diff options
Diffstat (limited to 'pkgs')
5 files changed, 34 insertions, 8 deletions
diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index a990e19dbc3f..bb31b24bf5ef 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -2,23 +2,22 @@ libharu, opencv, vigra, postgresql }: stdenv.mkDerivation rec { - name = "saga-2.1.2"; + name = "saga-2.1.4"; buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper ]; enableParallelBuilding = true; src = fetchurl { - url = "http://sourceforge.net/projects/saga-gis/files/SAGA%20-%202.1/SAGA%202.1.2/saga_2.1.2.tar.gz"; - sha256 = "51885446f717191210c4b13f0c35a1c5194c9d696d4f9b8f594bc1014809b2f5"; + url = "http://sourceforge.net/projects/saga-gis/files/SAGA%20-%202.1/SAGA%202.1.4/saga_2.1.4.tar.gz"; + sha256 = "694e4102f592f512c635328c40fdeff33493f74698d9466bb654baf3247e7b76"; }; meta = { - description = "SAGA - System for Automated Geoscientific Analyses"; + description = "System for Automated Geoscientific Analyses"; homepage = http://www.saga-gis.org; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.michelk ]; - platforms = with stdenv.lib.platforms; linux; - broken = true; + platforms = ["x86_64-linux" ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 4cabe3a4e2ab..71fb75a21576 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -99,4 +99,6 @@ rec { git-remote-hg = callPackage ./git-remote-hg { }; gitRemoteGcrypt = callPackage ./git-remote-gcrypt { }; + + git-extras = callPackage ./git-extras { }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix new file mode 100644 index 000000000000..3392c1c00217 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "git-extras-${version}"; + version = "2.2.0"; + + src = fetchurl { + url = "https://github.com/tj/git-extras/archive/${version}.tar.gz"; + sha256 = "0qwgaj0r9lsmwricpnma9rm7llfrcqarcfk5iq3ilxkns8a334va"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + makeFlags = "DESTDIR=$(out) PREFIX="; + + meta = with stdenv.lib; { + homepage = https://github.com/tj/git-extras; + description = "GIT utilities -- repo summary, repl, changelog population, author commit percentages and more"; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.spwhitt ]; + }; +} diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 8c26d1f89ef2..b626c8a1539c 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cairo, file, fontconfig, glib, gtk, freefont_ttf -, libjpeg, libpng, libtool, makeWrapper, openssl, pango, sqlite, which } : +, libjpeg, libpng, libtool, makeWrapper, openssl, pango, sqlite, which, readline } : stdenv.mkDerivation rec { pname = "racket"; @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { # Various Racket executables do runtime searches for these. ffiSharedLibs = "${cairo}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${libjpeg}/lib:" - + "${libpng}/lib:${openssl}/lib:${pango}/lib:${sqlite}/lib"; + + "${libpng}/lib:${openssl}/lib:${pango}/lib:${sqlite}/lib:" + + "${readline}/lib"; buildInputs = [ file fontconfig freefont_ttf libtool makeWrapper sqlite which ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c310d2102158..f211ee98680b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8161,6 +8161,7 @@ let description = "Test data generator for Robot Framework"; homepage = https://github.com/mkorpela/RoboMachine; license = licenses.asl20; + maintainers = [ maintainers.bjornfor ]; }; }; |