nix: update to latest nixpkgs

diff --git a/flake.lock b/flake.lock
index e2d6a83407074285862f34a015430dcd4a13f473..e10d834fccf4283d5d4b7d568d31aa04df7be90e 100644 (file)
--- a/flake.lock
+++ b/flake.lock
@@ -152,17 +152,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1623773486,
-        "narHash": "sha256-JqifiS2MkLomI/O1KlKLMlm0q2/CtPXYYPPVpYjlmic=",
+        "lastModified": 1634851225,
+        "narHash": "sha256-fwtGHHl7fTELucIRBKO5JORD8QP9Lo9PwY9nrJuEybE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e0f2949c981a636ff1a75bd075e2a614af3bafb1",
+        "rev": "cfe82d9f444a1b77f135070f1c1ee63fa061f2fd",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e0f2949c981a636ff1a75bd075e2a614af3bafb1",
         "type": "github"
       }
     },
@@ -179,11 +178,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1634868304,
-        "narHash": "sha256-3EGKKQb+o2k/5SAaQaBpA7b/IoaUSGZOtIQe+Lgj8G8=",
+        "lastModified": 1634875861,
+        "narHash": "sha256-avWt7CXZaX4WrdZDc7Ct5FIHxH1Gf3qk7aPzP88bJU8=",
         "ref": "main",
-        "rev": "4ac801d7ebb047489a4620053ae007b9a6cf4772",
-        "revCount": 226,
+        "rev": "f70599d5ca3076ee49955610e5e5a497eec35120",
+        "revCount": 232,
         "type": "git",
         "url": "https://git.hut.sourcephile.fr/~julm/julm-nix"
       },
@@ -256,17 +255,17 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1634858817,
-        "narHash": "sha256-Us0ib717a7Qt3DE2RA8K0wNjofFoWMTM3UtYWaxh9XM=",
+        "lastModified": 1634933215,
+        "narHash": "sha256-TwLp3GXJCD1n5mvQHnB8Eaqx4ogYlGdQ2cM9enH9ps0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2b24fa4db8e5f4e3b3873d020b9cd2d3111005af",
+        "rev": "c47fcb70c6885d6df869934280ebeb715ca7e6fd",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2b24fa4db8e5f4e3b3873d020b9cd2d3111005af",
+        "rev": "c47fcb70c6885d6df869934280ebeb715ca7e6fd",
         "type": "github"
       }
     },
@@ -337,12 +336,12 @@
     "pass": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-3aRH2jHtzRQxPr2ZZqpqDzbEg6JlBK7CbhgmU0kARaU=",
-        "path": "./pass",
+        "narHash": "sha256-tuh9RcCovyUu4a9J1q2YVZQH8kgS0fGEbyo84yAXb1U=",
+        "path": "/home/julm/work/sourcephile/nix/pass",
         "type": "path"
       },
       "original": {
-        "path": "./pass",
+        "path": "/home/julm/work/sourcephile/nix/pass",
         "type": "path"
       }
     },
@@ -419,12 +418,12 @@
     "secrets": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-OgK8/XHYoYmuZCmbznyJ5rf9rER34UXIecN22MzbjaU=",
-        "path": "./sec",
+        "narHash": "sha256-TYk/jJI/uAAwnjWA9dFYs4ViPDQ7XoGG6HzE8ABNHWk=",
+        "path": "/home/julm/work/sourcephile/nix/sec",
         "type": "path"
       },
       "original": {
-        "path": "./sec",
+        "path": "/home/julm/work/sourcephile/nix/sec",
         "type": "path"
       }
     },

diff --git a/flake.nix b/flake.nix
index d0532c16142fbe3bd0169c2dd9aaad0d1d2add38..ea37b0d990806a7a446a8dac9857556517975b3c 100644 (file)
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,7 @@
 {
 # Pin down nixpkgs from github, instead of using global, system or user registries.
-inputs.nixpkgs.url = "github:NixOS/nixpkgs/2b24fa4db8e5f4e3b3873d020b9cd2d3111005af";
+
+inputs.nixpkgs.url = "github:NixOS/nixpkgs/c47fcb70c6885d6df869934280ebeb715ca7e6fd";
 #inputs.nixpkgs.url = "flake:nixpkgs";
 inputs.flake-utils.url = "github:numtide/flake-utils";
 inputs.home-manager.follows = "julm-nix/home-manager";

diff --git a/nixpkgs/patches.nix b/nixpkgs/patches.nix
index 3a707ead8ed7955cc13c4a3ab0cb2ba0ee3b7a63..bc017d9fcefe44c2b8a7da7f4c5f225410f24a73 100644 (file)
--- a/nixpkgs/patches.nix
+++ b/nixpkgs/patches.nix
@@ -9,7 +9,7 @@
 {
   meta.description = "nixos/security.gnupg: provisioning GnuPG-protected secrets through the Nix store";
   url = "https://github.com/NixOS/nixpkgs/pull/93659.diff";
-  sha256 = "sha256-4Yt6c+3hJyLr71aiAw/gfp2rZNAk9vU2CVG0WJN8gbA=";
+  sha256 = "sha256-ECdCWZNREXxtKQYG2/EmTk6VFDTsOwrVBGZhU1y79Rc=";
 }
 {
   meta.description = "Update public-inbox to 1.6.1 and add systemd services";
@@ -26,11 +26,6 @@
   url = "https://github.com/NixOS/nixpkgs/pull/128014.diff";
   sha256 = "sha256-1iJ46NXslDxsP/uO0cSaCzO3A5VF338M6d027G7sK3o=";
 }
-{
-  meta.description = "nixos/console: fix cross-compiling";
-  url = "https://github.com/NixOS/nixpkgs/pull/142272.diff";
-  sha256 = "sha256-Hwld3JxZ+D1Pz1xcwfBy0zR8WoQluUKsbG0kdiDNDK4=";
-}
 {
   meta.description = "nixos/display-managers: fix cross-compiling";
   url = "https://github.com/NixOS/nixpkgs/pull/142273.diff";

diff --git a/shell.nix b/shell.nix
index 7697c99049c48316360353ee22bdc00ec38eae10..c9aa43d6bd4faee1126e111036c889179488a5cd 100644 (file)
--- a/shell.nix
+++ b/shell.nix
@@ -137,6 +137,7 @@ pkgs.mkShell {
     pkgs.wireguard
     pkgs.stun
     pkgs.mkpasswd
+    #pkgs.ubootTools
     #pkgs.hydra-unstable
   ];
   #enableParallelBuilding = true;