Compare commits
2 Commits
master
...
e630aefe92
| Author | SHA1 | Date | |
|---|---|---|---|
|
e630aefe92
|
|||
|
e8b1503cc0
|
@@ -49,6 +49,11 @@ let
|
||||
wxparaver = callPackage ./pkgs/paraver/default.nix { };
|
||||
};
|
||||
|
||||
allPkgs = collect isDerivation bscPkgs;
|
||||
|
||||
mkStrict = pkg: if pkg ? overrideAttrs then pkg.overrideAttrs { strictDeps = true; } else pkg;
|
||||
strictPkgs = map mkStrict allPkgs;
|
||||
|
||||
in bscPkgs // {
|
||||
# Prevent accidental usage of bsc attribute
|
||||
bsc = throw "the bsc attribute is deprecated, packages are now in the root";
|
||||
@@ -89,7 +94,7 @@ in bscPkgs // {
|
||||
};
|
||||
|
||||
pkgs = final.runCommand "ci-pkgs" { }
|
||||
"printf '%s\n' ${toString (collect isDerivation bscPkgs)} > $out";
|
||||
"printf '%s\n' ${toString strictPkgs} > $out";
|
||||
|
||||
tests = final.runCommand "ci-tests" { }
|
||||
"printf '%s\n' ${toString (collect isDerivation final.bsc-ci.test)} > $out";
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "bigotes";
|
||||
version = "9dce13";
|
||||
src = fetchFromGitHub {
|
||||
@@ -13,5 +13,5 @@ stdenv.mkDerivation rec {
|
||||
rev = "9dce13446a8da30bea552d569d260d54e0188518";
|
||||
sha256 = "sha256-ktxM3pXiL8YXSK+/IKWYadijhYXqGoLY6adLk36iigE=";
|
||||
};
|
||||
buildInputs = [ cmake ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user