diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-01-11 23:37:02 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-01-11 23:41:30 +0000 |
| commit | 6c557e3f1c28cf87e9fba232811d6875dd1399c1 (patch) | |
| tree | 035a071d5d8980df6de0fa42e2ef8fc0cce7055e /nixpkgs/pkgs/development/libraries/czmq | |
| parent | da7500bc026e937ac7fce7b50f67a0e1765737a7 (diff) | |
| parent | e4134747f5666bcab8680aff67fa3b63384f9a0f (diff) | |
| download | nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.gz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.bz2 nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.lz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.xz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.zst nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.zip | |
Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/czmq')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/czmq/3.x.nix | 26 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/czmq/czmq3-gcc7.patch | 26 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/czmq/default.nix (renamed from nixpkgs/pkgs/development/libraries/czmq/4.x.nix) | 0 |
3 files changed, 0 insertions, 52 deletions
diff --git a/nixpkgs/pkgs/development/libraries/czmq/3.x.nix b/nixpkgs/pkgs/development/libraries/czmq/3.x.nix deleted file mode 100644 index 73a51cd27310..000000000000 --- a/nixpkgs/pkgs/development/libraries/czmq/3.x.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, zeromq }: - -stdenv.mkDerivation rec { - version = "3.0.2"; - pname = "czmq"; - - src = fetchurl { - url = "http://download.zeromq.org/${pname}-${version}.tar.gz"; - sha256 = "16k9awrhdsymx7dnmvqcnkaq8lz8x8zppy6sh7ls8prpd6mkkjlb"; - }; - - patches = [ ./czmq3-gcc7.patch ]; - - # Fix build on Glibc 2.24. - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - - # Needs to be propagated for the .pc file to work - propagatedBuildInputs = [ zeromq ]; - - meta = with stdenv.lib; { - homepage = http://czmq.zeromq.org/; - description = "High-level C Binding for ZeroMQ"; - license = licenses.mpl20; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/czmq/czmq3-gcc7.patch b/nixpkgs/pkgs/development/libraries/czmq/czmq3-gcc7.patch deleted file mode 100644 index 4ab14685a6c1..000000000000 --- a/nixpkgs/pkgs/development/libraries/czmq/czmq3-gcc7.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/zgossip_engine.inc b/src/zgossip_engine.inc -index 37dbb4eb..727aaa9b 100644 ---- a/src/zgossip_engine.inc -+++ b/src/zgossip_engine.inc -@@ -258,7 +258,7 @@ engine_set_log_prefix (client_t *client, const char *string) - { - if (client) { - s_client_t *self = (s_client_t *) client; -- snprintf (self->log_prefix, sizeof (self->log_prefix) - 1, -+ snprintf (self->log_prefix, sizeof (self->log_prefix), - "%6d:%-33s", self->unique_id, string); - } - } -diff --git a/src/zsys.c b/src/zsys.c -index 4d0bb8a1..f07db9c8 100644 ---- a/src/zsys.c -+++ b/src/zsys.c -@@ -1071,7 +1071,7 @@ zsys_run_as (const char *lockfile, const char *group, const char *user) - } - } - // We record the current process id in the lock file -- char pid_buffer [10]; -+ char pid_buffer [32]; - snprintf (pid_buffer, sizeof (pid_buffer), "%6d\n", getpid ()); - if (write (handle, pid_buffer, strlen (pid_buffer)) != strlen (pid_buffer)) { - zsys_error ("cannot write to lockfile: %s", strerror (errno)); diff --git a/nixpkgs/pkgs/development/libraries/czmq/4.x.nix b/nixpkgs/pkgs/development/libraries/czmq/default.nix index 05e499c73d0c..05e499c73d0c 100644 --- a/nixpkgs/pkgs/development/libraries/czmq/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/czmq/default.nix |