Skip to content

Commit

Permalink
Merge pull request #250885 from tweag/spp-1a
Browse files Browse the repository at this point in the history
[RFC 140] Simple package paths, part 1a: Checking tool
  • Loading branch information
infinisil committed Aug 29, 2023
2 parents cbb59a1 + 34c8b0a commit f616ad7
Show file tree
Hide file tree
Showing 104 changed files with 1,627 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@
/pkgs/build-support/setup-hooks/auto-patchelf.py @layus
/pkgs/pkgs-lib @infinisil

# pkgs/by-name
/pkgs/test/nixpkgs-check-by-name @infinisil

# Nixpkgs build-support
/pkgs/build-support/writers @lassulus @Profpatsch

Expand Down
5 changes: 5 additions & 0 deletions nixos/release-combined.nix
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,11 @@ in rec {
(onFullSupported "nixpkgs.emacs")
(onFullSupported "nixpkgs.jdk")
["nixpkgs.tarball"]

# Ensure that nixpkgs-check-by-name is available in all release channels and nixos-unstable,
# so that a pre-built version can be used in CI for PR's on the corresponding development branches.
# See ../pkgs/test/nixpkgs-check-by-name/README.md
(onSystems ["x86_64-linux"] "nixpkgs.tests.nixpkgs-check-by-name")
];
};
}
2 changes: 2 additions & 0 deletions pkgs/test/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,6 @@ with pkgs;
};

pkgs-lib = recurseIntoAttrs (import ../pkgs-lib/tests { inherit pkgs; });

nixpkgs-check-by-name = callPackage ./nixpkgs-check-by-name { };
}
1 change: 1 addition & 0 deletions pkgs/test/nixpkgs-check-by-name/.envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
use nix
2 changes: 2 additions & 0 deletions pkgs/test/nixpkgs-check-by-name/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
target
.direnv
Loading

0 comments on commit f616ad7

Please sign in to comment.