about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/gdbm
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gdbm')
-rw-r--r--nixpkgs/pkgs/development/libraries/gdbm/0001-Remove-duplicate-assignments.patch25
-rw-r--r--nixpkgs/pkgs/development/libraries/gdbm/default.nix6
2 files changed, 2 insertions, 29 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gdbm/0001-Remove-duplicate-assignments.patch b/nixpkgs/pkgs/development/libraries/gdbm/0001-Remove-duplicate-assignments.patch
deleted file mode 100644
index 7583deb81098..000000000000
--- a/nixpkgs/pkgs/development/libraries/gdbm/0001-Remove-duplicate-assignments.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2c31a95d9e57a4308c5159c50e69b5c9178dee72 Mon Sep 17 00:00:00 2001
-From: Christian Kampka <christian@kampka.net>
-Date: Fri, 13 Nov 2020 16:52:12 +0100
-Subject: [PATCH] Remove duplicate assignments
-
----
- src/parseopt.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/parseopt.c b/src/parseopt.c
-index 268e080..a4c8576 100644
---- a/src/parseopt.c
-+++ b/src/parseopt.c
-@@ -255,8 +255,6 @@ print_option_descr (const char *descr, size_t lmargin, size_t rmargin)
- }
- 
- char *parseopt_program_name;
--char *parseopt_program_doc;
--char *parseopt_program_args;
- const char *program_bug_address = "<" PACKAGE_BUGREPORT ">";
- void (*parseopt_help_hook) (FILE *stream);
- 
--- 
-2.25.4
-
diff --git a/nixpkgs/pkgs/development/libraries/gdbm/default.nix b/nixpkgs/pkgs/development/libraries/gdbm/default.nix
index 3d333e503b2e..16c045cd68ef 100644
--- a/nixpkgs/pkgs/development/libraries/gdbm/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gdbm/default.nix
@@ -2,17 +2,15 @@
 
 stdenv.mkDerivation rec {
   pname = "gdbm";
-  version = "1.18.1";
+  version = "1.19";
 
   src = fetchurl {
     url = "mirror://gnu/gdbm/${pname}-${version}.tar.gz";
-    sha256 = "1p4ibds6z3ccy65lkmd6lm7js0kwifvl53r0fd759fjxgr917rl6";
+    sha256 = "sha256-N+0SIUEiuXLhig2UmVA55XdIGRk573QRWx1B2IETZLw=";
   };
 
   doCheck = true; # not cross;
 
-  patches = [ ./0001-Remove-duplicate-assignments.patch ];
-
   # Linking static stubs on cygwin requires correct ordering.
   # Consider upstreaming this.