felschr/nixos-config
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

feat(flake): reference nixpkgs input in other inputs

Browse source
This commit is contained in:
Felix Schröter 2020-09-26 23:55:15 +02:00
parent 0a772c90b0
commit 10a370ceac
No known key found for this signature in database
GPG key ID: 910ACB9F6BD26F58
2 changed files with 23 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
flake.lock
View file

@ -99,14 +99,16 @@
}, },
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1600939014, "lastModified": 1600992519,
"narHash": "sha256-KAE8spJnWmnFy1H1QVyRa2fA/09MxbZgjzvilqBhCPY=", "narHash": "sha256-Y9wlciB/g1QUquVpTZXQq23I5r8qJ4nZArfczTYBo24=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "690d93c22a8812c303a52786022f3f0441dfd06a", "rev": "abfb4cde51856dbee909f373b59cd941f51c2170",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -118,24 +120,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1600573085, "lastModified": 1600834745,
"narHash": "sha256-w5SGosyuTbFCBoUzgy2gyVcxYxRUvZ6SgHsRIPkZXgI=", "narHash": "sha256-JblQ+Io/P6oZVzMk0QhpsMNPaYDMjFaLh+lSuu7Pd5c=",
"path": "/nix/store/4abah8x1z3lna1k70mm2zpms62g0kf08-source",
"rev": "1179840f9a88b8a548f4b11d1a03aa25a790c379",
"type": "path"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1600573085,
"narHash": "sha256-w5SGosyuTbFCBoUzgy2gyVcxYxRUvZ6SgHsRIPkZXgI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1179840f9a88b8a548f4b11d1a03aa25a790c379", "rev": "daaa0e33505082716beb52efefe3064f0332b521",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -145,22 +134,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": {
"locked": {
"lastModified": 1600791342,
"narHash": "sha256-rHcPneff0ktF2Jhmh8kd+NqP1SaHa6uU2YJx1kyG1qQ=",
"owner": "NixOS",
"repo": "nixpkgs-channels",
"rev": "6ec10fc77e56b9f848930f129833cfbbac736e4f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-20.03",
"repo": "nixpkgs-channels",
"type": "github"
}
},
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1600942119, "lastModified": 1600942119,
@ -184,7 +157,9 @@
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"gitignore-nix-src": "gitignore-nix-src", "gitignore-nix-src": "gitignore-nix-src",
"hindent-src": "hindent-src", "hindent-src": "hindent-src",
"nixpkgs": "nixpkgs_3" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1600939022, "lastModified": 1600939022,
@ -205,7 +180,7 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"nur": "nur", "nur": "nur",
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
} }

10
flake.nix
View file

@ -3,13 +3,19 @@
inputs.flake-utils.url = "github:numtide/flake-utils"; inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.home-manager.url = "github:nix-community/home-manager/master"; inputs.home-manager = {
url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs";
};
inputs.nur.url = "github:nix-community/NUR/master"; inputs.nur.url = "github:nix-community/NUR/master";
inputs.pre-commit-hooks.url = inputs.pre-commit-hooks = {
url =
# "github:Myhlamaeus/pre-commit-hooks.nix/feat/flake"; # "github:Myhlamaeus/pre-commit-hooks.nix/feat/flake";
"github:Myhlamaeus/pre-commit-hooks.nix/8d48a4cd434a6a6cc8f2603b50d2c0b2981a7c55"; "github:Myhlamaeus/pre-commit-hooks.nix/8d48a4cd434a6a6cc8f2603b50d2c0b2981a7c55";
inputs.nixpkgs.follows = "nixpkgs";
};
outputs = { self, nixpkgs, flake-utils, home-manager, nur, pre-commit-hooks }: outputs = { self, nixpkgs, flake-utils, home-manager, nur, pre-commit-hooks }:
let let