Skip to content

Commit 5f1def9

Browse files
committed
nix: Use nixpkgs from nix-phps
Otherwise, we need to make sure we always update nixpkgs to the same version as the one used by nix-phps, if we want to be able to use the cache. Flake lock file updates: • Removed input 'nixpkgs' • Removed input 'utils' • Removed input 'utils/systems'
1 parent 913d2f8 commit 5f1def9

File tree

2 files changed

+7
-59
lines changed

2 files changed

+7
-59
lines changed

flake.lock

Lines changed: 2 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,16 @@
88
flake = false;
99
};
1010

11-
# Repository with software packages.
12-
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
13-
14-
utils.url = "github:numtide/flake-utils";
15-
1611
# Package expression for old PHP versions.
1712
phps.url = "github:fossar/nix-phps";
1813
};
1914

20-
outputs = { self, flake-compat, nixpkgs, phps, utils }:
15+
outputs = { self, phps, ... }:
2116
let
17+
# nixpkgs is a repository with software packages and some utilities.
18+
# From simplicity, we inherit it from the phps flake.
19+
inherit (phps.inputs) nixpkgs utils;
20+
2221
# Configure the development shell here (e.g. for CI).
2322

2423
# By default, we use the default PHP version from Nixpkgs.

0 commit comments

Comments
 (0)