Noratrieb/vps
1
0
Fork 0
mirror of https://github.com/Noratrieb/vps.git synced 2026-03-14 13:16:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

update to nixos 25.11

Browse source
This commit is contained in:
nora 2026-02-14 20:37:31 +01:00
parent f2b1f2bc51
commit eebb543d99
5 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
nix/apps/does-it-build/default.nix
View file

@ -1,8 +1,7 @@
{ pkgs, nixpkgs-next, lib, config, my-projects-versions, ... }: { pkgs, lib, config, my-projects-versions, ... }:
let let
does-it-build-base = (import (pkgs.fetchFromGitHub my-projects-versions.does-it-build.fetchFromGitHub)) { does-it-build-base = (import (pkgs.fetchFromGitHub my-projects-versions.does-it-build.fetchFromGitHub)) {
# needs a recent rust version. inherit pkgs;
pkgs = nixpkgs-next;
}; };
does-it-build = does-it-build-base.overrideAttrs (finalAttrs: previousAttrs: { does-it-build = does-it-build-base.overrideAttrs (finalAttrs: previousAttrs: {
DOES_IT_BUILD_OVERRIDE_VERSION = my-projects-versions.does-it-build.commit; DOES_IT_BUILD_OVERRIDE_VERSION = my-projects-versions.does-it-build.commit;

4
nix/hive.nix
View file

@ -2,8 +2,7 @@
meta = meta =
let let
nixpkgs-version = builtins.fromJSON (builtins.readFile ./nixpkgs.json); nixpkgs-version = builtins.fromJSON (builtins.readFile ./nixpkgs.json);
nixpkgs-path = (fetchTarball "https://github.com/NixOS/nixpkgs/archive/${nixpkgs-version."nixos-25.05".commit}.tar.gz"); nixpkgs-path = (fetchTarball "https://github.com/NixOS/nixpkgs/archive/${nixpkgs-version."nixos-25.11".commit}.tar.gz");
nixpkgs-next = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/${nixpkgs-version."nixos-25.11".commit}.tar.gz") { };
in in
{ {
# Override to pin the Nixpkgs version (recommended). This option # Override to pin the Nixpkgs version (recommended). This option
@ -16,7 +15,6 @@
specialArgs = { specialArgs = {
my-projects-versions = builtins.fromJSON (builtins.readFile ./my-projects.json); my-projects-versions = builtins.fromJSON (builtins.readFile ./my-projects.json);
inherit nixpkgs-next;
inherit nixpkgs-path; inherit nixpkgs-path;
networkingConfig = { networkingConfig = {

2
nix/modules/caddy/default.nix
View file

@ -6,7 +6,7 @@ let
"github.com/noratrieb-mirrors/certmagic-s3@v1.1.3" "github.com/noratrieb-mirrors/certmagic-s3@v1.1.3"
"github.com/sagikazarmark/caddy-fs-s3@v0.10.0" "github.com/sagikazarmark/caddy-fs-s3@v0.10.0"
]; ];
hash = "sha256-aZnF6dMCOfQufDhABS4ggfB0gkhDVYpdn2f60oqqKI8="; hash = "sha256-ERccS8hBcjttV92MgJkgLBNY1RWRztYujby80MH52Xo=";
}; };
in in
{ {

2
nix/modules/garage/default.nix
View file

@ -20,7 +20,7 @@ in
}; };
services.garage = { services.garage = {
enable = true; enable = true;
package = pkgs.garage_2_1_0; package = pkgs.garage_2;
settings = { settings = {
metadata_dir = "/var/lib/garage/meta"; metadata_dir = "/var/lib/garage/meta";
data_dir = "/var/lib/garage/data"; data_dir = "/var/lib/garage/data";

4
nix/nixpkgs.json
View file

@ -1,8 +1,4 @@
{ {
"nixos-25.05": {
"lastUpdated": "2026-01-31T13:55:04.757Z",
"commit": "ac62194c3917d5f474c1a844b6fd6da2db95077d"
},
"nixos-25.11": { "nixos-25.11": {
"lastUpdated": "2026-02-14T15:07:37.351Z", "lastUpdated": "2026-02-14T15:07:37.351Z",
"commit": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a" "commit": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a"