diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
| commit | 5423cabbbf2b6dec5568f1ecabd288d5d9a642ec (patch) | |
| tree | f316a6a921bfefd3a63bd4502c2eb50ff1644f67 /nixpkgs/pkgs/test | |
| parent | 46a88117a05c3469af5d99433af140c3de8ca088 (diff) | |
| parent | 8aa81f34981add12aecada6c702ddbbd0375ca36 (diff) | |
| download | nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.gz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.bz2 nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.lz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.xz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.zst nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/test')
| -rw-r--r-- | nixpkgs/pkgs/test/default.nix | 1 | ||||
| -rw-r--r-- | nixpkgs/pkgs/test/haskell/shellFor/default.nix | 8 | ||||
| -rw-r--r-- | nixpkgs/pkgs/test/nixpkgs-check-by-name/.envrc | 6 | ||||
| -rw-r--r-- | nixpkgs/pkgs/test/nixpkgs-check-by-name/scripts/pinned-tool.json | 4 |
4 files changed, 7 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/test/default.nix b/nixpkgs/pkgs/test/default.nix index 9868bbc6033b..3fcc9d047db9 100644 --- a/nixpkgs/pkgs/test/default.nix +++ b/nixpkgs/pkgs/test/default.nix @@ -17,6 +17,7 @@ with pkgs; (filter (n: n != "llvmPackages_7")) (filter (n: n != "llvmPackages_8")) (filter (n: n != "llvmPackages_10")) + (filter (n: n != "llvmPackages_11")) ]; tests = lib.genAttrs pkgSets (name: recurseIntoAttrs { clang = callPackage ./cc-wrapper { stdenv = pkgs.${name}.stdenv; }; diff --git a/nixpkgs/pkgs/test/haskell/shellFor/default.nix b/nixpkgs/pkgs/test/haskell/shellFor/default.nix index 83daf079cc0f..82cd9e38e731 100644 --- a/nixpkgs/pkgs/test/haskell/shellFor/default.nix +++ b/nixpkgs/pkgs/test/haskell/shellFor/default.nix @@ -1,7 +1,7 @@ { lib, writeText, haskellPackages, cabal-install }: (haskellPackages.shellFor { - packages = p: [ p.constraints p.linear ]; + packages = p: [ p.constraints p.cereal ]; # WARNING: When updating this, make sure that the libraries passed to # `extraDependencies` are not actually transitive dependencies of libraries in # `packages` above. We explicitly want to test that it is possible to specify @@ -14,8 +14,8 @@ mkdir -p "$sourceRoot" cd "$sourceRoot" tar -xf ${haskellPackages.constraints.src} - tar -xf ${haskellPackages.linear.src} - cp ${writeText "cabal.project" "packages: constraints* linear*"} cabal.project + tar -xf ${haskellPackages.cereal.src} + cp ${writeText "cabal.project" "packages: constraints* cereal*"} cabal.project ''; buildPhase = '' export HOME=$(mktemp -d) @@ -37,7 +37,7 @@ fi # Check packages arg - cabal v2-build --offline --verbose constraints linear --ghc-options="-O0 -j$NIX_BUILD_CORES" + cabal v2-build --offline --verbose constraints cereal --ghc-options="-O0 -j$NIX_BUILD_CORES" ''; installPhase = '' touch $out diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/.envrc b/nixpkgs/pkgs/test/nixpkgs-check-by-name/.envrc index 4555ccf0921f..1d953f4bd735 100644 --- a/nixpkgs/pkgs/test/nixpkgs-check-by-name/.envrc +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/.envrc @@ -1,7 +1 @@ -if has nix_direnv_watch_file; then - nix_direnv_watch_file default.nix shell.nix -else - watch_file default.nix shell.nix -fi - use nix diff --git a/nixpkgs/pkgs/test/nixpkgs-check-by-name/scripts/pinned-tool.json b/nixpkgs/pkgs/test/nixpkgs-check-by-name/scripts/pinned-tool.json index e20a11baadaf..350e71bffc79 100644 --- a/nixpkgs/pkgs/test/nixpkgs-check-by-name/scripts/pinned-tool.json +++ b/nixpkgs/pkgs/test/nixpkgs-check-by-name/scripts/pinned-tool.json @@ -1,4 +1,4 @@ { - "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0", - "ci-path": "/nix/store/5fjdmbiziyp47gfc9kmfgvxdlzd6bba1-nixpkgs-check-by-name" + "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", + "ci-path": "/nix/store/w6w7khwfq6qzm4bsyijhg7m2kqv9f9jl-nixpkgs-check-by-name" } |