nix: fix and document pkgs.path hack

diff --git a/Makefile b/Makefile
index da792b43e348535af8895fd3ca3a8025a30e40d2..7b35fdde5a01fa626bfbb259a5dffeb47ba92fd8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,8 @@ base/unbound/named.root:
 
 send-pass:
        rsync -ai --delete ../sec/pass julm@sourcephile.fr:work/sourcephile/sec/
+send-nixops:
+       rsync -ai --delete ../sec/nixops julm@sourcephile.fr:work/sourcephile/sec/
 recv-pass:
        rsync -ai --delete julm@sourcephile.fr:work/sourcephile/sec/pass  ../sec/
 recv-gnupg:

diff --git a/defaults.nix b/defaults.nix
index 2726b1989ee5762764dca9d9a449bb0efb91d248..0c7df106bceb9a17085c92daf5320753abedfaf6 100644 (file)
--- a/defaults.nix
+++ b/defaults.nix
@@ -18,6 +18,10 @@ nix = {
     options = "--delete-older-than 30d";
   };
   nixPath = [
+    # WARNING: this is a hack to avoid copying Nixpkgs
+    # a second time into the Nix store.
+    # It makes only sense when Nixpkgs is already in the Nix store,
+    # and is registered.
     "nixpkgs=${toString pkgs.path}"
   ];
 };
@@ -85,8 +89,11 @@ services = {
 
 environment = {
   #checkConfigurationOptions = false;
+  #etc.nixpkgs.source = (pkgs.runCommandLocal "pkgs.path" {propagatedBuildInputs=[pkgs.path]; buildInputs=[pkgs.path];} "mkdir $out");
   systemPackages = with pkgs; [
+    pkgs.path # WARNING: this is a hack to register the path to Nixpkgs. See nix.nixPath.
     binutils
+    pkgs.neofetch
     #dnsutils
     dstat
     htop

diff --git a/shell.nix b/shell.nix
index be5968e8499420ca5105e05584d7a18edd1ebd3a..cb3e88dbd5e762e0aa6fcb682d3ebd59e4b7de70 100644 (file)
--- a/shell.nix
+++ b/shell.nix
@@ -50,18 +50,15 @@ let
   localNixpkgsPatches = [
     patches/direnv.diff
   ];
-  nixpkgs = originPkgs.stdenv.mkDerivation {
+  nixpkgs = originPkgs.applyPatches {
     name = "nixpkgs-patched";
     src = originNixpkgs;
-    phases = [ "unpackPhase" "patchPhase" ];
     patches = map originPkgs.fetchpatch remoteNixpkgsPatches ++ localNixpkgsPatches;
     postPatch = ''
-      set -x
       patch=$(printf '%s\n' ${builtins.concatStringsSep " "
          (map (p: p.sha256) remoteNixpkgsPatches ++ localNixpkgsPatches)} |
         sort | sha256sum | cut -c -7)
-      mv $PWD $out
-      echo "+patch-$patch" >$out/.version-suffix
+      echo "+patch-$patch" >.version-suffix
     '';
   };
   pkgs = import nixpkgs {