Compare commits

..

2527 Commits

Author SHA1 Message Date
Mario Rodas
925ff360bc ruby_2_5: 2.5.7 -> 2.5.8
Changelog: https://www.ruby-lang.org/en/news/2020/03/31/ruby-2-5-8-released/
(cherry picked from commit 99b09d6b8f)
2020-04-01 13:16:45 +00:00
zowoq
e99df8643c ffmpeg_2_8: 2.8.14 -> 2.8.15
(cherry picked from commit c13f1a508d)
2020-01-04 12:38:06 +00:00
Mario Rodas
f0b18a3f96 ruby_2_5: 2.5.3 -> 2.5.7
Changelog: https://www.ruby-lang.org/en/news/2019/10/01/ruby-2-5-7-released/
(cherry picked from commit 5e76e7b430)
2019-10-02 11:11:44 +00:00
Mario Rodas
acb68715b9 ruby_2_4: 2.4.5 -> 2.4.9
Changelog:
- https://www.ruby-lang.org/en/news/2019/10/01/ruby-2-4-8-released/
- https://www.ruby-lang.org/en/news/2019/10/02/ruby-2-4-9-released/

(cherry picked from commit 5ed9d8b8aa)
2019-10-02 11:09:33 +00:00
Dima
f2ffac1ee4 linux-libre: fixing build / deblobbing (#68844)
Build was failing because we were depending on tagged versions of
the deblobbing scripts. The tags are not updated and thus newer
changes required won't be reflected unless the tag is re-created, which
might not be reliably the case.

So bumping revision and switching to use the branches to access the
deblob scripts.

For context, in our case the missing change is:

--- /nix/store/sfc0rrhj5l44zpqgpsymq5750k5wzg8p-tags-r16790/4.19-gnu/deblob-4.19	1970-01-01 01:00:01.000000000 +0100
+++ ../deblob-4.19	2019-09-14 14:53:44.637404289 +0200
@@ -1879,7 +1879,11 @@

 announce BRCMFMAC - "Broadcom IEEE802.11n embedded FullMAC WLAN driver"
 reject_firmware drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
-reject_firmware drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
+if grep -q firmware_request_nowarn drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c; then
+  reject_firmware_nowarn drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
+else
+  reject_firmware drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
+fi
 clean_blob drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
 clean_blob drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h

(cherry picked from commit 2a8f7d71ce)
2019-09-15 20:13:24 +00:00
Tobias Happ
2aead2422f environment.profiles: fix order of profiles
This change is needed because the order of profiles correlate to the
order in PATH, therefore "/etc/profiles/per-user/$USER" always appeared
after the system packages directories.

(cherry picked from commit 33c834f2fb)
2019-08-14 12:59:52 -04:00
Tor Hedin Brønner
e823132dd4 flatpak: clear GDK_PIXBUF_MODULE_FILE
GDK_PIXBUF_MODULE_FILE is often set to a nix store path not available in a app
sandbox. This can cause some apps to fail launching, simply reset this env var
when running applications.

fixes https://github.com/NixOS/nixpkgs/issues/53441

(cherry picked from commit 752e176d67)
(cherry picked from commit be89fd6a03)
2019-08-14 12:59:30 -04:00
Vitalii Zinchenko
68b3bff32d libelf: fix download url (#65576)
(cherry picked from commit 179ab19856)
2019-07-29 20:46:01 -04:00
Dmitry Kalinkin
9f9806d63d arrow-cpp: add fixDarwinDylibNames
(cherry picked from commit e884852ac4)

cc #64144
2019-07-02 13:02:25 -04:00
Vladimír Čunát
3d4459e31b Merge #62861: exim: patch CVE-2019-10149 (into release-18.09) 2019-06-17 14:51:25 +02:00
Dmitry Kalinkin
cb1d0c44e9 rivet: fix rivet-mkhtml runtime
(cherry picked from commit 73b5a2531c)
2019-06-10 18:03:16 -04:00
Vladimír Čunát
7ba52aed86 Merge #62059: cups: patch CVE-2018-4700 (into release-18.09) 2019-06-09 13:52:32 +02:00
Robert Scott
bce378d215 exim: add patch for CVE-2019-10149 2019-06-08 15:00:42 +01:00
Domen Kožar
d37ee9933a backport lib.strings.hasInfix 2019-06-07 14:19:48 +02:00
Vladimír Čunát
0fe4d437a1 vim_configurable: also apply the security patch
(cherry picked from commit e95bbcf5f8)
2019-06-06 10:48:26 +02:00
Andreas Rammhold
9e5afbee96 Merge #62713: vim/neovim: Backports fix for ACE
(cherry picked from commit 0d62805dbf)
The patch is fairly simple and the vulnerability seems important.
2019-06-06 10:47:28 +02:00
Franz Pletz
14ab6e4d4a Merge pull request #62292 from etu/php-upgrades-1809
[18.09] php: 7.1.29 -> 7.1.30, 7.2.18 -> 7.2.19
2019-06-01 13:43:47 +00:00
Elis Hirwing
cf9da14db5 php72: 7.2.18 -> 7.2.19
Changelog: https://php.net/index.php#id2019-05-30-2
(cherry picked from commit 639e146de1)
2019-05-31 10:37:14 +02:00
Elis Hirwing
61c1d2da30 php71: 7.1.29 -> 7.1.30
Changelog: https://php.net/index.php#id2019-05-30-3
(cherry picked from commit 1d92bec205)
2019-05-31 10:37:00 +02:00
aszlig
d2c887061c python/hetzner: 0.8.1 -> 0.8.2
Only includes a small fix for the login into the Robot Web interface,
which is used to eg. provide access to admin accounts (which in turn is
used by the NixOps Hetzner backend).

Signed-off-by: aszlig <aszlig@nix.build>
(cherry picked from commit 56009d4a8d)
2019-05-27 19:22:20 +02:00
Robert Scott
3ebabc95f1 cups: add patch for CVE-2018-4700 2019-05-25 12:34:06 +01:00
Tim Steinbach
66af519580 linux: 4.9.176 -> 4.9.177
(cherry picked from commit e289798ec8)
2019-05-19 16:04:46 +02:00
Tim Steinbach
f3cd79372b linux: 4.4.179 -> 4.4.180
(cherry picked from commit b5c73e967c)
2019-05-19 16:04:08 +02:00
Tim Steinbach
bb599d51f9 linux: 4.19.42 -> 4.19.44
(cherry picked from commit e9ec2f1f29)
2019-05-19 16:04:04 +02:00
Tim Steinbach
9d9d6de95d linux: 4.14.118 -> 4.14.120
(cherry picked from commit 08aae882b6)
2019-05-19 16:01:46 +02:00
samsonan-it
a7e559a550 Merge #60201: neo.map: fix URL
Current URL is no longer available.

(cherry picked from commit 6e100ae88f)
2019-05-19 10:21:32 +02:00
Renaud
87f146a41c Merge pull request #61637 from c0bw3b/sec/1809/mds
[18.09] spectre-meltdown-checker: 0.39 -> 0.41
2019-05-17 19:42:13 +02:00
Will Dietz
faf303913b spectre-meltdown-checker: 0.40 -> 0.41
https://github.com/speed47/spectre-meltdown-checker/releases/tag/v0.41
(cherry picked from commit f5b400b875)
2019-05-17 18:44:30 +02:00
R. RyanTM
3c0234e88e spectre-meltdown-checker: 0.39 -> 0.40
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/spectre-meltdown-checker/versions

(cherry picked from commit 4ca9524e98)
2019-05-17 18:44:24 +02:00
Renaud
2296f0fc95 Merge pull request #61551 from risicle/ris-leptonica-fix-18.09-backport
[r18.09] leptonica: patch multiple CVEs
2019-05-16 11:31:22 +02:00
Robert Scott
c8cd51d108 leptonica: patch multiple CVEs
this should fix CVE-2018-3836, CVE-2018-7186, CVE-2018-7247 & CVE-2018-7440

a fix for CVE-2018-7441 & CVE-2018-7442 is *not* included as its patches
are very wide-ranging

also enable tests to give confidence that I'm not completely butchering
the code

(cherry-picked from commit 0861ad591a)
2019-05-15 20:25:16 +01:00
Tim Steinbach
1e9e709953 linux: 4.9.174 -> 4.9.175 2019-05-11 09:23:53 -04:00
Tim Steinbach
ecbd1a1b4c linux: 4.19.41 -> 4.19.42 2019-05-11 09:23:52 -04:00
Tim Steinbach
356f4f64b2 linux: 4.14.117 -> 4.14.118 2019-05-11 09:23:50 -04:00
Renaud
6cd0603d75 Merge pull request #55442 from jacereda/fix-nvenc-licensing
ffmpeg-full: nvenc doesn't imply nonfree licensing
2019-05-10 13:54:17 +02:00
Jorge Acereda
65c52e11ab nv-codec-headers: fix license 2019-05-10 13:05:26 +02:00
Jorge Acereda
b869a42ddb nvenc: remove obsolete nvidia-video-sdk 2019-05-09 19:44:34 +02:00
Tim Steinbach
7413c884f0 linux: 4.9.173 -> 4.9.174 2019-05-08 10:15:18 -04:00
Tim Steinbach
ea757522ff linux: 4.19.40 -> 4.19.41 2019-05-08 10:15:16 -04:00
Tim Steinbach
187ab0f961 linux: 4.14.116 -> 4.14.117 2019-05-08 10:15:15 -04:00
Tim Steinbach
c2a6501db0 linux: 4.19.39 -> 4.19.40 2019-05-05 11:29:14 -04:00
Elis Hirwing
8b166e5007 Merge pull request #60882 from etu/1809-php-upgrades
[18.09] php: 7.1.27 -> 7.1.29, 7.2.16 -> 7.2.18
2019-05-05 11:43:47 +02:00
Tim Steinbach
9e149f7607 linux: 4.9.172 -> 4.9.173
(cherry picked from commit 5ee553b280)
2019-05-04 10:42:29 -04:00
Tim Steinbach
d267ae82e1 linux: 4.19.38 -> 4.19.39
(cherry picked from commit 7d0a77cd36)
2019-05-04 10:42:27 -04:00
Tim Steinbach
7b77a9ad60 linux: 4.14.115 -> 4.14.116
(cherry picked from commit a03324e9ba)
2019-05-04 10:42:26 -04:00
Vladimír Čunát
a483713a0e pinentry: update patch url
I verified the hash did NOT change as suggested in #60699.

(cherry picked from commit 0b9c477719)
2019-05-04 00:24:56 +02:00
Elis Hirwing
c57d980fd3 php72: 7.2.17 -> 7.2.18
Changelog: https://www.php.net/ChangeLog-7.php#7.2.18
(cherry picked from commit 6f3625a1c6)
2019-05-03 19:45:12 +02:00
Will Dietz
57d39230d5 php72: 7.2.16 -> 7.2.17
security release, see announcement:
https://www.php.net/archive/2019.php#id2019-04-04-2

(cherry picked from commit 76394e36ec)
2019-05-03 19:45:06 +02:00
Elis Hirwing
33dddace72 php71: 7.1.28 -> 7.1.29
Changelog: https://www.php.net/ChangeLog-7.php#7.1.29
(cherry picked from commit 2a0125c0ce)
2019-05-03 19:44:36 +02:00
Will Dietz
1f90d6aeeb php71: 7.1.27 -> 7.1.28
security release:
https://www.php.net/archive/2019.php#id2019-04-04-3

(cherry picked from commit b8446dcc57)
2019-05-03 19:44:32 +02:00
Dmitry Kalinkin
f2132308c4 texlive: provide bin.texlive on Darwin too
texlive attribute was accidentally added in attrset wrapped with

  stdenv.lib.optionalAttrs (!stdenv.isDarwin)

Fixes: dbc2c1c4b8 ('texlive: add missing perl dependencies for latexindent')
(cherry picked from commit b6d0bdf513)
2019-05-03 10:35:48 -04:00
Dmitry Kalinkin
fc98b4e129 texlive: add missing perl dependencies for latexindent
(cherry picked from commit dbc2c1c4b8)

cc #59537
2019-05-03 08:06:27 -04:00
Tim Steinbach
8114a09a4a linux: 4.14.114 -> 4.14.115
(cherry picked from commit 5d03bfd653)
2019-05-02 13:58:50 -04:00
Tim Steinbach
44c66417f4 linux: 4.19.37 -> 4.19.38
(cherry picked from commit e0bf73dbde)
2019-05-02 13:58:49 -04:00
Tim Steinbach
0d84ab811e linux: 4.9.171 -> 4.9.172
(cherry picked from commit 9d7638371f)
2019-05-02 13:58:48 -04:00
Renaud
41245517a9 Merge pull request #60673 from c0bw3b/backport/1809/thinprovtools
[18.09] thin-provisioning-tools: fix patch url
2019-05-02 00:18:20 +02:00
Mario Rodas
19b90303a0 thin-provisioning-tools: fix patch url
Void Linux changed its github organization from "voidlinux" to "void-linux"
See: https://voidlinux.org/news/2018/06/GitHub-Organisation-is-moving.html

(cherry picked from commit 898f34a059)
2019-05-01 23:18:34 +02:00
Samuel Dionne-Riel
ca6a1a1caf Merge pull request #60342 from andir/18.09/bind
[18.09] bind: 9.12.3-P4 -> 9.12.4-P1
2019-04-27 17:31:13 -04:00
Andreas Rammhold
6a8325bcb0 bind: apply atomics to refcount patch
Upstream added a commit [1] right after the release that fixes the
aarch64 atomic operation linker issue we have been seeing [2].

[1] d72f436b7d
[2] https://github.com/NixOS/nixpkgs/issues/60301#issue-437896459

(cherry picked from commit 37dd347cd3)
2019-04-27 21:12:40 +02:00
Will Dietz
872e1ced45 bind: 9.12.3-P4 -> 9.12.4-P1
https://www.openwall.com/lists/oss-security/2019/04/25/1

CVE-2018-5743, CVE-2019-6467, and CVE-2019-6468

(cherry picked from commit f0f081d3b4)
2019-04-27 21:11:50 +02:00
Tim Steinbach
28c541dc9a linux: Remove i2c-oops patch
(cherry picked from commit c08aa32c90)
2019-04-27 08:27:37 -04:00
Tim Steinbach
d328bd14b8 linux: 4.9.170 -> 4.9.171
(cherry picked from commit 8d98033d99)
2019-04-27 08:27:28 -04:00
Tim Steinbach
d002a2baa5 linux: 4.4.178 -> 4.4.179
(cherry picked from commit 3d829058a1)
2019-04-27 08:27:27 -04:00
Tim Steinbach
d352b2d42e linux: 4.19.36 -> 4.19.37
(cherry picked from commit d43faab5ef)
2019-04-27 08:27:26 -04:00
Tim Steinbach
70d8e4aa35 linux: 4.14.113 -> 4.14.114
(cherry picked from commit ae7baea76f)
2019-04-27 08:27:05 -04:00
Ambroz Bizjak
196979ee53 Fix kernel oops on boot due to bug in i2c driver.
https://github.com/NixOS/nixpkgs/issues/60126
https://lkml.org/lkml/2019/4/24/1123

The patch should be removed in the next round of stable releases because the fix should be included.

(cherry picked from commit 1e8a080589)
(cherry picked from commit a9c40eef1f)
2019-04-25 20:25:14 -04:00
Florian Klink
571b40d3f5 Merge pull request #60074 from flokli/18.09/gitlab-11.9.8
[18.09] gitlab: 11.9.1 -> 11.9.8
2019-04-23 11:24:45 +02:00
Florian Klink
c6d78acb79 gitlab-ce: 11.9.1 -> 11.9.8
(cherry picked from commit 04b5eb10c0)
2019-04-23 09:47:47 +02:00
Florian Klink
aaa5ecf5a3 gitlab-ee: 11.9.1 -> 11.9.8
(cherry picked from commit 33423e52c6)
2019-04-23 09:47:47 +02:00
Florian Klink
ee048f20b4 gitlab-workhorse: 8.3.1 -> 8.3.3
(cherry picked from commit 74eb807f83)
2019-04-23 09:47:47 +02:00
Silvan Mosberger
accbbc51a7 Merge pull request #59839 from dotlambda/dovecot-CVE-2019-10691
[18.09] dovecot: fix CVE-2019-10691
2019-04-22 22:45:07 +02:00
Tim Steinbach
ce0ec21d6c linux: 4.9.169 -> 4.9.170
(cherry picked from commit 24867c60e4)
2019-04-20 08:41:44 -04:00
Tim Steinbach
f2f5341f32 linux: 4.19.35 -> 4.19.36
(cherry picked from commit d5bbae8308)
2019-04-20 08:41:43 -04:00
Tim Steinbach
f9ba96d59a linux: 4.14.112 -> 4.14.113
(cherry picked from commit ab17efc087)
2019-04-20 08:41:42 -04:00
Robert Schütz
af0efb3d80 dovecot: fix CVE-2019-10691
https://dovecot.org/pipermail/dovecot-news/2019-April/000406.html
2019-04-18 16:51:18 +02:00
Tim Steinbach
373c8c385e openjdk: 8u202 -> 8u212
(cherry picked from commit 0540650f22)
2019-04-17 10:08:21 -04:00
Tim Steinbach
f2f5bd31ae linux: 4.9.168 -> 4.9.169
(cherry picked from commit 41336064ab)
2019-04-17 10:07:31 -04:00
Tim Steinbach
88f001bc41 linux: 4.19.34 -> 4.19.35
(cherry picked from commit f9c38693da)
2019-04-17 10:07:30 -04:00
Tim Steinbach
ce2e6dc265 linux: 4.14.111 -> 4.14.112
(cherry picked from commit dd3964e885)
2019-04-17 10:07:29 -04:00
strager
2aa505b77c boost: fix 1.55 build on macOS (#59508)
darwin-no-system-python.patch does not apply cleany on Boost 1.55's
sources. Fix this patch file for Boost 1.55, making it build
successfully on macOS.

(cherry picked from commit 153e7fca32)
2019-04-16 03:17:31 -04:00
Andreas Rammhold
05ef70a46f Merge pull request #59394 from andir/18.09/firefox
[18.09] firefox: 66.0.2 -> 66.0.3, firefox-bin: 66.0.2 -> 66.0.3
2019-04-13 16:30:47 +02:00
Florian Klink
47bc2faaf3 Merge pull request #59392 from flokli/18.09/gitea-1.7.6
[18.09] gitea 1.7.6
2019-04-13 13:22:41 +02:00
Florian Klink
c06c93b3ef gitea: 1.7.5 -> 1.7.6
From [release notes](https://github.com/go-gitea/gitea/releases/tag/v1.7.6):

SECURITY: Prevent remote code execution vulnerability with mirror repo URL settings
(cherry picked from commit 7578ec44dc)
2019-04-13 13:12:18 +02:00
Elis Hirwing
b43d1d87f1 gitea: 1.7.3 -> 1.7.5
Changelogs:
https://github.com/go-gitea/gitea/releases/tag/v1.7.5
https://github.com/go-gitea/gitea/releases/tag/v1.7.4
(cherry picked from commit c94d027510)
2019-04-13 13:12:00 +02:00
Milan Pässler
20590e25aa gitea: 1.7.1 -> 1.7.3
(cherry picked from commit 1246a736b1)
2019-04-13 13:03:09 +02:00
Pierre Bourdon
4224ef9166 nixos/tests/gitea: fix eval warnings
trace: warning: config.services.gitea.database.password will be stored as plaintext
        in the Nix store. Use database.passwordFile instead.

(Arguably, this shouldn't be a warning at all. But making it happy is
easier than having a debate on the value of this warning.)

(cherry picked from commit c0829a0859)
2019-04-13 13:03:09 +02:00
Elis Hirwing
1e1dab03e5 gitea: 1.7.0 -> 1.7.1
Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.7.1
(cherry picked from commit ae0c47b4b7)
2019-04-13 13:03:09 +02:00
Victor SENE
768756a5d0 gitea: 1.6.4 -> 1.7.0
(cherry picked from commit f5d69f88b7)
2019-04-13 13:03:09 +02:00
taku0
ee2bc58105 firefox-bin: 66.0.2 -> 66.0.3
(cherry picked from commit 7b49c78dad)
2019-04-13 12:28:36 +02:00
taku0
81e3286063 firefox: 66.0.2 -> 66.0.3
(cherry picked from commit 3412a2cfcc)
2019-04-13 12:28:34 +02:00
Andreas Rammhold
28c14967a6 Merge pull request #58352 from andir/18.09/thunderbird
[18.09] thunderbird: 60.5.1 -> 60.6.0
2019-04-12 16:05:22 +02:00
Vladyslav M
46d3867a08 Merge pull request #59282 from booxter/flash
[18.09] flashplayer: 32.0.0.142 -> 32.0.0.171
2019-04-11 01:41:16 +03:00
taku0
2e20179a47 flashplayer: 32.0.0.156 -> 32.0.0.171
(cherry picked from commit 3eb4e958b4)
2019-04-10 14:46:00 -07:00
taku0
5dabd04d4c flashplayer: 32.0.0.142 -> 32.0.0.156 (#57571)
(cherry picked from commit e933c7875b)
2019-04-10 14:45:56 -07:00
Sarah Brofeldt
ed436a6923 Merge pull request #59062 from aanderse/redmine-18.09-backport
redmine: 3.4.9 -> 3.4.10 (18.09 backport)
2019-04-10 17:45:31 +02:00
Tor Hedin Brønner
9484ea47d0 Merge pull request #59229 from hedning/flatpak-fixes
flatpak: 1.0.5 -> 1.0.8
2019-04-10 12:55:19 +02:00
xeji
22a606e20d Merge pull request #59224 from vdemeester/18.09-update-containerd
[18.09] containerd: 1.1.2 -> 1.1.7
2019-04-09 22:25:45 +02:00
Vincent Demeester
816ee7e6df containerd: 1.1.2 -> 1.1.7
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2019-04-09 21:20:49 +02:00
Tor Hedin Brønner
65606e1565 flatpak: 1.0.5 -> 1.0.8
security fixes
2019-04-09 20:43:21 +02:00
Will Dietz
a5ed21434d libssh2: 1.8.0 -> 1.8.1 (SECURITY)
Release announcement:
https://www.libssh2.org/mail/libssh2-devel-archive-2019-03/0009.shtml
Security info:
https://www.libssh2.org/mail/libssh2-devel-archive-2019-03/0010.shtml

(cherry picked from commit efee45b05a)
PR #57884
Co-authored-by: Linus Heckemann <git@sphalerite.org>
2019-04-08 08:37:18 +02:00
Dmitry Kalinkin
feaf8ac463 qt511.qtwebengine: fix eval 2019-04-07 23:04:42 -04:00
Dmitry Kalinkin
f2082ef1da qt5.qtwebengine: fail properly
QtWebEngine's build system is setup to perform certain platform checks
(see mkspecs/features/platform.prf). But a failed check will not cause
configuration phase to fail, but instead it configures no build targets.
So in such case the build will successfully perform build and install
phases. An empty output directories will are produced and the build
succeeds.

This patches qtwebengine qmake files to properly fail during
configuration phase.

This doesn't touch qt56 as it doesn't have this mechanism.

(cherry picked from commit 3e3e3918f2)
2019-04-07 23:03:32 -04:00
Dmitry Kalinkin
1b61f959be qt59.qtwebengine: fix on darwin
This ports a patch that is already used in 5.11. Also one of the
substituteInPlace call fails because a file doesn't exist.

(cherry picked from commit 0624deb5df)
2019-04-07 22:55:19 -04:00
Dmitry Kalinkin
f72758d968 qt5.qtwebengine: refactor more things to use patches instead of substituteInPlace
qt59.qtwebengine doesn't need those fixes (probably since the recent
minor version bump)

(cherry picked from commit ccd1bf610d)
2019-04-07 22:54:16 -04:00
Dmitry Kalinkin
17ef55fa36 qt5.qtwebengine: disable platform check using patches
The previous code using substituteInPlace was broken for both 5.9 and
5.11 (latter was broken after a minor release bump). Using patches
should make things fail loudly and prevent modules/qtwebengine.nix from
being littered with version checks.

(cherry picked from commit 1809832958)
2019-04-07 21:31:16 -04:00
Dmitry Kalinkin
490a7c42b9 qt5.qtwebengine: refactor to use lib.versionOlder
(cherry picked from commit 56dcf6e1f6)
2019-04-07 21:25:23 -04:00
Dmitry Kalinkin
8afd782257 qt5.qtwebengine: don't propagate cups dependency
(cherry picked from commit ecbb9d3639)
2019-04-07 21:23:29 -04:00
Dmitry Kalinkin
1de00e3eec qt511.qtwebengine: fix build on darwin
Co-Authored-By: Josef Kemetmüller <josef.kemetmueller@gmail.com>
(cherry picked from commit 45ab55e6e2)
2019-04-07 21:23:14 -04:00
Dmitry Kalinkin
890e1b1d09 xcbuild: provide migcom in toolchain
This is needed to facilitate build of qt5.qtwebengine on darwin

(cherry picked from commit 7a6d18cac5)
2019-04-07 21:21:29 -04:00
Vladimír Čunát
cd1b649e11 Merge #57952: qemu: apply CVE-2019-3812 patch (release-18.09)
master: a6dd84a
2019-04-07 11:24:13 +02:00
Vladimír Čunát
98b7db5160 Merge #57959: subversion security updates (into release-18.09)
CVE-2018-11803
2019-04-07 10:47:55 +02:00
Wael Nasreddine
a58fe6ef86 Merge #57711: go: 1.11.5 -> 1.11.6
(cherry picked from commit c465292832)
Fixes #58264 CVE-2019-9741
2019-04-07 10:16:45 +02:00
Vladimír Čunát
8afd997b0c Merge #59036: wget: 1.20.1 -> 1.20.3 (SECURITY)
(cherry picked from commit ca494bf6c3)
2019-04-07 10:00:35 +02:00
Will Dietz
f9576d0cce youtube-dl: 2019.04.01 -> 2019.04.07
(cherry picked from commit 0f620ef43a)
2019-04-07 02:32:02 -04:00
Tim Steinbach
680b155975 linux: 4.9.167 -> 4.9.168
(cherry picked from commit 21373e9c6f)
2019-04-06 12:59:28 -04:00
Tim Steinbach
bff31dd80d linux: 4.19.33 -> 4.19.34
(cherry picked from commit c45589b0bb)
2019-04-06 12:59:27 -04:00
Tim Steinbach
46b460ef2a linux: 4.14.110 -> 4.14.111
(cherry picked from commit b60ce2e638)
2019-04-06 12:59:26 -04:00
Aaron Andersen
5ce1b11105 redmine: 3.4.9 -> 3.4.10
(cherry picked from commit b6b3287897)
2019-04-06 09:08:20 -04:00
Robert Schütz
222950952f postfix: 3.3.3 -> 3.3.4 (#58680)
http://www.postfix.org/announcements/postfix-3.4.5.html
2019-04-05 10:07:50 +02:00
Silvan Mosberger
58efb6980f Merge pull request #58967 from aanderse/apacheHttpd-2.4.39
apacheHttpd: 2.4.35 -> 2.4.39
2019-04-04 17:42:57 +02:00
R. RyanTM
f2b553e810 apacheHttpd: 2.4.35 -> 2.4.39
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/apache-httpd/versions

(cherry picked from commit c3d1012f02)
2019-04-04 11:12:41 -04:00
Tim Steinbach
6ae427dee0 linux: 4.19.32 -> 4.19.33
(cherry picked from commit 4a91a6e05f)
2019-04-03 19:38:31 -04:00
Tim Steinbach
f3543d07f0 linux: 4.14.109 -> 4.14.110
(cherry picked from commit c0d537c780)
2019-04-03 19:38:29 -04:00
Tim Steinbach
0c2cc7f921 linux: 4.9.166 -> 4.9.167
(cherry picked from commit e731feae7f)
2019-04-03 19:38:28 -04:00
Tim Steinbach
02ab2b8772 linux: 4.4.177 -> 4.4.178
(cherry picked from commit 84fc0fb8d1)
2019-04-03 19:38:27 -04:00
Will Dietz
1d36ad6d16 youtube-dl: 2019.03.18 -> 2019.04.01
(cherry picked from commit 5ed1d8ea03)
2019-04-03 02:13:49 -04:00
John Ericson
884b0a4417 Merge pull request #58828 from obsidiansystems/km-fix-androidndk-cc-wrapper-flags
androidndk-pkgs: Fix cc-wrapper flags
2019-04-02 14:46:51 -04:00
Ken Micklas
7afd5e3e7a Remove unrecognized "float" settings for Android aarch32 systems 2019-04-02 13:24:52 -04:00
Ken Micklas
5f4bf240f5 androidndk-pkgs: Fix cc-wrapper flags 2019-04-02 12:45:37 -04:00
Silvan Mosberger
58fbebc4ea browserpass: Fix evaluation
When I backported https://github.com/NixOS/nixpkgs/pull/58639 to 18.09,
I didn't realize that buildGoPackage still required the `name`
attribute. Thanks to @primeos for notifying me of this.
2019-04-02 13:22:27 +02:00
Michael Weiss
e2a1fd1172 Merge pull request #58770 from primeos/security-backports-for-18.09
[18.09] Security backports for html-proofer and gollum
2019-04-02 13:11:16 +02:00
Michael Weiss
216f062a61 gollum: Update the dependencies (security)
See #58709.

(cherry picked from commit a92c7bb0cc)
2019-04-02 12:34:02 +02:00
Alyssa Ross
02aceb65cc gollum: rack: 1.6.10 -> 1.6.11
CVE-2018-16470: https://seclists.org/oss-sec/2018/q4/128
CVE-2018-16471: https://seclists.org/oss-sec/2018/q4/129
(cherry picked from commit 5b2da1ab19)
2019-04-02 12:33:48 +02:00
Michael Weiss
70d8066e56 html-proofer: 3.8.0 -> 3.10.2 (security)
See #58709.

(cherry picked from commit 20b9e18891)
2019-04-02 12:32:29 +02:00
Silvan Mosberger
b7910443a7 nixos/browserpass: update for v3
See https://github.com/browserpass/browserpass-native/issues/31

Additionally browserpass was removed from systemPackages, because it
doesn't need to be installed, browsers will get the path to the binary
from the native messaging host JSON.

(cherry picked from commit e98ee8d70c)
2019-04-01 17:36:47 +02:00
Silvan Mosberger
d22d43ac19 browserpass: 2.0.22 -> 3.0.1
See https://github.com/browserpass/browserpass-native/issues/31

This is fully backwards compatible.

(cherry picked from commit 6104fba188)
2019-04-01 17:36:24 +02:00
Vladimír Čunát
43ba99fa03 notary: disable tests (for now)
I don't really know anything about the package;
I just noticed the regression on hydra.nixos.org.

(cherry picked from commit ba18b47c2a)
2019-03-31 18:04:44 +02:00
Vladimír Čunát
3eed6d4573 Merge branch 'staging-18.09' into release-18.09
Hydra's output seems good.
2019-03-31 14:58:53 +02:00
Vladimír Čunát
fccf2a62fb dnsperf: fixup build with new bind version
(cherry picked from commit c327693407)
2019-03-31 14:57:04 +02:00
Florian Klink
2b8a526c5a Merge pull request #58535 from andir/18.09/firefox
[18.09] firefox: 66.0.1 -> 66.0.2, firefox-bin: 66.0.1 -> 66.0.2
2019-03-29 23:57:32 +01:00
Ben Gamari
399e3f3bc1 nixos/gitlab: Install and fixup vendorised gitlab-shell
gitaly now ships its own vendorised version of gitlab-shell. Previously
we failed to install this, resulting in
https://gitlab.com/gitlab-org/gitlab-ce/issues/59403.

(cherry picked from commit 50a4de7326)
2019-03-29 23:42:25 +01:00
Vladimír Čunát
4aebf787b8 Merge branch 'release-18.09' into staging-18.09 2019-03-29 14:07:17 +01:00
Andreas Rammhold
673179ddc3 firefox: 66.0.1 -> 66.0.2
(cherry picked from commit c8186ad7b3)
2019-03-29 12:21:32 +01:00
Andreas Rammhold
21eb4c4651 firefox-bin: 66.0.1 -> 66.0.2
(cherry picked from commit 6977980927)
2019-03-29 12:19:59 +01:00
Domen Kožar
395a543f36 haskell: allow separate bin output, disable by default
(cherry picked from commit bd06834d5e)
Signed-off-by: Domen Kožar <domen@dev.si>
2019-03-29 15:21:49 +07:00
Florian Klink
22483857a1 Merge pull request #58355 from andir/18.09/ghostscript-CVE-2019-6116
[18.09] ghostscript: add patch for CVE-2019-6116
2019-03-28 23:37:38 +01:00
Pierre Bourdon
29ed7c827f ghostscript: add patch for CVE-2019-6116
This is tagged as version 9.26a in the ghostpdl repo, but unfortunately
there are no tarballs released with that version number so far. We'll
continue calling this version 9.26 for now for simplicity's sake (and we
can switch to 9.26a and remove the patch when it's properly released).

Fixes #58262
Fixes #58089

(cherry picked from commit 91c46d17d5)
2019-03-28 23:35:02 +01:00
Florian Klink
7fcf299938 matomo: 3.9.0 -> 3.9.1
(cherry picked from commit 26f19430eb)
2019-03-28 22:58:43 +01:00
Florian Klink
c9364bf046 matomo: update url
(cherry picked from commit 4ffd3ad4fd)
2019-03-28 22:58:43 +01:00
R. RyanTM
bbded8f232 matomo: 3.8.1 -> 3.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/matomo/versions

(cherry picked from commit 139243406b)
2019-03-28 22:58:42 +01:00
Florian Jacob
1998611779 nixos/matomo: 3.8.0 introduces matomo.{php,js} files
(cherry picked from commit faac33bc77)
2019-03-28 22:58:33 +01:00
Florian Jacob
c569b15e42 matomo: 3.7.0 -> 3.8.1
security update

(cherry picked from commit 2f059806ef)
2019-03-28 22:58:33 +01:00
Peter Simons
29069cd291 Merge pull request #58485 from dotlambda/dovecot-CVE-2019-7524
[18.09] dovecot: add patch for CVE-2019-7524
2019-03-28 21:29:01 +01:00
Ben Gamari
2ec3dca6af nixos/gitaly: Run gitaly with procps in scope
Gitaly uses `ps` to track the RSS of `gitlab-ruby` and kills it when it
detects excessive memory leakage. See
https://gitlab.com/gitlab-org/gitaly/issues/1562.

(cherry picked from commit b90f5f03c2)
2019-03-28 18:25:02 +01:00
Robert Schütz
69cc728e2b dovecot: add patch for CVE-2019-7524
This applies commits
578cf77e84
696320b0f3
2019-03-28 15:18:23 +01:00
Will Dietz
f5900a9969 gnutls: 3.6.5 -> 3.6.7, security!
https://lists.gnupg.org/pipermail/gnutls-help/2019-March/004497.html
Close #58437.

(cherry picked from commit 225b164cc3)
The gnutls minor updates tend to have high level of compatibility,
and we're fixing some security problems.
2019-03-28 12:21:13 +01:00
Vladimír Čunát
69985a7e27 gnutls: 3.6.2 -> 3.6.5
No security problems have been published about 3.6.x so far,
but I'd certainly count the almost-transparent TLS 1.3 support
as a security improvement.

(cherry picked from commit 2ff530ec53)
2019-03-28 12:20:23 +01:00
Pascal Wittmann
033984c0b7 Merge pull request #58465 from rnhmjoj/monero-18.09
[18.09] monero: 0.13 -> 0.14
2019-03-28 08:20:25 +01:00
rnhmjoj
4f8e6ef622 monero-gui: fix missing qml imports
(cherry picked from commit bbefa951e7)
2019-03-28 01:50:45 +01:00
David Meister
78046ccf1b monero-gui: 0.13.0.4 -> 0.14.0.0
(cherry picked from commit b1d040b39b)
2019-03-28 01:50:34 +01:00
David Meister
b330796a37 monero: 0.13.0.4 -> 0.14.0.2
(cherry picked from commit a0a1dc0a55)
2019-03-28 01:50:24 +01:00
Graham Christensen
dc15b7f854 Merge pull request #58431 from alexbiehl/alex/nix-layers
dockerTools: align generated layer archives with docker's output
(cherry picked from commit 6af317616e)
2019-03-27 18:19:54 -04:00
Tim Steinbach
5a03c6872c linux: 4.19.31 -> 4.19.32
(cherry picked from commit ec83ff060e)
2019-03-27 10:14:11 -04:00
Tim Steinbach
f78bcc6c90 linux: 4.14.108 -> 4.14.109
(cherry picked from commit e3bee73c18)
2019-03-27 10:13:52 -04:00
Tim Steinbach
82a2b182bc linux: 4.9.165 -> 4.9.166
(cherry picked from commit ebd253309e)
2019-03-27 10:13:51 -04:00
Michael Weiss
51bab7011d Merge pull request #58430 from primeos/signal-desktop-backport
[18.09] signal-desktop backport
2019-03-27 12:20:33 +01:00
Michael Weiss
c2b4316819 signal-desktop: 1.21.2 -> 1.22.0
(cherry picked from commit e66b8d5fb1)
2019-03-27 11:27:49 +01:00
Michael Weiss
2db9668922 signal-desktop: 1.21.1 -> 1.21.2
(cherry picked from commit c498b7004d)
2019-03-27 11:27:49 +01:00
Michael Weiss
8dd725151f signal-desktop: 1.21.0 -> 1.21.1
(cherry picked from commit fcbcd327e5)
2019-03-27 11:27:49 +01:00
Michael Weiss
6ab2a54ccc signal-desktop: 1.20.0 -> 1.21.0
(cherry picked from commit e4156fb421)
2019-03-27 11:27:48 +01:00
Florian Klink
776fb73866 Merge pull request #58349 from andir/18.09/tzdata
[18.09] tzdata: 2018g -> 2019a
2019-03-27 09:30:32 +01:00
Andreas Rammhold
10207c23b3 tzdata: 2018g -> 2019a
(cherry picked from commit 32538ff51f15c2a416949a6f75ef41a505d530f8)
2019-03-27 09:09:35 +01:00
Tom F
c664b21337 adoptopenjdk: Remove libfreetype.so from adoptopenjdk's derivation. (#58411)
This caused some reverse dependencies of adoptopenjdk to depend on
adoptopenjdk's libfreetype, rather than the NixOS
libfreetype. For example: https://github.com/NixOS/nixpkgs/issues/57733

Now the derivation does not contain libfreetype.so . The JRE links to
nixpkg's freetype:

$ ldd /nix/store/9iyxm1nkn35xhjgri041r980z4p5ls5g-adoptopenjdk-hotspot-bin-11.0.2/lib/libfontmanager.so | grep -i freetype
	libfreetype.so => /nix/store/ycbkq39cngzx19j829qzgdnw3mx3z78g-freetype-2.9.1/lib/libfreetype.so (0x0000795e30702000)

(cherry picked from commit 6bae07337e)
2019-03-26 23:02:10 -04:00
Silvan Mosberger
efc8c2cd55 Merge pull request #58386 from booxter/release-18.09-turses-fix
turses: fix crash when starting with existing config file
2019-03-27 03:38:24 +01:00
ajs124
2c54e2d785 performous: fix build by using boost 166 (#58418)
(cherry picked from commit 910c1d05b7)
2019-03-26 22:08:49 -04:00
Alex Guzman
38e0576c31 nixos/security: make duo support secure failure correctly
seems that this got broken when the config option was made to use enums. "secure" got replaced with "enum", which isn't a valid option for the failure mode.

(cherry picked from commit 0c34b9fcf8)
2019-03-27 01:59:52 +01:00
Florian Klink
7e05cfabe1 Merge pull request #58407 from andir/18.09/avahi
[18.09] avahi: apply patches for CVE-2017-6519 & CVE-2018-1000845
2019-03-27 00:03:32 +01:00
Florian Klink
69c6f289f7 Merge pull request #58410 from flokli/18.09-gitlab-11.9.1
[18.09] gitlab 11.7.5 -> 11.9.1, backport of more fixes and test improvements
2019-03-26 23:59:55 +01:00
Florian Klink
68eaf07a7b gitlab: 11.9.0 -> 11.9.1
(cherry picked from commit dcac21bb15f8188f1e7ae87d57207308f86dd5f8)
2019-03-26 22:54:20 +01:00
Johan Thomsen
8b190da626 nixos/gitlab: added gzip and bzip2 as dependencies for gitaly
(cherry picked from commit 292c1ce7ff)
2019-03-26 22:52:18 +01:00
Jeff Slight
c4042a85ab gitlab: add openssh dependency to gitaly
(cherry picked from commit 059e5e0ba0)
2019-03-26 22:52:18 +01:00
Johan Thomsen
fcf257a4e9 nixos/gitlab: improved test to check download of repository archives
(cherry picked from commit 968d3c9c05)
2019-03-26 22:52:18 +01:00
Wael M. Nasreddine
caa3c17245 gitlab-shell: export GOCACHE in the installPhase
TMPDIR, in `GOCACHE = "$TMPDIR";`, will not be intepreted  when it's set
outside of a phase.

(cherry picked from commit 483d823ec4)
2019-03-26 22:52:17 +01:00
Ben Gamari
3a6c2a4bae nixos/gitlab: Introduce database pool size option
As well as a extraDatabaseConfig option.

(cherry picked from commit bd5ba09b79)
2019-03-26 22:52:17 +01:00
Andreas Rammhold
a6ddc35522 avahi: apply patches for CVE-2017-6519 & CVE-2018-1000845
(cherry picked from commit 87a762269f)
2019-03-26 21:42:21 +01:00
Ben Gamari
6522d74e5d gitlab: 11.8.2 -> 11.9.0
(cherry picked from commit d8c16f11a6)
2019-03-26 21:01:24 +01:00
Ben Gamari
f58bb3f191 gitlab: 11.7.5 -> 11.8.2
(cherry picked from commit 0ba98bb64c)
2019-03-26 21:01:20 +01:00
Ihar Hrachyshka
9751d10301 turses: fix crash when starting with existing config file
Fixes #57460

(cherry picked from commit 6f525a52d0)

Conflicts:
	pkgs/applications/networking/instant-messengers/turses/default.nix
2019-03-26 10:51:30 -07:00
Ihar Hrachyshka
ead962126c Switch homepage for turses to louipc fork
The original repo is gone.

(cherry picked from commit c59d2d3419)
2019-03-26 10:50:42 -07:00
taku0
9b6eddbd4d thunderbird: 60.5.2 -> 60.6.0
(cherry picked from commit 3c83eb43a5)
2019-03-26 11:19:43 +01:00
taku0
38063aab8d thunderbird: 60.5.1 -> 60.5.2
(cherry picked from commit 202f713153)
2019-03-26 11:19:39 +01:00
Will Dietz
2d656a9729 youtube-dl: 2019.03.01 -> 2019.03.18
(cherry picked from commit 0fa6ebe0a5)
2019-03-25 11:03:04 -04:00
Franz Pletz
90850bbf98 youtubeDL: 2019.02.18 -> 2019.03.01
(cherry picked from commit 86199e047c)
2019-03-25 11:03:01 -04:00
Franz Pletz
6ea3c4fa99 youtubeDL: 2019.01.30.1 -> 2019.02.18
(cherry picked from commit 7694c5149a)
2019-03-25 11:02:57 -04:00
Will Dietz
918bc44280 tor-browser-bundle-bin: 8.0.6 -> 8.0.8
(cherry picked from commit f114ab593e)
2019-03-25 10:43:05 +01:00
Samuel Dionne-Riel
40e716b92a ghc: Fixes backport (missing ghc822Binary) 2019-03-24 15:22:36 -04:00
Tim Steinbach
0ec4bb8658 linux: 4.19.30 -> 4.19.31
(cherry picked from commit 0e25209c33)
2019-03-24 12:20:13 -04:00
Philipp Volguine
3551de0ff8 paulstretch: init at version 2.2-2
This is a neat little program for extreme sound stretching and it was
not in the repo yet.

(cherry picked from commit e0c3c2ed52)

cc #57589 #58191
2019-03-23 19:55:26 -04:00
Andreas Rammhold
dcbe1b62b5 powerdns: 4.1.6 -> 4.1.7
This addresses CVE-2019-3871. The details of the issue can be retrieved
from the official announcement page [0].

[0] https://docs.powerdns.com/authoritative/security-advisories/powerdns-advisory-2019-03.html

(cherry picked from commit f4e9e42725)
2019-03-23 19:18:40 +01:00
Tim Steinbach
7e11e51ba8 linux: 4.14.107 -> 4.14.108
(cherry picked from commit eca0d0ad62)
2019-03-23 11:27:02 -04:00
Tim Steinbach
da0a76fcef linux: 4.9.164 -> 4.9.165
(cherry picked from commit d10015ea4f)
2019-03-23 11:27:00 -04:00
Tim Steinbach
f5ecc18af1 linux: 4.4.176 -> 4.4.177
(cherry picked from commit ece2d7d6a0)
2019-03-23 11:26:59 -04:00
Pascal Wittmann
51ba0286ac japser: 2.0.14 -> 2.0.16
(cherry picked from commit 96e93d6fa0)
2019-03-23 14:20:52 +01:00
Frederik Rietdijk
60acee5223 python35: 3.5.6 -> 3.5.7 2019-03-23 09:17:09 +01:00
Frederik Rietdijk
7dc8a0a20a python34: 3.4.9 -> 3.4.10 2019-03-23 09:17:09 +01:00
Andreas Rammhold
7270f27a5f Merge pull request #58156 from andir/18.09/firefox
[18.09] firefox: 66.0 -> 66.0.1, firefox-esr-60: 60.6.0esr -> 60.6.1esr
2019-03-23 09:01:52 +01:00
Peter Simons
dd28ae5c63 ghc: add new 8.6.4 version 2019-03-23 11:04:32 +07:00
Andreas Rammhold
d8251d760d firefox-esr-60: 60.6.0esr -> 60.6.1esr 2019-03-23 01:45:19 +01:00
Andreas Rammhold
c12ff07901 firefox: 66.0 -> 66.0.1 2019-03-23 01:45:04 +01:00
Andreas Rammhold
ed95b12264 firefox-bin: 66.0 -> 66.0.1 2019-03-23 01:44:55 +01:00
Herwig Hochleitner
43efac61c0 chromium: 73.0.3683.75 -> 73.0.3683.86
(cherry picked from commit ea34ad0e43)
2019-03-22 19:35:54 +01:00
Andreas Rammhold
680f9d7ea9 Merge pull request #57962 from andir/18.09/samba
[18.09] samba/ldb: fix CVE-2019-3824
2019-03-22 13:18:04 +01:00
Gabriel Ebner
f4b2ae96cc elan: 0.7.4 -> 0.7.5
(cherry picked from commit 11318d1ba2)
2019-03-22 11:17:09 +01:00
Jörg Thalheim
ed41adcde6 nix-review: 1.0.5 -> 2.0.0
(cherry picked from commit eb5afaf06b)
2019-03-22 07:09:14 +00:00
Jörg Thalheim
11b3807041 nix-review: 1.0.4 -> 1.0.5
(cherry picked from commit d4957cc98e)
2019-03-22 07:09:13 +00:00
Jörg Thalheim
0664a06388 nix-review: 1.0.2 -> 1.0.4
- also accept the full url of pull request i.e.
  https://github.com/NixOS/nixpkgs/pull/54323
- stream-parse nix-env's eval output
- fix logs for failed builds issued by remote builders
- prepare code for overlays like: https://github.com/NixOS/nixpkgs/pull/53934

(cherry picked from commit f6d6e5dcb5)
2019-03-22 07:09:12 +00:00
Jörg Thalheim
467c393495 nix-review: 1.0.1 -> 1.0.2
(cherry picked from commit 32f4166c67)
2019-03-22 07:09:11 +00:00
Simon Lackerbauer
15f0899451 atlassian-confluence: 6.11.1 -> 6.14.2
CVE-2019-3395, CVE-2019-3396

(cherry picked from commit 5ef5bbcd46)
2019-03-21 14:08:27 +00:00
Andreas Rammhold
8288fbd7ec samba4: apply patch for CVE-2019-3824 2019-03-20 14:13:56 +01:00
Andreas Rammhold
5a3d8d79ec ldb: apply patch for CVE-2019-3824 2019-03-20 14:13:56 +01:00
Gabriel Ebner
45456fecc7 elan: 0.5.0 -> 0.7.4
This fixes a bug with the github integration, the old version no longer
works due to github changes.

(cherry picked from commit 52c3ee6c4d)
2019-03-20 13:49:16 +01:00
Andreas Rammhold
00242aa4da subversion_1_10: 1.10.3 -> 1.10.4
bugfix release CVE-2018-11803 [0]

[0] https://subversion.apache.org/security/CVE-2018-11803-advisory.txt
2019-03-20 13:40:00 +01:00
R. RyanTM
9121e79b6d subversionClient: 1.10.2 -> 1.10.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/subversion-client/versions

(cherry picked from commit c5e2470b2e)
2019-03-20 13:14:08 +01:00
R. RyanTM
2c8a98a523 subversionClient: 1.11.0 -> 1.11.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/subversion-client/versions

(cherry picked from commit cd055b2f58)
2019-03-20 13:12:17 +01:00
Andreas Rammhold
d68f824426 qemu: apply CVE-2019-3812 patch
(cherry picked from commit c7d7c6fc41)
2019-03-20 11:41:41 +01:00
Tim Steinbach
3aa6408a8c linux: 4.19.29 -> 4.19.30
(cherry picked from commit b1c72326ce)
2019-03-19 08:58:43 -04:00
Tim Steinbach
a2bc79d0a7 linux: 4.14.106 -> 4.14.107
(cherry picked from commit 08414dd72e)
2019-03-19 08:58:42 -04:00
Tim Steinbach
5751489583 linux: 4.9.163 -> 4.9.164
(cherry picked from commit 9e2adb4e36)
2019-03-19 08:58:42 -04:00
Robert Hensing
b6050c5f43 Merge branch 'ngrok-update-backport' into release-18.09 2019-03-19 11:24:24 +01:00
Robert Hensing
6a67886b79 ngrok-2: Fix URLs and automate 2019-03-19 11:22:04 +01:00
Andreas Rammhold
8751edf7b8 Merge pull request #57861 from andir/18.09/firefox66
[18.09] firefox 65.0.2 -> 66, 60.5.2esr -> 60.6.0esr, firefox-bin: 65.0.2 -> 66.0
2019-03-19 08:21:07 +01:00
Léo Gaspard
e408cd4390 Merge branch 'pr-57863' into release-18.09
* pr-57863:
  PuTTY: 0.70 -> 0.71
2019-03-18 19:04:59 +01:00
Andreas Rammhold
7984e36986 Merge pull request #57569 from andir/18.09/nodejs
[18.09] nodejs_{6,8,10,11}_x: update, security fixes
2019-03-18 18:52:47 +01:00
Daniel Frank
07b8c657b8 PuTTY: 0.70 -> 0.71
(cherry picked from commit 9d95c9d78f)
2019-03-18 18:28:27 +01:00
Andreas Rammhold
0021ea861f firefox-esr-60: 60.5.2esr -> 60.6.0.esr
(cherry picked from commit 94d9400b4d)
2019-03-18 18:01:16 +01:00
Andreas Rammhold
d0f3ac2958 firefox-bin: 65.0.2 -> 66.0
(cherry picked from commit a1cd934ba3)
2019-03-18 17:58:15 +01:00
Andreas Rammhold
d4734ffe86 firefox: 65.0.2 -> 66.0
(cherry picked from commit dafe9c3cb0)
2019-03-18 17:54:45 +01:00
Andreas Rammhold
5d17a76f15 firefox: support building firefox 66 (and 60.6+)
(cherry picked from commit d64d42f12d)
2019-03-18 17:51:41 +01:00
Andreas Rammhold
122a66de9e rust-cbindgen_0_8_0: init at 0.8.0
This is a requirement for Firefox66. To retain compatibility with users
of rust-cbindgen I leave the others around since it usually breaks some
kind of compatibility.
2019-03-18 17:44:31 +01:00
Andreas Rammhold
a8e8de9e71 rustPlatform_1_31: init rustPlatform_1_31 attribute
rust_1_31 did exist already but the rustPlatform attrset was still
missing.
2019-03-18 17:43:34 +01:00
Michael Raskin
a95da2cd01 Merge pull request #57847 from tomfitzhenry/backport-llvm-big-parallel
llvm: mark as big-parallel
2019-03-18 13:00:03 +00:00
Graham Christensen
edd976dfbe llvm: mark as big-parallel
Big parallel jobs get many more (45) aarch64 cores than standard builds.
2019-03-18 18:46:23 +11:00
Michael Raskin
fdb5b68d15 Merge pull request #57668 from booxter/release-18.09-xscreensaver-perl
xscreensaver: Enable perl modules needed for RSS image fetch (#57629)
2019-03-15 08:09:21 +00:00
Ihar Hrachyshka
5bcb2d21c6 xscreensaver: Enable perl modules needed for RSS image fetch (#57629)
(cherry picked from commit 4730466366)
2019-03-14 14:23:22 -07:00
xeji
8252eaee34 Merge pull request #57651 from etu/release-18.09-php-updates
Release 18.09 php updates
2019-03-14 21:45:39 +01:00
Izorkin
1849e963d6 php72: 7.2.15 -> 7.2.16
(cherry picked from commit c6290e381f)
2019-03-14 19:23:16 +01:00
Izorkin
6cdf642d03 php71: 7.1.26 -> 7.1.27
(cherry picked from commit 627275399c)
2019-03-14 19:23:12 +01:00
Tim Steinbach
228271fe04 linux: 4.19.28 -> 4.19.29
(cherry picked from commit 82d6e57943)
2019-03-14 09:13:59 -04:00
Tim Steinbach
b98a69d968 linux: 4.14.105 -> 4.14.106
(cherry picked from commit 85924d84fc)
2019-03-14 09:13:58 -04:00
Tim Steinbach
132a24fa28 linux: 4.9.162 -> 4.9.163
(cherry picked from commit c130cb7374)
2019-03-14 09:13:57 -04:00
Edmund Wu
40f9098114 vscode: 1.32.1 -> 1.32.2
(cherry picked from commit ecc6ee8f1d)
2019-03-13 21:13:55 -04:00
Herwig Hochleitner
0c53b75ea6 chromium: 72.0.3626.121 -> 73.0.3683.75
CVE-2019-5787 CVE-2019-5788 CVE-2019-5789 CVE-2019-5790 CVE-2019-5791
CVE-2019-5792 CVE-2019-5793 CVE-2019-5794 CVE-2019-5795 CVE-2019-5796
CVE-2019-5797 CVE-2019-5798 CVE-2019-5799 CVE-2019-5800 CVE-2019-5801
CVE-2019-5802 CVE-2019-5803 CVE-2019-5804

(cherry picked from commit 006a699e69)
2019-03-13 16:23:16 +01:00
Will Dietz
3efcb4a4a3 nodejs-8_x: 8.15.0 -> 8.15.1 (security)
https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V8.md#8.15.1
(cherry picked from commit 702120ee90)
2019-03-13 11:44:49 +01:00
Will Dietz
5050c86e1a nodejs-6_x: 6.16.0 -> 6.17.0 (security)
https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V6.md#6.17.0
(cherry picked from commit 4df1c7234f)
2019-03-13 11:44:39 +01:00
Will Dietz
467e1c0cc9 nodejs-10_x: 10.15.0 -> 10.15.3 (security)
https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V10.md#10.15.3
https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V10.md#10.15.2
https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V10.md#10.15.1
(cherry picked from commit 9c894f8418)
2019-03-13 11:44:08 +01:00
Aria Edmonds
5d972dd2c9 discord: 0.0.8 -> 0.0.9
(cherry picked from commit 24c02a0f5d)
2019-03-12 17:10:00 -04:00
Bjørn Forsman
3c037fea9b deadpixi-sam: remove duplicate alias
It is already listed in aliases.nix, and I managed to get this from Nix:

  error: Alias deadpixi-sam is still in all-packages.nix

Fixes: 218d81bc9d ("all-packages: move aliases to aliases.nix")
(cherry picked from commit 38ae8aed16)
2019-03-12 13:04:42 +01:00
Tim Steinbach
60e2056e47 linux: 4.19.27 -> 4.19.28
(cherry picked from commit 810401284f)
2019-03-10 14:20:07 -04:00
Vladimír Čunát
a64f22b9fe Merge bind: 9.12.2 -> 9.12.3-P4 (into release-18.09)
Fixes #56358 CVE-2018-5741.
BIND maintenance releases seem quite conservative.
2019-03-10 10:24:23 +01:00
R. RyanTM
6a4742d210 bind: 9.12.3-P1 -> 9.12.3-P4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bind/versions

(cherry picked from commit e08f01f4e7)
2019-03-10 10:21:10 +01:00
R. RyanTM
f92f1a68e7 bind: 9.12.3 -> 9.12.3-P1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bind/versions

(cherry picked from commit f884c6c1de)
2019-03-10 10:21:08 +01:00
R. RyanTM
8e24938583 bind: 9.12.2-P2 -> 9.12.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bind/versions

(cherry picked from commit 21fbc6140e)
2019-03-10 10:21:05 +01:00
R. RyanTM
26ef5306fc bind: 9.12.2 -> 9.12.2-P2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bind/versions

(cherry picked from commit d1c1fbb61b)
2019-03-10 10:20:36 +01:00
Vladimír Čunát
3f49dd956e libarchive: apply upstream CVE patches
Fixes #57150.

(cherry picked from commit 5767c18d99)
2019-03-10 09:54:49 +01:00
Vladimír Čunát
3b8fc18111 pango: 1.42.1 → 1.42.4 (security)
Fixes #57183 CVE-2018-15120
It's a minimalistic version of commit f9943cd28a.
2019-03-10 09:34:17 +01:00
Herwig Hochleitner
37694c8cc0 nixos/virtualbox: add warning when for ineffective nixpkgs config
nixpkgs.config.virtualbox.enableExtensionPack doesn't do anything, but
used to. Add a warning for the unsuspecting.

(cherry picked from commit 8b6a38ce7e)
2019-03-08 23:20:03 +01:00
Will Dietz
2be82fd06e ntp: 4.2.8p12 -> 4.2.8p13 (#57059)
From http://www.ntp.org/index.html:
> ntp-4.2.8p13 was released on 07 March 2019.
> It addresses 1 medium-severity security issue in ntpd, and provides 17
> other non-security fixes and 1 improvements over 4.2.8p12.

(cherry picked from commit d7c23cc65f)
2019-03-08 23:11:29 +01:00
Edmund Wu
7b6408a06a vscode: 1.32.0 -> 1.32.1 (#57089)
(cherry picked from commit 128f691b87)
2019-03-08 16:44:29 -05:00
kyren
28e30399a9 stepmania: switch to clangStdenv
Stepmania appears to be miscompiled with gcc, fixes #54227

(cherry picked from commit ff6e4b44dc)
2019-03-08 18:30:25 +01:00
Edmund Wu
fef0aaaaab vscode: 1.31.1 -> 1.32.0
(cherry picked from commit 2a0d01f076)
2019-03-07 17:59:39 -05:00
Dmitry Kalinkin
31e932c0d4 pythonPackages.sqlalchemy_migrate: disable tests 2019-03-07 13:13:02 -05:00
Frederik Rietdijk
8abca4bc7b python: Django: 2.1.5 -> 2.1.7
(cherry picked from commit b67226fab2)
2019-03-07 09:54:51 +01:00
Lancelot SIX
aceb50ed82 pythonPackages.django_1_11: 1.11.18 -> 1.11.20
See release notes:
- https://docs.djangoproject.com/en/dev/releases/1.11.19/
- https://docs.djangoproject.com/en/dev/releases/1.11.20/

(cherry picked from commit 3e81b4500e)
2019-03-07 09:52:42 +01:00
Ivan Kozik
7e34b17aef chromium: fix sha256 for 72.0.3626.121
The sha256 was previously unchanged from 72.0.3626.119

(cherry picked from commit 2129c6ec05)
2019-03-07 05:30:32 +01:00
Dmitry Kalinkin
4c089d328f pythonPackages.sqlalchemy_migrate: a dummy change to trigger hydra build
Package failed on release-18.09 after version bump backport. Can't
reproduce locally. This is to check if the test is flaky.
2019-03-06 13:29:55 -05:00
Tim Steinbach
18fec2687c vivaldi: 2.3.1440.57-1 -> 2.3.1440.60-1
(cherry picked from commit 9d20f2214b)
2019-03-06 10:32:22 -05:00
José Romildo Malaquias
64fafd5e1f vivaldi: 2.3.1440.48-1 -> 2.3.1440.57-1
(cherry picked from commit fa99afa809)
2019-03-06 10:32:22 -05:00
José Romildo Malaquias
650a16d83f vivaldi: 2.3.1440.41-1 -> 2.3.1440.48-1
(cherry picked from commit a1ba6ab9bd)
2019-03-06 10:32:21 -05:00
Tim Steinbach
f13559a375 vivaldi-ffmpeg-codecs: 72.0.3626.121 -> 72.0.3626.122
(cherry picked from commit 07fdb3b102)
2019-03-06 10:32:20 -05:00
José Romildo Malaquias
e99e94e0fb vivaldi-ffmpeg-codecs: 72.0.3626.109 -> 72.0.3626.121
(cherry picked from commit 38b8f49b87)
2019-03-06 10:32:20 -05:00
José Romildo Malaquias
2bc25ec0aa vivaldi-ffmpeg-codecs: 72.0.3626.96 -> 72.0.3626.109
(cherry picked from commit ab93817c7e)
2019-03-06 10:32:19 -05:00
Shea Levy
796b760e2e Merge pull request #56919 from grahamc/closure-graph-memory-18.09
Closure graph memory (18.09)
2019-03-06 08:31:48 -05:00
Lancelot SIX
89a636b807 postgresql_10: 10.6 -> 10.7
See https://www.postgresql.org/about/news/1920/ for release information.

(cherry picked from commit a90cf49fa9)
2019-03-06 14:27:33 +01:00
Lancelot SIX
01cc1585ea postgresql_9_6: 9.6.11 -> 9.6.12
See https://www.postgresql.org/about/news/1920/ for release information.

(cherry picked from commit 70a31c2e00)
2019-03-06 14:26:43 +01:00
Lancelot SIX
460ee71a0e postgresql_9_5: 9.5.15 -> 9.5.16
See https://www.postgresql.org/about/news/1920/ for release information.

(cherry picked from commit 74c715e39c)
2019-03-06 14:26:10 +01:00
Lancelot SIX
811327035d postgresql_9_4: 9.4.20 -> 9.4.21
See https://www.postgresql.org/about/news/1920/ for release information.

(cherry picked from commit d1dd3a1f1a)
2019-03-06 14:25:27 +01:00
Graham Christensen
e32d9524ef references-by-popularity: cache computation to avoid memory bloat
On very large graphs (14k+ paths), we'd end up with a massive in
memory tree of mostly duplication.

We can safely cache trees and point back to them later, saving
memory.

(cherry picked from commit 09362bc3e8)
2019-03-05 17:34:31 -05:00
Graham Christensen
86fafb030e references-by-popularity: create debug output
(cherry picked from commit 54826e7471)
2019-03-05 17:34:27 -05:00
Tim Steinbach
343abf7730 linux: 4.19.26 -> 4.19.27
(cherry picked from commit 5e67bc19c8)
2019-03-05 15:07:50 -05:00
Tim Steinbach
8fa7a364e7 linux: 4.14.104 -> 4.14.105
(cherry picked from commit 535600be55)
2019-03-05 15:07:50 -05:00
Tim Steinbach
95ad0f6c87 linux: 4.9.161 -> 4.9.162
(cherry picked from commit cfc1110dc8)
2019-03-05 15:07:50 -05:00
Robert Schütz
ed8c74e857 python.pkgs.bpython: correct Exec in bpython.desktop
(cherry picked from commit b0a9ac798a)
2019-03-05 19:24:30 +01:00
Andreas Wiese
95fed28ac3 gogs: 0.11.53 -> 0.11.86 (#56838)
This release especially addresses CVE-2018-20303.
2019-03-05 10:47:43 +01:00
Matthew Bauer
3e02e7f49b ghc843: dont add -liconv to flags
Don’t add -liconv to LDFLAGS automatically so that GHC will add it
itself.

This was previously done in other compilers but this one is missing it.
2019-03-04 13:28:04 -05:00
Matthew Bauer
906d432591 ghc863: dont add extra libs
Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.

Merged in pull request #56795 from @matthewbauer.
2019-03-04 13:26:33 -05:00
Peter Hoeg
e542fc2c94 Merge pull request #56572 from peterhoeg/u/mqtt_stable
mosquitto: 1.5.4 -> 1.5.8
2019-03-04 12:23:13 +08:00
Dmitry Kalinkin
770d3ca491 Merge pull request #56447 from veprbl/pr/buldbot_fix_18.09
[18.09] fix buildbot
2019-03-03 11:02:35 -05:00
Vladimír Čunát
e2e84cc1f0 Merge branch 'staging-18.09' into release-18.09 2019-03-03 08:32:37 +01:00
Matthew Bauer
c42f391c0c nixos-rebuild: get Nix from channel
If our old Nix can’t evaluate the Nixpkgs channel, try the fallback
from the new channel /first/. That way we can upgrade Nix to a newer
version and support breaking changes to Nix (like seen in the upgrade
o Nix 2.0).

This change should be backported to older NixOS versions!

(cherry picked from commit 475c8aa018)
2019-03-02 18:49:56 -05:00
Michael Raskin
4c0be40815 Merge pull request #56558 from aanderse/redmine-18.09
redmine: 3.4.8 -> 3.4.9 [18.09 backport]
2019-03-02 20:00:09 +00:00
Wael Nasreddine
07ead02f6b Merge pull request #55429 from worldofpeace/keybase-updates-backport
[18.09] Keybase updates
2019-03-02 11:54:22 -08:00
Vladimír Čunát
64bc63d868 Merge branch 'release-18.09' into staging-18.09 2019-03-02 16:43:42 +01:00
Vladimír Čunát
feb49b0643 Merge #56223: gcc: 8.2.0 -> 8.3.0
(cherry picked from commit 3dda94df65)
2019-03-02 16:43:18 +01:00
Andreas Rammhold
80754f5cfd tinc_pre: fix error after openssl upgrade
With the openssl upgrade to 1.0.2r / 1.1.1b the tinc pre-release version
stopped working due to a bug in tinc where an encryption function was
used during decryption. I submitted a patch upstream [1] but that wasn't
released yet.

[1] http://git.tinc-vpn.org/git/browse?p=tinc;a=commit;h=2b0aeec02d64bb4724da9ff1dbc19b7d35d7c904

(cherry picked from commit 447c21089b)
2019-03-02 12:04:26 +01:00
taku0
f5b5d483d1 firefox-esr: 60.5.1esr -> 60.5.2esr
(cherry picked from commit 692a763f60)
2019-03-02 11:01:39 +01:00
taku0
820fc820bd firefox: 65.0.1 -> 65.0.2
(cherry picked from commit d59a40c3b0)
2019-03-02 11:01:38 +01:00
taku0
a1e65f86f4 firefox-bin: 65.0 -> 65.0.2
(cherry picked from commit 03bbab8540)
2019-03-02 10:58:57 +01:00
Herwig Hochleitner
bf9cd87b3b chromium: 72.0.3626.119 -> 72.0.3626.121
CVE-2019-5786

(cherry picked from commit 9a6e64691c)
2019-03-02 05:27:05 +01:00
worldofpeace
c0a99a5418 keybase-gui: drop gnome2.GConf
(cherry picked from commit ce8c243699)
2019-03-01 13:38:04 -05:00
worldofpeace
2d997e7a67 keybase-gui: 2.13.1 -> 3.0.0
(cherry picked from commit 6d9c5259cf)
2019-03-01 13:38:04 -05:00
Emmanuel Rosa
f659d701d8 keybase-gui: 2.13.0 -> 2.13.1
(cherry picked from commit 66d844ba59)
2019-03-01 13:38:04 -05:00
Roman Volosatovs
ee3986387f keybase-gui: 2.11.0 -> 2.13.0
(cherry picked from commit 3bc3772677)
2019-03-01 13:38:04 -05:00
worldofpeace
1e00feaa4a keybase: 2.13.1 -> 3.0.0
(cherry picked from commit 1f332e7b54)
2019-03-01 13:38:04 -05:00
Wael M. Nasreddine
e730b1b557 keybase: switch to fetchurl for sha256 consistency on Darwin
fetchFromGitHub and thus fetchzip hashes the contents of the archive and
not the archive itself. Unicode file names lead to different checksums
on HFS+ vs. other file systems because of Unicode normalisation

(cherry picked from commit f466c9f961)
2019-03-01 13:38:04 -05:00
Emmanuel Rosa
10defba529 keybase: 2.11.0 -> 2.13.1
(cherry picked from commit 239dc141bd)
2019-03-01 13:38:04 -05:00
Roman Volosatovs
980ae050bf keybase: 2.10.1 -> 2.11.0
(cherry picked from commit 563d4e2a77)
2019-03-01 13:38:04 -05:00
Roman Volosatovs
697aed9d3b kbfs: 2.10.1 -> 2.11.0
(cherry picked from commit a3a0742919)
2019-03-01 13:38:04 -05:00
Will Dietz
2325b5fed2 Merge #56494: file: 5.34 -> 5.36 (staging-18.09)
(cherry picked from commit 63e68e5bb9)
Minimal changes, .36 fixes some CVEs.
2019-03-01 12:39:55 +01:00
Peter Hoeg
0ab7392781 mosquitto: 1.5.5 -> 1.5.8
(cherry picked from commit 5638a1c717)
2019-03-01 19:04:13 +08:00
R. RyanTM
64ebd78a06 mosquitto: 1.5.4 -> 1.5.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mosquitto/versions

(cherry picked from commit 9496a0e3af)
2019-03-01 19:03:19 +08:00
Aaron Andersen
5b1b46fff8 redmine: 3.4.8 -> 3.4.9 2019-02-28 21:03:17 -05:00
Robert Schütz
060bcd6df5 postfix: 3.3.2 -> 3.3.3 (#56538)
http://www.postfix.org/announcements/postfix-3.3.3.html
2019-02-28 21:42:23 +01:00
Vladimír Čunát
dc4823f603 zeroc_ice: disable problematic parallel make
(cherry picked from commit f1ed4b50fc)
https://hydra.nixos.org/build/89580134
2019-02-28 07:27:46 +01:00
Tim Steinbach
1374ba6080 linux: 4.19.25 -> 4.19.26
(cherry picked from commit 9a65fde170)
2019-02-27 13:35:54 -05:00
Tim Steinbach
4528bd5430 linux: 4.14.103 -> 4.14.104
(cherry picked from commit 4580d6ca9e)
2019-02-27 13:35:54 -05:00
Tim Steinbach
58b34ab32f linux: 4.9.160 -> 4.9.161
(cherry picked from commit 4eff65e514)
2019-02-27 13:35:53 -05:00
Vladimír Čunát
2fa7fc4155 Merge #56375: wget: 1.19.5 -> 1.20.1 (into release-18.09) 2019-02-27 18:44:48 +01:00
Ben Wolsieffer
6e2ba9174e pythonPackages.sqlalchemy_migrate: 0.11.0 -> 0.12.0
(cherry picked from commit 52307dff25)
2019-02-27 12:36:33 -05:00
Alyssa Ross
8c2447fdee openssl: 1.0.2q -> 1.0.2r
(cherry picked from commit 9c94d74836)
Security fix; from PR #56414.
2019-02-27 09:34:45 +01:00
Ben Wolsieffer
ada3bf9e91 buildbot: 1.2.0 -> 1.4.0
buildbot was always broken on release-18.09 due to failing tests

One of the failures is:

[ERROR]
Traceback (most recent call last):
  File "/build/buildbot-1.2.0/buildbot/process/properties.py", line 459, in getRenderingFor
    rv = yield build.render(value[index])
  File "/nix/store/sqr3s9cva7r3z12hqb6rxw3w8kiqzmhd-python2.7-Twisted-18.7.0/lib/python2.7/site-packages/twisted/internet/defer.py", line 1418, in _inlineCallbacks
    result = g.send(result)
  File "/build/buildbot-1.2.0/buildbot/process/properties.py", line 495, in getRenderingFor
    raise KeyError(error_message)
exceptions.KeyError: "secrets service not started, need to configure SecretManager in c['services'] to use 'secrets'in Interpolate"

buildbot.test.unit.test_master.StartupAndReconfig.test_reconfigService_db_url_changed

There is a mention of this at https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=907687
Because buildbot was never working before, we can just bump the version
to the one which passes the test.

(cherry picked from commit 71c42462ab)
2019-02-26 21:55:53 -05:00
Pierre Bourdon
022a6f7c2b wget: 1.20 -> 1.20.1 (CVE-2018-20483)
(cherry picked from commit d132c08aa1)
2019-02-25 19:13:41 +01:00
Will Dietz
b2dc0bbafa wget: 1.19.5 -> 1.20
https://lists.gnu.org/archive/html/info-gnu/2018-11/msg00011.html
(cherry picked from commit c6db972e8b)
2019-02-25 19:13:40 +01:00
Herwig Hochleitner
aabc61049c chromium: 72.0.3626.109 -> 72.0.3626.119
(cherry picked from commit 338dc47d5f)
2019-02-25 02:02:44 +01:00
Michael Raskin
8e70d4bd7d Merge pull request #56313 from srhb/flashplayer-backport
Backport: flashplayer: 32.0.0.114 -> 32.0.0.142
2019-02-24 23:19:16 +00:00
Averell Dalton
8164dc3461 flashplayer: 32.0.0.114 -> 32.0.0.142
(cherry picked from commit 856a238e20)
2019-02-24 20:18:33 +01:00
Tim Steinbach
42daebc983 linux: 4.19.24 -> 4.19.25
(cherry picked from commit 298550b5bb)
2019-02-24 11:39:45 -05:00
Tim Steinbach
6dcc19a02d linux: 4.14.102 -> 4.14.103
(cherry picked from commit 77dde1a4a2)
2019-02-24 11:39:44 -05:00
Tim Steinbach
d4543be857 linux: 4.9.159 -> 4.9.160
(cherry picked from commit b939be8c23)
2019-02-24 11:39:43 -05:00
Tim Steinbach
5fe251c993 linux: 4.4.175 -> 4.4.176
(cherry picked from commit dec53994eb)
2019-02-24 11:39:42 -05:00
Vladimír Čunát
494f3ca688 Merge #55893: samba: 4.7.10 -> 4.7.12
... into release-18.09.  Contains security fixes.
2019-02-24 11:36:55 +01:00
Emmanuel Rosa
235487585e luakit: add HTTPS support (#52865)
Co-Authored-By: emmanuelrosa <emmanuelrosa@users.noreply.github.com>
(cherry picked from commit 421dd51ffd)
Fixes #56266.  I briefly re-tested that on 18.09.
2019-02-24 11:36:26 +01:00
Vladimír Čunát
76811bf69c Merge #52833: netatalk: 3.1.11 -> 3.1.12 (security)
(cherry picked from commit 0cf158006b)
2019-02-24 11:36:26 +01:00
Andrew Dunham
3a244e8e38 samba: 4.7.10 -> 4.7.12
Version 4.7.12 is a security release.

This fixes a couple of security related issues:
 - https://www.samba.org/samba/security/CVE-2018-14629.html
 - https://www.samba.org/samba/security/CVE-2018-16841.html
 - https://www.samba.org/samba/security/CVE-2018-16851.html
 - https://www.samba.org/samba/security/CVE-2018-16853.html

(cherry picked from commit 2acd0004c1)
2019-02-24 02:46:25 -05:00
Florian Klink
48b4e1c6bf Merge pull request #56242 from Lassulus/18.09-nextcloud
[18.09] nextcloud: 15.0.2 -> 15.0.4
2019-02-23 18:52:43 +01:00
R. RyanTM
af75060ff5 nextcloud: 15.0.2 -> 15.0.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nextcloud/versions

(cherry picked from commit a45b2032ff)
2019-02-23 14:42:05 +01:00
Robert Schütz
753f58d9a4 nixos/home-assistant: use availableComponents of configured package
fixes #55958

(cherry picked from commit e211f55d87)
2019-02-23 13:37:54 +01:00
worldofpeace
8ee1cdde22 wire-desktop: 3.5.2881 -> 3.6.2885
(cherry picked from commit 8ba66c2ee1)
2019-02-22 19:51:51 -05:00
Mikhail Klementev
5432f7f806 wire-desktop: 3.3.2872 -> 3.5.2881
(cherry picked from commit 7475db089b)
2019-02-22 19:51:51 -05:00
worldofpeace
41b31cdc5f wire-desktop: don't explicitly set phases
part of #28910

(cherry picked from commit 48a3ea0f81)
2019-02-22 19:51:50 -05:00
worldofpeace
69f7e37c37 wire-desktop: 3.2.2840 -> 3.3.2872 (#47941)
(cherry picked from commit fa3ec9c836)
2019-02-22 19:51:50 -05:00
Vladimír Čunát
23453d2d8c busybox: patch CVE-2018-20679
Fixes #54798.
2019-02-22 10:23:35 +01:00
worldofpeace
3276e04a39 Merge pull request #56127 from thefloweringash/fix-es6
[18.09] elasticsearch: Add zlib to buildInputs for unfree
2019-02-21 13:47:33 -05:00
Vladimír Čunát
1b621b83f0 Merge branch 'staging-18.09' into release-18.09
Just a systemd security patch.
2019-02-21 07:49:28 +01:00
aszlig
b36e2877f1 elasticsearch: Add zlib to buildInputs for unfree
The unfree variant of elasticsearch uses autoPatchelfHook and since we
removed the dependency on file for the hook itself in
58a97dfb49 we no longer have zlib
propagated.

So we need to explicitly state that dependency here.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @apeschar, @basvandijk
(cherry picked from commit 8df68a93e6)
2019-02-21 13:44:03 +09:00
Tim Steinbach
63a09881b6 linux: 4.19.23 -> 4.19.24
(cherry picked from commit a1cf586d72)
2019-02-20 10:34:26 -05:00
Tim Steinbach
7536ce975c linux: 4.14.101 -> 4.14.102
(cherry picked from commit 70643f0882)
2019-02-20 10:34:25 -05:00
Tim Steinbach
a17011c6b4 linux: 4.9.158 -> 4.9.159
(cherry picked from commit 85733d1f9c)
2019-02-20 10:34:24 -05:00
Tim Steinbach
0dcd0ff64e linux: 4.4.174 -> 4.4.175
(cherry picked from commit 9deab03a27)
2019-02-20 10:34:21 -05:00
Vladimír Čunát
4277563ac9 openscad: enableParallelBuilding = false;
Discussion: https://github.com/NixOS/nixpkgs/commit/c68dc2212e22
(cherry picked from commit 28d983fe25)
2019-02-20 10:18:50 +01:00
Bernard Fortz
3cd9396523 autojump: autoload when programs.autojump.enable is set.
(cherry picked from commit cd8ffef01b)
Signed-off-by: Domen Kožar <domen@dev.si>
2019-02-20 15:14:51 +07:00
Bernard Fortz
8e4e54b25b autodump: pulling package when programs.autojump.enable is true
(cherry picked from commit 0bca738513)
Signed-off-by: Domen Kožar <domen@dev.si>
2019-02-20 15:14:46 +07:00
Bernard Fortz
1e9c144576 autojump: creates links required by oh-my-zsh for autojump.
The autojump plugin in oh-my-zsh assumes autojump.zsh resides in
/run/current-system/sw/share/autojump/ but these links are not created
by default.

The new programs.autojump.enable option forces the creation of these
links.

(cherry picked from commit 0d749e58f7)
Signed-off-by: Domen Kožar <domen@dev.si>
2019-02-20 15:14:40 +07:00
Florian Klink
185ab27b8a gitlab-ee: 11.7.4 -> 11.7.5
(cherry picked from commit f4a7c16bd9)
2019-02-20 00:25:56 +01:00
Florian Klink
5db036173d gitlab: 11.7.4 -> 11.7.5
(cherry picked from commit 7f6351a21d)
2019-02-20 00:25:52 +01:00
Florian Klink
ba65001b7a gitlab-workhorse: 8.0.1 -> 8.0.2
(cherry picked from commit 75f66b19dd)
2019-02-20 00:25:47 +01:00
Franz Pletz
90f99f4a9b systemd: 239.20190110 -> 239.20190219
Fix CVE-2019-6454.

(cherry picked from commit e94914560b)
2019-02-20 00:01:22 +01:00
Vladimír Čunát
28f9452a77 Merge branch 'staging-18.09' into release-18.09
unzip CVE fix.
2019-02-19 08:30:12 +01:00
Herwig Hochleitner
7e5b59974a chromium: 72.0.3626.96 -> 72.0.3626.109
(cherry picked from commit c414e5bd08)
2019-02-19 04:46:46 +01:00
Shea Levy
c007ecfb5d postgresql: Don't move libs unnecessarily out of $lib.
In particular, when static linking pkgconfig expects libpq.a in $lib

(cherry picked from commit bb52ff3df8)
2019-02-18 20:31:34 -05:00
Vladimír Čunát
fd65170d66 Merge branch 'release-18.09' into staging-18.09 2019-02-18 08:22:07 +01:00
worldofpeace
ea0820818a Merge pull request #55949 from eadwu/backports/20190217
[18.09] vscode backports - 2019-02-17
2019-02-17 15:23:14 +00:00
Edmund Wu
347bcccadc vscode: 1.31.0 -> 1.31.1
(cherry picked from commit 8d5bce4053)
2019-02-17 09:46:09 -05:00
Vladimír Čunát
ef02c63ba1 Merge #54576: adoptopenjdk-bin: 11.0.1 -> 11.0.2
Includes security fixes.

(cherry picked from commit 94b518f855)
2019-02-17 09:59:36 +01:00
Vladimír Čunát
a332973a7f adoptopenjdk: pick expression structure from master
They seem to be uninteresting changes just hindering
backports of version bumps.
2019-02-17 09:58:57 +01:00
Pierre Bourdon
8d226d8ec8 unzip: patch CVE-2018-18384 (PR #55927)
Patch from https://sourceforge.net/p/infozip/bugs/53/

(cherry picked from commit 705167a5dc)
2019-02-17 08:07:43 +01:00
Vladimír Čunát
f4ddc31c4a Merge branch 'staging-18.09' into release-18.09
Security updates for qt5* and openssl.
We can't afford to wait for darwin rebuild - it would take far too long.
2019-02-17 07:39:34 +01:00
0x4A6F
19a0543c62 unifi: 5.9.29 -> 5.10.17
(cherry picked from commit 04a1f848a3)
2019-02-16 16:03:36 +01:00
Vladimír Čunát
af6b20c0fa Merge #55089: qt5*: bugfixes + security
... into staging-18.09.
2019-02-16 13:51:33 +01:00
Vladimír Čunát
7892372044 Merge #55832: thunderbird*: 60.5.0 -> 60.5.1
... into release-18.09
2019-02-16 10:34:28 +01:00
Vladimír Čunát
fe00e773d1 Merge #55885: openssl: 1.0.2p -> 1.0.2q
... into staging-18.09.
2019-02-16 10:13:53 +01:00
Vladimír Čunát
d7225e0856 Merge branch 'release-18.09' into staging-18.09 2019-02-16 10:13:00 +01:00
Alyssa Ross
9c75f208f3 openssl: 1.0.2p -> 1.0.2q
CVE-2018-0734: https://www.openssl.org/news/vulnerabilities.html#2018-0734
CVE-2018-5407: https://www.openssl.org/news/vulnerabilities.html#2018-5407

No patches can any longer be shared between 1.0.2 and 1.1, so reorganize
patches into subdirectories (and remove an unused one).

(cherry picked from commit ae29a9e688)
2019-02-16 00:56:30 -08:00
Matthew Bauer
82434e77d5 qt511: add patch for macOS sdk
Unfortunately we don’t have access to NSWindowStyleMask. These patches
should go away once we switch to a newer SDK.

(cherry picked from commit 81531046e8)
2019-02-16 09:38:25 +01:00
Samuel Dionne-Riel
526b34a18e linux: Drop the interpreter truncation patch
All usage has been removed from the stable branche; upstream having
updated with a revert.
2019-02-15 19:34:20 -05:00
Ben Wolsieffer
e181504731 linux_hardkernel_4_14: don't apply interpreter-trunc patch
The only 4.14.y versions that need the patch are 4.14.99 and 4.14.100.

(cherry picked from commit 60b5347fb5)
2019-02-15 19:31:38 -05:00
Tim Steinbach
14ce17862c kernel: Remove 4.18.x
4.18 series is EOL

(cherry picked from commit ff4bf6067e)
2019-02-15 23:41:19 +01:00
Vladimír Čunát
72aaa06feb Merge #55852: elfutils: 0.175 -> 0.176
Fixes six security CVE issues.

(cherry picked from commit 1ca67d201f)
2019-02-15 23:32:49 +01:00
Matthew Bauer
9bd45dddf8 haskell.buildStackProject: use setup hook
This makes things easier and hopefully fixes the arg too long issue.

Resolves #55548

(cherry picked from 0dabacae00)
2019-02-15 12:11:24 -05:00
Tim Steinbach
0ba800c4b4 linux: Remove truncation patch from 4.19 2019-02-15 10:04:48 -05:00
Tim Steinbach
6da8b83c5e linux: 4.19.21 -> 4.19.23
(cherry picked from commit 8c14948343)
2019-02-15 10:03:10 -05:00
Tim Steinbach
6e90746334 linux: 4.14.99 -> 4.14.101
(cherry picked from commit 7954ec0ffd)
2019-02-15 10:03:10 -05:00
Tim Steinbach
f0ce0f3149 linux: 4.9.156 -> 4.9.158
(cherry picked from commit 50f518c93f)
2019-02-15 10:03:09 -05:00
Andreas Rammhold
cd88dcb25c thunderbird-bin: 60.5.0 -> 60.5.1
(cherry picked from commit 3c35745731)
2019-02-15 15:18:23 +01:00
Andreas Rammhold
657d92e6d1 firefox: 60.5.0 -> 60.5.1
(cherry picked from commit 0f2226adc5)
2019-02-15 15:18:03 +01:00
Vladimír Čunát
735ab7a700 linux 4.9, 4.19: also apply interpreter-trunc
4.4.174 doesn't need this (possibly after a future bump).
I think this covers all the affected kernels ATM.  Builds tested.
2019-02-15 09:16:23 +01:00
Graham Christensen
a1156b996a Revert "shellFor: Don't suck in src to compare to deps. [Fixes #51079]"
This reverts commit b40b39b1bc.

tarball job failed:

    error: while evaluating anonymous function at /build/source/maintainers/scripts/find-tarballs.nix:6:1, called from undefined position:
    while evaluating 'operator' at /build/source/maintainers/scripts/find-tarballs.nix:27:16, called from undefined position:
    while evaluating 'immediateDependenciesOf' at /build/source/maintainers/scripts/find-tarballs.nix:39:29, called from /build/source/maintainers/scripts/find-tarballs.nix:27:44:
    while evaluating anonymous function at /build/source/lib/attrsets.nix:225:10, called from undefined position:
    while evaluating anonymous function at /build/source/maintainers/scripts/find-tarballs.nix:40:37, called from /build/source/lib/attrsets.nix:225:16:
    while evaluating 'derivationsIn' at /build/source/maintainers/scripts/find-tarballs.nix:42:19, called from /build/source/maintainers/scripts/find-tarballs.nix:40:40:
    while evaluating 'optional' at /build/source/lib/lists.nix:241:20, called from /build/source/maintainers/scripts/find-tarballs.nix:44:33:
    while evaluating 'canEval' at /build/source/maintainers/scripts/find-tarballs.nix:48:13, called from /build/source/maintainers/scripts/find-tarballs.nix:44:43:
    while evaluating the attribute 'drvPath' at /build/source/lib/customisation.nix:149:7:
    while evaluating the derivation attribute 'name' at /build/source/pkgs/stdenv/generic/make-derivation.nix:177:11:
    while evaluating 'nullSrc' at /build/source/pkgs/development/haskell-modules/make-package-set.nix:263:19, called from undefined position:
    while evaluating 'overrideCabal' at /build/source/pkgs/development/haskell-modules/lib.nix:37:24, called from /build/source/pkgs/development/haskell-modules/make-package-set.nix:263:22:
    attribute 'override' missing, at /build/source/pkgs/development/haskell-modules/lib.nix:37:28
2019-02-14 22:56:57 -05:00
Tim Steinbach
bf7d4a34e6 Revert "Revert "linux: 4.9.155 -> 4.9.156""
This reverts commit dd9b7aebae.
2019-02-14 21:21:50 -05:00
Tim Steinbach
6e94ffb79f Revert "Revert "linux: 4.19.20 -> 4.19.21""
This reverts commit e9468ff7b6.
2019-02-14 21:19:05 -05:00
Edmund Wu
c4b10f8347 linux: allow for interpreter to be truncated
via https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cb5b020a8d38f77209d0472a0fea755299a8ec78
see https://github.com/NixOS/nixpkgs/issues/53672

(cherry picked from commit f0b8a113dd)
2019-02-14 21:15:56 -05:00
Edmund Wu
9c78f68e28 Revert "Revert "linux: 4.14.98 -> 4.14.99""
This reverts commit 01d8894c4d.

(cherry picked from commit 13d1ba3439)
2019-02-14 21:02:48 -05:00
Silvan Mosberger
31d55726af Merge pull request #54901 from ElvishJerricco/haskell-shellfor-null-src-18.09
Backport #54900
2019-02-15 00:40:17 +01:00
Will Dietz
2745c15270 tor-browser-bundle-bin: 8.0.5 -> 8.0.6
https://blog.torproject.org/new-release-tor-browser-806
(cherry picked from commit 12984854c6)
2019-02-14 20:37:49 +01:00
Eelco Dolstra
dd9b7aebae Revert "linux: 4.9.155 -> 4.9.156"
This reverts commit eeda4d78da. The new
kernel breaks long shebang paths: https://lkml.org/lkml/2019/2/13/853
2019-02-14 14:58:08 +01:00
Eelco Dolstra
e9468ff7b6 Revert "linux: 4.19.20 -> 4.19.21"
This reverts commit a0ba6c2182. The new
kernel breaks long shebang paths: https://lkml.org/lkml/2019/2/13/853
2019-02-14 14:54:55 +01:00
Andreas Rammhold
68c0a16d43 Merge pull request #55759 from andir/18.09/firefox
[18.09] firefox: 65.0 -> 65.0.1, firefox-esr-60: 60.5.0esr -> 60.5.1esr
2019-02-14 13:50:22 +01:00
Andreas Rammhold
da8c0cbee8 firefox: add andir (myself) as maintainer
I have been working on this for some time now so it probably makes
sense...

(cherry picked from commit 826611bef9)
2019-02-14 11:35:48 +01:00
Andreas Rammhold
48e158db9b firefox-esr-60: 60.5.0esr -> 60.5.1esr
Release notes: https://www.mozilla.org/en-US/firefox/60.5.1/releasenotes/

(cherry picked from commit 2f4c7f3f92)
2019-02-14 11:35:38 +01:00
Andreas Rammhold
8108615193 firefox: 65.0 -> 65.0.1
Release notes: https://www.mozilla.org/en-US/firefox/65.0.1/releasenotes/

(cherry picked from commit aa2acd0123)
2019-02-14 11:34:59 +01:00
worldofpeace
7801872271 Merge pull request #55535 from eadwu/backports/20190210
[18.09] vscode backports - 20190210
2019-02-13 22:53:59 +00:00
Vladimír Čunát
3d99234ce7 Revert "linux: 4.14.98 -> 4.14.99"
This reverts commit 0e1eb30a1d.
It broke the installer tests, e.g. https://hydra.nixos.org/build/88704861

(cherry picked from commit 01d8894c4d)
2019-02-13 23:21:57 +01:00
Averell Dalton
c4cf19fe20 nextcloud-client: fix crash
(cherry picked from commit cfc7cdac45)
Signed-off-by: Maximilian Bosch <maximilian@mbosch.me>
2019-02-13 21:17:41 +01:00
Michael Raskin
bb748b4f28 libreoffice-still: replace with libreoffice-fresh which has actually reached the Still stage 2019-02-13 16:33:49 +01:00
Michael Raskin
73568e8e0f libreoffice-fresh: 6.0.5.2 -> 6.0.7.3 2019-02-13 16:33:49 +01:00
John Ericson
e1deb56b10 Merge pull request #55538 from worldofpeace/autopatchelf-backport
backport changes to autoPatchelfHook
2019-02-13 09:57:59 -05:00
José Romildo Malaquias
c86fd3ed13 vivaldi-ffmpeg-codecs: 71.0.3578.98 -> 72.0.3626.96
(cherry picked from commit c00b84adfc)
2019-02-13 09:11:50 -05:00
José Romildo Malaquias
f6e84ff918 vivaldi: 2.2.1388.37-1 -> 2.3.1440.41-1
(cherry picked from commit 24c966545a)
2019-02-13 09:11:29 -05:00
Ivan Kozik
e23980ea7d chromium: 72.0.3626.81 -> 72.0.3626.96
CVE-2019-5784

(cherry picked from commit 0811bbcaa4)
2019-02-13 12:28:26 +01:00
Vladimír Čunát
f4f2525cfc Merge branch 'staging-18.09' into release-18.09
Most x86_64-linux packages do have binaries,
so let's not keep 18.09-small waiting anymore.
2019-02-13 12:24:40 +01:00
Domen Kožar
89bf7472a1 fix #52118
(cherry picked from commit 28293fb169)
Signed-off-by: Domen Kožar <domen@dev.si>
2019-02-13 15:59:32 +07:00
Vladimír Čunát
63a36696f9 Merge branch 'release-18.09' into staging-18.09 2019-02-13 08:56:34 +01:00
Will Dietz
e5c1e6821c Merge #55334: curl: 7.63.0 -> 7.64.0
(cherry picked from commit 42446b15a7)
Contains security fixes.
2019-02-13 08:55:33 +01:00
Will Dietz
c979f23b9f curl: 7.62.0 -> 7.63.0
https://curl.haxx.se/mail/lib-2018-12/0036.html
https://curl.haxx.se/changes.html
(cherry picked from commit 5a8660bd29)
2019-02-13 08:55:06 +01:00
Austin Seipp
1669f07c75 foundationdb60: 6.0.15 -> 6.0.18
Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit c19807e25d,
without dependent patches, to bump version directly from 6.0.15)
2019-02-12 23:07:39 -06:00
Tim Steinbach
a0ba6c2182 linux: 4.19.20 -> 4.19.21
(cherry picked from commit c7e17fa49c)
2019-02-12 18:46:56 -05:00
Tim Steinbach
a260b5dbd5 linux: 4.14.98 -> 4.14.99
(cherry picked from commit 0e1eb30a1d)
2019-02-12 18:46:55 -05:00
Tim Steinbach
eeda4d78da linux: 4.9.155 -> 4.9.156
(cherry picked from commit a629651af2)
2019-02-12 18:46:54 -05:00
Peter Simons
8611e758a5 opentracing: fix Nixpkgs evaluation errors
(cherry picked from commit d46291dda5)
2019-02-12 15:14:35 +01:00
Bjørn Forsman
edbd55fa9a Unbreak eval with nix-1.x
Remove the last use of the "placeholder" primop on release-18.09 branch.

Fixes: a57d03fcc3 ("teeworlds: 0.6.4 -> 0.6.5"), which was backported
from master with the "placeholder" primop.
2019-02-12 15:14:20 +01:00
Tim Steinbach
fb51a58888 flashplayer: 32.0.0.114 -> 32.0.0.142
(cherry picked from commit 2fcb8c3ac7)
2019-02-12 08:22:33 -05:00
Sarah Brofeldt
eab0f4630b docker: 18.09.1 -> 18.09.2
(cherry picked from commit 9f3cad2ee3)
2019-02-12 13:14:43 +00:00
Will Dietz
8b3f09242d docker: 18.09.0 -> 18.09.1
https://github.com/docker/docker-ce/releases/tag/v18.09.1
(cherry picked from commit 487a43324e)
2019-02-12 13:14:43 +00:00
adisbladis
0a3561a969 Merge pull request #53375 from adisbladis/nodejs-backports
Backport nodejs from #53270
2019-02-12 12:07:19 +00:00
Robert Schütz
168cbb3969 Merge pull request #55562 from Moredread/tor-browser-backport
tor-browser-bundle-bin: 8.0.4 -> 8.0.5 (Backport)
2019-02-12 00:54:14 +01:00
Robert Schütz
ccd53a9cb1 borgbackup: 1.1.8 -> 1.1.9
Changelog: https://borgbackup.readthedocs.io/en/stable/changes.html#version-1-1-9-2019-02-10
(cherry picked from commit 9c5ca86247)
2019-02-12 00:39:33 +01:00
Robert Schütz
16340b902c borgbackup: 1.1.7 -> 1.1.8
(cherry picked from commit 3adf8427d2)
2019-02-12 00:39:33 +01:00
Pierre Bourdon
d770864744 libu2f-host: 1.1.6 -> 1.1.7 (CVE-2018-20340)
(cherry picked from commit da9fdcb1f0)
2019-02-11 21:58:24 +01:00
Will Dietz
d064b22415 tor-browser-bundle-bin: 8.0.4 -> 8.0.5
https://blog.torproject.org/new-release-tor-browser-805

* demote github URL, it doesn't have newest
  (including 8.0.4 which this upgrades from)

(cherry picked from commit 791a6c4937)
2019-02-11 13:01:57 +01:00
Peter Simons
109a28ab95 Merge pull request #55346 from dotlambda/dovecot-CVE-2019-3814
[18.09] dovecot: fix CVE-2019-3814
2019-02-11 11:17:35 +01:00
Robert Schütz
9e431cec25 dovecot: 2.3.4 -> 2.3.4.1
fixes CVE-2019-3814:
https://dovecot.org/list/dovecot-news/2019-February/000394.html

(cherry picked from commit d49ffaac8a)
2019-02-11 10:30:26 +01:00
Robert Schütz
72e1819062 dovecot: 2.3.3 -> 2.3.4, dovecot_pigeonhole: 0.5.3 -> 0.5.4
(cherry picked from commit b6c96c6419)
2019-02-11 10:30:09 +01:00
R. RyanTM
3b276cfcd0 dovecot_pigeonhole: 0.5.2 -> 0.5.3 (#47820)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/dovecot-pigeonhole/versions

(cherry picked from commit e00bfcd798)
2019-02-11 10:30:00 +01:00
R. RyanTM
f594245ae5 dovecot: 2.3.2.1 -> 2.3.3 (#47814)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/dovecot/versions

(cherry picked from commit 5a6c4d39fb)
2019-02-11 10:29:42 +01:00
aszlig
10ffd6f112 autoPatchelfHook: Skip on missing segment headers
If the file in question is not a shared object file but an ELF, we
really want to skip the file, because we won't have anything to patch
there.

For example if the file is created via "gcc -c -o foo.o foo.c", we don't
get a segment header and so far autoPatchelf was trying to patch such a
file.

By checking for missing segment headers, we're now no longer going to
attempt patching such a file.

Signed-off-by: aszlig <aszlig@nix.build>
Reported-by: Sander van der Burg <svanderburg@gmail.com>
(cherry picked from commit 4a6e3e4185)
2019-02-10 17:02:02 -05:00
aszlig
66de7c7939 autoPatchelfHook: Fix type of norecurse variable
While declaring it as an array doesn't do any harm in our usage, it
might be a bit confusing when reading the code.

Signed-off-by: aszlig <aszlig@nix.build>
(cherry picked from commit 9f23a63f79)
2019-02-10 17:01:57 -05:00
aszlig
2586da9d0e autoPatchelfHook: Add addAutoPatchelfSearchPath
This function is useful if autoPatchelf is invoked during some of the
phases of a build and allows to add arbitrary shared objects to the
search path.

So far the same functionality was in autoPatchelf itself, but not
available as a separate function, so when adding shared objects to the
dependency cache one would have to do so manually.

The function also has the --no-recurse flag, which prevents recursing
into subdirectories.

Signed-off-by: aszlig <aszlig@nix.build>
(cherry picked from commit 2faf905f98)
2019-02-10 17:01:51 -05:00
aszlig
83b7d5813a autoPatchelfHook: Add --no-recurse flag
This is to be used with the autoPatchelf command and allows to only
patch a specific file or directory without recursing into
subdirectories.

Apart from being able to run the command in a standalone way, as
detailled in the previous commit this is also needed for the Android SDK
emulator, because according to @svanderburg there are subdirectories we
don't want to patch.

The reason why I didn't use GNU getopt is that it might not be available
on all operating systems and the getopts bash builtin doesn't support
long arguments. Apart from that, the implementation for recognizing the
flag is pretty trivial and it's also using bash builtins only, so if we
want to do something really fancy someday, we can still change it.

Signed-off-by: aszlig <aszlig@nix.build>
(cherry picked from commit 3ca35ce0b2)
2019-02-10 17:01:46 -05:00
aszlig
f4eb9c5993 autoPatchelfHook: Allow to prevent automatic run
If you want to only run autoPatchelf on a specific path and leave
everything else alone, we now have a $dontAutoPatchelf environment
variable, which causes the postFixup hook to not run at all.

The name "dontAutoPatchelf" probably is a bit weird in conjunction with
putting "autoPatchelfHook" in nativeBuildInputs, but unless someone
comes up with a better name I keep it that way because it's consistent
with all the other dontStrip, dontPatchShebangs, dontPatchELF and
whatnot.

A specific example where this is needed is when building the Android SDK
emulator, which contains a few ARM binaries in subdirectories that
should not be patched. If we were to run autoPatchelf on all outputs
unconditionally we'd run into errors because some ARM libraries couldn't
be found.

Signed-off-by: aszlig <aszlig@nix.build>
(cherry picked from commit e4fbb244ee)
2019-02-10 17:01:40 -05:00
aszlig
c6fbed235a autoPatchelfHook: Make easier to run autoPatchelf
The autoPatchelf main function which is run against all of the outputs
was pretty much tailored towards this specific setup-hook and was
relying on $prefix to be set globally.

So if you wanted to run autoPatchelf manually - let's say during
buildPhase - you would have needed to run it like this:

  prefix=/some/directory autoPatchelf

This is now more intuitive and all you need to do is run the following:

  autoPatchelf /some/directory

Signed-off-by: aszlig <aszlig@nix.build>
(cherry picked from commit d03e4ffdbf)
2019-02-10 17:01:34 -05:00
aszlig
d3c7d37806 autoPatchelfHook: Correctly detect PIE binaries
I originally thought it would just be enough to just check for an INTERP
section in isExecutable, however this would mean that we don't detect
statically linked ELF files, which would break our recent improvement to
gracefully handle those.

In theory, we are only interested in ELF files that have an INTERP
section, so checking for INTERP would be enough. Unfortunately the
isExecutable function is already used outside of autoPatchelfHook, so we
can't easily get rid of it now, so let's actually strive for more
correctness and make isExecutable actually match ELF files that are
executable.

So what we're doing instead now is to check whether either the ELF type
is EXEC *or* we have an INTERP section and if one of them is true we
should have an ELF executable, even if it's statically linked.

Along the way I also set LANG=C for the invocations of readelf, just to
be sure we don't get locale-dependent output.

Tested this with the following command (which contains almost[1] all the
packages using autoPatchelfHook), checking whether we run into any
library-related errors:

  nix-build -E 'with import ./. { config.allowUnfree = true; };
    runCommand "test-executables" {
      drvs = [
        anydesk cups-kyodialog3 elasticsearch franz gurobi
        masterpdfeditor oracle-instantclient powershell reaper
        sourcetrail teamviewer unixODBCDrivers.msodbcsql17 virtlyst
        vk-messenger wavebox zoom-us
      ];
    } ("for i in $drvs; do for b in $i/bin/*; do " +
       "[ -x \"$b\" ] && timeout 10 \"$b\" || :; done; done")
  '

Apart from testing against library-related errors I also compared the
resulting store paths against the ones prior to this commit. Only
anydesk and virtlyst had the same as they didn't have self-references,
everything else differed only because of self-references, except
elasticsearch, which had the following PIE binaries:

  * modules/x-pack/x-pack-ml/platform/linux-x86_64/bin/autoconfig
  * modules/x-pack/x-pack-ml/platform/linux-x86_64/bin/autodetect
  * modules/x-pack/x-pack-ml/platform/linux-x86_64/bin/categorize
  * modules/x-pack/x-pack-ml/platform/linux-x86_64/bin/controller
  * modules/x-pack/x-pack-ml/platform/linux-x86_64/bin/normalize

These binaries were now patched, which is what this commit is all about.

[1]: I didn't include the "maxx" package (MaXX Interactive Desktop)
     because the upstream URLs are no longer existing and I couldn't
     find them elsewhere on the web.

Signed-off-by: aszlig <aszlig@nix.build>
Fixes: https://github.com/NixOS/nixpkgs/issues/48330
Cc: @gnidorah (for MaXX Interactive Desktop)
(cherry picked from commit c64624b843)
2019-02-10 17:01:25 -05:00
aszlig
f4136c19b5 autoPatchelfHook: Silence errors in isExecutable
The "maxx" package recursively runs isExecutable on a bunch of files and
since the change to use "readelf" instead of "file" a lot of errors like
this one are printed during build:

  readelf: Error: Not an ELF file - it has the wrong magic bytes at the
  start

While the isExecutable was never meant to be used outside of the
autoPatchelfHook, it's still a good idea to silence the errors because
whenever readelf fails, it clearly indicates that the file in question
is not a valid ELF file.

Signed-off-by: aszlig <aszlig@nix.build>
(cherry picked from commit b4526040a2)
2019-02-10 17:01:16 -05:00
aszlig
7b0e45e482 autoPatchelfHook: Only check PT_INTERP on execs
If the ELF file is not an executable, we do not get a PT_INTERP section,
because after all, it's a *shared* library.

So instead of checking for PT_INTERP (to avoid statically linked
executables) for all ELF files, we add another check to see if it's an
executable and *only* skip it when it is and there's no PT_INTERP.

Signed-off-by: aszlig <aszlig@nix.build>
(cherry picked from commit 9920215d00)
2019-02-10 17:00:38 -05:00
Jörg Thalheim
cb929ba3d3 autoPatchelfHook: do not patch statically linked files
Also speed up quite significantly due less forking.

(cherry picked from commit 58a97dfb49)
2019-02-10 16:59:26 -05:00
Edmund Wu
2475906e4a vscode: 1.30.2 -> 1.31.0
(cherry picked from commit ea679302a5)
2019-02-10 15:54:49 -05:00
worldofpeace
23689934dc vscode: minor cleanup, produce one wrapper on linux
I removed the hack for libsecret, introduced in[0] and
I didn't encounter any problems at runtime.

[0]: https://github.com/NixOS/nixpkgs/pull/29127

(cherry picked from commit d9b14864a5)
2019-02-10 15:51:17 -05:00
Edmund Wu
4af87382a5 vscode: fix rpath for native modules
(cherry picked from commit 919a5f6963)
2019-02-10 15:51:09 -05:00
Edmund Wu
a4a2964f7d vscode-extensions.ms-vscode.cpptools: 0.20.1 -> 0.21.0
(cherry picked from commit baf6ba553f)
2019-02-10 15:50:58 -05:00
markuskowa
5225d4bf01 Merge pull request #55459 from fadenb/mysql_module_dbname_quoting_backport
[18.09] nixos/mysql: fix option `ensureDatabases`
2019-02-09 19:02:55 +01:00
Vladimír Čunát
3acebb0395 Merge branch 'staging-18.09' into release-18.09
polkit security
2019-02-09 09:49:11 +01:00
Robin Stumm
6792ad7f1e nixos/mysql: fix option ensureDatabases
The database name needs to be quoted
in case it contains special characters
so the MySQL service does not fail to start.

(cherry picked from commit 429c0bf60c)
2019-02-08 22:28:07 +01:00
Pascal Wittmann
13050bedc4 nagstamon: 2.0.1 -> 3.2.1 2019-02-08 20:02:12 +01:00
Aaron Andersen
b0e4127a70 cron: fix error when running crontab as sudo (issue #54827)
(cherry picked from commit c8547081cb)

Fixes https://github.com/NixOS/nixpkgs/issues/54827.
2019-02-08 17:43:01 +00:00
Elis Hirwing
e50e323a2c php72: 7.2.14 -> 7.2.15
Changelog: https://secure.php.net/ChangeLog-7.php#7.2.15
(cherry picked from commit 89dec63005)
2019-02-08 14:26:58 +00:00
Elis Hirwing
83f7febfd2 php72: 7.2.13 -> 7.2.14
Changelog: http://php.net/ChangeLog-7.php#7.2.14
(cherry picked from commit ab341a18ad)
2019-02-08 14:26:58 +00:00
Elis Hirwing
8618619dfd php71: 7.1.25 -> 7.1.26
Changelog: http://php.net/ChangeLog-7.php#7.1.26
(cherry picked from commit 49538f6b3a)
2019-02-08 13:20:56 +00:00
Tim Steinbach
fe753dd2f9 linux: 4.4.173 -> 4.4.174
(cherry picked from commit b5108ee64686960667ed70c8f2ddf11a8d169238)
2019-02-08 08:19:32 -05:00
Jorge Acereda
ce211e6839 ffmpeg-full: nvenc doesn't imply nonfree licensing 2019-02-08 10:50:43 +00:00
Andreas Rammhold
b01a89d58f Revert "linux: Adds patch for fixing wifi on raspberry pi"
Upstream 4.19.20 contains this patch already.

This reverts commit 43f4fb3c52.
2019-02-08 10:50:49 +01:00
worldofpeace
a859ce551b polkit: fix CVE-2019-6133
Jann Horn of Google found that Polkit doesn't properly check
if a process is already authenticated, which can lead to an
authentication reuse by a different user[0]. See also [1]

Closes #55391

[0]: https://bugs.chromium.org/p/project-zero/issues/detail?id=1692
[1]: https://gitlab.freedesktop.org/polkit/polkit/issues/75

(cherry picked from commit 7da64c9fbe)
2019-02-08 08:07:09 +00:00
Jörg Thalheim
8c492fee00 Merge pull request #55430 from Lassulus/steam-stable
[18.09] Steam: run update_runtimes.py
2019-02-08 06:11:33 +00:00
christoph
2c3418277a run update_runtimes.py
(cherry picked from commit 6833eabe59)
2019-02-08 05:13:17 +01:00
taku0
e6ad2c30aa thunderbird, thunderbird-bin: 60.4.0 -> 60.5.0 (#54935)
* thunderbird-bin: 60.3.3 -> 60.5.0

* thunderbird: 60.4.0 -> 60.5.0

(cherry picked from commit 3106cbe8c3)
2019-02-07 23:32:15 +01:00
Wout Mertens
160e2f7dd4 Merge branch 'staging-18.09' into nodejs-backports 2019-02-07 15:41:59 +01:00
Daniel Barlow
987d4b9cb4 make-closure needs build system mkdir and jq
Make make-closure work when cross-compiling

(cherry picked from commit f9f6ddc083)
2019-02-06 23:08:33 -05:00
Tim Steinbach
919c37786c linux: 4.4.172 -> 4.4.173
(cherry picked from commit a957cc42cfd072019120b8b2eae680625c7d844e)
2019-02-06 14:40:48 -05:00
Tim Steinbach
642499faef linux: 4.19.19 -> 4.19.20
(cherry picked from commit 7870ada549)
2019-02-06 13:29:16 -05:00
Tim Steinbach
0ae99e827a linux: 4.14.97 -> 4.14.98
(cherry picked from commit bd7e5b51b5)
2019-02-06 13:29:15 -05:00
Tim Steinbach
9b3d1ecb15 linux: 4.9.154 -> 4.9.155
(cherry picked from commit 117551ce2a)
2019-02-06 13:29:14 -05:00
Dmitry Kalinkin
8008d0bbc6 Merge pull request #55257 from MatrixAI/release-18.09
Backport fixes to tensorflow to release-18.09
2019-02-06 00:30:54 -05:00
Jeff Slight
12b1462924 gitlab: 11.6.3 -> 11.7.4
(cherry picked from commit 8c043d3c7b)
2019-02-06 01:01:06 +01:00
Pascal Bach
2578fa2c96 gitlab-runner: 11.6.0 -> 11.7.0
(cherry picked from commit 30c40858bd)
2019-02-06 00:54:43 +01:00
Florian Klink
addb7f23eb minio-client: 2018-12-27T00-37-49Z -> 2019-01-30T19-57-22Z
(cherry picked from commit d60c38ad9b)
2019-02-05 18:41:43 +01:00
Florian Klink
9e7dfa983e minio: 2019-01-23T23-18-58Z -> 2019-01-31T00-31-19Z
(cherry picked from commit 16994118ba)
2019-02-05 18:41:41 +01:00
Herman Fries
a8511a6f86 tensorflow: Add contrib/tensor_forest to rpath
(cherry picked from commit 69af83b202)
2019-02-05 18:25:35 +11:00
Maximilian Bosch
38a99219f3 nixos/ndppd: register test 2019-02-04 23:22:20 +01:00
Franz Pletz
961794963b ndppd: don't use weird upstream systemd service unit
(cherry picked from commit 2746973061)
Signed-off-by: Maximilian Bosch <maximilian@mbosch.me>
2019-02-04 23:21:20 +01:00
elseym
b9d797fb44 ndppd module: refactor
(cherry picked from commit 4ce1c59389)
Signed-off-by: Maximilian Bosch <maximilian@mbosch.me>
2019-02-04 23:21:19 +01:00
Franz Pletz
43d2810d73 nixos/tests: add ndppd test
(cherry picked from commit f1b91b5726)
Signed-off-by: Maximilian Bosch <maximilian@mbosch.me>
2019-02-04 23:21:16 +01:00
Lancelot SIX
d4a1e8975a qgis: 2.18.22 -> 2.18.28
(cherry picked from commit 76b1610a35)
2019-02-04 21:36:48 +01:00
Dmitry Kalinkin
dbb9f8818a buildbot: fix CVE-2019-7313 2019-02-04 00:59:42 -05:00
Dmitry Kalinkin
1e2c3bedbb Revert "qt59-qtbase: fix darwin build with clang-5"
The fix is already included in Qt 5.9.7

This reverts commit 0bf153f9c0.

(cherry picked from commit fd75bbccb9)
2019-02-02 21:33:52 +01:00
Andreas Rammhold
89049f3bb3 qt511: 5.11.1 -> 5.11.3
This fixes

 * CVE-2018-15518, Qt Base: “double free or corruption” in QXmlStreamReader
 * CVE-2018-19873, Qt Base: QBmpHandler segfault on malformed BMP file
 * CVE-2018-19870, Qt Base: Check for QImage allocation failure in qgifhandler
 * CVE-2018-19871, Qt Imageformats: QImage: QTgaFile CPU exhaustion
 * CVE-2018-19865, Qt Virtual Keyboard: Qt Virtual Keyboard logs all key presses
 * CVE-2018-19869, Qt Svg: Fix crash when parsing malformed url reference

More details can be obtained from the Qt annoucement [1].

[1] https://blog.qt.io/blog/2018/12/04/qt-5-11-3-released-important-security-updates/

(cherry picked from commit 2f5d37b77b)
2019-02-02 17:56:45 +01:00
Andreas Rammhold
0948f87182 qt56: fix CVE-2018-{15518,19873,19870,19871,19865,19869}
* CVE-2018-15518, Qt Base: “double free or corruption” in QXmlStreamReader
 * CVE-2018-19873, Qt Base: QBmpHandler segfault on malformed BMP file
 * CVE-2018-19870, Qt Base: Check for QImage allocation failure in qgifhandler
 * CVE-2018-19871, Qt Imageformats: QImage: QTgaFile CPU exhaustion
 * CVE-2018-19865, Qt Virtual Keyboard: Qt Virtual Keyboard logs all key presses
 * CVE-2018-19869, Qt Svg: Fix crash when parsing malformed url reference

More details can be obtained from the Qt annoucement [1].

[1] https://blog.qt.io/blog/2018/12/04/qt-5-11-3-released-important-security-updates/

(cherry picked from commit 066be85d9d)
2019-02-02 17:56:45 +01:00
Andreas Rammhold
a3c82b97af qt56.qtvirtualkeyboard: init at 5.6.3
This adds the "missing" qtvirtualkeyboard module of qt56. I just add
this so I can apply (& test) the patches for a CVE in the next commit.
This might seem strange but in case anyone decided to add / use this in
the future we are on the safe(r) side.

(cherry picked from commit 295a210a23)
2019-02-02 17:52:38 +01:00
Roosemberth Palacios
2ff7ef373e youtube-dl: 2019.01.17 -> 2019.01.30.1 (#55076)
Signed-off-by: Roosembert Palacios <roosembert.palacios@epfl.ch>
2019-02-02 16:13:27 +01:00
worldofpeace
7e15417e42 typora: 0.9.53 -> 0.9.64, remove electron blob
Also dropped the i386 archive.

(cherry picked from commit 3b61faf52b)
The archive for 0.9.53 was removed resulting in a broken build.
2019-02-01 23:01:58 -05:00
Robert Schütz
2481296277 Merge pull request #54974 from MatrixAI/release-18.09
Backport fixes to Dask and Distributed to release-18.09
2019-02-01 14:20:39 +01:00
Léo Gaspard
b3a2215178 Merge branch 'pr-55022' into release-18.09
* pr-55022:
  redmine: 3.4.6 -> 3.4.8
2019-02-01 14:01:20 +01:00
Domen Kožar
10dbdd30d1 nixops: 1.6 -> 1.6.1
(cherry picked from commit 8b85a86023)
Signed-off-by: Domen Kožar <domen@dev.si>
2019-02-01 11:40:42 +07:00
Herwig Hochleitner
77e29cd5fa i2p: 0.9.35 -> 0.9.38
(cherry picked from commit f7165b2ad6)
2019-02-01 03:58:18 +01:00
Frederik Rietdijk
5272775da6 python: distributed: 1.23.1 -> 1.23.3
(cherry picked from commit e8783b8284)
2019-02-01 12:53:11 +11:00
Chris Ostrouchov
283985b5b8 pythonPackages.distributed: refactor move to fetchPypi
There is a bug when using git repo in that the package does not get a
version (shows up as `0+unknown`). Using pypi fixes this issue allows
allows for auto upgrades.

(cherry picked from commit e5cd420e73)
2019-02-01 12:52:47 +11:00
Chris Ostrouchov
802e8d2676 fixup! merge: fixing changes with nixpkgs since pull-request
(cherry picked from commit 027b9beb58)
2019-02-01 12:42:06 +11:00
Chris Ostrouchov
19a3d55dc7 pythonPackages.distributed: 1.15.1 -> 1.22.1
The github repository was downloaded instead of the pypi repository
for testing (needed `conftest.py`). Major work was done on the
underlying dependencies to make distributed work on python 2.7,
3+. Note that the test **do** take a significant amount of time (10-15
minutes).

 - moved to `python-modules`
 - compatible with 2.7, 3+
 - all tests pass (previously tests were not run)

(cherry picked from commit 4f70170f8a)
2019-02-01 12:42:04 +11:00
Chris Ostrouchov
fcd7df5ea8 pythonPackages.pytest-repeat: init at 0.6.0
- compatible with 2.7, 3+
 - all tests pass and running

(cherry picked from commit 7b920172db)
2019-02-01 12:41:37 +11:00
Chris Ostrouchov
ff5a9b975b pythonPackages.pytest-faulthandler: init at 1.5.0
- compatible with 2.7 and 3+
 - all test pass.

(cherry picked from commit 5704642a3f)
2019-02-01 12:41:37 +11:00
Aaron Andersen
a349f52d83 redmine: 3.4.6 -> 3.4.8
(cherry picked from commit 0f3ecc630c)
2019-01-31 20:00:29 -05:00
Ivan Kozik
e1271ae1f5 chromium: make the new audio sandbox NixOS-compatible
Deal with f2fc90bb74
which landed https://github.com/chromium/chromium/blob/master/services/audio/audio_sandbox_hook_linux.cc
containing /usr/share and /usr/lib/x86_64-linux-gnu paths.

closes https://github.com/NixOS/nixpkgs/pull/54960

(cherry picked from commit 03960a323d)
2019-01-31 20:07:22 +01:00
Rob Vermaas
22a34b26fe julia: add 1.1.0
(cherry picked from commit bfc3789f38)
2019-01-31 15:01:04 +01:00
Tim Steinbach
76fc5f47b3 linux: 4.19.18 -> 4.19.19
(cherry picked from commit e4c1ce97c3)
2019-01-31 07:21:46 -05:00
Tim Steinbach
4bb7f3408c linux: 4.14.96 -> 4.14.97
(cherry picked from commit f623daca21)
2019-01-31 07:21:46 -05:00
Tim Steinbach
d2c9ee8dbb linux: 4.9.153 -> 4.9.154
(cherry picked from commit 468b6cea72)
2019-01-31 07:21:45 -05:00
Michael Weiss
54e78e87b0 Merge pull request #54987 from primeos/signal-desktop-backport
[18.09] Signal-Desktop backport
2019-01-31 12:37:08 +01:00
Michael Weiss
f9514c91fe signal-desktop: 1.19.0 -> 1.20.0
(cherry picked from commit 3efab179a5)
2019-01-31 12:15:27 +01:00
Michael Weiss
44fc32dca9 signal-desktop: 1.18.1 -> 1.19.0
A new dependency (at-spi2-atk) is required for libatk-bridge-2.0.so.

Also libstdc++.so.6 is now required from stdenv.cc.cc.lib (stdenv.cc.cc
doesn't offer it). The binary will only find libstdc++.so.6 via
$LD_LIBRARY_PATH (i.e. not via rpath, the run-time search path).

(cherry picked from commit e01209f2c7)
2019-01-31 12:15:26 +01:00
Robert Schütz
5769ebc21a Merge pull request #54941 from dotlambda/CVE-2019-3498-backport
django: [18.09] CVE-2019-3498
2019-01-31 10:26:05 +01:00
Andreas Rammhold
cdf9d7ce34 Merge pull request #54944 from andir/18.09/dockerTools
[18.09] dockerTools: unpin go version
2019-01-31 09:40:22 +01:00
Izorkin
47be5473a2 datadog-agent: 6.8.3 -> 6.9.0
(cherry picked from commit 73b317d923)
Signed-off-by: Domen Kožar <domen@dev.si>
2019-01-31 13:05:09 +07:00
Izorkin
f54482f59a datadog-agent: 6.4.2 -> 6.8.3
(cherry picked from commit 47a8b13efa)
Signed-off-by: Domen Kožar <domen@dev.si>
2019-01-31 13:04:56 +07:00
Herwig Hochleitner
7f3df85f44 chromium: 71.0.3578.98 -> 72.0.3626.81
CVE-2019-5754 CVE-2019-5782 CVE-2019-5755 CVE-2019-5756 CVE-2019-5757
CVE-2019-5758 CVE-2019-5759 CVE-2019-5760 CVE-2019-5761 CVE-2019-5762
CVE-2019-5763 CVE-2019-5764 CVE-2019-5765 CVE-2019-5766 CVE-2019-5767
CVE-2019-5768 CVE-2019-5769 CVE-2019-5770 CVE-2019-5771 CVE-2019-5772
CVE-2019-5773 CVE-2019-5774 CVE-2019-5775 CVE-2019-5776 CVE-2019-5777
CVE-2019-5778 CVE-2019-5779 CVE-2019-5780 CVE-2019-5781

(cherry picked from commit 6b27008fb5)
2019-01-31 01:22:05 +01:00
worldofpeace
d19eea7334 pythonPackages.txaio: disable tests
See discussion in https://github.com/NixOS/nixpkgs/pull/53479

Fixes #53474
2019-01-30 18:53:17 -05:00
Robert Schütz
f944ffecb9 python.pkgs.django_1_8: mark as insecure (#54937)
Since CVE-2018-14574 and CVE-2019-3498 affect 1.11, it is very likely
they also apply to 1.8. However, Django 1.8 has reached EOL in April
2018 and the patches were not backported.

(cherry picked from commit c6e08579c5)
2019-01-30 23:58:13 +01:00
Andreas Rammhold
0d6c4a88e2 qt59.qtvirtualkeyboard: fix CVE-2018-19865
CVE-2018-19865 tracks the issue of qtvirtualkeyboard where it logs all
user input. With this commit we are applying the recommended patches
form the upstream project.

More details can be obtained from the Qt annoucement [1].

[1] https://blog.qt.io/blog/2018/12/04/qt-5-11-3-released-important-security-updates/

(cherry picked from commit 66601282cc)
2019-01-30 23:56:50 +01:00
Florian Franzen
fc0c9a25ab qt59: 5.9.3 -> 5.9.7
(cherry picked from commit 776c96272c)
2019-01-30 23:46:59 +01:00
Andreas Rammhold
bc739d01cc Merge pull request #54910 from andir/18.09/prometheus-node-exporter
[18.09] prometheus-node-exporter: remove go 1.9 pinning
2019-01-30 15:53:41 +01:00
Benjamin Hipple
f39fb7b419 dockerTools: unpin go version
The linked PR has been merged, and in fact dockerTools has upgraded to the
latest `go1.11` compiler:

https://github.com/moby/moby/pull/35739
https://github.com/moby/moby/pull/37358
(cherry picked from commit 4d8bb9a34a)
2019-01-30 15:43:21 +01:00
R. RyanTM
e9a99dd6cc python37Packages.django_2_1: 2.1.4 -> 2.1.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-django/versions

(cherry picked from commit 0f5b4ecbea)
2019-01-30 14:53:20 +01:00
R. RyanTM
a38319be05 python37Packages.django_2_1: 2.1.3 -> 2.1.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-django/versions

(cherry picked from commit 375f2c23dd)
2019-01-30 14:53:13 +01:00
R. RyanTM
425238f065 python36Packages.django_2_1: 2.1.2 -> 2.1.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.6-django/versions

(cherry picked from commit 1330965fa5)
2019-01-30 14:53:07 +01:00
Robert Schütz
67f7b70c10 python.pkgs.django_2_0: 2.0.9 -> 2.0.10
fixes CVE-2019-3498

(cherry picked from commit 682b551864)
2019-01-30 14:51:40 +01:00
Robert Schütz
ec76d88c15 python.pkgs.django_1_11: 1.11.17 -> 1.11.18
fixes CVE-2019-3498

(cherry picked from commit e79d165d42)
2019-01-30 14:51:20 +01:00
Mario Rodas
8f9bbbe1cb pythonPackages.django_1_11: 1.11.16 -> 1.11.17 (#52636)
(cherry picked from commit ddd91fcfab)
2019-01-30 14:51:13 +01:00
Andreas Rammhold
23806968da gitAndTools.grv: use buildGoPackage instead of buildGo19Package
(cherry picked from commit 4fbce625ed)
2019-01-30 11:52:16 +01:00
Andreas Rammhold
bba8c22223 Merge staging-18.09 into release-18.09 2019-01-30 11:30:52 +01:00
Andreas Rammhold
2fddd79df6 Merge pull request #54912 from andir/18.09/firefox65
[18.09] nss 3.41 -> 3.42, firefox 64 -> 65
2019-01-30 03:12:38 +01:00
Andreas Rammhold
4bc8537905 firefoxPackages.firefox-esr-60: 60.4.0esr -> 60.5.0esr
(cherry picked from commit 10024f2ad1)
2019-01-30 02:16:45 +01:00
Andreas Rammhold
4f6152afc8 prometheus-node-exporter: remove go 1.9 pinning
With Go1.11 the daemon seems to work just fine. I was unable to observe
any crashes (due to the wifi module being loaded).
2019-01-30 01:35:40 +01:00
Andreas Rammhold
5e90a0f1da firefox-bin: 64.0 -> 65.0 2019-01-30 00:01:33 +01:00
Andreas Rammhold
d85692d289 firefox: 64.0 -> 65.0
There have been some more changes to the source tree which broke the
buildconfig patch. This commit adds another patch that can be used for
the future versions. Once all the flavors are based off a new(ish)
firefox release we can remove the old patch.
2019-01-29 23:58:37 +01:00
Andreas Rammhold
36e8e5db3a nss: 3.41 -> 3.42 2019-01-29 23:56:58 +01:00
Andreas Rammhold
19b3dae9f8 Merge 'release-18.09' into staging-18.09 2019-01-29 23:52:19 +01:00
Vladimír Čunát
5a3e195bcb go_1_9: mark as insecure (see the parent commit)
Upstream only supports two latest releases.
https://github.com/golang/go/issues/29903#issuecomment-457307356

(cherry picked from commit a687ef9739)
2019-01-29 21:34:25 +00:00
Vladimír Čunát
374f74c139 go_1_10: 1.10.7 -> 1.10.8 (security)
https://groups.google.com/forum/#!topic/golang-announce/mVeX35iXuSw
https://github.com/NixOS/nixpkgs/pull/54658
(cherry picked from commit d32e779ae8)
2019-01-29 21:34:17 +00:00
allowthere
ef8659b7ed go: 1.11.4 -> 1.11.5
https://groups.google.com/forum/#!msg/golang-announce/mVeX35iXuSw/Flp8FX7QEAAJ

We have just released Go 1.11.5 and Go 1.10.8 to address a recently reported security issue. We recommend that all users update to one of these releases (if you’re not sure which, choose Go 1.11.5).

This DoS vulnerability in the crypto/elliptic implementations of the P-521 and P-384 elliptic curves may let an attacker craft inputs that consume excessive amounts of CPU.

These inputs might be delivered via TLS handshakes, X.509 certificates, JWT tokens, ECDH shares or ECDSA signatures. In some cases, if an ECDH private key is reused more than once, the attack can also lead to key recovery.

The issue is CVE-2019-6486 and Go issue golang.org/issue/29903. See the Go issue for more details.

(cherry picked from commit d803da845f)
2019-01-29 21:34:07 +00:00
Will Fancher
b40b39b1bc shellFor: Don't suck in src to compare to deps. [Fixes #51079] 2019-01-29 16:26:29 -05:00
zimbatm
e39e43a349 nixos/google-compute-image: don't use <nixpkgs> (#54539)
Avoid loading code from the NIX_PATH as it prevents pinning
2019-01-28 17:31:58 +00:00
Tim Steinbach
0576b02369 linux: 4.19.17 -> 4.19.18
(cherry picked from commit 4ab5604c85)
2019-01-27 16:20:15 -05:00
Tim Steinbach
eb2a4f493b linux: 4.14.95 -> 4.14.96
(cherry picked from commit 19505bb8d1)
2019-01-27 16:20:14 -05:00
Tim Steinbach
7dfa5be27c linux: 4.9.152 -> 4.9.153
(cherry picked from commit 4606793349)
2019-01-27 16:20:13 -05:00
Tim Steinbach
047a9dc080 linux: 4.4.171 -> 4.4.172
(cherry picked from commit 6df6bb42b5)
2019-01-27 16:20:12 -05:00
Maximilian Bosch
68c0e95383 nextcloud-client: fix qt error at startup
The QT_PLUGIN_PATH couldn't find the needed xcb plugin.

See also #51044

(cherry picked from commit b525493253)
2019-01-27 11:37:43 +01:00
Andreas Rammhold
73c0c699eb Merge pull request #54505 from andir/18.09/firefox65
[18.09] firefox 65
2019-01-26 17:18:58 +01:00
Vladimír Čunát
09218fe5de systemd-cryptsetup-generator: fixup linkage
It got broken by a6fc462b5 #53483.
But IMO it's *this* expression that was written in a too fragile way.

(cherry picked from commit 2c226107cb)
2019-01-26 14:18:16 +01:00
Vladimír Čunát
e481112024 Revert "nix: point at curl 7.59.0 (#41452)"
This reverts commit 5574df3549.
I also can't reproduce the problem anymore; discussion: #41312.
Fixes #53569, fixes #53948.  (Vulnerabilities in old curl.)

(cherry picked from commit 51ac3db79c)
I've noticed no complaints about this change on unstable/master.
2019-01-26 14:02:01 +01:00
Jörg Thalheim
06808d4a14 Merge pull request #54565 from ivan/18.09-runScript
[18.09] buildFHSUserEnv: use runScript in env
2019-01-26 09:34:14 +00:00
Kristoffer Søholm
a4ee02f835 buildFHSUserEnv: use runScript in env (#49077)
This makes its behaviour conform to what is implied in the
documentation.

(cherry picked from commit 6f05dea390)
2019-01-26 09:32:41 +00:00
Stig Palmquist
119a93190a pythonPackages.python-gnupg: 0.4.3 -> 0.4.4
Fixes CVE-2019-6690:
https://blog.hackeriet.no/cve-2019-6690-python-gnupg-vulnerability/

(cherry picked from commit 464cbda386)
2019-01-25 08:01:14 +01:00
Kristoffer Søholm
6f05dea390 buildFHSUserEnv: use runScript in env (#49077)
This makes its behaviour conform to what is implied in the
documentation.
2019-01-25 01:41:25 +00:00
Ingolf Wagner
b7088935d6 rustc: mark compileprocess as timeconsuming
(cherry picked from commit c5f0dbb660)
2019-01-24 19:44:36 -05:00
Pascal Wittmann
ea58d40cfd autossh: 1.4f -> 1.5.g 2019-01-24 22:04:48 +01:00
Eelco Dolstra
261251b29d Fix copy-tarballs.pl
(cherry picked from commit 11cf7d6e1f)
2019-01-24 16:16:12 +01:00
Frederik Rietdijk
a35ecf0973 ncurses: use github mirror
Development releases of ncurses are uploaded but often also removed
again. This is causing a lot of trouble, so let's instead use a
GitHub mirror.

(cherry picked from commit 43e867a226)
2019-01-24 10:36:49 +01:00
Voob of Doom
3f69c99c2e ncurses: 6.1-20181027 -> 6.1-20190112
v6.1-20181027 url is 404.

(cherry picked from commit 138720f2f1)
2019-01-24 10:36:41 +01:00
Silvan Mosberger
9f88b3cbea Merge pull request #54410 from worldofpeace/mate-downgrade-backport
[18.09] mate updates and downgrades
2019-01-24 00:24:53 +01:00
Andreas Rammhold
aeba227fe0 Merge release-18.09 into staging-18.09 2019-01-23 18:45:22 +01:00
Member Betty
c595242ca9 aws-google-auth: use python3 (#52445)
(cherry picked from commit d268e3b2c0)
2019-01-23 18:04:19 +01:00
Tim Steinbach
749a3a0d00 linux: 4.19.16 -> 4.19.17
(cherry picked from commit 1b8beae40b)
2019-01-23 07:13:01 -05:00
Tim Steinbach
9239b3e9ba linux: 4.14.94 -> 4.14.95
(cherry picked from commit 5f0a4ee69f)
2019-01-23 07:12:54 -05:00
Tim Steinbach
7ab024129d linux: 4.9.151 -> 4.9.152
(cherry picked from commit 8ee43e01fa)
2019-01-23 07:12:45 -05:00
Peter Simons
276e509673 Merge pull request #53939 from rnhmjoj/pandoc-crossref-backport
haskellPackages.pandoc-crossref: refactor disable tests for 0.3.2.1 [backport]
2019-01-23 12:51:57 +01:00
Vladimir Mosienko
c7ae9a29ff teamviewer: 13.1.3026 -> 14.1.3399
(cherry picked from commit 2a858b3f76)
2019-01-23 09:46:27 +00:00
Andreas Rammhold
e76e8909c6 firefoxPackages: support building with firefox 65
Firefox >=65 will depend on icu >=63. All the older firefox versions
(and derived packages) seem to work fine with this change.

Also the system path environment patch will fail to apply since there
was a trivial whitespace change in the source file. By adding `-l` to
patch we can avoid having to track two patches that do basically the
same. Having patchFlags per file without resorting to pre-/postPatch
would be nicer but there doesn't seem to be a facility for that right
now.

(cherry picked from commit e37b765e7897c015153552d4e33a8571ab9c5457)
2019-01-23 09:05:41 +01:00
Symphorien Gibol
5a0116e4c3 rustc: fix build with unbundled jemalloc and llvm on darwin
jemalloc with stripped prefix would cause segfaults in free:
https://github.com/NixOS/nixpkgs/pull/49557#issuecomment-436734677

This commit has been adjusted from the one on master to only carry the
relevant changes (the new optional `stripPrefix`) flag while still
keeping the other flags that were removed on master since they are no
loner supported by the version used there.

(cherry picked from commit 973eca740b)
2019-01-23 09:05:41 +01:00
Andreas Rammhold
ae835664b2 rust_1_31: init at 1.31
This removes the 1.29 backport and replaces it with the 1.31 version
from master.
2019-01-23 09:05:40 +01:00
Alyssa Ross
577aa817e6 nss: 3.40.1 -> 3.41
(cherry picked from commit fdc6caf144)
2019-01-23 09:05:40 +01:00
Alyssa Ross
335f87f88c icu63: init at 63.1
(cherry picked from commit 70b8ab6e72)
2019-01-23 01:13:30 +01:00
Matthew Bauer
88157a2a48 ghc: don’t add libiconv automatically
ghc needs it to fail to correctly detect it for later.
2019-01-22 17:47:21 -05:00
worldofpeace
a21dad5e57 Merge pull request #54364 from etu/stable-upgrade-gitea
Backport gitea: 1.6.3 -> 1.6.4
2019-01-21 18:06:20 +00:00
Tim Steinbach
dc7a3651b5 openjdk: 8u192 -> 8u202
(cherry picked from commit fad6b012bd)
2019-01-21 13:04:59 -05:00
Milan Svoboda
f3b123e574 DMD to provide libphobos2.so.x.y
(cherry picked from commit 3f634dd88c)
2019-01-21 16:30:04 +00:00
Mario Rodas
c2b2843d39 aws-google-auth: init at 0.0.29
(cherry picked from commit f15aecd1bb)
2019-01-21 14:26:29 +01:00
worldofpeace
e7ac65c8b1 mate.mate.polkit: move gobjectIntrospection to nativeBuildInputs
(cherry picked from commit e26d22c091)
2019-01-21 02:52:25 -05:00
worldofpeace
a6be464584 mate.mate-panel: add gobjectIntrospection
(cherry picked from commit 1101ebb4fe)
2019-01-21 02:52:25 -05:00
worldofpeace
edb086c46c mate.mate-menus: move gobjectIntropection to nativeBuildInputs
(cherry picked from commit 1fa78d2fce)
2019-01-21 02:52:25 -05:00
worldofpeace
cf60db5f7e mate.mozo: switch to using buildPythonApplication, cleanup
(cherry picked from commit ff22ad20e7)
2019-01-21 02:52:24 -05:00
worldofpeace
b49c670e64 mate.atril: workaround undeclared dependence on gio-unix-2.0
(cherry picked from commit f9b8f2cf4f)
2019-01-21 02:52:24 -05:00
worldofpeace
ba0b9683e0 mate.python-caja: 1.20.0 -> 1.20.2
(cherry picked from commit 6ce1348158)
2019-01-21 02:52:24 -05:00
worldofpeace
a05f04b997 mate.pluma: 1.21.1 -> 1.20.4
(cherry picked from commit 4e6b97784f)
2019-01-21 02:52:23 -05:00
worldofpeace
fbdcbfbeed mate.mozo: 1.20.1 -> 1.20.2
(cherry picked from commit bdf5b3dd1b)
2019-01-21 02:52:23 -05:00
worldofpeace
5c8370c66d mate.mate-utils: 1.21.0 -> 1.20.2
(cherry picked from commit e3c2e51e0e)
2019-01-21 02:52:22 -05:00
worldofpeace
4572f2fee1 mate.mate-user-guide: 1.21.0 -> 1.20.2
(cherry picked from commit 548e26ea45)
2019-01-21 02:52:22 -05:00
worldofpeace
a3a4fa7953 mate.mate-terminal: 1.21.0 -> 1.20.2
(cherry picked from commit 98ce15cf3f)
2019-01-21 02:52:22 -05:00
worldofpeace
3fbbdaef52 mate.mate-system-monitor: 1.21.0 -> 1.20.2
(cherry picked from commit 16ea947914)
2019-01-21 02:52:21 -05:00
worldofpeace
3cbac072fd mate.mate-settings-daemon: 1.21.0 -> 1.20.4
(cherry picked from commit c92039e5b6)
2019-01-21 02:52:21 -05:00
worldofpeace
5399b90410 mate.mate-session-manager: 1.21.0 -> 1.20.2
(cherry picked from commit 3a0bd5c367)
2019-01-21 02:52:21 -05:00
worldofpeace
9e362c1922 mate.mate-sensors-applet: 1.21.0 -> 1.20.3
(cherry picked from commit 254ed88cb7)
2019-01-21 02:52:20 -05:00
worldofpeace
7cc3ee5615 mate.mate-screensaver: 1.21.0 -> 1.20.3
(cherry picked from commit 2eadf35958)
2019-01-21 02:52:20 -05:00
worldofpeace
5995b1b3fc mate.mate-power-manager: 1.21.0 -> 1.20.3
(cherry picked from commit 0be0c710c2)
2019-01-21 02:52:20 -05:00
worldofpeace
980c1d50a2 mate.mate-polkit: 1.20.1 -> 1.20.2
(cherry picked from commit 9f79190976)
2019-01-21 02:52:19 -05:00
worldofpeace
1a3b4abb16 mate.mate-panel: 1.21.1 -> 1.20.4
(cherry picked from commit 276da98ded)
2019-01-21 02:52:19 -05:00
worldofpeace
0f8ec286c4 mate.mate-notification-daemon: 1.20.1 -> 1.20.2
(cherry picked from commit bd3e25849b)
2019-01-21 02:52:19 -05:00
worldofpeace
063d09f3e7 mate.mate-menus: 1.21.0 -> 1.20.2
(cherry picked from commit 8ef194d7da)
2019-01-21 02:52:18 -05:00
worldofpeace
9e7f3e6836 mate.mate-media: 1.21.0 -> 1.20.2
(cherry picked from commit ff86182e9a)
2019-01-21 02:52:18 -05:00
worldofpeace
d1a77f7b90 mate.mate-icon-theme: 1.21.0 -> 1.20.3
(cherry picked from commit 0065df21f4)
2019-01-21 02:52:18 -05:00
worldofpeace
842bc89419 mate.mate-desktop: 1.21.0 -> 1.20.4
(cherry picked from commit 5701547d34)
2019-01-21 02:52:17 -05:00
worldofpeace
f3c19a1cf8 mate.mate-control-center: 1.21.0 -> 1.20.4
(cherry picked from commit 365e164fe4)
2019-01-21 02:52:17 -05:00
worldofpeace
2e3955ee39 mate.mate-calc: 1.21.0 -> 1.20.3
(cherry picked from commit 4f495775b6)
2019-01-21 02:52:16 -05:00
worldofpeace
282dc010eb mate.mate-applets: 1.21.0 -> 1.20.3
(cherry picked from commit f344cccea6)
2019-01-21 02:52:16 -05:00
worldofpeace
fa59104cea mate.macro: 1.21.0 -> 1.20.3
(cherry picked from commit 5c8db56468)
2019-01-21 02:52:16 -05:00
worldofpeace
3e240c6ccb mate.libmateweather: 1.21.0 -> 1.20.2
(cherry picked from commit d5cdfc942d)
2019-01-21 02:52:15 -05:00
worldofpeace
bd3463ba88 mate.libmatemixer: 1.21.0 -> 1.20.1
(cherry picked from commit e9cf5dee86)
2019-01-21 02:52:15 -05:00
worldofpeace
8155484ac3 mate.libmatekbd: 1.21.0 -> 1.20.2
(cherry picked from commit 6ee7bf05f9)
2019-01-21 02:52:15 -05:00
worldofpeace
df04ea0061 mate.eom: 1.21.2 -> 1.20.2
(cherry picked from commit df577121f6)
2019-01-21 02:52:14 -05:00
worldofpeace
65e87d7609 mate.engrampa: 1.21.0 -> 1.20.2
(cherry picked from commit 26e351e39d)
2019-01-21 02:52:13 -05:00
worldofpeace
06dd214214 mate.caja-extensions: 1.20.1 -> 1.20.2
(cherry picked from commit 2f6424a4ff)
2019-01-21 02:52:13 -05:00
worldofpeace
deaecbbc2f mate.caja: 1.21.2 -> 1.20.3
(cherry picked from commit da66a0be1f)
2019-01-21 02:52:12 -05:00
worldofpeace
448da4b092 mate.atril: 1.20.0 -> 1.20.3
(cherry picked from commit 19281027e9)
2019-01-21 02:52:12 -05:00
Samuel Dionne-Riel
50f41ea2fc Revert "Add ssh backdoor to VM tests infrastructure."
This reverts commit d6e3db44cf.

See #53935 for explanations. In short, it may be causing issues with
tests on the build infrastructure.

(cherry picked from commit 3aab228d09)
2019-01-20 15:50:29 -05:00
taku0
c983626f12 oraclejdk: 8u191 -> 8u201, 8u202
(cherry picked from commit 11fbd8299d)
2019-01-20 11:41:26 +00:00
Elis Hirwing
9fcd2b1f6d gitea: 1.6.3 -> 1.6.4
Release notes: https://github.com/go-gitea/gitea/releases/tag/v1.6.4
2019-01-20 09:04:21 +01:00
Alexey Shmalko
5d9024da9b Merge pull request #54293 from witkamp/fix/gcc-arm-embedded/MANPATH
gcc-arm-embedded: fix MANPATH
2019-01-20 03:37:56 +02:00
Vladimír Čunát
a16476a935 Merge branch 'staging-18.09' into release-18.09 2019-01-19 17:23:04 +01:00
Theodore Witkamp
08e2492a58 gcc-arm-embedded: fix MANPATH 2019-01-18 16:05:56 -08:00
Robert Schütz
69c050c60b Merge pull request #54276 from timokau/youtube-dl-fix-18.09
[18.09] youtube-dl: 2019.01.16 -> 2019.01.17
2019-01-18 16:28:19 +01:00
Timo Kaufmann
8da20836c6 youtube-dl: 2019.01.16 -> 2019.01.17
Fixes an issue with youtube, see
https://github.com/rg3/youtube-dl/issues/18891

(cherry picked from commit a1169afded)
2019-01-18 16:07:42 +01:00
Joachim F
da32b557cb Merge pull request #54253 from Moredread/electrum-18.09
Backport: electrum: 3.2.3 -> 3.2.4 (security)
2019-01-18 10:21:20 +00:00
Jörg Thalheim
b3f403bd1c Merge pull request #54228 from schmittlauch/exfat-nofuse/update
exfat-nofuse: backport unbreak for 4.18 and 4.20
2019-01-18 08:14:49 +00:00
Jörg Thalheim
fee3c22f30 racket: fix drracket crashes on file dialogs
(cherry picked from commit 4f9e46af5d)
2019-01-18 08:13:19 +00:00
André-Patrick Bubel
20f17484af electrum: 3.2.3 -> 3.2.4 (security)
Backports anti-phishing measures from master

(cherry picked from commit cfcce55e1c)
2019-01-18 05:08:34 +01:00
makefu
44ec48f768 exfat-nofuse: unbreak for 4.18 and 4.20
(cherry picked from commit eac6725843)
2019-01-17 23:54:54 +01:00
Franz Pletz
fa3dd53be8 tengine: 2.2.2 -> 2.2.3 (security)
Fixes CVE-2018-16843, CVE-2018-16844 and CVE-2018-16845.

(cherry picked from commit 3a6cd12a47)
2019-01-17 13:27:39 +01:00
Tim Steinbach
c94837dd40 linux: 4.19.15 -> 4.19.16
(cherry picked from commit b4ab6ffb7f)
2019-01-17 06:57:14 -05:00
Tim Steinbach
520c2cbab8 linux: 4.14.93 -> 4.14.94
(cherry picked from commit 6ad56550e4)
2019-01-17 06:57:06 -05:00
Tim Steinbach
a87f6a6f4f linux: 4.9.150 -> 4.9.151
(cherry picked from commit 1e62588421)
2019-01-17 06:56:56 -05:00
Tim Steinbach
db4c3746c0 linux: 4.4.170 -> 4.4.171
(cherry picked from commit 2833865206)
2019-01-17 06:56:48 -05:00
Jörg Thalheim
8139daa10e Merge pull request #54018 from MP2E/discord_stable_bump
discord: 0.0.5 -> 0.0.8 [backport to release-18.09]
2019-01-17 09:03:45 +00:00
Jörg Thalheim
5907c1741b oraclejdk: 8.191 -> 8.201
also no longer use requireFile and accept the license via nixpkgs option

(cherry picked from commit 1dc706f060)
2019-01-17 07:31:21 +00:00
Cray Elliott
8a00a453ce discord: fix gsettings crash when selecting file
(cherry picked from commit ff2341afc9)
2019-01-16 17:35:09 -08:00
Cray Elliott
c2eb7d73c1 discord: remove line referencing paxmark 2019-01-16 17:34:58 -08:00
Cray Elliott
01f54e8fd8 discord: 0.0.7 -> 0.0.8
also fixes evaluation on release-18.09

(cherry picked from commit d5d5453684)
2019-01-16 17:34:58 -08:00
Cray Elliott
a76438ccab discord: 0.0.5 -> 0.0.7
discord now depends on gtk3 instead of gtk2, unfortunately
there is no public changelog, so other changes are unknown

(cherry picked from commit 4e4a9babd7)
2019-01-16 17:34:58 -08:00
Jörg Thalheim
55aaf71e07 Merge pull request #53887 from schmittlauch/ktouch-backport
ktouch backport: init at 18.08.0
2019-01-16 20:50:28 +00:00
Herman Fries
a8e638a1e4 jetbrains.webstorm: 2018.3.2 -> 2018.3.3
(cherry picked from commit 0931e88251)
2019-01-16 17:32:19 +00:00
Herman Fries
419c4b4d37 jetbrains.rider: 2018.2.3 -> 2018.3.1
(cherry picked from commit 86219e2512)
2019-01-16 17:32:16 +00:00
Herman Fries
bc58f8806f jetbrains.pycharm-professional: 2018.3.2 -> 2018.3.3
(cherry picked from commit 126220c72f)
2019-01-16 17:32:12 +00:00
Herman Fries
6f2f81ec35 jetbrains.pycharm-community: 2018.3.2 -> 2018.3.3
(cherry picked from commit 8af348a4c0)
2019-01-16 17:32:08 +00:00
Herman Fries
390b79a0db jetbrains.idea-ultimate: 2018.3.2 -> 2018.3.3
(cherry picked from commit 623af95530)
2019-01-16 17:32:05 +00:00
Herman Fries
56bfbd1114 jetbrains.idea-community: 2018.3.2 -> 2018.3.3
(cherry picked from commit 443f806762)
2019-01-16 17:31:56 +00:00
Herman Fries
c8d2fe6457 jetbrains.clion: 2018.3.2 -> 2018.3.3
(cherry picked from commit 878a1a3f71)
2019-01-16 17:31:51 +00:00
Bjørn Forsman
21f693ef8e gitolite: 3.6.10 -> 3.6.11
From https://github.com/sitaramc/gitolite/blob/master/CHANGELOG:

2019-01-08  v3.6.11 fix security issue in 'rsync' (bundle helper); see commit
                    5df2b81 for more

(cherry picked from commit 3dee561c34)
2019-01-16 13:44:39 +01:00
Lassulus
65db4e0871 gitolite 3.6.7 -> 3.6.10 (#48562)
(cherry picked from commit b7632217ab)
2019-01-16 13:44:31 +01:00
Bjørn Forsman
aa2b8cc964 gitolite: change patchPhase to postPatch
Overriding patchPhase is bad practice, it prevents customizing the
package with "patches = []".

(cherry picked from commit 9e1b5f1115)
2019-01-16 12:55:38 +01:00
Michael Raskin
af669204f7 Merge pull request #54005 from domenkozar/geoclue2-downgrade
Geoclue2 downgrade
2019-01-16 11:47:04 +00:00
Vladimír Čunát
de519bc6b9 Merge #54039: wireshark: 2.6.4 -> 2.6.6
(cherry picked from commit 2aa190bae0)

A few security problems were fixed in both of the bumps,
mostly crashes with specific packets:
https://www.wireshark.org/docs/relnotes/wireshark-2.6.5.html
https://www.wireshark.org/docs/relnotes/wireshark-2.6.6.html
2019-01-16 11:17:19 +01:00
Jörg Thalheim
d64b173fdf Merge pull request #54001 from jb55/clightning-backports
clightning: 0.6.1 -> 0.6.3 (security, 18.09 backport)
2019-01-16 06:42:04 +00:00
Orivej Desh
7b8eb4948b libjpeg-turbo: fix CVE-2018-20330 (#53950)
(cherry picked from commit b0757da432)
2019-01-16 01:24:58 +00:00
/u/leo60228
28b3fa6eb4 youtube-dl: 2019.01.10 -> 2019.01.16
See #54010

(cherry picked from commit 977fd31463)
2019-01-16 00:26:07 +01:00
Dmitry Kalinkin
5b0d714aad Merge pull request #53940 from ThomasMader/fixDub
[18.09] dub: Fix package build
2019-01-15 16:27:00 -05:00
William Casarin
d0b16e5926 clightning: 0.6.1 -> 0.6.3
Versions before 0.6.3 have a potential coin-stealing DoS vulnerability.

Please upgrade!

backported from commits:

ca67e65182 0.6.2 -> 0.6.3
b0fbc9ed40738176b1539009bcae88f5f63b8eab split native build inputs
3c1d7118e6 0.6.1 -> 0.6.2

Signed-off-by: William Casarin <jb55@jb55.com>
2019-01-15 12:56:49 -08:00
Tad Fisher
d6eccb3a74 jetbrains: 2018.3.1 -> 2018.3.2 2019-01-15 17:01:51 +00:00
Tad Fisher
7bfb238066 jetbrains: 2018.3 -> 2018.3.1 2019-01-15 17:01:46 +00:00
Jason "Don" O'Conal
ec4829afe5 jetbrains-editors: 2018.2 -> 2018.3 2019-01-15 17:01:42 +00:00
Vladimír Čunát
97e0d53d66 Merge branch 'staging-18.09' into release-18.09
Mainly CVE fixes for systemd and openssh
2019-01-15 00:11:44 +01:00
elseym
0b471f71fa sonarr service: add more options to module
(cherry picked from commit 31ad79f432)
2019-01-14 20:37:39 +01:00
elseym
7436c65827 nzbget service: fix preStart script and add more options to module
(cherry picked from commit 44e1aabd02)
2019-01-14 20:37:23 +01:00
Thomas Mader
4b08662e74 dub: Fix package build 2019-01-14 13:48:47 +01:00
Chris Ostrouchov
a46594aeb4 haskellPackages.pandoc-crossref: refactor disable tests for 0.3.2.1
Author acknowleges test failing (change when no longer 0.3.2.1).
https://github.com/lierdakil/pandoc-crossref/issues/199

(cherry picked from commit e1ed5b26c9)
2019-01-14 13:44:27 +01:00
Domen Kožar
e99d03715a Revert "geoclue2 service: add option to run demo agent"
This reverts commit 316669327c.
2019-01-14 11:37:53 +01:00
Domen Kožar
053e0061dc Revert "geoclue2: 2.4.8 → 2.4.10"
This reverts commit a6dab86ada.
2019-01-14 11:36:30 +01:00
Domen Kožar
d37e90a3dd Revert "geoclue: 2.4.10 -> 2.4.12"
This reverts commit 284fc9b449.
2019-01-14 11:36:18 +01:00
worldofpeace
3ee297b992 Revert "geoclue2: add patch to whitelist elementary's agent"
This reverts commit ac61b96d1c.
2019-01-14 11:36:05 +01:00
elseym
e02b9d79f8 nixos/containers: explicitly set link up on host for extraVeths
(cherry picked from commit 8a8bf886b5)
2019-01-14 05:01:54 +01:00
Vladimír Čunát
5c79b4b512 Merge branch 'release-18.09' into staging-18.09 2019-01-13 23:28:35 +01:00
Samuel Dionne-Riel
0352694373 Merge pull request #53877 from tomfitzhenry/cherry-pick-alertmanager-extra-flags
Alertmanager: Allow the definition of extra options on commandline
2019-01-13 16:56:44 -05:00
Andreas Rammhold
fb83c49e04 openssh: apply CVE-2018-20685 patch
And modified to remove the CVS headers

(cherry picked from commit 6d3a653f10)
2019-01-13 22:53:20 +01:00
Jörg Thalheim
015541ea6a Merge pull request #53648 from Mic92/udev-settle
[backport] nixos/systemd-udev-settle: don't restart on upgrades
2019-01-13 21:06:19 +00:00
taku0
ab476f6377 flashplayer-standalone: mark broken
(cherry picked from commit a019087ef4)
crashes, see #53742
2019-01-13 21:54:30 +01:00
taku0
873a87706f flashplayer: 32.0.0.101 -> 32.0.0.114
(cherry picked from commit 9f1ff9976f)
security update, 404 on previous source tarball
2019-01-13 21:54:30 +01:00
Tim Steinbach
2f3144d1f9 linux: 4.19.14 -> 4.19.15
(cherry picked from commit e8d79486ef6bba14c799aab7e33b67b144d9830c)
2019-01-13 15:50:58 -05:00
Tim Steinbach
f10eb33323 linux: 4.14.92 -> 4.14.93
(cherry picked from commit 40920807b65eb9194b2a0b00a273935fcdcd2ad8)
2019-01-13 15:50:57 -05:00
Tim Steinbach
ea5e0ed6d8 linux: 4.9.149 -> 4.9.150
(cherry picked from commit e2455e52fb7e50c4390cca7a54f4607271a9f819)
2019-01-13 15:50:56 -05:00
Tim Steinbach
08619eabcc linux: 4.4.169 -> 4.4.170
(cherry picked from commit 7f0aba4cbdc441eadaa70b989f14412e4cabd55b)
2019-01-13 15:50:55 -05:00
R. RyanTM
f99d014197 duplicity: 0.7.18.1 -> 0.7.18.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/duplicity/versions

(cherry picked from commit a481218df3)
2019-01-13 14:08:22 -05:00
R. RyanTM
3cd286c681 duplicity: 0.7.18 -> 0.7.18.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/duplicity/versions

(cherry picked from commit a12c1aebb7)
2019-01-13 14:08:22 -05:00
Trolli Schmittlauch
8ccb60b9ea Merge branch 'release-18.09' into ktouch-backport 2019-01-13 19:52:58 +01:00
Alberto Berti
ef7c9c4edb Allow the definition of extra options on commandline
I stumbled upon an issue with the Alertmanager that required
an additional comand line option. See https://groups.google.com/forum/#!msg/prometheus-users/-5wd-P13xCI/lGLBHHgnBgAJ

(cherry picked from commit 69e4e4934d)

Without this, Nixos machines on 18.09 that have no private IP addresses cannot start Alertmanager.
https://github.com/NixOS/nixpkgs/pull/46068
https://github.com/NixOS/nixpkgs/pull/45302
2019-01-13 13:33:34 +00:00
Trolli Schmittlauch
61f0e7fddf ktouch: init at 18.08.0
packaging the `ktouch` touch typing tutor. Due to Qt impurities, it
needs to be installed in a profile to find it runtime dependencies.

(cherry picked from commit e93bd1d445)
2019-01-13 14:23:20 +01:00
Trolli Schmittlauch
efbf00b210 qt511.qtdeclarative: fix CMake qmlcachegen path
This package contains several CMake files used for setting up its
provided tools for use in other projects build with CMake.
While packaging *ktouch* I found out that the ${_qt5Core_install_prefix}
variable doesn't expand at all, rendering the path to the `qmlcachegen`
binary useless. As a fix, the command itself is used instead of the path
to the binary.

(cherry picked from commit 4b76c4605e)
2019-01-13 14:21:23 +01:00
Pascal Bach
919e0ada69 youtube-dl: 2019.01.02 -> 2019.01.10
(cherry picked from commit 395dbf0d9a)
2019-01-13 12:42:57 +01:00
Pascal Bach
ab838cfffd youtube-dl: 2018.12.17 -> 2019.01.02
(cherry picked from commit c74054f1d1)
2019-01-13 12:42:48 +01:00
Franz Pletz
a6fc462b59 systemd: 239 -> 239.20190110
Fixes CVE-2018-16864 & CVE-2018-16865 (journald stack clash). Fixes #53755.

Also updates the debian patches to fix CVE-2018-15686. Fixes #52250.

(cherry picked from commit 74a64a8a61)
2019-01-13 10:46:17 +01:00
Florian Klink
001b34abcb Merge pull request #53824 from eadwu/backports/vscode-1.30.2
vscode backport: 1.30.1 -> 1.30.2
2019-01-12 23:41:29 +01:00
Florian Klink
3b7c070663 nextcloud: 15.0.0 -> 15.0.2
(cherry picked from commit 58af931a57)
2019-01-12 23:04:49 +01:00
Samuel Dionne-Riel
4d5935de62 tests: Wait for shell for twice as long (10m)
See #49441 for an earlier attempt, which was subsequently reverted. I am
assuming that doubling the time will be sufficient if the machine is
overloaded since so many of the tests already pass at 5 minutes, while
still not holding back failures for needlessly long.

(cherry picked from commit b28b37eb00)
2019-01-12 12:13:17 -05:00
Will Dietz
2427f19b91 tor: 0.3.4.9 -> 0.3.4.10
https://lists.torproject.org/pipermail/tor-announce/2019-January/000171.html

FWIW, in the ChangeLog (in the source, sorry) it mentions:

  As a reminder, the Tor 0.3.4 series will be supported until 10 June
  2019. Some time between now and then, users should switch to the Tor
  0.3.5 series, which will receive long-term support until at least 1
  Feb 2022.

So we should consider moving to 0.3.5 "soon" :).

(cherry picked from commit 91859c0504)
2019-01-12 14:43:22 +01:00
Edmund Wu
cffe29fcc7 vscode: 1.30.1 -> 1.30.2
(cherry picked from commit 6b80db3f5f)
2019-01-12 08:36:45 -05:00
Thomas Tuegel
ddea42ee1e Merge pull request #53461 from schmittlauch/kcharselect-backport
Kcharselect backport: init at 18.08.0
2019-01-12 06:35:25 -06:00
Andreas Rammhold
80dc91a621 Merge pull request #53838 from andir/18.09/irssi
[18.09] irssi: 1.1.1 -> 1.1.2
2019-01-12 13:31:25 +01:00
Andreas Rammhold
1e4a763013 irssi: 1.1.1 -> 1.1.2
Fixes CVE-2019-5882 [1] and a few minor changes [2].

[1] https://irssi.org/security/html/irssi_sa_2019_01/
[2] https://irssi.org/2019/01/09/irssi-1.1.2-released/

(cherry picked from commit 41ee7073df)
2019-01-12 12:54:17 +01:00
Orivej Desh
48db49741e libjpeg-turbo: specify djpeg rgb-islow-icc-cmp test dependencies
Hydra failure: https://hydra.nixos.org/build/87096374/nixlog/1

Upstream issue: https://github.com/libjpeg-turbo/libjpeg-turbo/pull/321

(cherry picked from commit c55a42359a)
2019-01-12 11:02:10 +01:00
Vladimír Čunát
634191a27e Merge branch 'release-18.09' into staging-18.09 2019-01-12 11:02:04 +01:00
Vladimír Čunát
b3a2846516 boehmgc: avoid mass rebuild due to the parent commit
(cherry picked from commit 414e66f222)
2019-01-11 20:16:08 +01:00
Dmitry Kalinkin
d669a7c634 boehmgc: fix patch url
Fixes: 587467a18e ('github-gentoo-compromized_can...')

(cherry picked from commit ac7f4c0478)
2019-01-11 13:36:51 -05:00
Dmitry Kalinkin
695d517153 adv_cmds: switch url to use https
warning: unable to download 'http://opensource.apple.com/tarballs/adv_cmds/adv_cmds-158.tar.gz': HTTP error 302 (curl error: Couldn't connect to server); retrying in 298 ms
(cherry picked from commit 1a7e65e146)
2019-01-11 13:33:49 -05:00
Vladimír Čunát
2fbd049f1b dns-root-data: the old KSK is dead!
Long live... eh, I hope the new KSK won't live as long as the old one.
Anyway, it doesn't really matter how fast people update this.
https://www.ietf.org/mail-archive/web/dnsop/current/msg24989.html
See RFC 5011 for details of the protocol.

I re-tested validation with both of these files, to be sure.

(cherry picked from commit c4a5565e7a)
2019-01-11 16:48:15 +01:00
Notkea
76cebbcf08 matrix-synapse: 0.34.0 -> 0.34.0.1 (CVE-2019-5885)
(cherry picked from commit 0be693a8df)
2019-01-10 21:06:15 +01:00
Jörg Thalheim
4d22e46dc8 Merge pull request #53747 from bkchr/raspberry_pi_wifi_fix_backport
linux: Adds patch for fixing wifi on raspberry pi
2019-01-10 14:17:01 +00:00
Bastian Köcher
43f4fb3c52 linux: Adds patch for fixing wifi on raspberry pi 2019-01-10 13:51:45 +01:00
Mario Rodas
3bd7f31e85 nodejs-10_x: 10.12.0 -> 10.15.0
(cherry picked from commit 4c917c6961)
2019-01-10 11:36:10 +00:00
Mario Rodas
eeb3ca3aa5 nodejs-8_x: 8.11.4 -> 8.15.0
(cherry picked from commit bf847226ca)
2019-01-10 11:36:09 +00:00
Mario Rodas
9ebc5f6fb5 nodejs-6_x: 6.14.4 -> 6.16.0
(cherry picked from commit 39bec3990e)
2019-01-10 11:35:59 +00:00
R. RyanTM
35a07f6b58 http-parser: 2.8.1 -> 2.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/http-parser/versions

(cherry picked from commit 5b9ad12e7b)
2019-01-10 11:33:20 +00:00
R. RyanTM
692c5df6b2 libuv: 1.23.1 -> 1.23.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libuv/versions

(cherry picked from commit 1699401625)
2019-01-10 11:33:19 +00:00
R. RyanTM
1515377c2f libuv: 1.23.0 -> 1.23.1 (#47763)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libuv/versions

(cherry picked from commit ef93155f60)
2019-01-10 11:33:18 +00:00
R. RyanTM
0baa330759 libuv: 1.21.0 -> 1.23.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/libuv/versions.

(cherry picked from commit 5a95b0b440)
2019-01-10 11:33:17 +00:00
Jörg Thalheim
d26f11d389 qemu-afl: various cleanups 2019-01-09 19:28:38 -06:00
Robert Scott
abf9ac73cc afl-qemu: update to qemu 2.10.0, as specified by afl 2.52b
refresh patches & configure options directly from afl 2.52b to make
installation as vanilla as possible
2019-01-09 19:28:38 -06:00
Tim Steinbach
7d6a506754 linux: 4.19.13 -> 4.19.14
(cherry picked from commit 20f9b5d10a)
2019-01-09 12:10:20 -05:00
Tim Steinbach
70af21236d linux: 4.14.91 -> 4.14.92
(cherry picked from commit d55b3c9bf0)
2019-01-09 11:24:51 -05:00
Tim Steinbach
39e3248141 linux: 4.9.148 -> 4.9.149
(cherry picked from commit ec3e81beaf)
2019-01-09 11:03:32 -05:00
Florian Klink
3cec2249aa minio-client: 2018-12-05T22-59-07Z -> 2018-12-27T00-37-49Z
(cherry picked from commit fd90297960)
2019-01-09 12:59:03 +01:00
Florian Klink
762e7c1ebf minio: 2018-12-06T01-27-43Z -> 2018-12-27T18-33-08Z
(cherry picked from commit 6c6a899f32)
2019-01-09 12:59:03 +01:00
tilpner
b690ab173b minio-client: 2018-07-31T02-28-53Z -> 2018-12-05T22-59-07Z
(cherry picked from commit 380fce5bc3)
2019-01-09 12:59:02 +01:00
tilpner
ac184eea4a minio: 2018-07-31T02-11-47Z -> 2018-12-06T01-27-43Z
(cherry picked from commit d08187edce)
2019-01-09 12:59:02 +01:00
Jörg Thalheim
23b9f34bc8 Merge pull request #53692 from Mic92/rambox-electron
[backport] rambox: update electron to 3.x
2019-01-09 10:40:14 +00:00
Jörg Thalheim
5838574af8 electron_3: also update arm hashes
(cherry picked from commit 60703db86c)
2019-01-09 09:34:28 +00:00
Jörg Thalheim
6ccdd1607e rambox: downgrade electron to 3.x
(cherry picked from commit fdb87a0fee)
2019-01-09 07:53:55 +00:00
Jörg Thalheim
f9f584c067 electron_3: init at 3.1.0
electron 4 had many breaking changes in their API,
breaking rambox. Since the 3.x version is still maintained,
we can add an older variant.

(cherry picked from commit 66c1f82631)
2019-01-09 07:51:43 +00:00
Frederik Rietdijk
836d1d7c1c lapp: change postgresql version, fixes metrics
(cherry picked from commit a06b90a7dc)
Let's have working metrics on 18.09 as well, again.
2019-01-08 15:24:32 +01:00
Jörg Thalheim
34a1278b81 nixos/systemd-udev-settle: don't restart on upgrades
The idea is that we only need this target during boot,
however there is no point on restarting it on every upgrade.

This hopefully fixes #21954

(cherry picked from commit 0a2c8cc1db)
2019-01-08 12:08:31 +00:00
Silvan Mosberger
876a2c759b Merge pull request #53187 from cdepillabout/add-cpufreq-opts-to-18.09
backport cpufreq opts to 18.09
2019-01-08 05:02:32 +01:00
Dylan Simon
929b7846da stdenv: allow custom stdenv to take crossOverlays
(cherry picked from commit 04beae0979)
2019-01-07 20:55:06 -06:00
Robin Gloster
3582fa3f51 gitlab: 11.6.0 -> 11.6.3
(cherry picked from commit 8fac37db00)
2019-01-07 21:50:22 +01:00
Florian Klink
0a6dac0de9 gitlab-workhorse: 7.1.3 -> 7.6.0
(cherry picked from commit 134a6decae)
2019-01-07 21:50:22 +01:00
Florian Klink
57405cd6c0 gitlab-shell: 8.4.1 -> 8.4.3
(cherry picked from commit ca69c9c2d0)
2019-01-07 21:50:21 +01:00
Florian Klink
46d70e0128 gitaly: 0.129.0 -> 1.7.1
(cherry picked from commit 97e7cf75fa)
2019-01-07 21:50:21 +01:00
Florian Klink
e9ec08f2d0 gitlab-ee: 11.5.5 -> 11.6.0
(cherry picked from commit 4d7ce7a605)
2019-01-07 21:50:20 +01:00
Florian Klink
ebf1a4cf09 gitlab-ce: 11.5.5 -> 11.6.0
(cherry picked from commit 7ea6bde0ae)
2019-01-07 21:50:20 +01:00
Will Dietz
1e3969dfee Merge #52584: llvm7: 7.0.0 -> 7.0.1
(cherry picked from commit 0e393d0da1)
2019-01-07 17:29:56 +01:00
rnhmjoj
37de10b869 searx: fix build error 2019-01-07 13:22:15 +00:00
rnhmjoj
e4576ec7ac searx: 0.14.0 -> 0.15.0
(cherry picked from commit 985bc6ca5a)
2019-01-07 13:22:15 +00:00
rnhmjoj
fc5c11cdab python.pkgs.plone-testing: fix build
(cherry picked from commit bb9edd458e)
2019-01-07 13:22:15 +00:00
Bas van Dijk
cca1e3720f Merge pull request #53561 from LumiGuide/release-18.09-wordpress-plugin-copy
nixos/apache-httpd/wordpress: copy plugins and themes instead of syml…
2019-01-07 13:56:39 +01:00
Falco Peijnenburg
820bb86340 nixos/apache-httpd/wordpress: copy plugins and themes instead of symlinking
Symlinking works for most plugins and themes, but Avada, for instance, fails to
understand the symlink, causing its file path stripping to fail. This results in
requests that look like:

https://example.com/wp-content//nix/store/...plugin/path/some-file.js

Since hard linking directories is not allowed, copying is the next best thing.

(cherry picked from commit 9d2c9157d7)
2019-01-07 13:46:48 +01:00
Andrew Dunham
c2950341d0 uriparser: 0.9.0 -> 0.9.1
(cherry picked from commit 83ba7beb1a)
2019-01-06 19:09:56 -05:00
(cdep)illabout
0232f5cb2d cpufreq: add option for setting the cpu max and min frequencies
This adds a NixOS option for setting the CPU max and min frequencies
with `cpufreq`.  The two options that have been added are:

- `powerManagement.cpufreq.max`
- `powerManagement.cpufreq.min`

(cherry picked from commit b0f10d2d53)
(cherry picked from commit 46ecec8239)
2019-01-06 21:12:48 +09:00
Luke Sandell
591da7cb84 wsjtx: 1.9.1 -> 2.0.0
Old version of FT8 protocol was obsoleted on 2019-01-01.

(cherry picked from commit fada7041a0)
2019-01-06 13:12:24 +01:00
Bas van Dijk
64e1f4b50b Merge pull request #53431 from obsidiansystems/callCaball2nixWithOption-18.09
[18.09] backport haskell-modules: add callCabal2nixWithOptions
2019-01-06 11:54:49 +01:00
Vladimír Čunát
3c832ac5dd obs-studio: restrict meta.platforms
Hydra has been trying to build it on aarch64-linux, but never succeeded:
https://hydra.nixos.org/job/nixos/release-18.09-aarch64/nixpkgs.obs-studio.aarch64-linux/all
(It tries to feed compiler x86-specific options.)
I didn't test i686-linux, due to a transitive dependency not building
(libupnp), but there it might likely work.

(cherry picked from commit a68ae2c205)
2019-01-05 22:57:57 +01:00
Trolli Schmittlauch
7abe13c207 kcharselect: init at 18.08.0
Packaging `kcharselect` because a KDE tool for inserting special
characters is very useful.

(cherry picked from commit ec0eaca0f4)
2019-01-05 20:43:14 +01:00
Trolli Schmittlauch
9836a245c7 add myself to maintainers list
(cherry picked from commit 4fb9712a83)
2019-01-05 20:38:41 +01:00
Elis Hirwing
0a124ba93d gitea: 1.6.2 -> 1.6.3
Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.6.3
(cherry picked from commit eeb35be95d)
2019-01-05 14:58:14 +01:00
R. RyanTM
cfbf9f0664 sysstat: 12.1.1 -> 12.1.2 (#52675)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/sysstat/versions

(cherry picked from commit df834ee56d and
fixed conflict)
2019-01-05 14:49:42 +01:00
Drew Hess
326104ee5c haskell-modules: add callCabal2nixWithOptions.
Fixes #44377.

(cherry picked from commit 4abb8be7ab)
2019-01-04 21:55:44 -05:00
Matthew Bauer
cadb6ca5f6 Merge pull request #53028 from Ericson2314/old-gcc-fix
gcc-4.8: fixup cross compilation after merging #15867 for 18.09
2019-01-04 10:33:54 -06:00
José Romildo Malaquias
50debdf133 vivaldi-ffmpeg-codecs: 70.0.3538.77 -> 71.0.3578.98
(cherry picked from commit 3e00845cf0)
2019-01-03 16:11:43 -05:00
José Romildo Malaquias
a839028e50 vivaldi: 2.1.1337.51-1 -> 2.2.1388.37-1
(cherry picked from commit cb1e93b2c0)
2019-01-03 16:11:43 -05:00
Rob Vermaas
995c78064a julia: fix hash for 1.0.3 2019-01-03 19:55:31 +01:00
Jörg Thalheim
7cd6335c96 Merge pull request #53310 from das-g/davmail-homepage
davmail: fix homepage domain name
2019-01-03 14:22:54 +01:00
Bas van Dijk
0043d907ae Merge pull request #53290 from LumiGuide/release-18.09-wordpress
Wordpress: 4.9.1 -> 5.0.2
2019-01-03 11:14:51 +01:00
Falco Peijnenburg
70114c606e Wordpress: 4.9.1 -> 5.0.2
(cherry picked from commit 4dc18cb059)
2019-01-03 10:49:54 +01:00
Rob Vermaas
438b6df1b1 julia: update to 1.0.3 2019-01-03 09:50:01 +01:00
Andrew Dunham
eb0480ad6c stdenv/native: add missing argument
(cherry picked from commit 8efe3df795)
2019-01-02 15:18:12 -06:00
ajs124
8757b2c2f7 sshd: Add restartTrigger for sshd_config
Co-Authored-By: Franz Pletz <fpletz@fnordicwalking.de>
(cherry picked from commit 325e314aae)
2019-01-02 20:37:20 +01:00
Franz Pletz
9d608a6f59 shairport-sync service: fix default arguments
(cherry picked from commit 0ea65cd96c)
2019-01-02 19:18:23 +01:00
Vladimír Čunát
95ca9c8b28 libjpeg(-turbo): patch CVE-2018-19664
Fixes #52972.

(cherry picked from commit f603c1c52c)
2019-01-02 09:53:24 +01:00
Tal Walter
ce5bbb97db dropbox: 55.4.171 -> 63.4.107 (#53062)
Dropbox version 55.4.171 is too old which results in an error when doing
the initial account linking.

(cherry picked from commit d5dbfad91a)
Reason: To have a usable dropbox package for the next release.
2019-01-02 02:02:25 -05:00
Tim Steinbach
d4146e8c9d sbt: 1.2.7 -> 1.2.8
(cherry picked from commit 711a74c65a)
2019-01-01 12:39:59 -05:00
CrazedProgrammer
42f4123b59 urn: 0.7.1 -> 0.7.2
(cherry picked from commit cc2573028b)
Reason: Bugfix update.
2018-12-31 17:19:58 -05:00
Mario Rodas
0396345b79 nodejs-8_x: 8.12.0 -> 8.14.1
(cherry picked from commit f27ee10a9e)
2018-12-30 21:22:33 -05:00
adisbladis
5a056ea90c nodejs-8_x: 8.11.4 -> 8.12.0
(cherry picked from commit 2e94003c9c)
2018-12-30 21:22:32 -05:00
Mario Rodas
266f1138eb nodejs-6_x: 6.14.4 -> 6.15.1
(cherry picked from commit 75b894af0f)
2018-12-30 21:22:32 -05:00
Tim Steinbach
30a2654e74 linux: 4.19.12 -> 4.19.13
(cherry picked from commit b3492bd25e8c62264f09f3db37224cf75855d11e)
2018-12-30 09:58:27 -05:00
Tim Steinbach
92986c6f78 linux: 4.14.90 -> 4.14.91
(cherry picked from commit 871d5bd0adc8a8bfa6f31a5d00e6b20d3734991a)
2018-12-30 09:58:17 -05:00
Tim Steinbach
ee66ecd48c linux: 4.9.147 -> 4.9.148
(cherry picked from commit 57a3e2621ce51ed3549b0d1fdb0b6fd25717776f)
2018-12-30 09:58:05 -05:00
Vladimír Čunát
e8a72dc747 exiv2: 0.26.2018.06.09 -> 0.26.2018.12.30 (security)
The bump includes all the patches we had and adds some more,
e.g. for CVE-2017-1000127.  I don't think all CVEs get fixed by that,
but 0.27 would currently break too many packages; /cc #50496.

(cherry picked from commit bf7d1b538d)
2018-12-30 11:58:34 +01:00
Domen Kožar
0a8f35c998 add elm2nix
(cherry picked from commit 324f018fb5)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-12-29 19:00:38 +00:00
John Q Crosscompiler
e2279f8b14 gcc-4.8: fixup cross compilation after merging #15867
Taken from https://pastebin.com/my8gcybx given to me on IRC.
2018-12-29 03:04:25 -05:00
R. RyanTM
2df6b5825f matomo: 3.6.1 -> 3.7.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/matomo/versions

(cherry picked from commit 687567efd0)
2018-12-28 15:10:29 -05:00
Timo Kaufmann
7dae9a4ddd fflas-ffpack: add patch to fix flaky test (#53006)
(cherry picked from commit ee1f54dbdb)
2018-12-28 13:48:57 +01:00
Frederik Rietdijk
76aafbf4bf python.pkgs.pytest_xdist: pytest-forked is needed during runtime, fixes #45060
(cherry picked from commit 364c59dd94)
2018-12-27 15:34:05 +01:00
Mario Rodas
32326f5de3 python37: fix darwin build
Remove issue24658 patch because is already fixed and backported to
Python 3.7 178d1c0777

(cherry picked from commit 1764870813)
2018-12-27 14:11:35 +01:00
Mario Rodas
838f18e1fd python36: fix darwin build
Remove issue24658 patch because is already fixed and backported to
Python 3.6 a5ebc205be

(cherry picked from commit 31680c54e1)
2018-12-27 14:11:34 +01:00
Timo Kaufmann
d4e1d3dbe4 nauty: 26r10 -> 26r11 (#52960)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nauty/versions

(cherry picked from commit 98092f7a67)
2018-12-27 11:54:06 +01:00
Vincent Ambo
5c48901a72 nixos/journaldriver: import module in top-level module list
Imports the `journaldriver` module into the top-level NixOS module
list to make it usable without extra work.

This went unnoticed in #42134 (mostly because my setup imports modules
explicitly from pinned versions).

Fixes #50390

(cherry picked from commit d5ea09758d)
2018-12-27 11:48:44 +01:00
Vladimír Čunát
33000fe7ca Merge branch 'staging-18.09' into release-18.09
Let's lump this rebuild together with the python updates.
2018-12-26 18:21:39 +01:00
Frederik Rietdijk
52571d750d python36: 3.6.7 -> 3.6.8
(cherry picked from commit 741e00fd10)
2018-12-26 09:44:13 +01:00
Frederik Rietdijk
0312ef11d6 python37: 3.7.1 -> 3.7.2
(cherry picked from commit 552d8a70d4)
2018-12-26 09:44:13 +01:00
Alexandre Peyroux
c840631fe2 masterpdfeditor: 5.1.60 -> 5.2.20
(cherry picked from commit c1e10bd258)
2018-12-26 00:13:15 +01:00
Pascal Bach
81d1a315f7 gitlab-runner: 11.5.0 -> 11.6.0
(cherry picked from commit 5b61578924)
2018-12-25 15:34:03 +01:00
Florian Klink
337687ff3e gitlab-ee: 11.5.4 -> 11.5.5
CVE-2018-20229, https://about.gitlab.com/2018/12/20/critical-security-release-gitlab-11-dot-5-dot-5-released/

(cherry picked from commit 236cb26954)
2018-12-25 15:29:09 +01:00
Florian Klink
6869be452d gitlab-ce: 11.5.4 -> 11.5.5
CVE-2018-20229, https://about.gitlab.com/2018/12/20/critical-security-release-gitlab-11-dot-5-dot-5-released/

(cherry picked from commit 6397fd3e71)
2018-12-25 15:29:09 +01:00
Meghea Iulian
928ff62213 brightnessctl: fix udev, cleanup & meta update 2018-12-25 15:01:19 +01:00
R. RyanTM
9b2e89775e brightnessctl: 0.3.2 -> 0.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/brightnessctl/versions
2018-12-25 15:01:12 +01:00
Alexandre Peyroux
0267a5a33e masterpdfeditor: 5.1.36 -> 5.1.60
(cherry picked from commit 27298d378f)
2018-12-25 14:31:46 +01:00
Alexandre Peyroux
79c8e369bb masterpdfeditor: use qtbase.qtPluginPrefix #44047
(cherry picked from commit 63b897a473)
2018-12-25 14:31:46 +01:00
Alexandre Peyroux
c5dee01627 masterpdfeditor: 5.1.12 -> 5.1.36
(cherry picked from commit 899b7663b0)
2018-12-25 14:31:46 +01:00
Robert Schütz
16d85e5a1d python.pkgs.django_1_8: 1.8.18 -> 1.8.19
This fixes CVE-2018-7536 and CVE-2018-7537:
https://www.djangoproject.com/weblog/2018/mar/06/security-releases/

cc https://github.com/NixOS/nixpkgs/issues/52679

(cherry picked from commit 461552526b)
2018-12-24 11:27:25 +01:00
Chris Ostrouchov
7f03676341 pythonPackages.django_1_8: refactor move to python-modules
(cherry picked from commit 4906ff50a9)
2018-12-24 11:25:29 +01:00
taku0
b9fa31cea0 licenses: add GPLv2.0 only + classpath exception
(cherry picked from commit 66124646ee)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-12-22 15:37:52 +00:00
Domen Kožar
7e0744c594 jre: use adoptopenjdk-jre-bin on aarch
(cherry picked from commit 2088ae10a3)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-12-22 15:37:52 +00:00
Benno Fünfstück
352bb0c0d9 adoptopenjdk-bin: disable openj9 jre for mac due to missing upstream
(cherry picked from commit 6972c433ab)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-12-22 15:37:52 +00:00
Robert Schütz
f90a5979ee adoptopenjdk-bin: use python-withPackages for shebang
Co-Authored-By: bennofs <benno.fuenfstueck@gmail.com>
(cherry picked from commit 682d1befd9)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-12-22 15:37:52 +00:00
Benno Fünfstück
c3e15f7da3 adoptopenjdk: autogenerate sources + add support for aarch64
(cherry picked from commit 5bbfc0cc37)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-12-22 15:37:52 +00:00
taku0
5af9e75983 adoptopenjdk-openj9-bin: 11 -> 11.0.1
(cherry picked from commit 3cfa035a99)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-12-22 15:37:52 +00:00
taku0
b75b9f528e adoptopenjdk-bin: support darwin platform
(cherry picked from commit 7c3dd045ce)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-12-22 15:37:52 +00:00
taku0
51bc964cbf adoptopenjdk-bin: init at 11
(cherry picked from commit 8faebb17ac)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-12-22 15:37:52 +00:00
Jörg Thalheim
fffd24d758 Merge pull request #52678 from risicle/ris-cf-cli-platforms-r18.09
[r18.09 backport] cloudfoundry-cli: fix build on multiple platforms, notably darwin, to produce correct binary for target…
2018-12-22 14:56:31 +01:00
Robert Scott
e67f3aeb3a cloudfoundry-cli: fix build on multiple platforms, notably darwin, to produce correct binary for target
cherry-picked from commit 61fad2cdce
2018-12-22 12:38:34 +00:00
Tim Steinbach
11c9922a7d kernel-config: CIFS_POSIX no longer exists
(cherry picked from commit 98ac5710bd)
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=6e785302dad
2018-12-22 09:10:24 +01:00
Franz Pletz
93468b34f3 gitea: fix version in app
(cherry picked from commit 12e57cbb61)
2018-12-22 04:34:06 +01:00
Justin Humm
50021740bc qutebrowser: fix pdfjs
Pdfjs was downloaded in two derivations, where one is sufficient.

Also there was allegedly a typo in the download URL.

(cherry picked from commit 0be7bfe1bf)
2018-12-21 22:21:25 -05:00
Elis Hirwing
b29f64a70f gitea: 1.6.0 -> 1.6.2
Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.6.1
Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.6.2
(cherry picked from commit a87fd222c8)
2018-12-22 03:24:30 +01:00
Henry
8b34b68806 gitea: 1.5.3 -> 1.6.0
Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.6.0
(cherry picked from commit 595c1e0a36)
2018-12-22 03:15:32 +01:00
Vladimír Čunát
e55e8ad8b2 Merge #52598: firefox: 63.0.3 -> 64.0 2018-12-21 21:44:38 +01:00
Vladimír Čunát
bdf88aa7e1 Merge #50249: libjpeg-turbo: 1.5.3 -> 2.0.1
(cherry picked from commit 834e7c4f0b)
Fixes CVE-2018-11813.
I see no issues with this reported for staging/master.
2018-12-21 16:25:49 +01:00
Tim Steinbach
679f6bb115 linux: 4.19.11 -> 4.19.12
(cherry picked from commit af6c117fac)
2018-12-21 09:13:19 -05:00
Tim Steinbach
e2b01088dc linux: 4.14.89 -> 4.14.90
(cherry picked from commit dea57f15e9)
2018-12-21 09:13:18 -05:00
Tim Steinbach
cc9ae38c55 linux: 4.9.146 -> 4.9.147
(cherry picked from commit a5f447e16a)
2018-12-21 09:13:18 -05:00
Tim Steinbach
6b45437aee linux: 4.4.168 -> 4.4.169
(cherry picked from commit 54ce2e016b)
2018-12-21 09:13:18 -05:00
Bjørn Forsman
8c6ab3c72f nixos/jenkins-job-builder: add accessTokenFile option
The new option allows storing the secret access token outside the world
readable Nix store.

(cherry picked from commit bb94d419fb)
2018-12-21 09:31:57 +01:00
Bjørn Forsman
7e621a2118 nixos/jenkins-job-builder: stop reloadScript on error
Currently there are two calls to curl in the reloadScript, neither which
check for errors. If something is misconfigured (like wrong authToken),
the only trace that something wrong happened is this log message:

  Asking Jenkins to reload config
  <h1>Bad Message 400</h1><pre>reason: Illegal character VCHAR='<'</pre>

The service isn't marked as failed, so it's easy to miss.

Fix it by passing --fail to curl.

While at it:
* Add $curl_opts and $jenkins_url variables to keep the curl command
  lines DRY.
* Add --show-error to curl to show short error message explanation when
  things go wrong (like HTTP 401 error).
* Lower-case the $CRUMB variable as upper case is for exported environment
  variables.

The new behaviour, when having wrong accessToken:

  Asking Jenkins to reload config
  curl: (22) The requested URL returned error: 401

And the service is clearly marked as failed in `systemctl --failed`.

(cherry picked from commit 8ebfd5c45c)
2018-12-21 09:31:46 +01:00
Philipp Middendorf
948c9f4b3c liquibase: fix missing dependencies
(cherry picked from commit 7d270d993b)
Signed-off-by: Maximilian Bosch <maximilian@mbosch.me>
2018-12-21 02:21:06 +01:00
Andreas Rammhold
232f20d503 firefox: 63.0.3 -> 64.0
(cherry picked from commit d8cde6882c)
2018-12-20 20:52:32 -01:00
Andreas Rammhold
9a9a7cc1c3 firefox: updated common.nix to support ffx64
(cherry picked from commit 93a9e626d0)
2018-12-20 20:52:32 -01:00
Herwig Hochleitner
b7cfe953e8 chromium: 71.0.3578.80 -> 71.0.3578.98
CVE-2018-17481

(cherry picked from commit 327f7da260)
2018-12-20 21:31:33 +01:00
Herwig Hochleitner
aa89b5fd56 chromium/plugins: specify gcc instead of stdenv.cc
(cherry picked from commit 7eea24db5d)
2018-12-20 21:27:15 +01:00
volth
3852c84087 chromium: build with clang
(cherry picked from commit d2daf0dd6f)
2018-12-20 21:27:15 +01:00
Jörg Thalheim
345c088139 Merge pull request #52565 from ackien/git-secret-gawk-backport
[18.09] git-secret: Backport gawk fix
2018-12-20 18:45:02 +01:00
John Ericson
97940bf6c5 Merge pull request #52559 from Ericson2314/openspades-darwin
openspades: Fix Darwin build, for 18.09
2018-12-20 12:18:17 -05:00
Tim Steinbach
be9872621c linux: 4.19.10 -> 4.19.11
(cherry picked from commit 1b84b9f725)
2018-12-20 10:47:41 -05:00
Sarah Brofeldt
6a7dea9330 Merge pull request #52530 from johanot/kubernetes-1.11.6
kubernetes: 1.11.5 -> 1.11.6
2018-12-20 13:15:30 +01:00
Aiken Cairncross
7c9bd9692d git-secret: Add gawk to wrapper
Cherry-picked from 0fc60df
2018-12-20 11:07:30 +00:00
Peter Simons
34a637ca92 ghc: add new compiler version 8.6.3
(cherry picked from commit c37ae1dcf6)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-12-20 10:28:30 +00:00
Lengyel Balazs
fbb7dbdb95 firmware-linux-nonfree: 20181017 -> 20181213
(cherry picked from commit 374a672424)

Fixes #52430.
2018-12-20 04:40:10 +01:00
Will Dietz
7cf770ca93 linux-firmware: 2018-08-25 -> 2018-10-17
(cherry picked from commit 788d324205)
2018-12-20 04:37:39 +01:00
Johan Thomsen
efdc3d51bc kubernetes: 1.11.5 -> 1.11.6 2018-12-19 17:07:29 +01:00
Amine Chikhaoui
9bacb8289b networkmanagerapplet: 1.8.16 -> 1.8.18
(#50338)

(cherry picked from commit e1ad1a0aa2)
2018-12-19 13:55:16 +01:00
Symphorien Gibol
de20e95222 brlaser: fix install dir
Fixes #49092

(cherry picked from commit 26ee8d6479)
2018-12-19 11:02:38 +01:00
Edmund Wu
a3eba49f7f vscode: 1.30.0 -> 1.30.1
(cherry picked from commit 4b0e96f3b7)
2018-12-18 20:45:18 -05:00
Edmund Wu
b273957530 vscode-extensions.WakaTime.vscode-wakatime: 1.2.4 -> 1.2.5
(cherry picked from commit 59b30d9aa7)
2018-12-18 20:45:18 -05:00
Edmund Wu
82ae6ee36f vscode-extensions.ms-python.python: 2018.11.0 -> 2018.12.1
(cherry picked from commit 8ac14eb0bb)
2018-12-18 20:45:18 -05:00
Edmund Wu
a5bedfb3df vscode-with-extensions: only add flag if extensions > 0
(cherry picked from commit df8dccfdcf)
2018-12-18 20:45:18 -05:00
John Ericson
02f47920b5 Merge pull request #52500 from obsidiansystems/haskell-servant-cross
servant: Sphinx is a build-time dependency for 18.09
2018-12-18 17:44:52 -05:00
Pablo Delgado Krämer
5fe7934ce5 nixos/oh-my-zsh: fix wrong manual information
Manual still refers to 'programs.ohMyZsh' although it should be 'programs.zsh.ohMyZsh'.

(cherry picked from commit 685c4f5608)
Signed-off-by: Maximilian Bosch <maximilian@mbosch.me>
2018-12-18 23:22:26 +01:00
Renaud
e9a1274f3a Merge pull request #51849 from srhb/backport-zoom-2.6
Backport: zoom-us: 2.5.146186.1130 -> 2.6.146750.1204
2018-12-18 16:28:21 +01:00
Tim Steinbach
0e84e7dfd7 linux: 4.4.167 -> 4.4.168
(cherry picked from commit e29ebd9e51d20f132c41fb8f641aaf6a5bbc5cd5)
2018-12-18 09:13:07 -05:00
Linus Heckemann
33a0a37a11 Merge pull request #52482 from mayflower/fswatch-backport
[18.09] Fswatch backports
2018-12-18 14:38:52 +01:00
Linus Heckemann
d6104293d7 Merge pull request #52474 from mayflower/gopass-backport
gopass: 1.8.2 -> 1.8.3
2018-12-18 14:04:18 +01:00
Linus Heckemann
b3b01efca2 Merge pull request #52473 from mayflower/hwloc-bump
[18.09] hwloc: 1.11.10 -> 1.11.12
2018-12-18 14:03:27 +01:00
R. RyanTM
7cf11fc0f7 fswatch: 1.13.0 -> 1.14.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/fswatch/versions

(cherry picked from commit 2cbaaa55d5)
2018-12-18 13:55:02 +01:00
R. RyanTM
aceb0f90d3 fswatch: 1.12.0 -> 1.13.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/fswatch/versions

(cherry picked from commit e7c2c5784f)
2018-12-18 13:55:02 +01:00
Linus Heckemann
185a2851a2 Merge pull request #52478 from mayflower/haproxy-backport
[18.09] Haproxy backports
2018-12-18 13:27:08 +01:00
R. RyanTM
ce6719d3e6 haproxy: 1.8.14 -> 1.8.15
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/haproxy/versions

(cherry picked from commit 44482c54ff)
2018-12-18 13:22:24 +01:00
R. RyanTM
49aabfa88d haproxy: 1.8.13 -> 1.8.14
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/haproxy/versions

(cherry picked from commit 365dad81f8)
2018-12-18 13:22:24 +01:00
Mario Rodas
d3f7773f43 gopass: 1.8.2 -> 1.8.3
(cherry picked from commit c32752fb12)
2018-12-18 12:56:31 +01:00
Linus Heckemann
d34d2b1958 hwloc: 1.11.10 -> 1.11.12
additionally, refactor version string and download link to make it
comatible with automatic updates as in
ac85a1ec47 (thanks @markuskowa)
2018-12-18 12:45:39 +01:00
Matthew Bauer
2a0f4d2d50 Merge pull request #52252 from Ericson2314/fix-darwin-bootstrap-cmds-for-18.09
treewide: Use "buildPackages" darwin for bootstrap_cmd for 18.09
2018-12-17 22:53:18 -06:00
Pavel Goran
19fb949471 nixos/mysql: support package=mysql57
(cherry picked from commit 21e9c35f5f)

Fixes #25418.
2018-12-18 00:50:56 +01:00
Pascal Bach
4f69b3ced6 youtube-dl: 2018.11.18 -> 2018.12.17
(cherry picked from commit 28e9a1eef1)
2018-12-18 00:10:15 +01:00
Franz Pletz
fa3dabe232 youtubeDL: 2018.11.07 -> 2018.11.18
(cherry picked from commit c826315257)
2018-12-18 00:10:14 +01:00
Jörg Thalheim
76ac1b6f30 go_1_11: update outdated meta.branch
(cherry picked from commit a4f37346e7)
2018-12-17 19:31:11 +01:00
Benjamin Herr
3e10c5bf26 go: 1.11.2 -> 1.11.4
(cherry picked from commit ce2d980be8)
2018-12-17 19:30:26 +01:00
Jaka Hudoklin
41f74251b9 go_1_11: 1.11 -> 1.11.2f
fixes #50180

(cherry picked from commit 734bd4ca54)
2018-12-17 19:30:19 +01:00
Benjamin Herr
d0c3afbf50 go_1_10: 1.10.3 -> 1.10.7
(cherry picked from commit 3cb3a24ce9)
2018-12-17 19:29:30 +01:00
Franz Pletz
8eaff5a744 postgresql: branch 9.3 is not maintained anymore
See https://www.postgresql.org/support/versioning/.

(cherry picked from commit 61bd0e851e)
2018-12-17 16:38:41 +01:00
R. RyanTM
eeb072c21e graphicsmagick: 1.3.30 -> 1.3.31
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/graphicsmagick/versions

(cherry picked from commit 6d7e94aa1e)
2018-12-17 16:37:25 +01:00
taku0
f9954722c6 thunderbird-bin: 60.3.2 -> 60.3.3
(cherry picked from commit f9d6dcecd7)
2018-12-17 16:37:25 +01:00
taku0
2eae458684 thunderbird: 60.3.2 -> 60.3.3
(cherry picked from commit 5698d7888e)
2018-12-17 16:37:25 +01:00
Shea Levy
a580755f64 haskell generic builder: Add flag to allow inconsistent dependencies.
(cherry picked from commit 30fb5b0dcf)
2018-12-17 09:26:48 -05:00
Tim Steinbach
82d26ac69b linux: 4.19.9 -> 4.19.10
(cherry picked from commit ed5920e6ad35d86d0bed03749b90af3d67092602)
2018-12-17 09:19:58 -05:00
Tim Steinbach
5bfaa294ea linux: 4.14.88 -> 4.14.89
(cherry picked from commit 56fcbb2f7882445d77bd5ba60bd11f22f743c540)
2018-12-17 09:19:58 -05:00
Tim Steinbach
3758dc9f3d linux: 4.9.145 -> 4.9.146
(cherry picked from commit 2e749ccd868d3cf38e61aa6e98a2641cf8dad432)
2018-12-17 09:19:57 -05:00
Linus Heckemann
c106bb5092 Merge pull request #52435 from primeos/signal-desktop-backport
[18.09] signal-desktop backport
2018-12-17 15:16:43 +01:00
Michael Weiss
a136eba3de signal-desktop: 1.18.0 -> 1.18.1
(cherry picked from commit b3fb2d5c1c)
2018-12-17 14:58:23 +01:00
Michael Weiss
613042f247 signal-desktop: 1.17.3 -> 1.18.0
(cherry picked from commit a6167c3311)
2018-12-17 14:58:23 +01:00
Michael Weiss
a3317be35f signal-desktop: 1.17.2 -> 1.17.3
(cherry picked from commit e075748769)
2018-12-17 14:58:22 +01:00
Franz Pletz
b9d7b24d2c libssh: 0.7.6 -> 0.7.7
Bugfix release for the 0.7 branch to fix regressions from the security
fixes.

See https://www.libssh.org/2018/10/29/libssh-0-8-5-and-libssh-0-7-7/.
2018-12-17 02:19:07 +01:00
Mario Rodas
600c6c66ec libvncserver: add CVE-2018-7225 patch
(cherry picked from commit 03fddb139e)
2018-12-17 02:04:59 +01:00
Franz Pletz
1b0da4da0f prosody: 0.10.2 -> 0.10.3 2018-12-17 01:15:42 +01:00
Florian Klink
bb0a7fc892 Merge pull request #52410 from flokli/18.09-gitlab-11.5.4
[18.09] gitlab: 11.5.1 -> 11.5.4
2018-12-17 00:42:24 +01:00
Florian Klink
3adcfd4199 gitlab: run test with 4096 bits if on 64bit, else the the maximum for 32bit
(cherry picked from commit c788367eda)
2018-12-16 23:57:30 +01:00
Florian Klink
2a91e6b1a1 gitlab-ee: 11.5.1 -> 11.5.4
(cherry picked from commit 0a87bdecd5)
2018-12-16 23:57:30 +01:00
Florian Klink
d40c6b224e gitlab-ce: 11.5.1 -> 11.5.4
(cherry picked from commit 88fc01b0e6)
2018-12-16 23:57:29 +01:00
Jörg Thalheim
f0b6661d19 Merge pull request #52043 from worldofpeace/vscode/backport
vscode backports
2018-12-16 22:15:08 +00:00
R. RyanTM
2b0b12223f nsd: 4.1.25 -> 4.1.26
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nsd/versions
2018-12-16 20:01:08 +01:00
R. RyanTM
81dfe93af2 nsd: 4.1.24 -> 4.1.25
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nsd/versions
2018-12-16 20:00:54 +01:00
R. RyanTM
de9cec4809 cryptsetup: 2.0.5 -> 2.0.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cryptsetup/versions

(cherry picked from commit 7f61a7814e)
2018-12-16 18:44:48 +01:00
R. RyanTM
aa6d82d9f5 cryptsetup: 2.0.4 -> 2.0.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cryptsetup/versions

(cherry picked from commit f3545ef3c8)
2018-12-16 18:44:48 +01:00
Maximilian Bosch
7a01e146cb nixos/nextcloud: add basic module documentation and warn about current upgrading issues
Part of #49783. NextCloud tracks in its `config.php` the application's
state which makes it hard for the module to modify configurations during
upgrades.

It will take time until the issue is properly fixed, therefore we
decided to warn about this in the manual.

This PR addresses two things:

* Adding a basic example for nextcloud. I figured it to be helpful to
  add some basic usage instructions when adding a new manual entry.
  Advanced documentation may follow later.

  For now this document actively links to the service options, so users
  are guided to the remaining options that can be helpful in certain
  cases.

* Add a warning about upgrades and manual changes in
  `/var/lib/nextcloud`. This will be fixed in the future, but it's
  definetely helpful to document the current issues in the manual (as
  proposed in https://github.com/NixOS/nixpkgs/issues/49783#issuecomment-439691127).

(cherry picked from commit 216a954540)
2018-12-16 16:00:45 +01:00
Florian Klink
bf91596709 nextcloud: 14.0.4 -> 15.0.0
(cherry picked from commit 66060d3bb0)
2018-12-16 15:01:58 +01:00
Maximilian Bosch
e32ea11241 Merge pull request #52355 from flokli/18.09-nextcloud-client-2.5.1
[18.09] nextcloud-client: 2.3.3 -> 2.5.1
2018-12-16 14:32:03 +01:00
Florian Klink
893cf309d1 nextcloud-client: 2.5.0 -> 2.5.1
(cherry picked from commit f5c9ceaf43)
2018-12-16 13:38:18 +01:00
Maximilian Bosch
1fb886d9cf nextcloud-client: 2.3.3 -> 2.5.0 (#50463)
Updates to the latest version of the desktop client available. Tested
the config migration from `nextcloud-client` 2.3.3 with a Nextcloud
14.0.3 instance (hosted using `services.nextcloud`).

Additionally the derivation required the following changes:

* Dropped `Qt5Sql` patch: this has been fixed upstream and isn't needed
  anymore (furthermore their CMake structure has changed and the patch
  wouldn't apply anymore on 2.5.0).

* Moved to a new upstream repository (nextcloud/desktop), kept
  `fetchgit` to properly fetch submodules.

* Added OpenSSL 1.1 integration: `libsync` (the syncing provided by this
  package) requires 1.1, furthermore the linking flags had to be fixed
  manually by passing `NIX_LDFLAGS` to the derivation.

Furthermore I moved the support for a Gnome3 keyring into its own
wrapper to avoid a full rebuild of the package whenever you alter
`withGnomeKeyring` in an override expressions.

It's still possible to enable keyring (now without recompile) like this:

```
nextcloud-client.override { withGnomeKeyring = true; }
```

To override the derivation itself you now have to use
`nextcloud-client-unwrapped`:

```
nextcloud-client-unwrapped.overrideAttrs (old: {
   src = yoursrc;
})
```

(cherry picked from commit e75f922e91)
2018-12-16 13:38:18 +01:00
Will Dietz
d683610bda sqlite: 3.25.3 -> 3.26.0
(cherry picked from commit 2d7c6d088e)
2018-12-15 22:12:11 +00:00
John Ericson
1211edbbc9 Merge remote-tracking branch 'upstream/release-18.09' into fix-darwin-bootstrap-cmds-for-18.09 2018-12-15 12:48:31 -05:00
Vladimír Čunát
e48c8832ed Merge branch 'staging-18.09' into release-18.09 2018-12-15 11:26:29 +01:00
Rickard Nilsson
345993c57c mosquitto: 1.5.3 -> 1.5.4
Remove patch that has been merged upstrem.

(cherry picked from commit 2473754ad2)
2018-12-15 08:51:12 +01:00
Rickard Nilsson
61d76f8881 nixos/nm-setup-hostsdir: RemainAfterExist -> RemainAfterExit
(cherry picked from commit b20fcce195)
2018-12-15 08:34:30 +01:00
Edmund Wu
f227f13119 vscode-extensions.WakaTime.vscode-wakatime: 1.2.3 -> 1.2.4
(cherry picked from commit 70092febc4)
2018-12-14 08:08:43 -05:00
Edmund Wu
18333ba716 vscode-extensions.ms-python.python: 2018.10.1 -> 2018.11.0
(cherry picked from commit 7369c3a06d)
2018-12-14 08:08:32 -05:00
Edmund Wu
9c853c7121 vscode-extensions.WakaTime.vscode-wakatime: init at 1.2.3
(cherry picked from commit f7b05cafff)
2018-12-14 08:05:57 -05:00
Edmund Wu
7b6192b047 vscode-extensions.ms-vscode.cpptools: 0.19.0 -> 0.20.1
(cherry picked from commit 728d2a2ac7)
2018-12-14 08:05:26 -05:00
Edmund Wu
d31a5dae7a vscode-extensions.ms-python.python: 2018.9.1 -> 2018.10.1
(cherry picked from commit c4cb982772)
2018-12-14 08:05:15 -05:00
Edmund Wu
b02c1772de vscode-extensions.ms-vscode.cpptools: use mono 5 (#49489)
(cherry picked from commit f8ef8bf469)
2018-12-14 08:05:04 -05:00
Edmund Wu
eb3f66a987 vscode-extensions.ms-python.python: 2018.8.0 -> 2018.9.1 (#48849)
(cherry picked from commit a53a3bf1ee)
2018-12-14 08:01:16 -05:00
Edmund Wu
3fb0d35e96 vscode-extensions.ms-vscode.cpptools: 0.17.6 -> 0.19.0 (#47573)
(cherry picked from commit 4c95508641)
2018-12-14 08:01:07 -05:00
Edmund Wu
c58f8c000b vscode-extensions.ms-python.python: 2018.7.0 -> 2018.8.0 (#47572)
(cherry picked from commit 285800d537)
2018-12-14 08:00:54 -05:00
Moritz Ulrich
63e94feb23 vscode: 1.29.1 -> 1.30.0
(cherry picked from commit 38d4c09096)
2018-12-14 07:57:52 -05:00
Edmund Wu
8999332778 vscode,vscode-extensions: fix insiders build
(cherry picked from commit d41e868e02)
2018-12-14 07:57:39 -05:00
Patrick Hilhorst
eaa89f1f72 vscode: 1.29.0 -> 1.29.1 (#50462)
(cherry picked from commit 874b017564)
2018-12-14 07:56:43 -05:00
Edmund Wu
ca10a0e943 vscode: 1.28.2 -> 1.29.0
(cherry picked from commit a23e3b0505)
2018-12-14 07:55:25 -05:00
Joachim Fasting
7e88992a8c tor-browser-bundle-bin: 8.0.3 -> 8.0.4
(cherry picked from commit 1ba77eeb22)
2018-12-14 12:54:27 +01:00
Samuel Dionne-Riel
ea863cd334 Revert "pkgsStatic: Add warning saying this is a provisional backport"
This reverts commit 3c1049fbef.

This broke tarball on release-18.09

  * https://hydra.nixos.org/build/85858044/
  * https://hydra.nixos.org/build/85858044/nixlog/1
2018-12-13 22:34:58 -05:00
R. RyanTM
d6d3a1299f davfs2: 1.5.3 -> 1.5.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/davfs2/versions

(cherry picked from commit c5f7204aff)
2018-12-13 21:01:34 -05:00
John Ericson
340c0c4361 Merge pull request #51969 from vaibhavsagar/fix-static-lz4
lz4: Fix pkgsStatic build for 18.09
2018-12-13 18:28:01 -05:00
John Ericson
91865b213f Merge branch 'fix-portable-libsystem-for-18.09' into release-18.09 2018-12-13 17:49:46 -05:00
John Ericson
62c609930c Merge pull request #51957 from obsidiansystems/crossOverlays-for-18.09
pkgsStatic for 18.09
2018-12-13 17:31:42 -05:00
Elis Hirwing
7a37ddc0d8 nixos/lightdm: Fix spelling of option in docs
(cherry picked from commit 6fa51fe5cf)
2018-12-13 21:45:25 +00:00
Elis Hirwing
5c5607f9c2 nixos/sddm: Fix spelling of option in docs
(cherry picked from commit c974813b92)
2018-12-13 21:45:25 +00:00
Guillaume Bouchard
fbfe10f0a1 Fix english in stdenv.xml
(cherry picked from commit d5c931992d)
2018-12-13 21:34:10 +00:00
John Ericson
3c1049fbef pkgsStatic: Add warning saying this is a provisional backport 2018-12-13 19:17:55 +00:00
Tim Steinbach
5e425e22a7 linux: 4.19.8 -> 4.19.9
(cherry picked from commit 5a15ab7b5d)
2018-12-13 07:01:25 -05:00
Tim Steinbach
99315692f6 linux: 4.14.87 -> 4.14.88
(cherry picked from commit f335fa6d74)
2018-12-13 07:01:25 -05:00
Tim Steinbach
de113e0352 linux: 4.9.144 -> 4.9.145
(cherry picked from commit 1f92bdcd94)
2018-12-13 07:01:25 -05:00
Tim Steinbach
b01a9058cc linux: 4.4.166 -> 4.4.167
(cherry picked from commit adf8cdd67d)
2018-12-13 07:01:24 -05:00
Eelco Dolstra
25d0880528 Revert "resolvconf.conf: Remove forced NSCD service restart"
This reverts commit d8c16bc54a. It
breaks nscd invalidation when the network configuration changes.

(cherry picked from commit 09cbfea2ed)
2018-12-12 23:16:50 +00:00
Andreas Rammhold
d15b9bd990 firefox-esr-60: 60.3.0esr -> 60.4.0esr
See #51863.

(cherry picked from commit d16d0b3762)
2018-12-12 20:35:29 +01:00
Will Dietz
ea9cfed73b Merge #51365: nss: 3.40 -> 3.40.1 (security)
(cherry picked from commit fb137c1bcc)
This is a patch release to fix CVE-2018-12404.
2018-12-12 13:16:04 +01:00
Andreas Rammhold
3d606b06d1 firefox-bin: 63.0.3 -> 64.0
See #51863.

(cherry picked from commit 536d0cc3a7)
2018-12-12 11:10:00 +01:00
Vladimír Čunát
4f3446f299 nixos/nvidia: improve the assertion again
/cc 13938acd0 #51836.

(cherry picked from commit ad3e9191d1)
2018-12-12 00:35:21 +01:00
Andreas Rammhold
824b311961 rust-cbindgen_0_6_7: init at 0.6.7
after feedback from @veprbl in #51805 I added this as another package
which can be used for the 18.09 firefox builds.

(cherry picked from commit f1ee26bc4b)
2018-12-11 17:24:52 -05:00
Jörg Thalheim
da88e93f95 dropbox: fix evaluation
fixes #51883
2018-12-11 21:36:13 +00:00
Graham Christensen
99875d5cca Revert "modules: add mxisd with test"
Wasn't the commit which was in master, and this version
did not work due to evaluation errors on a missing option.

This reverts commit d9758833c5.
2018-12-11 16:34:55 -05:00
Vladimír Čunát
13938acd03 Merge #51836: nixos/nvidia: fix inverted assertion
(cherry picked from commit ac19d5e34f)
2018-12-11 21:42:35 +01:00
Izorkin
6e0efb350d php72: 7.2.12 -> 7.2.13
(cherry picked from commit f80e7df143)
2018-12-11 20:39:33 +01:00
Izorkin
043a2be17e php71: 7.1.24 -> 7.1.25
(cherry picked from commit 374be65924)
2018-12-11 20:39:27 +01:00
Maximilian Güntner
d9758833c5 modules: add mxisd with test
(cherry picked from commit 44bb1c30b4ecfbe60bac1205a7f2af2e1323f2df)
2018-12-11 20:39:14 +01:00
Maximilian Güntner
5f75865e49 mxisd: init at 1.2.0
(cherry picked from commit e40eb38dd4)
2018-12-11 20:39:13 +01:00
Vladimír Čunát
ffc28dd05c Merge branch 'release-18.09' into staging-18.09 2018-12-11 15:01:05 +01:00
Alyssa Ross
f55c7cfa94 Merge pull request #51835 from alyssais/geckodriver-backport
Backport "geckodriver: unstable-2018-02-24 -> 0.22.0" to 18.09
2018-12-11 12:05:20 +00:00
Markus Hauck
1d83bd047b dropbox: add mesa, libxshmfence and libpthreadstubs 2018-12-11 11:55:16 +00:00
Sarah Brofeldt
87ee6c4fe4 Merge pull request #51856 from samueldr/auto/dbeaver/nixos-18.09/5.3.0
dbeaver: 5.2.5 -> 5.3.0 (18.09)
2018-12-11 12:49:17 +01:00
Jappie Klooster
32d7eb3c0a doc: Fix insecure nginx docs (#51840)
(cherry picked from commit e576c3b385)
2018-12-11 11:03:42 +00:00
Samuel Dionne-Riel
30e538bd47 dbeaver: 5.2.5 -> 5.3.0
(cherry picked from commit 1c3079fce3)
2018-12-10 17:48:58 -05:00
Sarah Brofeldt
80a92d2290 zoom-us: 2.5.146186.1130 -> 2.6.146750.1204
(cherry picked from commit 8b3949d989)
Backport of #51662
2018-12-10 22:46:29 +01:00
Renaud
b144dfa3b2 Merge pull request #51828 from andir/18.09/steam
[18.09] steam: ran update-runtime.py
2018-12-10 22:29:04 +01:00
Robert Schütz
7b7d14045c python.pkgs.pylint: disable broken test
fixes https://github.com/NixOS/nixpkgs/issues/51394
2018-12-10 17:23:09 +01:00
Raphael Borun Das Gupta
03c552a37b geckodriver: unstable-2018-02-24 -> 0.22.0
Motivation: unstable-2018-02-24 (which reports to be
0.19.1, but probably doesn't correspond to any actual
geckodriver release) isn't compatible with the currently
shipped Firefox version 63.0

closes NixOS/nixpkgs#50380
2018-12-10 16:01:33 +00:00
Cole Mickens
4921bf4698 google-chrome-dev: add at-spi2-core dependency
(cherry picked from commit 45fd44c66d)
2018-12-10 15:19:21 +01:00
Renaud
dc7548237b Merge pull request #51826 from markuskowa/fix-gnss-sdr-18.09
[18.09] gnss-sdr: turn off unit tests explicitly
2018-12-10 14:59:40 +01:00
Andreas Rammhold
a67d27eacd steam: ran update-runtime.py
(cherry picked from commit 1de88c36cc)
2018-12-10 13:50:37 +01:00
Markus Kowalewski
67de9c4617 gnss-sdr: turn off unit tests explicitly
(cherry picked from commit 0528001141)
2018-12-10 13:42:22 +01:00
Vladimír Čunát
4b374061a6 nixos tests: disable kafka for now
They consistently fail since openjdk bump with some out-of-space errors.
That's not a problem by itself, but each test instance ties a build slot
for many hours and consequently they also delay channels as those wait
for all builds to finish.

Feel free to re-enable when fixed, of course.

(cherry picked from commit 3946d83a3c)
2018-12-10 13:25:49 +01:00
Florian Klink
6a7b2a4aa5 Merge pull request #51799 from flokli/18.09-ghostscript-9.26
ghostscript: 9.25 -> 9.26
2018-12-09 23:02:26 +01:00
Tor Hedin Brønner
2549e2e977 ghostscript: 9.25 -> 9.26
(cherry picked from commit 0ed7d3c62a)
2018-12-09 22:29:05 +01:00
Andreas Rammhold
1a5d5a570b Merge pull request #51795 from andir/18.09/smartmontools
[18.09] smartmontools: drivedb 4548 -> 4852
2018-12-09 21:53:31 +01:00
Andreas Rammhold
510946b241 smartmontools: drivedb 4548 -> 4852 2018-12-09 21:39:13 +01:00
Simon Lackerbauer
b352d47e42 nextcloud: 14.0.3 -> 14.0.4
(cherry picked from commit ee1613aea6)
2018-12-09 18:02:00 +01:00
Vladimír Čunát
99e3efe7ff Merge staging-18.09 into release-18.09
It's older version of the branch that's almost finished on Hydra.
2018-12-09 17:47:29 +01:00
Herwig Hochleitner
d56ec49ae4 llvm-7: init in release-18.09 (#51771)
chromium builds best with llvm 7 and instead of taking the hit of
hunting for gcc patches until release-18.09 is phased out, we just
backport it

see https://github.com/NixOS/nixpkgs/issues/51602

cc @dtzWill could you have a look at any commits, i might have missed?

this merged branch was built as follows:

```
± git merge-base release-18.09 master
2a1c0dde8f

± git checkout -b release-18.09-llvm-7 2a1c0dde8f
Switched to a new branch 'release-18.09-llvm-7'

± git cherry-pick -x $(git log master --format=oneline -- pkgs/development/compilers/llvm/7 | cut -f1 -d' ' | tac )
[release-18.09-llvm-7 0120cd8826f] llvm7: init at 7.0.0rc3
 Author: Will Dietz <w@wdtz.org>
 Date: Tue Sep 18 14:19:58 2018 -0500
 15 files changed, 1260 insertions(+)
 create mode 100644 pkgs/development/compilers/llvm/7/clang/default.nix
 create mode 100644 pkgs/development/compilers/llvm/7/clang/purity.patch
 create mode 100644 pkgs/development/compilers/llvm/7/compiler-rt-codesign.patch
 create mode 100644 pkgs/development/compilers/llvm/7/compiler-rt.nix
 create mode 100644 pkgs/development/compilers/llvm/7/default.nix
 create mode 100644 pkgs/development/compilers/llvm/7/libc++/default.nix
 create mode 100644 pkgs/development/compilers/llvm/7/libc++/setup-hook.sh
 create mode 100644 pkgs/development/compilers/llvm/7/libc++abi.nix
 create mode 100644 pkgs/development/compilers/llvm/7/lld.nix
 create mode 100644 pkgs/development/compilers/llvm/7/lldb.nix
 create mode 100644 pkgs/development/compilers/llvm/7/llvm-outputs.patch
 create mode 100644 pkgs/development/compilers/llvm/7/llvm.nix
 create mode 100644 pkgs/development/compilers/llvm/7/openmp.nix
 create mode 100644 pkgs/development/compilers/llvm/7/sanitizers-nongnu.patch
[release-18.09-llvm-7 efc3c480d86] llvm7: patch test shebang (otherwise test fails)
 Author: Will Dietz <w@wdtz.org>
 Date: Tue Sep 18 14:35:21 2018 -0500
 1 file changed, 2 insertions(+)
[release-18.09-llvm-7 30d468d7f47] llvm-manpages: fix build by removing references to $lib output
 Author: Will Dietz <w@wdtz.org>
 Date: Tue Sep 18 14:45:39 2018 -0500
 1 file changed, 3 insertions(+)
[release-18.09-llvm-7 64b459e5ae3] comment
 Author: Will Dietz <w@wdtz.org>
 Date: Tue Sep 18 14:52:17 2018 -0500
 1 file changed, 1 insertion(+), 1 deletion(-)
[release-18.09-llvm-7 ad2705efb6e] compiler-rt: quickfix codesign patch by dropping hunks 'already applied'
 Author: Will Dietz <w@wdtz.org>
 Date: Tue Sep 18 15:00:39 2018 -0500
 1 file changed, 33 insertions(+), 155 deletions(-)
 rewrite pkgs/development/compilers/llvm/7/compiler-rt-codesign.patch (78%)
[release-18.09-llvm-7 f51bf899719] llvm7: use final release tarballs now that they're available
 Author: Will Dietz <w@wdtz.org>
 Date: Wed Sep 19 07:43:33 2018 -0500
 1 file changed, 2 insertions(+), 2 deletions(-)
[release-18.09-llvm-7 93244a2dc24] llvm7: update hashes, they did change after all.
 Author: Will Dietz <w@wdtz.org>
 Date: Wed Sep 19 08:00:23 2018 -0500
 9 files changed, 9 insertions(+), 10 deletions(-)
[release-18.09-llvm-7 1e9d9d2e4ff] llvm*: http -> https, prefer releases.llvm.org
 Author: Will Dietz <w@wdtz.org>
 Date: Wed Sep 19 08:02:21 2018 -0500
 7 files changed, 7 insertions(+), 7 deletions(-)
[release-18.09-llvm-7 f5e526ba11a] libc++7: prefer 'optional' as suggested by comment
 Author: Will Dietz <w@wdtz.org>
 Date: Wed Sep 19 08:36:40 2018 -0500
 1 file changed, 1 insertion(+), 5 deletions(-)
[release-18.09-llvm-7 f254fb70666] llvm7: only use 1 number in version suffix, upstream changed
 Author: Will Dietz <w@wdtz.org>
 Date: Thu Sep 20 19:42:44 2018 -0500
 1 file changed, 1 insertion(+), 1 deletion(-)
[release-18.09-llvm-7 fa6fed6230d] llvm7: optionally use libpfm (exegesis), default off w/darwin
 Author: Will Dietz <w@wdtz.org>
 Date: Thu Sep 20 19:53:59 2018 -0500
 1 file changed, 4 insertions(+), 1 deletion(-)
[release-18.09-llvm-7 21959244dc4] llvm7: update musl patch for sanitizers
 Author: Will Dietz <w@wdtz.org>
 Date: Mon Sep 24 10:43:07 2018 -0500
 1 file changed, 75 insertions(+), 76 deletions(-)
```
2018-12-09 15:06:31 +01:00
Vladimír Čunát
ee3de676a6 Merge #51451: perl security updates (into staging-18.09) 2018-12-09 14:28:58 +01:00
Vladimír Čunát
1970a4cd13 fbreader: fixup build with curl-7.62
This was easy to patch; submitted upstream.

(cherry picked from commit 17acf57f9d)
2018-12-09 10:29:59 +01:00
Will Dietz
b324990b20 llvm7: update musl patch for sanitizers
(cherry picked from commit 5b2de5126d)
2018-12-09 05:27:03 +01:00
Will Dietz
9932296ed8 llvm7: optionally use libpfm (exegesis), default off w/darwin
(cherry picked from commit 9fe245d7e0)
2018-12-09 05:27:03 +01:00
Will Dietz
ffa9366411 llvm7: only use 1 number in version suffix, upstream changed
See llvm 2a6cf85828509e89e18739e5f4b9a958820d66d4

(cherry picked from commit b3645d74d1)
2018-12-09 05:27:03 +01:00
Will Dietz
ddccbf531d libc++7: prefer 'optional' as suggested by comment
(cherry picked from commit e3030a2908)
2018-12-09 05:27:03 +01:00
Will Dietz
df92d262a8 llvm*: http -> https, prefer releases.llvm.org
(cherry picked from commit 167e799d81)
2018-12-09 05:27:03 +01:00
Will Dietz
3683dade86 llvm7: update hashes, they did change after all.
Pretty sure they did last time too :).

(cherry picked from commit 0920652c5c)
2018-12-09 05:27:03 +01:00
Will Dietz
253a584046 llvm7: use final release tarballs now that they're available
(cherry picked from commit fca31e1a68)
2018-12-09 05:27:02 +01:00
Will Dietz
b2e5f6581a compiler-rt: quickfix codesign patch by dropping hunks 'already applied'
Quite possibly this is not right.

(cherry picked from commit 621fd23cb5)
2018-12-09 05:27:02 +01:00
Will Dietz
3d95f8a221 comment
(cherry picked from commit ba701ef329)
2018-12-09 05:27:02 +01:00
Will Dietz
a379d9a656 llvm-manpages: fix build by removing references to $lib output
(cherry picked from commit 38699890d6)
2018-12-09 05:27:02 +01:00
Will Dietz
c0bc50f825 llvm7: patch test shebang (otherwise test fails)
(cherry picked from commit b7692f5be5)
2018-12-09 05:27:02 +01:00
Will Dietz
5b5381f0c1 llvm7: init at 7.0.0rc3
Copy of 6 + updated hashes

(cherry picked from commit bb110d80fc)
2018-12-09 05:27:02 +01:00
Herwig Hochleitner
1a4498d132 chromium: 70.0.3538.110 -> 71.0.3578.80
CVE-2018-17480 CVE-2018-17481 CVE-2018-18335 CVE-2018-18336
CVE-2018-18337 CVE-2018-18338 CVE-2018-18339 CVE-2018-18340
CVE-2018-18341 CVE-2018-18342 CVE-2018-18343 CVE-2018-18344
CVE-2018-18345 CVE-2018-18346 CVE-2018-18347 CVE-2018-18348
CVE-2018-18349 CVE-2018-18350 CVE-2018-18351 CVE-2018-18352
CVE-2018-18353 CVE-2018-18354 CVE-2018-18355 CVE-2018-18356
CVE-2018-18357 CVE-2018-18358 CVE-2018-18359

see https://github.com/NixOS/nixpkgs/issues/51602

(cherry picked from commit 8942a3e00c)

chromium: update conditionals and gcc patches for min version 71

(cherry picked from commit ccb93eb6b0)
2018-12-09 04:52:36 +01:00
Vladimír Čunát
2e7699531a Merge #51688: nettle: 3.4 -> 3.4.1 (security)
(cherry picked from commit b9d22d3fe8)
2018-12-08 23:38:20 +01:00
Renaud
f1a942b441 Merge pull request #51675 from c0bw3b/sec/1809/polkit
[18.09] polkit: add patch for CVE-2018-19788
2018-12-08 23:20:17 +01:00
Renaud
f006e8448b Merge pull request #51243 from vaibhavsagar/update-developPackage
Update developPackage
2018-12-08 18:15:44 +01:00
Tim Steinbach
b4360cadfd linux: 4.19.7 -> 4.19.8
(cherry picked from commit 6de9095a12f9ec834933217840ba3df716738a77)
2018-12-08 10:26:34 -05:00
Tim Steinbach
8e67eb47d3 linux: 4.14.86 -> 4.14.87
(cherry picked from commit 5fa8435719a1ad5b7ac8f57ce3c6e47cebafbdeb)
2018-12-08 10:26:33 -05:00
Tim Steinbach
04b8900a51 linux: 4.9.143 -> 4.9.144
(cherry picked from commit 1567d09a49613f1bc21d6d5905fe339a26d82ed0)
2018-12-08 10:26:32 -05:00
Renaud
695391fd84 Merge pull request #51734 from c0bw3b/sec/1809/sssd
[18.09] sssd: 1.16.2 -> 1.16.3
2018-12-08 16:05:55 +01:00
Will Dietz
0ec2084017 sssd: 1.16.2 -> 1.16.3 (security!)
https://docs.pagure.org/SSSD.sssd/users/relnotes/notes_1_16_3.html
(cherry picked from commit 01fab8778f)
2018-12-08 15:47:03 +01:00
Renaud
e9a2c5328f nixos/systemd-nspawn: accept all Exec and Files options
See: https://www.freedesktop.org/software/systemd/man/systemd.nspawn.html
Closes #49712
2018-12-08 14:43:51 +01:00
Florian Klink
7538184722 Merge pull request #51711 from worldofpeace/vivaldi/18.09-backport
backport vivaldi updates from unstable
2018-12-08 13:30:25 +01:00
Periklis Tsirakidis
b3aff3a040 openjpeg: fix for CVE-2018-18088
(cherry picked from commit a4700aa526)
2018-12-08 21:01:57 +09:00
worldofpeace
dfe1c9670b vivaldi: correct hash
Fixes #51635

(cherry picked from commit 5256cfd006)
2018-12-07 21:54:26 -05:00
José Romildo Malaquias
eac3842765 vivaldi: 2.1.1337.47-1 -> 2.1.1337.51-1
(cherry picked from commit 94c342348b)
2018-12-07 21:52:30 -05:00
José Romildo Malaquias
1ca86b41c4 vivaldi: 2.1.1337.36-1 -> 2.1.1337.47-1
(cherry picked from commit b14d1167c9)
2018-12-07 21:52:16 -05:00
José Romildo Malaquias
9a5586dbf0 vivaldi: 2.0.1309.29-2 -> 2.1.1337.36-1
(cherry picked from commit 3cd8c2240b)
2018-12-07 21:52:04 -05:00
Patrick Hilhorst
f15255aead vivaldi: 1.15.1147.64-1 -> 2.0.1309.29-2
(cherry picked from commit 71eb7adfb2)
2018-12-07 21:51:51 -05:00
Lukas Werling
12bd585969 vivaldi: 1.15.1147.42-1 -> 1.15.1147.64-1
(cherry picked from commit eb275c96f2)
2018-12-07 21:51:19 -05:00
José Romildo Malaquias
3e69d11580 vivaldi-ffmpeg-codecs: 69.0.3497.73 -> 70.0.3538.77
(cherry picked from commit 34964d6f3b)
2018-12-07 21:48:00 -05:00
Lukas Werling
d078ba9b5d vivaldi-ffmpeg-codecs: 61.0.3163.91 -> 69.0.3497.73
(cherry picked from commit 478e1fe369)
2018-12-07 21:47:56 -05:00
c0bw3b
c1e49a34a4 polkit: add patch for CVE-2018-19788
unprivileged users with UID > INT_MAX can successfully execute any systemctl command
Original issue: https://gitlab.freedesktop.org/polkit/polkit/issues/74

(cherry picked from commit a14af16cfc)
2018-12-07 19:45:11 +01:00
Will Dietz
135a7f9604 tor: 0.3.4.8 -> 0.3.4.9
https://gitweb.torproject.org/tor.git/plain/ChangeLog?h=tor-0.3.4.9

Please confirm the sha256 is correct for a verified tarball,
I'm not setup (or know how offhand but docs look promising)
to do this myself.

(cherry picked from commit c78761b5bd)
2018-12-07 13:15:16 +01:00
taku0
4b4c24c341 flashplayer: 31.0.0.153 -> 32.0.0.101
(cherry picked from commit f7a266d44a)
Backport of #51623
2018-12-07 12:14:39 +01:00
Jörg Thalheim
59ae1fd285 nix-review: 0.6.1 -> 1.0.1
- use nix build instead of nix-build
- writes per-build log in the current working directory
- symlinks the builds in the current working directory
- detects & deduplicates build aliases
- markdown reports
- filter builds by regex
- generate nix expression files that can be build by the user

(cherry picked from commit 53f1ffa4d3)
2018-12-07 11:12:57 +00:00
Samuel Dionne-Riel
7795a7ad5f sd-image: Slims the ext4 filesystem even more.
This is to try and squeeze more lost space from the image, so that hydra
starts building it again.

The fsck previous to the resize2fs is required so resize2fs works.

The one afterwards is a sanity check.

Using `-M` from resize2fs will not give much saved space due to a known
(in the manual) issue.

```
[samueldr@aarch64:~/nixpkgs]$ ls -lh result-*/*/*.img
-r--r--r-- 1 root root 2.2G Jan  1  1970 result-original/sd-image/nixos-sd-image-18.09.git.a7fd431-aarch64-linux.img
-r--r--r-- 1 root root 2.1G Jan  1  1970 result-M/sd-image/nixos-sd-image-18.09.git.a7fd431-aarch64-linux.img
-r--r--r-- 1 root root 1.9G Jan  1  1970 result-slimmed/sd-image/nixos-sd-image-18.09.git.a7fd431-aarch64-linux.img
```

```
[samueldr@aarch64:~/nixpkgs]$ nix path-info -S ./result-original
/nix/store/c8k9n78gylx293rjh762fr05a069kxp2-nixos-sd-image-18.09.git.a7fd431-aarch64-linux.img   3844125000

[samueldr@aarch64:~/nixpkgs]$ nix path-info -S ./result-slimmed
/nix/store/962238skj5mnzhrsmjy23dyzmxk77sp4-nixos-sd-image-18.09.git.a7fd431-aarch64-linux.img   3447473208
```

(cherry picked from commit 61bdaad9a9)
2018-12-06 18:35:59 -05:00
Anatolii Prylutskyi
a7924afc9f rambox: 0.6.2 -> 0.6.3
(cherry picked from commit 7ff4f5be26)
2018-12-06 10:55:43 +00:00
Jörg Thalheim
29eb612952 rambox: 0.6.1 -> 0.6.2
(cherry picked from commit fb7abdaea1)
2018-12-06 10:55:43 +00:00
Renaud
d54a4accc7 Merge pull request #51591 from c0bw3b/data/1809/tzdata
[18.09] tzdata: 2018e -> 2018g
2018-12-05 23:43:11 +01:00
Tim Steinbach
2dc559868c linux: 4.19.6 -> 4.19.7
(cherry picked from commit 808d52ee05)
2018-12-05 17:36:38 -05:00
Tim Steinbach
df3e859d10 linux: 4.14.85 -> 4.14.86
(cherry picked from commit e945771e4c)
2018-12-05 17:36:37 -05:00
Tim Steinbach
dd9018dfdc linux: 4.9.142 -> 4.9.143
(cherry picked from commit 1f7266cbbb)
2018-12-05 17:36:37 -05:00
Franz Pletz
b57b9b7a49 tzdata: 2018e -> 2018g
Notable changes:
  - Morocco switched to permanent +01 on 2018-10-27
  - Volgograd moved from +03 to +04 on 2018-10-28
  - Fiji ends DST 2019-01-13, not 2019-01-20
  - Most of Chile changes DST dates, effective 2019-04-06

tzdata: fetch over https
(cherry picked from commit 7c25174154)
2018-12-05 22:29:57 +01:00
Renaud
261bf90fb9 Merge pull request #51181 from guaraqe/ncurses
ncurses: upgrade from 6.1 -> 6.1-20181027
2018-12-05 12:18:38 +01:00
Trolli Schmittlauch
dd039326f0 dino: 2018-11-27 -> 2018-11-29 (#51557)
(cherry picked from commit 99231a36bb)
2018-12-05 11:16:02 +00:00
Jörg Thalheim
30ab8686bf dino: enable parallel building
(cherry picked from commit a995836356)
2018-12-05 11:15:55 +00:00
Jörg Thalheim
3faf28ae41 dino: 2018-09-21 -> 2018-11-27
(cherry picked from commit 3b44ccd991)
2018-12-05 11:15:49 +00:00
Jörg Thalheim
22f639d78d dino: 2018-09-05 -> 2018-09-21
(cherry picked from commit 3dec3de2d3)
2018-12-05 11:15:43 +00:00
Jörg Thalheim
0c4650db8f dino: 2018-07-08 -> 2018-09-05
(cherry picked from commit de825a4eaa)
2018-12-05 11:15:34 +00:00
Pierre Bourdon
b260b7c2af prometheus/exporters: fix regression in DynamicUser behavior
Instead of setting User/Group only when DynamicUser is disabled, the
previous version of the code set it only when it was enabled. This
caused services with DynamicUser enabled to actually run as nobody, and
services without DynamicUser enabled to run as root.

Regression from fbb7e0c82f.

(cherry picked from commit 3873f43fc3)
2018-12-05 11:40:32 +01:00
Florian Klink
40e7d55262 pkgsi686Linux.nixosTests.gitlab: fix 32 bit tests
GitLab 11.5.1 dropped the dependency to posix_spawn, which is broken on
32bit. (See https://gitlab.com/gitlab-org/gitlab-ce/issues/53525)

The only part missing is decreasing virtualisation.memorySize to
something that a 32 bit qemu still executes.

The maximum seems to be 2047, and tests passed with that value for me.

(cherry picked from commit 5c82aa8854)
2018-12-05 10:47:55 +01:00
Andrew Dunham
0b2757de07 ncurses: upgrade from 6.1 -> 6.1-20181027
This includes fixes for CVE-2018-10754.

While we're changing things, also set the `--with-manpage-format=normal`
configure flag, which prevents the `configure` script from looking in
/usr to determine whether to compress manpages. This was already the
format on NixOS (where these directories don't exist), but making this
explicit makes the build more reproducible on other distros.

(cherry picked from commit f485b2e71f)
2018-12-05 10:25:27 +01:00
Robin Gloster
7b3336baf3 gitlab-shell: fix hard-coded path
(cherry picked from commit c2b54dcee5)
2018-12-05 10:16:55 +01:00
Robin Gloster
b9ba657642 gitlab: 11.5.0 -> 11.5.1
(cherry picked from commit 88b63b2505)
2018-12-05 10:16:53 +01:00
Samuel Dionne-Riel
d25517ab51 Merge pull request #51511 from hedning/nix-completions-bump
[18.09] backport nix-{zsh,bash}-completions
2018-12-05 04:22:12 +00:00
Samuel Dionne-Riel
885811d932 Merge pull request #51486 from johanot/kubernetes-1.11.5
kubernetes: 1.11.4 -> 1.11.5
2018-12-05 04:20:07 +00:00
John Ericson
3fd87ad007 Merge pull request #51286 from obsidiansystems/bump-android-sdk-backport
Bump android sdk backport in 18.09
2018-12-04 15:11:58 -05:00
Renaud
aae21170ee Merge pull request #51395 from c0bw3b/sec/1809/postfix
[18.09]  postfix: 3.3.1 -> 3.3.2
2018-12-04 20:57:46 +01:00
c0bw3b
29f01a82f9 postfix: 3.3.1 -> 3.3.2
Changelog:
http://www.postfix.org/announcements/postfix-3.3.2.html
2018-12-04 20:37:32 +01:00
Tor Hedin Brønner
bf19f01b6d nix-zsh-completions: 0.4.1 -> 0.4.2
(cherry picked from commit 5bc0270211)
2018-12-04 16:53:16 +01:00
Maximilian Bosch
1d027e2fdd nix-zsh-completions: 0.4.0 -> 0.4.1
Contains several bugfixes that improve the ZSH completion for nix*
commands.

For further reference: https://github.com/spwhitt/nix-zsh-completions/releases/tag/0.4.1

(cherry picked from commit e446261e51)
2018-12-04 16:53:04 +01:00
Tor Hedin Brønner
36e8c6b71f nix-bash-completions: 0.6.6 -> 0.6.7
(cherry picked from commit ad8f5ca2bb)
2018-12-04 16:52:06 +01:00
Timo Kaufmann
8992f529d7 python.pkgs.pygraphviz: add graphviz path (#51502)
(cherry picked from commit 21de751e74)
2018-12-04 12:32:13 +01:00
Mario Rodas
cc0831b0e2 docs: Remove nix-repl references
nix-repl has been deprecated
2018-12-04 10:53:38 +00:00
Alexey Lebedeff
27b3ca8e46 nvidia_legacy_340: Remove unneeded/failing patch
The patch is not applying and no longer needed after upgrade in
045575e744. Now the same result is
achieved by the following lines in the driver package itself:

    #if defined(NV_DRM_LEGACY_PCI_INIT_PRESENT)
    #define nv_drm_pci_init drm_legacy_pci_init
    #define nv_drm_pci_exit drm_legacy_pci_exit
    #else
    #define nv_drm_pci_init drm_pci_init
    #define nv_drm_pci_exit drm_pci_exit
    #endif
2018-12-04 10:43:50 +00:00
Renaud
7ebed57d7b Merge pull request #51491 from flokli/18.09-zoom-us-2.5.146186.1130
[18.09] zoom-us: 2.4.129780.0915 -> 2.5.146186.1130 (CVE-2018-15715)
2018-12-04 08:25:12 +01:00
Florian Klink
8b52f7db8d zoom-us: 2.4.129780.0915 -> 2.5.146186.1130
fixes [CVE-2018-15715](https://nvd.nist.gov/vuln/detail/CVE-2018-15715)

(cherry picked from commit c4177f4e5b)
2018-12-04 02:14:20 +01:00
R. RyanTM
8c853e6682 elfutils: 0.174 -> 0.175
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/elfutils/versions

Fixes CVE-2018-18310, CVE-2018-18520 and CVE-2018-18521.

CC #51458

(cherry picked from commit 5beb37d258)
2018-12-04 00:54:38 +01:00
R. RyanTM
5ce279105f elfutils: 0.173 -> 0.174
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/elfutils/versions

Fixes CVE-2018-16062, CVE-2018-16402 and CVE-2018-16403.

(cherry picked from commit f52e50c60f)
2018-12-04 00:54:12 +01:00
Robin Gloster
3e238c552d strongswan: fix patch's CVE number
The patch above this one is the one fixing the previous CVEs.

fixes #51461
2018-12-04 00:25:34 +01:00
Renaud
b09e113035 Merge pull request #51479 from c0bw3b/sec/1809/udisks
[18.09] udisks: 2.8.0 -> 2.8.1
2018-12-04 00:15:05 +01:00
Johan Thomsen
27a7e1f6f5 kubernetes: 1.11.4 -> 1.11.5 2018-12-03 23:40:13 +01:00
Will Dietz
4bb9ffd1c4 udisks: 2.8.0 -> 2.8.1
https://github.com/storaged-project/udisks/blob/udisks-2.8.1/NEWS
(cherry picked from commit 9a74fd0b0f)
2018-12-03 23:18:17 +01:00
Domen Kožar
9bdbd595db chrome-token-signing: fix path to opensc-pkcs11
(cherry picked from commit 4cf1d88d12)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-12-03 17:19:01 +00:00
Bjørn Forsman
d45a0d7a4f jpeginfo: init at 1.6.1
jpeginfo prints information and tests integrity of JPEG/JFIF files.

(cherry picked from commit 84a2463499)
2018-12-03 17:09:54 +01:00
Vladimír Čunát
395a526fc6 Merge branch 'release-18.09' into staging-18.09
I mainly want the kernel updates, to avoid useless builds.
2018-12-03 15:47:08 +01:00
volth
62141daa1f perl: 5.28.0 -> 5.28.1, 5.26.2 -> 5.26.3 2018-12-03 13:53:50 +00:00
Pierre Bourdon
b7162eb5c4 nixos.tests.keymap: use new name of the colemak/en-latin9 keymap
Commit df6d40feb6 renamed colemak/en-latin9 to
colemak/colemak, but the keymap test wasn't adjusted to refer to the new path.

(cherry picked from commit 74598ca8d3)
2018-12-03 13:09:08 +01:00
Vladimír Čunát
4f5651d4ed Merge #50963: nss, libpng & sqlite backports (staging-18.09)
Planned date of FF 64 is in about a week.
2018-12-03 11:36:50 +01:00
Vladimír Čunát
c395d62507 Merge branch 'staging-18.09' into release-18.09
On x86_64-linux this looks good, only R fails tests on Hydra,
but I've been unable to reproduce that failure locally,
so let me not delay the CVE fixes.
2018-12-03 11:05:15 +01:00
Jörg Thalheim
b7c795d588 Merge pull request #51407 from M-Gregoire/fix/networkmanagerservice
Fix NetworkManager-wait-online.service
2018-12-03 08:55:05 +00:00
Austin Seipp
173852b936 nixos/chrony: fix misplaced ConditionCapability= directive
Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 4594b18070)
2018-12-02 20:33:30 -06:00
R. RyanTM
58f61cfcdd kdeconnect: 1.3.1 -> 1.3.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/kdeconnect/versions

(cherry picked from commit efbc6f4648)
This version is needed to use the Android companion application.
Fixes #51396
2018-12-02 20:19:38 -05:00
Jörg Thalheim
6c6aef86be Merge pull request #51361 from davidak/fix-mumble
Backport mumble fix
2018-12-02 22:44:51 +00:00
worldofpeace
205bbc3365 kbfs: 2.6.0 -> 2.10.1
(cherry picked from commit b49ed49c68)
2018-12-02 12:01:43 -08:00
Jon Banafato
0cad7d413a kbfs: 2.5.0 -> 2.6.0
(cherry picked from commit 254c5a0100)
2018-12-02 12:01:43 -08:00
worldofpeace
5abdefdf38 keybase: 2.7.3 -> 2.10.1
(cherry picked from commit 3fdbd985d9)
2018-12-02 12:01:43 -08:00
Daiderd Jordan
80c749e29c keybase: add cf-private on darwin
Undefined symbols for architecture x86_64:
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in _x002.o
      "_OBJC_CLASS_$_NSDictionary", referenced from:
          objc-class-ref in _x002.o
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in _x002.o
    ld: symbol(s) not found for architecture x86_64

(cherry picked from commit be9fc0d669)
2018-12-02 12:01:43 -08:00
Jon Banafato
9d3b4dd757 keybase: 2.5.0 -> 2.7.3
(cherry picked from commit 468d41db46)
2018-12-02 12:01:43 -08:00
worldofpeace
930c69803b keybase-gui: 2.7.0 -> 2.11.0
- Use `autoPatchelfHook`
- Don't explicitly set phases - Part of #28910
- Correct `version` by hoisting out the suffix

(cherry picked from commit 02e9d06e5e)
2018-12-02 12:01:43 -08:00
Jon Banafato
0980c9385d keybase-gui: 2.5.0 -> 2.7.0
(cherry picked from commit 68ad1f8774)
2018-12-02 12:01:43 -08:00
MGregoire
022eb6afaf Fix NetworkManager-wait-online.service 2018-12-02 20:34:33 +01:00
Vladimír Čunát
e1aacc81b7 Merge #51390: thunderbird(-bin): 60.3.0 -> 60.3.2 2018-12-02 18:32:34 +01:00
Jörg Thalheim
e8dd26fc30 Revert "nixos/luksroot: Check whether the device already exists"
This reverts commit 14b0a4f1ad.

Apparently this can break peoples setup: https://github.com/NixOS/nixpkgs/pull/50281#issuecomment-443516289
2018-12-02 17:08:36 +00:00
Jörg Thalheim
4c22ad7bf7 Merge pull request #51354 from dasJ/luks-checkexist-backport
nixos/luksroot: Backport #50281
2018-12-02 16:51:04 +00:00
Bas van Dijk
24ff4d87bc elasticsearch: make sure to patchelf the x-pack-ml binaries
(cherry picked from commit b560dd9047)
2018-12-02 15:57:57 +01:00
Bas van Dijk
35b40f4f7a elk: 6.3.2 -> 6.5.1
(cherry picked from commit fbf0efc6a7)
2018-12-02 15:34:36 +01:00
Vladimír Čunát
fd3e3c727f Merge #51378: linuxPackages.nvidia_x11_legacy304: broken on 4.18+
(cherry picked from commit 70f507ae56)
2018-12-02 14:33:40 +01:00
Janne Heß
14b0a4f1ad nixos/luksroot: Check whether the device already exists
The new reuse behaviour is cool and really useful but it breaks one of
my use cases. When using kexec, I have a script which will unlock the
disks in my initrd. However, do_open_passphrase will fail if the disk is
already unlocked.

(cherry picked from commit 9cd4ce98bf)
Reason: The new behaviour breaks my existing setup and I'd like to have
it fixed before March.
2018-12-02 14:05:48 +01:00
taku0
416eb4bc1c thunderbird: 60.3.0 -> 60.3.2
(cherry picked from commit 61c83b3975)
2018-12-02 13:59:52 +01:00
taku0
b8ae370815 thunderbird-bin: 60.3.0 -> 60.3.2
(cherry picked from commit d37976c508)
2018-12-02 13:59:45 +01:00
taku0
373bf6abcd thunderbird: 60.3.0 -> 60.3.1
(cherry picked from commit 1e8694d3d7)
2018-12-02 13:59:22 +01:00
taku0
83ed12481a thunderbird-bin: 60.3.0 -> 60.3.1
(cherry picked from commit 52fc63e37b)
2018-12-02 13:59:18 +01:00
Jörg Thalheim
49be1fad9b networkmanager-applet: set default icon theme 2018-12-02 11:50:33 +00:00
Silvan Mosberger
b3e718378d Merge pull request #51374 from Infinisil/backport/fix/minecraft
[18.09] minecraft: Fix versions <1.13
2018-12-02 08:20:48 +01:00
Silvan Mosberger
8fc7a2d975 minecraft: Fix versions <1.13
(cherry picked from commit 0d2355d7e3)
2018-12-02 07:56:07 +01:00
Andrew Childs
65b2552a46 mumble: fix hang on reconfiguring audio
(cherry picked from commit 773c8807c9)

Reason: Backport fix to 18.09
2018-12-02 06:37:26 +01:00
Tim Steinbach
d004311ba3 kernel: 4.19.5 -> 4.19.6
(cherry picked from commit 0bc0a6ed25ce840d15c924cde841ed243c06237e)
2018-12-01 11:22:25 -05:00
Tim Steinbach
aaeedad66f kernel: 4.14.84 -> 4.14.85
(cherry picked from commit c29204b85278648279a6ed78db0dc4e4a85d4cfe)
2018-12-01 11:22:24 -05:00
Tim Steinbach
c1bca408c3 kernel: 4.9.141 -> 4.9.142
(cherry picked from commit 4440f74ae57fd83f875f2f340eeed95c015a1b45)
2018-12-01 11:22:23 -05:00
Tim Steinbach
8597515996 kernel: 4.4.165 -> 4.4.166
(cherry picked from commit 2a533a71e36a41bfdde0e4dd880604a7141a985e)
2018-12-01 11:22:23 -05:00
Tim Steinbach
b69279c5f3 sbt: 1.2.6 -> 1.2.7
(cherry picked from commit 9ee9387b472a71e5250f1b131ce3b1a7bdc9c763)
2018-12-01 11:22:22 -05:00
Léo Gaspard
b47741cdd8 Merge branch 'pr-51299' into release-18.09
* pr-51299:
  nixos/urxvtd: remove socket activation
2018-12-01 16:02:32 +09:00
Samuel Dionne-Riel
2e19ed4e83 Merge pull request #51273 from herrwiese/nixos-postgres-unknown-var
postgresql: Fix variable spelling in NixOS module
2018-12-01 03:14:28 +00:00
fishyfriend
31efd1f3a5 nixos/urxvtd: remove socket activation
This fixes #23193. urxvtd is not presently compatible with socket activation.

(cherry picked from commit b34b39cab4)
2018-11-30 18:51:40 -05:00
worldofpeace
de81882a82 Merge pull request #51289 from 1000101/backport-release-18.09
[18.09] trezord: 2.0.24 -> 2.0.25
2018-11-30 16:13:09 -05:00
Jörg Thalheim
9b71a920a4 Merge pull request #51292 from Mic92/mlx5-core-en
[WIP][backport-18.09]: kernel: enable MLX5_CORE_EN when possible
2018-11-30 19:00:07 +00:00
Vladimír Čunát
420db065cf Re-revert "Merge staging-18.09 into release-18.09"
This reverts commit 3d63c05ddf.
This should fix #51281 (after merged to release-18.09),
but we would better re-check for similar problems.
2018-11-30 19:14:44 +01:00
Vladimír Čunát
57081c2bc0 Merge branch 'release-18.09' into staging-18.09 2018-11-30 19:14:22 +01:00
Graham Christensen
4934f82f43 kernel: enable MLX5_CORE_EN when possible
Hydra's builders from Packet.net use this option a lot, causing
lots of slow deploys.

(cherry picked from commit d65b39a805)
2018-11-30 17:56:46 +00:00
Ján Hrnko
46f7707f08 trezord: 2.0.24 -> 2.0.25
(cherry picked from commit e3768c8063)
2018-11-30 18:04:29 +01:00
Clemens Fruhwirth
854e94d262 androidsdk: Re-add emulator that was broken out of the sdk-tools package.
(cherry picked from commit b4d9f6ddca)
2018-11-30 10:58:27 -05:00
David McFarland
73ee651740 androidsdk: fix monitor interpreter path
(cherry picked from commit c43abffb9c)
2018-11-30 10:58:27 -05:00
Nick Novitski
6d9532887b androidenv: version buildTools and add buildToolsVersions sdk argument
(cherry picked from commit d861da151f)
2018-11-30 10:58:27 -05:00
Nick Novitski
48223815a1 androidsdk: 25.2.5 -> 26.1.1, license agreement
(cherry picked from commit 950608bae0)
2018-11-30 10:58:27 -05:00
Florian Klink
43e3285cf5 Merge pull request #51072 from flokli/gitlab-11.5.0-18.09
[18.09] Gitlab 11.5.0
2018-11-30 15:06:58 +01:00
Robert Schütz
7d166c6941 Merge pull request #51257 from schmittlauch/seafile-backport
seafile-shared: backport newer minor version to fix build failures
2018-11-30 11:52:48 +01:00
Andreas Wiese
2ae7b7082b postgresql: Fix variable spelling in NixOS module
Current build of nixos-18.09-small (nixos-18.09.1473.c1acb5ce6d8) fails
with

error: undefined variable 'postgresqlPackage' at […]/nixos/modules/services/databases/postgresql.nix:251:38

The right variable name should be cfg.package; fix.
2018-11-30 10:58:59 +01:00
Renaud
c1acb5ce6d Merge pull request #51169 from nyanloutre/jackett-update-18.09
[18.09] jackett: 0.10.434 -> 0.10.471
2018-11-29 22:33:17 +01:00
Doug Beardsley
7b54e50c08 Update developPackage documentation
(cherry picked from commit c3c82aa675)
2018-11-29 14:06:41 -05:00
Doug Beardsley
fca28547b5 Add name parameter to developPackage
(cherry picked from commit d36c55a530)
2018-11-29 14:06:13 -05:00
Robert Schütz
f135007e8c seafile-client: 6.2.5 -> 6.2.7
(cherry picked from commit 377e0e9b0f)

reason: built-error of seafile-shared-6.2.4 (see #51238)
2018-11-29 18:08:30 +01:00
Robert Schütz
2d3cf40a2d seafile-shared: 6.2.5 -> 6.2.7
(cherry picked from commit 3dccf7dca7)

reason: built-error of seafile-shared-6.2.4 (see #51238)
2018-11-29 18:04:34 +01:00
Graham Christensen
a0c7949780 Revert "zfs cannot be distributed. Disabling it in the isos."
ZFS's popularity is growing, and not including it by default is a
bit frustrating. On top of that, the base iso includes ZFS
_anyway_ due to other packages depending upon it.

I think we're in the clear to do this on the basis that Oracle
probably doesn't care, it is probably fine (the SFLC agrees) and
we're a small fish. If a copyright holder asks us to, we can
definitely revert it again.

This reverts commit 33d07c7ea9.

(cherry picked from commit 6db866cbd2)
2018-11-29 08:38:19 -05:00
Samuel Dionne-Riel
09c74d944d sd-image: Do not use batch operation for mcopy.
```
       b      Batch mode. Optimized for huge recursive copies, but less secure if a crash happens during the copy.
```

It seems the "less secure if a crash happens" does not need a crash to
happen.

With batch mode:

```
/[...]/.
  Start (0) does not point to parent (___)
```

For pretty much everything copied in.

Without batch mode, everything passes `fsck`.

See #51150

(cherry picked from commit 1b6a4d3979)
2018-11-28 19:25:34 -05:00
Samuel Dionne-Riel
19f0f4758e sd-image: Verifies the FAT partition before copying it.
This is to ensure `mtools`-based operations don't wreck the FS.

(cherry picked from commit 2e5eb135aa)
2018-11-28 19:25:26 -05:00
Timo Kaufmann
b7747ce27e sage: don't test the downgraded R (#51192)
Fails transiently. See https://github.com/NixOS/nixpkgs/pull/49249. The
failures look harmless and are fixed with R 3.5 which will be used in
sage 8.5.

(cherry picked from commit d6376bca6d)
2018-11-28 23:17:09 +01:00
Kristoffer Thømt Ravneberg
bb287f821f gitlab-shell: don't hardcode gitlab-shell paths in authorized_keys
(cherry picked from commit a3ec5dce2b)
2018-11-28 23:11:19 +01:00
Austin Seipp
4169ce094c postgresql: enable systemd service notification on 9.6+
This results in a marginal closure size increase of ~137mb -> ~141mb.
This only affects the 'out' output, not the 'lib' output, so
libpq-dependent expressions should not bloat as a result of this.

The type of the systemd service is changed to 'notify' on 9.6+, which
will help identify when Postgres is starting/shutting down.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 1e83cf3174)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-11-28 16:42:28 +00:00
Matt McHenry
d7e3a072ec elm: extract makeDotElm and fetchElmDeps
(cherry picked from commit 206a1c00ba)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-11-28 16:35:35 +00:00
Peter Simons
2c848ea92d Merge pull request #51177 from peti/add-pandoc-manpage
pandoc: adapt postInstall hook to embedded-data-files build
2018-11-28 15:09:52 +01:00
Peter Simons
965b8ecccb pandoc: adapt postInstall hook to embedded-data-files build
(cherry picked from commit b38bfe18c7)
2018-11-28 13:33:18 +01:00
Léo Gaspard
aacc016422 Merge branch 'pr-51156' into release-18.09
* pr-51156:
  haskellPackages: default to ghc 8.4.4 as per Stackage LTS 12.16
2018-11-28 20:50:43 +09:00
nyanloutre
fd41dd53f1 jackett: 0.10.446 -> 0.10.471
(cherry picked from commit 6c06017137)
2018-11-28 09:58:18 +01:00
R. RyanTM
db73ad3ecd jackett: 0.10.434 -> 0.10.446
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jackett/versions

(cherry picked from commit 91796d1020)
2018-11-28 09:58:18 +01:00
Samuel Dionne-Riel
9deeaa225b Merge pull request #51159 from samueldr/18.09/mtools-4.0.21
[18.09] mtools 4.0.18 -> 4.0.21
2018-11-28 03:30:28 +00:00
Will Dietz
84f7a5ed07 mtools: 4.0.20 -> 4.0.21
* mtools: 4.0.20 -> 4.0.21 (#50993)

https://lists.gnu.org/archive/html/info-mtools/2018-11/msg00009.html

* mtools: homepage is https-capable

(cherry picked from commit 51b526d86e)
2018-11-27 22:07:04 -05:00
Jörg Thalheim
20cdb37294 mtools: fix darwin build
(cherry picked from commit 47a239a240)
2018-11-27 22:07:00 -05:00
R. RyanTM
a58cdb9edd mtools: 4.0.19 -> 4.0.20
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mtools/versions

(cherry picked from commit 4f99f26f9b)
2018-11-27 22:06:55 -05:00
R. RyanTM
75c1a76c6c mtools: 4.0.18 -> 4.0.19
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mtools/versions

(cherry picked from commit aee3689349)
2018-11-27 22:06:21 -05:00
Markus Kowalewski
9be0cb168b mtools: add license
(cherry picked from commit 4f83467ba4)
2018-11-27 22:06:16 -05:00
Peter Simons
1afc9c9e56 haskellPackages: default to ghc 8.4.4 as per Stackage LTS 12.16 2018-11-27 21:07:33 -05:00
Andrew Dunham
6ea49f6f86 libtiff: 2018-11-04 -> 4.0.10
(cherry picked from commit ac3b358a8c)
2018-11-28 10:54:13 +09:00
Andrew Dunham
76fc36f75d libtiff: 4.0.9 -> 2018-11-04
This includes a bunch of security fixes (#49786), and mimics what Debian
has done in moving to a git snapshot instead of a released version +
backported security patches.

(cherry picked from commit 3137c609a4)
2018-11-28 10:54:09 +09:00
Léo Gaspard
92e700d297 Merge branch 'pr-51092' into release-18.09
* pr-51092:
  php72: 7.2.11 -> 7.2.12
  php71: 7.1.23 -> 7.1.24
  php: align Darwin and Linux versions again
  php72: 7.2.10 -> 7.2.11
  php71: 7.1.22 -> 7.1.23
2018-11-28 10:05:28 +09:00
Renaud
db561c90ef Merge pull request #51148 from c0bw3b/sec/1809/pdnsrec
pdns-recursor: 4.1.7 -> 4.1.8 (security)
2018-11-27 23:19:36 +01:00
Will Dietz
6a0c135870 pdns-recursor: 4.1.7 -> 4.1.8 (security)
https://docs.powerdns.com/recursor/changelog/4.1.html#change-4.1.8
(cherry picked from commit 14342e8c6d)
2018-11-27 22:59:00 +01:00
Pavel Goran
5c1cf68a94 gitea: include "options" directory in "data" output
This directory contains template files needed for initializing new repositories.

Fixes #49404.

(cherry picked from commit 5f3054ef70)
2018-11-27 22:38:09 +01:00
Tim Steinbach
0551730dae linux: 4.19.4 -> 4.19.5
(cherry picked from commit 08292ab3da0f4df2d1560403e0e48b289f740457)
2018-11-27 16:20:30 -05:00
Tim Steinbach
0375fe783f linux: 4.14.83 -> 4.14.84
(cherry picked from commit d435ad65664ea762b58df28fd6bda4a08bebe86b)
2018-11-27 16:20:30 -05:00
Tim Steinbach
9aff7df93e linux: 4.9.140 -> 4.9.141
(cherry picked from commit 94906bfefed6cb7c1fe53fceb81038ddc8ee8ebc)
2018-11-27 16:20:29 -05:00
Tim Steinbach
1e1faecaeb linux: 4.4.164 -> 4.4.165
(cherry picked from commit 2c3325ecf9af6f1d5a237190028d28a44ba210b3)
2018-11-27 16:20:29 -05:00
Peter Simons
86d1ba34b4 gnome3.gnome-keyring: disable test suite on i686 to fix the build
https://github.com/NixOS/nixpkgs/issues/51121
2018-11-27 17:43:09 +01:00
Pascal Bach
aa4599bef0 gitlab-runner: 11.2.0 -> 11.5.0
(cherry picked from commit c3c57c798f)
2018-11-27 13:48:59 +01:00
Vladimír Čunát
56aac496ff sssd: fix build with updated curl-7.62
Fixes #51106.

(cherry picked from commit 439bf86ca9)
The patch seems very safe to pick.
2018-11-27 12:58:10 +01:00
Jörg Thalheim
f3fbb8543d nixopsUnstable: 1.6.1pre2622_f10999a -> 1.6.1pre2706_d5ad09c
This fixes evaluation with the latest master.

(cherry picked from commit cbea2201db)
2018-11-27 11:29:49 +00:00
Pierre Bourdon
a281d8dcac php72: 7.2.11 -> 7.2.12
(cherry picked from commit ec3d829257)
2018-11-27 02:57:35 +01:00
Pierre Bourdon
574e5af5c2 php71: 7.1.23 -> 7.1.24
(cherry picked from commit 8221da343e)
2018-11-27 02:57:34 +01:00
Pierre Bourdon
df57073860 php: align Darwin and Linux versions again
Instead of pinning Darwin to older versions, add small patches to
configure.in (7.1) / configure.ac (7.2) to fix the build of the intl
extension on recent PHP versions on Darwin.

fix-paths-php7.patch also required changes -- since we now run autoconf
at build time (through ./buildconf), it needs to patch the input .m4
files instead of ./configure directly.

(cherry picked from commit ea10173045)
2018-11-27 02:57:34 +01:00
Elis Hirwing
a294c126de php72: 7.2.10 -> 7.2.11
Changelog: https://secure.php.net/ChangeLog-7.php#7.2.11
(cherry picked from commit b9773bd12e)
2018-11-27 02:41:06 +01:00
Elis Hirwing
96d56c8635 php71: 7.1.22 -> 7.1.23
Changelog: https://secure.php.net/ChangeLog-7.php#7.1.23
(cherry picked from commit 36e3fdd9b6)
2018-11-27 02:40:56 +01:00
Florian Klink
86e84c6d15 gitlab tests: enable recommendedProxySettings, test redirection works as it should
The nixos test is a bit misleading, as the given nginx configuration
would always cause gitlab to redirect to localhost, which is clearly not
what you want in a production setup.

Instead we now enable services.nginx.recommendedProxySettings,
curl against http://gitlab, and assure we get redirected to that same
hostname, too.

(cherry picked from commit 6870eafe72)
2018-11-26 18:53:20 +01:00
Florian Klink
3e65e8d949 gitaly: 0.125.1 -> 0.129.0
(cherry picked from commit 63f25471cb)
2018-11-26 18:53:13 +01:00
Florian Klink
a8b34b1f0b gitlab-workhorse: 7.0.0 -> 7.1.0
(cherry picked from commit a33622e4d4)
2018-11-26 18:53:04 +01:00
Florian Klink
808219bd72 gitlab-shell: 8.3.3 -> 8.4.1
(cherry picked from commit 293a631081)
2018-11-26 18:52:57 +01:00
Florian Klink
3d05f49362 gitlab: 11.4.4 -> 11.5.0, add data.json, make default.nix use it
(cherry picked from commit 625e66d879)
2018-11-26 18:52:49 +01:00
Florian Klink
3905118d6d gitlab-workhorse: rename srcs attribute to src
(cherry picked from commit 3233efb33b)
2018-11-26 18:52:24 +01:00
Florian Klink
c3b6aab73c gitlab-workhorse: drop deterministic-build.patch
we already set VERSION in makeFlags below.

(cherry picked from commit 8b51e837b9)
2018-11-26 18:52:14 +01:00
Florian Klink
bfc48c7774 gitlab-workhorse: move to pkgs/applications/version-management/gitlab
(cherry picked from commit d768e3967f)
2018-11-26 18:52:06 +01:00
Florian Klink
c430d13132 gitaly: move to pkgs/applications/version-management/gitlab
(cherry picked from commit cb79c1e60b)
2018-11-26 18:51:59 +01:00
Florian Klink
df9c1df139 gitlab-shell: move to pkgs/applications/version-management/gitlab
(cherry picked from commit 8e8f692e22)
2018-11-26 18:51:54 +01:00
Pierre Bourdon
a7fd4310c0 curl: cherry-pick upstream patch for ipv6 url parsing
Upstream bug: curl/curl#3218.

This causes nixos/tests/ipv6.nix to fix since the last staging merge.

(cherry picked from commit 90720d0139)
In the end I decided to pick it directly without staging,
so that the various security fixes get to stable* channels fast.
2018-11-25 14:01:31 +01:00
Joachim F
3559a6430e Merge #48084: steam: add libxcb to steamrt overrides
(cherry picked from commit 30008a1cda)

Fixes #47932.  On 18.09 we still have libxcb 1.12, but I expect the
change will help with mixing versions, and it seems safe anyway.
2018-11-25 10:46:22 +01:00
Renaud
f3cc68c505 Merge pull request #51014 from c0bw3b/pkg/1809/nvidia-legacy
[18.09] nvidia_legacy_340: 340.104 -> 340.107
2018-11-25 09:02:49 +01:00
Florian Jacob
70cf0cba42 nvidia_legacy_340: 340.104 -> 340.107
(cherry picked from commit 045575e744)
2018-11-25 08:40:43 +01:00
Renaud
5340848b61 Merge pull request #50988 from timor/release-18.09
libmtp: 1.1.15 -> 1.1.16
2018-11-24 20:26:33 +01:00
timor
5be73b4b1d libmtp: 1.1.15 -> 1.1.16
This fixes the problem of connecting android phones via MTP in kde/dolphin.

Original Bug description: https://bugs.kde.org/show_bug.cgi?id=387454

(cherry picked from commit 79f148c2e0)
2018-11-24 19:00:52 +01:00
Vladimír Čunát
87d114352c Merge branch 'staging-18.09' into release-18.09
Multiple CVE fixes.
2018-11-24 10:20:24 +01:00
Unknown
5d4a1a3897 marble: Fix include install to dev output
(cherry picked from commit 956a4b2bb6)

Fixes #50938
2018-11-24 00:40:22 -05:00
Franz Pletz
b2030e8240 browserpass: 2.0.18 -> 2.0.22
(cherry picked from commit 5ea22c49f1)
2018-11-24 01:37:01 +01:00
Franz Pletz
96550b30d1 matrix-synapse: 0.33.8 -> 0.33.9
(cherry picked from commit 2bf16cbbc3)
2018-11-23 21:13:15 +01:00
Peter Hoeg
247fea906a matrix-synapse: prepare for python3 switch
With this commit, we *can* swap python2 for python3 to run synapse using python3
instead.

The reason for not making the switch is that a number of CLI tools provided with
synapse do not yet work under py3 despite synapse running fine.

So this doesn't actually do anything on its own except to prepare for the
upcoming py3 switch.

(cherry picked from commit dc74c44e67)
2018-11-23 21:13:14 +01:00
Will Dietz
aa3f523dd5 pythonPackages.sqlalchemy: 1.2.11 -> 1.2.13
(cherry picked from commit b8229dd2dc)
2018-11-23 19:32:29 +01:00
Will Dietz
06a935b7ee sqlite: 3.25.2 -> 3.25.3
https://sqlite.org/releaselog/3_25_3.html
(cherry picked from commit 6f0c65ee3f)
2018-11-23 19:32:29 +01:00
Will Dietz
6b5273508b sqlite: 3.25.1 -> 3.25.2
(cherry picked from commit 2e2740165a)
2018-11-23 19:32:29 +01:00
Will Dietz
631572e453 sqlite: 3.25.0 -> 3.25.1
(cherry picked from commit daf738f55d)
2018-11-23 19:32:29 +01:00
Will Dietz
628ea26c63 sqlite: 3.24.0 -> 3.25.0
https://sqlite.org/releaselog/3_25_0.html
(cherry picked from commit 0c7b1576dd)
2018-11-23 19:32:29 +01:00
Andreas Rammhold
43ca58ebed libpng: 1.6.34 -> 1.6.35
(cherry picked from commit e5deb04fed)
2018-11-23 19:32:29 +01:00
Andreas Rammhold
7146449bf4 nss: 3.39 -> 3.40
(cherry picked from commit 376f4b9f05)
2018-11-23 19:32:29 +01:00
Franz Pletz
1fd295ff0d minetest: 0.4.17 -> 0.4.17.1
(cherry picked from commit f88543769e)
2018-11-23 17:54:22 +01:00
Edward Tjörnhammar
3960912a49 minetest: 0.4.16 -> 0.4.17
(cherry picked from commit 8ff9e78dc1)
2018-11-23 17:54:21 +01:00
Franz Pletz
991beddf1a riot-web: 0.17.3 -> 0.17.6
(cherry picked from commit 64da5fcfac)
2018-11-23 17:53:29 +01:00
R. RyanTM
7f2243a396 riot-web: 0.17.0 -> 0.17.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/riot-web/versions

(cherry picked from commit f091b32b16)
2018-11-23 17:53:28 +01:00
R. RyanTM
4acd14a9a4 riot-web: 0.16.5 -> 0.17.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/riot-web/versions

(cherry picked from commit 5d88d542e3)
2018-11-23 17:53:28 +01:00
Franz Pletz
3d64330807 batman_adv: 2018.2 -> 2018.4
(cherry picked from commit b62a18b0c2)
2018-11-23 17:53:28 +01:00
R. RyanTM
95137ab11b batctl: 2018.3 -> 2018.4 (#50826)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/batctl/versions

(cherry picked from commit 119e4e30c8)
2018-11-23 17:53:27 +01:00
R. RyanTM
68c6f0c399 alfred: 2018.2 -> 2018.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/alfred/versions

(cherry picked from commit 40ea9c7143)
2018-11-23 17:53:27 +01:00
R. RyanTM
d869774152 batctl: 2018.2 -> 2018.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/batctl/versions

(cherry picked from commit 6d8f22a58b)
2018-11-23 17:53:27 +01:00
Vladimír Čunát
9f5c1566d2 Merge branch 'release-18.09' into staging-18.09 2018-11-23 16:39:52 +01:00
Tim Steinbach
932e0f30c4 linux: 4.19.3 -> 4.19.4
(cherry picked from commit 13e38d8180)
2018-11-23 08:34:55 -05:00
Tim Steinbach
9fba76c579 linux: 4.14.82 -> 4.14.83
(cherry picked from commit 86f9ac22e2)
2018-11-23 08:34:55 -05:00
Tim Steinbach
67800921ed linux: 4.9.138 -> 4.9.140
(cherry picked from commit 5879586e01)
2018-11-23 08:34:54 -05:00
Bas van Dijk
a85aacc806 Merge pull request #50880 from ElvishJerricco/18.09-bump-ghcjs-2018-11-21
Backport #50879
2018-11-23 12:17:38 +01:00
Ingolf Wagner
172eb14358 bitwig-studio1: fix dependency to libxkbcommon_7
(cherry picked from commit 6fcc67e189)
2018-11-23 03:40:58 -05:00
Ingolf Wagner
fabf2dd765 libxkbcommon: split version (for bitwig)
(cherry picked from commit b499f924da)
2018-11-23 03:39:52 -05:00
Robert Schütz
636b2b2da9 linuxPackages.{spl,zfs}: 0.7.11 -> 0.7.12
(cherry picked from commit d9cd9acc24)
2018-11-22 20:54:29 +01:00
Linus Heckemann
51076ed20c lib/licenses: remove bsl10
Licence isn't used anywhere and nonfree.

(cherry picked from commit 4ef0760808)
2018-11-22 16:02:50 +01:00
Linus Heckemann
c7519bd468 lib/licenses: mark some as unfree
AMD license agreement (currently unavailable at the given URL, but
included in tarball) disallows reverse-engineering, modification,
redistribution etc;

BSL licenses limit commercial production use.

(cherry picked from commit 8fb1e5e166)
2018-11-22 16:02:46 +01:00
Jörg Thalheim
21517c60d9 netdata: create missing /etc/netdata
Since netdata 1.11.0 updated in https://github.com/NixOS/nixpkgs/pull/50459
it needs to have a /etc/netdata directory, which we did not create by default.
fixes #50893
2018-11-21 23:12:54 +00:00
Thomas Tuegel
012b9e6c21 Merge pull request #50877 from ttuegel/backport/50472
nixos/fontconfig: fix enable option of penultimate
2018-11-21 14:02:53 -06:00
Tim Steinbach
dfd23be5a3 linux: 4.19.2 -> 4.19.3
(cherry picked from commit 8f11b37a95)
2018-11-21 09:54:30 -05:00
Tim Steinbach
d0193db8af linux: 4.18.19 -> 4.18.20
(cherry picked from commit ff82d7c786)
2018-11-21 09:54:30 -05:00
Tim Steinbach
42151716eb linux: 4.14.81 -> 4.14.82
(cherry picked from commit 3667a91b78)
2018-11-21 09:54:30 -05:00
Tim Steinbach
c90a18b60b linux: 4.9.137 -> 4.9.138
(cherry picked from commit 0e7dafe8c0)
2018-11-21 09:54:29 -05:00
Tim Steinbach
bb10644e6f linux: 4.4.163 -> 4.4.164
(cherry picked from commit e822b9680b)
2018-11-21 09:54:29 -05:00
Orivej Desh
29842ed37d movit: 1.5.1 -> 1.6.2, fix build after #49310
Fixes #49883

(cherry picked from commit 6daa1938b6)
2018-11-21 14:59:02 +01:00
Will Fancher
716bacecbf Bump GHCJS 8.4 2018-11-21 08:08:30 -05:00
Johannes Frankenau
bfb89a3d12 nixos/fontconfig: fix enable option of penultimate
(cherry picked from commit eea86c9e71)
2018-11-21 06:42:33 -06:00
Peter Simons
03dc6471c1 Merge pull request #50806 from twhitehead/release-18.09
haskellPackages.generic-lens: apply patch to fix tests
2018-11-20 20:50:28 +01:00
Nathan van Doorn
869d900dca haskellPackages.generic-lens: apply patch to fix tests
(cherry picked from commit 550fe159f0)
2018-11-20 13:21:36 -05:00
Michael Raskin
f7da99c4b9 Merge pull request #50839 from taku0/flashplayer-31.0.0.153
flashplayer: 31.0.0.122 -> 31.0.0.153
(cherry picked from commit d3bdf3fe98)
2018-11-20 19:46:15 +03:00
Renaud
9feb8b74e0 Merge pull request #50698 from nyanloutre/makemkv-update-18.09
[18.09] makemkv: 1.12.3 -> 1.14.1
2018-11-20 10:33:45 +01:00
nyanloutre
e24bc96919 makemkv: using two URLs for src
This will prevent future failures due to the first URL being broken each
time a new version is released

See https://github.com/NixOS/nixpkgs/pull/50437#issuecomment-439329862
for details

(cherry picked from commit 05166dcce1)
2018-11-20 09:48:27 +01:00
Herwig Hochleitner
c1427bf45f chromium: add jdk.jre to build dependencies for versions >= 72
thanks for finding out @volth
see 6fba9250aa

(cherry picked from commit bac76e8a9e)
2018-11-20 01:03:23 +01:00
Herwig Hochleitner
7fd90514b3 chromium: 70.0.3538.102 -> 70.0.3538.110
CVE-2018-17479

(cherry picked from commit 7c79a0d4ac)
2018-11-19 23:53:30 +01:00
taku0
04005e5f71 firefox: 63.0.1 -> 63.0.3
(cherry picked from commit 917309fa62)
2018-11-19 20:34:25 +01:00
Vladyslav M
e980db62d3 Merge pull request #50660 from samueldr/auto/dbeaver/nixos-18.09/5.2.5
dbeaver: 5.2.4 -> 5.2.5 (18.09)
2018-11-19 21:22:48 +02:00
Tim Steinbach
df5ce5b5bb openjdk: 8u181 -> 8u192
(cherry picked from commit 7f7c4e423186fcd55f2f5fa6800707dd07d6b5b6)
2018-11-19 14:08:13 -05:00
Michael Raskin
d85622d616 Merge pull request #50755 from tokudan/ff6303
firefox-bin: 63.0.1 -> 63.0.3
2018-11-19 17:51:34 +00:00
taku0
01338788ac firefox-bin: 63.0.1 -> 63.0.3
(cherry picked from commit fa138b55a6)
2018-11-19 18:29:04 +01:00
nyanloutre
9071b93a71 makemkv: 1.14.0 -> 1.14.1
(cherry picked from commit 30bc36c64e)
2018-11-19 10:48:50 +01:00
Daniël de Kok
3aca7b859f makemkv: 1.12.3 -> 1.14.0
Changes: https://www.makemkv.com/download/history.html

Since this derivation only support Linux on x86_64, set the platform
meta data accordingly.

(cherry picked from commit f528731fe9)
2018-11-19 10:48:42 +01:00
Ivan Jager
50fb682075 zfsUnstable: 0.8.0-rc1 -> 0.8.0-rc2
(cherry picked from commit a995a81182)
2018-11-19 08:12:37 +01:00
Jörg Thalheim
4852b57781 zfs{Stable,Unstable}: mark as incompatible with 4.19
(cherry picked from commit 8609ff17ed)
2018-11-19 08:12:37 +01:00
Lenz Weber
2386f0982f zfs-unstable: 2018-09-02 -> 0.8.0-rc1 (#46543)
(cherry picked from commit 218ce4de50)
2018-11-19 08:12:06 +01:00
Lenz Weber
c97912743f zfs-unstable: 64e9696 -> c197a77
(cherry picked from commit 080a6385ff)
2018-11-19 08:11:48 +01:00
rnhmjoj
c2f36881f6 monero-gui: 0.13.0.3 -> 0.13.0.4
(cherry picked from commit 88a86f78a3)
2018-11-19 08:10:23 +01:00
fuwa
3d50d1bde1 monero: 0.13.0.3 -> 0.13.0.4
(cherry picked from commit 40d7e12685)
2018-11-19 08:10:20 +01:00
Samuel Dionne-Riel
58dd475e6c dbeaver: 5.2.4 -> 5.2.5
(cherry picked from commit 47d1bcc873)
2018-11-18 20:32:34 -05:00
Renaud
734cc38c75 Merge pull request #50613 from c0bw3b/sec/1809/live555
[18.09] live555: 2018.02.28 -> 2018.10.17
2018-11-18 20:14:40 +01:00
c0bw3b
d03b29fc55 live555: broken on aarch64
(cherry picked from commit 525e397f64)
2018-11-18 18:03:22 +01:00
Peter Hoeg
46d5ce21a9 live555: 2018.02.28 -> 2018.10.17
(cherry picked from commit fb81d629ac)
2018-11-18 18:03:08 +01:00
Gabriel Ebner
e1bd04a3f4 Revert "openjdk11: enable ZGC on x86_64-linux"
We don't have openjdk11 on 18.09, and this breaks openjdk10:
https://hydra.nixos.org/build/84099818/nixlog/1

This reverts commit 5d0ef3fd90.
2018-11-18 12:08:56 +01:00
Austin Seipp
b37872d426 foundationdb: set RELEASE=true for official builds
This ensures the proper version is reported in the server status
information; otherwise it has a '-PRERELEASE' suffix.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 47b3086bdf)
2018-11-17 22:13:49 -06:00
Jörg Thalheim
f0445db9b4 netdata: fix python plugins
(cherry picked from commit e08ee4971652b402888e2bc2ecec75a83ba661d8)
2018-11-17 20:34:34 +00:00
Jan Tojnar
656288f7bf Merge pull request #50507 from hedning/fix-nautilus-thumbnails
gnome3.gnome-desktop: fix path substitution
2018-11-17 19:12:06 +01:00
Tor Hedin Brønner
35c64e56c7 gnome3.gnome-desktop: fix path substitution
`substituteAll` intentionally doesn't work with all caps:
https://github.com/NixOS/nixpkgs/issues/28086
2018-11-17 16:09:24 +01:00
Jörg Thalheim
34ff87e288 nixos/netdata: own plugins must the looked up first
Otherwise netdata will not find python modules.
To make sure netdata still pick up our setuid version of apps.plugin
we rename the original executable.
2018-11-17 15:05:54 +00:00
Jörg Thalheim
aa31685d60 netdata: Disable files in /etc and /var 2018-11-17 15:05:54 +00:00
Mario Rodas
74592d67f4 netdata: 1.10.0 -> 1.11.0 2018-11-17 15:05:53 +00:00
Victor SENE
3078bca9ed fprintd: use correct path for configuration
(cherry picked from commit a70779458a)
2018-11-17 08:22:45 +01:00
Austin Seipp
0f7a562edd foundationdb60: 6.0.11pre2716 -> 6.0.15
Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 8d4f8a6d26)
2018-11-16 20:38:47 -06:00
Austin Seipp
d359c39bb6 foundationdb: rework python bindings, build system
FoundationDB uses Python at build time for some code generation.
However, it also has the official python bindings inside the source code
too, and the code for the Python bindings has some of it auto-generated
at compile time.

This made building python packages unattractive: we want to use the
source code generated from the FoundationDB build, but we don't want to
rebuild it. Previously we would override the 'python' input to the
FoundationDB module, but this meant we would do a complete rebuild, as
it was a necessary build time dependency, even though the resulting
generated code itself would not change. Furthermore, FoundationDB
versions < 6.0 don't properly support Python 3 *for the build system*,
though the bindings supported it, so that caused build failures. But the
first effect is the worst: it meant building separate python2 and
python3 packages implied two complete rebuilds of a single FoundationDB
version. This meant rather than 3 FDB builds, we'd do 3*N where N = the
number of major Python versions we support.

Finally, because we did not use pip to generate a wheel that we install
with metadata recorded for the installation, the FoundationDB python
package couldn't be used as an input to other setup.py-based packages:
there would be no recorded metadata in the dist-info folder which would
say this is the foundationdb package. This greatly limits its utility.

To fix all this, we do a few things:

  - Apply some patches to fix the build system with Python 3.x for
    older FoundationDB versions. (This is nice if end-users have
    overridden the global Python version for some reason.)
  - Move python directly into nativeBuildInputs, so it is only a
    build time dependency.
  - Take the python source code from the ./bindings directory and
    tar it up use later after the build is done, so we get to keep
    the generated code. This is the new 'pythonsrc' output from the
    build. This code doesn't change based on whether or not the input
    or resulting package is using Python 2 or 3, it's totally
    deterministic.
  - The build system also patches up the python source code a little,
    so it can be installed directly with setup.py (it needs a little
    stuff that it normally expects the build system to do.)
  - Rework the python package to a separate file that uses
    buildPythonPackage directly. Because the source code is already
    prepared, it needs almost nothing else. Furthermore, this kills
    the override itself for the foundationdb package, meaning rebuilds
    are no longer needed.
  - This package is very simple and just uses foundationdb.pythonsrc
    as its source input. It also ensures a link to libfdb_c.so can
    be found by ctypes (using substituteInPlace)
  - python-packages.nix now just uses callPackage directly.

The net effect of this is, most importantly, that python packages do not
imply a full rebuild of the server source code: building python2 and
python3 packages from a version of FoundationDB now does not need to
override the foundationdb python input, reducing the number of needless
builds. They instead just run setup.py with the given version as input.

The second biggest effect is that wheel metadata is recorded correctly,
meaning dependent-python-packages that want to use the FoundationDB
bindings e.g. from PyPi should now work fine with buildPythonPackage.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 6054dabc11)
2018-11-16 20:38:41 -06:00
Austin Seipp
eec1fa5132 foundationdb: include fdb.options in .dev for binding generators
Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 32948a6f3d)
2018-11-16 20:38:36 -06:00
Austin Seipp
1d3d52afe2 foundationdb60: 6.0.4pre2497_73d64cb2 -> 6.0.11pre2716_9e8c1941e
Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit f1737fa646)
2018-11-16 20:38:30 -06:00
Austin Seipp
5d0ef3fd90 openjdk11: enable ZGC on x86_64-linux
The Z Garbage Collector is a concurrent, scalable, low latency garbage
collector designed to meet extremely-low-pause-time requirements for
small-to-multi-TB heap sizes.

ZGC can be enabled with the magical incantation:

    $ java -XX:+UnlockExperimentalVMOptions -XX:+UseZGC ...

Currently, ZGC is only available for x86_64-linux (though a port for
aarch64-linux may become available at a future time.) There are also a
number of other features that currently aren't present, such as JVMCI
integration (meaning compiler tools like Graal which require JVMCI will
not work with ZGC enabled.)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 1629147423)
2018-11-16 20:38:08 -06:00
Alexander V. Nikolaev
894a9994e8 glfw: hardwire path to libGL.so.1
(cherry picked from commit f664181ef2)
2018-11-17 01:38:55 +00:00
Will Dietz
5d07a3270e curl: 7.61.1 -> 7.62.0
See
https://github.com/NixOS/nixpkgs/issues/49463#issuecomment-434617623

(cherry picked from commit e9d6475e68)
2018-11-16 23:45:58 +01:00
Tim Steinbach
aff3b08b43 curl: 7.61.0 -> 7.61.1
(cherry picked from commit 16650af8c3)
2018-11-16 23:45:34 +01:00
Peter Hoeg
222fa75fde unifiStable: 5.8.30 -> 5.9.29
(cherry picked from commit ef927360e3)
2018-11-16 22:43:00 +01:00
Pascal Bach
6df7719e9e unifiStable: 5.8.28 -> 5.8.30
(cherry picked from commit 9cab954ab6)
2018-11-16 22:42:26 +01:00
Pascal Bach
4d13398cd9 unifiTesting: 5.9.22 -> 5.9.29
(cherry picked from commit 8fa7b89353)
2018-11-16 22:42:15 +01:00
Lancelot SIX
cff4cb689f gnupg22: 2.2.10 -> 2.2.11
See http://lists.gnu.org/archive/html/info-gnu/2018-11/msg00003.html for
release information

(cherry picked from commit ace631b616)
2018-11-16 13:01:16 +01:00
Rob Vermaas
e0eb712136 Update GCE image for 18.09 2018-11-16 11:42:43 +01:00
Lancelot SIX
c0f1a40da3 postgresql_10: 10.5 -> 10.6
See https://www.postgresql.org/about/news/1905/ for release information.
Fixes CVE-2018-16850

(cherry picked from commit 575151eb08)
2018-11-16 09:43:42 +01:00
Lancelot SIX
8d2a122b82 postgresql_9_6: 9.6.10 -> 9.6.11
See https://www.postgresql.org/about/news/1905/ for release information.
Fixes CVE-2018-16850

(cherry picked from commit 1670fd115d)
2018-11-16 09:42:24 +01:00
Lancelot SIX
16f5419791 postgresql_9_5: 9.5.14 -> 9.5.15
See https://www.postgresql.org/about/news/1905/ for release information.
Fixes CVE-2018-16850

(cherry picked from commit f703ea62a0)
2018-11-16 09:39:08 +01:00
Lancelot SIX
c022a69fd9 postgresql_9_4: 9.4.19 -> 9.4.20
See https://www.postgresql.org/about/news/1905/ for release information.
Fixes CVE-2018-16850

(cherry picked from commit 882c3b529c)
2018-11-16 09:37:41 +01:00
Lancelot SIX
2f3573359b postgresql_9_3: 9.3.24 -> 9.3.25
See https://www.postgresql.org/about/news/1905/ for release information.
Fixes CVE-2018-16850

(cherry picked from commit 5d37d63388)
2018-11-16 09:36:14 +01:00
Lancelot SIX
76a06b02ec gnupg22: 2.2.9 -> 2.2.11
See http://lists.gnu.org/archive/html/info-gnu/2018-11/msg00003.html for
release information

(cherry picked from commit ace631b616)
2018-11-16 09:32:42 +01:00
Tim Steinbach
a4d225c278 linux: 4.19.1 -> 4.19.2
(cherry picked from commit 248dfd2842)
2018-11-15 21:03:51 -05:00
Tim Steinbach
826e7b3bf0 linux: 4.19 -> 4.19.1
(cherry picked from commit 3e1ca4f176)
2018-11-15 21:03:50 -05:00
Tim Steinbach
21146197c3 linux: Add 4.19
(cherry picked from commit 2bb68c7017)
2018-11-15 21:03:44 -05:00
Edmund Wu
da81531c1d jetbrains.webstorm: 2018.2.5 -> 2018.2.6
(cherry picked from commit 07839a571b)
2018-11-15 23:50:24 +00:00
Edmund Wu
a3ce85af74 jetbrains.pycharm-professional: 2018.2.4 -> 2018.2.5
(cherry picked from commit 19fa47c150)
2018-11-15 23:50:23 +00:00
Edmund Wu
f2643c4498 jetbrains.pycharm-community: 2018.2.4 -> 2018.2.5
(cherry picked from commit 1a2a2aba02)
2018-11-15 23:50:23 +00:00
Edmund Wu
863f9933c1 jetbrains.idea-ultimate: 2018.2.5 -> 2018.2.6
(cherry picked from commit b48f467e1b)
2018-11-15 23:50:22 +00:00
Edmund Wu
010446f764 jetbrains.idea-community: 2018.2.5 -> 2018.2.6
(cherry picked from commit c2bbfa56ed)
2018-11-15 23:50:22 +00:00
Edmund Wu
0883f7fba3 jetbrains.goland: 2018.2.3 -> 2018.2.4
(cherry picked from commit 2787e2c75e)
2018-11-15 23:50:22 +00:00
Edmund Wu
a23ee32fc6 jetbrains.datagrip: 2018.2.4 -> 2018.2.5
(cherry picked from commit 4d20e9999b)
2018-11-15 23:50:21 +00:00
Edmund Wu
597c1abbc0 jetbrains.clion: 2018.2.5 -> 2018.2.6
(cherry picked from commit 9d1b22a909)
2018-11-15 23:50:21 +00:00
Edward Tjörnhammar
975fe6d830 jetbrains.webstorm: 2018.2.3 -> 2018.2.5
(cherry picked from commit 30422aa7d0)
2018-11-15 23:50:21 +00:00
Edward Tjörnhammar
1c16a9a551 jetbrains.ruby-mine: 2018.2.2 -> 2018.2.4
(cherry picked from commit e61f199470)
2018-11-15 23:50:20 +00:00
Edward Tjörnhammar
b3f7d81f46 jetbrains.phpstorm: 2018.2.3 -> 2018.2.5
(cherry picked from commit b8096a088e)
2018-11-15 23:50:20 +00:00
Edward Tjörnhammar
4eafa0f009 jetbrains.clion: 2018.2.4 -> 2018.2.5
(cherry picked from commit 8c084007d5)
2018-11-15 23:50:19 +00:00
Jörg Thalheim
8c898a91af Merge pull request #50436 from rafaelgg/fix-selfoss-port-backport
selfoss (service): fix port in service config (backport of #50411)
2018-11-15 23:12:32 +00:00
Rafael García Gallego
17293a833c selfoss (service): fix port in service config (#50411)
(cherry picked from commit 8bf4fe85f1)
2018-11-16 00:05:54 +01:00
Alyssa Ross
8fa2565a73 nginxMainline: 1.15.5 -> 1.15.6
CVE-2018-16843, CVE-2018-16844

https://nginx.org/en/security_advisories.html
(cherry picked from commit de9026de6e)
2018-11-15 21:11:49 +00:00
Alyssa Ross
850a8779f3 nginxStable: 1.14.0 -> 1.14.1
CVE-2018-16843, CVE-2018-16844

https://nginx.org/en/security_advisories.html
(cherry picked from commit 1908322d10)
2018-11-15 21:11:42 +00:00
Will Dietz
679ff5e5a1 flatpak: 1.0.4 -> 1.0.5
(cherry picked from commit 0e218ffc0c)
2018-11-15 21:02:00 +00:00
Oyren
533c5bcdeb write_stylus: fix loading libGL.so with libglvnd (#50395)
./Write: error while loading shared libraries: libGL.so.1: cannot open shared object file: No such file or directory

(cherry picked from commit 04b234e995)
2018-11-15 19:41:41 +00:00
Jean-Baptiste Giraudeau
2e790145d1 Fix help2man.postInstall syntax error under cygwin.
(cherry picked from commit 7fdb87a862)
2018-11-15 17:06:54 +00:00
Benjamin Hipple
dcb2e0068f docs: fix minor grammar issues in the manual 2018-11-15 15:48:49 +00:00
Peter Simons
012203f6e5 ghc: add new version 8.6.2
(cherry picked from commit 8d81cf6201)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-11-15 14:26:36 +00:00
taku0
24da975834 flashplayer: 31.0.0.122 -> 31.0.0.148
(cherry picked from commit 4c2d254a7f)
2018-11-15 14:20:11 +00:00
Periklis Tsirakidis
8ea0aa352e libarchive: 3.3.2 -> 3.3.3
Update includes patches for sec issues:
- CVE-2017-14166
- CVE-2017-14501
- CVE-2017-14502
- Upstream includes patch for libressl version check

fixes #49583

(cherry picked from commit 95fa7b6370)
2018-11-15 14:01:32 +00:00
Jörg Thalheim
abd0d521c3 nix-review: 0.6.0 -> 0.6.1
- blacklist for tests.nixos-functions.nixos-test
- nix-review rev HEAD: will now work as expected

(cherry picked from commit 695a157740)
2018-11-15 13:42:44 +00:00
Jörg Thalheim
95bc67101a nix-review: 0.5.3 -> 0.6.0
(cherry picked from commit 42f17d8f14)
2018-11-15 13:42:44 +00:00
Jörg Thalheim
825ecf0a0a nix-review: 0.5.2 -> 0.5.3
(cherry picked from commit 23a017fbca)
2018-11-15 13:42:43 +00:00
Robin Gloster
9bf8b0d06b gitlab: fix smtp setting
fixes #50163

(cherry picked from commit 74df0823f3)
2018-11-15 12:19:34 +01:00
John Ericson
edd03bed0f Merge pull request #50375 from obsidiansystems/haskell-bash-completion-18.09
haskellPackages: Add shell completion for 18.09
2018-11-14 19:06:07 -05:00
John Ericson
bb04322459 Merge remote-tracking branch 'upstream/release-18.09' into haskell-bash-completion-18.09 2018-11-14 18:49:25 -05:00
wucke13
bedbba6138 qgroundcontrol: fixes #49870
The `.desktop` referenced a non existent script to run `QGroundControl`. This commits adds a `sed` command, which replaces the non existent script by the name of the `QGroundControl` binary in the relevant `.desktop` file.

(cherry picked from commit c26b42be74)
2018-11-14 19:15:56 +00:00
Alexander V. Nikolaev
cf3ef93e04 openarena: fix loading libGL.so with libglvnd
(cherry picked from commit b0d470061f)
2018-11-14 17:50:31 +00:00
Daniel Peebles
435cfc8876 Merge pull request #50352 from DzmitrySudnik/release-18.09
exhibitor: fix paths for zookeeper shell scripts
2018-11-14 11:05:35 -05:00
Dzmitry Sudnik
1e3a4d644a exhibitor: fix paths for zookeeper shell scripts to point to local folders
(cherry picked from commit 5517661935)
2018-11-14 11:01:51 -05:00
Renaud
a74b08d71a Merge pull request #49549 from c0bw3b/sec/1809/openjpeg
[18.09] openjpeg: adding patch for CVE-2018-7648
2018-11-14 16:35:49 +01:00
Herwig Hochleitner
a964a33447 chromium: 70.0.3538.77 -> 70.0.3538.102
(cherry picked from commit 4b5ffcb964)
2018-11-14 03:06:19 +01:00
Herwig Hochleitner
09468e9f52 chromium: 70.0.3538.67 -> 70.0.3538.77
(cherry picked from commit 17585ff6d8)
2018-11-14 03:06:19 +01:00
Markus Kowalewski
4c72d0ce20 nixos/postgresqlBackup: set to umask to 0077
* Ensure that the backup file is only readable by the owner
* Add file permission test to tests

(cherry picked from commit a0371d4761)
2018-11-13 20:41:38 -05:00
Tim Steinbach
c293626323 linux: 4.18.18 -> 4.18.19
(cherry picked from commit aac632ce90b86d8734e2d0c5955a8f77259ff619)
2018-11-13 14:36:18 -05:00
Tim Steinbach
918e0e6fff linux: 4.14.80 -> 4.14.81
(cherry picked from commit 338d38e57b68e12a2f015e9eabe561accefcad4f)
2018-11-13 14:36:18 -05:00
Tim Steinbach
a2256b54dd linux: 4.9.136 -> 4.9.137
(cherry picked from commit 7395bd34f76e22abc4e4c79847fd978a713da932)
2018-11-13 14:36:18 -05:00
Timo Kaufmann
0f21a3e0f2 Merge pull request #50309 from nyanloutre/jackett-434-18-09
[18.09] jackett: 0.10.365 -> 0.10.434
2018-11-13 19:56:20 +01:00
Linus Heckemann
132b1d6a58 Merge pull request #50312 from WilliButz/grafana-backport
grafana: 5.3.2 -> 5.3.4 (backport)
2018-11-13 16:50:41 +01:00
WilliButz
559a34303f grafana: 5.3.2 -> 5.3.4
(cherry picked from commit ddd8f94051)
2018-11-13 14:38:50 +01:00
nyanloutre
a97fe124c6 jackett: 0.10.420 -> 0.10.434
(cherry picked from commit 2ae0b2e19d)
2018-11-13 14:17:18 +01:00
R. RyanTM
57809e32fc jackett: 0.10.365 -> 0.10.420
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jackett/versions

(cherry picked from commit 2af7527bd1)
2018-11-13 14:17:09 +01:00
Samuel Dionne-Riel
09dfd188bd Merge pull request #50268 from tokudan/ff6301
firefox-bin: 63.0 -> 63.0.1
2018-11-12 23:30:17 +00:00
Joachim F
d9d932fdd4 Merge pull request #50260 from pacien/release-18.09-youtube-dl-2018.11.07
youtube-dl: 2018.10.29 -> 2018.11.07 (release-18.09 backport)
2018-11-12 11:43:31 +00:00
Michael Raskin
b988f3ef58 firefox-bin: 63.0 -> 63.0.1
(cherry picked from commit 213407d471)
2018-11-12 11:31:33 +01:00
Valentin Heidelberger
297149bacb youtube-dl: 2018.10.29 -> 2018.11.07 2018-11-12 09:34:18 +01:00
Elis Hirwing
ee7b0dbaef gitea: 1.5.2 -> 1.5.3 (#50229)
Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.5.3
(cherry picked from commit 090bd931e1)
2018-11-11 15:28:09 +01:00
Chris Ostrouchov
8cc5d3a84a pythonPackages.pep8: refactor move to python-modules, disable tests
We need to disable tests because of a tokenize change in python 3.6.7.

(cherry picked from commit 9c36906e1a)
2018-11-11 09:38:10 +01:00
Frederik Rietdijk
f148e894b3 python.pkgs.pycodestyle: fix building with python37
(cherry picked from commit a263ab4e5c)
2018-11-11 09:31:01 +01:00
Frederik Rietdijk
3d63c05ddf Revert "Merge staging-18.09 into release-18.09"
This reverts commit 3b2944dbcb, reversing
changes made to 496a23896f.

I wasn't aware we had a Hydra job for this. Looking at it now, it seems we
have a lot more failures, so I am reverting this merge.
2018-11-11 09:17:50 +01:00
Frederik Rietdijk
3b2944dbcb Merge staging-18.09 into release-18.09 2018-11-11 09:01:21 +01:00
Franz Pletz
496a23896f python27: add patch to fix CVE-2018-1000802
(cherry picked from commit ae3e9b5a27)
2018-11-11 09:01:08 +01:00
Silvan Mosberger
272d854642 Merge pull request #50214 from samueldr/18.09/python36
doc: Fixes default python interpreter.
2018-11-11 02:07:58 +01:00
Samuel Dionne-Riel
e30dda6092 doc: Fixes default python interpreter.
This is equivalent to the change in
a649f1c0cd, which cannot apply cleanly as
cherry-picked. The stable (18.09) nixpkgs still has python34.
2018-11-10 19:28:06 -05:00
Tim Steinbach
f9820a0a4b docker: Fix binary names
(cherry picked from commit 68c3e5f38b)
2018-11-10 19:26:38 -05:00
Tim Steinbach
88babf6209 linux: 4.4.162 -> 4.4.163
(cherry picked from commit fb44ed79d22c88145132f49c0747def014528b68)
2018-11-10 16:12:57 -05:00
Tim Steinbach
abc2258c34 linux: 4.9.135 -> 4.9.136
(cherry picked from commit 98b6ecace1eea344987f6f942e88e550825f4aca)
2018-11-10 16:12:56 -05:00
Tim Steinbach
bb62b4987b linux: 4.14.79 -> 4.14.80
(cherry picked from commit e64068cdbfe0a5d6543da6986376763e3d588711)
2018-11-10 16:12:56 -05:00
Tim Steinbach
dfc0a358c4 linux: 4.18.17 -> 4.18.18
(cherry picked from commit a1cc1c89a9de5a3fe27d88558b279a48e0efb7cd)
2018-11-10 16:12:55 -05:00
Vladimír Čunát
9110d40d20 Merge branch 'release-18.09' into staging-18.09 2018-11-10 20:25:46 +01:00
Renaud
f99bab3e61 Merge pull request #50200 from c0bw3b/sec/1809/pdns
[18.09]  powerdns: 4.1.4 -> 4.1.5 /  pdns-recursor: 4.1.3 -> 4.1.7
2018-11-10 20:01:26 +01:00
Renaud
619efcc0e5 pdns-recursor: 4.1.4 -> 4.1.7
PowerDNS Security Advisory 2018-04 (CVE-2018-10851)
PowerDNS Security Advisory 2018-06 (CVE-2018-14626)
PowerDNS Security Advisory 2018-07 (CVE-2018-14644)

(cherry picked from commit 02693e327a)
2018-11-10 18:48:03 +01:00
Michele Guerini Rocco
ddb12efaa0 pdns-recursor: 4.1.3 -> 4.1.4 (#45984)
(cherry picked from commit ca850897c8)
2018-11-10 18:47:44 +01:00
R. RyanTM
166a3d5551 powerdns: 4.1.4 -> 4.1.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/powerdns/versions

(cherry picked from commit 08cd9b812b)
2018-11-10 18:42:57 +01:00
Robert Schütz
bb72473b5b home-assistant: mark as insecure 2018-11-10 14:08:28 +01:00
Samuel Dionne-Riel
aa8c4f38ea Merge pull request #48806 from bgamari/nixos-18.09-ghc-8.4.4
[18.09] ghc: add new 8.4.4 version
2018-11-10 02:34:47 +00:00
Samuel Dionne-Riel
141f63c29b Merge pull request #49387 from tazjin/chore/backport-doc-comments
Backport documentation comment changes to release-18.09
2018-11-10 02:33:51 +00:00
Samuel Dionne-Riel
06834f7262 Merge pull request #49491 from jokogr/u-18.09/lxd-3.0.2
[18.09] lxd 3.0.0 -> 3.0.2
2018-11-10 02:13:50 +00:00
Samuel Dionne-Riel
611808937a Merge pull request #49586 from periklis/backport-uriparser-18.09
uriparser: 0.9.0 backport to 18.09
2018-11-10 02:02:48 +00:00
Renaud
e97b663dba Merge pull request #49851 from samueldr/auto/dbeaver/nixos-18.09/5.2.4
dbeaver: 5.2.2 -> 5.2.4 (18.09)
2018-11-09 10:15:28 +01:00
Renaud
7438211aaa Merge pull request #49954 from c0bw3b/1809/nixos/gitea
[18.09] nixos/gitea: fix mysql issue, add mysql socket auth, and add a nixos test
2018-11-09 00:25:13 +01:00
Aaron Andersen
369df5d24a nixos/gitea: add a nixos test to ensure the initial database migration succeeds so the application can start
(cherry picked from commit 0dde47a58a)
2018-11-08 23:53:25 +01:00
Aaron Andersen
c66f5d2219 nixos/gitea: add mysql socket authentication as an option
(cherry picked from commit 3ed52c7804)
2018-11-08 23:53:06 +01:00
Aaron Andersen
4cfa83f556 nixos/gitea: fix systemd after target when mysql is the database of choice
(cherry picked from commit 0bbb6f4f2a)
2018-11-08 23:52:04 +01:00
Domen Kožar
7819700bad Add chrome-token-signing
(cherry picked from commit 068374c0ae)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-11-08 18:06:24 +00:00
Tim Steinbach
deedc8803e docker: 18.06.1 -> 18.09
(cherry picked from commit f15af0047a381dd272155cf35c451d9cc8c07c69)
2018-11-08 08:40:39 -05:00
Domen Kožar
094ff6cf6a qdigidoc: 3.13.6 -> 4.1.0
(cherry picked from commit e854a7a72f)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-11-08 11:43:05 +00:00
Domen Kožar
43a0cfbe05 libdigidocpp: 3.13.6 -> 3.13.7
(cherry picked from commit ad521a2757)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-11-08 11:42:55 +00:00
Timo Kaufmann
56090c4151 Merge pull request #49888 from timokau/numpy-high-cpu-fix
numpy: fix high cpu count bug
2018-11-08 12:00:12 +01:00
Robert Hensing
4fd4f5c80d acsccid: init at 1.1.6
(cherry picked from commit 9dd7fde27f)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-11-08 10:58:28 +00:00
Tim Steinbach
3715dd31d6 subversion: 1.9.7 -> 1.9.9
(cherry picked from commit 1cfc2427c8)
2018-11-07 20:26:50 -05:00
Tim Steinbach
8764ecc478 subversion: init 1.11.0
(cherry picked from commit 451126ea6e)
2018-11-07 20:26:50 -05:00
Tim Steinbach
a4c4cbb613 gradle: 4.10 -> 4.10.2
(cherry picked from commit c1d9f57dcc)
2018-11-07 20:13:53 -05:00
Tim Steinbach
be8258fdc2 kotlin: 1.2.71 -> 1.3.0
(cherry picked from commit 619c39e5c9)
2018-11-07 20:13:30 -05:00
R. RyanTM
27405f9b87 kotlin: 1.2.70 -> 1.2.71
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/kotlin/versions

(cherry picked from commit 9d8e0819aa)
2018-11-07 20:13:30 -05:00
R. RyanTM
dd6e06b54a kotlin: 1.2.61 -> 1.2.70
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/kotlin/versions

(cherry picked from commit 4eb077bed7)
2018-11-07 20:13:29 -05:00
Tim Steinbach
b20d58f9bb ammonite: 1.2.1 -> 1.4.2
(cherry picked from commit dd46b1adb6)
2018-11-07 20:12:47 -05:00
R. RyanTM
199d87e68d ammonite: 1.2.0 -> 1.2.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ammonite/versions

(cherry picked from commit 8cf1f60fa3)
2018-11-07 20:12:46 -05:00
Oscar Vargas Torres
b5ceebb306 ammonite: 1.1.2 -> 1.2.0
(cherry picked from commit 08b8923774)
2018-11-07 20:12:46 -05:00
Tim Steinbach
e2cf9127aa oh-my-zsh: 2018-09-19 -> 2018-11-02
(cherry picked from commit 072b2b86b0)
2018-11-07 20:11:57 -05:00
lassulus
2eddede86f dwarf-fortress: fix theme override
(cherry picked from commit 0cd1e6732d)
2018-11-08 02:01:12 +01:00
Timo Kaufmann
0d2483f059 numpy: fix high cpu count bug 2018-11-07 22:28:41 +01:00
Matthew Bauer
a8ff261660 darwin-tested: remove firefox from blocking jobs
It’s broken in the latest run and I don’t think anyone needs it right
now. Hopefully can be fixed for 19.03.
2018-11-07 12:57:13 -06:00
R. RyanTM
7cf572d87a pcsclite: 1.8.23 -> 1.8.24
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pcsclite/versions

(cherry picked from commit f174ae0f4f)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-11-07 18:26:32 +00:00
Samuel Dionne-Riel
f8dc3f1416 Merge pull request #49832 from 1000101/backport-release-18.09
[18.09] backport trezord: 2.0.19 -> 2.0.24
2018-11-07 16:43:45 +00:00
Timo Kaufmann
bd151c9448 Merge pull request #49874 from rafaelgg/release-18.09
flashplayer: add libglvnd dep
2018-11-07 17:31:28 +01:00
Rafael García Gallego
e92a04197a flashplayer: add libglvnd dep
(cherry picked from commit ded5faa82e)
2018-11-07 17:02:33 +01:00
Florian Klink
1349894743 lark-parser: 2017-12-18 -> 0.6.5
This bumps lark-parser to a released version that doesn't loop forever
and consumes all memory on certain grammars.

erezsh/lark redirects now to lark-parser/lark, so also update homepage.

(cherry picked from commit becf8879f4)
2018-11-07 11:30:52 +01:00
Samuel Dionne-Riel
72ab1b44a1 dbeaver: 5.2.2 -> 5.2.4
(cherry picked from commit fada4e87b8)
2018-11-06 21:59:48 -05:00
Samuel Dionne-Riel
cf597f0926 Merge pull request #49820 from srhb/1809-backport-nix-213
18.09: backport nix 2.1.1 -> 2.1.2 -> 2.1.3
2018-11-07 02:23:26 +00:00
sveitser
6141829459 nixos/jupyter: wait for network.target
(cherry picked from commit 13892da3e7)
2018-11-06 20:46:07 +01:00
Russell O'Connor
e0be1f6c2e trezord: 2.0.19 -> 2.0.24
(cherry picked from commit 10c56c5cfb)
2018-11-06 16:11:26 +01:00
Eelco Dolstra
9f2e2ee638 nix: 2.1.2 -> 2.1.3
(cherry picked from commit 2c9265c950)
2018-11-06 12:15:27 +01:00
Eelco Dolstra
4a03292016 nix: 2.1.1 -> 2.1.2
(cherry picked from commit 869f615ff4)
2018-11-06 12:15:25 +01:00
Aaron Andersen
1c0d935fd0 filesystems: escape spaces in fstab with \040
(cherry picked from commit 36d695f696)
2018-11-06 11:09:47 +00:00
Robert Schütz
32958da2c3 radicale: 2.1.10 -> 2.1.11
(cherry picked from commit 28a6927637)
2018-11-06 11:12:32 +01:00
Samuel Dionne-Riel
6d6e4e6b55 Merge pull request #49328 from c0bw3b/nixos/gc-release
[18.09] installation-device: set GC initial heap size to 1MB
2018-11-06 00:53:46 +00:00
lassulus
0c774fa8c6 dwarf-fortress: fix most of customization options
see #49779
close #49803

(cherry picked from commit 290dd06d14)
2018-11-06 01:03:00 +01:00
John Ericson
4507926b80 Merge pull request #49800 from obsidiansystems/bump-all-cabal-hashes-18.09
all-cabal-hashes: Update all-cabal-hashes in 18.09 to match Nixpkgs master
2018-11-05 14:52:41 -05:00
Peter Simons
32124db7d2 all-cabal-hashes: update to Hackage at 2018-11-02T16:36:33Z
(cherry picked from commit f648605b4e)
2018-11-05 14:27:52 -05:00
Peter Simons
b5b3e8ca1f all-cabal-hashes: update snapshot to Hackage at 2018-10-22T08:31:54Z
(cherry picked from commit 8089b93697)
2018-11-05 14:27:52 -05:00
Peter Simons
26527be691 all-cabal-hashes: update to Hackage at 2018-10-08T09:07:42Z
(cherry picked from commit b5f43fa04e)
2018-11-05 14:27:51 -05:00
Peter Simons
314e480750 all-cabal-hashes: update to Hackage at 2018-09-27T00:15:48Z
(cherry picked from commit 0af54ac670)
2018-11-05 14:27:51 -05:00
Peter Simons
c20d3110aa all-cabal-hashes: update snapshot to Hackage at 2018-09-18T11:13:20Z
(cherry picked from commit 89972ff45f)
2018-11-05 14:27:51 -05:00
John Ericson
a13b603e5e Merge pull request #49796 from obsidiansystems/fix-pkgsFor
release-lib: Fix `pkgsFor` for 18.09
2018-11-05 14:18:32 -05:00
Falco Peijnenburg
bf7930d582 haskellPackages.*.env: Fixed shellHook being ignored
The problem was introduced in 2bafa93b75

(cherry picked from commit 0ff9a7a2cd)
2018-11-04 19:36:25 +01:00
Michael Raskin
6ea2f786b8 Merge pull request #49606 from Ekleog/synapse-0.33.8-b18.09
matrix-synapse: 0.33.6 -> 0.33.8
2018-11-04 17:29:35 +00:00
Tim Steinbach
84c2e99546 linux: 4.14.78 -> 4.14.79
(cherry picked from commit bd636c897724c4c26171a8486c153c37c2a38eac)
2018-11-04 11:45:57 -05:00
Tim Steinbach
8c8d0cdc65 linux: 4.18.16 -> 4.18.17
(cherry picked from commit 4eade6749d2777dd82fd6e279209a1d91482c490)
2018-11-04 11:45:57 -05:00
Léo Gaspard
139fd45a8e matrix-synapse: 0.33.6 -> 0.33.8
Also reworked dependencies:
 * blist and ujson are marked as no longer needed
 * pytz has no mention throughout `git log -p` on synapse's repository
 * systemd and affinity are optional (but turned on by default)

(cherry picked from commit bb86056575)
2018-11-04 23:40:16 +09:00
Vladimír Čunát
35151f695e Merge #49747: gnome3.mutter: fix crash on startup
... with nvidia drivers.
2018-11-04 15:09:28 +01:00
Austin Seipp
cc39474fd0 timescaledb: fix license (Apache 2.0, not PostgreSQL)
Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit b0f7c86094)
2018-11-04 07:31:31 -06:00
Andrew Childs
3845a4ce15 gnome3.mutter: fix crash on startup with nvidia drivers
(cherry picked from commit e2e23ddd89)
2018-11-04 21:51:24 +09:00
Andreas Rammhold
faa179da40 Merge pull request #49589 from schmittlauch/jedi-vim-18.09
vimPlugins: add jedi-vim plugin
2018-11-04 13:19:38 +01:00
Robin Gloster
9ea650bb5d gitlab module: fix config handling
There could be old *.rb files in the config directory that import
non-existant gems that would cause errors in the rake task.

(cherry picked from commit eadb998581)
2018-11-04 00:28:21 +01:00
Florian Klink
386ff58ba3 gitlab: 11.4.3 -> 11.4.4
SSRF in Kubernetes integration
The GitLab Kubernetes integration was vulnerable to a SSRF issue which could allow an attacker to make requests to access any internal URLs. The issue is now mitigated in the latest release and is assigned CVE-2018-18843.

(cherry picked from commit 9e491f732a)
2018-11-03 18:20:03 +01:00
Robin Gloster
91844280a5 gitlab: refactor and fix test
(cherry picked from commit ec7cb84bf0)
2018-11-03 18:20:03 +01:00
Renaud
fb9d531efe Merge pull request #49697 from c0bw3b/sec/ansible
[18.09] ansible: 2.5.2 -> 2.5.11 and 2.6.2 -> 2.6.7
2018-11-03 17:28:44 +01:00
Vladimír Čunát
98c1150f2c systemd: apply patches from Debian
There are some security fixes among those.
2018-11-03 17:11:01 +01:00
Vladimír Čunát
0744358a7e Revert "systemd: 239 -> 239.20181031"
This reverts commit d1de23b830.
The changes turned out to be too intrusive, so we'll patch instead.
2018-11-03 17:11:00 +01:00
Vladimír Čunát
5b94195d21 Merge #49677: thunderbird*: 60.2.1 -> 60.3.0
Critical security fixes.

(cherry picked from commit f3cca2f83c)
2018-11-03 17:10:44 +01:00
Thilo Uttendorfer
9eb6e66420 ansible_2_6: 2.6.2 -> 2.6.7
(cherry picked from commit e63509a651)
2018-11-03 16:58:49 +01:00
Thilo Uttendorfer
fba092f238 ansible_2_5: 2.5.2 -> 2.5.11
(cherry picked from commit de8a3e3125)
2018-11-03 16:57:53 +01:00
Sergei Khoma
0f4978267a fix typo
based on https://www.ec2instances.info/

(cherry picked from commit c4cad45082)
2018-11-03 16:05:59 +01:00
Michael Raskin
dbda176a4c Merge pull request #48827 from clefru/gvfs-fix
gvfs: Fix-up paths to gio binary
2018-11-02 14:24:01 +00:00
Rickard Nilsson
686151998e nixos/google-compute-image: Fix network service
The google-network-daemon service should have type `simple`. (type
`oneshot` makes the service hang in startup).

See d48fc3a5e2/google_compute_engine_init/systemd/google-network-daemon.service (L10)

(cherry picked from commit c010c7547c9926dc5a235ff733a43747d34899dd)
2018-11-02 14:38:41 +01:00
Domen Kožar
46effdb883 chromium: use jumbo builds to speedup compilation
On Hetzner machine with 1 core: 4h40m
On Hetzner machine with 8 cores: 1h20m

(cherry picked from commit 89ede978a0)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-11-02 10:15:31 +00:00
Peter Simons
1f54d5f166 ghc: add new 8.4.4 version
(cherry picked from commit 069bf7aee3)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-11-02 10:14:34 +00:00
aszlig
13cd588afa nixos/tests/chromium: Fix sandbox info matching
As reported by @andir, the regular expressions that match the sandbox
output are no longer matching in the recent Chromium bump as of
bb03fbc2c8.

Instead of a boolean field that determines whether namespace sandboxes
are on, the namespace sandbox is now an enum within "Layer 1 Sandbox".

I've modified the regular expressions accordingly and also ran the test
for the stable branch, which now succeeds.

Signed-off-by: aszlig <aszlig@nix.build>
Issue: https://github.com/NixOS/nixpkgs/issues/49442
Cc: @bendlas, @andir
(cherry picked from commit 73cdd5a476)
2018-11-02 10:25:01 +01:00
Michael Raskin
9660896ecd Merge pull request #49563 from zarelit/ntp_upstream_patch_bp
[18.09] ntp: fix ntpd shutdown by using upstream patch
2018-11-02 08:11:44 +00:00
Periklis Tsirakidis
4292214c0a uriparser: 0.8.6 -> 0.9.0
(cherry picked from commit 2783ca5de4)
Reason: Provides security fixes for the 0.8.x branch.
2018-11-02 08:22:15 +01:00
Periklis Tsirakidis
ff43959e75 gtest: Use native cmake/ninja builder
Clean up the expression and add pkgconfig support

(cherry picked from commit 9ac64e5bb6)
Reason: Pre-Requisite to backport uriparser 0.9.0, which patches
security issues of the 0.8.x branch.
2018-11-02 08:21:33 +01:00
R. RyanTM
d97645057f gmock: 1.8.0 -> 1.8.1 (#46273)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
gtest

(cherry picked from commit 9cfbcc28d0)
Reason: Pre-Requisite to backport uriparser 0.9.0, which patches
security issues of the 0.8.x branch.
2018-11-02 08:20:43 +01:00
Franz Pletz
f71cc5f744 strongswan: patch CVE-2018-16151 & CVE-2018-16152 2018-11-02 03:14:18 +01:00
R. RyanTM
a9c8e66bde wireshark: 2.6.3 -> 2.6.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wireshark-qt/versions

(cherry picked from commit 77d29e5f06)

Security fixes: https://www.wireshark.org/docs/relnotes/wireshark-2.6.4.html
2018-11-02 03:00:53 +01:00
Will Dietz
a57d03fcc3 teeworlds: 0.6.4 -> 0.6.5
This release adds support for building with cmake!
So switch to that eagerly instead of fighting with bam.

(if nothing else cmake is the devil we know...)

Also:

* fixup 'DATA_DIR' so programs can find resources
  (without need for wrappers)
* install readme+license as previously done ("docs")
* don't install tools since not built or installed by default
  * esp since doesn't appear to have non-adhoc method for installation
  * other distros don't seem to include

(cherry picked from commit 18258bae34)

Fixes CVE-2018-18541.
2018-11-02 02:49:23 +01:00
Franz Pletz
16087d8836 tomcat_connectors: 1.2.41-dev-1613051 -> 1.2.46
Fixes CVE-2018-11759, CVE-2018-1323, CVE-2016-6808.

(cherry picked from commit 9fe0e57d9d)
2018-11-01 22:38:11 +01:00
Uli Baum
394ca68424 Revert "virtualgl-lib: fix broken startup script (#49185)"
This reverts commit c341f56928.

See #49611.
2018-11-01 22:08:13 +01:00
Franz Pletz
23218a80a3 icecast: 2.4.3 -> 2.4.4
Fixes CVE-2018-18820.

(cherry picked from commit 24d6c0dbde)
2018-11-01 21:49:58 +01:00
John Ericson
d9934979f0 Merge pull request #49566 from obsidiansystems/release-lib-cleanup
release-lib: Cache cross nixpkgs evals too, and other fixes, for 18.09
2018-11-01 16:46:22 -04:00
Trolli Schmittlauch
18d3332147 vim-plugins: add jedi-vim plugin
This plugin needs python3 support in vim, but no other addon seems to
care about verifying that vim is built accordingly, so I don't do that
as well.
2018-11-01 15:24:20 +01:00
Franz Pletz
d1de23b830 systemd: 239 -> 239.20181031
Fixes CVE-2018-15688 and updates latest upstream stable v239 branch.

See https://github.com/NixOS/systemd/pull/24 for details.

Co-authored-by: Andreas Rammhold <andreas@rammhold.de>
(cherry picked from commit a7912ecc85)
2018-11-01 11:25:59 +01:00
Tristan Helmich (omniIT)
b1e74c01f6 sc-controller: 0.4.4 -> 0.4.5
(cherry picked from commit 0459a8c8db)
Backport of #49543
2018-11-01 09:32:16 +01:00
John Ericson
89fb76c51c Merge pull request #49568 from obsidiansystems/arm-auto-detect
lib.systems.platforms: Add more ARM autodetection for 18.09
2018-10-31 21:21:30 -04:00
David Costa
3f06ebf426 ntp: fix ntpd shutdown by using upstream patch
After a series of amendments the seccomp.patch made ntpd work properly
but only on 32-bit systems.
This commit replaces that patch with the one submitted upstream by
cleverca22 and that fixes the issue also on 64-bit systems.

Close #38627, #45885

(cherry picked from commit 6759b7900e)
2018-10-31 23:13:15 +00:00
Timon Stampfli
1f4c8583ea openjpeg: adding patch for CVE-2018-7648 2018-10-31 20:33:18 +01:00
R. RyanTM
c7dc8ec572 riot-web: 0.16.2 -> 0.16.5
(cherry picked from commit 34e8009dcb)
2018-10-31 16:49:08 +01:00
R. RyanTM
65e85c8e5b riot-web: 0.16.0 -> 0.16.2 (#46190)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
riot-web

(cherry picked from commit 57062f9072)
2018-10-31 16:49:08 +01:00
Thilo Uttendorfer
85ad2d0b02 nginxMainline: 1.15.3 -> 1.15.5 (#48127)
(cherry picked from commit 205b3d94e1)
2018-10-31 16:49:08 +01:00
Timo Kaufmann
47c4afa2a6 Merge pull request #49523 from timokau/youtube-dl-backport
youtube-dl: backports
2018-10-31 15:58:57 +01:00
Jörg Thalheim
ea30555a03 Revert "tinc: remove unnecessary networking.interfaces"
This reverts commit cde886e7c6.
This broke users using networking.interfaces since the interface
is not up when configuring addresses: https://github.com/NixOS/nixpkgs/issues/27070#issuecomment-434704624
2018-10-31 14:33:15 +00:00
Timo Kaufmann
3592ebe5f2 youtube-dl: 2018.10.05 -> 2018.10.29
(cherry picked from commit 6ff17834db)
2018-10-31 14:42:00 +01:00
Philip Nelson
9e41ec1fdb youtube-dl: 2018.09.26 -> 2018.10.05 (#47940)
(cherry picked from commit 3a0fbe3cbe)
2018-10-31 14:38:59 +01:00
nyanloutre
dbc3b8de4f youtube-dl: 2018.09.18 -> 2018.09.26
(cherry picked from commit 967baedc2a)
2018-10-31 14:38:51 +01:00
Valentin Heidelberger
ebd4599259 youtube-dl: 2018.09.10 -> 2018.09.18 (#47151)
(cherry picked from commit 4a68689bb4)
2018-10-31 14:38:39 +01:00
AndersonTorres
b4fc0d9118 youtube-dl: 2018.08.04 -> 2018.09.10
(cherry picked from commit 74047ea686)
2018-10-31 14:38:21 +01:00
Edmund Wu
bdfaa0a4d8 vscode-extensions.ms-vscode.cpptools: update build (#48850)
(cherry picked from commit e96d14d177)
2018-10-30 21:19:40 +00:00
Ioannis Koutras
1a4a9da49e lxd: 3.0.0 -> 3.0.2
(cherry picked from commit ab62fe9108)
2018-10-30 23:06:24 +02:00
Ioannis Koutras
94ffbb5a4a dqlite: initialize at 0.2.4
(cherry picked from commit 891277e6a9)
2018-10-30 23:06:23 +02:00
Ioannis Koutras
1bbe592f5b sqlite-replication: initialize at 3.24.0+replication3
(cherry picked from commit bf39304e53)
2018-10-30 23:06:23 +02:00
Michael Weiss
75836e72fd Merge pull request #49482 from primeos/signal-desktop-backport
[18.09] Backport signal-desktop

Reason: The current version (1.15.5) will expire soon (2018-11-14).
2018-10-30 20:46:39 +01:00
John Ericson
5fe3360114 Merge pull request #49479 from obsidiansystems/haskell-shell-completions
haskell-lib: Factor out shell completion scripts helper for 18.09
2018-10-30 15:25:06 -04:00
Michael Weiss
ffebc0bfd0 signal-desktop: 1.17.1 -> 1.17.2
(cherry picked from commit 46f5debb94)
2018-10-30 20:11:20 +01:00
Michael Weiss
f3d906c66b signal-desktop: 1.17.0 -> 1.17.1
(cherry picked from commit 6021a94062)
2018-10-30 20:11:20 +01:00
Michael Weiss
95a7e4912f signal-desktop: 1.16.3 -> 1.17.0
(cherry picked from commit f346289ea6)
2018-10-30 20:11:19 +01:00
Michael Weiss
18766e3fb2 signal-desktop: 1.16.2 -> 1.16.3
(cherry picked from commit 5edc1dd7a8)
2018-10-30 20:11:19 +01:00
tobiasBora
73a1b48f64 signal-desktop: enable notifications
(cherry picked from commit 820e1caf86)
2018-10-30 20:11:19 +01:00
Michael Weiss
2cbe9f990c signal-desktop: 1.16.1 -> 1.16.2
(cherry picked from commit a526719184)
2018-10-30 20:11:19 +01:00
Michael Weiss
21e9b2e499 signal-desktop: 1.16.0 -> 1.16.1
(cherry picked from commit 3410dcd90e)
2018-10-30 20:11:19 +01:00
Michael Weiss
8558acb575 signal-desktop: 1.15.5 -> 1.16.0
(cherry picked from commit 7c1b85cf6d)
2018-10-30 20:11:18 +01:00
adisbladis
65852ff2f8 firefox-beta-bin: 62.0b20 -> 64.0b5 2018-10-30 18:37:03 +00:00
adisbladis
f724b7ab8b firefox-devedition-bin: 62.0b20 -> 64.0b5 2018-10-30 18:36:09 +00:00
markuskowa
c341f56928 virtualgl-lib: fix broken startup script (#49185)
Replace /bin/sh with bash in vglrun.
'exec' fails with /bin/sh

(cherry picked from commit efd3f8b57f)
2018-10-30 16:19:25 +01:00
Eelco Dolstra
47ae5861de nixUnstable: 2.2pre6520_18b4c53f -> 2.2pre6526_9f99d624
(cherry picked from commit 81b2bfaf36)
2018-10-30 16:17:42 +01:00
Shea Levy
cbffbb1bae nixUnstable: 2.1pre6377_954d1f4d -> 2.2pre6520_18b4c53f
(cherry picked from commit bd7e0aec71)
2018-10-30 16:17:38 +01:00
Lassulus
f4deae935d nixos/bitlbee: use purple-2 as purple_plugin_path (#49440)
(cherry picked from commit 334dd6f964)
2018-10-30 15:39:28 +01:00
volth
c42d8f770d [cpan2nix] perlPackages.NetAmazonS3: 0.84 -> 0.85
dependencies:
perlPackages.TestLoadAllModules: init at 0.022

(cherry picked from commit f32975e3fd)
2018-10-30 15:04:05 +01:00
Jörg Thalheim
1855a92cea SenchaCmd: 6.5.3.6 -> 6.6.0.13
This package is internally used by rambox

(cherry picked from commit 9d9f7d27a1)
2018-10-30 13:33:07 +00:00
Jörg Thalheim
0cfdeb3baf rambox: fix crash when native filesystem dialogs are created
(cherry picked from commit ac8acb283c)
2018-10-30 13:33:07 +00:00
Jaka Hudoklin
f62293e343 google-cloud-sdk: 215.0.0 -> 222.0.0
(cherry picked from commit 7df72ad928)
2018-10-30 10:38:14 +00:00
Moritz Ulrich
6e5f7e6c3a google-cloud-sdk: 206.0.0 -> 215.0.0
(cherry picked from commit d710765f52)
2018-10-30 10:38:14 +00:00
Eric Wolf
227cf39e0c nixos/release-notes for 18.09: fix missing entry
- the addition of the groups kvm and render breaks the configuration of
   users, which added them

(cherry picked from commit 30d2792091)
2018-10-30 10:23:44 +00:00
Stefan Siegl
960c147321 tomboy: build against mono 5, refs #49369
(cherry picked from commit 74cfbd63e1)
2018-10-30 10:17:12 +00:00
David Costa
af7d54e972 crystal: fix "play" subcommand (#49422)
(backport of commit 473c890034)
2018-10-30 00:36:48 +01:00
R. RyanTM
68cf714d23 matomo: 3.6.0 -> 3.6.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/matomo/versions

(cherry picked from commit d4029e7935)
2018-10-30 00:17:04 +01:00
Robin Gloster
bf392fec56 gitlab: 11.4.0 -> 11.4.3
(cherry picked from commit 3aec530964)
2018-10-29 20:42:50 +01:00
R. RyanTM
d5814e22dc clamav: 0.100.1 -> 0.100.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/clamav/versions

(cherry picked from commit b249bcc7b4)
2018-10-29 18:05:30 +01:00
Florian Klink
ec6af332b4 Merge pull request #49240 from flokli/layered-docker-images-18.09
[18.09] layered docker images
2018-10-29 14:25:08 +00:00
Vincent Ambo
acb1efb8d7 lib/options: Update documentation comments for docs generation
Documents functions in `lib.options` for docs generation with nixdoc.

The formatting change in the `mkOption` arguments is due to the way
`nixdoc` parses documentation comments on pattern arguments. It's not
ideal, but it works.
2018-10-29 12:38:30 +01:00
Vincent Ambo
a53c60db51 lib/debug: Update documentation comments for docs generation
Documents functions in `lib.debug` for docs generation with nixdoc.

Note that type signatures and clearer descriptions are still missing
on some of these functions, but this is good enough for a first run.
2018-10-29 12:32:35 +01:00
Vincent Ambo
20d8273eb7 lib/lists: Update documentation comments for doc generation
Updates documentation comments with extra information for nixdoc[1]
compatibility.

[1]: https://github.com/tazjin/nixdoc
2018-10-29 12:32:30 +01:00
Vincent Ambo
34cd613eaf lib/strings: Update documentation comments for doc generation
Updates documentation comments with extra information for nixdoc[1]
compatibility.

Some documentation strings have additionally been reworded for
clarity.

"Faux types" are added where applicable, but some functions do things
that are not trivially representable in the type notation used so they
were ignored for this purpose.

[1]: https://github.com/tazjin/nixdoc
2018-10-29 12:32:26 +01:00
Vincent Ambo
09772db18f lib/trivial: Update function comments for doc generation
Expands on some of the function comments and add some of the
special syntaxes recognised by nixdoc.
2018-10-29 12:32:22 +01:00
Alyssa Ross
74fe437075 bb: add Darwin compatibility
It even has working sound, unlike on Linux!

(cherry picked from commit c49aa0d0df)
2018-10-29 11:22:21 +00:00
Alyssa Ross
dc98e149d0 libmikmod: remove duplicate libpulseaudio dep
This is already included as a propagatedBuildInput, so no need to have
it also be a buildInput.

(cherry picked from commit 4807e04283)
2018-10-29 11:22:11 +00:00
Limbo Peng
32c258d1f7 httping: add libintl to buildInputs on Darwin (#48188)
* httping: add libintl to buildInputs on Darwin

Otherwise it won't compile.

* httping: fix URLs

(cherry picked from commit 9f8b40c2de)
2018-10-29 11:19:04 +00:00
Tobias Pflug
5e5252c5a8 bats: add missing grep dependency
(cherry picked from commit 8284f09dcd)
2018-10-29 11:17:01 +00:00
Daiderd Jordan
38e4922373 loc: enable darwin build
It works fine there and probably other unix platforms.

(cherry picked from commit 561fb30ac6)
2018-10-29 11:13:56 +00:00
Daiderd Jordan
6092f3e87e yarn: add platforms (#48912)
(cherry picked from commit d0544a355b)
2018-10-29 11:10:23 +00:00
Timo Kaufmann
8126ce7e45 Merge pull request #49249 from timokau/sage-fix-attrname-18.09
sage: fix attrname, add sagemath alias (18.09)
2018-10-29 10:08:04 +01:00
Jörg Thalheim
c05b365541 mono44: mark as insecure 2018-10-28 23:01:17 +00:00
aki-ks
186adedc6f jetbrains.idea-ultimate: 2018.2.4 -> 2018.2.5 2018-10-28 22:28:58 +00:00
aki-ks
b582c29032 jetbrains.idea-community: 2018.2.4 -> 2018.2.5 2018-10-28 22:28:52 +00:00
Edward Tjörnhammar
381a6a9bb9 jetbrains.pycharm-professional: 2018.2.3 -> 2018.2.4
(cherry picked from commit f9c4a74b73)
2018-10-28 22:27:37 +00:00
Edward Tjörnhammar
9200307e02 jetbrains.pycharm-community: 2018.2.3 -> 2018.2.4
(cherry picked from commit feb57bc9b9)
2018-10-28 22:27:32 +00:00
Edward Tjörnhammar
2852b60839 jetbrains.goland: 2018.2.2 -> 2018.2.3
(cherry picked from commit 546dfb51a6)
2018-10-28 22:27:28 +00:00
Edmund Wu
f237eaf83d jetbrains.webstorm: 2018.2.2 -> 2018.2.3
(cherry picked from commit 4b1e3376d1)
2018-10-28 22:27:23 +00:00
Edmund Wu
c144876ecb jetbrains.ruby-mine: 2018.2.1 -> 2018.2.2
(cherry picked from commit 9b69a2520a)
2018-10-28 22:27:17 +00:00
Edmund Wu
97ae532b92 jetbrains.rider: 2018.2 -> 2018.2.3
(cherry picked from commit 88692dd376)
2018-10-28 22:26:31 +00:00
Edmund Wu
a156a78af6 jetbrains.pycharm-professional: 2018.2.2 -> 2018.2.3
(cherry picked from commit 3bc77e5977)
2018-10-28 22:26:24 +00:00
Edmund Wu
56579fd8e9 jetbrains.pycharm-community: 2018.2.2 -> 2018.2.3
(cherry picked from commit b30e64bb8a)
2018-10-28 22:26:20 +00:00
Edmund Wu
3d950f0502 jetbrains.phpstorm: 2018.2.2 -> 2018.2.3
(cherry picked from commit 6f78c882da)
2018-10-28 22:26:16 +00:00
Edmund Wu
9c1347c08b jetbrains.idea-ultimate: 2018.2.2 -> 2018.2.4
(cherry picked from commit 7ce6836e95)
2018-10-28 22:26:12 +00:00
Edmund Wu
d291ab8993 jetbrains.idea-community: 2018.2.2 -> 2018.2.4
(cherry picked from commit e2ff1bceb3)
2018-10-28 22:26:08 +00:00
Edmund Wu
388622dcc5 jetbrains.goland: 2018.2.1 -> 2018.2.2
(cherry picked from commit 397215b8b6)
2018-10-28 22:26:04 +00:00
Edmund Wu
f3d84b108c jetbrains.datagrip: 2018.2.2 -> 2018.2.4
(cherry picked from commit 0174f259ac)
2018-10-28 22:25:58 +00:00
Edmund Wu
0e85365ae9 jetbrains.clion: 2018.2.2 -> 2018.2.4
(cherry picked from commit 98fe28e5ab)
2018-10-28 22:25:52 +00:00
Silvan Mosberger
b8fc97b9e4 Merge pull request #49363 from nyanloutre/steam-update-18-09
[18.09] Steam update
2018-10-28 22:12:11 +01:00
Patrick Hilhorst
21286962a7 steam: ran update-runtime.py
(cherry picked from commit 714b6e3d17)
2018-10-28 22:04:04 +01:00
Patrick Hilhorst
29247ba14f steam: made update-runtime.py nicer
(cherry picked from commit 7c2b6b0afe)
2018-10-28 22:04:03 +01:00
Jörg Thalheim
894dc671df Merge pull request #49357 from Mic92/plasma-backport
nixos/plasma5: disable ocr tests
2018-10-28 20:34:32 +00:00
Silvan Mosberger
a6d1dcfc34 Merge pull request #49335 from bjpbakker/release-18.09
[18.09] xorg.xf86videovmware: fix for GFX support
2018-10-28 21:05:38 +01:00
Jörg Thalheim
708bdc99e1 nixos/plasma5: disable ocr tests
This is brittle and breaks the test
2018-10-28 19:59:52 +00:00
Sarah Brofeldt
8fa0017d04 Merge pull request #49297 from johanot/kubernetes-1.11.4
kubernetes: 1.11.3 -> 1.11.4
2018-10-28 16:16:38 +01:00
Bart Bakker
1264470950 xorg.xf86videovmware: fix for GFX support
Fix the mesa dependency for `xorg.xf86videovmware`. Add `llvm_6` because
`mesa_noglu` has a runtime dependency on clang (see TODO in
`development/libraries/mesa`).
2018-10-28 12:29:17 +01:00
Renaud
09740d8404 installation-device: set GC initial heap size to 1MB
100000 (100kB) is too aggressive (too low) and gets ignored by the GC
Fixes #43339
2018-10-28 11:18:43 +01:00
Timo Kaufmann
d9e7a831f8 sage: add sagemath alias
Sage is commonly referred to as sagemath (probably to improve
searchability). Many other distors call their package sagemath.

(cherry picked from commit 80833d13fe)
2018-10-27 14:19:15 +02:00
Timo Kaufmann
66d8fd1fda sage: fix attrname
This is a minimal change mainly to make sure repology recognizes this
package as sage. I plan a bit more refactoring later, but this is
intentionally kept minimally invasive so that it won't break anything
and can be backported to 18.09.

(cherry picked from commit 2513747356)
2018-10-27 14:19:07 +02:00
Renaud
76ec0982ae Merge pull request #49117 from alexeymuranov/update-flatpak-in-18.09
[18.09] flatpak: 1.0.2 -> 1.0.4 (cherry-picked from master)
2018-10-27 13:54:08 +02:00
R. RyanTM
9d07f7f098 lighttpd: 1.4.50 -> 1.4.51 (#49238)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lighttpd/versions

(cherry picked from commit 5bccc53a50)
2018-10-27 13:30:44 +02:00
Franz Pletz
f5fcdf5530 Merge pull request #49233 from ciil/jira-update-18.09
atlassian-jira: 7.12.1 -> 7.12.3 (18.09)
2018-10-27 11:13:42 +00:00
Graham Christensen
5a4f3306b8 dockerTools: test buildLayeredImage
(cherry picked from commit fb2d153dac)
2018-10-27 12:04:04 +01:00
Graham Christensen
fbb61c14a2 dockerTools.buildLayeredImage: init
Create a many-layered Docker Image.

Implements much less than buildImage:

 - Doesn't support specific uids/gids
 - Doesn't support runninng commands after building
 - Doesn't require qemu
 - Doesn't create mutable copies of the files in the path
 - Doesn't support parent images

If you want those feature, I recommend using buildLayeredImage as an
input to buildImage.

Notably, it does support:

 - Caching low level, common paths based on a graph traversial
   algorithm, see referencesByPopularity in
   0a80233487993256e811f566b1c80a40394c03d6
 - Configurable number of layers. If you're not using AUFS or not
   extending the image, you can specify a larger number of layers at
   build time:

       pkgs.dockerTools.buildLayeredImage {
         name = "hello";
         maxLayers = 128;
         config.Cmd = [ "${pkgs.gitFull}/bin/git" ];
       };

 - Parallelized creation of the layers, improving build speed.
 - The contents of the image includes the closure of the configuration,
   so you don't have to specify paths in contents and config.

   With buildImage, paths referred to by the config were not included
   automatically in the image. Thus, if you wanted to call Git, you
   had to specify it twice:

       pkgs.dockerTools.buildImage {
         name = "hello";
         contents = [ pkgs.gitFull ];
         config.Cmd = [ "${pkgs.gitFull}/bin/git" ];
       };

   buildLayeredImage on the other hand includes the runtime closure of
   the config when calculating the contents of the image:

       pkgs.dockerTools.buildImage {
         name = "hello";
         config.Cmd = [ "${pkgs.gitFull}/bin/git" ];
       };

Minor Problems

 - If any of the store paths change, every layer will be rebuilt in
   the nix-build. However, beacuse the layers are bit-for-bit
   reproducable, when these images are loaded in to Docker they will
   match existing layers and not be imported or uploaded twice.

Common Questions

 - Aren't Docker layers ordered?

   No. People who have used a Dockerfile before assume Docker's
   Layers are inherently ordered. However, this is not true -- Docker
   layers are content-addressable and are not explicitly layered until
   they are composed in to an Image.

 - What happens if I have more than maxLayers of store paths?

   The first (maxLayers-2) most "popular" paths will have their own
   individual layers, then layer #(maxLayers-1) will contain all the
   remaining "unpopular" paths, and finally layer #(maxLayers) will
   contain the Image configuration.

(cherry picked from commit 4fe9006190)
(cherry picked from commit d1e46df24b)
2018-10-27 12:03:38 +01:00
Graham Christensen
61b4fa9ad9 referencesByPopularity: init to sort packages by a cachability heuristic
Using a simple algorithm, convert the references to a path in to a
sorted list of dependent paths based on how often they're referenced
and how deep in the tree they live. Equally-"popular" paths are then
sorted by name.

The existing writeReferencesToFile prints the paths in a simple
ascii-based sorting of the paths.

Sorting the paths by graph improves the chances that the difference
between two builds appear near the end of the list, instead of near
the beginning. This makes a difference for Nix builds which export a
closure for another program to consume, if that program implements its
own level of binary diffing.

For an example, Docker Images. If each store path is a separate layer
then Docker Images can be very efficiently transfered between systems,
and we get very good cache reuse between images built with the same
version of Nixpkgs. However, since Docker only reliably supports a
small number of layers (42) it is important to pick the individual
layers carefully. By storing very popular store paths in the first 40
layers, we improve the chances that the next Docker image will share
many of those layers.*

Given the dependency tree:

    A - B - C - D -\
     \   \   \      \
      \   \   \      \
       \   \ - E ---- F
        \- G

Nodes which have multiple references are duplicated:

    A - B - C - D - F
     \   \   \
      \   \   \- E - F
       \   \
        \   \- E - F
         \
          \- G

Each leaf node is now replaced by a counter defaulted to 1:

    A - B - C - D - (F:1)
     \   \   \
      \   \   \- E - (F:1)
       \   \
        \   \- E - (F:1)
         \
          \- (G:1)

Then each leaf counter is merged with its parent node, replacing the
parent node with a counter of 1, and each existing counter being
incremented by 1. That is to say `- D - (F:1)` becomes `- (D:1, F:2)`:

    A - B - C - (D:1, F:2)
     \   \   \
      \   \   \- (E:1, F:2)
       \   \
        \   \- (E:1, F:2)
         \
          \- (G:1)

Then each leaf counter is merged with its parent node again, merging
any counters, then incrementing each:

    A - B - (C:1, D:2, E:2, F:5)
     \   \
      \   \- (E:1, F:2)
       \
        \- (G:1)

And again:

    A - (B:1, C:2, D:3, E:4, F:8)
     \
      \- (G:1)

And again:

    (A:1, B:2, C:3, D:4, E:5, F:9, G:2)

and then paths have the following "popularity":

    A     1
    B     2
    C     3
    D     4
    E     5
    F     9
    G     2

and the popularity contest would result in the paths being printed as:

    F
    E
    D
    C
    B
    G
    A

* Note: People who have used a Dockerfile before assume Docker's
Layers are inherently ordered. However, this is not true -- Docker
layers are content-addressable and are not explicitly layered until
they are composed in to an Image.

(cherry picked from commit fd045173ce)
2018-10-27 11:57:35 +01:00
Graham Christensen
607e6140cd dockertools: tarsum: turn in to a buildInput
(cherry picked from commit 2bf0ee3b2b)
2018-10-27 11:57:28 +01:00
Andreas Rammhold
73a4857dc0 Merge pull request #49186 from andir/18.09/mosquitto
[18.09] mosquitto: 1.4.15 -> 1.5.3
2018-10-27 12:17:25 +02:00
Simon Lackerbauer
5be1827afe atlassian-jira: 7.12.1 -> 7.12.3
(cherry picked from commit 50abe602b1)
2018-10-27 11:50:38 +02:00
Bas van Dijk
cbcd5aa085 Merge pull request #48155 from ElvishJerricco/fix/haskell/shellFor/18.09
Backport #46453
2018-10-27 10:03:47 +01:00
Dmitry Kalinkin
6b60c067e1 pythonPackages.pyarrow: fix running tests on hydra
This replaces standard checkPhase using setup.py that uses pytest-runner
with an explicit call to pytest. One reason to do that is because
setup.py triggers another rebuild when asked to do "test". Another
reason is that there seems to be a conflict between possible imports for
pyarrow: `pwd`/pyarrow vs $out/pyarrow. By some unknown reason this
triggers an import error on hydra and ofborg, but not on my machine. The
solution here is to remove `pwd`/pyarrow, keep the tests and use direct
call to pytest (setup.py needs `pwd`/pyarrow). The added benefit is that
we are now testing what is installed in $out.

(cherry picked from commit 6ae3cb4d36)
2018-10-27 10:32:43 +02:00
Silvan Mosberger
9551f011b7 Merge pull request #49156 from 1000101/backport-release-18.09
[18.09] nixos/trezord: revised and updated udev rules
2018-10-27 01:19:15 +02:00
Johan Thomsen
6129945d89 kubernetes: 1.11.3 -> 1.11.4 2018-10-26 17:13:04 +01:00
Ján Hrnko
3c1ca59be7 nixos/trezord: revised and updated udev rules
(cherry picked from commit a88e0ef9aa)
2018-10-26 16:05:42 +02:00
Peter Hoeg
3581f5bfd0 mosquitto: 1.4.15 -> 1.5.3
This backport to 18.09 fixes a serious of security related issues in
mosquitto when run as a server.

Use cmake on all platforms instead of only macos.

(cherry picked from commit a45fa35742)
2018-10-26 14:58:26 +02:00
Jörg Thalheim
c2ad4bfbc0 Merge pull request #49099 from Mic92/breakpoint-backport
Backport breakpointHook [18.09]
2018-10-26 12:22:20 +01:00
Jörg Thalheim
fcca8103db doc: extend breakpointHook documentation
(cherry picked from commit 7f80fb2db4)
2018-10-26 11:15:28 +01:00
Robin Gloster
ef1e83d47c gitlab: 11.3.4 -> 11.4.0
(cherry picked from commit 02afda3fd8)
2018-10-26 11:41:28 +02:00
Robin Gloster
551d22e287 gitlab-workhorse: 6.1.1 -> 7.0.0
(cherry picked from commit eb7f8e71ad)
2018-10-26 11:41:28 +02:00
Robin Gloster
c26c4cc166 gitaly: 0.125.0 -> 0.125.1
(cherry picked from commit 1a984ccc4e)
2018-10-26 11:41:27 +02:00
Raphael Borun Das Gupta
61aa2be8ad nixpkgs docs: add missing spaces between words
(cherry picked from commit aa77e3aa4f)
2018-10-26 09:14:15 +01:00
Raphael Borun Das Gupta
7008cd8acd nixpkgs docs: remove spurious ">"
(cherry picked from commit bea0b3021c)
2018-10-26 09:14:14 +01:00
Andreas Rammhold
755108176f Merge pull request #49044 from andir/18.09/firefox
[18.09] firefox{,-bin}: 62.0.3 -> 63.0 & nss: 3.38-> 3.39
2018-10-26 00:55:12 +02:00
Joachim F
7cb7d77830 Merge pull request #49122 from schmittlauch/backport-tbb803
backport tor-browser-bundle-bin: 8.0.2 -> 8.0.3
2018-10-25 21:26:33 +00:00
Will Dietz
9e10ff6216 tor-browser-bundle-bin: 8.0.2 -> 8.0.3
reason: minor security update

https://gitweb.torproject.org/builders/tor-browser-build.git/tree/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=tbb-8.0.3-build1
(cherry picked from commit 8324a938e7)
2018-10-25 22:49:23 +02:00
R. RyanTM
4b180235db flatpak: 1.0.2 -> 1.0.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/flatpak/versions

(cherry picked from commit 825f6210be)
2018-10-25 21:07:15 +02:00
Andreas Rammhold
e428680fb8 Merge pull request #49111 from mayflower/grafana-backport
grafana: 5.2.4 -> 5.3.2
2018-10-25 18:56:11 +02:00
Trolli Schmittlauch
dbc3d6fdd9 clarifying name arg determines vim command name
The `name` arg of `vim_configurable.customize` does not only determine
the package name, but also the name of the command/ executable to be
called.
In my opinion this is not documented properly and finding that out took
me several hours.
2018-10-25 17:51:36 +01:00
Linus Heckemann
30068ec658 Merge pull request #49109 from mayflower/nix-index-backport
nix-index: backport version bump and build fix
2018-10-25 18:48:18 +02:00
Justin Humm
3cf85cfb55 mapmap: mark broken
the mapmap binary segfaults at the moment at master and nixos-18.09. I
will speak with upstream for a fix and mark this broken in the meantime.

(cherry picked from commit 5ab10923d6)
2018-10-25 17:40:21 +01:00
WilliButz
e89bfd37a6 grafana: 5.2.4 -> 5.3.2
(cherry picked from commit e3927861d6)
2018-10-25 17:34:51 +02:00
Daiderd Jordan
fadacd10ab nix-index: fix darwin build
(cherry picked from commit 5c14decaa3)
2018-10-25 17:05:17 +02:00
Moritz Kiefer
540c63691c nix-index: 0.1.1 -> 0.1.2
(cherry picked from commit bd4301a2ae)
2018-10-25 17:05:17 +02:00
Jörg Thalheim
21cf1c4f26 Merge pull request #48984 from timokau/r8168-backport
r8168 backport
2018-10-25 15:04:12 +01:00
Jörg Thalheim
ccd398f2e4 doc/breakpointHook: add documentation
(cherry picked from commit 325a5699cb)
2018-10-25 14:09:35 +01:00
Jörg Thalheim
c80620fc27 breakpointHook: add for debugging failing builds
Usuage: Add breakpointHook to your `buildInputs` like this:

  stdenv.mkDerivation rec {
    # ...
    buildInputs = [ breakpointHook ];
  });

When the build fails as show in this example:

  pkgs.hello.overrideAttrs (old: {
    buildInputs = [ breakpointHook ];
    postPatch = ''
      false
    '';
  });

It will halt execution printing the following message:

build failed in patchPhase with exit code 1
To attach to this build run the following command as root:

   cntr attach -t command cntr-/nix/store/ynyb4n82x2r7sldd58pbb405jdqh5f00-hello-2.10

Installing cntr and running the command will provide shell access to the
build sandbox of failed build:

sudo cntr attach -t command cntr-/nix/store/ynyb4n82x2r7sldd58pbb405jdqh5f00-hello-2.10
WARNING: bad ownership on /nix/var/nix/profiles/per-user/root, should be 1000
[nixbld@localhost:/var/lib/cntr]$

At /var/lib/cntr the sandbox filesystem is mounted. All commands and
files of the system are still accessible within the shell.
To execute commands from the sandbox use the `cntr exec` subcommand.

(cherry picked from commit f10b935f84)
2018-10-25 14:09:34 +01:00
Jörg Thalheim
54dd052e56 cntr: init at 1.2.0
(cherry picked from commit 84e915a779)
2018-10-25 14:09:26 +01:00
Andreas Rammhold
3b4c03a6de firefox-esr: 60.2.2esr -> 60.3.0esr
(cherry picked from commit 3db6ca50ef0ce27b4f9765b783dcc32c0a613a2d)
2018-10-25 14:54:38 +02:00
Andreas Rammhold
e80c1fa3b2 firefox-bin: 62.0.3 -> 63.0
(cherry picked from commit 5137c04770)
2018-10-25 11:12:05 +02:00
Andreas Rammhold
344e66a524 firefox: 62.0.3 -> 63.0
(cherry picked from commit 277da59e47)
2018-10-25 11:12:04 +02:00
Andreas Rammhold
8bdbb8c922 rust_1_29: backport for rust 1.29.1 from unstable
Based on commit aef6830d3e

(cherry picked from commit dc2becf42f)
2018-10-25 11:12:04 +02:00
Vincent Laporte
9d2ff83b03 ocamlPackages.vg: 0.9.0 -> 0.9.1
(cherry picked from commit c640f024dd)
2018-10-25 08:39:17 +02:00
Gabriel Ebner
f5689d5d6b abcde: 2.8.1 -> 2.9.2
Fixes #41789.

(cherry picked from commit 47fb4859a5)
2018-10-24 20:49:19 +02:00
Herwig Hochleitner
a8fe91de2e chromium: 69.0.3497.100 -> 70.0.3538.67
(cherry picked from commit bb03fbc2c8)
2018-10-24 19:44:08 +02:00
volth
2e960de3f4 chromium: propagate stdenv for "chromium.override{ stdenv=gcc8Stdenv; }" (#48615)
(cherry picked from commit 337d140953)
2018-10-24 19:44:08 +02:00
volth
56ea01bc52 chromium 71+: there is no more option 'use_gtk3' (#48595)
(cherry picked from commit d767ba9996)
2018-10-24 19:44:08 +02:00
volth
487192196c chromium 71+: add at-spi2-core dependency (#48594)
(cherry picked from commit d039722d0e)
2018-10-24 19:44:07 +02:00
volth
77ea7d7bd5 chromium: fix aarch64 build (#48586)
* chromium: fix aarch64 build

* chromium: use more stable urls

(cherry picked from commit 0c8cdb53f6)
2018-10-24 19:44:07 +02:00
volth
c09da54fc7 chromium plugins: add meta.platforms (#48495)
to prevent their installation on aarch64

(cherry picked from commit 2ad99a662d)
2018-10-24 19:44:07 +02:00
Andreas Rammhold
e167830504 nss: 3.38 -> 3.39
(cherry picked from commit 8a9b6bc607)
2018-10-24 18:15:29 +02:00
John Ericson
06fb0253af Merge pull request #48931 from obsidiansystems/darwin-to-linux-18.09
misc pkgs: Darwin -> Linux cross compilation for 18.09
2018-10-24 10:37:15 -04:00
Timo Kaufmann
8e9b654643 r8168: init at 8.046.00
(cherry picked from commit c8b5deae19)
2018-10-24 11:50:44 +02:00
John Ericson
0afc9ca7a8 Merge remote-tracking branch 'upstream/release-18.09' into darwin-to-linux-18.09 2018-10-23 23:27:29 -04:00
Daiderd Jordan
87dc3df433 linux-headers: Temporarily avoid mass rebuild
This is only needed for 18.09, not master
2018-10-23 23:27:20 -04:00
Rob Vermaas
df29219f51 opentracing-cpp: fix version in derivation 2018-10-23 18:15:05 +02:00
Rob Vermaas
9d6184f1bc nginx-opentracing: init at 0.7.0 2018-10-23 18:07:45 +02:00
Rob Vermaas
0b695b6682 opentracing-cpp: add meta 2018-10-23 18:01:34 +02:00
Rob Vermaas
f49df04c02 opentracing-cpp: init 1.5.0 2018-10-23 17:56:28 +02:00
Wael Nasreddine
c162a0af64 gocode: 2018-07-27 -> 2018-10-22 (#48832)
github.com/nsf/gocode has also been deprecated in favor of github.com/mdempsky/gocode

(cherry picked from commit cc4b9ef40f)
2018-10-23 12:21:25 +02:00
Jörg Thalheim
1b7e30c79f Merge pull request #48822 from nyanloutre/18-09-jackett-10-365
[18.09] jackett: 0.10.250 -> 0.10.365
2018-10-23 10:43:14 +01:00
Dmitry Kalinkin
694aff67f8 mu: fix build for withMug = true (#48830)
Fixes a following build error:

/nix/store/xxx-binutils-2.30/bin/ld: cannot find -lgstapp-1.0
/nix/store/xxx-binutils-2.30/bin/ld: cannot find -lgstaudio-1.0
/nix/store/xxx-binutils-2.30/bin/ld: cannot find -lgstfft-1.0
/nix/store/xxx-binutils-2.30/bin/ld: cannot find -lgstpbutils-1.0
/nix/store/xxx-binutils-2.30/bin/ld: cannot find -lgstvideo-1.0
/nix/store/xxx-binutils-2.30/bin/ld: cannot find -lgstbase-1.0
/nix/store/xxx-binutils-2.30/bin/ld: cannot find -lgstreamer-1.0

This workaround targets release-18.09 branch and is not needed at master (no
idea why).
2018-10-23 11:38:32 +02:00
nyanloutre
2b4f74612b jackett: update mono version to 5.14
See details here : https://github.com/NixOS/nixpkgs/pull/48821#issuecomment-431837095

(cherry picked from commit 7a44e6e365)
2018-10-23 11:01:38 +02:00
Linus Heckemann
f8d156f44f poezio: 0.11 -> 0.12 2018-10-23 09:33:44 +02:00
Linus Heckemann
af588df938 slixmpp: 1.2.4-post1 -> 1.4.0
(cherry picked from commit ec9d761628)
2018-10-23 09:33:38 +02:00
xeji
f80504e8fd Merge pull request #48150 from Vskilet/release-18.09
[18.09] nixos/emby: use the dataDir option
2018-10-23 00:45:37 +02:00
nyanloutre
25b2aeb9ca jackett: 0.10.304 -> 0.10.365
(cherry picked from commit 896ae4974e)
2018-10-22 23:56:23 +02:00
R. RyanTM
93a57b3d66 jackett: 0.10.258 -> 0.10.304
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jackett/versions

(cherry picked from commit 7f5a809374)
2018-10-22 23:56:23 +02:00
Edward Tjörnhammar
c4cb419081 jackett: 0.10.250 -> 0.10.258
(cherry picked from commit 914c341c6f)
2018-10-22 23:56:22 +02:00
Jörg Thalheim
09bc130c1e Merge pull request #48831 from nyanloutre/18-09-slimserver-fix
[18.09] slimserver: Relax audio scan dependency (#47029)
2018-10-22 22:48:00 +01:00
Drew Hess
be9e927c95 dovecot: dovenull user should have its own group.
Quoting from https://wiki.dovecot.org/UserIds#dovenulluser:

"It should belong to its own private dovenull group where no one else
belongs to..."

(cherry picked from commit fa388534e4)
2018-10-22 22:47:00 +01:00
Philipp Hausmann
e15b5baaef slimserver: Relax audio scan dependency (#47029)
(cherry picked from commit 09df5da98f)
2018-10-22 23:45:18 +02:00
Daniël de Kok
a7325a613e samba4: 4.7.9 -> 4.7.10 (#48787)
Changes: https://www.samba.org/samba/history/samba-4.7.10.html
(cherry picked from commit d620d8fa67)
2018-10-22 15:46:01 +02:00
Clemens Fruhwirth
c00f5672d7 gvfs: Fix-up paths to gio binary 2018-10-22 15:08:04 +02:00
Peter Simons
e05517fb18 ghc: add new 8.4.4 version
(cherry picked from commit 069bf7aee3)
2018-10-21 23:33:26 -04:00
Piotr Bogdan
140867131c debootstrap: fix up paths to {chroot,unshare}, small clean up
Fixes #45915.

(cherry picked from commit be63e30563)
2018-10-21 18:45:31 +01:00
R. RyanTM
5b2a9767c5 debootstrap: 1.0.108 -> 1.0.109
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/debootstrap/versions

(cherry picked from commit 73dbb11a0d)
2018-10-21 18:45:31 +01:00
R. RyanTM
b76a8378ee debootstrap: 1.0.107 -> 1.0.108 (#46294)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/debootstrap/versions

(cherry picked from commit 8955ec6c73)
2018-10-21 18:45:30 +01:00
Jörg Thalheim
d4d4e58e33 Merge pull request #48779 from Ma27/backport-vim-clang-fix
vimPlugins.clang_complete: fix path to libclang.so (backport)
2018-10-21 17:00:35 +01:00
Leon Schuermann
08a0f3fefc nextcloud: 14.0.1 -> 14.0.3
(cherry picked from commit 6d3b54a1e9)
2018-10-21 15:40:40 +02:00
Victor SENE
2026505e5c nixos/nextcloud: add poolConfig option (#48094)
(cherry picked from commit 2dcd512e74)
2018-10-21 15:40:40 +02:00
Florian Klink
2822d45a4e nextcloud: fix sendmail path discovery
(cherry picked from commit 1fd6477b35)
2018-10-21 15:40:40 +02:00
Ruben Maher
dde8fafa69 nextcloud: 13.0.6 -> 14.0.1
(cherry picked from commit e5b3ea56e1)

Co-authored-by: Robin Gloster <mail@glob.in>
2018-10-21 15:40:40 +02:00
Franz Pletz
f1509d8b11 nixos/nextcloud: init
(cherry picked from commit ebd38185c8)

Co-authored-by: Franz Pletz <fpletz@fnordicwalking.de>
Co-authored-by: Robin Gloster <mail@glob.in>
Co-authored-by: Janne Heß <janne@hess.ooo>
Co-authored-by: Florian Klink <flokli@flokli.de>
2018-10-21 15:40:40 +02:00
Maximilian Bosch
5fa7d74d87 vimPlugins.clang_complete: fix path to libclang.so
Same fix as d301d5cb74.

A traditional backport with `git cherry-pick` is impossible as the
override approach for VIM plugins has significantly changed.
2018-10-21 15:12:20 +02:00
Vaskó László
4d9183342b kitty: fix locating libstartup-notification-1
Startup notification doesn't work in recent versions of Kitty:
> Traceback (most recent call last):
>   File "/nix/store/3a3b0xd952gp8jw70k5kh3a4zhgzf0p7-kitty-0.12.3/bin/../lib/kitty/kitty/utils.py", line 216, in init_startup_notification
>     return init_startup_notification_x11(window_handle, startup_id)
>   File "/nix/store/3a3b0xd952gp8jw70k5kh3a4zhgzf0p7-kitty-0.12.3/bin/../lib/kitty/kitty/utils.py", line 201, in init_startup_notification_x11
>     return init_x11_startup_notification(display, window_handle, sid)
> OSError: Failed to load libstartup-notification-1.so with error: libstartup-notification-1.so: cannot open shared object file: No such file or directory

Apparently dispatching of startup notification has been moved to a C
binding in kitty 0.6.0 [1] so the substituion had to be modified to reflect
that. Without this fix Kitty still works except that window managers
which depend on startup notifications to be fired (e.g. Awesome)
cannot apply special placement rules.

The substitution mechanism is also changed to use a patch file to detect
this kind of mistakes in the future.

[1]: b08f4ab593

(cherry picked from commit 1842c4aaa4)
2018-10-20 23:51:41 +01:00
Samuel Dionne-Riel
e76b112853 ruby: 2.5.2 -> 2.5.3
https://www.ruby-lang.org/en/news/2018/10/18/ruby-2-5-3-released/

This release is just for fixing the packaging issue. This release doesn’t
contain any additional bug fixes from 2.5.2.

(cherry picked from commit 87407bc7e8)
2018-10-20 21:25:20 +01:00
Frederik Rietdijk
50a6f2170d python37: 3.7.0 -> 3.7.1
(cherry picked from commit e4d84434a7)
2018-10-20 21:01:37 +02:00
Frederik Rietdijk
8a3e8bd64b python36: 3.6.6 -> 3.6.7
(cherry picked from commit 241bab3a5e)
2018-10-20 21:01:26 +02:00
Frederik Rietdijk
4a4e11f026 Merge staging into release 2018-10-20 21:00:53 +02:00
Ben Wolsieffer
0da77aaaf8 python2Packages.pylint: init at 1.9.2
Backport of pylint 1.9.2, required for older python2.7
(2.x versions of pylint work only with python 3.4+)

(cherry picked from commit 67ea56717a)
2018-10-20 20:49:59 +02:00
Ben Wolsieffer
b33fe1b101 python2Packages.astroid: init at 1.6.5
Older version backported from master, as requirement for pylint 1.9.2

(cherry picked from commit 4f09e05849)
2018-10-20 20:49:59 +02:00
John Ericson
2569506025 Merge pull request #48673 from Ericson2314/xorg-override-18.09
xorg: allow overriding via overrideScope' for 18.09
2018-10-20 13:16:45 -04:00
Jeff Slight
720af0f20f mattermost: 5.3.0 -> 5.4.0
(cherry picked from commit 321b3a224f)
2018-10-20 17:09:43 +01:00
Jeff Slight
bbc3f425e3 mattermost: 5.1.0 -> 5.3.0
(cherry picked from commit 06eeeed171)
2018-10-20 17:09:24 +01:00
Tim Steinbach
b62ae252fd linux: 4.18.15 -> 4.18.16
(cherry picked from commit 154f457bc3)
2018-10-20 11:18:45 -04:00
Tim Steinbach
617448e796 linux: 4.14.77 -> 4.14.78
(cherry picked from commit 719087fb8c)
2018-10-20 11:18:45 -04:00
Tim Steinbach
76408dd069 linux: 4.9.134 -> 4.9.135
(cherry picked from commit 560e61a3fd)
2018-10-20 11:18:44 -04:00
Tim Steinbach
9dec819286 linux: 4.4.161 -> 4.4.162
(cherry picked from commit 218bf14c3e)
2018-10-20 11:18:44 -04:00
Samuel Dionne-Riel
35421cfdf7 Merge pull request #48692 from samueldr/fix/disallow-aliases
Backports misc. fixes for the new ofborg eval time checks
2018-10-19 20:08:51 -04:00
Samuel Dionne-Riel
8713c07ca5 Merge pull request #48636 from samueldr/backport/PR48301
Update Monero for upcoming hard fork (backports #48301)
2018-10-19 20:06:30 -04:00
Tmplt
1b9888aaa0 nixos/compton: fix corrupt colours with Mesa 18 on AMD
On AMD hardware with Mesa 18, compton renders some colours incorrectly
when using the glx backend. This patch sets an environmental variable
for compton so colours are rendered correctly.

Topical bug: <https://bugs.freedesktop.org/show_bug.cgi?id=104597>
2018-10-19 15:42:11 -05:00
gnidorah
d75b725497 kvmgt module: add service restart on failure
(cherry picked from commit a6603fd8a8)
2018-10-19 10:45:31 +01:00
Edmund Wu
69a482f640 vscode: 1.28.0 -> 1.28.2
(cherry picked from commit 8861eca096)
2018-10-19 08:41:11 +01:00
Edmund Wu
a6d64776c0 vscode: 1.27.2 -> 1.28.0
(cherry picked from commit a3962299f1)
2018-10-19 08:40:58 +01:00
Bastian Köcher
d8649a8a68 vscode: 1.26.1 -> 1.27.2 (#47397)
(cherry picked from commit 0d810c5ac4)
2018-10-19 08:40:40 +01:00
Jörg Thalheim
cde886e7c6 tinc: remove unnecessary networking.interfaces
This breaks with networking backends enabled and
also creates large delays on boot when some services depends
on the network target. It is also not really required
because tinc does create those interfaces itself.

fixes #27070

(cherry picked from commit 5a1f0f9aa3)
2018-10-19 08:36:34 +01:00
John Ericson
e23b220a78 Merge remote-tracking branch 'upstream/release-18.09' into xorg-override-18.09 2018-10-19 00:59:22 -04:00
Ryan Mulligan
9dc7c3191a treewide: fix config.allowAliases = false evaluation
(cherry picked from commit f91a79ecc8)

 Conflicts:
	pkgs/misc/vim-plugins/default.nix

That file has NOT been touched in this cherry pick.
2018-10-18 21:10:02 -04:00
Ryan Mulligan
b02c65ab30 treewide: fix allowAliases = false evaluation problems
(cherry picked from commit 856fbc8dba)

 Conflicts:
	pkgs/os-specific/linux/roccat-tools/default.nix

File isn't in release-18.09
2018-10-18 21:06:21 -04:00
Milan Svoboda
9779809e05 wings: fix runtime failure. (#48681)
Erlang/OTP 18 [erts-7.3.1.4] [source] [64-bit] [async-threads:10] [hipe] [kernel-poll:false]

Eshell V7.3.1.4  (abort with ^G)
1>
=ERROR REPORT==== 18-Oct-2018::21:29:53 ===
beam/beam_load.c(1189): Error loading module sdl:
  mandatory chunk of type 'Atom' not found

=ERROR REPORT==== 18-Oct-2018::21:29:53 ===
Loading of /nix/store/qalvdrzjqqm3a8nsavjbhfiv1pzhw82k-esdl-1.3.1/lib/erlang/lib/esdl-1.3.1/ebin/sdl.beam failed: badfile

=ERROR REPORT==== 18-Oct-2018::21:29:53 ===
Error in process <0.35.0> with exit value:
{undef,[{sdl,init,[1048608],[]},
        {wings_init,init,0,[{file,"wings_init.erl"},{line,28}]},
        {wings,init,1,[{file,"wings.erl"},{line,105}]}]}

Fatal internal error - log written to /home/milan/wings_crash.dump

(cherry picked from commit 43fc3bbb62)
2018-10-18 21:43:01 +01:00
Silvan Mosberger
ff2b5ea471 Merge pull request #48619 from Chiiruno/release-18.09
Update bcachefs (cherry pick for 18.09)
2018-10-18 21:21:13 +02:00
John Ericson
318e45d469 Merge remote-tracking branch 'upstream/release-18.09' into xorg-override-18.09 2018-10-18 12:22:44 -04:00
Michael Raitza
cb996fdb60 nixos/openafs: Add defaultText to avoid evaluating packages
(cherry picked from commit 290a7d2ee9)
2018-10-18 16:11:57 +01:00
Michael Raitza
a2927b8477 openafs: 1.6.22.2 -> 1.6.23
Add support for 4.18 kernels.

(cherry picked from commit f8b5b5dcb7)
2018-10-18 16:11:56 +01:00
Michael Raitza
39acfb0591 openafs_1_8: 1.8.0 -> 1.8.2
This release adds support for ARM64.

(cherry picked from commit d37bb7302f)
2018-10-18 16:11:56 +01:00
Michael Raitza
72603fb252 openafs: Align package name with kernel version based on modDirVersion
(cherry picked from commit bf7600d3b5)
2018-10-18 16:11:56 +01:00
zimbatm
2f82603dbd Merge pull request #48650 from marsam/feature/update-ruby
ruby: 2.3.7 -> 2.3.8, 2.4.4 -> 2.4.5, 2.5.1 -> 2.5.2
2018-10-18 16:01:19 +02:00
Tim Steinbach
412c69ea97 linux: 4.18.14 -> 4.18.15
(cherry picked from commit 42cfc436ce)
2018-10-18 08:28:28 -04:00
Tim Steinbach
56dfc9523f linux: 4.14.76 -> 4.14.77
(cherry picked from commit 7abe0e881e)
2018-10-18 08:28:28 -04:00
Tim Steinbach
a3e4021cda linux: 4.9.133 -> 4.9.134
(cherry picked from commit ab8ff7c07c)
2018-10-18 08:28:28 -04:00
Shreyansh Khajanchi
f8847fc824 hugo: apply upstream patch to call rst2html directly on Nix
Initially, rst2html was called via the python interpreter which would
fail if the script was wrapped in a launcher as on NixOS.

(cherry picked from commit d4f88f1d0c)
2018-10-18 12:51:44 +01:00
Mario Rodas
0919505711 pythonPackages.pytest: pathlib2 is only required for python<3.6
(cherry picked from commit 0f26db59ad)
2018-10-18 11:08:01 +02:00
Mario Rodas
50b8c23de8 pythonPackages.pathlib2: remove unnecessary python version check
(cherry picked from commit 0a08d69bf0)
2018-10-18 11:08:01 +02:00
rnhmjoj
499f1c7126 monero-gui: 0.13.0.2 -> 0.13.0.3
(cherry picked from commit e57438faf0)
2018-10-17 22:29:31 -04:00
rnhmjoj
636a47500a monero: 0.13.0.2 -> 0.13.0.3
(cherry picked from commit 8929e036ce)
2018-10-17 22:29:29 -04:00
rnhmjoj
fae2c59469 monero-gui: 0.12.3.0 -> 0.13.0.2
(cherry picked from commit 8e15e9c452)
2018-10-17 22:28:55 -04:00
rnhmjoj
b183e85a77 xmr-stak: 2.4.7 -> 2.5.0
(cherry picked from commit 6dc4ae5eb2)
2018-10-17 22:28:55 -04:00
rnhmjoj
6dda50f242 monero: 0.12.3.0 -> 0.13.0.2
(cherry picked from commit 028164ef05)
2018-10-17 22:28:55 -04:00
rnhmjoj
ea0853e4e0 monero-gui: 0.12.0.0 -> 0.12.3.0
(cherry picked from commit fd95d30609)
2018-10-17 22:28:51 -04:00
rnhmjoj
f430eaafcb monero: 0.12.0.0 -> 0.12.3.0
(cherry picked from commit 90ab6c8400)
2018-10-17 22:28:49 -04:00
Tim Steinbach
81f5c2698a sbt: 1.2.4 -> 1.2.6
(cherry picked from commit b2dabdc697)
2018-10-17 20:48:45 -04:00
Matt McHenry
41905d631f clementine: add gst_plugins to buildInputs so setup hooks work
when the build was refactored in ef5e212d, this was lost.  a4ba8c65
got most of it back, but missed the addition of gst_plugins to
buildInputs.

fixes #39960

(cherry picked from commit 6fcee4e1dd)
Signed-off-by: Maximilian Bosch <maximilian@mbosch.me>
2018-10-18 01:48:35 +02:00
Maximilian Bosch
bfb61a7709 nixos/weechat: add setuid wrapper for `screen' to ensure true multiuser capabilities
Previously you either had to set the setuid bit yourself or workaround
`isSystemUser = true` (for a loginable shell) to access the weechat
screen.

`programs.screen` shouldn't do this by default to avoid taking too much
assumptions about the setup, however `services.weechat` explicitly
requires tihs.

See #45728

(cherry picked from commit 018573b757)
2018-10-17 23:43:46 +02:00
volth
971b5bea49 oraclejdk8: 8u181 -> 8u191 (#48624)
(cherry picked from commit 4035086baf)
Oracle download site provides 8u191 now.
2018-10-17 18:47:42 +02:00
Jörg Thalheim
56915a59ad Merge pull request #48632 from clefru/hostapd-fix-on-18.09
Fix hostapd's place in systemd dependency tree. (#45464)
2018-10-17 16:02:36 +01:00
clefru
20ebe73f91 Fix hostapd's place in systemd dependency tree. (#45464)
* nat/bind/dhcp.service:
  Remove. Those services have nothing to do with a link-level service.

* sys-subsystem-net-devices-${if}.device:
  Add as BindsTo dependency as this will make hostapd stop when the
  device is unplugged.

* network-link-${if}.service:
  Add hostapd as dependency for this service via requiredBy clause,
  so that the network link is only considered to be established
  only after hostapd has started.

* network.target:
  Remove this from wantedBy clause as this is already implied from
  dependencies stacked above hostapd. And if it's not implied than
  starting hostapd is not required for this particular network
  configuration.

(cherry picked from commit 725fcdef3f)
2018-10-17 16:53:49 +02:00
隠岐奈
5f4617cfea bcachefs-tools: 2018-08-22 -> 2018-10-12
(cherry picked from commit 0c4a7a86fd)
2018-10-17 07:03:47 -05:00
隠岐奈
67856c9259 linux_testing_bcachefs: 4.18.2018.09.21 -> 4.18.2018.10.12
(cherry picked from commit d8410167d1)
2018-10-17 07:03:47 -05:00
Anatolii Prylutskyi
ff7413b160 rambox: fix invalid sha256
(cherry picked from commit 4051fc901b)
2018-10-17 09:34:32 +01:00
Tim Steinbach
19ee57bdaf oh-my-zsh: 2018-09-03 -> 2018-09-14
(cherry picked from commit e0a98c5dc0)
2018-10-16 16:51:11 -04:00
Rob Vermaas
3b3a2d30df julia_10: update to 1.0.1 2018-10-16 22:14:16 +02:00
zimbatm
68c70cfe9e terraform-providers.libvirt: fix plugin output (#48577)
Terraform depends on this binary name format to detect the provider
version.

(cherry picked from commit 7786575c6c)
2018-10-16 19:36:35 +02:00
Linus Heckemann
4a748215d1 libssh: 0.7.5 -> 0.7.6
Fixes CVE-2018-10933:

libssh versions 0.6 and above have an authentication bypass
vulnerability in the server code. By presenting the server an
SSH2_MSG_USERAUTH_SUCCESS message in place of the
SSH2_MSG_USERAUTH_REQUEST message which the server would expect to
initiate authentication, the attacker could successfully authentciate
without any credentials.

Source:
https://www.libssh.org/2018/10/16/libssh-0-8-4-and-0-7-6-security-and-bugfix-release/
(cherry picked from commit eca462813d)
2018-10-16 19:09:51 +02:00
Rob Vermaas
71941853a1 nixpart0.blivet: fix reference to selinux python modules 2018-10-16 17:12:05 +02:00
Rob Vermaas
7ceea6f601 blivet: fix reference to selinux python modules 2018-10-16 17:04:43 +02:00
Uli Baum
b97e1dc662 Merge branch 'release-18.09' into staging-18.09 2018-10-16 09:08:25 +02:00
florianjacob
ab27d00f39 mariadb.connector-c: 2.3.6 -> 2.3.7 (#48078)
(cherry picked from commit 98e5a0f9f4)

contains security fix for CVE-2018-3081
2018-10-16 09:05:49 +02:00
José Romildo Malaquias
8fe63a0c1e greybird: remove license cc-by-nc-sa-30 (#46802)
Greybird is dual-licensed as GPLv2 or later and CC-BY-SA 3.0 or later.
The first is free, and the second is unfree in nixpkgs. Currently both
licenses are listed in the package derivation. And nix takes that it is
unfree. If one of the licenses in the list is unfree. nix consider
that the software is unfree. Remove the unfree one.

(cherry picked from commit 1944defa4c)
2018-10-16 08:36:34 +02:00
Sarah Brofeldt
24bab87520 Merge pull request #48486 from srhb/backport-48485
Backport 18.09: haskellPackages.cryptonite: fix for aarch64 and re-enable tests
2018-10-16 00:02:05 +02:00
Drew Hess
67a7354cd5 haskellPackages.cryptonite: fix for aarch64.
This is a cherry-pick from upstream (see
https://github.com/haskell-crypto/cryptonite/issues/234); there has
been no upstream release since the fix was committed.

(cherry picked from commit 321626d5ee)
Backport of #48485
2018-10-15 23:46:26 +02:00
Drew Hess
fbb068dcc4 haskellPackages.cryptonite: re-enable tests.
This has been fixed since cryptonite-0.7:

https://github.com/haskell-crypto/cryptonite/issues/28

cryptonite is also no longer listed in expected-test-failures in
Stackage.

(cherry picked from commit c8a59e8453)
Backport of #48485
2018-10-15 23:46:08 +02:00
Eelco Dolstra
b5380ae736 ec2-amis.nix: Add 18.09 images
(cherry picked from commit 47dfe25e1b)
2018-10-15 22:52:23 +02:00
Wael M. Nasreddine
f935d5ba86 easyrsa: add support for darwin
(cherry picked from commit 1828799f47)
2018-10-15 20:28:18 +02:00
Florian Jacob
38f5b076d7 gitea: 1.5.1 -> 1.5.2
(cherry picked from commit 0a5c7cf512)
2018-10-15 19:58:46 +02:00
Jörg Thalheim
c15e342304 Merge pull request #48469 from Lassulus/df-18.09
[18.09] fix dwarf fortress package
2018-10-15 18:20:41 +01:00
Graham Christensen
1f50fc2bc5 Merge pull request #48468 from Ekleog/release-notes-backport
release-notes/18-09: add licenses marked as unfree
2018-10-15 13:17:24 -04:00
lassulus
12847b9043 dwarf-fortress: fix build error
(cherry picked from commit 0d57159eca)
2018-10-15 17:28:22 +02:00
Morgan Jones
35beccebbf Inline JSON files
(cherry picked from commit 213b5457fc)
2018-10-15 17:28:18 +02:00
Morgan Jones
0f3b98a39c Update twbt to 6.54
(cherry picked from commit 2cd2571edd)
2018-10-15 17:28:14 +02:00
Morgan Jones
982080d18b Use stdenv.mkDerivation for Therapist wrapper
(cherry picked from commit 5f1013d875)
2018-10-15 17:28:11 +02:00
Morgan Jones
811d52713e Fix dangling DFHack "Git:" version text
(cherry picked from commit 870f05c975)
2018-10-15 17:28:07 +02:00
Morgan Jones
99b1a44ab3 Therapist needs to depend on the DF version, since it uses its MD5
(cherry picked from commit fe847fcc92)
2018-10-15 17:28:03 +02:00
Morgan Jones
aa12b85056 Let the user override dfVersion in dwarf-fortress-full
(cherry picked from commit 7a5521537a)
2018-10-15 17:27:59 +02:00
Morgan Jones
5f563479b2 Fix dfhack's Dwarf Fortress MD5 in the correct environment
(cherry picked from commit f14d3b4795)
2018-10-15 17:27:55 +02:00
Morgan Jones
d66a253aad dwarf-fortress: Support multiple unfuck/dfhack/TWBT versions
(cherry picked from commit 4ada74e293)
2018-10-15 17:27:51 +02:00
Aaron VonderHaar
13e6a3e41a elm-format: 0.8.0 -> 0.8.1
(cherry picked from commit 67f58eee5e)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-10-15 16:12:52 +01:00
Léo Gaspard
3b65a51174 release-notes/18-09: add licenses marked as unfree
(cherry picked from commit 2a2c99673b)
2018-10-16 00:07:45 +09:00
Lancelot SIX
c6494972c1 pythonPackages.django_2_1: 2.1.1 -> 2.1.2
See https://docs.djangoproject.com/en/2.1/releases/2.1.2/

(cherry picked from commit 50ad0f2cc7)
2018-10-15 15:09:13 +02:00
Lancelot SIX
145076a41f pythonPackages.django_2_1: 2.0.8 -> 2.0.9
See https://docs.djangoproject.com/en/2.0/releases/2.0.9/

(cherry picked from commit cd902644bf)
2018-10-15 15:08:10 +02:00
Lancelot SIX
7d19c136e9 pythonPackages.django: 1.11.15 -> 1.11.16
See https://docs.djangoproject.com/en/1.11/releases/1.11.16/

(cherry picked from commit 95a040f9b6)
2018-10-15 15:07:31 +02:00
Jörg Thalheim
ae16537bf8 Merge pull request #48437 from rnhmjoj/shell-conduit-backport
haskellPackages.shell-conduit: fix build
2018-10-15 11:02:28 +01:00
rnhmjoj
2334e37f5a haskellPackages.shell-conduit: fix build
(cherry picked from commit 096be6d941)
Reason: the package is broken in NixOS stable.
2018-10-15 11:24:56 +02:00
Samuel Dionne-Riel
c06f5302f6 dbeaver: 5.2.1 -> 5.2.2 (#48442)
(cherry picked from commit 22c12da8aa)
2018-10-15 08:09:55 +02:00
Ambroz Bizjak
195a573cc8 nixos/xserver: Implement configuration of NVIDIA Optimus via PRIME
This adds configuration options which automate the configuration of NVIDIA Optimus using PRIME. This allows using the NVIDIA proprietary driver on Optimus laptops, in order to render using the NVIDIA GPU while outputting to displays connected only to the integrated Intel GPU. It also adds an option for enabling kernel modesetting for the NVIDIA driver (via a kernel command line flag); this is particularly useful together with Optimus/PRIME because it fixes tearing on PRIME-connected screens.

The user still needs to enable the Optimus/PRIME feature and specify the bus IDs of the Intel and NVIDIA GPUs, but this is still much easier for users and more reliable. The implementation handles both the X configuration file as well as getting display managers to run certain necessary `xrandr` commands just after X has started.

Configuration of commands run after X startup is done using a new configuration option `services.xserver.displayManager.setupCommands`. Support for this option is implemented for LightDM, GDM and SDDM; all of these have been tested with this feature including logging into a Plasma session.

Note: support of `setupCommands` for GDM is implemented by making GDM run the session executable via a wrapper; the wrapper will run the `setupCommands` before execing. This seemed like the simplest and most reliable approach, and solves running these commands both for GDM's X server and user X servers (GDM starts separate X servers for itself and user sessions). An alternative approach would be with autostart files but that seems harder to set up and less reliable.

Note that some simple features for X configuration file generation (in `xserver.nix`) are added which are used in the implementation:
- `services.xserver.extraConfig`: Allows adding arbitrary new sections. This is used to add the Device section for the Intel GPU.
- `deviceSection` and `screenSection` within `services.xserver.drivers`. This allows the nvidia configuration module to add additional contents into the `Device` and `Screen` sections of the "nvidia" driver, and not into such sections for other drivers that may be enabled.
2018-10-14 20:06:12 -05:00
Tycho Grouwstra
320499ca33 skypeforlinux: 8.28.0.41 -> 8.32.0.44 (#48391)
* skypeforlinux: 8.28.0.41 -> 8.32.0.44

Fixes 404 on https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_8.28.0.41_amd64.deb, as only [more recent versions](https://repo.skype.com/deb/pool/main/s/skypeforlinux/) are still available, as previously noted at #31047. Avoiding `x.y.76.z` releases as per the comment.

* update sha256

(cherry picked from commit 72128fcd9d)
2018-10-15 01:11:12 +03:00
Jörg Thalheim
9345561c18 rambox: 0.5.17 -> 0.6.1
(cherry picked from commit a25e765dc9)
2018-10-14 20:52:40 +01:00
Tim Steinbach
08005ede0f fail2ban: 0.10.3.1 -> 0.10.4
(cherry picked from commit 2a4bfe20d5aa2709c40f4b1d2bf55b34d3131144)
2018-10-14 10:27:15 -04:00
Jörg Thalheim
970b2937f6 Merge pull request #48377 from bgamari/cross-fixes-for-18.09
Cross fixes for 18.09
2018-10-14 09:10:26 +01:00
volth
eb1dc551af bootStage1: fix cross build (@matthewbauer's solution)
(cherry picked from commit b3dff39105)
2018-10-14 02:03:23 -04:00
volth
e1fbfca6e0 bootStage1: fix cross build
(cherry picked from commit 9dd5dc57a7)
2018-10-14 02:03:18 -04:00
Tim Steinbach
d96c7a3563 linux: 4.18.13 -> 4.18.14
(cherry picked from commit 0ba1f0aa72)
2018-10-13 12:46:01 -04:00
Tim Steinbach
d001ddcdca linux: 4.14.75 -> 4.14.76
(cherry picked from commit 43d8a40653)
2018-10-13 12:46:00 -04:00
Tim Steinbach
766d135c1f linux: 4.9.132 -> 4.9.133
(cherry picked from commit b4d4affe41)
2018-10-13 12:46:00 -04:00
Tim Steinbach
1b3c777a97 linux: 4.4.160 -> 4.4.161
(cherry picked from commit 3ad8afbf3e)
2018-10-13 12:46:00 -04:00
Franz Pletz
aa25fb3de4 wireguard: 0.0.20181006 -> 0.0.20181007
(cherry picked from commit 97d2779059)
2018-10-13 15:49:51 +02:00
Yegor Timoshenko
9787b0c11d wireguard-go: 0.0.20180613 -> 0.0.20181001
(cherry picked from commit fed0a4ec94)
2018-10-13 15:49:45 +02:00
Yegor Timoshenko
ce2715b2f6 wireguard: 0.0.20180925 -> 0.0.20181006
(cherry picked from commit 011a463d17)
2018-10-13 15:49:39 +02:00
Ben Challenor
a95db4c83e jenkins: 2.138.1 -> 2.138.2
(cherry picked from commit 88e7d7b350)
2018-10-13 14:13:01 +02:00
Justin Humm
ae53ed9d36 haskellPackages.arbtt: unbreak with jailbreak
(cherry picked from commit a01cab05c6)
Backport of #48000
2018-10-13 12:52:47 +02:00
Daiderd Jordan
a326dad536 reattach-to-user-namespace: 2.6 -> 2.7
Adds macOS Mojave (10.14) support.

(cherry picked from commit 42088e08b3)
2018-10-13 11:56:45 +02:00
Frederik Rietdijk
1d61c41646 python.pkgs.pip: 18.0 -> 18.1
(cherry picked from commit 474c78a3e5)
2018-10-13 10:35:21 +02:00
Frederik Rietdijk
de7a2df9cf python.pkgs.bootstrapped-pip: update pip, setuptools and wheel
(cherry picked from commit b05a5969fc)
2018-10-13 10:35:13 +02:00
Ben Wolsieffer
6306db4f77 pythonPackages.autobahn: use checkInputs
(cherry picked from commit 1c3f7302fa)
2018-10-13 10:34:36 +02:00
Frederik Rietdijk
c918e051aa pythonPackages.autobahn: run hooks
(cherry picked from commit b75ea627c6)
2018-10-13 10:34:26 +02:00
Frederik Rietdijk
284a1283e7 pythonPackages.pytest.setupHook: run in correct phase
It was reported that the 2nd solution wasn't working as expected because
it was ran in the wrong phase.

This commit creates a new phase, in between the installCheckPhase and distPhase.

(cherry picked from commit 20a4a4b593)
2018-10-13 10:34:04 +02:00
Samuel Dionne-Riel
03bf8cd487 lib/types: enhances separatedString's description
The previous description "string" is misleading in the full options
manual pages; they are actually concatenated strings, with a specific
character.

The empty string version ("types.string") has been special-cased to
provide a better message.

(cherry picked from commit 0808c7cd31)
2018-10-12 19:57:59 -04:00
Alexander V. Nikolaev
29b9fee3fc nixos/rmilter: don't enable by default, if rspamd enabled
(cherry picked from commit b61dd2bcb7)
2018-10-12 23:54:13 +01:00
Graham Christensen
c8342644cf nixpkgs docs: document recursivelyUpdate
(cherry picked from commit 0eb3b93e1a)
2018-10-12 16:55:18 -04:00
Graham Christensen
c30b39cfb1 nixpkgs docs: document recursivelyUpdateUntil
(cherry picked from commit c100a456b1)
2018-10-12 16:55:18 -04:00
Graham Christensen
1682621057 nixpkgs docs: document zipAttrs
(cherry picked from commit 77140a9075)
2018-10-12 16:55:18 -04:00
Graham Christensen
a02495dd47 nixpkgs docs: document zipAttrsWith
(cherry picked from commit 655a5fa8bf)
2018-10-12 16:55:17 -04:00
Graham Christensen
66ce692e62 nixpkgs docs: Clarify zipAttrsWithNames's docs
(cherry picked from commit 4edb31882c)
2018-10-12 16:55:17 -04:00
Graham Christensen
b8f712ef61 nixpkgs docs: document zipAttrsWithNames
(cherry picked from commit 3b3bde463b)
2018-10-12 16:07:14 -04:00
Graham Christensen
8b02f90f3a nixpkgs docs: document optionalAttrs
(cherry picked from commit e0c6981d19)
2018-10-12 16:07:14 -04:00
Graham Christensen
3736fcdc64 nixpkgs docs: document toDerivation
(cherry picked from commit c547c3fe82)
2018-10-12 16:07:13 -04:00
Graham Christensen
1280a227f3 nixpkgs docs: document isDerivation
(cherry picked from commit f85a4ba9c3)
2018-10-12 16:07:13 -04:00
Graham Christensen
16c53e041b nixpkgs docs: document genAttrs
(cherry picked from commit ef05e1057b)
2018-10-12 16:07:13 -04:00
Graham Christensen
27b549342b nixpkgs docs: document mapAttrsRecursiveCond
(cherry picked from commit d664b8f5e3)
2018-10-12 16:07:12 -04:00
Graham Christensen
45dbf83bbc nixpkgs docs: finish up mapAttrsRecursive
(cherry picked from commit e7549b96ad)
2018-10-12 16:07:12 -04:00
Léo Gaspard
14bb2f42bf nheko: mark as insecure (#48281)
The package is no longer maintained and includes potential security
vulnerabilities (a use-after-free and several crashes) that are known
and not fixed in the version present in nixpkgs. They don't look too bad
judging from the trigger vectors mentioned in the changelog, but with
the project going unmaintained one of them becoming a security
vulnerability would likely not be noticed.

(cherry picked from commit ad992cbde1)
2018-10-12 21:29:24 +02:00
Victor SENE
2c5f94b836 nixos/emby : delete programData hardcode in pkg
(cherry picked from commit 751c64754f)
2018-10-12 16:57:01 +02:00
Victor SENE
ec61247898 nixos/emby : use the dataDir option
(cherry picked from commit 7d43e2a861)
2018-10-12 16:57:01 +02:00
nyanloutre
ca20a042cd nixos/emby: fixes binary name change introduced by #47659
(cherry picked from commit bb06b5b442)
2018-10-12 16:57:00 +02:00
nyanloutre
3f8c202c46 emby: move lib to opt
(cherry picked from commit c2e269ea05)
2018-10-12 16:56:59 +02:00
nyanloutre
36f064d341 emby: move usr/lib to lib
(cherry picked from commit 9ec17c6318)
2018-10-12 16:56:59 +02:00
nyanloutre
04d75db258 emby: add sqlite to wrapper
(cherry picked from commit f7a2e2025f)
2018-10-12 16:56:58 +02:00
nyanloutre
ef311d5c76 WIP emby: 3.5.2.0 -> 3.5.3.0
(cherry picked from commit 6e8da1ddf0)
2018-10-12 16:56:58 +02:00
worldofpeace
c2638ddfc9 emby: 3.4.1.0 -> 3.5.2.0
(cherry picked from commit bd02b3352a)
2018-10-12 16:56:57 +02:00
worldofpeace
cfd6ace6bf nixos/emby: ensure plugins are writeable
(cherry picked from commit a16c6d85a1)
2018-10-12 16:56:57 +02:00
Nick Novitski
d308e698f9 fastlane: disable update check
(cherry picked from commit 63ed3c8c5e)
2018-10-12 14:30:19 +01:00
Will Dietz
b72998bbfc chromium: update to 69.0.3497.100 (and others), ran update.sh
(cherry picked from commit ce6db5e36e)
2018-10-12 15:01:06 +02:00
Uli Baum
589d270ce4 nixos/network-interfaces-scripted: fix container networking bug
When a bridge interface was reconfigured, running containers using
this bridge lost connectivity: restarting network-addresses-brN.service
triggered a restart of network-setup.service via a "partOf" relationship
introduced in 07e0c0e0a2.
This in turn restarted brN-netdev.service.
The bridge was thus destroyed and recreated with the same name but a new
interface id, causing attached veth interfaces to lose their connection.

This change removes the "partOf" relationship between
network-setup.service and network-addresses-brN.service for all bridges.

(cherry picked from commit 2742063677)
2018-10-12 10:50:52 +02:00
Periklis Tsirakidis
c0c867ddb7 minikube: bump version 0.29.0 -> 0.30.0
This is a fix release for CVE-2018-1002103. More details in
https://github.com/kubernetes/minikube/issues/3208

(cherry picked from commit e5ee89f758)
Backport of #48256
2018-10-12 10:48:59 +02:00
Vincent Demeester
c0c5ea193f minikube: 0.28.1 -> 0.29.0
Hard-code kubernetes version as the upstream python script is broken/not-up-to-date

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit ba98a7aea1)
Backport of #47765
2018-10-12 10:33:06 +02:00
taku0
3cff2fbc0a oraclejdk: deprecate oraclejdk 10
(cherry picked from commit 628fa1d50f)
2018-10-12 00:06:57 +02:00
Franz Pletz
e6630c9f90 Merge pull request #48237 from andir/18.09/apacheHttpd
[18.09] apacheHttpd: 2.4.34 -> 2.4.35
2018-10-11 21:51:29 +00:00
R. RyanTM
d720d5f697 apacheHttpd: 2.4.34 -> 2.4.35
Picked from master since it fixes CVE-2018-11763 which allows a remote
DoS against a server with HTTP/2 enabled.

Reference: https://lists.apache.org/thread.html/d435b0267a76501b9e06c552b20c887171064cde38e46d678da4d3dd@%3Cannounce.httpd.apache.org%3E

(cherry picked from commit 524c2120f9)
2018-10-11 23:09:10 +02:00
Silvan Mosberger
b97b32cf1d Merge pull request #48227 from Infinisil/issue-46038
[18.09] nix-daemon service: Ensure `ssh` is on PATH. Fixes #46038.
2018-10-11 22:18:15 +02:00
Niklas Hambüchen
6e2c08b68c nix-daemon service: Ensure ssh is on PATH. Fixes #46038.
This fixes a regression introduced in commit
  700e21d6da

nix needs ssh on path for the SSH substituter functionality,
not only the distributed builds functionality.

Signed-off-by: Niklas Hambüchen <mail@nh2.me>
(cherry picked from commit 31919bce6b)
2018-10-11 21:53:00 +02:00
Silvan Mosberger
b91cb0607d Merge pull request #48220 from prusnak/backport_nm_plugins
openvpn plugins: use absolute paths to configuration gui
2018-10-11 20:53:34 +02:00
John Ericson
b413cfd3ff Merge pull request #48221 from obsidiansystems/versatile-__splicedPackages
__splicedPackages: Don't include xorg for 18.09
2018-10-11 13:54:25 -04:00
Michael Raskin
1a75f83903 Merge pull request #48189 from aanderse/redmine
redmine: refactor, cleanup, bug fix, and add functionality
(cherry picked from commit a29603344a)
2018-10-11 20:53:00 +03:00
Symphorien Gibol
a582a32e24 openvpn plugins: use absolute paths to configuration gui
(cherry picked from commit 5bfe8bfcea)
2018-10-11 19:28:02 +02:00
zimbatm
8d9756ef56 vault: 0.11.1 -> 0.11.2
changelog: https://github.com/hashicorp/vault/blob/v0.11.2/CHANGELOG.md
(cherry picked from commit 0bcbb97879)
2018-10-11 18:28:26 +02:00
John Ericson
5fdfc6f4ae Merge pull request #48216 from LumiGuide/fix-overrideScope-warning
lib: fix wording of the `overrideScope` warning
(cherry picked from commit 041119528c)
2018-10-11 12:04:44 -04:00
WilliButz
2cae2b9a84 nixos/tests: add test for prometheus exporters
(cherry picked from commit 0febc64ed1)
2018-10-11 16:00:02 +02:00
WilliButz
7277b1d908 nixos/prometheus-exporters: fix unapplied service config
Prior to this commit, the default values for `Restart`, `PrivateTmp` and
`WorkingDirectory` were falsely ignored.

I also added myself as maintainer.

(cherry picked from commit fbb7e0c82f)
2018-10-11 16:00:01 +02:00
WilliButz
59940fbcd6 nixos/prometheus-varnish-exporter: avoid crash on restart
(cherry picked from commit 24320f4a9e)
2018-10-11 16:00:00 +02:00
Pavol Rusnak
a8ad1fbe92 spotify: fix icon
(cherry picked from commit 33171befdb)
2018-10-11 15:24:26 +02:00
Franz Pletz
6d6bc0a58c equilux-theme: init at 20180927
(cherry picked from commit 6892cbce09)
2018-10-11 14:14:39 +02:00
Franz Pletz
97ba5aac8d xsecurelock: hardcode path to xset
(cherry picked from commit c04e6e04e2)
2018-10-11 14:14:36 +02:00
Jörg Thalheim
85b269a5d5 alacritty: 0.2.0 -> 0.2.1
(cherry picked from commit 3bc454fda7)
2018-10-11 11:14:42 +01:00
Tim Steinbach
42725274ef linux: 4.18.12 -> 4.18.13
(cherry picked from commit cf440dae56)
2018-10-10 19:57:12 -04:00
Tim Steinbach
f5bd6040ee linux: 4.14.74 -> 4.14.75
(cherry picked from commit fab0c8824a)
2018-10-10 19:57:10 -04:00
Tim Steinbach
a3a6780a52 linux: 4.9.131 -> 4.9.132
(cherry picked from commit 8f9743d2b7)
2018-10-10 19:57:07 -04:00
Tim Steinbach
515f4a7522 linux: 4.4.159 -> 4.4.160
(cherry picked from commit 33b68f8768)
2018-10-10 19:57:05 -04:00
xeji
3997e8d617 flashplayer: 31.0.0.108 -> 31.0.0.122 (#48126)
previous version was removed upstream (404)

(cherry picked from commit bde4483d13)
2018-10-10 23:50:09 +02:00
Daniël de Kok
cbf6eede26 resilio-sync: 2.6.0 -> 2.6.1 (#47973)
Changelog: https://help.resilio.com/hc/en-us/articles/206216855-Sync-2-x-change-log
(cherry picked from commit 632ae0502e)
2018-10-10 23:47:38 +02:00
Dmitry Kalinkin
abd6a5bff3 dia: fix on darwin (#48176)
Fixes runtime error:
  GTK+ 2.x symbols detected. Using GTK+ 2.x and GTK+ 3 in the same process is not supported

(cherry picked from commit c047572a17)
2018-10-10 23:21:05 +02:00
Justin Humm
d60bd3f681 ja2-stracciatella: fix build due to #47709 2018-10-10 21:55:45 +02:00
Kristoffer Thømt Ravneberg
71f195761f gitlab-ee: Add ee rubyEnv, fixes regression introduced by 11.3.0 in #45574
(cherry picked from commit 0083ca1266)
2018-10-10 21:41:21 +02:00
Kristoffer Thømt Ravneberg
0d110efa2b gitlab: 11.2.3 -> 11.3.4
(cherry picked from commit d837338d6b)
2018-10-10 21:41:21 +02:00
Kristoffer Thømt Ravneberg
dbd9fed2fb gitlab-workhorse: 6.1.0 -> 6.1.1, make build deterministic
(cherry picked from commit 998d4e4e2c)
2018-10-10 21:41:20 +02:00
Kristoffer Thømt Ravneberg
e86dd58b29 gitaly: 0.117.2 -> 0.120.0
(cherry picked from commit 908a75a3ae)
2018-10-10 21:41:20 +02:00
Andreas Rammhold
c7e72a70f0 Merge pull request #48125 from andir/18.09/net_snmp
[18.09] net_snmp: fix CVE-2018-18065
2018-10-10 21:05:19 +02:00
Justin Humm
5647e9ae4e buildRustPackage: fix regex for separating lib and bin
E.g. exa was wrongly put into /lib, as it matches

  .*.a

but not

  .*\.a

(cherry picked from commit 64d0676fe1)
2018-10-10 19:34:49 +02:00
Silvan Mosberger
2bafa93b75 haskellPackages.*.env: Use shellFor 2018-10-10 08:46:39 -04:00
Silvan Mosberger
08814b72cf haskellPackages.shellFor: Clean and fixup
- Now correctly sets NIX_GHC* env vars
2018-10-10 08:46:39 -04:00
Silvan Mosberger
fdaa426452 haskell.lib.getBuildInputs: Use generic builder passthru to implement 2018-10-10 08:46:39 -04:00
Eelco Dolstra
4dd9cd3f69 libqtav: Reduce closure size from 734 to 457 MiB
(cherry picked from commit cd3a0b7f38)
2018-10-10 13:28:22 +02:00
Eelco Dolstra
f8e3e22055 marble: Add dev output
(cherry picked from commit 13c1f26807)
2018-10-10 13:28:03 +02:00
Eelco Dolstra
a1dc97e7ba digikam: libGLU_combined -> libGL + libGLU
This prevents a runtime dependency on a large number of -dev outputs.

(cherry picked from commit a3382a85b3)
2018-10-10 13:28:00 +02:00
Eelco Dolstra
70647250bb opencv3: Reduce closure size from 520 to 154 MiB
(cherry picked from commit c8a2533516)
2018-10-10 13:27:12 +02:00
Eelco Dolstra
e11239eb6d thunderbird: Remove buildconfig
This reduces the closure size from 1689 MiB to 425 MiB.

(cherry picked from commit 2be42950c3)
2018-10-10 13:26:45 +02:00
Eelco Dolstra
0465040d06 qtgraphicaleffects: Add dev output
This shrank my system closure by about 192 MiB.

(cherry picked from commit 9bbd4f653f)
2018-10-10 13:26:40 +02:00
Eelco Dolstra
fd1e5b2550 lsof: Don't record compiler flags / build kernel
This removed glibc.dev from the closure and improves binary
reproducibility.

(cherry picked from commit 1eff910a15)
2018-10-10 13:26:20 +02:00
Matthew Bauer
1c3945ad25 nfs-utils: properly strip system-generators
nfs-utils had a dependency on gcc through
etc/systemd/system-generators/*-server-generator. It was not stripped
correctly because it’s not in an expected path. This adds it to the
strip list.

(cherry picked from commit 1427c50cea)
2018-10-10 13:25:43 +02:00
Eelco Dolstra
383bbb9626 git: Strip libsecret
This reduces gitFull's closure size from 412 MiB to 271 MiB.

(cherry picked from commit 7b9c4954f2)
2018-10-10 13:25:09 +02:00
Samuel Dionne-Riel
8cfce968b1 nixos/doc: Actually fix partitioning instructions.
The previous tentative to the fix got the order mixed up a bit. This
new fix has been re-verified to get them in the good order as per the
instructions in the following chapters.

(cherry picked from commit 467bec34bb)
2018-10-09 23:02:00 -04:00
lassulus
c93665d440 nixos/gnome3: don't autoenable gdm
This seems to cause problems if people have other display-managers
enabled

(cherry picked from commit 5a752ad879)
2018-10-09 23:31:04 +01:00
Vincent Ambo
59fe4c7f17 journaldriver: 1.0.0 -> 1.1.0 (#48106)
Included changes:

* upstream repository has moved, URLs changed accordingly
* journaldriver bumped to new upstream release

The new release includes an important workaround for an issue that
could cause log-forwarding to fail after service restarts due to
invalid journal cursors being persisted.

(cherry picked from commit 5ead27394d)

backported because of moved upstream repo
2018-10-09 23:46:38 +02:00
Andreas Rammhold
9bf0cd9ccb net_snmp: fix CVE-2018-18065
(cherry picked from commit 2f7c242953)
2018-10-09 23:09:04 +02:00
Gabriel Ebner
de37b4c18c vdirsyncer: fix build
I'm not entirely sure what's going on here.  The exact same code works
on master.
2018-10-09 13:25:11 +02:00
Erlend Pedersen
df6d40feb6 kbd: Rename some keymaps.
From upstream kbd, some keymap names are reused across very different
keyboard layouts. This is a a problem because loadkeys just picks the
first keymap it sees. The clashing names lead to e.g.  "loadkeys no"
defaulting to a norwegian dvorak map instead of the much more common
qwerty one.

Used Arch Linux's list of keymaps that need renaming, with a small
deviation: the norwegian dvorak map becomes dvorak-no instead of
no-dvorak, to match the naming scheme for all the other dvorak maps.

fixes #47878

(cherry picked from commit f1987fb58f)
2018-10-09 08:19:44 +01:00
Tim Steinbach
01762972be sbt: 1.2.3 -> 1.2.4
(cherry picked from commit 844bcbd137)
2018-10-08 20:14:08 -04:00
Arian van Putten
1ada6fcde1 nixos/containers: Add regression test for #40355
(cherry picked from commit 0668906e84)
2018-10-08 17:00:33 -04:00
Arian van Putten
cf9b801b60 Revert "Revert "Revert "doc: Update section about imperative containers"""
nixos-container can now execute nix commands again inside the container

This reverts commit 9622cd3b38.

(cherry picked from commit bb31835b1d)
2018-10-08 17:00:33 -04:00
Arian van Putten
76c1cd35d0 nixos-container: Force container to talk to host nix-daemon
When logging into a container by using
  nixos-container root-login
all nix-related commands in the container would fail, as they
tried to modify the nix db and nix store, which are mounted
read-only in the container.  We want nixos-container to not
try to modify the nix store at all, but instead delegate
any build commands to the nix daemon of the host operating system.

This already works for non-root users inside a nixos-container,
as it doesn't 'own' the nix-store, and thus defaults
to talking to the daemon socket at /nix/var/nix/daemon-socket/,
which is bind-mounted to the host daemon-socket, causing all nix
commands to be delegated to the host.

However, when we are the root user inside the container, we have the
same uid as the nix store owner, eventhough it's not actually
the same root user (due to user namespaces). Nix gets confused,
and is convinced it's running in single-user mode, and tries
to modify the nix store directly instead.

By setting `NIX_REMOTE=daemon` in `/etc/profile`, we force nix
to operate in multi-user mode, so that it will talk to the host
daemon instead, which will modify the nix store for the container.

This fixes #40355

(cherry picked from commit 3624bb5362)
2018-10-08 17:00:33 -04:00
Linus Heckemann
d0b24be55d debian vm tools: use snapshot.debian.org
snapshot.debian.org actually keeps track of all of the updates as they
come in rather than doing arbitrary (?) snapshots.

(cherry picked from commit 9cc18fa7f9)
2018-10-08 17:34:41 +01:00
Vladimír Čunát
3cee341f06 Merge branch 'staging-18.09' into release-18.09 2018-10-08 17:14:59 +02:00
pacien
21293d2576 tinc: 1.0.34 -> 1.0.35, 1.1pre16 -> 1.1pre17
Critical security update (CVE-2018-16737, CVE-2018-16738, CVE-2018-16758)

(cherry picked from commit 15a190eb27)
2018-10-08 17:04:13 +02:00
Rob Vermaas
1eb1fec3ae Fix build for rPackages.units 2018-10-08 12:53:07 +02:00
Vladimír Čunát
3ab942ef67 openssh: fix tunnel forwarding (upstream patch)
Close #48031, fixes #48016.  I didn't use the PR commit
because I think it's better to fetch the patch.

(cherry picked from commit c2e6ca501e)
2018-10-08 12:06:06 +02:00
Vladimír Čunát
41cc5c414b Merge branch 'release-18.09' into staging-18.09 2018-10-08 12:05:59 +02:00
Ben Gamari
2fdba72c05 qpdf: Drop CVE-2018-9918.patch (#47935)
This has been merged upstream in 8.2.1.

(cherry picked from commit 58a02af417)
2018-10-08 08:41:53 +02:00
lassulus
617607e043 charybdis service: bin/charybdis-ircd -> bin/charybdis
(cherry picked from commit 99c8dc4a11)
2018-10-07 20:44:43 +01:00
Andreas Rammhold
76e4d162ab Merge pull request #48014 from schmittlauch/backport-tbb-bin-8.0.2
backport tor-browser-bundle-bin minor update
2018-10-07 20:05:25 +02:00
Andreas Rammhold
34eb9f7d10 backport tor-browser-bundle-bin minor update
tor-browser-bundle-bin: 8.0.1 -> 8.0.2

Update to latest version due to security updates and 8.0.1 not being
available on the mirrors anymore.

Release notes: https://blog.torproject.org/new-release-tor-browser-802

(cherry picked from commit 248ed3575c)

reason: The binary dist-file of tor-browser-bundle-bin-8.0.2 is gone
from the mirrors, making the derivation for v8.0.1 fail.
This is just a minor version bump.
2018-10-07 19:25:24 +02:00
Alex Leferry 2
5cc757117d cool-retro-term: Fix link to home page
(cherry picked from commit 82b2b9135a)
2018-10-07 11:56:23 +01:00
Justin Humm
45c83d91b8 borgbackup: patch bug that allowed for exceeding quotas
See also https://github.com/borgbackup/borg/issues/4093 for this.

(cherry picked from commit 0cfc923813)
2018-10-07 11:53:54 +01:00
Andrew Childs
2b3b607ea9 nixos/prometheus-snmp-exporter: fix command line argument format
(cherry picked from commit c477d6658c)
2018-10-07 11:50:35 +01:00
Chris Hodapp
090f5e0955 gdal: Add libxml2 to build
(cherry picked from commit 4af38a2516)
Backport of #47972
2018-10-07 10:00:50 +02:00
Samuel Dionne-Riel
be47bab9e4 nano: 3.0 -> 3.1
(cherry picked from commit 65eb3e38e8)
Backport of #47991
2018-10-07 09:56:17 +02:00
Samuel Dionne-Riel
f4bb9c421f Merge pull request #47956 from samueldr/18.09/backport-46443
[backport] Miniupnpd and bittorrent improvements (#46443)
2018-10-06 12:27:07 -04:00
schneefux
299814b385 nodePackages.webtorrent-cli: add node-gyp dependency, fixes build
(cherry picked from commit ce4072c662)
2018-10-06 16:41:03 +01:00
Jaka Hudoklin
9eb724f85e telepresence: 0.85 -> 0.93 (#47966)
(cherry picked from commit a134b9a3dd)

backported because previouse version failed to build
2018-10-06 15:22:20 +02:00
Andreas Rammhold
98e6fa3738 firefox: provide clang configure flags on i686
With the upgrade to firefox 62 clang flags are now required on i686.

(cherry picked from commit acf4a4eff3)
2018-10-06 10:43:58 +02:00
Andreas Rammhold
f26df1572d firefox-esr-52: mark as unsupported
The ESR release is no longer supported by Mozilla. We should mark it as
insecure as we did on 18.03 and master.

Originally marked as insecure on master in 0a3f07077b.
2018-10-06 10:42:10 +02:00
Jörg Thalheim
c7dc01c287 Merge pull request #47952 from samueldr/auto/dbeaver/nixos-18.09/5.2.1
dbeaver: 5.2.0 -> 5.2.1 (18.09)
2018-10-06 08:03:17 +01:00
Florian Klink
dbcbf7cce8 ghostscript: 9.24 -> 9.25 (#47948)
Highlights in this release include:

This release fixes problems with argument handling, some unintended results of the security fixes to the SAFER file access restrictions (specifically accessing ICC profile files), and some additional security issues over the recent 9.24 release.

CVE-2018-16802
CVE-2018-17183

Note: The ps2epsi utility does not, and cannot call Ghostscript with the -dSAFER command line option. It should never be called with input from untrusted sources.

Security issues have been the primary focus of this release, including solving several (well publicised) real and potential exploits.
PLEASE NOTE: We strongly urge users to upgrade to this latest release to avoid these issues.

As well as Ghostscript itself, jbig2dec has had a significant amount of work improving its robustness in the face of out specification files.

IMPORTANT: We are in the process of forking LittleCMS. LCMS2 is not thread safe, and cannot be made thread safe without breaking the ABI. Our fork will be thread safe, and include performance enhancements (these changes have all be been offered and rejected upstream). We will maintain compatibility between Ghostscript and LCMS2 for a time, but not in perpetuity. Our fork will be available as its own package separately from Ghostscript (and MuPDF).

The usual round of bug fixes, compatibility changes, and incremental improvements.

(cherry picked from commit 5b77b0d2f1)
2018-10-06 08:47:09 +02:00
Bob van der Linden
fc8769dbfc tests: bittorrent: add bobvanderlinden as maintainer
(cherry picked from commit 5fbc521bf9)
2018-10-06 00:36:38 -04:00
Bob van der Linden
b453212005 tests: bittorrent: improve stability
This attempts to improve stability of the test by using existing
services for miniupnpd and transmission.

It also uses explicit addresses for the network interfaces so that the
external IP addresses are valid internet addresses (thus fixing
validation problems from upnpc).

Also disable eth0 from being used to transfer torrents over without that
being the intention.

(cherry picked from commit 276ffc5656)
2018-10-06 00:36:38 -04:00
Bob van der Linden
3ab4c76382 tests: upnp: init test for upnp using miniupnpd / miniupnpc
(cherry picked from commit 32c63c6905)
2018-10-06 00:36:38 -04:00
Bob van der Linden
4342bdd79d nixos: miniupnpd: use iptables scripts
(cherry picked from commit d3eff01076)
2018-10-06 00:36:37 -04:00
Bob van der Linden
9dc6bdcc09 miniupnpd: wrap iptables scripts to use correct PATH
(cherry picked from commit 2039327879)
2018-10-06 00:36:37 -04:00
Samuel Dionne-Riel
8810238efa dbeaver: 5.2.0 -> 5.2.1
(cherry picked from commit 2012860e7e)
2018-10-05 22:37:28 -04:00
Samuel Dionne-Riel
6a3f5bcb06 nixos/doc: Updates release date for 18.09
(cherry picked from commit 82d1bf9691)
2018-10-05 18:33:19 -04:00
Samuel Dionne-Riel
1863faca75 README: 18.03 -> 18.09
(cherry picked from commit 29b479eb72)
2018-10-05 18:25:14 -04:00
Samuel Dionne-Riel
0ea9623aa4 Updates 18.09 release notes for release.
(cherry picked from commit 6487a47996)
2018-10-05 18:19:39 -04:00
Andreas Rammhold
b0b0a6cf3b Merge pull request #47925 from edef1c/git-2.18.1
git: 2.18.0 -> 2.18.1 (CVE-2018-17456)
2018-10-05 22:12:29 +02:00
edef
def2618c09 git: 2.18.0 -> 2.18.1 (CVE-2018-17456) 2018-10-05 18:41:59 +00:00
Graham Christensen
d916a0f9ce docs: Delete assert functions since they don't exist in 18.09 2018-10-05 13:18:04 -04:00
Graham Christensen
3bf2c2f2d1 Generate links to function definitions
Hydra passes the full revision in to the input, which we pass through.

If we don't get this ,we try to get it from other sources, or default to
master which should have the definition in a close-ish location.

All published docs should have theURL resolve properly, only local
hackers will have the link break.

(cherry picked from commit 5daee73ce4)
2018-10-05 13:14:11 -04:00
Graham Christensen
09b8ed042a version.nix: extract revision-fetching function
(cherry picked from commit 4312cfdbda)
2018-10-05 13:14:07 -04:00
Samuel Dionne-Riel
9d5f0ba8e3 Merge pull request #47898 from peterhoeg/f/activation_1809
nixos system-activation: support activation scripts run in a user context
2018-10-05 12:26:32 -04:00
Graham Christensen
131cb302ab nixpkgs: Start documenting library functions in XML
Covers assert functions and about half of the attrsets functions.

Some internal consistency around IDs could be improved.

(cherry picked from commit f835f77e02)
2018-10-05 10:20:39 -04:00
Notkea
4e73b76ede matrix-synapse: 0.33.5 -> 0.33.6
(cherry picked from commit 570b9bab25)
Backport of #47880
2018-10-05 10:33:18 +02:00
Peter Hoeg
c8b3a26aec plasma5: run kbuildsycoca5 in the user context
(cherry picked from commit 4dada63a17)
2018-10-05 11:27:17 +08:00
Peter Hoeg
092f82b803 switch-to-configuration.pl: activate the nixos-activation.service user service
(cherry picked from commit 8118d6eb2e)
2018-10-05 11:27:03 +08:00
Peter Hoeg
c5b97d47b8 system-activation: support script fragments to run in a user context
(cherry picked from commit 1353ba2678)
2018-10-05 11:26:22 +08:00
Alex Leferry 2
b4d7324678 GRV: Fix typos in description
(cherry picked from commit 1bb4b16b3b)
2018-10-04 23:27:50 +01:00
Vladimír Čunát
8dae912c28 Merge #47699: nixos on hyperv improvements 2018-10-05 00:11:57 +02:00
Michael Weiss
cb08cb4333 Merge pull request #47884 from primeos/security-backports-for-18.09
[18.09] gollum, jekyll (security backports)
2018-10-04 21:50:44 +02:00
Andreas Rammhold
7c3459b027 Merge pull request #47874 from andir/18.09/thunderbird
[18.09] thunderbird:  60.0 -> 60.2.1, thunderbird-bin: 60.0 -> 60.2.1
2018-10-04 21:43:55 +02:00
Michael Weiss
1f96d2f3e4 gollum: 4.1.3 -> 4.1.4 (security, CVE-2018-3740)
(cherry picked from commit 18b468ed81)
Reason: Security update: "Depend on new version of gollum-lib that
relies on a patched version of sanitize, which solves a vulnerability
(CVE-2018-3740). See https://github.com/gollum/gollum-lib/pull/296."
2018-10-04 21:15:38 +02:00
Michael Weiss
5ca268d7cf jekyll: 3.8.3 -> 3.8.4 (security)
(cherry picked from commit e8a35913e1)
Reason: Security update: "fix include bypass of EntryFilter#filter
symlink check".
2018-10-04 21:14:46 +02:00
Michael Weiss
69d32c2a33 gollum: 4.1.2 -> 4.1.3
(cherry picked from commit 265c5fc485)
Reason: Security update: "Solves a vulnerability in the File view and
All Pages view that would allow XSS."
2018-10-04 21:13:50 +02:00
zimbatm
5399898b86 elvish: provide the compiled version
Without this fix, `elvish -version` displays "unknown"

(cherry picked from commit 9d49cf1808)
2018-10-04 19:54:45 +01:00
taku0
20063233d6 thunderbird-bin: 60.0 -> 60.2.1
(cherry picked from commit d4de3b2d34)
2018-10-04 19:20:58 +02:00
taku0
5669552c91 thunderbird: 60.0 -> 60.2.1
(cherry picked from commit d802524def)
2018-10-04 19:20:29 +02:00
Vladimír Čunát
c78e3b7cfb nixos-option: fix #47722 when missing ~/.nix-defexpr/channels
The problem was that the non-fatal warning was not omitted
from the output when constructing a nix expression.
Now it seems OK for me.  When return code is OK,
the warnings don't get passed anywhere, but I expect
that won't matter for this utility.  Fatal errors are still shown.

(cherry picked from commit de93b32f90)
2018-10-04 17:22:05 +02:00
Florian Klink
c02f213dfa terraform-providers.matchbox: init at 0.2.2 (#47863)
(cherry picked from commit e4f4e9fd1d)
2018-10-04 16:15:49 +02:00
Jörg Thalheim
be38959376 Merge pull request #47407 from kalbasit/nixpkgs_add-terraform-provider-nixos
terraform: update all providers and move nixos provider under terraform.withPlugins
(cherry picked from commit 5547a8b6a5)
2018-10-04 11:40:57 +02:00
Vladimír Čunát
11ec1cd1a6 Merge branch 'staging-18.09' into release-18.09 2018-10-04 08:45:49 +02:00
Tim Steinbach
6cbd1ec4b0 linux: 4.18.11 -> 4.18.12
(cherry picked from commit 21db680d32522ece1cbb3999b8e468f2e8b57906)
2018-10-03 23:48:23 -04:00
Tim Steinbach
a4d4490254 linux: 4.14.73 -> 4.14.74
(cherry picked from commit 575c118a6469cd2148ed3092de90f0d8d3aaec53)
2018-10-03 23:48:16 -04:00
Tim Steinbach
e468090878 linux: 4.9.130 -> 4.9.131
(cherry picked from commit e6ff57b328e913ae656e038a819b12926eadd230)
2018-10-03 23:48:08 -04:00
Samuel Dionne-Riel
91c3bc1dfe doc: installing-usb: removes notes about unetbootin.
They are known to cause more issues than solving issues; futhermore
using `dd` should work everywhere without fail.

(cherry picked from commit 8467dc857b)
2018-10-03 22:57:04 -04:00
Samuel Dionne-Riel
9da278dc38 doc: Reviews partitioning instructions to use parted.
The tests in <nixos/tests/installer.nix> are using `parted`, so they are
bound to be better tested than `fdisk`.

This is brought on by a couple issues, plus reports on IRC that the
`fdisk` instructions didn't work as expected.

 * #39354
 * #46309
 * #39942
 * #45478

Care was taken so that the other documented steps did not need changes.

In all this kerfufle, a slight re-organization of the Chapter has been
made, allowing better deep linking.

(cherry picked from commit 6cfbf403ca)
2018-10-03 22:57:00 -04:00
Samuel Dionne-Riel
292d4fce90 nixos/doc: Adds sub-folder to input files.
(cherry picked from commit 2c0d56f007)
2018-10-03 22:56:54 -04:00
Samuel Dionne-Riel
59f5dea6bd doc: installing-usb make macOS note a note.
While it seemingly brings more attention to the macOS notes with the
default docbook template, it better represents which parts of the
section are about macOS, and which parts are simply in the flow of the
text; otherwise the last paragraph may be lost into the details for
macOS.

(cherry picked from commit 8192fcd0fd)
2018-10-03 22:56:33 -04:00
Graham Christensen
e13c208665 nixpkgs docs: format 2018-10-03 22:01:16 -04:00
Graham Christensen
4a0da7f3ac nixpkgs docs: Rebuild manual-full if nested XML docs change 2018-10-03 22:00:29 -04:00
Graham Christensen
ce5e6466b6 shell functions: rewrite as xml 2018-10-03 22:00:29 -04:00
Graham Christensen
5954454dd1 nixpkgs docs: move shell section to its own file 2018-10-03 22:00:28 -04:00
Graham Christensen
7413dce611 nixpkgs docs: move dockertool to its own file 2018-10-03 22:00:27 -04:00
Graham Christensen
191745989c nixpkgs docs: move fhs-environments to its own file 2018-10-03 21:58:37 -04:00
Graham Christensen
05519f21fc nixpkgs docs: move debug to its own file 2018-10-03 21:58:37 -04:00
Graham Christensen
b66df5c45d nixpkgs docs: move generators to its own file 2018-10-03 21:58:37 -04:00
Graham Christensen
3b739c0daf nixpkgs docs: move overrides to its own file 2018-10-03 21:57:26 -04:00
Jörg Thalheim
46069d481c Merge pull request #47709 from et4te/rustbuild-fix-staging
buildRustPackage: install binaries to bin and libraries to lib correctly
2018-10-04 00:03:15 +01:00
Jan Tojnar
d6ff529d05 Merge pull request #47515 from alexeymuranov/update-flatpak-on-18.09
[18.09] flatpak: 0.99.3 -> 1.0.2 (cherry-picked from master)
2018-10-03 21:05:19 +02:00
Matthew Bauer
c090089aad Merge pull request #47788 from prusnak/gcc-arm-embedded_update-18.09
gcc-arm-embedded: 6-2017-q2-update -> 7-2018-q2-update
2018-10-03 13:49:53 -05:00
Jörg Thalheim
e6a6523818 Merge pull request #47757 from nyanloutre/cherry-pick-jackett
[18.09] jackett: cherry-pick 0.10.250
2018-10-03 18:55:12 +01:00
Pavol Rusnak
9fc3dc917a gcc-arm-embedded: 6-2017-q2-update -> 7-2018-q2-update
+ update blackmagic to latest commit which includes gcc7 fixes

(cherry picked from commit b3531b9719)
2018-10-03 19:49:53 +02:00
Keshav Kini
536f6e86cf makeself: backport megastep/makeself#142
Currently, a self-extracting archive created by makeself will fail to
properly execute on NixOS because the boilerplate Bash code it uses to
clean up the temporary directory it extracted its contents into
assumes that the `rm` command is installed at `/bin/rm`, which is not
the case on NixOS.

This commit, a backport of a pull request I made to the upstream
repository at megastep/makeself#142, fixes the issue by causing the
boilerplate code to call `rm` without specifying an absolute path,
which allows the version of `rm` from one's current Nix environment to
be used instead.

(cherry picked from commit eb84586cad)
2018-10-03 18:38:48 +01:00
R. RyanTM
9a8c266656 libressl_2_8: 2.8.0 -> 2.8.1
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libressl/versions

(cherry picked from commit 807d73c391)
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-10-03 11:59:21 -05:00
nyanloutre
4507f60278 jackett: 0.10.198 -> 0.10.250 2018-10-03 15:24:37 +02:00
R. RyanTM
b8e9aff1d7 jackett: 0.10.160 -> 0.10.198
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jackett/versions
2018-10-03 15:24:36 +02:00
Paul TREHIOU
5a725dcbd0 jackett: 0.9.41 -> 0.10.160 (#46114)
* jackett: update mono to 5.8

Jackett needs mono version >= 5.8

https://github.com/Jackett/Jackett/blob/master/README.md#supported-systems

* jackett: 0.9.41 -> 0.10.160
2018-10-03 15:24:36 +02:00
taku0
04675c8aaa thunderbird: 60.0 -> 60.2.1
(cherry picked from commit d802524def)
2018-10-03 14:54:36 +02:00
taku0
964489f201 thunderbird-bin: 60.0 -> 60.2.1
(cherry picked from commit d4de3b2d34)
2018-10-03 14:54:14 +02:00
Márton Boros
1ae800be28 Fix systemd timer unit documentation
Fixes #36210

(cherry picked from commit d8a555d819)
2018-10-03 08:46:40 -04:00
zimbatm
6e0c9ffbd4 google-compute-engine: 20180510 -> 20180905
The list of corresponding NixOS services are also updated

(cherry picked from commit 9fb79868ab)
2018-10-03 14:11:36 +02:00
Periklis Tsirakidis
f12ea6195e kubectx: 0.5.1 -> 0.6.1
Also provides shell completions for zsh, bash and fish

(cherry picked from commit b9f9b05c37)
Backport of #47731
2018-10-03 13:19:50 +02:00
Maximilian Bosch
6e93cdfe35 nixos/activation: fix systemd-user daemon-reload in auto-upgrade service (#47695)
The autoupgrade service defined in `system.autoUpgrade`
(`nixos/modules/installer/tools/auto-upgrade.nix`) doesn't have `su` in
its path and thus yields a warning during the `daemon-reload`.

Specifying the absolute path fixes the issue.

Fixes #47648

(cherry picked from commit 7297cc5501 and
resolved conflict)
2018-10-03 12:43:20 +02:00
R. RyanTM
b7bfb4180e wireguard-tools: 0.0.20180918 -> 0.0.20180925
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wireguard-tools/versions

(cherry picked from commit 1491848406)
2018-10-03 11:34:38 +01:00
Andreas Rammhold
1e81ff3244 Merge pull request #47714 from andir/18.09/firefox
[18.09] firefox{-bin,}: 62.0.2 -> 62.0.3, firefox-esr-60: 60.2.1 -> 60.2.2
2018-10-03 11:24:01 +02:00
Andreas Rammhold
f4b24ac5e4 firefox-esr-60: 60.2.1 -> 60.2.2 [critical security fixes]
This update bumps the package to the latest stable version containing a
few security fixes:

- CVE-2018-12386: Type confusion in JavaScript
  A vulnerability in register allocation in JavaScript can lead to type
  confusion, allowing for an arbitrary read and write. This leads to
  remote code execution inside the sandboxed content process when
  triggered.

- CVE-2018-12387
  A vulnerability where the JavaScript JIT compiler inlines
  Array.prototype.push with multiple arguments that results in the stack
  pointer being off by 8 bytes after a bailout. This leaks a memory
  address to the calling function which can be used as part of an
  exploit inside the sandboxed content process.

Source: https://www.mozilla.org/en-US/security/advisories/mfsa2018-24/
(cherry picked from commit 246d2848ff)
2018-10-03 09:54:47 +02:00
Andreas Rammhold
22502e78be firefox: 62.0.2 -> 62.0.3 [critical security fixes]
This update bumps the package to the latest stable version containing a
few security fixes:

- CVE-2018-12386: Type confusion in JavaScript
  A vulnerability in register allocation in JavaScript can lead to type
  confusion, allowing for an arbitrary read and write. This leads to
  remote code execution inside the sandboxed content process when
  triggered.

- CVE-2018-12387
  A vulnerability where the JavaScript JIT compiler inlines
  Array.prototype.push with multiple arguments that results in the stack
  pointer being off by 8 bytes after a bailout. This leaks a memory
  address to the calling function which can be used as part of an
  exploit inside the sandboxed content process.

Source: https://www.mozilla.org/en-US/security/advisories/mfsa2018-24/
(cherry picked from commit e7785f1148)
2018-10-03 09:54:41 +02:00
Andreas Rammhold
4663251636 firefox-bin: 62.0.2 -> 62.0.3 [critical security fixes]
This update bumps the package to the latest stable version containing a
few security fixes:

- CVE-2018-12386: Type confusion in JavaScript
  A vulnerability in register allocation in JavaScript can lead to type
  confusion, allowing for an arbitrary read and write. This leads to
  remote code execution inside the sandboxed content process when
  triggered.

- CVE-2018-12387
  A vulnerability where the JavaScript JIT compiler inlines
  Array.prototype.push with multiple arguments that results in the stack
  pointer being off by 8 bytes after a bailout. This leaks a memory
  address to the calling function which can be used as part of an
  exploit inside the sandboxed content process.

Source: https://www.mozilla.org/en-US/security/advisories/mfsa2018-24/
(cherry picked from commit 64d02660cb)
2018-10-03 09:54:35 +02:00
Edward Tate
c3f8368f97 Shortened rmdir, improved regex to support shared libs with multiple integers at the end. 2018-10-03 09:25:53 +02:00
Edward Tate
f08cebd8d2 Use regex instead of -name in find with -print0 and xargs -0. 2018-10-03 09:25:53 +02:00
Edward Tate
6f37fa7c99 buildRustPackage now correctly installs binaries to bin and libraries to lib. 2018-10-03 09:25:53 +02:00
Peter Hoeg
9ffdaa1f19 nixos on hyperv: hot-add CPU
(cherry picked from commit 6e3e136f77)
2018-10-03 11:46:48 +08:00
Peter Hoeg
18ae457bc7 nixos-installer: use the hyperv module on hyperv
(cherry picked from commit ca6d41ae65)
2018-10-03 11:46:42 +08:00
Peter Hoeg
42968c07c5 nixos on hyperv: load modules and set video mode
(cherry picked from commit 3a76bc7a79)
2018-10-03 11:46:36 +08:00
R. RyanTM
7f70ebf30b matomo: 3.5.1 -> 3.6.0 (#46242)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
matomo

(cherry picked from commit c45dd04946)

backported for security updates
2018-10-02 22:47:39 +02:00
Matthew Bauer
79bbe4d543 haskell: fix x509-system on mojave
darwin.security_tool is currently broken in Mojave. See issue #45042
for more info. Our security_tool stuff comes from 10.9 so I suspect
that it needs an update.

Here I am putting in a hack to get things working again. This uses the
system provided security binary at /usr/bin/security to avoid the
issue in Haskell’s x509-system package. Unfortunately, this will break
with the sandbox. I am also working on a proper fix, but this requires
updating lots of Apple stuff (and also copumpkin’s new CF). You can
follow the progress on this branch:

  https://github.com/matthewbauer/nixpkgs/tree/xcode-security

This commit should be backported to release-18.03 and release-18.09.

/cc @copumpkin @lnl7 @pikajude
2018-10-02 15:20:55 -05:00
Philipp Middendorf
9934f413da jetbrains: add libnotify to wrapper to enable notifications
(cherry picked from commit 0b2f2f3d96)
2018-10-02 20:12:05 +01:00
Philipp Middendorf
0f51003a5b jshint: depend on phantomjs2
(cherry picked from commit 22e9c0a6fa)
2018-10-02 19:34:35 +01:00
R. RyanTM
3e44d2f2b5 verilator: 3.926 -> 4.002
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/verilator/versions

(cherry picked from commit 609f9198f2)
2018-10-02 09:58:38 -05:00
Léo Gaspard
18749a72b7 jetbrains.idea-community: add IntelliJ keyword to the longDescription (#47650)
This should make it easier to find the package under the name
IntelliJ in eg. [1]

[1] https://nixos.org/nixos/packages.html#intellij

(cherry picked from commit 5f5905e30e)
2018-10-02 16:03:42 +02:00
Josef Kemetmüller
0d8c62c15c libcanberra: fix darwin build (#47634)
(cherry picked from commit aeee761aba)
2018-10-02 12:56:34 +02:00
Matthew Pickering
0a198954be gdal: 2.3.1 -> 2.3.2
(cherry picked from commit f80730d903)
Backport of #47565
2018-10-02 09:09:54 +02:00
WilliButz
b8ef448e95 nvtop: use version-independent libnvidia-ml.so symlink
(cherry picked from commit 781206217e)
2018-10-02 08:42:57 +02:00
John Ericson
3e55299b41 Merge pull request #47646 from obsidiansystems/ghc-8.2.2-change-patch
ghc-8.2.2: Oops, added adjacent patch the one I wanted
2018-10-02 01:46:39 -04:00
John Ericson
0ce0851442 Merge pull request #47645 from obsidiansystems/ghc-8.2-hsc2hs
ghc-8.2.2: Fix which hsc2hs is installed on cross for 18.09
2018-10-02 01:10:51 -04:00
Austin Seipp
7b05874c1b perlPackages.Mojolicious: 8.0 -> 8.01
Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 5a179ffb01)
2018-10-01 23:26:47 -05:00
Austin Seipp
2e06ce8e98 perlPackages.MojoliciousPluginStatus: init at 1.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 37ce9316bf)
2018-10-01 23:26:47 -05:00
Austin Seipp
56f5ff8a3c perlPackages: init Sereal package family at 4.005
Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 65923ede17)
2018-10-01 23:26:47 -05:00
Austin Seipp
029d9c8173 symbiyosys: 2018.07.26 -> 2018.09.12
Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 919a3b7f9c)
2018-10-01 23:26:47 -05:00
Austin Seipp
bcad3bb1e8 yosys: 2018.08.08 -> 2018.09.30
Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit d7393024d1)
2018-10-01 23:26:47 -05:00
Austin Seipp
8edbdae43d arachne-pnr: 2018.05.13 -> 2018.09.08
Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 7b0b895053)
2018-10-01 23:26:47 -05:00
Austin Seipp
aa4177b408 icestorm: 2018.08.01 -> 2018.09.04
Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 1e9e3adfb1)
2018-10-01 23:26:47 -05:00
Franz Pletz
66fd61163a nixos/clamav: fix freshclam service if db up to date
(cherry picked from commit 11ba2f270f)
2018-10-02 00:27:24 +02:00
Franz Pletz
5fc5a4fb21 nixos/clamav: fix daemon/updater services toggling
(cherry picked from commit f8d681a91f)
2018-10-02 00:27:23 +02:00
Franz Pletz
b3038ade6f shairport-sync: fix pulseaudio support & default arguments
(cherry picked from commit e7ca9af4cc)
2018-10-02 00:27:23 +02:00
Uli Baum
f2faf3299e Merge branch 'release-18.09' into staging-18.09 2018-10-02 00:17:52 +02:00
Will Dietz
1f1c8079b3 lz4: 1.8.2 -> 1.8.3 (#47547)
(cherry picked from commit 55b6cad537)
2018-10-02 00:16:26 +02:00
John Ericson
d296abb484 Merge pull request #47627 from obsidiansystems/ghc-cross-fixes
ghc: Misc cross fixes for 18.09
2018-10-01 17:19:34 -04:00
Sarah Brofeldt
a54dadb950 nixos/tests/nix-ssh-serve.nix: Use stable nix (#47584)
(cherry picked from commit 358a1c8a28)
2018-10-01 23:02:10 +02:00
xeji
10eec00131 linux kernel: increase build timeout from 1hr to 4 hrs (#47564)
We've recently seen a lot of kernel build timeouts on hydra,
so let's increase the timeout.

(cherry picked from commit 83fd9785f6 and
resolved conflict)
2018-10-01 17:45:27 +02:00
Jörg Thalheim
ec3497a084 Merge pull request #47592 from Mic92/alacritty-backport
alacritty: 2018-08-30 -> 0.2.0 (backport)
2018-10-01 12:23:10 +01:00
Jörg Thalheim
57a4034bd0 alacritty: spell darwin platform correctly
(cherry picked from commit 13b2903169)
2018-10-01 12:09:21 +01:00
Jörg Thalheim
44125457d4 alacritty: restrict platforms to x86_64-{linux,darwin}
(cherry picked from commit 350c79f983)
2018-10-01 12:03:31 +01:00
Jörg Thalheim
2d84895618 alacritty: 2018-08-30 -> 0.2.0
Based on popular demand I decided to upgraded alacritty from my own fork.
We currently also have a version in staging that works without but we
cannot easily backport this one because it relies on some changes in the rust
build infrastructure

(cherry picked from commit cb6ccb6a7e)
2018-10-01 12:03:28 +01:00
Sarah Brofeldt
ff37ba7028 dockerTools: Use nix instead of nixUnstable
(cherry picked from commit b256df4937)
2018-10-01 10:05:50 +02:00
Florian Klink
b550b7d9e3 pythonPackages.pystemd: init at 0.5.0 (#47517)
(cherry picked from commit 2be514d5c3)
2018-10-01 07:36:56 +01:00
Josef Kemetmüller
0f1911eea2 pythonPackages.py-cpuinfo: Fix darwin build (#47558)
(cherry picked from commit 49dcf7be62)
2018-09-30 21:19:24 +02:00
volth
a3e5e6e792 language_subtag_registry: fix hash (#47555)
(cherry picked from commit 61007c0e96)
2018-09-30 21:15:36 +02:00
Josef Kemetmüller
f2a1d990ec pythonPackages.python-mapnik: Fix build
There were two things to fix:
- Boost started shipping libboost_python.so as libboost_python{Major}{Minor}
- Make sure that mapnik and boost link to the correct version of python.

(cherry picked from commit be6451e020)
2018-09-30 21:13:26 +02:00
Josef Kemetmüller
8b3bff1de7 mapnik: 3.0.13 -> 3.0.20
(cherry picked from commit b1857daa25)
2018-09-30 21:13:25 +02:00
Graham Christensen
26537f5379 docs: format 2018-09-29 20:49:27 -04:00
Graham Christensen
4867086bc7 Revert "Revert "doc: Update section about imperative containers""
I fixed the problem.

This reverts commit 29624f6bb2.
2018-09-29 20:47:03 -04:00
Will Dietz
4c3a0ae445 nix-daemon: only add channels dir to NIX_PATH if exists
Per reviewer comment (thanks!).

(cherry picked from commit 243e28bc96)
2018-09-29 20:34:13 -04:00
Tuomas Tynkkynen
aa0c7bd5ed nixos/kexec: Replace meta.available checks
This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.

[dezgeg: Also squash in the bugfix commit "nixos/kexec: Fix typo in meta.platforms" by aszlig]

(cherry picked from commit 599c4df46a)
(cherry picked from commit fd8bca45c9)
2018-09-30 03:09:46 +03:00
Tuomas Tynkkynen
5330abad53 ghc: Replace meta.available checks for enableIntegerSimple
This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.

(cherry picked from commit f4dd2fed7f)
2018-09-30 02:13:48 +03:00
Tuomas Tynkkynen
ae63055af9 treewide: Replace meta.available checks in shouldUsePackages copypasta
This reverts commit 79d8353b5e.

This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.

(cherry picked from commit 5e84926a66)
2018-09-30 02:13:48 +03:00
Tuomas Tynkkynen
2c3443e2d2 apparmor: Replace meta.available checks
This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.

(cherry picked from commit 50d0360888)
2018-09-30 02:13:47 +03:00
Tuomas Tynkkynen
50da319891 nix: Replace meta.available checks
This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.

(cherry picked from commit cdeafe7cdf)

Conflicts:
	pkgs/tools/package-management/nix/default.nix
2018-09-30 02:13:41 +03:00
Tuomas Tynkkynen
6b1ebeb5eb systemd: Replace meta.available checks
This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.

(cherry picked from commit fe7919f7a1)
2018-09-30 02:12:30 +03:00
Tuomas Tynkkynen
29624f6bb2 Revert "doc: Update section about imperative containers"
This reverts commit b72abcf861.

Breaks manual build:

https://nix-cache.s3.amazonaws.com/log/wnjcy6n5f871bpyy9nd06smiz1ggv99c-nixos-manual-combined.drv
2018-09-30 01:02:45 +03:00
Tim Steinbach
b7cab85b26 linux: 4.18.10 -> 4.18.11
(cherry picked from commit 5eefdebf49)
2018-09-29 17:55:08 -04:00
Tim Steinbach
99b696927a linux: 4.14.72 -> 4.14.73
(cherry picked from commit 00e57782bc)
2018-09-29 17:54:57 -04:00
Tim Steinbach
9bd9306c36 linux: 4.9.129 -> 4.9.130
(cherry picked from commit 74f56e14d9)
2018-09-29 17:54:46 -04:00
Tim Steinbach
c2e605e9d1 linux: 4.4.158 -> 4.4.159
(cherry picked from commit 7769fd6a80)
2018-09-29 17:54:36 -04:00
Tycho Grouwstra
1d5b7a7d42 gitkraken: 4.0.2 -> 4.0.5 (#47512)
Fixes #47498. Note that the releases have moved to a new URL; I'm not sure they still host the earlier versions.

(cherry picked from commit 9d727e0a91)

backported because previous source url returns 404.
2018-09-29 20:51:42 +02:00
Arian van Putten
b72abcf861 doc: Update section about imperative containers
Nix commands inside the container have been broken since 18.03,
and no fix is yet in sight.  Lets remove from the documentation
that this is a usecase that we support, as it doesn't seem
likely that this will be fixed before 18.09 either.

See #40355

(cherry picked from commit f309440ee3)
2018-09-29 19:18:54 +01:00
Jan Tojnar
0f9355abb2 flatpak-builder: add libyaml
(cherry picked from commit 7d2c8bbe9a)
2018-09-29 13:21:22 +02:00
Jan Tojnar
941941b151 xdg-dbus-proxy: init at 0.1.0
(cherry picked from commit 2d19ee6247)
2018-09-29 13:21:22 +02:00
Tor Hedin Brønner
7569e96508 ostree: 2018.6 -> 2018.8
(cherry picked from commit 87d11ae99c)
2018-09-29 13:21:22 +02:00
Tor Hedin Brønner
8063903183 xdg-desktop-portal-gtk: 0.99 -> 1.0.2
(cherry picked from commit b6c17cd46f)
2018-09-29 13:21:22 +02:00
Tor Hedin Brønner
3f0618a7ed flatpak: 0.99.3 -> 1.0.2
(cherry picked from commit 37a828ec27)
2018-09-29 13:21:22 +02:00
Tor Hedin Brønner
e80820d5b7 xdg-desktop-portal: 0.99 -> 1.0.2
(cherry picked from commit 0d994736a1)
2018-09-29 13:21:22 +02:00
Tor Hedin Brønner
727eb5ed78 pipewire: 0.1.9 -> 0.2.3
I also removed pipewire from mutter temporarily, since it is not compatible.

(cherry picked from commit c32b0409a9)
2018-09-29 13:21:21 +02:00
Vladimír Čunát
c5668bd183 Merge branch 'staging-18.09' into release-18.09 2018-09-29 11:09:27 +02:00
Vladimír Čunát
fe195c03ed Merge #45683: nvidia_x11: 390.77 -> 390.87
(cherry picked from commit d9f7d27ef5)
2018-09-29 11:09:16 +02:00
Tom Bereknyei
6c68068a52 gnuradio: 3.7.13.3 -> 3.7.13.4
(cherry picked from commit a054f269bf)
Backport of #47491
2018-09-29 10:57:01 +02:00
Wael M. Nasreddine
56591a244e browsh: 1.4.10 -> 1.4.13
(cherry picked from commit fa46ce3828)
Backport of #47501
2018-09-29 10:00:28 +02:00
symphorien
c922e20b5d exempi: patch CVE-2018-12648, enable tests on linux (#47496)
(cherry picked from commit e502c72773)
2018-09-29 00:16:18 +02:00
Daiderd Jordan
f5db056efd freedroidrpg: don't build on hydra
Similar to some other builds, sdl-config gets stuck and times out.

    checking for sdl-config... /nix/store/q2hm1ka0qxs2gv5bmrxj7j80lygk4b5z-SDL-1.2.15-dev/bin/sdl-config
    building of '/nix/store/m2d7v0n5hd2498vfxp18i37p7r1lf76p-freedroidrpg-0.16.1' timed out after 7200 seconds of silence

/cc ZHF #45961

(cherry picked from commit 9b99819283)
2018-09-28 22:33:32 +02:00
Daiderd Jordan
e087e20239 flpsed: mark linux only
Doesn't build on darwin and probably other platforms.

    GsWidget.H:26:3: error: 'Atom' does not name a type; did you mean 'tm'?
       Atom atoms[5];
       ^~~~
       tm
    GsWidget.cxx: In member function 'void GsWidget::setProps()':
    GsWidget.cxx:47:2: error: 'atoms' was not declared in this scope
      atoms[0] = XInternAtom(fl_display,"GHOSTVIEW" , false);
      ^~~~~

/cc ZHF #45961

(cherry picked from commit cd78d0cc3f)
2018-09-28 22:33:32 +02:00
Daiderd Jordan
c1f9ffc740 fox: mark broken on darwin
Undefined symbols for architecture x86_64:
      "_MPCreateSemaphore", referenced from:
          FX::FXSemaphore::FXSemaphore(int) in FXThread.o
          FX::FXSemaphore::FXSemaphore(int) in FXThread.o
      "_MPDeleteSemaphore", referenced from:
          FX::FXSemaphore::~FXSemaphore() in FXThread.o
          FX::FXSemaphore::~FXSemaphore() in FXThread.o
      "_MPSignalSemaphore", referenced from:
          FX::FXSemaphore::post() in FXThread.o
      "_MPWaitOnSemaphore", referenced from:
          FX::FXSemaphore::wait() in FXThread.o
          FX::FXSemaphore::trywait() in FXThread.o
    ld: symbol(s) not found for architecture x86_64

/cc ZHF #45961

(cherry picked from commit 6390b8b63e)
2018-09-28 22:33:31 +02:00
Brian Olsen
3108f741fe nixos/rspamd: Remove non-working socket activation
The socket activation I added to the rspamd module doesn't actually work
and can't be made to work without changes to rspamd.

See: #47421
See: rspamd/rspamd#2035
(cherry picked from commit 783a58f363)
2018-09-28 21:04:41 +02:00
John Ericson
aab182ebea Merge pull request #47488 from obsidiansystems/ghcjs-ghc-version
ghcjs-*: Expose the version of GHC used
2018-09-28 12:33:35 -04:00
Jörg Thalheim
1e9f50f156 systemd: don't restart user-runtime-dir@ on upgrades
Likewise logind we should not try to restart this service after upgrade,
the user's current session depends on it.

(cherry picked from commit aa69bb5743)
2018-09-28 12:10:36 +01:00
Orivej Desh
1e1821c166 retroshare: mark as broken (#47350)
Broken by libupnp: 1.6.21 -> 1.8.3 (#41684).

(cherry picked from commit eeac44c81a)
2018-09-28 11:57:57 +02:00
xeji
0c29a51467 linuxPackages.jool: 3.5.7 -> unstable-20180706 (#47284)
3.5.7 doesn't build with kernel 4.14.71.
Needs most recent upstream revision to build, which supports
kernels up to 4.17.

(cherry picked from commit f0e4b31eb2)
2018-09-28 11:55:12 +02:00
Tuomas Tynkkynen
a7fa8e1aa8 Add ssh backdoor to VM tests infrastructure.
Thanks to @dezgeg for prototype implementation, I've
cleaned it up and added documentation.

(cherry picked from commit d6e3db44cf)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-09-28 10:54:09 +01:00
Sarah Brofeldt
0e0cd2fc30 haskellPackages.term-rewriting: doJailbreak and dontCheck
(cherry picked from commit 5c45ca0943)
Backport of #47456
2018-09-28 10:48:19 +02:00
John Ericson
3768913cc9 Merge pull request #47445 from obsidiansystems/ghcjs-no-double-callPackage
ghcjs-{7.10, 8.0}: Improve overriding situation for 18.09
2018-09-27 19:11:52 -04:00
Brian Olsen
0f4e117054 nixos/rspamd: Preserve runtime directory when using socket activation
(cherry picked from commit 458bcc8f7a)
2018-09-27 14:09:54 +01:00
Jean-Philippe Cugnet
cdb33d1ddc erlangR19: 19.3.6.6 -> 19.3.6.11
(cherry picked from commit bf22712993)
Backport of #47367
2018-09-27 10:44:30 +02:00
Jean-Philippe Cugnet
d101614d71 erlangR20: 20.3.8 -> 20.3.8.9
(cherry picked from commit 6e5682ab41)
Backport #47369
2018-09-27 10:22:32 +02:00
Florian Klink
cf64adec53 golden-cheetah: add desktop item and icon
(cherry picked from commit bb51ba9bb8)
2018-09-27 09:54:37 +02:00
Austin Seipp
3c85e586b3 libiio: install python bindings
Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit af48e5783a)
2018-09-26 19:40:41 -05:00
Corey O'Connor
d26e830997 vlc: 3.0.3 -> 3.0.4 (#47406)
(cherry picked from commit 26ce265258)

Didn't build, invalid url for vlc-qt5.11.patch.
2018-09-26 23:27:42 +02:00
John Ericson
8e2e8bb882 Merge remote-tracking branch 'upstream/release-18.09' into staging-18.09 2018-09-26 15:55:37 -04:00
John Ericson
3b5c708ac8 Merge pull request #47401 from obsidiansystems/paxctl-darwin-no-mass-rebuild
paxctl: Fix darwin and cross without mass-rebuild for 18.09
2018-09-26 15:52:44 -04:00
xeji
e5eabccb00 Merge pull request #47396 from rycee/backport/noti
Backport the noti package to 18.09
2018-09-26 19:31:44 +02:00
Mario Rodas
583a32148c noti: fix darwin build
(cherry picked from commit 4c56eb81e9)
2018-09-26 18:54:57 +02:00
stites
e835796a18 noti: init at 3.1.0
(cherry picked from commit f1c30cf772)
2018-09-26 18:54:56 +02:00
stites
e861f31344 add stites to maintainers list
(cherry picked from commit 82f980828d)
2018-09-26 18:54:56 +02:00
John Ericson
6bc58a9438 Merge branch 'release-18.09' into staging-18.09 2018-09-26 11:23:49 -04:00
John Ericson
e06de91855 Merge commit '607063f61be3b19a2da054776b360d9c5b03038a' into release-18.09
This gets the partial revert on the common ancestor of master and
release-18.09, easier further devlopment.
2018-09-26 11:22:28 -04:00
Tim Steinbach
a3b7cd1fa3 linux: 4.18.9 -> 4.18.10
(cherry picked from commit 24c31d43bb)
2018-09-26 08:02:35 -04:00
Tim Steinbach
74680cff73 linux: 4.14.71 -> 4.14.72
(cherry picked from commit 61452c82ae)
2018-09-26 08:02:29 -04:00
Tim Steinbach
1c7a4320e8 linux: 4.9.128 -> 4.9.129
(cherry picked from commit 8e4d980904)
2018-09-26 08:02:23 -04:00
Tim Steinbach
a4cedc0981 linux: 4.4.157 -> 4.4.158
(cherry picked from commit 656ca2296c)
2018-09-26 08:02:18 -04:00
Domen Kožar
29660a2085 postgresql: give postgres user a shell
(cherry picked from commit 82feb4b66e)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-09-26 12:12:29 +01:00
Matthew Bauer
f9c4075873 stdenv: partial revert of f2bb59e
/cc @Ericson2314

PR was https://github.com/NixOS/nixpkgs/pull/46857

This line broke MacOS cross compilation. paxctl cannot be built on
macOS. Maybe it can be fixed, but no reason to break things
unnecessarily.

Regardless, you definitely need to be more careful about backporting.
I think it’s fine to move fast and break things on master but
with release-18.09 we should be more careful. Something like more
automated testing for cross compilation would also be
helpful (hopefully even making it block).
2018-09-26 02:23:07 -05:00
Okina Matara
0b70148bd6 linux_testing_bcachefs: 4.18.2018.08.31 -> 4.18.2018.09.21
(cherry picked from commit d98b0805cc)
2018-09-26 08:49:53 +02:00
xeji
391bf82ca3 qboot: 20150603 -> 20170330, fix build (#47364)
Switch back to original upstream project which is more recent
than the fork we used.

(cherry picked from commit 4ad424fbd6)
2018-09-25 22:33:46 +02:00
John Ericson
372d0cc4f4 Merge pull request #47363 from obsidiansystems/ghc-sphinx
ghc: Sphinx is a build-time dependency
2018-09-25 16:31:27 -04:00
Luke Clifton
67e53e0c6d abduco: refactor (compile on darwin) (#47124)
(cherry picked from commit 3d8f6b6188)
2018-09-25 22:30:03 +02:00
Luke Clifton
b018ccca8f dvtm: refactor (fix on darwin) (#47103)
(cherry picked from commit 4eebe205fe)
2018-09-25 22:28:48 +02:00
Michael Roitzsch
0253b1e38f podofo: fix library linkage on Darwin (#47214)
* podofo: fix library linkage on Darwin

Because the library is not yet installed when the tools are build, it does not contain its final store path as its install name. Linking the tools picks up this incorrect install name and needs to be fixed after installing.

(cherry picked from commit 4b1ffa0b00)
2018-09-25 22:12:17 +02:00
gnidorah
f2210522d2 tdesktop: support opening urls under wayland
(cherry picked from commit e79ccc1100)
2018-09-25 21:10:33 +01:00
John Ericson
1d542e7e8f Merge pull request #47361 from obsidiansystems/python-format
python-*: Format `pythonPackages` bindings for 18.09
2018-09-25 15:40:01 -04:00
John Ericson
3252c48c29 Merge commit 'a70aeacbf770757212e1845b97ea7d561b5f7af4' into staging-18.09 2018-09-25 14:48:54 -04:00
John Ericson
a70aeacbf7 Merge remote-tracking branch 'upstream/release-18.09' 2018-09-25 14:48:31 -04:00
John Ericson
37a5fcb775 Merge pull request #47356 from obsidiansystems/numpy-fortran
numpy, scipy: Fix some nativeBuildInputs  for 18.09
2018-09-25 14:45:45 -04:00
John Ericson
b7dbd81c9c Merge remote-tracking branch 'upstream/release-18.09' into staging-18.09 2018-09-25 14:19:32 -04:00
zimbatm
35832681f1 firefox-bin: fix channel patching
The patchPhase wasn't being applied at all.

This patch re-enables that and also re-thinks the setting that we want
to have. Turning off the auto-update is more accurate and doesn't lose
information like it did before.

(cherry picked from commit 6060940c24)
2018-09-25 15:49:32 +01:00
Uli Baum
69514d78a6 herqq: mark broken
- build fails with qt511 and qt59
  (it used to build with qt510 which is not available anymore)
- no nixpkgs maintainer
- upstream repo looks inactive, last commit a year ago

(cherry picked from commit 9beaa6dcad)
2018-09-25 12:26:45 +02:00
Uli Baum
a7792ffa4f monodevelop: mark broken
build has failed since 2018-03-08
cc maintainer @obadz

(cherry picked from commit 6b4abb9fa7)
2018-09-25 12:26:45 +02:00
Uli Baum
da6b7f6d84 gtk-sharp-3_0: mark broken
build has failed since 2018-04-28
no maintainer

(cherry picked from commit 395a1528f0)
2018-09-25 12:26:45 +02:00
Uli Baum
294060d163 Revert "virtualization/qemu-vm: fix and improve virtio/scsi switching"
This reverts commit 174e19d1f6.

It broke nixos.ova and eval of some tests.
2018-09-25 11:05:31 +02:00
Notkea
52799425f8 matrix-synapse: 0.33.3.1 -> 0.33.5
Upgrade matrix-synapse to the latest version,
adding a new required dependency (treq)

(cherry picked from commit 4cd6502925)
2018-09-25 10:03:10 +01:00
Colin Rice
86406e24bb go: Remove pkg/obj directory from the build outputs.
This appears to be causing the go package to be roughly 900MB in size.

(cherry picked from commit cdeb26ee76)
2018-09-25 09:47:55 +01:00
Florian Klink
e2d0b3be8d pythonPackages.elasticsearch-dsl: 0.0.9 -> 6.2.1
(cherry picked from commit 18c7fbd78d)
2018-09-25 08:58:11 +01:00
William Casarin
3b175f5d2a clightning: 0.6.0 -> 0.6.1
Update to the latest release.

Highlights for c-lightning users
--------------------------------

  - Less stuck payments: Liveness ping test before locking up funds with peers.
  - Better routing: now considers size of channels.
  - Fewer spurious closes: fee estimate improvements, and new feerates command
  - Several annoying bugs fixed.

Highlights for the network
--------------------------

  - Gossipd now less spammy with channel_update.
  - option_data_loss_protect to protect peers against being out-of-date.
  - Payment errors now refer to the correct channel.

Internal Improvements
---------------------

  - Simplified client flow; after init message exchange by connectd, each is
    isolated in its own daemon.
  - JSON parameter handling vastly simplfied.
  - Python testing framework now uses proper fixtures, and split into separate
    files.
  - Many other cleanups and clarifications.
  - We keepachangelog.com!

Signed-off-by: William Casarin <jb55@jb55.com>

(cherry picked from commit 2aa0b85653)
Backport of #47286
2018-09-25 08:49:32 +02:00
Michael Raskin
2039adfb4c Merge pull request #47289 from 1000101/master
trezord: 2.0.14 -> 2.0.19 and nixos/trezord: revised and updated udev rules
(cherry picked from commit ce411911e8)
2018-09-25 08:38:34 +02:00
Matthew Bauer
633e7ee7fb emacsMacport: 7.1 → 7.2
Fixes a critical issue with macOS

[NEWS](https://bitbucket.org/mituharu/emacs-mac/raw/master/NEWS-mac)

* emacs-26.1-mac-7.2 (2018-09-09)

** Fixed bugs

*** Buffer contents are not displayed on macOS 10.14.
This is mainly because now NSViews are backed by Core Animation Layer
(layer-backed) by default and non-deferred drawing into views no
longer works.  Instead of switching to deferred drawing (i.e., draw
only inside -[NSView drawRect:]), we draw into our own backing bitmap
in a non-deferred way as before, and update the view contents with the
resulting image via -[NSView updateLayer].  This "application-side
double buffering" is also available on OS X 10.8 - macOS 10.13 if you
set the frame parameter `inhibit-double-buffering' to nil when
creating a frame.  Just like on macOS 10.14, such a frame does not do
LCD smoothing.

*** Screenshot grabbed via Services is displayed in wrong size when we
have display mirroring between Retina and non-Retina displays.

*** Cursor movement just after frame resize sometimes leaves garbage.

*** Crash by the Fall_threads call from the GUI thread at the select
emulation when there are multiple Lisp threads.

*** Info title has ASCII underline unlike other window systems.

*** Vertical scroll bar is created as horizontal if frame font height
is short.

** Improvements

*** macOS 10.14 adds property :appearance to (mac-application-state).
The value may be "NSAppearanceNameAqua" or "NSAppearanceNameDarkAqua".

*** Add new color format "mac:COLOR-LIST-NAME:COLOR-NAME" and
"mac:COLOR-NAME" (shorthand for "mac:System:COLOR-NAME").  The actual
color may be different depending on the global appearance setting on
macOS 10.14.  For example, "mac:textColor" is black on the Light Mode
but is white on the Dark Mode.

*** Default frame colors respect appearance setting on macOS 10.14.
Now the default frame foreground/background color is
"mac:textColor"/"mac:textBackgroundColor", respectively.  Changes of
the system setting of the global appearance are dynamically reflected.

*** New function `mac-color-list-alist' to get the available
combinations of COLOR-LIST-NAMEs and COLOR-NAMEs.  Note that this
value is dependent on user environment and OS version.  Also, some
combinations may represent image patterns rather than colors.  For the
former cases, `(color-values "mac:COLOR-LIST-NAME:COLOR-NAME")'
returns nil.
2018-09-24 21:40:01 -05:00
WilliButz
9684fc03bb nixos/gitlab: rebuild authorized_keys during preStart
This updates the path to the 'gitlab-shell' to the
correct store path when gitlab is restarted.

(cherry picked from commit 78ad8d4a62)
2018-09-25 03:54:51 +02:00
Robin Gloster
6c4993b4f6 gitlab module: workhorse may start before gitlab
(cherry picked from commit dc915565ba)
2018-09-25 03:54:50 +02:00
Robin Gloster
6fc98d4d98 gitlab: 11.2.3 -> 11.3.0
(cherry picked from commit ed85eb5433)
2018-09-25 03:54:50 +02:00
Robin Gloster
63e305ba8d gitaly: 0.117.2 -> 0.120.0
(cherry picked from commit cbc21b8b90)
2018-09-25 03:54:49 +02:00
Robin Gloster
7cd7f188bc gitlab-shell: 8.1.1 -> 8.3.3
(cherry picked from commit 545c07108f)
2018-09-25 03:54:49 +02:00
Robin Gloster
450f2f5e5b gitlab-workhorse: 6.0.0 -> 6.1.0
(cherry picked from commit 96c1765bac)
2018-09-25 03:54:49 +02:00
Kristoffer Thømt Ravneberg
2676927ffc nixos/gitlab: avoid creating recursive symlinks, add gitlab-rake deps
(cherry picked from commit f17f59ca8e)
2018-09-25 03:54:48 +02:00
Kristoffer Thømt Ravneberg
2b4a105b8d gitlab-ee: init at 11.2.3
(cherry picked from commit 6946d97ce4)
2018-09-25 03:54:48 +02:00
Kristoffer Thømt Ravneberg
b57d410e1b gitlab: 10.8.0 -> 11.2.3
(cherry picked from commit 51c1830147)
2018-09-25 03:54:47 +02:00
Kristoffer Thømt Ravneberg
c50434a505 gitlab-shell: 7.1.2 -> 8.1.1
(cherry picked from commit bfc8d80c6e)
2018-09-25 03:54:47 +02:00
Kristoffer Thømt Ravneberg
cdb7f84118 gitaly: 0.100.0 -> 0.117.2
(cherry picked from commit 949172f289)
2018-09-25 03:54:46 +02:00
Kristoffer Thømt Ravneberg
b3a1678ce4 gitlab-workhorse: 4.2.0 -> 6.0.0
(cherry picked from commit 45aa373fa9)
2018-09-25 03:54:46 +02:00
John Ericson
0cf38d9921 Merge pull request #47304 from obsidiansystems/haskell-no-rec-18.09
ghc, ghcjs: Get rid of extraneous alex, happy, and hscolour args for 18.09
2018-09-24 20:28:07 -04:00
John Ericson
d6e2a2c4da Merge remote-tracking branch 'upstream/release-18.09' into haskell-no-rec-18.09 2018-09-24 20:11:48 -04:00
John Ericson
5b6fc8f87d Merge remote-tracking branch 'upstream/release-18.09' into haskell-no-rec-18.09 2018-09-24 20:10:19 -04:00
John Ericson
da6e61fedd Merge pull request #47301 from obsidiansystems/haskell-no-rec
haskellPackages: Avoid outer `rec { .. }` for 18.09
2018-09-24 18:59:12 -04:00
Uli Baum
04b04e9745 Merge branch 'release-18.09' into staging-18.09 2018-09-25 00:07:47 +02:00
John Ericson
c896936cd1 Merge pull request #47299 from obsidiansystems/overrideScope-order
lib: Deprecate `overrideScope` in lieu of `overrideScope'` taking arguments in the conventional order for 18.09
2018-09-24 18:04:35 -04:00
Peter Simons
b719e29d95 ghc: add release version for 8.6.1
(cherry picked from commit 2ffcbeda13)
2018-09-24 18:03:16 -04:00
Austin Seipp
b0f8181432 nixos/chrony: clean up, rework to be a little closer to upstream
Most importantly, this sets PrivateTmp, ProtectHome, and ProtectSystem
so that Chrony flaws are mitigated, should they occur.

Moving to ProtectSystem=full however, requires moving the chrony key
files under /var/lib/chrony -- which should be fine, anyway.

This also ensures ConditionCapability=CAP_SYS_TIME is set, ensuring
that chronyd will only be launched in an environment where such a
capability can be granted.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 0ce90d58cc)
2018-09-24 15:43:23 -05:00
baracoder
f34ef9e746 dotnet-sdk: Reduce closure: Unpack to a subdirectory to prevent copying build files (#47269)
(cherry picked from commit 7f0865bac8)
2018-09-24 21:38:59 +01:00
Domen Kožar
31432d4b88 nixos tests: move common configuration into separate file
This allows tests outside nixos to use acme setup.

(cherry picked from commit 6eacc17157)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-09-24 20:09:32 +01:00
Andreas Rammhold
2373df6dcc Merge pull request #47277 from andir/18.09/firefox
[18.09] firefox, firefox-bin 61.0.2 -> 62.0.2, firefox-esr: 60.2.0esr -> 60.2.1esr [Moderate security fixes]
2018-09-24 20:46:38 +02:00
Lorenzo Manacorda
71fd97dd05 *: remove DappHub projects
DappHub maintains a separate overlay at
https://github.com/dapphub/dapptools/blob/master/overlay.nix

(cherry picked from commit 6017c6fa5b)
2018-09-24 18:49:45 +01:00
Maximilian Bosch
32af342e46 eztrace: 1.0.6 -> 1.1-7 (#47282)
See https://hydra.nixos.org/build/80721509
Addresses #45960

(cherry picked from commit 2babfb5a88)
2018-09-24 19:35:22 +02:00
Uli Baum
570ec19f39 nixos/tests/installer: stop udev queue before calling mdadm
In the swraid test, temporarily stop udev queue execution while
creating mdraid devices to prevent a race with udev, see
https://groups.google.com/forum/#!topic/scylladb-dev/u87yHgo3ylU

(cherry picked from commit 7dd6a5192d)
2018-09-24 19:00:29 +02:00
Uli Baum
c2ab695557 nixos/tests/installer: use flock for all parted calls
to further reduce risk of race with udev, like util-linux
recommends for sfdisk:
https://github.com/karelzak/util-linux/blob/v2.32/disk-utils/sfdisk.8#L71

(cherry picked from commit c46677fec2)
2018-09-24 19:00:29 +02:00
Uli Baum
dc74ab0eac nixos/tests/installer: prevent race between parted and udev
by combining all parted commands into a single parted call.
This eliminates one cause of non-deterministic failure.

(cherry picked from commit a5183762c5)
2018-09-24 19:00:29 +02:00
Andrew Dunham
35271fdb2f boost: limit concurrent jobs to the maximum supported number (#47255)
(cherry picked from commit ba278c3b87)
2018-09-24 18:23:05 +02:00
Stefan Junker
174e19d1f6 virtualization/qemu-vm: fix and improve virtio/scsi switching
(cherry picked from commit f777d2b719)
2018-09-24 18:05:15 +02:00
taku0
02429f790b firefox-esr: 60.1.0esr -> 60.2.1esr
(cherry picked from commit e5778a9991)
2018-09-24 17:41:00 +02:00
taku0
53dee62105 firefox: 61.0.2 -> 62.0.2
(cherry picked from commit da9823672f)
2018-09-24 17:40:04 +02:00
taku0
10db65e530 firefox-bin: 61.0.2 -> 62.0.2
(cherry picked from commit 5b79f81a39)
2018-09-24 17:39:05 +02:00
xeji
4f4807ae66 nixos/tests/hound: fix non-deterministic failure (#47152)
The test failed on Hydra in one instance because a request to the
server was sent before indexing was finished.
Retry the request until it succeeds (or times out).

(cherry picked from commit c525111133)
2018-09-24 17:32:51 +02:00
Bas van Dijk
afe328bb5e opencv: 3.4.2 -> 3.4.3
(cherry picked from commit 252c0d4c82)
2018-09-24 16:02:10 +02:00
Maximilian Bosch
32a5d08507 python3Packages.google-compute-engine: fix build (#47267)
The dependency `distro` was missing.
See https://hydra.nixos.org/build/81330387

Addresses #45960

(cherry picked from commit baa7e52fe0)
2018-09-24 15:52:47 +02:00
Daiderd Jordan
3cee0ce5b8 eiskaltdcpp: mark linux only
The darwin build fails and other platforms will probably run into
similar issues.

    Determining if the Q_WS_QWS exist failed with the following output:
    Change Dir: /tmp/nix-build-eiskaltdcpp-2.2.10.drv-0/source/build/CMakeFiles/CMakeTmp

    Run Build Command:"/nix/store/qfag24z6xsr6jkyi8gb4cv62rp945rbk-gnumake-4.2.1/bin/make" "cmTC_14e67/fast"
    /nix/store/qfag24z6xsr6jkyi8gb4cv62rp945rbk-gnumake-4.2.1/bin/make -f CMakeFiles/cmTC_14e67.dir/build.make CMakeFiles/cmTC_14e67.dir/build
    make[1]: Entering directory '/private/tmp/nix-build-eiskaltdcpp-2.2.10.drv-0/source/build/CMakeFiles/CMakeTmp'
    Building CXX object CMakeFiles/cmTC_14e67.dir/CheckSymbolExists.cxx.o
    /nix/store/2gdwhdzhy4iwkp7fh8v6gy6nxj1zi9pv-clang-wrapper-5.0.2/bin/clang++   -I/nix/store/8dzqilmdr0p3qmmrxh51xk7wli6grm0i-qt-4.8.7/include -F/nix/store/8dzqilmdr0p3qmmrxh51xk7wli6grm0i-qt-4.8.7/lib  -std=c++0x -pipe -Wformat -Werror=format-security  -arch x86_64   -o CMakeFiles/cmTC_14e67.dir/CheckSymbolExists.cxx.o -c /tmp/nix-build-eiskaltdcpp-2.2.10.drv-0/source/build/CMakeFiles/CMakeTmp/CheckSymbolExists.cxx
    /tmp/nix-build-eiskaltdcpp-2.2.10.drv-0/source/build/CMakeFiles/CMakeTmp/CheckSymbolExists.cxx:8:19: error: use of undeclared identifier 'Q_WS_QWS'
      return ((int*)(&Q_WS_QWS))[argc];
                  ^

/cc ZHF #45961

(cherry picked from commit 52ad963b50)
2018-09-24 13:59:28 +01:00
Maximilian Bosch
20d144b58c python3Packages.py3exiv2: fix build
Recent boost versions name their `python3` shared objects
`boost_python3x` rather than `boost_python3`.

See https://hydra.nixos.org/build/80712295
Addresses #45960

(cherry picked from commit 50f23da8e6)
2018-09-24 13:53:14 +01:00
Jörg Thalheim
ea48d53c8c Merge pull request #47247 from danme/release-18.09
nvidia-x11: Fix vulkan VK_KHR_xcb_surface
2018-09-24 13:20:02 +01:00
Maximilian Bosch
34cafeee32 Revert "python: ldappool: 2.2.0 -> 2.3.0"
This reverts commit 29acc8339f.

(cherry picked from commit fbeb94dd46)
2018-09-24 13:17:54 +01:00
Florian Klink
7eb1fa2845 systemd: update to fix nspawn containers (#47264)
This fixes nspawn containers with older systemd inside currently failing
to start.

See:
https://github.com/NixOS/systemd/pull/23
https://github.com/systemd/systemd/pull/10104
https://github.com/NixOS/nixpkgs/issues/47253
(cherry picked from commit c3cc34f20a)
2018-09-24 10:03:16 +01:00
Eelco Dolstra
e4966591ef Revert "nixos: set nixos in nixPath"
This reverts commit 67c8c49177.

'nix run nixos.firefox' is *not* supposed to work - the Nix 2.x
interface attempts to standardize on nixpkgs.*, to get rid of the
nixos/nixpkgs confusion that existed with the channels interface. So
let's not bring that confusion back.

(cherry picked from commit 9c53116d49)
2018-09-24 10:44:47 +02:00
Will Dietz
ee582a32d2 NIX_PATH: don't prepend $HOME-based value in session variable, set later
environment.sessionVariables cannot refer to the values of env vars,
and as a result this has caused problems in a variety of scenarios.

One use for these is that they're injected into /etc/profile,
elewhere these are used to populate an 'envfile' for pam
(`pam 5 pam_env.conf`) which mentions use of HOME being
potentially problematic.

Anyway if the goal is to make things easier for users,
simply do the NIX_PATH modification as extraInit.

This fixes the annoying problems generated by the current approach
(#40165 and others) while hopefully serving the original goal.

One way to check if things are borked is to try:

$ sudo env | grep NIX_PATH

Which (before this change) prints NIX_PATH variable with
an unexpanded $HOME in the value.

-------

This does mean the following won't contain user channels for 'will':
$ sudo -u will nix-instantiate --eval -E builtins.nixPath

However AFAICT currently they won't be present either,
due to unescaped $HOME.  Unsure if similar situation for other users
of sessionVariables (not sudo) work with current situation
(if they exist they will regress after this change AFAIK).

(cherry picked from commit fa67ca1543)
2018-09-23 20:08:33 -05:00
Alexander V. Nikolaev
4307b37781 rmilter: deprecation notice
(cherry picked from commit 868040ee22)
2018-09-24 01:41:27 +01:00
Alexander V. Nikolaev
1a159fe86b rmilter: move rmilter.sock out of /run/rmilter
/run/rmilter is set by systemd, and have root:root ownership, which
prevent pid file to write.

This fix suggested to be promoted to 18.09 branch.
(Although rmilter itself is deprecated, and I plan to remove it, after
18.09 would be released)

(cherry picked from commit 08f266490b)
2018-09-24 01:41:26 +01:00
Bas van Dijk
fa3e193e27 haskellPackages.haddock-api: fix build
Also remove haddock-library == 1.4.4 since it's not needed anymore

(cherry picked from commit 77c73cc8eb29da2154d2e9087d7efd7fd9af10f9)
2018-09-24 01:58:08 +02:00
Bas van Dijk
aeb114f7c9 haskellPackages.yi-core: use overrideScope instead of override
(cherry picked from commit 2de9705b9fcaa3650ea85a9f5e2aee834948fc8f)
2018-09-24 01:58:01 +02:00
Bas van Dijk
d99f352d1d haskellPackages.safe-money-*: use overrideScope instead of override
(cherry picked from commit 2481b366f6ea964889d1010e4159055cef7b5b95)
2018-09-24 01:57:55 +02:00
Bas van Dijk
21808eca2b haskellPackages.Frames: use overrideScope instead of override
(cherry picked from commit f1f2c2d3fc74d52f445f08f0f0410d1be586532b)
2018-09-24 01:57:49 +02:00
Matthew Bauer
9b696718bb nixos: make firefox default browser
Without this the graphical installer has no way to open the manual.
You can fix it yourself by installing any HTML browser but this might
be unfamiliar to users new to NixOS and without any other way to open
the manual. The downside is it will also increase download sizes.

Fixes #46537
2018-09-23 18:49:09 -05:00
Matthew Bauer
cb52ea4f19 kde: add kdoctools to default environment
khelpcenter needs meinproc5 to work properly. Hopefully doesn’t effect
closure sizes too much - kdoctools is rather small.

Fixes #46539

/cc @ttuegel
2018-09-23 18:48:53 -05:00
Matthew Bauer
95f31078f5 nixos: set nixos in nixPath
This makes using the nixos channel work out of the box with the new
Nix commands. For example:

$ nix run nixos.firefox -c firefox

Fixes #46536
2018-09-23 18:48:40 -05:00
Andrew Dunham
18a7c1df64 hdf4: fix build on aarch64-linux (#47209)
Pull in the Debian patches for AArch64 support, and a bonus patch for
reproducible builds while we're at it.

(cherry picked from commit 104014c6ba)
2018-09-23 23:57:59 +02:00
Bas van Dijk
9b4d87cec5 haskellPackages.Euterpea: fix build by using PortMidi == 0.2
(cherry picked from commit 9b67908e67)
2018-09-23 22:50:45 +02:00
Maximilian Bosch
c49fa222a7 pythonPackages.pyftgl: fix build (#47232)
See https://hydra.nixos.org/build/80705583

Recent `boost` versions with `python` enabled have changed their naming
scheme for `boost_python` shared objects which causes issues with the
proper linking when building `pyftgl`.

Previously the library was named `boost_python3`, no it's named
`boost_python36` for current python (3.6.x).

The same issue applies for the `python2`.

Addresses #45960

(cherry picked from commit 5ad7aedf63)
2018-09-23 22:39:44 +02:00
danme
3ab740ad40 nvidia-x11: Fix vulkan VK_KHR_xcb_surface
Fixes the issue: https://github.com/NixOS/nixpkgs/issues/39149

Problem was that the Nvidia driver did not find the libxcb-glx at runtime.

(cherry picked from commit bda072cafc)
2018-09-23 22:18:17 +02:00
Bas van Dijk
ef9e8bd933 haskellPackages.Frames-beam: disable tests because it requires a running PostgreSQL server
(cherry picked from commit 73cf1c26d8)
2018-09-23 21:59:02 +02:00
Bas van Dijk
9e57b836ca haskellPackages.Frames: fix build by using vinyl-0.10.0
(cherry picked from commit ff6122c993)
2018-09-23 21:58:53 +02:00
Maximilian Bosch
19e8f7c977 tig: fix zsh completion
The ZSH completion script of `tig` basically imports the bash completion
script and uses it as completion approach. Unfortunately the script
takes several assumptions about the directory structure using
`$funcsourcetrace`[1] that don't apply on NixOS.

The easiest workaround is t opatch the completion script and import the
bash completion script from `$out`.

[1] http://zsh.sourceforge.net/Doc/Release/Zsh-Modules.html#index-funcsourcetrace
2018-09-23 19:21:58 +01:00
John Ericson
8b60c7d088 doc: Don't mention top-level {build, host, target}Platform
For technical reasons, we cannot easily add a warning to top-level
definitions, so 2a6e4ae49a and
e51f736076 reverted the deprecation. But
we can still remove mention of the would-be deprecated definitions to
steer people towards using the preferred alternatives.

(cherry picked from commit e39a73cc55)
2018-09-23 13:29:08 -04:00
John Ericson
7ca9ae5c2b top-level: system should still come from the host platform
2a6e4ae49a and
e51f736076 reverted a bit too much, and I
initially missed this when reviewing. The release notes already still
mention this change, too.

(cherry picked from commit 359d00f8b0)
2018-09-23 13:29:06 -04:00
Bas van Dijk
e611a82197 Revert "libtensorflow: 1.9.0 -> 1.10.0"
This reverts commit 713991132e.

libtensorflow is only used by the Haskell tensorflow packages and they
don't work with tensorflow-1.10 yet. So the easiest solution is to
just revert this commit and add it back when they do gain support.

(cherry picked from commit 6e14b9fc2d)
2018-09-23 19:17:12 +02:00
Bas van Dijk
b2c49a7750 Revert "libtensorflow: fix hashes for darwin and cuda downloads"
This reverts commit 93ed13f86b.

libtensorflow is only used by the Haskell tensorflow packages and they
don't work with tensorflow-1.10 yet. So the easiest solution is to
just revert this commit and add it back when they do gain support.

(cherry picked from commit 39d35e77ee)
2018-09-23 19:17:05 +02:00
John Ericson
9f4d633d93 Merge commit '84c8e397d234bcdbd7ee4a41bf6b705d1250250c' into release-18.09 2018-09-23 13:06:12 -04:00
volth
8b20d98e82 alternative for iproute module (#41801)
(cherry picked from commit 0fa04d646d)

It is unfortunate to cherry-pick something with release notes to the
release staging branch so close to the release. But the change is to a
new service so no one comming from 18.03 would be surprised to a
last-minute change in behavior. Furthermore, the change is a month old
and it appears it only wasn't cherry-picked already by mistake.
2018-09-23 12:24:08 -04:00
John Ericson
afa89e9408 Merge remote-tracking branch 'upstream/release-18.09' into staging-18.09 2018-09-23 12:17:37 -04:00
Florian Klink
5bb85cd45c php: set mysql socket path if mysql[i] or pdo_mysql support is enabled
PHP tries to discover the mysql default socket path during configure
phase by probing the file system:
cf3b852109/ext/mysqli/config.m4 (L4)

This obviously fails to discover /run/mysqld/mysqld.sock, which is being
used (hardcoded) across all MySQL flavours.

This leads to PHP having no mysql socket path set for the mysql[i]
extensions, and `/tmp/mysql.sock` set for pdo_mysql,
meaning one currently has to manually configure and set it in php.ini.

Luckily, PHP supports setting that path via
`--with-mysql-sock=/run/mysqld/mysqld.sock` during configure phase,
so let's do this as soon as one of the three modules is enabled.

(cherry picked from commit baa04e4204)
2018-09-23 16:19:18 +01:00
John Ericson
a06d703851 Merge commit '45f40f5fe02d71f9863e54277a50fe7e1dc46afa' into release-18.09 2018-09-23 11:03:47 -04:00
Andrew Dunham
48625909dc erlangR18: apply upstream patches to fix nondeterministic build failures (#47202)
As per the following bug report, sometimes erts/start_scripts will fail
to compile because of a Makefile ordering issue. Apply the upstream
patches to fix this.
  https://bugs.erlang.org/browse/ERL-241

(cherry picked from commit c987ed0896)
2018-09-23 11:02:47 +02:00
xeji
2c83b339c6 nixos/tests/prosody: use sqlite database (#47185)
The test didn't catch an issue with luadbi because it used
internal storage only. Switch to sqlite to test sql access.

(cherry picked from commit 589b290b43)
2018-09-23 10:46:55 +02:00
Vladimír Čunát
317ce1b622 Merge: nixos/weechat backports
Close #46861 - it's exactly the same commits, just with -x annotations.
2018-09-23 10:41:01 +02:00
adisbladis
e44b6cd961 weechat: Add version and meta to buildEnv package
Currently the output from `nix search` and similar tools are lacking
important meta data

(cherry picked from commit 230fd49738)
2018-09-23 10:39:19 +02:00
Maximilian Bosch
a1c48b9ea6 weechatScripts.weechat-matrix-bridge: don't export `olm.lua' as script (#46582)
Loading olm.lua as weechat script with `/script load olm.lua' causes
errors like this:

```
/nix/store/43jbh7yxh8j4gjfzbvpd9clncah5dip1-weechat-matrix-bridge-2018-05-29/lib/ffi.so: undefined symbol: lua_tointeger
```

As `olm.lua' is loaded by `matrix.lua' it doesn't need to be included
manually by the weechat configuration.

(cherry picked from commit 61a9463498)
2018-09-23 10:37:51 +02:00
Maximilian Bosch
9ceff9e3e5 weechat: fix quoting for ${} syntax
In my previous PR I missed that ${sec.foobar} (syntax to retrieve
secrets in a weechat runtime) breaks the shell evaluation.

Furthermore `;` shall be used rather than `\n` to concat scripts and the
init config.

(cherry picked from commit e2b4644f9c)
2018-09-23 10:37:27 +02:00
Maximilian Bosch
79b38a9795 weechatScripts.wee-slack: init at 2.1.1
(cherry picked from commit f5becfb5b0)
2018-09-23 10:34:59 +02:00
Maximilian Bosch
d74a291ea6 nixos/weechat: cleanup module, add module documentation
This adds several improvements the previously introduced
`services.weechat` module:

* Dropped `services.weechat.init` as the initialization script can now
  be done on package-level since 2af41719bc using the `configure`
  function.

* Added `sessionName` option to explicitly configure a name for the
  `screen` session (by default: weechat-screen).

* Added `binary` option to configure the binary name (e.g.
  `weechat-headless`).

* Added docs regarding `screen` session and `weechat.service`.

(cherry picked from commit 18d419141d)
2018-09-23 10:34:24 +02:00
Maximilian Bosch
27c2215684 weechat: 2.1 -> 2.2; improve package configuration
This aims to make the `weechat` package even more configurable. It
allows to specify scripts and commands using the `configure` function
inside a `weechat.override` expression.

The package can be configured like this:

```
with import <nixpkgs> { };
weechat.override {
  plugins = { availablePlugins, ... }: {
    plugins = builtins.attrValues availablePlugins;

    init = ''
      /set foo bar
      /server add freenode chat.freenode.org
    '';

    scripts = [ "/path/to/script.py" ];
  };
}
```

All commands are passed to `weechat --run-command "/set foo bar;/server ..."`.

The `plugins' attribute is not necessarily required anymore, if it's
sufficient to add `init' commands, the `plugins' will be
`builtins.attrValues availablePlugins' by default.

Additionally the result contains `weechat` and `weechat-headless`
(introduced in WeeChat 2.1) now.

(cherry picked from commit a8efe61412)
2018-09-23 10:33:56 +02:00
Yegor Timoshenko
b4f299eddb weechat: add NixOS module
(cherry picked from commit b54987715b)
2018-09-23 10:33:09 +02:00
Samuel Dionne-Riel
7c7f9623dc qesteidutil: Fixes build from Qt upgrade. (#46083)
(cherry picked from commit ef2b217812)
2018-09-23 10:15:18 +02:00
Andrew Dunham
0d7c472fd7 pythonPackages.flask_assets: fix tests (#47203)
(cherry picked from commit e141f7cd2f)
2018-09-23 10:03:35 +02:00
Andrew Dunham
233328cde5 xsecurelock: 1.0 -> 1.1
(cherry picked from commit da18ffac6b)
Backport of #47190
2018-09-23 09:56:59 +02:00
Uli Baum
73ceb7742c nixos/iso-image: fix 32bit UEFI boot
UEFI iso image for i686 didn't boot because the
default boot file was incorrectly named bootx32.efi.
The correct name is bootia32.efi.

(cherry picked from commit 845ae983f6)
2018-09-23 00:47:29 -04:00
Daiderd Jordan
1cae9ef0fd ffmpeg: don't use gcc on darwin (#47189)
This isn't necessary and causes build failures for certain versions.

    CC      libavfilter/libmpcodecs/vf_eq2.o
    CC      libavfilter/libmpcodecs/vf_fil.o
    CC      libavfilter/libmpcodecs/vf_fspp.o
    libavfilter/libmpcodecs/vf_fspp.c:939:18: error: unknown token in expression
            movq %mm2, 0*8+(%rsp)

/cc ZHF #45961

(cherry picked from commit 52a1179b6c)
2018-09-22 23:13:40 +02:00
Jörg Thalheim
2de47a73c8 luaPackages.luadbi: 0.5 -> 0.6 (#47156)
Switch to maintained fork that is compatible with lua5.2/lua5.3.
This package was tested with prosody.

(cherry picked from commit a8413d816a)

Backported because prosody database access is broken without it.
2018-09-22 22:30:02 +02:00
Uli Baum
10a9c597ad Merge branch 'release-18.09' into staging-18.09 2018-09-22 21:53:17 +02:00
Elis Hirwing
11aa1784b1 php: Refactor so we can upgrade PHP per platform (#47162)
This way we don't need to disable flags etc by platform and can still
backport new versions to stable for linux even if there's a bug or
something in the darwin build.

(cherry picked from commit 0b82fbc3af)
2018-09-22 20:27:44 +02:00
Elis Hirwing
e7ffc978c7 php71: 7.1.21 -> 7.1.22
Changelog: https://secure.php.net/ChangeLog-7.php#7.1.22
(cherry picked from commit 89b7ad263e)
2018-09-22 20:27:26 +02:00
Elis Hirwing
922f74af6d php: 7.2.8 -> 7.2.10
Changelog 7.2.9: http://php.net/ChangeLog-7.php#7.2.9
Changelog 7.2.10: http://php.net/ChangeLog-7.php#7.2.10

(cherry picked from commit 5a868df967)
2018-09-22 20:27:16 +02:00
Joachim Fasting
2625469949 tor-browser-bundle-bin: 8.0 -> 8.0.1
(cherry picked from commit f2ba1a4284)
2018-09-22 20:19:23 +02:00
Andrew Dunham
ad9e8ea664 libsndfile: Add patch for CVE-2018-13139 (#47160)
(cherry picked from commit fcde178ed5)
2018-09-22 19:34:30 +02:00
Christian Kauhaus
b831700b8f lua: 5.2.3 -> 5.2.4 (#47126)
Lua 5.2.4 is the EOL point release of the 5.2 series.

(cherry picked from commit 6adb944cb6)
2018-09-22 19:11:47 +02:00
xeji
9e4916b84d devpi-client: 3.1.0 -> 4.1.0, fix tests (#47142)
(cherry picked from commit c770699524)
2018-09-22 18:08:37 +02:00
Jean-Paul Calderone
8342f255e1 nixos/tor: Correct "transparent" typo
(cherry picked from commit 57834da7fc)
2018-09-22 15:46:45 +02:00
Joachim Fasting
d25ed2c9f7 electrum: 3.1.3 -> 3.2.3
(cherry picked from commit 1e379f29f7)
2018-09-22 15:46:45 +02:00
Joachim Fasting
2cbfd84d80 tor-browser-bundle-bin: stdenv.shell -> runtimeShell in wrapper
(cherry picked from commit aacf68a635)
2018-09-22 15:46:44 +02:00
Joachim Fasting
f683eaaedc tor-browser-bundle-bin: parameterize icon theme
(cherry picked from commit 546e511edc)
2018-09-22 15:46:43 +02:00
Joachim Fasting
9a7d79c221 tor-browser-bundle-bin: add gsettings-schemas
See https://github.com/NixOS/nixpkgs/issues/46587

(cherry picked from commit 5710ee3bef)
2018-09-22 15:46:42 +02:00
Joachim Fasting
95258ee051 tor-browser-bundle-bin: 7.5.6 -> 8.0
(cherry picked from commit ed5283fcf5)
2018-09-22 15:46:41 +02:00
Joachim Fasting
26152dfaa1 tor: 0.3.3.9 -> 0.3.4.8
(cherry picked from commit 48abf865bc)
2018-09-22 15:46:36 +02:00
Leo R. Lundgren
1e46ead867 open-vm-tools: 10.1.10 -> 10.3.0
(cherry picked from commit bbb30c320e)
2018-09-22 20:19:04 +08:00
xeji
4a620decd3 zathura: 0.4.0 -> 0.4.1 (#47140)
This fixes the synctex-related build failure with texlive 2018
(currently on 18.09).

(cherry picked from commit 9e87b56dd1)
2018-09-22 14:18:09 +02:00
John Ericson
409fd48e64 Merge pull request #47146 from obsidiansystems/fetchzip-cross
fetchzip: Use unzip from buildPackages
2018-09-21 14:52:21 -04:00
John Ericson
2ef1d084c5 Merge pull request #47144 from obsidiansystems/windows-libusb
libusb1: Build everywhere, since MinGW works, for 18.09
2018-09-21 14:28:40 -04:00
Daiderd Jordan
5165dfe9de docker-proxy: mark linux only
Unlike docker (cli only) this probably won't work on darwin.

    github.com/docker/libnetwork/networkdb
    can't load package: package github.com/docker/libnetwork/ns: build constraints exclude all Go files in /private/tmp/nix-build-docker-proxy-7b2b1feb1de4817d522cc372af149ff48d25028e.drv-0/go/src/github.com/docker/libnetwork/ns

/cc ZHF #45961

(cherry picked from commit 33f818198b)
2018-09-21 20:15:55 +02:00
Daiderd Jordan
61ce290c2b dico: mark linux only.
Never built successfully.

    Undefined symbols for architecture x86_64:
      "_rpl_strerror", referenced from:
          _default_print_diag in libgrecs.a(diag.o)
          _grecs_symtab_strerror in libgrecs.a(symtab.o)
          _parse_inet in libgrecs.a(sockaddr.o)
    ld: symbol(s) not found for architecture x86_64

/cc ZHF #45961

(cherry picked from commit 709a828e71)
2018-09-21 20:15:53 +02:00
Daiderd Jordan
488a45d7a2 dolphinEmuMaster: mark broken on darwin
The default version isn't enabled on darwin either, however it did work
at some point.

    /tmp/nix-build-dolphin-emu-2018-08-17.drv-0/source/Source/Core/Core/NetPlayServer.cpp:1180:26: error: unknown type name 'lzo_uint32_t'; did you mean 'lzo_uint32'?
      std::vector<u8> wrkmem(LZO1X_1_MEM_COMPRESS);

/cc ZHF #45961

(cherry picked from commit f6bc086b21)
2018-09-21 20:15:52 +02:00
Bas van Dijk
93506c3a0b haskellPackages.mandrill: fix build for ghc843
(cherry picked from commit 73862bf812)
2018-09-21 19:12:50 +02:00
Christoph Hrdinka
fc3cfe3af5 libretro.mame: 2017-03-02 -> 2018-09-13
Fixes build of the MAME libretro core.

Closes #47137.

Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
2018-09-21 18:55:26 +02:00
José Romildo Malaquias
c16b9dacb4 ephoto: add dependency on mesa_noglu.dev (#47136)
(cherry picked from commit e372ab4626)
2018-09-21 18:26:18 +02:00
Michael Raskin
fd6930685c acl2: 8.1.post.2018.09.20 -> 8.1; turns out there is a release
(cherry picked from commit 60b6d5f8a8)
2018-09-21 18:08:05 +02:00
José Romildo Malaquias
edf5020042 rage: add dependency on mesa_noglu.dev (#47132)
(cherry picked from commit 7ac0ecc12b)
2018-09-21 17:41:54 +02:00
Michael Raskin
d10c5b88de acl2: 8.0 -> 8.0.post.2018.09.20; fixes build with fresher SBCL
(cherry picked from commit de764e65f0)
2018-09-21 12:13:49 +02:00
Vladimír Čunát
7eec667f5b Merge branch 'staging-18.09' into release-18.09
The comparison seems very good on Hydra.
2018-09-21 12:02:35 +02:00
Uli Baum
793776b730 nixos/tests/ferm: disable dhcpcd
The test failed in one run on Hydra, logs look like
dhcpcd changed ipv6 routing at just the wrong time.
Disable dhcpcd. It's not needed, the test uses static IPs anyway.

(cherry picked from commit 5e7b7b805a)
2018-09-21 09:59:16 +01:00
Mario Rodas
c1328a1779 bat: install man page (#47099)
(cherry picked from commit ba33eac477)
2018-09-21 10:23:57 +02:00
Uli Baum
711ff4b687 nixos/tests/atd: wait for atd to start
The test failed non-deterministically when an at command was
issued before the atd daemon was running.

(cherry picked from commit 8ffd65b12e)
Backport to 18.09
2018-09-21 10:10:16 +02:00
John Ericson
ef450efb9d Merge pull request #47097 from obsidiansystems/fix-x509-system
haskellPackages.x509-system: Override based on the host, not target platform for 18.09
2018-09-20 21:55:29 -04:00
Graham Christensen
a84a302732 Clarfy the binary reproducibility problems of created=now with dockerTools.buildImage.
(cherry picked from commit 7736337916)
2018-09-20 20:31:52 -04:00
Graham Christensen
9eefd1e846 dockerTools.buildImage: test that created=now makes an unstable date
(cherry picked from commit aedc651903)
2018-09-20 20:31:52 -04:00
Graham Christensen
0fe015a70c dockerTools.buildImage: support impure dates
Because dates are an impurity, by default buildImage will use a static
date of one second past the UNIX Epoch. This can be a bit frustrating
when listing docker images in the CLI:

    $ docker image list
    REPOSITORY   TAG      IMAGE ID       CREATED        SIZE
    hello        latest   08c791c7846e   48 years ago   25.2MB

If you want to trade the purity for a better user experience, you can
set created to now.

    pkgs.dockerTools.buildImage {
      name = "hello";
      tag = "latest";
      created = "now";
      contents = pkgs.hello;

      config.Cmd = [ "/bin/hello" ];
    }

and now the Docker CLI will display a reasonable date and sort the
images as expected:

    $ docker image list
    REPOSITORY   TAG      IMAGE ID       CREATED              SIZE
    hello        latest   de2bf4786de6   About a minute ago   25.2MB

(cherry picked from commit a32d7e0c74)
2018-09-20 20:31:51 -04:00
Austin Seipp
f40d13666e perlPackages.MojoIOLoopForkCall: 0.19 -> 0.20
Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 0214f9e25e)
2018-09-20 18:40:58 -05:00
Austin Seipp
b59c61198a perlPackages.Mojolicious: 7.88 -> 8.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 08815b9af8)
2018-09-20 18:40:47 -05:00
Austin Seipp
e4b0c7bbd2 libiio: init at 0.15
(cherry picked from commit 0f2b10d1ac)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-09-20 18:39:17 -05:00
Nathan van Doorn
70ecb51beb haskellPackages.sbv: fix location of z3 executable
A lot of the functionality of the z3 library depends on it being able to
find the z3 executable on $PATH. Hard-coding it here means it will never
be unable to find it and z3 doesn't need to pollute $PATH.

(cherry picked from commit c8598daad4)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-09-20 18:32:04 -05:00
roconnor
40d22a78b7 bitcoin: 0.16.2 -> 0.16.3 (#46891)
(cherry picked from commit fab901ddd3)

security: fixes CVE-2018-17144
2018-09-21 00:36:12 +02:00
xeji
a31fc1ca57 liquidwar: fix build (#47064)
- add missing dependencies readline and libtool that used to be
  propagated by guile but aren't anymore
- build with guile 2.0 instead of 1.8

(cherry picked from commit 2c5ae2ae61)
2018-09-21 00:21:31 +02:00
xeji
abdbf1ccd6 pythonPackages.circus: fix build, add meta (#47066)
(cherry picked from commit 9c02914b42)
2018-09-21 00:21:31 +02:00
xeji
af334fe875 nixos/tests/gdk-pixbuf: fix test on i686 (#46916)
Test didn't run because it tried to create a VM with 4096M RAM
but qemu-system-i386 has a hard 2047M memory limit.
- reduce memory to 2047M on i686.
- increase timeout 300s -> 1800s because the tests are much slower
  on i686 and timed out.

(cherry picked from commit e40d850fd1)
2018-09-20 21:30:06 +02:00
Vincent Laporte
355a0377b1 ocaml ≤ 4.05: mark as broken on Aarch64 (#47010)
(cherry picked from commit ce03af969e)
2018-09-20 21:19:00 +02:00
Tim Steinbach
6ec64973bc linux: 4.18.8 -> 4.18.9
(cherry picked from commit 3e4377cf15fb153010ff8d49dcaf131f1dfe0af9)
2018-09-20 09:53:19 -04:00
Tim Steinbach
3f2aa18db8 linux: 4.14.70 -> 4.14.71
(cherry picked from commit 1c620c669655c1aa7a101a7fafba7327a60293c1)
2018-09-20 09:53:13 -04:00
Tim Steinbach
e8f3acd155 linux: 4.9.127 -> 4.9.128
(cherry picked from commit 172e43335443b15ba25989759eb4085bed55542a)
2018-09-20 09:53:02 -04:00
Tim Steinbach
672b375dfc linux: 4.4.156 -> 4.4.157
(cherry picked from commit 9d678ecf88ee0691cd85d348a790802239faaa10)
2018-09-20 09:52:55 -04:00
xeji
d5cbdecd3b nixos/tests/networking.virtual: prevent non-deterministic failure (#46949)
The test failed non-deterministically on Hydra because interfaces
sometimes weren't yet fully cleaned up when the result was checked.

(cherry picked from commit 05659962cd)
2018-09-20 13:21:24 +02:00
Uli Baum
43809bd8d4 gitlab: add missing meta.platforms
(cherry picked from commit 8cd90e40be)
2018-09-20 12:57:46 +02:00
Maximilian Bosch
b89050daac nixos/yabar: fix module & test (#46954)
The `pkgs.yabar` package is relatively old (2016-04) and contains
several issues fixed on master. `yabar-unstable` containsa recent master
build with several fixes and a lot of new features (I use
`yabar-unstable` for some time now and had no issues with it).

In the upstream bugtracker some bugs could be fixed on ArchLinux by
simply installing `yabar-git` (an AUR package which builds a recent
master).

To stabilize the module, the option `programs.yabar.package` now
defaults to `pkgs.yabar-unstable` and yields a warning with several
linked issues that are known on `pkgs.yabar`.

The test has been refactored as well to ensure that `yabar` actually
starts (and avoid non-deterministic random success) and takes a
screenshot of a very minimalistic configuration on IceWM.

Fixes #46899

(cherry picked from commit 8b58a7187c)
2018-09-20 12:48:21 +02:00
R. RyanTM
d4e9c35441 wireguard-tools: 0.0.20180904 -> 0.0.20180918
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wireguard-tools/versions

(cherry picked from commit 03d8620098)
2018-09-20 08:33:56 +01:00
xeji
175d49256f pythonPackages.nilearn: disable still failing tests (#46918)
A previous attempt to fix tests failing on some machines (#46850)
was unsuccessful, they still failed on Hydra sometimes while
succeeding locally. Revert #46850 and disable these tests instead.

(cherry picked from commit f3a0c8a3aa)
2018-09-19 23:50:53 +02:00
xeji
08c39f8d47 arelle: fix build, use current python3 (#46862)
It was pinned to python34, build failed in dependency
python34Packages.pytest. Use python3(6) instead.

(cherry picked from commit a0c5dd8a09)
2018-09-19 22:19:17 +02:00
Domen Kožar
b8f71e3c79 datadog-agent: remove privateTmp=true
This allows postgres integration to connect to socket in /tmp

(cherry picked from commit 5715aa1951)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-09-19 18:56:25 +01:00
John Ericson
90e9b8d0f9 Merge pull request #46904 from obsidiansystems/zlib-ios
zlib: Fix iOS cross build for 18.09
2018-09-19 12:49:14 -04:00
Edmund Wu
d3905a3ddf lightdm: fix tmpfiles path (#46886)
(cherry picked from commit 1a15b10ae3)
2018-09-19 16:54:40 +02:00
xeji
3af2eb2072 exempi: fix i686 build (#46884)
failed with `unknown symbol __divmoddi4`.
Standard fix is to use gcc6.

(cherry picked from commit d57c9ec407)
2018-09-19 16:20:35 +02:00
xeji
d5d36e5d2c nixos/tests/hibernate: prevent non-deterministic failure (#46882)
... that occurred mostly on i686. Improve timing.
With this, the failures are no longer reproducible on my machine.

(cherry picked from commit beb8ca2887)
2018-09-19 16:20:35 +02:00
xeji
842b9054e8 nixos/tests/containers-imperative: fix on i686 (#46874)
Test failed on i686 in a sandbox because some packages required
to build the nixos manual for the container were missing. Add them.

(cherry picked from commit daf40ab165)
2018-09-19 16:20:34 +02:00
xeji
2c43ad2498 openxpki: fix build, use current python3Packages (#46860)
Build used python34Packages and failed because python34Packages.pytest
didn't build anymore. Use python3Packages instead.

(cherry picked from commit 012682222f)
2018-09-19 16:17:27 +02:00
xeji
1bc047d46e czmq: 4.0.2 -> 4.1.1 (#46855)
(cherry picked from commit c9969162ab)
2018-09-19 16:17:27 +02:00
xeji
fd0c124cd6 pythonPackages.nilearn: fix test_signal tests (#46850)
These tests failed on some machines, probably due to lower arithmetic
presicion. Reduce required precision from 13 to 8 decimal digits.

(cherry picked from commit 970393c34a)
2018-09-19 16:17:27 +02:00
Jörg Thalheim
09d8df5b21 python3.pkgs.typeguard: fix builds by applying utf-8 locales
ZHF #45960

(cherry picked from commit b224eef108)
2018-09-19 15:14:15 +01:00
Pascal Wittmann
86f9a958cf homebank: 5.1.8 -> 5.2.1 2018-09-19 15:06:55 +02:00
aszlig
d07dbd4490 python/hetzner: 0.8.0 -> 0.8.1
This is only a minor bugfix release and updates the fallback CA root
certificates. For NixOS this is usually not required as the probe paths
will match there, but for non-NixOS users it might be helpful.

Signed-off-by: aszlig <aszlig@nix.build>
(cherry picked from commit 48d1c50f7a)
Reason: This might be relevant for NixOps users on Mac OS X and the
        update won't break anything that wasn't broken before.
2018-09-19 14:32:20 +02:00
Jack Kelly
adb467eeaf dockerTools.pullImage: correct default arch
(cherry picked from commit af5eab6ea6)
2018-09-19 09:28:35 +02:00
John Ericson
b853e73d52 Merge pull request #46873 from obsidiansystems/cross-haskell-ar-flag
haskell infra: Also pass `--with-ar` in cross builds for 18.09
2018-09-18 19:14:17 -04:00
John Ericson
d29a153655 Merge remote-tracking branch 'upstream/release-18.09' into staging-18.09 2018-09-18 16:56:24 -04:00
John Ericson
5b053b4697 Merge pull request #46858 from obsidiansystems/darwin-to-linux-prep
misc pkgs: various cross fixes in preparation for darwin->linux for 18.09
2018-09-18 16:52:36 -04:00
Elis Hirwing
4c4aff3293 nixos/activation: Switch from bash to sh to avoid reading users bash config (#46851)
This fixes #46750. This should also work with non-POSIX shells like in #46042.

(cherry picked from commit 5664e64a01)
2018-09-18 21:48:02 +02:00
Domen Kožar
68c956914b datadog-integrtaions-core: 2018-05-27 -> 2018-09-18
(cherry picked from commit 943871a866)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-09-18 20:23:44 +01:00
xeji
bc7ec9b651 nixos/release.nix: disable tests.ec2-config (#46830)
This test doesn't work in a sandbox and never succeeded on Hydra.
It simulates an EC2 instance reconfiguring itself at runtime,
which needs network access.

(cherry picked from commit a83d61b708)
2018-09-18 19:27:57 +02:00
Graham Christensen
374d22d68d Merge pull request #46838 from grahamc/check-outputs-in-meta-18.09
stdenv: Validate meta.outputsToInstall
2018-09-18 12:45:01 -04:00
Uli Baum
3d949911c0 gtk-doc: don't build with dblatex by default
make it optional: withDblatex ? false
This removes the dependency of gtk-doc on texlive.

(cherry picked from commit d6ecbe1410)
2018-09-18 18:39:04 +02:00
Robin Gloster
69da311f79 texlive: fix missing synctex header
The automake file was patched but `automake` not run.
Also since the texk/web2c folder is not in autoconfig's
SUBDIRS the autoreconfHook has to be run in there.

Completely fixes #46376

(cherry picked from commit ce6e72a11c)
2018-09-18 18:34:54 +02:00
Graham Christensen
24ad8ada2e elf-header-real: fixup outputsToInstall
(cherry picked from commit 301109a2dd)
2018-09-18 12:28:23 -04:00
Graham Christensen
da5fd39d21 stdenv: Validate meta.outputsToInstall
If meta.outputsToInstall is set to include absent outputs, various
tools break including channel updates and nix-env.

    grahamc@Morbo> nix-env -i -f . -A elf-header-real
    installing 'elf-header'
    error: this derivation has bad 'meta.outputsToInstall'

This patch verifies each value in meta.outputsToInstall is a valid
output. It validates this condition only if checkMeta is true.

    grahamc@Morbo> nix-build . -A elf-header-real
    error: Package ‘elf-header’ in /home/grahamc/projects/nixpkgs/pkgs/development/libraries/elf-header/default.nix:36 has invalid meta.outputsToInstall, refusing to evaluate.

    The package elf-header has set meta.outputsToInstall to: bin

    however elf-header only has the outputs: out

    and is missing the following ouputs:

      - bin

    (use '--show-trace' to show detailed location information)

Note, now the nix-env experience is decidedly worse for users who have
checkMeta set to true:

    grahamc@Morbo> nix-env -i -f . -A elf-header-real; echo $?
    0

though since this is already an issue for unfree, broken, unsupported,
and insecure validity problems I'm not sure we should do something
different here.

(cherry picked from commit b80c9ce4a9)
2018-09-18 12:28:23 -04:00
WilliButz
6ffa699c86 prometheus-json-exporter: add patch to support bool parsing
(cherry picked from commit b59cd2bc17)
2018-09-18 18:22:47 +02:00
WilliButz
ef7921a342 prometheus-json-exporter: 2016-09-13 -> 2017-10-06
(cherry picked from commit b712736283)
2018-09-18 18:22:47 +02:00
Adam Finn Tulinius
81884ce1b4 OVMF: update homepage
Tianocore was apparently moved from SourceForge to GitHub.

(cherry picked from commit 8b8474b1b5)
2018-09-18 13:16:53 +01:00
Clemens Fruhwirth
f339ca57cc mpack: Invoke /run/wrappers/bin/sendmail via execvp
Calling /run/current-sw/bin/sendmail fails under postfix because
setgid bits are not set. Switching the hardcoded path to an invocation
via execvp should cover both cases, when the sendmail binary is
setgid-wrapped and when it is not.

(cherry picked from commit 6d97096d8b)
2018-09-18 10:01:56 +01:00
pacien
083237f061 exim: enable LMTP support
This makes the LMTP transport available by default.
No additional dependency is required.

(cherry picked from commit c3dd421a2e)
2018-09-18 09:51:28 +02:00
José Romildo Malaquias
e97e63bd63 efl: 1.21.0 -> 1.21.1
(cherry picked from commit 5f1c33efce)
2018-09-18 09:43:53 +02:00
John Ericson
4bd5b51c3a Merge pull request #46816 from obsidiansystems/darwin-android-ndk
androidndk: Add Darwin support for 18.09
2018-09-17 23:01:41 -04:00
Yegor Timoshenko
a001c45db2 Merge pull request #46803 from vaibhavsagar/bump-all-cabal-hashes-18.09
all-cabal-hashes: update snapshot to Hackage at 2018-09-12T08:26:27Z
2018-09-17 23:48:28 +00:00
Jörg Thalheim
0ad7d4feb7 heroku: fix homepage
(cherry picked from commit 11dcb770b9)
2018-09-17 22:39:50 +01:00
Bob van der Linden
4ba68be6d5 heroku: set HEROKU_DISABLE_AUTOUPDATE=1
(cherry picked from commit db571e9b78)
2018-09-17 22:39:50 +01:00
Bob van der Linden
c922f7b92a heroku: skip build phase
(cherry picked from commit 1f8dc21c94)
2018-09-17 22:39:49 +01:00
Bob van der Linden
1934cbb6a6 heroku: 5.6.32 -> 7.16.0
(cherry picked from commit 6ab1ee4951)
2018-09-17 22:39:49 +01:00
John Ericson
62dadfbd0e Merge pull request #46796 from obsidiansystems/late-bind-buildHaskellPackages
haskell infra: "late bind" `buildHaskellPackages` for 18.09
2018-09-17 16:21:01 -04:00
Peter Simons
fa90e003a3 all-cabal-hashes: update snapshot to Hackage at 2018-09-12T08:26:27Z
(cherry picked from commit ee6ecb0eaf)
2018-09-17 16:12:28 -04:00
Maximilian Bosch
ff791c8c1d pythonPackages.mahotas: skip test_moments.test_normalize and test_texture.test_haralick3d testcase (#46793)
As stated in #46368, this package seems to have issues with impure tests
(reported in https://github.com/luispedro/mahotas/issues/97).

Unfortunately the `release-18.09` job on Hydra fails at the attempt to
build this package since `test_moments.test_normalize1` and
`test_texture.test_haralick3d` breaks. Until
the root cause is identified, we skip the disabled tests to ensure that
the resulting package is not entirely broken (which can't be confirmed
with `doCheck = false`).

See https://hydra.nixos.org/job/nixos/release-18.09/nixpkgs.python27Packages.mahotas.x86_64-linux
See https://hydra.nixos.org/job/nixos/release-18.09/nixpkgs.python36Packages.mahotas.x86_64-linux
See https://logs.nix.ci/?key=nixos/nixpkgs.46793&attempt_id=b85a638d-dcb0-41d3-ab2a-9616a3bb0175

/cc @xeji @luispedro

(cherry picked from commit 5f2eacccf6)
2018-09-17 21:34:52 +02:00
Uli Baum
347723980a ipfs-migrator: update dependencies in deps.nix
Most dependencies are vendored in the upstream source anyway,
deps.nix just contains the few that are not.
Dependencies were updated manually because go2nix doesn't
work correctly for this package - it produces an empty deps.nix.

(cherry picked from commit f896867ae5)
2018-09-17 19:17:41 +02:00
Uli Baum
96859fd9eb ipfs-migrator: 6 -> 7
New version is required to migrate existing ipfs repos to repo v7.

(cherry picked from commit 6823fe9fb0)
2018-09-17 19:17:41 +02:00
Samuel Dionne-Riel
95b11f3cb9 nixos/tests/installer: grub1 needs /tmp to exist.
(cherry picked from commit b63c539bdc)
2018-09-17 19:13:49 +02:00
Samuel Dionne-Riel
7a811a3dbd grub: grub-0.97-patch-1.15 -> grub-0.97-73
Instead of using Gentoo's patchset, uses Debian's.

Gentoo's doesn't work anymore.

(cherry picked from commit 932c8f4c13)
2018-09-17 19:13:48 +02:00
Samuel Dionne-Riel
8174365dd1 grub: Use gcc6
GCC 7 wasn't kind to grub.

(cherry picked from commit ba09b05702)
2018-09-17 19:13:48 +02:00
aanderse
409abea609 php: add option to enable argon2
(cherry picked from commit e48811f83d)
2018-09-17 19:05:30 +02:00
Danylo Hlynskyi
9d77b35f68 zoom-us: 2.3.128305.0716 -> 2.4.129780.0915, QT downgrade (#46778)
Qt 5.11 was downgraded to 5.9 because of two issues:
- spawns errors like
```
qrc:/qml/SignInWaiting.qml:20:9: QML BusyIndicator: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:26:9: QML Text: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:20:9: QML BusyIndicator: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:26:9: QML Text: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:20:9: QML BusyIndicator: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:26:9: QML Text: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:20:9: QML BusyIndicator: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:26:9: QML Text: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:20:9: QML BusyIndicator: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:26:9: QML Text: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
```
- Google login doesn't work. It just doesn't start embedded webbrowser

(cherry picked from commit 969a39bd09)
2018-09-17 16:10:10 +02:00
Vladimír Čunát
8b04b63c76 Merge branch 'staging-18.09' into release-18.09 2018-09-17 12:55:39 +02:00
worldofpeace
03f1f355ad nixos/lightdm: use systemd.tmpfiles (#46734)
This also makes logs appear at /var/log/lightdm

(cherry picked from commit 67e9571ba4)
2018-09-17 11:03:20 +02:00
Notkea
48bdc51a72 exim: add optional support for PAM (#46744)
(cherry picked from commit f607f45f33)
2018-09-17 10:50:38 +02:00
Uli Baum
39c585aab1 ostree: fix tests
- Workarounds for https://github.com/ostreedev/ostree/issues/1592
- Disable failing test-gpg-verify-result.test, see
  https://github.com/ostreedev/ostree/issues/1634

(cherry picked from commit d734328f5d)
2018-09-17 09:25:57 +02:00
Vladimír Čunát
1c9013dd34 Merge branch 'release-18.09' into staging-18.09 2018-09-17 09:10:38 +02:00
pacien
026d0c8ae5 exim: parametrise package
This allows the definition of a custom derivation of Exim,
which can be used to enable custom features such as LDAP and PAM support.

The default behaviour remains unchanged (defaulting to pkgs.exim).

(cherry picked from commit d73ed4264f)
2018-09-17 00:42:45 +01:00
Uli Baum
3e10c3705f pythonPackages.dendropy: fix build
Build failed after update to 4.4.0 because the tests are incorrectly
packages in the pypi version.
Switch to upstream github repo, fix tests, disable failing test cases

(cherry picked from commit a66c00d780)
2018-09-16 22:26:14 +01:00
Jörg Thalheim
92f867daae Merge pull request #46525 from Chiiruno/dev/zeronet
nixos/zeronet: Fix TOR permissions, add torAlways option
2018-09-16 22:20:55 +01:00
Matthew Bauer
a86020b885 Revert "Merge pull request #46108 from obsidiansystems/cross-patch-shebangs"
This reverts commit 6877b4c13e, reversing
changes made to 69b6db0ec5.
2018-09-16 15:29:50 -05:00
Pascal Wittmann
50fa8ebf70 tmsu: 0.7.0 -> 0.7.1
(cherry picked from commit c314092164)
2018-09-16 19:21:35 +02:00
Matt McHenry
3c670aad43 elm: patch to widen dependency after hackage update 1b1cb6305c
works around missing dependency 'language-glsl >=0.0.2 && <0.3'

patch from https://github.com/elm/compiler/pull/1784

(cherry picked from commit e78f60475b)
2018-09-16 13:02:43 +02:00
Matt McHenry
9c4e77d4e1 elm: pick up some recent minor updates to 0.19.0
(cherry picked from commit 04d8e267b7)
2018-09-16 13:02:43 +02:00
Bob van der Linden
91792592f0 go: skip flaky os/exec TestExtraFiles
This seems to only happen on i686 on go 1.11. It also happens on
Debian. For more information:

https://github.com/golang/go/issues/25628
(cherry picked from commit 0bf6b440d9)
2018-09-16 11:09:49 +01:00
Vincent Laporte
deebbe43fb ocaml ≤ 4.05: mark as broken on Aarch64
(cherry picked from commit 4f3868b72d)
2018-09-16 09:29:42 +01:00
Vincent Laporte
8a26f19782 pythonPackages.libnacl: fix build on darwin
(cherry picked from commit 5b8b9a08e7)
2018-09-16 09:26:45 +01:00
Peter Simons
bb78d66906 haskell-stm: update overrides that use version 2.4.5.0 to version 2.4.5.1
(cherry picked from commit 53d34305f6)
2018-09-15 21:02:05 -04:00
xeji
a0ba8bba23 pythonPackages.pyodbc: fix build (#46703)
Build with unixODBC instead of libiodbc, see discussion in
https://github.com/mkleehammer/pyodbc/issues/444

(cherry picked from commit 13c500ae16)
2018-09-15 23:14:23 +02:00
John Ericson
ce1cc9dd81 Merge pull request #46713 from obsidiansystems/ios-depoy
ios-depoy: Add missing rsync dep
2018-09-15 15:09:18 -04:00
worldofpeace
3ac0a6c74a rust.section.md: remove nixcrate reference
nixcrate is deprecated

(cherry picked from commit 6dae5de436)
2018-09-15 19:46:35 +01:00
Sarah Brofeldt
a55a1363c3 darcs: unpin ghc (use 8.4.x) version
(cherry picked from commit 0fe0f481c7)
2018-09-15 19:15:00 +02:00
Bob van der Linden
f829dbfaaa Deedle: 1.2.0 -> 1.2.5 (#46702)
(cherry picked from commit 76001b8509)
2018-09-15 16:18:47 +02:00
Bob van der Linden
4aea85a89f Paket: 1.18.2 -> 5.179.1 (#46701)
(cherry picked from commit 6a4b9dfa2f)
2018-09-15 16:03:48 +02:00
Tim Steinbach
0d5e4c9dba sbt: 1.2.1 -> 1.2.3
(cherry picked from commit 795488491c)
2018-09-15 09:57:55 -04:00
Tim Steinbach
53c8df749a linux: 4.18.7 -> 4.18.8
(cherry picked from commit 2193518801)
2018-09-15 09:48:16 -04:00
Tim Steinbach
ed197e7ceb linux: 4.14.69 -> 4.14.70
(cherry picked from commit 1a13067273)
2018-09-15 09:48:07 -04:00
Tim Steinbach
580831c518 linux: 4.9.126 -> 4.9.127
(cherry picked from commit c1d7826a8a)
2018-09-15 09:47:56 -04:00
Tim Steinbach
f071d81afb linux: 4.4.155 -> 4.4.156
(cherry picked from commit b9ca4ac95c)
2018-09-15 09:47:48 -04:00
Jesper Geertsen Jonsson
d36f38a38c Fixes the lldpd service failing to start
Backports a patch that will be included in later upstream versions.
The patch removes a call to /bin/mkdir.

(cherry picked from commit 8a03ec0a32)
2018-09-15 15:38:06 +02:00
volth
38710e66cd libguestfs-appliance: do not build on Hydra
(cherry picked from commit ac52817bd9)
2018-09-15 15:37:16 +02:00
Franz Pletz
2aaebeecdd matrique: init at 250
(cherry picked from commit d79e201851)
2018-09-15 15:28:33 +02:00
Franz Pletz
4010c783ca nheko: 0.4.3 -> 0.5.5
(cherry picked from commit ff8fc5c46c)
2018-09-15 15:16:00 +02:00
Franz Pletz
8ee65ee040 spdlog_1: init 1.1.0
(cherry picked from commit 4d11a37c69)
2018-09-15 15:16:00 +02:00
Franz Pletz
fdd5647264 mtxclient: init at 0.1.0
(cherry picked from commit 8473168bef)
2018-09-15 15:16:00 +02:00
Ben Challenor
ba90765578 jenkins: 2.121.2 -> 2.138.1
(cherry picked from commit 16ce28ed72)
2018-09-15 15:10:44 +02:00
Maximilian Bode
14ccf337ba salt: fix darwin build by specifying dependency on tornado 4
/cc ZHF #45961

(cherry picked from commit 2438ceb5b4)
2018-09-15 12:41:40 +02:00
Maximilian Bode
c96aee40b0 click: 0.3.1 -> 0.3.2
patch necessary to fix "error: the lock file needs to be updated but --frozen was passed to prevent this"

(cherry picked from commit 95c7d8300f)
2018-09-15 11:03:09 +01:00
Peter Simons
4e96a5fc5f cabal2nix: fix (and clean up)override for hpack dependency
(cherry picked from commit 1c5d7ad52e)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-09-15 10:33:30 +01:00
Peter Simons
52f36810cd haskell-Cabal: keep a copy of the 2.2.x version around in the package set
(cherry picked from commit 838b4fe552)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-09-15 10:33:29 +01:00
Peter Simons
1c02221724 haskell-cabal2nix: update override for hpack 0.31.0
* pkgs/development/haskell-modules/configuration-common.nix:

(cherry picked from commit e0c081c6ac)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-09-15 10:33:29 +01:00
Peter Simons
942e0be544 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.11-9-gb3613cb from Hackage revision
3869e8d541.

(cherry picked from commit 1b1cb6305c)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-09-15 10:33:29 +01:00
Peter Simons
84d9adf76c LTS Haskell 12.9
(cherry picked from commit 3c1af12544)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-09-15 10:33:11 +01:00
Will Dietz
373d615198 zsh: 5.6.1 -> 5.6.2
From upstream's NEWS:

> Changes from 5.6.1 to 5.6.2
> ---------------------------
>
> Fix another SIGTTOU case.
>
> Fix SIGWINCH being ignored when zsh is not in the foreground.
>
> The release tarballs are now compressed using xz(1), whereas previously
> both xz(1) and gzip(1) versions were available.  If this gets in your way,
> give us a shout.
>

(cherry picked from commit ef21db9bd3)
2018-09-15 10:54:38 +02:00
Will Dietz
420bfb1405 kmsxx: 2017-10-10 -> 2018-09-10
Various improvements -- if nothing else the 'kmstest'
utility now explains properly when permissions problem :).

(cherry picked from commit 4c1f27a4fc)
2018-09-15 10:53:23 +02:00
Will Dietz
b567484b16 kmscube: 2017-03-19 -> 2018-06-17 (and fix homepage!)
(cherry picked from commit 268d72ec5e)
2018-09-15 10:53:21 +02:00
John Ericson
d1593baffd Merge pull request #46684 from obsidiansystems/elf-header
elf-header: Init at <libc version> for 18.09
2018-09-15 02:01:01 -04:00
Bob van der Linden
b998319b6a Newtonsoft.Json: 6.0.8 -> 11.0.2 (#46679)
(cherry picked from commit fb11065050)
2018-09-15 01:50:27 +02:00
Clemens Fruhwirth
28f3ce334f spl/zfs: 0.7.10 -> 0.7.11
(cherry picked from commit 81082c6c60)
2018-09-15 01:24:43 +02:00
Uli Baum
47d922fc54 qt56.qtwebengine: mark as broken
- no successful build since 2018-04-25
- not used in nixpkgs anymore

(cherry picked from commit 83e5bbfb58)
2018-09-15 00:55:29 +02:00
Uli Baum
fc31a4b195 btanks: mark as broken
no successful hydra build since 2018-03-16, last upstream release 2009.

(cherry picked from commit ba757ffdc9)
2018-09-15 00:55:29 +02:00
Uli Baum
22e09e7007 leksah: mark as broken
no successful build since 2017-08-19

(cherry picked from commit ab5a8b69b0)
2018-09-15 00:55:29 +02:00
Uli Baum
1de40e2160 kippo: mark as broken
no successful hydra build since 2017-12-11

(cherry picked from commit 19d1daedd0)
2018-09-15 00:55:29 +02:00
Uli Baum
7d5f1dad42 frab: mark as broken
No successful hydra build since 2018-02-14.
The build fails in the ruby gem json-1.8.3, which we cannot
mark directly as broken in nixpkgs, so we mark this as broken.

(cherry picked from commit 15fedb51b3)
2018-09-15 00:55:28 +02:00
Uli Baum
380b44f4fe clasp-common-lisp: mark as broken
no successful hydra build since 2018-01-03

(cherry picked from commit 4c2388dee3)
2018-09-15 00:55:28 +02:00
Uli Baum
f04e126009 darwin.maloader: mark as broken
no successfull build in Hydra history back to 2017-08-21

(cherry picked from commit 4795c2a23a)
2018-09-15 00:55:28 +02:00
xeji
0da7a40fca geis: fix build (#46663)
disable format hardening, ignore some compiler warnings

(cherry picked from commit 57ee141696)
2018-09-14 23:59:32 +02:00
Maximilian Bode
b158a30bb1 gitAndTools.grv: fix darwin build by using go 1.9
cf. https://github.com/fsnotify/fsevents/issues/40

/cc ZHF #45961

(cherry picked from commit 6b7cefdc58)
2018-09-14 23:20:16 +02:00
brocking
9fa6a261fb scaleway-cli: 1.14 -> 1.17
(cherry picked from commit 10a6ab75a8)
2018-09-14 16:59:19 +01:00
Michael Raskin
7956bfb364 Merge pull request #46643 from taku0/flashplayer-31.0.0.108
flashplayer: 30.0.0.154 -> 31.0.0.108 [Important security fix]
(cherry picked from commit a9e50ec21a)
2018-09-14 14:34:53 +03:00
Uli Baum
5eb4258a9a pythonPackages.nilearn: fix tests
disable failing tests

(cherry picked from commit d9bdd64f04)
2018-09-14 10:58:22 +02:00
Uli Baum
297a082708 pythonPackages.wordfreq: 2.0 -> 2.2.0, fix build
Previous version didn't build (test failure).
Update to latest, tests use pytest now, disable failing tests.

(cherry picked from commit be12bb81aa)
2018-09-14 10:58:22 +02:00
Uli Baum
837e7c6925 pythonPackages.pytest-rerunfailures: fix build
some tests fail since pytest 3.7.2 -> 3.7.4 update, disable them

(cherry picked from commit 0bda601ee5)
2018-09-14 10:58:21 +02:00
Uli Baum
6678badb1b pythonPackages.flask-pymongo: fix build
add missing dependency: vcversioner

(cherry picked from commit 781eaa1377)
2018-09-14 10:58:21 +02:00
Uli Baum
25f3b47320 pythonPackages.eve: fix build, drop incorrect dependencies
Build failed because of dependency Flask-PyMongo, which actually
isn't a dependency of eve as they have their own flask_pymongo code.

- Drop incorrect dependency flask-pymongo
- Drop redunant dependencies already propageted by flask:
  itsdangerous, werkzeug, jinja2
- Drop dependency markupsafe, not required any more

(cherry picked from commit 9e4b0b795c)
2018-09-14 10:58:21 +02:00
Uli Baum
c2bb2fb269 pythonPackages.daphne: 2.1.0 -> 2.2.2
Update, re-enable all tests on linux, disable tests on darwin.
This fixes the build of pythonPackages.channels

(cherry picked from commit abe97e9446)
2018-09-14 10:58:21 +02:00
Daiderd Jordan
8a93d258cd cargo-web: mark broken on darwin
Looks CoreFoundation related.

    Undefined symbols for architecture x86_64:
      "_CFURLResourceIsReachable", referenced from:
          fsevent_sys::core_foundation::str_path_to_cfstring_ref::h0ea4bd94e2c613f2 in libfsevent_sys-ef30b6879660a6c1.rlib(fsevent_sys-ef30b6879660a6c1.fsevent_sys7-49ce33334334dd3a5c7883bf4070f954.rs.rcgu.o)
    ld: symbol(s) not found for architecture x86_64

/cc ZHF #45961

(cherry picked from commit 327edb4b1d)
2018-09-14 10:44:52 +02:00
Daiderd Jordan
3b0dddd940 csfml: mark linux only
While it's possible to build on darwin, we never had a successful build.

    Undefined symbols for architecture x86_64:
      "sf::microseconds(long long)", referenced from:
          _sfSleep in Sleep.cpp.o

/cc ZHF #45961

(cherry picked from commit 54b4000d54)
2018-09-14 10:44:51 +02:00
Daiderd Jordan
fffefe7901 cernlib: mark broken on darwin
Using gccStdenv makes the build go further, but then it fails with.

    kuipc /private/tmp/nix-build-cernlib-2006.drv-0/2006/src/packlib/kuip/code_kuip/kuipcdf.cdf kuipcdf.c
    Makefile:413: archive/kuipcdf.d: No such file or directory
    make[3]: *** [Makefile:473: kuipcdf.c] Abort trap: 6

/cc ZHF #45961

(cherry picked from commit 68f7e75517)
2018-09-14 10:44:51 +02:00
WilliButz
221ec615f8 prometheus-dovecot-exporter: 0.1.1 -> 0.1.3
(cherry picked from commit 21324ef0e4)
2018-09-14 03:59:38 +02:00
Daiderd Jordan
0b3e0cdab2 ceres-solver: fix darwin build (#46626)
The Basel BUILD file conflicts with the cmake build directory on
case-insensitive filesystems, eg. darwin.

/cc ZHF #45961

(cherry picked from commit 807b0105b4)
2018-09-13 23:44:27 +02:00
Daiderd Jordan
4199eb48fa calaos_installer: fix darwin install (#46629)
On darwin this builds an application instead of a binary.

/cc ZHF #45961

(cherry picked from commit 68956555c1)
2018-09-13 23:40:52 +02:00
Daiderd Jordan
ce1f20f43c cargo-update: fix darwin build (#46625)
On darwin libcurl is also needed.

/cc ZHF #45961

(cherry picked from commit d782c4eba5)
2018-09-13 23:36:54 +02:00
Daiderd Jordan
381c09b225 brlaser: cleanup and mark linux only (#46622)
The test binaries depend use open_memstream which isn't available on
darwin.

    error: use of undeclared identifier 'open_memstream'

/cc ZHF #45961

(cherry picked from commit 04cba83e7f)
2018-09-13 22:48:30 +02:00
R. RyanTM
4293f9f252 google-compute-engine: 20180129 -> 20180510 (#46278)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
google-compute-engine

(cherry picked from commit 035b2f5250)
2018-09-13 20:09:47 +01:00
Simon Lackerbauer
8b5f311616 atlassian-jira: 7.12.0 -> 7.12.1
(cherry picked from commit a431f3e35d)
2018-09-13 19:59:24 +02:00
Simon Lackerbauer
8ade355e59 atlassian-crowd: 3.1.2 -> 3.2.5
(cherry picked from commit f05e51abed)
2018-09-13 19:59:24 +02:00
Simon Lackerbauer
00ba14dcb7 atlassian-confluence: 6.8.0 -> 6.11.1
(cherry picked from commit 4d962b6dcd)
2018-09-13 19:59:24 +02:00
WilliButz
214e4e57eb grafana: 5.2.3 -> 5.2.4
(cherry picked from commit 68b25008e2)
2018-09-13 19:56:54 +02:00
Eelco Dolstra
51b62e6a8c Revert "aliases: add nixos-rebuild"
This reverts commit 0b124c1e91. We
should really stop adding things that are not packages to
all-packages.nix. For example, having nixos-rebuild.nix in
all-packages.nix causes 'nix-env -qa' to evaluate a NixOS
configuration, which obviously is not good for performance. (We should
probably also remove the 'nixos' attribute from all-packages.nix, but
at least that's a function so nix-env will ignore it.)

(cherry picked from commit f1c978aca0)
2018-09-13 18:27:36 +01:00
Samuel Dionne-Riel
43a15a7f55 Merge pull request #46598 from srhb/kube-1.11-backport-1809
18.09: kubernetes: 1.10.5 -> 1.11.3
2018-09-13 13:06:22 -04:00
Uli Baum
77d9ad1f26 pythonPackages.zodb: fix tests
Tests failed after `persistent` was updated to 4.4.
Apply an upstream patch to fix them.

(cherry picked from commit b54677969b)
2018-09-13 17:02:31 +01:00
Matthew Bauer
d9f1e37ec7 aliases: add nixos-rebuild
Fixes #44135

(cherry picked from commit 0b124c1e91)
2018-09-13 14:46:30 +01:00
Maximilian Bosch
3625ce7a44 tamarin-prover: fix ghc 8.4 build (#46597)
See https://hydra.nixos.org/build/81125645

`tamarin-prover' upstream has a patch to fix GHC 8.4 compilation (and
uses stack lts-12.1 now), but it's not released yet:

a08f6e4007

The build is divided in several derivations, therefore the patch had to
be splitted and rebased for `lib/term', `lib/theory' and `lib/utils' to
ensure that the patch applies properly during the `patchPhase'.

Addresses #45960

(cherry picked from commit 2cfc0bb7ee)
2018-09-13 14:11:52 +02:00
Matthias C. M. Troffaes
755710dbf5 wolfssl: enable all features
(cherry picked from commit 66e6ee73d4)
2018-09-13 12:06:05 +01:00
Jaakko Luttinen
1851422f61 syncthing: 0.14.48 -> 0.14.50
(cherry picked from commit 6400d4b4aa)
2018-09-13 11:47:26 +01:00
xeji
17f538bd06 leo-editor: 5.6 -> 5.7.3, fix build (#46589)
Previous version depended on qt56.qtwebengine which was broken.

(cherry picked from commit eb88142c4b)
2018-09-13 12:18:31 +02:00
Uli Baum
ae181c387a pythonPackages.restview: fix tests
Failed after readme_renderer was updated. Apply an upstream patch.

(cherry picked from commit 6dc57134da)
2018-09-13 11:41:32 +02:00
Uli Baum
c8b1f54b89 pythonPackages.pyfakefs: fix darwin build
One test failed on darwin due to case-insensitive file system,
disable it.

(cherry picked from commit bd02a1931a)
2018-09-13 11:41:32 +02:00
Uli Baum
7e47d1a020 pythonPackages.pydub: fix aarch64 build
one test failed due to rounding errors, disable it

(cherry picked from commit bc036397a3)
2018-09-13 11:41:31 +02:00
Uli Baum
38f6951e38 pythonPackages.pydub: remove obsolete patch
(cherry picked from commit 40c469e56b)
2018-09-13 11:41:31 +02:00
Uli Baum
671205b3e5 pythonPackages.pydub: fix build and tests
- remove obsolete patch that caused build failure
- no tests were run because required data files were missing in pypi
  version; use github version instead

(cherry picked from commit 80ecef8e4b)
2018-09-13 11:41:31 +02:00
Uli Baum
a700d468ba pythonPackages.pyfakefs: 3.4.1 -> 3.4.3, fix build
Update and disable some failing test cases

(cherry picked from commit d2a885a3b5)
2018-09-13 11:41:31 +02:00
Uli Baum
27159aee90 pythonPackages.readme_renderer: fix build
Disable one test case that has failed since last bleach update.

(cherry picked from commit bb1f3422e0)
2018-09-13 11:41:31 +02:00
Uli Baum
2880ca71fa pythonPackages.us: fix build
Required jellyfish==0.5.6 but we have 0.6.1. Loosen requirements.

(cherry picked from commit a7166cdc35)
2018-09-13 11:41:31 +02:00
Johan Thomsen
0c84b5cab7 kubernetes: 1.10.5 -> 1.11.3
Fixed minor issue where kube-addon manager complaints about
/opt/namespace.yaml missing.

Added release notes with reference to Kubernetes 1.11 release notes.

closes #43882

(cherry picked from commit a49f56c3b1)
2018-09-13 11:30:34 +02:00
Domen Kožar
cedae2bbec nixos: datadog-agent: fix systemd support
(cherry picked from commit 595ae18797)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-09-13 09:12:44 +01:00
Domen Kožar
160eea3602 datadog: add live process monitoring
(cherry picked from commit bef541c569)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-09-13 09:12:37 +01:00
Domen Kožar
4fce4287ff nixos: remove unneeded api_key from config
(cherry picked from commit 049b3a6cc2)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-09-13 09:12:30 +01:00
Jörg Thalheim
29f4541a82 pythonPackage.backports-shutil-which: enable tests
(cherry picked from commit 8d4afa5f2e)
2018-09-12 22:08:30 -04:00
Jaakko Luttinen
ed0fc7dc1d pythonPackages.libagent: fix propagatedBuildInputs
(cherry picked from commit d0ce8834ae)
2018-09-12 22:08:30 -04:00
Jaakko Luttinen
91f488c3bf pythonPackage.backports-shutil-which: init at 3.5.1
(cherry picked from commit 80b64a2e04)
2018-09-12 22:08:30 -04:00
Jaakko Luttinen
825f91bdcc pythonPackage.pymsgbox: init at 1.0.6
(cherry picked from commit c9bf7f67b9)
2018-09-12 22:08:30 -04:00
Jaakko Luttinen
ff6e4d0369 pythonPackages.ledgerblue: fix build inputs
(cherry picked from commit 5c9db2f02f)
2018-09-12 22:08:29 -04:00
Jaakko Luttinen
f8c8a23389 pythonPackages.python-u2flib-host: init at 3.0.3
(cherry picked from commit 38e86a8f1e)
2018-09-12 22:08:29 -04:00
Jaakko Luttinen
832dcfdb11 pythonPackages.rlp: fix build
(cherry picked from commit f053daf36c)
2018-09-12 22:08:29 -04:00
Jaakko Luttinen
d72f81ed5a pythonPackages.eth-utils: init at 1.2.0
(cherry picked from commit 9f8e6148c5)
2018-09-12 22:08:29 -04:00
Jaakko Luttinen
923a6b22e6 pythonPackages.eth-typing: init at 1.1.0
(cherry picked from commit 541a13ca0a)
2018-09-12 22:08:29 -04:00
Jaakko Luttinen
735b1e10b4 pythonPackages.eth-hash: init at 0.1.14
(cherry picked from commit c44504410b)
2018-09-12 22:08:29 -04:00
xeji
3e31aa326e pythonPackages.BTrees: fix build (#46588)
a test case failed since the update to 4.5.1, disable it

(cherry picked from commit 68b7de9e2e)
2018-09-13 02:33:04 +02:00
Uli Baum
b55e3054b9 mitmproxy: 3.0.4 -> 4.0.4, fix tests
- add missing checkInputs
- apply upstream patch to fix some tests that failed due to
  expired test ssl certs
- re-enable a previously disabled test case

(cherry picked from commit d225a91b7c)
2018-09-13 02:19:56 +02:00
Daiderd Jordan
9c9c04f918 asymptote: mark broken on darwin
It only builds with gc-7.6.0 on darwin for some reason.

/cc ZHF #45961

(cherry picked from commit 9fc6f1123d)
2018-09-13 00:07:09 +02:00
Daiderd Jordan
642d69b527 aws-okta: mark broken on darwin
Could be caused by our older 10.10.5 CoreFoundation.

    # github.com/segmentio/aws-okta/vendor/github.com/keybase/go-keychain
    go/src/github.com/segmentio/aws-okta/vendor/github.com/keybase/go-keychain/corefoundation_go110.go:35:33: cannot use nil as type _Ctype_CFAllocatorRef in argument to _Cfunc_CFDataCreate
    go/src/github.com/segmentio/aws-okta/vendor/github.com/keybase/go-keychain/corefoundation_go110.go:61: cannot use nil as type _Ctype_CFAllocatorRef in argument to func literal
    go/src/github.com/segmentio/aws-okta/vendor/github.com/keybase/go-keychain/corefoundation_go110.go:98:41: cannot use nil as type _Ctype_CFAllocatorRef in argument to _Cfunc_CFStringCreateWithBytes
    go/src/github.com/segmentio/aws-okta/vendor/github.com/keybase/go-keychain/corefoundation_go110.go:133: cannot use nil as type _Ctype_CFAllocatorRef in argument to func literal

/cc ZHF #45961

(cherry picked from commit b814881394)
2018-09-13 00:07:05 +02:00
Daiderd Jordan
91da313b87 litecoin: add missing framework and mark broken on darwin
In file included from qt/bitcoin.cpp:9:
    ./qt/bitcoingui.h:14:10: fatal error: 'QLabel' file not found
    #include <QLabel>
             ^~~~~~~~
    1 error generated.

/cc ZHF #45961

(cherry picked from commit 0dff3d5c73)
2018-09-13 00:07:01 +02:00
Daiderd Jordan
70f2abee3d ethsign: mark broken on darwin
Could be caused by our older 10.10.5 CoreFoundation.

    go/src/github.com/ethereum/go-ethereum/vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go:51:216:
    cannot use nil as type _Ctype_CFAllocatorRef in argument to func literal
    go/src/github.com/ethereum/go-ethereum/vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go:162:47:
    cannot use nil as type _Ctype_CFAllocatorRef in argument to
    _Cfunc_CFStringCreateWithCStringNoCopy
    go/src/github.com/ethereum/go-ethereum/vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go:163:225:
    cannot use nil as type _Ctype_CFAllocatorRef in argument to func literal

/cc ZHF #45961

(cherry picked from commit e7ecf593e2)
2018-09-13 00:06:57 +02:00
Daiderd Jordan
3c2e66d746 bitcoin-xt: mark broken on darwin
/cc ZHF #45961

(cherry picked from commit 8f6ede967e)
2018-09-13 00:06:53 +02:00
Daiderd Jordan
72830db1a0 bitcoin-unlimited: mark broken on darwin
/cc ZHF #45961

(cherry picked from commit eaff0b74c0)
2018-09-13 00:06:49 +02:00
Daiderd Jordan
509e79eec5 bitcoin-classic: mark broken on darwin
Last successful build https://hydra.nixos.org/build/74552951.

/cc ZHF #45961

(cherry picked from commit d990bae6ef)
2018-09-13 00:06:44 +02:00
Daiderd Jordan
a95c041252 bitcoin-abc: mark broken on darwin
Last successful build https://hydra.nixos.org/build/74552872.

/cc ZHF #45961

(cherry picked from commit cf9d1a6d30)
2018-09-13 00:06:41 +02:00
Daiderd Jordan
7b82c4f182 atlas: mark broken on darwin
Started to fail since 3.10.3.

    /private/tmp/nix-build-atlas-3.10.3.drv-0/ATLAS/build/bin/ATLrun.sh: line 4: 31119 Segmentation fault: 11  $atldir/$*
    make[3]: *** [Makefile:1695: ssanity_test] Error 139

/cc ZHF #45961

(cherry picked from commit f1542f612b)
2018-09-13 00:06:37 +02:00
Daiderd Jordan
93f4bb6a62 asio: mark broken on darwin
Started to fail since 1.12.1.

    Undefined symbols for architecture x86_64:
      "boost::chrono::steady_clock::now()", referenced from:
          pinger::start_send() in ping.o
          asio::detail::timer_queue<asio::detail::chrono_time_traits<boost::chrono::steady_clock, asio::wait_traits<boost::chrono::steady_clock> > >::wait_duration_msec(long) const in ping.o
          asio::detail::timer_queue<asio::detail::chrono_time_traits<boost::chrono::steady_clock, asio::wait_traits<boost::chrono::steady_clock> > >::wait_duration_usec(long) const in ping.o
          asio::detail::timer_queue<asio::detail::chrono_time_traits<boost::chrono::steady_clock, asio::wait_traits<boost::chrono::steady_clock> > >::get_ready_timers(asio::detail::op_queue<asio::detail::scheduler_operation>&) in ping.o
          pinger::handle_receive(unsigned long) in p

/cc ZHF #45961

(cherry picked from commit 80a4e48e45)
2018-09-13 00:06:34 +02:00
Daiderd Jordan
5bf79832e6 alock: mark linux only
The darwin build fails and it's probably not particularly useful there.

    utils.c:33:19: error: use of undeclared identifier 'CLOCK_MONOTONIC'
        clock_gettime(CLOCK_MONOTONIC, &t);

/cc ZHF #45961

(cherry picked from commit 139eb11a6d)
2018-09-13 00:06:24 +02:00
Uli Baum
7d5b1d14c6 banshee: remove
- was broken since June 2016 because it depends on `boo`
- no visible attempts to fix in over 2 years

(cherry picked from commit 2953d4c994)
2018-09-12 23:26:23 +02:00
Uli Baum
e586eda60d nant: remove
- our version is from 2015
- it doesn't build
- upstream project is dead, last release 2012, last commit Oct 2016.
- used by only 1 nixpkgs package: `boo`, marked broken since 2016.

(cherry picked from commit dc84de59d1)
2018-09-12 23:26:23 +02:00
Uli Baum
18e9a5c8e4 boo: remove, broken since Jun 2016
marked broken in June 2016, no visible attempt to fix it,
so let's get rid of it

(cherry picked from commit 5a166ffd47)
2018-09-12 23:26:23 +02:00
zimbatm
770ee0b279 vault: 0.10.4 -> 0.11.1
changelog: https://github.com/hashicorp/vault/blob/v0.11.1/CHANGELOG.md
(cherry picked from commit 7880cd6752)
2018-09-12 23:12:34 +02:00
worldofpeace
362498c6fe eolie: 0.9.35 -> 0.9.36
(cherry picked from commit 508e353fd4)
2018-09-12 21:30:23 +01:00
Josef Kemetmüller
84361ab3e1 scs: Fix darwin build
Additionally we make the unit-test deterministic by specifying a seed
instead of using something random.

(cherry picked from commit d726c0ff1d)
2018-09-12 21:25:52 +02:00
Robin Gloster
088e1bdf7d grafana module: allow path for extraConfig vals
(cherry picked from commit 929f71d381)
2018-09-12 14:22:21 +02:00
Robin Gloster
1ffb47ad48 acme module: fix self-signed cert with openssl 1.1
(cherry picked from commit 515a7aa452)
2018-09-12 13:41:50 +02:00
Michael Raskin
32c008a946 lispPackages.quicklisp: 2018-04-30 -> 2018-08-31 ; regenerate packages
Added a wrapper package that creates symlinks to OpenSSL libraries with
the actual versions, because we have 1.0.2 with .so-suffix .1.0.0 and
cl-async-ssl is unhappy because of that.

I continue to dislike cl-postgres and simple-date upstream packaging.

This fixes cl-libuv and dependent packages.

Progress on #45960

(cherry picked from commit 5048b0d1f9)
2018-09-12 11:59:56 +03:00
Christoph Hrdinka
8e20e5ee35 zsh: 5.6 -> 5.6.1
Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
2018-09-12 09:35:55 +02:00
Elis Hirwing
8468a4bfc7 nano: 2.9.8 -> 3.0
Changelog: http://lists.gnu.org/archive/html/info-nano/2018-09/msg00000.html

Also updated the nix highlighting for nano

(cherry picked from commit b47c5870f4)
2018-09-11 20:28:07 -04:00
Matthew Bauer
7bc168e4b5 Merge pull request #46518 from srhb/revert-build-host-target-platform-deprecation-1809
Revert build host target platform deprecation on release-18.09
2018-09-11 18:55:05 -05:00
Maximilian Bosch
f95ddad29f python3Packages.pyowm: fix python3 build (#46549)
See https://hydra.nixos.org/build/80714323

Version 2.9 requires `geojson==2.x'. To allow 2.4, the constraint
required some patching using `substituteInPlace'.

Addresses #45960

(cherry picked from commit a25dcb6607)
2018-09-12 01:24:15 +02:00
Daiderd Jordan
40e4aee577 aria2: fix darwin build (#46548)
Not released yet, see https://github.com/aria2/aria2/issues/1198

/cc ZHF #45961

(cherry picked from commit 2164e39eaa)
2018-09-12 00:11:53 +02:00
John Ericson
3ef52f02a9 Merge pull request #46546 from obsidiansystems/glibc-configureFlags-cleanup
glibc: Use lib.enableFeature and friends for 18.09
2018-09-11 17:51:08 -04:00
Maximilian Bosch
f0972029de pants: fix build (#46545)
See https://hydra.nixos.org/build/80727495

`pants' works with requests==2.19 to build successfully and `nixpkgs' currently uses `requests==2.19.1`.
Patching the version constraint in `setup.py' accordingly fixes the problem.

Addresses #45960

(cherry picked from commit 46d1166b80)
2018-09-11 23:22:50 +02:00
Florian Bruhin
23200f56e8 qutebrowser: Fix patching of standarddir.py
The original patch was broken since a85e19a5e1 because an `APPNAME` variable was introduced there.

(cherry picked from commit 84a0dc8191)
2018-09-11 23:09:56 +02:00
John Ericson
6877b4c13e Merge pull request #46108 from obsidiansystems/cross-patch-shebangs
patch-shebangs: respect cross compilation for 18.09
2018-09-11 16:41:04 -04:00
Matthew Bauer
e9b63007e5 patch-shebangs: respect cross compilation
This hopefully makes patchShebangs respect cross compilation. It
introduces the concept of the HOST_PATH. Nothing is ever executed on
it but instead used as a way to get the proper path using ‘command
-v’. Needs more testing.

/cc @ericson2314 @dtzwill

Fixes #33956
Fixes #21138

(Modified backport of f06942327a. See
previous commit to understand the differences between this and the
original.)
2018-09-11 16:16:09 -04:00
John Ericson
c72c865560 stdenv: Define HOST_PATH more loosely when strictDeps isn't set
This ensures this change is safe last minute for 18.09. Master won't
have this.
2018-09-11 16:15:19 -04:00
Daiderd Jordan
03c8cbe813 perl-TestRunCmdLine: disable tests on darwin
/cc ZHF #45961

(cherry picked from commit f61279e45b)
2018-09-11 22:05:25 +02:00
Mario Rodas
81969394b4 nodejs-6_x: 6.14.3 -> 6.14.4
(cherry picked from commit bfdfb73ff1)
2018-09-11 14:26:31 -04:00
Mario Rodas
ad5046d8b8 nodejs: use https for downloading
(cherry picked from commit 36b5ffa40b)
2018-09-11 14:26:31 -04:00
Samuel Dionne-Riel
fce2d40051 qt5.qtwebkit: Fixes modules src being subtly broken.
b785d4813e introduced breakage in Qt
modules for 5.6 and 5.9, especially visible is Qt Webkit.

This was manifested by having a non-sensical build log where it is using
the top-level `src` attribute as source instead of Qt Webkit's own
source.

Were it not for the `src` top-level attribute (which is a legit
package), the error would have been made obvious by passing `null` to
`src`.

This partily reverts newly introduced way `src` can be passed to a
qtModule, instead relying on extending the `srcs` attrset.

For ZHF #45960

(cherry picked from commit cb380983ed)
2018-09-11 11:05:16 -04:00
Okina Matara
3091eb6537 nixos/zeronet: Fix TOR permissions, add torAlways option
(cherry picked from commit 9c97f37761)
Reason: Fixing an important zeronet feature for a new release.
2018-09-11 09:27:05 -05:00
Daiderd Jordan
bd1c922388 perl-Mouse: fix darwin build
/cc ZHF #45961

(cherry picked from commit 5e8fd8792b)
2018-09-11 09:59:34 -04:00
Daiderd Jordan
676841e61d perl-Module-Build-XSUtil: fix darwin build
While building the tests LD gets called with -mmacosx-version-min=10.10
which is a CC flag, causing the build to fail with LD=ld.  This is
pretty common with perl packages.

/cc ZHF #45961

(cherry picked from commit dc6b36b994)
2018-09-11 09:59:31 -04:00
Sarah Brofeldt
bf7c2e35f1 nixos/doc: Add stable pre-release warning (#46473)
(cherry picked from commit 66f6105978)
2018-09-11 15:42:49 +02:00
Domen Kožar
1c852070e8 datadog-agent: 6.1.4 -> 6.4.2
(cherry picked from commit 2c18d48c0e)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-09-11 13:17:41 +01:00
Domen Kožar
d25939132f dep2nix: fix eval (no IFD)
(cherry picked from commit e8621a45a2)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-09-11 13:17:23 +01:00
Domen Kožar
b2fc0f0234 dep2nix: 0.0.1 -> 0.0.2
(cherry picked from commit 35df0f7f0c)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-09-11 13:17:10 +01:00
Sarah Brofeldt
ea4d36a2e5 Revert "top-level: Deprecate top-level {build,host,target}Platform"
This reverts commit e51f736076.
2018-09-11 12:07:22 +02:00
Erik Arvstedt
c1713a14db networking.hostId: fix cmd in description
1. Simplify the command by reading directly from /etc/machine-id which
is already a random, lower-case hex string
2. Previously, the command output could be too short because of missing
leading digits. This is now fixed.

(cherry picked from commit 7a42623c23)
2018-09-11 10:32:18 +01:00
Sarah Brofeldt
c36aedb1c8 Merge pull request #46503 from ento/aws-vault-4-3-0
aws-vault: 4.1.0 -> 4.3.0, pass linker flag for specifying app version
(cherry picked from commit 5984aae9a7)
2018-09-11 11:30:38 +02:00
Wael M. Nasreddine
f461c933a1 bazel: 0.16.0 -> 0.16.1
(cherry picked from commit d24f81b825)
2018-09-11 11:27:36 +02:00
xeji
dd13aedbdb pythonPackages.pytestflakes: fix build (#46500)
- disable a failing test case that looks broken
- remove pytestcache depencency that was dropped upstream

(cherry picked from commit f201f8c3fd)
2018-09-11 11:16:03 +02:00
Clemens Fruhwirth
766d15ddd9 spl/zfs: 0.7.9 -> 0.7.10
(cherry picked from commit 05f122c561)
2018-09-11 07:07:44 +02:00
José Romildo Malaquias
f02eb7d337 lxqt: mv contents of base, core and optional to parent directory (#46484)
(cherry picked from commit 2047e28c7f)

a noop change, backported for easier maintenance
2018-09-10 23:01:21 +02:00
Maximilian Bosch
7666310ebf pythonPackages.mahotas: fix build, move expression
See https://hydra.nixos.org/build/80828287

Moves `mahotas` out of `python-packages.nix` into its own file and fixes
broken test cases by skipping them using nosetest's `@nottest`
annotation.

These tests broke from time to time in a sandbox and are therefore
considered impure.

Addresses #45960

(cherry picked from commit ee897b64ff)
2018-09-10 22:59:10 +02:00
Maximilian Bosch
cde1edebd6 openbsm: fix linux build
See https://hydra.nixos.org/build/80705916

To fix the linux build the patch `bsm-add-audit_token_to_pid.patch`
mustn't be applied during Linux builds, only for Darwin as it's an
Apple-only fix.

The compiler failure occurred because `audit_token_t` is part of
`<mach/mach.h>` which is not available on Linux.

Addresses #45960

(cherry picked from commit 080b2fdd8c)
2018-09-10 22:58:46 +02:00
Michele Guerini Rocco
d164d7eb89 antimony: 0.9.3 -> 2018-10-17 (#46486)
(cherry picked from commit fd7e69be1c)
2018-09-10 22:17:36 +02:00
volth
1b0c262aad perlPackages: ZHF 18.09 (#46493)
(cherry picked from commit 50789a0b19)
2018-09-10 22:14:34 +02:00
Daiderd Jordan
a1f2a67850 bullet: fix darwin build
The examples fail with an opengl related issue:

    Undefined symbols for architecture x86_64:
      "SimpleOpenGL3App::SimpleOpenGL3App(char const*, int, int, bool)", referenced from:
          _main in main_opengl_single_example.o
      "_useShadowMap", referenced from:
          GL_ShapeDrawer::drawScene(btDiscreteDynamicsWorld const*, bool, int) in GL_ShapeDrawer.o
    ld: symbol(s) not found for architecture x86_64

And the tests need an extra dependencly, possibley related to
https://github.com/bulletphysics/bullet3/issues/819

    ld: library not found for -lBussIK

/cc ZHF #45961

(cherry picked from commit 939debc7a4)
2018-09-10 21:35:26 +02:00
zimbatm
57268a967f govendor: init at 1.0.9 (#46485)
(cherry picked from commit 404b224529)
2018-09-10 17:48:34 +01:00
Urban Skudnik
0be60455c8 hcloud: Add autocomplete support for bash and zsh
Currently one would need to manually run the command to generate
completion and insert it into `.bashrc`/`.zshrc` to get the
autocompletion to work. This patch will automatically generate
both docs and save them to correct position so it should continue
to work even if user changes the shell at a later stage.

(cherry picked from commit d23c357f1c)
2018-09-10 15:20:10 +01:00
Linus Heckemann
12703a0c06 earlyoom: fix version number (#46481)
earlyoom's Makefile attempts to detect the current version using git,
but we don't keep .git in its source, so this fails. We can however
set the VERSION environment variable to override this, as we now do.

(cherry picked from commit ac679e721f)
2018-09-10 13:23:28 +01:00
Arian van Putten
23bbe26bde safe-money: Fix dependencies for safe-money-*
They all depend on safe-money-0.7, but hackage2nix made them incorrectly
depend on safe-money-0.6

We should be able to remove this 'hack' as soon as the new Stackage LTS
comes out, as safe-money-0.7 will then be the default version.
2018-09-10 13:14:53 +01:00
Shea Levy
406e0a6dca Merge branch 'haskell-updates-18.09' into release-18.09 2018-09-10 07:48:30 -04:00
Maximilian Bosch
b7be61673c pythonmagick: fix build (#46469)
The original build broke with the following linker issue:

```
  CXXLD    _PythonMagick.la
/nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/ld: cannot find -l-L/nix/store/4gh6ynzsd5ndx37hmkl62xa8z30k43y1-imagemagick-6.9.9-34/lib
collect2: error: ld returned 1 exit status
```

This happens since `BOOST_PYTHON_LIB` wasn't set properly, however
`_PythonMagick.la` was linked with `-l$(BOOST_PYTHON_LIB)
$(MAGICK_LIBS)`. With an empty `BOOST_PYTHON_LIB` the linker got
confused.

To work around this, the `boost` library directory needs to be specified
explicitly. To ensure that the changes take effect, the original
`configure` script shipped with `$src` needs to be removed and recreated
using the `autoreconfHook`.

Additionally the `imagemagick` license (https://spdx.org/licenses/ImageMagick.html)
needs to be added to `lib/licenses.nix` to document the proper license
of `pythonmagick` in the meta section.

(cherry picked from commit 6d6cbd316d)
2018-09-10 12:00:38 +02:00
Amine Chikhaoui
ee22050f05 ZHF 18.09: fix crypsetup build with python enabled. (#46468)
Fixes https://hydra.nixos.org/build/81028247.

(cherry picked from commit 00064c21cc)
2018-09-10 11:54:23 +02:00
Eelco Dolstra
821c67d51b Merge pull request #46401 from matthewbauer/revert-nix-minver
[18.09] set min version back to 1.11
2018-09-10 09:50:17 +02:00
Will Dietz
93e78c721c busybox: 1.29.2 -> 1.29.3 (#46458)
(cherry picked from commit 30500d23bc)
2018-09-10 08:44:21 +02:00
Samuel Dionne-Riel
55c8b29523 dbeaver: 5.1.6 -> 5.2.0 (#46457)
(cherry picked from commit cf3795a25e)
2018-09-10 08:20:31 +02:00
Tim Steinbach
f7f88636a2 linux: 4.18.6 -> 4.18.7
(cherry picked from commit ea765b2e2b)
2018-09-09 19:35:03 -04:00
Tim Steinbach
caeb83bdd3 linux: 4.14.68 -> 4.14.69
(cherry picked from commit 276b2ab892)
2018-09-09 19:34:53 -04:00
Tim Steinbach
f4b248e4b0 linux: 4.9.125 -> 4.9.126
(cherry picked from commit d40f4159ed)
2018-09-09 19:34:41 -04:00
Tim Steinbach
db9849f1c3 linux: 4.4.154 -> 4.4.155
(cherry picked from commit 13728ed2b5)
2018-09-09 19:34:31 -04:00
Josef Kemetmüller
9cb6025551 pythonPackages.joblib: Disable flaky test (#46439)
The test `test_nested_parallelism_limit` fails on darwin.

(cherry picked from commit 6f891ff66e)
2018-09-09 22:42:34 +02:00
Josef Kemetmüller
3143d6bd2e pythonPackages.fiona: Fix darwin build (#46435)
(cherry picked from commit 5e0c468737)
2018-09-09 22:41:12 +02:00
Josef Kemetmüller
bbfa5d87dc pythonPackages.libusb1: Disable flaky test
(cherry picked from commit b633fc4fb4)
2018-09-09 22:25:31 +02:00
Josef Kemetmüller
43387f069a pythonPackages.libusb1: Fix darwin build
(cherry picked from commit 063aa389df)
2018-09-09 22:25:31 +02:00
Josef Kemetmüller
b682a408fd castxml: Fix build (#46442)
(cherry picked from commit 4ab5625c95)
2018-09-09 22:19:01 +02:00
Josef Kemetmüller
ff81358447 pythonPackages.flask_ldap_login: Disable on python3
(cherry picked from commit b667a76eac)
2018-09-09 22:01:40 +02:00
Josef Kemetmüller
6ef71d09b8 pythonPackages.flask_ldap_login: 0.3.0 -> 0.3.4
(cherry picked from commit 25f8753bf4)
2018-09-09 22:01:40 +02:00
Josef Kemetmüller
3925e7486f pythonPackages.flask_ldap_login: Fix build
(cherry picked from commit d4e89680d2)
2018-09-09 22:01:40 +02:00
Josef Kemetmüller
34059be473 pythonPackages.cozy: Disable on python2 (#46436)
Cozy does not support python2.

(cherry picked from commit a4b040e69f)
2018-09-09 21:34:20 +02:00
Janne Heß
a38d70855b treewide: Use http/https for homepages
(cherry picked from commit 9ef77854f7)
2018-09-09 15:51:08 +01:00
Tad Fisher
3dc8898536 vkquake: fix build
(cherry picked from commit b19cdc31c1)
2018-09-09 15:48:49 +01:00
Maximilian Bosch
5170f7219f pdf2htmlEX: mark as broken
See https://hydra.nixos.org/build/81003667

The build is currently broken on Hydra due to the following error:

```
CairoFontEngine.cc:681:17: error: 'void Object::free()' is private within this context
```

This issue is was also reported in AUR (https://aur.archlinux.org/packages/pdf2htmlex/)
and in the upstream issue tracker (https://github.com/coolwanglu/pdf2htmlEX/issues/753) with
no answer until now.

The current README.md states that the project is no longer under active
development and it seems as there are currently no active maintainers
who could fix this:

* 5d0a2239fc
* https://github.com/coolwanglu/pdf2htmlEX/issues/772

(cherry picked from commit de6544b50e)
2018-09-09 15:46:54 +01:00
José Romildo Malaquias
fa3cc6bf23 xsettingsd: git-2015-06-14 -> 1.0.0
- Update to version 1.0.0
- Install man pages
- Fix license
- Add maintainer

(cherry picked from commit 68102e793d)
2018-09-09 14:17:35 +01:00
Jörg Thalheim
7490ec9ed3 doc/vim: improve plugin documentation
(cherry picked from commit 97acac9a81)
2018-09-09 14:15:52 +01:00
zimbatm
6142a2ef4b strongswan: set the right dir for TLS CA cert
This fixes an issue where the strongswan NM client is not able to
connect to a VPN. By default it tries to load the trust CA from
/usr/share/ca-certificates which doesn't exist in NixOS and most modern
distros.

See debian-related issue:
  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835095

(cherry picked from commit 71e6dfdaea)
2018-09-09 14:14:29 +01:00
Sarah Brofeldt
0a46d6f6b9 Merge pull request #46419 from srhb/backport-nix21-perl-bindings
nix.perl-bindings: Fix build in 18.09
2018-09-09 14:59:23 +02:00
Daniël de Kok
7d404b9103 cgit: use full path of groff in man2html
groff may not be installed system-wide or may be outside cgit's path
(e.g. when running cgit using uwsgi). As a result, the man2html filter
fails. Replace groff by its full path in man2html.

(cherry picked from commit bbcf5eb130)
2018-09-09 13:56:44 +01:00
Daiderd Jordan
b68bfbceab altcoins.btc1: fix darwin build (#46398)
Only hexdump was needed from utillinux which is also available on darwin
through the unixtools meta package.

(cherry picked from commit 4e282e295f)
2018-09-09 14:54:42 +02:00
Eelco Dolstra
ddd3d98ccc nix.perl-bindings: Fix build
(cherry picked from commit b06ad6199f)
2018-09-09 14:52:35 +02:00
Maximilian Bode
32a4cbc756 pythonPackages.tifffile: fix python 2 build (#46415)
(cherry picked from commit c020a59ccd)
2018-09-09 12:14:04 +02:00
Maximilian Bode
50bc216165 pythonPackages.CDDB: fix darwin build (#46412)
(cherry picked from commit 5b1b4adb2a)
2018-09-09 12:11:13 +02:00
Jan Malakhovski
69b6db0ec5 gpgme: use default texinfo
(cherry picked from commit 53c9efe9e5)
2018-09-09 12:05:37 +02:00
Jan Malakhovski
4ce4c247db git: use default texinfo
(cherry picked from commit 7705c76c49)
2018-09-09 12:05:37 +02:00
Samuel Dionne-Riel
97916acf08 texlive: Adds patch for missing synctex header. (#46376)
This seems like a known issue as other distributions (ArchLinux here)
have patches fixing the issue.

This hopefully fixes more than one dependant builds for ZHF 18.09.

(cherry picked from commit 1ac912bf1b)
2018-09-09 11:39:43 +02:00
Uli Baum
33e2a6dc9f Merge branch 'release-18.09' into staging-18.09 2018-09-09 11:39:09 +02:00
Maximilian Bode
17456d8082 pythonPackages.django-raster: fix build (#46413)
(cherry picked from commit dfcf07d9d3)
2018-09-09 11:35:29 +02:00
Yannik Sander
546fe710b1 build with pythonPackages
(cherry picked from commit 1245621497)
2018-09-08 18:18:31 -04:00
Matthew Bauer
d3a113eb3f rpcbind: remove placeholder 2018-09-08 17:03:49 -05:00
Matthew Bauer
ed948341ce Revert "Merge pull request #37693 from jtojnar/min-nix-two"
This reverts commit 4caab41c1b, reversing
changes made to 11dab7bd4a.
2018-09-08 17:02:10 -05:00
Matthew Bauer
f4bfc63727 Revert "nfs-utils: simplify code using placeholders"
This reverts commit 037d27ed00.
2018-09-08 17:00:33 -05:00
Matthew Bauer
02bb97e5bb Revert "nixos docs: add release notes for nix 2.0 requiremnt bump"
This reverts commit 18f9539655.
2018-09-08 16:57:46 -05:00
Matthew Bauer
891b025fc2 Revert "Nix minimal version: 1.11 -> 2.0"
This reverts commit 7d1968c0e3.
2018-09-08 16:56:57 -05:00
Matthew Bauer
01f75ae0fd xdg/mime.nix: ensure $out/share/mime/packages exists
For update-mime-database to work, you must have to have some mime
packages installed. In some DEs like XFCE this is not guaranteed to
happen. In that case just skip the update-mime-database call.

Fixes #46162
2018-09-08 16:55:48 -05:00
xeji
3ecacb1cb6 pythonPackages.persistent: fix build (#46364)
Documentation-related tests failed, the docs didn't build correctly
because of missing dependencies sphinx and manuel. Add them.

(cherry picked from commit 113f4d7b44)
2018-09-08 21:35:58 +02:00
Maximilian Bode
52a9286bcb pythonPackages.confluent-kafka: fix build (#46380)
cc #45960

(cherry picked from commit 73e75a7d16)
2018-09-08 21:32:36 +02:00
xeji
0817f94f76 cryptsetup: enable and fix tests (#46346)
Some tests use O_DIRECT which is filesystem dependent and fails in a
sandbox as well as on some filesystems without sandboxing.
Patch out O_DIRECT and disable the 4 test cases that still fail in a
sandbox. See discussion in #46151.

(cherry picked from commit 8c6cf3de3d)
2018-09-08 21:24:50 +02:00
Michael Raskin
f890192b9c Merge #46348: chromium: 68.0.3440.106 -> 69.0.3497.81
(cherry picked from commit 7c69ae6259)
2018-09-08 20:10:59 +02:00
Maximilian Bosch
a05c49a22f jbake: fix sandbox build (#46363)
See https://hydra.nixos.org/build/80999410

Without a sandbox the `checkPhase` breaks with the following error:

```
/nix/store/i6vl5lwlz5jbkg4r6p340dwmj6fha3xq-stdenv-linux/setup: bin/jbake: /usr/bin/env: bad interpreter: No such file or directory
jbake did not return correct version
```

Running `patchShebangs` before fixes the issue.

Addresses #45960

(cherry picked from commit 6960a96a0c)
2018-09-08 15:21:30 +02:00
Graham Christensen
07cfc2fa56 Merge pull request #46343 from obsidiansystems/fix-46320
nixpkgs module: Fix defaulting of `localSystem` and `system` for 18.09
2018-09-08 09:16:56 -04:00
Tad Fisher
43c9869dc5 nixos/networkmanager: fix VPN plugin service definition targets (#46201)
(cherry picked from commit 56b3c5b2dd)
2018-09-08 14:36:35 +02:00
Maximilian Bosch
3be4b8afc3 chessx: fix build (#46359)
See https://hydra.nixos.org/build/80998335.

Upstream doesn't support QT 5.11 ATM which broke compilation:

```
src/dialogs/savedialog.cpp: In constructor ‘SaveDialog::SaveDialog(QWidget*, Qt::WindowFlags)’:
src/dialogs/savedialog.cpp:37:34: error: invalid use of incomplete type ‘class QButtonGroup’
     group = new QButtonGroup(this);
```

The Arch community recommends to use an older QT version to fix
this (https://aur.archlinux.org/packages/chessx/).

Furthermore the `QT_PLUGIN_PATH` wasn't set properly which broke the
runtime since QT coudln't find the `xcb` plugin:

```
qt.qpa.plugin: Could not find the Qt platform plugin "xcb" in ""
This application failed to start because no Qt platform plugin could be initialized.
Reinstalling the application may fix this problem.
```

Finally, some minor style fixes were made for consistent indentation.

Addresses #45960

(cherry picked from commit 37032db583)
2018-09-08 14:20:01 +02:00
Samuel Dionne-Riel
5fa7404db9 yabause: 0.9.14 -> 0.9.15 (#46353)
+ fixes for Qt 5.11 build.

(cherry picked from commit 2c751dcdc9)
2018-09-08 13:59:29 +02:00
Maximilian Bosch
4eaa7ef159 pythonPackages.pycaption: fix build (#46356)
The `beaitufulsoup4` package distributed by `nixpkgs` is now at `4.6.3`.

Additionally it fixes `gnomecaption` which depends on the broken
`pycaption` package.

See https://hydra.nixos.org/build/81000247
See https://hydra.nixos.org/build/80723223

Addresses #45960

(cherry picked from commit a02002deba)
2018-09-08 12:10:47 +02:00
worldofpeace
26d65faa62 mono-addins: fix build (#46354)
(cherry picked from commit 2031c0ebfe)
2018-09-08 10:07:44 +02:00
Bastian Köcher
0df87918e5 kdecoration-viewer: Fixes build (#46339)
(cherry picked from commit 0f8c58afd2)
2018-09-08 01:40:05 +02:00
Maximilian Bosch
0842915312 pythonPackages.trio: fix build (#46342)
Fixes the build for `python3Packages.trio' for the next ZHF iteration.
Please refer to the Hydra build for further reference: https://hydra.nixos.org/build/80617356

`python3Packages.sniffio` is needed for the build, otherwise the build
aborts with an error like this:

```
  Could not find a version that satisfies the requirement sniffio (from trio==0.6.0) (from versions: )
No matching distribution found for sniffio (from trio==0.6.0)
```

See #45960

(cherry picked from commit 218ac50fd4)
2018-09-08 01:05:14 +02:00
Timo Kaufmann
cc05d938f9 youtube-dl: fix youtube video download
(cherry picked from commit 8ef940a038)
2018-09-07 21:24:07 +02:00
Timo Kaufmann
441226d374 youtube-dl: 2018.08.28 -> 2018.09.01
(cherry picked from commit fa76f75c7b)
2018-09-07 21:24:05 +02:00
Timo Kaufmann
97577f0057 sage: fix numpy and scipy integration
(cherry picked from commit 7521f2863d)
2018-09-07 18:56:17 +02:00
Chris Ostrouchov
17e17700e2 pythonPackages.ncclient: refactor
adding selectors2 as dependency of ncclient. Added recently 20 days
ago in August. 8ef20f2828

(cherry picked from commit a726956b42)
2018-09-07 17:34:52 +02:00
Chris Ostrouchov
010fc6b762 pythonPackages.selectors2: init at 2.0.1
Added package becuase now dependency of ncclient.

(cherry picked from commit 11c3fe2258)
2018-09-07 17:34:52 +02:00
Michael Raskin
4a62ef0800 julia: readd julia_06 name, make julia an alias that selects a version, as we usually do for incompatible versions
(cherry picked from commit 0e4197b34b)
2018-09-07 15:57:32 +01:00
Daniël de Kok
4f475fee74 python2Packages.spacy_models: update all models to version 2.0.0 (#46182)
Update the model list to those models that are compatibly with the
latest spaCy version:

https://github.com/explosion/spacy-models/blob/master/compatibility.json

The updated model file evaluates to the following packages:

python2Packages.spacy_models.de_core_news_sm
python2Packages.spacy_models.en_core_web_lg
python2Packages.spacy_models.en_core_web_md
python2Packages.spacy_models.en_core_web_sm
python2Packages.spacy_models.en_vectors_web_lg
python2Packages.spacy_models.es_core_news_md
python2Packages.spacy_models.es_core_news_sm
python2Packages.spacy_models.fr_core_news_md
python2Packages.spacy_models.fr_core_news_sm
python2Packages.spacy_models.it_core_news_sm
python2Packages.spacy_models.nl_core_news_sm
python2Packages.spacy_models.pt_core_news_sm
python2Packages.spacy_models.xx_ent_wiki_sm
python3Packages.spacy_models.de_core_news_sm
python3Packages.spacy_models.en_core_web_lg
python3Packages.spacy_models.en_core_web_md
python3Packages.spacy_models.en_core_web_sm
python3Packages.spacy_models.en_vectors_web_lg
python3Packages.spacy_models.es_core_news_md
python3Packages.spacy_models.es_core_news_sm
python3Packages.spacy_models.fr_core_news_md
python3Packages.spacy_models.fr_core_news_sm
python3Packages.spacy_models.it_core_news_sm
python3Packages.spacy_models.nl_core_news_sm
python3Packages.spacy_models.pt_core_news_sm
python3Packages.spacy_models.xx_ent_wiki_sm

(cherry picked from commit d261df5fc1)
2018-09-07 13:00:14 +02:00
Christopher Ostrouchov
5974311abe pythonPackages.kubernetes: add missing dependency (#46179)
fix build issue from missing dependency `adal`. This is due to `adal`
being added as a dependency in July
23rd. 9afec55f4a (diff-b4ef698db8ca845e5845c4618278f29a)

(cherry picked from commit 66e1288962)
2018-09-07 11:26:36 +02:00
Christopher Ostrouchov
a16ba12a82 pythonPackages.ordered-set: add missing dependency (#46183)
missing dependency for doing tests (pytestrunner) added three months
ago June c0b9308988.

(cherry picked from commit 427e4910ec)
2018-09-07 09:29:43 +02:00
Christopher Ostrouchov
53b906236e pythonPackages.phonopy: refactor (#46161)
Fixing phonopy not building. Tests were moved on Jul 30.

(cherry picked from commit 6586765a8f)
2018-09-07 08:41:50 +02:00
Christopher Ostrouchov
1857e03ed4 pythonPackages.locustio: 0.8.1 -> 0.9.0 (#46191)
Fixing build issue. Additionally fetching from github becuase pypi
packge does not come with README which is a buildtime dependency.

(cherry picked from commit b5b48c0a91)
2018-09-07 08:39:17 +02:00
Christopher Ostrouchov
796c736318 pythonPackages.pyslurm: 20180604 -> 20180811 (#46187)
Update version to support latest version of slurm. Fixes since
previously did not build.

(cherry picked from commit b1d6d159aa)
2018-09-07 08:29:11 +02:00
Bas van Dijk
415b1be6b6 Merge pull request #46212 from vaibhavsagar/bump-all-cabal-hashes-18.09
all-cabal-hashes: update snapshot to Hackage at 2018-09-04T11:59:40Z
2018-09-07 01:19:29 +02:00
Vladimír Čunát
ef96e79597 Merge branch 'staging-18.09' into release-18.09 2018-09-07 00:50:42 +02:00
Vaibhav Sagar
a55b95691b all-cabal-hashes: update snapshot to Hackage at 2018-09-04T11:59:40Z
(cherry picked from commit d376ceb6ff)
2018-09-06 17:27:30 -04:00
Graham Christensen
3d83234c08 Merge pull request #46192 from grahamc/nix-2.1-on-18.09
Nix 2.1 on 18.09
2018-09-06 15:44:49 -04:00
Graham Christensen
16188edaff Revert "Revert "nix-plugins: 4.0.5 -> 5.0.0.""
This reverts commit 5acc35215f.
2018-09-06 15:31:15 -04:00
Graham Christensen
e52cd2e27f Revert "Revert "nix: 2.1 -> 2.1.1""
This reverts commit 1e2124583d.
2018-09-06 15:31:14 -04:00
Graham Christensen
a385819d8f Revert "Revert "nix: 2.0.4 -> 2.1""
This reverts commit 7fba61a49c.
2018-09-06 15:31:12 -04:00
Graham Christensen
7fba61a49c Revert "nix: 2.0.4 -> 2.1"
This reverts commit 95a907b72b.

Premature, doesn't evaluate.
2018-09-06 15:30:05 -04:00
Graham Christensen
1e2124583d Revert "nix: 2.1 -> 2.1.1"
This reverts commit 4d33c0eea8.

Premature, doesn't evaluate.
2018-09-06 15:29:51 -04:00
Graham Christensen
5acc35215f Revert "nix-plugins: 4.0.5 -> 5.0.0."
This reverts commit 91e057d1b7.

Premature. Doesn't evaluate.
2018-09-06 15:29:45 -04:00
Shea Levy
91e057d1b7 nix-plugins: 4.0.5 -> 5.0.0.
Fixes build against nix 2.1.

(cherry picked from commit 56a605c8b9)
2018-09-06 15:27:27 -04:00
Eelco Dolstra
4d33c0eea8 nix: 2.1 -> 2.1.1
(cherry picked from commit 1510f324a3)
2018-09-06 15:26:14 -04:00
Eelco Dolstra
95a907b72b nix: 2.0.4 -> 2.1
(cherry picked from commit 347638ccfe)
2018-09-06 15:26:10 -04:00
Christopher Ostrouchov
b871c68e4d pythonPackages.jupyterlab_launcher: refactor (#46178)
jupyterlab_launcher does not support python version < 3.5. Disabled
for older versions

(cherry picked from commit 7bcc2870c7)
2018-09-06 20:41:14 +02:00
Jan Malakhovski
23da995a02 nixos/shells: fix indent everywhere
to comply with `doc/coding-conventions.xml`

(cherry picked from commit 8952375b48)
2018-09-06 20:32:40 +02:00
Tor Hedin Brønner
0cf3e0ba00 nixos/shells: avoid overriding the environment for child shells
A shared exported guard `__NIXOS_SET_ENVIRONMENT_DONE` is introduced that can
be used to prevent child shells from sourcing `system.build.setEnvironment`
the second time.

This fixes e.g. `nix run derivation` when run from e.g. ZSH through the console or
ssh. Before this Bash would resource the common environment resetting the `PATH`
environment variable.

We also export `system.build.setEnvironment` to `/etc/set-environment` making it
easy to reset the common environment with `. /etc/set-environment` when
needed and to grep for environment variables in `/etc` (which was the
motivation of #30418).

This reverts changes made in b00a3fc6fd
(the original #30418).

(cherry picked from commit d273db48c6)
2018-09-06 20:32:40 +02:00
John Ericson
e981546ab7 doc: Add release notes for top-level {build,host,target}Platform deprecation
I forgot to do this in e51f736076.

(cherry picked from commit f66257cfce)
2018-09-06 14:28:26 -04:00
Matthieu Coudron
efa7ab7f7f python3Packages.genanki: init at 0.6.0
Library to generate anki flashcards.

(cherry picked from commit 13050ccc0b)
2018-09-06 18:52:43 +02:00
Chris Ostrouchov
8167419324 pythonPackages.geopandas: 0.3.0 -> 0.4.0
Additionally fix issue with tests failing for 18.09 release.

Tests required url fetch. Disabled with "not web".

(cherry picked from commit 1d6fd65957)
2018-09-06 18:50:46 +02:00
Shea Levy
7f345622bc haskell.compiler.ghc861: Apply fix to abi-hash with backpack.
See https://phabricator.haskell.org/D5123.

(cherry picked from commit 06a3db6e54)
2018-09-06 11:40:57 -04:00
Shea Levy
328fc49235 ghc: Apply fix to abi-hash with backpack.
See https://phabricator.haskell.org/D5123.

(cherry picked from commit cbf194384f)
2018-09-06 11:40:47 -04:00
Alexander Biehl
f3ced683ba More conservative SCC tagging for Haskell libraries
`all-functions` corresponds to `-fprof-auto` which places an SCC on every binding. It is well known that SCCs hinder GHC from doing its optimization magic and really slows down profiled code to a point where the profiling reports are completely skewed towards things that were completely optimized away in production settings. Concretely this shows up with things like lenses which do not carry runtime overhead when properly simplified.

`exported-functions` corresponds to GHCs `-fprof-auto-exported` which doesn't put SCCs on `INLINE`d code and in turn doesn't influence simplification of this basic but important stuff.

(cherry picked from commit 3c70c4c6af)
2018-09-06 11:40:31 -04:00
Alex Biehl
f071c8b135 Haskell builder: Use $abi/$libname as --libsubdir
(cherry picked from commit a7d8800b1e)
2018-09-06 11:40:05 -04:00
Michael Raskin
e0404ef024 matrix-synapse: 0.33.3 -> 0.33.3.1
(cherry picked from commit 6ea0c3e271)
2018-09-06 16:58:14 +02:00
Sebastien Maret
0ba0f158ef gildas: add alternative url for the source code (#46145)
For each new release, the upstream developers of Gildas move the
source code of the previous release to a different directory. Add this
directory to the list of url to avoid build failure at each new
release.

(cherry picked from commit 5b58c6ac76)
2018-09-06 15:11:20 +01:00
John Ericson
813ed8fade Merge pull request #46149 from obsidiansystems/plain-system-host
top-level, stdenv: Make `system` and `stdenv.system` describe the hostPlatform for 18.09
2018-09-06 09:37:51 -04:00
John Ericson
5e3f2d4a95 Merge pull request #46146 from obsidiansystems/deprecate-top-level-platform-aliases
top-level: Deprecate top-level `{build,host,target}Platform` for 18.09
2018-09-06 08:11:16 -04:00
Matthieu Coudron
77a56c9e56 pythonPackages.alot: install zsh completion
(cherry picked from commit 97816bed33)
2018-09-06 11:28:33 +01:00
Ashley Gillman
cec33e25d6 python.pkgs.nipype: Futures is python 2 only. Also fix building.
(cherry picked from commit 12c0dd5432)
2018-09-06 10:48:41 +01:00
Chris Ostrouchov
eedff96832 pythonPackages.pymatgen: 2018.8.10 -> 2018.9.1
Also 2018.8.10 does not build in previous state because auto updating
from pypi did not account for a new requirement `networkx`. This has
been added.

(cherry picked from commit 63cf879d6c)
2018-09-06 10:34:56 +01:00
Matthieu Coudron
caf9d779d7 khal: add zsh completion
(cherry picked from commit 61df695f65)
2018-09-06 09:50:57 +01:00
Vladimír Čunát
5381f0c2f7 Merge branch 'release-18.09' into staging-18.09 2018-09-06 09:53:44 +02:00
Vladimír Čunát
f03d1058d9 Merge #46075: texinfoInteractive: fix for new perl
(cherry picked from commit b5bd566172)
2018-09-06 09:16:48 +02:00
Tim Steinbach
6f3bd5db2f linux: Remove 4.17
(cherry picked from commit f89d6d92b7)
2018-09-05 21:03:18 -04:00
Uli Baum
5b82747057 gnu-smalltalk: fix build
disable format hardening

(cherry picked from commit e5d9c16f2a)
2018-09-05 23:47:05 +01:00
Jörg Thalheim
e207071779 iana-etc: 20180711 -> 20180905 2018-09-05 22:57:52 +01:00
Robert Schütz
76b654c4d5 python.pkgs.py3status: fix build
(cherry picked from commit 041043420f)
2018-09-05 23:36:57 +02:00
Maximilian Bosch
a015527b1b nixos/activation: fix activation script for non-POSIX shells (#46042)
This fixes an issue with shells like fish that are not fully POSIX
compliant. The syntax `ENV=val cmd' doesn't work properly in there.

This issue has been addressed in #45932 and #45945, however it has been
recommended to use a single shell (`stdenv.shell' which is either
`bash' or `sh') to significantly reduce the maintenance overload in the
future.

See https://github.com/NixOS/nixpkgs/issues/45897#issuecomment-417923464

Fixes #45897

/cc @FRidh @xaverdh @etu

(cherry picked from commit df05618f2a)
2018-09-05 22:50:03 +02:00
xeji
a6e2a55611 nixos/tests/opensmtpd: prevent non-deterministic failure (#46071)
A sporadic failure occured on Hydra because a request was sent
to smtpd after the systemd unit was started, but before the daemon
was actually listening. Fix by checking for open ports first.

(cherry picked from commit f70dc57ad3)
2018-09-05 22:36:38 +02:00
Jethro Kuan
c3796a7d1b pythonPackages.tflearn: 0.2.1 -> 0.3.2 (#46102)
(cherry picked from commit a9a380b259)
2018-09-05 17:39:17 +01:00
John Ericson
d3cc8c6b1d Merge pull request #46105 from obsidiansystems/trace-to-warn
stdenv, neovim: Use `lib.warn` for deprecation warnings for 18.09
2018-09-05 11:54:41 -04:00
Timo Kaufmann
79b736ef42 spotify: 1.0.88.353.g15c26ea1-14 -> 1.0.83.316.ge96b6e67-5
The recent update is broken. Playing a song causes spotify to segfault.
This is probably
https://community.spotify.com/t5/Desktop-Linux/Segfault-with-the-new-update/td-p/4554830#,
which was recognized by upstream and will hopefully be fixed soon.

(cherry picked from commit d89b1f0fbf)
2018-09-05 17:36:41 +02:00
Vladyslav Mykhailichenko
7357961cf4 wireguard: 0.0.20180809 -> 0.0.20180904
(cherry picked from commit 4cd94bb5b8)
2018-09-05 16:08:37 +01:00
xeji
3f70d89181 statsd: mark broken, disable nixos test (#46097)
It's broken with node v8 and the upstream project is dead
(last commit Nov. 2016), see #45946 and
https://github.com/etsy/statsd/issues/646

(cherry picked from commit ba52f4cb76)
2018-09-05 16:49:05 +02:00
Daniël de Kok
e36e682d08 pythonPackages.thinc: fix darwin build (#46092)
thinc uses Accelerate on macOS as a blas library. Add the necessary
dependencies to allow building on unsandboxed Darwin machines.

(cherry picked from commit 348a153781)
2018-09-05 16:23:26 +02:00
Daniël de Kok
dd6d9aecca python[23]Packages.mxnet: fix build
Relax graphviz, numpy, requests dependency version bounds.

(cherry picked from commit e57e92bfa2)
2018-09-05 16:10:54 +02:00
Daniël de Kok
81b8016e39 python[23]Packages.graphviz: 0.5.2 -> 0.9
(cherry picked from commit 19ac917707)
2018-09-05 16:10:54 +02:00
Daniël de Kok
e2baf6a7bb mxnet: fix library dependencies.
- mxnet now builds the open source MKL DNN library. However, this
  was not included with the build.
- mxnet builds its own OpenMP library, even when OpenMP is provided
  by the system. This leads to problems, so remove the included
  OpenMP implementation:

  https://github.com/apache/incubator-mxnet/pull/12160

(cherry picked from commit 590ce7d1ae)
2018-09-05 16:10:54 +02:00
Sebastien Maret
d23bc7fc56 gildas: ignore clang warnings for unused command line arguments
See #46044

(cherry picked from commit b76cf0b54c)
2018-09-05 16:04:47 +02:00
Sebastien Maret
38f590a034 gildas: fix makefile rule
(cherry picked from commit 3bc898035d)
2018-09-05 16:04:47 +02:00
Tim Steinbach
6f01302d9e linux: 4.18.5 -> 4.18.6
(cherry picked from commit 25cad43f85)
2018-09-05 08:24:17 -04:00
Tim Steinbach
b232cee0c3 linux: 4.14.67 -> 4.14.68
(cherry picked from commit de9a2fd061)
2018-09-05 08:24:17 -04:00
Tim Steinbach
2bb649fd65 linux: 4.9.124 -> 4.9.125
(cherry picked from commit 92010b7a88)
2018-09-05 08:24:17 -04:00
Tim Steinbach
6db1351f15 linux: 4.4.153 -> 4.4.154
(cherry picked from commit f685edba08)
2018-09-05 08:24:17 -04:00
Urban Skudnik
96ae9a3522 restic: Fix autocomplete for zsh
zsh requires for files to be prepended with underscore to be
recognized as widgets, see [1] for more details.

[1] https://github.com/NixOS/nixpkgs/pull/46001#issuecomment-418567160

(cherry picked from commit e9fe3a334b)
2018-09-05 10:42:46 +01:00
Daniël de Kok
e928fd9f33 spacy: relax dependency versions
(cherry picked from commit da8475736e)
2018-09-05 10:35:42 +01:00
Daniël de Kok
7888e2602e thinc: relax dependency version requirements
(cherry picked from commit ffb094f939)
2018-09-05 10:35:42 +01:00
Vladimír Čunát
cba0654682 Merge #46047: ghostscript: 9.22 -> 9.24 (security)
(cherry picked from commit 281a629c2a)
2018-09-05 11:15:16 +02:00
Samuel Dionne-Riel
dea9a04ae6 qtkeychain: Fixes Qt4 build. (#46085)
(cherry picked from commit c59d9d371e)
2018-09-05 09:29:39 +02:00
Samuel Dionne-Riel
dd1afaab7d solarus-quest-editor: 1.4.5 -> 1.5.3
(cherry picked from commit 455f8151fd)
2018-09-05 08:54:42 +02:00
Samuel Dionne-Riel
508608d572 solarus: 1.4.5 -> 1.5.3
(cherry picked from commit 83a0d5d013)
2018-09-05 08:54:24 +02:00
Samuel Dionne-Riel
f8585bb4d5 qmapshack: 1.11.1 -> 1.12.0 (#46084)
(cherry picked from commit a394d08f11)
2018-09-05 08:39:57 +02:00
Samuel Dionne-Riel
85a10bcdd2 qtchan: Fixes build from Qt upgrade. (#46082)
Uses an upstream fix.

(cherry picked from commit 7ec9a333df)
2018-09-05 08:24:21 +02:00
Sarah Brofeldt
3e87977e38 go_1_11: Allow only one of GOARM={5,6,7}
(cherry picked from commit e153a988ec)
Backport of #46031 to release-18.09
2018-09-05 01:05:58 +02:00
Andreas Rammhold
2c844ce13a python.pkgs.pytest-fixture-config: disable tests (#46021)
Tests seem to fail on all recent versions even outside of our build
system. The upstream CI tests seem to somehow succeed but I wasn't able
to reproduce that locally. For not it is probably best to disable them.

(cherry picked from commit d814c98ec8)
2018-09-05 01:03:07 +02:00
Orivej Desh
b25eb04b03 swift-im: fix build with Qt 5.11 and split QtWebKit
(cherry picked from commit 205f3e941a)
2018-09-04 21:52:05 +00:00
Orivej Desh
ebaaaf693e psi-plus: 1.2.235 -> 1.3.410
(cherry picked from commit 6767396e38)
2018-09-04 21:51:56 +00:00
Orivej Desh
375234df52 libsignal-protocol-c: init at 2.3.2
(cherry picked from commit 2e0befd22e)
2018-09-04 21:51:45 +00:00
Orivej Desh
90d0fdaa4d psi: specify license (#43716)
(cherry picked from commit 0f1125975a)
2018-09-04 21:51:30 +00:00
worldofpeace
ac690fc18d dbus-sharp-2_0: fix build (#46060)
(cherry picked from commit 33fa23f6b3)
2018-09-04 23:38:37 +02:00
Will Dietz
6c449eb729 zsh: 5.5.1 -> 5.6 (#46052)
Security, see:

https://github.com/zsh-users/zsh/blob/zsh-5.6/NEWS#L7
(cherry picked from commit 59f5a65e72)

Backported because it contains a CVE fix
2018-09-04 23:33:29 +02:00
Uli Baum
1ee95ca8c9 nixos/tests/novacomd: prevent non-deterministic failure
A sporadic failure occured on Hydra because a request was sent
to the daemon after the systemd unit was started, but before the
daemon was actually listening. Fix by checking for open port first.

(cherry picked from commit 62086c6be6)
2018-09-04 23:20:56 +02:00
Tim Steinbach
d38c50caf4 oh-my-zsh: 2018-07-29 -> 2018-09-03
(cherry picked from commit 98ef33ec74)
2018-09-04 16:20:17 -04:00
symphorien
94b8a71dc3 sound-juicer: fix build (#46051)
(cherry picked from commit 16e776fde7)
2018-09-04 21:16:34 +02:00
Uli Baum
11c2595e40 boost: fix faulty cherry-pick in c70ff28
the change in c70ff28 accidentally ended up in the wrong line
2018-09-04 18:28:46 +02:00
Stephen
c70ff28968 boost: disable python explicitly in b2Args (#45679)
fixes the build of boost_162

(cherry picked from commit 775d1ecf57)
2018-09-04 18:23:33 +02:00
Uli Baum
8fb90de88c systemd: don't use options from fstab on remount
Include fix by @aszlig to fix remount with comment/application-specific
fstab options.

(cherry picked from commit 03c1f567d5)
2018-09-04 13:03:32 +02:00
Uli Baum
f3ed8122dc texlive: add IPFS URL for package source snapshot
(cherry picked from commit 20d88c1a4b)
2018-09-04 12:59:20 +02:00
Uli Baum
b9a33159b6 biber: 2.10 -> 2.11
2.11 is the version used in TexLive 2018

(cherry picked from commit 5c9ebf4fc7)
2018-09-04 12:59:20 +02:00
Uli Baum
6ce6f557ce texlive.bin.core-big: disable luatex53
build failed on Darwin
Patch by @veprbl

(cherry picked from commit 831551a9a1)
2018-09-04 12:59:20 +02:00
Uli Baum
1fab25f991 texlive.bin.core-big: remove unneeded compiler flags
(cherry picked from commit ac03d2e571)
2018-09-04 12:59:20 +02:00
Uli Baum
1ab0bd7190 texlive: add detailed upgrade instructions in separate file
(cherry picked from commit 2737f17d38)
2018-09-04 12:59:19 +02:00
Uli Baum
1bec29aec6 texlive-packages: snapshot 2017-final -> 20180827
and use fixed hashes

(cherry picked from commit f3961e5dae)
2018-09-04 12:59:19 +02:00
Uli Baum
292413f567 texlive: make packages fixed-output derivations
This reverts a part of the changes made in #40826.
Fixed-output derivations save time and space on rebuilds.

(cherry picked from commit 738bae4ec2)
2018-09-04 12:59:19 +02:00
Uli Baum
d2c300b757 texlive: update server URLs
(cherry picked from commit d5816c9bcb)
2018-09-04 12:59:19 +02:00
Uli Baum
0bf565747f texlive.bin: 20170524 -> 20180414
(cherry picked from commit 149b180f18)
2018-09-04 12:59:19 +02:00
Uli Baum
17bcaf17f7 poppler_min: 0.61 -> 0.67
currently only used for texlive

(cherry picked from commit c52174030e)
2018-09-04 12:59:18 +02:00
Timo Kaufmann
6f8e07ac0f Merge #46016: openblas: fix pkg-config alias name
(cherry picked from commit a774988e44)
2018-09-04 12:11:35 +02:00
Daniël de Kok
4b666f1118 mxnet: 1.1.0 -> 1.2.1 (#46026)
Update and fix the build:

- Perl is a build-time requirement.
- Fix hardcoded /bin/bash invocation.

(cherry picked from commit 93a5947158)
2018-09-04 11:38:35 +02:00
Daniël de Kok
b4479796e3 vowpalwabbit: mark broken on aarch64.
(cherry picked from commit 69d418aeac)
2018-09-04 08:59:28 +02:00
Daniël de Kok
07ec5b577b vowpal-wabbit: fix Darwin build.
- Follow the same logic for finding boost-python as for Linux.
- Set DYLD_LIBRARY_PATH so that ctypes find_library can find
  boost-python.
- Do not use '-mt' suffix when linking against boost-serialization
  and boost-program_options on Darwin.

(cherry picked from commit fe7e89ba3b)
2018-09-04 08:59:28 +02:00
Daniël de Kok
8f33594a10 vowpalwabbit: fix build against boost-python.
Patch setup.py to look for libboost_python{Major}{Minor}.

(cherry picked from commit 875bb6bcb9)
2018-09-04 08:59:28 +02:00
John Ericson
46f4a934dc Merge pull request #46024 from Ericson2314/fix-45993
mkDerivation: Fix cross compilation for 18.09
2018-09-04 01:29:10 -04:00
markuskowa
a2aacb218c gnss-sdr: set boost version to 1.66 (#46014)
(cherry picked from commit 7c915abd52)
2018-09-04 00:21:22 +02:00
Daniël de Kok
d0182e0917 magit-todos: fix build by providing git as input. (#45999)
magit-todos requires git during builds. Fixes #45868.

(cherry picked from commit 9d6ff38f70)
2018-09-03 23:43:17 +02:00
symphorien
f391f6fe73 gede: 2.6.1 -> 2.10.9 (#45995)
reverting to qt 5.9 fixed the build.

(cherry picked from commit 3549879b45)
2018-09-03 23:25:08 +02:00
Dmitry Kalinkin
6c988bce77 Revert "arrow-cpp: 0.9.0 -> 0.10.0" (#45991)
Hold off the upgrade until parquet 1.5.0 is released.

This reverts commit 72d630779d.

(cherry picked from commit 992d64bf3e)
2018-09-03 22:44:54 +02:00
Vladyslav M
05c52a7afb ion: broken on darwin (#46010)
(cherry picked from commit 8954c1f719)
2018-09-03 22:38:51 +02:00
aanderse
427ac1a21a kodi: fix nfs support (#46006)
libnfs is required to be in the LD_LIBRARY_PATH for kodi if you want nfs support 
see: https://www.reddit.com/r/NixOS/comments/9aiquo/how_to_enable_nfs_support_in_kodi/

(cherry picked from commit 435eccf15e)
2018-09-03 22:34:12 +02:00
worldofpeace
00a43c05d9 photoflow: mark broken for aarch64
(cherry picked from commit 507dfccdf8)
2018-09-03 22:29:53 +02:00
worldofpeace
d22277b59d sayonara: 1.0.0-git5-20180115 -> 1.1.1-git1-20180828
(cherry picked from commit 3149f84a92)
2018-09-03 22:29:52 +02:00
worldofpeace
2aab2027be photoflow: 2018-03-06 -> 2018-08-28
(cherry picked from commit a3db67282d)
2018-09-03 22:29:52 +02:00
worldofpeace
46733c68f9 imgcat: fix build
(cherry picked from commit 66385a66dc)
2018-09-03 22:29:52 +02:00
worldofpeace
c5c046907d amule: fix build
(cherry picked from commit 9069908680)
2018-09-03 22:29:52 +02:00
worldofpeace
e36aa2dd95 xfce4-mixer: fix build
(cherry picked from commit 6ed0823e15)
2018-09-03 22:29:51 +02:00
worldofpeace
74dfea0922 SkypeExport: fix build
(cherry picked from commit 451e04fb4d)
2018-09-03 22:29:51 +02:00
worldofpeace
2fd6a4a224 valadoc: fix build
(cherry picked from commit f828bb313b)
2018-09-03 22:29:51 +02:00
volth
f370254427 perlPackages.TestAggregate: broken with perl 5.26+ (#46003)
(cherry picked from commit c36bfa7211)
2018-09-03 22:05:18 +02:00
volth
414202cd18 perlPackages.UNIVERSALref: broken with perl 5.26+
(cherry picked from commit 9173c37e05)
2018-09-03 21:04:24 +01:00
Daniël de Kok
08a86afbb7 Keras: fix build by updating expected dependencies. (#45992)
Keras expects keras_preprocessing 1.0.2 and 1.0.4. 1.0.3 and 1.0.5
are respectively in nixpkgs.

ZHF #45960

(cherry picked from commit e33be2ab56)
2018-09-03 22:00:08 +02:00
Uli Baum
4c00a04f47 Revert "[cpan2nix] perlPackages.GetoptLongDescriptive: 0.102 -> 0.103"
It broke perlPackages.MouseXGetOpt

This reverts commit ad47c381bd.

(cherry picked from commit 9889c0f241)
2018-09-03 21:54:21 +02:00
Elis Hirwing
d7cd099d6f gitea: 1.5.0 -> 1.5.1 (#45968)
Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.5.1
(cherry picked from commit fcccb9e5ca)
2018-09-03 20:30:48 +02:00
Tim Steinbach
c0bde692f6 kernel: Remove Copperhead
The patches are unmaintained and suggest a false sense of security

(cherry picked from commit 5fccac2b8d)
2018-09-03 11:19:10 -04:00
Vladimír Čunát
e185954cf9 treewide: fix various links (homepage, src)
(cherry picked from commit 9b48a67731)
2018-09-03 16:55:08 +02:00
Vladimír Čunát
ad8c446c20 aefs: fix meta.homepage
(cherry picked from commit 0d388e1bb6)
2018-09-03 16:30:35 +02:00
Vladimír Čunát
347e4c26f0 Merge #45974: purple-matrix: 2016-07-11 -> 2018-08-02
(cherry picked from commit 956790acaf)
2018-09-03 16:16:01 +02:00
Vladimír Čunát
2ba2f91a7f knot-dns: 2.7.1 -> 2.7.2
https://lists.nic.cz/pipermail/knot-dns-users/2018-August/001423.html
(cherry picked from commit 0a5b8ef8c4)
2018-09-03 14:41:00 +02:00
Vladimír Čunát
efe9acb17f tarball job: more --show-trace
Without that I couldn't well do the parent commit.

(cherry picked from commit 8d7439eb19)
2018-09-03 14:29:16 +02:00
Vladimír Čunát
102e0168dd lib/trivial.nix: fix missing parens
Broken in 62dca7c9a; the tricky thing is that it depends on nix version.

(cherry picked from commit 608730af44)
2018-09-03 14:29:12 +02:00
Domen Kožar
e62269f3c8 nix-prefetch-git: needs findutils as it depends on find/xargs
(cherry picked from commit 66d6e847bb)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-09-03 13:23:41 +01:00
Christian Kauhaus
1845c6e3f7 poppler 0.61: patch against CVE-2018-13988 (#45916)
Out of bounds vulnerability in versions up to 0.62.

Generally, we use a newer poppler version but some pkgs still depend on
0.61. Patch named in https://nvd.nist.gov/vuln/detail/CVE-2018-13988.

(cherry picked from commit 542a86037d)
2018-09-03 08:56:35 +02:00
Uli Baum
4d0a22db7f nixos/release.nix: fix eval of closures
missing parentheses

cc: @samueldr
2018-09-03 08:55:58 +02:00
Samuel Dionne-Riel
0d8c216dd2 nixos: Sets channel and version for 18.09 2018-09-02 21:58:13 -04:00
aszlig
ee2463cd71 nixos: Document option description changes
This adds a release notes entry to make users (and especially
developers) aware so they no longer need to use </para><para> in option
descriptions as this is now done automatically on every two consecutive
newlines.

More details can be found in the commit message of f865d0feab.

Signed-off-by: aszlig <aszlig@nix.build>
(cherry picked from commit 4652f2f87e)
2018-09-03 01:15:18 +02:00
aszlig
0d3cfcb958 nixos: Split paras by \n\n in option descriptions
What annoyed me for a long time was the fact, that in order to break
into a new paragraph, you need to insert </para><para> in the
description attribute of an option.

Now we will automatically create <para/> elements for every block that
is separated by two consecutive newlines.

I first tried to do this within options-to-docbook.xsl, but it turns
out[1] that this isn't directly possible with XSLT 1.0, so I added
another XSLT file that postprocesses the option descriptions that are
now enclosed in <nixos:option-description/> by options-to-docbook.xsl.

The splitting itself is a bit more involved, because we can't simply
split on every \n\n because we'd also split text nodes of elements, for
example:

  <screen><![CDATA[

    one line

    another one

  ]]></screen>

This would create one <para/> element for "one line" and another for
"another line", which we obviously don't want because <screen/> is used
to display verbatim contents of what a user is seeing on the screen.

So what we do instead is splitting *only* the top-level text nodes
within the outermost <para/> and leave all elements as-is. If there are
more than one <para/> elements at the top-level, we simply don't process
it at all, because the description then already contains </para><para>.

https://www.mhonarc.org/archive/html/xsl-list/2012-09/msg00319.html

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra, @domenkozar
(cherry picked from commit f865d0feab)
2018-09-02 18:31:36 -04:00
59720 changed files with 1382019 additions and 5702600 deletions

View File

@@ -1,34 +0,0 @@
{
"name": "nixpkgs",
"image": "mcr.microsoft.com/devcontainers/universal:2-linux",
"features": {
"ghcr.io/devcontainers/features/nix:1": {
// fails in the devcontainer sandbox, enable sandbox via config instead
"multiUser": false,
"packages": "nixpkgs.nixd,nixpkgs.nixfmt-rfc-style",
"useAttributePath": true,
"extraNixConfig": "experimental-features = nix-command flakes,sandbox = true"
}
},
// Fixup permissions inside container.
// https://github.com/NixOS/nix/issues/6680#issuecomment-1230902525
"postCreateCommand": "sudo apt-get install -y acl",
"postStartCommand": "sudo setfacl -k /tmp; if [ -e /dev/kvm ]; then sudo chgrp $(id -g) /dev/kvm; fi",
"customizations": {
"vscode": {
"extensions": [
"jnoortheen.nix-ide"
],
"settings": {
"[nix]": {
"editor.formatOnSave": true
},
"nix.enableLanguageServer": true,
"nix.serverPath": "nixd"
}
}
},
"remoteEnv": {
"NIXPKGS": "/workspaces/nixpkgs"
}
}

8
.dir-locals.el Normal file
View File

@@ -0,0 +1,8 @@
;;; Directory Local Variables
;;; For more information see (info "(emacs) Directory Variables")
((nil
(bug-reference-bug-regexp . "\\(\\(?:[Ii]ssue \\|[Ff]ixe[ds] \\|[Rr]esolve[ds]? \\|[Cc]lose[ds]? \\|[Pp]\\(?:ull [Rr]equest\\|[Rr]\\) \\|(\\)#\\([0-9]+\\))?\\)")
(bug-reference-url-format . "https://github.com/NixOS/nixpkgs/issues/%s"))
(nix-mode
(tab-width . 2)))

View File

@@ -1,5 +1,5 @@
# EditorConfig configuration for nixpkgs
# https://EditorConfig.org
# http://EditorConfig.org
# Top-most EditorConfig file
root = true
@@ -11,85 +11,18 @@ insert_final_newline = true
trim_trailing_whitespace = true
charset = utf-8
# Ignore diffs/patches
[*.{diff,patch}]
end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
# We want readFile .version to return the version without a newline.
[.version]
insert_final_newline = false
# see https://nixos.org/nixpkgs/manual/#chap-conventions
# Match json/lockfiles/markdown/nix/perl/python/ruby/shell/docbook files, set indent to spaces
[*.{bash,js,json,lock,md,nix,pl,pm,py,rb,sh,xml}]
# Match nix/ruby/docbook files, set indent to spaces with width of two
[*.{nix,rb,xml}]
indent_style = space
# Match docbook files, set indent width of one
[*.xml]
indent_size = 1
# Match json/lockfiles/markdown/nix/ruby files, set indent width of two
[*.{js,json,lock,md,nix,rb}]
indent_size = 2
# Match all the Bash code in Nix files, set indent width of two
[*.{bash,sh}]
indent_size = 2
# Match Perl and Python scripts, set indent width of four
[*.{pl,pm,py}]
# Match shell/python/perl scripts, set indent to spaces with width of four
[*.{sh,py,pl}]
indent_style = space
indent_size = 4
# Match gemfiles, set indent to spaces with width of two
[Gemfile]
indent_size = 2
indent_style = space
# Match package.json and package-lock.json, which are generally pulled from upstream and accept them as they are
[package{,-lock}.json]
indent_style = unset
insert_final_newline = unset
# Disable file types or individual files
# some of these files may be auto-generated and/or require significant changes
[*.{c,h}]
insert_final_newline = unset
trim_trailing_whitespace = unset
[*.{asc,key,ovpn}]
insert_final_newline = unset
end_of_line = unset
trim_trailing_whitespace = unset
[*.lock]
indent_size = unset
# Although Markdown/CommonMark allows using two trailing spaces to denote
# a hard line break, we do not use that feature in nixpkgs since
# it forces the surrounding paragraph to become a <literallayout> which
# does not wrap reasonably.
# Instead of a hard line break, start a new paragraph by inserting a blank line.
[*.md]
trim_trailing_whitespace = true
# binaries
[*.nib]
end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
charset = unset
[eggs.nix]
trim_trailing_whitespace = unset
[registry.dat]
end_of_line = unset
insert_final_newline = unset
# Keep this hint at the bottom:
# Please don't add entries for subfolders here.
# Create <subfolder>/.editorconfig instead.
# Match diffs, avoid to trim trailing whitespace
[*.{diff,patch}]
trim_trailing_whitespace = false

View File

@@ -1,287 +0,0 @@
# This file contains a list of commits that are not likely what you
# are looking for in a blame, such as mass reformatting or renaming.
#
# If a commit's line ends with `# !autorebase <command>`,
# where <command> is an idempotent bash command that reapplies the changes from the commit,
# the `maintainers/scripts/auto-rebase/run.sh` script can be used to rebase
# across that commit while automatically resolving merge conflicts caused by the commit.
#
# You can set this file as a default ignore file for blame by running
# the following command.
#
# $ git config blame.ignoreRevsFile .git-blame-ignore-revs
#
# To temporarily not use this file add
# --ignore-revs-file=""
# to your blame command.
#
# The ignoreRevsFile can't be set globally due to blame failing if the file isn't present.
# To not have to set the option in every repository it is needed in,
# save the following script in your path with the name "git-bblame"
# now you can run
# $ git bblame $FILE
# to use the .git-blame-ignore-revs file if it is present.
#
# #!/usr/bin/env bash
# repo_root=$(git rev-parse --show-toplevel)
# if [[ -e $repo_root/.git-blame-ignore-revs ]]; then
# git blame --ignore-revs-file="$repo_root/.git-blame-ignore-revs" $@
# else
# git blame $@
# fi
# nixos/modules/rename: Sort alphabetically
1f71224fe86605ef4cd23ed327b3da7882dad382
# manual: fix typos
feddd5e7f8c6f8167b48a077fa2a5394dc008999
# nixos: fix module paths in rename.nix
d08ede042b74b8199dc748323768227b88efcf7c
# fix indentation in mk-python-derivation.nix
d1c1a0c656ccd8bd3b25d3c4287f2d075faf3cf3
# fix indentation in meteor default.nix
a37a6de881ec4c6708e6b88fd16256bbc7f26bbd
# pkgs/stdenv/make-derivation: Reindent
b4cc2a2479a7ab0f6440b2e1319221920ef72699
# treewide: automatically md-convert option descriptions
2e751c0772b9d48ff6923569adfa661b030ab6a2
# nixos/*: automatically convert option docs
087472b1e5230ffc8ba642b1e4f9218adf4634a2
# nixos/*: automatically convert option descriptions
ef176dcf7e76c3639571d7c6051246c8fbadf12a
# nixos/*: automatically convert option docs to MD
61e93df1891972bae3e0c97a477bd44e8a477aa0
# nixos/*: convert options with admonitions to MD
722b99bc0eb57711c0498a86a3f55e6c69cdb05f
# nixos/*: automatically convert option docs
6039648c50c7c0858b5e506c6298773a98e0f066
# nixos/*: md-convert options with unordered lists
c915b915b5e466a0b0b2af2906cd4d2380b8a1de
# nixos/*: convert options with listings
f2ea09ecbe1fa1da32eaa6e036d64ac324a2986f
# nixos/*: convert straggler options to MD
1d41cff3dc4c8f37bb5841f51fcbff705e169178
# nixos/*: normalize manpage references to single-line form
423545fe4865d126e86721ba30da116e29c65004
# nixos/documentation: split options doc build
fc614c37c653637e5475a0b0a987489b4d1f351d
# nixos/*: convert options with admonitions to MD
722b99bc0eb57711c0498a86a3f55e6c69cdb05f
# nixos/*: convert internal option descriptions to MD
9547123258f69efd92b54763051d6dc7f3bfcaca
# nixos/*: replace </para><para> with double linebreaks
694d5b19d30bf66687b42fb77f43ea7cd1002a62
# treewide: add defaultText for options with simple interpolation defaults
fb0e5be84331188a69b3edd31679ca6576edb75a
# nixos/*: mark pre-existing markdown descriptions as mdDoc
7e7d68a250f75678451cd44f8c3d585bf750461e
# nixos/*: normalize link format
3aebb4a2be8821a6d8a695f0908d8567dc00de31
# nixos/*: replace <code> in option docs with <literal>
16102dce2fbad670bd47dd75c860a8daa5fe47ad
# nixos/*: add trivial defaultText for options with simple defaults
25124556397ba17bfd70297000270de1e6523b0a
# systemd: rewrite comments
92dfeb7b3dab820ae307c56c216d175c69ee93cd
# systemd: break too long lines of Nix code
67643f8ec84bef1482204709073e417c9f07eb87
# {pkgs/development/cuda-modules,pkgs/test/cuda,pkgs/top-level/cuda-packages.nix}: reformat all CUDA files with nixfmt-rfc-style 2023-03-01
802a1b4d3338f24cbc4efd704616654456d75a94
# postgresql: move packages.nix to ext/default.nix
719034f6f6749d624faa28dff259309fc0e3e730
# php ecosystem: reformat with nixfmt-rfc-style
75ae7621330ff8db944ce4dff4374e182d5d151f
c759efa5e7f825913f9a69ef20f025f50f56dc4d
# pkgs/os-specific/bsd: Reformat with nixfmt-rfc-style 2024-03-01
3fe3b055adfc020e6a923c466b6bcd978a13069a
# k3s: format with nixfmt-rfc-style
6cfcd3c75428ede517bc6b15a353d704837a2830
# python3Packages: format with nixfmt
59b1aef59071cae6e87859dc65de973d2cc595c0
# treewide description changes (#317959)
bf995e3641950f4183c1dd9010349263dfa0123b
755b915a158c9d588f08e9b08da9f7f3422070cc
f8c4a98e8e138e21353a2c33b90db3359f539b37
# vscode-extensions.*: format with nixfmt (RFC 166)
7bf9febfa6271012b1ef86647a3a06f06875fdcf
# remove uses of mdDoc (#303841)
1a24330f792c8625746d07d842290e6fd95ae6f9
acd0e3898feb321cb9a71a0fd376f1157d0f4553
1b28414d2886c57343864326dbb745a634d3e37d
6afb255d976f85f3359e4929abd6f5149c323a02
# azure-cli: move to by-name, nixfmt #325950
96cd538b68bd1d0a0a37979356d669abbba32ebc
# poptracker: format with nixfmt-rfc-style (#326697)
ff5c8f6cc3d1f2e017e86d50965c14b71f00567b
# mangal: format with nixfmt-rfc-style #328284
3bb5e993cac3a6e1c3056d2bc9bf43eb2c7a5951
# pico-sdk: switch to finalAttrs (#329438)
8946018b0391ae594d167f1e58497b18de068968
# ollama: format with nixfmt-rfc-style (#329353)
bdfde18037f8d9f9b641a4016c8ada4dc4cbf856
# nixos/ollama: format with nixfmt-rfc-style (#329561)
246d1ee533810ac1946d863bbd9de9b525818d56
# steam: cleanup (#216972)
ad815aebfbfe1415ff6436521d545029c803c3fb
# nixos/nvidia: apply nixfmt-rfc-style (#313440)
fbdcdde04a7caa007e825a8b822c75fab9adb2d6
# treewide: reformat files which need reformatting after (#341407)
e0464e47880a69896f0fb1810f00e0de469f770a
# step-cli: format package.nix with nixfmt (#331629)
fc7a83f8b62e90de5679e993d4d49ca014ea013d
# ndn-cxx: format with nixfmt-rfc-style
160b2b769c3b8a6d1ae9947afa77520fa2887db7
# ndn-tools: format with nixfmt-rfc-style
4882ef721ce3d7bb3b5e48ff80125255db515013
# nfd: format with nixfmt-rfc-style
548c2377fa81e2abfc192fbf4f521e601251c468
# darwin.stdenv: format with nixfmt-rfc-style (#333962)
93c10ac9e561c6594d3baaeaff2341907390d9b8
# nrr: format with nixfmt-rfc-style (#334578)
cffc27daf06c77c0d76bc35d24b929cb9d68c3c9
# nixos/kanidm: inherit lib, nixfmt
8f18393d380079904d072007fb19dc64baef0a3a
# fetchhg: format after refactoring with lib.extendMkDerivation and make overridable (#423539)
34a5b1eb23129f8fb62c677e3760903f6d43228f
# fetchurl: nixfmt-rfc-style
ce21e97a1f20dee15da85c084f9d1148d84f853b
# percona: apply nixfmt
8d14fa2886fec877690c6d28cfcdba4503dbbcea
# nixos/virtualisation: format image-related files
# Original formatting commit that was reverted
04fadac429ca7d6b92025188652376c230205730
# Revert commit
4cec81a9959ce612b653860dcca53101a36f328a
# Final commit that does the formatting
88b285c01d84de82c0b2b052fd28eaf6709c2d26
# sqlc: format with nixfmt
2bdec131b2bb2c8563f4556d741d34ccb77409e2
# ant: format with nixfmt-rfc-style
2538d58436b8d0b56d29780aeebf4bf720ddb9ea
# treewide: migrate packages to pkgs/by-name, take 1
571c71e6f73af34a229414f51585738894211408
# format files with nixfmt (#347275)
adb9714bd909df283c66bbd641bd631ff50a4260
# treewide: incus packages
9ab59bb5fb943ad6740f64f5a79eae9642fb8211
# treewide nixfmt reformat pass 1, master, staging and staging-next
4f0dadbf38ee4cf4cc38cbc232b7708fddf965bc
667d42c00d566e091e6b9a19b365099315d0e611
84d4f874c2bac9f3118cb6907d7113b3318dcb5e
# tmuxPlugins sha-to-sri.py script
516b1e74c358a9c4b06e5591f8c1a2897aad0c33
# treewide: migrate comments in lib to rfc145 style
ef85e0daa092c9eae0d32c7ce16b889728a5fbc0
d89ad6c70e0e89aaae75e9f886878ea4e103965a
e0fe216f4912dd88a021d12a44155fd2cfeb31c8
80d5b411f6397d5c3e755a0635d95742f76f3c75
# nixos/movim: format with nixfmt-rfc-style
43c1654cae47cbf987cb63758c06245fa95c1e3b
# nixos/iso-image.nix: nixfmt
da9a092c34cef6947d7aee2b134f61df45171631
# python-packages: format with nixfmt-rfc-style
5f6f5e13ae0b6960cbf1be8aeb3d0048285a08d1
# python-packages: sort with keep-sorted
fd14c067813572afc03ddbf7cdedc3eab5a59954
783add849cbca228a36ffdf407e5d380dc2fe6c4
# treewide format of all Nix files
374e6bcc403e02a35e07b650463c01a52b13a7c8 # !autorebase nix-shell --run treefmt
# nix: nixfmt-rfc-style
a4f7e161b380b35b2f7bc432659a95fd71254ad8
0812c9a321003c924868051d2b2e1934e8880f3f
34f269c14ac18d89ddee9a8f54b1ca92a85bbcc6
062c34cdace499aa44f0fa6ca6f2ca71769f6c43
# haskellPackages.hercules-ci-agent (cabal2nix -> nixfmt-rfc-style)
9314da7ee8d2aedfb15193b8c489da51efe52bb5
# nix-builder-vm: nixfmt-rfc-style
a034fb50f79816c6738fb48b48503b09ea3b0132
# treewide: switch instances of lib.teams.*.members to the new meta.teams attribute
05580f4b4433fda48fff30f60dfd303d6ee05d21
# nixos/redmine: Get rid of global lib expansions
d7f1102f04c58b2edfc74c9a1d577e3aebfca775
# **/README.md: one sentence per line
3d505c03610b6102af6d870ae3506a151cef1f68
60e35e4ded6e91524364a74b3b4ec233ed9321f2
99f2e655d9db009ee0b4ede3edced5f6c882c7f4
b4532efe93882ae2e3fc579929a42a5a56544146
# emacs: keep elpa/nongnu/melpa package overrides sorted
9f2faf683ed48704aa17f693208a13aa64e22181
# nixfmt 1.0.0
62fe01651911043bd3db0add920af3d2935d9869 # !autorebase nix-shell --run treefmt
5a0711127cd8b916c3d3128f473388c8c79df0da # !autorebase nix-shell --run treefmt

4
.gitattributes vendored
View File

@@ -1,6 +1,4 @@
**/deps.nix linguist-generated
**/deps.json linguist-generated
**/deps.toml linguist-generated
**/node-packages.nix linguist-generated
pkgs/applications/editors/emacs-modes/*-generated.nix linguist-generated
@@ -16,5 +14,3 @@ nixos/doc/default.nix linguist-documentation=false
nixos/modules/module-list.nix merge=union
# pkgs/top-level/all-packages.nix merge=union
ci/OWNERS linguist-language=CODEOWNERS

99
.github/CODEOWNERS vendored Normal file
View File

@@ -0,0 +1,99 @@
# CODEOWNERS file
#
# This file is used to describe who owns what in this repository. This file does not
# replace `meta.maintainers` but is instead used for other things than derivations
# and modules, like documentation, package sets, and other assets.
#
# For documentation on this file, see https://help.github.com/articles/about-codeowners/
# Mentioned users will get code review requests.
# This file
/.github/CODEOWNERS @edolstra
# Libraries
/lib @edolstra @nbp
/lib/systems @nbp @ericson2314
/lib/generators.nix @edolstra @nbp @Profpatsch
/lib/debug.nix @edolstra @nbp @Profpatsch
# Nixpkgs Internals
/default.nix @nbp
/pkgs/top-level/default.nix @nbp @Ericson2314
/pkgs/top-level/impure.nix @nbp @Ericson2314
/pkgs/top-level/stage.nix @nbp @Ericson2314
/pkgs/stdenv/generic @Ericson2314
/pkgs/stdenv/cross @Ericson2314
/pkgs/build-support/cc-wrapper @Ericson2314 @orivej
/pkgs/build-support/bintools-wrapper @Ericson2314 @orivej
/pkgs/build-support/setup-hooks @Ericson2314
# NixOS Internals
/nixos/default.nix @nbp
/nixos/lib/from-env.nix @nbp
/nixos/lib/eval-config.nix @nbp
/nixos/doc/manual/configuration/abstractions.xml @nbp
/nixos/doc/manual/configuration/config-file.xml @nbp
/nixos/doc/manual/configuration/config-syntax.xml @nbp
/nixos/doc/manual/configuration/modularity.xml @nbp
/nixos/doc/manual/development/assertions.xml @nbp
/nixos/doc/manual/development/meta-attributes.xml @nbp
/nixos/doc/manual/development/option-declarations.xml @nbp
/nixos/doc/manual/development/option-def.xml @nbp
/nixos/doc/manual/development/option-types.xml @nbp
/nixos/doc/manual/development/replace-modules.xml @nbp
/nixos/doc/manual/development/writing-modules.xml @nbp
/nixos/doc/manual/man-nixos-option.xml @nbp
/nixos/modules/installer/tools/nixos-option.sh @nbp
# Python-related code and docs
/maintainers/scripts/update-python-libraries @FRidh
/pkgs/top-level/python-packages.nix @FRidh
/pkgs/development/interpreters/python @FRidh
/pkgs/development/python-modules @FRidh
/doc/languages-frameworks/python.md @FRidh
# Haskell
/pkgs/development/compilers/ghc @peti @ryantm @basvandijk
/pkgs/development/haskell-modules @peti @ryantm @basvandijk
/pkgs/development/haskell-modules/default.nix @peti @ryantm @basvandijk
/pkgs/development/haskell-modules/generic-builder.nix @peti @ryantm @basvandijk
/pkgs/development/haskell-modules/hoogle.nix @peti @ryantm @basvandijk
# R
/pkgs/applications/science/math/R @peti
/pkgs/development/r-modules @peti
# Ruby
/pkgs/development/interpreters/ruby @zimbatm
/pkgs/development/ruby-modules @zimbatm
# Rust
/pkgs/development/compilers/rust @Mic92 @LnL7
# Darwin-related
/pkgs/stdenv/darwin @NixOS/darwin-maintainers
/pkgs/os-specific/darwin @NixOS/darwin-maintainers
# Beam-related (Erlang, Elixir, LFE, etc)
/pkgs/development/beam-modules @gleber
/pkgs/development/interpreters/erlang @gleber
/pkgs/development/interpreters/lfe @gleber
/pkgs/development/interpreters/elixir @gleber
/pkgs/development/tools/build-managers/rebar @gleber
/pkgs/development/tools/build-managers/rebar3 @gleber
/pkgs/development/tools/erlang @gleber
# Jetbrains
/pkgs/applications/editors/jetbrains @edwtjo
# Eclipse
/pkgs/applications/editors/eclipse @rycee
# https://github.com/NixOS/nixpkgs/issues/31401
/lib/licenses.nix @ghost
# Qt / KDE
/pkgs/applications/kde @ttuegel
/pkgs/desktops/plasma-5 @ttuegel
/pkgs/development/libraries/kde-frameworks @ttuegel
/pkgs/development/libraries/qt-5 @ttuegel

52
.github/CONTRIBUTING.md vendored Normal file
View File

@@ -0,0 +1,52 @@
# How to contribute
Note: contributing implies licensing those contributions
under the terms of [COPYING](../COPYING), which is an MIT-like license.
## Opening issues
* Make sure you have a [GitHub account](https://github.com/signup/free)
* [Submit an issue](https://github.com/NixOS/nixpkgs/issues) - assuming one does not already exist.
* Clearly describe the issue including steps to reproduce when it is a bug.
* Include information what version of nixpkgs and Nix are you using (nixos-version or git revision).
## Submitting changes
* Format the commit messages in the following way:
```
(pkg-name | nixos/<module>): (from -> to | init at version | refactor | etc)
(Motivation for change. Additional information.)
```
Examples:
* nginx: init at 2.0.1
* firefox: 54.0.1 -> 55.0
* nixos/hydra: add bazBaz option
Dual baz behavior is needed to do foo.
* nixos/nginx: refactor config generation
The old config generation system used impure shell scripts and could break in specific circumstances (see #1234).
* `meta.description` should:
* Be capitalized.
* Not start with the package name.
* Not have a period at the end.
* `meta.license` must be set and fit the upstream license.
* If there is no upstream license, `meta.license` should default to `stdenv.lib.licenses.unfree`.
* `meta.maintainers` must be set.
See the nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes) and on how to [submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes).
## Writing good commit messages
In addition to writing properly formatted commit messages, it's important to include relevant information so other developers can later understand *why* a change was made. While this information usually can be found by digging code, mailing list/Discourse archives, pull request discussions or upstream changes, it may require a lot of work.
For package version upgrades and such a one-line commit message is usually sufficient.
## Reviewing contributions
See the nixpkgs manual for more details on how to [Review contributions](https://nixos.org/nixpkgs/manual/#sec-reviewing-contributions).

View File

@@ -1,6 +1,12 @@
<!--
Please note: This blank issue template is meant for extraordinary issues
that do not fit the templates. Unless you know your issue is relevant to
Nixpkgs and requires the free-form blank issue, please use the issue
templates instead.
-->
## Issue description
### Steps to reproduce
## Technical details
Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the
results.

View File

@@ -1,143 +0,0 @@
name: "Bug report (package)"
description: "Create a generic bug report against a package."
title: "PACKAGENAME: BUG TITLE"
labels: ["0.kind: bug"]
body:
- type: "markdown"
attributes:
value: |
<p align="center">
<a href="https://nixos.org">
<picture>
<source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg">
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos-white.svg">
<img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg" width="400px" alt="NixOS logo">
</picture>
</a>
</p>
Welcome to Nixpkgs. Please replace the **`PACKAGENAME: BUG TITLE`** template above with the correct package name (As seen in the [NixOS Package Search](https://search.nixos.org/packages)) and a short title summarising what the bug entails.
> [!TIP]
> For instance, if you were filing a bug against the [`hello`](https://search.nixos.org/packages?channel=unstable&from=0&size=1&buckets=%7B%22package_attr_set%22%3A%5B%22No%20package%20set%22%5D%2C%22package_license_set%22%3A%5B%22GNU%20General%20Public%20License%20v3.0%20or%20later%22%5D%2C%22package_maintainers_set%22%3A%5B%5D%2C%22package_platforms%22%3A%5B%5D%7D&sort=relevance&type=packages&query=hello) package about it failing to launch on ARM Linux, your title would be as follows:
> ```
> hello: fails to launch on aarch64-linux
> ```
---
- type: "dropdown"
id: "version"
attributes:
label: "Nixpkgs version"
description: |
What version of Nixpkgs are you using?
If you are using an older version, please update to the latest stable version and check if the issue persists before continuing this bug report.
options:
- "Please select a version."
- "- Unstable (25.11)"
- "- Stable (25.05)"
default: 0
validations:
required: true
- type: "textarea"
id: "description"
attributes:
label: "Describe the bug"
description: "Please include a clear and concise description of what the issue is."
validations:
required: true
- type: "textarea"
id: "how-to-reproduce"
attributes:
label: "Steps to reproduce"
description: "Please include a step-by-step guide for reproducing this issue. Consider writing in concise, numbered bullet points to ensure that Nixpkgs developers can retrace your steps."
validations:
required: true
- type: "input"
id: "expected-behaviour"
attributes:
label: "Expected behaviour"
description: "Please write a concise description of what was supposed to happen."
validations:
required: true
- type: "textarea"
id: "screenshots"
attributes:
label: "Screenshots"
description: |
If applicable, add screenshots to help explain your problem.
If you need help uploading images to GitHub, please review the [relevant documentation](https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#uploading-assets).
validations:
required: false
- type: "textarea"
id: "logs"
attributes:
label: "Relevant log output"
description: |
If applicable, copy and paste any relevant log output.
This will be automatically formatted into code, so no need for backticks.
render: "console"
validations:
required: false
- type: "textarea"
id: "additional-context"
attributes:
label: "Additional context"
description: "Add any other context about the problem here."
validations:
required: false
- type: "textarea"
id: "metadata"
attributes:
label: "System metadata"
description: "Please run `nix-shell -p nix-info --run \"nix-info -m\"` on a terminal and paste the output of that command here."
validations:
required: true
- type: "textarea"
id: "maintainers"
attributes:
label: "Notify maintainers"
description: |
Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
value: |2
---
**Note for maintainers:** Please tag this issue in your pull request description. (i.e. `Resolves #ISSUE`.)
validations:
required: false
- type: "checkboxes"
id: "sanity-check"
attributes:
label: "I assert that this issue is relevant for Nixpkgs"
description: |
This bug tracker is for actionable issues that are not the result of user error. If you need help using your system and are unsure if this is a bug with Nixpkgs, please consider asking for help on the [NixOS Discourse](https://discourse.nixos.org/) or the [NixOS Matrix Space](https://matrix.to/#/#community:nixos.org) before opening an issue.
options:
- label: "I assert that this is a bug and not a support request."
required: true
- label: "I assert that this is not a [duplicate of an existing issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+label%3A%220.kind%3A+bug%22+-label%3A%226.topic%3A+darwin%22+-label%3A%226.topic%3A+nixos%22). "
required: true
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
required: true
- type: "markdown"
attributes:
value: |
# Thank you for helping improve Nixpkgs!
---
- type: "textarea"
id: "prioritisation"
attributes:
label: "Is this issue important to you?"
description: |
**Please do not modify this text area!**
This template helps Nixpkgs developers know which issues should be prioritised by allowing users to vote with a :+1: reaction.
This is not a guarantee that highly-requested issues will be fixed first, but it helps us to figure out what's important to users. Please react on other users' issues if you find them important.
value: |
Add a :+1: [reaction] to [issues you find important].
[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/
[issues you find important]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc

View File

@@ -1,157 +0,0 @@
name: "Bug report (macOS)"
description: "Create a bug report against a package where the issue only occurs on macOS."
title: "PACKAGENAME: BUG TITLE"
labels: ["0.kind: bug", "6.topic: darwin"]
body:
- type: "markdown"
attributes:
value: |
<p align="center">
<a href="https://nixos.org">
<picture>
<source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg">
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos-white.svg">
<img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg" width="400px" alt="NixOS logo">
</picture>
</a>
</p>
Welcome to Nixpkgs. Please replace the **`PACKAGENAME: BUG TITLE`** template above with the correct package name (As seen in the [NixOS Package Search](https://search.nixos.org/packages)) and a short title summarising what the bug entails.
> [!TIP]
> For instance, if you were filing a bug against the [`hello`](https://search.nixos.org/packages?channel=unstable&from=0&size=1&buckets=%7B%22package_attr_set%22%3A%5B%22No%20package%20set%22%5D%2C%22package_license_set%22%3A%5B%22GNU%20General%20Public%20License%20v3.0%20or%20later%22%5D%2C%22package_maintainers_set%22%3A%5B%5D%2C%22package_platforms%22%3A%5B%5D%7D&sort=relevance&type=packages&query=hello) package about it failing to launch on Apple Silicon, your title would be as follows:
> ```
> hello: fails to launch on aarch64-darwin
> ```
---
- type: "dropdown"
id: "version"
attributes:
label: "Nixpkgs version"
description: |
What version of Nixpkgs are you using?
If you are using an older version, please update to the latest stable version and check if the issue persists before continuing this bug report.
options:
- "Please select a version."
- "- Unstable (25.11)"
- "- Stable (25.05)"
default: 0
validations:
required: true
- type: "textarea"
id: "description"
attributes:
label: "Describe the bug"
description: "Please include a clear and concise description of what the issue is."
validations:
required: true
- type: "textarea"
id: "how-to-reproduce"
attributes:
label: "Steps to reproduce"
description: "Please include a step-by-step guide for reproducing this issue. Consider writing in concise, numbered bullet points to ensure that Nixpkgs developers can retrace your steps."
validations:
required: true
- type: "input"
id: "expected-behaviour"
attributes:
label: "Expected behaviour"
description: "Please write a concise description of what was supposed to happen."
validations:
required: true
- type: "textarea"
id: "screenshots"
attributes:
label: "Screenshots"
description: |
If applicable, add screenshots to help explain your problem.
If you need help uploading images to GitHub, please review the [relevant documentation](https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#uploading-assets).
validations:
required: false
- type: "textarea"
id: "logs"
attributes:
label: "Relevant log output"
description: |
If applicable, copy and paste any relevant log output.
This will be automatically formatted into code, so no need for backticks.
render: "console"
validations:
required: false
- type: "textarea"
id: "additional-context"
attributes:
label: "Additional context"
description: "Add any other context about the problem here."
validations:
required: false
- type: "textarea"
id: "metadata"
attributes:
label: "System metadata"
description: "Please run `nix-shell -p nix-info --run \"nix-info -m\"` on a terminal and paste the output of that command here."
validations:
required: true
- type: "dropdown"
id: "nix-darwin"
attributes:
label: "Are you using nix-darwin?"
description: |
[`nix-darwin`](https://github.com/LnL7/nix-darwin) is a set of NixOS-like modules for macOS systems. Depending on your issue, this information may be relevant.
options:
- "Yes, I am using nix-darwin."
- "No, I am not using nix-darwin."
default: 1
validations:
required: true
- type: "textarea"
id: "maintainers"
attributes:
label: "Notify maintainers"
description: |
Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
If this issue is related to the Darwin packaging architecture as a whole, or is related to the core Darwin frameworks, consider mentioning the `@NixOS/darwin-core` team.
value: |2
---
**Note for maintainers:** Please tag this issue in your pull request description. (i.e. `Resolves #ISSUE`.)
validations:
required: false
- type: "checkboxes"
id: "sanity-check"
attributes:
label: "I assert that this issue is relevant for Nixpkgs"
description: |
This bug tracker is for actionable issues that are not the result of user error. If you need help using your system and are unsure if this is a bug with Nixpkgs/NixOS, please consider asking for help on the [NixOS Discourse](https://discourse.nixos.org/) or the [NixOS Matrix Space](https://matrix.to/#/#community:nixos.org) before opening an issue.
options:
- label: "I assert that this is a bug and not a support request."
required: true
- label: "I assert that this is not a [duplicate of an existing issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+label%3A%220.kind%3A+bug%22+label%3A%226.topic%3A+darwin%22). "
required: true
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
required: true
- type: "markdown"
attributes:
value: |
# Thank you for helping improve Nixpkgs!
---
- type: "textarea"
id: "prioritisation"
attributes:
label: "Is this issue important to you?"
description: |
**Please do not modify this text area!**
This template helps Nixpkgs developers know which issues should be prioritised by allowing users to vote with a :+1: reaction.
This is not a guarantee that highly-requested issues will be fixed first, but it helps us to figure out what's important to users. Please react on other users' issues if you find them important.
value: |
Add a :+1: [reaction] to [issues you find important].
[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/
[issues you find important]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc

View File

@@ -1,147 +0,0 @@
name: "Bug report (NixOS module)"
description: "Create a bug report against a NixOS Module."
title: "nixos/MODULENAME: BUG TITLE"
labels: ["0.kind: bug", "6.topic: nixos"]
body:
- type: "markdown"
attributes:
value: |
<p align="center">
<a href="https://nixos.org">
<picture>
<source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg">
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos-white.svg">
<img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg" width="400px" alt="NixOS logo">
</picture>
</a>
</p>
Welcome to Nixpkgs. Please replace the **`nixos/MODULENAME: BUG TITLE`** template above with the correct module name (As seen in the [NixOS Option Search](https://search.nixos.org/options)) and a short title summarising what the bug entails.
> [!TIP]
> For instance, if you were filing a bug against the [`systemd-boot`](https://search.nixos.org/options?channel=unstable&show=boot.loader.systemd-boot.enable&from=0&size=1) module about it failing to install [`memtest86`](https://search.nixos.org/options?channel=unstable&show=boot.loader.systemd-boot.memtest86.enable&from=0&size=1), your title would be as follows:
> ```
> nixos/systemd-boot: fails to install memtest86
> ```
---
- type: "dropdown"
id: "version"
attributes:
label: "Nixpkgs version"
description: |
What version of Nixpkgs are you using?
If you are using an older version, please update to the latest stable version and check if the issue persists before continuing this bug report.
options:
- "Please select a version."
- "- Unstable (25.11)"
- "- Stable (25.05)"
default: 0
validations:
required: true
- type: "textarea"
id: "description"
attributes:
label: "Describe the bug"
description: "Please include a clear and concise description of what the issue is."
validations:
required: true
- type: "textarea"
id: "how-to-reproduce"
attributes:
label: "Steps to reproduce"
description: "Please include a step-by-step guide for reproducing this issue. Consider writing in concise, numbered bullet points to ensure that Nixpkgs developers can retrace your steps."
validations:
required: true
- type: "input"
id: "expected-behaviour"
attributes:
label: "Expected behaviour"
description: "Please write a concise description of what was supposed to happen."
validations:
required: true
- type: "textarea"
id: "screenshots"
attributes:
label: "Screenshots"
description: |
If applicable, add screenshots to help explain your problem.
If you need help uploading images to GitHub, please review the [relevant documentation](https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#uploading-assets).
validations:
required: false
- type: "textarea"
id: "logs"
attributes:
label: "Relevant log output"
description: |
If applicable, copy and paste any relevant log output.
This will be automatically formatted into code, so no need for backticks.
render: "console"
validations:
required: false
- type: "textarea"
id: "additional-context"
attributes:
label: "Additional context"
description: "Add any other context about the problem here."
validations:
required: false
- type: "textarea"
id: "metadata"
attributes:
label: "System metadata"
description: "Please run `nix-shell -p nix-info --run \"nix-info -m\"` on a terminal and paste the output of that command here."
validations:
required: true
- type: "textarea"
id: "maintainers"
attributes:
label: "Notify maintainers"
description: |
Please mention the people who are in the `meta.maintainers` list of the offending module. This is done by prefixing the person's username with an '@' character. You can quickly go to the source code of a module by searching for it on the [NixOS Option Search](https://search.nixos.org/options) and clicking the "Declared in..." button.
Please note that the maintainer attribute name does not always match the maintainer's GitHub username. If that occurs, try looking in [`maintainers/maintainer-list.nix`](https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix) for the maintainer attribute name, and checking if the maintainer has a listed GitHub username.
If in doubt, check `git blame` for whoever last touched the module, or check the associated package's maintainers. Please add the mentions above the `---` characters.
value: |2
---
**Note for maintainers:** Please tag this issue in your pull request description. (i.e. `Resolves #ISSUE`.)
validations:
required: false
- type: "checkboxes"
id: "sanity-check"
attributes:
label: "I assert that this issue is relevant for Nixpkgs"
description: |
This bug tracker is for actionable issues that are not the result of user error. If you need help using your system and are unsure if this is a bug with Nixpkgs, please consider asking for help on the [NixOS Discourse](https://discourse.nixos.org/) or the [NixOS Matrix Space](https://matrix.to/#/#community:nixos.org) before opening an issue.
options:
- label: "I assert that this is a bug and not a support request."
required: true
- label: "I assert that this is not a [duplicate of an existing issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+label%3A%220.kind%3A+bug%22+label%3A%226.topic%3A+nixos%22). "
required: true
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
required: true
- type: "markdown"
attributes:
value: |
# Thank you for helping improve Nixpkgs!
---
- type: "textarea"
id: "prioritisation"
attributes:
label: "Is this issue important to you?"
description: |
**Please do not modify this text area!**
This template helps Nixpkgs developers know which issues should be prioritised by allowing users to vote with a :+1: reaction.
This is not a guarantee that highly-requested issues will be fixed first, but it helps us to figure out what's important to users. Please react on other users' issues if you find them important.
value: |
Add a :+1: [reaction] to [issues you find important].
[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/
[issues you find important]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc

View File

@@ -1,153 +0,0 @@
name: "Build failure"
description: "Report a package that is failing to build."
title: "Build failure: PACKAGENAME"
labels: ["0.kind: build failure"]
body:
- type: "markdown"
attributes:
value: |
<p align="center">
<a href="https://nixos.org">
<picture>
<source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg">
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos-white.svg">
<img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg" width="400px" alt="NixOS logo">
</picture>
</a>
</p>
Welcome to Nixpkgs. Please replace the **`Build failure: PACKAGENAME`** template above with the correct package name (As seen in the [NixOS Package Search](https://search.nixos.org/packages)).
> [!TIP]
> For instance, if you were filing a build failure against the [`hello`](https://search.nixos.org/packages?channel=unstable&from=0&size=1&buckets=%7B%22package_attr_set%22%3A%5B%22No%20package%20set%22%5D%2C%22package_license_set%22%3A%5B%22GNU%20General%20Public%20License%20v3.0%20or%20later%22%5D%2C%22package_maintainers_set%22%3A%5B%5D%2C%22package_platforms%22%3A%5B%5D%7D&sort=relevance&type=packages&query=hello) package, your title would be as follows:
> ```
> Build failure: hello
> ```
---
- type: "dropdown"
id: "version"
attributes:
label: "Nixpkgs version"
description: |
In what version of Nixpkgs did the build failure occur?
If you are using an older version, please update to the latest stable version and check if the build failure persists before continuing this report.
If you are purposefully trying to build an ancient version of a package in an older Nixpkgs, please coordinate with the [NixOS Archivists](https://matrix.to/#/#archivists:nixos.org).
options:
- "Please select a version."
- "- Unstable (25.11)"
- "- Stable (25.05)"
default: 0
validations:
required: true
- type: "textarea"
id: "how-to-reproduce"
attributes:
label: "Steps to reproduce"
description: "Please include a step-by-step guide for reproducing this build failure. Consider writing in concise, numbered bullet points to ensure that Nixpkgs developers can retrace your steps."
validations:
required: true
- type: "dropdown"
id: "hydra"
attributes:
label: "Can Hydra reproduce this build failure?"
description: |
Can [Hydra](https://hydra.nixos.org), Nixpkgs' Continuous Integration system, reproduce this build failure?
Please use the search function in the header bar to locate the last build job for the package in question.
- If there's a <img src="https://raw.githubusercontent.com/NixOS/hydra/refs/heads/master/src/root/static/images/emojione-red-x-274c.svg" width="20px" align="top" alt="Red X"> icon near the package entry, say '**Yes, Hydra can reproduce this build failure.**'
- If there's a <img src="https://raw.githubusercontent.com/NixOS/hydra/refs/heads/master/src/root/static/images/emojione-gray-x-2716.svg" width="20px" align="top" alt="Dark Gray X"> icon near the package entry, then the build failure occurs with another package, and you need to track the original failing package by going down the chain of 'Cached failures' until you reach the final package in the failing dependency chain. Once you locate the failing package, re-write this report against that package and say '**Yes, Hydra can reproduce this build failure.**'
- If there's a <img src="https://raw.githubusercontent.com/NixOS/hydra/refs/heads/master/src/root/static/images/emojione-check-2714.svg" width="20px" align="top" alt="Green Check Mark"> icon near the package entry, then it most likely means it's a local issue with your system. (Maybe you ran out of space?)
You can still open a build failure report, but please say '**No, Hydra cannot reproduce this build failure.**' below.
- If there's a <img src="https://raw.githubusercontent.com/NixOS/hydra/refs/heads/master/src/root/static/images/emojione-question-2754.svg" width="20px" align="top" alt="Gray Question Mark"> icon near the package entry, say '**Hydra is currently rebuilding this package.**'
- If there's a <img src="https://raw.githubusercontent.com/NixOS/hydra/refs/heads/master/src/root/static/images/emojione-stopsign-1f6d1.svg" width="20px" align="top" alt="Red Stop Sign"> icon near the package entry, then the build job was stopped manually. If this occurs, please coordinate with the [Infrastructure Team](https://matrix.to/#/#infra:nixos.org), and say '**The last build job was manually cancelled.**'
- If Hydra isn't supposed to build the package at all, say '**Hydra doesnt try to build the package.**'
options:
- "Please select the Hydra Status."
- "Yes, Hydra can reproduce this build failure."
- "No, Hydra cannot reproduce this build failure."
- "Hydra is currently rebuilding this package."
- "The last build job was manually cancelled."
- "Hydra doesnt try to build the package."
default: 0
validations:
required: true
- type: "input"
id: "hydra-logs"
attributes:
label: "Link to Hydra build job"
description: "If you answered 'yes' in the question above, please copy-and-paste the link to the failing Hydra job here."
validations:
required: false
- type: "textarea"
id: "logs"
attributes:
label: "Relevant log output"
description: |
Please copy and paste the logs from the failed build.
This will be automatically formatted into code, so no need for backticks.
render: "console"
validations:
required: true
- type: "textarea"
id: "additional-context"
attributes:
label: "Additional context"
description: "Add any other context about the problem here."
validations:
required: false
- type: "textarea"
id: "metadata"
attributes:
label: "System metadata"
description: "Please run `nix-shell -p nix-info --run \"nix-info -m\"` on a terminal and paste the output of that command here."
validations:
required: true
- type: "textarea"
id: "maintainers"
attributes:
label: "Notify maintainers"
description: |
Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
value: |2
---
**Note for maintainers:** Please tag this issue in your pull request description. (i.e. `Resolves #ISSUE`.)
validations:
required: false
- type: "checkboxes"
id: "sanity-check"
attributes:
label: "I assert that this issue is relevant for Nixpkgs"
description: |
This bug tracker is for actionable issues that are not the result of user error. If you need help using your system and are unsure if this is a bug with Nixpkgs, please consider asking for help on the [NixOS Discourse](https://discourse.nixos.org/) or the [NixOS Matrix Space](https://matrix.to/#/#community:nixos.org) before opening an issue.
options:
- label: "I assert that this is a bug and not a support request."
required: true
- label: "I assert that this is not a [duplicate of an existing issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+label%3A%220.kind%3A+build+failure%22). "
required: true
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
required: true
- type: "markdown"
attributes:
value: |
# Thank you for helping improve Nixpkgs!
---
- type: "textarea"
id: "prioritisation"
attributes:
label: "Is this issue important to you?"
description: |
**Please do not modify this text area!**
This template helps Nixpkgs developers know which issues should be prioritised by allowing users to vote with a :+1: reaction.
This is not a guarantee that highly-requested issues will be fixed first, but it helps us to figure out what's important to users. Please react on other users' issues if you find them important.
value: |
Add a :+1: [reaction] to [issues you find important].
[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/
[issues you find important]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc

View File

@@ -1,126 +0,0 @@
name: "Request: package update"
description: "Create an update request for an existing, but outdated package."
title: "Update Request: PACKAGENAME OLDVERSION → NEWVERSION"
labels: ["0.kind: enhancement", "9.needs: package (update)"]
body:
- type: "markdown"
attributes:
value: |
<p align="center">
<a href="https://nixos.org">
<picture>
<source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg">
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos-white.svg">
<img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg" width="400px" alt="NixOS logo">
</picture>
</a>
</p>
Welcome to Nixpkgs. Please replace the **`Update Request: PACKAGENAME OLDVERSION → NEWVERSION`** template above with the correct package name (As seen in the [NixOS Package Search](https://search.nixos.org/packages)), the current version of the package, and the latest version of the package.
> [!TIP]
> For instance, if you were filing a request against the out of date `hello` package, where the current version in Nixpkgs is 1.0.0, but the latest version upstream is 1.0.1, your title would be as follows:
> ```
> Update Request: hello 1.0.0 → 1.0.1
> ```
---
- type: "dropdown"
id: "version"
attributes:
label: "Nixpkgs version"
description: |
What version of Nixpkgs are you using?
If you are using an older or stable version, please update to the latest **unstable** version and check if the package is still out of date.
If the package has been updated in unstable, but you believe the update should be backported to the stable release of Nixpkgs, please file the '**Request: backport to stable**' form instead.
options:
- "Please select a version."
- "- Unstable (25.11)"
- "- Stable (25.05)"
default: 0
validations:
required: true
- type: "input"
id: "name"
attributes:
label: "Package name"
description: "Please indicate the name of the package."
validations:
required: true
- type: "input"
id: "upstream-version"
attributes:
label: "Upstream version"
description: "Please indicate the latest version of the package."
validations:
required: true
- type: "input"
id: "nixpkgs-version"
attributes:
label: "Nixpkgs version"
description: |
Please indicate the current version number in Nixpkgs' **unstable** channel. You can check this by setting the [NixOS Package Search](https://search.nixos.org/packages?channel=unstable) channel to 'unstable' and searching for the package.
If you meant to request an upgrade in the stable channel, please file the '**Request: backport to stable**' form instead.
validations:
required: true
- type: "input"
id: "changelog"
attributes:
label: "Changelog"
description: "If applicable, please link the upstream changelog for the latest version."
validations:
required: false
- type: "textarea"
id: "additional-context"
attributes:
label: "Additional context"
description: "Add any other context about the update here."
validations:
required: false
- type: "textarea"
id: "maintainers"
attributes:
label: "Notify maintainers"
description: |
Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
value: |2
---
**Note for maintainers:** Please tag this issue in your pull request description. (i.e. `Resolves #ISSUE`.)
validations:
required: false
- type: "checkboxes"
id: "sanity-check"
attributes:
label: "I assert that this issue is relevant for Nixpkgs"
options:
- label: "I assert that this package update does not yet exist in an [open pull request](https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+is%3Apr+label%3A%228.has%3A+package+%28update%29%22) or in [Nixpkgs Unstable](https://search.nixos.org/packages?channel=unstable)."
required: true
- label: "I assert that this is not a [duplicate of any known issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+label%3A%229.needs%3A+package+%28update%29%22)."
required: true
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
required: true
- type: "markdown"
attributes:
value: |
# Thank you for helping improve Nixpkgs!
---
- type: "textarea"
id: "prioritisation"
attributes:
label: "Is this issue important to you?"
description: |
**Please do not modify this text area!**
This template helps Nixpkgs developers know which issues should be prioritised by allowing users to vote with a :+1: reaction.
This is not a guarantee that highly-requested issues will be fixed first, but it helps us to figure out what's important to users. Please react on other users' issues if you find them important.
value: |
Add a :+1: [reaction] to [issues you find important].
[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/
[issues you find important]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc

View File

@@ -1,101 +0,0 @@
name: "Request: NixOS module"
description: "Create a new NixOS Module request for an existing package."
title: "Module Request: nixos/MODULENAME"
labels: ["0.kind: enhancement", "6.topic: nixos", "9.needs: module (new)"]
body:
- type: "markdown"
attributes:
value: |
<p align="center">
<a href="https://nixos.org">
<picture>
<source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg">
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos-white.svg">
<img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg" width="400px" alt="NixOS logo">
</picture>
</a>
</p>
Welcome to Nixpkgs. Please replace the **`Module Request: nixos/MODULENAME`** template above with the correct module name (As seen in the [NixOS Option Search](https://search.nixos.org/options)).
> [!TIP]
> For instance, if you were filing a request against the missing `hello` module, your title would be as follows:
> ```
> Module Request: nixos/hello
> ```
---
- type: "dropdown"
id: "version"
attributes:
label: "Nixpkgs version"
description: |
What version of Nixpkgs are you using?
If you are using an older or stable version, please update to the latest **unstable** version and check if the module still does not exist before continuing this request.
options:
- "Please select a version."
- "- Unstable (25.11)"
- "- Stable (25.05)"
default: 0
validations:
required: true
- type: "textarea"
id: "description"
attributes:
label: "Describe the proposed module"
description: "Please include a clear and concise description of what the module should accomplish."
validations:
required: true
- type: "textarea"
id: "additional-context"
attributes:
label: "Additional context"
description: "Add any other context about the proposed module here."
validations:
required: false
- type: "textarea"
id: "maintainers"
attributes:
label: "Notify maintainers"
description: |
Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
value: |2
---
**Note for maintainers:** Please tag this issue in your pull request description. (i.e. `Resolves #ISSUE`.)
validations:
required: false
- type: "checkboxes"
id: "sanity-check"
attributes:
label: "I assert that this issue is relevant for Nixpkgs"
options:
- label: "I assert that this module does not yet exist in an [open pull request](https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+is%3Apr+label%3A%228.has%3A+module+%28new%29%22) or in [NixOS Unstable](https://search.nixos.org/options?channel=unstable)."
required: true
- label: "I assert that this is not a [duplicate of an existing issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+label%3A%229.needs%3A+module+%28new%29%22). "
required: true
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
required: true
- type: "markdown"
attributes:
value: |
# Thank you for helping improve NixOS!
---
- type: "textarea"
id: "prioritisation"
attributes:
label: "Is this issue important to you?"
description: |
**Please do not modify this text area!**
This template helps Nixpkgs developers know which issues should be prioritised by allowing users to vote with a :+1: reaction.
This is not a guarantee that highly-requested issues will be fixed first, but it helps us to figure out what's important to users. Please react on other users' issues if you find them important.
value: |
Add a :+1: [reaction] to [issues you find important].
[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/
[issues you find important]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc

View File

@@ -1,107 +0,0 @@
name: "Request: backport to stable"
description: "Create a backport request for a package that is up-to-date in the unstable channel, but outdated in the stable channel."
title: "Backport to Stable: PACKAGENAME OLDVERSION → NEWVERSION"
labels: ["0.kind: enhancement", "9.needs: port to stable"]
body:
- type: "markdown"
attributes:
value: |
<p align="center">
<a href="https://nixos.org">
<picture>
<source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg">
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos-white.svg">
<img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg" width="400px" alt="NixOS logo">
</picture>
</a>
</p>
> [!CAUTION]
> **Before you begin:** Be advised that backports are subject to the [release suitability guidelines](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#changes-acceptable-for-releases).
>
> Stable releases of Nixpkgs do not receive breaking changes, which include major package updates that have incompatible API changes and break backwards compatibility. In the [Semantic Versioning standard](https://semver.org/), this is the first version number (1.X.X).
>
> Generally, only minor package updates, such as security patches, bug fixes and feature additions (but not removals!) will be considered for backporting. Please read the rules above carefully before filing this backport request.
Welcome to Nixpkgs. Please replace the **`Backport to Stable: PACKAGENAME OLDVERSION → NEWVERSION`** template above with the correct package name (As seen in the [NixOS Package Search](https://search.nixos.org/packages)), the current version of the package in Nixpkgs Stable and the current version of the package in Nixpkgs Unstable.
> [!TIP]
> For instance, if you were filing a request against the out of date `hello` package, where the current version in Nixpkgs Unstable is 1.0.1, but the current version in Nixpkgs Stable is 1.0.0, your title would be as follows:
> ```
> Backport to Stable: hello 1.0.0 → 1.0.1
> ```
---
- type: "input"
id: "name"
attributes:
label: "Package name"
description: "Please indicate the name of the package."
validations:
required: true
- type: "input"
id: "unstable-version"
attributes:
label: "Version in unstable"
description: "Please indicate the current version of the package in the unstable channel."
validations:
required: true
- type: "input"
id: "stable-version"
attributes:
label: "Version in stable"
description: "Please indicate the current version of the package in the stable channel."
validations:
required: true
- type: "textarea"
id: "reasoning"
attributes:
label: "Reasoning for backport"
description: "Please briefly explain why this backport fits the [release suitability guidelines](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#changes-acceptable-for-releases) and why you think this update should be backported."
validations:
required: false
- type: "textarea"
id: "maintainers"
attributes:
label: "Notify maintainers"
description: |
Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
value: |2
---
**Note for maintainers:** Please tag this issue in your pull request description. (i.e. `Resolves #ISSUE`.)
validations:
required: false
- type: "checkboxes"
id: "sanity-check"
attributes:
label: "I assert that this issue is relevant for Nixpkgs"
options:
- label: "I assert that this backport does not yet exist in an [open pull request](https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+in%3Atitle+backport)."
required: true
- label: "I assert that this is not a [duplicate of any known issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+label%3A%229.needs%3A+port+to+stable%22+)."
required: true
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
required: true
- type: "markdown"
attributes:
value: |
# Thank you for helping improve Nixpkgs!
---
- type: "textarea"
id: "prioritisation"
attributes:
label: "Is this issue important to you?"
description: |
**Please do not modify this text area!**
This template helps Nixpkgs developers know which issues should be prioritised by allowing users to vote with a :+1: reaction.
This is not a guarantee that highly-requested issues will be fixed first, but it helps us to figure out what's important to users. Please react on other users' issues if you find them important.
value: |
Add a :+1: [reaction] to [issues you find important].
[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/
[issues you find important]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc

View File

@@ -1,89 +0,0 @@
name: "Request: documentation"
description: "Report missing or incorrect documentation in the NixOS or Nixpkgs manuals."
title: "Missing Documentation: PACKAGENAME"
labels: ["0.kind: enhancement", "9.needs: documentation"]
body:
- type: "markdown"
attributes:
value: |
<p align="center">
<a href="https://nixos.org">
<picture>
<source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg">
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos-white.svg">
<img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg" width="400px" alt="NixOS logo">
</picture>
</a>
</p>
Welcome to Nixpkgs. Please replace the **`Missing Documentation: PACKAGENAME`** template above with the correct package name (As seen in the [NixOS Package Search](https://search.nixos.org/packages)) or module name (As seen in the [NixOS Option Search](https://search.nixos.org/options)).
> [!TIP]
> For instance, if you were filing an issue against the [`hello`](https://search.nixos.org/packages?channel=unstable&from=0&size=1&buckets=%7B%22package_attr_set%22%3A%5B%22No%20package%20set%22%5D%2C%22package_license_set%22%3A%5B%22GNU%20General%20Public%20License%20v3.0%20or%20later%22%5D%2C%22package_maintainers_set%22%3A%5B%5D%2C%22package_platforms%22%3A%5B%5D%7D&sort=relevance&type=packages&query=hello) package about it not having any NixOS-specific documentation, your title would be as follows:
> ```
> Missing Documentation: hello
> ```
---
- type: "textarea"
id: "description"
attributes:
label: "Describe the problem"
description: "Please include a clear and concise description of what the issue is."
validations:
required: true
- type: "textarea"
id: "proposal"
attributes:
label: "Proposed solution"
description: |
If possible, please draft a tentative documentation chapter to resolve this issue.
Your proposal should be written in CommonMark Markdown, optionally enhanced with [Nix-specific extensions](https://github.com/NixOS/nixpkgs/tree/master/doc#syntax).
render: "markdown"
validations:
required: false
- type: "textarea"
id: "maintainers"
attributes:
label: "Notify maintainers"
description: |
Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
value: |2
---
**Note for maintainers:** Please tag this issue in your pull request description. (i.e. `Resolves #ISSUE`.)
validations:
required: false
- type: "checkboxes"
id: "sanity-check"
attributes:
label: "I assert that this issue is relevant for Nixpkgs"
options:
- label: "I assert that this request is not already implemented in the latest [NixOS](https://nixos.org/manual/nixos/unstable/) or [Nixpkgs](https://nixos.org/manual/nixpkgs/unstable/) manuals."
required: true
- label: "I assert that this is not a [duplicate of an existing documentation issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+label%3A%229.needs%3A+documentation%22)."
required: true
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
required: true
- type: "markdown"
attributes:
value: |
# Thank you for helping improve Nixpkgs!
---
- type: "textarea"
id: "priorisation"
attributes:
label: "Is this issue important to you?"
description: |
**Please do not modify this text area!**
This template helps Nixpkgs developers know which issues should be prioritised by allowing users to vote with a :+1: reaction.
This is not a guarantee that highly-requested issues will be fixed first, but it helps us to figure out what's important to users. Please react on other users' issues if you find them important.
value: |
Add a :+1: [reaction] to [issues you find important].
[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/
[issues you find important]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc

View File

@@ -1,159 +0,0 @@
name: "Unreproducible Package"
description: "Report a package that does not produce a bit-by-bit reproducible result each time it is built."
title: "Unreproducible Package: PACKAGENAME"
labels: ["0.kind: enhancement", "6.topic: reproducible builds"]
body:
- type: "markdown"
attributes:
value: |
<p align="center">
<a href="https://nixos.org">
<picture>
<source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg">
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos-white.svg">
<img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/refs/heads/master/logo/nixos.svg" width="400px" alt="NixOS logo">
</picture>
</a>
</p>
Welcome to Nixpkgs. Please replace the **`Unreproducible Package: PACKAGENAME`** template above with the correct package name (As seen in the [NixOS Package Search](https://search.nixos.org/packages)).
> [!NOTE]
> This form is for reporting unreproducible packages. For more information, see the [Reproducible Builds Status](https://reproducible.nixos.org/) page.
>
> To report a package that fails to build entirely, please use the "Build Failure" form instead.
---
- type: "input"
id: "version"
attributes:
label: "Nixpkgs Revision"
description: "In which commit of Nixpkgs is this package displaying unreproducibility?"
- type: "textarea"
id: "introduction"
attributes:
label: "Introduction"
description: |
This is a generic introduction to build reproducibility.
Please replace **PACKAGENAME** below with the canonical package name of the package, as you have done for the title above.
value: |
Building **PACKAGENAME** multiple times does not yield bit-by-bit identical
results, complicating the detection of Continuous Integration (CI) breaches. For
more information on this issue, visit [reproducible-builds.org](https://reproducible-builds.org/).
Fixing bit-by-bit reproducibility also has additional advantages, such as
avoiding hard-to-reproduce bugs, making content-addressed storage more effective
and reducing rebuilds in such systems.
validations:
required: true
- type: "textarea"
id: "how-to-reproduce"
attributes:
label: "Steps to reproduce"
description: |
This is a step-by-step instruction set meant for maintainers to debug the package that is failing to reproduce. You should also follow it to gather the `diffoscope` logs that will be needed below.
Please replace **PACKAGENAME** below with the canonical package name of the package, as you have done for the introduction and the title above.
value: |
### 1. Build the package
This step will build the package. Specific arguments are passed to the command
to keep the build artifacts so we can compare them in case of differences.
Execute the following command:
```
nix-build '<nixpkgs>' -A PACKAGENAME && nix-build '<nixpkgs>' -A PACKAGENAME --check --keep-failed
```
Or using the new command line style:
```
nix build nixpkgs#PACKAGENAME && nix build nixpkgs#PACKAGENAME --rebuild --keep-failed
```
### 2. Compare the build artifacts
If the previous command completes successfully, no differences were found and
there's nothing to do, builds are reproducible.
If it terminates with the error message `error: derivation '<X>' may not be
deterministic: output '<Y>' differs from '<Z>'`, use `diffoscope` to investigate
the discrepancies between the two build outputs. You may need to add the
`--exclude-directory-metadata recursive` option to ignore files and directories
metadata (*e.g. timestamp*) differences.
```
nix run nixpkgs#diffoscopeMinimal -- --exclude-directory-metadata recursive <Y> <Z>
```
### 3. Examine the build log
To examine the build log, use:
```
nix-store --read-log $(nix-instantiate '<nixpkgs>' -A PACKAGENAME)
```
Or with the new command line style:
```
nix log $(nix path-info --derivation nixpkgs#PACKAGENAME)
```
validations:
required: true
- type: "textarea"
id: "logs"
attributes:
label: "Diffoscope log"
description: |
Please copy and paste the relevant `diffoscope` log output, gathered from the steps above.
This will be automatically formatted into a monospaced text block, so no need for backticks.
render: "console"
- type: "textarea"
id: "additional-context"
attributes:
label: "Additional context"
description: "Add any other context about the problem here."
validations:
required: false
id: "maintainers"
attributes:
label: "Notify maintainers"
description: |
Please mention the people who are in the **Maintainers** list of the offending package. This is done by by searching for the package on the [NixOS Package Search](https://search.nixos.org/packages) and mentioning the people listed under **Maintainers** by prefixing their GitHub usernames with an '@' character. Please add the mentions above the `---` characters in the template below.
value: |2
---
**Note for maintainers:** Please tag this issue in your pull request description. (i.e. `Resolves #ISSUE`.)
validations:
required: false
- type: "checkboxes"
id: "sanity-check"
attributes:
label: "I assert that this issue is relevant for Nixpkgs"
options:
- label: "I assert that this is not a [duplicate of any known issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+label%3A%226.topic%3A+reproducible+builds%22)."
required: true
- label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it."
required: true
- type: "markdown"
attributes:
value: |
# Thank you for helping improve Nixpkgs!
---
- type: "textarea"
id: "prioritisation"
attributes:
label: "Is this issue important to you?"
description: |
**Please do not modify this text area!**
This template helps Nixpkgs developers know which issues should be prioritised by allowing users to vote with a :+1: reaction.
This is not a guarantee that highly-requested issues will be fixed first, but it helps us to figure out what's important to users. Please react on other users' issues if you find them important.
value: |
Add a :+1: [reaction] to [issues you find important].
[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/
[issues you find important]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc

View File

@@ -1,47 +1,20 @@
###### Motivation for this change
<!--
^ Please summarise the changes you have done and explain why they are necessary here ^
For package updates please link to a changelog or describe changes, this helps your fellow maintainers discover breaking updates.
For new packages please briefly describe the package or provide a link to its homepage.
-->
## Things done
###### Things done
<!-- Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. -->
- Built on platform:
- [ ] x86_64-linux
- [ ] aarch64-linux
- [ ] x86_64-darwin
- [ ] aarch64-darwin
- Tested, as applicable:
- [ ] [NixOS tests] in [nixos/tests].
- [ ] [Package tests] at `passthru.tests`.
- [ ] Tests in [lib/tests] or [pkgs/test] for functions and "core" functionality.
- [ ] Ran `nixpkgs-review` on this PR. See [nixpkgs-review usage].
- [ ] Tested basic functionality of all binary files, usually in `./result/bin/`.
- Nixpkgs Release Notes
- [ ] Package update: when the change is major or breaking.
- NixOS Release Notes
- [ ] Module addition: when adding a new NixOS module.
- [ ] Module update: when the change is significant.
- [ ] Fits [CONTRIBUTING.md], [pkgs/README.md], [maintainers/README.md] and other READMEs.
[NixOS tests]: https://nixos.org/manual/nixos/unstable/index.html#sec-nixos-tests
[Package tests]: https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#package-tests
[nixpkgs-review usage]: https://github.com/Mic92/nixpkgs-review#usage
[CONTRIBUTING.md]: https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md
[lib/tests]: https://github.com/NixOS/nixpkgs/blob/master/lib/tests
[maintainers/README.md]: https://github.com/NixOS/nixpkgs/blob/master/maintainers/README.md
[nixos/tests]: https://github.com/NixOS/nixpkgs/blob/master/nixos/tests
[pkgs/README.md]: https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md
[pkgs/test]: https://github.com/NixOS/nixpkgs/blob/master/pkgs/test
- [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS)
- Built on platform(s)
- [ ] NixOS
- [ ] macOS
- [ ] other Linux distributions
- [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run "nox-review wip"`
- [ ] Tested execution of all binary files (usually in `./result/bin/`)
- [ ] Determined the impact on package closure size (by running `nix path-info -S` before and after)
- [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).
---
Add a :+1: [reaction] to [pull requests you find important].
[reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/
[pull requests you find important]: https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+sort%3Areactions-%2B1-desc

36
.github/STALE-BOT.md vendored
View File

@@ -1,36 +0,0 @@
# Stale bot information
- Thanks for your contribution!
- Our stale bot will never close an issue or PR.
- To remove the stale label, just leave a new comment.
- _How to find the right people to ping?_ &rarr; [`git blame`](https://git-scm.com/docs/git-blame) to the rescue! (or GitHub's history and blame buttons.)
- You can always ask for help on [our Discourse Forum](https://discourse.nixos.org/), [our Matrix room](https://matrix.to/#/#nix:nixos.org), or on the [#nixos IRC channel](https://web.libera.chat/#nixos).
## Suggestions for PRs
1. GitHub sometimes doesn't notify people who commented / reviewed a PR previously, when you (force) push commits. If you have addressed the reviews you can [officially ask for a review](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review) from those who commented to you or anyone else.
2. If it is unfinished but you plan to finish it, please mark it as a draft.
3. If you don't expect to work on it any time soon, closing it with a short comment may encourage someone else to pick up your work.
4. To get things rolling again, rebase the PR against the target branch and address valid comments.
5. If you need a review to move forward, ask in [the Discourse thread for PRs that need help](https://discourse.nixos.org/t/prs-in-distress/3604).
6. If all you need is a merge, check the git history to find and [request reviews](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review) from people who usually merge related contributions.
## Suggestions for issues
1. If it is resolved (either for you personally, or in general), please consider closing it.
2. If this might still be an issue, but you are not interested in promoting its resolution, please consider closing it while encouraging others to take over and reopen an issue if they care enough.
3. If you still have interest in resolving it, try to ping somebody who you believe might have an interest in the topic. Consider discussing the problem in [our Discourse Forum](https://discourse.nixos.org/).
4. As with all open source projects, your best option is to submit a Pull Request that addresses this issue. We :heart: this attitude!
**Memorandum on closing issues**
Don't be afraid to close an issue that holds valuable information. Closed issues stay in the system for people to search, read, cross-reference, or even reopen--nothing is lost! Closing obsolete issues is an important way to help maintainers focus their time and effort.
## Useful GitHub search queries
- [Open PRs with any stale-bot interaction](https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+commenter%3Aapp%2Fstale+)
- [Open PRs with any stale-bot interaction and `2.status: stale`](https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+commenter%3Aapp%2Fstale+label%3A%222.status%3A+stale%22)
- [Open PRs with any stale-bot interaction and NOT `2.status: stale`](https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+commenter%3Aapp%2Fstale+-label%3A%222.status%3A+stale%22+)
- [Open Issues with any stale-bot interaction](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+commenter%3Aapp%2Fstale+)
- [Open Issues with any stale-bot interaction and `2.status: stale`](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+commenter%3Aapp%2Fstale+label%3A%222.status%3A+stale%22+)
- [Open Issues with any stale-bot interaction and NOT `2.status: stale`](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+commenter%3Aapp%2Fstale+-label%3A%222.status%3A+stale%22+)

View File

@@ -1,95 +0,0 @@
name: Get merge commit
description: 'Checks whether the Pull Request is mergeable and checks out the repo at up to two commits: The result of a temporary merge of the head branch into the target branch ("merged"), and the parent of that commit on the target branch ("target"). Handles push events and merge conflicts gracefully.'
inputs:
mergedSha:
description: "The merge commit SHA, previously collected."
type: string
merged-as-untrusted:
description: "Whether to checkout the merge commit in the ./untrusted folder."
type: boolean
targetSha:
description: "The target commit SHA, previously collected."
type: string
target-as-trusted:
description: "Whether to checkout the target commit in the ./trusted folder."
type: boolean
outputs:
mergedSha:
description: "The merge commit SHA"
value: ${{ steps.commits.outputs.mergedSha }}
targetSha:
description: "The target commit SHA"
value: ${{ steps.commits.outputs.targetSha }}
runs:
using: composite
steps:
- id: commits
if: ${{ !inputs.mergedSha && !inputs.targetSha }}
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
with:
script: |
if (context.eventName == 'push') return core.setOutput('mergedSha', context.sha)
for (const retryInterval of [5, 10, 20, 40, 80]) {
console.log("Checking whether the pull request can be merged...")
const prInfo = (await github.rest.pulls.get({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: context.payload.pull_request.number
})).data
if (prInfo.state != 'open') throw new Error ("PR is not open anymore.")
if (prInfo.mergeable == null) {
console.log(`GitHub is still computing whether this PR can be merged, waiting ${retryInterval} seconds before trying again...`)
await new Promise(resolve => setTimeout(resolve, retryInterval * 1000))
continue
}
let mergedSha, targetSha
if (prInfo.mergeable) {
console.log("The PR can be merged.")
mergedSha = prInfo.merge_commit_sha
targetSha = (await github.rest.repos.getCommit({
owner: context.repo.owner,
repo: context.repo.repo,
ref: prInfo.merge_commit_sha
})).data.parents[0].sha
} else {
console.log("The PR has a merge conflict.")
mergedSha = prInfo.head.sha
targetSha = (await github.rest.repos.compareCommitsWithBasehead({
owner: context.repo.owner,
repo: context.repo.repo,
basehead: `${prInfo.base.sha}...${prInfo.head.sha}`
})).data.merge_base_commit.sha
}
console.log(`Checking the commits:\nmerged:${mergedSha}\ntarget:${targetSha}`)
core.setOutput('mergedSha', mergedSha)
core.setOutput('targetSha', targetSha)
return
}
throw new Error("Not retrying anymore. It's likely that GitHub is having internal issues: check https://www.githubstatus.com.")
- if: inputs.merged-as-untrusted && (inputs.mergedSha || steps.commits.outputs.mergedSha)
# Would be great to do the checkouts in git worktrees of the existing spare checkout instead,
# but Nix is broken with them:
# https://github.com/NixOS/nix/issues/6073
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ inputs.mergedSha || steps.commits.outputs.mergedSha }}
path: untrusted
- if: inputs.target-as-trusted && (inputs.targetSha || steps.commits.outputs.targetSha)
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ inputs.targetSha || steps.commits.outputs.targetSha }}
path: trusted

View File

@@ -1,7 +0,0 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
labels: []

View File

@@ -1,23 +0,0 @@
# This file is used by .github/workflows/labels.yml
# This version is only run for Pull Requests from development branches like staging-next, haskell-updates or python-updates.
"4.workflow: package set update":
- any:
- head-branch:
- '-updates$'
"4.workflow: staging":
- any:
- head-branch:
- '^staging-next$'
- '^staging-next-'
"6.topic: haskell":
- any:
- head-branch:
- '^haskell-updates$'
"6.topic: python":
- any:
- head-branch:
- '^python-updates$'

View File

@@ -1,32 +0,0 @@
# This file is used by .github/workflows/labels.yml
# This version uses `sync-labels: false`, meaning that a non-match will NOT remove the label
# keep-sorted start case=no numeric=yes newline_separated=yes skip_lines=1
"6.topic: policy discussion":
- any:
- changed-files:
- any-glob-to-any-file:
- .github/**/*
- CONTRIBUTING.md
- pkgs/README.md
- nixos/README.md
- maintainers/README.md
- lib/README.md
- doc/README.md
"8.has: documentation":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/**/*
- nixos/doc/**/*
"backport release-25.05":
- any:
- changed-files:
- any-glob-to-any-file:
- .github/workflows/*
- ci/**/*.*
# keep-sorted end

604
.github/labeler.yml vendored
View File

@@ -1,604 +0,0 @@
# This file is used by .github/workflows/labels.yml
# This version uses `sync-labels: true`, meaning that a non-match will remove the label
# keep-sorted start case=no numeric=yes newline_separated=yes skip_lines=1
"4.workflow: backport":
- any:
- base-branch:
- '^release-'
- '^staging-\d'
- '^staging-next-\d'
# NOTE: bsd, darwin and cross-compilation labels are handled by ofborg
"6.topic: agda":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/agda.section.md
- nixos/tests/agda.nix
- pkgs/build-support/agda/**/*
- pkgs/development/libraries/agda/**/*
- pkgs/top-level/agda-packages.nix
"6.topic: cinnamon":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/services/x11/desktop-managers/cinnamon.nix
- nixos/tests/cinnamon.nix
- nixos/tests/cinnamon-wayland.nix
- pkgs/by-name/ci/cinnamon-*/**/*
- pkgs/by-name/cj/cjs/**/*
- pkgs/by-name/mu/muffin/**/*
- pkgs/by-name/ne/nemo/**/*
- pkgs/by-name/ne/nemo-*/**/*
"6.topic: continuous integration":
- any:
- changed-files:
- any-glob-to-any-file:
- .github/**/*
- ci/**/*.*
"6.topic: coq":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/applications/science/logic/coq/**/*
- pkgs/development/coq-modules/**/*
- pkgs/top-level/coq-packages.nix
"6.topic: COSMIC":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/services/desktop-managers/cosmic.nix
- nixos/modules/services/display-managers/cosmic-greeter.nix
- nixos/tests/cosmic.nix
- pkgs/by-name/co/cosmic-*/**/*
- pkgs/by-name/xd/xdg-desktop-portal-cosmic/*
"6.topic: crystal":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/development/compilers/crystal/**/*
"6.topic: cuda":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/development/cuda-modules/**/*
- pkgs/top-level/cuda-packages.nix
"6.topic: deepin":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/services/desktops/deepin/**/*
- pkgs/desktops/deepin/**/*
"6.topic: docker tools":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/applications/virtualization/docker/**/*
"6.topic: dotnet":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/dotnet.section.md
- maintainers/scripts/update-dotnet-lockfiles.nix
- pkgs/build-support/dotnet/**/*
- pkgs/development/compilers/dotnet/**/*
- pkgs/test/dotnet/**/*
- pkgs/top-level/dotnet-packages.nix
"6.topic: emacs":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/services/editors/emacs.nix
- nixos/modules/services/editors/emacs.xml
- nixos/tests/emacs-daemon.nix
- pkgs/applications/editors/emacs/build-support/**/*
- pkgs/applications/editors/emacs/elisp-packages/**/*
- pkgs/applications/editors/emacs/**/*
- pkgs/top-level/emacs-packages.nix
"6.topic: Enlightenment DE":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/services/x11/desktop-managers/enlightenment.nix
- pkgs/desktops/enlightenment/**/*
- pkgs/development/python-modules/python-efl/*
"6.topic: erlang":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/beam.section.md
- pkgs/development/beam-modules/**/*
- pkgs/development/interpreters/elixir/**/*
- pkgs/development/interpreters/erlang/**/*
- pkgs/development/tools/build-managers/rebar/**/*
- pkgs/development/tools/build-managers/rebar3/**/*
- pkgs/development/tools/erlang/**/*
- pkgs/top-level/beam-packages.nix
"6.topic: fetch":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/build-support/fetch*/**/*
"6.topic: flakes":
- any:
- changed-files:
- any-glob-to-any-file:
- '**/flake.nix'
- lib/systems/flake-systems.nix
- nixos/modules/config/nix-flakes.nix
"6.topic: flutter":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/build-support/flutter/*.nix
- pkgs/development/compilers/flutter/**/*.nix
"6.topic: games":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/games/**/*
"6.topic: GNOME":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/gnome.section.md
- nixos/modules/services/desktops/gnome/**/*
- nixos/modules/services/desktop-managers/gnome.nix
- nixos/tests/gnome-xorg.nix
- nixos/tests/gnome.nix
- pkgs/desktops/gnome/**/*
"6.topic: golang":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/go.section.md
- pkgs/build-support/go/**/*
- pkgs/development/compilers/go/**/*
"6.topic: hardware":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/hardware/**/*
"6.topic: haskell":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/haskell.section.md
- maintainers/scripts/haskell/**/*
- pkgs/development/compilers/ghc/**/*
- pkgs/development/haskell-modules/**/*
- pkgs/development/tools/haskell/**/*
- pkgs/test/haskell/**/*
- pkgs/top-level/haskell-packages.nix
- pkgs/top-level/release-haskell.nix
"6.topic: java":
- any:
- changed-files:
- any-glob-to-any-file:
# Distributions
- pkgs/development/compilers/adoptopenjdk-icedtea-web/**/*
- pkgs/development/compilers/corretto/**/*
- pkgs/development/compilers/graalvm/**/*
- pkgs/development/compilers/openjdk/**/*
- pkgs/by-name/op/openjfx/**/*
- pkgs/development/compilers/semeru-bin/**/*
- pkgs/development/compilers/temurin-bin/**/*
- pkgs/development/compilers/zulu/**/*
# Documentation
- doc/languages-frameworks/java.section.md
# Gradle
- doc/languages-frameworks/gradle.section.md
- pkgs/development/tools/build-managers/gradle/**/*
- pkgs/by-name/gr/gradle-completion/**/*
# Maven
- pkgs/by-name/ma/maven/**/*
- doc/languages-frameworks/maven.section.md
# Ant
- pkgs/by-name/an/ant/**/*
# javaPackages attrset
- pkgs/development/java-modules/**/*
- pkgs/top-level/java-packages.nix
# Maintainer tooling
- pkgs/by-name/ni/nixpkgs-openjdk-updater/**/*
# Misc
- nixos/modules/programs/java.nix
"6.topic: jitsi":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/services/networking/jitsi-videobridge.nix
- nixos/modules/services/web-apps/jitsi-meet.nix
- pkgs/servers/web-apps/jitsi-meet/**/*
- pkgs/servers/jitsi-videobridge/**/*
- pkgs/applications/networking/instant-messengers/jitsi/**/*
"6.topic: julia":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/julia.section.md
- pkgs/development/compilers/julia/**/*
- pkgs/development/julia-modules/**/*
"6.topic: jupyter":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/development/python-modules/jupyter*/**/*
- pkgs/development/python-modules/mkdocs-jupyter/*
- nixos/modules/services/development/jupyter/**/*
- pkgs/applications/editors/jupyter-kernels/**/*
- pkgs/applications/editors/jupyter/**/*
"6.topic: k3s":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/services/cluster/k3s/**/*
- nixos/tests/k3s/**/*
- pkgs/applications/networking/cluster/k3s/**/*
"6.topic: kernel":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/build-support/kernel/**/*
- pkgs/os-specific/linux/kernel/**/*
"6.topic: lib":
- any:
- changed-files:
- any-glob-to-any-file:
- lib/**
"6.topic: llvm/clang":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/development/compilers/llvm/**/*
"6.topic: lua":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/development/tools/misc/luarocks/*
- pkgs/development/interpreters/lua-5/**/*
- pkgs/development/interpreters/luajit/**/*
- pkgs/development/lua-modules/**/*
- pkgs/top-level/lua-packages.nix
"6.topic: Lumina DE":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/services/x11/desktop-managers/lumina.nix
- pkgs/desktops/lumina/**/*
"6.topic: LXQt":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/services/x11/desktop-managers/lxqt.nix
- pkgs/desktops/lxqt/**/*
"6.topic: mate":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/services/x11/desktop-managers/mate.nix
- nixos/tests/mate.nix
- pkgs/desktops/mate/**/*
"6.topic: module system":
- any:
- changed-files:
- any-glob-to-any-file:
- lib/modules.nix
- lib/types.nix
- lib/options.nix
- lib/tests/modules.sh
- lib/tests/modules/**
"6.topic: musl":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/os-specific/linux/musl/**/*
"6.topic: nim":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/nim.section.md
- pkgs/build-support/build-nim-package.nix
- pkgs/build-support/build-nim-sbom.nix
- pkgs/by-name/ni/nim*
- pkgs/top-level/nim-overrides.nix
"6.topic: nixos":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/**/*
- pkgs/by-name/sw/switch-to-configuration-ng/**/*
- pkgs/by-name/ni/nixos-rebuild-ng/**/*
- pkgs/os-specific/linux/nixos-rebuild/**/*
"6.topic: nixos-container":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/virtualisation/nixos-containers.nix
- pkgs/tools/virtualization/nixos-container/**/*
"6.topic: nodejs":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/javascript.section.md
- pkgs/build-support/node/**/*
- pkgs/development/node-packages/**/*
- pkgs/development/tools/yarn/*
- pkgs/development/tools/yarn2nix-moretea/**/*
- pkgs/development/tools/pnpm/**/*
- pkgs/development/web/nodejs/*
"6.topic: nvidia":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/hardware/video/nvidia.nix
- nixos/modules/services/hardware/nvidia-container-toolkit/**/*
- nixos/modules/services/hardware/nvidia-optimus.nix
- pkgs/os-specific/linux/nvidia-x11/**/*
"6.topic: ocaml":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/ocaml.section.md
- pkgs/development/compilers/ocaml/**/*
- pkgs/development/compilers/reason/**/*
- pkgs/development/ocaml-modules/**/*
- pkgs/development/tools/ocaml/**/*
- pkgs/top-level/ocaml-packages.nix
"6.topic: pantheon":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/services/desktops/pantheon/**/*
- nixos/modules/services/x11/desktop-managers/pantheon.nix
- nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
- nixos/tests/pantheon.nix
- pkgs/desktops/pantheon/**/*
"6.topic: php":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/php.section.md
- nixos/tests/php/**/*
- pkgs/build-support/php/**/*
- pkgs/development/interpreters/php/**/*
- pkgs/development/php-packages/**/*
- pkgs/test/php/default.nix
- pkgs/top-level/php-packages.nix
"6.topic: printing":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/services/printing/cupsd.nix
- pkgs/misc/cups/**/*
"6.topic: python":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/python.section.md
- pkgs/development/interpreters/python/**/*
- pkgs/development/python-modules/**/*
- pkgs/top-level/python-packages.nix
"6.topic: qt/kde":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/qt.section.md
- nixos/modules/services/x11/desktop-managers/plasma5.nix
- nixos/tests/plasma5.nix
- pkgs/applications/kde/**/*
- pkgs/desktops/plasma-5/**/*
- pkgs/development/libraries/kde-frameworks/**/*
- pkgs/development/libraries/qt-5/**/*
"6.topic: R":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/applications/science/math/R/**/*
- pkgs/development/r-modules/**/*
"6.topic: rocm":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/development/rocm-modules/**/*
"6.topic: ruby":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/ruby.section.md
- pkgs/development/interpreters/ruby/**/*
- pkgs/development/ruby-modules/**/*
- pkgs/top-level/ruby-packages.nix
"6.topic: rust":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/rust.section.md
- pkgs/build-support/rust/**/*
- pkgs/development/compilers/rust/**/*
"6.topic: stdenv":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/stdenv/**/*
"6.topic: steam":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/games/steam/**/*
"6.topic: systemd":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/os-specific/linux/systemd/**/*
- nixos/modules/system/boot/systemd*/**/*
"6.topic: tcl":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/tcl.section.md
- pkgs/development/interpreters/tcl/*
- pkgs/development/tcl-modules/**/*
- pkgs/top-level/tcl-packages.nix
"6.topic: teams":
- any:
- changed-files:
- any-glob-to-any-file:
- maintainers/team-list.nix
"6.topic: testing":
- any:
- changed-files:
- any-glob-to-any-file:
# NOTE: Let's keep the scope limited to test frameworks that are
# *developed in this repo*;
# - not individual tests
# - not packages for test frameworks
- pkgs/build-support/testers/**
- nixos/lib/testing/**
- nixos/lib/test-driver/**
- nixos/tests/nixos-test-driver/**
- nixos/lib/testing-python.nix # legacy
- nixos/tests/make-test-python.nix # legacy
# lib/debug.nix has a test framework (runTests) but it's not the main focus
"6.topic: TeX":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/texlive.section.md
- pkgs/test/texlive/**
- pkgs/tools/typesetting/tex/**/*
"6.topic: updaters":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/common-updater/**/*
"6.topic: vim":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/vim.section.md
- pkgs/applications/editors/vim/**/*
- pkgs/applications/editors/vim/plugins/**/*
- nixos/modules/programs/neovim.nix
- pkgs/applications/editors/neovim/**/*
"6.topic: vscode":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/applications/editors/vscode/**/*
"6.topic: windows":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/os-specific/windows/**/*
"6.topic: xen-project":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/virtualisation/xen*
- pkgs/by-name/xe/xen/*
- pkgs/by-name/qe/qemu_xen/*
- pkgs/by-name/xe/xen-guest-agent/*
- pkgs/by-name/xt/xtf/*
- pkgs/build-support/xen/*
- pkgs/development/ocaml-modules/xen*/*
- pkgs/development/ocaml-modules/vchan/*
"6.topic: xfce":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/doc/manual/configuration/xfce.xml
- nixos/modules/services/x11/desktop-managers/xfce.nix
- nixos/tests/xfce.nix
- pkgs/desktops/xfce/**/*
"6.topic: zig":
- any:
- changed-files:
- any-glob-to-any-file:
- pkgs/development/compilers/zig/**/*
- doc/hooks/zig.section.md
"8.has: changelog":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/release-notes/**/*
- nixos/doc/manual/release-notes/**/*
"8.has: maintainer-list (update)":
- any:
- changed-files:
- any-glob-to-any-file:
- maintainers/maintainer-list.nix
"8.has: module (update)":
- any:
- changed-files:
- any-glob-to-any-file:
- nixos/modules/**/*
# keep-sorted end

View File

@@ -1,63 +0,0 @@
# GitHub Actions Workflows
Some architectural notes about key decisions and concepts in our workflows:
- Instead of `pull_request` we use [`pull_request_target`](https://docs.github.com/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#pull_request_target) for all PR-related workflows.
This has the advantage that those workflows will run without prior approval for external contributors.
- Running on `pull_request_target` also optionally provides us with a GH_TOKEN with elevated privileges (write access), which we need to do things like adding labels, requesting reviewers or pushing branches.
**Note about security:** We need to be careful to limit the scope of elevated privileges as much as possible.
Thus they should be lowered to the minimum with `permissions: {}` in every workflow by default.
- By definition `pull_request_target` runs in the context of the **base** of the pull request.
This means, that the workflow files to run will be taken from the base branch, not the PR, and actions/checkout will not checkout the PR, but the base branch, by default.
To protect our secrets, we need to make sure to **never execute code** from the pull request and always evaluate or build nix code from the pull request with the **sandbox enabled**.
- To test the pull request's contents, we checkout the "test merge commit".
This is a temporary commit that GitHub creates automatically as "what would happen, if this PR was merged into the base branch now?".
The checkout could be done via the virtual branch `refs/pull/<pr-number>/merge`, but doing so would cause failures when this virtual branch doesn't exist (anymore).
This can happen when the PR has conflicts, in which case the virtual branch is not created, or when the PR is getting merged while workflows are still running, in which case the branch won't exist anymore at the time of checkout.
Thus, we use the `get-merge-commit.yml` workflow to check whether the PR is mergeable and the test merge commit exists and only then run the relevant jobs.
- Various workflows need to make comparisons against the base branch.
In this case, we checkout the parent of the "test merge commit" for best results.
Note, that this is not necessarily the same as the default commit that actions/checkout would use, which is also a commit from the base branch (see above), but might be older.
## Terminology
- **base commit**: The pull_request_target event's context commit, i.e. the base commit given by GitHub Actions.
Same as `github.event.pull_request.base.sha`.
- **head commit**: The HEAD commit in the pull request's branch.
Same as `github.event.pull_request.head.sha`.
- **merge commit**: The temporary "test merge commit" that GitHub Actions creates and updates for the pull request.
Same as `refs/pull/${{ github.event.pull_request.number }}/merge`.
- **target commit**: The base branch's parent of the "test merge commit" to compare against.
## Concurrency Groups
We use [GitHub's Concurrency Groups](https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/control-the-concurrency-of-workflows-and-jobs) to cancel older jobs on pushes to Pull Requests.
When two workflows are in the same group, a newer workflow cancels an older workflow.
Thus, it is important how to construct the group keys:
- Because we want to run jobs for different events at same time, we add `github.event_name` to the key.
This is the case for the `pull_request` which runs on changes to the workflow files to test the new files and the same workflow from the base branch run via `pull_request_event`.
- We don't want workflows of different Pull Requests to cancel each other, so we include `github.event.pull_request.number`.
The [GitHub docs](https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/control-the-concurrency-of-workflows-and-jobs#example-using-a-fallback-value) show using `github.head_ref` for this purpose, but this doesn't work well with forks: Different users could have the same head branch name in their forks and run CI for their PRs at the same time.
- Sometimes, there is no `pull_request.number`.
To ensure non-PR runs are never cancelled, we add a fallback of `github.run_id`.
This is a unique value for each workflow run.
- Of course, we run multiple workflows at the same time, so we add `github.workflow` to the key.
Otherwise workflows would cancel each other.
- There is a special case for reusable workflows called via `workflow_call` - they will have `github.workflow` set to their parent workflow's name.
Thus, they would cancel each other.
That's why we additionally hardcode the name of the workflow as well.
This results in a key with the following semantics:
```
<running-workflow>-<triggering-workflow>-<triggered-event>-<pull-request/fallback>
```

View File

@@ -1,76 +0,0 @@
# WARNING:
# When extending this action, be aware that $GITHUB_TOKEN allows write access to
# the GitHub repository. This means that it should not evaluate user input in a
# way that allows code injection.
name: Backport
on:
pull_request_target:
types: [closed, labeled]
permissions:
contents: read
issues: write
pull-requests: write
defaults:
run:
shell: bash
jobs:
backport:
name: Backport Pull Request
if: vars.NIXPKGS_CI_APP_ID && github.event.pull_request.merged == true && (github.event.action != 'labeled' || startsWith(github.event.label.name, 'backport'))
runs-on: ubuntu-24.04-arm
steps:
# Use a GitHub App to create the PR so that CI gets triggered
# The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
id: app-token
with:
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
permission-contents: write
permission-pull-requests: write
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ github.event.pull_request.head.sha }}
token: ${{ steps.app-token.outputs.token }}
- name: Log current API rate limits
env:
GH_TOKEN: ${{ steps.app-token.outputs.token }}
run: gh api /rate_limit | jq
- name: Create backport PRs
id: backport
uses: korthout/backport-action@0193454f0c5947491d348f33a275c119f30eb736 # v3.2.1
with:
# Config README: https://github.com/korthout/backport-action#backport-action
copy_labels_pattern: 'severity:\ssecurity'
github_token: ${{ steps.app-token.outputs.token }}
pull_description: |-
Bot-based backport to `${target_branch}`, triggered by a label in #${pull_number}.
* [ ] Before merging, ensure that this backport is [acceptable for the release](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#changes-acceptable-for-releases).
* Even as a non-committer, if you find that it is not acceptable, leave a comment.
- name: Log current API rate limits
env:
GH_TOKEN: ${{ steps.app-token.outputs.token }}
run: gh api /rate_limit | jq
- name: "Add 'has: port to stable' label"
if: steps.backport.outputs.created_pull_numbers != ''
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
with:
# Not using the app on purpose to avoid triggering another workflow run after adding this label.
script: |
await github.rest.issues.addLabels({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.payload.pull_request.number,
labels: [ '8.has: port to stable' ]
})

View File

@@ -1,100 +0,0 @@
name: Build
on:
workflow_call:
inputs:
baseBranch:
required: true
type: string
mergedSha:
required: true
type: string
secrets:
CACHIX_AUTH_TOKEN:
required: true
permissions: {}
defaults:
run:
shell: bash
jobs:
build:
strategy:
fail-fast: false
matrix:
include:
- runner: ubuntu-24.04
system: x86_64-linux
builds: [shell, manual-nixos, lib-tests, tarball]
desc: shell, docs, lib, tarball
- runner: ubuntu-24.04-arm
system: aarch64-linux
builds: [shell, manual-nixos, manual-nixpkgs, manual-nixpkgs-tests]
desc: shell, docs
- runner: macos-13
system: x86_64-darwin
builds: [shell]
desc: shell
- runner: macos-14
system: aarch64-darwin
builds: [shell]
desc: shell
name: '${{ matrix.system }}: ${{ matrix.desc }}'
runs-on: ${{ matrix.runner }}
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
sparse-checkout: .github/actions
- name: Check if the PR can be merged and checkout the merge commit
uses: ./.github/actions/get-merge-commit
with:
mergedSha: ${{ inputs.mergedSha }}
merged-as-untrusted: true
- uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
with:
extra_nix_config: sandbox = true
- uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
with:
# This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
name: nixpkgs-ci
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- name: Build shell
if: contains(matrix.builds, 'shell')
run: nix-build untrusted/ci -A shell
- name: Build NixOS manual
if: |
contains(matrix.builds, 'manual-nixos') && !cancelled() &&
contains(fromJSON(inputs.baseBranch).type, 'primary')
run: nix-build untrusted/ci -A manual-nixos --argstr system ${{ matrix.system }} --out-link nixos-manual
- name: Build Nixpkgs manual
if: contains(matrix.builds, 'manual-nixpkgs') && !cancelled()
run: nix-build untrusted/ci -A manual-nixpkgs -A manual-nixpkgs-tests
- name: Build Nixpkgs manual tests
if: contains(matrix.builds, 'manual-nixpkgs-tests') && !cancelled()
run: nix-build untrusted/ci -A manual-nixpkgs-tests
- name: Build lib tests
if: contains(matrix.builds, 'lib-tests') && !cancelled()
run: nix-build untrusted/ci -A lib-tests
- name: Build tarball
if: contains(matrix.builds, 'tarball') && !cancelled()
run: nix-build untrusted/ci -A tarball
- name: Upload NixOS manual
if: |
contains(matrix.builds, 'manual-nixos') && !cancelled() &&
contains(fromJSON(inputs.baseBranch).type, 'primary')
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: nixos-manual-${{ matrix.system }}
path: nixos-manual
if-no-files-found: error

View File

@@ -1,71 +0,0 @@
name: Check
on:
workflow_call:
inputs:
baseBranch:
required: true
type: string
headBranch:
required: true
type: string
permissions: {}
defaults:
run:
shell: bash
jobs:
no-channel-base:
name: no channel base
if: contains(fromJSON(inputs.baseBranch).type, 'channel')
runs-on: ubuntu-24.04-arm
steps:
- run: |
cat <<EOF
The nixos-* and nixpkgs-* branches are pushed to by the channel
release script and should not be merged into directly.
Please target the equivalent release-* branch or master instead.
EOF
exit 1
cherry-pick:
if: |
github.event_name == 'pull_request' ||
(fromJSON(inputs.baseBranch).stable && !contains(fromJSON(inputs.headBranch).type, 'development'))
permissions:
pull-requests: write
runs-on: ubuntu-24.04-arm
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
filter: tree:0
path: trusted
- name: Install dependencies
run: npm install bottleneck
- name: Log current API rate limits
env:
GH_TOKEN: ${{ github.token }}
run: gh api /rate_limit | jq
- name: Check cherry-picks
id: check
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
with:
script: |
require('./trusted/ci/github-script/commits.js')({
github,
context,
core,
dry: context.eventName == 'pull_request',
})
- name: Log current API rate limits
env:
GH_TOKEN: ${{ github.token }}
run: gh api /rate_limit | jq

View File

@@ -1,147 +0,0 @@
# This workflow depends on two GitHub Apps with the following permissions:
# - For checking code owners:
# - Permissions:
# - Repository > Administration: read-only
# - Organization > Members: read-only
# - Install App on this repository, setting these variables:
# - OWNER_RO_APP_ID (variable)
# - OWNER_RO_APP_PRIVATE_KEY (secret)
# - For requesting code owners:
# - Permissions:
# - Repository > Administration: read-only
# - Organization > Members: read-only
# - Repository > Pull Requests: read-write
# - Install App on this repository, setting these variables:
# - OWNER_APP_ID (variable)
# - OWNER_APP_PRIVATE_KEY (secret)
#
# This split is done because checking code owners requires handling untrusted PR input,
# while requesting code owners requires PR write access, and those shouldn't be mixed.
#
# Note that the latter is also used for ./eval.yml requesting reviewers.
name: Codeowners v2
on:
pull_request:
paths:
- .github/workflows/codeowners-v2.yml
pull_request_target:
types: [opened, ready_for_review, synchronize, reopened]
concurrency:
group: codeowners-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: true
permissions: {}
defaults:
run:
shell: bash
env:
OWNERS_FILE: ci/OWNERS
# Don't do anything on draft PRs
DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }}
jobs:
# Check that code owners is valid
check:
name: Check
runs-on: ubuntu-24.04-arm
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
sparse-checkout: .github/actions
- name: Check if the PR can be merged and checkout the merge and target commits
uses: ./.github/actions/get-merge-commit
with:
merged-as-untrusted: true
target-as-trusted: true
- uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
- uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
with:
# This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
name: nixpkgs-ci
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- name: Build codeowners validator
run: nix-build trusted/ci -A codeownersValidator
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
if: github.event_name == 'pull_request_target' && vars.OWNER_RO_APP_ID
id: app-token
with:
app-id: ${{ vars.OWNER_RO_APP_ID }}
private-key: ${{ secrets.OWNER_RO_APP_PRIVATE_KEY }}
permission-administration: read
permission-members: read
- name: Log current API rate limits
if: steps.app-token.outputs.token
env:
GH_TOKEN: ${{ steps.app-token.outputs.token }}
run: gh api /rate_limit | jq
- name: Validate codeowners
if: steps.app-token.outputs.token
env:
OWNERS_FILE: untrusted/${{ env.OWNERS_FILE }}
GITHUB_ACCESS_TOKEN: ${{ steps.app-token.outputs.token }}
REPOSITORY_PATH: untrusted
OWNER_CHECKER_REPOSITORY: ${{ github.repository }}
# Set this to "notowned,avoid-shadowing" to check that all files are owned by somebody
EXPERIMENTAL_CHECKS: "avoid-shadowing"
run: result/bin/codeowners-validator
- name: Log current API rate limits
if: steps.app-token.outputs.token
env:
GH_TOKEN: ${{ steps.app-token.outputs.token }}
run: gh api /rate_limit | jq
# Request reviews from code owners
request:
name: Request
runs-on: ubuntu-24.04-arm
steps:
- uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
# Important: Because we use pull_request_target, this checks out the base branch of the PR, not the PR head.
# This is intentional, because we need to request the review of owners as declared in the base branch.
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
path: trusted
- name: Build review request package
run: nix-build trusted/ci -A requestReviews
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
if: github.event_name == 'pull_request_target' && vars.OWNER_APP_ID
id: app-token
with:
app-id: ${{ vars.OWNER_APP_ID }}
private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
permission-administration: read
permission-members: read
permission-pull-requests: write
- name: Log current API rate limits
if: steps.app-token.outputs.token
env:
GH_TOKEN: ${{ steps.app-token.outputs.token }}
run: gh api /rate_limit | jq
- name: Request reviews
if: steps.app-token.outputs.token
env:
GH_TOKEN: ${{ steps.app-token.outputs.token }}
run: result/bin/request-code-owner-reviews.sh ${{ github.repository }} ${{ github.event.number }} "$OWNERS_FILE"
- name: Log current API rate limits
if: steps.app-token.outputs.token
env:
GH_TOKEN: ${{ steps.app-token.outputs.token }}
run: gh api /rate_limit | jq

View File

@@ -1,65 +0,0 @@
name: Dismissed review
on:
workflow_run:
workflows:
- Review dismissed
types: [completed]
concurrency:
group: dismissed-review-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: true
permissions:
pull-requests: write
defaults:
run:
shell: bash
jobs:
# The `check-cherry-picks` workflow creates review comments which reviewers
# are encouraged to manually dismiss if they're not relevant.
# When a CI-generated review is dismissed, this job automatically minimizes
# it, preventing it from cluttering the PR.
minimize:
name: Minimize as resolved
runs-on: ubuntu-24.04-arm
steps:
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
with:
script: |
// PRs from forks don't have any PRs associated by default.
// Thus, we request the PR number with an API call *to* the fork's repo.
// Multiple pull requests can be open from the same head commit, either via
// different base branches or head branches.
const { head_repository, head_sha, repository } = context.payload.workflow_run
await Promise.all(
(await github.paginate(github.rest.repos.listPullRequestsAssociatedWithCommit, {
owner: head_repository.owner.login,
repo: head_repository.name,
commit_sha: head_sha
}))
.filter(pull_request => pull_request.base.repo.id == repository.id)
.map(async (pull_request) =>
Promise.all(
(await github.paginate(github.rest.pulls.listReviews, {
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: pull_request.number
})).filter(review =>
review.user.login == 'github-actions[bot]' &&
review.state == 'DISMISSED'
).map(review => github.graphql(`
mutation($node_id:ID!) {
minimizeComment(input: {
classifier: RESOLVED,
subjectId: $node_id
})
{ clientMutationId }
}`,
{ node_id: review.node_id }
))
)
)
)

View File

@@ -1,58 +0,0 @@
# Some workflows depend on the base branch of the PR, but changing the base branch is not included in the default trigger events, which would be `opened`, `synchronize` or `reopened`.
# Instead it causes an `edited` event.
# Since `edited` is also triggered when PR title/body is changed, we use this wrapper workflow, to run the other workflows conditionally only.
# There are already feature requests for adding a `base_changed` event:
# - https://github.com/orgs/community/discussions/35058
# - https://github.com/orgs/community/discussions/64119
#
# Instead of adding this to each workflow's pull_request_target event, we trigger this in a separate workflow.
# This has the advantage, that we can actually skip running those jobs for simple edits like changing the title or description.
# The actual trigger happens by closing and re-opening the pull request, which triggers the default pull_request_target events.
# This is much simpler and reliable than other approaches.
name: "Edited base branch"
on:
pull_request_target:
types: [edited]
concurrency:
group: edited-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: true
permissions: {}
defaults:
run:
shell: bash
jobs:
base:
name: Trigger jobs
runs-on: ubuntu-24.04
if: github.event.changes.base.ref.from && github.event.changes.base.ref.from != github.event.pull_request.base.ref
steps:
# Use a GitHub App to create the PR so that CI gets triggered
# The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
# We only need Pull Requests: write here, but the app is also used for backports.
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
id: app-token
with:
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
permission-pull-requests: write
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
with:
github-token: ${{ steps.app-token.outputs.token }}
script: |
function changeState(state) {
return github.rest.pulls.update({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: context.payload.pull_request.number,
state
})
}
await changeState('closed')
await changeState('open')

View File

@@ -1,255 +0,0 @@
name: Eval
on:
workflow_call:
inputs:
mergedSha:
required: true
type: string
targetSha:
type: string
systems:
required: true
type: string
secrets:
OWNER_APP_PRIVATE_KEY:
required: false
permissions: {}
defaults:
run:
shell: bash
jobs:
eval:
runs-on: ubuntu-24.04-arm
strategy:
fail-fast: false
matrix:
system: ${{ fromJSON(inputs.systems) }}
name: ${{ matrix.system }}
outputs:
targetRunId: ${{ steps.targetRunId.outputs.targetRunId }}
steps:
- name: Enable swap
run: |
sudo fallocate -l 10G /swap
sudo chmod 600 /swap
sudo mkswap /swap
sudo swapon /swap
- name: Check out the PR at the test merge commit
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ inputs.mergedSha }}
path: untrusted
- name: Install Nix
uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
with:
extra_nix_config: sandbox = true
- name: Evaluate the ${{ matrix.system }} output paths for all derivation attributes
env:
MATRIX_SYSTEM: ${{ matrix.system }}
run: |
nix-build untrusted/ci -A eval.singleSystem \
--argstr evalSystem "$MATRIX_SYSTEM" \
--arg chunkSize 10000 \
--out-link merged
# If it uses too much memory, slightly decrease chunkSize
- name: Upload the output paths and eval stats
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: merged-${{ matrix.system }}
path: merged/*
- name: Log current API rate limits
env:
GH_TOKEN: ${{ github.token }}
run: gh api /rate_limit | jq
- name: Get target run id
if: inputs.targetSha
id: targetRunId
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
env:
MATRIX_SYSTEM: ${{ matrix.system }}
TARGET_SHA: ${{ inputs.targetSha }}
with:
script: |
const system = process.env.MATRIX_SYSTEM
const targetSha = process.env.TARGET_SHA
let run_id
try {
run_id = (await github.rest.actions.listWorkflowRuns({
...context.repo,
workflow_id: 'push.yml',
event: 'push',
head_sha: targetSha
})).data.workflow_runs[0].id
} catch {
throw new Error(`Could not find a push.yml workflow run for ${targetSha}.`)
}
// Waiting 120 * 5 sec = 10 min. max.
// Eval takes max 5-6 minutes, normally.
for (let i = 0; i < 120; i++) {
const result = await github.rest.actions.listWorkflowRunArtifacts({
...context.repo,
run_id,
name: `merged-${system}`
})
if (result.data.total_count > 0) {
core.setOutput('targetRunId', run_id)
return
}
await new Promise(resolve => setTimeout(resolve, 5000))
}
// No artifact found at this stage. This usually means that Eval failed on the target branch.
// This should only happen when Eval is broken on the target branch and this PR fixes it.
// Continue without targetRunId to skip the remaining steps, but pass the job.
- name: Log current API rate limits
env:
GH_TOKEN: ${{ github.token }}
run: gh api /rate_limit | jq
- uses: actions/download-artifact@v4
if: steps.targetRunId.outputs.targetRunId
with:
run-id: ${{ steps.targetRunId.outputs.targetRunId }}
name: merged-${{ matrix.system }}
path: target
github-token: ${{ github.token }}
merge-multiple: true
- name: Compare outpaths against the target branch
if: steps.targetRunId.outputs.targetRunId
env:
MATRIX_SYSTEM: ${{ matrix.system }}
run: |
nix-build untrusted/ci -A eval.diff \
--arg beforeDir ./target \
--arg afterDir "$(readlink ./merged)" \
--argstr evalSystem "$MATRIX_SYSTEM" \
--out-link diff
- name: Upload outpaths diff and stats
if: steps.targetRunId.outputs.targetRunId
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: diff-${{ matrix.system }}
path: diff/*
compare:
runs-on: ubuntu-24.04-arm
needs: [eval]
if: needs.eval.outputs.targetRunId
permissions:
statuses: write
steps:
- name: Download output paths and eval stats for all systems
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
pattern: diff-*
path: diff
merge-multiple: true
- name: Check out the PR at the target commit
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ inputs.targetSha }}
path: trusted
- name: Install Nix
uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
with:
extra_nix_config: sandbox = true
- name: Combine all output paths and eval stats
run: |
nix-build trusted/ci -A eval.combine \
--arg diffDir ./diff \
--out-link combined
- name: Compare against the target branch
env:
AUTHOR_ID: ${{ github.event.pull_request.user.id }}
run: |
git -C trusted fetch --depth 1 origin ${{ inputs.mergedSha }}
git -C trusted diff --name-only ${{ inputs.mergedSha }} \
| jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json
# Use the target branch to get accurate maintainer info
nix-build trusted/ci -A eval.compare \
--arg combinedDir "$(realpath ./combined)" \
--arg touchedFilesJson ./touched-files.json \
--argstr githubAuthorId "$AUTHOR_ID" \
--out-link comparison
cat comparison/step-summary.md >> "$GITHUB_STEP_SUMMARY"
- name: Upload the comparison results
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: comparison
path: comparison/*
- name: Add eval summary to commit statuses
if: ${{ github.event_name == 'pull_request_target' }}
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
with:
script: |
const { readFile } = require('node:fs/promises')
const changed = JSON.parse(await readFile('comparison/changed-paths.json', 'utf-8'))
const description =
'Package: ' + [
`added ${changed.attrdiff.added.length}`,
`removed ${changed.attrdiff.removed.length}`,
`changed ${changed.attrdiff.changed.length}`
].join(', ') +
' — Rebuild: ' + [
`linux ${changed.rebuildCountByKernel.linux}`,
`darwin ${changed.rebuildCountByKernel.darwin}`
].join(', ')
const { serverUrl, repo, runId, payload } = context
const target_url =
`${serverUrl}/${repo.owner}/${repo.repo}/actions/runs/${runId}?pr=${payload.pull_request.number}`
await github.rest.repos.createCommitStatus({
...repo,
sha: payload.pull_request.head.sha,
context: 'Eval Summary',
state: 'success',
description,
target_url
})
misc:
if: ${{ github.event_name != 'push' }}
runs-on: ubuntu-24.04-arm
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
sparse-checkout: .github/actions
- name: Check if the PR can be merged and checkout the merge commit
uses: ./.github/actions/get-merge-commit
with:
merged-as-untrusted: true
- name: Install Nix
uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
with:
extra_nix_config: sandbox = true
- name: Ensure flake outputs on all systems still evaluate
run: nix flake check --all-systems --no-build ./untrusted
- name: Query nixpkgs with aliases enabled to check for basic syntax errors
run: |
time nix-env -I ./untrusted -f ./untrusted -qa '*' --option restrict-eval true --option allow-import-from-derivation false >/dev/null

View File

@@ -1,120 +0,0 @@
# WARNING:
# When extending this action, be aware that $GITHUB_TOKEN allows some write
# access to the GitHub API. This means that it should not evaluate user input in
# a way that allows code injection.
name: Labels
on:
schedule:
- cron: '07,17,27,37,47,57 * * * *'
workflow_call:
inputs:
headBranch:
required: true
type: string
secrets:
NIXPKGS_CI_APP_PRIVATE_KEY:
required: true
workflow_dispatch:
concurrency:
# This explicitly avoids using `run_id` for the concurrency key to make sure that only
# *one* scheduled run can run at a time.
group: labels-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number }}
# PR-triggered runs will be cancelled, but scheduled runs will be queued.
cancel-in-progress: ${{ github.event_name != 'schedule' }}
# This is used as fallback without app only.
# This happens when testing in forks without setting up that app.
permissions:
issues: write
pull-requests: write
defaults:
run:
shell: bash
jobs:
update:
runs-on: ubuntu-24.04-arm
if: github.event_name != 'schedule' || github.repository_owner == 'NixOS'
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
sparse-checkout: |
ci/github-script
- name: Install dependencies
run: npm install @actions/artifact bottleneck
# Use a GitHub App, because it has much higher rate limits: 12,500 instead of 5,000 req / hour.
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
if: vars.NIXPKGS_CI_APP_ID
id: app-token
with:
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
permission-issues: write
permission-pull-requests: write
- name: Log current API rate limits
env:
GH_TOKEN: ${{ steps.app-token.outputs.token || github.token }}
run: gh api /rate_limit | jq
- name: Labels from API data and Eval results
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
with:
github-token: ${{ steps.app-token.outputs.token || github.token }}
retries: 3
script: |
require('./ci/github-script/labels.js')({
github,
context,
core,
dry: context.eventName == 'pull_request'
})
- name: Log current API rate limits
env:
GH_TOKEN: ${{ steps.app-token.outputs.token || github.token }}
run: gh api /rate_limit | jq
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
name: Labels from touched files
if: |
github.event_name == 'pull_request_target' &&
!contains(fromJSON(inputs.headBranch).type, 'development')
with:
repo-token: ${{ steps.app-token.outputs.token }}
configuration-path: .github/labeler.yml # default
sync-labels: true
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
name: Labels from touched files (no sync)
if: |
github.event_name == 'pull_request_target' &&
!contains(fromJSON(inputs.headBranch).type, 'development')
with:
repo-token: ${{ steps.app-token.outputs.token }}
configuration-path: .github/labeler-no-sync.yml
sync-labels: false
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
name: Labels from touched files (development branches)
# Development branches like staging-next, haskell-updates and python-updates get special labels.
# This is to avoid the mass of labels there, which is mostly useless - and really annoying for
# the backport labels.
if: |
github.event_name == 'pull_request_target' &&
contains(fromJSON(inputs.headBranch).type, 'development')
with:
repo-token: ${{ steps.app-token.outputs.token }}
configuration-path: .github/labeler-development-branches.yml
sync-labels: true
- name: Log current API rate limits
env:
GH_TOKEN: ${{ steps.app-token.outputs.token || github.token }}
run: gh api /rate_limit | jq

View File

@@ -1,105 +0,0 @@
name: Lint
on:
workflow_call:
inputs:
mergedSha:
required: true
type: string
targetSha:
required: true
type: string
permissions: {}
defaults:
run:
shell: bash
jobs:
treefmt:
runs-on: ubuntu-24.04-arm
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
sparse-checkout: .github/actions
- name: Check if the PR can be merged and checkout the merge commit
uses: ./.github/actions/get-merge-commit
with:
mergedSha: ${{ inputs.mergedSha }}
merged-as-untrusted: true
- uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
with:
extra_nix_config: sandbox = true
- name: Check that files are formatted
run: |
# Note that it's fine to run this on untrusted code because:
# - There's no secrets accessible here
# - The build is sandboxed
if ! nix-build untrusted/ci -A fmt.check; then
echo "Some files are not properly formatted"
echo "Please format them by going to the Nixpkgs root directory and running one of:"
echo " nix-shell --run treefmt"
echo " nix develop --command treefmt"
echo " nix fmt"
echo "Make sure your branch is up to date with master; rebase if not."
echo "If you're having trouble, please ping @NixOS/nix-formatting"
exit 1
fi
parse:
runs-on: ubuntu-24.04-arm
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
sparse-checkout: .github/actions
- name: Check if the PR can be merged and checkout the merge commit
uses: ./.github/actions/get-merge-commit
with:
mergedSha: ${{ inputs.mergedSha }}
merged-as-untrusted: true
- uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
with:
extra_nix_config: sandbox = true
- name: Parse all nix files
run: |
# Tests multiple versions at once, let's make sure all of them run, so keep-going.
nix-build untrusted/ci -A parse --keep-going
nixpkgs-vet:
runs-on: ubuntu-24.04-arm
# This should take 1 minute at most, but let's be generous. The default of 6 hours is definitely too long.
timeout-minutes: 10
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
sparse-checkout: .github/actions
- name: Check if the PR can be merged and checkout merged and target commits
uses: ./.github/actions/get-merge-commit
with:
mergedSha: ${{ inputs.mergedSha }}
merged-as-untrusted: true
targetSha: ${{ inputs.targetSha }}
target-as-trusted: true
- uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
with:
extra_nix_config: sandbox = true
- name: Running nixpkgs-vet
env:
# Force terminal colors to be enabled. The library that `nixpkgs-vet` uses respects https://bixense.com/clicolors/
CLICOLOR_FORCE: 1
run: |
if nix-build untrusted/ci -A nixpkgs-vet --arg base "./trusted" --arg head "./untrusted"; then
exit 0
else
exitCode=$?
echo "To run locally: ./ci/nixpkgs-vet.sh $GITHUB_BASE_REF https://github.com/$GITHUB_REPOSITORY.git"
echo "If you're having trouble, ping @NixOS/nixpkgs-vet"
exit "$exitCode"
fi

View File

@@ -1,46 +0,0 @@
# This action periodically merges base branches into staging branches.
# This is done to
# * prevent conflicts or rather resolve them early
# * make all potential breakage happen on the staging branch
# * and make sure that all major rebuilds happen before the staging
# branch gets merged back into its base branch.
name: "Periodic Merges (24h)"
on:
schedule:
# * is a special character in YAML so you have to quote this string
# Merge every 24 hours
- cron: '0 0 * * *'
workflow_dispatch:
permissions: {}
defaults:
run:
shell: bash
jobs:
periodic-merge:
if: github.repository_owner == 'NixOS'
strategy:
# don't fail fast, so that all pairs are tried
fail-fast: false
# certain branches need to be merged in order, like master->staging-next->staging
# and disabling parallelism ensures the order of the pairs below.
max-parallel: 1
matrix:
pairs:
- from: release-25.05
into: staging-next-25.05
- from: staging-next-25.05
into: staging-25.05
- name: merge-base(master,staging) → haskell-updates
from: master staging
into: haskell-updates
uses: ./.github/workflows/periodic-merge.yml
with:
from: ${{ matrix.pairs.from }}
into: ${{ matrix.pairs.into }}
name: ${{ matrix.pairs.name || format('{0} → {1}', matrix.pairs.from, matrix.pairs.into) }}
secrets: inherit

View File

@@ -1,43 +0,0 @@
# This action periodically merges base branches into staging branches.
# This is done to
# * prevent conflicts or rather resolve them early
# * make all potential breakage happen on the staging branch
# * and make sure that all major rebuilds happen before the staging
# branch gets merged back into its base branch.
name: "Periodic Merges (6h)"
on:
schedule:
# * is a special character in YAML so you have to quote this string
# Merge every 6 hours
- cron: '0 */6 * * *'
workflow_dispatch:
permissions: {}
defaults:
run:
shell: bash
jobs:
periodic-merge:
if: github.repository_owner == 'NixOS'
strategy:
# don't fail fast, so that all pairs are tried
fail-fast: false
# certain branches need to be merged in order, like master->staging-next->staging
# and disabling parallelism ensures the order of the pairs below.
max-parallel: 1
matrix:
pairs:
- from: master
into: staging-next
- from: staging-next
into: staging
uses: ./.github/workflows/periodic-merge.yml
with:
from: ${{ matrix.pairs.from }}
into: ${{ matrix.pairs.into }}
name: ${{ format('{0} → {1}', matrix.pairs.from, matrix.pairs.into) }}
secrets: inherit

View File

@@ -1,63 +0,0 @@
name: "Merge"
on:
workflow_call:
inputs:
from:
description: Branch to merge into target branch. Can also be two branches separated by space to find the merge base between them.
required: true
type: string
into:
description: Target branch to merge into.
required: true
type: string
defaults:
run:
shell: bash
jobs:
merge:
runs-on: ubuntu-24.04-arm
steps:
# Use a GitHub App to create the PR so that CI gets triggered
# The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
id: app-token
with:
app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
permission-contents: write
permission-pull-requests: write
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Find merge base between two branches
if: contains(inputs.from, ' ')
id: merge_base
env:
branches: ${{ inputs.from }}
run: |
# turn into bash array, split on space
read -ra branches <<< "$branches"
git fetch --shallow-since="1 month ago" origin "${branches[@]}"
merge_base="$(git merge-base "refs/remotes/origin/${branches[0]}" "refs/remotes/origin/${branches[1]}")"
echo "Found merge base: $merge_base" >&2
echo "merge_base=$merge_base" >> "$GITHUB_OUTPUT"
- name: ${{ inputs.from }} → ${{ inputs.into }}
uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # 1.4.0
with:
type: now
from_branch: ${{ steps.merge_base.outputs.merge_base || inputs.from }}
target_branch: ${{ inputs.into }}
github_token: ${{ steps.app-token.outputs.token }}
- name: Comment on failure
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
if: ${{ failure() }}
with:
issue-number: 105153
body: |
Periodic merge from `${{ inputs.from }}` into `${{ inputs.into }}` has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).
token: ${{ steps.app-token.outputs.token }}

View File

@@ -1,149 +0,0 @@
name: PR
on:
pull_request:
paths:
- .github/workflows/build.yml
- .github/workflows/check.yml
- .github/workflows/eval.yml
- .github/workflows/lint.yml
- .github/workflows/pr.yml
- .github/workflows/labels.yml
- .github/workflows/reviewers.yml # needs eval results from the same event type
pull_request_target:
concurrency:
group: pr-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: true
permissions: {}
jobs:
prepare:
runs-on: ubuntu-24.04-arm
outputs:
baseBranch: ${{ steps.branches.outputs.base }}
headBranch: ${{ steps.branches.outputs.head }}
mergedSha: ${{ steps.get-merge-commit.outputs.mergedSha }}
targetSha: ${{ steps.get-merge-commit.outputs.targetSha }}
systems: ${{ steps.systems.outputs.systems }}
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
sparse-checkout: |
.github/actions
ci/supportedBranches.js
ci/supportedSystems.json
- name: Check if the PR can be merged and get the test merge commit
uses: ./.github/actions/get-merge-commit
id: get-merge-commit
- name: Load supported systems
id: systems
run: |
echo "systems=$(jq -c <ci/supportedSystems.json)" >> "$GITHUB_OUTPUT"
- name: Determine branch type
id: branches
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
with:
script: |
const { classify } = require('./ci/supportedBranches.js')
const { base, head } = context.payload.pull_request
const baseClassification = classify(base.ref)
core.setOutput('base', baseClassification)
core.info('base classification:', baseClassification)
const headClassification =
(base.repo.full_name == head.repo.full_name) ?
classify(head.ref) :
// PRs from forks are always considered WIP.
{ type: ['wip'] }
core.setOutput('head', headClassification)
core.info('head classification:', headClassification)
check:
name: Check
needs: [prepare]
uses: ./.github/workflows/check.yml
permissions:
# cherry-picks
pull-requests: write
with:
baseBranch: ${{ needs.prepare.outputs.baseBranch }}
headBranch: ${{ needs.prepare.outputs.headBranch }}
lint:
name: Lint
needs: [prepare]
uses: ./.github/workflows/lint.yml
with:
mergedSha: ${{ needs.prepare.outputs.mergedSha }}
targetSha: ${{ needs.prepare.outputs.targetSha }}
eval:
name: Eval
needs: [prepare]
uses: ./.github/workflows/eval.yml
permissions:
# compare
statuses: write
secrets:
OWNER_APP_PRIVATE_KEY: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
with:
mergedSha: ${{ needs.prepare.outputs.mergedSha }}
targetSha: ${{ needs.prepare.outputs.targetSha }}
systems: ${{ needs.prepare.outputs.systems }}
labels:
name: Labels
needs: [prepare, eval]
uses: ./.github/workflows/labels.yml
permissions:
issues: write
pull-requests: write
secrets:
NIXPKGS_CI_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
with:
headBranch: ${{ needs.prepare.outputs.headBranch }}
reviewers:
name: Reviewers
needs: [prepare, eval]
if: |
needs.prepare.outputs.targetSha &&
!contains(fromJSON(needs.prepare.outputs.headBranch).type, 'development')
uses: ./.github/workflows/reviewers.yml
secrets:
OWNER_APP_PRIVATE_KEY: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
build:
name: Build
needs: [prepare]
uses: ./.github/workflows/build.yml
secrets:
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
with:
baseBranch: ${{ needs.prepare.outputs.baseBranch }}
mergedSha: ${{ needs.prepare.outputs.mergedSha }}
# This job's only purpose is to serve as a target for the "Required Status Checks" branch ruleset.
# It "needs" all the jobs that should block merging a PR.
# If they pass, it is skipped — which counts as "success" for purposes of the branch ruleset.
# However, if any of them fail, this job will also fail — thus blocking the branch ruleset.
no-pr-failures:
# Modify this list to add or remove jobs from required status checks.
needs:
- check
- lint
- eval
- build
# WARNING:
# Do NOT change the name of this job, otherwise the rule will not catch it anymore.
# This would prevent all PRs from merging.
name: no PR failures
if: ${{ failure() }}
runs-on: ubuntu-24.04-arm
steps:
- run: exit 1

View File

@@ -1,48 +0,0 @@
name: Push
on:
pull_request:
paths:
- .github/workflows/push.yml
# eval is tested via pr.yml
push:
# Keep this synced with ci/request-reviews/dev-branches.txt
branches:
- master
- staging
- release-*
- staging-*
- haskell-updates
- python-updates
permissions: {}
jobs:
prepare:
runs-on: ubuntu-24.04-arm
outputs:
systems: ${{ steps.systems.outputs.systems }}
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
sparse-checkout: |
ci/supportedSystems.json
- name: Load supported systems
id: systems
run: |
echo "systems=$(jq -c <ci/supportedSystems.json)" >> "$GITHUB_OUTPUT"
eval:
name: Eval
needs: [prepare]
uses: ./.github/workflows/eval.yml
# Those are not actually used on push, but will throw an error if not set.
permissions:
# compare
issues: write
pull-requests: write
statuses: write
with:
mergedSha: ${{ github.sha }}
systems: ${{ needs.prepare.outputs.systems }}

View File

@@ -1,17 +0,0 @@
name: Review dismissed
on:
pull_request_review:
types: [dismissed]
permissions: {}
defaults:
run:
shell: bash
jobs:
trigger:
runs-on: ubuntu-24.04-arm
steps:
- run: echo This is a no-op only used as a trigger for workflow_run.

View File

@@ -1,144 +0,0 @@
# This workflow will request reviews from the maintainers of each package
# listed in the PR's most recent eval comparison artifact.
name: Reviewers
on:
pull_request:
paths:
- .github/workflows/reviewers.yml
pull_request_target:
types: [ready_for_review]
workflow_call:
secrets:
OWNER_APP_PRIVATE_KEY:
required: true
concurrency:
group: reviewers-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: true
permissions: {}
defaults:
run:
shell: bash
jobs:
request:
runs-on: ubuntu-24.04-arm
steps:
- name: Check out the PR at the base commit
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
path: trusted
sparse-checkout: ci
- name: Install Nix
uses: cachix/install-nix-action@f0fe604f8a612776892427721526b4c7cfb23aba # v31
with:
extra_nix_config: sandbox = true
- name: Build the requestReviews derivation
run: nix-build trusted/ci -A requestReviews
# See ./codeowners-v2.yml, reuse the same App because we need the same permissions
# Can't use the token received from permissions above, because it can't get enough permissions
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
if: github.event_name == 'pull_request_target' && vars.OWNER_APP_ID
id: app-token
with:
app-id: ${{ vars.OWNER_APP_ID }}
private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
permission-administration: read
permission-members: read
permission-pull-requests: write
- name: Log current API rate limits (github.token)
env:
GH_TOKEN: ${{ github.token }}
run: gh api /rate_limit | jq
# In the regular case, this workflow is called via workflow_call from the eval workflow directly.
# In the more special case, when a PR is undrafted an eval run will have started already.
- name: Wait for comparison to be done
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
id: eval
with:
script: |
const run_id = (await github.rest.actions.listWorkflowRuns({
owner: context.repo.owner,
repo: context.repo.repo,
workflow_id: 'pr.yml',
event: context.eventName,
head_sha: context.payload.pull_request.head.sha
})).data.workflow_runs[0].id
core.setOutput('run-id', run_id)
// Waiting 120 * 5 sec = 10 min. max.
// The extreme case is an Eval run that just started when the PR is undrafted.
// Eval takes max 5-6 minutes, normally.
for (let i = 0; i < 120; i++) {
const result = await github.rest.actions.listWorkflowRunArtifacts({
owner: context.repo.owner,
repo: context.repo.repo,
run_id,
name: 'comparison'
})
if (result.data.total_count > 0) return
await new Promise(resolve => setTimeout(resolve, 5000))
}
throw new Error("No comparison artifact found.")
- name: Log current API rate limits (github.token)
env:
GH_TOKEN: ${{ github.token }}
run: gh api /rate_limit | jq
- name: Download the comparison results
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
run-id: ${{ steps.eval.outputs.run-id }}
github-token: ${{ github.token }}
pattern: comparison
path: comparison
merge-multiple: true
- name: Log current API rate limits (app-token)
if: ${{ steps.app-token.outputs.token }}
env:
GH_TOKEN: ${{ steps.app-token.outputs.token }}
run: gh api /rate_limit | jq
- name: Log current API rate limits (github.token)
env:
GH_TOKEN: ${{ github.token }}
run: gh api /rate_limit | jq
- name: Requesting maintainer reviews
if: ${{ steps.app-token.outputs.token }}
env:
GH_TOKEN: ${{ github.token }}
REPOSITORY: ${{ github.repository }}
NUMBER: ${{ github.event.number }}
AUTHOR: ${{ github.event.pull_request.user.login }}
# Don't request reviewers on draft PRs
DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }}
run: |
# maintainers.json contains GitHub IDs. Look up handles to request reviews from.
# There appears to be no API to request reviews based on GitHub IDs
jq -r 'keys[]' comparison/maintainers.json \
| while read -r id; do gh api /user/"$id" --jq .login; done \
| GH_TOKEN=${{ steps.app-token.outputs.token }} result/bin/request-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR"
- name: Log current API rate limits (app-token)
if: ${{ steps.app-token.outputs.token }}
env:
GH_TOKEN: ${{ steps.app-token.outputs.token }}
run: gh api /rate_limit | jq
- name: Log current API rate limits (github.token)
env:
GH_TOKEN: ${{ github.token }}
run: gh api /rate_limit | jq

30
.gitignore vendored
View File

@@ -2,41 +2,15 @@
,*
.*.swp
.*.swo
.\#*
\#*\#
.idea/
.nixos-test-history
.vscode/
.helix/
outputs/
result-*
result
repl-result-*
tags
!pkgs/development/python-modules/result
result-*
/doc/NEWS.html
/doc/NEWS.txt
/doc/manual.html
/doc/manual.pdf
/source/
.version-suffix
.direnv
.envrc
.DS_Store
.mypy_cache
__pycache__
/pkgs/development/libraries/qt-5/*/tmp/
/pkgs/desktops/kde-5/*/tmp/
/pkgs/development/mobile/androidenv/xml/*
# generated by pkgs/common-updater/update-script.nix
update-git-commits.txt
/*.log
# JetBrains IDEA module declaration file
/nixpkgs.iml
# Usually used for manual backports
.worktree/
/pkgs/desktops/kde-5/*/tmp/

View File

@@ -1,34 +0,0 @@
ajs124 <git@ajs124.de> <ajs124@users.noreply.github.com>
Anderson Torres <torres.anderson.85@protonmail.com>
Atemu <git@atemu.net> <atemu.main@gmail.com>
Christina Sørensen <christina@cafkafk.com>
Christina Sørensen <christina@cafkafk.com> <christinaafk@gmail.com>
Christina Sørensen <christina@cafkafk.com> <89321978+cafkafk@users.noreply.github.com>
Daniel Løvbrøtte Olsen <me@dandellion.xyz> <daniel.olsen99@gmail.com>
Ethan Carter Edwards <ethan@ethancedwards.com> Ethan Edwards <ethancarteredwards@gmail.com>
Fabian Affolter <mail@fabian-affolter.ch> <fabian@affolter-engineering.ch>
Fiona Behrens <me@kloenk.dev>
Fiona Behrens <me@kloenk.dev> <me@kloenk.de>
goatastronaut0212 <goatastronaut0212@outlook.com> <goatastronaut0212@proton.me>
Janne Heß <janne@hess.ooo> <dasJ@users.noreply.github.com>
jopejoe1 <nixpkgs@missing.ninja>
jopejoe1 <nixpkgs@missing.ninja> <johannes@joens.email>
jopejoe1 <nixpkgs@missing.ninja> <34899572+jopejoe1@users.noreply.github.com>
Jörg Thalheim <joerg@thalheim.io> <Mic92@users.noreply.github.com>
Lin Jian <me@linj.tech> <linj.dev@outlook.com>
Lin Jian <me@linj.tech> <75130626+jian-lin@users.noreply.github.com>
Martin Weinelt <hexa@darmstadt.ccc.de> <mweinelt@users.noreply.github.com>
Martin Häcker <spamfaenger@gmx.de> <spamfaenger@gmx.de>
moni <lythe1107@gmail.com> <lythe1107@icloud.com>
R. RyanTM <ryantm-bot@ryantm.com>
Robert Hensing <robert@roberthensing.nl> <roberth@users.noreply.github.com>
Sandro Jäckel <sandro.jaeckel@gmail.com>
Sandro Jäckel <sandro.jaeckel@gmail.com> <sandro.jaeckel@sap.com>
superherointj <5861043+superherointj@users.noreply.github.com>
Tomodachi94 <tomodachi94@protonmail.com> Tomo <68489118+Tomodachi94@users.noreply.github.com>
Vladimír Čunát <v@cunat.cz> <vcunat@gmail.com>
Vladimír Čunát <v@cunat.cz> <vladimir.cunat@nic.cz>
Yifei Sun <ysun@hey.com>
Yifei Sun <ysun@hey.com> StepBroBD <ysun@hey.com>
Yifei Sun <ysun@hey.com> StepBroBD <Hi@StepBroBD.com>
Yifei Sun <ysun@hey.com> <ysun+git@stepbrobd.com>

View File

@@ -1 +0,0 @@
lib/.version

1
.version Normal file
View File

@@ -0,0 +1 @@
18.09

View File

@@ -1,848 +0,0 @@
# Contributing to Nixpkgs
This document is for people wanting to contribute to Nixpkgs.
This involves changes that are proposed using [GitHub](https://github.com) [pull requests](https://docs.github.com/pull-requests) to the [Nixpkgs repository](https://github.com/nixos/nixpkgs).
A GitHub account is recommended, which you can sign up for [here](https://github.com/signup).
See [here](https://discourse.nixos.org/t/about-the-patches-category/477) for how to contribute without a GitHub account.
This document assumes that you already know how to use GitHub and Git.
If that's not the case, we recommend learning about it [here](https://docs.github.com/en/get-started/quickstart/hello-world).
## Overview
[overview]: #overview
This file contains general contributing information.
More specific information about individual parts of Nixpkgs can be found here:
- [`doc`](./doc/README.md): Sources and infrastructure for the [Nixpkgs manual](https://nixos.org/manual/nixpkgs/stable/)
- [`lib`](./lib/README.md): Sources and documentation of the [library functions](https://nixos.org/manual/nixpkgs/stable/#chap-functions)
- [`maintainers`](./maintainers/README.md): Nixpkgs maintainer and team listings, maintainer scripts
- [`nixos`](./nixos/README.md): Implementation of [NixOS](https://nixos.org/manual/nixos/stable/)
- [`pkgs`](./pkgs/README.md): Package and [builder](https://nixos.org/manual/nixpkgs/stable/#part-builders) definitions
# How to's
## How to create pull requests
[pr-create]: #how-to-create-pull-requests
This section describes how changes can be proposed with a pull request (PR).
> [!Note]
> Be aware that contributing implies licensing those contributions under the terms of [COPYING](./COPYING), an MIT-like license.
0. Set up a local version of Nixpkgs to work with:
1. [Fork](https://docs.github.com/en/get-started/quickstart/fork-a-repo#forking-a-repository) the [Nixpkgs repository](https://github.com/nixos/nixpkgs).
1. [Clone the forked repository](https://docs.github.com/en/get-started/quickstart/fork-a-repo#cloning-your-forked-repository) into a local `nixpkgs` directory.
1. [Configure the upstream Nixpkgs repository](https://docs.github.com/en/get-started/quickstart/fork-a-repo#configuring-git-to-sync-your-fork-with-the-upstream-repository).
1. Select the appropriate [base branch](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches#working-with-branches) for the change, as [described here][branch].
If in doubt, use `master`.
This can be changed later by [rebasing][rebase].
2. Create a new Git branch, ideally such that:
- The name of the branch hints at your change, e.g. `update-hello`.
- The branch contains the most recent base branch.
We'll assume the base branch `master` here.
```bash
# Make sure you have the latest changes from upstream Nixpkgs
git fetch upstream
# Create and switch to a new branch, based on the base branch in Nixpkgs
git switch --create update-hello upstream/master
```
To avoid potentially having to download and build many derivations, you can base on a specific [Git commit](https://www.git-scm.com/docs/gitglossary#def_commit) instead:
- The commit of the latest `nixpkgs-unstable` channel, available [here](https://channels.nixos.org/nixpkgs-unstable/git-revision).
- The commit of a local Nixpkgs downloaded using [nix-channel](https://nixos.org/manual/nix/stable/command-ref/nix-channel), available using `nix-instantiate --eval --expr '(import <nixpkgs/lib>).trivial.revisionWithDefault null'`
- If you're using NixOS, the commit of your NixOS installation, available with `nixos-version --revision`.
You can use this commit instead of `upstream/master` in the above command:
```bash
# Here, b9c03fbb is an example commit from nixpkgs-unstable
git switch --create update-hello b9c03fbb
```
3. Make your changes in the local Nixpkgs repository and:
- Adhere to both the [general code conventions][code-conventions], and the relevant [specific code conventions][overview].
- Test the changes.
- If necessary, document the changes.
See the [overview section][overview] for more specific information.
4. Commit your changes using `git commit`.
Make sure to adhere to the [commit conventions](#commit-conventions).
Repeat the steps 3-4 as many times as necessary.
Advance to the next step once all the commits make sense together.
You can view your commits with `git log`.
5. Push your commits to your fork of Nixpkgs:
```
git push --set-upstream origin HEAD
```
The above command will output a link to directly do the next step:
```
remote: Create a pull request for 'update-hello' on GitHub by visiting:
remote: https://github.com/myUser/nixpkgs/pull/new/update-hello
```
6. [Create a pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request#creating-the-pull-request) from the new branch in your Nixpkgs fork to the upstream Nixpkgs repository.
Use the branch from step 1 as the PR's base branch.
Go through the [pull request template](#pull-request-template).
7. Respond to review comments and potentially to CI failures and merge conflicts by updating the PR.
Always keep it in a mergeable state.
The non-technical side of this process is covered in [I opened a PR, how do I get it merged?](#i-opened-a-pr-how-do-i-get-it-merged).
The [ofborg](https://github.com/NixOS/ofborg) CI system will perform checks to ensure code quality.
You can see the results at the bottom of the PR.
See [the ofborg Readme](https://github.com/NixOS/ofborg#readme) for more details.
- To add new commits, repeat steps 3-4 and push the result:
```
git push
```
- To change existing commits, [rewrite the Git history](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History).
Useful Git commands for this are `git commit --patch --amend` and `git rebase --interactive`.
With a rewritten history you need to force-push the commits:
```
git push --force-with-lease
```
- If there are merge conflicts, you will have to [rebase the branch](https://git-scm.com/book/en/v2/Git-Branching-Rebasing) onto the current **base branch**.
Sometimes this can be done [on GitHub directly](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/keeping-your-pull-request-in-sync-with-the-base-branch#updating-your-pull-request-branch).
To rebase locally:
```
git fetch upstream
git rebase upstream/master
git push --force-with-lease
```
Use the base branch from step 1 instead of `upstream/master`.
- If you need to change the base branch, [rebase][rebase].
8. If your PR is merged and [acceptable for releases][release-acceptable], you may [backport][pr-backport] it.
### Pull request template
[pr-template]: #pull-request-template
The pull request template helps to determine which steps have been taken so far.
Details not covered by the title and links to existing related issues should go at the top.
When a PR is created, it will be pre-populated with some checkboxes.
#### Tested using sandboxing
When sandbox builds are enabled, Nix will set up an isolated environment for each build process.
It is used to remove further hidden dependencies set by the build environment, to improve reproducibility.
This includes access to the network during the build outside of `fetch*` functions and files outside the Nix store.
Depending on the operating system, access to other resources is blocked as well; see [sandbox](https://nixos.org/manual/nix/stable/command-ref/conf-file#conf-sandbox) in the Nix manual for details.
Please test builds with sandboxing enabled, because it is also used in [Hydra](https://nixos.org/hydra).
If you are on Linux, sandboxing is enabled by default.
On other platforms, sandboxing is disabled by default due to a small performance hit on each build.
Please enable sandboxing **before** building the package by adding the following to `/etc/nix/nix.conf`:
```ini
sandbox = true
```
#### Built on platform(s)
Many Nix packages are designed to run on multiple platforms.
As such, its important to let the maintainer know which platforms you have tested on.
Its not always practical to test all platforms, and its not required for a pull request to be merged.
Only check the platforms you tested the build on in this section.
#### Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
Packages with automated tests are likely merged quicker, because they dont require as much manual testing.
If there are existing tests for the package, they should be run.
NixOS tests can only be run on linux.
For more details on writing and running tests, see the [section in the NixOS manual](https://nixos.org/nixos/manual/index.html#sec-nixos-tests).
#### Tested compilation of all pkgs that depend on this change using `nixpkgs-review`
If you are modifying a package, you can use `nixpkgs-review` to make sure all packages that depend on the updated package still build.
It can work on uncommitted changes with the `wip` option or on a specific pull request.
Review changes from pull request number 12345:
```ShellSession
nix-shell -p nixpkgs-review --run "nixpkgs-review pr 12345"
```
Alternatively, with flakes (and analogously for the other commands below):
```ShellSession
nix run nixpkgs#nixpkgs-review -- pr 12345
```
Review uncommitted changes:
```ShellSession
nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
```
Review changes from the last commit:
```ShellSession
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
```
#### Tested execution of all binary files (usually in `./result/bin/`)
It's important to test a modified package's executables.
Look into `./result/bin` and run all files in there, or at a minimum, the main executable.
For example, if you make a change to `texlive`, you probably would only check the binaries associated with the change you made, rather than testing all of them.
#### Meets Nixpkgs contribution standards
The last checkbox is about whether it fits the guidelines in this `CONTRIBUTING.md` file.
This document details our standards for commit messages, reviews, licensing of contributions, etc...
Everyone should read and understand these standards before submitting a pull request.
### Rebasing between branches (i.e. from master to staging)
[rebase]: #rebasing-between-branches-ie-from-master-to-staging
Sometimes, changes must be rebased between branches.
One example is, if the number of rebuilds caused is too large for the original target branch.
In the following example, the current `feature` branch is based on `master`, and we rebase it to have the PR target `staging`.
We rebase on the _merge base_ between `master` and `staging` to avoid too many local rebuilds.
```console
# Rebase your commits onto the common merge base
git rebase --onto upstream/staging... upstream/master
# Force push your changes
git push origin feature --force-with-lease
```
The syntax `upstream/staging...` is equivalent to `upstream/staging...HEAD` and stands for the merge base between `upstream/staging` and `HEAD` (hence between `upstream/staging` and `upstream/master`).
Then use the *Edit* button in the upper right corner of the GitHub PR, and switch the base branch from `master` to `staging`.
*After* the PR has been retargeted, a final rebase onto the target branch might be needed to resolve merge conflicts.
```console
# Rebase onto target branch
git rebase upstream/staging
# Review and fixup possible conflicts
git status
# Force push your changes
git push origin feature --force-with-lease
```
## How to backport pull requests
[pr-backport]: #how-to-backport-pull-requests
Once a PR has been merged, a backport to the corresponding `release-YY.MM` branch can be created.
### Automatically backporting changes
> [!Note]
> You have to be a [Nixpkgs maintainer](./maintainers) to automatically create a backport pull request.
Add the [`backport release-YY.MM` label](https://github.com/NixOS/nixpkgs/labels?q=backport) to the PR on the `master` branch.
This will cause [a GitHub Action](.github/workflows/backport.yml) to open a new PR to the `release-YY.MM` branch a few minutes later.
This can be done on both open or already merged pull requests.
### Manually backporting changes
To manually create a backport, follow [the standard pull request process][pr-create], but:
- Use `release-YY.MM` for the base branch, both for the local branch and the pull request.
> [!Warning]
> Do not use the `nixos-YY.MM` branch.
> It points to the latest _tested_ release channel commit.
- Instead of manually making and committing the changes, use [`git cherry-pick -x`](https://git-scm.com/docs/git-cherry-pick) for each commit.
Use `git cherry-pick -x <commit>` when the reason is obvious, for example for minor version bumps and fixes.
Otherwise, use `git cherry-pick -xe <commit>` to add a reason for the backport.
Here is [an example](https://github.com/nixos/nixpkgs/commit/5688c39af5a6c5f3d646343443683da880eaefb8).
> [!Warning]
> Ensure the commits exist on the master branch.
> In the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request.
- In the pull request description, link to the original pull request to `master`.
The pull request title should include `[YY.MM]` matching the release you're backporting to.
## How to review pull requests
[pr-review]: #how-to-review-pull-requests
The Nixpkgs project receives a high number of pull requests.
Anyone may review and approve PRs and it is an important contribution to the project.
The high change rate makes any PR that remains open for too long subject to merge conflicts.
To avoid extra work, reviewing PRs timely and being responsive is key.
GitHub provides sort filters to see the [most recently updated](https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc) pull requests.
We highly encourage looking at [this list of ready to merge, unreviewed pull requests](https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+review%3Anone+status%3Asuccess+no%3Aproject+no%3Aassignee+no%3Amilestone).
Controversial changes can lead to controversial opinions, but it is important to respect every community member and their work.
Always be nice and polite.
GitHub provides reactions for quick feedback to pull requests or comments.
The thumb-down reaction should be used with care and, if possible, accompanied with explanation for the submitter to improve their contribution.
When doing a review:
- Aim to drive the proposal to a timely conclusion.
- Focus on the proposed changes and keep the scope narrow.
- Help the contributor prioritise their efforts towards getting their change merged.
If you find anything related that could be improved but is not immediately required for acceptance, consider:
- Implementing the changes yourself in a follow-up pull request,
- Tracking your idea in an issue,
- Offering to review a follow-up pull request,
- Making concrete [suggestions](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/incorporating-feedback-in-your-pull-request) in the same pull request.
For example, follow-up changes could involve refactoring code in the affected files.
But please remember not to make such additional considerations a blocker, and communicate that to the contributor, for example by following the [conventional comments](https://conventionalcomments.org) pattern.
If the related change is essential for the contribution at hand, make clear why you think it is important to address that first.
Pull request reviews should include a list of what has been reviewed in a comment, so other reviewers and mergers can know the state of the review.
All the review templates provided are generic examples.
Their usage is optional and the reviewer is free to adapt them.
To get more information about how to review specific parts of Nixpkgs, refer to the documents linked to in the [overview section][overview].
If a pull request contains documentation changes that might require feedback from the documentation team, ping [@NixOS/documentation-team](https://github.com/orgs/nixos/teams/documentation-team) on the pull request.
If you have enough knowledge and experience in a topic and would like to be a long-term reviewer for related submissions, please contact the current reviewers for that topic.
The main reviewers for a topic can be hard to find as there is no list, but checking past pull requests or git-blaming the code can give some hints.
## How to merge pull requests yourself
[pr-merge]: #how-to-merge-pull-requests
You can invoke the nixpkgs-merge-bot by commenting `@NixOS/nixpkgs-merge-bot merge`.
The bot will verify the following conditions, refusing to merge otherwise:
- the PR author should be @r-ryantm or a Nixpkgs committer;
- the invoker should be among the package maintainers;
- the package should reside in `pkgs/by-name`.
Further, nixpkgs-merge-bot will ensure all CI checks and the ofborg builds for Linux have successfully completed before merging the pull request.
Should the checks still be underway, the bot will wait for them to finish before attempting the merge again.
For other pull requests, please see [I opened a PR, how do I get it merged?](#i-opened-a-pr-how-do-i-get-it-merged).
In case the PR is stuck waiting for the author to apply a trivial change and the author allowed members to modify the PR, consider applying it yourself.
You should pay extra attention to make sure the addition doesn't go against the idea of the original PR and would not be opposed by the author.
Please see the discussion in [GitHub nixpkgs issue #321665](https://github.com/NixOS/nixpkgs/issues/321665) for information on how to proceed to be granted this level of access.
As a maintainer, when you leave the Nix community, please create an issue or post on [Discourse](https://discourse.nixos.org) with references to the packages and modules you maintained, so they can be taken over by other contributors.
# Flow of merged pull requests
After a pull request is merged, it eventually makes it to [Hydra](https://hydra.nixos.org).
Hydra regularly evaluates and builds Nixpkgs, updating [the official channels](https://channels.nixos.org) when their jobs succeed.
See [Nix Channel Status](https://status.nixos.org) for the current channel states.
Our primary development branches and their related channels are:
- `master`: The main branch, used for the unstable channels `nixos-unstable`, `nixos-unstable-small` and `nixpkgs-unstable`.
- `release-YY.MM`: The release branches, used for the stable channels `nixos-YY.MM`, `nixos-YY.MM-small` and `nixpkgs-YY.MM-darwin`.
When a channel is updated, its corresponding branch is also updated to the same commit.
Example: The [`nixpkgs-unstable` branch](https://github.com/nixos/nixpkgs/tree/nixpkgs-unstable) corresponds to the commit from the [`nixpkgs-unstable` channel](https://channels.nixos.org/nixpkgs-unstable).
Nixpkgs is tied to the NixOS release process, which is documented in the [NixOS Release Wiki](https://nixos.github.io/release-wiki/).
See [this section][branch] to know when to use the release branches.
## Staging
[staging]: #staging
The staging workflow exists to batch Hydra builds of many packages together.
It is coordinated in the [Staging room](https://matrix.to/#/#staging:nixos.org) on Matrix.
It works by directing commits that cause [mass rebuilds][mass-rebuild] to a separate `staging` branch that isn't directly built by Hydra.
Regularly, the `staging` branch is _manually_ merged into a `staging-next` branch to be built by Hydra using the [`nixpkgs:staging-next` jobset](https://hydra.nixos.org/jobset/nixpkgs/staging-next).
The `staging-next` branch should then only receive changes that fix Hydra builds; **for anything else, ask the [Staging room](https://matrix.to/#/#staging:nixos.org) first**.
Once it is verified that there are no major regressions, `staging-next` is merged into `master` using [a pull request](https://github.com/NixOS/nixpkgs/issues?q=label%3A%224.workflow%3A+staging%22).
This is done manually to ensure it's a good use of Hydra's computing resources.
Since `staging-next` is separate from `staging`, you may merge changes into `staging` at any time.
In order for the `staging` and `staging-next` branches to be up-to-date with the latest commits on `master`, there are regular _automated_ merges from `master` into `staging-next`, and from `staging-next` into `staging`.
This is implemented using GitHub workflows [here](.github/workflows/periodic-merge-6h.yml) and [here](.github/workflows/periodic-merge-24h.yml).
> [!Note]
> Changes must be well tested before being merged into any branch.
> Hydra builds should not be used as a testing platform.
Here is a Git history diagram showing the flow of commits between the three branches:
```mermaid
%%{init: {
'theme': 'base',
'themeVariables': {
'gitInv0': '#ff0000',
'gitInv1': '#ff0000',
'git2': '#ff4444',
'commitLabelFontSize': '15px'
},
'gitGraph': {
'showCommitLabel':true,
'mainBranchName': 'master',
'rotateCommitLabel': true
}
} }%%
gitGraph
commit id:" "
branch staging
commit id:" "
branch staging-next
merge master id:"automatic"
checkout staging
merge staging-next id:"automatic "
checkout staging-next
merge staging type:HIGHLIGHT id:"manual"
commit id:"fixup"
checkout master
checkout staging
checkout master
commit id:" "
checkout staging-next
merge master id:"automatic "
checkout staging
merge staging-next id:"automatic "
checkout staging-next
commit id:"fixup "
checkout master
merge staging-next type:HIGHLIGHT id:"manual (PR)"
```
Here's an overview of the different branches:
| branch | `master` | `staging-next` | `staging` |
| --- | --- | --- | --- |
| Used for development | ✔️ | ❌ | ✔️ |
| Built by Hydra | ✔️ | ✔️ | ❌ |
| [Mass rebuilds][mass-rebuild] | ❌ | ⚠️ Only to fix Hydra builds | ✔️ |
| Critical security fixes | ✔️ for non-mass-rebuilds | ✔️ for mass-rebuilds | ❌ |
| Automatically merged into | `staging-next` | `staging` | - |
| Manually merged into | - | `master` | `staging-next` |
The staging workflow is used for all stable branches with corresponding names:
- `master`/`release-YY.MM`
- `staging`/`staging-YY.MM`
- `staging-next`/`staging-next-YY.MM`
# Conventions
## Branch conventions
<!-- This section is relevant to both contributors and reviewers -->
[branch]: #branch-conventions
Most changes should go to `master`, but sometimes other branches should be used instead.
Use the following decision process to figure out the right branch:
Is the change [acceptable for releases][release-acceptable] and do you wish to have the change in the release?
- No: Use the `master` branch, do not backport the pull request.
- Yes: Can the change be implemented the same way on the `master` and release branches?
For example, a package's major version might differ between the `master` and release branches, such that separate security patches are required.
- Yes: Use the `master` branch and [backport the pull request](#how-to-backport-pull-requests).
- No: Create separate pull requests to the `master` and `release-YY.MM` branches.
If the change causes a [mass rebuild][mass-rebuild], use the staging branch instead:
- Mass rebuilds to `master` should go to `staging` instead.
- Mass rebuilds to `release-YY.MM` should go to `staging-YY.MM` instead.
See [this section][staging] for how such changes propagate between the branches.
### Changes acceptable for releases
[release-acceptable]: #changes-acceptable-for-releases
Only changes to _supported_ releases may be accepted.
The oldest supported release (`YYMM`) can be found using
```
nix-instantiate --eval -A lib.trivial.oldestSupportedRelease
```
The release branches should generally only receive backwards-compatible changes, both for the Nix expressions and derivations.
Here are some examples of changes that are okay to backport:
- ✔️ New packages, modules and functions
- ✔️ Security fixes
- ✔️ Package version updates
- ✔️ Patch versions with fixes
- ✔️ Minor versions with new functionality, but no breaking changes
In addition, major package version updates with breaking changes are also acceptable for:
- ✔️ Services that would fail without up-to-date client software, such as `spotify`, `steam`, and `discord`
- ✔️ Security critical applications, such as `firefox` and `chromium`
### Changes causing mass rebuilds
[mass-rebuild]: #changes-causing-mass-rebuilds
Which changes cause mass rebuilds is not formally defined.
In order to help the decision, CI automatically assigns [`rebuild` labels](https://github.com/NixOS/nixpkgs/labels?q=rebuild) to pull requests based on the number of packages they cause rebuilds for.
As a rule of thumb, if the number of rebuilds is **over 500**, it can be considered a mass rebuild.
To get a sense for what changes are considered mass rebuilds, see [previously merged pull requests to the staging branches](https://github.com/NixOS/nixpkgs/issues?q=base%3Astaging+-base%3Astaging-next+is%3Amerged).
## Commit conventions
[commit-conventions]: #commit-conventions
- Create one commit for each logical unit.
- If you have commits `pkg-name: oh, forgot to insert whitespace`: squash commits in this case.
Use `git rebase -i`.
See [Squashing Commits](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History#_squashing) for additional information.
- For consistency, there should not be a period at the end of the commit message's summary line (the first line of the commit message).
- When adding yourself to `maintainer-list.nix`, make a separate commit with the message `maintainers: add <handle>`.
Add the commit before those making changes to the package or module.
See [Nixpkgs Maintainers](./maintainers/README.md) for details.
- Make sure you read about any commit conventions specific to the area you're touching.
See:
- [Commit conventions](./doc/README.md#commit-conventions) for changes to `doc`, the Nixpkgs manual.
- [Commit conventions](./lib/README.md#commit-conventions) for changes to `lib`.
- [Commit conventions](./nixos/README.md#commit-conventions) for changes to `nixos`.
- [Commit conventions](./pkgs/README.md#commit-conventions) for changes to `pkgs`.
### Writing good commit messages
[writing-good-commit-messages]: #writing-good-commit-messages
It's important to include relevant information in the *commit message*, so others can later understand *why* a change was made.
While this potentially can be understood by reading code, PR discussion or upstream changes, doing so often requires a lot of work.
Simple package version updates need to include the attribute name, old and new versions, as well as a reference to the release notes or changelog.
Package upgrades with more extensive changes require more verbose commit messages.
Pull requests should not be squash-merged, as this discards information including detail from commit messages, GPG signatures, and authorship.
Many pull requests don't make sense as a single commit anyway.
## Code conventions
[code-conventions]: #code-conventions
### Release notes
If you removed packages or made some major NixOS changes, write about it in the next release notes in [`nixos/doc/manual/release-notes`](./nixos/doc/manual/release-notes).
### File naming and organisation
Names of files and directories should be in lowercase, with dashes between words — kebab case, not camel case.
For instance, it should be `all-packages.nix`, not `allPackages.nix` or `AllPackages.nix`.
### Formatting
CI [enforces](./.github/workflows/lint.yml) all Nix files to be formatted using the [official Nix formatter](https://github.com/NixOS/nixfmt).
You can ensure this locally using either of these commands:
```
nix-shell --run treefmt
nix develop --command treefmt
nix fmt
```
If you're starting your editor in `nix-shell` or `nix develop`, you can also set it up to automatically run `treefmt` on save.
If you have any problems with formatting, please ping the [formatting team](https://nixos.org/community/teams/formatting/) via [@NixOS/nix-formatting](https://github.com/orgs/NixOS/teams/nix-formatting).
### Syntax
- Set up [editorconfig](https://editorconfig.org) for your editor, such that [the settings](./.editorconfig) are automatically applied.
- Use `lowerCamelCase` for variable names, not `UpperCamelCase`.
Note, this rule does not apply to package attribute names, which instead follow the rules in [package naming](./pkgs/README.md#package-naming).
- Functions should list their expected arguments as precisely as possible.
That is, write
```nix
{
stdenv,
fetchurl,
perl,
}:
<...>
```
instead of
```nix
args: with args; <...>
```
or
```nix
{
stdenv,
fetchurl,
perl,
...
}:
<...>
```
For functions that are truly generic in the number of arguments, but have some required arguments, you should write them using an `@`-pattern:
```nix
{
stdenv,
doCoverageAnalysis ? false,
...
}@args:
stdenv.mkDerivation (args // { foo = if doCoverageAnalysis then "bla" else ""; })
```
instead of
```nix
args:
args.stdenv.mkDerivation (
args
// {
foo = if args ? doCoverageAnalysis && args.doCoverageAnalysis then "bla" else "";
}
)
```
- Unnecessary string conversions should be avoided.
Do
```nix
{ rev = version; }
```
instead of
```nix
{ rev = "${version}"; }
```
- Building lists conditionally _should_ be done with `lib.optional(s)` instead of using `if cond then [ ... ] else null` or `if cond then [ ... ] else [ ]`.
```nix
{ buildInputs = lib.optional stdenv.hostPlatform.isDarwin iconv; }
```
instead of
```nix
{ buildInputs = if stdenv.hostPlatform.isDarwin then [ iconv ] else null; }
```
As an exception, an explicit conditional expression with null can be used when fixing a important bug without triggering a mass rebuild.
If this is done a follow up pull request _should_ be created to change the code to `lib.optional(s)`.
# Practical contributing advice
To contribute effectively and efficiently, you need to be aware of how the process generally works.
This section aims to document the process as we live it in Nixpkgs to set the right expectations and give practical tips on how to work with it.
## I opened a PR, how do I get it merged?
[i-opened-a-pr-how-do-i-get-it-merged]:#i-opened-a-pr-how-do-i-get-it-merged
In order for your PR to be merged, a committer needs to review and merge it.
Because committers are mostly independent, unpaid volunteers, this can take time.
It is entirely normal for your PR to sit around without any feedback for days, weeks or sometimes even months.
We strive to avoid this, but the reality is that it happens frequently.
Even when you get feedback, follow-ups may take just as long.
Don't be intimidated and kindly ask for feedback again every so often.
If your change is good, it will eventually be merged.
You can often speed up the process by understanding the committer's perspective and preparing your PR with reviewing in mind.
### The committer's perspective
PRs have varying quality and even the best people make mistakes.
Committers need to assess whether a PR's changes are good or not.
To merge, at least one committer has to be confident about its quality.
Committers typically assess three aspects:
1. Whether the change's intention is necessary and desirable.
2. Whether the code quality of your changes is good.
3. Whether the produced artifacts are good.
To get your PR merged quickly and smoothly, you should help convince committers in these aspects.
### How to help committers assess your PR
It's best to explain *why* you've made your change, because guessing the intention is not always possible.
This does not apply to trivial changes like version updates, because the intention is obvious.
For more nuanced changes or even major version upgrades, it helps if you explain the background behind your change.
For example, if you're adding a package, explain what it is and why it should be in Nixpkgs.
This goes hand in hand with [Writing good commit messages](#writing-good-commit-messages).
To show the quality of your code, you should focus on making it *reviewable*.
First, take a look at your code changes yourself and try to put yourself into the shoes of someone who didn't just write that code.
Would you immediately know what the code does or why it is needed by glancing at it?
If not, reviewers will notice this and will ask you to clarify the code by refactoring it and/or adding code comments.
Doing this preemptively can save a lot of time.
Doing multiple unrelated changes in a single commit can become hard to review quickly.
Thus, consider multiple atomic commits to tell the story of your change.
There is a balance to strike however: over-fragmentation causes friction.
The artifacts are the hardest to assess because PRs touch all sorts of components: applications, libraries, NixOS modules, editor plugins and many other things.
Any individual committer can only really assess components that they themselves know how to use.
Yet, they must still be convinced somehow.
There isn't a good generic solution to this but there are some ways to ease it:
- Provide smoke tests that can be run without much research or setup.
Committers usually don't have the time or interest to learn how your component works and how they could test its functionality.
Try to provide a quick guide on how to use it in a meaningful way or a ready-made command that demonstrates that it works as expected.
The committer can use this to convince themselves that your change is good.
If it can be automated, you could even turn this into an automated NixOS test which reviewers could simply run.
- Invite other users of the component to try it out and report their findings.
Seeing other users testing the changes and having it work for them can convince committers, too.
- Describe what you have done to test your PR.
It also helps, if you can additionally show that you have done sufficient quality assurance on your changes.
- Become a maintainer of the component.
Listed maintainers generally receive more trust when it comes to changes to their maintained components.
Even if you adhere to all of these recommendations, it is still quite possible for your PR to be forgotten or abandoned by any given committer.
Please remain mindful of them doing this work on their own volition and unpaid in their free time and therefore [owing you nothing](https://mikemcquaid.com/open-source-maintainers-owe-you-nothing/).
Causing a stink in such a situation is a surefire way to get any other potential committer to not want to look at your PR either.
Ask them nicely whether they still intend to review your PR and find yourself another committer to look at your PR if not.
### How can I get a committer to look at my PR?
- Improve skimmability: use a simple descriptive PR title outlining _what_ is done and _why_.
Details go in commit messages.
- Improve discoverability: apply all relevant labels, tick all relevant PR body checkboxes.
- Wait.
Reviewers frequently browse open PRs and may happen to run across yours and take a look.
- Get non-committers to review/approve.
Many committers filter open PRs for low-hanging fruit that have already been reviewed.
- [@-mention](https://github.blog/news-insights/mention-somebody-they-re-notified/) someone and ask them nicely.
- Post in one of the channels made for this purpose if there has been no activity for at least one week:
- The current "PRs ready for review" or "PRs already reviewed" threads in the [NixOS Discourse](https://discourse.nixos.org/c/dev/14).
- The [Nixpkgs Review Requests Matrix room](https://matrix.to/#/#review-requests:nixos.org).
- Similar threads/rooms in unofficial NixOS spaces, such as Discord.
### CI failed or got stuck on my PR, what do I do?
First, ensure that the failure is actually related to your change.
Sometimes, the CI system simply has a hiccup or the check was broken by someone else before.
Read through the error message; it's usually quite easy to tell whether it is caused by changes to the component you touched.
If it is indeed caused by your change, try to fix it.
Don't be afraid of asking for advice if you're uncertain how to do that, others might have fixed such issues already and can help you out.
Your PR will not be merged while CI is still failing.
ofborg builds can often get stuck, particularly in PRs targeting `staging` and in builders for the Darwin platform.
Reviewers will know how to handle them or when to ignore them.
Don't worry about it.
However, if there is a build failure and it was caused by your change, you need to investigate it.
If ofborg reveals the build to be broken on a platform that you don't have access to, consider setting your package's `meta.broken`, `meta.badPlatforms` or `meta.platforms` accordingly.
When in any doubt, please ask via comments or through one of the help channels.
## I received a review, how do I get it over the finish line?
Most likely, a reviewer wants you to change a few things or requires further input.
A reviewer may have taken a look at the code and it looked good to them ("Diff LGTM"), but they still need to be convinced of the artifact's quality.
They might also be waiting on input from other users or maintainers on whether the intention and direction of your PR makes sense.
If you know of people who could help clarify any of this, please bring the PR to their attention.
The current state of the PR is frequently not clearly communicated, so please don't hesitate to ask about it if it's unclear to you.
It's also possible for the reviewer to not be convinced that your PR is necessary or that the method you've chosen is the right one.
Please explain your intentions and reasoning to the committer in such a case.
There may be constraints you had to work with which they're not aware of or qualities of your approach that they didn't immediately notice.
If these weren't clear to the reviewer, that's a good sign you should explain them in your commit message or code comments!
There are some further pitfalls and realities to be aware of:
### Aim to reduce cycles
Be prepared for it to take a while for the reviewer to get back to you after you respond.
This is simply the reality of projects at the scale of Nixpkgs.
As such, make sure to respond to _all_ feedback at once.
It wastes everyone's time to wait for a couple of days just to have the reviewer need to remind you to address something they asked for.
### A reviewer requested a bunch of insubstantial changes
The people involved in Nixpkgs care about code quality.
Once in Nixpkgs, the code needs to be maintained for many years to come.
Therefore, you will likely be asked to do something different or adhere to a standard.
Sometimes however, they also care a bit too much and may ask you to adhere to a personal preference of theirs.
It's not always easy to tell whether or not the requested changes must be addressed.
Sometimes, another reviewer may even have a _conflicting_ opinion on some points.
It is convention to mark review comments that are not required to merge as nitpicks, but this is not always followed.
As the author, you should still take a look at these, as they will often reveal best practices and unwritten rules.
Those usually have good reasons behind them and you may want to pick them up as well.
Please keep in mind that reviewers always mean well.
Their intent is not to denounce your code, they want your code to be as good as it can be.
Through their experience, they may also take notice of a seemingly insignificant issue that has caused problems before.
Sometimes however, they can also get a bit carried away and become too perfectionistic.
If you feel some of the requests are unreasonable, out of scope, or merely a matter of personal preference, try to nicely ask the reviewers whether these requests are *critical* to the PR's success.
While we do have a set of [official standards for the Nix community](https://github.com/NixOS/rfcs), we don't have standards for everything and there are often multiple valid ways to achieve the same goal.
Unless there are standards forbidding the patterns used in your code or there are serious technical, maintainability or readability issues with your code, you can disregard these requests.
Please communicate this clearly though; a simple "I prefer it this way and see no major issue maintaining it" can save a lot of arguing.
If you are unsure about some change requests, please ask reviewers *why* they requested them.
This will usually reveal how important they deem it to be and will help educate you about standards, best practices, unwritten rules as well as preferences people have and why.
Some committers have stronger opinions on some things and may not want to merge your PR if you don't follow their requests.
It is totally fine to get yourself a second or third opinion in such a case.
### Committers work on a push-basis
It's possible for you to get a review but nothing happens afterwards, even if you respond to review comments.
A committer not following up on your PR does not necessarily mean they're disinterested, they may have simply had other circumstances preventing them from doing so.
Committers typically handle many PRs at the same time and it is not realistic for them to keep up with all of them immediately.
If someone approved and didn't merge a few days later, they most likely just forgot.
Please see it as your responsibility to actively remind reviewers of your open PRs.
The easiest way to do so is to notify them via GitHub.
Github notifies people involved, whenever you add a comment or push to your PR or re-request their review.
Doing any of that will get their attention again.
Everyone deserves proper attention, and yes, that includes you!
However, please be mindful that committers can sadly not always give everyone the attention they deserve.
It may very well be the case that you have to do this every time you need the committer to follow up upon your PR.
Again, this is a community project so please be mindful of people's circumstances here; be nice when requesting reviews again.
It may also be the case that the committer has lost interest or isn't familiar enough with the component you're touching to be comfortable to merge.
They will likely not immediately state that fact, so please ask for clarification and don't hesitate to find yourself another committer to take a look.
### Nothing helped
If you followed these guidelines but still got no results or if you feel that you have been wronged, please explicitly reach out to the greater community.
The [NixOS Discourse](https://discourse.nixos.org) is a great place to do this, as it has historically been the asynchronous medium with the greatest concentration of committers and other people who are involved in Nixpkgs.
There is a dedicated discourse thread [PRs in distress](https://discourse.nixos.org/t/prs-in-distress/3604) where you can link your PR, if everything else fails.
The [Nixpkgs / NixOS contributions Matrix channel](https://matrix.to/#/#dev:nixos.org) is the best synchronous channel with the same qualities.
Please reserve these for cases where you've made a serious effort in trying to get the attention of multiple active committers and provided realistic means for them to assess your PR's quality.
As mentioned previously, it is unfortunately perfectly normal for a PR to sit around for weeks.
Please don't blow up situations where progress is happening but is merely not going fast enough for your tastes.
Honking in a traffic jam will not make you go any faster.

11
COPYING
View File

@@ -1,4 +1,4 @@
Copyright (c) 2003-2025 Eelco Dolstra and the Nixpkgs/NixOS contributors
Copyright (c) 2003-2018 Eelco Dolstra and the Nixpkgs/NixOS contributors
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
@@ -18,3 +18,12 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
======================================================================
Note: the license above does not apply to the packages built by the
Nix Packages collection, merely to the package descriptions (i.e., Nix
expressions, build scripts, etc.). It also might not apply to patches
included in Nixpkgs, which may be derivative works of the packages to
which they apply. The aforementioned artifacts are all covered by the
licenses of the respective packages.

112
README.md
View File

@@ -1,85 +1,41 @@
<p align="center">
<a href="https://nixos.org">
<picture>
<source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos.svg">
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos-white.png">
<img src="https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nixos.svg" width="500px" alt="NixOS logo">
</picture>
</a>
</p>
[<img src="https://nixos.org/logo/nixos-hires.png" width="500px" alt="logo" />](https://nixos.org/nixos)
<p align="center">
<a href="CONTRIBUTING.md"><img src="https://img.shields.io/github/contributors-anon/NixOS/nixpkgs" alt="Contributors badge" /></a>
<a href="https://opencollective.com/nixos"><img src="https://opencollective.com/nixos/tiers/supporter/badge.svg?label=supporters&color=brightgreen" alt="Open Collective supporters" /></a>
</p>
[![Code Triagers Badge](https://www.codetriage.com/nixos/nixpkgs/badges/users.svg)](https://www.codetriage.com/nixos/nixpkgs)
[Nixpkgs](https://github.com/nixos/nixpkgs) is a collection of over 120,000 software packages that can be installed with the [Nix](https://nixos.org/nix/) package manager.
It also implements [NixOS](https://nixos.org/nixos/), a purely-functional Linux distribution.
Nixpkgs is a collection of packages for the [Nix](https://nixos.org/nix/) package
manager. It is periodically built and tested by the [Hydra](https://hydra.nixos.org/)
build daemon as so-called channels. To get channel information via git, add
[nixpkgs-channels](https://github.com/NixOS/nixpkgs-channels.git) as a remote:
# Manuals
```
% git remote add channels https://github.com/NixOS/nixpkgs-channels.git
```
* [NixOS Manual](https://nixos.org/nixos/manual) - how to install, configure, and maintain a purely-functional Linux distribution
* [Nixpkgs Manual](https://nixos.org/nixpkgs/manual/) - contributing to Nixpkgs and using programming-language-specific Nix expressions
* [Nix Package Manager Manual](https://nixos.org/nix/manual) - how to write Nix expressions (programs), and how to use Nix command line tools
For stability and maximum binary package support, it is recommended to maintain
custom changes on top of one of the channels, e.g. `nixos-18.09` for the latest
release and `nixos-unstable` for the latest successful build of master:
# Community
```
% git remote update channels
% git rebase channels/nixos-18.09
```
For pull-requests, please rebase onto nixpkgs `master`.
[NixOS](https://nixos.org/nixos/) Linux distribution source code is located inside
`nixos/` folder.
* [NixOS installation instructions](https://nixos.org/nixos/manual/#ch-installation)
* [Documentation (Nix Expression Language chapter)](https://nixos.org/nix/manual/#ch-expression-language)
* [Manual (How to write packages for Nix)](https://nixos.org/nixpkgs/manual/)
* [Manual (NixOS)](https://nixos.org/nixos/manual/)
* [Community maintained wiki](https://nixos.wiki/)
* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
* [Continuous package builds for 18.09 release](https://hydra.nixos.org/jobset/nixos/release-18.09)
* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
* [Tests for 18.09 release](https://hydra.nixos.org/job/nixos/release-18.09/tested#tabs-constituents)
Communication:
* [Discourse Forum](https://discourse.nixos.org/)
* [Matrix Chat](https://matrix.to/#/#space:nixos.org)
* [NixOS Weekly](https://weekly.nixos.org/)
* [Official wiki](https://wiki.nixos.org/)
* [Community-maintained list of ways to get in touch](https://wiki.nixos.org/wiki/Get_In_Touch#Chat) (Discord, Telegram, IRC, etc.)
# Other Project Repositories
The sources of all official Nix-related projects are in the [NixOS organization on GitHub](https://github.com/NixOS/).
Here are some of the main ones:
* [Nix](https://github.com/NixOS/nix) - the purely functional package manager
* [NixOps](https://github.com/NixOS/nixops) - the tool to remotely deploy NixOS machines
* [nixos-hardware](https://github.com/NixOS/nixos-hardware) - NixOS profiles to optimize settings for different hardware
* [Nix RFCs](https://github.com/NixOS/rfcs) - the formal process for making substantial changes to the community
* [NixOS homepage](https://github.com/NixOS/nixos-homepage) - the [NixOS.org](https://nixos.org) website
* [hydra](https://github.com/NixOS/hydra) - our continuous integration system
* [NixOS Artwork](https://github.com/NixOS/nixos-artwork) - NixOS artwork
# Continuous Integration and Distribution
Nixpkgs and NixOS are built and tested by our continuous integration system, [Hydra](https://hydra.nixos.org/).
* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
* [Continuous package builds for the NixOS 25.05 release](https://hydra.nixos.org/jobset/nixos/release-25.05)
* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
* [Tests for the NixOS 25.05 release](https://hydra.nixos.org/job/nixos/release-25.05/tested#tabs-constituents)
Artifacts successfully built with Hydra are published to cache at https://cache.nixos.org/.
When successful build and test criteria are met, the Nixpkgs expressions are distributed via [Nix channels](https://nix.dev/manual/nix/stable/command-ref/nix-channel.html).
# Contributing
Nixpkgs is among the most active projects on GitHub.
While thousands of open issues and pull requests might seem a lot at first, it helps consider it in the context of the scope of the project.
Nixpkgs describes how to build tens of thousands of pieces of software and implements a Linux distribution.
The [GitHub Insights](https://github.com/NixOS/nixpkgs/pulse) page gives a sense of the project activity.
Community contributions are always welcome through GitHub Issues and Pull Requests.
For more information about contributing to the project, please visit the [contributing page](CONTRIBUTING.md).
# Donations
The infrastructure for NixOS and related projects is maintained by a nonprofit organization, the [NixOS Foundation](https://nixos.org/nixos/foundation.html).
To ensure the continuity and expansion of the NixOS infrastructure, we are looking for donations to our organization.
You can donate to the NixOS foundation through [SEPA bank transfers](https://nixos.org/donate.html) or by using Open Collective:
<a href="https://opencollective.com/nixos#support"><img src="https://opencollective.com/nixos/tiers/supporter.svg?width=890" /></a>
# License
Nixpkgs is licensed under the [MIT License](COPYING).
Note:
MIT license does not apply to the packages built by Nixpkgs, merely to the files in this repository (the Nix expressions, build scripts, NixOS modules, etc.).
It also might not apply to patches included in Nixpkgs, which may be derivative works of the packages to which they apply.
The aforementioned artifacts are all covered by the licenses of the respective packages.
* [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos)

502
ci/OWNERS
View File

@@ -1,502 +0,0 @@
# This file is used to describe who owns what in this repository.
# Users/teams will get review requests for PRs that change their files.
#
# This file does not replace `meta.maintainers`
# but is instead used for other things than derivations and modules,
# like documentation, package sets, and other assets.
#
# This file uses the same syntax as the natively supported CODEOWNERS file,
# see https://help.github.com/articles/about-codeowners/ for documentation.
# However it comes with some notable differences:
# - There is no need for user/team listed here to have write access.
# - No reviews will be requested for PRs that target the wrong base branch.
#
# Processing of this file is implemented in workflows/codeowners-v2.yml
# CI
/.github/*_TEMPLATE* @SigmaSquadron
/.github/actions @NixOS/nixpkgs-ci
/.github/workflows @NixOS/nixpkgs-ci
/ci @NixOS/nixpkgs-ci
/ci/OWNERS @infinisil @philiptaron
# Development support
/.editorconfig @Mic92 @zowoq
/shell.nix @infinisil @NixOS/Security
# Libraries
/lib @infinisil @hsjobeki
/lib/generators.nix @infinisil @hsjobeki @Profpatsch
/lib/cli.nix @infinisil @hsjobeki @Profpatsch
/lib/debug.nix @infinisil @hsjobeki @Profpatsch
/lib/asserts.nix @infinisil @hsjobeki @Profpatsch
/lib/path/* @infinisil @hsjobeki
/lib/fileset @infinisil @hsjobeki
## Standard environmentrelated libraries
/lib/customisation.nix @alyssais @NixOS/stdenv
/lib/derivations.nix @alyssais @NixOS/stdenv
/lib/fetchers.nix @alyssais @NixOS/stdenv
/lib/meta.nix @alyssais @NixOS/stdenv
/lib/source-types.nix @alyssais @NixOS/stdenv
/lib/systems @alyssais @NixOS/stdenv
## Libraries / Module system
/lib/modules.nix @infinisil @roberth @hsjobeki
/lib/types.nix @infinisil @roberth @hsjobeki
/lib/options.nix @infinisil @roberth @hsjobeki
/lib/tests/modules.sh @infinisil @roberth @hsjobeki
/lib/tests/modules @infinisil @roberth @hsjobeki
# Nixpkgs Internals
/default.nix @Ericson2314
/pkgs/top-level/default.nix @Ericson2314
/pkgs/top-level/impure.nix @Ericson2314
/pkgs/top-level/stage.nix @Ericson2314
/pkgs/top-level/splice.nix @Ericson2314
/pkgs/top-level/release-cross.nix @Ericson2314
/pkgs/top-level/by-name-overlay.nix @infinisil @philiptaron
/pkgs/stdenv @philiptaron @NixOS/stdenv
/pkgs/stdenv/generic @Ericson2314 @NixOS/stdenv
/pkgs/stdenv/generic/check-meta.nix @Ericson2314 @NixOS/stdenv
/pkgs/stdenv/cross @Ericson2314 @NixOS/stdenv
/pkgs/build-support @philiptaron
/pkgs/build-support/cc-wrapper @Ericson2314
/pkgs/build-support/bintools-wrapper @Ericson2314
/pkgs/build-support/setup-hooks @Ericson2314
/pkgs/build-support/setup-hooks/arrayUtilities @ConnorBaker
/pkgs/build-support/setup-hooks/auto-patchelf.sh @layus
/pkgs/by-name/au/auto-patchelf @layus
## Format generators/serializers
/pkgs/pkgs-lib @Stunkymonkey @h7x4
# Nixpkgs build-support
/pkgs/build-support/writers @lassulus @Profpatsch
# Nixpkgs make-disk-image
/doc/build-helpers/images/makediskimage.section.md @raitobezarius
/nixos/lib/make-disk-image.nix @raitobezarius
# Nix, the package manager
# @raitobezarius is not "code owner", but is listed here to be notified of changes
# pertaining to the Nix package manager.
# i.e. no authority over those files.
pkgs/tools/package-management/nix/ @NixOS/nix-team @raitobezarius
nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobezarius
# Nixpkgs documentation
/maintainers/scripts/db-to-md.sh @jtojnar @ryantm
/maintainers/scripts/doc @jtojnar @ryantm
# Contributor documentation
/CONTRIBUTING.md @infinisil
/.github/PULL_REQUEST_TEMPLATE.md @infinisil
/doc/contributing/ @infinisil
/doc/contributing/contributing-to-documentation.chapter.md @jtojnar @infinisil
/lib/README.md @infinisil
/doc/README.md @infinisil
/nixos/README.md @infinisil
/pkgs/README.md @infinisil
/pkgs/by-name/README.md @infinisil
/maintainers/README.md @infinisil
# User-facing development documentation
/doc/development.md @infinisil
/doc/development @infinisil
# NixOS Internals
/nixos/default.nix @infinisil
/nixos/lib/from-env.nix @infinisil
/nixos/lib/eval-config.nix @infinisil
/nixos/modules/misc/ids.nix @R-VdP
/nixos/modules/system/activation/bootspec.nix @grahamc @cole-h @raitobezarius
/nixos/modules/system/activation/bootspec.cue @grahamc @cole-h @raitobezarius
# NixOS Render Docs
/pkgs/by-name/ni/nixos-render-docs @fricklerhandwerk @GetPsyched @hsjobeki
/doc/redirects.json @fricklerhandwerk @GetPsyched @hsjobeki
/nixos/doc/manual/redirects.json @fricklerhandwerk @GetPsyched @hsjobeki
# NixOS integration test driver
/nixos/lib/test-driver @tfc
# NixOS QEMU virtualisation
/nixos/modules/virtualisation/qemu-vm.nix @raitobezarius
# ACME
/nixos/modules/security/acme @NixOS/acme
# Systemd
/nixos/modules/system/boot/systemd.nix @NixOS/systemd
/nixos/modules/system/boot/systemd @NixOS/systemd
/nixos/lib/systemd-*.nix @NixOS/systemd
/pkgs/os-specific/linux/systemd @NixOS/systemd
# Systemd-boot
/nixos/modules/system/boot/loader/systemd-boot @JulienMalka
# Limine
/nixos/modules/system/boot/loader/limine @lzcunt @phip1611 @programmerlexi @johnrtitor
/nixos/tests/limine @johnrtitor
# Images and installer media
/nixos/modules/profiles/installation-device.nix @ElvishJerricco
/nixos/modules/installer/cd-dvd/ @ElvishJerricco
/nixos/modules/installer/sd-card/
# Amazon
/nixos/modules/virtualisation/amazon-init.nix @arianvp
/nixos/modules/virtualisation/ec2-data.nix @arianvp
/nixos/modules/virtualisation/amazon-options.nix @arianvp
/nixos/modules/virtualisation/amazon-image.nix @arianvp
/nixos/maintainers/scripts/ec2/ @arianvp
/nixos/modules/services/misc/amazon-ssm-agent.nix @arianvp
/nixos/tests/amazon-ssm-agent.nix @arianvp
/nixos/modules/system/boot/grow-partition.nix @arianvp
/nixos/modules/services/monitoring/amazon-cloudwatch-agent.nix @philipmw
/nixos/tests/amazon-cloudwatch-agent.nix @philipmw
# Monitoring
/nixos/modules/services/monitoring/fluent-bit.nix @arianvp
/nixos/tests/fluent-bit.nix @arianvp
# nixos-rebuild-ng
/pkgs/by-name/ni/nixos-rebuild-ng @thiagokokada
# Updaters
## update.nix
/maintainers/scripts/update.nix @jtojnar
/maintainers/scripts/update.py @jtojnar
## common-updater-scripts
/pkgs/common-updater/scripts/update-source-version @jtojnar
# Android tools, libraries, and environments
/pkgs/development/android* @NixOS/android
/pkgs/development/mobile/android* @NixOS/android
/pkgs/applications/editors/android-studio* @NixOS/android
/doc/languages-frameworks/android* @NixOS/android
/pkgs/by-name/an/android* @NixOS/android
# Python-related code and docs
/doc/languages-frameworks/python.section.md @mweinelt @natsukium
/maintainers/scripts/update-python-libraries @mweinelt @natsukium
/pkgs/by-name/up/update-python-libraries @mweinelt @natsukium
/pkgs/development/interpreters/python @mweinelt @natsukium
/pkgs/top-level/python-packages.nix @natsukium
/pkgs/top-level/release-python.nix @natsukium
# CUDA
/pkgs/top-level/cuda-packages.nix @NixOS/cuda-maintainers
/pkgs/top-level/release-cuda.nix @NixOS/cuda-maintainers
/pkgs/development/cuda-modules @NixOS/cuda-maintainers
# Haskell
/doc/languages-frameworks/haskell.section.md @sternenseemann @maralorn @wolfgangwalther
/maintainers/scripts/haskell @sternenseemann @maralorn @wolfgangwalther
/pkgs/development/compilers/ghc @sternenseemann @maralorn @wolfgangwalther
/pkgs/development/haskell-modules @sternenseemann @maralorn @wolfgangwalther
/pkgs/test/haskell @sternenseemann @maralorn @wolfgangwalther
/pkgs/top-level/release-haskell.nix @sternenseemann @maralorn @wolfgangwalther
/pkgs/top-level/haskell-packages.nix @sternenseemann @maralorn @wolfgangwalther
# Perl
/pkgs/development/interpreters/perl @stigtsp @zakame @marcusramberg
/pkgs/top-level/perl-packages.nix @stigtsp @zakame @marcusramberg
/pkgs/development/perl-modules @stigtsp @zakame @marcusramberg
# R
/pkgs/applications/science/math/R @jbedo
/pkgs/development/r-modules @jbedo
# Rust
/pkgs/development/compilers/rust @alyssais @Mic92 @zowoq @winterqt @figsoda
/pkgs/build-support/rust @zowoq @winterqt @figsoda
/pkgs/build-support/rust/fetch-cargo-vendor* @TomaSajt
/doc/languages-frameworks/rust.section.md @zowoq @winterqt @figsoda
# Tcl
/pkgs/development/interpreters/tcl @fgaz
/pkgs/development/libraries/tk @fgaz
/pkgs/top-level/tcl-packages.nix @fgaz
/pkgs/development/tcl-modules @fgaz
/doc/languages-frameworks/tcl.section.md @fgaz
# C compilers
/pkgs/development/compilers/gcc
/pkgs/development/compilers/llvm @alyssais @RossComputerGuy @NixOS/llvm
/pkgs/development/compilers/emscripten @raitobezarius
/doc/toolchains/llvm.chapter.md @alyssais @RossComputerGuy @NixOS/llvm
/doc/languages-frameworks/emscripten.section.md @raitobezarius
# Audio
/nixos/modules/services/audio/botamusique.nix @mweinelt
/nixos/modules/services/audio/snapserver.nix @mweinelt
/nixos/tests/botamusique.nix @mweinelt
/nixos/tests/snapcast.nix @mweinelt
# Browsers
/pkgs/build-support/build-mozilla-mach @mweinelt
/pkgs/applications/networking/browsers/firefox/update.nix
/pkgs/applications/networking/browsers/firefox/packages/firefox.nix @mweinelt
/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-*.nix @mweinelt
/pkgs/applications/networking/browsers/librewolf @squalus @DominicWrege @fpletz @LordGrimmauld
/pkgs/applications/networking/browsers/chromium @emilylange @networkException
/nixos/tests/chromium.nix @emilylange @networkException
# Certificate Authorities
pkgs/by-name/ca/cacert @ajs124 @lukegb @mweinelt
pkgs/development/libraries/nss/ @ajs124 @lukegb @mweinelt
pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
# Java
/doc/languages-frameworks/java.section.md @NixOS/java
/doc/languages-frameworks/gradle.section.md @NixOS/java
/doc/languages-frameworks/maven.section.md @NixOS/java
/nixos/modules/programs/java.nix @NixOS/java
/pkgs/top-level/java-packages.nix @NixOS/java
# Jetbrains
/pkgs/applications/editors/jetbrains @edwtjo @leona-ya @theCapypara
# Licenses
/lib/licenses.nix @alyssais @emilazy
# Qt
/pkgs/development/libraries/qt-5 @K900 @NickCao @SuperSandro2000 @ttuegel
/pkgs/development/libraries/qt-6 @K900 @NickCao @SuperSandro2000 @ttuegel
# KDE / Plasma 5
/pkgs/applications/kde @K900 @NickCao @SuperSandro2000 @ttuegel
/pkgs/desktops/plasma-5 @K900 @NickCao @SuperSandro2000 @ttuegel
/pkgs/development/libraries/kde-frameworks @K900 @NickCao @SuperSandro2000 @ttuegel
# KDE / Plasma 6
/pkgs/kde @K900 @NickCao @SuperSandro2000 @ttuegel
/maintainers/scripts/kde @K900 @NickCao @SuperSandro2000 @ttuegel
# PostgreSQL and related stuff
/pkgs/by-name/po/postgresqlTestHook @NixOS/postgres
/pkgs/by-name/ps/psqlodbc @NixOS/postgres
/pkgs/servers/sql/postgresql @NixOS/postgres
/pkgs/development/tools/rust/cargo-pgrx @NixOS/postgres
/nixos/modules/services/databases/postgresql.md @NixOS/postgres
/nixos/modules/services/databases/postgresql.nix @NixOS/postgres
/nixos/tests/postgresql @NixOS/postgres
# MySQL/MariaDB and related stuff
/nixos/modules/services/databases/mysql.nix @6543
/nixos/modules/services/backup/mysql-backup.nix @6543
# Hardened profile & related modules
/nixos/modules/profiles/hardened.nix @joachifm
/nixos/modules/security/lock-kernel-modules.nix @joachifm
/nixos/modules/security/misc.nix @joachifm
/nixos/tests/hardened.nix @joachifm
/pkgs/os-specific/linux/kernel/hardened/ @fabianhjr @joachifm
# Home Automation
/nixos/modules/services/home-automation/home-assistant.nix @mweinelt
/nixos/modules/services/home-automation/zigbee2mqtt.nix @mweinelt
/nixos/tests/home-assistant.nix @mweinelt
/nixos/tests/zigbee2mqtt.nix @mweinelt
/pkgs/servers/home-assistant @mweinelt
/pkgs/by-name/es/esphome @mweinelt
# Linux kernel
/pkgs/top-level/linux-kernels.nix @NixOS/linux-kernel
/pkgs/os-specific/linux/kernel/ @NixOS/linux-kernel
# Network Time Daemons
/pkgs/by-name/ch/chrony @thoughtpolice
/pkgs/by-name/nt/ntp @thoughtpolice
/pkgs/by-name/op/openntpd @thoughtpolice
/nixos/modules/services/networking/ntp @thoughtpolice
# Network
/pkgs/by-name/ke/kea @mweinelt
/pkgs/by-name/ba/babeld @mweinelt
/nixos/modules/services/networking/babeld.nix @mweinelt
/nixos/modules/services/networking/kea.nix @mweinelt
/nixos/modules/services/networking/knot.nix @mweinelt
/nixos/modules/services/monitoring/prometheus/exporters/kea.nix @mweinelt
/nixos/tests/babeld.nix @mweinelt
/nixos/tests/kea.nix @mweinelt
/nixos/tests/knot.nix @mweinelt
# Web servers
/doc/packages/nginx.section.md @raitobezarius
/pkgs/servers/http/nginx/ @raitobezarius
/nixos/modules/services/web-servers/nginx/ @raitobezarius
# D
/pkgs/build-support/dlang @jtbx @TomaSajt
# Dhall
/pkgs/development/dhall-modules @Gabriella439 @Profpatsch
/pkgs/development/interpreters/dhall @Gabriella439 @Profpatsch
# Idris
/pkgs/development/idris-modules @Infinisil
/pkgs/development/compilers/idris2 @mattpolzin
# Bazel
/pkgs/development/tools/build-managers/bazel @Profpatsch
# NixOS modules for e-mail and dns services
/nixos/modules/services/mail/mailman.nix @peti
/nixos/modules/services/mail/postfix.nix @peti
/nixos/modules/services/networking/bind.nix @peti
/nixos/modules/services/mail/rspamd.nix @peti
# Emacs
/pkgs/applications/editors/emacs/elisp-packages @NixOS/emacs
/pkgs/applications/editors/emacs @NixOS/emacs
/pkgs/top-level/emacs-packages.nix @NixOS/emacs
/doc/packages/emacs.section.md @NixOS/emacs
/nixos/modules/services/editors/emacs.md @NixOS/emacs
# Kakoune
/pkgs/applications/editors/kakoune @philiptaron
# LuaPackages
/pkgs/development/lua-modules @NixOS/lua
# Neovim
/pkgs/applications/editors/neovim @NixOS/neovim
# VimPlugins
/pkgs/applications/editors/vim/plugins @NixOS/neovim
# VsCode Extensions
/pkgs/applications/editors/vscode/extensions
# PHP interpreter, packages, extensions, tests and documentation
/doc/languages-frameworks/php.section.md @aanderse @drupol @globin @ma27 @talyz
/nixos/tests/php @aanderse @drupol @globin @ma27 @talyz
/pkgs/build-support/php/build-pecl.nix @aanderse @drupol @globin @ma27 @talyz
/pkgs/build-support/php @drupol
/pkgs/development/interpreters/php @jtojnar @aanderse @drupol @globin @ma27 @talyz
/pkgs/development/php-packages @aanderse @drupol @globin @ma27 @talyz
/pkgs/top-level/php-packages.nix @jtojnar @aanderse @drupol @globin @ma27 @talyz
# Docker tools
/pkgs/build-support/docker @roberth
/nixos/tests/docker-tools* @roberth
/doc/build-helpers/images/dockertools.section.md @roberth
# Blockchains
/pkgs/applications/blockchains @mmahut @RaghavSood
# Go
/doc/languages-frameworks/go.section.md @kalbasit @katexochen @Mic92 @zowoq
/pkgs/build-support/go @kalbasit @katexochen @Mic92 @zowoq
/pkgs/development/compilers/go @kalbasit @katexochen @Mic92 @zowoq
# GNOME
/pkgs/desktops/gnome @jtojnar
/pkgs/desktops/gnome/extensions @jtojnar
/pkgs/build-support/make-hardcode-gsettings-patch @jtojnar
# Cinnamon
/pkgs/by-name/ci/cinnamon-* @mkg20001
/pkgs/by-name/cj/cjs @mkg20001
/pkgs/by-name/mu/muffin @mkg20001
/pkgs/by-name/ne/nemo @mkg20001
/pkgs/by-name/ne/nemo-* @mkg20001
# Xfce
/doc/hooks/xfce4-dev-tools.section.md @NixOS/xfce
# terraform providers
/pkgs/applications/networking/cluster/terraform-providers @zowoq
# Forgejo
nixos/modules/services/misc/forgejo.nix @adamcstephens @bendlas @emilylange
pkgs/by-name/fo/forgejo/ @adamcstephens @bendlas @emilylange
# Dotnet
/pkgs/build-support/dotnet @corngood
/pkgs/development/compilers/dotnet @corngood
/pkgs/test/dotnet @corngood
/doc/languages-frameworks/dotnet.section.md @corngood
# Node.js
/pkgs/build-support/node/build-npm-package @winterqt
/pkgs/build-support/node/fetch-npm-deps @winterqt
/doc/languages-frameworks/javascript.section.md @winterqt
/pkgs/development/tools/pnpm @Scrumplex @gepbird
# OCaml
/pkgs/build-support/ocaml @ulrikstrid
/pkgs/development/compilers/ocaml @ulrikstrid
/pkgs/development/ocaml-modules @ulrikstrid
# ZFS
/nixos/modules/tasks/filesystems/zfs.nix @adamcstephens @amarshall
/nixos/tests/zfs.nix @adamcstephens @amarshall
/pkgs/os-specific/linux/zfs @adamcstephens @amarshall
# Zig
/pkgs/development/compilers/zig @figsoda @RossComputerGuy
/doc/hooks/zig.section.md @figsoda @RossComputerGuy
# Buildbot
nixos/modules/services/continuous-integration/buildbot @Mic92 @zowoq
nixos/tests/buildbot.nix @Mic92 @zowoq
pkgs/development/tools/continuous-integration/buildbot @Mic92 @zowoq
# Pretix
pkgs/by-name/pr/pretix/ @mweinelt
pkgs/by-name/pr/pretalx/ @mweinelt
nixos/modules/services/web-apps/pretix.nix @mweinelt
nixos/modules/services/web-apps/pretalx.nix @mweinelt
nixos/tests/web-apps/pretix.nix @mweinelt
nixos/tests/web-apps/pretalx.nix @mweinelt
# incus/lxc
nixos/maintainers/scripts/incus/ @adamcstephens
nixos/modules/virtualisation/incus.nix @adamcstephens
nixos/modules/virtualisation/lxc* @adamcstephens
nixos/tests/incus/ @adamcstephens
pkgs/by-name/in/incus/ @adamcstephens
pkgs/by-name/lx/lxc* @adamcstephens
# ExpidusOS, Flutter
/pkgs/development/compilers/flutter @RossComputerGuy
/pkgs/desktops/expidus @RossComputerGuy
# GNU Tar & Zip
/pkgs/tools/archivers/gnutar @RossComputerGuy
/pkgs/by-name/zi/zip @RossComputerGuy
# SELinux
/pkgs/by-name/ch/checkpolicy @RossComputerGuy
/pkgs/by-name/li/libselinux @RossComputerGuy
/pkgs/by-name/li/libsepol @RossComputerGuy
# installShellFiles
/pkgs/by-name/in/installShellFiles/* @Ericson2314
/pkgs/test/install-shell-files/* @Ericson2314
/doc/hooks/installShellFiles.section.md @Ericson2314
# Darwin
/pkgs/by-name/ap/apple-sdk @NixOS/darwin-core
/pkgs/os-specific/darwin/apple-source-releases @NixOS/darwin-core
/pkgs/stdenv/darwin @NixOS/darwin-core
# BEAM
pkgs/development/beam-modules/ @NixOS/beam
pkgs/development/interpreters/erlang/ @NixOS/beam
pkgs/development/interpreters/elixir/ @NixOS/beam
pkgs/development/interpreters/lfe/ @NixOS/beam
# Authelia
pkgs/servers/authelia/ @06kellyjac @dit7ya @nicomem
# OctoDNS
pkgs/by-name/oc/octodns/ @anthonyroussel
# Teleport
pkgs/by-name/te/teleport* @arianvp @justinas @sigma @tomberek @freezeboy @techknowlogick @JuliusFreudenberger
# Warp-terminal
pkgs/by-name/wa/warp-terminal/ @emilytrau @imadnyc @donteatoreo @johnrtitor

View File

@@ -1,52 +0,0 @@
# CI support files
This directory contains files to support CI, such as [GitHub Actions](https://github.com/NixOS/nixpkgs/tree/master/.github/workflows) and [Ofborg](https://github.com/nixos/ofborg).
This is in contrast with [`maintainers/scripts`](../maintainers/scripts) which is for human use instead.
## Pinned Nixpkgs
CI may need certain packages from Nixpkgs.
In order to ensure that the needed packages are generally available without building, [`pinned.json`](./pinned.json) contains a pinned Nixpkgs version tested by Hydra.
Run [`update-pinned.sh`](./update-pinned.sh) to update it.
## `ci/nixpkgs-vet.sh BASE_BRANCH [REPOSITORY]`
Runs the [`nixpkgs-vet` tool](https://github.com/NixOS/nixpkgs-vet) on the HEAD commit, closely matching what CI does.
This can't do exactly the same as CI, because CI needs to rely on GitHub's server-side Git history to compute the mergeability of PRs before the check can be started.
In turn, when contributors are running this tool locally, we don't want to have to push commits to test them, and we can also rely on the local Git history to do the mergeability check.
Arguments:
- `BASE_BRANCH`: The base branch to use, e.g. master or release-24.05
- `REPOSITORY`: The repository from which to fetch the base branch.
Defaults to <https://github.com/NixOS/nixpkgs.git>.
# Branch classification
For the purposes of CI, branches in the NixOS/nixpkgs repository are classified as follows:
- **Channel** branches
- `nixos-` or `nixpkgs-` prefix
- Are only updated from `master` or `release-` branches, when hydra passes.
- Otherwise not worked on, Pull Requests are not allowed.
- Long-lived, no deletion, no force push.
- **Primary development** branches
- `release-` prefix and `master`
- Pull Requests required.
- Long-lived, no deletion, no force push.
- **Secondary development** branches
- `staging-` prefix, `haskell-updates` and `python-updates`
- Pull Requests normally required, except when merging development branches into each other.
- Long-lived, no deletion, no force push.
- **Work-In-Progress** branches
- `backport-`, `revert-` and `wip-` prefixes.
- Deprecated: All other branches, not matched by channel/development.
- Pull Requests are optional.
- Short-lived, force push allowed, deleted after merge.
Some branches also have a version component, which is either `unstable` or `YY.MM`.
`ci/supportedBranches.js` is a script imported by CI to classify the base and head branches of a Pull Request.
This classification will then be used to skip certain jobs.
This script can also be run locally to print basic test cases.

View File

@@ -1,31 +0,0 @@
{
buildGoModule,
fetchFromGitHub,
fetchpatch,
}:
buildGoModule {
name = "codeowners-validator";
src = fetchFromGitHub {
owner = "mszostok";
repo = "codeowners-validator";
rev = "f3651e3810802a37bd965e6a9a7210728179d076";
hash = "sha256-5aSmmRTsOuPcVLWfDF6EBz+6+/Qpbj66udAmi1CLmWQ=";
};
patches = [
# https://github.com/mszostok/codeowners-validator/pull/222
(fetchpatch {
name = "user-write-access-check";
url = "https://github.com/mszostok/codeowners-validator/compare/f3651e3810802a37bd965e6a9a7210728179d076...840eeb88b4da92bda3e13c838f67f6540b9e8529.patch";
hash = "sha256-t3Dtt8SP9nbO3gBrM0nRE7+G6N/ZIaczDyVHYAG/6mU=";
})
# Undoes part of the above PR: We don't want to require write access
# to the repository, that's only needed for GitHub's native CODEOWNERS.
# Furthermore, it removes an unnecessary check from the code
# that breaks tokens generated for GitHub Apps.
./permissions.patch
# Allows setting a custom CODEOWNERS path using the OWNERS_FILE env var
./owners-file-name.patch
];
postPatch = "rm -r docs/investigation";
vendorHash = "sha256-R+pW3xcfpkTRqfS2ETVOwG8PZr0iH5ewroiF7u8hcYI=";
}

View File

@@ -1,15 +0,0 @@
diff --git a/pkg/codeowners/owners.go b/pkg/codeowners/owners.go
index 6910bd2..e0c95e9 100644
--- a/pkg/codeowners/owners.go
+++ b/pkg/codeowners/owners.go
@@ -39,6 +39,10 @@ func NewFromPath(repoPath string) ([]Entry, error) {
// openCodeownersFile finds a CODEOWNERS file and returns content.
// see: https://help.github.com/articles/about-code-owners/#codeowners-file-location
func openCodeownersFile(dir string) (io.Reader, error) {
+ if file, ok := os.LookupEnv("OWNERS_FILE"); ok {
+ return fs.Open(file)
+ }
+
var detectedFiles []string
for _, p := range []string{".", "docs", ".github"} {
pth := path.Join(dir, p)

View File

@@ -1,36 +0,0 @@
diff --git a/internal/check/valid_owner.go b/internal/check/valid_owner.go
index a264bcc..610eda8 100644
--- a/internal/check/valid_owner.go
+++ b/internal/check/valid_owner.go
@@ -16,7 +16,6 @@ import (
const scopeHeader = "X-OAuth-Scopes"
var reqScopes = map[github.Scope]struct{}{
- github.ScopeReadOrg: {},
}
type ValidOwnerConfig struct {
@@ -223,10 +222,7 @@ func (v *ValidOwner) validateTeam(ctx context.Context, name string) *validateErr
for _, t := range v.repoTeams {
// GitHub normalizes name before comparison
if strings.EqualFold(t.GetSlug(), team) {
- if t.Permissions["push"] {
- return nil
- }
- return newValidateError("Team %q cannot review PRs on %q as neither it nor any parent team has write permissions.", team, v.orgRepoName)
+ return nil
}
}
@@ -245,10 +241,7 @@ func (v *ValidOwner) validateGitHubUser(ctx context.Context, name string) *valid
for _, u := range v.repoUsers {
// GitHub normalizes name before comparison
if strings.EqualFold(u.GetLogin(), userName) {
- if u.Permissions["push"] {
- return nil
- }
- return newValidateError("User %q cannot review PRs on %q as they don't have write permissions.", userName, v.orgRepoName)
+ return nil
}
}

View File

@@ -1,131 +0,0 @@
let
pinned = (builtins.fromJSON (builtins.readFile ./pinned.json)).pins;
in
{
system ? builtins.currentSystem,
nixpkgs ? null,
}:
let
nixpkgs' =
if nixpkgs == null then
fetchTarball {
inherit (pinned.nixpkgs) url;
sha256 = pinned.nixpkgs.hash;
}
else
nixpkgs;
pkgs = import nixpkgs' {
inherit system;
config = {
permittedInsecurePackages = [ "nix-2.3.18" ];
};
overlays = [ ];
};
fmt =
let
treefmtNixSrc = fetchTarball {
inherit (pinned.treefmt-nix) url;
sha256 = pinned.treefmt-nix.hash;
};
treefmtEval = (import treefmtNixSrc).evalModule pkgs {
# Important: The auto-rebase script uses `git filter-branch --tree-filter`,
# which creates trees within the Git repository under `.git-rewrite/t`,
# notably without having a `.git` themselves.
# So if this projectRootFile were the default `.git/config`,
# having the auto-rebase script use treefmt on such a tree would make it
# format all files in the _parent_ Git tree as well.
projectRootFile = ".git-blame-ignore-revs";
# Be a bit more verbose by default, so we can see progress happening
settings.verbose = 1;
# By default it's info, which is too noisy since we have many unmatched files
settings.on-unmatched = "debug";
programs.actionlint.enable = true;
programs.keep-sorted.enable = true;
# This uses nixfmt underneath,
# the default formatter for Nix code.
# See https://github.com/NixOS/nixfmt
programs.nixfmt.enable = true;
programs.yamlfmt = {
enable = true;
settings.formatter = {
retain_line_breaks = true;
};
};
settings.formatter.yamlfmt.excludes = [
# Breaks helm templating
"nixos/tests/k3s/k3s-test-chart/templates/*"
# Aligns comments with whitespace
"pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml"
# TODO: Fix formatting for auto-generated file
"pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml"
];
settings.formatter.editorconfig-checker = {
command = "${pkgs.lib.getExe pkgs.editorconfig-checker}";
options = [ "-disable-indent-size" ];
includes = [ "*" ];
priority = 1;
};
};
fs = pkgs.lib.fileset;
nixFilesSrc = fs.toSource {
root = ../.;
fileset = fs.difference ../. (fs.maybeMissing ../.git);
};
in
{
shell = treefmtEval.config.build.devShell;
pkg = treefmtEval.config.build.wrapper;
check = treefmtEval.config.build.check nixFilesSrc;
};
in
rec {
inherit pkgs fmt;
requestReviews = pkgs.callPackage ./request-reviews { };
codeownersValidator = pkgs.callPackage ./codeowners-validator { };
# FIXME(lf-): it might be useful to test other Nix implementations
# (nixVersions.stable and Lix) here somehow at some point to ensure we don't
# have eval divergence.
eval = pkgs.callPackage ./eval {
nix = pkgs.nixVersions.latest;
};
# CI jobs
lib-tests = import ../lib/tests/release.nix { inherit pkgs; };
manual-nixos = (import ../nixos/release.nix { }).manual.${system} or null;
manual-nixpkgs = (import ../doc { });
manual-nixpkgs-tests = (import ../doc { }).tests;
nixpkgs-vet = pkgs.callPackage ./nixpkgs-vet.nix { };
parse = pkgs.lib.recurseIntoAttrs {
latest = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.latest; };
lix = pkgs.callPackage ./parse.nix { nix = pkgs.lix; };
# TODO: Raise nixVersions.minimum to 2.24 and flip back to it.
minimum = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.nix_2_24; };
};
shell = import ../shell.nix { inherit nixpkgs system; };
tarball = import ../pkgs/top-level/make-tarball.nix {
# Mirrored from top-level release.nix:
nixpkgs = {
outPath = pkgs.lib.cleanSource ../.;
revCount = 1234;
shortRev = "abcdef";
revision = "0000000000000000000000000000000000000000";
};
officialRelease = false;
inherit pkgs lib-tests;
# 2.28 / 2.29 take 9x longer than 2.30 or Lix.
# TODO: Switch back to nixVersions.latest
nix = pkgs.lix;
};
}

View File

@@ -1,26 +0,0 @@
# Nixpkgs CI evaluation
The code in this directory is used by the [eval.yml](../../.github/workflows/eval.yml) GitHub Actions workflow to evaluate the majority of Nixpkgs for all PRs, effectively making sure that when the development branches are processed by Hydra, no evaluation failures are encountered.
Furthermore it also allows local evaluation using
```
nix-build ci -A eval.full \
--max-jobs 4 \
--cores 2 \
--arg chunkSize 10000 \
--arg evalSystems '["x86_64-linux" "aarch64-darwin"]'
```
- `--max-jobs`: The maximum number of derivations to run at the same time.
Only each [supported system](../supportedSystems.json) gets a separate derivation, so it doesn't make sense to set this higher than that number.
- `--cores`: The number of cores to use for each job.
Recommended to set this to the amount of cores on your system divided by `--max-jobs`.
- `chunkSize`: The number of attributes that are evaluated simultaneously on a single core.
Lowering this decreases memory usage at the cost of increased evaluation time.
If this is too high, there won't be enough chunks to process them in parallel, and will also increase evaluation time.
- `evalSystems`: The set of systems for which `nixpkgs` should be evaluated.
Defaults to the four official platforms (`x86_64-linux`, `aarch64-linux`, `x86_64-darwin` and `aarch64-darwin`).
A good default is to set `chunkSize` to 10000, which leads to about 3.6GB max memory usage per core, so suitable for fully utilising machines with 4 cores and 16GB memory, 8 cores and 32GB memory or 16 cores and 64GB memory.
Note that 16GB memory is the recommended minimum, while with less than 8GB memory evaluation time suffers greatly.

View File

@@ -1,154 +0,0 @@
import json
import os
from scipy.stats import ttest_rel
import pandas as pd
import numpy as np
from pathlib import Path
# Define metrics of interest (can be expanded as needed)
METRIC_PREFIXES = ("nr", "gc")
def flatten_data(json_data: dict) -> dict:
"""
Extracts and flattens metrics from JSON data.
This is needed because the JSON data can be nested.
For example, the JSON data entry might look like this:
"gc":{"cycles":13,"heapSize":5404549120,"totalBytes":9545876464}
Flattened:
"gc.cycles": 13
"gc.heapSize": 5404549120
...
Args:
json_data (dict): JSON data containing metrics.
Returns:
dict: Flattened metrics with keys as metric names.
"""
flat_metrics = {}
for k, v in json_data.items():
if isinstance(v, (int, float)):
flat_metrics[k] = v
elif isinstance(v, dict):
for sub_k, sub_v in v.items():
flat_metrics[f"{k}.{sub_k}"] = sub_v
return flat_metrics
def load_all_metrics(directory: Path) -> dict:
"""
Loads all stats JSON files in the specified directory and extracts metrics.
Args:
directory (Path): Directory containing JSON files.
Returns:
dict: Dictionary with filenames as keys and extracted metrics as values.
"""
metrics = {}
for system_dir in directory.iterdir():
assert system_dir.is_dir()
for chunk_output in system_dir.iterdir():
with chunk_output.open() as f:
data = json.load(f)
metrics[f"{system_dir.name}/${chunk_output.name}"] = flatten_data(data)
return metrics
def dataframe_to_markdown(df: pd.DataFrame) -> str:
df = df.sort_values(by=df.columns[0], ascending=True)
markdown_lines = []
# Header (get column names and format them)
header = '\n| ' + ' | '.join(df.columns) + ' |'
markdown_lines.append(header)
markdown_lines.append("| - " * (len(df.columns)) + "|") # Separator line
# Iterate over rows to build Markdown rows
for _, row in df.iterrows():
# TODO: define threshold for highlighting
highlight = False
fmt = lambda x: f"**{x}**" if highlight else f"{x}"
# Check for no change and NaN in p_value/t_stat
row_values = []
for val in row:
if isinstance(val, float) and np.isnan(val): # For NaN values in p-value or t-stat
row_values.append("-") # Custom symbol for NaN
elif isinstance(val, float) and val == 0: # For no change (mean_diff == 0)
row_values.append("-") # Custom symbol for no change
else:
row_values.append(fmt(f"{val:.4f}" if isinstance(val, float) else str(val)))
markdown_lines.append('| ' + ' | '.join(row_values) + ' |')
return '\n'.join(markdown_lines)
def perform_pairwise_tests(before_metrics: dict, after_metrics: dict) -> pd.DataFrame:
common_files = sorted(set(before_metrics) & set(after_metrics))
all_keys = sorted({ metric_keys for file_metrics in before_metrics.values() for metric_keys in file_metrics.keys() })
results = []
for key in all_keys:
before_vals, after_vals = [], []
for fname in common_files:
if key in before_metrics[fname] and key in after_metrics[fname]:
before_vals.append(before_metrics[fname][key])
after_vals.append(after_metrics[fname][key])
if len(before_vals) >= 2:
before_arr = np.array(before_vals)
after_arr = np.array(after_vals)
diff = after_arr - before_arr
pct_change = 100 * diff / before_arr
t_stat, p_val = ttest_rel(after_arr, before_arr)
results.append({
"metric": key,
"mean_before": np.mean(before_arr),
"mean_after": np.mean(after_arr),
"mean_diff": np.mean(diff),
"mean_%_change": np.mean(pct_change),
"p_value": p_val,
"t_stat": t_stat
})
df = pd.DataFrame(results).sort_values("p_value")
return df
if __name__ == "__main__":
before_dir = os.environ.get("BEFORE_DIR")
after_dir = os.environ.get("AFTER_DIR")
if not before_dir or not after_dir:
print("Error: Environment variables 'BEFORE_DIR' and 'AFTER_DIR' must be set.")
exit(1)
before_stats = Path(before_dir) / "stats"
after_stats = Path(after_dir) / "stats"
# This may happen if the pull request target does not include PR#399720 yet.
if not before_stats.exists():
print("⚠️ Skipping comparison: stats directory is missing in the target commit.")
exit(0)
# This should never happen, but we're exiting gracefully anyways
if not after_stats.exists():
print("⚠️ Skipping comparison: stats directory missing in current PR evaluation.")
exit(0)
before_metrics = load_all_metrics(before_stats)
after_metrics = load_all_metrics(after_stats)
df1 = perform_pairwise_tests(before_metrics, after_metrics)
markdown_table = dataframe_to_markdown(df1)
print(markdown_table)

View File

@@ -1,186 +0,0 @@
{
callPackage,
lib,
jq,
runCommand,
writeText,
python3,
}:
{
combinedDir,
touchedFilesJson,
githubAuthorId,
byName ? false,
}:
let
/*
Derivation that computes which packages are affected (added, changed or removed) between two revisions of nixpkgs.
Note: "platforms" are "x86_64-linux", "aarch64-darwin", ...
---
Inputs:
- beforeDir, afterDir: The evaluation result from before and after the change.
They can be obtained by running `nix-build -A ci.eval.full` on both revisions.
---
Outputs:
- changed-paths.json: Various information about the changes:
{
attrdiff: {
added: ["package1"],
changed: ["package2", "package3"],
removed: ["package4"],
},
labels: {
"10.rebuild-darwin: 1-10": true,
"10.rebuild-linux: 1-10": true
},
rebuildsByKernel: {
darwin: ["package1", "package2"],
linux: ["package1", "package2", "package3"]
},
rebuildCountByKernel: {
darwin: 2,
linux: 3,
},
rebuildsByPlatform: {
aarch64-darwin: ["package1", "package2"],
aarch64-linux: ["package1", "package2"],
x86_64-linux: ["package1", "package2", "package3"],
x86_64-darwin: ["package1"],
},
}
- step-summary.md: A markdown render of the changes
---
Implementation details:
Helper functions can be found in ./utils.nix.
Two main "types" are important:
- `packagePlatformPath`: A string of the form "<PACKAGE_PATH>.<PLATFORM>"
Example: "python312Packages.numpy.x86_64-linux"
- `packagePlatformAttr`: An attrs representation of a packagePlatformPath:
Example: { name = "python312Packages.numpy"; platform = "x86_64-linux"; }
*/
inherit (import ./utils.nix { inherit lib; })
groupByKernel
convertToPackagePlatformAttrs
groupByPlatform
extractPackageNames
getLabels
;
# Attrs
# - keys: "added", "changed" and "removed"
# - values: lists of `packagePlatformPath`s
diffAttrs = builtins.fromJSON (builtins.readFile "${combinedDir}/combined-diff.json");
rebuilds = diffAttrs.added ++ diffAttrs.changed;
rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs rebuilds;
changed-paths =
let
rebuildsByPlatform = groupByPlatform rebuildsPackagePlatformAttrs;
rebuildsByKernel = groupByKernel rebuildsPackagePlatformAttrs;
rebuildCountByKernel = lib.mapAttrs (
kernel: kernelRebuilds: lib.length kernelRebuilds
) rebuildsByKernel;
in
writeText "changed-paths.json" (
builtins.toJSON {
attrdiff = lib.mapAttrs (_: extractPackageNames) diffAttrs;
inherit
rebuildsByPlatform
rebuildsByKernel
rebuildCountByKernel
;
labels =
getLabels rebuildCountByKernel
# Sets "10.rebuild-*-stdenv" label to whether the "stdenv" attribute was changed.
// lib.mapAttrs' (
kernel: rebuilds: lib.nameValuePair "10.rebuild-${kernel}-stdenv" (lib.elem "stdenv" rebuilds)
) rebuildsByKernel
# Set the "11.by: package-maintainer" label to whether all packages directly
# changed are maintained by the PR's author.
# (https://github.com/NixOS/ofborg/blob/df400f44502d4a4a80fa283d33f2e55a4e43ee90/ofborg/src/tagger.rs#L83-L88)
// {
"11.by: package-maintainer" =
maintainers ? ${githubAuthorId}
&& lib.all (lib.flip lib.elem maintainers.${githubAuthorId}) (
lib.flatten (lib.attrValues maintainers)
);
};
}
);
maintainers = callPackage ./maintainers.nix { } {
changedattrs = lib.attrNames (lib.groupBy (a: a.name) rebuildsPackagePlatformAttrs);
changedpathsjson = touchedFilesJson;
inherit byName;
};
in
runCommand "compare"
{
nativeBuildInputs = [
jq
(python3.withPackages (
ps: with ps; [
numpy
pandas
scipy
]
))
];
maintainers = builtins.toJSON maintainers;
passAsFile = [ "maintainers" ];
env = {
BEFORE_DIR = "${combinedDir}/before";
AFTER_DIR = "${combinedDir}/after";
};
}
''
mkdir $out
cp ${changed-paths} $out/changed-paths.json
if jq -e '(.attrdiff.added | length == 0) and (.attrdiff.removed | length == 0)' "${changed-paths}" > /dev/null; then
# Chunks have changed between revisions
# We cannot generate a performance comparison
{
echo
echo "# Performance comparison"
echo
echo "This compares the performance of this branch against its pull request base branch (e.g., 'master')"
echo
echo "For further help please refer to: [ci/README.md](https://github.com/NixOS/nixpkgs/blob/master/ci/README.md)"
echo
} >> $out/step-summary.md
python3 ${./cmp-stats.py} >> $out/step-summary.md
else
# Package chunks are the same in both revisions
# We can use the to generate a performance comparison
{
echo
echo "# Performance Comparison"
echo
echo "Performance stats were skipped because the package sets differ between the two revisions."
echo
echo "For further help please refer to: [ci/README.md](https://github.com/NixOS/nixpkgs/blob/master/ci/README.md)"
} >> $out/step-summary.md
fi
{
echo
echo "# Packages"
echo
jq -r -f ${./generate-step-summary.jq} < ${changed-paths}
} >> $out/step-summary.md
cp "$maintainersPath" "$out/maintainers.json"
''

View File

@@ -1,30 +0,0 @@
def truncate(xs; n):
if xs | length > n then xs[:n] + ["..."]
else xs
end;
def itemize_packages(xs):
truncate(xs; 2000) |
map("- [\(.)](https://search.nixos.org/packages?channel=unstable&show=\(.)&from=0&size=50&sort=relevance&type=packages&query=\(.))") |
join("\n");
def get_title(s; xs):
s + " (" + (xs | length | tostring) + ")";
def section(title; xs):
"<details> <summary>" + get_title(title; xs) + "</summary>\n\n" + itemize_packages(xs) + "</details>";
def fallback_document(content; n):
if content | utf8bytelength > n then
get_title("Added packages"; .attrdiff.added) + "\n\n" +
get_title("Removed packages"; .attrdiff.removed) + "\n\n" +
get_title("Changed packages"; .attrdiff.changed)
else content
end;
# we truncate the list to stay below the GitHub limit of 1MB per step summary.
fallback_document(
section("Added packages"; .attrdiff.added) + "\n\n" +
section("Removed packages"; .attrdiff.removed) + "\n\n" +
section("Changed packages"; .attrdiff.changed); 1000 * 1000
)

View File

@@ -1,114 +0,0 @@
{
lib,
}:
# Almost directly vendored from https://github.com/NixOS/ofborg/blob/5a4e743f192fb151915fcbe8789922fa401ecf48/ofborg/src/maintainers.nix
{
changedattrs,
changedpathsjson,
byName ? false,
}:
let
pkgs = import ../../.. {
system = "x86_64-linux";
config = { };
overlays = [ ];
};
changedpaths = builtins.fromJSON (builtins.readFile changedpathsjson);
anyMatchingFile =
filename: builtins.any (changed: lib.strings.hasSuffix changed filename) changedpaths;
anyMatchingFiles = files: builtins.any anyMatchingFile files;
enrichedAttrs = builtins.map (name: {
path = lib.splitString "." name;
name = name;
}) changedattrs;
validPackageAttributes = builtins.filter (
pkg:
if (lib.attrsets.hasAttrByPath pkg.path pkgs) then
(
let
value = lib.attrsets.attrByPath pkg.path null pkgs;
in
if (builtins.tryEval value).success then
if value != null then true else builtins.trace "${pkg.name} exists but is null" false
else
builtins.trace "Failed to access ${pkg.name} even though it exists" false
)
else
builtins.trace "Failed to locate ${pkg.name}." false
) enrichedAttrs;
attrsWithPackages = builtins.map (
pkg: pkg // { package = lib.attrsets.attrByPath pkg.path null pkgs; }
) validPackageAttributes;
attrsWithMaintainers = builtins.map (
pkg:
let
meta = pkg.package.meta or { };
in
pkg
// {
# TODO: Refactor this so we can ping entire teams instead of the individual members.
# Note that this will require keeping track of GH team IDs in "maintainers/teams.nix".
maintainers = meta.maintainers or [ ];
}
) attrsWithPackages;
relevantFilenames =
drv:
(lib.lists.unique (
builtins.map (pos: lib.strings.removePrefix (toString ../..) pos.file) (
builtins.filter (x: x != null) [
((drv.meta or { }).maintainersPosition or null)
((drv.meta or { }).teamsPosition or null)
(builtins.unsafeGetAttrPos "src" drv)
# broken because name is always set by stdenv:
# # A hack to make `nix-env -qa` and `nix search` ignore broken packages.
# # TODO(@oxij): remove this assert when something like NixOS/nix#1771 gets merged into nix.
# name = assert validity.handled; name + lib.optionalString
#(builtins.unsafeGetAttrPos "name" drv)
(builtins.unsafeGetAttrPos "pname" drv)
(builtins.unsafeGetAttrPos "version" drv)
# Use ".meta.position" for cases when most of the package is
# defined in a "common" section and the only place where
# reference to the file with a derivation the "pos"
# attribute.
#
# ".meta.position" has the following form:
# "pkgs/tools/package-management/nix/default.nix:155"
# We transform it to the following:
# { file = "pkgs/tools/package-management/nix/default.nix"; }
{ file = lib.head (lib.splitString ":" (drv.meta.position or "")); }
]
)
));
attrsWithFilenames = builtins.map (
pkg: pkg // { filenames = relevantFilenames pkg.package; }
) attrsWithMaintainers;
attrsWithModifiedFiles = builtins.filter (pkg: anyMatchingFiles pkg.filenames) attrsWithFilenames;
listToPing = lib.concatMap (
pkg:
builtins.map (maintainer: {
id = maintainer.githubId;
inherit (maintainer) github;
packageName = pkg.name;
dueToFiles = pkg.filenames;
}) pkg.maintainers
) attrsWithModifiedFiles;
byMaintainer = lib.groupBy (ping: toString ping.${if byName then "github" else "id"}) listToPing;
packagesPerMaintainer = lib.attrsets.mapAttrs (
maintainer: packages: builtins.map (pkg: pkg.packageName) packages
) byMaintainer;
in
packagesPerMaintainer

View File

@@ -1,195 +0,0 @@
{ lib, ... }:
rec {
# Borrowed from https://github.com/NixOS/nixpkgs/pull/355616
uniqueStrings = list: builtins.attrNames (builtins.groupBy lib.id list);
/*
Converts a `packagePlatformPath` into a `packagePlatformAttr`
Turns
"hello.aarch64-linux"
into
{
name = "hello";
packagePath = [ "hello" ];
platform = "aarch64-linux";
}
*/
convertToPackagePlatformAttr =
packagePlatformPath:
let
# python312Packages.numpy.aarch64-linux -> ["python312Packages" "numpy" "aarch64-linux"]
splittedPath = lib.splitString "." packagePlatformPath;
# ["python312Packages" "numpy" "aarch64-linux"] -> ["python312Packages" "numpy"]
packagePath = lib.sublist 0 (lib.length splittedPath - 1) splittedPath;
# "python312Packages.numpy"
name = lib.concatStringsSep "." packagePath;
in
if name == "" then
null
else
{
# [ "python312Packages" "numpy" ]
inherit packagePath;
# python312Packages.numpy
inherit name;
# "aarch64-linux"
platform = lib.last splittedPath;
};
/*
Converts a list of `packagePlatformPath`s into a list of `packagePlatformAttr`s
Turns
[
"hello.aarch64-linux"
"hello.x86_64-linux"
"hello.aarch64-darwin"
"hello.x86_64-darwin"
"bye.x86_64-darwin"
"bye.aarch64-darwin"
"release-checks" <- Will be dropped
]
into
[
{ name = "hello"; platform = "aarch64-linux"; packagePath = [ "hello" ]; }
{ name = "hello"; platform = "x86_64-linux"; packagePath = [ "hello" ]; }
{ name = "hello"; platform = "aarch64-darwin"; packagePath = [ "hello" ]; }
{ name = "hello"; platform = "x86_64-darwin"; packagePath = [ "hello" ]; }
{ name = "bye"; platform = "aarch64-darwin"; packagePath = [ "hello" ]; }
{ name = "bye"; platform = "x86_64-darwin"; packagePath = [ "hello" ]; }
]
*/
convertToPackagePlatformAttrs =
packagePlatformPaths:
builtins.filter (x: x != null) (builtins.map convertToPackagePlatformAttr packagePlatformPaths);
/*
Converts a list of `packagePlatformPath`s directly to a list of (unique) package names
Turns
[
"hello.aarch64-linux"
"hello.x86_64-linux"
"hello.aarch64-darwin"
"hello.x86_64-darwin"
"bye.x86_64-darwin"
"bye.aarch64-darwin"
]
into
[
"hello"
"bye"
]
*/
extractPackageNames =
packagePlatformPaths:
let
packagePlatformAttrs = convertToPackagePlatformAttrs (uniqueStrings packagePlatformPaths);
in
uniqueStrings (builtins.map (p: p.name) packagePlatformAttrs);
/*
Group a list of `packagePlatformAttr`s by platforms
Turns
[
{ name = "hello"; platform = "aarch64-linux"; ... }
{ name = "hello"; platform = "x86_64-linux"; ... }
{ name = "hello"; platform = "aarch64-darwin"; ... }
{ name = "hello"; platform = "x86_64-darwin"; ... }
{ name = "bye"; platform = "aarch64-darwin"; ... }
{ name = "bye"; platform = "x86_64-darwin"; ... }
]
into
{
aarch64-linux = [ "hello" ];
x86_64-linux = [ "hello" ];
aarch64-darwin = [ "hello" "bye" ];
x86_64-darwin = [ "hello" "bye" ];
}
*/
groupByPlatform =
packagePlatformAttrs:
let
packagePlatformAttrsByPlatform = builtins.groupBy (p: p.platform) packagePlatformAttrs;
extractPackageNames = map (p: p.name);
in
lib.mapAttrs (_: extractPackageNames) packagePlatformAttrsByPlatform;
# Turns
# [
# { name = "hello"; platform = "aarch64-linux"; ... }
# { name = "hello"; platform = "x86_64-linux"; ... }
# { name = "hello"; platform = "aarch64-darwin"; ... }
# { name = "hello"; platform = "x86_64-darwin"; ... }
# { name = "bye"; platform = "aarch64-darwin"; ... }
# { name = "bye"; platform = "x86_64-darwin"; ... }
# ]
#
# into
#
# {
# linux = [ "hello" ];
# darwin = [ "hello" "bye" ];
# }
groupByKernel =
packagePlatformAttrs:
let
filterKernel =
kernel:
builtins.attrNames (
builtins.groupBy (p: p.name) (
builtins.filter (p: lib.hasSuffix kernel p.platform) packagePlatformAttrs
)
);
in
lib.genAttrs [ "linux" "darwin" ] filterKernel;
/*
Maps an attrs of `kernel - rebuild counts` mappings to an attrs of labels
Turns
{
linux = 56;
darwin = 1;
}
into
{
"10.rebuild-darwin: 1" = true;
"10.rebuild-darwin: 1-10" = true;
"10.rebuild-darwin: 11-100" = false;
# [...]
"10.rebuild-darwin: 1" = false;
"10.rebuild-darwin: 1-10" = false;
"10.rebuild-linux: 11-100" = true;
# [...]
}
*/
getLabels =
rebuildCountByKernel:
lib.mergeAttrsList (
lib.mapAttrsToList (
kernel: rebuildCount:
let
range = from: to: from <= rebuildCount && (to == null || rebuildCount <= to);
in
lib.mapAttrs' (number: lib.nameValuePair "10.rebuild-${kernel}: ${number}") {
"0" = range 0 0;
"1" = range 1 1;
"1-10" = range 1 10;
"11-100" = range 11 100;
"101-500" = range 101 500;
"501-1000" = range 501 1000;
"501+" = range 501 null;
"1001-2500" = range 1001 2500;
"2501-5000" = range 2501 5000;
"5001+" = range 5001 null;
}
) rebuildCountByKernel
);
}

View File

@@ -1,281 +0,0 @@
# Evaluates all the accessible paths in nixpkgs.
# *This only builds on Linux* since it requires the Linux sandbox isolation to
# be able to write in various places while evaluating inside the sandbox.
#
# This file is used by nixpkgs CI (see .github/workflows/eval.yml) as well as
# being used directly as an entry point in Lix's CI (in `flake.nix` in the Lix
# repo).
#
# If you know you are doing a breaking API change, please ping the nixpkgs CI
# maintainers and the Lix maintainers (`nix eval -f . lib.teams.lix`).
{
callPackage,
lib,
runCommand,
writeShellScript,
symlinkJoin,
time,
procps,
nix,
jq,
}:
let
nixpkgs =
with lib.fileset;
toSource {
root = ../..;
fileset = unions (
map (lib.path.append ../..) [
"default.nix"
"doc"
"lib"
"maintainers"
"nixos"
"pkgs"
".version"
"ci/supportedSystems.json"
]
);
};
supportedSystems = builtins.fromJSON (builtins.readFile ../supportedSystems.json);
attrpathsSuperset =
{
evalSystem,
}:
runCommand "attrpaths-superset.json"
{
src = nixpkgs;
nativeBuildInputs = [
nix
time
];
}
''
export NIX_STATE_DIR=$(mktemp -d)
mkdir $out
export GC_INITIAL_HEAP_SIZE=4g
command time -f "Attribute eval done [%MKB max resident, %Es elapsed] %C" \
nix-instantiate --eval --strict --json --show-trace \
"$src/pkgs/top-level/release-attrpaths-superset.nix" \
-A paths \
-I "$src" \
--option restrict-eval true \
--option allow-import-from-derivation false \
--option eval-system "${evalSystem}" > $out/paths.json
'';
singleSystem =
{
# The system to evaluate.
# Note that this is intentionally not called `system`,
# because `--argstr system` would only be passed to the ci/default.nix file!
evalSystem,
# The path to the `paths.json` file from `attrpathsSuperset`
attrpathFile ? "${attrpathsSuperset { inherit evalSystem; }}/paths.json",
# The number of attributes per chunk, see ./README.md for more info.
chunkSize,
checkMeta ? true,
# Don't try to eval packages marked as broken.
includeBroken ? false,
# Whether to just evaluate a single chunk for quick testing
quickTest ? false,
}:
let
singleChunk = writeShellScript "single-chunk" ''
set -euo pipefail
chunkSize=$1
myChunk=$2
system=$3
outputDir=$4
export NIX_SHOW_STATS=1
export NIX_SHOW_STATS_PATH="$outputDir/stats/$myChunk"
echo "Chunk $myChunk on $system start"
set +e
command time -o "$outputDir/timestats/$myChunk" \
-f "Chunk $myChunk on $system done [%MKB max resident, %Es elapsed] %C" \
nix-env -f "${nixpkgs}/pkgs/top-level/release-outpaths-parallel.nix" \
--eval-system "$system" \
--option restrict-eval true \
--option allow-import-from-derivation false \
--query --available \
--out-path --json \
--show-trace \
--arg chunkSize "$chunkSize" \
--arg myChunk "$myChunk" \
--arg attrpathFile "${attrpathFile}" \
--arg systems "[ \"$system\" ]" \
--arg checkMeta ${lib.boolToString checkMeta} \
--arg includeBroken ${lib.boolToString includeBroken} \
-I ${nixpkgs} \
-I ${attrpathFile} \
> "$outputDir/result/$myChunk" \
2> "$outputDir/stderr/$myChunk"
exitCode=$?
set -e
cat "$outputDir/stderr/$myChunk"
cat "$outputDir/timestats/$myChunk"
if (( exitCode != 0 )); then
echo "Evaluation failed with exit code $exitCode"
# This immediately halts all xargs processes
kill $PPID
elif [[ -s "$outputDir/stderr/$myChunk" ]]; then
echo "Nixpkgs on $system evaluated with warnings, aborting"
kill $PPID
fi
'';
in
runCommand "nixpkgs-eval-${evalSystem}"
{
nativeBuildInputs = [
nix
time
procps
jq
];
env = {
inherit evalSystem chunkSize;
};
}
''
export NIX_STATE_DIR=$(mktemp -d)
nix-store --init
echo "System: $evalSystem"
cores=$NIX_BUILD_CORES
echo "Cores: $cores"
attrCount=$(jq length "${attrpathFile}")
echo "Attribute count: $attrCount"
echo "Chunk size: $chunkSize"
# Same as `attrCount / chunkSize` but rounded up
chunkCount=$(( (attrCount - 1) / chunkSize + 1 ))
echo "Chunk count: $chunkCount"
mkdir -p $out/${evalSystem}
# Record and print stats on free memory and swap in the background
(
while true; do
availMemory=$(free -b | grep Mem | awk '{print $7}')
freeSwap=$(free -b | grep Swap | awk '{print $4}')
echo "Available memory: $(( availMemory / 1024 / 1024 )) MiB, free swap: $(( freeSwap / 1024 / 1024 )) MiB"
if [[ ! -f "$out/${evalSystem}/min-avail-memory" ]] || (( availMemory < $(<$out/${evalSystem}/min-avail-memory) )); then
echo "$availMemory" > $out/${evalSystem}/min-avail-memory
fi
if [[ ! -f $out/${evalSystem}/min-free-swap ]] || (( availMemory < $(<$out/${evalSystem}/min-free-swap) )); then
echo "$freeSwap" > $out/${evalSystem}/min-free-swap
fi
sleep 4
done
) &
seq_end=$(( chunkCount - 1 ))
${lib.optionalString quickTest ''
seq_end=0
''}
chunkOutputDir=$(mktemp -d)
mkdir "$chunkOutputDir"/{result,stats,timestats,stderr}
seq -w 0 "$seq_end" |
command time -f "%e" -o "$out/${evalSystem}/total-time" \
xargs -I{} -P"$cores" \
${singleChunk} "$chunkSize" {} "$evalSystem" "$chunkOutputDir"
cp -r "$chunkOutputDir"/stats $out/${evalSystem}/stats-by-chunk
if (( chunkSize * chunkCount != attrCount )); then
# A final incomplete chunk would mess up the stats, don't include it
rm "$chunkOutputDir"/stats/"$seq_end"
fi
cat "$chunkOutputDir"/result/* | jq -s 'add | map_values(.outputs)' > $out/${evalSystem}/paths.json
'';
diff = callPackage ./diff.nix { };
combine =
{
diffDir,
}:
runCommand "combined-eval"
{
nativeBuildInputs = [
jq
];
}
''
mkdir -p $out
# Combine output paths from all systems
cat ${diffDir}/*/diff.json | jq -s '
reduce .[] as $item ({}; {
added: (.added + $item.added),
changed: (.changed + $item.changed),
removed: (.removed + $item.removed)
})
' > $out/combined-diff.json
mkdir -p $out/before/stats
for d in ${diffDir}/before/*; do
cp -r "$d"/stats-by-chunk $out/before/stats/$(basename "$d")
done
mkdir -p $out/after/stats
for d in ${diffDir}/after/*; do
cp -r "$d"/stats-by-chunk $out/after/stats/$(basename "$d")
done
'';
compare = callPackage ./compare { };
full =
{
# Whether to evaluate on a specific set of systems, by default all are evaluated
evalSystems ? if quickTest then [ "x86_64-linux" ] else supportedSystems,
# The number of attributes per chunk, see ./README.md for more info.
chunkSize,
quickTest ? false,
}:
let
diffs = symlinkJoin {
name = "diffs";
paths = map (
evalSystem:
let
eval = singleSystem {
inherit quickTest evalSystem chunkSize;
};
in
diff {
inherit evalSystem;
# Local "full" evaluation doesn't do a real diff.
beforeDir = eval;
afterDir = eval;
}
) evalSystems;
};
in
combine {
diffDir = diffs;
};
in
{
inherit
attrpathsSuperset
singleSystem
diff
combine
compare
# The above three are used by separate VMs in a GitHub workflow,
# while the below is intended for testing on a single local machine
full
;
}

View File

@@ -1,61 +0,0 @@
{
lib,
runCommand,
writeText,
}:
{
beforeDir,
afterDir,
evalSystem,
}:
let
/*
Computes the key difference between two attrs
{
added: [ <keys only in the second object> ],
removed: [ <keys only in the first object> ],
changed: [ <keys with different values between the two objects> ],
}
*/
diff =
let
filterKeys = cond: attrs: lib.attrNames (lib.filterAttrs cond attrs);
in
old: new: {
added = filterKeys (n: _: !(old ? ${n})) new;
removed = filterKeys (n: _: !(new ? ${n})) old;
changed = filterKeys (
n: v:
# Filter out attributes that don't exist anymore
(new ? ${n})
# Filter out attributes that are the same as the new value
&& (v != (new.${n}))
) old;
};
getAttrs =
dir:
let
raw = builtins.readFile "${dir}/${evalSystem}/paths.json";
# The file contains Nix paths; we need to ignore them for evaluation purposes,
# else there will be a "is not allowed to refer to a store path" error.
data = builtins.unsafeDiscardStringContext raw;
in
builtins.fromJSON data;
beforeAttrs = getAttrs beforeDir;
afterAttrs = getAttrs afterDir;
diffAttrs = diff beforeAttrs afterAttrs;
diffJson = writeText "diff.json" (builtins.toJSON diffAttrs);
in
runCommand "diff" { } ''
mkdir -p $out/${evalSystem}
cp -r ${beforeDir} $out/before
cp -r ${afterDir} $out/after
cp ${diffJson} $out/${evalSystem}/diff.json
''

View File

@@ -1,3 +0,0 @@
[run]
indent_style = space
indent_size = 2

View File

@@ -1,2 +0,0 @@
node_modules
step-summary.md

View File

@@ -1,2 +0,0 @@
package-lock-only = true
save-exact = true

View File

@@ -1,17 +0,0 @@
# GitHub specific CI scripts
This folder contains [`actions/github-script`](https://github.com/actions/github-script)-based JavaScript code.
It provides a `nix-shell` environment to run and test these actions locally.
To run any of the scripts locally:
- Enter `nix-shell` in `./ci/github-script`.
- Ensure `gh` is authenticated.
## Check commits
Run `./run commits OWNER REPO PR`, where OWNER is your username or "NixOS", REPO is the name of your fork or "nixpkgs" and PR is the number of the pull request to check.
## Labeler
Run `./run labels OWNER REPO`, where OWNER is your username or "NixOS" and REPO the name of your fork or "nixpkgs".

View File

@@ -1,10 +0,0 @@
This report is automatically generated by the `PR / Check / cherry-pick` CI workflow.
Some of the commits in this PR require the author's and reviewer's attention.
Please follow the [backporting guidelines](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#how-to-backport-pull-requests) and cherry-pick with the `-x` flag.
This requires changes to the unstable `master` and `staging` branches first, before backporting them.
Occasionally, it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts or when updating minor versions of packages which have already advanced to the next major on unstable.
If you need to merge this PR despite the warnings, please [dismiss](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/dismissing-a-pull-request-review) this review shortly before merging.

View File

@@ -1,281 +0,0 @@
module.exports = async function ({ github, context, core, dry }) {
const { execFileSync } = require('node:child_process')
const { readFile } = require('node:fs/promises')
const { join } = require('node:path')
const { classify } = require('../supportedBranches.js')
const withRateLimit = require('./withRateLimit.js')
await withRateLimit({ github, core }, async (stats) => {
stats.prs = 1
const pull_number = context.payload.pull_request.number
const job_url =
context.runId &&
(
await github.paginate(github.rest.actions.listJobsForWorkflowRun, {
...context.repo,
run_id: context.runId,
per_page: 100,
})
).find(({ name }) => name == 'Check / cherry-pick').html_url +
'?pr=' +
pull_number
async function handle({ sha, commit }) {
// Using the last line with "cherry" + hash, because a chained backport
// can result in multiple of those lines. Only the last one counts.
const match = Array.from(
commit.message.matchAll(/cherry.*([0-9a-f]{40})/g),
).at(-1)
if (!match)
return {
sha,
commit,
severity: 'warning',
message: `Couldn't locate original commit hash in message of ${sha}.`,
}
const original_sha = match[1]
let branches
try {
branches = (
await github.request({
// This is an undocumented endpoint to fetch the branches a commit is part of.
// There is no equivalent in neither the REST nor the GraphQL API.
// The endpoint itself is unlikely to go away, because GitHub uses it to display
// the list of branches on the detail page of a commit.
url: `https://github.com/${context.repo.owner}/${context.repo.repo}/branch_commits/${original_sha}`,
headers: {
accept: 'application/json',
},
})
).data.branches
.map(({ branch }) => branch)
.filter((branch) => classify(branch).type.includes('development'))
} catch (e) {
// For some unknown reason a 404 error comes back as 500 without any more details in a GitHub Actions runner.
// Ignore these to return a regular error message below.
if (![404, 500].includes(e.status)) throw e
}
if (!branches?.length)
return {
sha,
commit,
severity: 'error',
message: `${original_sha} given in ${sha} not found in any pickable branch.`,
}
const diff = execFileSync('git', [
'-C',
__dirname,
'range-diff',
'--no-color',
'--ignore-all-space',
'--no-notes',
// 100 means "any change will be reported"; 0 means "no change will be reported"
'--creation-factor=100',
`${original_sha}~..${original_sha}`,
`${sha}~..${sha}`,
])
.toString()
.split('\n')
// First line contains commit SHAs, which we'll print separately.
.slice(1)
// # The output of `git range-diff` is indented with 4 spaces, but we'll control indentation manually.
.map((line) => line.replace(/^ {4}/, ''))
if (!diff.some((line) => line.match(/^[+-]{2}/)))
return {
sha,
commit,
severity: 'info',
message: `${original_sha} is highly similar to ${sha}.`,
}
const colored_diff = execFileSync('git', [
'-C',
__dirname,
'range-diff',
'--color',
'--no-notes',
'--creation-factor=100',
`${original_sha}~..${original_sha}`,
`${sha}~..${sha}`,
]).toString()
return {
sha,
commit,
diff,
colored_diff,
severity: 'warning',
message: `Difference between ${sha} and original ${original_sha} may warrant inspection.`,
}
}
const commits = await github.paginate(github.rest.pulls.listCommits, {
...context.repo,
pull_number,
})
const results = await Promise.all(commits.map(handle))
// Log all results without truncation, with better highlighting and all whitespace changes to the job log.
results.forEach(({ sha, commit, severity, message, colored_diff }) => {
core.startGroup(`Commit ${sha}`)
core.info(`Author: ${commit.author.name} ${commit.author.email}`)
core.info(`Date: ${new Date(commit.author.date)}`)
core[severity](message)
core.endGroup()
if (colored_diff) core.info(colored_diff)
})
// Only create step summary below in case of warnings or errors.
// Also clean up older reviews, when all checks are good now.
if (results.every(({ severity }) => severity == 'info')) {
if (!dry) {
await Promise.all(
(
await github.paginate(github.rest.pulls.listReviews, {
...context.repo,
pull_number,
})
)
.filter((review) => review.user.login == 'github-actions[bot]')
.map(async (review) => {
if (review.state == 'CHANGES_REQUESTED') {
await github.rest.pulls.dismissReview({
...context.repo,
pull_number,
review_id: review.id,
message: 'All cherry-picks are good now, thank you!',
})
}
await github.graphql(
`mutation($node_id:ID!) {
minimizeComment(input: {
classifier: RESOLVED,
subjectId: $node_id
})
{ clientMutationId }
}`,
{ node_id: review.node_id },
)
}),
)
}
return
}
// In the case of "error" severity, we also fail the job.
// Those should be considered blocking and not be dismissable via review.
if (results.some(({ severity }) => severity == 'error'))
process.exitCode = 1
core.summary.addRaw(
await readFile(join(__dirname, 'check-cherry-picks.md'), 'utf-8'),
true,
)
results.forEach(({ severity, message, diff }) => {
if (severity == 'info') return
// The docs for markdown alerts only show examples with markdown blockquote syntax, like this:
// > [!WARNING]
// > message
// However, our testing shows that this also works with a `<blockquote>` html tag, as long as there
// is an empty line:
// <blockquote>
//
// [!WARNING]
// message
// </blockquote>
// Whether this is intended or just an implementation detail is unclear.
core.summary.addRaw('<blockquote>')
core.summary.addRaw(
`\n\n[!${severity == 'warning' ? 'WARNING' : 'CAUTION'}]`,
true,
)
core.summary.addRaw(`${message}`, true)
if (diff) {
// Limit the output to 10k bytes and remove the last, potentially incomplete line, because GitHub
// comments are limited in length. The value of 10k is arbitrary with the assumption, that after
// the range-diff becomes a certain size, a reviewer is better off reviewing the regular diff in
// GitHub's UI anyway, thus treating the commit as "new" and not cherry-picked.
// Note: if multiple commits are close to the limit, this approach could still lead to a comment
// that's too long. We think this is unlikely to happen, and so don't deal with it explicitly.
const truncated = []
let total_length = 0
for (line of diff) {
total_length += line.length
if (total_length > 10000) {
truncated.push('', '[...truncated...]')
break
} else {
truncated.push(line)
}
}
core.summary.addRaw('<details><summary>Show diff</summary>')
core.summary.addRaw('\n\n``````````diff', true)
core.summary.addRaw(truncated.join('\n'), true)
core.summary.addRaw('``````````', true)
core.summary.addRaw('</details>')
}
core.summary.addRaw('</blockquote>')
})
if (job_url)
core.summary.addRaw(
`\n\n_Hint: The full diffs are also available in the [runner logs](${job_url}) with slightly better highlighting._`,
)
const body = core.summary.stringify()
core.summary.write()
const pendingReview = (
await github.paginate(github.rest.pulls.listReviews, {
...context.repo,
pull_number,
})
).find(
(review) =>
review.user.login == 'github-actions[bot]' &&
// If a review is still pending, we can just update this instead
// of posting a new one.
(review.state == 'CHANGES_REQUESTED' ||
// No need to post a new review, if an older one with the exact
// same content had already been dismissed.
review.body == body),
)
if (dry) {
if (pendingReview)
core.info('pending review found: ' + pendingReview.html_url)
else core.info('no pending review found')
} else {
// Either of those two requests could fail for very long comments. This can only happen
// with multiple commits all hitting the truncation limit for the diff. If you ever hit
// this case, consider just splitting up those commits into multiple PRs.
if (pendingReview) {
await github.rest.pulls.updateReview({
...context.repo,
pull_number,
review_id: pendingReview.id,
body,
})
} else {
await github.rest.pulls.createReview({
...context.repo,
pull_number,
event: 'REQUEST_CHANGES',
body,
})
}
}
})
}

View File

@@ -1,414 +0,0 @@
module.exports = async function ({ github, context, core, dry }) {
const path = require('node:path')
const { DefaultArtifactClient } = require('@actions/artifact')
const { readFile, writeFile } = require('node:fs/promises')
const withRateLimit = require('./withRateLimit.js')
const artifactClient = new DefaultArtifactClient()
async function handlePullRequest({ item, stats }) {
const log = (k, v) => core.info(`PR #${item.number} - ${k}: ${v}`)
const pull_number = item.number
// This API request is important for the merge-conflict label, because it triggers the
// creation of a new test merge commit. This is needed to actually determine the state of a PR.
const pull_request = (
await github.rest.pulls.get({
...context.repo,
pull_number,
})
).data
const reviews = await github.paginate(github.rest.pulls.listReviews, {
...context.repo,
pull_number,
})
const approvals = new Set(
reviews
.filter((review) => review.state == 'APPROVED')
.map((review) => review.user?.id),
)
// After creation of a Pull Request, `merge_commit_sha` will be null initially:
// The very first merge commit will only be calculated after a little while.
// To avoid labeling the PR as conflicted before that, we wait a few minutes.
// This is intentionally less than the time that Eval takes, so that the label job
// running after Eval can indeed label the PR as conflicted if that is the case.
const merge_commit_sha_valid =
new Date() - new Date(pull_request.created_at) > 3 * 60 * 1000
const prLabels = {
// We intentionally don't use the mergeable or mergeable_state attributes.
// Those have an intermediate state while the test merge commit is created.
// This doesn't work well for us, because we might have just triggered another
// test merge commit creation by request the pull request via API at the start
// of this function.
// The attribute merge_commit_sha keeps the old value of null or the hash *until*
// the new test merge commit has either successfully been created or failed so.
// This essentially means we are updating the merge conflict label in two steps:
// On the first pass of the day, we just fetch the pull request, which triggers
// the creation. At this stage, the label is likely not updated, yet.
// The second pass will then read the result from the first pass and set the label.
'2.status: merge conflict':
merge_commit_sha_valid && !pull_request.merge_commit_sha,
'12.approvals: 1': approvals.size == 1,
'12.approvals: 2': approvals.size == 2,
'12.approvals: 3+': approvals.size >= 3,
'12.first-time contribution': [
'NONE',
'FIRST_TIMER',
'FIRST_TIME_CONTRIBUTOR',
].includes(pull_request.author_association),
}
const { id: run_id, conclusion } =
(
await github.rest.actions.listWorkflowRuns({
...context.repo,
workflow_id: 'pr.yml',
event: 'pull_request_target',
exclude_pull_requests: true,
head_sha: pull_request.head.sha,
})
).data.workflow_runs[0] ??
// TODO: Remove this after 2025-09-17, at which point all eval.yml artifacts will have expired.
(
await github.rest.actions.listWorkflowRuns({
...context.repo,
// In older PRs, we need eval.yml instead of pr.yml.
workflow_id: 'eval.yml',
event: 'pull_request_target',
status: 'success',
exclude_pull_requests: true,
head_sha: pull_request.head.sha,
})
).data.workflow_runs[0] ??
{}
// Newer PRs might not have run Eval to completion, yet.
// Older PRs might not have an eval.yml workflow, yet.
// In either case we continue without fetching an artifact on a best-effort basis.
log('Last eval run', run_id ?? '<n/a>')
if (conclusion === 'success') {
Object.assign(prLabels, {
// We only set this label if the latest eval run was successful, because if it was not, it
// *could* have requested reviewers. We will let the PR author fix CI first, before "escalating"
// this PR to "needs: reviewer".
// Since the first Eval run on a PR always sets rebuild labels, the same PR will be "recently
// updated" for the next scheduled run. Thus, this label will still be set within a few minutes
// after a PR is created, if required.
// Note that a "requested reviewer" disappears once they have given a review, so we check
// existing reviews, too.
'9.needs: reviewer':
!pull_request.draft &&
pull_request.requested_reviewers.length == 0 &&
reviews.length == 0,
})
}
const artifact =
run_id &&
(
await github.rest.actions.listWorkflowRunArtifacts({
...context.repo,
run_id,
name: 'comparison',
})
).data.artifacts[0]
// Instead of checking the boolean artifact.expired, we will give us a minute to
// actually download the artifact in the next step and avoid that race condition.
// Older PRs, where the workflow run was already eval.yml, but the artifact was not
// called "comparison", yet, will skip the download.
const expired =
!artifact ||
new Date(artifact?.expires_at ?? 0) <
new Date(new Date().getTime() + 60 * 1000)
log('Artifact expires at', artifact?.expires_at ?? '<n/a>')
if (!expired) {
stats.artifacts++
await artifactClient.downloadArtifact(artifact.id, {
findBy: {
repositoryName: context.repo.repo,
repositoryOwner: context.repo.owner,
token: core.getInput('github-token'),
},
path: path.resolve(pull_number.toString()),
expectedHash: artifact.digest,
})
const maintainers = new Set(
Object.keys(
JSON.parse(
await readFile(`${pull_number}/maintainers.json`, 'utf-8'),
),
).map((m) => Number.parseInt(m, 10)),
)
const evalLabels = JSON.parse(
await readFile(`${pull_number}/changed-paths.json`, 'utf-8'),
).labels
Object.assign(
prLabels,
// Ignore `evalLabels` if it's an array.
// This can happen for older eval runs, before we switched to objects.
// The old eval labels would have been set by the eval run,
// so now they'll be present in `before`.
// TODO: Simplify once old eval results have expired (~2025-10)
Array.isArray(evalLabels) ? undefined : evalLabels,
{
'12.approved-by: package-maintainer': Array.from(maintainers).some(
(m) => approvals.has(m),
),
},
)
}
return prLabels
}
async function handle({ item, stats }) {
try {
const log = (k, v, skip) => {
core.info(`#${item.number} - ${k}: ${v}` + (skip ? ' (skipped)' : ''))
return skip
}
log('Last updated at', item.updated_at)
log('URL', item.html_url)
const issue_number = item.number
const itemLabels = {}
if (item.pull_request || context.payload.pull_request) {
stats.prs++
Object.assign(itemLabels, await handlePullRequest({ item, stats }))
} else {
stats.issues++
}
const latest_event_at = new Date(
(
await github.paginate(github.rest.issues.listEventsForTimeline, {
...context.repo,
issue_number,
per_page: 100,
})
)
.filter(({ event }) =>
[
// These events are hand-picked from:
// https://docs.github.com/en/rest/using-the-rest-api/issue-event-types?apiVersion=2022-11-28
// Each of those causes a PR/issue to *not* be considered as stale anymore.
// Most of these use created_at.
'assigned',
'commented', // uses updated_at, because that could be > created_at
'committed', // uses committer.date
'head_ref_force_pushed',
'milestoned',
'pinned',
'ready_for_review',
'renamed',
'reopened',
'review_dismissed',
'review_requested',
'reviewed', // uses submitted_at
'unlocked',
'unmarked_as_duplicate',
].includes(event),
)
.map(
({ created_at, updated_at, committer, submitted_at }) =>
new Date(
updated_at ?? created_at ?? submitted_at ?? committer.date,
),
)
// Reverse sort by date value. The default sort() sorts by string representation, which is bad for dates.
.sort((a, b) => b - a)
.at(0) ?? item.created_at,
)
log('latest_event_at', latest_event_at.toISOString())
const stale_at = new Date(new Date().setDate(new Date().getDate() - 180))
// Create a map (Label -> Boolean) of all currently set labels.
// Each label is set to True and can be disabled later.
const before = Object.fromEntries(
(
await github.paginate(github.rest.issues.listLabelsOnIssue, {
...context.repo,
issue_number,
})
).map(({ name }) => [name, true]),
)
Object.assign(itemLabels, {
'2.status: stale':
!before['1.severity: security'] && latest_event_at < stale_at,
})
const after = Object.assign({}, before, itemLabels)
// No need for an API request, if all labels are the same.
const hasChanges = Object.keys(after).some(
(name) => (before[name] ?? false) != after[name],
)
if (log('Has changes', hasChanges, !hasChanges)) return
// Skipping labeling on a pull_request event, because we have no privileges.
const labels = Object.entries(after)
.filter(([, value]) => value)
.map(([name]) => name)
if (log('Set labels', labels, dry)) return
await github.rest.issues.setLabels({
...context.repo,
issue_number,
labels,
})
} catch (cause) {
throw new Error(`Labeling #${item.number} failed.`, { cause })
}
}
await withRateLimit({ github, core }, async (stats) => {
if (context.payload.pull_request) {
await handle({ item: context.payload.pull_request, stats })
} else {
const lastRun = (
await github.rest.actions.listWorkflowRuns({
...context.repo,
workflow_id: 'labels.yml',
event: 'schedule',
status: 'success',
exclude_pull_requests: true,
per_page: 1,
})
).data.workflow_runs[0]
const cutoff = new Date(
Math.max(
// Go back as far as the last successful run of this workflow to make sure
// we are not leaving anyone behind on GHA failures.
// Defaults to go back 1 hour on the first run.
new Date(lastRun?.created_at ?? new Date().getTime() - 1 * 60 * 60 * 1000).getTime(),
// Go back max. 1 day to prevent hitting all API rate limits immediately,
// when GH API returns a wrong workflow by accident.
new Date().getTime() - 24 * 60 * 60 * 1000,
),
)
core.info('cutoff timestamp: ' + cutoff.toISOString())
const updatedItems = await github.paginate(
github.rest.search.issuesAndPullRequests,
{
q: [
`repo:"${context.repo.owner}/${context.repo.repo}"`,
'is:open',
`updated:>=${cutoff.toISOString()}`,
].join(' AND '),
per_page: 100,
// TODO: Remove in 2025-10, when it becomes the default.
advanced_search: true,
},
)
let cursor
// No workflow run available the first time.
if (lastRun) {
// The cursor to iterate through the full list of issues and pull requests
// is passed between jobs as an artifact.
const artifact = (
await github.rest.actions.listWorkflowRunArtifacts({
...context.repo,
run_id: lastRun.id,
name: 'pagination-cursor',
})
).data.artifacts[0]
// If the artifact is not available, the next iteration starts at the beginning.
if (artifact) {
stats.artifacts++
const { downloadPath } = await artifactClient.downloadArtifact(
artifact.id,
{
findBy: {
repositoryName: context.repo.repo,
repositoryOwner: context.repo.owner,
token: core.getInput('github-token'),
},
expectedHash: artifact.digest,
},
)
cursor = await readFile(path.resolve(downloadPath, 'cursor'), 'utf-8')
}
}
// From GitHub's API docs:
// GitHub's REST API considers every pull request an issue, but not every issue is a pull request.
// For this reason, "Issues" endpoints may return both issues and pull requests in the response.
// You can identify pull requests by the pull_request key.
const allItems = await github.rest.issues.listForRepo({
...context.repo,
state: 'open',
sort: 'created',
direction: 'asc',
per_page: 100,
after: cursor,
})
// Regex taken and comment adjusted from:
// https://github.com/octokit/plugin-paginate-rest.js/blob/8e5da25f975d2f31dda6b8b588d71f2c768a8df2/src/iterator.ts#L36-L41
// `allItems.headers.link` format:
// <https://api.github.com/repositories/4542716/issues?page=3&per_page=100&after=Y3Vyc29yOnYyOpLPAAABl8qNnYDOvnSJxA%3D%3D>; rel="next",
// <https://api.github.com/repositories/4542716/issues?page=1&per_page=100&before=Y3Vyc29yOnYyOpLPAAABl8xFV9DOvoouJg%3D%3D>; rel="prev"
// Sets `next` to undefined if "next" URL is not present or `link` header is not set.
const next = ((allItems.headers.link ?? '').match(
/<([^<>]+)>;\s*rel="next"/,
) ?? [])[1]
if (next) {
cursor = new URL(next).searchParams.get('after')
const uploadPath = path.resolve('cursor')
await writeFile(uploadPath, cursor, 'utf-8')
if (dry) {
core.info(`pagination-cursor: ${cursor} (upload skipped)`)
} else {
// No stats.artifacts++, because this does not allow passing a custom token.
// Thus, the upload will not happen with the app token, but the default github.token.
await artifactClient.uploadArtifact(
'pagination-cursor',
[uploadPath],
path.resolve('.'),
{
retentionDays: 1,
},
)
}
}
// Some items might be in both search results, so filtering out duplicates as well.
const items = []
.concat(updatedItems, allItems.data)
.filter(
(thisItem, idx, arr) =>
idx ==
arr.findIndex((firstItem) => firstItem.number == thisItem.number),
)
;(await Promise.allSettled(items.map((item) => handle({ item, stats }))))
.filter(({ status }) => status == 'rejected')
.map(({ reason }) =>
core.setFailed(`${reason.message}\n${reason.cause.stack}`),
)
}
})
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,10 +0,0 @@
{
"private": true,
"dependencies": {
"@actions/artifact": "2.3.2",
"@actions/core": "1.11.1",
"@actions/github": "6.0.1",
"bottleneck": "2.19.5",
"commander": "14.0.0"
}
}

View File

@@ -1,72 +0,0 @@
#!/usr/bin/env -S node --import ./run
import { execSync } from 'node:child_process'
import { closeSync, mkdtempSync, openSync, rmSync } from 'node:fs'
import { tmpdir } from 'node:os'
import { join } from 'node:path'
import { program } from 'commander'
import * as core from '@actions/core'
import { getOctokit } from '@actions/github'
async function run(action, owner, repo, pull_number, dry = true) {
const token = execSync('gh auth token', { encoding: 'utf-8' }).trim()
const github = getOctokit(token)
const payload = !pull_number ? {} : {
pull_request: (await github.rest.pulls.get({
owner,
repo,
pull_number,
})).data
}
process.env['INPUT_GITHUB-TOKEN'] = token
closeSync(openSync('step-summary.md', 'w'))
process.env.GITHUB_STEP_SUMMARY = 'step-summary.md'
await action({
github,
context: {
payload,
repo: {
owner,
repo,
},
},
core,
dry,
})
}
program
.command('commits')
.description('Check commit structure of a pull request.')
.argument('<owner>', 'Owner of the GitHub repository to check (Example: NixOS)')
.argument('<repo>', 'Name of the GitHub repository to check (Example: nixpkgs)')
.argument('<pr>', 'Number of the Pull Request to check')
.action(async (owner, repo, pr) => {
const commits = (await import('./commits.js')).default
run(commits, owner, repo, pr)
})
program
.command('labels')
.description('Manage labels on pull requests.')
.argument('<owner>', 'Owner of the GitHub repository to label (Example: NixOS)')
.argument('<repo>', 'Name of the GitHub repository to label (Example: nixpkgs)')
.argument('[pr]', 'Number of the Pull Request to label')
.option('--no-dry', 'Make actual modifications')
.action(async (owner, repo, pr, options) => {
const labels = (await import('./labels.js')).default
const tmp = mkdtempSync(join(tmpdir(), 'github-script-'))
try {
process.env.GITHUB_WORKSPACE = tmp
process.chdir(tmp)
run(labels, owner, repo, pr, options.dry)
} finally {
rmSync(tmp, { recursive: true })
}
})
await program.parse()

View File

@@ -1,25 +0,0 @@
{
system ? builtins.currentSystem,
pkgs ? (import ../. { inherit system; }).pkgs,
}:
pkgs.callPackage (
{
gh,
importNpmLock,
mkShell,
nodejs,
}:
mkShell {
packages = [
gh
importNpmLock.hooks.linkNodeModulesHook
nodejs
];
npmDeps = importNpmLock.buildNodeModules {
npmRoot = ./.;
inherit nodejs;
};
}
) { }

View File

@@ -1,63 +0,0 @@
module.exports = async function ({ github, core }, callback) {
const Bottleneck = require('bottleneck')
const stats = {
issues: 0,
prs: 0,
requests: 0,
artifacts: 0,
}
// Rate-Limiting and Throttling, see for details:
// https://github.com/octokit/octokit.js/issues/1069#throttling
// https://docs.github.com/en/rest/using-the-rest-api/best-practices-for-using-the-rest-api
const allLimits = new Bottleneck({
// Avoid concurrent requests
maxConcurrent: 1,
// Will be updated with first `updateReservoir()` call below.
reservoir: 0,
})
// Pause between mutative requests
const writeLimits = new Bottleneck({ minTime: 1000 }).chain(allLimits)
github.hook.wrap('request', async (request, options) => {
// Requests to a different host do not count against the rate limit.
if (options.url.startsWith('https://github.com')) return request(options)
// Requests to the /rate_limit endpoint do not count against the rate limit.
if (options.url == '/rate_limit') return request(options)
// Search requests are in a different resource group, which allows 30 requests / minute.
// We do less than a handful each run, so not implementing throttling for now.
if (options.url.startsWith('/search/')) return request(options)
stats.requests++
if (['POST', 'PUT', 'PATCH', 'DELETE'].includes(options.method))
return writeLimits.schedule(request.bind(null, options))
else return allLimits.schedule(request.bind(null, options))
})
async function updateReservoir() {
let response
try {
response = await github.rest.rateLimit.get()
} catch (err) {
core.error(`Failed updating reservoir:\n${err}`)
// Keep retrying on failed rate limit requests instead of exiting the script early.
return
}
// Always keep 1000 spare requests for other jobs to do their regular duty.
// They normally use below 100, so 1000 is *plenty* of room to work with.
const reservoir = Math.max(0, response.data.resources.core.remaining - 1000)
core.info(`Updating reservoir to: ${reservoir}`)
allLimits.updateSettings({ reservoir })
}
await updateReservoir()
// Update remaining requests every minute to account for other jobs running in parallel.
const reservoirUpdater = setInterval(updateReservoir, 60 * 1000)
try {
await callback(stats)
} finally {
clearInterval(reservoirUpdater)
core.notice(
`Processed ${stats.prs} PRs, ${stats.issues} Issues, made ${stats.requests + stats.artifacts} API requests and downloaded ${stats.artifacts} artifacts.`,
)
}
}

View File

@@ -1,53 +0,0 @@
{
lib,
nix,
nixpkgs-vet,
runCommand,
}:
{
base ? ../.,
head ? ../.,
}:
let
filtered =
with lib.fileset;
path:
toSource {
fileset = (gitTracked path);
root = path;
};
in
runCommand "nixpkgs-vet"
{
nativeBuildInputs = [
nixpkgs-vet
];
env.NIXPKGS_VET_NIX_PACKAGE = nix;
}
''
export NIX_STATE_DIR=$(mktemp -d)
nixpkgs-vet --base ${filtered base} ${filtered head}
# TODO: Upstream into nixpkgs-vet, see:
# https://github.com/NixOS/nixpkgs-vet/issues/164
badFiles=$(find ${filtered head}/pkgs -type f -name '*.nix' -print | xargs grep -l '^[^#]*<nixpkgs/' || true)
if [[ -n $badFiles ]]; then
echo "Nixpkgs is not allowed to use <nixpkgs> to refer to itself."
echo "The offending files:"
echo "$badFiles"
exit 1
fi
# TODO: Upstream into nixpkgs-vet, see:
# https://github.com/NixOS/nixpkgs-vet/issues/166
conflictingPaths=$(find ${filtered head} | awk '{ print $1 " " tolower($1) }' | sort -k2 | uniq -D -f 1 | cut -d ' ' -f 1)
if [[ -n $conflictingPaths ]]; then
echo "Files in nixpkgs must not vary only by case."
echo "The offending paths:"
echo "$conflictingPaths"
exit 1
fi
touch $out
''

View File

@@ -1,66 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p jq
set -o pipefail -o errexit -o nounset
trace() { echo >&2 "$@"; }
tmp=$(mktemp -d)
cleanup() {
# Don't exit early if anything fails to cleanup
set +o errexit
trace -n "Cleaning up.. "
[[ -e "$tmp/base" ]] && git worktree remove --force "$tmp/base"
[[ -e "$tmp/merged" ]] && git worktree remove --force "$tmp/merged"
rm -rf "$tmp"
trace "Done"
}
trap cleanup exit
repo=https://github.com/NixOS/nixpkgs.git
if (( $# != 0 )); then
baseBranch=$1
shift
else
trace "Usage: $0 BASE_BRANCH [REPOSITORY]"
trace "BASE_BRANCH: The base branch to use, e.g. master or release-23.11"
trace "REPOSITORY: The repository to fetch the base branch from, defaults to $repo"
exit 1
fi
if (( $# != 0 )); then
repo=$1
shift
fi
if [[ -n "$(git status --porcelain)" ]]; then
trace -e "\e[33mWarning: Dirty tree, uncommitted changes won't be taken into account\e[0m"
fi
headSha=$(git rev-parse HEAD)
trace -e "Using HEAD commit \e[34m$headSha\e[0m"
trace -n "Creating Git worktree for the HEAD commit in $tmp/merged.. "
git worktree add --detach -q "$tmp/merged" HEAD
trace "Done"
trace -n "Fetching base branch $baseBranch to compare against.. "
git fetch -q "$repo" refs/heads/"$baseBranch"
baseSha=$(git rev-parse FETCH_HEAD)
trace -e "\e[34m$baseSha\e[0m"
trace -n "Creating Git worktree for the base branch in $tmp/base.. "
git worktree add -q "$tmp/base" "$baseSha"
trace "Done"
trace -n "Merging base branch into the HEAD commit in $tmp/merged.. "
git -C "$tmp/merged" merge -q --no-edit "$baseSha"
trace -e "\e[34m$(git -C "$tmp/merged" rev-parse HEAD)\e[0m"
trace "Running nixpkgs-vet.."
nix-build ci -A nixpkgs-vet --arg base "$tmp/base" --arg head "$tmp/merged"

View File

@@ -1,43 +0,0 @@
{
lib,
nix,
runCommand,
}:
let
nixpkgs =
with lib.fileset;
toSource {
root = ../.;
fileset = (fileFilter (file: file.hasExt "nix") ../.);
};
in
runCommand "nix-parse-${nix.name}"
{
nativeBuildInputs = [
nix
];
}
''
export NIX_STORE_DIR=$TMPDIR/store
export NIX_STATE_DIR=$TMPDIR/state
cd "${nixpkgs}"
# Passes all files to nix-instantiate at once.
# Much faster, but will only show first error.
parse-all() {
find . -type f -iname '*.nix' | xargs -P $(nproc) nix-instantiate --parse >/dev/null 2>/dev/null
}
# Passes each file separately to nix-instantiate with -n1.
# Much slower, but will show all errors.
parse-each() {
find . -type f -iname '*.nix' | xargs -n1 -P $(nproc) nix-instantiate --parse >/dev/null
}
if ! parse-all; then
parse-each
fi
touch $out
''

View File

@@ -1,31 +0,0 @@
{
"pins": {
"nixpkgs": {
"type": "Git",
"repository": {
"type": "GitHub",
"owner": "NixOS",
"repo": "nixpkgs"
},
"branch": "nixpkgs-unstable",
"submodules": false,
"revision": "2baf8e1658cba84a032c3a8befb1e7b06629242a",
"url": "https://github.com/NixOS/nixpkgs/archive/2baf8e1658cba84a032c3a8befb1e7b06629242a.tar.gz",
"hash": "0l48zkf2zs7r53fjq46j770vpb5avxihyfypra3fv429akqnsmm1"
},
"treefmt-nix": {
"type": "Git",
"repository": {
"type": "GitHub",
"owner": "numtide",
"repo": "treefmt-nix"
},
"branch": "main",
"submodules": false,
"revision": "421b56313c65a0815a52b424777f55acf0b56ddf",
"url": "https://github.com/numtide/treefmt-nix/archive/421b56313c65a0815a52b424777f55acf0b56ddf.tar.gz",
"hash": "1l57hzz704s7izkkcl3xsg77xjfza57cl0fchs24rdpdhmry2dmp"
}
},
"version": 5
}

View File

@@ -1,44 +0,0 @@
{
lib,
stdenvNoCC,
makeWrapper,
coreutils,
codeowners,
jq,
curl,
github-cli,
gitMinimal,
}:
stdenvNoCC.mkDerivation {
name = "request-reviews";
src = lib.fileset.toSource {
root = ./.;
fileset = lib.fileset.unions [
./get-code-owners.sh
./request-reviewers.sh
./request-code-owner-reviews.sh
./verify-base-branch.sh
./dev-branches.txt
];
};
nativeBuildInputs = [ makeWrapper ];
dontBuild = true;
installPhase = ''
mkdir -p $out/bin
mv dev-branches.txt $out/bin
for bin in *.sh; do
mv "$bin" "$out/bin"
wrapProgram "$out/bin/$bin" \
--set PATH ${
lib.makeBinPath [
coreutils
codeowners
jq
curl
github-cli
gitMinimal
]
}
done
'';
}

View File

@@ -1,9 +0,0 @@
# Trusted development branches:
# These generally require PRs to update and are built by Hydra.
# Keep this synced with the branches in .github/workflows/eval.yml
master
staging
release-*
staging-*
haskell-updates
python-updates

View File

@@ -1,97 +0,0 @@
#!/usr/bin/env bash
# Get the code owners of the files changed by a PR, returning one username per line
set -euo pipefail
log() {
echo "$@" >&2
}
if (( "$#" < 4 )); then
log "Usage: $0 GIT_REPO OWNERS_FILE BASE_REF HEAD_REF"
exit 1
fi
gitRepo=$1
ownersFile=$2
baseRef=$3
headRef=$4
tmp=$(mktemp -d)
trap 'rm -rf "$tmp"' exit
git -C "$gitRepo" diff --name-only --merge-base "$baseRef" "$headRef" > "$tmp/touched-files"
readarray -t touchedFiles < "$tmp/touched-files"
log "This PR touches ${#touchedFiles[@]} files"
# Get the owners file from the base, because we don't want to allow PRs to
# remove code owners to avoid pinging them
git -C "$gitRepo" show "$baseRef":"$ownersFile" > "$tmp"/codeowners
# Associative array with the user as the key for easy de-duplication
# Make sure to always lowercase keys to avoid duplicates with different casings
declare -A users=()
for file in "${touchedFiles[@]}"; do
result=$(codeowners --file "$tmp"/codeowners "$file")
# Remove the file prefix and trim the surrounding spaces
read -r owners <<< "${result#"$file"}"
if [[ "$owners" == "(unowned)" ]]; then
log "File $file is unowned"
continue
fi
log "File $file is owned by $owners"
# Split up multiple owners, separated by arbitrary amounts of spaces
IFS=" " read -r -a entries <<< "$owners"
for entry in "${entries[@]}"; do
# GitHub technically also supports Emails as code owners,
# but we can't easily support that, so let's not
if [[ ! "$entry" =~ @(.*) ]]; then
warn -e "\e[33mCodeowner \"$entry\" for file $file is not valid: Must start with \"@\"\e[0m" >&2
# Don't fail, because the PR for which this script runs can't fix it,
# it has to be fixed in the base branch
continue
fi
# The first regex match is everything after the @
entry=${BASH_REMATCH[1]}
if [[ "$entry" =~ (.*)/(.*) ]]; then
# Teams look like $org/$team
org=${BASH_REMATCH[1]}
team=${BASH_REMATCH[2]}
# Instead of requesting a review from the team itself,
# we request reviews from the individual users.
# This is because once somebody from a team reviewed the PR,
# the API doesn't expose that the team was already requested for a review,
# so we wouldn't be able to avoid rerequesting reviews
# without saving some some extra state somewhere
# We could also consider implementing a more advanced heuristic
# in the future that e.g. only pings one team member,
# but escalates to somebody else if that member doesn't respond in time.
gh api \
--cache=1h \
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2022-11-28" \
"/orgs/$org/teams/$team/members" \
--jq '.[].login' > "$tmp/team-members"
readarray -t members < "$tmp/team-members"
log "Team $entry has these members: ${members[*]}"
for user in "${members[@]}"; do
users[${user,,}]=
done
else
# Everything else is a user
users[${entry,,}]=
fi
done
done
printf "%s\n" "${!users[@]}"

View File

@@ -1,82 +0,0 @@
#!/usr/bin/env bash
# Requests reviews for a PR after verifying that the base branch is correct
set -euo pipefail
tmp=$(mktemp -d)
trap 'rm -rf "$tmp"' exit
SCRIPT_DIR=$(dirname "$0")
log() {
echo "$@" >&2
}
effect() {
if [[ -n "${DRY_MODE:-}" ]]; then
log "Skipping in dry mode:" "${@@Q}"
else
"$@"
fi
}
if (( $# < 3 )); then
log "Usage: $0 GITHUB_REPO PR_NUMBER OWNERS_FILE"
exit 1
fi
baseRepo=$1
prNumber=$2
ownersFile=$3
log "Fetching PR info"
prInfo=$(gh api \
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2022-11-28" \
"/repos/$baseRepo/pulls/$prNumber")
baseBranch=$(jq -r .base.ref <<< "$prInfo")
log "Base branch: $baseBranch"
prRepo=$(jq -r .head.repo.full_name <<< "$prInfo")
log "PR repo: $prRepo"
prBranch=$(jq -r .head.ref <<< "$prInfo")
log "PR branch: $prBranch"
prAuthor=$(jq -r .user.login <<< "$prInfo")
log "PR author: $prAuthor"
extraArgs=()
if pwdRepo=$(git rev-parse --show-toplevel 2>/dev/null); then
# Speedup for local runs
extraArgs+=(--reference-if-able "$pwdRepo")
fi
log "Fetching Nixpkgs commit history"
# We only need the commit history, not the contents, so we can do a tree-less clone using tree:0
# https://github.blog/open-source/git/get-up-to-speed-with-partial-clone-and-shallow-clone/#user-content-quick-summary
git clone --bare --filter=tree:0 --no-tags --origin upstream "${extraArgs[@]}" https://github.com/"$baseRepo".git "$tmp"/nixpkgs.git
log "Fetching the PR commit history"
# Fetch the PR
git -C "$tmp/nixpkgs.git" remote add fork https://github.com/"$prRepo".git
# This remote config is the same as --filter=tree:0 when cloning
git -C "$tmp/nixpkgs.git" config remote.fork.partialclonefilter tree:0
git -C "$tmp/nixpkgs.git" config remote.fork.promisor true
git -C "$tmp/nixpkgs.git" fetch --no-tags fork "$prBranch"
headRef=$(git -C "$tmp/nixpkgs.git" rev-parse refs/remotes/fork/"$prBranch")
log "Checking correctness of the base branch"
if ! "$SCRIPT_DIR"/verify-base-branch.sh "$tmp/nixpkgs.git" "$headRef" "$baseRepo" "$baseBranch" "$prRepo" "$prBranch" | tee "$tmp/invalid-base-error" >&2; then
log "Posting error as comment"
if ! response=$(effect gh api \
--method POST \
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2022-11-28" \
"/repos/$baseRepo/issues/$prNumber/comments" \
-F "body=@$tmp/invalid-base-error"); then
log "Failed to post the comment: $response"
fi
exit 1
fi
log "Requesting reviews from code owners"
"$SCRIPT_DIR"/get-code-owners.sh "$tmp/nixpkgs.git" "$ownersFile" "$baseBranch" "$headRef" | \
"$SCRIPT_DIR"/request-reviewers.sh "$baseRepo" "$prNumber" "$prAuthor"

View File

@@ -1,88 +0,0 @@
#!/usr/bin/env bash
# Request reviewers for a PR, reading line-separated usernames on stdin,
# filtering for valid reviewers before using the API endpoint to request reviews:
# https://docs.github.com/en/rest/pulls/review-requests?apiVersion=2022-11-28#request-reviewers-for-a-pull-request
set -euo pipefail
tmp=$(mktemp -d)
trap 'rm -rf "$tmp"' exit
log() {
echo "$@" >&2
}
effect() {
if [[ -n "${DRY_MODE:-}" ]]; then
log "Skipping in dry mode:" "${@@Q}"
else
"$@"
fi
}
if (( "$#" < 3 )); then
log "Usage: $0 BASE_REPO PR_NUMBER PR_AUTHOR"
exit 1
fi
baseRepo=$1
prNumber=$2
prAuthor=$3
tmp=$(mktemp -d)
trap 'rm -rf "$tmp"' exit
declare -A users=()
while read -r handle && [[ -n "$handle" ]]; do
users[${handle,,}]=
done
# Cannot request a review from the author
if [[ -v users[${prAuthor,,}] ]]; then
log "One or more files are owned by the PR author, ignoring"
unset 'users[${prAuthor,,}]'
fi
gh api \
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2022-11-28" \
"/repos/$baseRepo/pulls/$prNumber/reviews" \
--jq '.[].user.login' > "$tmp/already-reviewed-by"
# And we don't want to rerequest reviews from people who already reviewed
while read -r user; do
if [[ -v users[${user,,}] ]]; then
log "User $user is a potential reviewer, but has already left a review, ignoring"
unset 'users[${user,,}]'
fi
done < "$tmp/already-reviewed-by"
for user in "${!users[@]}"; do
if ! gh api \
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2022-11-28" \
"/repos/$baseRepo/collaborators/$user" >&2; then
log "User $user is not a repository collaborator, probably missed the automated invite to the maintainers team (see <https://github.com/NixOS/nixpkgs/issues/234293>), ignoring"
unset 'users[$user]'
fi
done
if [[ "${#users[@]}" -gt 10 ]]; then
log "Too many reviewers (${!users[*]}), skipping review requests"
exit 0
fi
for user in "${!users[@]}"; do
log "Requesting review from: $user"
if ! response=$(jq -n --arg user "$user" '{ reviewers: [ $user ] }' | \
effect gh api \
--method POST \
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2022-11-28" \
"/repos/$baseRepo/pulls/$prNumber/requested_reviewers" \
--input -); then
log "Failed to request review from $user: $response"
fi
done

View File

@@ -1,104 +0,0 @@
#!/usr/bin/env bash
# Check that a PR doesn't include commits from other development branches.
# Fails with next steps if it does
set -euo pipefail
tmp=$(mktemp -d)
trap 'rm -rf "$tmp"' exit
SCRIPT_DIR=$(dirname "$0")
log() {
echo "$@" >&2
}
# Small helper to check whether an element is in a list
# Usage: `elementIn foo "${list[@]}"`
elementIn() {
local e match=$1
shift
for e; do
if [[ "$e" == "$match" ]]; then
return 0
fi
done
return 1
}
if (( $# < 6 )); then
log "Usage: $0 LOCAL_REPO HEAD_REF BASE_REPO BASE_BRANCH PR_REPO PR_BRANCH"
exit 1
fi
localRepo=$1
headRef=$2
baseRepo=$3
baseBranch=$4
prRepo=$5
prBranch=$6
# All development branches
devBranchPatterns=()
while read -r pattern; do
if [[ "$pattern" != '#'* ]]; then
devBranchPatterns+=("$pattern")
fi
done < "$SCRIPT_DIR/dev-branches.txt"
git -C "$localRepo" branch --list --format "%(refname:short)" "${devBranchPatterns[@]}" > "$tmp/dev-branches"
readarray -t devBranches < "$tmp/dev-branches"
if [[ "$baseRepo" == "$prRepo" ]] && elementIn "$prBranch" "${devBranches[@]}"; then
log "This PR merges $prBranch into $baseBranch, no commit check necessary"
exit 0
fi
# The current merge base of the PR
prMergeBase=$(git -C "$localRepo" merge-base "$baseBranch" "$headRef")
log "The PR's merge base with the base branch $baseBranch is $prMergeBase"
# This is purely for debugging
git -C "$localRepo" rev-list --reverse "$baseBranch".."$headRef" > "$tmp/pr-commits"
log "The PR includes these $(wc -l < "$tmp/pr-commits") commits:"
cat <"$tmp/pr-commits" >&2
for testBranch in "${devBranches[@]}"; do
if [[ -z "$(git -C "$localRepo" rev-list -1 --since="1 month ago" "$testBranch")" ]]; then
log "Not checking $testBranch, was inactive for the last month"
continue
fi
log "Checking if commits from $testBranch are included in the PR"
# We need to check for any commits that are in the PR which are also in the test branch.
# We could check each commit from the PR individually, but that's unnecessarily slow.
#
# This does _almost_ what we want: `git rev-list --count headRef testBranch ^baseBranch`,
# except that it includes commits that are reachable from _either_ headRef or testBranch,
# instead of restricting it to ones reachable by both
# Easily fixable though, because we can use `git merge-base testBranch headRef`
# to get the least common ancestor (aka merge base) commit reachable by both.
# If the branch being tested is indeed the right base branch,
# this is then also the commit from that branch that the PR is based on top of.
testMergeBase=$(git -C "$localRepo" merge-base "$testBranch" "$headRef")
# And then use the `git rev-list --count`, but replacing the non-working
# `headRef testBranch` with the merge base of the two.
extraCommits=$(git -C "$localRepo" rev-list --count "$testMergeBase" ^"$baseBranch")
if (( extraCommits != 0 )); then
log -e "\e[33m"
echo "The PR's base branch is set to $baseBranch, but $extraCommits commits from the $testBranch branch are included. Make sure you know the [right base branch for your changes](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#branch-conventions), then:"
echo "- If the changes should go to the $testBranch branch, [change the base branch](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-base-branch-of-a-pull-request) to $testBranch"
echo "- If the changes should go to the $baseBranch branch, rebase your PR onto the merge base with the $baseBranch branch:"
echo " \`\`\`bash"
echo " # git rebase --onto \$(git merge-base upstream/$baseBranch HEAD) \$(git merge-base upstream/$testBranch HEAD)"
echo " git rebase --onto $prMergeBase $testMergeBase"
echo " git push --force-with-lease"
echo " \`\`\`"
log -e "\e[m"
exit 1
fi
done
log "Base branch is correct, no commits from development branches are included"

View File

@@ -1,62 +0,0 @@
#!/usr/bin/env nix-shell
/*
#!nix-shell -i node -p nodejs
*/
const typeConfig = {
master: ['development', 'primary'],
release: ['development', 'primary'],
staging: ['development', 'secondary'],
'staging-next': ['development', 'secondary'],
'haskell-updates': ['development', 'secondary'],
'python-updates': ['development', 'secondary'],
nixos: ['channel'],
nixpkgs: ['channel'],
}
function split(branch) {
return { ...branch.match(/(?<prefix>.+?)(-(?<version>\d{2}\.\d{2}|unstable)(?:-(?<suffix>.*))?)?$/).groups }
}
function classify(branch) {
const { prefix, version } = split(branch)
return {
stable: (version ?? 'unstable') !== 'unstable',
type: typeConfig[prefix] ?? [ 'wip' ]
}
}
module.exports = { classify }
// If called directly via CLI, runs the following tests:
if (!module.parent) {
console.log('split(branch)')
function testSplit(branch) {
console.log(branch, split(branch))
}
testSplit('master')
testSplit('release-25.05')
testSplit('staging-next')
testSplit('staging-25.05')
testSplit('staging-next-25.05')
testSplit('nixpkgs-25.05-darwin')
testSplit('nixpkgs-unstable')
testSplit('haskell-updates')
testSplit('backport-123-to-release-25.05')
console.log('')
console.log('classify(branch)')
function testClassify(branch) {
console.log(branch, classify(branch))
}
testClassify('master')
testClassify('release-25.05')
testClassify('staging-next')
testClassify('staging-25.05')
testClassify('staging-next-25.05')
testClassify('nixpkgs-25.05-darwin')
testClassify('nixpkgs-unstable')
testClassify('haskell-updates')
testClassify('backport-123-to-release-25.05')
}

View File

@@ -1,6 +0,0 @@
[
"aarch64-linux",
"aarch64-darwin",
"x86_64-linux",
"x86_64-darwin"
]

View File

@@ -1,8 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p npins
set -euo pipefail
cd "$(dirname "${BASH_SOURCE[0]}")"
npins --lock-file pinned.json update

View File

@@ -1,8 +1,6 @@
let
requiredVersion = import ./lib/minver.nix;
in
let requiredVersion = import ./lib/minver.nix; in
if !builtins ? nixVersion || builtins.compareVersions requiredVersion builtins.nixVersion == 1 then
if ! builtins ? nixVersion || builtins.compareVersions requiredVersion builtins.nixVersion == 1 then
abort ''
@@ -16,11 +14,11 @@ if !builtins ? nixVersion || builtins.compareVersions requiredVersion builtins.n
- If you installed Nix using the install script (https://nixos.org/nix/install),
it is safe to upgrade by running it again:
curl -L https://nixos.org/nix/install | sh
curl https://nixos.org/nix/install | sh
For more information, please see the NixOS release notes at
https://nixos.org/nixos/manual or locally at
${toString ./nixos/doc/manual/release-notes}.
${toString ./doc/manual/release-notes}.
If you need further help, see https://nixos.org/nixos/support.html
''

7
doc/.gitignore vendored Normal file
View File

@@ -0,0 +1,7 @@
*.chapter.xml
*.section.xml
.version
out
manual-full.xml
highlightjs
functions/library/locations.xml

104
doc/Makefile Normal file
View File

@@ -0,0 +1,104 @@
MD_TARGETS=$(addsuffix .xml, $(basename $(wildcard ./*.md ./**/*.md)))
.PHONY: all
all: validate format out/html/index.html out/epub/manual.epub
.PHONY: debug
debug:
nix-shell --run "xmloscopy --docbook5 ./manual.xml ./manual-full.xml"
.PHONY: format
format:
find . -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \
xmlformat --config-file "$$XMLFORMAT_CONFIG" -i {}
.PHONY: fix-misc-xml
fix-misc-xml:
find . -iname '*.xml' -type f \
-exec ../nixos/doc/varlistentry-fixer.rb {} ';'
.PHONY: clean
clean:
rm -f ${MD_TARGETS} .version manual-full.xml functions/library/locations.xml
rm -rf ./out/ ./highlightjs
.PHONY: validate
validate: manual-full.xml
jing "$$RNG" manual-full.xml
out/html/index.html: manual-full.xml style.css highlightjs
mkdir -p out/html
xsltproc ${xsltFlags} \
--nonet --xinclude \
--output $@ \
"$$XSL/docbook/xhtml/docbook.xsl" \
./manual-full.xml
mkdir -p out/html/highlightjs/
cp -r highlightjs out/html/
cp ./overrides.css out/html/
cp ./style.css out/html/style.css
mkdir -p out/html/images/callouts
cp "$$XSL/docbook/images/callouts/"*.svg out/html/images/callouts/
chmod u+w -R out/html/
out/epub/manual.epub: manual-full.xml
mkdir -p out/epub/scratch
xsltproc ${xsltFlags} --nonet \
--output out/epub/scratch/ \
"$$XSL/docbook/epub/docbook.xsl" \
./manual-full.xml
cp ./overrides.css out/epub/scratch/OEBPS
cp ./style.css out/epub/scratch/OEBPS
mkdir -p out/epub/scratch/OEBPS/images/callouts/
cp "$$XSL/docbook/images/callouts/"*.svg out/epub/scratch/OEBPS/images/callouts/
echo "application/epub+zip" > mimetype
zip -0Xq "out/epub/manual.epub" mimetype
rm mimetype
cd "out/epub/scratch/" && zip -Xr9D "../manual.epub" *
rm -rf "out/epub/scratch/"
highlightjs:
mkdir -p highlightjs
cp -r "$$HIGHLIGHTJS/highlight.pack.js" highlightjs/
cp -r "$$HIGHLIGHTJS/LICENSE" highlightjs/
cp -r "$$HIGHLIGHTJS/mono-blue.css" highlightjs/
cp -r "$$HIGHLIGHTJS/loader.js" highlightjs/
manual-full.xml: ${MD_TARGETS} .version functions/library/locations.xml *.xml **/*.xml **/**/*.xml
xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml
.version:
nix-instantiate --eval \
-E '(import ../lib).version' > .version
functions/library/locations.xml:
nix-build ./lib-function-locations.nix \
--out-link ./functions/library/locations.xml
%.section.xml: %.section.md
pandoc $^ -w docbook+smart \
-f markdown+smart \
| sed -e 's|<ulink url=|<link xlink:href=|' \
-e 's|</ulink>|</link>|' \
-e 's|<sect. id=|<section xml:id=|' \
-e 's|</sect[0-9]>|</section>|' \
-e '1s| id=| xml:id=|' \
-e '1s|\(<[^ ]* \)|\1xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" |' \
| cat > $@
%.chapter.xml: %.chapter.md
pandoc $^ -w docbook+smart \
--top-level-division=chapter \
-f markdown+smart \
| sed -e 's|<ulink url=|<link xlink:href=|' \
-e 's|</ulink>|</link>|' \
-e 's|<sect. id=|<section xml:id=|' \
-e 's|</sect[0-9]>|</section>|' \
-e '1s| id=| xml:id=|' \
-e '1s|\(<[^ ]* \)|\1|' \
| cat > $@

View File

@@ -1,422 +0,0 @@
# Contributing to the Nixpkgs reference manual
This directory houses the sources files for the Nixpkgs reference manual.
> [!IMPORTANT]
> We are actively restructuring our documentation to follow the [Diátaxis framework](https://diataxis.fr/)
>
> Going forward, this directory should **only** contain [reference documentation](https://nix.dev/contributing/documentation/diataxis#reference).
> For tutorials, guides and explanations, contribute to <https://nix.dev/> instead.
>
> We are actively working to generate **all** reference documentation from the [doc-comments](https://github.com/NixOS/rfcs/blob/master/rfcs/0145-doc-strings.md) present in code.
> This also provides the benefit of using `:doc` in the `nix repl` to view reference documentation locally on the fly.
For documentation only relevant for contributors, use Markdown files next to the source and regular code comments.
> [!TIP]
> Feedback for improving support for parsing and rendering doc-comments is highly appreciated.
> [Open an issue](https://github.com/NixOS/nixpkgs/issues/new?labels=6.topic%3A+documentation&title=Doc%3A+) to request bugfixes or new features.
Rendered documentation:
- [Unstable (from master)](https://nixos.org/manual/nixpkgs/unstable/)
- [Stable (from latest release)](https://nixos.org/manual/nixpkgs/stable/)
The rendering tool is [nixos-render-docs](../pkgs/by-name/ni/nixos-render-docs), sometimes abbreviated `nrd`.
## Contributing to this documentation
You can quickly check your edits with `nix-build`:
```ShellSession
$ cd /path/to/nixpkgs
$ nix-build doc
```
If the build succeeds, the manual will be in `./result/share/doc/nixpkgs/manual.html`.
### Development environment
In order to reduce repetition, consider using tools from the provided development environment:
Load it from the Nixpkgs documentation directory with
```ShellSession
$ cd /path/to/nixpkgs/doc
$ nix-shell
```
To load the development utilities automatically when entering that directory, [set up `nix-direnv`](https://nix.dev/guides/recipes/direnv).
Make sure that your local files aren't added to Git history by adding the following lines to `.git/info/exclude` at the root of the Nixpkgs repository:
```
/**/.envrc
/**/.direnv
```
#### `devmode`
Use [`devmode`](../pkgs/by-name/de/devmode/README.md) for a live preview when editing the manual.
### Testing redirects
Once you have a successful build, you can open the relevant HTML (path mentioned above) in a browser along with the anchor, and observe the redirection.
Note that if you already loaded the page and *then* input the anchor, you will need to perform a reload.
This is because browsers do not re-run client JS code when only the anchor has changed.
## Syntax
As per [RFC 0072](https://github.com/NixOS/rfcs/pull/72), all new documentation content should be written in [CommonMark](https://commonmark.org/) Markdown dialect.
Additional syntax extensions are available, all of which can be used in NixOS option documentation.
The following extensions are currently used:
#### Tables
Tables, using the [GitHub-flavored Markdown syntax](https://github.github.com/gfm/#tables-extension-).
#### Anchors
Explicitly defined **anchors** on headings, to allow linking to sections.
These should be always used, to ensure the anchors can be linked even when the heading text changes, and to prevent conflicts between [automatically assigned identifiers](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/auto_identifiers.md).
It uses the widely compatible [header attributes](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/attributes.md) syntax:
```markdown
## Syntax {#sec-contributing-markup}
```
> [!Note]
> NixOS option documentation does not support headings in general.
#### Inline Anchors
Allow linking arbitrary place in the text (e.g. individual list items, sentences…).
They are defined using a hybrid of the link syntax with the attributes syntax known from headings, called [bracketed spans](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/bracketed_spans.md):
```markdown
- []{#ssec-gnome-hooks-glib} `glib` setup hook will populate `GSETTINGS_SCHEMAS_PATH` and then `wrapGApps*` hook will prepend it to `XDG_DATA_DIRS`.
```
#### Automatic links
If you **omit a link text** for a link pointing to a section, the text will be substituted automatically.
For example `[](#chap-contributing)`.
This syntax is taken from [MyST](https://myst-parser.readthedocs.io/en/latest/using/syntax.html#targets-and-cross-referencing).
#### HTML
Inlining HTML is not allowed.
Parts of the documentation gets rendered to various non-HTML formats, such as man pages in the case of NixOS manual.
#### Roles
If you want to link to a man page, you can use `` {manpage}`nix.conf(5)` ``.
The references will turn into links when a mapping exists in [`doc/manpage-urls.json`](./manpage-urls.json).
Please keep the `manpage-urls.json` file alphabetically sorted.
A few markups for other kinds of literals are also available:
- `` {command}`rm -rfi` ``
- `` {env}`XDG_DATA_DIRS` ``
- `` {file}`/etc/passwd` ``
- `` {option}`networking.useDHCP` ``
- `` {var}`/etc/passwd` ``
These literal kinds are used mostly in NixOS option documentation.
This syntax is taken from [MyST](https://myst-parser.readthedocs.io/en/latest/syntax/syntax.html#roles-an-in-line-extension-point).
Though, the feature originates from [reStructuredText](https://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html#role-manpage) with slightly different syntax.
They are handled by `myst_role` defined per renderer. <!-- reverse references in code -->
#### Admonitions
Set off from the text to bring attention to something.
It uses pandocs [fenced `div`s syntax](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/fenced_divs.md):
```markdown
::: {.warning}
This is a warning
:::
```
The following are supported:
- `caution`
- `important`
- `note`
- `tip`
- `warning`
- `example`
Example admonitions require a title to work.
If you don't provide one, the manual won't be built.
```markdown
::: {.example #ex-showing-an-example}
# Title for this example
Text for the example.
:::
```
#### [Definition lists](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/definition_lists.md)
For defining a group of terms:
```markdown
pear
: green or yellow bulbous fruit
watermelon
: green fruit with red flesh
```
## Commit conventions
- Make sure you read about the [commit conventions](../CONTRIBUTING.md#commit-conventions) common to Nixpkgs as a whole.
- If creating a commit purely for documentation changes, format the commit message in the following way:
```
doc: (documentation summary)
(Motivation for change, relevant links, additional information.)
```
Examples:
* doc: update the kernel config documentation to use `nix-shell`
* doc: add information about `nix-update-script`
Closes #216321.
- If the commit contains more than just documentation changes, follow the commit message format relevant for the rest of the changes.
## Documentation conventions
In an effort to keep the Nixpkgs manual in a consistent style, please follow the conventions below, unless they prevent you from properly documenting something.
In that case, please open an issue about the particular documentation convention and tag it with a "needs: documentation" label.
When needed, each convention explain why it exists, so you can make a decision whether to follow it or not based on your particular case.
Note that these conventions are about the **structure** of the manual (and its source files), not about the content that goes in it.
You, as the writer of documentation, are still in charge of its content.
### One sentence per line
Put each sentence in its own line.
This makes reviews and suggestions much easier, since GitHub's review system is based on lines.
It also helps identifying long sentences at a glance.
### Callouts and examples
Use the [admonition syntax](#admonitions) for callouts and examples.
### Provide self-contained examples
Provide at least one example per function, and make examples self-contained.
This is easier to understand for beginners.
It also helps with testing that it actually works especially once we introduce automation.
Example code should be such that it can be passed to `pkgs.callPackage`.
Instead of something like:
```nix
pkgs.dockerTools.buildLayeredImage {
name = "hello";
contents = [ pkgs.hello ];
}
```
Write something like:
```nix
{ dockerTools, hello }:
dockerTools.buildLayeredImage {
name = "hello";
contents = [ hello ];
}
```
### REPLs
When showing inputs/outputs of any [REPL](https://en.wikipedia.org/wiki/Read%E2%80%93eval%E2%80%93print_loop), such as a shell or the Nix REPL, use a format as you'd see in the REPL, while trying to visually separate inputs from outputs.
This means that for a shell, you should use a format like the following:
```shell
$ nix-build -A hello '<nixpkgs>' \
--option require-sigs false \
--option trusted-substituters file:///tmp/hello-cache \
--option substituters file:///tmp/hello-cache
/nix/store/zhl06z4lrfrkw5rp0hnjjfrgsclzvxpm-hello-2.12.1
```
Note how the input is preceded by `$` on the first line and indented on subsequent lines, and how the output is provided as you'd see on the shell.
For the Nix REPL, you should use a format like the following:
```shell
nix-repl> builtins.attrNames { a = 1; b = 2; }
[ "a" "b" ]
```
Note how the input is preceded by `nix-repl>` and the output is provided as you'd see on the Nix REPL.
### Headings for inputs, outputs and examples
When documenting functions or anything that has inputs/outputs and example usage, use nested headings to clearly separate inputs, outputs, and examples.
Keep examples as the last nested heading, and link to the examples wherever applicable in the documentation.
The purpose of this convention is to provide a familiar structure for navigating the manual, so any reader can expect to find content related to inputs in an "inputs" heading, examples in an "examples" heading, and so on.
An example:
```
## buildImage
Some explanation about the function here.
Describe a particular scenario, and point to [](#ex-dockerTools-buildImage), which is an example demonstrating it.
### Inputs
Documentation for the inputs of `buildImage`.
Perhaps even point to [](#ex-dockerTools-buildImage) again when talking about something specifically linked to it.
### Passthru outputs
Documentation for any passthru outputs of `buildImage`.
### Examples
Note that this is the last nested heading in the `buildImage` section.
:::{.example #ex-dockerTools-buildImage}
# Using `buildImage`
Example of how to use `buildImage` goes here.
:::
```
### Function arguments
Use [definition lists](#definition-lists) to document function arguments, and the attributes of such arguments as well as their [types](https://nixos.org/manual/nix/stable/language/values).
For example:
```markdown
# pkgs.coolFunction {#pkgs.coolFunction}
`pkgs.coolFunction` *`name`* *`config`*
Description of what `callPackage` does.
## Inputs {#pkgs-coolFunction-inputs}
If something's special about `coolFunction`'s general argument handling, you can say so here.
Otherwise, just describe the single argument or start the arguments' definition list without introduction.
*`name`* (String)
: The name of the resulting image.
*`config`* (Attribute set)
: Introduce the parameter. Maybe you have a test to make sure `{ }` is a sensible default; then you can say: these attributes are optional; `{ }` is a valid argument.
`outputHash` (String; _optional_)
: A brief explanation including when and when not to pass this attribute.
: _Default:_ the output path's hash.
```
Checklist:
- Start with a synopsis, to show the order of positional arguments.
- Metavariables are in emphasized code spans: ``` *`arg1`* ```.
Metavariables are placeholders where users may write arbitrary expressions.
This includes positional arguments.
- Attribute names are regular code spans: ``` `attr1` ```.
These identifiers can _not_ be picked freely by users, so they are _not_ metavariables.
- _optional_ attributes have a _`Default:`_ if it's easily described as a value.
- _optional_ attributes have a _`Default behavior:`_ if it's not easily described using a value.
- Nix types aren't in code spans, because they are not code
- Nix types are capitalized, to distinguish them from the camelCase Module System types, which _are_ code and behave like functions.
#### Examples
To define a referenceable figure use the following fencing:
```markdown
:::{.example #an-attribute-set-example}
# An attribute set example
You can add text before
```nix
{ a = 1; b = 2;}
```
and after code fencing
:::
```
Defining examples through the `example` fencing class adds them to a "List of Examples" section after the Table of Contents.
Though this is not shown in the rendered documentation on nixos.org.
#### Figures
To define a referenceable figure use the following fencing:
```markdown
::: {.figure #nixos-logo}
# NixOS Logo
![NixOS logo](./nixos_logo.png)
:::
```
Defining figures through the `figure` fencing class adds them to a `List of Figures` after the `Table of Contents`.
Though this is not shown in the rendered documentation on nixos.org.
#### Footnotes
To add a foonote explanation, use the following syntax:
```markdown
Sometimes it's better to add context [^context] in a footnote.
[^context]: This explanation will be rendered at the end of the chapter.
```
#### Inline comments
Inline comments are supported with following syntax:
```markdown
<!-- This is an inline comment -->
```
The comments will not be rendered in the rendered HTML.
#### Link reference definitions
Links can reference a label, for example, to make the link target reusable:
```markdown
::: {.note}
Reference links can also be used to [shorten URLs][url-id] and keep the markdown readable.
:::
[url-id]: https://github.com/NixOS/nixpkgs/blob/19d4f7dc485f74109bd66ef74231285ff797a823/doc/README.md
```
This syntax is taken from [CommonMark](https://spec.commonmark.org/0.30/#link-reference-definitions).
#### Typographic replacements
Typographic replacements are enabled.
Check the [list of possible replacement patterns check](https://github.com/executablebooks/markdown-it-py/blob/3613e8016ecafe21709471ee0032a90a4157c2d1/markdown_it/rules_core/replacements.py#L1-L15).
## Getting help
If you need documentation-specific help or reviews, ping [@NixOS/documentation-team](https://github.com/orgs/nixos/teams/documentation-team) on your pull request.

View File

@@ -1,3 +0,0 @@
document.addEventListener('DOMContentLoaded', function(event) {
anchors.add('h1[id]:not(div.note h1, div.warning h1, div.tip h1, div.caution h1, div.important h1), h2[id]:not(div.note h2, div.warning h2, div.tip h2, div.caution h2, div.important h2), h3[id]:not(div.note h3, div.warning h3, div.tip h3, div.caution h3, div.important h3), h4[id]:not(div.note h4, div.warning h4, div.tip h4, div.caution h4, div.important h4), h5[id]:not(div.note h5, div.warning h5, div.tip h5, div.caution h5, div.important h5), h6[id]:not(div.note h6, div.warning h6, div.tip h6, div.caution h6, div.important h6)');
});

9
doc/anchor.min.js vendored

File diff suppressed because one or more lines are too long

View File

@@ -1,30 +0,0 @@
# Build helpers {#part-builders}
A build helper is a function that produces derivations.
:::{.warning}
This is not to be confused with the [`builder` argument of the Nix `derivation` primitive](https://nixos.org/manual/nix/unstable/language/derivations.html), which refers to the executable that produces the build result, or [remote builder](https://nixos.org/manual/nix/stable/advanced-topics/distributed-builds.html), which refers to a remote machine that could run such an executable.
:::
Such a function is usually designed to abstract over a typical workflow for a given programming language or framework.
This allows declaring a build recipe by setting a limited number of options relevant to the particular use case instead of using the `derivation` function directly.
[`stdenv.mkDerivation`](#part-stdenv) is the most widely used build helper, and serves as a basis for many others.
In addition, it offers various options to customize parts of the builds.
There is no uniform interface for build helpers.
[Trivial build helpers](#chap-trivial-builders) and [fetchers](#chap-pkgs-fetchers) have various input types for convenience.
[Language- or framework-specific build helpers](#chap-language-support) usually follow the style of `stdenv.mkDerivation`, which accepts an attribute set or a fixed-point function taking an attribute set.
```{=include=} chapters
build-helpers/fixed-point-arguments.chapter.md
build-helpers/fetchers.chapter.md
build-helpers/trivial-build-helpers.chapter.md
build-helpers/testers.chapter.md
build-helpers/dev-shell-tools.chapter.md
build-helpers/special.md
build-helpers/images.md
hooks/index.md
languages-frameworks/index.md
packages/index.md
```

View File

@@ -1,84 +0,0 @@
# Development Shell helpers {#chap-devShellTools}
The `nix-shell` command has popularized the concept of transient shell environments for development or testing purposes.
<!--
We should try to document the product, not its development process in the Nixpkgs reference manual,
but *something* needs to be said to provide context for this library.
This is the most future proof sentence I could come up with while Nix itself does yet make use of this.
Relevant is the current status of the devShell attribute "project": https://github.com/NixOS/nix/issues/7501
-->
However, `nix-shell` is not the only way to create such environments, and even `nix-shell` itself can indirectly benefit from this library.
This library provides a set of functions that help create such environments.
## `devShellTools.valueToString` {#sec-devShellTools-valueToString}
Converts Nix values to strings in the way the [`derivation` built-in function](https://nix.dev/manual/nix/2.23/language/derivations) does.
:::{.example}
## `valueToString` usage examples
```nix
devShellTools.valueToString (builtins.toFile "foo" "bar")
# => "/nix/store/...-foo"
```
```nix
devShellTools.valueToString false
# => ""
```
:::
## `devShellTools.unstructuredDerivationInputEnv` {#sec-devShellTools-unstructuredDerivationInputEnv}
Convert a set of derivation attributes (as would be passed to [`derivation`]) to a set of environment variables that can be used in a shell script.
This function does not support `__structuredAttrs`, but does support `passAsFile`.
:::{.example}
## `unstructuredDerivationInputEnv` usage example
```nix
devShellTools.unstructuredDerivationInputEnv {
drvAttrs = {
name = "foo";
buildInputs = [
hello
figlet
];
builder = bash;
args = [
"-c"
"${./builder.sh}"
];
};
}
# => {
# name = "foo";
# buildInputs = "/nix/store/...-hello /nix/store/...-figlet";
# builder = "/nix/store/...-bash";
#}
```
Note that `args` is not included, because Nix does not added it to the builder process environment.
:::
## `devShellTools.derivationOutputEnv` {#sec-devShellTools-derivationOutputEnv}
Takes the relevant parts of a derivation and returns a set of environment variables, that would be present in the derivation.
:::{.example}
## `derivationOutputEnv` usage example
```nix
let
pkg = hello;
in
devShellTools.derivationOutputEnv {
outputList = pkg.outputs;
outputMap = pkg;
}
```
:::

View File

@@ -1,949 +0,0 @@
# Fetchers {#chap-pkgs-fetchers}
Building software with Nix often requires downloading source code and other files from the internet.
To this end, we use functions that we call _fetchers_, which obtain remote sources via various protocols and services.
Nix provides built-in fetchers such as [`builtins.fetchTarball`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-fetchTarball).
Nixpkgs provides its own fetchers, which work differently:
- A built-in fetcher will download and cache files at evaluation time and produce a [store path](https://nixos.org/manual/nix/stable/glossary#gloss-store-path).
A Nixpkgs fetcher will create a ([fixed-output](https://nixos.org/manual/nix/stable/glossary#gloss-fixed-output-derivation)) [derivation](https://nixos.org/manual/nix/stable/glossary#gloss-derivation), and files are downloaded at build time.
- Built-in fetchers will invalidate their cache after [`tarball-ttl`](https://nixos.org/manual/nix/stable/command-ref/conf-file#conf-tarball-ttl) expires, and will require network activity to check if the cache entry is up to date.
Nixpkgs fetchers only re-download if the specified hash changes or the store object is not available.
- Built-in fetchers do not use [substituters](https://nixos.org/manual/nix/stable/command-ref/conf-file#conf-substituters).
Derivations produced by Nixpkgs fetchers will use any configured binary cache transparently.
This significantly reduces the time needed to evaluate Nixpkgs, and allows [Hydra](https://nixos.org/hydra) to retain and re-distribute sources used by Nixpkgs in the [public binary cache](https://cache.nixos.org).
For these reasons, Nix's built-in fetchers are not allowed in Nixpkgs.
The following table summarises the differences:
| Fetchers | Download | Output | Cache | Re-download when |
|-|-|-|-|-|
| `builtins.fetch*` | evaluation time | store path | `/nix/store`, `~/.cache/nix` | `tarball-ttl` expires, cache miss in `~/.cache/nix`, output store object not in local store |
| `pkgs.fetch*` | build time | derivation | `/nix/store`, substituters | output store object not available |
:::{.tip}
`pkgs.fetchFrom*` helpers retrieve _snapshots_ of version-controlled sources, as opposed to the entire version history, which is more efficient.
`pkgs.fetchgit` by default also has the same behaviour, but can be changed through specific attributes given to it.
:::
## Caveats {#chap-pkgs-fetchers-caveats}
Because Nixpkgs fetchers are fixed-output derivations, an [output hash](https://nixos.org/manual/nix/stable/language/advanced-attributes#adv-attr-outputHash) has to be specified, usually indirectly through a `hash` attribute.
This hash refers to the derivation output, which can be different from the remote source itself!
This has the following implications that you should be aware of:
- Use Nix (or Nix-aware) tooling to produce the output hash.
- When changing any fetcher parameters, always update the output hash.
Use one of the methods from [](#sec-pkgs-fetchers-updating-source-hashes).
Otherwise, existing store objects that match the output hash will be re-used rather than fetching new content.
:::{.note}
A similar problem arises while testing changes to a fetcher's implementation.
If the output of the derivation already exists in the Nix store, test failures can go undetected.
The [`invalidateFetcherByDrvHash`](#tester-invalidateFetcherByDrvHash) function helps prevent reusing cached derivations.
:::
## Updating source hashes {#sec-pkgs-fetchers-updating-source-hashes}
There are several ways to obtain the hash corresponding to a remote source.
Unless you understand how the fetcher you're using calculates the hash from the downloaded contents, you should use [the fake hash method](#sec-pkgs-fetchers-updating-source-hashes-fakehash-method).
1. []{#sec-pkgs-fetchers-updating-source-hashes-fakehash-method} The fake hash method: In your package recipe, set the hash to one of
- `""`
- `lib.fakeHash`
- `lib.fakeSha256`
- `lib.fakeSha512`
Attempt to build, extract the calculated hashes from error messages, and put them into the recipe.
:::{.warning}
You must use one of these four fake hashes and not some arbitrarily-chosen hash.
See [](#sec-pkgs-fetchers-secure-hashes) for details.
:::
:::{.example #ex-fetchers-update-fod-hash}
# Update source hash with the fake hash method
Consider the following recipe that produces a plain file:
```nix
{ fetchurl }:
fetchurl {
url = "https://raw.githubusercontent.com/NixOS/nixpkgs/23.05/.version";
hash = "sha256-ZHl1emidXVojm83LCVrwULpwIzKE/mYwfztVkvpruOM=";
}
```
A common mistake is to update a fetcher parameter, such as `url`, without updating the hash:
```nix
{ fetchurl }:
fetchurl {
url = "https://raw.githubusercontent.com/NixOS/nixpkgs/23.11/.version";
hash = "sha256-ZHl1emidXVojm83LCVrwULpwIzKE/mYwfztVkvpruOM=";
}
```
**This will produce the same output as before!**
Set the hash to an empty string:
```nix
{ fetchurl }:
fetchurl {
url = "https://raw.githubusercontent.com/NixOS/nixpkgs/23.11/.version";
hash = "";
}
```
When building the package, use the error message to determine the correct hash:
```shell
$ nix-build
(some output removed for clarity)
error: hash mismatch in fixed-output derivation '/nix/store/7yynn53jpc93l76z9zdjj4xdxgynawcw-version.drv':
specified: sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
got: sha256-BZqI7r0MNP29yGH5+yW2tjU9OOpOCEvwWKrWCv5CQ0I=
error: build of '/nix/store/bqdjcw5ij5ymfbm41dq230chk9hdhqff-version.drv' failed
```
:::
2. Prefetch the source with [`nix-prefetch-<type> <URL>`](https://search.nixos.org/packages?buckets={%22package_attr_set%22%3A[%22No%20package%20set%22]%2C%22package_license_set%22%3A[]%2C%22package_maintainers_set%22%3A[]%2C%22package_platforms%22%3A[]}&query=nix-prefetch), where `<type>` is one of
- `url`
- `git`
- `hg`
- `cvs`
- `bzr`
- `svn`
The hash is printed to stdout.
3. Prefetch by package source (with `nix-prefetch-url '<nixpkgs>' -A <package>.src`, where `<package>` is package attribute name).
The hash is printed to stdout.
This works well when you've upgraded the existing package version and want to find out new hash, but is useless if the package can't be accessed by attribute or the package has multiple sources (`.srcs`, architecture-dependent sources, etc).
4. Upstream hash: use it when upstream provides `sha256` or `sha512`.
Don't use it when upstream provides `md5`, compute `sha256` instead.
A little nuance is that `nix-prefetch-*` tools produce hashes with the `nix32` encoding (a Nix-specific base32 adaptation), but upstream usually provides hexadecimal (`base16`) encoding.
Fetchers understand both formats.
Nixpkgs does not standardise on any one format.
You can convert between hash formats with [`nix-hash`](https://nixos.org/manual/nix/stable/command-ref/nix-hash).
5. Extract the hash from a local source archive with `sha256sum`.
Use `nix-prefetch-url file:///path/to/archive` if you want the custom Nix `base32` hash.
## Obtaining hashes securely {#sec-pkgs-fetchers-secure-hashes}
It's always a good idea to avoid Man-in-the-Middle (MITM) attacks when downloading source contents.
Otherwise, you could unknowingly download malware instead of the intended source, and instead of the actual source hash, you'll end up using the hash of malware.
Here are security considerations for this scenario:
- `http://` URLs are not secure to prefetch hashes.
- Upstream hashes should be obtained via a secure protocol.
- `https://` URLs give you more protections when using `nix-prefetch-*` or for upstream hashes.
- `https://` URLs are secure when using the [fake hash method](#sec-pkgs-fetchers-updating-source-hashes-fakehash-method) *only if* you use one of the listed fake hashes.
If you use any other hash, the download will be exposed to MITM attacks even if you use HTTPS URLs.
In more concrete terms, if you use any other hash, the [`--insecure` flag](https://curl.se/docs/manpage.html#-k) will be passed to the underlying call to `curl` when downloading content.
## Proxy usage {#sec-pkgs-fetchers-proxy}
Nixpkgs fetchers can make use of a http(s) proxy. Each fetcher will automatically inherit proxy-related environment variables (`http_proxy`, `https_proxy`, etc) via [impureEnvVars](https://nixos.org/manual/nix/stable/language/advanced-attributes#adv-attr-impureEnvVars).
The environment variable `NIX_SSL_CERT_FILE` is also inherited in fetchers, and can be used to provide a custom certificate bundle to fetchers. This is usually required for a https proxy to work without certificate validation errors.
To use a temporary Tor instance as a proxy for fetching from `.onion` addresses, add `nativeBuildInputs = [ tor.proxyHook ];` to the fetcher parameters.
[]{#fetchurl}
## `fetchurl` {#sec-pkgs-fetchers-fetchurl}
`fetchurl` returns a [fixed-output derivation](https://nixos.org/manual/nix/stable/glossary.html#gloss-fixed-output-derivation) which downloads content from a given URL and stores the unaltered contents within the Nix store.
It uses {manpage}`curl(1)` internally, and allows its behaviour to be modified by specifying a few attributes in the argument to `fetchurl` (see the documentation for attributes `curlOpts`, `curlOptsList`, and `netrcPhase`).
The resulting [store path](https://nixos.org/manual/nix/stable/store/store-path) is determined by the hash given to `fetchurl`, and also the `name` (or `pname` and `version`) values.
If neither `name` nor `pname` and `version` are specified when calling `fetchurl`, it will default to using the [basename](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-baseNameOf) of `url` or the first element of `urls`.
If `pname` and `version` are specified, `fetchurl` will use those values and will ignore `name`, even if it is also specified.
### Inputs {#sec-pkgs-fetchers-fetchurl-inputs}
`fetchurl` requires an attribute set with the following attributes:
`url` (String; _optional_)
: The URL to download from.
:::{.note}
Either `url` or `urls` must be specified, but not both.
:::
All URLs of the format [specified here](https://curl.se/docs/url-syntax.html#rfc-3986-plus) are supported.
_Default value:_ `""`.
`urls` (List of String; _optional_)
: A list of URLs, specifying download locations for the same content.
Each URL will be tried in order until one of them succeeds with some content or all of them fail.
See [](#ex-fetchers-fetchurl-nixpkgs-version-multiple-urls) to understand how this attribute affects the behaviour of `fetchurl`.
:::{.note}
Either `url` or `urls` must be specified, but not both.
:::
_Default value:_ `[]`.
`hash` (String; _optional_)
: Hash of the derivation output of `fetchurl`, following the format for integrity metadata as defined by [SRI](https://www.w3.org/TR/SRI/).
For more information, see [](#chap-pkgs-fetchers-caveats).
:::{.note}
It is recommended that you use the `hash` attribute instead of the other hash-specific attributes that exist for backwards compatibility.
If `hash` is not specified, you must specify `outputHash` and `outputHashAlgo`, or one of `sha512`, `sha256`, or `sha1`.
:::
_Default value:_ `""`.
`outputHash` (String; _optional_)
: Hash of the derivation output of `fetchurl` in the format expected by Nix.
See [the documentation on the Nix manual](https://nixos.org/manual/nix/stable/language/advanced-attributes.html#adv-attr-outputHash) for more information about its format.
:::{.note}
It is recommended that you use the `hash` attribute instead.
If `outputHash` is specified, you must also specify `outputHashAlgo`.
:::
_Default value:_ `""`.
`outputHashAlgo` (String; _optional_)
: Algorithm used to generate the value specified in `outputHash`.
See [the documentation on the Nix manual](https://nixos.org/manual/nix/stable/language/advanced-attributes.html#adv-attr-outputHashAlgo) for more information about the values it supports.
:::{.note}
It is recommended that you use the `hash` attribute instead.
The value specified in `outputHashAlgo` will be ignored if `outputHash` isn't also specified.
:::
_Default value:_ `""`.
`sha1` (String; _optional_)
: SHA-1 hash of the derivation output of `fetchurl` in the format expected by Nix.
See [the documentation on the Nix manual](https://nixos.org/manual/nix/stable/language/advanced-attributes.html#adv-attr-outputHash) for more information about its format.
:::{.note}
It is recommended that you use the `hash` attribute instead.
:::
_Default value:_ `""`.
`sha256` (String; _optional_)
: SHA-256 hash of the derivation output of `fetchurl` in the format expected by Nix.
See [the documentation on the Nix manual](https://nixos.org/manual/nix/stable/language/advanced-attributes.html#adv-attr-outputHash) for more information about its format.
:::{.note}
It is recommended that you use the `hash` attribute instead.
:::
_Default value:_ `""`.
`sha512` (String; _optional_)
: SHA-512 hash of the derivation output of `fetchurl` in the format expected by Nix.
See [the documentation on the Nix manual](https://nixos.org/manual/nix/stable/language/advanced-attributes.html#adv-attr-outputHash) for more information about its format.
:::{.note}
It is recommended that you use the `hash` attribute instead.
:::
_Default value:_ `""`.
`name` (String; _optional_)
: The symbolic name of the downloaded file when saved in the Nix store.
See [the `fetchurl` overview](#sec-pkgs-fetchers-fetchurl) for details on how the name of the file is decided.
_Default value:_ `""`.
`pname` (String; _optional_)
: A base name, which will be combined with `version` to form the symbolic name of the downloaded file when saved in the Nix store.
See [the `fetchurl` overview](#sec-pkgs-fetchers-fetchurl) for details on how the name of the file is decided.
:::{.note}
If `pname` is specified, you must also specify `version`, otherwise `fetchurl` will ignore the value of `pname`.
:::
_Default value:_ `""`.
`version` (String; _optional_)
: A version, which will be combined with `pname` to form the symbolic name of the downloaded file when saved in the Nix store.
See [the `fetchurl` overview](#sec-pkgs-fetchers-fetchurl) for details on how the name of the file is decided.
_Default value:_ `""`.
`recursiveHash` (Boolean; _optional_) []{#sec-pkgs-fetchers-fetchurl-inputs-recursiveHash}
: If set to `true`, will signal to Nix that the hash given to `fetchurl` was calculated using the `"recursive"` mode.
See [the documentation on the Nix manual](https://nixos.org/manual/nix/stable/language/advanced-attributes.html#adv-attr-outputHashMode) for more information about the existing modes.
By default, `fetchurl` uses `"recursive"` mode when the `executable` attribute is set to `true`, so you don't need to specify `recursiveHash` in this case.
_Default value:_ `false`.
`executable` (Boolean; _optional_)
: If `true`, sets the executable bit on the downloaded file.
_Default value_: `false`.
`downloadToTemp` (Boolean; _optional_) []{#sec-pkgs-fetchers-fetchurl-inputs-downloadToTemp}
: If `true`, saves the downloaded file to a temporary location instead of the expected Nix store location.
This is useful when used in conjunction with `postFetch` attribute, otherwise `fetchurl` will not produce any meaningful output.
The location of the downloaded file will be set in the `$downloadedFile` variable, which should be used by the script in the `postFetch` attribute.
See [](#ex-fetchers-fetchurl-nixpkgs-version-postfetch) to understand how to work with this attribute.
_Default value:_ `false`.
`postFetch` (String; _optional_)
: Script executed after the file has been downloaded successfully, and before `fetchurl` finishes running.
Useful for post-processing, to check or transform the file in some way.
See [](#ex-fetchers-fetchurl-nixpkgs-version-postfetch) to understand how to work with this attribute.
_Default value:_ `""`.
`netrcPhase` (String or Null; _optional_)
: Script executed to create a {manpage}`netrc(5)` file to be used with {manpage}`curl(1)`.
The script should create the `netrc` file (note that it does not begin with a ".") in the directory it's currently running in (`$PWD`).
The script is executed during the setup done by `fetchurl` before it runs any of its code to download the specified content.
:::{.note}
If specified, `fetchurl` will automatically alter its invocation of {manpage}`curl(1)` to use the `netrc` file, so you don't need to add anything to `curlOpts` or `curlOptsList`.
:::
:::{.caution}
Since `netrcPhase` needs to be specified in your source Nix code, any secrets that you put directly in it will be world-readable by design (both in your source code, and when the derivation gets created in the Nix store).
If you want to avoid this behaviour, see the documentation of `netrcImpureEnvVars` for an alternative way of dealing with these secrets.
:::
_Default value_: `null`.
`netrcImpureEnvVars` (List of String; _optional_)
: If specified, `fetchurl` will add these environment variable names to the list of [impure environment variables](https://nixos.org/manual/nix/stable/language/advanced-attributes.html#adv-attr-impureEnvVars), which will be passed from the environment of the calling user to the builder running the `fetchurl` code.
This is useful when used with `netrcPhase` to hide any secrets that are used in it, because the script in `netrcPhase` only needs to reference the environment variables with the secrets in them instead.
However, note that these are called _impure_ variables for a reason:
the environment that starts the build needs to have these variables declared for everything to work properly, which means that additional setup is required outside what Nix controls.
_Default value:_ `[]`.
`curlOpts` (String; _optional_)
: If specified, this value will be appended to the invocation of {manpage}`curl(1)` when downloading the URL(s) given to `fetchurl`.
Multiple arguments can be separated by spaces normally, but values with whitespaces will be interpreted as multiple arguments (instead of a single value), even if the value is escaped.
See `curlOptsList` for a way to pass values with whitespaces in them.
_Default value:_ `""`.
`curlOptsList` (List of String; _optional_)
: If specified, each element of this list will be passed as an argument to the invocation of {manpage}`curl(1)` when downloading the URL(s) given to `fetchurl`.
This allows passing values that contain spaces, with no escaping needed.
_Default value:_ `[]`.
`showURLs` (Boolean; _optional_)
: If set to `true`, this will stop `fetchurl` from downloading anything at all.
Instead, it will output a list of all the URLs it would've used to download the content (after resolving `mirror://` URLs, for example).
This is useful for debugging.
_Default value:_ `false`.
`meta` (Attribute Set; _optional_)
: Specifies any [meta-attributes](#chap-meta) for the derivation returned by `fetchurl`.
_Default value:_ `{}`.
`passthru` (Attribute Set; _optional_)
: Specifies any extra [`passthru`](#chap-passthru) attributes for the derivation returned by `fetchurl`.
Note that `fetchurl` defines [`passthru` attributes of its own](#ssec-pkgs-fetchers-fetchurl-passthru-outputs).
Attributes specified in `passthru` can override the default attributes returned by `fetchurl`.
_Default value:_ `{}`.
`preferLocalBuild` (Boolean; _optional_)
: This is the same attribute as [defined in the Nix manual](https://nixos.org/manual/nix/stable/language/advanced-attributes.html#adv-attr-preferLocalBuild).
It is `true` by default because making a remote machine download the content just duplicates network traffic (since the local machine might download the results from the derivation anyway), but this could be useful in cases where network access is restricted on local machines.
_Default value:_ `true`.
`nativeBuildInputs` (List of Attribute Set; _optional_)
: Additional packages needed to download the content.
This is useful if you need extra packages for `postFetch` or `netrcPhase`, for example.
Has the same semantics as in [](#var-stdenv-nativeBuildInputs).
See [](#ex-fetchers-fetchurl-nixpkgs-version-postfetch) to understand how this can be used with `postFetch`.
_Default value:_ `[]`.
### Passthru outputs {#ssec-pkgs-fetchers-fetchurl-passthru-outputs}
`fetchurl` also defines its own [`passthru`](#chap-passthru) attributes:
`url` (String)
: The same `url` attribute passed in the argument to `fetchurl`.
### Examples {#ssec-pkgs-fetchers-fetchurl-examples}
:::{.example #ex-fetchers-fetchurl-nixpkgs-version}
# Using `fetchurl` to download a file
The following package downloads a small file from a URL and shows the most common way to use `fetchurl`:
```nix
{ fetchurl }:
fetchurl {
url = "https://raw.githubusercontent.com/NixOS/nixpkgs/23.11/.version";
hash = "sha256-BZqI7r0MNP29yGH5+yW2tjU9OOpOCEvwWKrWCv5CQ0I=";
}
```
After building the package, the file will be downloaded and place into the Nix store:
```shell
$ nix-build
(output removed for clarity)
/nix/store/4g9y3x851wqrvim4zcz5x2v3zivmsq8n-version
$ cat /nix/store/4g9y3x851wqrvim4zcz5x2v3zivmsq8n-version
23.11
```
:::
:::{.example #ex-fetchers-fetchurl-nixpkgs-version-multiple-urls}
# Using `fetchurl` to download a file with multiple possible URLs
The following package adapts [](#ex-fetchers-fetchurl-nixpkgs-version) to use multiple URLs.
The first URL was crafted to intentionally return an error to illustrate how `fetchurl` will try multiple URLs until it finds one that works (or all URLs fail).
```nix
{ fetchurl }:
fetchurl {
urls = [
"https://raw.githubusercontent.com/NixOS/nixpkgs/23.11/does-not-exist"
"https://raw.githubusercontent.com/NixOS/nixpkgs/23.11/.version"
];
hash = "sha256-BZqI7r0MNP29yGH5+yW2tjU9OOpOCEvwWKrWCv5CQ0I=";
}
```
After building the package, both URLs will be used to download the file:
```shell
$ nix-build
(some output removed for clarity)
trying https://raw.githubusercontent.com/NixOS/nixpkgs/23.11/does-not-exist
(some output removed for clarity)
curl: (22) The requested URL returned error: 404
trying https://raw.githubusercontent.com/NixOS/nixpkgs/23.11/.version
(some output removed for clarity)
/nix/store/n9asny31z32q7sdw6a8r1gllrsfy53kl-does-not-exist
$ cat /nix/store/n9asny31z32q7sdw6a8r1gllrsfy53kl-does-not-exist
23.11
```
However, note that the name of the file was derived from the first URL (this is further explained in [the `fetchurl` overview](#sec-pkgs-fetchers-fetchurl)).
To ensure the result will have the same name regardless of which URLs are used, we can modify the package:
```nix
{ fetchurl }:
fetchurl {
name = "nixpkgs-version";
urls = [
"https://raw.githubusercontent.com/NixOS/nixpkgs/23.11/does-not-exist"
"https://raw.githubusercontent.com/NixOS/nixpkgs/23.11/.version"
];
hash = "sha256-BZqI7r0MNP29yGH5+yW2tjU9OOpOCEvwWKrWCv5CQ0I=";
}
```
After building the package, the result will have the name we specified:
```shell
$ nix-build
(output removed for clarity)
/nix/store/zczb6wl3al6jm9sm5h3pr6nqn0i5ji9z-nixpkgs-version
```
:::
:::{.example #ex-fetchers-fetchurl-nixpkgs-version-postfetch}
# Manipulating the content downloaded by `fetchurl`
It might be useful to manipulate the content downloaded by `fetchurl` directly in its derivation.
In this example, we'll adapt [](#ex-fetchers-fetchurl-nixpkgs-version) to append the result of running the `hello` package to the contents we download, purely to illustrate how to manipulate the content.
```nix
{
fetchurl,
hello,
lib,
}:
fetchurl {
url = "https://raw.githubusercontent.com/NixOS/nixpkgs/23.11/.version";
nativeBuildInputs = [ hello ];
downloadToTemp = true;
postFetch = ''
${lib.getExe hello} >> $downloadedFile
mv $downloadedFile $out
'';
hash = "sha256-ceooQQYmDx5+0nfg40uU3NNI2yKrixP7HZ/xLZUNv+w=";
}
```
After building the package, the resulting file will have "Hello, world!" appended to it:
```shell
$ nix-build
(output removed for clarity)
/nix/store/ifi6pp7q0ag5h7c5v9h1c1c7bhd10c7f-version
$ cat /nix/store/ifi6pp7q0ag5h7c5v9h1c1c7bhd10c7f-version
23.11
Hello, world!
```
Note that the `hash` specified in the package is different than the hash specified in [](#ex-fetchers-fetchurl-nixpkgs-version), because the contents of the output have changed (even though the actual file that was downloaded is the same).
See [](#chap-pkgs-fetchers-caveats) for more details on how to work with the `hash` attribute when the output changes.
:::
## `fetchzip` {#sec-pkgs-fetchers-fetchzip}
Returns a [fixed-output derivation](https://nixos.org/manual/nix/stable/glossary.html#gloss-fixed-output-derivation) which downloads an archive from a given URL and decompresses it.
Despite its name, `fetchzip` is not limited to `.zip` files but can also be used with [various compressed tarball formats](#tar-files) by default.
This can extended by specifying additional attributes, see [](#ex-fetchers-fetchzip-rar-archive) to understand how to do that.
### Inputs {#sec-pkgs-fetchers-fetchzip-inputs}
`fetchzip` requires an attribute set, and most attributes are passed to the underlying call to [`fetchurl`](#sec-pkgs-fetchers-fetchurl).
The attributes below are treated differently by `fetchzip` when compared to what `fetchurl` expects:
`name` (String; _optional_)
: Works as defined in `fetchurl`, but has a different default value than `fetchurl`.
_Default value:_ `"source"`.
`nativeBuildInputs` (List of Attribute Set; _optional_)
: Works as defined in `fetchurl`, but it is also augmented by `fetchzip` to include packages to deal with additional archives (such as `.zip`).
_Default value:_ `[]`.
`postFetch` (String; _optional_)
: Works as defined in `fetchurl`, but it is also augmented with the code needed to make `fetchzip` work.
:::{.caution}
It is only safe to modify files in `$out` in `postFetch`.
Consult the implementation of `fetchzip` for anything more involved.
:::
_Default value:_ `""`.
`stripRoot` (Boolean; _optional_)
: If `true`, the decompressed contents are moved one level up the directory tree.
This is useful for archives that decompress into a single directory which commonly includes some values that change with time, such as version numbers.
When this is the case (and `stripRoot` is `true`), `fetchzip` will remove this directory and make the decompressed contents available in the top-level directory.
[](#ex-fetchers-fetchzip-simple-striproot) shows what this attribute does.
This attribute is **not** passed through to `fetchurl`.
_Default value:_ `true`.
`extension` (String or Null; _optional_)
: If set, the archive downloaded by `fetchzip` will be renamed to a filename with the extension specified in this attribute.
This is useful when making `fetchzip` support additional types of archives, because the implementation may use the extension of an archive to determine whether they can decompress it.
If the URL you're using to download the contents doesn't end with the extension associated with the archive, use this attribute to fix the filename of the archive.
This attribute is **not** passed through to `fetchurl`.
_Default value:_ `null`.
`recursiveHash` (Boolean; _optional_)
: Works [as defined in `fetchurl`](#sec-pkgs-fetchers-fetchurl-inputs-recursiveHash), but its default value is different than for `fetchurl`.
_Default value:_ `true`.
`downloadToTemp` (Boolean; _optional_)
: Works [as defined in `fetchurl`](#sec-pkgs-fetchers-fetchurl-inputs-downloadToTemp), but its default value is different than for `fetchurl`.
_Default value:_ `true`.
`extraPostFetch` **DEPRECATED**
: This attribute is deprecated.
Please use `postFetch` instead.
This attribute is **not** passed through to `fetchurl`.
### Examples {#sec-pkgs-fetchers-fetchzip-examples}
::::{.example #ex-fetchers-fetchzip-simple-striproot}
# Using `fetchzip` to output contents directly
The following recipe shows how to use `fetchzip` to decompress a `.tar.gz` archive:
```nix
{ fetchzip }:
fetchzip {
url = "https://github.com/NixOS/patchelf/releases/download/0.18.0/patchelf-0.18.0.tar.gz";
hash = "sha256-3ABYlME9R8klcpJ7MQpyFEFwHmxDDEzIYBqu/CpDYmg=";
}
```
This archive has all its contents in a directory named `patchelf-0.18.0`.
This means that after decompressing, you'd have to enter this directory to see the contents of the archive.
However, `fetchzip` makes this easier through the attribute `stripRoot` (enabled by default).
After building the recipe, the derivation output will show all the files in the archive at the top level:
```shell
$ nix-build
(output removed for clarity)
/nix/store/1b7h3fvmgrcddvs0m299hnqxlgli1yjw-source
$ ls /nix/store/1b7h3fvmgrcddvs0m299hnqxlgli1yjw-source
aclocal.m4 completions configure.ac m4 Makefile.in patchelf.spec README.md tests
build-aux configure COPYING Makefile.am patchelf.1 patchelf.spec.in src version
```
If `stripRoot` is set to `false`, the derivation output will be the decompressed archive as-is:
```nix
{ fetchzip }:
fetchzip {
url = "https://github.com/NixOS/patchelf/releases/download/0.18.0/patchelf-0.18.0.tar.gz";
hash = "sha256-uv3FuKE4DqpHT3yfE0qcnq0gYjDNQNKZEZt2+PUAneg=";
stripRoot = false;
}
```
:::{.caution}
The hash changed!
Whenever changing attributes of a Nixpkgs fetcher, [remember to invalidate the hash](#chap-pkgs-fetchers-caveats), otherwise you won't get the results you're expecting!
:::
After building the recipe:
```shell
$ nix-build
(output removed for clarity)
/nix/store/2hy5bxw7xgbgxkn0i4x6hjr8w3dbx16c-source
$ ls /nix/store/2hy5bxw7xgbgxkn0i4x6hjr8w3dbx16c-source
patchelf-0.18.0
```
::::
::::{.example #ex-fetchers-fetchzip-rar-archive}
# Using `fetchzip` to decompress a `.rar` file
The `unrar` package provides a [setup hook](#ssec-setup-hooks) to decompress `.rar` archives during the [unpack phase](#ssec-unpack-phase), which can be used with `fetchzip` to decompress those archives:
```nix
{ fetchzip, unrar }:
fetchzip {
url = "https://archive.org/download/SpaceCadet_Plus95/Space_Cadet.rar";
hash = "sha256-fC+zsR8BY6vXpUkVd6i1jF0IZZxVKVvNi6VWCKT+pA4=";
stripRoot = false;
nativeBuildInputs = [ unrar ];
}
```
Since this particular `.rar` file doesn't put its contents in a directory inside the archive, `stripRoot` must be set to `false`.
After building the recipe, the derivation output will show the decompressed files:
```shell
$ nix-build
(output removed for clarity)
/nix/store/zpn7knxfva6rfjja2gbb4p3l9w1f0d36-source
$ ls /nix/store/zpn7knxfva6rfjja2gbb4p3l9w1f0d36-source
FONT.DAT PINBALL.DAT PINBALL.EXE PINBALL2.MID TABLE.BMP WMCONFIG.EXE
MSCREATE.DIR PINBALL.DOC PINBALL.MID Sounds WAVEMIX.INF
```
::::
## `fetchpatch` {#fetchpatch}
`fetchpatch` works very similarly to `fetchurl` with the same arguments expected. It expects patch files as a source and performs normalization on them before computing the checksum. For example, it will remove comments or other unstable parts that are sometimes added by version control systems and can change over time.
- `relative`: Similar to using `git-diff`'s `--relative` flag, only keep changes inside the specified directory, making paths relative to it.
- `stripLen`: Remove the first `stripLen` components of pathnames in the patch.
- `decode`: Pipe the downloaded data through this command before processing it as a patch.
- `extraPrefix`: Prefix pathnames by this string.
- `excludes`: Exclude files matching these patterns (applies after the above arguments).
- `includes`: Include only files matching these patterns (applies after the above arguments).
- `revert`: Revert the patch.
Note that because the checksum is computed after applying these effects, using or modifying these arguments will have no effect unless the `hash` argument is changed as well.
Most other fetchers return a directory rather than a single file.
## `fetchDebianPatch` {#fetchdebianpatch}
A wrapper around `fetchpatch`, which takes:
- `patch` and `hash`: the patch's filename,
and its hash after normalization by `fetchpatch` ;
- `pname`: the Debian source package's name ;
- `version`: the upstream version number ;
- `debianRevision`: the [Debian revision number] if applicable ;
- the `area` of the Debian archive: `main` (default), `contrib`, or `non-free`.
Here is an example of `fetchDebianPatch` in action:
```nix
{
lib,
fetchDebianPatch,
buildPythonPackage,
}:
buildPythonPackage rec {
pname = "pysimplesoap";
version = "1.16.2";
src = <...>;
patches = [
(fetchDebianPatch {
inherit pname version;
debianRevision = "5";
patch = "Add-quotes-to-SOAPAction-header-in-SoapClient.patch";
hash = "sha256-xA8Wnrpr31H8wy3zHSNfezFNjUJt1HbSXn3qUMzeKc0=";
})
];
# ...
}
```
Patches are fetched from `sources.debian.org`, and so must come from a
package version that was uploaded to the Debian archive. Packages may
be removed from there once that specific version isn't in any suite
anymore (stable, testing, unstable, etc.), so maintainers should use
`copy-tarballs.pl` to archive the patch if it needs to be available
longer-term.
[Debian revision number]: https://www.debian.org/doc/debian-policy/ch-controlfields.html#version
## `fetchsvn` {#fetchsvn}
Used with Subversion. Expects `url` to a Subversion directory, `rev`, and `hash`.
## `fetchgit` {#fetchgit}
Used with Git. Expects `url` to a Git repo, `rev`, and `hash`. `rev` in this case can be full the git commit id (SHA1 hash) or a tag name like `refs/tags/v1.0`.
If you want to fetch a tag you should pass the `tag` parameter instead of `rev` which has the same effect as setting `rev = "refs/tags"/${version}"`.
This is safer than just setting `rev = version` w.r.t. possible branch and tag name conflicts.
Additionally, the following optional arguments can be given:
*`fetchSubmodules`* (Boolean)
: Whether to also fetch the submodules of a repository.
*`fetchLFS`* (Boolean)
: Whether to fetch LFS objects.
*`preFetch`* (String)
: Shell code to be executed before the repository has been fetched, to allow
changing the environment the fetcher runs in.
*`postFetch`* (String)
: Shell code executed after the repository has been fetched successfully.
This can do things like check or transform the file.
*`leaveDotGit`* (Boolean)
: Whether the `.git` directory of the clone should *not* be removed after checkout.
Be warned though that the git repository format is not stable and this flag is therefore not suitable for actual use by itself.
Only use this for testing purposes or in conjunction with removing the `.git` directory in `postFetch`.
*`deepClone`* (Boolean)
: Clone the entire repository as opposing to just creating a shallow clone.
This implies `leaveDotGit`.
*`fetchTags`* (Boolean)
: Whether to fetch all tags from the remote repository. This is useful when the build process needs to run `git describe` or other commands that require tag information to be available. This parameter implies `leaveDotGit`, as tags are stored in the `.git` directory.
*`sparseCheckout`* (List of String)
: Prevent git from fetching unnecessary blobs from server.
This is useful if only parts of the repository are needed.
::: {.example #ex-fetchgit-sparseCheckout}
# Use `sparseCheckout` to only include some directories:
```nix
{ stdenv, fetchgit }:
stdenv.mkDerivation {
name = "hello";
src = fetchgit {
url = "https://...";
sparseCheckout = [
"directory/to/be/included"
"another/directory"
];
hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
};
}
```
:::
See [git sparse-checkout](https://git-scm.com/docs/git-sparse-checkout) for more information.
Some additional parameters for niche use-cases can be found listed in the function parameters in the declaration of `fetchgit`: `pkgs/build-support/fetchgit/default.nix`.
Future parameters additions might also happen without immediately being documented here.
## `fetchfossil` {#fetchfossil}
Used with Fossil. Expects `url` to a Fossil archive, `rev`, and `hash`.
## `fetchcvs` {#fetchcvs}
Used with CVS. Expects `cvsRoot`, `tag`, and `hash`.
## `fetchhg` {#fetchhg}
Used with Mercurial. Expects `url`, `rev`, `hash`, overridable with [`<pkg>.overrideAttrs`](#sec-pkg-overrideAttrs).
A number of fetcher functions wrap part of `fetchurl` and `fetchzip`. They are mainly convenience functions intended for commonly used destinations of source code in Nixpkgs. These wrapper fetchers are listed below.
## `fetchFromGitea` {#fetchfromgitea}
`fetchFromGitea` expects five arguments. `domain` is the gitea server name. `owner` is a string corresponding to the Gitea user or organization that controls this repository. `repo` corresponds to the name of the software repository. These are located at the top of every Gitea HTML page as `owner`/`repo`. `rev` corresponds to the Git commit hash or tag (e.g `v1.0`) that will be downloaded from Git. Finally, `hash` corresponds to the hash of the extracted directory. Again, other hash algorithms are also available but `hash` is currently preferred.
## `fetchFromGitHub` {#fetchfromgithub}
`fetchFromGitHub` expects four arguments. `owner` is a string corresponding to the GitHub user or organization that controls this repository. `repo` corresponds to the name of the software repository. These are located at the top of every GitHub HTML page as `owner`/`repo`. `rev` corresponds to the Git commit hash or tag (e.g `v1.0`) that will be downloaded from Git. If you need to fetch a tag however, you should prefer to use the `tag` parameter which achieves this in a safer way with less boilerplate. Finally, `hash` corresponds to the hash of the extracted directory. Again, other hash algorithms are also available, but `hash` is currently preferred.
To use a different GitHub instance, use `githubBase` (defaults to `"github.com"`).
`fetchFromGitHub` uses `fetchzip` to download the source archive generated by GitHub for the specified revision. If `leaveDotGit`, `deepClone` or `fetchSubmodules` are set to `true`, `fetchFromGitHub` will use `fetchgit` instead. Refer to its section for documentation of these options.
## `fetchFromGitLab` {#fetchfromgitlab}
This is used with GitLab repositories. It behaves similarly to `fetchFromGitHub`, and expects `owner`, `repo`, `rev`, and `hash`.
To use a specific GitLab instance, use `domain` (defaults to `"gitlab.com"`).
## `fetchFromGitiles` {#fetchfromgitiles}
This is used with Gitiles repositories. The arguments expected are similar to `fetchgit`.
## `fetchFromBitbucket` {#fetchfrombitbucket}
This is used with BitBucket repositories. The arguments expected are very similar to `fetchFromGitHub` above.
## `fetchFromSavannah` {#fetchfromsavannah}
This is used with Savannah repositories. The arguments expected are very similar to `fetchFromGitHub` above.
## `fetchFromRepoOrCz` {#fetchfromrepoorcz}
This is used with repo.or.cz repositories. The arguments expected are very similar to `fetchFromGitHub` above.
## `fetchFromSourcehut` {#fetchfromsourcehut}
This is used with sourcehut repositories. Similar to `fetchFromGitHub` above,
it expects `owner`, `repo`, `rev` and `hash`, but don't forget the tilde (~)
in front of the username! Expected arguments also include `vc` ("git" (default)
or "hg"), `domain` and `fetchSubmodules`.
If `fetchSubmodules` is `true`, `fetchFromSourcehut` uses `fetchgit`
or `fetchhg` with `fetchSubmodules` or `fetchSubrepos` set to `true`,
respectively. Otherwise, the fetcher uses `fetchzip`.
## `requireFile` {#requirefile}
`requireFile` allows requesting files that cannot be fetched automatically, but whose content is known.
This is a useful last-resort workaround for license restrictions that prohibit redistribution, or for downloads that are only accessible after authenticating interactively in a browser.
If the requested file is present in the Nix store, the resulting derivation will not be built, because its expected output is already available.
Otherwise, the builder will run, but fail with a message explaining to the user how to provide the file. The following code, for example:
```nix
requireFile {
name = "jdk-${version}_linux-x64_bin.tar.gz";
url = "https://www.oracle.com/java/technologies/javase-jdk11-downloads.html";
hash = "sha256-lL00+F7jjT71nlKJ7HRQuUQ7kkxVYlZh//5msD8sjeI=";
}
```
results in this error message:
```
***
Unfortunately, we cannot download file jdk-11.0.10_linux-x64_bin.tar.gz automatically.
Please go to https://www.oracle.com/java/technologies/javase-jdk11-downloads.html to download it yourself, and add it to the Nix store
using either
nix-store --add-fixed sha256 jdk-11.0.10_linux-x64_bin.tar.gz
or
nix-prefetch-url --type sha256 file:///path/to/jdk-11.0.10_linux-x64_bin.tar.gz
***
```
This function should only be used by non-redistributable software with an unfree license that we need to require the user to download manually.
It produces packages that cannot be built automatically.
## `fetchtorrent` {#fetchtorrent}
`fetchtorrent` expects two arguments. `url` which can either be a Magnet URI (Magnet Link) such as `magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c` or an HTTP URL pointing to a `.torrent` file. It can also take a `config` argument which will craft a `settings.json` configuration file and give it to `transmission`, the underlying program that is performing the fetch. The available config options for `transmission` can be found [here](https://github.com/transmission/transmission/blob/main/docs/Editing-Configuration-Files.md#options)
```nix
{ fetchtorrent }:
fetchtorrent {
config = {
peer-limit-global = 100;
};
url = "magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c";
hash = "";
}
```
### Parameters {#fetchtorrent-parameters}
- `url`: Magnet URI (Magnet Link) such as `magnet:?xt=urn:btih:dd8255ecdc7ca55fb0bbf81323d87062db1f6d1c` or an HTTP URL pointing to a `.torrent` file.
- `backend`: Which bittorrent program to use. Default: `"transmission"`. Valid values are `"rqbit"` or `"transmission"`. These are the two most suitable torrent clients for fetching in a fixed-output derivation at the time of writing, as they can be easily exited after usage. `rqbit` is written in Rust and has a smaller closure size than `transmission`, and the performance and peer discovery properties differs between these clients, requiring experimentation to decide upon which is the best.
- `config`: When using `transmission` as the `backend`, a json configuration can
be supplied to transmission. Refer to the [upstream documentation](https://github.com/transmission/transmission/blob/main/docs/Editing-Configuration-Files.md) for information on how to configure.

View File

@@ -1,71 +0,0 @@
# Fixed-point arguments of build helpers {#chap-build-helpers-finalAttrs}
As mentioned in the beginning of this part, `stdenv.mkDerivation` could alternatively accept a fixed-point function. The input of such function, typically named `finalAttrs`, is expected to be the final state of the attribute set.
A build helper like this is said to accept **fixed-point arguments**.
Build helpers don't always support fixed-point arguments yet, as support in [`stdenv.mkDerivation`](#mkderivation-recursive-attributes) was first included in Nixpkgs 22.05.
## Defining a build helper with `lib.extendMkDerivation` {#sec-build-helper-extendMkDerivation}
Developers can use the Nixpkgs library function [`lib.customisation.extendMkDerivation`](#function-library-lib.customisation.extendMkDerivation) to define a build helper supporting fixed-point arguments from an existing one with such support, with an attribute overlay similar to the one taken by [`<pkg>.overrideAttrs`](#sec-pkg-overrideAttrs).
Beside overriding, `lib.extendMkDerivation` also supports `excludeDrvArgNames` to optionally exclude some arguments in the input fixed-point arguments from passing down the base build helper (specified as `constructDrv`).
:::{.example #ex-build-helpers-extendMkDerivation}
# Example definition of `mkLocalDerivation` extended from `stdenv.mkDerivation` with `lib.extendMkDerivation`
We want to define a build helper named `mkLocalDerivation` that builds locally without using substitutes by default.
Instead of taking a plain attribute set,
```nix
{
preferLocalBuild ? true,
allowSubstitute ? false,
specialArg ? (_: false),
...
}@args:
stdenv.mkDerivation (
removeAttrs [
# Don't pass specialArg into mkDerivation.
"specialArg"
] args
// {
# Arguments to pass
inherit preferLocalBuild allowSubstitute;
# Some expressions involving specialArg
greeting = if specialArg "hi" then "hi" else "hello";
}
)
```
we could define with `lib.extendMkDerivation` an attribute overlay to make the result build helper also accepts the the attribute set's fixed point passing to the underlying `stdenv.mkDerivation`, named `finalAttrs` here:
```nix
lib.extendMkDerivation {
constructDrv = stdenv.mkDerivation;
excludeDrvArgNames = [
# Don't pass specialArg into mkDerivation.
"specialArg"
];
extendDrvArgs =
finalAttrs:
{
preferLocalBuild ? true,
allowSubstitute ? false,
specialArg ? (_: false),
...
}@args:
{
# Arguments to pass
inherit preferLocalBuild allowSubstitute;
# Some expressions involving specialArg
greeting = if specialArg "hi" then "hi" else "hello";
};
}
```
:::
If one needs to apply extra changes to the result derivation, pass the derivation transformation function to `lib.extendMkDerivation` as `lib.customisation.extendMkDerivation { transformDrv = drv: ...; }`.

View File

@@ -1,12 +0,0 @@
# Images {#chap-images}
This chapter describes tools for creating various types of images.
```{=include=} sections
images/appimagetools.section.md
images/dockertools.section.md
images/ocitools.section.md
images/portableservice.section.md
images/makediskimage.section.md
images/binarycache.section.md
```

View File

@@ -1,166 +0,0 @@
# pkgs.appimageTools {#sec-pkgs-appimageTools}
`pkgs.appimageTools` is a set of functions for extracting and wrapping [AppImage](https://appimage.org/) files.
They are meant to be used if traditional packaging from source is infeasible, or if it would take too long.
To quickly run an AppImage file, `pkgs.appimage-run` can be used as well.
::: {.warning}
The `appimageTools` API is unstable and may be subject to backwards-incompatible changes in the future.
:::
## Wrapping {#ssec-pkgs-appimageTools-wrapping}
Use `wrapType2` to wrap any AppImage.
This will create a FHS environment with many packages [expected to exist](https://github.com/AppImage/pkg2appimage/blob/master/excludelist) for the AppImage to work.
`wrapType2` expects an argument with the `src` attribute, and either a `name` attribute or `pname` and `version` attributes.
It will eventually call into [`buildFHSEnv`](#sec-fhs-environments), and any extra attributes in the argument to `wrapType2` will be passed through to it.
This means that you can pass the `extraInstallCommands` attribute, for example, and it will have the same effect as described in [`buildFHSEnv`](#sec-fhs-environments).
::: {.note}
In the past, `appimageTools` provided both `wrapType1` and `wrapType2`, to be used depending on the type of AppImage that was being wrapped.
However, [those were unified early 2020](https://github.com/NixOS/nixpkgs/pull/81833), meaning that both `wrapType1` and `wrapType2` have the same behaviour now.
:::
:::{.example #ex-wrapping-appimage-from-github}
# Wrapping an AppImage from GitHub
```nix
{ appimageTools, fetchurl }:
let
pname = "nuclear";
version = "0.6.30";
src = fetchurl {
url = "https://github.com/nukeop/nuclear/releases/download/v${version}/nuclear-v${version}.AppImage";
hash = "sha256-he1uGC1M/nFcKpMM9JKY4oeexJcnzV0ZRxhTjtJz6xw=";
};
in
appimageTools.wrapType2 { inherit pname version src; }
```
:::
The argument passed to `wrapType2` can also contain an `extraPkgs` attribute, which allows you to include additional packages inside the FHS environment your AppImage is going to run in.
`extraPkgs` must be a function that returns a list of packages.
There are a few ways to learn which dependencies an application needs:
- Looking through the extracted AppImage files, reading its scripts and running `patchelf` and `ldd` on its executables.
This can also be done in `appimage-run`, by setting `APPIMAGE_DEBUG_EXEC=bash`.
- Running `strace -vfefile` on the wrapped executable, looking for libraries that can't be found.
:::{.example #ex-wrapping-appimage-with-extrapkgs}
# Wrapping an AppImage with extra packages
```nix
{ appimageTools, fetchurl }:
let
pname = "irccloud";
version = "0.16.0";
src = fetchurl {
url = "https://github.com/irccloud/irccloud-desktop/releases/download/v${version}/IRCCloud-${version}-linux-x86_64.AppImage";
hash = "sha256-/hMPvYdnVB1XjKgU2v47HnVvW4+uC3rhRjbucqin4iI=";
};
in
appimageTools.wrapType2 {
inherit pname version src;
extraPkgs = pkgs: [ pkgs.at-spi2-core ];
}
```
:::
## Extracting {#ssec-pkgs-appimageTools-extracting}
Use `extract` if you need to extract the contents of an AppImage.
This is usually used in Nixpkgs to install extra files in addition to [wrapping](#ssec-pkgs-appimageTools-wrapping) the AppImage.
`extract` expects an argument with the `src` attribute, and either a `name` attribute or `pname` and `version` attributes.
::: {.note}
In the past, `appimageTools` provided both `extractType1` and `extractType2`, to be used depending on the type of AppImage that was being extracted.
However, [those were unified early 2020](https://github.com/NixOS/nixpkgs/pull/81572), meaning that both `extractType1` and `extractType2` have the same behaviour as `extract` now.
:::
:::{.example #ex-extracting-appimage}
# Extracting an AppImage to install extra files
This example was adapted from a real package in Nixpkgs to show how `extract` is usually used in combination with `wrapType2`.
Note how `appimageContents` is used in `extraInstallCommands` to install additional files that were extracted from the AppImage.
```nix
{ appimageTools, fetchurl }:
let
pname = "irccloud";
version = "0.16.0";
src = fetchurl {
url = "https://github.com/irccloud/irccloud-desktop/releases/download/v${version}/IRCCloud-${version}-linux-x86_64.AppImage";
hash = "sha256-/hMPvYdnVB1XjKgU2v47HnVvW4+uC3rhRjbucqin4iI=";
};
appimageContents = appimageTools.extract { inherit pname version src; };
in
appimageTools.wrapType2 {
inherit pname version src;
extraPkgs = pkgs: [ pkgs.at-spi2-core ];
extraInstallCommands = ''
mv $out/bin/${pname}-${version} $out/bin/${pname}
install -m 444 -D ${appimageContents}/irccloud.desktop $out/share/applications/irccloud.desktop
install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/irccloud.png \
$out/share/icons/hicolor/512x512/apps/irccloud.png
substituteInPlace $out/share/applications/irccloud.desktop \
--replace-fail 'Exec=AppRun' 'Exec=${pname}'
'';
}
```
:::
The argument passed to `extract` can also contain a `postExtract` attribute, which allows you to execute additional commands after the files are extracted from the AppImage.
`postExtract` must be a string with commands to run.
:::{.example #ex-extracting-appimage-with-postextract}
# Extracting an AppImage to install extra files, using `postExtract`
This is a rewrite of [](#ex-extracting-appimage) to use `postExtract`.
```nix
{ appimageTools, fetchurl }:
let
pname = "irccloud";
version = "0.16.0";
src = fetchurl {
url = "https://github.com/irccloud/irccloud-desktop/releases/download/v${version}/IRCCloud-${version}-linux-x86_64.AppImage";
hash = "sha256-/hMPvYdnVB1XjKgU2v47HnVvW4+uC3rhRjbucqin4iI=";
};
appimageContents = appimageTools.extract {
inherit pname version src;
postExtract = ''
substituteInPlace $out/irccloud.desktop --replace-fail 'Exec=AppRun' 'Exec=${pname}'
'';
};
in
appimageTools.wrapType2 {
inherit pname version src;
extraPkgs = pkgs: [ pkgs.at-spi2-core ];
extraInstallCommands = ''
mv $out/bin/${pname}-${version} $out/bin/${pname}
install -m 444 -D ${appimageContents}/irccloud.desktop $out/share/applications/irccloud.desktop
install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/irccloud.png \
$out/share/icons/hicolor/512x512/apps/irccloud.png
'';
}
```
:::

View File

@@ -1,63 +0,0 @@
# pkgs.mkBinaryCache {#sec-pkgs-binary-cache}
`pkgs.mkBinaryCache` is a function for creating Nix flat-file binary caches.
Such a cache exists as a directory on disk, and can be used as a Nix substituter by passing `--substituter file:///path/to/cache` to Nix commands.
Nix packages are most commonly shared between machines using [HTTP, SSH, or S3](https://nixos.org/manual/nix/stable/package-management/sharing-packages.html), but a flat-file binary cache can still be useful in some situations.
For example, you can copy it directly to another machine, or make it available on a network file system.
It can also be a convenient way to make some Nix packages available inside a container via bind-mounting.
`mkBinaryCache` expects an argument with the `rootPaths` attribute.
`rootPaths` must be a list of derivations.
The transitive closure of these derivations' outputs will be copied into the cache.
## Optional arguments {#sec-pkgs-binary-cache-arguments}
`compression` (`"none"` or `"xz"` or `"zstd"`; _optional_)
: The compression algorithm to use.
_Default value:_ `zstd`.
::: {.note}
This function is meant for advanced use cases.
The more idiomatic way to work with flat-file binary caches is via the [nix-copy-closure](https://nixos.org/manual/nix/stable/command-ref/nix-copy-closure.html) command.
You may also want to consider [dockerTools](#sec-pkgs-dockerTools) for your containerization needs.
:::
[]{#sec-pkgs-binary-cache-example}
:::{.example #ex-mkbinarycache-copying-package-closure}
# Copying a package and its closure to another machine with `mkBinaryCache`
The following derivation will construct a flat-file binary cache containing the closure of `hello`.
```nix
{ mkBinaryCache, hello }: mkBinaryCache { rootPaths = [ hello ]; }
```
Build the cache on a machine.
Note that the command still builds the exact nix package above, but adds some boilerplate to build it directly from an expression.
```shellSession
$ nix-build -E 'let pkgs = import <nixpkgs> {}; in pkgs.callPackage ({ mkBinaryCache, hello }: mkBinaryCache { rootPaths = [hello]; }) {}'
/nix/store/azf7xay5xxdnia4h9fyjiv59wsjdxl0g-binary-cache
```
Copy the resulting directory to another machine, which we'll call `host2`:
```shellSession
$ scp result host2:/tmp/hello-cache
```
At this point, the cache can be used as a substituter when building derivations on `host2`:
```shellSession
$ nix-build -A hello '<nixpkgs>' \
--option require-sigs false \
--option trusted-substituters file:///tmp/hello-cache \
--option substituters file:///tmp/hello-cache
/nix/store/zhl06z4lrfrkw5rp0hnjjfrgsclzvxpm-hello-2.12.1
```
:::

Some files were not shown because too many files have changed in this diff Show More