From 01205490433984fd5aad700fab8c27332c47ca1c Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 16 May 2021 17:29:07 +0200 Subject: [PATCH] Update nixpkgs to latest nixos-unstable revision --- nix/default.nix | 2 +- nix/nixpkgs.json | 10 +++++----- nix/update-nixpkgs.sh | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index ed43435..286ea32 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -10,7 +10,7 @@ in import (hostpkgs.stdenv.mkDerivation { src = fetchFromGitHub { owner = "NixOS"; - repo = "nixpkgs-channels"; + repo = "nixpkgs"; inherit (srcDef) rev sha256; }; diff --git a/nix/nixpkgs.json b/nix/nixpkgs.json index 9455f55..c1c9443 100644 --- a/nix/nixpkgs.json +++ b/nix/nixpkgs.json @@ -1,9 +1,9 @@ { - "url": "https://github.com/nixos/nixpkgs-channels.git", - "rev": "0f5ce2fac0c726036ca69a5524c59a49e2973dd4", - "date": "2020-05-19T01:31:20+02:00", - "path": "/nix/store/57j44dl147z6956rc5ks4h1ff2rbdlxp-nixpkgs-channels", - "sha256": "0nkk492aa7pr0d30vv1aw192wc16wpa1j02925pldc09s9m9i0r3", + "url": "https://github.com/nixos/nixpkgs.git", + "rev": "20887e4bbfdae3aed6bfa1f53ddf138ee325515e", + "date": "2021-07-03T21:40:35-05:00", + "path": "/nix/store/ph4npn3fa3hv9i9vvwsgwaz7zhl9v2dd-nixpkgs", + "sha256": "0hc79sv59appb7bynz5bzyqvrapyjdq63s79i649vxl93504kmnv", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nix/update-nixpkgs.sh b/nix/update-nixpkgs.sh index 0bb858a..2bfd515 100755 --- a/nix/update-nixpkgs.sh +++ b/nix/update-nixpkgs.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p nix-prefetch-git -nix-prefetch-git https://github.com/nixos/nixpkgs-channels.git \ +nix-prefetch-git https://github.com/nixos/nixpkgs.git \ --rev refs/heads/nixos-unstable > ./nix/nixpkgs.json