public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
249,689 Commits 1 Branch 0 Tags 1.5 GiB
Commit Graph

6392 Commits

Author SHA1 Message Date
Vladimír Čunát 0b32140b34
Merge branch 'staging-next' into staging 2020-10-28 18:48:56 +01:00
Vladimír Čunát 31839c352e
Merge branch 'master' into staging-next 2020-10-28 18:48:18 +01:00
Maximilian Bosch 3d04e9a779
Merge pull request #101669 from Zopieux/nxdomain 
nxdomain: init at 1.0.1
 2020-10-28 10:49:50 +01:00
Andreas Rammhold db0fe5c3eb
Merge branch master into staging to fix eval error 
This fixes the eval error of the small (and "big"?) NixOS test set that
was fixed in 1088f05 & eba8f542.
 2020-10-28 03:03:27 +01:00
Alexandre Macabies c7f2086af5 nxdomain: init at 1.0.1 2020-10-27 23:41:01 +01:00
Ben Siraphob db74029e3e treewide: remove package names from prefix of descriptions 2020-10-27 09:15:07 -07:00
Ryan Mulligan 99725609cd
Merge pull request #89227 from f4814/rcon-init 
rcon: init at 0.5
 2020-10-26 06:56:21 -07:00
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 336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" 
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
 2020-10-26 08:19:17 +01:00
Markus S. Wamser 166a0642d4 croc: add passthru.tests 2020-10-25 10:51:49 +01:00
Vladimír Čunát 2f6b00b15e
Merge branch 'staging-next' into staging 2020-10-25 09:47:04 +01:00
R. RyanTM 9baf29e382 cksfv: 1.3.14 -> 1.3.15 2020-10-25 09:42:54 +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
Vladimír Čunát 17f5305b6c
Merge #101508: libraw: 0.20.0 -> 0.20.2 2020-10-25 09:28:53 +01:00
Andreas Rammhold 250fb4611f
Merge pull request #100456 from maralorn/boolToString 
treewide: De-inline uses of lib.boolToString
 2020-10-25 00:45:11 +02:00
R. RyanTM 668f38cb75 croc: 8.5.1 -> 8.5.2 2020-10-24 19:23:01 +00:00
WORLDofPEACE 949f7f9227
Merge pull request #98316 from NixOS/gnome-3.38 
GNOME 3.38
 2020-10-23 20:02:38 -04:00
Jan Tojnar c87e6738df
networkmanager: fix build 
Not sure why this is an issue now, likely a gtk-doc or gobject-introspection bump.
 2020-10-24 01:16:59 +02:00
Jan Tojnar c252654584
Merge branch 'master' into staging-next 2020-10-24 01:10:07 +02:00
Andreas Rammhold 5506c40150
Merge pull request #101091 from mweinelt/fastd 
fastd: 19 -> 21
 2020-10-23 15:15:01 +02:00
Jan Tojnar d13fc932cd
Merge branch 'master' into staging-next 2020-10-22 21:20:14 +02:00
R. RyanTM 6de2304582 cjdns: 20.7 -> 21 2020-10-22 14:18:41 +02:00
Austin Seipp 278d8641c8
vegeta: 12.7.0 -> 12.8.4 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2020-10-21 13:05:34 -05:00
Vladimír Čunát 90094b0468
Merge branch 'master' into staging-next 
minor conflict: rust update vs. darwin fixes for it
  (not tested but seems quite OK)
 2020-10-21 13:34:06 +02:00
Florian Klink 6e5ccaa34f
Merge pull request #100657 from flokli/network-manager-sstp 
networkmanager-sstp: init at unstable-2020-04-20, bump sstp from 1.0.12 to 1.0.13
 2020-10-21 00:33:13 +02:00
