wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-10 04:43:53 +02:00
Code Activity

Remove old build system

Browse source
This commit is contained in:
John Ericson 2024-10-17 15:38:05 -04:00
parent 71c2e21f3b
commit e70c9bb06a
76 changed files with 9 additions and 4639 deletions
Download patch file Download diff file Expand all files Collapse all files

8
packaging/components.nix
View file

@ -25,11 +25,6 @@ in
version = baseVersion + versionSuffix;
inherit versionSuffix;
nix = callPackage ../package.nix {
version = fineVersion;
versionSuffix = fineVersionSuffix;
};
nix-util = callPackage ../src/libutil/package.nix { };
nix-util-c = callPackage ../src/libutil-c/package.nix { };
nix-util-test-support = callPackage ../src/libutil-test-support/package.nix { };
@ -66,6 +61,5 @@ in
nix-perl-bindings = callPackage ../src/perl/package.nix { };
# Will replace `nix` once the old build system is gone.
nix-ng = callPackage ../packaging/everything.nix { };
nix-everything = callPackage ../packaging/everything.nix { };
}

2
packaging/dev-shell.nix
View file

@ -2,7 +2,7 @@
{ pkgs }:
(pkgs.nix.override { forDevShell = true; }).overrideAttrs (attrs:
pkgs.nixComponents.nix-util.overrideAttrs (attrs:
let
stdenv = pkgs.nixDependencies.stdenv;

5
packaging/hydra.nix
View file

@ -32,7 +32,7 @@ let
# convention to transpose it, and to transpose it efficiently, we need to
# enumerate them manually, so that we don't evaluate unnecessary package sets.
forAllPackages = lib.genAttrs [
"nix"
"nix-everything"
"nix-util"
"nix-util-c"
"nix-util-test-support"
@ -54,7 +54,6 @@ let
"nix-cmd"
"nix-cli"
"nix-functional-tests"
"nix-ng"
];
in
{
@ -180,7 +179,7 @@ in
import (nixpkgs + "/lib/tests/test-with-nix.nix")
{
lib = nixpkgsFor.${system}.native.lib;
nix = self.packages.${system}.nix;
nix = self.packages.${system}.nix-cli;
pkgs = nixpkgsFor.${system}.native;
}
);