From ac14a29f62dadcd9b91d840b330f444ddcacb913 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Sat, 7 May 2022 13:38:25 -0400 Subject: [PATCH] Update all inputs, and stop using hardcoded hash --- README.md | 4 ++++ flake.lock | 63 +++++++++++++++++++++++++++--------------------------- flake.nix | 6 +----- 3 files changed, 37 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 1fa5ddf..8c467be 100644 --- a/README.md +++ b/README.md @@ -33,3 +33,7 @@ make - `home`: home-manager config - `nixos`: nixos config (includes nix-darwin) - `systems`: top-level configuration.nix('ish) for various kinds of system + +## Tips + +- To update NixOS (and other inputs) run `nix flake update` diff --git a/flake.lock b/flake.lock index c4daf2e..75a52c4 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1650976225, - "narHash": "sha256-PGM65SQHS63Dd5MmLJo3GJsZP9lJVZmpWxluQoG1Dt8=", + "lastModified": 1651916036, + "narHash": "sha256-UuD9keUGm4IuVEV6wdSYbuRm7CwfXE63hVkzKDjVsh4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "bb3baef6e115ae47bc2ab4973bd3a486488485b0", + "rev": "2f2bdf658d2b79bada78dc914af99c53cad37cba", "type": "github" }, "original": { @@ -24,11 +24,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1648199409, - "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", "owner": "edolstra", "repo": "flake-compat", - "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", "type": "github" }, "original": { @@ -96,11 +96,11 @@ "pre-commit-hooks-nix": "pre-commit-hooks-nix" }, "locked": { - "lastModified": 1649443307, - "narHash": "sha256-R5WJbQtGeE+sLciMRefrosyLSwOR4VB52gJSgDyKH7c=", + "lastModified": 1651595533, + "narHash": "sha256-dGF4ZukZb7Qumc+OxTPYC0RaxG2P5CyzhbZlSF+5YJw=", "owner": "hercules-ci", "repo": "hercules-ci-agent", - "rev": "56a8925fb519ce25a4ff8376ab76607a7d1b49ec", + "rev": "36e1f84b106f9e727797ee14e75dca24459b2cd5", "type": "github" }, "original": { @@ -133,11 +133,11 @@ ] }, "locked": { - "lastModified": 1650148597, - "narHash": "sha256-/1V3grYy4GaqRgPjbBwWUY8mvZK/lfIPkkVtU/870ss=", + "lastModified": 1651886851, + "narHash": "sha256-kbXOJSf1uho0/7P54nZkJdJY3oAelIjyc6tfiRhaXJI=", "owner": "nix-community", "repo": "home-manager", - "rev": "8ab155c61f5821ffda723de88b0009769771d4f2", + "rev": "882bd8118bdbff3a6e53e5ced393932b351ce2f6", "type": "github" }, "original": { @@ -174,11 +174,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1650096904, - "narHash": "sha256-mSnDYhZCnw13vApIApeZMIYvuYnrd+Bal4aWbD3xzOc=", + "lastModified": 1651911366, + "narHash": "sha256-p2LrkJGLbG6IwIpjPoJPHR4dKmHY6IT6Oidwwv+k0EU=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "ae9ee8abdce8256822879916d386550bb55f5b6c", + "rev": "8df1ab4a1da0b68dbca54a8a0502cf75a786cb2f", "type": "github" }, "original": { @@ -207,11 +207,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1646647249, - "narHash": "sha256-G1qFpuv8FOO7Sjx3kPwVi63emtCFZvTBSta8jODOb/U=", + "lastModified": 1650522846, + "narHash": "sha256-SxWHXRI3qJwswyXAtzsi6PKVY3KLNNnb072KaJthII8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "86fa91c21f911d7cb0427baed3b177744b82e068", + "rev": "6b4ebea9093c997c5f275c820e679108de4871ab", "type": "github" }, "original": { @@ -241,15 +241,16 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1649417654, - "narHash": "sha256-IKC+25OiNIGPIGs0iBg/gx1lrGR4N5MGe5x+sGi7vzw=", + "lastModified": 1650701402, + "narHash": "sha256-XKfstdtqDg+O+gNBx1yGVKWIhLgfEDg/e2lvJSsp9vU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5df8b35e4f4074bd8b77eed10b267b6e5d029d6c", + "rev": "bc41b01dd7a9fdffd32d9b03806798797532a5fe", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -303,11 +304,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1649986882, - "narHash": "sha256-cNsInUFq1MbuvaEmv8x6jetWnmAU+osMpnwKumtjksI=", + "lastModified": 1651726670, + "narHash": "sha256-dSGdzB49SEvdOJvrQWfQYkAefewXraHIV08Vz6iDXWQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5181d5945eda382ff6a9ca3e072ed6ea9b547fee", + "rev": "c777cdf5c564015d5f63b09cc93bef4178b19b01", "type": "github" }, "original": { @@ -319,11 +320,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1649986882, - "narHash": "sha256-cNsInUFq1MbuvaEmv8x6jetWnmAU+osMpnwKumtjksI=", + "lastModified": 1651726670, + "narHash": "sha256-dSGdzB49SEvdOJvrQWfQYkAefewXraHIV08Vz6iDXWQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5181d5945eda382ff6a9ca3e072ed6ea9b547fee", + "rev": "c777cdf5c564015d5f63b09cc93bef4178b19b01", "type": "github" }, "original": { @@ -366,17 +367,17 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1651007983, - "narHash": "sha256-GNay7yDPtLcRcKCNHldug85AhAvBpTtPEJWSSDYBw8U=", + "lastModified": 1651726670, + "narHash": "sha256-dSGdzB49SEvdOJvrQWfQYkAefewXraHIV08Vz6iDXWQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e10da1c7f542515b609f8dfbcf788f3d85b14936", + "rev": "c777cdf5c564015d5f63b09cc93bef4178b19b01", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "e10da1c7f542515b609f8dfbcf788f3d85b14936", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 51f4b74..36372d6 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,7 @@ description = "Srid's NixOS configuration"; inputs = { - # To update nixpkgs (and thus NixOS), pick the nixos-unstable rev from - # https://status.nixos.org/ - # - # This ensures that we always use the official nix cache. - nixpkgs.url = "github:nixos/nixpkgs/e10da1c7f542515b609f8dfbcf788f3d85b14936"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; darwin.url = "github:lnl7/nix-darwin/master"; darwin.inputs.nixpkgs.follows = "nixpkgs";