diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-07 00:09:37 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-07 00:09:37 +0200 |
commit | a85dcf4a00c1ac354eda3b84209b8fa6b2133259 (patch) | |
tree | 16bbf46e3cd5d7ea259783ee8b1ea8d5c7048e0d /pkgs/applications/science/math | |
parent | 4b2ce84872a0903b9800d3ed23915f48ecedc565 (diff) | |
parent | 46a9e805efeee40d360605fa5987866ca45fed23 (diff) | |
download | nixlib-a85dcf4a00c1ac354eda3b84209b8fa6b2133259.tar nixlib-a85dcf4a00c1ac354eda3b84209b8fa6b2133259.tar.gz nixlib-a85dcf4a00c1ac354eda3b84209b8fa6b2133259.tar.bz2 nixlib-a85dcf4a00c1ac354eda3b84209b8fa6b2133259.tar.lz nixlib-a85dcf4a00c1ac354eda3b84209b8fa6b2133259.tar.xz nixlib-a85dcf4a00c1ac354eda3b84209b8fa6b2133259.tar.zst nixlib-a85dcf4a00c1ac354eda3b84209b8fa6b2133259.zip |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/development/libraries/libav/default.nix pkgs/shells/bash/bash-4.2-patches.nix pkgs/stdenv/generic/default.nix
Diffstat (limited to 'pkgs/applications/science/math')
-rw-r--r-- | pkgs/applications/science/math/pari/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/math/pcalc/default.nix | 26 | ||||
-rw-r--r-- | pkgs/applications/science/math/sloane/default.nix | 6 |
3 files changed, 31 insertions, 5 deletions
diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index e59bb9fe666a..2bd1aa893c55 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, gmp, readline }: stdenv.mkDerivation rec { - version = "2.7.1"; + version = "2.7.2"; name = "pari-${version}"; src = fetchurl { url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; - sha256 = "1gj1rddi22hinzwy7r6hljgbi252wwwyd6gapg4hvcn0ycc7jqyc"; + sha256 = "1b0hzyhafpxhmiljyhnsh6c27ydsvb2599fshwq2fjfm96awjxmc"; }; buildInputs = [gmp readline]; diff --git a/pkgs/applications/science/math/pcalc/default.nix b/pkgs/applications/science/math/pcalc/default.nix new file mode 100644 index 000000000000..8e68e455ef18 --- /dev/null +++ b/pkgs/applications/science/math/pcalc/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchgit, bison2, flex }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "pcalc-${version}"; + version = "20120812"; + + src = fetchgit { + url = git://git.code.sf.net/p/pcalc/code; + rev = "db5c5d587d4d24ff6b23405a92eeaad4c0f99618"; + sha256 = "1bzmiz9rrss3xk0vzszbisjkph73zwgc0riqn9zdd2h1iv6dgq92"; + }; + + makeFlags = [ "DESTDIR= BINDIR=$(out)/bin" ]; + buildInputs = [ bison2 flex ]; + + meta = { + homepage = http://pcalc.sourceforge.net/; + description = "Programmer's calculator"; + license = licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ ftrvxmtrx ]; + platforms = stdenv.lib.platforms.linux; + inherit version; + }; +} diff --git a/pkgs/applications/science/math/sloane/default.nix b/pkgs/applications/science/math/sloane/default.nix index b3bde7874cab..644ec3be5693 100644 --- a/pkgs/applications/science/math/sloane/default.nix +++ b/pkgs/applications/science/math/sloane/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "sloane"; - version = "1.9.1"; - sha256 = "0scnvir7il8ldy3g846xmrdkk2rxnlsiyqak0jvcarf2qi251x5i"; + version = "1.9.3"; + sha256 = "0xl3dmi6czwfbi17742hqxf3d6sl9dci08qszrkdmasnvivakg78"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -23,6 +23,6 @@ cabal.mkDerivation (self: { description = "A command line interface to Sloane's On-Line Encyclopedia of Integer Sequences"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.akc ]; + maintainers = with self.stdenv.lib.maintainers; [ akc ]; }; }) |