Florian Klink cdda94f70e sstp: 1.0.12 -> 1.0.13 2020-10-21 00:02:18 +02:00
Florian Klink 72cd3086cc networkmanager-sstp: init at unstable-2020-04-20 2020-10-21 00:02:18 +02:00
Frederik Rietdijk 23890fc236 Merge staging-next into staging 2020-10-20 20:55:46 +02:00
Vladimír Čunát cf82eb9514
Merge #100875: curl: 7.72.0 -> 7.73.0 (into staging) 2020-10-20 12:40:07 +02:00
Martin Weinelt 5a4385d4a9
fastd: 19 -> 21 2020-10-19 22:07:35 +02:00
Janne Heß 7ef527cff8
iperf3: 3.8.1 -> 3.9 (#100744) 
changelog http://software.es.net/iperf/news.html#iperf-3-9-released
 2020-10-19 12:24:49 +02:00
Mario Rodas 597a1e7f2d
Merge pull request #84572 from dguibert/dg/init-waitron 
waitron: init at 2020-01-24
 2020-10-18 20:25:01 -05:00
Jan Tojnar 5c766c5c24
Merge branch 'staging-next' into staging 2020-10-18 21:21:03 +02:00
Mario Rodas 9bc9bfeaff
Merge pull request #100910 from r-ryantm/auto-update/dnsproxy 
dnsproxy: 0.32.0 -> 0.32.6
 2020-10-18 08:57:01 -05:00
Mario Rodas 1b5ff33e18
Merge pull request #100909 from r-ryantm/auto-update/croc 
croc: 8.5.0 -> 8.5.1
 2020-10-18 08:56:23 -05:00
Mario Rodas 2831f7f51c
Merge pull request #100930 from r-ryantm/auto-update/flannel 
flannel: 0.12.0 -> 0.13.0
 2020-10-18 08:44:22 -05:00
Mario Rodas 00738f9a9b
Merge pull request #100898 from r-ryantm/auto-update/clash 
clash: 1.1.0 -> 1.2.0
 2020-10-18 08:33:14 -05:00
Mario Rodas 1be97c0f48
Merge pull request #100928 from r-ryantm/auto-update/findomain 
findomain: 2.1.3 -> 2.1.4
 2020-10-18 08:22:21 -05:00
Mario Rodas 91bfb962df
Merge pull request #100938 from r-ryantm/auto-update/frp 
frp: 0.34.0 -> 0.34.1
 2020-10-18 08:17:27 -05:00
Mario Rodas 8183d72181
Merge pull request #100957 from r-ryantm/auto-update/grpcui 
grpcui: 1.0.0 -> 1.1.0
 2020-10-18 07:47:03 -05:00
R. RyanTM 9440fec364 grpcui: 1.0.0 -> 1.1.0 2020-10-18 10:55:24 +00:00
Vladimír Čunát a6d8c4ff33
Merge #100058: unbound: 1.11.0 -> 1.12.0 (into staging) 2020-10-18 11:38:46 +02:00
R. RyanTM 0628b0322f frp: 0.34.0 -> 0.34.1 2020-10-18 08:10:02 +00:00
R. RyanTM 6b02640fe9 flannel: 0.12.0 -> 0.13.0 2020-10-18 06:47:41 +00:00
R. RyanTM 0a22624386 findomain: 2.1.3 -> 2.1.4 2020-10-18 06:37:28 +00:00
R. RyanTM 1d3cf88e01 dnsproxy: 0.32.0 -> 0.32.6 2020-10-18 01:54:37 +00:00
R. RyanTM 137a906148 croc: 8.5.0 -> 8.5.1 2020-10-18 01:18:21 +00:00
R. RyanTM e072662ed6 amass: 3.10.3 -> 3.10.5 2020-10-17 17:20:32 -07:00
R. RyanTM 1616d57218 clash: 1.1.0 -> 1.2.0 2020-10-17 22:40:17 +00:00
Martin Weinelt cc0fdccf39
Merge pull request #100846 from r-ryantm/auto-update/bandwhich 
bandwhich: 0.19.0 -> 0.20.0
 2020-10-18 00:36:43 +02:00