qenya/nixfiles
1
0
Fork 0
Code Issues 5 Pull requests Actions Activity

flake.nix: rationalise nixpkgs versions

Browse source
This commit is contained in:
Katherina Walshe-Grey 2024-09-26 13:40:33 +01:00
parent 3fc692f0c2
commit 309e44aa8a
2 changed files with 80 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
flake.lock
View file

@ -2,7 +2,9 @@
"nodes": { "nodes": {
"actual": { "actual": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": [
"nixpkgs-unstable"
]
}, },
"locked": { "locked": {
"lastModified": 1725392458, "lastModified": 1725392458,
@ -133,6 +135,26 @@
"type": "github" "type": "github"
} }
}, },
"home-manager-unstable": {
"inputs": {
"nixpkgs": [
"nixpkgs-unstable"
]
},
"locked": {
"lastModified": 1727346017,
"narHash": "sha256-z7OCFXXxIseJhEHiCkkUOkYxD9jtLU8Kf5Q9WC0SjJ8=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c124568e1054a62c20fbe036155cc99237633327",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"home-manager_2": { "home-manager_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -156,21 +178,21 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1725103162, "lastModified": 1727264057,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "rev": "759537f06e6999e141588ff1c9be7f3a5c060106",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgsSmall": { "nixpkgs-small": {
"locked": { "locked": {
"lastModified": 1727284797, "lastModified": 1727284797,
"narHash": "sha256-roj2jFZ/VNBQBBmUvvYRGiWbegZEgRk9Y1dhcY8kgLA=", "narHash": "sha256-roj2jFZ/VNBQBBmUvvYRGiWbegZEgRk9Y1dhcY8kgLA=",
@ -186,18 +208,34 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1727264057, "lastModified": 1727122398,
"narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=", "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "759537f06e6999e141588ff1c9be7f3a5c060106", "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.05", "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable-small": {
"locked": {
"lastModified": 1727320268,
"narHash": "sha256-B4AK91+9frHerQ6mFAtaR46ECMRtZufrtXFj/b5NqYU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ea2838e1ce0a9da2abf88275843aca29d9f82b30",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable-small",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -220,10 +258,10 @@
"plasma-manager": { "plasma-manager": {
"inputs": { "inputs": {
"home-manager": [ "home-manager": [
"home-manager" "home-manager-unstable"
], ],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs-unstable"
] ]
}, },
"locked": { "locked": {
@ -263,8 +301,11 @@
"birdsong": "birdsong", "birdsong": "birdsong",
"colmena": "colmena", "colmena": "colmena",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_2", "home-manager-unstable": "home-manager-unstable",
"nixpkgsSmall": "nixpkgsSmall", "nixpkgs": "nixpkgs",
"nixpkgs-small": "nixpkgs-small",
"nixpkgs-unstable": "nixpkgs-unstable",
"nixpkgs-unstable-small": "nixpkgs-unstable-small",
"nur": "nur", "nur": "nur",
"plasma-manager": "plasma-manager", "plasma-manager": "plasma-manager",
"randomcat": "randomcat" "randomcat": "randomcat"

35
flake.nix
View file

@ -1,20 +1,27 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs-small.url = "github:NixOS/nixpkgs/nixos-24.05-small";
nixpkgsSmall.url = "github:NixOS/nixpkgs/nixos-24.05-small"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-unstable-small.url = "github:NixOS/nixpkgs/nixos-unstable-small";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.05"; url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
plasma-manager = { home-manager-unstable = {
url = "github:nix-community/plasma-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs-unstable";
inputs.home-manager.follows = "home-manager";
}; };
plasma-manager = {
url = "github:nix-community/plasma-manager";
inputs.nixpkgs.follows = "nixpkgs-unstable";
inputs.home-manager.follows = "home-manager-unstable";
};
# TODO: remove dependency on NUR (#16)
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
agenix = { agenix = {
@ -33,11 +40,17 @@
flake = false; flake = false;
}; };
actual.url = "git+https://git.xeno.science/xenofem/actual-nix?ref=main"; # Third-party flake providing package and NixOS module for Actual Budget as
# nixpkgs are having trouble: https://github.com/NixOS/nixpkgs/issues/269069
actual = {
url = "git+https://git.xeno.science/xenofem/actual-nix?ref=main";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
birdsong.url = "git+https://git.qenya.tel/qenya/birdsong?ref=main"; birdsong.url = "git+https://git.qenya.tel/qenya/birdsong?ref=main";
}; };
outputs = inputs@{ self, nixpkgs, nixpkgsSmall, home-manager, plasma-manager, nur, agenix, colmena, randomcat, actual, birdsong, ... }: { outputs = inputs@{ self, nixpkgs, nixpkgs-small, home-manager, plasma-manager, nur, agenix, colmena, randomcat, actual, birdsong, ... }: {
nixosConfigurations = (colmena.lib.makeHive self.outputs.colmena).nodes; nixosConfigurations = (colmena.lib.makeHive self.outputs.colmena).nodes;
# The name of this output type is not standardised. I have picked # The name of this output type is not standardised. I have picked
@ -61,9 +74,9 @@
nodeNixpkgs = { nodeNixpkgs = {
kilgharrah = import nixpkgs { system = "x86_64-linux"; }; kilgharrah = import nixpkgs { system = "x86_64-linux"; };
tohru = import nixpkgs { system = "x86_64-linux"; }; tohru = import nixpkgs { system = "x86_64-linux"; };
yevaud = import nixpkgsSmall { system = "x86_64-linux"; }; yevaud = import nixpkgs-small { system = "x86_64-linux"; };
orm = import nixpkgsSmall { system = "x86_64-linux"; }; orm = import nixpkgs-small { system = "x86_64-linux"; };
kalessin = import nixpkgsSmall { system = "aarch64-linux"; }; kalessin = import nixpkgs-small { system = "aarch64-linux"; };
}; };
specialArgs = { inherit self; }; specialArgs = { inherit self; };
}; };