1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 22:50:49 +00:00
Commit graph

13 commits

Author SHA1 Message Date
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Rickard Nilsson 225e412edb Remove myself as maintainer of some packages. 2019-08-20 15:24:01 +02: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
Limbo Peng 9f8b40c2de httping: add libintl to buildInputs on Darwin (#48188)
* httping: add libintl to buildInputs on Darwin

Otherwise it won't compile.

* httping: fix URLs
2018-10-14 15:20:42 +02:00
Tobias Geerinckx-Rice 0f84673f3d
Remove nckx as a maintainer for all packages
Goodbye, and thanks for all the Nix...
2018-01-16 23:00:49 +01:00
Renaud b0ae3c14fb httping 2.5: fetch over https + license 2017-03-02 19:20:26 +01:00
ndowens ef4775c2a7 httping: 2.4 -> 2.5 2017-03-01 19:12:00 -06:00
Tobias Geerinckx-Rice ac33b4724a More version attribute tidying where maintainers |= nckx 2016-01-25 20:08:34 +01:00
Tobias Geerinckx-Rice 4dbaefa218 httping: add optional fftw for better graphing
Enabled by default.
2015-09-11 22:28:40 +02:00
Rickard Nilsson 6c6a06b99f httping: Enable SSL support 2015-07-10 12:58:56 +02:00
Tobias Geerinckx-Rice 98b2d7b727 Separate nativeBuildInputs where maintainers |= nckx 2015-06-17 22:21:32 +02:00
Tobias Geerinckx-Rice f401b3cf0b httping 2.3.4 -> 2.4
Also add support for the fancy ncurses interface.
2015-04-28 02:22:25 +02:00
Rickard Nilsson b64eeaf727 new package: httping 2.3.4 2015-01-19 03:52:26 +01:00