nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-23 14:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
251,904 Commits 199 Branches 125 Tags 8.4 GiB
a2e71c49e6
Commit Graph

6435 Commits

Author SHA1 Message Date
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
Tim Steinbach
4df8aa7b00
curl: 7.72.0 -> 7.73.0 2020-10-17 16:43:01 -04:00
R. RyanTM
350a1bbdca bandwhich: 0.19.0 -> 0.20.0 2020-10-17 17:06:59 +00:00
Ben Siraphob
683a87dbeb treewide: remove periods from end of package descriptions 2020-10-17 08:22:31 -07:00
Malte Brandy
cebf9198f3
treewide: De-inline uses of lib.boolToString 
This commit should not change eval results
 2020-10-14 01:46:17 +02:00
Frederik Rietdijk
9e1943edc0 Merge master into staging-next 2020-10-13 19:34:34 +02:00
zowoq
acd388dd68 croc: 8.3.1 -> 8.5.0 
https://github.com/schollz/croc/releases/tag/v8.3.2
https://github.com/schollz/croc/releases/tag/v8.4.0
https://github.com/schollz/croc/releases/tag/v8.5.0
 2020-10-13 20:06:25 +10:00
Mario Rodas
93efe2a4df
Merge pull request #100260 from servalcatty/v2ray 
v2ray: 4.28.2 -> 4.31.0 and clean up
 2020-10-11 20:12:51 -05:00
Serval
7e13605016
v2ray: remove unnecessary buildInputs 2020-10-12 00:42:55 +08:00
Serval
8bc3737850
v2ray: 4.28.2 -> 4.31.0 2020-10-12 00:39:24 +08:00
Vladimír Čunát
338b25697c
Merge branch 'master' into staging-next 
Quite many rebuilds from master:
> Estimating rebuild amount by counting changed Hydra jobs.
>    3926 x86_64-darwin
>    4645 x86_64-linux
 2020-10-10 11:32:10 +02:00
Mario Rodas
f174a84d33
Merge pull request #99979 from suhr/tox 
tox-node: 0.0.8 -> 0.1.0
 2020-10-08 18:14:20 -05:00
Martin Weinelt
7d2a6beb6d
unbound: 1.11.0 -> 1.12.0 2020-10-09 00:46:40 +02:00
Frederik Rietdijk
ec28e32c9e Merge master into staging-next 2020-10-08 21:47:26 +02:00
Tim Steinbach
a5209ce244
httpstat: Format with nixfmt 2020-10-08 11:00:17 -04:00
Robert Scott
8484c442ed
Merge pull request #100044 from risicle/ris-packetdrill-fix 
packetdrill: 1.0 -> unstable-2020-08-22, fix build
 2020-10-08 20:55:02 +01:00
Robert Scott
87fad4d39e packetdrill: 1.0 -> unstable-2020-08-22, fix build 
also switch to cmake build
 2020-10-08 19:52:13 +01:00
Mario Rodas
dbf63a9e32
Merge pull request #99686 from marsam/update-grpcurl 
grpcurl: 1.4.0 -> 1.7.0
 2020-10-07 21:21:57 -05:00
Сухарик
5ada68ac1b tox-node: 0.0.8 -> 0.1.0 2020-10-07 23:37:19 +03:00
Vladimír Čunát
420f89ceb2
Revert "apparmor: fix and improve the service" 
This reverts commit fb6d63f3fd.

I really hope this finally fixes #99236: evaluation on Hydra.
This time I really did check basically the same commit on Hydra:
https://hydra.nixos.org/eval/1618011

Right now I don't have energy to find what exactly is wrong in the
commit, and it doesn't seem important in comparison to nixos-unstable
channel being stuck on a commit over one week old.
 2020-10-07 12:22:18 +02:00
Timo Kaufmann
8722718311
Merge pull request #99893 from ardumont/bump-amule 
amule: 2.3.2 -> unstable-20201006
 2020-10-07 10:03:07 +02:00
Antoine R. Dumont (@ardumont)
1f7cf96291
amule: 2.3.2 -> unstable-20201006 
There has been no new release since 2.3.2 for some years now (around 2016) [1]

The most recent master branch for the amule project includes a commit [2] which
fixes compilation breakage with the next libupnp version [3].

So this bumps the amule version to the latest commit of that repository.

[1] https://github.com/amule-project/amule/issues/219

[2] 8784480c79

[3] #93048
 2020-10-06 23:35:22 +02:00
Antoine R. Dumont (@ardumont)
98e5369baf
gmrender-resurrect: Make build against libupnp 1.14 ok 
Current PR opened but not merged upstream [1]

[1] https://github.com/hzeller/gmrender-resurrect/pull/214
 2020-10-06 23:25:13 +02:00
Frederik Rietdijk
692d219a93 Merge staging-next into staging 2020-10-06 10:25:58 +02:00
Mario Rodas
ef3155fbbc grpcurl: 1.4.0 -> 1.7.0 2020-10-03 04:20:00 +00:00
Jan Tojnar
32b4375f10
Merge branch 'staging-next' into staging 2020-09-29 00:12:29 +02:00
Emery Hemingway
11ce7675cf yggdrasil: 0.3.14 -> 0.3.15 2020-09-28 09:55:05 +02:00
Ryan Burns
e1d834aa09 sshping: fix build on darwin 
Fix hardcoded C++ compiler
 2020-09-27 12:59:30 -07:00
