Skip to content

Use determinate-specific input names #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
heywoodlh wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Use determinate-specific input names #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 8 additions & 7 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
description = "The purely functional package manager";

inputs.nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.2505";
inputs.determinate-nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.2505";

inputs.nixpkgs-regression.url = "github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2";
inputs.nixpkgs-23-11.url = "github:NixOS/nixpkgs/a62e6edd6d5e1fa0329b8653c801147986f8d446";
Expand All @@ -10,21 +10,21 @@
inputs.flake-parts.url = "https://flakehub.com/f/hercules-ci/flake-parts/0.1";
inputs.git-hooks-nix.url = "https://flakehub.com/f/cachix/git-hooks.nix/0.1.941";
# work around https://github.com/NixOS/nix/issues/7730
inputs.flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
inputs.git-hooks-nix.inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-parts.inputs.nixpkgs-lib.follows = "determinate-nixpkgs";
inputs.git-hooks-nix.inputs.nixpkgs.follows = "determinate-nixpkgs";
# work around 7730 and https://github.com/NixOS/nix/issues/7807
inputs.git-hooks-nix.inputs.gitignore.follows = "";

outputs =
inputs@{
self,
nixpkgs,
determinate-nixpkgs,
nixpkgs-regression,
...
}:

let
inherit (nixpkgs) lib;
inherit (determinate-nixpkgs) lib;

officialRelease = true;

Expand Down Expand Up @@ -94,7 +94,7 @@
crossSystem:
forAllStdenvs (
stdenv:
import nixpkgs {
import determinate-nixpkgs {
localSystem = {
inherit system;
};
Expand Down Expand Up @@ -314,6 +314,7 @@
system:
(import ./ci/gha/tests {
inherit system;
nixpkgs = determinate-nixpkgs;
pkgs = nixpkgsFor.${system}.native;
nixFlake = self;
}).topLevel
Expand Down Expand Up @@ -562,7 +563,7 @@

```console
nix repl> :lf NixOS/nix
nix-repl> ps = lib.makeComponents { pkgs = import inputs.nixpkgs { crossSystem = "riscv64-linux"; }; }
nix-repl> ps = lib.makeComponents { pkgs = import inputs.determinate-nixpkgs { crossSystem = "riscv64-linux"; }; }
nix-repl> ps
{
appendPatches = «lambda appendPatches @ ...»;
Expand Down
9 changes: 5 additions & 4 deletions packaging/hydra.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
officialRelease,
}:
let
inherit (inputs) nixpkgs nixpkgs-regression;
inherit (inputs) determinate-nixpkgs nixpkgs-regression;

installScriptFor =
tarballs:
Expand Down Expand Up @@ -167,7 +167,8 @@ rec {
# System tests.
tests =
import ../tests/nixos {
inherit lib nixpkgs;
inherit lib;
nixpkgs = determinate-nixpkgs;
pkgs = nixpkgsFor.x86_64-linux.native;
nixComponents = nixpkgsFor.x86_64-linux.native.nixComponents2;
inherit (self.inputs) nixpkgs-23-11;
Expand All @@ -193,7 +194,7 @@ rec {

nixpkgsLibTests = forAllSystems (
system:
import (nixpkgs + "/lib/tests/test-with-nix.nix") {
import (determinate-nixpkgs + "/lib/tests/test-with-nix.nix") {
lib = nixpkgsFor.${system}.native.lib;
nix = self.packages.${system}.nix-cli;
pkgs = nixpkgsFor.${system}.native;
Expand All @@ -203,7 +204,7 @@ rec {
nixpkgsLibTestsLazy = forAllSystems (
system:
lib.overrideDerivation
(import (nixpkgs + "/lib/tests/test-with-nix.nix") {
(import (determinate-nixpkgs + "/lib/tests/test-with-nix.nix") {
lib = nixpkgsFor.${system}.native.lib;
nix = self.packages.${system}.nix-cli;
pkgs = nixpkgsFor.${system}.native;
Expand Down