Merge remote-tracking branch 'gum/master'

5 files changed, 55 insertions, 2 deletions

diff --git a/makefu/2configs/tools/consoles.nix b/makefu/2configs/tools/consoles.nix
index 543215adf..7090804d4 100644
--- a/makefu/2configs/tools/consoles.nix
+++ b/makefu/2configs/tools/consoles.nix
@@ -4,5 +4,6 @@
     opl-utils
     hdl-dump
     bin2iso
+    cue2pops
   ];
 }
diff --git a/makefu/2configs/tools/mobility.nix b/makefu/2configs/tools/mobility.nix
index 1993a5212..f2676f11c 100644
--- a/makefu/2configs/tools/mobility.nix
+++ b/makefu/2configs/tools/mobility.nix
@@ -5,5 +5,5 @@
     mosh
   ];
 
-  boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
+  # boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
 }
diff --git a/makefu/5pkgs/bin2iso/default.nix b/makefu/5pkgs/bin2iso/default.nix
new file mode 100644
index 000000000..31d05fab3
--- /dev/null
+++ b/makefu/5pkgs/bin2iso/default.nix
@@ -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;
+  };
+}
diff --git a/makefu/5pkgs/cue2pops/default.nix b/makefu/5pkgs/cue2pops/default.nix
new file mode 100644
index 000000000..218ae8307
--- /dev/null
+++ b/makefu/5pkgs/cue2pops/default.nix
@@ -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;
+  };
+}
diff --git a/makefu/source.nix b/makefu/source.nix
index ccdc7b9f0..647803fd7 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -13,7 +13,7 @@ let
               then "buildbot"
               else "makefu";
   _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
 
 in