JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
261,358 Commits 2 Branches 0 Tags 12 GiB
a9acf8eba5
Commit Graph

40 Commits

Author SHA1 Message Date
Vladimír Čunát
89023c38fc
Recover the complicated situation after my bad merge 
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
 2020-10-26 09:01:04 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" 
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
 2020-10-25 09:41:51 +01:00
Pierre Bourdon
ef30a745a8
zeromq: 4.3.2 -> 4.3.3 2020-10-06 08:04:57 +02:00
rnhmjoj
8415766d6f
zeromq3: remove 
This zeromq version is really old and is no longer needed
by any package in Nixpkgs.
 2020-06-22 15:45:14 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Robin Gloster
9da5420213
zeromq: *Flags are lists 2019-12-30 11:13:38 +01:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585) 
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
 2019-08-15 13:41:18 +01:00
Matthew Bauer
6ff7c2ca93
Merge pull request #65049 from matthewbauer/zmq-enable-drafts 
zmq: enable drafts api
 2019-07-25 09:54:00 -04:00
Matthew Bauer
3b8e595810 zmq: add enableDrafts option 
This is needed by emacs-zmq, and will be used by it.
 2019-07-24 16:12:40 -04:00
Robert Scott
c996567948 zeromq: 4.3.1 -> 4.3.2 2019-07-17 10:25:35 +02:00
Matthew Bauer
92f0f8dd68 Merge remote-tracking branch 'NixOS/master' into staging 2019-01-27 00:01:13 -05:00
Jörg Thalheim
b5c1deca8a
treewide: remove wkennington as maintainer 
He prefers to contribute to his own nixpkgs fork triton.
Since he is still marked as maintainer in many packages
this leaves the wrong impression he still maintains those.
 2019-01-26 10:05:32 +00:00
R. RyanTM
d1bcac2a54 zeromq: 4.3.0 -> 4.3.1 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/zeromq/versions
 2019-01-19 09:31:29 +01:00
R. RyanTM
ce7a6c5217 zeromq: 4.2.5 -> 4.3.0 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/zeromq/versions
 2018-12-19 19:47:29 -05:00
Timo Kaufmann
f5581b74d2 zeromq: 4.2.3 -> 4.2.5 2018-07-23 21:58:10 +02:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
adisbladis
4b6b7c2c7d
zeromq: 4.2.2 -> 4.2.3 2018-01-02 01:05:06 +01:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809) 
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
 2017-08-01 22:03:30 +02:00
Nikolay Amiantov
77ebac7ba9 zeromq: build with cmake 
This way CMake config modules are installed.
 2017-07-27 17:07:44 +03:00
rushmorem
467f7d3f6c zmq: v4.2.0 -> v4.2.2 2017-02-18 22:52:02 +02:00
Franz Pletz
cc5d604125
zeromq2: remove, not maintained anymore 2016-11-10 00:37:17 +01:00
Franz Pletz
10445bc753
zeromq: 4.1.4 -> 4.2.0 2016-11-10 00:37:07 +01:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms 
Build-tested on x86_64 Linux & Mac.
 2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
b96fe03484 treewide: Fix meta.platforms related typos 2016-08-02 21:17:44 +03:00
Tobias Geerinckx-Rice
30ba40798c
zeromq: remove unused sodium_warning.patch 2016-06-22 03:58:55 +02:00
Jason Ziglar
b6586ee694 Updating ZeroMQ to 4.1.4 2016-02-13 13:31:49 -05:00
William A. Kennington III
9fd510e95a zeromq: Fix with new libsodium 2015-11-07 15:44:53 -08:00
Domen Kožar
310b7e24d2 zeromq: add patch to fix build 2015-11-07 18:13:50 +01:00
William A. Kennington III
88285257f1 zeromq: 4.1.2 -> 4.1.3 2015-09-18 14:52:51 -07:00
William A. Kennington III
c0b553c12c zeromq: 4.1.1 -> 4.1.2 2015-06-18 21:17:51 -07:00
Peter Simons
957d9f6d57 zeromq: update to version 4.1.1 
Version 4.0.6 is "retired" and also failed to compile because its sha256
hash changed on the upstream site for some reason.
 2015-06-10 10:07:46 +02:00
Pascal Wittmann
8895716869 zeromq: update from 4.0.5 to 4.0.6, fixes CVE-2014-9721 2015-06-08 13:31:27 +02:00
William A. Kennington III
e0ba90ba4e zeromq4: Refactor 2015-03-11 18:50:04 -07:00
William A. Kennington III
048148ad97 zeromq3: Refactor 2015-03-11 18:50:04 -07:00
Domen Kožar
579f93203a zeromq: 4.0.4 -> 4.0.5 2014-11-30 18:03:32 +01:00
Paul Colomiets
6b27a2789e Upgrade zeromq and nanomsg 2014-06-16 22:25:56 +03:00
Tom Dimiduk
c4f66df29a add zeromq4 and zeromq4-haskell 2014-05-01 07:52:21 -04:00
Evgeny Egorochkin
e8a9e30cc7 Add meta.branch to some packages 2014-01-08 18:06:18 +02:00
Peter Simons
e810a42b84 zeromq: add version 3.x 2012-10-24 18:17:27 +02:00
Andres Löh
ea8d3f396e Added zeromq and haskell-zeromq-haskell. 
svn path=/nixpkgs/trunk/; revision=30878
 2011-12-14 08:31:14 +00:00