mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 01:51:24 +00:00
Code Issues Wiki Activity
190965 commits 268 branches 125 tags 5.4 GiB
Commit graph

4956 commits

Author SHA1 Message Date
Frederik Rietdijk 98640fd482 Merge master into staging-next 2019-08-27 16:36:47 +02:00
Michael Weiss ba9305c404
tcpflow: 1.4.6 -> 1.5.2 
Changelog: https://github.com/simsong/tcpflow/blob/tcpflow-1.5.2/ChangeLog
Does now cross-compile and build with OpenSSL 1.1.1.
I've also restructured/simplified the expression and added additional
meta information.
 2019-08-26 20:11:52 +02:00
Vladimír Čunát 985d1ac425
Merge branch 'master' into staging-next 
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
 2019-08-25 14:57:11 +02:00
Marek Mahut d212d864e4
Merge pull request #67202 from kisik21/uwimap-cross-compile-fix 
uwimap: Fixed cross-compilation
 2019-08-25 14:27:24 +02:00
Jan Tojnar edcecfee00
Merge pull request #67358 from jtojnar/ofono-progress 
nixos/ofono: various improvements
 2019-08-24 21:37:42 +02:00
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
Jan Tojnar 5db762126c
nixos/ofono: allow adding 3rd party plug-ins 2019-08-23 19:50:53 +02:00
Jan Tojnar f66613b3b6
nixos/ofono: add module 2019-08-23 19:50:53 +02:00
Linus Heckemann d1d602f559 Merge remote-tracking branch 'origin/master' into openssl-1.1 2019-08-23 17:27:39 +02:00
Marek Mahut bd67156e12
Merge pull request #67005 from bbigras/httplz 
httplz: 1.5.1 -> 1.5.2
 2019-08-23 08:19:28 +02:00
Robin Gloster c7e75df21f
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-23 02:00:31 +02:00
Will Dietz 01902aec93
arping: 2.19 -> 2.20 
https://github.com/ThomasHabets/arping/releases/tag/arping-2.20
 2019-08-22 13:23:52 -05:00
Robin Gloster 6095f88e7e
socat2pre: mark as broken 2019-08-21 20:31:57 +02:00
Vika a2b474b9b5 uwimap: Fixed cross-compilation 
Shouldn't cause a rebuild of native package. The build system, as with
Lua, couldn't find cc, ar and ranlib - I helped it a little.
 2019-08-21 16:45:17 +03:00
