diff --git a/flake.lock b/flake.lock index d2a978e8..45d5c345 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1607638611, - "narHash": "sha256-KRkNcw1eZns54CyunrHx7qoPccvy1hz7/VpMnWtp5hg=", + "lastModified": 1608368177, + "narHash": "sha256-C+M4DE/gAUC1W46SodGtMC5UNOS6AayBfGyKlIvwcxY=", "owner": "nix-community", "repo": "home-manager", - "rev": "b6ed605d4a5a75fae25132e4f1da15f3fd635bc1", + "rev": "e87bccabc318475ab712470657b85435354b53f7", "type": "github" }, "original": { @@ -38,16 +38,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1607822201, - "narHash": "sha256-wuwgnEvEqX04MbYIrLrxmS3b9nPDAZ7vCHUVU36MSoM=", - "owner": "charvp", + "lastModified": 1607522989, + "narHash": "sha256-o/jWhOSAlaK7y2M57OIriRt6whuVVocS/T0mG7fd1TI=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "58cb5383869ced196b0b198a78daca08b63e958e", + "rev": "e9158eca70ae59e73fae23be5d13d3fa0cfc78b4", "type": "github" }, "original": { - "owner": "charvp", - "ref": "master", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index fd150a52..7d8173a2 100644 --- a/flake.nix +++ b/flake.nix @@ -2,12 +2,12 @@ description = "Nixos configuration flake"; inputs = { - nixpkgs = { url = "github:charvp/nixpkgs/master"; }; + flake-utils.url = "github:numtide/flake-utils/master"; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - flake-utils = { url = "github:numtide/flake-utils/master"; }; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; }; outputs = { self, nixpkgs, home-manager, flake-utils }: diff --git a/update.sh b/update.sh index 56fb427d..12540720 100755 --- a/update.sh +++ b/update.sh @@ -6,7 +6,7 @@ if [ -z "${NO_LOCAL:-}" ] then pushd ../nixpkgs git fetch --all --prune - git rebase upstream/nixos-unstable-small || exit 1 + git rebase upstream/nixos-unstable || exit 1 git push || exit 1 popd fi