diff options
| author | Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> | 2023-11-08 06:15:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-08 06:15:46 +0000 |
| commit | ba2ed469c261928415e1121f26bfe96ebbed8a33 (patch) | |
| tree | 806254c8497062bce2f1d43b4602002290a4ae1a /pkgs/applications/science | |
| parent | 4c234ceeb61f6d111bb1db30376cdb4019e56142 (diff) | |
| parent | 3db5de3ba9909bc8631fe6808638099a5cad0a49 (diff) | |
| download | nixpkgs-ba2ed469c261928415e1121f26bfe96ebbed8a33.tar nixpkgs-ba2ed469c261928415e1121f26bfe96ebbed8a33.tar.gz nixpkgs-ba2ed469c261928415e1121f26bfe96ebbed8a33.tar.bz2 nixpkgs-ba2ed469c261928415e1121f26bfe96ebbed8a33.tar.lz nixpkgs-ba2ed469c261928415e1121f26bfe96ebbed8a33.tar.xz nixpkgs-ba2ed469c261928415e1121f26bfe96ebbed8a33.tar.zst nixpkgs-ba2ed469c261928415e1121f26bfe96ebbed8a33.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/biology/last/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/biology/quast/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/z3/default.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index 8ec08f22b7d..7cf1560d249 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1471"; + version = "1499"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = "refs/tags/${version}"; - hash = "sha256-HQ2C7SFfJS6TOJZUm6szhu+hMm41BnH8A7DZE5yh9fM="; + hash = "sha256-uofXtGGDloM1FxW0PYKKwfDOPlAJiapGVKwd1clFzp8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/quast/default.nix b/pkgs/applications/science/biology/quast/default.nix index e5ee4b53089..f280f81fae8 100644 --- a/pkgs/applications/science/biology/quast/default.nix +++ b/pkgs/applications/science/biology/quast/default.nix @@ -27,7 +27,7 @@ pythonPackages.buildPythonApplication rec { --replace "/bin/bash" "${bash}/bin/bash" mkdir -p "$out/${python.sitePackages}" export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" - ${python.pythonForBuild.interpreter} setup.py install \ + ${python.pythonOnBuildForHost.interpreter} setup.py install \ --install-lib=$out/${python.sitePackages} \ --prefix="$out" ''; diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 9fe39c8cef8..6165cfe8bd2 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -47,7 +47,7 @@ let common = { version, sha256, patches ? [ ], tag ? "z3" }: configurePhase = concatStringsSep " " ( - [ "${python.pythonForBuild.interpreter} scripts/mk_make.py --prefix=$out" ] + [ "${python.pythonOnBuildForHost.interpreter} scripts/mk_make.py --prefix=$out" ] ++ optional javaBindings "--java" ++ optional ocamlBindings "--ml" ++ optional pythonBindings "--python --pypkgdir=$out/${python.sitePackages}" |