Use updated fetchNixpkgs.nix (#327)

Author: Gabriella439

default.nix

@@ -4,9 +4,7 @@ let
   nixpkgs = fetchNixpkgs {
     rev = "804060ff9a79ceb0925fe9ef79ddbf564a225d47";
 
-    sha256 = "01pb6p07xawi60kshsxxq1bzn8a0y4s5jjqvhkwps4f5xjmmwav3";
-
-    outputSha256 = "0ga345hgw6v2kzyhvf5kw96hf60mx5pbd9c4qj5q4nan4lr7nkxn";
+    sha256 = "0ga345hgw6v2kzyhvf5kw96hf60mx5pbd9c4qj5q4nan4lr7nkxn";
   };
 
   readDirectory = import ./nix/readDirectory.nix;

nix/fetchNixpkgs.nix

@@ -1,6 +1,5 @@
 { rev                             # The Git revision of nixpkgs to fetch
-, sha256                          # The SHA256 of the downloaded data
-, outputSha256 ? null             # The SHA256 fixed-output hash
+, sha256                          # The SHA256 hash of the unpacked archive
 , system ? builtins.currentSystem # This is overridable if necessary
 }:
 
@@ -10,15 +9,15 @@ if (0 <= builtins.compareVersions builtins.nixVersion "1.12")
 then (
   builtins.fetchTarball {
     url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";
-    sha256 = outputSha256;
+    inherit sha256;
   })
 
 # This hack should at least work for Nix 1.11
 else (
   (rec {
     tarball = import <nix/fetchurl.nix> {
-      url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";
-      inherit sha256;
+      url    = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";
+      sha256 = null;
     };
 
     builtin-paths = import <nix/config.nix>;
@@ -41,9 +40,9 @@ else (
       tar       = builtins.storePath builtin-paths.tar;
       gzip      = builtins.storePath builtin-paths.gzip;
       coreutils = builtins.storePath builtin-paths.coreutils;
-    } // (if null == outputSha256 then { } else {
+    } // (if null == sha256 then { } else {
       outputHashMode = "recursive";
       outputHashAlgo = "sha256";
-      outputHash = outputSha256;
+      outputHash = sha256;
     }));
   }).nixpkgs)