Compare commits

...

2 Commits

Author SHA1 Message Date
Robert Hensing
97bd6ebfed Add hydraJobs.tests.nix-serve 2024-09-18 18:32:46 +02:00
Robert Hensing
cf5592c66a TMP: flake: Update nixpkgs to release-24.05 (3a458f7, 2024-09-18)
This includes https://github.com/NixOS/nixpkgs/pull/342817

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/c3d4ac725177c030b1e289015989da2ad9d56af0' (2024-08-15)
  → 'github:NixOS/nixpkgs/3a458f7c763ca62c6bf454b8d828bd86b7250671' (2024-09-18)
2024-09-18 18:24:35 +02:00
5 changed files with 26 additions and 5 deletions

8
flake.lock generated
View File

@@ -80,16 +80,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1723688146,
"narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=",
"lastModified": 1726674819,
"narHash": "sha256-qyfnYJsZq8cBBat6oGjHnu5MaWbNw47Ph31fX0iWPIU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c3d4ac725177c030b1e289015989da2ad9d56af0",
"rev": "3a458f7c763ca62c6bf454b8d828bd86b7250671",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"ref": "release-24.05",
"repo": "nixpkgs",
"type": "github"
}

View File

@@ -1,7 +1,7 @@
{
description = "The purely functional package manager";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
inputs.nixpkgs-regression.url = "github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2";
inputs.nixpkgs-23-11.url = "github:NixOS/nixpkgs/a62e6edd6d5e1fa0329b8653c801147986f8d446";
inputs.flake-compat = { url = "github:edolstra/flake-compat"; flake = false; };
@@ -139,6 +139,12 @@
nix = final.nixComponents.nix;
nix-serve =
prev.nix-serve.override {
# undo potential version pinning
nix = final.nix;
};
# See https://github.com/NixOS/nixpkgs/pull/214409
# Remove when fixed in this flake's nixpkgs
pre-commit =

View File

@@ -27,6 +27,7 @@
, mdbook
, mdbook-linkcheck
, mercurial
, nix-perl-bindings
, openssh
, openssl
, pkg-config
@@ -334,6 +335,10 @@ in {
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
passthru = lib.optionalAttrs (stdenv.buildPlatform.canExecute stdenv.hostPlatform) {
perl-bindings = nix-perl-bindings;
};
meta = {
platforms = lib.platforms.unix ++ lib.platforms.windows;
mainProgram = "nix";

View File

@@ -122,5 +122,8 @@
nix-main-c
;
};
}
// lib.optionalAttrs (stdenv.buildPlatform.canExecute stdenv.hostPlatform) {
perl-bindings = nix-perl-bindings;
};
})

View File

@@ -160,3 +160,10 @@ in
cgroups = runNixOSTestFor "x86_64-linux" ./cgroups;
}
// (let
inherit (nixpkgsFor."x86_64-linux".native) nixosTests;
in {
nix-serve =
assert nixosTests.nix-serve.config.nodes.machine.services.nix-serve.package.nix == self.packages.x86_64-linux.nix;
nixosTests.nix-serve;
})