diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-20 21:56:06 -0600 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-21 09:39:11 -0600 |
commit | f4bf6ba67bd75009d0107674c894c79017263a04 (patch) | |
tree | 1c7ba21526e37c659beebfd403cd4729cf419702 /pkgs/tools/misc/mdbtools | |
parent | 3e6d7a2329974ce63c4b6ee31c30ed576d94015b (diff) | |
download | nixpkgs-f4bf6ba67bd75009d0107674c894c79017263a04.tar nixpkgs-f4bf6ba67bd75009d0107674c894c79017263a04.tar.gz nixpkgs-f4bf6ba67bd75009d0107674c894c79017263a04.tar.bz2 nixpkgs-f4bf6ba67bd75009d0107674c894c79017263a04.tar.lz nixpkgs-f4bf6ba67bd75009d0107674c894c79017263a04.tar.xz nixpkgs-f4bf6ba67bd75009d0107674c894c79017263a04.tar.zst nixpkgs-f4bf6ba67bd75009d0107674c894c79017263a04.zip |
mdbtools: 0.6pre1 -> 0.7.1
Also remove mbdtools_git. This was older than mbdtools!
Diffstat (limited to 'pkgs/tools/misc/mdbtools')
-rw-r--r-- | pkgs/tools/misc/mdbtools/default.nix | 21 | ||||
-rw-r--r-- | pkgs/tools/misc/mdbtools/git.nix | 35 |
2 files changed, 13 insertions, 43 deletions
diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix index d251bee71d9..8a3842322f9 100644 --- a/pkgs/tools/misc/mdbtools/default.nix +++ b/pkgs/tools/misc/mdbtools/default.nix @@ -1,15 +1,20 @@ -{ stdenv, fetchurl, glib, readline, bison, flex, pkgconfig }: +{ stdenv, fetchFromGitHub, glib, readline +, bison, flex, pkgconfig, autoreconfHook +, txt2man, which }: -stdenv.mkDerivation { - name = "mdbtools-0.6pre1"; +let version = "0.7.1"; +in stdenv.mkDerivation { + name = "mdbtools-${version}"; - src = fetchurl { - url = mirror://sourceforge/mdbtools/mdbtools-0.6pre1.tar.gz; - sha256 = "1lz33lmqifjszad7rl1r7rpxbziprrm5rkb27wmswyl5v98dqsbi"; + src = fetchFromGitHub { + owner = "brianb"; + repo = "mdbtools"; + rev = version; + sha256 = "0gwcpp9y09xhs21g7my2fs8ncb8i6ahlyixcx8jd3q97jbzj441l"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [glib readline bison flex]; + nativeBuildInputs = [ pkgconfig bison flex autoreconfHook txt2man which ]; + buildInputs = [ glib readline ]; preConfigure = '' sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix deleted file mode 100644 index b275002e110..00000000000 --- a/pkgs/tools/misc/mdbtools/git.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchgit, glib, readline, bison, flex, pkgconfig, - libiconv, autoreconfHook, which, txt2man, gnome-doc-utils, scrollkeeper }: - -stdenv.mkDerivation { - name = "mdbtools-git-2014-07-25"; - - src = fetchgit { - url = "http://github.com/brianb/mdbtools.git"; - rev = "9ab40e83e6789015c965c92bdb62f92f8cdd0dbd"; - sha256 = "0hlf5lk86xm0bpdlpk4a1zyfvbim76dhvmybxga2p7mbb1jc825l"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - glib readline bison flex autoreconfHook which txt2man - gnome-doc-utils scrollkeeper libiconv - ]; - - preAutoreconf = '' - sed -e '/ENABLE_GTK_DOC/aAM_CONDITIONAL(HAVE_GNOME_DOC_UTILS, test x$enable_gtk_doc = xyes)' \ - -e '/ENABLE_GTK_DOC/aAM_CONDITIONAL(ENABLE_SK, test x$enable_scrollkeeper = xyes)' \ - -i configure.ac - ''; - - preConfigure = '' - sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c - ''; - - meta = with stdenv.lib; { - description = ".mdb (MS Access) format tools"; - homepage = http://mdbtools.sourceforge.net; - platforms = platforms.linux; - license = with licenses; [ gpl2 lgpl2 ]; - }; -} |