update.sh: newer nix-prefetch and hashes

3 files changed, 48 insertions, 11 deletions

diff --git a/flake.lock b/flake.lock
index 3e7cbbfbe9b5..0cac685351fa 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "cachixpkgs": {
       "locked": {
-        "lastModified": 1595357489,
-        "narHash": "sha256-hogc9RVcShK+r9h9rnRlHdBS/Ptaxa+SE8kcVyMLKjM=",
+        "lastModified": 1597243902,
+        "narHash": "sha256-wYGEPOmBDpEmGtgA2n/AuOhAE00ti2WbxCYuaoFy0MU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9ea61f7bc4454734ffbff73c9b6173420fe3147b",
+        "rev": "2a403c9476638a33b1cab4851e55df13491eece3",
         "type": "github"
       },
       "original": {
@@ -16,13 +16,44 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1597053966,
+        "narHash": "sha256-f9lbPS/GJ1His8fsDqM6gfa8kSqREU4eKiMCS5hrKg4=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "ec20f52e2ff61e9c36c2b894b62fc1b4bd04c71b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "master": {
+      "locked": {
+        "lastModified": 1597301641,
+        "narHash": "sha256-DAVv3GU41avLNjZz3YPk/BSWZKOJijbkpmTRKL9etdU=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "28224516e5cfce2782fc8bbc700ca814d4648cb7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1596615455,
-        "narHash": "sha256-qOp3QRL7dUbN+Kus7tReThC5ZuIqG9fy7/nkqlO78n8=",
+        "lastModified": 1597057899,
+        "narHash": "sha256-U144beTNlMdersGcr49IGU2YP1HjeS3pT3+FbOXN7r8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8e2b14aceb1d40c7e8b84c03a7c78955359872bb",
+        "rev": "32b46dd897ab2143a609988a04d87452f0bbef59",
         "type": "github"
       },
       "original": {
@@ -35,6 +66,8 @@
     "root": {
       "inputs": {
         "cachixpkgs": "cachixpkgs",
+        "flake-utils": "flake-utils",
+        "master": "master",
         "nixpkgs": "nixpkgs"
       }
     }
diff --git a/flake.nix b/flake.nix
index 33d27ec32b4c..51e505656d01 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,8 +4,10 @@
   description = "wayland-apps";

 

   inputs = {

+    master = { url = "github:nixos/nixpkgs/master"; };

     nixpkgs = { url = "github:nixos/nixpkgs/nixos-unstable"; };

     cachixpkgs = { url = "github:nixos/nixpkgs/nixos-20.03"; };

+    flake-utils = { url = "github:numtide/flake-utils"; }; # TODO: adopt this

   };

 

   outputs = inputs:

@@ -28,6 +30,7 @@
     rec {

       devShell = forAllSystems (system:

         let

+          master_ = (pkgsFor inputs.master system false);

           nixpkgs_ = (pkgsFor inputs.nixpkgs system false);

           cachixpkgs_ = (pkgsFor inputs.cachixpkgs system false);

         in

@@ -37,8 +40,9 @@
               nixFlakes

               bash cacert

               curl git jq mercurial

-              nix-build-uncached

-              nix-prefetch openssh ripgrep

+              openssh ripgrep

+              master_.nix-build-uncached

+              master_.nix-prefetch

             ];

           }

       );

diff --git a/update.sh b/update.sh
index 3da17fea8e2d..5c314101305f 100755
--- a/update.sh
+++ b/update.sh
@@ -95,14 +95,14 @@ function update() {
       # TODO: do this with nix instead of sed?
       sed -i "s/${rev}/${newrev}/" "${metadata}"
       sed -i "s|${date}|${newdate}|" "${metadata}"
-      sed -i "s/${sha256}/${newsha256}/" "${metadata}"
+      sed -i "s|${sha256}|${newsha256}|" "${metadata}"
 
       # CargoSha256 has to happen AFTER the other rev/sha256 bump
       if [[ "${cargoSha256}" != "missing_cargoSha256" ]]; then
         newcargoSha256="$(NIX_PATH="${tmpnixpath}" \
           nix-prefetch \
             "{ sha256 }: let p=(import ./build.nix).${upattr}; in p.cargoDeps.overrideAttrs (_: { cargoSha256 = sha256; })")"
-        sed -i "s/${cargoSha256}/${newcargoSha256}/" "${metadata}"
+        sed -i "s|${cargoSha256}|${newcargoSha256}|" "${metadata}"
       fi
 
       # VendorSha256 has to happen AFTER the other rev/sha256 bump
@@ -110,7 +110,7 @@ function update() {
         newvendorSha256="$(NIX_PATH="${tmpnixpath}" \
           nix-prefetch \
             "{ sha256 }: let p=(import ./build.nix).${upattr}; in p.go-modules.overrideAttrs (_: { vendorSha256 = sha256; })")"
-        sed -i "s/${vendorSha256}/${newvendorSha256}/" "${metadata}"
+        sed -i "s|${vendorSha256}|${newvendorSha256}|" "${metadata}"
       fi
 
       set +x