Commit Graph

6410 Commits

Author SHA1 Message Date
Maximilian Bosch
f71d393b94
curlie: 1.5.4 -> 1.6.0
https://github.com/rs/curlie/releases/tag/v1.6.0

Fixes integration with `curl-7.73.0` which we have on `master`
since 4df8aa7b00.
2020-11-06 13:46:18 +01:00
Martin Weinelt
0a6cdb667f
Merge pull request #102592 from r-ryantm/auto-update/lldpd
lldpd: 1.0.5 -> 1.0.6
2020-11-05 20:10:24 +01:00
Mario Rodas
6ebbc312aa shadowsocks-rust: 1.8.18 -> 1.8.23 2020-11-04 04:20:00 +00:00
Frederik Rietdijk
49cd7307d0
Merge pull request #101207 from NixOS/staging-next
Staging next
2020-11-04 10:48:08 +01:00
Sascha Grunert
6fc9aca0de slirp4netns: 1.1.4 -> 1.1.6
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-11-04 19:22:20 +10:00
Frederik Rietdijk
9e6d7d3c74 Merge master into staging-next 2020-11-04 09:27:42 +01:00
R. RyanTM
53db304162 oneshot: 1.2.0 -> 1.3.1 2020-11-03 22:00:18 -08:00
R. RyanTM
00d6fff630 i2pd: 2.33.0 -> 2.34.0 2020-11-03 08:59:20 -08:00
R. RyanTM
2d9968f1ae dropbear: 2020.80 -> 2020.81 2020-11-03 08:49:08 -08:00
Frederik Rietdijk
237966224d Merge master into staging-next 2020-11-03 12:06:06 +01:00
R. RyanTM
8b0af5deaa lldpd: 1.0.5 -> 1.0.6 2020-11-03 06:51:31 +00:00
Sarah Brofeldt
17bdaa27e1
Merge pull request #102467 from r-ryantm/auto-update/haproxy
haproxy: 2.2.2 -> 2.2.4
2020-11-02 21:02:44 +01:00
Sarah Brofeldt
bfb42b51f0
Merge pull request #102493 from r-ryantm/auto-update/keepalived
keepalived: 2.1.3 -> 2.1.5
2020-11-02 20:57:29 +01:00
R. RyanTM
e6e6578623 keepalived: 2.1.3 -> 2.1.5 2020-11-02 16:13:59 +00:00
R. RyanTM
56d0b47ae7 minio-client: 2020-08-08T02-33-58Z -> 2020-10-03T02-54-56Z 2020-11-02 08:13:59 -08:00
R. RyanTM
b174be956e haproxy: 2.2.2 -> 2.2.4 2020-11-02 10:41:43 +00:00
Pavol Rusnak
2c931312ce treewide: simplify rev/repo arguments in src
+ use fetchFromGithub where possible
2020-11-01 23:02:24 -08:00
R. RyanTM
4205938c6e tridactyl-native: 1.20.1 -> 1.20.2 2020-11-01 17:18:26 -08:00
Frederik Rietdijk
7a8d5dc8a6 Merge master into staging-next 2020-11-01 10:10:47 +01:00
Vladimír Čunát
dfd3ede68d
Merge branch 'master' into staging-next 2020-10-31 14:30:44 +01:00
Bruno Bigras
4e6f5a3054 chrony: 3.5.1 -> 4.0 2020-10-30 17:44:24 -04:00
Mario Rodas
ebe09a7ccc
Merge pull request #102039 from r-ryantm/auto-update/croc
croc: 8.5.2 -> 8.6.5
2020-10-30 07:50:58 -05:00
Mario Rodas
1429b00ba0
Merge pull request #102075 from siraben/mozwire-0.7.0
mozwire: 0.5.2 -> 0.7.0
2020-10-30 07:43:35 -05:00
Alex Whitt
fcc6849bcd bacnet-stack: init at 1.0.0
Update pkgs/tools/networking/bacnet-stack/default.nix

Co-authored-by: Daniel Løvbrøtte Olsen <daniel.olsen99+GitHub@gmail.com>

bacnet-stack: Add maintainer and use the original GitHub repo

bacnet-stack: Alphabetize

Update pkgs/top-level/all-packages.nix

Co-authored-by: Jon <jonringer@users.noreply.github.com>
2020-10-29 21:48:58 -07:00
Ben Siraphob
452312ec15 mozwire: 0.5.2 -> 0.7.0 2020-10-29 23:44:35 +07:00
R. RyanTM
a15f5f379b croc: 8.5.2 -> 8.6.5 2020-10-29 12:31:08 +00: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
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
Markus S. Wamser
166a0642d4 croc: add passthru.tests 2020-10-25 10:51:49 +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
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