diff --git a/flake.lock b/flake.lock
index 85886b730f..13a8ffd3b4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -184,13 +184,13 @@
"type": "github"
}
},
- "nixpkgs_2": {
+ "nixpkgs-unstable": {
"locked": {
- "lastModified": 1682519441,
- "narHash": "sha256-Vsq/8NOtvW1AoC6shCBxRxZyMQ+LhvPuJT6ltbzuv+Y=",
+ "lastModified": 1682592683,
+ "narHash": "sha256-L2Y8rRlVzu5qA3CZqTMotuoj2EXrVbV52BB1nhEGsKE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "7a32a141db568abde9bc389845949dc2a454dfd3",
+ "rev": "468813060dc63db045cd9b47bc633292f2d08f9a",
"type": "github"
},
"original": {
@@ -200,6 +200,22 @@
"type": "github"
}
},
+ "nixpkgs_2": {
+ "locked": {
+ "lastModified": 1669833724,
+ "narHash": "sha256-/HEZNyGbnQecrgJnfE8d0WC5c1xuPSD2LUpB6YXlg4c=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "4d2b37a84fad1091b9de401eb450aae66f1a741e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "22.11",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
"pre-commit-hooks": {
"inputs": {
"flake-compat": [
@@ -233,6 +249,7 @@
"devenv": "devenv",
"fenix": "fenix",
"nixpkgs": "nixpkgs_2",
+ "nixpkgs-unstable": "nixpkgs-unstable",
"systems": "systems"
}
},
diff --git a/flake.nix b/flake.nix
index 91916d9abb..80f96deea8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,7 +46,8 @@
inputs = {
# Use the master/unstable branch of nixpkgs. The latest stable, 22.11,
# does not contain 'perl536Packages.NetAsyncHTTP', needed by Sytest.
- nixpkgs.url = "github:NixOS/nixpkgs/master";
+ nixpkgs.url = "github:NixOS/nixpkgs/22.11";
+ nixpkgs-unstable.url = "github:NixOS/nixpkgs/master";
# Output a development shell for x86_64/aarch64 Linux/Darwin (MacOS).
systems.url = "github:nix-systems/default";
# A development environment manager built on Nix. See https://devenv.sh.
@@ -62,13 +63,14 @@
};
};
- outputs = { self, nixpkgs, devenv, systems, ... } @ inputs:
+ outputs = { self, nixpkgs, nixpkgs-unstable, devenv, systems, ... } @ inputs:
let
forEachSystem = nixpkgs.lib.genAttrs (import systems);
in {
devShells = forEachSystem (system:
let
pkgs = nixpkgs.legacyPackages.${system};
+ pkgs-unstable = nixpkgs-unstable.legacyPackages.${system};
in {
# Everything is configured via devenv - a nix module for creating declarative
# developer environments. See https://devenv.sh/reference/options/ for a list
@@ -191,7 +193,7 @@
ModulePluggable
NetAsyncHTTP
MetricsAny # required by Net::Async::HTTP
- NetAsyncHTTPServer
+ pkgs-unstable.perl536Packages.NetAsyncHTTPServer
StructDumb
URI
YAMLLibYAML
|
