From ef8d63c80e8596012f9c3bf801e9852bc33c80cf Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Sat, 10 Nov 2018 11:29:42 +0100
Subject: [PATCH] nix: bump just and add to common profile

---
 nix/home-manager/profiles/common.nix |  4 ++++
 nix/pkgs/just.nix                    | 24 ++++++++++++++++++++++++
 shell.nix                            | 22 +---------------------
 3 files changed, 29 insertions(+), 21 deletions(-)
 create mode 100644 nix/pkgs/just.nix

diff --git a/nix/home-manager/profiles/common.nix b/nix/home-manager/profiles/common.nix
index 5088769..e0d029a 100644
--- a/nix/home-manager/profiles/common.nix
+++ b/nix/home-manager/profiles/common.nix
@@ -25,6 +25,8 @@ in {
       dropbearStatic = dropbear.override {
         enableStatic = true;
       };
+
+      just = pkgs.callPackage ../../pkgs/just.nix {};
     };
   };
 
@@ -58,5 +60,7 @@ in {
       cacert
       openssl
       mkpasswd
+
+      just
       ]);
 }
diff --git a/nix/pkgs/just.nix b/nix/pkgs/just.nix
new file mode 100644
index 0000000..f1a0fa5
--- /dev/null
+++ b/nix/pkgs/just.nix
@@ -0,0 +1,24 @@
+{ rustPlatform
+, stdenv
+}:
+
+  rustPlatform.buildRustPackage rec {
+    name = "just-${version}";
+    version = "849cdcb37fb42feb5e8724ec9fb3b34027e0da4f";
+    src = builtins.fetchGit {
+      url = "https://github.com/casey/just.git";
+      rev = version;
+    };
+
+    cargoSha256 = "0awfq9fhcin2q6mvv54xw6i6pxhdp9xa1cpx3jmpf3a6h8l6s9wp";
+
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+      description = "Just a command runner ";
+      homepage = https://github.com/casey/just;
+      license = licenses.unlicense;
+      maintainers = [ ];
+      platforms = platforms.all;
+    };
+  }
diff --git a/shell.nix b/shell.nix
index 9ea28a3..a0f6894 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,32 +1,12 @@
 with import <nixpkgs> {};
 
 let 
-  just = rustPlatform.buildRustPackage rec {
-    name = "just-${version}";
-    version = "git";
-    src = builtins.fetchGit {
-      url = "https://github.com/casey/just.git";
-      rev = "6430d38a6a489ba4e818b6a892e8bbbbacbfe8f3";
-    };
-
-    cargoSha256 = "0awfq9fhcin2q6mvv54xw6i6pxhdp9xa1cpx3jmpf3a6h8l6s9wp";
-
-    doCheck = false;
-
-    meta = with stdenv.lib; {
-      description = "Just a command runner ";
-      homepage = https://github.com/casey/just;
-      license = licenses.unlicense;
-      maintainers = [ ];
-      platforms = platforms.all;
-    };
-  };
 
 in 
 stdenv.mkDerivation {
   name = "infra-env";
   buildInputs = [
-    just
+    (pkgs.callPackage ./nix/pkgs/just.nix {})
     git-crypt
     vcsh
     gnupg