diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 448fd04edd81..807e6a6a2a82 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -1,22 +1,40 @@ -{ stdenv, fetchurl, automake }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "gdbm-1.8.3"; + name = "gdbm-1.9.1"; + src = fetchurl { url = "mirror://gnu/gdbm/${name}.tar.gz"; - sha256 = "1j8x51xc71di1fx23sl22n5ghlqxl9a57sxri82l12z2l8w06d6c"; + sha256 = "1vcs39nhvwyicjfx4qc17k54n22azla5yjr9yachcavp6wk8a9b0"; }; - patches = [ ./install.patch ]; - - # The fuloong2f is not supported by gdbm 1.8.3 still - preConfigure = '' - cp ${automake}/share/automake*/config.{sub,guess} . - ''; + doCheck = true; meta = { - description = "GNU DBM key/value database library"; + description = "GNU dbm key/value database library"; + + longDescription = + '' GNU dbm (or GDBM, for short) is a library of database functions that + use extensible hashing and work similar to the standard UNIX dbm. + These routines are provided to a programmer needing to create and + manipulate a hashed database. + + The basic use of GDBM is to store key/data pairs in a data file. + Each key must be unique and each key is paired with only one data + item. + + The library provides primitives for storing key/data pairs, + searching and retrieving the data by its key and deleting a key + along with its data. It also support sequential iteration over all + key/data pairs in a database. + + For compatibility with programs using old UNIX dbm function, the + package also provides traditional dbm and ndbm interfaces. + ''; + homepage = http://www.gnu.org/software/gdbm/; - license = "GPLv2+"; + license = "GPLv3+"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.ludo ]; }; } diff --git a/pkgs/development/libraries/gdbm/install.patch b/pkgs/development/libraries/gdbm/install.patch deleted file mode 100644 index 81afe020b7be..000000000000 --- a/pkgs/development/libraries/gdbm/install.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- gdbm-1.8.3/Makefile.in 2002-10-08 18:09:12.000000000 +0200 -+++ gdbm-1.8.3/Makefile.in 2008-04-07 01:15:58.000000000 +0200 -@@ -131,11 +131,11 @@ install: libgdbm.la gdbm.h gdbm.info - $(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \ - $(INSTALL_ROOT)$(infodir) - $(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \ -+ $(INSTALL_DATA) gdbm.h \ - $(INSTALL_ROOT)$(includedir)/gdbm.h -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \ -+ $(INSTALL_DATA) $(srcdir)/gdbm.3 \ - $(INSTALL_ROOT)$(man3dir)/gdbm.3 -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \ -+ $(INSTALL_DATA) $(srcdir)/gdbm.info \ - $(INSTALL_ROOT)$(infodir)/gdbm.info - - install-compat: -@@ -143,9 +143,9 @@ install-compat: - $(INSTALL_ROOT)$(includedir) - $(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \ - $(INSTALL_ROOT)$(libdir)/libgdbm_compat.la -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \ -+ $(INSTALL_DATA)) $(srcdir)/dbm.h \ - $(INSTALL_ROOT)$(includedir)/dbm.h -- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \ -+ $(INSTALL_DATA)) $(srcdir)/ndbm.h \ - $(INSTALL_ROOT)$(includedir)/ndbm.h - - #libgdbm.a: $(OBJS) gdbm.h diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 264391bd328a..dad141528d01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -179,9 +179,6 @@ let # inside the set for derivations. recurseIntoAttrs = attrs: attrs // {recurseForDerivations = true;}; - # Return the first available value in the order: pkg.val, val, or default. - getPkgConfig = pkg : val : default : (getConfig [ pkg val ] (getConfig [ val ] default)); - builderDefs = lib.composedArgsAndFun (import ../build-support/builder-defs/builder-defs.nix) { inherit stringsWithDeps lib stdenv writeScript fetchurl fetchmtn fetchgit; @@ -3317,19 +3314,19 @@ let glibc29 = callPackage ../development/libraries/glibc-2.9 { kernelHeaders = linuxHeaders; - installLocales = getPkgConfig "glibc" "locales" false; + installLocales = getConfig [ "glibc" "locales" ] false; }; glibc29Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.9) { inherit stdenv fetchurl; gccCross = gccCrossStageStatic; kernelHeaders = linuxHeadersCross; - installLocales = getPkgConfig "glibc" "locales" false; + installLocales = getConfig [ "glibc" "locales" ] false; }); glibc213 = (callPackage ../development/libraries/glibc-2.13 { kernelHeaders = linuxHeaders; - installLocales = getPkgConfig "glibc" "locales" false; + installLocales = getConfig [ "glibc" "locales" ] false; machHeaders = null; hurdHeaders = null; gccCross = null; @@ -3341,7 +3338,7 @@ let inherit stdenv fetchurl; gccCross = gccCrossStageStatic; kernelHeaders = if crossGNU then hurdHeaders else linuxHeadersCross; - installLocales = getPkgConfig "glibc" "locales" false; + installLocales = getConfig [ "glibc" "locales" ] false; } // @@ -3362,7 +3359,7 @@ let eglibc = callPackage ../development/libraries/eglibc { kernelHeaders = linuxHeaders; - installLocales = getPkgConfig "glibc" "locales" false; + installLocales = getConfig [ "glibc" "locales" ] false; }; glibcLocales = callPackage ../development/libraries/glibc-2.13/locales.nix { }; @@ -3789,7 +3786,7 @@ let libimobiledevice = callPackage ../development/libraries/libimobiledevice { }; libiodbc = callPackage ../development/libraries/libiodbc { - useGTK = getPkgConfig "libiodbc" "gtk" false; + useGTK = getConfig [ "libiodbc" "gtk" ] false; }; libktorrent = newScope pkgs.kde4 ../development/libraries/libktorrent { }; @@ -6346,11 +6343,11 @@ let }; emacsSnapshot = lowPrio (callPackage ../applications/editors/emacs-snapshot { - xawSupport = getPkgConfig "emacs" "xawSupport" false; - xaw3dSupport = getPkgConfig "emacs" "xaw3dSupport" false; - gtkGUI = getPkgConfig "emacs" "gtkSupport" true; - xftSupport = getPkgConfig "emacs" "xftSupport" true; - dbusSupport = getPkgConfig "emacs" "dbusSupport" true; + xawSupport = getConfig [ "emacs" "xawSupport" ] false; + xaw3dSupport = getConfig [ "emacs" "xaw3dSupport" ] false; + gtkGUI = getConfig [ "emacs" "gtkSupport" ] true; + xftSupport = getConfig [ "emacs" "xftSupport" ] true; + dbusSupport = getConfig [ "emacs" "dbusSupport" ] true; }); emacsPackages = emacs: self: let callPackage = newScope self; in rec { @@ -7271,7 +7268,7 @@ let # KDE support is not working yet. inherit (kde3) kdelibs kdebase; - withKde = getPkgConfig "taskJuggler" "kde" false; + withKde = getConfig [ "taskJuggler" "kde" ] false; }; tesseract = callPackage ../applications/graphics/tesseract { }; @@ -8153,7 +8150,7 @@ let ghostscript = callPackage ../misc/ghostscript { x11Support = false; - cupsSupport = getPkgConfig "ghostscript" "cups" true; + cupsSupport = getConfig [ "ghostscript" "cups" ] true; gnuFork = getConfig [ "ghostscript" "gnu" ] true; }; @@ -8194,13 +8191,13 @@ let nix = nixStable; nixStable = callPackage ../tools/package-management/nix { - storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; - stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; + storeDir = getConfig [ "nix" "storeDir" ] "/nix/store"; + stateDir = getConfig [ "nix" "stateDir" ] "/nix/var"; }; nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { - storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; - stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; + storeDir = getConfig [ "nix" "storeDir" ] "/nix/store"; + stateDir = getConfig [ "nix" "stateDir" ] "/nix/var"; }; nixSqlite = nixUnstable;