Merge remote-tracking branch 'gum/master'

This commit is contained in:
lassulus 2018-01-05 15:57:01 +01:00
commit cf49b9d015
5 changed files with 55 additions and 2 deletions

View File

@ -4,5 +4,6 @@
opl-utils opl-utils
hdl-dump hdl-dump
bin2iso bin2iso
cue2pops
]; ];
} }

View File

@ -5,5 +5,5 @@
mosh mosh
]; ];
boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ]; # boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
} }

View File

@ -0,0 +1,28 @@
{ stdenv, lib, pkgs, fetchurl }:
stdenv.mkDerivation rec {
pname = "bin2iso";
version = "1.9b";
_dlver = builtins.replaceStrings ["."] [""] version;
name = "${pname}-${version}";
src = fetchurl {
url = "http://users.eastlink.ca/~doiron/${pname}/linux/${pname}${_dlver}_linux.c";
sha256 = "0gg4hbzlm83nnbccy79dnxbwpn7lxl3fb87ka36mlclikvknm2hy";
};
unpackPhase = "true";
buildPhase =''
gcc -Wall -o $pname $src
'';
installPhase = ''
install -Dm755 $pname $out/bin/$pname
'';
meta = {
homepage = http://users.eastlink.ca/~doiron/bin2iso/ ;
description = "converts bin+cue to iso";
license = lib.licenses.gpl3;
};
}

View File

@ -0,0 +1,24 @@
{ stdenv, lib, pkgs, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "cue2pops";
version = "2";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "makefu";
repo = "cue2pops-linux";
rev = "541863a";
sha256 = "05w84726g3k33rz0wwb9v77g7xh4cnhy9sxlpilf775nli9bynrk";
};
installPhase = ''
install -Dm755 $pname $out/bin/$pname
'';
meta = {
homepage = http://users.eastlink.ca/~doiron/bin2iso/ ;
description = "converts bin+cue to iso";
license = lib.licenses.gpl3;
};
}

View File

@ -13,7 +13,7 @@ let
then "buildbot" then "buildbot"
else "makefu"; else "makefu";
_file = <stockholm> + "/makefu/1systems/${name}/source.nix"; _file = <stockholm> + "/makefu/1systems/${name}/source.nix";
ref = "475bec2"; # unstable @ 2017-08-04 ref = "3e8d708"; # nixos-17.09 @ 2018-01-05
# + do_sqlite3 ruby: 55a952be5b5 # + do_sqlite3 ruby: 55a952be5b5
in in