Michael Raskin
31a4e2e28b
Merge pull request #93457 from ju1m/apparmor 
apparmor: fix and improve the service
 2020-09-27 13:07:38 +00:00
Oleksii Filonenko
d7b442c121
Merge pull request #98826 from r-ryantm/auto-update/nebula 
nebula: 1.2.0 -> 1.3.0
 2020-09-26 11:04:02 +03:00
Oleksii Filonenko
02b7dcb4ee
Merge pull request #98717 from r-ryantm/auto-update/frp 
frp: 0.33.0 -> 0.34.0
 2020-09-26 11:00:31 +03:00
R. RyanTM
bff1304ec2 nebula: 1.2.0 -> 1.3.0 2020-09-26 05:24:41 +00:00
R. RyanTM
3a4e082f7f frp: 0.33.0 -> 0.34.0 2020-09-25 07:16:46 +00:00
zowoq
9979d33ac7 mtr: 0.93 -> 0.94 
https://github.com/traviscross/mtr/blob/v0.94/NEWS
 2020-09-25 13:12:32 +10:00
Jan Tojnar
d471c5d1f3
Merge branch 'staging-next' into staging 2020-09-24 23:09:00 +02:00
Pierre Bourdon
ce615a5c32
dnsperf: 2.3.1 -> 2.3.4 
Required for newer Bind versions support without isc-config.sh.
 2020-09-24 18:08:47 +02:00
R. RyanTM
2377e8e8ca findomain: 2.1.1 -> 2.1.3 2020-09-23 20:50:24 -07:00
Timo Kaufmann
c8cde01af4
Merge pull request #98513 from r-ryantm/auto-update/tridactyl-native 
tridactyl-native: 1.20.0 -> 1.20.1
 2020-09-23 09:40:14 +02:00
R. RyanTM
21a2c12fe7 tridactyl-native: 1.20.0 -> 1.20.1 2020-09-23 02:39:29 +00:00
zowoq
ff64cb724d amass: 3.10.1 -> 3.10.3 
https://github.com/OWASP/Amass/releases/tag/v3.10.2
https://github.com/OWASP/Amass/releases/tag/v3.10.3
 2020-09-23 07:29:28 +10:00
Frederik Rietdijk
7bff759fac Merge staging-next into staging 2020-09-22 18:31:56 +02:00
Maximilian Bosch
23370afced
curlie: 1.3.1 -> 1.5.4 2020-09-22 11:23:17 +02:00
Martin Weinelt
aeab683e38
Merge pull request #98168 from gnidorah/updates 
update some packages I maintain
 2020-09-22 03:59:27 +02:00
WORLDofPEACE
34aaac6d7c Merge branch 'staging-next' into staging 2020-09-20 18:41:15 -04:00
Gabriel Ebner
efa2089077
Merge pull request #89731 from doronbehar/jdk_rename 2020-09-20 11:07:55 +02:00
Daniël de Kok
c6105a18b1
Merge pull request #98312 from r-burns/openssh_hpn 
openssh_hpn: fix source
 2020-09-20 11:04:31 +02:00
Ryan Burns
f8473b1d39 openssh_hpn: fix source 2020-09-20 00:42:40 -07:00
Mario Rodas
e3796bc865 shadowsocks-rust: 1.8.17 -> 1.8.18 2020-09-20 04:20:00 +00:00
Gabriel Ebner
94b17d9694 zap: use jdk8 2020-09-19 17:47:06 +02:00
Serval
af9f04db79
v2ray: 4.27.5 -> 4.28.2 2020-09-19 20:29:14 +08:00
Marek Mahut
52532b7c36
Merge pull request #91256 from prusnak/seeks 
seeks: remove, upstream unmaintained
 2020-09-18 16:32:33 +02:00
Marek Mahut
3f95e9b51d
Merge pull request #96629 from prusnak/i2pd 
i2pd: 2.32.1 -> 2.33.0
 2020-09-18 16:20:39 +02:00
Fabian Geiselhart
5d0fc4a5a5 rcon: init at 0.5 2020-09-17 19:59:19 +02:00
gnidorah
0366a7f2b7 phodav: 2.4 -> 2.5 2020-09-17 16:38:07 +03:00
Thomas Tuegel
c0825ddbe9
Merge pull request #97672 from ttuegel/mariadb-connector-c-multiple-outputs 
mariadb-connector-c: multiple outputs
 2020-09-15 05:38:28 -05:00
Mario Rodas
c1d2464fdb shadowsocks-libev: 3.3.4 -> 3.3.5 
https://github.com/shadowsocks/shadowsocks-libev/releases/tag/v3.3.5
 2020-09-14 23:19:21 -05:00
leenaars
d88f262fd2
ipgrep: ipgrep: 1.0 -> 1.0.1 (#97903) 2020-09-13 22:45:13 +00:00
Doron Behar
c1f4bf78a8 shadowfox: Add ldflags 
shadowfox-updater compares the version of itself with that of the latest
version released upon startup. If it doesn't know it's own version, this
comparison always falsely leads to it suggesting the user to update it
upon startup, where in fact it is updated. This is a confusing behavior
only NixOS users suffer and now it's solved.
 2020-09-13 00:36:03 +03:00