Robin Gloster f4fc845e5b
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-21 14:25:13 +02:00
R. RyanTM ed07403382 zerotierone: 1.4.0 -> 1.4.2 (#67175) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/zerotierone/versions
 2019-08-21 08:51:31 +00:00
Paul TREHIOU 1e2ad9e6bc networkmanager: hardcode parts of the source URL (#67100) 
Broke the build as the pname variable was used to create the URL
Introduced by 46420bbaa3
 2019-08-20 17:05:19 -04:00
Robin Gloster 8c0786babe
Merge pull request #67103 from mayflower/globin-maintainership 
treewide: update globin's maintained drvs
 2019-08-20 17:57:47 +00:00
Marek Mahut 3aa22f44ef
Merge pull request #67001 from r-ryantm/auto-update/nfdump 
nfdump: 1.6.17 -> 1.6.18
 2019-08-20 19:44:24 +02:00
Robin Gloster 4e60b0efae
treewide: update globin's maintained drvs 2019-08-20 19:36:05 +02:00
Domen Kožar 40e973776d
Merge pull request #67003 from r-ryantm/auto-update/openapi-generator-cli 
openapi-generator-cli: 4.0.3 -> 4.1.0
 2019-08-20 15:48:42 +02:00
Rickard Nilsson 225e412edb Remove myself as maintainer of some packages. 2019-08-20 15:24:01 +02:00
Bruno Bigras fc1f812a44 httplz: 1.5.1 -> 1.5.2 2019-08-19 21:33:13 -04:00
R. RyanTM 1a4644b6ed openapi-generator-cli: 4.0.3 -> 4.1.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/openapi-generator-cli/versions
 2019-08-19 18:31:42 -07:00
R. RyanTM b7c70b1bd8 nfdump: 1.6.17 -> 1.6.18 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nfdump/versions
 2019-08-19 18:03:23 -07:00
R. RyanTM df771cf289 memtier-benchmark: 1.2.11 -> 1.2.17 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/memtier-benchmark/versions
 2019-08-19 19:29:28 -05:00
Will Dietz 1aaf047918
whois: 5.5.0 -> 5.5.1 
https://github.com/rfc1036/whois/blob/v5.5.1/debian/changelog
 2019-08-19 14:56:50 -05:00
R. RyanTM 09148726a2 tridactyl-native: 1.16.2 -> 1.16.3 (#66874) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/tridactyl-native/versions
 2019-08-19 13:28:57 +02:00
Frederik Rietdijk f65aa21bb2 Merge master into staging-next 2019-08-18 12:53:44 +02:00
Frederik Rietdijk 295888c622
Merge pull request #66381 from NixOS/staging-next 
Staging next
 2019-08-18 08:54:45 +02:00
Maximilian Bosch 4d5d448859 curlie: init at 1.2.0 (#66799) 2019-08-17 20:52:19 -07:00
Marek Mahut 37c22b49f5
Merge pull request #66743 from c089/patch-1 
http-prompt: Allow installation on Mac OS
 2019-08-17 23:53:51 +02:00
Marek Mahut 4291d44309
Merge pull request #66726 from bbigras/httplz 
httplz: 1.5.0 -> 1.5.1
 2019-08-17 23:07:21 +02:00
R. RyanTM 8fa7c08c58 babeld: 1.8.5 -> 1.9.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/babeld/versions
 2019-08-17 12:17:02 -07:00
Marek Mahut 67ae9491d9 httplz: adding darwin.apple_sdk.frameworks.Security 2019-08-17 19:43:44 +02:00
volth c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Frederik Rietdijk fe9a3e3e63 Merge staging-next into staging 2019-08-17 09:39:23 +02:00
Frederik Rietdijk c68f58d95c Merge master into staging-next 2019-08-17 09:30:16 +02:00
Christoph Neuroth 4ef579143c http-prompt: Allow installation on Mac OS 
The original pkg author noted that they could only test on linux. I'm running
this package on Mac OS without problems.
 2019-08-17 07:58:19 +02:00
Bruno Bigras 42accfb7d1 httplz: 1.5.0 -> 1.5.1 2019-08-16 12:24:10 -04:00
John Wiegley 2edd7103da
mtr: Only include libcap on Darwin 
Fixes #66688
 2019-08-15 11:29:13 -07: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
Frederik Rietdijk cff9e6429a Merge staging-next into staging 2019-08-14 13:46:33 +02:00
Frederik Rietdijk 8d56f2472e Merge master into staging-next 2019-08-14 13:45:54 +02:00
Jonathan Ringer cbed276a69 axel: 2.17.3 -> 2.17.5 2019-08-13 19:55:13 -07:00
Marek Mahut 61ea45d6be
Merge pull request #65403 from dtzWill/update/dhcpcd-8.0.1 
dhcpcd: 7.2.3 -> 8.0.2
 2019-08-13 21:59:37 +02:00
Jan Tojnar bb4a33ec91
ofono: init at 1.30 (#66565) 
ofono: init at 1.30
 2019-08-13 15:56:52 +02:00
Jan Tojnar 590310b23f
ofono: init at 1.30 2019-08-13 15:37:16 +02:00
Graham Christensen 5d807f80c7
Merge pull request #63864 from cransom/datadog-agent-integrations-fix 
datadog-agent: fix extraIntegrations
 2019-08-12 12:15:48 -04:00
edef 068f46f991
Merge pull request #63585 from edef1c/openssh-keysign 
openssh: use ssh-keysign from PATH
 2019-08-11 12:57:42 +00:00