From ba42be899d0af94f5a3a1c9a71451c76d4666eb4 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 4 Jan 2018 02:14:36 +0100
Subject: [PATCH 1/6] ma pkgs.cue2pops: init

---
 makefu/2configs/tools/consoles.nix |  1 +
 makefu/5pkgs/cue2pops/default.nix  | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 makefu/5pkgs/cue2pops/default.nix

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/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;
+  };
+}

From e02e7053aaabc883ae4a6aa23886b6ee92cebb79 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 4 Jan 2018 18:36:47 +0100
Subject: [PATCH 2/6] ma source: cherry-pick latest kernel bump

---
 makefu/source.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/makefu/source.nix b/makefu/source.nix
index ccdc7b9f0..822b1e7c0 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -13,8 +13,9 @@ let
               then "buildbot"
               else "makefu";
   _file = <stockholm> + "/makefu/1systems/${name}/source.nix";
-  ref = "475bec2"; # unstable @ 2017-08-04
+  ref = "d37e53e"; # unstable @ 2017-12-08
                    # + do_sqlite3 ruby: 55a952be5b5
+                   # + kernel bump: 1e129a3f993
 
 in
   evalSource (toString _file) [

From 9f77a71c7b72e3aa32042d5876cc08b00c5ed9bf Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 4 Jan 2018 18:48:46 +0100
Subject: [PATCH 3/6] ma pkgs.mobility: temp remove exfat-nofuse

---
 makefu/2configs/tools/mobility.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ];
 }

From 77d53e841b7eaed58925571c2bdeb51cdc5e82a3 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 4 Jan 2018 23:18:32 +0100
Subject: [PATCH 4/6] ma source: retry to bump nixpkgs

---
 makefu/source.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/makefu/source.nix b/makefu/source.nix
index 822b1e7c0..6b305b641 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -13,9 +13,8 @@ let
               then "buildbot"
               else "makefu";
   _file = <stockholm> + "/makefu/1systems/${name}/source.nix";
-  ref = "d37e53e"; # unstable @ 2017-12-08
+  ref = "26ed774"; # nixpkgs-unstable @ 2018-01-04
                    # + do_sqlite3 ruby: 55a952be5b5
-                   # + kernel bump: 1e129a3f993
 
 in
   evalSource (toString _file) [

From 3ad5283dfbf1733e06b16d4439c4f14268680240 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 5 Jan 2018 11:12:47 +0100
Subject: [PATCH 5/6] ma pkgs.bin2iso: init

---
 makefu/5pkgs/bin2iso/default.nix | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 makefu/5pkgs/bin2iso/default.nix

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;
+  };
+}

From 801f2f0926d665fb2a3c2fd9184706a2235fe960 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 5 Jan 2018 11:52:07 +0100
Subject: [PATCH 6/6] ma source: back to stable

---
 makefu/source.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/makefu/source.nix b/makefu/source.nix
index 6b305b641..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 = "26ed774"; # nixpkgs-unstable @ 2018-01-04
+  ref = "3e8d708"; # nixos-17.09 @ 2018-01-05
                    # + do_sqlite3 ruby: 55a952be5b5
 
 in