jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
251,091 Commits 266 Branches 122 Tags 5.3 GiB
99fb79ae84
Commit Graph

6424 Commits

Author SHA1 Message Date
Frederik Rietdijk
99fb79ae84 Merge master into staging-next 2020-11-06 12:51:56 +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
Jan Tojnar
a821be7531
Merge branch 'master' into staging-next 2020-11-05 09:42:47 +01: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
10c57af49c Merge staging-next into staging 2020-11-04 09:28:07 +01: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
Mario Rodas
6ebbc312aa shadowsocks-rust: 1.8.18 -> 1.8.23 2020-11-04 04:20:00 +00: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
Andreas Rammhold
be6e50a3ae
Merge pull request #99959 from helsinki-systems/upd/openssh 
[staging] openssh: 8.3p1 -> 8.4p1
 2020-11-03 16:00:31 +01:00
Frederik Rietdijk
470f05cb5d Merge staging-next into staging 2020-11-03 12:06:41 +01: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
83dde6c52c Merge staging-next into staging 2020-11-01 10:11:12 +01: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
Janne Heß
02390ed725 openssh: 8.3p1 -> 8.4p1 
Fixes CVE-2020-15778, CVE-2020-14145
 2020-10-29 18:58:04 +01: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
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 c778945806b 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: 4effe769e2b
 - `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 (803ca85c209)
 - 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 c778945806b44d46ec16bc4302e7e7163e6bab97.

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 17f5305b6c20df795c365368d2d868266519599e, reversing
changes made to a8a018ddc0a8b5c3d4fa94c94b672c37356bc075.
 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