From ab1a1c621b42569846aeb1e7dd319c4a278d3bff Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Fri, 16 Feb 2018 16:37:10 +0100
Subject: [PATCH 1/4] idsk : init at 0.16-1846729

---
 pkgs/tools/filesystems/idsk/default.nix | 33 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/tools/filesystems/idsk/default.nix

diff --git a/pkgs/tools/filesystems/idsk/default.nix b/pkgs/tools/filesystems/idsk/default.nix
new file mode 100644
index 00000000000..20a29239159
--- /dev/null
+++ b/pkgs/tools/filesystems/idsk/default.nix
@@ -0,0 +1,33 @@
+
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+
+	pname = "idsk";
+  version = "0.16";
+  rev = "1846729ac3432aa8c2c0525be45cfff8a513e007";
+  short_rev = "${builtins.substring 0 7 rev}";
+	name = "${pname}-${version}-${short_rev}";
+
+  meta = with stdenv.lib; {
+    description = "manipulating cpc dsk images and files";
+    homepage = https://github.com/cpcsdk/idsk ;
+    license = "unknown";
+    maintainers = [ maintainers.genesis ];
+    platforms = platforms.linux;
+  };
+
+	src = fetchFromGitHub {
+		owner = "cpcsdk";
+		repo  = "${pname}";
+		rev = "${rev}";
+		sha256 = "0d891lvf2nc8bys8kyf69k54rf3jlwqrcczbff8xi0w4wsiy5ckv";
+	};
+
+	nativeBuildInputs = [ cmake ];
+
+	installPhase = ''
+		mkdir -p $out/bin
+		cp iDSK $out/bin
+	'';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fbe12e462d0..15b508d1aff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19928,6 +19928,8 @@ with pkgs;
 
   epkowa = callPackage ../misc/drivers/epkowa { };
 
+  idsk = callPackage ../tools/filesystems/idsk { };
+
   illum = callPackage ../tools/system/illum { };
 
   # using the new configuration style proposal which is unstable

From d93933e434eedf1159325901b06413e019bd9dfd Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Fri, 16 Feb 2018 21:14:56 +0100
Subject: [PATCH 2/4] fixes according to PR

---
 pkgs/tools/filesystems/idsk/default.nix | 27 +++++++++++--------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/filesystems/idsk/default.nix b/pkgs/tools/filesystems/idsk/default.nix
index 20a29239159..409d9dd8485 100644
--- a/pkgs/tools/filesystems/idsk/default.nix
+++ b/pkgs/tools/filesystems/idsk/default.nix
@@ -1,26 +1,23 @@
-
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
 
-	pname = "idsk";
-  version = "0.16";
-  rev = "1846729ac3432aa8c2c0525be45cfff8a513e007";
-  short_rev = "${builtins.substring 0 7 rev}";
-	name = "${pname}-${version}-${short_rev}";
+	repo = "idsk";
+	version = "unstable-2018-02-11";
+	rev = "1846729ac3432aa8c2c0525be45cfff8a513e007";
+	name = "${repo}-${version}";
 
-  meta = with stdenv.lib; {
-    description = "manipulating cpc dsk images and files";
-    homepage = https://github.com/cpcsdk/idsk ;
-    license = "unknown";
-    maintainers = [ maintainers.genesis ];
-    platforms = platforms.linux;
-  };
+	meta = with stdenv.lib; {
+		description = "Manipulating CPC dsk images and files";
+		homepage = https://github.com/cpcsdk/idsk ;
+		license = "unknown";
+		maintainers = [ maintainers.bignaux ];
+		platforms = platforms.linux;
+	};
 
 	src = fetchFromGitHub {
+		inherit rev repo;
 		owner = "cpcsdk";
-		repo  = "${pname}";
-		rev = "${rev}";
 		sha256 = "0d891lvf2nc8bys8kyf69k54rf3jlwqrcczbff8xi0w4wsiy5ckv";
 	};
 

From fed67dcbf95dde58c377deb28b003de7a5b0a23c Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Fri, 16 Feb 2018 22:15:45 +0100
Subject: [PATCH 3/4] fix tab

---
 pkgs/tools/filesystems/idsk/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/idsk/default.nix b/pkgs/tools/filesystems/idsk/default.nix
index 409d9dd8485..04236769326 100644
--- a/pkgs/tools/filesystems/idsk/default.nix
+++ b/pkgs/tools/filesystems/idsk/default.nix
@@ -26,5 +26,5 @@ stdenv.mkDerivation rec {
 	installPhase = ''
 		mkdir -p $out/bin
 		cp iDSK $out/bin
-	'';
+		'';
 }

From 5088917402d719156c5bf9ad3770d7222f533da7 Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Sat, 17 Feb 2018 08:20:00 +0100
Subject: [PATCH 4/4] fixing tab and maintainers

---
 pkgs/tools/filesystems/idsk/default.nix | 42 ++++++++++++-------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/tools/filesystems/idsk/default.nix b/pkgs/tools/filesystems/idsk/default.nix
index 04236769326..617457f55b6 100644
--- a/pkgs/tools/filesystems/idsk/default.nix
+++ b/pkgs/tools/filesystems/idsk/default.nix
@@ -2,29 +2,29 @@
 
 stdenv.mkDerivation rec {
 
-	repo = "idsk";
-	version = "unstable-2018-02-11";
-	rev = "1846729ac3432aa8c2c0525be45cfff8a513e007";
-	name = "${repo}-${version}";
+  repo = "idsk";
+  version = "unstable-2018-02-11";
+  rev = "1846729ac3432aa8c2c0525be45cfff8a513e007";
+  name = "${repo}-${version}";
 
-	meta = with stdenv.lib; {
-		description = "Manipulating CPC dsk images and files";
-		homepage = https://github.com/cpcsdk/idsk ;
-		license = "unknown";
-		maintainers = [ maintainers.bignaux ];
-		platforms = platforms.linux;
-	};
+  meta = with stdenv.lib; {
+    description = "Manipulating CPC dsk images and files";
+    homepage = https://github.com/cpcsdk/idsk ;
+    license = "unknown";
+    maintainers = [ maintainers.genesis ];
+    platforms = platforms.linux;
+  };
 
-	src = fetchFromGitHub {
-		inherit rev repo;
-		owner = "cpcsdk";
-		sha256 = "0d891lvf2nc8bys8kyf69k54rf3jlwqrcczbff8xi0w4wsiy5ckv";
-	};
+  src = fetchFromGitHub {
+    inherit rev repo;
+    owner = "cpcsdk";
+    sha256 = "0d891lvf2nc8bys8kyf69k54rf3jlwqrcczbff8xi0w4wsiy5ckv";
+  };
 
-	nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 
-	installPhase = ''
-		mkdir -p $out/bin
-		cp iDSK $out/bin
-		'';
+  installPhase = ''
+    mkdir -p $out/bin
+    cp iDSK $out/bin
+  '';
 }