Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6dd536a3cb57
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9451ae5974fe
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 18, 2020

  1. gdbm: Fix multiple definitions error when building with clang

    @kampka @FRidh
    kampka authored and FRidh committed Nov 18, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    sikmir Nikolay Korotkiy
    GPG key ID: D1DE6D7F693663A5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9451ae5 View commit details
Showing with 27 additions and 0 deletions.
  1. +25 −0 pkgs/development/libraries/gdbm/0001-Remove-duplicate-assignments.patch
  2. +2 −0 pkgs/development/libraries/gdbm/default.nix
25 changes: 25 additions & 0 deletions pkgs/development/libraries/gdbm/0001-Remove-duplicate-assignments.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
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

2 changes: 2 additions & 0 deletions pkgs/development/libraries/gdbm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {

doCheck = true; # not cross;

patches = [ ./0001-Remove-duplicate-assignments.patch ];

# Linking static stubs on cygwin requires correct ordering.
# Consider upstreaming this.