summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorquentin@aristote.fr <quentin@aristote.fr>2024-12-01 22:59:58 +0100
committerquentin@aristote.fr <quentin@aristote.fr>2024-12-01 23:28:59 +0100
commit2f994c161ab21a5b675f28cd25947908f8ce80ed (patch)
treef1d04e007a50ddef460287d2a4aef69ff12f6778
parent7082046cf78fd6a0bef7a968f7c751d45f9859a5 (diff)
upgrade to nixos 24.11
-rw-r--r--config/default.nix6
-rw-r--r--config/nix.nix8
-rw-r--r--flake.lock20
-rw-r--r--flake.nix2
4 files changed, 17 insertions, 19 deletions
diff --git a/config/default.nix b/config/default.nix
index 89444af..dd22e26 100644
--- a/config/default.nix
+++ b/config/default.nix
@@ -10,15 +10,11 @@
./users.nix
];
- # needed so that the server doesn't rebuild big packages
- # originally enabled in modulesPath + profiles/minimal.nix
- environment.noXlibs = false;
-
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
- system.stateVersion = "20.03"; # Did you read the comment?
+ system.stateVersion = "24.11"; # Did you read the comment?
}
diff --git a/config/nix.nix b/config/nix.nix
index d0b6ba2..dae9061 100644
--- a/config/nix.nix
+++ b/config/nix.nix
@@ -18,7 +18,9 @@
setFlakeRegistry = true;
};
- systemd.services.nixos-upgrade = {
+ systemd.services.nixos-upgrade = let
+ mkForce = lib.mkOverride 51;
+ in {
# restart at most once every hour
serviceConfig = {
Restart = "on-failure";
@@ -27,8 +29,8 @@
MemoryHigh = "1G";
MemoryMax = "1.5G";
};
- startLimitBurst = 1;
- startLimitIntervalSec = 3600;
+ startLimitBurst = mkForce 1;
+ startLimitIntervalSec = mkForce 3600;
preStart = lib.mkAfter ''
echo Dry-building...
drvs=$(${pkgs.nixos-rebuild}/bin/nixos-rebuild dry-build --flake /etc/nixos/ 2>&1 | grep '/nix/store')
diff --git a/flake.lock b/flake.lock
index 7dd7c78..c7bb7ea 100644
--- a/flake.lock
+++ b/flake.lock
@@ -41,11 +41,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
- "lastModified": 1730738729,
- "narHash": "sha256-p9upl+KnE26WCdk76KgikaBPPgmLR9u4OBx+C4xAq6E=",
+ "lastModified": 1725035720,
+ "narHash": "sha256-764uAk5btX4T2XQXgIi3J2duQbSqYYSVRWHAmJiepQE=",
"owner": "qaristote",
"repo": "info",
- "rev": "55d71faf6c7d49a2a3e40b5dc9b80a94bf71fa55",
+ "rev": "94398458e52445e9940aa3a3ede5c2e3821c0030",
"type": "github"
},
"original": {
@@ -500,11 +500,11 @@
"nur": "nur"
},
"locked": {
- "lastModified": 1730489304,
- "narHash": "sha256-C5E2rbwRKP6IBgMOE1wbSx4us48x013lNj8/42J3SJY=",
+ "lastModified": 1733090804,
+ "narHash": "sha256-SNHUon75+HwBGb+JtFh33zZja1jrMaYxOYJzOHBxHgc=",
"owner": "qaristote",
"repo": "my-nixpkgs",
- "rev": "2fcb411292b2bb2be84a65a4bb82b444d9856133",
+ "rev": "54ec124ae568dac37a11348ce45e6f21737ad556",
"type": "github"
},
"original": {
@@ -900,16 +900,16 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1730891215,
- "narHash": "sha256-i85DPrhDuvzgvIWCpJlbfM2UFtNYbapo20MtQXsvay4=",
+ "lastModified": 1732981179,
+ "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c128e44a249d6180740d0a979b6480d5b795c013",
+ "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "release-24.05",
+ "ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
diff --git a/flake.nix b/flake.nix
index 8388c1e..3c615eb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
inputs.nixpkgs.follows = "/nixpkgs";
};
my-nixpkgs.url = "github:qaristote/my-nixpkgs";
- nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
+ nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
};
outputs = {