diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2018-08-03 19:33:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-03 19:33:12 +0200 |
| commit | f0612719388c216f908225c97b00e55c681076db (patch) | |
| tree | a2b4f1e65106fe18523c32d03a15822c945c0e88 | |
| parent | 82bce290f5133d05a0c3ef5eb9ae45f5030a0d89 (diff) | |
| parent | ae3bbf2958ff72cad357074eb24ccc18afab21c3 (diff) | |
| download | nixpkgs-f0612719388c216f908225c97b00e55c681076db.tar nixpkgs-f0612719388c216f908225c97b00e55c681076db.tar.gz nixpkgs-f0612719388c216f908225c97b00e55c681076db.tar.bz2 nixpkgs-f0612719388c216f908225c97b00e55c681076db.tar.lz nixpkgs-f0612719388c216f908225c97b00e55c681076db.tar.xz nixpkgs-f0612719388c216f908225c97b00e55c681076db.tar.zst nixpkgs-f0612719388c216f908225c97b00e55c681076db.zip | |
Merge pull request #44411 from dotlambda/almonds-python3
almonds: use python3
| -rw-r--r-- | pkgs/applications/science/math/almonds/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/science/math/almonds/default.nix b/pkgs/applications/science/math/almonds/default.nix index fb76699b0c8..96613f4e38a 100644 --- a/pkgs/applications/science/math/almonds/default.nix +++ b/pkgs/applications/science/math/almonds/default.nix @@ -1,11 +1,9 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, ncurses, pillow, pytest }: +{ stdenv, python3, fetchFromGitHub, ncurses }: -let +with python3.pkgs; buildPythonApplication rec { + pname = "almonds"; version = "1.25b"; -in -buildPythonApplication { - name = "almonds-${version}"; src = fetchFromGitHub { owner = "Tenchi2xh"; repo = "Almonds"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cfebcc1322c..364278687a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20466,7 +20466,7 @@ with pkgs; ### SCIENCE/MATH - almonds = pythonPackages.callPackage ../applications/science/math/almonds { }; + almonds = callPackage ../applications/science/math/almonds { }; arpack = callPackage ../development/libraries/science/math/arpack { }; |