Armael/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

upgrade to nixos 24.11

Browse source
This commit is contained in:
root 2024-12-04 22:32:19 +01:00
parent ac4ba79809
commit 3715d7e8e5
3 changed files with 35 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
flake.lock generated
View file

@ -42,27 +42,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1720553833, "lastModified": 1733261153,
"narHash": "sha256-IXMiHQMtdShDXcBW95ctA+m5Oq2kLxnBt7WlMxvDQXA=", "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "249fbde2a178a2ea2638b65b9ecebd531b338cf9", "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.05", "ref": "nixos-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1720657034, "lastModified": 1733097829,
"narHash": "sha256-nPhbeFdyN8yn+EXmnPcBWisoypndtQbNIhSKmAinv3E=", "narHash": "sha256-9hbb1rqGelllb4kVUCZ307G2k3/UhmA8PPGBoyuWaSw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "212defe037698e18fc9521dfe451779a8979844c", "rev": "2c15aa59df0017ca140d9ba302412298ab4bf22a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -73,6 +73,22 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1733097829,
"narHash": "sha256-9hbb1rqGelllb4kVUCZ307G2k3/UhmA8PPGBoyuWaSw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2c15aa59df0017ca140d9ba302412298ab4bf22a",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2c15aa59df0017ca140d9ba302412298ab4bf22a",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1718419000, "lastModified": 1718419000,
"narHash": "sha256-v4+aJpRDbJil691DXo5SydqowcB01B6E9+wFH/pNk6k=", "narHash": "sha256-v4+aJpRDbJil691DXo5SydqowcB01B6E9+wFH/pNk6k=",
@ -90,21 +106,20 @@
}, },
"paste-py": { "paste-py": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": "nixpkgs_2",
"nixpkgs"
],
"poetry2nix": "poetry2nix" "poetry2nix": "poetry2nix"
}, },
"locked": { "locked": {
"lastModified": 1718472648, "lastModified": 1733345422,
"narHash": "sha256-eugtFG0Z2uycs29m9XsezGoE7xBWYD7EaysDH4+RMz4=", "narHash": "sha256-wVnHQo9BvDmvADq6nnMoDuHQOXhTUVJgEIbwZXge8JI=",
"rev": "fd4b051067a09b1f76df5516514330e0d53398f7", "ref": "refs/heads/pastisserie",
"revCount": 126, "rev": "27a639f5aaf970b1ccfc1657541abed7a874aea3",
"revCount": 127,
"type": "git", "type": "git",
"url": "https://github.com/Armael/paste-py" "url": "https://github.com/Armael/paste-py"
}, },
"original": { "original": {
"rev": "fd4b051067a09b1f76df5516514330e0d53398f7", "rev": "27a639f5aaf970b1ccfc1657541abed7a874aea3",
"type": "git", "type": "git",
"url": "https://github.com/Armael/paste-py" "url": "https://github.com/Armael/paste-py"
} }
@ -113,7 +128,7 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nix-github-actions": "nix-github-actions", "nix-github-actions": "nix-github-actions",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_3",
"systems": "systems_2", "systems": "systems_2",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },

6
flake.nix
View file

@ -1,8 +1,8 @@
{ {
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
inputs.paste-py.url = "git+https://github.com/Armael/paste-py?rev=fd4b051067a09b1f76df5516514330e0d53398f7"; inputs.paste-py.url = "git+https://github.com/Armael/paste-py?rev=27a639f5aaf970b1ccfc1657541abed7a874aea3";
inputs.paste-py.inputs.nixpkgs.follows = "nixpkgs"; # inputs.paste-py.inputs.nixpkgs.follows = "nixpkgs";
outputs = { self, nixpkgs, ... }@inputs: { outputs = { self, nixpkgs, ... }@inputs: {
nixosConfigurations."oven" = nixpkgs.lib.nixosSystem { nixosConfigurations."oven" = nixpkgs.lib.nixosSystem {

5
pastila/configuration.nix
View file

@ -36,9 +36,6 @@ in
boot.loader.grub.enable = true; boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/vda"; boot.loader.grub.device = "/dev/vda";
# use the latest kernel compatible with zfs
boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
# setup automatic snapshots (~short term: retain no more than 1 month) # setup automatic snapshots (~short term: retain no more than 1 month)
services.zfs.autoSnapshot = { services.zfs.autoSnapshot = {
enable = true; enable = true;
@ -80,7 +77,7 @@ in
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
irssi irssi
weechat weechat
transmission transmission_3
tremc tremc
unstable.poezio unstable.poezio
]; ];