Compare commits

..

1954 Commits

Author SHA1 Message Date
Domen Kožar
2c1838ab99 btrfs-progs: 4.14.1 -> 4.15.1
(cherry picked from commit 11238ffbe1)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-04-07 12:54:35 +01:00
Domen Kožar
d51b5654e8 e2fsprogs: 1.43.8 -> 1.44.1
(cherry picked from commit e6114781b0)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-04-07 12:50:04 +01:00
Domen Kožar
7f561ed56a kernel: depend optionally on libelf 2018-04-07 12:22:16 +01:00
David Guibert
d64de62fcd kernel 4.14 require libelf to compile modules.
[...]
make modules -C /nix/store/h1vzl6bq4wif3m8dd1bw2p3fv4shjg3n-linux-4.14.9-dev/lib/modules/4.14.9/build EXTRA_CFLAGS=-Werror-implicit-function-declaration M=/tmp/nix-build-spl-kernel-2017-11-16-4.14.9.drv-0/source/build
/nix/store/h1vzl6bq4wif3m8dd1bw2p3fv4shjg3n-linux-4.14.9-dev/lib/modules/4.14.9/source/Makefile:939: *** "Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel". Stop.

This patch introduces kernel.moduleBuildDependencies to avoid the logic "stdenv.lib.optional (stdenv.lib.versionAtLeast kernel.version "4.14") libelf" in multiple places.

[dezgeg did some minor tweaks on top]
2018-04-07 12:19:44 +01:00
Tim Steinbach
9f9f727f36 linux: Add 4.14 2018-04-06 13:52:13 +01:00
Yegor Timoshenko
78e9665b48 kernel/common-config: backport 4.13+ support 2018-01-06 11:26:51 +00:00
Will Fancher
aea4ac85ac Extract files one at a time from all-cabal-hashes 2017-12-17 13:24:08 -05:00
Graham Christensen
d77e0969a7 openssl: fix nix patch for recent update
(cherry picked from commit e06dbe4f5b)
2017-11-03 21:47:54 +01:00
Graham Christensen
13d06210ef openssl_1_1_0: 1.1.0f -> 1.1.0g
(cherry picked from commit 5e2d96deb3)
2017-11-03 21:47:53 +01:00
Graham Christensen
c4052e624c openssl_1_0_2: 1.0.2l -> 1.0.2m
(cherry picked from commit 7726b46027)
2017-11-03 21:47:53 +01:00
Vladimír Čunát
6233be812f libav_11: security 11.10 -> 11.11
Fixes CVE-2017-7862.

(cherry picked from commit 25515ce928)
2017-10-31 00:20:07 +01:00
Bas van Dijk
821f2ea5d5 network-interfaces-scripted: fix NixOS/nixops#640
Reverse the PartOf dependency between network-setup and network-addresses-*

This was joint work of: @nh2, @domenkozar, @fpletz, @aszlig and @basvandijk
at the NixCon 2017 hackathon.
2017-10-30 20:48:32 +01:00
Franz Pletz
5459ab4268 linux: 4.4.84 -> 4.4.95
(cherry picked from commit 0a5ecde808)
2017-10-30 18:01:09 +01:00
Franz Pletz
ce4f54404d php71: 7.1.9 -> 7.1.11
(cherry picked from commit f41f5a8f77)
2017-10-30 17:59:05 +01:00
Franz Pletz
061d7504b5 php70: 7.0.24 -> 7.0.25
(cherry picked from commit 3975f267ab)
2017-10-30 17:59:04 +01:00
Franz Pletz
fe9be8e1f3 php56: 5.6.31 -> 5.6.32
(cherry picked from commit ecdf4f1c51)
2017-10-30 17:59:03 +01:00
Franz Pletz
630dbfe672 wget: 1.19.1 -> 1.19.2 for multiple CVEs
Fixes CVE-2017-13089, CVE-2017-13090.

(cherry picked from commit 3e29dd00fc)
2017-10-27 12:10:08 +02:00
Vladimír Čunát
c1a3522189 Merge #30729: freeimage: apply security patches
(cherry picked from commit dc240d2069)
They're relatively simple patches, used by Debian.
2017-10-24 21:40:28 +02:00
Tim Steinbach
aea148274b curl: 7.56.0 -> 7.56.1
(cherry picked from commit 9bd9305602)
2017-10-24 10:14:53 +02:00
Piotr Bogdan
b869376aa6 foomatic-filters: fix CVE-2015-8327 & CVE-2015-8560
(cherry picked from commit 4b756e4873)
2017-10-24 08:49:16 +02:00
Franz Pletz
a04665592c imagemagick7: 7.0.7-4 -> 7.0.7-8
(cherry picked from commit bb49391151)
2017-10-23 22:18:14 +02:00
Franz Pletz
f8b53887de imagemagick: 6.9.9-15 -> 6.9.9-20
(cherry picked from commit 6af0de6478)
2017-10-23 22:18:13 +02:00
Piotr Bogdan
b525d8cef2 irssi: 1.0.4 -> 1.0.5
Security update, see https://irssi.org/security/irssi_sa_2017_10.txt.

(cherry picked from commit c815637719)
2017-10-23 21:50:18 +02:00
taku0
8b8977f9ff flashplayer: 27.0.0.159 -> 27.0.0.170
(cherry picked from commit a060b850f6)
2017-10-17 14:10:27 +02:00
taku0
6a4df59fef flashplayer: 27.0.0.130 -> 27.0.0.159
(cherry picked from commit 628c039326)
2017-10-17 14:10:27 +02:00
Graham Christensen
a644b28933 wpa_supplicant: patch for KRACKAttack
CVE-2017-13077: Reinstallation of the pairwise encryption key (PTK-TK) in the 4-way handshake.
    CVE-2017-13078: Reinstallation of the group key (GTK) in the 4-way handshake.
    CVE-2017-13079: Reinstallation of the integrity group key (IGTK) in the 4-way handshake.
    CVE-2017-13080: Reinstallation of the group key (GTK) in the group key handshake.
    CVE-2017-13081: Reinstallation of the integrity group key (IGTK) in the group key handshake.
    CVE-2017-13082: Accepting a retransmitted Fast BSS Transition (FT) Reassociation Request and reinstalling the pairwise encryption key (PTK-TK) while processing it.
    CVE-2017-13084: Reinstallation of the STK key in the PeerKey handshake.
    CVE-2017-13086: reinstallation of the Tunneled Direct-Link Setup (TDLS) PeerKey (TPK) key in the TDLS handshake.
    CVE-2017-13087: reinstallation of the group key (GTK) when processing a Wireless Network Management (WNM) Sleep Mode Response frame.
    CVE-2017-13088: reinstallation of the integrity group key (IGTK) when processing a Wireless Network Management (WNM) Sleep Mode Response frame.

(cherry picked from commit ea50efcc67)
2017-10-16 19:57:42 +02:00
Graham Christensen
eb470c3591 hostapd: patch for KRACKAttack
CVE-2017-13077: Reinstallation of the pairwise encryption key (PTK-TK) in the 4-way handshake.
    CVE-2017-13078: Reinstallation of the group key (GTK) in the 4-way handshake.
    CVE-2017-13079: Reinstallation of the integrity group key (IGTK) in the 4-way handshake.
    CVE-2017-13080: Reinstallation of the group key (GTK) in the group key handshake.
    CVE-2017-13081: Reinstallation of the integrity group key (IGTK) in the group key handshake.
    CVE-2017-13082: Accepting a retransmitted Fast BSS Transition (FT) Reassociation Request and reinstalling the pairwise encryption key (PTK-TK) while processing it.
    CVE-2017-13084: Reinstallation of the STK key in the PeerKey handshake.
    CVE-2017-13086: reinstallation of the Tunneled Direct-Link Setup (TDLS) PeerKey (TPK) key in the TDLS handshake.
    CVE-2017-13087: reinstallation of the group key (GTK) when processing a Wireless Network Management (WNM) Sleep Mode Response frame.
    CVE-2017-13088: reinstallation of the integrity group key (IGTK) when processing a Wireless Network Management (WNM) Sleep Mode Response frame.

(cherry picked from commit 629965a532)
2017-10-16 19:57:30 +02:00
Bjørn Forsman
8de50112ac nixos/atd: remove "batch" from setuid wrappers
"batch" is a shell script so invoking it via setuid wrapper never worked
anyway. (The kernel drops perms on executables with shebang.) A previous
nixpkgs commit made "batch" invoke the NixOS setuid "at" wrapper to gain
needed privileges.

Thanks to @yesbox for noticing.

(cherry picked from commit 497108b456)
2017-10-16 19:18:47 +02:00
Bjørn Forsman
b1f5ef7249 nixos/tests: add basic test for services.atd
(cherry picked from commit 943730ff9b)

(Fix trivial conflict in nixos/release.nix.)
2017-10-16 19:18:23 +02:00
Bjørn Forsman
1aab6079ce at: fix permission errors with "batch" on NixOS
Fixes https://github.com/NixOS/nixpkgs/issues/12392

(cherry picked from commit 38e6ae8e44)
2017-10-16 19:18:04 +02:00
Daiderd Jordan
6500c1ae62 curl: fix clang build
(cherry picked from commit 514593ea31)
2017-10-16 15:24:32 +02:00
Vladimír Čunát
461e4a7e9a xorg-server: security 1.19.4 -> 1.19.5
CVE-2017-{12176,12177,12178,12183}

(cherry picked from commit 2baf618c3e)
2017-10-14 19:25:56 +02:00
Vladimír Čunát
f7b1bf41bb xorg libXfont2, libXres: security updates
CVE-2013-1988, CVE-2017-{13720,13722}

(cherry picked from commit 6328c76e77)
2017-10-14 19:25:54 +02:00
mimadrid
78ce72cca9 unrar: 5.5.7 -> 5.5.8
(cherry picked from commit 94fa59228a)
2017-10-12 22:08:48 +03:00
Robin Gloster
a3dd02c451 nss: fix includedir for pkgconfig
(cherry picked from commit 034c168aa2)
It fixes some reverse dependencies and it's very unlikely to worsen
something.
2017-10-11 08:17:49 +02:00
Bjørn Forsman
6549173ae5 nixos/lighttpd: add missing modules to allKnownModules
The output of ./configure shows all modules/plugins, both enabled and
disabled. With this info we can finally build the _complete_ list of
modules. We were missing these:

  mod_authn_gssapi
  mod_authn_ldap
  mod_geoip

(I hit this as I was building lighttpd with ldap support and the NixOS
module said ldap was unsupported, due to these missing entries in
allKnownModules.)

(cherry picked from commit d26f8b5e00)
2017-10-10 20:18:27 +02:00
Bjørn Forsman
9773f9d509 nixos/lighttpd: update list of allowed module names
* mod_dirlisting is auto-loaded by lighttpd and should not be explicitly
  loaded in the configuration file.
* The rest comes from looking at "ls -1 $lighttpd/lib/*.so" when
  lighttpd is built with "enableMagnet" and "enableMysql".

(cherry picked from commit b339e6e13f)
2017-10-10 20:18:23 +02:00
jaltek
4c36a0e761 shutter: 0.93.1 -> 0.94
(cherry picked from commit da93e6e678)
2017-10-10 19:33:13 +02:00
Léo Gaspard
6ed3db6d1b fcron module: fix use with hardlink-optimized store
(cherry picked from commit 1afd97aa8f)
2017-10-09 23:13:40 +01:00
Joerg Thalheim
55def8acf5 nixos/fcron: service needs fcron in PATH
otherwise fcronsighup is not found.
Set PATH to /run/current-system/sw/bin does not seems to be used by service file anyway.

(cherry picked from commit e34e28e573)
2017-10-09 11:43:58 +01:00
Vladimír Čunát
ab269d8947 xorg-server: security 1.19.2 -> 1.19.4
CVE-2017-{13721,13723}
https://lists.x.org/archives/xorg-announce/2017-October/002808.html

(cherry picked from commits 07efaaa722 and 35b4c8be51)
2017-10-08 17:39:54 +02:00
Piotr Bogdan
3824456f87 ruby_2_2: 2.2.7 -> 2.2.8
For multiple CVE's:

- CVE-2017-0898
- CVE-2017-10784
- CVE-2017-14033
- CVE-2017-14064

See https://www.ruby-lang.org/en/news/2017/09/14/ruby-2-2-8-released/

(cherry picked from commit 547fba5140)
2017-10-07 21:26:52 +01:00
Tim Steinbach
b1018291ee ruby: 2.2.5 -> 2.2.7
(cherry picked from commit ec2c469230)
2017-10-07 21:26:37 +01:00
Vladimír Čunát
373119bde8 firefox: revert the upgrade for now
It needs rustc-1.17, and I don't see how to port it ATM.  /cc #30143
2017-10-07 22:06:24 +02:00
Vladimír Čunát
111c132b53 icu: keep default version on 58
... to avoid mass rebuilds for now. (Bumped in parent merge.)

(cherry picked from commit a7159d3cda)
2017-10-07 22:06:24 +02:00
Vladimír Čunát
b27d55b798 Merge #30143: firefox-*: critical security updates
(cherry picked from commit 84952fc292)
2017-10-07 22:06:23 +02:00
romildo
0065ae23e3 locate: does not use localuser for mlocate
(cherry picked from commit 6ef6484dd6)
2017-10-07 21:11:51 +02:00
romildo
65aed1dfdb locate: fix creation of the parent directory of of locate database
(cherry picked from commit c06a10e05f)
2017-10-07 21:11:45 +02:00
Franz Pletz
0938f2eac5 curl: 7.55.1 -> 7.56.0 for CVE-2017-1000254
https://curl.haxx.se/docs/adv_20171004.html
(cherry picked from commit a98b96824d)
2017-10-04 08:20:50 +02:00
Tim Steinbach
6158b6bbf6 curl: 7.55.0 -> 7.55.1
(cherry picked from commit 135a841d91)
2017-10-04 08:20:49 +02:00
Franz Pletz
09b9f7e7c4 libidn2: 2.0.3 -> 2.0.4 for multiple CVEs
Fixes CVE-2017-14061, CVE-2017-14062.

(cherry picked from commit 1ff1c6ac4a)
2017-10-02 19:08:05 +02:00
Lancelot SIX
cef1776176 libidn2: 2.0.2 -> 2.0.3
See http://lists.gnu.org/archive/html/info-gnu/2017-07/msg00008.html
for release information

(cherry picked from commit e420be7ab5)
2017-10-02 19:08:04 +02:00
John Wiegley
dbf99ab8e1 libidn2: Correct a broken darwin patch
(cherry picked from commit b88296818d)
2017-10-02 19:08:04 +02:00
Lancelot SIX
b8083950ad libidn2: 2.0.1 -> 2.0.2
See https://lists.gnu.org/archive/html/info-gnu/2017-04/msg00011.html
for release information

(cherry picked from commit b8ee0d54aa)
2017-10-02 19:08:03 +02:00
Lancelot SIX
15577e731b libidn2: 0.16 -> 2.0.1
See http://lists.gnu.org/archive/html/info-gnu/2017-04/msg00010.html
for release information. With this release the numbering scheme changed.

(cherry picked from commit 0c318375c8)
2017-10-02 19:07:45 +02:00
Franz Pletz
a4f22f5d51 chrony: 3.1 -> 3.2
(cherry picked from commit 9fc7f918ee)
2017-10-02 19:07:37 +02:00
Franz Pletz
6a6f1127dc chrony: 3.0 -> 3.1
(cherry picked from commit ed71a3a678)
2017-10-02 19:07:37 +02:00
Franz Pletz
fb2948c469 vlc: add patch to fix CVE-2017-9300
(cherry picked from commit ad2ae842bb)
2017-10-02 19:07:37 +02:00
Franz Pletz
e43c79b616 dnsmasq: 2.77 -> 2.78 for multiple CVEs
Fixes CVE-2017-14491, CVE-2017-14492, CVE-2017-14493, CVE-2017-14494,
CVE-2017-14495, CVE-2017-14496.

(cherry picked from commit 2f188ff37f)
2017-10-02 17:13:17 +02:00
Franz Pletz
e57b61fea0 dnsmasq: 2.76 -> 2.77
(cherry picked from commit bc3ee6bfd4)
2017-10-02 17:13:17 +02:00
Rickard Nilsson
55bef6e401 ruby: 2.3.4 -> 2.3.5
Fixes CVE-2017-14033, CVE-2017-0898

(cherry picked from commit 85049c5aad)
2017-09-30 22:48:51 +02:00
Tim Steinbach
72a6370732 ruby: 2.3.3 -> 2.3.4
(cherry picked from commit 482566939e)
2017-09-30 22:47:51 +02:00
Joachim Fasting
9a4448f276 hydra: 2017-07-27 -> 2017-09-14
Builds against recent nixUnstable

(cherry picked from commit 3e96cee147)
2017-09-30 18:46:15 +02:00
Bjørn Forsman
64979ee66f lshw: fix built-in version info
Currently lshw says its version is "unknown". Make it report the current
package version instead.

(cherry picked from commit e570198980)
2017-09-30 11:45:42 +02:00
Franz Pletz
41c9543f84 virt-what: init at 1.18
(cherry picked from commit df86f19968)
2017-09-29 00:09:14 +02:00
Franz Pletz
870284d10e augeas: 1.8.0 -> 1.8.1 for CVE-2017-7555
(cherry picked from commit d2b6e9cdb0)
2017-09-28 17:13:33 +02:00
ndowens
61856210bd augeas: 1.7.0 -> 1.8.0
(cherry picked from commit 856a7e7646)
2017-09-28 17:13:20 +02:00
ndowens
dd62f59b67 augeas: 1.5.0 -> 1.7.0
(cherry picked from commit d9bc414521)
2017-09-28 17:13:18 +02:00
Franz Pletz
c55bebefe3 fossil: 2.2 -> 2.3
Fixes XSS vulnerability on the /help webpage. No CVE known.

(cherry picked from commit faed026cd4)
2017-09-28 17:12:45 +02:00
Linus Heckemann
d17c78a0c0 fossil: 1.36 -> 2.2
(cherry picked from commit 3f8f8bf5f6)
2017-09-28 17:12:33 +02:00
Franz Pletz
4733986502 postfix: 3.1.3 -> 3.2.3
Possibly fixes security issues. No CVE yet.

(cherry picked from commit 14e53aa0b1)
2017-09-28 17:09:40 +02:00
Franz Pletz
d3776594d9 mpg123: 1.25.4 -> 1.25.7 for multiple CVEs
Fixes at least CVE-2017-10683, CVE-2017-11126, CVE-2017-9545,
CVE-2017-12797.

(cherry picked from commit 6c283ae8f3)
2017-09-28 17:09:40 +02:00
Franz Pletz
ba37a7f018 mongoc: don't use bundled zlib & snappy
(cherry picked from commit bc5ec7b1d4)
2017-09-28 15:13:15 +02:00
Franz Pletz
a114047c0e mongoc: 1.7.0 -> 1.8.0
(cherry picked from commit cc258a671a)
2017-09-28 15:03:44 +02:00
Robin Gloster
8c0d9714ac mongoc: 1.5.4 -> 1.7.0
(cherry picked from commit beace037d0)
2017-09-28 15:03:43 +02:00
Franz Pletz
f7f3761ac2 libbson: 1.6.1 -> 1.8.0 for CVE-2017-14227
(cherry picked from commit 6dd6f10615)
2017-09-28 15:01:28 +02:00
ndowens
b5e4338175 libbson:1.1.10 -> 1.6.1
libbson: Removed un-needed deps
(cherry picked from commit ca8a0e3c80)
2017-09-28 15:01:21 +02:00
Franz Pletz
1833335e08 pyjwt: 1.4.2 -> 1.5.3 for CVE-2017-11424
(cherry picked from commit 232340f35b)
2017-09-28 14:59:26 +02:00
Franz Pletz
17941369dc kerberos: 1.15 -> 1.15.2 for CVE-2017-11462
(cherry picked from commit 8678f14ac9)
2017-09-28 14:59:18 +02:00
Franz Pletz
f570eafd50 php71: 7.1.8 -> 7.1.9
(cherry picked from commit 09b6f1e605)
2017-09-28 14:59:12 +02:00
Robin Gloster
f274387baf php: 7.1.7 -> 7.1.8
(cherry picked from commit bd1a78aa34)
2017-09-28 14:59:06 +02:00
Franz Pletz
484c775f47 php70: 7.0.22 -> 7.0.24
(cherry picked from commit d27ebcbae3)
2017-09-28 14:58:56 +02:00
Robin Gloster
0ed4b570ec php70: 7.0.21 -> 7.0.22
(cherry picked from commit 4ce80c5ed5)
2017-09-28 14:58:56 +02:00
Franz Pletz
6fe4513521 unrar: 5.5.5 -> 5.5.7 for multiple CVEs
Fixes CVE-2012-6706, CVE-2017-12940, CVE-2017-12941, CVE-2017-12942.

(cherry picked from commit 58f15c1f95)
2017-09-28 14:58:26 +02:00
Franz Pletz
35b5cc881e libraw: 0.18.2 -> 0.18.5 for multiple CVEs
Fixes at least CVE-2017-13735, CVE-2017-14265, CVE-2017-14348.

(cherry picked from commit c7e16f5ce5)
2017-09-28 14:58:19 +02:00
Marko Poikonen
85da3514b0 libraw: 0.17.2 -> 0.18.2
(cherry picked from commit a379ee6863)
2017-09-28 14:58:18 +02:00
Franz Pletz
3bc41fcfb0 oniguruma: 5.9.5 -> 6.6.1 for multiple CVEs
Fixes CVE-2017-9224, CVE-2017-9225, CVE-2017-9226, CVE-2017-9227,
 CVE-2017-9228, CVE-2017-9229.

(cherry picked from commit 41b43b201e)
2017-09-28 14:57:45 +02:00
Franz Pletz
4912d214df samba3: mark as vulnerable
(cherry picked from commit c02c47d1eb)
2017-09-28 14:57:38 +02:00
Franz Pletz
bc09188b3d libtiff: use patches from newer debian revision
(cherry picked from commit 8a5b8aeaf5)
2017-09-28 14:55:15 +02:00
Franz Pletz
232d8b96ca weechat: 1.9 -> 1.9.1 for CVE-2017-14727
https://lists.nongnu.org/archive/html/weechat-security/2017-09/msg00000.html
(cherry picked from commit 15189140dd)
2017-09-28 13:05:36 +02:00
Franz Pletz
e4ebe9b5c2 weechat: 1.8 -> 1.9
(cherry picked from commit ed515c8080)
2017-09-28 13:04:15 +02:00
lassulus
00bd262674 weechat: 1.7.1 -> 1.8
(cherry picked from commit d88faa261d)
2017-09-28 13:04:15 +02:00
Franz Pletz
ea06690f1f openvpn: 2.4.3 -> 2.4.4 for CVE-2017-12166
https://community.openvpn.net/openvpn/wiki/CVE-2017-12166
(cherry picked from commit 8e4586d077)
2017-09-28 12:28:24 +02:00
Bjørn Forsman
ad6265dbfa nixos/gitolite: don't leak nix store hash into gitolite-admin username/key
It doesn't look good when the initial admin user is named
"<hash>-gitolite-admin" and the key stored as
"<hash>-gitolite-admin.pub". Instead, make it simply "gitolite-admin"
and "gitolite-admin.pub".

(cherry picked from commit 6b9ee30672)
2017-09-27 19:22:57 +02:00
Franz Pletz
cf79bb1d33 imagemagick7: 7.0.6-4 -> 7.0.7-4 for multiple CVEs
Too many CVEs to list because they are not tracked upstream by release
versions.

(cherry picked from commit de4abf7054)
2017-09-26 17:30:55 +02:00
Franz Pletz
a5734ef50d imagemagick: 6.9.9-7 -> 6.9.9-15 for multiple CVEs
Too many CVEs to list because they are not tracked upstream by release
versions.

(cherry picked from commit 2d854c4c92)
2017-09-26 17:30:55 +02:00
Michael Raskin
3d04a557b7 asymptote: do not install sty-files, let texlive care of it
TeXLive version is effectively identical anyway, and it caused an
unneccessary file name collision.

Fixes: #29671
(cherry picked from commit 8d001911db)
2017-09-23 19:35:05 +02:00
Thomas Tuegel
31954b85e8 hplip: fix Python wrappers
We cannot rely on wrapPythonPrograms to wrap the installed executables because
they are symlinks (which it ignores). Instead, we have to emulate it to make
the wrappers ourselves.

(cherry picked from commit 1e2ebee42a)
2017-09-21 11:22:04 -05:00
Tim Jäger
d687d0f1a2 hplip: introduce nettools dependency (#26439)
* hplip: introduce nettools dependency

Some HP printers (notably a HP MFP M477fnw) need to run `hostname` as part of
the printing process. This executable is provided by the "nettools" package.

* hplip: prepend nettools to PATH

(cherry picked from commit 0c54a292fb)
2017-09-21 11:22:00 -05:00
Thomas Tuegel
e3b483a65d hplip: install PPDs where CUPS will find them
(cherry picked from commit 5ab37fb913)
2017-09-21 11:21:05 -05:00
Shea Levy
f22388e986 openldap: Use a global localstatedir
(cherry picked from commit c3b41a77e6)
2017-09-21 08:20:34 -06:00
Thomas Tuegel
b7e4857dd9 dropbox: 34.4.22 -> 35.4.20
(cherry picked from commit b0deb1ed48)
2017-09-21 06:12:22 -05:00
Peter Hoeg
0b1a5f2c0f dropbox: 34.4.20 -> 34.4.22
(cherry picked from commit 569867b3e8)
2017-09-21 06:12:18 -05:00
Robert Helgesson
ecc3eda7fe emacsPackagesNg.multi-term: fix broken download 2017-09-21 11:43:59 +02:00
Rob Vermaas
9e228fc2d8 Make sure dummy kernel module is loaded for hologram-agent.
(cherry picked from commit eb873f6c78)
2017-09-20 10:59:08 +00:00
Johannes Frankenau
1e30a7c617 borgbackup: 1.0.10 -> 1.0.11
(cherry picked from commit c6e52bc430)
2017-09-19 22:46:02 +02:00
Jörg Thalheim
b675a9f78a libwebsockets: fix eval
(cherry picked from commit 6d423da7cc)
2017-09-19 21:15:48 +01:00
Volth
70005ec6cd mosquitto: 1.4 -> 1.4.14
fixes #29567

(cherry picked from commit 6950da832d)
2017-09-19 20:32:07 +01:00
volth
0ece78b674 libwebsockets: 1.4 -> 2.3.0
(cherry picked from commit 4916f64948)
2017-09-19 20:32:07 +01:00
Jonathan Rudenberg
1eb9ffcc8d kodiPlugins: fix path for shared object links
Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>
2017-09-19 08:12:34 +02:00
Herwig Hochleitner
83706dd49f chromium: 60.0.3112.113 -> 61.0.3163.79
CVE-2017-5111
CVE-2017-5112
CVE-2017-5113
CVE-2017-5114
CVE-2017-5115
CVE-2017-5116
CVE-2017-5117
CVE-2017-5118
CVE-2017-5119
CVE-2017-5120

(cherry picked from commit 2773508b5d)
2017-09-18 23:46:49 +02:00
Kirill Boltaev
5ad3e85ca2 chromium: 60.0.3112.90 -> 60.0.3112.113
(cherry picked from commit 73af0b1696)
2017-09-18 23:46:49 +02:00
Herwig Hochleitner
3d032b54c9 chromium: 60.0.3112.78 -> 60.0.3112.90
(cherry picked from commit e8f1ddcbd1)
2017-09-18 23:46:49 +02:00
Franz Pletz
c15a900a70 apacheHttpd: fix CVE-2017-9798 (Optionsbleed)
https://blog.fuzzing-project.org/60-Optionsbleed-HTTP-OPTIONS-method-can-leak-Apaches-server-memory.html
(cherry picked from commit c9d11b8a1d)
2017-09-18 16:05:08 +02:00
Eelco Dolstra
88604ee33a nixUnstable: 1.12pre5511_c94f3d55 -> 1.12pre5619_346aeee1
(cherry picked from commit b86fd340f0)
2017-09-15 12:53:11 +02:00
Peter Simons
2667bfb1b9 ikiwiki: mark build broken
The test suite fails after we updated to Imagemagick from version 6.9.7-6 to
6.9.8-4. https://ikiwiki.info/bugs/imagemagick_6.9.8_test_suite_failure/ has
more details.

(cherry picked from commit 045c707e54)
2017-09-15 11:28:53 +02:00
Jörg Thalheim
59505673c1 daemontools: fix build
(cherry picked from commit d7f6367471)
2017-09-15 11:28:47 +02:00
Samuel Leathers
6e753b3e62 PyWebDAV: Fix src url
(cherry picked from commit 95f88c458b)
2017-09-15 10:47:11 +02:00
Michele Guerini Rocco
7af5c674d1 pythonPackages.pyscard: 1.9.4 -> 1.9.6 (#29386)
cherry-picked from d58e1f1c7b
2017-09-14 20:43:14 +01:00
Rickard Nilsson
5ae9420f66 Revert "libarchive: Patch for CVE-2017-14166"
This reverts commit 53b9546989.

Mass-rebuild, erronously pushed to release-17.03
2017-09-14 20:44:10 +02:00
Rickard Nilsson
53b9546989 libarchive: Patch for CVE-2017-14166 2017-09-14 16:13:06 +02:00
John Ericson
446f185626 darwin-stdenv, cc-wrapper: Fix eval on darwin
Need to refer directly to `darwin.binutils` as on Linux, `binutils`
doesn't take a `cctools` parameter. Persist `darwin.binutils` from the
previous stage too, so no hashes change.
2017-09-14 01:37:31 -04:00
Tuomas Tynkkynen
85cd273664 policycoreutils: Fix setuid install
(cherry picked from commit 4d205eb044)
2017-09-13 23:55:12 +02:00
taku0
19c0e24778 flashplayer: 26.0.0.151 -> 27.0.0.130
(cherry picked from commit c2e7d1f1f2)
2017-09-13 23:40:21 +02:00
Mikael Brockman
b4527644df emacs: 25.2 -> 25.3
https://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00211.html

> This is an emergency release to fix a security vulnerability in Emacs.
>
> Enriched Text mode has its support for decoding 'x-display' disabled.
> This feature allows saving 'display' properties as part of text.
> Emacs 'display' properties support evaluation of arbitrary Lisp forms
> as part of instantiating the property, so decoding 'x-display' is
> vulnerable to executing arbitrary malicious Lisp code included in the
> text (e.g., sent as part of an email message).

(cherry picked from commit 78f457c76c)
2017-09-13 23:40:19 +02:00
Yann Hodique
372ea4f71f emacs: 25.1 -> 25.2
(cherry picked from commit d884024d42)
2017-09-13 23:40:14 +02:00
John Ericson
86c879d3be Merge pull request #29096 from obsidiansystems/appease-sierra-linker
cc-wrapper: More intelligent sierra hack
2017-09-12 22:45:21 -04:00
John Ericson
c5b655a325 cc-wrapper: Utilize patched cctools ld for more robust macOS Sierra hack
Also fix numberous bugs, such as:

 - Not getting confused on more flags taking file arguments.

 - Ensuring children reexport their children, but the original
   binary/library doesn't.

 - Not spawning children when it turns out we just dynamically link
   under the threshold but our total number of inputs exceeeds it.

 - Children were always named `libunnamed-*`, when that name was
   supposed to be the last resort only.

In addition to the script, we also patch ld-wrapper to respect `.dylib`
and `.so` alike. In a future version of nixpkgs, this can be so enabled
by defaut. Newer nixpkgs will probably do this by default.
2017-09-12 22:42:14 -04:00
John Ericson
2c6ab8aadb cctools: Add patch for extra flag for sierra hack
Patch is drawn from [1], a back-port of [2].

Eventually, we might consider doing something for GNU binutils too, in
order that we switch (the normal) ld-wrapper to always use this to
leverage ld to resolve libraries, rather than faking it in bash.

[1]: https://github.com/obsidiansystems/cctools-port/tree/libs-normalize-17.03
[2]: https://github.com/tpoechtrager/cctools-port/pull/34
2017-09-12 20:32:40 -04:00
pvgoran
df7e518568 services.gitolite: Add RequiresMountsFor unit option ...
... to ensure that the filesystem where `dataDir` resides is mounted when we do initialization or upgrade.

(cherry picked from commit 4c4f73c0eb)
2017-09-12 07:04:51 +00:00
Bjørn Forsman
30bbc80b7e qmmp: 1.1.9 -> 1.1.10
(cherry picked from commit 88ae298467)
2017-09-11 20:13:48 +02:00
Bjørn Forsman
812229f05f qmmp: 1.1.5 -> 1.1.9
(cherry picked from commit 4b84127f1c)
2017-09-11 20:13:46 +02:00
timor
c35a493b27 perl-Class-Autouse: 1.99_02 -> 2.01
(cherry picked from commit f717af03ad)
2017-09-11 18:50:03 +02:00
timor
c8dfc9b165 perl-Data-Dumper: 2.154 -> 2.161 + build fix
(cherry picked from commit dcdbe960f8)
2017-09-11 18:28:02 +02:00
Vincent Laporte
a0e6a891ee ImageMagick: fix Magick-config
(cherry picked from commit 82a4c5e38b)
2017-09-10 00:32:34 +02:00
timor
7eb1a42de4 perl-File-Modified: 0.07 -> 0.10
(cherry picked from commit e480b4baee)
2017-09-09 19:05:04 +02:00
timor
86956b917b perl-Filter-Simple: 0.91 -> 0.94
(cherry picked from commit 4bf61ab252)
2017-09-09 19:05:04 +02:00
Bjørn Forsman
694529e45d kicad: 4.0.6 -> 4.0.7
(cherry picked from commit 15c18cef3d)
2017-09-09 14:16:35 +02:00
Bjørn Forsman
1405e36f52 kicad: put the full version string in name
(cherry picked from commit dfbb710375)
2017-09-09 14:16:29 +02:00
Daniel Frank
081da9301d kicad: update to 4.0.6
(cherry picked from commit f3f38eccbb)
2017-09-09 14:16:19 +02:00
Thomas Tuegel
46fc14b6b2 dropbox: 33.4.23 -> 34.4.20
(cherry picked from commit a6fcd2ce2f)
2017-09-08 11:36:34 -05:00
Peter Hoeg
13b0e47ed6 rubygems: 2.6.10 -> 2.6.13
Fixes a number of CVEs:

- a DNS request hijacking vulnerability. (CVE-2017-0902)
- an ANSI escape sequence vulnerability. (CVE-2017-0899)
- a DoS vulnerability in the query command. (CVE-2017-0900)
- a vulnerability in the gem installer that allowed a malicious gem to overwrite arbitrary files. (CVE-2017-0901)

(cherry picked from commit 9f51b3c105)
2017-09-08 16:22:18 +01:00
Andrzej Trzaska
838cbd54b3 Use gem 2.6.10 (#23902)
(cherry picked from commit 162845d5b1)
2017-09-08 16:22:11 +01:00
John Ericson
8ed299faac macos-sierra-shared: Backport change for consistency with other channels
While 17.03 does not have binutils-wrapper and thus doesn't need this to
work, I'll be continuing to improve this on all 3 platforms for the
immediate future. It's thus prudent to keep them somewhat in sync for
sake of future cherry-picking.

This post-dates the initial release of 17.03 and isn't used by anything
there at the moment, so I deem churn like this inconsequential and thus
acceptable.

(adapted from commit eb326c9cb7)
2017-09-06 14:37:03 -04:00
Robin Gloster
6c8b819c99 tcpdump: 4.9.1 -> 4.9.2
This is a security release theoretically under emgargo, but leaked by
Mageia and Fedora.

We have permission to deliver this prior to public release.

(cherry picked from commit 993a83d395)
2017-09-06 16:46:15 +02:00
Frederik Rietdijk
ee26c61ca2 Merge pull request #29053 from lsix/update_django_1_10
pythonPackages.django: 1.10.7 -> 1.10.8 (release 17.03)
2017-09-06 16:22:10 +02:00
Lancelot SIX
c2c99604a9 pythonPackages.django: 1.10.7 -> 1.10.8
Fixes CVE-2017-12794
See https://docs.djangoproject.com/en/1.10/releases/1.10.8/
2017-09-06 16:12:17 +02:00
John Ericson
1360efeac6 haskell infra: Make sure packages get custom stdenv
One of the goals of 74f5fe5 was to allow passing in a custom stdenv,
which would be used for genericBuilder's `mkDerivation` call. That does
work, but if packages takes `stdenv` as an parameter for any reason,
they'll get the default one instead. This change remedies it.

(cherry picked from commit 19de1f537e)
2017-09-05 15:36:33 -04:00
Franz Pletz
8b517ebd6a file: 5.31 -> 5.32 for CVE-2017-1000249
(cherry picked from commit 84ec7ef6c3)
2017-09-05 20:24:38 +02:00
Tuomas Tynkkynen
4ccb207ef2 file: 5.30 -> 5.31
(cherry picked from commit f1d8069ee8)
2017-09-05 20:24:38 +02:00
Renaud
ffbf54eb35 file: 5.28 -> 5.30
(cherry picked from commit 1129f92f65)
2017-09-05 20:24:37 +02:00
Franz Pletz
a95a8a25d1 ffmpeg_2_8: 2.8.11 -> 2.8.13
(cherry picked from commit 85cffcfce0)
2017-09-05 14:45:02 +02:00
Franz Pletz
f94fa51434 libav_12: 12 -> 12.1
(cherry picked from commit b1e9eff33e)
2017-09-05 14:40:58 +02:00
Vladimír Čunát
e146e9ea7c libav: maintenance 11.9 -> 11.10
(cherry picked from commit 322582d703)
2017-09-05 14:40:57 +02:00
Vladimír Čunát
f758cb87cf libav-11: maintenance 11.8 -> 11.9
The patch doesn't apply anymore and changelog suggests it's not needed.

(cherry picked from commit 5576ef9f1d)
2017-09-05 14:40:57 +02:00
Franz Pletz
c7e73c2c70 tcpdump: fix multiple CVEs
Fixes CVE-2017-11541, CVE-2017-11542, CVE-2017-11543.

Also fixes a segfault if built with openssl 1.1.

(cherry picked from commit a46f206271)
2017-09-05 13:17:47 +02:00
WilliButz
a60d54ac37 tcpdump: 4.9.0 -> 4.9.1
- fetch from GitHub instead of debian mirror

(cherry picked from commit c860c02def)
2017-09-05 13:17:47 +02:00
hsloan
f602ea0da5 tcpdump: Don't use stdenv.cross
(cherry picked from commit 822084fa37)
2017-09-05 13:17:46 +02:00
Franz Pletz
c1e2390c39 connman: 1.34 -> 1.35
Fixes CVE-2017-12865, see http://connmando.nri-secure.co.jp/index.html.

Fixes #28967.

(cherry picked from commit 7753daa204)
2017-09-05 12:09:18 +02:00
romildo
dd74be68bd connman: 1.33 -> 1.34
(cherry picked from commit ac8698b7d1)
2017-09-05 12:09:17 +02:00
Maximilian Güntner
f21b0dbf25 samba: 4.5.10 -> 4.5.13 2017-09-04 22:34:51 +02:00
Eelco Dolstra
22d4630e68 pythonPackages.libarchive-c: Disable failing test
f9f9749fd2 (commitcomment-24028305)
2017-09-04 17:20:26 +02:00
Vladimír Čunát
37d30a23b7 Merge #28946: nixos doc: update glibc locales link
(cherry picked from commit b41d33319c)
2017-09-03 23:04:16 +02:00
Tim Steinbach
eef209569f coreutils: 8.26 -> 8.28 (#28891)
(cherry picked from commit 1c45fd01aa)
8.28 fixes CVE-2017-7476.
2017-09-02 20:36:18 +02:00
Vladimír Čunát
edbf167fe8 Merge #28792: libgcrypt: 1.7.8 -> 1.7.9 2017-09-02 18:40:24 +02:00
Servilio Afre Puentes
97ea13c1d6 gitlab: fix permission issue in build phase
The newer DEB packages have a setuid file, creating an error when
unpacking the source during the build phase.

As dpkg doesn't have a way to pass parameters to tar, dpkg is then
told to just extract the filesystem tar file and that is unpacked by
tar directly.

Fixes #28494

(cherry picked from commit fae458c5e7)
2017-08-31 17:37:42 +01:00
Servilio Afre Puentes
8b8d64a2cb gitlab: 8.17.6 -> 8.17.8
Latest release has important bugfixes.

(cherry picked from commit cffb1fab3e)
2017-08-31 17:37:42 +01:00
Lancelot SIX
2be9c05a26 libgcrypt: 1.7.8 -> 1.7.9
Fixes CVE-2017-0379

See http://lists.gnu.org/archive/html/info-gnu/2017-08/msg00014.html
for release announcement and CVE details.
2017-08-31 16:29:00 +02:00
Volth
c121e43c30 tinc_pre: avoid infinite loop with EBADFD on network restart
(cherry picked from commit 688dc4e4c3)

cc #28789
2017-08-31 16:04:49 +02:00
Eelco Dolstra
768b390adc nix: 1.11.13 -> 1.11.14
(cherry picked from commit 79954b9d1f)
2017-08-31 11:02:42 +02:00
Jörg Thalheim
7da346a9f8 inetutils: fix service name
(cherry picked from commit 67adf69a16)
2017-08-31 09:59:29 +01:00
Franz Pletz
d76cd1a28b mbedtls: 2.5.1 -> 2.6.0 for CVE-2017-14032
https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2017-02
(cherry picked from commit 6f2fffef77)
2017-08-30 23:30:51 +02:00
Franz Pletz
577cc74958 mbedtls: 2.4.2 -> 2.5.1
(cherry picked from commit fac48cca7d)
2017-08-30 23:30:46 +02:00
Franz Pletz
a146db74e8 mbedtls: 2.4.0 -> 2.4.2
(cherry picked from commit aa58307973)
2017-08-30 23:30:42 +02:00
Jörg Thalheim
0eb90a42a3 network-interfaces-scripted: don't add 'lo' as device dependency
systemd does not create device units for loopback devices,
since they are not physical.

(cherry picked from commit 5d4a54ca4d)
2017-08-30 14:07:55 +01:00
Graham Christensen
956fe00bc7 Merge pull request #28742 from tokudan/release-17.03_ff5503
firefox: 55.0 -> 55.0.3
2017-08-30 08:20:18 -04:00
taku0
1277732d4d firefox: 55.0 -> 55.0.3
(cherry picked from commit dec0929f19)
2017-08-30 14:06:01 +02:00
Tim Steinbach
598c6f4d37 linux: 4.9.45 -> 4.9.46
(cherry picked from commit 5037f68b829265a0d4fde28207e39ea975a2b6fe)
2017-08-30 07:59:19 -04:00
Tim Steinbach
6a58b935bb linux: 4.12.9 -> 4.12.10
(cherry picked from commit 03a90094571e1831b6fbb2e3289c760af02d4121)
2017-08-30 07:59:19 -04:00
Nick Hu
56da88a298 teamviewer: 12.0.71510 -> 12.0.76279
(cherry picked from commit 90c5bf8c58)
2017-08-29 09:20:21 +00:00
Vladimír Čunát
a70a841cbd libjpeg(-turbo): 1.5.1 -> 1.5.2
(cherry picked from commit 240313e251)
2017-08-28 16:50:10 -04:00
Daniel Frank
9ef9973cb1 mbuffer: 20160613 -> 20170806
(cherry picked from commit 821881030d)

fixes #28612
2017-08-28 21:44:19 +01:00
Franz Pletz
db88de3725 libarchive: 3.3.1 -> 3.3.2
(cherry picked from commit f9f9749fd2)

Fixes lots of security issues (no release notes available).
2017-08-28 20:00:31 +02:00
Franz Pletz
c1fc1ead9f libarchive: 3.2.2 -> 3.3.1
(cherry picked from commit bf6c90ed67)
2017-08-28 19:58:31 +02:00
Vladimír Čunát
d4d3659e54 pprof: init at 2017-08-28
(cherry picked from commit e0010cd1c3)
2017-08-28 18:47:12 +02:00
Benjamin Saunders
da2159dafb electron: 1.4.15 -> 1.6.2 2017-08-28 14:26:40 +02:00
Tim Steinbach
160db9d330 atom: 1.19.2 -> 1.19.3 2017-08-28 14:15:52 +02:00
Samuel Leathers
e567693d30 atom: fixes #28436 - atom git integration 2017-08-28 14:15:52 +02:00
Tim Steinbach
3fd9e0f807 atom: 1.19.0 -> 1.19.2 2017-08-28 14:15:51 +02:00
Tim Steinbach
122c405b4c atom: 1.18.0 -> 1.19.0 2017-08-28 14:15:51 +02:00
Tim Steinbach
6ef6aa3c7b atom: 1.17.2 -> 1.18.0 2017-08-28 14:15:50 +02:00
Tim Steinbach
50a6f1ef1e atom: 1.17.0 -> 1.17.2 2017-08-28 14:15:50 +02:00
Tim Steinbach
6c0b7ec3c2 atom: 1.16.0 -> 1.17.0 2017-08-28 14:15:49 +02:00
Robin Gloster
fcae9e4c64 docker-distribution: 2.5.1 -> 2.5.2 2017-08-28 13:01:39 +02:00
Jörg Thalheim
46e6cde798 frostwire: add java to PATH
fixes #28547

(cherry picked from commit 9d74fd3e07)
2017-08-27 08:56:18 +01:00
Joachim F
e56d163c96 Merge pull request #28170 from ambrop72/chromium-fix3
Restore Chromium update in release-17.03, fix beta build
2017-08-26 19:58:50 +00:00
Tim Steinbach
ce331cc9a1 linux: 4.4.80 -> 4.4.84 2017-08-26 09:53:22 -04:00
Tim Steinbach
c8c8f8d98f linux: 4.9.44 -> 4.9.45
(cherry picked from commit 9b9d0cc06b)
2017-08-26 09:50:25 -04:00
Tim Steinbach
e04f3b4c7c linux: 4.12.8 -> 4.12.9
(cherry picked from commit d23bed7cc6)
2017-08-26 09:50:25 -04:00
Jörg Thalheim
f064a2da32 strongswan: add patch for CVE-2017-11185
(cherry picked from commit ad7439fbd1)
2017-08-25 22:02:47 +01:00
aszlig
fca2ff1a8b twister: 0.9.30 -> 0.9.34
From the upstream changelog:

Version 0.9.34:

 * quick fix to "Assertion mapInfo.count" failed, don't mess with these
   addrman structures!

Version 0.9.33:

 * fix serious connectivity problem: not trying to connect to >=0.9.30
   peers with random ports.

Version 0.9.31:

 * backport from upstream (arvidn/libtorrent@677e642):
   fixed uTP vulnerability from

The fixes in 0.9.31 are a bit more serious and it actually contains two
fixes from what I've been able to dig through:

 * https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-5685
 * https://www.us-cert.gov/ncas/alerts/TA14-017A

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit c905b7895c)
2017-08-25 18:32:14 +02:00
Thomas Tuegel
3f96be21d0 Merge pull request #28541 from tokudan/ibus-unblock
unblock 17.03: ibus: disabling the emoji dict
2017-08-25 08:30:48 -05:00
Jörg Thalheim
f7ff041d03 jetbrains.webstorm: 2017.1.4 -> 2017.2.2
fixes #28560

(cherry picked from commit 7ea05ea542)
2017-08-25 11:36:24 +01:00
Jörg Thalheim
4e413a9baa jetbrains.idea-ultimate: 2017.2.1 -> 2017.2.2
(cherry picked from commit ed023e0374)
2017-08-25 11:36:19 +01:00
Jörg Thalheim
9f73a20d89 jetbrains.pycharm-community: 2017.2.1 -> 2017.2.2
(cherry picked from commit 5bf21b3db7)
2017-08-25 11:36:13 +01:00
Jörg Thalheim
eb5f3d0b5a jetbrains.idea-ultimate: 2017.2.1 -> 2017.2.2
(cherry picked from commit 61e3436496)
2017-08-25 11:36:07 +01:00
Jörg Thalheim
f5b84d36b3 jetbrains.idea-community: 2017.2.1 -> 2017.2.2
(cherry picked from commit c5d3ddba3e)
2017-08-25 11:35:56 +01:00
Robert Helgesson
3d92fac36c nixos/tlp: mask systemd-rfkill socket
This fixes a spurious error on boot. See #24737.

(cherry picked from commit f861426de9)
2017-08-25 10:11:53 +02:00
Thomas Tuegel
49f6352e94 dropbox: 32.4.23 -> 33.4.23
(cherry picked from commit 72d6389ca1)
2017-08-24 11:49:16 -05:00
Daniel Frank
74c3c2c039 ibus: unblock channel 17.03 by disabling the emoji dict. Generating it hangs the build process. 2017-08-24 18:35:24 +02:00
taku0
a24fbb583e firefox: 55.0 -> 55.0.2
(cherry picked from commit f175cdc411)
2017-08-22 21:35:49 +02:00
taku0
9ba6492515 firefox: 55.0 -> 55.0.1
(cherry picked from commit 71d0a5a328)
2017-08-22 21:35:49 +02:00
taku0
713e9e0278 firefox: 54.0.1 -> 55.0
(cherry picked from commit 39e6dfe2f6)
2017-08-22 21:35:49 +02:00
mimadrid
a4632ae706 sqlite3_analyzer: 3.19.2 -> 3.20.0
(cherry picked from commit 1b7ec57d06)
2017-08-22 21:35:49 +02:00
mimadrid
1970021ef6 sqlite: 3.19.3 -> 3.20.0
(cherry picked from commit 36f6e4c167)
2017-08-22 21:35:49 +02:00
Franz Pletz
923ab613c2 sqlite3: 3.19.2 -> 3.19.3
(cherry picked from commit 0977c17f83)
2017-08-22 21:35:49 +02:00
mimadrid
87d97b3ce3 sqlite3: 3.17.0 -> 3.19.2
(cherry picked from commit 4d93d257f7)
2017-08-22 21:35:49 +02:00
mimadrid
e3f535d004 sqlite3_analyzer: 3.17.0 -> 3.19.2
(cherry picked from commit a604f14184)
2017-08-22 21:35:49 +02:00
mimadrid
a8d41bbee8 sqlite3_analyzer: 3.8.10.1 -> 3.17.0
fixes #23479

(cherry picked from commit eba71df6bc)
2017-08-22 21:35:49 +02:00
Vladimír Čunát
4ed52d62b9 libpng: 1.6.30 -> 1.6.31
1.6.30 won't build for ARM.  Hydra has almost no binaries for current
staging, so let's update for all platforms

(cherry picked from commit ba68231273)
2017-08-22 21:35:49 +02:00
Vladimír Čunát
d128f22fae libpng: 1.6.29 -> 1.6.30
(cherry picked from commit 0f09b05794)
2017-08-22 21:35:49 +02:00
Vladimír Čunát
fdec6be249 libpng: 1.6.28 -> 1.6.29
(cherry picked from commit 6230bfa123)
2017-08-22 21:35:49 +02:00
Puneet Arora
dad3c2231c subversion: 1.9.6 -> 1.9.7 (#28306)
(cherry picked from commit 14a7721454)

Fixes https://subversion.apache.org/security/CVE-2017-9800-advisory.txt
2017-08-22 14:30:13 +02:00
Maximilian Bosch
171094a819 geogebra: fallback to web.archive.org
(cherry picked from commit 319dac82d1)
2017-08-22 14:30:11 +02:00
Maximilian Bosch
54644b3b78 geogebra: 5-0-377-0 -> 5-0-382-0
(cherry picked from commit 242d950ab3)
2017-08-22 14:30:10 +02:00
Maximilian Bosch
ffabae37d3 geogebra: 5-0-369-0 -> 5-0-377-0
(cherry picked from commit 02ceec5343)
2017-08-22 14:29:55 +02:00
Sean Parsons
c4abd6f9e4 renoise: 3.0.1 -> 3.1.0 (#28380)
Replaced demo parameter with releasePath parameter.
2017-08-22 00:13:58 +02:00
Franz Pletz
713110e1d8 phpfpm service: remove NoNewPrivileges systemd option
This interferes with sendmail because suid won't work. Fixes #26611.

(cherry picked from commit cfb716e6a5)
2017-08-21 19:27:15 +02:00
Vladimír Čunát
f4c3bdc1df Merge #28346: readline: bugfix 7.0 -> 7.0.3
(cherry picked from commit 6c3513b4c0)
They are three simple bugfixes; only bashInteractive uses readline-7;
(at least) one of the bugs manifests in 17.03.
2017-08-20 13:29:07 +02:00
Tim Steinbach
28e8894a89 linux: 4.12.7 -> 4.12.8
(cherry picked from commit 9281b05c7f)
2017-08-18 15:34:04 -04:00
Tim Steinbach
8909cef424 linux: 4.9.43 -> 4.9.44
(cherry picked from commit a5f01aa745)
2017-08-18 15:31:20 -04:00
Eelco Dolstra
6dc5620b58 gcc: 6.3.0 -> 6.4.0
(cherry picked from commit 07176ed6f1)
It's just a bugfix update.
2017-08-18 16:55:01 +02:00
Hoang Xuan Phu
a391aca77f imagemagick: 6.9.9-3 -> 6.9.9-7
The old release has been removed from https://www.imagemagick.org/download/releases/ causing new builds to fail.

(cherry picked from commit b4c7d595c8)
2017-08-18 15:55:00 +02:00
Tim Steinbach
6fd82d7a67 ImageMagick: 7.0.6-1 -> 7.0.6-4
(cherry picked from commit 5e26dbe7ad)
2017-08-18 15:55:00 +02:00
Tim Steinbach
d33b18c57b ImageMagick: 6.9.9-0 -> 6.9.9-3
(cherry picked from commit bde8a15019)
2017-08-18 15:54:59 +02:00
Franz Pletz
2ef4001b95 linuxPackages.acpi_call: add patch for 4.12 compat
(cherry picked from commit 65f9631b87)
2017-08-18 11:19:27 +02:00
Sander van der Burg
b590b8285c nodePackages: regenerate with node2nix 1.3.0 2017-08-17 21:16:48 +02:00
Rickard Nilsson
c733e399da libsndfile: Security patches
Fixes CVE-2017-12562, CVE-2017-6892, CVE-2017-8361, CVE-2017-8363,
CVE-2017-8363, CVE-2017-8362

(cherry picked from commit 31eea73f99)
2017-08-17 18:34:06 +02:00
Bart Brouns
18eaa72c38 libsndfile: 1.0.27 -> 1.0.28
(cherry picked from commit 480d94553e)
2017-08-17 17:57:38 +02:00
Vladimír Čunát
3d49ba410f python3Packages.breathe: enable with python3
The tests don't work (not sure why), but sphinx seems to work OK.

(cherry picked from commit b5af77004a)
2017-08-17 14:25:29 +02:00
Rickard Nilsson
be8cada2d5 shadow: 4.4 -> 4.5
Fixes CVE-2017-12424

(cherry picked from commit 5f8a45c136)
2017-08-17 13:25:32 +02:00
Rickard Nilsson
150d759704 libxslt: Patch for CVE-2017-5029
(cherry picked from commit 1f9d9deb8a)
2017-08-17 13:25:24 +02:00
Tim Steinbach
128223fbdf openldap: 2.4.44 -> 2.4.45
(cherry picked from commit 0737359dd0)

Fixes CVE-2017-9287
2017-08-17 13:16:19 +02:00
Peter Hoeg
7078eef617 syncthing: 0.14.23 -> 0.14.36
Fixes #28310.
2017-08-17 08:30:48 +08:00
Michael Peyton Jones
6445453020 Factorio: 0.15.31 -> 0.15.33
(cherry picked from commit 1b262de7ee)
2017-08-16 19:29:20 +02:00
Josef Kemetmueller
31a956f18c Force check the filesystem before resizing
The message buffer of the kernel lists
> Please run 'e2fsck -f /dev/disk/by-label/nixos' first.
as the output of the command `resize2fs "$device"`.
This fixes NixOS/nixpkgs#26910.

(cherry picked from commit 899e2b5748)
Signed-off-by: Domen Kožar <domen@dev.si>
2017-08-16 14:40:01 +02:00
Graham Christensen
4766963768 Merge pull request #28292 from yegortimoshenko/patch-1
containers: wether -> whether
2017-08-15 08:23:37 -04:00
Yegor Timoshenko
be9e5c4551 containers: wether -> whether 2017-08-15 12:17:36 +00:00
Thomas Tuegel
e929c8f8fd vcsh: Patch for Git 2.13.2
Fixes #27134.

(cherry picked from commit 8489fbe4af)
2017-08-15 06:47:57 -05:00
Franz Pletz
65752b2d04 sudo: 1.8.20p1 -> 1.8.20p2
(cherry picked from commit 47f7aa96b0)

Fixes CVE-2017-1000368
2017-08-14 15:32:57 +02:00
Rickard Nilsson
10f0290795 kibana: 4.6.0 -> 4.6.5
Fixes CVE-2016-10366

(cherry picked from commit 129f8d7e99)
2017-08-14 15:04:21 +02:00
Eelco Dolstra
5096e3b188 elfutils: 0.168 -> 0.169
(cherry picked from commit 340bd1ed2e)

Fixes CVE-2017-7611, CVE-2017-7607, CVE-2017-7609, CVE-2017-7613,
CVE-2017-7608, CVE-2017-7612, CVE-2017-7610
2017-08-14 14:24:01 +02:00
Rickard Nilsson
51a83266d1 dpkg: 1.18.18 -> 1.18.24
Fixes CVE-2017-8283

(cherry picked from commit 3c136e5fa4)
2017-08-14 14:01:24 +02:00
Robert Helgesson
14e2a39b60 faac: fix patch URLs
Fixes #28028.
2017-08-13 22:47:36 +02:00
Tim Steinbach
6a886d59f2 linux: 4.9.42 -> 4.9.43
(cherry picked from commit 03ab6d73a3811be6c99b32fe8edcd5cdbea8178d)
2017-08-13 15:41:56 -04:00
Tim Steinbach
1bdc06efa3 linux: 4.12.6 -> 4.12.7
(cherry picked from commit 7cea2c2cdcec898e2a302d185c30f3d16b4777c1)
2017-08-13 15:38:59 -04:00
Robin Gloster
ec8d5081dd sysdig: fix build with current curl
(cherry picked from commit 89ad46d9b4)

Fixes #28191
2017-08-12 19:35:43 +02:00
Sebastian Hagen
36b4c4ed44 libtiff: Fix debian patch tarball URL
The tiff debian tarball URL has disappeared (since debian updated their current
version), which renders this package unbuildable.

Change it to a debian snapshot URL, which should be around indefinitely.

(cherry picked from commit edf6176d8a)
2017-08-11 23:31:58 +01:00
Joachim Fasting
81628ce54f tor-browser-bundle-bin: 7.0.3 -> 7.0.4
- Update Firefox to 52.3.0esr
- Update Tor to 0.3.0.10

(cherry picked from commit 1b77c29507)
2017-08-11 22:59:32 +02:00
Keith Amidon
5c912f06ef nixos/samba: fix pam service name typo (#28049)
The PAM service name used before this commit was "sambda", with an
extra 'd'. For some reason I don't quite fully understand this typo
prevents GDM from starting. This change fixes that as tested in VMs
built using "nixos-rebuild -I nixpkgs=<mypkgs> build-vm".

(cherry picked from commit f9204b9762)
2017-08-11 22:59:24 +02:00
Ambroz Bizjak
c4f199a991 chromium: fix beta version build
Fixes build error https://nix-cache.s3.amazonaws.com/log/0vb420kj4ys98k4ayq1sxkclkhlkazzx-chromium-60.0.3112.78.drv
2017-08-11 20:55:35 +02:00
Ambroz Bizjak
31633b1397 Revert "Revert "chromium: 58.0.3029.110 -> 60.0.3112.78""
This reverts commit 138313fe01.
2017-08-11 20:55:29 +02:00
Robin Gloster
f40bd007d4 dropbox: fix eval
cc @peterhoeg
2017-08-11 18:21:49 +02:00
Tim Steinbach
9c9cb402f9 linux: 4.12.5 -> 4.12.6
(cherry picked from commit 47d9b48e4d)
2017-08-11 12:15:56 -04:00
Tim Steinbach
aeda2afd05 linux: 4.12.4 -> 4.12.5
(cherry picked from commit ff9479cd54)
2017-08-11 12:15:51 -04:00
Tim Steinbach
5afad2afc7 linux: 4.9.41 -> 4.9.42
(cherry picked from commit a311de0da3126ff3d6942c0822e08c53fbcfbc20)
2017-08-11 12:10:41 -04:00
Wout Mertens
5546101ef4 Merge pull request #28154 from wmertens/add-node-8
nodejs-8_x: backport from master
2017-08-11 17:21:05 +02:00
Wout Mertens
3955c37c44 nodejs-8_x: backport from master 2017-08-11 15:13:11 +02:00
Amine Chikhaoui
0fb781e8d7 (git): fix ssh-path patch which was broken during the update to 2.14.1 2017-08-11 12:54:28 +02:00
Peter Hoeg
6932d806ce dropbox: 31.4.25 -> 32.4.23 2017-08-11 16:08:12 +08:00
Tim Steinbach
725e1baa85 mercurial: 4.1.1 -> 4.3.1
(cherry picked from commit f0719b5a0b)
2017-08-10 20:57:06 -04:00
Mike Cooper
f23f4bf0eb mercurial, tortoisehg: 3.9.2 -> 4.1.1
(cherry picked from commit 50bd7a113d)
2017-08-10 20:56:13 -04:00
Silvan Mosberger
d62a642a79 git: 2.14.0 -> 2.14.1
The new version contains a security fix for CVE-2017-1000117

More information regarding this update can be found here:
http://marc.info/?l=git&m=150238802328673&w=2

(cherry picked from commit 4a0efc9c4f)
2017-08-10 20:40:04 -04:00
mimadrid
d658937f64 git: 2.13.4 -> 2.14.0
(cherry picked from commit dc74b1a86d)
2017-08-10 20:39:51 -04:00
Tim Steinbach
34601e7344 git: 2.13.3 -> 2.13.4
(cherry picked from commit ae73a1704a)
2017-08-10 20:39:38 -04:00
Tim Steinbach
23c659fb2e git: 2.13.2 -> 2.13.3
(cherry picked from commit eb5263a9f1)
2017-08-10 20:39:30 -04:00
Alexander Schmolck
7badaca968 git: add missing deps for filter-branch etc (#27221)
Several git commands are implemented as shell scripts that run awk, sed, grep
and perl. There is some existing patching in the postinstall for perl to rewrite
it to an absolute reference to pkgs.perl, but several other packages are both
missing as a dependency and have no rewrite logic.

In particular git filter-branch depends on sed and grep.

Additionally, the perl logic also seds git-am, which is now a binary not a shell
script anymore (see <github.com/git/git/blob/master/builtin/am.c>), so this part
was obsolete.

I tested this by grepping all shell scripts for the relevant commands and then
comparing the diffs of the new version to what is produced in master. All
changes in the scripts seem good to me.

(cherry picked from commit 2c1097a83b)
2017-08-10 20:38:40 -04:00
Karol Chmist
b9a041c962 idea-ultimate: 2017.1.5 -> 2017.2.1
(cherry picked from commit e8020e272d)
2017-08-10 21:01:27 +01:00
Jiri Danek
c6b637c556 idea-community: 2017.2.0 -> 2017.2.1
(cherry picked from commit 305b3fed04)
2017-08-10 21:01:27 +01:00
Benno Fünfstück
0175391b11 jetbrains.pycharm-{community,professional}: 2017.1.4 -> 2017.1.5
(cherry picked from commit 37daf755d9)
2017-08-10 21:01:27 +01:00
Benno Fünfstück
bd13aaabb9 jetbrains.idea-community: 2017.1.4 -> 2017.1.5
(cherry picked from commit 141706567c)
2017-08-10 21:01:27 +01:00
Urban Škudnik
55caad9032 jetbrains.idea-ultimate: 2017.1.4 -> 2017.1.5
(cherry picked from commit 9ce8aadf5a)
2017-08-10 21:01:27 +01:00
Vladimír Čunát
029341bf05 libsoup: security 2.56.0 -> 2.56.1
Fixes CVE-2017-2885

(cherry picked from commit 3be89a6758)
2017-08-10 21:04:29 +02:00
Franz Pletz
6cd9a84705 subversion19: 1.9.5 -> 1.9.6 for CVE-2017-9800
See https://subversion.apache.org/security/CVE-2017-9800-advisory.txt

(cherry picked from commit abd837fe3d)
2017-08-10 20:58:20 +02:00
Franz Pletz
d5de850211 subversion18: 1.8.17 -> 1.8.18 for CVE-2017-9800
See https://subversion.apache.org/security/CVE-2017-9800-advisory.txt

(cherry picked from commit 0f5cbe43da)
2017-08-10 20:58:20 +02:00
taku0
cc0e511427 flashplayer: 26.0.0.137 -> 26.0.0.151
(cherry picked from commit 668007f034)
2017-08-10 14:45:19 -04:00
Franz Pletz
a9c4ad1f49 curl: 7.54.1 -> 7.55.0
Fixes #28073.

Fixes CVE-2017-1000101, CVE-2017-1000100, CVE-2017-1000099.

(cherry picked from commit b44bed5568)
2017-08-10 16:27:23 +02:00
Tim Steinbach
713d4b7e9e curl: 7.54.0 -> 7.54.1
(cherry picked from commit 9560fcbadf)
2017-08-10 16:27:22 +02:00
Tim Steinbach
771e06ec17 curl: 7.53.1 -> 7.54.0
(cherry picked from commit 55e334e62a)
2017-08-10 16:27:22 +02:00
Jörg Thalheim
055e5c3578 gajim: 0.16.7 -> 0.16.8
(cherry picked from commit 537944ea77)
2017-08-09 19:25:53 +01:00
Jörg Thalheim
e81d7e4e7a gajim: 0.16.6 -> 0.16.7
(cherry picked from commit d90e6c7ee6)
2017-08-09 19:25:53 +01:00
Franz Pletz
f1a7b81918 cacert: really fix utf-8 certname blacklists
See #27576.

(cherry picked from commit 2d5c1226c6)
2017-08-09 20:05:04 +02:00
Vladimír Čunát
93498869b9 knot-resolver: security 1.3.2 -> 1.3.3
https://lists.nic.cz/pipermail/knot-dns-users/2017-August/001184.html
(cherry picked from commit 10bcf0818f)
2017-08-09 16:41:03 +02:00
Lancelot SIX
1f7114aec3 Merge pull request #27834 from lsix/update_wiresharb_17.03
wireshark: 2.2.5 -> 2.2.8 (release-17.03)
2017-08-09 10:06:09 +02:00
Shea Levy
dc44472119 Merge branch 'ghcjs-node-version' of https://github.com/obsidiansystems/nixpkgs into release-17.03 2017-08-08 14:21:26 -04:00
John Ericson
f551ab5402 ghcjs / nodejs: Add back older 6.x node version for GHCJS
GHCJS seems to rely on it, otherwise the TH evaluator fails with an
unexpectedly closed file descriptor.

Node was bumped in 59249d04ba
2017-08-08 14:16:48 -04:00
Domen Kožar
f40f2f21c0 hydra: 2017-07-24 -> 2017-07-27
(cherry picked from commit a082215df5)
Signed-off-by: Domen Kožar <domen@dev.si>
2017-08-08 10:51:31 +02:00
Tim Steinbach
4dc413acc8 linux: 4.4.79 -> 4.4.80
(cherry picked from commit ea2a10e143)
2017-08-07 11:35:56 -04:00
Tim Steinbach
92dfc19124 linux: 4.9.40 -> 4.9.41
(cherry picked from commit 4825e4818b)
2017-08-07 11:32:56 -04:00
Aneesh Agrawal
c40b85d4fd bcrypt: add required dependency on six
(cherry picked from commit 669f5819e2)
2017-08-07 13:06:58 +02:00
Silvan Mosberger
8f17e414be docs: fix error in nix expression
(cherry picked from commit dcf651b468)
2017-08-06 11:01:57 +02:00
Will Dietz
3049ac21ef mailutils: Fix attempts to set unsupported ownership and perms
(cherry picked from commit d339dc762c)
2017-08-05 18:53:13 +02:00
Robin Gloster
fe266a01ad fix eval
cc @Ericson2314
2017-08-05 12:06:54 +02:00
Thomas Tuegel
c01097ca88 dropbox: 31.4.24 -> 31.4.25
(cherry picked from commit acf05ea777)
2017-08-04 19:56:06 -05:00
John Ericson
9217fc2f5a cc-wrapper: Backport sierra reexport hack and test 2017-08-03 19:51:20 -04:00
John Ericson
d724125fbc backport haskell infra: Misc cleanups
- The haskell lib is very close to not relying on Nixpkgs. I think
   this is good---simpler to think about and matches Nixpkgs's lib.

 - The haskell lib is only imported once

 - stdenv is exposed more shallowly so it can be overriden more easily.
   I'll eventually use this on Darwin to avoid the Sierra shared
   library problems (unless changes are to be made system-wide).

Closes https://github.com/NixOS/nixpkgs/pull/27840.
2017-08-03 19:51:20 -04:00
Bjørn Forsman
1454628d57 vim_configurable: add ".../after" plugin dirs to runtimepath
This fixes using e.g. CSApprox when installed with nix.

(cherry picked from commit 1639429359)
2017-08-03 12:21:38 +02:00
Frederik Rietdijk
34aa9a6a40 intltool: fix url 2017-08-03 10:17:06 +02:00
Peter Hoeg
08bc48049c Merge pull request #27890 from peterhoeg/u/dbs
dropbox: 30.4.22 -> 31.4.24
2017-08-03 10:59:00 +08:00
Peter Hoeg
b1714535d4 dropbox: 30.4.22 -> 31.4.24
(cherry picked from commit cbdf32b53ee5406989e3f2c56032f05181a1cdc0)
2017-08-03 10:56:56 +08:00
Graham Christensen
3a3d021bf3 Merge pull request #27871 from moretea/varnish-17.03
Patch varnish vulnerability
2017-08-02 09:08:05 -04:00
Maarten Hoogendoorn
b6b2da83dd patch varnish vulnerability 2017-08-02 14:59:21 +02:00
André-Patrick Bubel
d95660168d gutenprint: 5.2.11 -> 5.2.13
(cherry picked from commit 30f96ed2ba)
2017-08-02 12:38:27 +02:00
Eric Litak
5eb78b6997 factorio: 0.15.30 -> 0.15.31
(cherry picked from commit 2647ef05d4)
2017-08-01 23:07:08 +02:00
Shea Levy
0108097872 fetchFromGitHub: Allow private repos, hosted githubs
(cherry picked from commit b71b7ee622)
2017-08-01 14:12:09 -04:00
Lancelot SIX
970bc6f790 wireshark: 2.2.5 -> 2.2.8
Fixes the following CVEs:
- CVE-2017-11406
- CVE-2017-11407
- CVE-2017-11408
- CVE-2017-11409
2017-08-01 16:16:36 +02:00
Franz Pletz
2d80003beb memcached: 1.4.33 -> 1.4.39 for CVE-2017-9951
(cherry picked from commit 88526f279d)
2017-08-01 10:28:44 +02:00
Franz Pletz
c2c4239247 apacheHttpd: 2.4.26 -> 2.4.27 for multiple CVEs
Fixes: CVE-2017-9788 CVE-2017-9789

See https://httpd.apache.org/security/vulnerabilities_24.html

(cherry picked from commit 1f15b7c81b)
2017-08-01 10:28:39 +02:00
Franz Pletz
009b99e9c2 catdoc: add to patch fix CVE-2017-11110
(cherry picked from commit 5bfc47bbab)
2017-08-01 10:28:33 +02:00
Franz Pletz
a004cd9292 mysql57: 5.7.17 -> 5.7.19
(cherry picked from commit 3621bc76fd)
2017-08-01 10:28:28 +02:00
Franz Pletz
d93dc063ba mysql55: 5.5.54 -> 5.5.57 for multiple CVEs
See:
  - https://dev.mysql.com/doc/relnotes/mysql/5.5/en/news-5-5-56.html
  - https://dev.mysql.com/doc/relnotes/mysql/5.5/en/news-5-5-56.html
  - https://dev.mysql.com/doc/relnotes/mysql/5.5/en/news-5-5-55.html
  - http://www.oracle.com/technetwork/security-advisory/cpujul2017-3236622.html

Fixes: CVE-2017-3635 CVE-2017-3636 CVE-2017-3641 CVE-2017-3648 CVE-2017-3651
       CVE-2017-3652 CVE-2017-3653
(cherry picked from commit 4b5ae11f66)
2017-08-01 10:28:21 +02:00
Franz Pletz
8a52a02363 ipsecTools: add patch to fix CVE-2016-10396
(cherry picked from commit 4afb3f4ade)
2017-08-01 10:28:16 +02:00
Peter Simons
b909987ffa mpg123: update to version 1.25.4
(cherry picked from commit a3007a39c5)

Fixes CVE-2017-9545.
2017-08-01 10:17:12 +02:00
Franz Pletz
dc7682e3d4 bind: 9.10.5-P2 -> 9.10.6 for multiple CVEs
See: https://kb.isc.org/article/AA-01522

Fixes: CVE-2017-3140 CVE-2017-3141 CVE-2017-3142 CVE-2017-3143
2017-08-01 10:05:46 +02:00
Franz Pletz
c164921d34 libmtp: 1.1.11 -> 1.1.13
(cherry picked from commit c2a271e825)

Fixes: CVE-2017-9831 CVE-2017-9832
2017-08-01 09:42:00 +02:00
Franz Pletz
604043f2b0 pythonPackages.supervisor: 3.1.1 -> 3.1.4 (security)
Fixes CVE-2017-11610.

(cherry picked from commit 77ca756c7a)
2017-08-01 08:37:18 +02:00
Daniel Peebles
ea2e2af192 Merge pull request #27807 from NixOS/revert-27630-backport-high-sierra-17.03
Revert "Fix Darwin stdenv to work on 10.13 (backport to 17.03)"
2017-07-31 15:29:21 -04:00
Daniel Peebles
075f623399 Revert "Fix Darwin stdenv to work on 10.13 (backport to 17.03)" 2017-07-31 13:52:19 -04:00
Joachim Fasting
f39972bd14 electrum: 2.8.2 -> 2.8.3
(cherry picked from commit 9cee10973d)
2017-07-31 16:46:54 +02:00
Tim Steinbach
fc91f39ac1 torbrowser: 7.0.2 -> 7.0.3
Fixes a bug whereby visiting specially crafted urls could lead to
direct (non-tor) connections to the remote host[1]

[1]: https://blog.torproject.org/blog/tor-browser-703-released

(cherry picked from commit 449946ef94)
2017-07-31 16:44:40 +02:00
Franz Pletz
3c6e969bde cacert: fix unicode names in blacklist
Fixes #27576.

(cherry picked from commit 55742a2044)
2017-07-31 12:28:12 +02:00
Robin Gloster
138313fe01 Revert "chromium: 58.0.3029.110 -> 60.0.3112.78"
This reverts commit e9344b5677.

Build fails: https://nix-cache.s3.amazonaws.com/log/0vb420kj4ys98k4ayq1sxkclkhlkazzx-chromium-60.0.3112.78.drv

cc @anpryl

(#27776)
2017-07-30 22:40:53 +02:00
Anatolii Prylutskyi
e9344b5677 chromium: 58.0.3029.110 -> 60.0.3112.78 2017-07-30 21:00:14 +02:00
Vladimír Čunát
0590ecbe9e flex-2.5.35: switch source URL
(cherry picked from commit 25c762f2bc)
2017-07-30 09:47:07 +02:00
Eelco Dolstra
38ca6fae1b nix: 1.11.12 -> 1.11.13
(cherry picked from commit 17642b5fd0)
2017-07-28 20:26:16 +02:00
Eelco Dolstra
4f92d2077f nix: 1.11.11 -> 1.11.12
(cherry picked from commit 40cf34aaae)
2017-07-28 20:26:08 +02:00
Eelco Dolstra
5db121d10a diffoscope: Move all required tools into pythonPath
Alternative fix for #27534 that prevents the use of a double wrapper
(creating even uglier script names than usual, like
..diffoscope-wrapped-wrapped).

This was my bad in 96d7f35e96.

(cherry picked from commit 91dc811566)
2017-07-28 20:25:03 +02:00
Eelco Dolstra
0d61f5f78a Revert "diffoscope: wrap executable and include tools in PATH"
This reverts commit 23ad77b998.

Double wrapper scripts considered harmful.

(cherry picked from commit 3e68facc72)
2017-07-28 20:24:52 +02:00
Tim Steinbach
6b042fb329 linux: 4.4.78 -> 4.4.79
(cherry picked from commit 5a6b5b8daf)
2017-07-28 10:03:11 -04:00
Tim Steinbach
314f279ff4 linux: 4.9.39 -> 4.9.40
(cherry picked from commit 88c0f67ded)
2017-07-28 10:03:06 -04:00
Tim Steinbach
a36d3a07b6 linux: 4.12.3 -> 4.12.4
(cherry picked from commit f43c445824)
2017-07-28 10:03:00 -04:00
Vladimír Čunát
e50639cb5c knot-resolver: 1.2.6 -> 1.3.2
(master commit 62e4e3301b)
I know this is a larger update, but 1.2.x is unmaintained there's quite
a lot of bugs fixed and no significant incompatibility.
2017-07-28 15:28:19 +02:00
Robin Gloster
992ebf4457 maintainers: backport ris to fix eval 2017-07-28 14:15:13 +02:00
Robin Gloster
2940669e3f aws-auth: clean up
(cherry picked from commit 27800258e1)
2017-07-28 12:12:13 +02:00
Robert Scott
ecdf64dce7 aws-auth: init at unstable-2017-07-24
(cherry picked from commit 2989324d60)
2017-07-28 12:12:13 +02:00
Eelco Dolstra
38f0eaa570 makeImageFromDebDist: Add extraDebs arguments
This allows adding packages that are not part of the distribution, e.g.g

  extraDebs = [
    (pkgs.fetchurl {
      name = "openjdk.deb";
      url = http://ppa.launchpad.net/openjdk-r/ppa/ubuntu/pool/main/o/openjdk-8/openjdk-8-jdk-headless_8u111-b14-3~14.04.1_amd64.deb;
      sha256 = "1n5ibpkx9pjmc4nr052rls1yqbq7ckav2rabixjhd4yxbyhjl0ap";
    })
  ];

(cherry picked from commit 63d7b6ee29)
2017-07-27 20:35:37 +02:00
Daniel Peebles
0213a1865c Merge pull request #27630 from copumpkin/backport-high-sierra-17.03
Fix Darwin stdenv to work on 10.13 (backport to 17.03)
2017-07-26 23:13:53 -04:00
Sander van der Burg
6bf7904140 disnix: 0.7.1 -> 0.7.2
(cherry picked from commit 94f0a6793b)
2017-07-26 19:23:48 +00:00
Eelco Dolstra
b1fdd69287 debian: 8.8 -> 8.9
(cherry picked from commit a7c8f5e419)
2017-07-26 20:02:38 +02:00
Vladimír Čunát
7cb1cf07f5 pythonPackages.augeas: init at 1.0.2
(cherry picked from commit ac4c567c36)
2017-07-26 17:58:53 +02:00
Domen Kožar
f828a8689d ghc: apply a patch to fix common gold linker problem
It would otherwise result into undefined referenecs for some functions
in the base when using the gold linker:

   error: undefined reference to 'sqrt'

Fixes https://github.com/bos/double-conversion/pull/17

Previously ghc option -optl=-lm was used for packages depending on
such functions, but that could result into

   fatal error: cannot mix -r with dynamic object /nix/store/7crrmih8c52r8fbnqb933dxrsp44md93-glibc-2.25/lib/libm.so.6

in some situations like profiling builds.

Patch was prepared by Michael Bishop and Niklas Hambüchen.

Closes https://github.com/NixOS/nixpkgs/pull/27584.

(cherry picked from commit aafe3d29c1)
2017-07-26 10:22:02 +02:00
aszlig
040921d3da broadcom_sta: Add patch for supporting Linux 4.12
The patch is from Arch Linux at:

https://aur.archlinux.org/cgit/aur.git/tree/linux412.patch?h=broadcom-wl

Tested this by building against the following attributes:

  * linuxPackages.broadcom_sta
  * linuxPackages_latest.broadcom_sta
  * pkgsI686Linux.linuxPackages.broadcom_sta
  * pkgsI686Linux.linuxPackages_latest.broadcom_sta

I have not tested whether this works at runtime, because I do not posess
the hardware.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

(cherry picked from commit c71233f12c)

Fixes #27607.
2017-07-25 23:06:02 +02:00
georgewhewell
ea1410d6bd broadcom-sta: add patch for kernel 4.11+
(cherry picked from commit daf674491e)

Fixes #27607.
2017-07-25 23:05:41 +02:00
Franz Pletz
0357e2f8da ddccontrol: disable bindnow hardening
Caused segfaults. Fixes #27612.

(cherry picked from commit b33b40036b)
2017-07-25 22:59:08 +02:00
Lluís Batlle i Rossell
f1311880c7 zstd: 1.2.0 -> 1.3.0
(cherry picked from commit f338e99039)
2017-07-25 17:59:15 +02:00
Orivej Desh
97221fb4b7 zstd: 1.1.3 -> 1.2.0
(cherry picked from commit cb1af17f53)
2017-07-25 17:59:08 +02:00
Dan Peebles
9f0089807b Fix Darwin stdenv to work on 10.13
The main changes are in libSystem, which lost the coretls component in 10.13
and some hardening changes that quietly crash any program that uses %n in
a non-constant format string, so we've needed to patch a lot of programs that
use gnulib.

(cherry picked from commit 0419452113)
2017-07-24 22:14:28 -04:00
Bas van Dijk
7dc735ea29 hydra: 2017-06-22 -> 2017-07-24
hydra-2017-06-22 fails to build because of the nixUnstable upgrade.
hydra-2017-07-24 builds successfully.

(cherry picked from commit 662cf644bc)
2017-07-24 23:54:54 +02:00
Jörg Thalheim
8d9c8383f9 perf: remove binutils patch by wrapper
starting with linux 4.12 our patch no longer applied. In order to
avoid having to maintain patches for different linux kernels it is
easier to use a wrapper instead.

(cherry picked from commit 887570883e)
2017-07-23 15:19:09 +01:00
Sarah Brofeldt
e982b64928 spotify: 1.0.57.474.gca9c9538-30 -> 1.0.49.125.g72ee7853-111 (downgrade)
clarify note about stable and testing versions

(cherry picked from commit ef672008e1)
2017-07-23 14:27:27 +01:00
adisbladis
0c1c07e1a7 c-ares: 1.12.0 -> 1.13.0 for CVE-2017-1000381
(cherry picked from commit 66976bc670)
2017-07-22 08:56:47 -04:00
Tim Steinbach
d49a1157cd openjdk: 8u131-b11 -> 8u141-b15
(cherry picked from commit 8e37e3b7f1)
2017-07-21 16:18:31 +02:00
Kai Harries
40315ac217 diffoscope: wrap executable and include tools in PATH
diffoscope was looking for the tools it uses during runtime, but the
tools there neither part of the closure nor were they in the
PATH. This commit fixes this.

(cherry picked from commit 23ad77b998)
2017-07-21 13:42:22 +01:00
taku0
2b6aced488 oraclejdk: 8u131 -> 8u141
(cherry picked from commit 3e502bc73a)
2017-07-21 14:31:35 +02:00
Tim Steinbach
f20dcba3d1 linux: Remove 4.11
4.11.x has been EOL'd

(cherry picked from commit ba9275da88)
2017-07-21 07:37:28 -04:00
Tim Steinbach
9e426c5148 linux: 4.12.2 -> 4.12.3
(cherry picked from commit 98ad0f4dab)
2017-07-21 07:36:36 -04:00
Tim Steinbach
5a44619bdb linux: 4.9.38 -> 4.9.39
(cherry picked from commit 232f497169)
2017-07-21 07:36:36 -04:00
Tim Steinbach
4950dc5ce9 linux: 4.4.77 -> 4.4.78
(cherry picked from commit 5181d7568f)
2017-07-21 07:36:35 -04:00
Eelco Dolstra
02cecb3e8d nixUnstable: 1.12pre5506_3162ad5f -> 1.12pre5511_c94f3d55
(cherry picked from commit 8a31137441)
2017-07-21 13:10:10 +02:00
zimbatm
f2c6262381 nixUnstable: pre5413_b4b1f452 -> pre5506_3162ad5f
(cherry picked from commit 2780e2a780)
2017-07-21 13:10:05 +02:00
Rhys
48ecdcf598 nixos/oauth2_proxy: actually pass provider-specific options
Syntax errors prevented important parameters from being passed to
oauth2_proxy, which could have permitted unauthorised access to
services behind the proxy.

(cherry picked from commit 8777174d60)
2017-07-21 00:29:55 +02:00
Michael Peyton Jones
85489e4c45 Factorio service: fix typo in attribute path
(cherry picked from commit b09c87ab47)
2017-07-20 20:50:11 +02:00
Eric Litak
975cab15b9 factorio: authenticatedFetch now handles 404 properly
(cherry picked from commit 9953a798fb)
2017-07-20 20:50:04 +02:00
Graham Christensen
b3fa6295ad nixos/ldap: remove tls_checkpeer no when using TLS
(cherry picked from commit 2b2a6f2070)
2017-07-19 19:29:52 -04:00
Daiderd Jordan
b798aa6340 gitlab: fix archive urls for gitlab service
Accessing an url like https://gitlab.example.org/group/project/repository/archive.tar.gz?ref=master
requires tar/gzip to be in the path of the gitlab-workhorse service otherwise it fails.

(cherry picked from commit a03d6116ce)
2017-07-19 22:11:26 +02:00
adisbladis
10420649f1 postgresql-9.2.20 -> postgresql-9.2.21
postgresql-9.3.16 -> postgresql-9.3.17
postgresql-9.4.11 -> postgresql-9.4.12
postgresql-9.5.6 -> postgresql-9.5.7
postgresql-9.6.2 -> postgresql-9.6.3

Fixes:
  * CVE-2017-7484
  * CVE-2017-7485
  * CVE-2017-7486

See:
  * https://www.postgresql.org/about/news/1746/
(cherry picked from commit b5c6543de3)
2017-07-19 18:06:03 +02:00
adisbladis
4a8fe03499 nodejs: 4.8.1 -> 4.8.4
(cherry picked from commit f33f7dc0fa)
2017-07-19 18:06:03 +02:00
Christine Koppelt
ae825ec16e nodejs-4_x: 4.6.0 -> 4.8.1
(cherry picked from commit 5861b8b1c9)
2017-07-19 18:06:03 +02:00
adisbladis
4958ff2ec9 nodejs: 7.10.0 -> 7.10.1
(cherry picked from commit ea4e03d7ac)
2017-07-19 18:06:03 +02:00
Mathias Schreck
3f61eb3fbc nodejs-7_x: 7.9.0 -> 7.10.0
(cherry picked from commit 4abefec367)
2017-07-19 18:06:03 +02:00
Mathias Schreck
2a17b05266 nodejs: 7.7.3 -> 7.9.0
(cherry picked from commit 6cdec33141)
2017-07-19 18:06:03 +02:00
Jacek Smolak
f7de37e8f2 nodejs-7_x: 7.7.2 -> 7.7.3
(cherry picked from commit 07e6fe3e57)
2017-07-19 18:06:02 +02:00
Ben Zhang
c7fb5869ff nodejs: 7.7.1 -> 7.7.2
(cherry picked from commit e50dba97d2)
2017-07-19 18:06:02 +02:00
Mathias Schreck
5145e85f4c nodejs: 7.6.0 -> 7.7.1
(cherry picked from commit 792d8bd74b)
2017-07-19 18:05:59 +02:00
Peter Hoeg
b2f195132d gsoap: 2.8.42 -> 2.8.49
Fixes: CVE-2017-9765
2017-07-19 18:05:02 +02:00
Graham Christensen
69dd2456ff Merge pull request #27489 from joepie91/patch/cherrypick-node
nodejs: 6.9.5 -> 6.11.1
2017-07-19 07:37:46 -04:00
adisbladis
59249d04ba nodejs: 6.9.5 -> 6.11.1
(cherry picked from commit fffe1efa03)
2017-07-19 09:46:23 +02:00
Vladimír Čunát
41b2c16087 gnutls: use 3.5.10 on Darwin for now
This contains a revert of d6454e6a1.

(cherry picked from commit 42fd72091e)
2017-07-18 16:04:56 -04:00
Franz Pletz
ccb5642ccb graphicsmagick: 1.3.25 -> 1.3.26
(cherry picked from commit cb2344829f)
2017-07-18 18:05:12 +02:00
Franz Pletz
9cbba51b04 imagemagick7: 7.0.6-0 -> 7.0.6-1
(cherry picked from commit cff27d574e)
2017-07-18 18:05:06 +02:00
Franz Pletz
e6acc075c1 imagemagick: 6.9.8-10 -> 6.9.9-0
(cherry picked from commit 0e9676f62e)
2017-07-18 18:05:06 +02:00
luigy
e4d6399c86 Fix #27448 argument list too long in fetchzip for darwin.
Paired with @Ericson2314

(cherry picked from commit eb6c45bcae)
2017-07-18 09:07:56 -04:00
Franz Pletz
cf614ba74c zfsUnstable: 0.7.0-rc4 -> 0.7.0-rc5
(cherry picked from commit 7f0994c33d)
2017-07-18 11:16:29 +01:00
Rob Vermaas
e93f26847e Add file with Azure image locations, similar to ec2-amis.nix. Will be used by nixops. 2017-07-18 09:18:20 +00:00
Rob Vermaas
9d810ddcc1 Add file with GCE image locations, similar to ec2-amis.nix. Will be used by nixops. 2017-07-18 09:15:45 +00:00
Jamey Sharp
75f87bc323 build-fhs-userenv: Propagate $XAUTHORITY
The `DISPLAY` environment variable is propagated into chroots built with
`buildFHSUserEnv`, but currently the `XAUTHORITY` variable is not. When
the latter is set, its value is usually necessary in order to connect to
the X server identified by the former.

This matters for users running gdm3, for example, who have `XAUTHORITY`
set to something like `/run/user/1000/gdm/Xauthority` instead of the X
default of `~/.Xauthority`, which doesn't exist in that setup.

Fixes #21532.

(cherry picked from commit 09bae7cb70)
2017-07-18 08:27:30 +01:00
Robert Helgesson
359c8c9d9a expat: 2.2.1 -> 2.2.2
(cherry picked from commit cc8e2aec29)
2017-07-18 01:22:07 +02:00
Nicolas B. Pierron
7be2796f63 Update Mozilla Software Releases sub-key.
This commit update the Mozilla Software Releases, with the key found at:
https://gpg.mozilla.org/pks/lookup?search=Mozilla+Software+Releases+%3Crelease%40mozilla.com%3E&op=vindex

(cherry picked from commit 5442484c5f)
2017-07-18 00:13:50 +02:00
aszlig
4d1e1d07f9 nixos/taskserver: Fix manual PKI management
The helper tool had a very early check whether the automatically created
CA key/cert are available and thus it would abort if the key was
unavailable even though we don't need or even want to have the CA key.

Unfortunately our NixOS test didn't catch this, because it was just
switching from a configuration with an automatically created CA to a
manual configuration without deleting the generated keys and certs.

This is done now in the tests and it's also fixed in the helper tool.

Reported-by: @jpotier
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Tested-by: @jpotier
(cherry picked from commit b618843860)
2017-07-17 20:30:48 +02:00
Franz Pletz
292343c5cb firmwareLinuxNonfree: 2017-04-16 -> 2017-07-05
Fixes #27129.

(cherry picked from commit e1b29dd6d6)
2017-07-17 15:25:35 +02:00
Franz Pletz
1ed0985281 firmwareLinuxNonfree: 2017-03-11 -> 2017-04-16
(cherry picked from commit b733a34e8e)
2017-07-17 15:25:27 +02:00
Graham Christensen
bd484ad23c Merge pull request #27390 from pbogdan/chrome-17.03
chrome/chromium: beta and dev fixes for release-17.03.
2017-07-16 17:24:22 -04:00
Eric Litak
0ebdca01d3 factorio: 0.15.26 -> 0.15.30 (#27421)
(cherry picked from commit 96b4ed637b)
2017-07-16 14:30:44 +02:00
Eric Litak
42e9d16513 factorio: 0.15.16 -> 0.15.26
(cherry picked from commit a72c1e4e1c)
2017-07-16 14:30:42 +02:00
Johannes Barthelmes
4e048095cc factorio: 0.15.1 -> 0.15.16
(cherry picked from commit 636ce2dfdb)
2017-07-16 14:30:41 +02:00
Guillaume Maudoux
ea7e3715fe factorio-demo: init at 0.14.23 (#25265)
(cherry picked from commit 92f53af64d)
2017-07-16 14:30:40 +02:00
Eric Litak
466e59eab1 factorio: 0.14.21 -> 0.15.1
(cherry picked from commit 81122d3beb)
2017-07-16 14:30:39 +02:00
Eric Litak
116d982a50 factorio: add name as arg to authenticatedFetch
(cherry picked from commit 3a083218b9)
2017-07-16 14:30:33 +02:00
Tim Steinbach
bde6a03e13 linux: 4.4.76 -> 4.4.77
(cherry picked from commit 81b993369c)
2017-07-15 19:33:45 -04:00
Tim Steinbach
da2479a19c linux: 4.9.37 -> 4.9.38
Remove temporary patches to perf as well

(cherry picked from commit b04858db1b)
2017-07-15 19:33:33 -04:00
Tim Steinbach
170e378656 linux: 4.11.10 -> 4.11.11
(cherry picked from commit ccec16579d)
2017-07-15 19:32:20 -04:00
Tim Steinbach
05e8bb0a90 linux: 4.12.1 -> 4.12.2
(cherry picked from commit c5ef98bb34)
2017-07-15 19:32:12 -04:00
Will Dietz
a40677c0ea opensmtpd: Fix attempt to set unsupported permissions during install
(cherry picked from commit 04aa269fb1)
2017-07-15 17:42:35 +02:00
Vladimír Čunát
8e75b4dc7b evince: patch CVE-2017-1000083 + minor changes
This removes help for now but fixes #27388.
The minor update might be related to the patch so it's included.

(cherry picked from commit efe66e221f)
2017-07-15 10:09:28 +02:00
Tim Steinbach
c82b517c03 perf: Apply patch for offline kernels
As per https://lkml.org/lkml/2017/7/13/314, perf is broken in 4.9.36 and 4.9.37
Patches in this commit are taken from
https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/commit/?id=39f4f2c018bd831c325e11983f8893caf72fd9eb

This will allow perf to build again and should be included in a future 4.9.x release,
allowing the custom patching to be removed again

(cherry picked from commit c4fff9de509d6bff5f9d6e875e73472534f72d15)
2017-07-14 20:05:41 -04:00
Bjørn Forsman
7b390ba4dc nixos/libvirt: prevent OVMF path from being garbage collected
Use xmlstarlet to update the OVMF path on each startup, like we do for
<emulator>...qemu-kvm</emulator>.

A libvirt domain using UEFI cannot start if the OVMF path is garbage
collected/missing.

(cherry picked from commit b8e109d6ac)
2017-07-14 22:11:06 +02:00
Bjørn Forsman
cf9bb65e79 nixos/libvirt: modify xml with xmlstarlet
Instead of grep and sed, which is brittle.

(I don't know how to preserve the comment we currently add to say that
this line is auto-updated. But I don't think it adds much value, so I'm
not spending any effort on it.)

(cherry picked from commit 292827b0e0)
2017-07-14 22:11:05 +02:00
Joachim Fasting
1436cc45af OVMF: separate output for ovmf binaries
OVMF{,CODE,VARS}.fd are now available in a dedicated fd output, greatly
reducing the closure in the common case where only those files are used (a
few MBs versus several hundred MBs for the full OVMF).

Note: it's unclear why `dontPatchELF` is now necessary for the build to
pass (on my end, at any rate) but it doesn't make much sense to run this
fixup anyway,

Note: my reading of xen's INSTALL suggests that --with-system-ovmf should
point directly to the OVMF binary.  As such, the previous invocation was
incorrect (it pointed to the root of the OVMF tree).  In any case, I have
only built xen with `--with-system-ovmf`, I have not tested it.

Fixes https://github.com/NixOS/nixpkgs/issues/25854
Closes https://github.com/NixOS/nixpkgs/pull/25855

(cherry picked from commit 252dcd62f3)

[Bjørn: Conflicts in pkgs/applications/virtualization/xen/4.5.nix were
resolved by dropping the changes. In branch release-17.03
.../xen/4.5.nix doesn't use OVMF at all.]
2017-07-14 20:18:19 +02:00
Bjørn Forsman
2d491aafd0 nixos/acme: improve documentation
* Use literalExample for better readability
* Clarify a bit wrt. 'webroot' and 'allowKeysForGroup'

(cherry picked from commit 6a55fda61e)
2017-07-14 18:01:16 +02:00
Bjørn Forsman
b436981b98 nixos/acme: support "full.pem" (for lighttpd)
* Create "full.pem" from selfsigned certificate
* Tell simp_le to create "full.pem"
* Inject service dependency between lighttpd and the generation of certificates

Side note: According to the internet these servers also use the
"full.pem" format: pound, ejabberd, pure-ftpd.

(cherry picked from commit 7a0e958b97)
2017-07-14 18:00:49 +02:00
Piotr Bogdan
517e23ad39 chrome: fix icons. 2017-07-14 16:00:08 +01:00
Piotr Bogdan
7c661d15dd chrome: make sure settings can be saved. 2017-07-14 16:00:08 +01:00
Thomas Tuegel
9bcc738404 Merge pull request #27383 from ttuegel/update/stable/dropbox
dropbox: 28.4.14 -> 30.4.22
2017-07-14 09:17:15 -05:00
Thomas Tuegel
94e632d4f8 dropbox: 29.4.20 -> 30.4.22
(cherry picked from commit 640137d2cb)
2017-07-14 07:19:48 -05:00
Thomas Tuegel
995965ba7a dropbox: 28.4.14 -> 29.4.20
(cherry picked from commit 59f94b12f3)
2017-07-14 07:19:33 -05:00
Peter Hoeg
e8852fd046 dropbox: use wmctrl from nixpkgs
(cherry picked from commit c4c33eaca1)
2017-07-14 07:18:59 -05:00
Rob Vermaas
3597b5f7fc nlopt: build without octave support, as it is broken with octave 4.x+ 2017-07-14 10:51:56 +00:00
Clemens Fruhwirth
ae4ff80025 Introduce virtualisation.libvirtd.qemuOvmf.
(cherry picked from commit df5d588f13)
2017-07-14 11:14:44 +02:00
Bjørn Forsman
87a320200c libvirt: add missing gettext in libvirt-guests.sh
Or else this is seen in the system log:

.../libexec/libvirt-guests.sh: line 211: gettext: command not found

(cherry picked from commit 01ec484a47)
2017-07-14 11:14:44 +02:00
Vincent Laporte
99aac554e2 libvirt: fix build on darwin
(cherry picked from commit dd1471b4c4)
2017-07-14 11:14:44 +02:00
Vince van Oosten
50f242d129 add parted to build inputs
(cherry picked from commit 00c3bd1561)
2017-07-14 11:14:44 +02:00
Vince v. Oosten
dac0d0f356 add disk storage to libvirt
(cherry picked from commit 39e95aa159)
2017-07-14 11:14:44 +02:00
Franz Pletz
911d8e7fdc nginx: add patch to fix CVE-2017-7529 2017-07-14 01:06:03 +02:00
Piotr Bogdan
1e95dcd673 chromium: fix build beta and dev build failures. 2017-07-13 20:50:56 +01:00
Joachim Fasting
849b5a5193 alienfx: do not attempt to install suid executables
(cherry picked from commit f90d7b23a7)
2017-07-13 18:09:30 +02:00
Jörg Thalheim
3cb54cc8e6 runit: disable uid check during install
(cherry picked from commit 712d26d437)
2017-07-13 18:06:10 +02:00
Joachim Fasting
5e082aed14 runit: replace hardcoded /sbin/runit with in-store runit binary
runit-init calls the runit executable as /sbin/runit, which
obviously fails for us.

This should improve support for using runit as an init replacement.

(cherry picked from commit 5a04a30653)
2017-07-13 18:06:03 +02:00
taku0
14e1a15ced flashplayer: 26.0.0.131 -> 26.0.0.137
(cherry picked from commit eca15bd0c2)
2017-07-13 14:45:30 +02:00
Joachim Fasting
e9200fc3a1 tinycc: 0.9.27pre-20170605 -> 0.9.27pre-20170710
Various CPP improvements/fixes
Support forward declaration of enums (GNU extension)
Initial implementation of C11 _Generic

(cherry picked from commit cfc6e4471b)
2017-07-13 14:45:28 +02:00
Tim Steinbach
33e2402afb linux: 4.12 -> 4.12.1
(cherry picked from commit 6131b4d52d)
2017-07-13 08:37:01 -04:00
Tim Steinbach
4e24689e11 linux: 4.11.9 -> 4.11.10
(cherry picked from commit 24de0bad42)
2017-07-13 08:35:08 -04:00
Tim Steinbach
f12f08f872 linux: 4.9.36 -> 4.9.37
(cherry picked from commit 6da222918e)
2017-07-13 08:31:43 -04:00
Tim Steinbach
310e0941f7 linux: 4.9.35 -> 4.9.36
(cherry picked from commit 05bd289ff8)
2017-07-13 08:31:39 -04:00
Emmanuel Rosa
b63d2c3dd0 pgadmin: make desktop item
This change adds the .desktop file so that pgAdmin shows up in the menu
system of desktop environments (ex. GNOME, XFCE, etc).

Closes #27067

(cherry picked from commit b6e15bde7a)
2017-07-12 23:21:32 +01:00
Joachim Fasting
7f63d3b7a4 ndisc6: do not attempt to install suid binaries
(cherry picked from commit 50339315e5)
2017-07-12 20:58:31 +02:00
Jörg Thalheim
b6f05ca54d Merge pull request #27316 from yegortimoshenko/patch-1
nftables: drop services prefix in an error message
2017-07-12 11:20:11 +01:00
Yegor Timoshenko
f2c0e09a87 nftables: drop services prefix in an error message 2017-07-12 02:55:25 +03:00
Piotr Bogdan
58d7712413 chromium: don't apply patch no longer needed on >= 58. 2017-07-11 15:39:42 +01:00
rnhmjoj
94941cb045 fish-foreign-env: hide warnings when setting PATH 2017-07-11 15:20:21 +01:00
Vladimír Čunát
9948e91575 texlive: switch to a *working* temporary mirror
See #24683.

(cherry picked from commit 7d547a6b4c)
2017-07-11 15:34:55 +02:00
Sander van der Burg
27ab44fc09 disnix: 0.7 -> 0.7.1
(cherry picked from commit 42e6b754fb)
2017-07-11 00:27:06 +02:00
Will Dietz
86ca675a28 wcslib: fix attempts to use unsupported permissions during install
(cherry picked from commit 15253a8dde)
2017-07-10 22:51:21 +02:00
Will Dietz
69a346fc50 netselect: Fix attempt to use unsupported permissions on files in store
(cherry picked from commit 59bf263a59)
2017-07-10 22:51:09 +02:00
Rickard Nilsson
dadb283ef5 vulnix: Cherry pick changes from master
Cherry picked from commit 70322d8b87, but
left out the actual version bump of pythonPackages.BTrees
2017-07-10 20:00:51 +02:00
Maksim Bronsky
b5a6cb6cea initial release: vulnix
(cherry picked from commit 97f26ee39a)
2017-07-10 19:28:18 +02:00
Vladimír Čunát
a595e78cdf knot-resolver: remove aarch64 from meta.platforms
It will compile but won't really work ATM.

(cherry picked from commit 3678981f9f)
2017-07-10 18:11:51 +02:00
Tristan Helmich
5287b6566a pythonPackages.phonenumbers: init at 8.4.0
(cherry picked from commit cf957fedea)
2017-07-10 16:41:47 +02:00
Franz Pletz
d02087843e matrix-synapse: 0.21.0 -> 0.22.1
(cherry picked from commit 90f9d52b73)
2017-07-10 16:40:13 +02:00
Franz Pletz
42ce762672 matrix-synapse service: restart on failure
(cherry picked from commit 4ec09476f2)
2017-07-10 16:40:12 +02:00
Tristan Helmich
cad1a8f885 matrix-synapse: 0.20.0 -> 0.21.0
(cherry picked from commit 2b7eb321de)
2017-07-10 16:40:12 +02:00
Tristan Helmich
9e08a70010 matrix-synapse: 0.19.3 -> 0.20.0
(cherry picked from commit 0f64656dca)
2017-07-10 16:40:09 +02:00
Jörg Thalheim
a9b4f2dec2 wireguard: 0.0.20170629 -> 0.0.20170706
(cherry picked from commit 1532d5632f)
2017-07-10 07:33:00 +01:00
Franz Pletz
b752a01eda php71: 7.1.5 -> 7.1.7
Fixes:
  * CVE-2017-9224
  * CVE-2017-9226
  * CVE-2017-9227
  * CVE-2017-9228
  * CVE-2017-9229

See:
  * https://secure.php.net/ChangeLog-7.php#7.1.6
  * https://secure.php.net/ChangeLog-7.php#7.1.7
(cherry picked from commit 456c76169d)
2017-07-10 00:33:49 +02:00
Franz Pletz
3ac3db9196 php70: 7.0.19 -> 7.0.21 for multiple CVEs
Fixes:
  * CVE-2017-9224
  * CVE-2017-9226
  * CVE-2017-9227
  * CVE-2017-9228
  * CVE-2017-9229

See:
  * https://secure.php.net/ChangeLog-7.php#7.0.20
  * https://secure.php.net/ChangeLog-7.php#7.0.21
(cherry picked from commit f15f580cca)
2017-07-10 00:33:48 +02:00
Franz Pletz
3d539ab0de php56: 5.6.30 -> 5.6.31 for multiple CVEs
Fixes:
  * CVE-2017-9224
  * CVE-2017-9226
  * CVE-2017-9227
  * CVE-2017-9228
  * CVE-2017-9229

See https://secure.php.net/ChangeLog-5.php#5.6.31.

(cherry picked from commit 586f780828)
2017-07-10 00:33:48 +02:00
Franz Pletz
1c6b2e996d irssi: 1.0.3 -> 1.0.4 for multiple CVEs
Fixes:
  * CVE-2017-10965
  * CVE-2017-10966

See https://irssi.org/security/irssi_sa_2017_07.txt.

(cherry picked from commit 1f926aa94f)
2017-07-10 00:33:47 +02:00
Charles Strahan
aa0654b293 chrome: fix fallout from #26512
Fixes broken save dialogue (causes chrome to crash) and missing icons.

(cherry picked from commit 39fd944402)

release-17.03 now contains chrome & chromium version >= 59, in form of dev and
beta releases.
2017-07-09 19:07:22 +01:00
José Luis Lafuente
9872fb2768 chrome 59 requieres gtk3
(cherry picked from commit f09c2e7745)

release-17.03 now contains chrome & chromium version >= 59, in form of dev and
beta releases.
2017-07-09 19:06:06 +01:00
Johannes Frankenau
a27b43c2af feh: 2.18.2 -> 2.19
(cherry picked from commit 1df820cd3d)

Contains fix for https://nvd.nist.gov/vuln/detail/CVE-2017-7875
2017-07-09 10:25:53 +02:00
Vladimír Čunát
a07c52bb8e Merge #27165: ttf-envy-code-r: init at 0.PR7
(cherry picked from commit c057098b7d)
It just adds a new package.
2017-07-08 11:35:30 +02:00
Eelco Dolstra
8cb29b3c84 httpd: 2.4.25 -> 2.4.26
CVE-2017-3167, CVE-2017-3169, CVE-2017-7659, CVE-2017-7668,  CVE-2017-7679

(cherry picked from commit 8fc5beb855)
2017-07-07 17:25:43 +02:00
Eelco Dolstra
d8ea4c4196 Revert "linux: 4.9.35 -> 4.9.36"
This reverts commit c9cf9ceac3.

Upstream commit b6f75b986a7f7b79953b94f9778de295a253c624 [1] adds a call to a non-existent function, breaking perf:

util/probe-event.c: In function 'post_process_module_probe_trace_events':
util/probe-event.c:669:9: error: implicit declaration of function 'post_process_probe_trace_point' [-Werror=implicit-function-declaration]
   ret = post_process_probe_trace_point(&tevs[i].point,
         ^
util/probe-event.c:669:3: error: nested extern declaration of 'post_process_probe_trace_point' [-Werror=nested-externs]
   ret = post_process_probe_trace_point(&tevs[i].point,
   ^

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/tools/perf/util/probe-event.c?h=v4.9.36&id=b6f75b986a7f7b79953b94f9778de295a253c624
2017-07-07 11:59:37 +02:00
Rob Vermaas
1b57bf274a Update nixops to 1.5.1 2017-07-06 11:13:45 +00:00
Will Dietz
3d89df66b3 kbdlight: Fix installation permissions
Looks like NixOS creates a security wrapper for this already, FWIW.

(cherry picked from commit 09d85c49c4)
2017-07-06 13:13:02 +02:00
Will Dietz
db882abaa3 ddccontrol: Don't try to set special perms on ddcpci
(cherry picked from commit bcaceabc3c)
2017-07-06 13:13:00 +02:00
Will Dietz
4ab58f28ff mcron: Fix attempt to set +s during install
(cherry picked from commit 7492873014)
2017-07-06 13:12:59 +02:00
Will Dietz
94bfe7ae09 libutempter: Fixup unsupported permissions here as well
(cherry picked from commit 0d871bd108)
2017-07-06 13:12:54 +02:00
Tim Steinbach
29546eb4e3 linux: 4.4.75 -> 4.4.76
(cherry picked from commit a04afd1594)
2017-07-05 12:55:57 -04:00
Tim Steinbach
c9cf9ceac3 linux: 4.9.35 -> 4.9.36
(cherry picked from commit 05bd289ff8)
2017-07-05 12:55:35 -04:00
Tim Steinbach
0cc792c475 linux: 4.11.8 -> 4.11.9
(cherry picked from commit 00f0f7e9f6)
2017-07-05 12:55:28 -04:00
Vladimír Čunát
9622ce13d8 Merge #27153: atop: don't chmod u+s
(cherry picked from commit 49250054d2)
2017-07-05 17:32:02 +02:00
Rob Vermaas
cbfb35a145 Fix hologram server with go versions > 1.4, no fix yet upstream. 2017-07-05 10:21:51 +00:00
aszlig
7bb59ef88f virtualbox: Add patch for Linux 4.12
Compiling the kernel modules on Linux 4.12 fails, so I've included an
upstream patch from:

https://www.virtualbox.org/changeset/66927/vbox

The patch is applied against the guest additions as well, where we need
to transform the patch a bit so that we get CR LF line endings (DOS
format), which is what is the case for the guest additions ISO.

I've tested this with all the subtests of the "virtualbox" NixOS VM
tests and they all succeed on x86_64-linux.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 12ee0fbd88)
2017-07-04 14:41:19 -04:00
lassulus
83d40b4771 ucspi-tcp: remove setuid from install script
(cherry picked from commit d461e64b63)
2017-07-04 17:28:31 +01:00
Joachim Fasting
3cb4728897 tor-browser-bundle-bin: 7.0.1 -> 7.0.2
(cherry picked from commit 92524eb2f1)
2017-07-04 16:40:41 +02:00
Will Dietz
8cbf5d1c6a mailman: Fix attempts to chmod g+s during installation
(cherry picked from commit 179936d75c)
2017-07-04 16:38:25 +02:00
aszlig
e29bf5025c vlock: Don't try to install setuid binary
With newer Nix it's (fortunately) no longer possible to create a file
with setuid bits, even though the permissions are fixed later the build
will fail during installPhase already.

I've verified whether the contents of the output path are the same as
before this change and the contents match.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 4007ee974c)
2017-07-04 16:38:23 +02:00
Will Dietz
12e8dcafb7 firejail: don't try to set setuid bit
(cherry picked from commit 707145a955)
2017-07-04 16:38:22 +02:00
Will Dietz
3b45e1bdcf leafnode: patch around setting special bits
(cherry picked from commit ed0ac2fece)
2017-07-04 16:38:21 +02:00
Franz Pletz
799eb69009 httpd: don't install suid executables into nix store
(cherry picked from commit b8bfc8dae2)
2017-07-04 16:38:20 +02:00
Tim Steinbach
4f02e7bac5 linux-testing: 4.11-rc7 -> 4.12-rc1
(cherry picked from commit 336b044dcb)
Signed-off-by: Domen Kožar <domen@dev.si>
2017-07-04 10:52:59 +02:00
Tim Steinbach
81fceb2554 linux: Add 4.12
(cherry picked from commit f130e0027e)
Signed-off-by: Domen Kožar <domen@dev.si>
2017-07-04 08:38:39 +02:00
Vladimír Čunát
72c9ed78d0 Merge #26628: treewide: setuid/setgid fallout
(cherry picked from commit d88c0cf867)
There were just a couple of conflicts, apparently someone has already
fixed rewritefs and cron on 17.03.
I re-checked that all those do build now (with a new-enough nix daemon).
2017-07-03 20:25:12 +02:00
Jörg Thalheim
ebeb8901a2 Merge #27074: kmod-debian-aliases: Fix source tarball URL.
(cherry picked from commit 02ce696304)
2017-07-03 08:44:59 +02:00
Vladimír Čunát
65904657b5 Merge #27076: mariadb: fix URL for source tarball
Not even all their mirrors serve our version, unfortunately.

(cherry picked from commit cc83f35118)
2017-07-03 08:43:22 +02:00
Vladimír Čunát
8ad1e63e79 Merge #27075: p7zip: Update CVE-2016-9296 patch URL
(cherry picked from commit 1f0de2dce2)
2017-07-03 08:22:53 +02:00
Vladimír Čunát
057f89b934 lib/maintainers: add zxc24 to fix evaluation
Broken by 03a00c39d.
2017-07-01 11:32:17 +02:00
Vladimír Čunát
0476a06415 texlive.combine: fix perl scripts without a shebang
Fixes #24343.  These parts of upstream texlive are really ugly.
Also improve variable quoting in the code around.

(cherry picked from commit 8dddd2b672)
The change seems safe enough.
2017-07-01 11:29:15 +02:00
Tomas Hlavaty
ccd6ec20e1 ccl: create ccl symlink
Make it more intuitive for users to start ccl and avoid platform
dependent executable names.

https://github.com/NixOS/nixpkgs/issues/26934
(cherry picked from commit ad82538423)
It seems a rather safe change.
2017-07-01 10:32:08 +02:00
Peter Simons
84eeefe294 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.2.1-13-g5c18fb5 from Hackage revision
04f3948836.
2017-06-30 22:43:24 +02:00
Peter Simons
180bbd462b haskell: copy current state from master branch (LTS 8.20) 2017-06-30 22:43:23 +02:00
Tim Steinbach
8a8bc4f55d Merge pull request #26988 from taku0/firefox-bin-54.0.1
firefox, firefox-bin: 54.0 -> 54.0.1,  firefox-esr: 52.2.0esr -> 52.2.1esr

(cherry picked from commit 7f9ec267a6)
2017-06-30 08:51:55 -04:00
Jason A. Donenfeld
ce3a705810 wireguard: 0.0.20170613 -> 0.0.20170629
Simple version bump.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
(cherry picked from commit 9ffccc77d9)
2017-06-30 08:43:39 +01:00
Jason A. Donenfeld
03a00c39db wireguard: 0.0.20170531 -> 0.0.20170613
Simple version bump. Release notes:

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
(cherry picked from commit 9d4bf6b155)
2017-06-30 08:43:21 +01:00
Peter Simons
9fe528222f bind: update to version 9.10.5-P2 to fix CVE-2017-3142 and CVE-2017-3143 2017-06-29 22:22:11 +02:00
Lancelot SIX
2e983f14f6 libgcrypt: 1.7.7 -> 1.7.8
See http://lists.gnu.org/archive/html/info-gnu/2017-06/msg00016.html
for release information

(cherry picked from commit 9a9294a970)
2017-06-29 11:53:40 -04:00
Eelco Dolstra
fc3f38d67f Forks::Super: Build on Hydra
(cherry picked from commit 6feedb4492)
2017-06-29 15:02:53 +02:00
Tim Steinbach
9e5a13f6f1 linux: 4.11.7 -> 4.11.8
(cherry picked from commit 37bc494949)
2017-06-29 08:33:15 -04:00
Tim Steinbach
a03777e74e linux: 4.9.34 -> 4.9.35
Also, remove XSA-216 patches, the fixes are now integrated upstream

(cherry picked from commit d1aff8d2e5)
2017-06-29 08:33:02 -04:00
Tim Steinbach
c88fa5b309 linux: 4.4.74 -> 4.4.75
(cherry picked from commit 6b35f22e28)
2017-06-29 08:31:45 -04:00
Tim Steinbach
94ed59f5c0 linux: 4.4.73 -> 4.4.74
(cherry picked from commit d2e199ca3c)
2017-06-29 08:31:14 -04:00
Rob Vermaas
26d750ebbe Make cron build. 2017-06-29 11:29:29 +00:00
Tim Steinbach
1201ddaf36 Merge pull request #26868 from michalpalka/xen-security-2017.06-backport-new
xen: patch for XSAs: 216, 217, 218, 219, 220, 221, 222, and 224 (release-17.03)
2017-06-28 22:44:43 -04:00
Will Dietz
55bc539b80 mendeley: ignore errors attempting to install link handler on startup
It's not critical functionality and AFAICT only fails in environments
that wouldn't benefit from "successfully" installing it anyway.

Fixes #24709
Fixes #24821

(cherry picked from commit 4f4ae214a3a46ba83f790d23c0e9df0bf9f04215)
2017-06-28 23:44:02 +01:00
Tim Steinbach
3a76840b2d docker: 17.03.1-ce -> 17.03.2-ce
(cherry picked from commit add90948bc)
2017-06-28 12:52:50 -04:00
Jörg Thalheim
a10cbbd591 suid-chroot: do not set suid bit during install
To be useful in nixos, it probably also requires a module to set up a hardening wrapper.

(cherry picked from commit 855c1bde42)
2017-06-28 16:01:32 +01:00
Eelco Dolstra
a2c7482319 systemd: Apply fix for CVE-2017-9445 2017-06-28 14:00:28 +02:00
Shea Levy
17568fbd2d Add ansible 2.3
(cherry picked from commit 551dcb6783)
2017-06-27 15:35:24 -04:00
Maximilian Bosch
f38559d781 geogebra: 5-0-361-0 -> 5-0-369-0
(cherry picked from commit f5665e9ab4)
2017-06-27 17:24:44 +02:00
Maximilian Bosch
39ca634620 geogebra: 5-0-355-0 -> 5-0-361-0
(cherry picked from commit 47e8665595)
2017-06-27 17:24:40 +02:00
Maximilian Bosch
8e4eb8970a geogebra: 5-0-350-0 -> 5-0-355-0 (#25324)
(cherry picked from commit b12f76ddd3)
2017-06-27 17:24:38 +02:00
Domen Kožar
412e55a193 hydra: restart daemons on config change
https://github.com/NixOS/hydra/pull/491
(cherry picked from commit 4dadb12a63)
Signed-off-by: Domen Kožar <domen@dev.si>
2017-06-27 17:09:42 +02:00
Jörg Thalheim
1b78b2d18d glusterfs: do not set setuid in install
related to #26600
2017-06-27 13:23:43 +02:00
Niklas Hambüchen
395bd92ed4 glusterfs: Upgrade to 3.10.2 2017-06-27 13:23:43 +02:00
Niklas Hambüchen
2982a657c9 glusterfs: Enable parallel building.
I checked for determinism with `nix-build --option build-repeat 10`.
2017-06-27 13:23:43 +02:00
Niklas Hambüchen
c061e5072d glusterfs: Make commands that gluster calls work. Fixes #25620.
Done by setting PATH and PYTHONPATH appropriately.

Adds the following patches:

* One that removes hardcodes to /sbin, /usr/bin, etc.
  from gluster, so that programs like `lvm` and `xfs_info` can be
  called at runtime; see https://bugzilla.redhat.com/show_bug.cgi?id=1450546.
* One that fixes unsubstituted autoconf macros in paths (a problem
  in the 3.10 release); see https://bugzilla.redhat.com/show_bug.cgi?id=1450588.
* One that removes uses of the `find_library()` Python function that does
  not behave as expected in Python < 3.6 (and would not behave correctly
  even on 3.6 in nixpkgs due to #25763);
  see https://bugzilla.redhat.com/show_bug.cgi?id=1450593.

I think that all of these patches should be upstreamed.

Also adds tests to check that none of the Python based utilities
throw import errors, calling `--help` or equivalent on them.
2017-06-27 13:23:43 +02:00
Niklas Hambüchen
fef914c794 glusterfs: Use github instead of download.gluster.org to obtain source.
This is because the source tarball available on
  https://download.gluster.org/pub/gluster/glusterfs/3.10/3.10.1/glusterfs-3.10.1.tar.gz
has different contents than the v3.10.1 tag;
for example, it lacks the file `xlators/features/ganesha/src/Makefile.am`,
which the tag has.
This is because GluserFS's release process removes some unused files.

This made impossible to apply patches written by or for upstream, as those
are written against what's in upstream's git.

As a nice side effect, we no longer have to hardcode the "3.10" in the
`3.10/${version}` part of the URL.
2017-06-27 13:23:43 +02:00
Niklas Hambüchen
8c0620faee glusterfs: Remove no longer needed subsitutions of DESTDIR.
They were made unnecessary in commit d07154b3bc, which added
`makeFlags = "DESTDIR=$(out)";`.
2017-06-27 13:23:43 +02:00
Volth
b2bf4d8327 mtr: do not do 'setcap' on installPhase, it would fail anyway
(cherry picked from commit 8fe525b6c7)
2017-06-26 19:31:15 +02:00
Franz Pletz
4fb8f6f7a5 lxc: 2.0.7 -> 2.0.8
(cherry picked from commit eb8c14751a)
2017-06-26 19:17:11 +02:00
Will Dietz
b00fb69ff8 at: Don't set fancy bits on install
(cherry picked from commit 0d92084f75)
2017-06-26 19:11:27 +02:00
Rob Vermaas
5cff2032dc Disable pyopenssl tests temporarily, due to hardcoded certificate that depend on a date before June 10-11 2017. Newest version of pyopenssl still has the same certificates as far as I could see. 2017-06-26 12:56:13 +00:00
Franz Pletz
17e9509d66 libcgroup: do not set suid bit in nix store
(cherry picked from commit b788956239)
2017-06-26 09:17:33 +02:00
Emmanuel Rosa
469fa436c7 thunderbird: 52.2.0 -> 52.2.1
(cherry picked from commit 994998e475)
2017-06-26 09:17:21 +02:00
Gabriel Ebner
55f2e7894b microcodeIntel: 20161104 -> 20170511
(cherry picked from commit 252e9ec84a)
2017-06-26 09:16:57 +02:00
Michał Pałka
96d840718b xen: patch for XSAs: 216, 217, 218, 219, 220, 221, 222, and 224
XSA-216 Issue Description:

> The block interface response structure has some discontiguous fields.
> Certain backends populate the structure fields of an otherwise
> uninitialized instance of this structure on their stacks, leaking
> data through the (internal or trailing) padding field.

More: https://xenbits.xen.org/xsa/advisory-216.html

XSA-217 Issue Description:

> Domains controlling other domains are permitted to map pages owned by
> the domain being controlled.  If the controlling domain unmaps such a
> page without flushing the TLB, and if soon after the domain being
> controlled transfers this page to another PV domain (via
> GNTTABOP_transfer or, indirectly, XENMEM_exchange), and that third
> domain uses the page as a page table, the controlling domain will have
> write access to a live page table until the applicable TLB entry is
> flushed or evicted.  Note that the domain being controlled is
> necessarily HVM, while the controlling domain is PV.

More: https://xenbits.xen.org/xsa/advisory-217.html

XSA-218 Issue Description:

> We have discovered two bugs in the code unmapping grant references.
>
> * When a grant had been mapped twice by a backend domain, and then
> unmapped by two concurrent unmap calls, the frontend may be informed
> that the page had no further mappings when the first call completed rather
> than when the second call completed.
>
> * A race triggerable by an unprivileged guest could cause a grant
> maptrack entry for grants to be "freed" twice.  The ultimate effect of
> this would be for maptrack entries for a single domain to be re-used.

More: https://xenbits.xen.org/xsa/advisory-218.html

XSA-219 Issue Description:

> When using shadow paging, writes to guest pagetables must be trapped and
> emulated, so the shadows can be suitably adjusted as well.
>
> When emulating the write, Xen maps the guests pagetable(s) to make the final
> adjustment and leave the guest's view of its state consistent.
>
> However, when mapping the frame, Xen drops the page reference before
> performing the write.  This is a race window where the underlying frame can
> change ownership.
>
> One possible attack scenario is for the frame to change ownership and to be
> inserted into a PV guest's pagetables.  At that point, the emulated write will
> be an unaudited modification to the PV pagetables whose value is under guest
> control.

More: https://xenbits.xen.org/xsa/advisory-219.html

XSA-220 Issue Description:

> Memory Protection Extensions (MPX) and Protection Key (PKU) are features in
> newer processors, whose state is intended to be per-thread and context
> switched along with all other XSAVE state.
>
> Xen's vCPU context switch code would save and restore the state only
> if the guest had set the relevant XSTATE enable bits.  However,
> surprisingly, the use of these features is not dependent (PKU) or may
> not be dependent (MPX) on having the relevant XSTATE bits enabled.
>
> VMs which use MPX or PKU, and context switch the state manually rather
> than via XSAVE, will have the state leak between vCPUs (possibly,
> between vCPUs in different guests).  This in turn corrupts state in
> the destination vCPU, and hence may lead to weakened protections
>
> Experimentally, MPX appears not to make any interaction with BND*
> state if BNDCFGS.EN is set but XCR0.BND{CSR,REGS} are clear.  However,
> the SDM is not clear in this case; therefore MPX is included in this
> advisory as a precaution.

More: https://xenbits.xen.org/xsa/advisory-220.html

XSA-221 Issue Description:

> When polling event channels, in general arbitrary port numbers can be
> specified.  Specifically, there is no requirement that a polled event
> channel ports has ever been created.  When the code was generalised
> from an earlier implementation, introducing some intermediate
> pointers, a check should have been made that these intermediate
> pointers are non-NULL.  However, that check was omitted.

More: https://xenbits.xen.org/xsa/advisory-221.html

XSA-222 Issue Description:

> Certain actions require removing pages from a guest's P2M
> (Physical-to-Machine) mapping.  When large pages are in use to map
> guest pages in the 2nd-stage page tables, such a removal operation may
> incur a memory allocation (to replace a large mapping with individual
> smaller ones).  If this allocation fails, these errors are ignored by
> the callers, which would then continue and (for example) free the
> referenced page for reuse.  This leaves the guest with a mapping to a
> page it shouldn't have access to.
>
> The allocation involved comes from a separate pool of memory created
> when the domain is created; under normal operating conditions it never
> fails, but a malicious guest may be able to engineer situations where
> this pool is exhausted.

More: https://xenbits.xen.org/xsa/advisory-222.html

XSA-224 Issue Description:

> We have discovered a number of bugs in the code mapping and unmapping
> grant references.
>
> * If a grant is mapped with both the GNTMAP_device_map and
> GNTMAP_host_map flags, but unmapped only with host_map, the device_map
> portion remains but the page reference counts are lowered as though it
> had been removed. This bug can be leveraged cause a page's reference
> counts and type counts to fall to zero while retaining writeable
> mappings to the page.
>
> * Under some specific conditions, if a grant is mapped with both the
> GNTMAP_device_map and GNTMAP_host_map flags, the operation may not
> grab sufficient type counts.  When the grant is then unmapped, the
> type count will be erroneously reduced.  This bug can be leveraged
> cause a page's reference counts and type counts to fall to zero while
> retaining writeable mappings to the page.
>
> * When a grant reference is given to an MMIO region (as opposed to a
> normal guest page), if the grant is mapped with only the
> GNTMAP_device_map flag set, a mapping is created at host_addr anyway.
> This does *not* cause reference counts to change, but there will be no
> record of this mapping, so it will not be considered when reporting
> whether the grant is still in use.

More: https://xenbits.xen.org/xsa/advisory-224.html

(cherry picked and adapted from commit 80e0cda7ff)
2017-06-26 07:04:45 +00:00
Franz Pletz
5b54e99cea glibc: fix i686 build
(cherry picked from commit 7cfd1c8c1b)
2017-06-26 02:26:32 +02:00
Bjørn Forsman
d0ad6a7651 nixos/bcache: add services.udev.packages = [ bcache-tools ]
Adds /dev/disk/by-{id,label}/* symlinks for bcache device nodes, in the
final rootfs.

Symlinks will only be created for bcache devices that contain
filesystems. So if you have a blank bcache device or run LVM on top of
bcache you will not get this kind of symlink.

(cherry picked from commit 5b48368386)
2017-06-25 19:53:39 +02:00
Bjørn Forsman
b71f5e311b nixos/bcache: /bin/sh -> ${bash}/bin/sh
Or else `services.udev.packages = [ bcache-tools ]` cannot be used.

To not break bcache in the initrd I'm modifying this in stage-1.nix:

  -  --replace /bin/sh ${extraUtils}/bin/sh
  +  --replace ${bash}/bin/sh ${extraUtils}/bin/sh

Reasoning behind that change:

* If not modifying the /bin/sh pattern in any way, it will also match
  ${bash}/bin/sh, creating a broken path like
  /nix/store/HASH-bash/nix/store/HASH-bash/bin/sh in the udev rule file.

* The addition of /bin/sh was done in 775f381a9e
  ("stage-1: add bcache support"). It seems somewhat plausible that
  no new users have appeared since then and we can take this opportunity
  to back out of this change without much fear of regressions.

  If there _are_ regressions, they should be in the form of build time
  errors, not runtime (boot), due to how the udev rule output is checked
  for invalid path references. So low risk, IMHO.

* An alternative approach could be to copy the /bin/sh substitute rule
  over to the non-initrd udev rules implementation in NixOS, but I think
  this way is better:
  - The rules file comes with a working path out of the box.
  - We can use more precise pattern matching when modifying the udev
    rules for the initrd.

(cherry picked from commit 581226cfb4)
2017-06-25 19:53:39 +02:00
Bjørn Forsman
37ec462019 bcache-tools: add name to the source store path
So that

 $ nix-build -A bcache-tools.src

gives

 /nix/store/HASH-bcache-tools-1.0.7.tar.gz

instead of

 /nix/store/HASH-v1.0.7.tar.gz

(cherry picked from commit f12b0a2179)
2017-06-25 19:53:39 +02:00
Tim Steinbach
c1ad03b460 Revert "linux: patch CVE-2017-1000364 (stack clash)"
This reverts commit 6c026fe3d0.
2017-06-25 09:19:07 -04:00
Tim Steinbach
280f0db6a0 Revert "Revert "linux: 4.9.33 -> 4.9.34""
This reverts commit 0ee624c208.
2017-06-25 09:18:56 -04:00
Tim Steinbach
0ee624c208 Revert "linux: 4.9.33 -> 4.9.34"
This reverts commit e74d2b42c8.
2017-06-25 09:02:11 -04:00
tv
39cd4cf25d bitlbee-facebook: 1.1.0 -> 1.1.1
(cherry picked from commit 267ea50604)
2017-06-24 20:45:51 +01:00
Der Pfirsich
916970f68d spotify: 1.0.55.487.g256699aa-16 -> 1.0.57.474.gca9c9538-30 (#26794)
(cherry picked from commit 2c6fbc737f)
2017-06-24 20:42:39 +01:00
Daiderd Jordan
c841128b86 plex: fix preStart permissions
(cherry picked from commit c0cdf58807)
2017-06-24 18:50:09 +02:00
Tim Steinbach
e74d2b42c8 linux: 4.9.33 -> 4.9.34
(cherry picked from commit b06cb59fc1)
2017-06-24 11:27:27 -04:00
Tim Steinbach
48b9d22717 linux: 4.11.6 -> 4.11.7
(cherry picked from commit 3a68f0bb78)
2017-06-24 11:27:20 -04:00
Tuomas Tynkkynen
274bc995fe kernel: Don't build self-test modules
(cherry picked from commit 370ace4cf0)
2017-06-24 11:26:44 -04:00
Jörg Thalheim
233c29a6dc linux_4_11: renable CONFIG_UPROBE_EVENTS
CONFIG_UPROBE_EVENT was renamed to CONFIG_UPROBE_EVENTS.

(cherry picked from commit e89e96a755)
2017-06-24 11:25:53 -04:00
timor
89aadc39c8 kernel: enable audio jack reconfiguration
Change kernel config to allow for changing the functions of the audio
jacks at run-time as well as at boot time.

(cherry picked from commit d74f8351a5)
2017-06-24 11:25:46 -04:00
Jörg Thalheim
e67dd4ac41 glusterfs: do not set setuid in install
related to #26600

(cherry picked from commit ecc34cbdb3)
2017-06-24 11:29:42 +02:00
rnhmjoj
2fee07561f pythonPackages.pygraphviz: fix build and add python.pkgs.graphviz
(cherry picked from commit d8027bd9c4)
2017-06-23 15:13:39 +02:00
Vladimír Čunát
7c1a1651a5 knot-dns: security 2.4.2 -> 2.4.5
https://lists.nic.cz/pipermail/knot-dns-users/2017-June/001144.html
(master is using 2.5.x already)
2017-06-23 14:49:44 +02:00
Peter Simons
bff2ea5a4c haskell: fix logic error in generic builder introduced in 00892b7e4e
Closes https://github.com/NixOS/nixpkgs/issues/26760.

(cherry picked from commit 8ddaef6ddf)
2017-06-23 12:51:11 +02:00
Franz Pletz
b049392e16 glibc: patch CVE-2017-1000366 (stack clash)
(cherry picked from commit 2296bf394e)
2017-06-23 04:29:01 +02:00
Franz Pletz
6c026fe3d0 linux: patch CVE-2017-1000364 (stack clash)
(cherry picked from commit aab71b31d5)
2017-06-23 04:29:01 +02:00
Franz Pletz
b972c0e666 exim: patch CVE-2017-1000369 (stack clash)
(cherry picked from commit 16aa92305b)
2017-06-23 04:29:00 +02:00
Franz Pletz
f4b4edc290 coreutils: fix tests depending on setuid/setgid bits
(cherry picked from commit 6a850d2b11)
2017-06-23 04:28:58 +02:00
Rok Garbas
9b948ea439 pypi2nix: 1.6.0 -> 1.8.0 2017-06-22 19:40:54 +02:00
Volth
011192b5f4 jetbrains.{webstorm,phpstorm}: 2017.1 -> 2017.1.4
(cherry picked from commit bf5c57e1b8)
2017-06-22 16:54:30 +01:00
Gauthier POGAM--LE MONTAGNER
aae153cae4 idea.webstorm: 2017.1 -> 2017.1.3
(cherry picked from commit 282fba7f0c)
2017-06-22 16:46:31 +01:00
Jiri Danek
eea3211bb4 idea-community: 2017.1.1 -> 2017.1.3
(cherry picked from commit ccef4810ca)
2017-06-22 16:45:55 +01:00
Vasiliy Solovey
633d046590 clion1: remove package
It is no longer present on JetBrains download servers and is
very outdated.

(cherry picked from commit d41dee0a9f)
2017-06-22 16:44:08 +01:00
mingchuan
6ed463b058 slock: Avoid chmod u+s (#26600)
(cherry picked from commit 722d61c2f2)
2017-06-22 16:30:10 +01:00
Domen Kožar
57bbb880d0 hydra: 2017-06-21 -> 2017-06-22
(cherry picked from commit 05f94c8c13)
Signed-off-by: Domen Kožar <domen@dev.si>
2017-06-22 16:48:59 +02:00
Domen Kožar
496c1f3f7d haskellPackages: make configuration-{nix,common}.nix configurable
The motivation is to be able to get rid of common configuration
when initial packages differs since common configuration assumes
a very specific version set.

cc @jmitchell @peti

(cherry picked from commit bb9e23837a)
Signed-off-by: Domen Kožar <domen@dev.si>
2017-06-22 14:41:58 +02:00
Jörg Thalheim
25a8ba5baf iana-etc: 20170417 -> 20170512
(cherry picked from commit f016fa3ce3)
2017-06-22 01:40:43 +02:00
Jörg Thalheim
b8ac2b3a2b iana-etc: 20170328 -> 20170417
(cherry picked from commit 024cbbd520)
2017-06-22 01:40:42 +02:00
Jörg Thalheim
2306897dc7 iana-etc: 2.30 -> 20170328
(cherry picked from commit 50527dbd0e)
2017-06-22 01:40:42 +02:00
Franz Pletz
c18c4546d1 webkitgtk: 2.16.3 -> 2.16.4 for multiple CVEs
Fixes:

  * CVE-2017-2538
  * CVE-2017-2424

See https://webkitgtk.org/security/WSA-2017-0005.html

(cherry picked from commit febe37a24a)
2017-06-22 00:20:31 +02:00
Volth
81fc645b48 webkitgtk: 2.14.11 -> 2.16.3
(cherry picked from commit 3de90b259c)
2017-06-22 00:19:54 +02:00
Franz Pletz
ec3cb5f658 webkitgtk: remove unreferenced 2.12 and patch
(cherry picked from commit 3d6ed4a072)
2017-06-22 00:18:18 +02:00
Ambroz Bizjak
f827d499a1 kdevelop: 5.0.4 -> 5.1.1
Including also a patch for bug https://bugs.kde.org/show_bug.cgi?id=379433
which is a quite annoying regression from 5.0.4. The patch is the same as
the change committed upstream.

(cherry picked from commit 8f4619bb3d)
2017-06-21 22:18:29 +02:00
Jan Tojnar
eb2ce870a9 doc: Fix some typos
(cherry picked from commit e35f3c0679)
2017-06-21 22:18:22 +02:00
Domen Kožar
2b31e72a9c hydra-evaluator: depend on jq
(cherry picked from commit 7bd918b364)
Signed-off-by: Domen Kožar <domen@dev.si>
2017-06-21 15:35:20 +02:00
Domen Kožar
14732f856a hydra: 2017-04-26 -> 2017-06-21
(cherry picked from commit be4a4ef701)
Signed-off-by: Domen Kožar <domen@dev.si>
2017-06-21 15:31:05 +02:00
Franz Pletz
79cd5b18b9 unrar: 5.4.5 -> 5.5.5 (security)
Fixes arbitrary memory write.

See https://bugs.chromium.org/p/project-zero/issues/detail?id=1286

(cherry picked from commit cfdb9769ce)
2017-06-21 14:38:57 +02:00
Franz Pletz
d97649c2c8 openvpn: 2.4.2 -> 2.4.3
See https://community.openvpn.net/openvpn/wiki/VulnerabilitiesFixedInOpenVPN243

Fixed:

  * CVE-2017-7508
  * CVE-2017-7520
  * CVE-2017-7521
  * CVE-2017-7512
  * CVE-2017-7522

(cherry picked from commit 5521b542a2)
2017-06-21 13:36:29 +02:00
Charles Strahan
0a1c41f761 flash: 26.0.0.126 -> 26.0.0.131
The previous releases were 404ing.

(cherry picked from commit dda6daa4ff)
2017-06-21 08:46:42 +02:00
taku0
698f336e5c flashplayer: 25.0.0.171 -> 26.0.0.126
(cherry picked from commit 264ec9242f)
2017-06-21 08:46:31 +02:00
Eelco Dolstra
b506b9437b aws-sdk-cpp: 1.0.127 -> 1.0.153
(cherry picked from commit ac8451508b)
2017-06-20 12:15:56 +02:00
Eelco Dolstra
1ab7ac7368 aws-sdk-cpp: 1.0.60 -> 1.0.127
(cherry picked from commit 3b44cd731c)
2017-06-20 12:15:32 +02:00
Rok Garbas
76d649b594 firefox-*-bin: update to latest 2017-06-19 19:21:30 +02:00
Eelco Dolstra
7b1e936b24 nix: 1.11.10 -> 1.11.11 2017-06-19 19:01:05 +02:00
Shea Levy
2d8b86954b pythonPackages.sphinx: Tests seem to be broken on darwin 2017-06-19 11:58:10 -04:00
Jörg Thalheim
cb90e6a036 hardware.enableRedistributableFirmware: fix spelling error
(cherry picked from commit e697585675)
2017-06-19 12:40:59 +02:00
Jörg Thalheim
102c006b60 hardware: add enableRedistributalFirmware
Due the recent inclusion of broadcom-bt-firmware in enableAllFirmware,
it was required to set `nixpkgs.config.allowUnfree` to obtain the full
list. To make this dependency more explicit an assertion is added and an
alternative option `enableRedistributalFirmware` is provided to only
obtain firmware with an license allowing redistribution.

(cherry picked from commit 05aa80c06a)
2017-06-19 12:40:52 +02:00
Eelco Dolstra
1e2cca428f aws-sdk-cpp: Better fix for the failing credentials test
(cherry picked from commit c1e5ca92b7)
2017-06-19 10:59:09 +02:00
Pascal Wittmann
066a82fe81 Merge pull request #26706 from mmai/release-17.03
shaarli: 0.8.1 -> 0.8.4
2017-06-19 09:35:58 +02:00
Henri Bourcereau
8883b77ba7 shaarli: 0.8.1 -> 0.8.4
(cherry picked from commit 6e497974a6)
Reason: Update Shaarli version to 0.8.4 in order to fix a login bug (cf. shaarli/Shaarli#711)
2017-06-19 08:52:43 +02:00
Robert Helgesson
c28e6eecaa expat: 2.2.0 -> 2.2.1
Includes fixes for CVE-2017-9233 and CVE-2016-9063.

(cherry picked from commit 5fc48529bc)
2017-06-18 19:06:32 -04:00
romildo
038a699ca8 jetbrains.idea-ultimate: 2017.1 -> 2017.1.4
(cherry picked from commit bc1f59fb4f)

fixes #26674
2017-06-18 17:34:37 +01:00
Peter Simons
fd649be983 synchronize Haskell infrastructure with master@8a8f0408cd9b7fdda1095
This change means the release branch is now based on LTS Haskell 8.18.
2017-06-18 14:27:11 +02:00
Will Dietz
b5e4b0cd0a rewritefs: Don't attempt to set special bits
(cherry picked from commit 7270b9b425)
2017-06-18 13:39:14 +02:00
Franz Pletz
d1fce4f2c3 linux: 4.9.32 -> 4.9.33
(cherry picked from commit bbb9182cbc)
2017-06-17 18:46:36 +02:00
Franz Pletz
b2e0946f46 linux: 4.4.72 -> 4.4.73
(cherry picked from commit a470aa0924)
2017-06-17 18:46:36 +02:00
Franz Pletz
d5ac9b0ff2 linux: 4.11.5 -> 4.11.6
(cherry picked from commit c973a4a887)
2017-06-17 18:46:35 +02:00
Domen Kožar
df7d0bcf72 chromium: apply patch to fix chromecast
(cherry picked from commit af4056f22b)
Signed-off-by: Domen Kožar <domen@dev.si>
2017-06-17 17:24:21 +02:00
Franz Pletz
4ba5d813cb kernelPackages.zfs: 0.6.5.9 -> 0.6.5.10
(cherry picked from commit de74d2015f)
2017-06-17 15:59:52 +02:00
Franz Pletz
ba6654f137 imagemagick: 6.9.8-9 -> 6.9.8-10
(cherry picked from commit 5f803db91f)
2017-06-17 15:55:30 +02:00
Jan Malakhovski
b9d7a4a936 ImageMagick: 6.9.8-6 -> 6.9.8-9
(cherry picked from commit 6696378911)
2017-06-17 15:55:30 +02:00
Franz Pletz
e3d49bb409 imagemagick7: 7.0.5-7 -> 7.0.6-0
(cherry picked from commit 9be1951a8a)
2017-06-17 15:53:30 +02:00
Vladimír Čunát
a889c4c379 Merge #26657: nixos security.wrappers: fix a typo
Fixes #26611.

(cherry picked from commit c416641d4d)
2017-06-17 10:05:30 +02:00
taku0
5a9c99607e thunderbird-bin: fixup missing gtk3
(cherry picked from commit 77f0ad5a37)
Now it seems to work, and the expression is fully synced with nixpkgs
master.
2017-06-16 22:30:20 +02:00
Vladimír Čunát
69380c984b Merge #26601: thunderbird*: 52.1.1 -> 52.2.0 (security)
(cherry picked from commit 791f072384)
I left out the firefox-bin bits, as they didn't apply anyway.
2017-06-16 22:20:13 +02:00
Peter Simons
852827bbc3 perl-Shell-Command: initial version 0.06
(cherry picked from commit 8d71c758a1)
2017-06-16 19:34:31 +02:00
Peter Simons
a268ba9975 mr: update to version 1.20170129
(cherry picked from commit b7f71bd2ad)
2017-06-16 19:23:30 +02:00
Peter Simons
fa9303e07c vcsh: patch broken parser for $GIT_VERSION_MINOR
(cherry picked from commit f59104bc73)
2017-06-16 19:22:48 +02:00
Peter Simons
64fe5007fa vcsh: update to latest Git head, enable test suite, install man page
(cherry picked from commit 14283b6a95)
2017-06-16 19:22:38 +02:00
Eelco Dolstra
6d5c142886 aws-sdk-cpp: Fix credentials test
These require a home directory.

http://hydra.nixos.org/build/54519006
(cherry picked from commit 672d2dfbb8)
2017-06-16 19:19:00 +02:00
Vladimír Čunát
d33c4b2b4a Merge #26571: firefox* updates (critical security)
(cherry picked from commit 952bb9a445)
Yes, finally I could do this simple cherry-pick :-)
2017-06-16 11:30:02 +02:00
Vladimír Čunát
9914a7443e wrapFirefox: fix #25505 gtk3 file dialogs
Crash + icons.

(cherry picked from commit 700d6186a3)
Maybe it's not required ATM, but it shouldn't hurt.
2017-06-16 11:23:11 +02:00
Vladimír Čunát
378d10001f firefoxPackages: refactor to a state "close" to master
The point is to support simple version updates via simple
cherry-picking.  The hashes are the same as in the grandparent commit.
2017-06-16 11:23:10 +02:00
Jan Malakhovski
773822dc09 firefox: rename default.nix -> common.nix
(cherry picked from commit 1d407173b0)
2017-06-16 11:23:10 +02:00
Tim Steinbach
23aa768a87 linux: 4.11.4 -> 4.11.5
(cherry picked from commit b4576c5108)
2017-06-15 08:55:25 -04:00
Tim Steinbach
c9c3dcc95f linux: 4.9.31 -> 4.9.32
(cherry picked from commit a7efc9f0cd)
2017-06-15 08:55:24 -04:00
Tim Steinbach
e79a485bb1 linux: 4.4.71 -> 4.4.72
(cherry picked from commit 07edb44d15)
2017-06-15 08:55:24 -04:00
Franz Pletz
9a45923070 bind: 9.10.5 -> 9.10.5-P1 for CVE-2017-3140
(cherry picked from commit 72c36db003)
2017-06-15 13:45:30 +02:00
Robin Gloster
64323a9a4b bind: 9.10.4-P6 -> 9.10.5
(cherry picked from commit b447f624c3)
2017-06-15 13:45:29 +02:00
Edward Tjörnhammar
3467562805 kodi-retroarch-advanced-launchers: ensure sound has been released
(cherry picked from commit a66a9ae8e8)
2017-06-15 07:12:38 +02:00
Edward Tjörnhammar
6ca6adafed kodiPlugins.steam-controller: init at 0.9.0
(cherry picked from commit 677f194a10)
2017-06-15 07:12:37 +02:00
Edward Tjörnhammar
3ad3f641c9 kodiPlugins.joystick: init at 1.3.6
(cherry picked from commit fe0b858113)
2017-06-15 07:12:37 +02:00
Edward Tjörnhammar
9377b891d8 kodiPlugins.advanced-emulator-launcher: init at 0.9.6
(cherry picked from commit 4f410bfc8d)
2017-06-15 07:12:37 +02:00
Edward Tjörnhammar
4fbda79d9a kodiPlugins: move build funs to common
(cherry picked from commit 513e66e310)
2017-06-15 07:12:36 +02:00
Edward Tjörnhammar
e88e1deb4a kodiPlugins.svtplay: 4.0.42 -> 4.0.48
(cherry picked from commit 5b01ba947a)
2017-06-15 07:12:36 +02:00
Edward Tjörnhammar
3c66850fe1 kodiPlugins.exodus: 3.0.5 -> 3.1.13
(cherry picked from commit 1f98e47ec1)
2017-06-15 07:12:36 +02:00
Jonathan Rudenberg
c864dff291 kodi: init pvr-hdhomerun plugin at 2.4.7
(cherry picked from commit 8a978a7be3)
2017-06-15 07:12:35 +02:00
Jonathan Rudenberg
d4b63980bd libhdhomerun: init at revision 1efbcb2
(cherry picked from commit 031156c41f)
2017-06-15 07:12:35 +02:00
Joachim Fasting
6324d2fcda tor-browser-bundle-bin: 7.0 -> 7.0.1
(cherry picked from commit 4f909c4f3a)
2017-06-14 23:35:06 +02:00
Thomas Tuegel
2343b552d2 dropbox: 27.4.22 -> 28.4.14
(cherry picked from commit 98c38d51b9)
2017-06-14 15:15:49 -05:00
Pascal Wittmann
420e29105e jasper: 2.0.12 -> 2.0.13, fixes CVE-2017-6850
(cherry picked from commit fcf205024a)
2017-06-14 20:17:31 +02:00
Jörg Thalheim
11db0020c3 broadcom-bt-firmware: revert to unfree
license was misinterpreted, it is now only conditionally in the all
firmware list included, if `allowUnfree` is set.

fixes #25567

(cherry picked from commit 192f8e7699)
2017-06-14 01:33:13 +02:00
Jörg Thalheim
c6add81553 broadcom-bt-firmware: change license to redistributal
see also: https://github.com/winterheart/broadcom-bt-firmware/blob/master/LICENSE.broadcom_bcm20702

fixes #25567

(cherry picked from commit cc75ccbf64)
2017-06-14 01:33:12 +02:00
Jörg Thalheim
99f1c919fc broadcom-bt-firmware: mention package limitations
(cherry picked from commit d072ef956d)
2017-06-14 01:33:12 +02:00
zraexy
b254d4988a broadcom-bt-firmware: init at 12.0.1.1011
broadcom-bt-firmware: init at 12.0.1.1011

(cherry picked from commit d900478e3c)
2017-06-14 01:33:12 +02:00
zraexy
a5ee4c0160 bt-fw-converter: init at 2017-02-19
(cherry picked from commit 7845163d6a)
2017-06-14 01:33:11 +02:00
zraexy
eba5db9a43 perlPackages.RegexpGrammars: init at 1.045
(cherry picked from commit 31ad4e1657)
2017-06-14 01:33:11 +02:00
Taylor "Nekroze" Lawson
412b0a17aa Kubernetes ABAC policy file fix (#26499)
Fix the incorrect nix map that generates the Kubernetes policy file

(cherry picked from commit 9fb87f9c9d)
2017-06-13 23:37:23 +02:00
Tim Shaffer
8dcd0eafc1 vim: update URL for vimrc
Previous URL was returning a 404. Adjusting the query parameters fixes
things.

(cherry picked from commit e973c75d65)
2017-06-13 20:22:57 +02:00
Vladimír Čunát
7aca46f9a9 thunderbird: 45.8.0 -> 52.1.1
... via picking the state in nixpkgs master.  Fixes #26490.
I saw no reason to omit any of the changes we've done in master.
I'm testing it, though just briefly ATM.  It still uses gtk2 by default.
2017-06-13 11:11:44 +02:00
Shea Levy
d10fe64124 haskellPackages.developPackage: Add overrides argument
(cherry picked from commit b349d4b899)
2017-06-12 19:29:55 -04:00
Daniel Fullmer
1c5f4ae5d2 programs.zsh.syntaxHighlighting: Fix default value for patterns
(cherry picked from commit b8ebc60abd)
2017-06-13 00:58:06 +02:00
Maximilian Bosch
19a2cb81b6 programs.zsh.syntax-highlighting: simplify enable option by using mkEnableOption
(cherry picked from commit c4e4071ed1)
2017-06-13 00:58:06 +02:00
Maximilian Bosch
6a5ce160af programs.zsh.syntaxHighlighting: refactor to use attr sets rather than recursive lists for patterns
The idea has been described here: https://github.com/NixOS/nixpkgs/pull/25323#issuecomment-298677369

(cherry picked from commit 0925f79d56)
2017-06-13 00:58:06 +02:00
Maximilian Bosch
9045bd0e3c programs.zsh: rename oh-my-zsh to ohMyZsh
This is intended to provide better consistency with other NixOS modules.
Please refer to mayflower/nixpkgs#21 for further information.

(cherry picked from commit a549596700)
2017-06-13 00:58:05 +02:00
Willi Butz
803987054c zsh module: rename option syntax-highlighting
rename zsh-option "syntax-highlighting" -> "syntaxHighlighting"

(cherry picked from commit 4e4f7a2f66)
2017-06-13 00:58:05 +02:00
Maximilian Bosch
07973d17de programs.zsh.syntax-highlighting: support custom highlighting patterns
see https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/pattern.md
for further reference.

(cherry picked from commit f6e612bb8f)
2017-06-13 00:58:05 +02:00
Maximilian Bosch
ffb4c1f926 programs.zsh.syntax-highlighting: refactor highlighters option for proper validation
Right now the `programs.zsh.syntax-highlighting.highlighters` option
lacks appropriate validation which can cause confusing things when
mistyping a higlighter for zsh-syntax-highlighting.

(cherry picked from commit baa3b3efff)
2017-06-13 00:58:05 +02:00
Maximilian Bosch
533f813013 zsh-syntax-highlighting: Add more configuration options and move to module (#25153)
* programs.zsh: factor zsh-syntax-highlighting out into its own module

* programs.zsh.syntax-highlighting: add `highlighters` option

* programs.zsh: document BC break introduced by moving zsh-syntax-completion into its own module

(cherry picked from commit 0a12aafde4)
2017-06-13 00:57:35 +02:00
Maximilian Bosch
6f295b8c50 oh-my-zsh: add module (#25140)
* programs.zsh: add enableOhMyZsh option to automate setup of oh-my-zsh in global zshrc

* programs.zsh: make oh-my-zsh plugins configurable

* programs.zsh: add ohMyZshCustom option

* programs.zsh: add ohMyZshTheme option

* programs.zsh: applying minor fixes to evaluate expressions properly

* programs.zsh: fix ordering of oh-my-zsh config and execution

* programs.zsh: move all oh-my-zsh params into its own scope named programs.zsh.oh-my-zsh

(cherry picked from commit 9ec64d2890)
2017-06-13 00:55:37 +02:00
Eelco Dolstra
74a1ea1f89 perf: Fix perf annotate
This command requires objdump, so make sure it can find it.

(cherry picked from commit 63e9d1c51e)
2017-06-12 20:14:54 +02:00
Eelco Dolstra
7a76e259c8 nix: 1.11.9 -> 1.11.10
(cherry picked from commit 0bffe03828)
2017-06-12 20:14:41 +02:00
Eelco Dolstra
7071d1eaf4 nixUnstable: 1.12pre5350_7689181e -> 1.12pre5413_b4b1f452
(cherry picked from commit 3d4a8e1f84)
2017-06-12 20:14:38 +02:00
Shea Levy
49e8512100 Add haskellPackages.developPackage for local development default.nixes
(cherry picked from commit 01e047d088)
2017-06-10 20:14:16 -04:00
Shea Levy
dc9836189c Add packageSourceOverrides function to haskell package sets
(cherry picked from commit 219bb1c80c)
2017-06-10 20:14:16 -04:00
Vladimír Čunát
5bafc71b61 virtualboxGuestAdditions: don't install setuid/setgid
(cherry picked from commit cc9a72a286)
2017-06-10 01:27:34 +02:00
Vladimír Čunát
458c44a29d pycairo: fix #26475 - another dead patch download
(cherry picked from commit d12497a23b)
2017-06-09 21:58:46 +02:00
Graham Christensen
d039b5b24e Merge pull request #26491 from michalpalka/release-17.03-xen-security
xen: patch for XSAs: 206, 211, 212, 213, 214 and 215
2017-06-09 15:16:01 -04:00
Joachim Fasting
8d7c1a4b91 tinycc: 0.9.27pre-20170527 -> 0.9.27pre-20170605
Contains further fix to x86_64 codegen (and some less relevant Windows
stuff).

(cherry picked from commit 39f7530e47)
2017-06-09 16:32:40 +02:00
Joachim Fasting
a91a06da55 linuxPackages.evdi: specify minimum kernel version, per upstream
Upstream says 3.16 is the oldest supported kernel.  No versions prior to
3.18 build on Hydra. See e.g., https://hydra.nixos.org/build/53599831.

(cherry picked from commit b1f0af7ef6)
2017-06-09 16:32:34 +02:00
Michał Pałka
b06473f46e xen: patch for XSAs: 206, 211, 212, 213, 214 and 215
XSA-206 Issue Description:

> xenstored supports transactions, such that if writes which would
> invalidate assumptions of a transaction occur, the entire transaction
> fails.  Typical response on a failed transaction is to simply retry
> the transaction until it succeeds.
>
> Unprivileged domains may issue writes to xenstore which conflict with
> transactions either of the toolstack or of backends such as the driver
> domain. Depending on the exact timing, repeated writes may cause
> transactions made by these entities to fail indefinitely.

More: https://xenbits.xen.org/xsa/advisory-206.html

XSA-211 Issue Description:

> When a graphics update command gets passed to the VGA emulator, there
> are 3 possible modes that can be used to update the display:
>
> * blank - Clears the display
> * text - Treats the display as showing text
> * graph - Treats the display as showing graphics
>
> After the display geometry gets changed (i.e., after the CIRRUS VGA
> emulation has resized the display), the VGA emulator will resize the
> console during the next update command. However, when a blank mode is
> also selected during an update, this resize doesn't happen. The resize
> will be properly handled during the next time a non-blank mode is
> selected during an update.
>
> However, other console components - such as the VNC emulation - will
> operate as though this resize had happened. When the display is
> resized to be larger than before, this can result in a heap overflow
> as console components will expect the display buffer to be larger than
> it is currently allocated.

More: https://xenbits.xen.org/xsa/advisory-211.html

XSA-212 Issue Description:

> The XSA-29 fix introduced an insufficient check on XENMEM_exchange
> input, allowing the caller to drive hypervisor memory accesses outside
> of the guest provided input/output arrays.

More: https://xenbits.xen.org/xsa/advisory-212.html

XSA-213 Issue Description:

> 64-bit PV guests typically use separate (root) page tables for their
> kernel and user modes.  Hypercalls are accessible to guest kernel
> context only, which certain hypercall handlers make assumptions on.
> The IRET hypercall (replacing the identically name CPU instruction)
> is used by guest kernels to transfer control from kernel mode to user
> mode.  If such an IRET hypercall is placed in the middle of a multicall
> batch, subsequent operations invoked by the same multicall batch may
> wrongly assume the guest to still be in kernel mode.  If one or more of
> these subsequent operations involve operations on page tables, they may
> be using the wrong root page table, confusing internal accounting.  As
> a result the guest may gain writable access to some of its page tables.

More: https://xenbits.xen.org/xsa/advisory-213.html

XSA-214 Issue Description:

> The GNTTABOP_transfer operation allows one guest to transfer a page to
> another guest.  The internal processing of this, however, does not
> include zapping the previous type of the page being transferred.  This
> makes it possible for a PV guest to transfer a page previously used as
> part of a segment descriptor table to another guest while retaining the
> "contains segment descriptors" property.
>
> If the destination guest is a PV one of different bitness, it may gain
> access to segment descriptors it is not normally allowed to have, like
> 64-bit code segments in a 32-bit PV guest.
>
> If the destination guest is a HVM one, that guest may freely alter the
> page contents and then hand the page back to the same or another PV
> guest.
>
> In either case, if the destination PV guest then inserts that page into
> one of its own descriptor tables, the page still having the designated
> type results in validation of its contents being skipped.

More: https://xenbits.xen.org/xsa/advisory-214.html

XSA-215 Issue Description:

> Under certain special conditions Xen reports an exception resulting
> from returning to guest mode not via ordinary exception entry points,
> but via a so call failsafe callback.  This callback, unlike exception
> handlers, takes 4 extra arguments on the stack (the saved data
> selectors DS, ES, FS, and GS).  Prior to placing exception or failsafe
> callback frames on the guest kernel stack, Xen checks the linear
> address range to not overlap with hypervisor space.  The range spanned
> by that check was mistakenly not covering these extra 4 slots.

More: https://xenbits.xen.org/xsa/advisory-215.html
(cherry picked from commit dd3dcceb23)
2017-06-09 14:23:26 +00:00
Vladimír Čunát
46a0241ae2 pycairo: fix #26475 - a dead patch download
(cherry picked from commit 97f3009bf8)
2017-06-09 15:21:53 +02:00
Joachim Fasting
dc6c17b8b7 tor: 0.2.9.10 -> 0.2.9.11
Of particular note is a fix for TROVE-2017-005.

See https://blog.torproject.org/blog/tor-0308-released-fix-hidden-services-also-are-02429-02514-02612-0278-02814-and-02911
2017-06-09 09:39:12 +02:00
Herwig Hochleitner
9f208afb22 chromium: softlink system nodejs into third_party
somehow, the build seems to have changed with chromium 58, to not auto
download the node binary. It is needed to generate webui files and we
can substitute our own.

(cherry picked from commit 1fe7bd9ed6)
2017-06-09 09:39:10 +02:00
Herwig Hochleitner
e28c6e1030 chromium: add bootstrap gn patch
(cherry picked from commit bafcf4226e)
2017-06-09 09:39:10 +02:00
Herwig Hochleitner
93c4e49911 chromium: 58.0.3029.96 -> 58.0.3029.110
(cherry picked from commit 232507a73c)
2017-06-09 09:39:09 +02:00
Herwig Hochleitner
61d5447739 chromium: 57.0.2987.133 -> 58.0.3029.96
(cherry picked from commit ab65bf9dbd)
2017-06-09 09:39:08 +02:00
Herwig Hochleitner
f900ea0ad3 ninja: 1.7.1 -> 1.7.2
(cherry picked from commit 6509ba66a8)
2017-06-09 09:39:07 +02:00
Joachim Fasting
12a70ca67f tor-browser-bundle-bin: 6.5.2 -> 7.0
Now requires pulseaudio for audio playback.

https://blog.torproject.org/blog/tor-browser-70-released
(cherry picked from commit 5b5f3f542a)
2017-06-09 09:39:01 +02:00
Vladimír Čunát
52499b7a93 Merge #26452: libtiff: 4.0.7-6 -> 4.0.8-2
(cherry picked from commit bbec4f5af7)
2017-06-08 21:51:30 +02:00
Vladimír Čunát
ad413fdb58 Merge: fixup setuid/setgid build problems
This should be enough for the small channel to succeed again.
2017-06-08 21:51:07 +02:00
Vladimír Čunát
80fc4f7976 openssh: fixup build on Hydra
http://hydra.nixos.org/build/53993444
(cherry picked from commit 445b107d93)
2017-06-08 21:50:28 +02:00
Vladimír Čunát
b8cc4590c8 nfs-utils: fixup setuid/setgid build problems, hopefully
(cherry picked from commit 10f9fb63f1)
2017-06-08 21:46:50 +02:00
Vladimír Čunát
63e553a125 util-linux: fixup setuid/setgid build problems
Taken from 1aac1fe5dd on master but without refactoring.
2017-06-08 21:46:09 +02:00
Vladimír Čunát
6718abd71d shadow: fixup setuid/setgid build problems, hopefully
(cherry picked from commit 833bc78dcf)
2017-06-08 21:40:40 +02:00
Jörg Thalheim
18e4687c38 systemd-nspawn: fixes evaluation error
fixes #25097

(cherry picked from commit 522c16bd86)
2017-06-07 22:51:31 +01:00
Tim Steinbach
d3b66f9b94 openssl: 1.0.2k -> 1.0.2l
cc #26435

(cherry picked from commit 67c1f0e65a)
2017-06-07 14:10:57 +02:00
Tim Steinbach
0c8509befb openssl: 1.1.0e -> 1.1.0f
(cherry picked from commit a64194f9d4)
2017-06-07 14:10:57 +02:00
Lancelot SIX
9823d1d018 libgcrypt: 1.7.6 -> 1.7.7
See https://lists.gnu.org/archive/html/info-gnu/2017-06/msg00001.html
for release announcement.

(cherry picked from commit b96ba3a17a)
2017-06-07 14:10:57 +02:00
Tim Steinbach
ddd1f85765 linux: 4.11.3 -> 4.11.4
(cherry picked from commit 66faa421c9)
2017-06-07 08:10:13 -04:00
Tim Steinbach
dd9ce14909 linux: 4.4.70 -> 4.4.71
(cherry picked from commit 01fc1a80b3)
2017-06-07 08:10:13 -04:00
Tim Steinbach
f9e4256767 linux: 4.9.30 -> 4.9.31
(cherry picked from commit c7abd6943e)
2017-06-07 08:10:12 -04:00
Vladimír Čunát
23ca0dddec gnutls: maintenance 3.5.10 -> 3.5.13
It contains a fix for DOS possibility in servers.
http://gnutls.org/security.html#GNUTLS-SA-2017-4

(cherry picked from commit 9135c9f73a)
2017-06-07 13:28:55 +02:00
Eelco Dolstra
7648f528de NixOS VM tests: Don't create a setgid group in vde_switch
Nix no longer allows this for security reasons.

http://hydra.nixos.org/build/53993125
(cherry picked from commit 0996ea8a68)
2017-06-07 12:00:35 +02:00
Franz Pletz
2bbe0b0f0b irssi: 1.0.2 -> 1.0.3 (security)
See https://irssi.org/security/irssi_sa_2017_06.txt.

(cherry picked from commit e864345d37)
2017-06-07 06:00:39 +02:00
Franz Pletz
f82ae7cb24 nixos/firewall: clean up rpfilter rules properly
The rpfilter rules wouldn't be removed if it was previously enabled
but disabled in a new generation.

(cherry picked from commit a49c2366ef)
2017-06-07 06:00:16 +02:00
Eelco Dolstra
300fa462b3 nix: 1.11.8 -> 1.11.9
(cherry picked from commit e4190943c8)
2017-06-06 15:04:31 +02:00
Stefan Lau
870cf05b6f chromedriver: allow to install on more systems
(cherry picked from commit 04527cd84b)
2017-06-05 14:30:45 -04:00
Renzo Carbonara
883cc6d7fd ghcjsHEAD: bump git revision
This particular revision brings significant performance improvements
when building code that uses TemplateHaskell.

(cherry picked from commit d0c68a1658)
2017-06-05 14:24:35 -04:00
Pascal Wittmann
9ed5dbafe3 yara: 3.5.0 > 3.6.0, fixes CVE-2017-5924 2017-06-04 17:51:40 +02:00
Jörg Thalheim
8ddf6f97c5 apvlv: use wrapGAppsHook
(cherry picked from commit 5fcdd6c562)
2017-06-04 11:01:28 +01:00
David Asabina
f7c081b7e6 apvlv: copy main_menubar.glade to out dir
The application requires the main_menubar.glade alongside the
Startup.pdf. Just making sure all required assets are present 😉.

Currently `apvlv` fails with the `(apvlv:16999): Gtk-ERROR **: failed to add UI: Failed to open file '${store-path}-apvlv-0.1.5/share/doc/apvlv/main_menubar.glade': No such file or directory
zsh: trace trap  apvlv` error.

(cherry picked from commit 5029b39b44)
2017-06-04 10:50:52 +01:00
rnhmjoj
5dddb23b4a dnschain: allow different bind and external addresses
(cherry picked from commit 2606d395fc)
2017-06-04 08:29:40 +01:00
Jörg Thalheim
9e0a260195 wireguard: 0.0.20170409 -> 0.0.20170531
(cherry picked from commit 6caf5d7dada713bfb7a593124b4d4aa4ad7ae7a2)
2017-06-03 13:25:35 +01:00
Emmanuel Rosa
f82bbc904d doc: clarify building-nixos CD/DVD instructions
This change updates the instructions for building a NixOS ISO so that it's clear how to do it.

Previously, the instructions stated to set NIXOS_CONFIG prior to running `nix-build`, yet the example provided by-passed NIXOS_CONFIG anyway. But the *really* important missing piece is the need for nixos/default.nix. See #21840.

This change removes the NIXOS_CONFIG verbiage, and adds steps to clone nixpkgs and (most importantly) cd'ing into nixpkgs/nixos. That way, the reader may think: *Oh, so I need a default.nix and a configuration.nix. Ahhh, OK.*

I purposely added the redundant default.nix argument.

(cherry picked from commit 4bee34dcc5)
2017-06-02 21:16:04 -04:00
Jörg Thalheim
788ce6e3df resilio: remove systemd user service
this used to be part of the upstream btsync package

fixes #26303

(cherry picked from commit 3d17573cd4)
2017-06-02 21:28:33 +01:00
Jörg Thalheim
42a1ed6f2a resilio: generate configuration with toJSON
(cherry picked from commit c611d03842)
2017-06-02 21:28:28 +01:00
Jörg Thalheim
3a96338ce6 resilio-sync: cosmetic changes
(cherry picked from commit b6e384732e)
2017-06-02 21:28:22 +01:00
Kjartan Ovmilk
746639b7a5 resilio service: replaces btsync service, which is no longer supported upstream.
(cherry picked from commit 919b39bb7c)
2017-06-02 21:28:08 +01:00
Kjartan Ovmilk
5bbbfda716 resilio-sync: init at 2.5.2
(cherry picked from commit 2bd5c13af5)
2017-06-02 21:27:02 +01:00
Graham Christensen
0e00bc51ea Merge pull request #26326 from LumiGuide/release-17.03_strongswan-5.5.3
strongswan: 5.5.2 -> 5.5.3
2017-06-02 09:04:00 -04:00
Bas van Dijk
e7ad5830e1 strongswan: 5.5.2 -> 5.5.3 2017-06-02 15:00:10 +02:00
Vladimír Čunát
6f5edd3bc2 mesa: maintenance 17.0.2 -> 17.0.7
Expected to be the last update of the branch.  I somehow neglected
maintenance updates on 17.03 after master got updated to mesa-17.1.x
2017-06-01 21:31:31 +02:00
Thomas Tuegel
ecaef55b05 dropbox: 26.4.24 -> 27.4.22
(cherry picked from commit fa1952908e)
2017-06-01 08:48:08 -05:00
Thomas Tuegel
0fdd1b432f dropbox: 25.4.28 -> 26.4.24
(cherry picked from commit 2099f0afcc)
2017-06-01 08:48:00 -05:00
Nikolay Amiantov
0b0ea40ac3 pythonPackages.nbxmpp: 0.5.3 -> 0.5.5
Fix annoying bug with messages being resent on reconnection.

(cherry picked from commit 120275fd6e)
2017-06-01 02:02:15 +03:00
Vladimír Čunát
05126bc850 nvidia_x11_legacy304: apply patches from Debian
The drivers would build but probably wouldn't work without them.
See #26250.

(cherry picked from commit 0c4b91505e)
2017-05-31 16:34:55 +03:00
Vladimír Čunát
0dfad67203 nvidia_x11_legacy304: 304.134 -> 304.135
(cherry picked from commit af58f8de55)
2017-05-31 16:34:48 +03:00
Nikolay Amiantov
e67c1b7d9a nvidia module: link proper output as OpenGL drivers
(cherry picked from commit d09e3535f5)
2017-05-31 16:34:15 +03:00
Domen Kožar
21a8239452 Merge pull request #26267 from jmitchell/fix/haskell-modules-refactoring
haskell-modules: refactor package set
2017-05-31 08:17:25 +02:00
Jacob Mitchell
9cf5b90374 haskell-modules: refactor package set
This change is effectively a no-op to nixpkgs. However, it gives users
the flexibility to create and maintain their own package sets per
project, while benefiting from nix's Haskell configurations.

I would make immediate use of this change in stack2nix, a project that
generates nix expressions for all the dependencies of a given Haskell
project. @domenkozar is familiar with the motivations and helped
refine this change

(cherry picked from commit ed6ecacf64)
Reason: enable faster builds for current users of the stack2nix
project.
2017-05-30 17:05:06 -07:00
Tim Steinbach
083b2c89d4 ammonite: 0.9.3 -> 0.9.5
(cherry picked from commit 8d689482b9)
2017-05-30 18:58:52 -04:00
Daiderd Jordan
ed9cfc75c9 sudo: 1.8.20 -> 1.8.20p1, fixes CVE-2017-1000367
(cherry picked from commit 3c0114d472)
2017-05-30 23:35:56 +02:00
Vladimír Čunát
7cbf7f54c1 nvidia module: allow .persistenced == null
Fixes #26250.  This is fallout from PR #22304.
It's null for 304 and 173 legacy drivers.

(cherry picked from commit bc7b895aa5)
2017-05-30 20:59:17 +02:00
Joachim Fasting
569742c789 tor-browser-bundle-bin: additional download urls
To better support users that are unable to access the official Tor
distribution site, e.g., https://github.com/NixOS/nixpkgs/issues/26184

(cherry picked from commit 2262f89230)
2017-05-29 23:30:09 +02:00
Joachim Fasting
3005d250e2 tinycc: 0.9.27pre-20170225 -> 0.9.27pre-20170527
Contains fixes for the x86_64 codegen [1]

[1]: https://lists.nongnu.org/archive/html/tinycc-devel/2017-05/msg00102.html

(cherry picked from commit a50315d736)
2017-05-29 23:30:03 +02:00
Pascal Wittmann
5a0b2d7d96 radicale: 1.1.1 -> 1.1.2, fixes CVE-2017-8342 2017-05-29 09:30:35 +02:00
Thomas Tuegel
2412cec456 Revert "plasma5: 5.8.6 -> 5.8.7"
This reverts commit b1f8bd12d3.

Fixes #26080.

In this bugfix release, upstream has changed the Qt dependency requirement from
Qt 5.6 to Qt 5.7; such an update is not acceptable for an LTS release, so
updates to the Plasma desktop environment in NixOS are discontinued.
2017-05-28 08:33:12 -05:00
evujumenuk
36550fc129 zfs: Bump incompatibleKernelVersion to "4.11"
https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.6.5.9 attests compatibility with kernel versions up to 4.10.x.(cherry picked from commit aef776836d)
2017-05-28 11:14:51 +01:00
Jörg Thalheim
d32788ffe0 kernelPackages.zfsUnstable: 0.7.0-rc3 -> 0.7.0-rc4
(cherry picked from commit 7765e5971c)
2017-05-28 11:12:50 +01:00
Jörg Thalheim
f98e0bb8ab kernelPackages.splUnstable: 0.7.0-rc3 -> 0.7.0-rc4
(cherry picked from commit 4ea961ccc3)
2017-05-28 11:12:43 +01:00
Thomas Tuegel
9f4a10220c spotify: 1.0.53.758 -> 1.0.55.487
(cherry picked from commit b7290d3af5)

Fixes #26141.
2017-05-27 03:15:20 +02:00
Franz Pletz
5600895fd4 geolite-legacy: 2016-07-08 -> 2017-05-26
(cherry picked from commit 45372b1cdc)
2017-05-26 23:44:00 +02:00
Daiderd Jordan
b8b7b32141 darwin-frameworks: don't use pure CF
(cherry picked from commit 97a3e7cf52)
2017-05-26 10:24:00 -04:00
Daiderd Jordan
a6f1faf94f darwin: add setup-hook to fix CF references
(cherry picked from commit 04fa8e006c)
2017-05-26 10:23:57 -04:00
Dan Peebles
96a5ae56d9 apple-sdk: 10.9 -> 10.10
This is a slightly less ambitious version of the (now reverted) commit
377cef8d16, which had a bunch of issues
that I don't have time to resolve right now.

(cherry picked from commit 59b795c590)
2017-05-26 10:19:06 -04:00
Michiel Leenaars
88ed9271bd nsd: fix openssl path in nsd-control-setup
Closes #26002
2017-05-26 10:02:56 +02:00
Michiel Leenaars
88cf6a3c0a nsd: 4.1.15 -> 4.1.16 2017-05-26 10:02:56 +02:00
Edward Tjörnhammar
738f7645d8 kodi: 17.2 -> 17.3
(cherry picked from commit 0c6153059d)
2017-05-26 09:31:06 +08:00
Tim Steinbach
a178872405 linux: FS_ENCRYPTION only for >= 4.9 kernels
(cherry picked from commit 690a83091b)
2017-05-25 18:26:11 -04:00
Tim Steinbach
97a3b9b8b8 linux: 4.4.69 -> 4.4.70
(cherry picked from commit 8f0ca4f44a)
2017-05-25 18:25:58 -04:00
Tim Steinbach
0cca5642b0 linux: 4.9.29 -> 4.9.30
(cherry picked from commit 446c57fdb2)
2017-05-25 18:25:51 -04:00
Tim Steinbach
36439797cb linux: 4.11.2 -> 4.11.3
(cherry picked from commit f618a6caa1)
2017-05-25 18:25:45 -04:00
Aleksey Zhukov
f0c4be2873 pycharm-professional: 2017.1 -> 2017.1.3
(cherry picked from commit b6f2c44b8e)
2017-05-25 15:45:55 +02:00
Aleksey Zhukov
958443e014 pycharm-community: 2017.1 -> 2017.1.3
(cherry picked from commit d1844f480b)
2017-05-25 15:44:13 +02:00
Vasiliy Solovey
d56d0ab956 idea: rename to jetbrains
JetBrains IDEs were put under wrong scope which was confusing.
Fixes #24453

(cherry picked from commit bab0ed75c0)
2017-05-25 15:38:08 +02:00
Vasiliy Solovey
b50009158b jetbrains: add alias for idea
(cherry picked from commit 68db8222b6)
2017-05-25 15:37:49 +02:00
Robin Gloster
4102445801 php70: 7.0.16 -> 7.0.19
fixes build with openssl 1.1

(cherry picked from commit d0ffb23442)
2017-05-25 02:46:30 +02:00
Franz Pletz
1497004507 php71: 7.1.2 -> 7.1.5
(cherry picked from commit 9bb358316f)
2017-05-25 02:45:40 +02:00
Martin Wohlert
9c8fc48948 gnupg: 2.1.20 -> 2.1.21
(cherry picked from commit b15baed9e7)
2017-05-25 02:41:28 +02:00
Lancelot SIX
c7b973f100 gnupg21: 2.1.19 -> 2.1.20
See http://lists.gnu.org/archive/html/info-gnu/2017-04/msg00002.html
for release information

(cherry picked from commit 637770f699)
2017-05-25 02:41:27 +02:00
Lancelot SIX
2f356c80a7 gnupg21: 2.1.18 -> 2.1.19
See http://lists.gnu.org/archive/html/info-gnu/2017-03/msg00000.html
for release information

(cherry picked from commit ade2357c65)
2017-05-25 02:41:26 +02:00
Franz Pletz
aede047052 imagemagick: 6.9.8-4 -> 6.9.8-6
(cherry picked from commit e1b3f854b6)
2017-05-25 02:07:54 +02:00
koral
a1cebc5b86 imagemagick: 6.9.7-6 -> 6.9.8-4
(cherry picked from commit e55cf2cba3)
2017-05-25 02:07:54 +02:00
Franz Pletz
9530e9d9ed imagemagick7: 7.0.4-6 -> 7.0.5-7
(cherry picked from commit 2d04e5653a)
2017-05-25 02:07:29 +02:00
Franz Pletz
e74d7f758c libtasn1: apply patch to fix CVE-2017-6891
(cherry picked from commit 5479f742e6)
2017-05-25 01:15:36 +02:00
Franz Pletz
8c7460f890 samba: 4.5.8 -> 4.5.10
Fixes CVE-2017-7494.

cc #26072
2017-05-25 01:15:18 +02:00
Peter Simons
d82736a3af libqmi: enable MBIM support
(cherry picked from commit c1609e4a4d)
2017-05-24 17:29:19 +02:00
Peter Simons
43b42b6bfd libqmi: update to version 1.18.0
The new version adds a dependency in libgudev.

(cherry picked from commit 9b54745c61)
2017-05-24 17:29:19 +02:00
Peter Simons
df96ad0fa9 multi-ghc-travis: update to latest git version and install both scripts
We're using the names 'make-travis-yml' and 'make-travis-yml-2' now, which
feels more in-line'ish with the Cabal file hvr is distributing.

(cherry picked from commit 769e14a422)
2017-05-24 17:29:19 +02:00
Tim Steinbach
58e227052d ammonite: 0.9.1 -> 0.9.3
(cherry picked from commit 997f9d678e)
2017-05-24 07:43:11 -04:00
Graham Christensen
984c2593f5 Merge pull request #26048 from peterhoeg/u/kodi_stable
kodi: 17.1 -> 17.2
2017-05-24 06:56:37 -04:00
Graham Christensen
ea6d620a7b Merge pull request #26047 from peterhoeg/f/vlc
vlc: 2.2.4 -> 2.2.5.1 with fix for subtitle vulnerability
2017-05-24 06:56:26 -04:00
Peter Hoeg
4185841f17 kodi: 17.1 -> 17.2
(cherry picked from commit 8fd2f022f0)
2017-05-24 16:04:08 +08:00
Peter Hoeg
11dcb46d31 vlc: 2.2.4 -> 2.2.5.1
Fixes a nasty vulnerability caused by broken subtitle handling:

http://blog.checkpoint.com/2017/05/23/hacked-in-translation/
(cherry picked from commit 4e2b190d52)
2017-05-24 13:09:49 +08:00
Thomas Tuegel
b1f8bd12d3 plasma5: 5.8.6 -> 5.8.7 2017-05-23 11:35:34 -05:00
Tim Steinbach
2c6ef66d21 ammonite: 0.9.0 -> 0.9.1
(cherry picked from commit 347cb0b4f7)
2017-05-23 07:50:52 -04:00
Peter Simons
05bc7686b3 all-cabal-hashes: update to latest version of Hackage
(cherry picked from commit cb838cad5c)
2017-05-23 10:38:42 +02:00
Mateusz Kowalczyk
4d07c03462 jenkins: 2.61 -> 2.62
(cherry picked from commit 638fb38ef0)
2017-05-22 17:29:32 +02:00
Mateusz Kowalczyk
da121ec773 jenkins: 2.56 -> 2.61
(cherry picked from commit a7e861a058)

Fixes CVE-2017-1000355. https://jenkins.io/security/advisory/2017-04-26/
2017-05-22 17:29:09 +02:00
James Earl Douglas
79011faade jenkins: 2.55 -> 2.56
(cherry picked from commit fa8ee0d45b)
2017-05-22 17:28:41 +02:00
James Earl Douglas
7d44e01acd jenkins: 2.53 -> 2.55
(cherry picked from commit fce59d47e7)
2017-05-22 17:28:40 +02:00
Franz Pletz
514985cb60 jenkins: 2.49 -> 2.53
(cherry picked from commit 6049560e60)
2017-05-22 17:27:34 +02:00
Martin Wohlert
50fdb3a7f7 libopus: 1.1.3 -> 1.1.4
(cherry picked from commit 88af502593)

Security release. See #25973.

Fixes CVE-2017-0381.
2017-05-22 17:22:47 +02:00
Domen Kožar
fe62c993b5 nixopsUnstable: 2017-05-15 -> 2017-05-22 2017-05-22 15:51:49 +02:00
Rhys
9fd6417e27 cython: build on 32-bit ARM
(cherry picked from commit c46c3fa5aa)
2017-05-22 09:16:52 +02:00
Patrick Callahan
3f88905985 fish: (NixOS only) source configuration sections anew in all child shells
this fixes issue #25800: https://github.com/NixOS/nixpkgs/issues/25800

(cherry picked from commit 42c768c8e8)
2017-05-22 07:10:08 +01:00
Patrick Callahan
a895b02597 fish: source NixOS environment on non-login shells, when it hasn't been
sourced
(this fixes issue #25789:
https://github.com/NixOS/nixpkgs/issues/25789#issuecomment-301577290 and
the issue with git-annex mentioned here
https://github.com/NixOS/nixpkgs/pull/24314#issuecomment-301587124 )

(cherry picked from commit 3f91e0dbae)
2017-05-22 07:10:02 +01:00
spamntaters
1ba4ab0207 Opera: 44.0.2510.857 -> 45.0.2552.812
(cherry picked from commit 2f455390a5)
2017-05-21 18:47:02 +02:00
Joachim Fasting
9a648530a2 treewide: s,enableParallelBuild(s),enableParallelBuilding,g
(cherry picked from commit 874b81b31f)
2017-05-21 18:47:01 +02:00
Niklas Hambüchen
daf0b3108b manual: Fix addCheck example having arguments in wrong order.
`addCheck` takes first the type, then the check.

(cherry picked from commit 2df7d4d63a)
2017-05-21 18:47:00 +02:00
Joachim Fasting
d606d25fac dnscrypt-proxy: 1.9.4 -> 1.9.5
See https://github.com/jedisct1/dnscrypt-proxy/releases/tag/1.9.5

(cherry picked from commit bfd3227686)

Contains fixes for the cache plugin, nothing else of note.
2017-05-21 18:47:00 +02:00
Joachim Fasting
77194b2fad nano: use https for meta.homepage
The http variant is a permanent redirect to https

(cherry picked from commit 16b6ee3608)
2017-05-21 18:46:54 +02:00
Tim Steinbach
27b488f28e ammonite: 0.8.5 -> 0.9.0
(cherry picked from commit 207c4427b2)
2017-05-21 09:42:49 -04:00
Tim Steinbach
c4cb1ee63e ammonite: 0.8.4 -> 0.8.5
(cherry picked from commit 8037c5e0cf)
2017-05-21 09:42:49 -04:00
Tim Steinbach
8368becca8 linux: 4.11.1 -> 4.11.2
(cherry picked from commit a42c54057f)
2017-05-20 17:20:54 -04:00
Tuomas Tynkkynen
1fadfc27ad kernel: 4.11 -> 4.11.1
(cherry picked from commit c230aee121)
2017-05-20 17:20:49 -04:00
Tim Steinbach
213b543126 linux: 4.9.28 -> 4.9.29
(cherry picked from commit a551ca61b7)
2017-05-20 17:20:07 -04:00
Tim Steinbach
471ae2e551 linux: 4.4.68 -> 4.4.69
(cherry picked from commit 82852ac60e)
2017-05-20 17:20:07 -04:00
Tuomas Tynkkynen
7995849ab8 kernel: 4.4.67 -> 4.4.68
(cherry picked from commit 8de08ff145)
2017-05-20 17:19:56 -04:00
Tuomas Tynkkynen
aaa743eca0 kernel: 4.10 is end-of-life
https://lkml.org/lkml/2017/5/20/75

(cherry picked from commit de263072b5)
2017-05-20 19:55:34 +03:00
Bjørn Forsman
9ece08dee6 vino: use wrapGAppsHook
Fixes this:

  .vino-server-wr[8931]: Using the 'memory' GSettings backend. \
  Your settings will not be saved or shared with other applications.

Still, the screen sharing settings under "gnome-control-center sharing"
does not seem to be persisted (except the enabling/disabling sharing
flag itself). Making changes and then re-opening gnome-control-center
shows the default screen sharing settings. Sigh.

(cherry picked from commit 0eff1d9f2a)
2017-05-19 23:32:47 +02:00
Bjørn Forsman
836e237ebe nixos/gnome3: fix screen sharing
Without this change there will be silent errors when enabling screen
sharing. The GUI thinks it enables the service when it in fact does not
(errors are seen in the system journal).

vino is already in the closure of gnome-control-center, so this is
basically free.

Configuration of screen sharing is done in GNOME control center.

(cherry picked from commit f9633c7791)
2017-05-19 23:32:39 +02:00
Bjørn Forsman
582e8d0ccf vino: add missing gsettings schema
Fixes this:

  $ ./result/libexec/vino-server
  ...
  (vino-server:13915): GLib-GIO-ERROR **: Settings schema 'org.gnome.Vino' is not installed

(cherry picked from commit 94c47b0884)
2017-05-19 23:32:30 +02:00
Vladimír Čunát
b3e54ca95f firefox-esr: 52.1.1esr -> 52.1.2esr
(from master commit 1b3f3f0f1f)
2017-05-19 21:06:33 +02:00
Vladimír Čunát
cfaf051d15 firefox: 53.0.2 -> 53.0.3
(from master commit 0460c77eb2)
2017-05-19 21:05:19 +02:00
taku0
998239031c firefox-bin: 53.0.2 -> 53.0.3
(cherry picked from commit b646ead557)
2017-05-19 21:03:22 +02:00
Peter Simons
05b2da80fe R: Revert "import upstream patch to fix broken "R CMD Sweave" command"
This reverts commit 76296ce3a5. That patch is
intended for R 3.4.0 only. Not sure this commit ever appeared here in this
branch. It looks like *I* committed it??? Must have been confused.

Closes https://github.com/NixOS/nixpkgs/issues/25572.
2017-05-19 15:40:57 +02:00
Nikolay Amiantov
02a188c919 linuxPackages.evdi: init at 1.4.1
(cherry picked from commit 030862f63c)
2017-05-19 02:53:56 +03:00
Nikolay Amiantov
9afd33c571 displaylink: 1.1.62 -> 1.3.52
(cherry picked from commit e17744067a)
2017-05-19 02:52:46 +03:00
Nikolay Amiantov
e4f02ef7eb ffmpeg: fix arm build
(cherry picked from commit 6679dbbd60)
2017-05-19 02:30:45 +03:00
Domen Kožar
3e47e62519 nixopsUnstable: correct tarball 2017-05-18 15:39:14 +02:00
Domen Kožar
e5804b8471 nixopsUnstable: 1.5 -> 2017-05-15
(cherry picked from commit 8ae6797c0e)
Signed-off-by: Domen Kožar <domen@dev.si>
2017-05-18 11:42:32 +02:00
Rickard Nilsson
f2c4af4e3b nixos/luks: Silence killall complain about non-existing cryptsetup processes
(cherry picked from commit a92bdc54e3)
2017-05-16 15:11:39 +02:00
Tuomas Tynkkynen
c9700e6b9e kernel: 4.9.27 -> 4.9.28
(cherry picked from commit ba585648e7)
2017-05-16 14:57:40 +02:00
taku0
de9f1805e4 flashplayer-ppapi: 25.0.0.148 -> 25.0.0.171
(cherry picked from commit 3d3e4cdd7d)
2017-05-16 14:39:07 +02:00
taku0
290906a915 flashplayer: 25.0.0.148 -> 25.0.0.171
(cherry picked from commit 17107fc977)
2017-05-16 14:39:03 +02:00
Vladimír Čunát
f93654c492 firefox: disable content sandboxing - not ready yet
Details: https://github.com/NixOS/nixpkgs/issues/24295#issuecomment-300588575
(cherry-picked from master commit 2a6edacc4e)
2017-05-14 17:31:55 +02:00
Vladimír Čunát
163dd01a3c freetype: fix CVE-2017-{8105,8287} by upstream patches
I copied the patches, as the changelog changes would certainly conflict.

(cherry picked from commit b0d2de45cd)
2017-05-14 15:02:50 +02:00
Armijn Hemel
ee7db075d1 samba: 4.5.3 -> 4.5.8
(cherry picked from commit f7580a1f06)
2017-05-14 16:00:16 +03:00
Marc Nickert
557afcc389 libtiff: security 4.0.7-5 -> 4.0.7-6 (Debian patches)
Taken from PR #25742, only adding extra comment.

(cherry picked from commit 1c9ed32a34)
2017-05-14 14:30:03 +02:00
Thomas Tuegel
22da5d0246 Merge pull request #25692 from ambrop72/kdevelop-shell-1703
kdevelop: Fix shell integration, version bump
2017-05-13 11:25:33 -05:00
Michał Pałka
3b8dd4bee5 gitlab service: fix uploading artifacts from gitlab-runner
Add the binaries from gitlab-workhorse to the path of the
gitlab-workhorse service, as gitlab-zip-metadata is needed
by the service

(cherry picked from commit 8aa756b64a)
2017-05-13 06:54:19 +01:00
Peter Simons
4af03f695b openvpn: update to version 2.4.2 to fix CVE-2017-7478 and CVE-2017-7479
(cherry picked from commit ae6f9324cd)
2017-05-12 13:36:12 +02:00
Cray Elliott
21e75aac80 nvidia_x11_beta: 378.13 -> 381.22
also remove nvidia 4.10 kernel patch as it is no longer needed

(cherry picked from commit 11b8cfb506)
2017-05-12 10:22:13 +02:00
Linus Heckemann
f883be5061 nvidia stable: 375.39 -> 375.66
(cherry picked from commit 995d41c091)
2017-05-12 10:19:48 +02:00
Vladimír Čunát
3a59976521 nvidia_x11_legacy340: fix patch URL to fix #25721
Using fixed-commit URLs and fetchpatch is just more robust.

(cherry picked from commit 165a6548ad)
2017-05-12 10:16:06 +02:00
Ambroz Bizjak
d77a2cf772 kdevelop: Fix shell integration (issue 25559) 2017-05-11 00:05:47 +02:00
Ambroz Bizjak
5b1b690d3d kdevelop: 5.0.3 -> 5.0.4 (#23788) 2017-05-11 00:05:36 +02:00
Ryan Trinkle
b962831330 gi-webkit2: fix gi-javascriptcore dependency
(cherry picked from commit 1927361e44)
2017-05-10 16:48:35 -04:00
Shea Levy
8c90757a96 hackage2nix: Pull haskellSrc2nix from the final package set
(cherry picked from commit ac1599971f)
2017-05-10 08:04:05 -04:00
Jörg Thalheim
b63ad7af91 Merge pull request #24314 from therealpxc/fish
fish: fix environment clobbering and improve initialization
2017-05-10 10:03:59 +01:00
Franz Pletz
09373fa902 bind: disable seccomp by default
Fixes #25645 & #23431.

(cherry picked from commit eb79649414)
2017-05-09 18:24:15 +02:00
Franz Pletz
08cf608095 gitlab: 8.17.5 -> 8.17.6
Security release: https://about.gitlab.com/2017/05/08/gitlab-9-dot-1-dot-3-security-release/

(cherry picked from commit 326efe5fdc)
2017-05-09 18:24:14 +02:00
Tristan Helmich
a344c6c7d2 elasticsearch_kopf: 1.5.7 -> 2.1.1
(cherry picked from commit 342c289d12)
2017-05-09 17:46:42 +02:00
Tim Steinbach
9ddc0ab811 linux: 4.10.14 -> 4.10.15
(cherry picked from commit 3a281eca0ecbcc1e135e12321dd80e833e8145f9)
2017-05-09 08:44:01 -04:00
Eelco Dolstra
99f3536df9 shadow: Fix hash
(cherry picked from commit e2700861fb)
2017-05-08 16:56:23 +02:00
Eelco Dolstra
836d8666d5 nixUnstable: 1.12pre5344_eba840c8 -> 1.12pre5350_7689181e
(cherry picked from commit 234cdc02eb)
2017-05-08 16:52:19 +02:00
Eelco Dolstra
2436649140 nixUnstable: 1.12pre5308_2f21d522 -> 1.12pre5344_eba840c8
(cherry picked from commit d53540dd32)
2017-05-08 16:52:17 +02:00
Eelco Dolstra
9dedc95773 shadow: Fix using default shell in useradd
This caused "useradd xyzzy" to produce a user with no shell:

  xyzzy:x:1002:100::/home/xyzzy:

https://github.com/shadow-maint/shadow/pull/33
(cherry picked from commit 7f6abddcd7)
2017-05-08 16:31:40 +02:00
Eelco Dolstra
612cbd7697 libseccomp: Fix RPATH
Ensure that bin/scmp_sys_resolver doesn't have $TMPDIR in its RPATH.

I can't reproduce the issue reported in
98edb24368 that required the addition of
a wrapper script. It seems to work fine without.

(cherry picked from commit d46e78ed0f)
2017-05-08 16:31:27 +02:00
Renaud
e0c9263935 libseccomp: 2.3.1 -> 2.3.2 + fixed scmp_sys_resolver
`libseccomp` is updated to 2.3.2
`scmp_sys_resolver` is fixed (it could not find libseccomp.so.2 shared library before)

(cherry picked from commit 98edb24368)
2017-05-08 16:31:21 +02:00
Eelco Dolstra
8bc45d33c8 man-pages: 4.09 -> 4.11
(cherry picked from commit b7ed6ef9e1)
2017-05-08 16:03:59 +02:00
Eelco Dolstra
ce201f43ef debian: 8.7 -> 8.8
(cherry picked from commit 31c2d20621)
2017-05-08 16:03:24 +02:00
Tim Steinbach
d5612c5ef2 linux: 4.9.26 -> 4.9.27
(cherry picked from commit 8c74ff6534)
2017-05-08 09:26:42 -04:00
Tim Steinbach
9a96125396 linux: 4.4.66 -> 4.4.67
(cherry picked from commit 4e2c67ff76)
2017-05-08 09:24:09 -04:00
Michal Rus
4a7a03913d intero-nix-shim: fix runtime dependencies
(cherry picked from commit 6aefa13156)
2017-05-07 08:21:27 -04:00
Vladimír Čunát
ae9d534a15 firefox-esr: 52.1.0esr -> 52.1.1esr
(cherry picked from 6b7175435 of PR #25574)
2017-05-07 13:35:37 +02:00
Armijn Hemel
5bc322db0a mediawiki: 1.27.1 -> 1.27.3
(cherry picked from commit cdebfa80ab)
2017-05-07 06:58:48 -04:00
Armijn Hemel
0b7406e86b tomcat85: 8.5.11 -> 8.5.14
(cherry picked from commit 024ddb32a7)
2017-05-07 06:55:01 -04:00
Joachim Fasting
41da81ac3f Revert "google-chrome: 57.0.2987.133 -> 58.0.3029.96"
This reverts commit 1736798a87.

Fails to build on hydra, despite working for the submitter ...
2017-05-07 11:41:30 +02:00
Vladimír Čunát
7a6587ff8d firefox: 53.0 -> 53.0.2
(cherry-picked from commit 4689fdac1b, of PR #25574)
2017-05-07 11:30:57 +02:00
Jörg Thalheim
8fd2f7209d zfs: zed service is now called zfs-zed
fixes #25566

(cherry picked from commit 6b0d8027ef)
2017-05-07 10:23:24 +01:00
taku0
f2156dd095 firefox-bin: 53.0 -> 53.0.2
(cherry picked from commit de8073c75c from PR #25574)
2017-05-07 11:04:55 +02:00
Michael Weiss
3e3c38aaef desktop-managers: Use a black BG as fallback
Use a solid black background when no background image (via
~/.background-image) is provided. In my case this fixes the really
strange behaviour when i3 without a desktop manager starts with the SDDM
login screen as background image.

(cherry picked from commit 852813689a)
2017-05-06 23:05:46 +02:00
Michael Weiss
9283310780 display-managers: Fix the xsession parameters
The xsession script was called with inconsistent (depending on the
display managers) and wrong parameters. The main reason for this where
the spaces the parameter syntax. In order to fix this the old syntax:
$1 = '<desktop-manager> + <window-manager>'
Will be replaced with a new syntax:
$1 = "<desktop-manager>+<window-manager>"

This assumes that neither "<desktop-manager>" nor "<window-manager>"
contain the "+" character but this shouldn't be a problem.

This patch also fixes the quoting by using double quotes (") instead of
single quotes (') [0].

Last but not least this'll add some comments for the better
understanding of the script.

[0]: https://specifications.freedesktop.org/desktop-entry-spec/latest/ar01s06.html

(cherry picked from commit 1273f414a7)
2017-05-06 23:00:35 +02:00
Judson Lester
c893d7adcc nixos/display-managers: Quote "$vars" (#25199)
(cherry picked from commit 0d72629570)
2017-05-06 22:59:59 +02:00
Benjamin Staffin
1736798a87 google-chrome: 57.0.2987.133 -> 58.0.3029.96
stable: 57.0.2987.133 -> 58.0.3029.96
beta: 58.0.3029.68 -> 59.0.3071.36
dev: 59.0.3067.0 -> 60.0.3088.3
(cherry picked from commit 4a593e4285)
2017-05-06 16:01:07 +02:00
José Romildo Malaquias
6149cd874e vivaldi: 1.8.770.56-1 -> 1.9.818.44-1 (#25345)
(cherry picked from commit f87e4c9f53)
2017-05-06 16:01:05 +02:00
romildo
fac4593448 vivaldi: 1.6.689.34-1 -> 1.8.770.56-1
Add $out/opt/vivaldi/lib to RPATH so that libffmpeg.so distributed
with Vivaldi can be found. Otherwise launching Vivaldi fails.

(cherry picked from commit 9747994a7b)
2017-05-06 16:00:58 +02:00
Judah Jacobson
f2878422ca Fix use of isDarwin conditionals.
(cherry picked from commit 2caa7b88ae)
2017-05-05 18:40:43 -04:00
Judah Jacobson
92ed6cb2f2 haskell: work around linker limits on Mac OS X Sierra.
The Sierra linker added a limit on the number of paths that any one
dynamic library (`*.dylib`) can reference.  This causes problems when
a Haskell library has many immediate dependencies (#22810).

We follow a similar fix as GHC/Cabal/Stack: for each derivation,
create a new directory with symlinks to all the dylibs of its immediate
dependencies, and patch its package DB to reference that directory
using the new `dynamic-library-dirs` field.

Note that this change is a no-op for older versions of GHC, i.e., they will
continue to fail on some packages as before.

Also note that this change causes the bootstrapped versions of GHC to be
recompiled, since they depend on `hscolour` which is built by
`generic-builder.nix`.

Tested by building the `stack` binary as described in #22810.

(cherry picked from commit 7131e06214)
2017-05-05 18:40:42 -04:00
Joachim Fasting
ef06638832 libressl: 2.5.3 -> 2.5.4
Contains a fix for CVE-2017-8301: TLS verification vulnerability in
LibreSSL 2.5.1 - 2.5.3 [1][2]

[1]: http://seclists.org/oss-sec/2017/q2/145
[2]: https://github.com/libressl-portable/portable/issues/307

(cherry picked from commit e2bc4e4bde)
2017-05-05 22:39:18 +02:00
Bas van Dijk
977b320d5d wordpress: replace the dbPassword option with dbPasswordFile
We shouldn't force users to store passwords in the world-readable Nix store.
2017-05-05 11:03:55 +02:00
Patrick Callahan
52d8f1bc1c fish: resolve NixOS-related initialization problems 2017-05-04 20:23:48 -07:00
edanaher
8283cc824b prosody: 0.9.10 -> 0.9.12 (#24269) (#25394)
(cherry picked from commit a616f4ec9b)
2017-05-04 21:23:24 +02:00
Eelco Dolstra
bf88c39cb7 hydra: preHook -> shellHook
Upstream 8abc595d1c.

(cherry picked from commit 7d3f1d9c56)
2017-05-04 15:35:32 +02:00
Domen Kožar
a983b6220d nixos datadog module: add processConfig option
(cherry picked from commit 0bc033117f)
Signed-off-by: Domen Kožar <domen@dev.si>
2017-05-04 13:31:54 +02:00
Rob Vermaas
77c85b0ecb dd-agent: Add default config files of dd-agent and auto_conf dir
to /etc/dd-agent/conf.d by default, and make sure
/etc/dd-agent/conf.d is used.

Before NixOS 17.03, we were using dd-agent 5.5.X which
used configuration from /etc/dd-agent/conf.d

In NixOS 17.03 the default conf.d location is first used relative,
meaning that $out/agent/conf.d was used without NixOS overrides.

This change implements similar functionality as PR #25288, without
breaking backwards compatibility.
2017-05-04 09:44:56 +00:00
Patrick Callahan
085a292bde fzf: add fish hook for NixOS 2017-05-03 18:51:51 -07:00
Patrick Callahan
e302239eb9 direnv: add fish shell hook for NixOS 2017-05-03 18:51:45 -07:00
Tim Steinbach
4d10f31b93 linux: 4.10.13 -> 4.10.14
(cherry picked from commit 2a38ecc055)
2017-05-03 20:47:22 -04:00
Tim Steinbach
795c9518e3 linux: 4.9.25 -> 4.9.26
(cherry picked from commit 6076843be3)
2017-05-03 20:47:17 -04:00
Tim Steinbach
ee92506497 linux: 4.4.65 -> 4.4.66
(cherry picked from commit af933bc7d3)
2017-05-03 20:47:10 -04:00
Patrick Callahan
3b6adc39cc fish-foreign-env: git-20151223 -> git-20170324 2017-05-03 16:50:35 -07:00
Michal Rus
a162c6c828 intero-nix-shim: init at 0.1.2
(cherry picked from commit 9925c5c9b1)
2017-05-03 17:59:48 -04:00
Théo Zimmermann
afa901d8c7 camlp5: fix install with ocaml 4.04
The problem was that bytecode executables were shrinked.

This closes #25367.
2017-05-03 17:58:13 +00:00
Bjørn Forsman
978cae2c5f borgbackup: 1.0.9 -> 1.0.10
(cherry picked from commit 5f1398ce13)
2017-05-03 19:41:04 +02:00
Eelco Dolstra
f53fb18925 nixUnstable.perlBindings: Fix Nix::Config generation
The configure script calls nix-instantiate, which fails if /nix/var
doesn't exist (e.g. in a sandbox). This caused a bogus Nix::Config
module to be generated, causing issues in Hydra.

(cherry picked from commit 20d846bcdd)
2017-05-03 17:41:27 +02:00
Peter Simons
76296ce3a5 R: import upstream patch to fix broken "R CMD Sweave" command
The command "R CMD Sweave" always exits with error code "1", even if the
command was successful. This upstream patch remedies this issue.

(cherry picked from commit 5e5d16f425)
2017-05-03 15:03:23 +02:00
Domen Kožar
56fc82e406 hlint: add as statically linked haskell binary 2017-05-03 14:03:28 +02:00
Thomas Tuegel
69d910cfef dropbox: 24.4.17 -> 25.4.28
(cherry picked from commit 572fd3de58)
2017-05-02 16:19:33 -05:00
Maximilian Güntner
dc7dc77cde youtube-dl: 2017.04.17 -> 2017.04.28
(cherry picked from commit 76d8811d8a)
2017-05-02 21:27:08 +02:00
Eelco Dolstra
43c13c86ba youtube-dl: 2017.04.02 -> 2017.04.17
(cherry picked from commit d387a1f0ae)
2017-05-02 21:27:08 +02:00
Eelco Dolstra
df8b04d5d5 yotube-dl: 2017.03.10 -> 2017.04.02
(cherry picked from commit 17aab8a63e)
2017-05-02 21:27:08 +02:00
Franz Pletz
68be490f93 youtubeDL: 2017.03.07 -> 2017.03.10
(cherry picked from commit 7dfea0a84a)
2017-05-02 21:27:08 +02:00
Ioannis Koutras
0b11e60ed0 efivar: 31 -> 30
According to the release page, version 31 of efivar is still considered
as a pre-release and the sha256sum has changed at least once. This commit
switches to the last, stable release.

(cherry picked from commit cc4e2505e4)
2017-05-02 21:20:09 +02:00
Tim Steinbach
3df898e99e ammonite: 0.8.3 -> 0.8.4
Also rename package and add alias for the old name.

(cherry picked from commit c13e328916)
2017-05-02 13:45:01 -04:00
Tim Steinbach
55792f6412 linux: Add cgroups patches for 4.9, 4.10, 4.11
(cherry picked from commit b5169fd277)
2017-05-02 13:44:38 -04:00
Domen Kožar
bcbf3b5f41 Merge pull request #25387 from NixOS/hydra-2017-04-26
hydra: 2017-03-21 -> 2017-04-26
2017-05-02 09:36:10 +02:00
Shea Levy
4aab5c5798 Add linux 4.11
(cherry picked from commit 207a0af06a)
2017-05-01 19:04:53 -04:00
Shea Levy
4cb63d4edd haskellSrc2nix: preferLocalBuild and use unwrapped cabal2nix.
No need to download bazaar etc...

(cherry picked from commit 9f2bbf65af)
2017-05-01 18:21:51 -04:00
Michael Raskin
fb76933b82 Merge pull request #25279 from LnL7/libplist-2.0.0
libplist: 1.12 -> 2.0.0
(cherry picked from commit 63e3711ee5)
It fixes security issues.
2017-05-01 20:11:08 +02:00
Vladimír Čunát
d39c0f265e nixos manual: add a note about "nofail" FS option
Close #1858, as I think the points have been well resolved.

(cherry picked from commit eb4792a03f)
This docs change fully applies to 17.03, too.
2017-05-01 19:58:10 +02:00
Shea Levy
d7743d1eb8 nixBufferBuilders: Add haskellMonoRepo builder
(cherry picked from commit 8a1707ad0d)
2017-05-01 11:44:31 -04:00
Shea Levy
75690abf3c Add haskellPathsInDir lib function
(cherry picked from commit d1afc718f8)
2017-05-01 10:50:10 -04:00
Domen Kožar
47c8ee6dae hydra: 2017-03-21 -> 2017-04-26 2017-05-01 15:12:18 +02:00
Michael Raskin
5ab1994500 Merge pull request #24854 from edanaher/add-acme-domain
acme: Add "domain" option to separate domain from name
2017-05-01 11:59:14 +02:00
Pascal Wittmann
fa45863ba8 Add missing maintainer dmjio 2017-04-30 19:50:20 +02:00
Shea Levy
1536b8dbd8 Backport halvm from master 2017-04-30 11:09:07 -04:00
Tim Steinbach
41c2084eb9 linux: 4.4.64 -> 4.4.65
(cherry picked from commit 0c4de3c0c9)
2017-04-30 08:59:14 -04:00
Michael Raskin
e2c4633d72 Merge pull request #25333 from zraexy/zraexy-nvidia-x11
nvidia-x11: switch download urls to https
(cherry picked from commit b5c3586289)
2017-04-30 13:47:20 +02:00
Shea Levy
e7a82346b2 Backport haskell updates from master 2017-04-29 21:36:44 -04:00
Eelco Dolstra
ff22e6979d nixUnstable: 1.12pre5152_915f62fa -> 1.12pre5308_2f21d522
(cherry picked from commit e042db5e41)
2017-04-28 17:56:45 +02:00
Shea Levy
66f982eef7 haddock-api: Remove unneeded patch 2017-04-28 10:02:22 -04:00
Shea Levy
a7379e9a11 Fix tarball breakage 2017-04-28 09:49:19 -04:00
Domen Kožar
084a20ecc8 nixos: hydra: sync with upstream hydra module 2017-04-28 14:53:57 +02:00
Pascal Wittmann
eefafadef6 yesod-auth-oauth2: jailbreak because of outdated dependencies 2017-04-28 14:40:06 +02:00
Joachim Fasting
de30ab00ac grsecurity: discontinue support
Upstream has decided to make -testing patches private, effectively ceasing
free support for grsecurity/PaX [1].  Consequently, we can no longer
responsibly support grsecurity on NixOS.

This patch turns the kernel and patch expressions into build errors and
adds a warning to the manual, but retains most of the infrastructure, in
an effort to make the transition smoother.  For 17.09 all of it should
probably be pruned.

[1]: https://grsecurity.net/passing_the_baton.php

(cherry picked from commit 32b8512e54)
2017-04-28 12:37:42 +02:00
Joachim Fasting
5409632c55 grsecurity: 4.9.24-201704210851 -> 4.9.24-2201704220732
(cherry picked from commit 9e6c96f8fc)
2017-04-28 12:37:40 +02:00
Peter Simons
51bf3337a5 haskell-dbus: drop semicolons.patch; this change appears to have been included upstream
(cherry picked from commit 87ec7bb087)
2017-04-28 08:22:01 +02:00
Tim Steinbach
988e325ec7 linux: 4.4.63 -> 4.4.64
(cherry picked from commit 7f3b857d0d)
2017-04-27 22:13:04 -04:00
Tim Steinbach
ce76e2b4e6 linux: 4.10.12 -> 4.10.13
(cherry picked from commit 08c44a5cac)
2017-04-27 22:10:33 -04:00
Tim Steinbach
9c3ba5e6a4 linux: 4.9.24 -> 4.9.25
(cherry picked from commit 903fec9922)
2017-04-27 22:07:54 -04:00
Shea Levy
91a2fe9a57 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.1.1-8-g19ebdb9 from Hackage revision
d86fe490e7.
2017-04-27 22:04:16 -04:00
Azul
c545296adc mesos: 1.1.0 -> 1.1.1
(cherry picked from commit de688d90ba)
2017-04-27 17:49:35 +02:00
Bas van Dijk
1c0a0c027c wordpress: 4.7.3 -> 4.7.4
See: https://wordpress.org/news/2017/04/wordpress-4-7-4/
(cherry picked from commit b9371e83e4)
2017-04-27 17:29:03 +02:00
Thomas Tuegel
e915ead52e dropbox: 24.4.16 -> 24.4.17
(cherry picked from commit 41e04f43dc)
2017-04-27 09:24:26 -05:00
Thomas Tuegel
cc69860a17 dropbox: 23.4.19 -> 24.4.16
(cherry picked from commit f8189e69bc)
2017-04-27 09:24:23 -05:00
Ben Zhang
6d30a36d3b closurecompiler: 20160208 -> 20170218
(cherry picked from commit 1252a3707b)
2017-04-27 06:06:59 -04:00
Renzo Carbonara
aa0383397a fetchdarcs: add SSL_CERT_FILE environment variable 2017-04-26 22:23:31 +02:00
Shea Levy
090ffd5fab nix perl-bindings: Fix Config.pm
(cherry picked from commit 5aa936d0ee)
2017-04-25 20:36:15 -04:00
Tuomas Tynkkynen
3c65e6c7df Revert "rustc: don't build on i686"
This reverts commit 9f86136cef.

Rust is nowadays required for building Firefox, so the channel updates
are blocked on this.

(It also builds fine for me.)

(cherry picked from commit c90998d5cf)
2017-04-25 18:53:31 +03:00
Dan Peebles
232e8a9dad darwin.libSystem: fix intermittent impurity bug
If you've seen issues with libsystem_symptoms.dylib,
this should fix that.
(cherry picked from commit d93f2c3865)
2017-04-25 08:01:53 -04:00
Edward Tjörnhammar
ad0a973ea0 nixos, i2pd: remove, no longer needed, extip hack
(cherry picked from commit 0277345265)
2017-04-24 23:04:41 +02:00
Edward Tjörnhammar
b37b2ce0c4 i2pd: 2.12.0 -> 2.13.0
(cherry picked from commit da2518fe25)
2017-04-24 23:04:29 +02:00
Edward Tjörnhammar
49e6946acc i2pd: 2.11.0 -> 2.12.0
(cherry picked from commit dc514b246e)
2017-04-24 20:52:33 +02:00
Domen Kožar
77016a07a4 add papertrail at 0.10.1
Thank you @grahamc <3
2017-04-24 17:05:27 +02:00
Vladimír Čunát
162a05122c knot-resolver: maintenance 1.2.5 -> 1.2.6
(cherry picked from commit 125cf35273)
2017-04-24 16:40:15 +02:00
Tim Steinbach
93870d9e48 ammonite: 0.8.2 -> 0.8.3
(cherry picked from commit f6e0e71b9d)
2017-04-24 07:10:49 -04:00
Michael Raskin
2d88a1b052 qemu: take force-uid0-on-9p.patch from master to fix patch application 2017-04-24 01:31:29 +02:00
Linus Heckemann
be65d233c1 nixpkgs manual: Remove obsolete warning (#21117)
PR #815 has already been cherry-picked into the default nix version 1.11.8.
(cherry picked from commit 5c7f4669a7)
2017-04-23 22:41:13 +02:00
Vladimír Čunát
e9360f2cf1 Revert "kdiff3: fixup patch hash after #25059"
This reverts commit b72d4e13c7.
(cherry picked from commit 5a3e454db3)
The hash was actually fine, but Hydra re-used the bad derivation from
master.  Nondeterministic fixed-output derivations are hell.
2017-04-23 20:55:45 +02:00
lassulus
4031dafa2a weechat: 1.7 -> 1.7.1
(cherry picked from commit 839b3ce5fe)
2017-04-23 14:47:02 +01:00
Volth
bfff24189c qemu: 2.8.1 -> 2.8.1.1 2017-04-23 14:27:14 +02:00
Michael Raskin
b2badb903e firefox: 52.0.1 -> 53.0. A hopefully correct port of a patch by taku0. 2017-04-23 12:43:27 +02:00
Michael Raskin
a2b8e146ec hunspell_1_6: init at 1.6.1 (ported from update by taku0 on master) 2017-04-23 12:43:27 +02:00
Jörg Thalheim
a400bbb1c4 fcron: install systab
fixes #25072

(cherry picked from commit 44c3726dca)
2017-04-23 11:45:31 +02:00
Volth
7b80438e55 qemu: 2.8.0 -> 2.8.1 2017-04-23 11:13:40 +02:00
Eelco Dolstra
99dfb6dce3 Revert "display-manager: fix argument handling of sddm"
This reverts commit 40a5498c3f.

It breaks slim:

Apr 22 21:04:23 hagbard xsession[1037]: /nix/store/bw00yl4yspl3wlyiwk56bi0hljjr00di-xsession: Window manager '/nix/store/bw00yl4yspl3wlyiwk56bi0hljjr00di-xsession 'xfce'' not found.
Apr 22 21:04:23 hagbard xsession[1037]: /nix/store/bw00yl4yspl3wlyiwk56bi0hljjr00di-xsession: Desktop manager '/nix/store/bw00yl4yspl3wlyiwk56bi0hljjr00di-xsession 'xfce'' not found.

Issue #23264.
2017-04-22 21:26:36 +02:00
Vladimír Čunát
4fe9cf7109 kdiff3: fixup patch hash after #25059
I'm sorry; not sure why the hash didn't match;
I probably kept the hash of an older version by mistake.

(cherry picked from commit b72d4e13c7)
2017-04-22 16:38:05 +02:00
Vladimír Čunát
c99757baa0 Merge #25043: firefox-{bin,esr}: critical security
(cherry picked from commit 5cdf192827)
2017-04-22 14:13:14 +02:00
Vladimír Čunát
b294c8a397 nss: 3.28.3 -> 3.30 (close #24508)
(cherry picked from commit 8eab29e26f)
Update was required now for firefox-esr.  We've been using this version
on unstable/master for a few weeks.
2017-04-22 14:13:10 +02:00
Jean-Baptiste Giraudeau
d5af2a69f4 Kodi: use kodi fork of libdvdnav/libdvdread. Fix #24153 (dvd playback)
(cherry picked from commit 40d46f9ca4)
2017-04-22 08:31:42 +02:00
Peter Hoeg
53dc7916ae libguestfs: add missing libapparmor buildInput
(cherry picked from commit 2f73d5f856)

Fixes https://github.com/NixOS/nixpkgs/issues/25092
2017-04-22 01:26:15 +02:00
Piotr Bogdan
5b5f49e9f9 unclutter: Fix default value of $DISPLAY
(cherry picked from commit c91c3209f3)

Fixes https://github.com/NixOS/nixpkgs/issues/25073
2017-04-22 01:26:13 +02:00
Joachim Fasting
c8c3126342 grsecurity: 4.9.23-201704181901 -> 4.9.24-201704210851
(cherry picked from commit 05911da7bb)
2017-04-22 01:26:07 +02:00
obadz
aaf43d07f6 ecryptfs-helper: fix makeWrapper use after 7ff6eec5
(cherry picked from commit c4fecfb1ec)
2017-04-21 21:26:34 +01:00
Chris Hodapp
2af7c40ed9 mapnik: add optional PostgreSQL dependency
Closes #25063.
2017-04-21 16:54:20 +02:00
Tim Steinbach
eb99e407f1 scala: 2.12.1 -> 2.12.2
(cherry picked from commit 4b9ac70a87)
2017-04-21 08:05:57 -04:00
Tim Steinbach
e38565ee08 openjdk: 8u121-13 -> 8u131-11
(cherry picked from commit fabfec0512)
2017-04-21 08:05:45 -04:00
Tim Steinbach
b9eebfa4b4 linux: 4.4.62 -> 4.4.63
(cherry picked from commit 7fb1b54cc1)
2017-04-21 08:03:56 -04:00
Tim Steinbach
abdf94f8a0 linux: 4.10.11 -> 4.10.12
(cherry picked from commit 1b3282d52d)
2017-04-21 08:01:34 -04:00
Tim Steinbach
186fad5f76 linux: 4.9.23 -> 4.9.24
(cherry picked from commit 4dda88c89d)
2017-04-21 07:59:46 -04:00
Tim Steinbach
e6f3b39df8 linux: 4.4.61 -> 4.4.62
(cherry picked from commit 7643c7c8cc)
2017-04-21 07:59:30 -04:00
Tim Steinbach
ec70293d1c linux: 4.10.10 -> 4.10.11
(cherry picked from commit 842c2be66fefdb098f555e61025694e81f9ba890)
2017-04-21 07:59:30 -04:00
Vladimír Čunát
c558d093ab kdiff3: fix with git mergetool (#25059)
The quick patch has been submitted upstream.

(cherry picked from commit be7ce1b0e9)
I consider that problem a regression wrt. 16.09.
2017-04-20 17:19:02 +02:00
Joachim Fasting
5d611adde6 torbrowser: 6.5.1 -> 6.5.2
(cherry picked from commit 0602b9d194)
2017-04-20 12:22:42 +02:00
Joachim Fasting
d63792aaec grsecurity: 4.9.22-201704120836 -> 4.9.23-201704181901
(cherry picked from commit 9902d63e84)
2017-04-20 12:22:35 +02:00
Jörg Thalheim
bc11395603 linuxPackages.broadcom-sta: patch file was not named correctly
(cherry picked from commit b61e9f6d24)
2017-04-20 08:14:42 +02:00
Jörg Thalheim
ff764011fe linuxPackages.broadcom-sta: add patch to repo
fetchPatch was unreliable and the checksum kept breaking all the time

(cherry picked from commit f0f9cad9f2)
2017-04-20 07:07:56 +02:00
Jörg Thalheim
d7626aa66a linuxPackages.broadcom-sta: fix checksum
for some strange reason we have a different checksum for master/release-17.03
2017-04-20 04:55:03 +00:00
Bjørn Forsman
d9514e0aa2 hydra: add dependency on Nix' perl bindings
This unbreaks the build since the latest nixUnstable update
(3dd66ec6e9).

It's basically the same fix as in hydra git repo:

  a0376a92e5

(cherry picked from commit 9c830c8456)
2017-04-19 19:14:17 +02:00
Tim Steinbach
10179b08a5 Merge pull request #25012 from benley/oraclejdk-backport-17.03
oraclejdk: 8u121 -> 8u131
2017-04-19 11:25:05 -04:00
Thomas Tuegel
ad5f65a41b fdr: mark broken
fdr requires Qt >= 5.7, which is not available in this release.
2017-04-19 10:09:02 -05:00
Benjamin Staffin
df17936697 oraclejdk: 8u121 -> 8u131
(cherry picked from commit ad0ad62c31)
2017-04-19 00:18:52 -04:00
Eelco Dolstra
9db11781d2 Add nixUnstable.perl-bindings
(cherry picked from commit 29b415dcdb)
2017-04-18 20:37:04 +02:00
Eelco Dolstra
d43cac9056 nix: 1.12pre5122_c60715e -> 1.12pre152_915f62fa
(cherry picked from commit 3dd66ec6e9)
2017-04-18 20:28:30 +02:00
Dan Peebles
b5c83975b4 brotli: fix on Darwin
(cherry picked from commit 6f0a2af5bc)
2017-04-18 17:13:02 +02:00
Vladimír Čunát
b22029de9e Revert "grub module: fix efiInstallAsRemovable description"
This reverts commit c2b56626f1.
It broke creating the manual.  I suspect the descriptions are
auto-wrapped by <para> and </para>.

We've been through this already in 3af715af90.
/cc #24978, @zraexy, @Mic92.

(cherry picked from commit 91ad6b3597)
2017-04-18 14:27:06 +02:00
Tim Steinbach
fb14e6a1a7 linux: 4.9.22 -> 4.9.23
(cherry picked from commit 1173fe0b49)
2017-04-18 08:18:34 -04:00
Maksim Bronsky
4861ab9dbe perl: 5.22.2 -> 5.22.3 (#24832)
(cherry picked from commit d6b42b4008)
2017-04-18 14:15:35 +02:00
Frederik Rietdijk
c5b29121fe python36: 3.6.0 -> 3.6.1
(cherry picked from commit 07327cddf6e79704d00f9199d129b0564f5d57f8)
2017-04-18 13:15:15 +02:00
Frederik Rietdijk
34a565cba9 pythonPackages.qtconsole: use pyqt5 backend
instead of pyqt4 which required building qt4.

(cherry picked from commit 8cc5530a73)
2017-04-18 11:21:51 +02:00
Frederik Rietdijk
2da9af9289 Python docs: Python 2.x namespace packages may collide when using .withPackages
(cherry picked from commit 8d491ec6c6)
2017-04-18 09:05:53 +02:00
Tim Stewart
ea2d55d5f7 docker: improve reproducibility of layers
This patch fixes file modification times to $SOURCE_DATE_EPOCH, and
ensures that files originating from the store are owned by root:root.
Both changes improve reproducibility, and the latter allows proper
building on a host where the store is owned by a non-root user.

(cherry picked from commit 5ca1646bb0)
2017-04-17 23:00:23 -04:00
Jörg Thalheim
40a5498c3f display-manager: fix argument handling of sddm
previously session type was not correctly set.

fixes #23264

(cherry picked from commit 6b7c5ba535)
2017-04-18 01:44:59 +02:00
zraexy
452f64cdff grub module: fix efiInstallAsRemovable description
(cherry picked from commit c2b56626f1)
2017-04-18 01:13:55 +02:00
Peter Jones
67c6638b08 plex: Don't overwrite primary database on restart
This change fixes two major issues:

  1. If you don't use SIGQUIT to stop Plex it will corrupt its own
     database :(

  2. Newer versions of Plex keep metadata in the
     `com.plexapp.plugins.library.db` database.  This is the file that
     we copy into `/var/lib/plex/.skeleton`.  If we copy the empty
     database on top of this one the user will lose their entire
     library metadata.  This change skips the copy if the file
     already exists.

(cherry picked from commit 5a50b26662)

See https://github.com/NixOS/nixpkgs/pull/24900#issuecomment-294513707
2017-04-17 20:37:27 +02:00
Tobias Pflug
058b89992b broadcom-sta: fix linux-4.8 patch sha
(cherry picked from commit d857b2d2fa)

Note also the change to a stable url.
2017-04-17 20:37:25 +02:00
Joachim Fasting
d55d1ff199 logcheck: point homepage to alioth.debian.org
The page at logcheck dot org contains questionable links and it is unclear
whether it is controlled by the logcheck project at all.  Fix by using the
homepage debian points to instead.

Fixes https://github.com/NixOS/nixpkgs/issues/24952

(cherry picked from commit c2130eca44)
2017-04-17 20:37:23 +02:00
ndowens
376bda65fd logcheck: 1.3.17 -> 1.3.18
logcheck: Added hyphen
(cherry picked from commit 1dcb0bbc39)
2017-04-17 20:37:22 +02:00
Thomas Tuegel
24ce0db06a dropbox: 23.4.18 -> 23.4.19
Dropbox is again updated without a release announcement. I noticed on Friday
that the client was malfunctioning. I was waiting for a release announcement
with the new version number, but as one was not forthcoming, I simply guessed at it.

(cherry picked from commit 4f5391e8c4)
2017-04-17 10:15:58 -05:00
Peter Hoeg
cba47bc398 spotify: 1.0.52.717 -> 1.0.53.758
Additionally:

 - some minor cleanups
 - define meta.platforms so hydra doesn't try to evaluate at all on i686 instead
   of waiting for "assert" to fail.

As spotify is distributing a i686 version, there really is no reason not to
support that. Someone just has to add support for it.

(cherry picked from commit 58db2099b4)
2017-04-17 14:25:17 +02:00
Bjørn Forsman
1d45682ca0 nixos/lighttpd: set $HOME for gitweb sub-service
This allows gitweb to expand '~' in /etc/gitconfig. Without a $HOME
variable, it fails to list any projects and instead show the text
"No such projects found" in the UI.

Setting $HOME to the gitweb project root seems like a sensible value.

(cherry picked from commit d916ce2ef4)
2017-04-17 13:40:28 +02:00
Ambroz Bizjak
3069f721ec ntpd: Allow additional syscalls in seccomp filter.
Fixes issue #21136.

The problem is that the seccomp system call filter configured by ntpd did not
include some system calls that were apparently needed. For example the
program hanged in getpid just after the filter was installed:

prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0)  = 0
seccomp(SECCOMP_SET_MODE_STRICT, 1, NULL) = -1 EINVAL (Invalid argument)
seccomp(SECCOMP_SET_MODE_FILTER, 0, {len=41, filter=0x5620d7f0bd90}) = 0
getpid()                                = ?

I do not know exactly why this is a problem on NixOS only, perhaps we have getpid
caching disabled.

The fcntl and setsockopt system calls also had to be added.

(cherry picked from commit 35e0eea053)
2017-04-17 07:36:26 -04:00
Victor Calvert
ebbababd8f nvidia: 340.101 -> 340.102 (#24694)
(cherry picked from commit 71d8ce6f4b)
It's just maintenance + patches to support newer kernels.
2017-04-16 22:14:46 +02:00
Dan Peebles
07bbc3eb5a buildbot-master module: fix overly restrictive option type for masterCfg
(cherry picked from commit 3f116702cc)

Fixes https://github.com/NixOS/nixpkgs/issues/24951
2017-04-16 14:53:43 +02:00
Vladimír Čunát
a3e77e0d2c simgrid: fixup sandboxed build after update #24915
(cherry picked from commit 9fc61d0db5)
2017-04-16 14:16:23 +02:00
Nikolay Amiantov
6334cf1444 dropbear: fix static build
Fixes #24839. Also change default sftp-server path to a more canonical.

(cherry picked from commit 3507da085f)
2017-04-16 13:00:39 +03:00
edef
b647a67dfe etcd module: fix extraConf manual link 2017-04-16 09:49:21 +02:00
Tuomas Tynkkynen
a7ebf59aa7 stdenv: ARM bootstrap: Update bootstrap tarballs to latest hydra-built ones
Fixes sandboxed build of glibc. Discussion about a similar failure on aarch64 at:
8bfa9f528c.

Picked from the following cross-trunk evaluation:
http://hydra.nixos.org/eval/1349278 based on nixpkgs
commit 1f32d4b4eb.

armv5tel job: http://hydra.nixos.org/build/51569718
armv6l job: http://hydra.nixos.org/build/51569717
armv7l job: http://hydra.nixos.org/build/51569713

(cherry picked from commit 28f87e4141)
2017-04-15 15:43:48 +03:00
Sophia Gold
718c47a797 simgrid: 3.11.1 -> 3.15
(cherry picked from commit 76b8ce3023)
2017-04-15 08:25:49 +02:00
Benjamin Staffin
3531f1b04b Merge pull request #24904 from benley/latte-dock-backpot
latte-dock: backport to 17.03
2017-04-14 18:55:40 -04:00
romildo
76c63133c5 lxqt-panel: fix for explicit (a C++11 keyword) being used as variable
It is needed to override "explicit" as this is a C++ keyword. But it
is used as variable name in xkb.h. This is causing a failure in C++
compile time.  Similar bug here:
https://bugs.freedesktop.org/show_bug.cgi?id=74080

Workaround from
ec62109e0f.

(cherry picked from commit e2ad762394)
2017-04-14 23:36:46 +02:00
romildo
9f64797c4e lxqt: fix qtsvg attribute
(cherry picked from commit d12635370b)
2017-04-14 23:00:48 +02:00
Robert Helgesson
0a24814d8f haskellPackages.bench: 1.0.2 -> 1.0.3
The 1.0.2 version does not build with the current turtle library.
2017-04-14 22:27:37 +02:00
Benjamin Staffin
f2456e40b2 latte-dock: 0.5.98 -> 0.6.0
(cherry picked from commit 77c8470e0a)
2017-04-14 16:16:03 -04:00
Benjamin Staffin
214cfe9da0 latte-dock: init at 0.5.98
(cherry picked from commit 09e4ece6e1)
2017-04-14 16:15:49 -04:00
Benjamin Staffin
77145531e1 chromium: 57.0.2987.110 -> 57.0.2987.133 [security]
CVE-2017-5055: Use after free in printing. Credit to Wadih Matar
CVE-2017-5054: Heap buffer overflow in V8. Credit to Nicolas Trippar of Zimperium zLabs
CVE-2017-5052: Bad cast in Blink. Credit to JeongHoon Shin
CVE-2017-5056: Use after free in Blink. Credit to anonymous
CVE-2017-5053: Out of bounds memory access in V8. Credit to Team Sniper (Keen Lab and PC Mgr) reported through ZDI (ZDI-CAN-4587)
(cherry picked from commit 552efadbef)
2017-04-14 14:51:42 -04:00
Tuomas Tynkkynen
a98a83523a stdenv: aarch64: Update bootstrap tarballs
Hopefully fixes sandboxed build of glibc on aarch64, as discussed on
8bfa9f528c.

Picked from the following cross-trunk evaluation:
http://hydra.nixos.org/eval/1341395 based on nixpkgs
commit bb3ef8a95c.

build job: http://hydra.nixos.org/build/50125932

(busybox's hash not changing is not a bug!)

(cherry picked from commit 20d9edff17)
2017-04-14 21:41:58 +03:00
Tuomas Tynkkynen
1ff02f8947 bash: Set bash_cv_getcwd_malloc=yes when cross compiling
Because if you don't, the configure script assumes that your getcwd()
function is broken. Which then makes bash use it's own getcwd()
implementation, which doesn't work if the path to the current directory
contains bind mounts in its paths. This shows up as:

shell-init: error retrieving current directory: getcwd: cannot access parent directories: Bad file descriptor

... and fails the aarch64 glibc build with sandboxes enabled.

Sigh.

(cherry picked from commit dff0ba38a2)
2017-04-14 21:41:46 +03:00
risicle
27cc9237fd sops: init at version 2.0.8 (#24898)
backport of b3fadc9085 to 17.03
2017-04-14 19:31:54 +02:00
Lluís Batlle i Rossell
1ff2818acc vlock: improve eintr patch
(cherry picked from commit a2737b1fdf)
2017-04-14 15:09:11 +02:00
Lluís Batlle i Rossell
cb0ae53c45 vlock: fix ENOPATCH
Thanks, @dtzWill.

Signed-off-by: Lluís Batlle i Rossell <viric@viric.name>
(cherry picked from commit 1bd3fa6210)
2017-04-14 15:09:10 +02:00
Lluís Batlle i Rossell
5cd8be4686 vlock: fix EINTR handling
Signed-off-by: Lluís Batlle i Rossell <viric@viric.name>
(cherry picked from commit c2291aae44)
2017-04-14 15:09:10 +02:00
Thomas Tuegel
464c237acb Merge pull request #24882 from benley/nm-openvpn-cherrypick
Backport nm-openvpn fix to 17.03
2017-04-14 05:43:21 -05:00
Aristid Breitkreuz
07129b49ef Merge pull request #24698 from MP2E/ffmpeg_sdl2
ffmpeg-full: replace SDL support with SDL2 support
(cherry picked from commit 43626b6a88)
2017-04-14 11:53:27 +02:00
Eelco Dolstra
8521c97902 flashplayer-standalone: 25.0.0.127 -> 25.0.0.148
(cherry picked from commit 6a1f168b1e)
2017-04-14 11:44:48 +02:00
Eelco Dolstra
08ce4d89dc flashplayer: 25.0.0.127 -> 25.0.0.148
(cherry picked from commit 72605647a4)
2017-04-14 11:44:47 +02:00
taku0
1ac6a77d58 firefox-bin: 52.0.1 -> 52.0.2
(cherry picked from commit 88b697330a)
2017-04-14 11:31:34 +02:00
taku0
2ddd8b9837 firefox-esr: 52.0.1esr -> 52.0.2esr
(cherry picked from commit 7a768e73fb)
2017-04-14 11:31:29 +02:00
taku0
c166cc30b7 firefox: 52.0.1 -> 52.0.2
(cherry picked from commit 014d11ea96)
2017-04-14 11:31:22 +02:00
Lengyel Balázs
30c8f6eddf chromium: flashplayer: 25.0.0.127 -> 25.0.0.148
(cherry picked from commit f08e89d256)
2017-04-14 11:30:36 +02:00
Eelco Dolstra
4f2b5c6806 gnupg: Give the 1compat package a higher priority
This resolves collision warnings with the regular gnupg packages.

(cherry picked from commit e410c78cd5)
2017-04-14 11:21:09 +02:00
Michael Weiss
1126b0fad5 gnupg*: Improve the meta set
And use version from gnupg21 for gnupg1compat.

(cherry picked from commit c9ecc70880)
2017-04-14 11:21:00 +02:00
Eelco Dolstra
aab9d5e378 Allow systemd-fsck@.service to find fsck.*
Fixes "fsck.ext4 doesn't exist, not checking file system on ...".

(cherry picked from commit e84d5b23e1)
2017-04-14 11:19:38 +02:00
Eelco Dolstra
f779ca3cec Don't restart systemd-fsck@ units
Restarting them is useless since the filesystem is already
checked. Worse, restarting them causes the filesystem to be unmounted.

Also remove an override for systemd-rkill@.service which no longer
exists.

(cherry picked from commit de51ad6cd1)
2017-04-14 11:19:32 +02:00
Benjamin Staffin
f662c7fd61 plasma-nm: enable parallel building
This thing takes a long time to build.

(cherry picked from commit 7c75940c5e)
2017-04-13 16:54:42 -04:00
Benjamin Staffin
ba91f694ec plasma-nm: patch in the correct path to openvpn executable
Fixes #24808

(cherry picked from commit 5db1fe64c0)
2017-04-13 16:53:54 -04:00
Benjamin Smith
fb39b013eb opera: 43.0.2442.991 -> 44.0.2510.857
(cherry picked from commit 3e2335bc45)
2017-04-13 22:32:44 +02:00
Joachim Fasting
2ed5b0e690 grsecurity: 4.9.21-201704091948 -> 4.9.22-201704120836
(cherry picked from commit 3fa5605b41)
2017-04-13 22:32:37 +02:00
Jörg Thalheim
587d1a3fe0 Merge pull request #24870 from rydnr/local
Jetbrains Idea-Ultimate 2016.3.4 -> 2017.1
2017-04-13 16:07:58 +02:00
Tim Steinbach
a327b02cf8 atom: 1.15.0 -> 1.16.0
(cherry picked from commit 416337b95c)
2017-04-13 08:49:29 -04:00
Gauthier POGAM--LE MONTAGNER
4c02bbd5ea atom: 1.14.4 -> 1.15.0
(cherry picked from commit acd8ede120)
2017-04-13 08:49:22 -04:00
Marco Maggesi
ff97d8bb1c BLCR 0.8.5b4 *do* work with Linux 3.10. 2017-04-13 14:13:20 +02:00
Jörg Thalheim
5acb454e2a fcron: do not chmod at all
fcron does handle permissions on its own correctly

fixes #24814

(cherry picked from commit 5ca7e8a69a)
2017-04-13 12:31:44 +02:00
Jose San Leandro
789823d3ca Jetbrains Idea-Ultimate 2016.3 -> 2017.1 2017-04-13 10:38:20 +02:00
edanaher
a2fb1ef1e9 acme: Add "domain" option to separate domain from name
Fixes #24731.

(cherry picked from commit e3559c23c2)
This is useful on servers like mine, which often prefer to stay on stable
releases.  Since there's no impact if you're not using the new option, this
should be safe to pull in.
2017-04-12 16:10:34 -04:00
Domen Kožar
7ad99e9fc8 nixos: escape brackets in systemd units
One day we should just whitelist instead of blacklist chars.

Fixes https://github.com/NixOS/nixops/issues/614

(cherry picked from commit 635822da82)
Signed-off-by: Domen Kožar <domen@dev.si>
2017-04-12 15:56:51 +02:00
Nikolay Amiantov
a9fb947157 unity3d: 5.3.5 -> 5.5.3
Also add udev to dependencies and don't strip unneeded ones.
Fixes #22513.

(cherry picked from commit 8c56608078)

It's a version bump but currently Unity doesn't work at all.
2017-04-12 16:53:26 +03:00
Tim Steinbach
e69e56f8e0 linux: 4.4.60 -> 4.4.61
(cherry picked from commit 5f05792417)
2017-04-12 09:18:20 -04:00
Tim Steinbach
5fcce3d251 linux: 4.10.9 -> 4.10.10
(cherry picked from commit 6860eedfd6)
2017-04-12 09:18:17 -04:00
Tim Steinbach
770117ef4f linux: 4.9.21 -> 4.9.22
(cherry picked from commit 224a8f7358)
2017-04-12 09:14:16 -04:00
Franz Pletz
33bd699008 nginxMainline: 1.11.10 -> 1.11.13
(cherry picked from commit 73f04ddd57)
2017-04-11 19:57:52 +02:00
Franz Pletz
7911ba32e6 libressl_2_5: 2.5.1 -> 2.5.3
(cherry picked from commit 29ed67faea)
2017-04-11 19:42:46 +02:00
Shea Levy
2d02be089a lib: Add composeExtensions for composing extension functions
(cherry picked from commit 0a15af2ed1)
2017-04-11 11:16:56 -04:00
Thomas Tuegel
32491fc8b6 Merge pull request #24824 from mdorman/font-lock-plus-update
melpa-packages: update font-lock+ expression for 17.03
2017-04-11 08:49:40 -05:00
Michael Alan Dorman
95c1487d3d melpa-packages: update font-lock+ expression
Because this is pulled from emacswiki, there's no way to continue to
retrieve the prior version after it's updated; since we've had a
couple of reports of it rendering _other_ packages
uninstallable (#24540), it seems worth updating.
2017-04-11 08:12:49 -04:00
Maximilian Güntner
a56392363e ruby-modules: check tzinfo version
tzinfo 0.3.xx does not contain the file

lib/tzinfo/zoneinfo_data_source.rb

it is only included in the 1.x branch.

closes #24080
closes #24682

(cherry picked from commit d84029f296)
2017-04-11 10:46:05 +02:00
Jon Banafato
f9ada742df keepassx-community: 2.1.3 -> 2.1.4
KeePassXC has a new bugfix release available: https://github.com/keepassxreboot/keepassxc/releases/tag/2.1.4

(cherry picked from commit 03e4d8dbf27021be796f6d40caef646f8ea386d5)
2017-04-11 10:04:23 +02:00
Jörg Thalheim
2f54a70fe6 openvpn: remove no longer correct systemd-notify.patch
This patch was only necessary for 2.3.x, while 2.4.0 improved
its own systemd notify support.

See: https://github.com/NixOS/nixpkgs/issues/24817
(cherry picked from commit e09b950f54)
2017-04-11 09:08:55 +02:00
Nikolay Amiantov
b8ece8f169 wrapGAppsHook: fixup cherry-pick
Sorry, should test better. Thanks to Travis for noticing!
2017-04-11 02:17:58 +03:00
Nikolay Amiantov
ba4d30402c tlp service: mask systemd-rfkill
Fixes #24737.

(cherry picked from commit c8c340b05a)
2017-04-11 02:09:46 +03:00
Nikolay Amiantov
91b3abc4a9 wrapGAppsHook: add librvsg as a dependency
User themes may use SVG icons which won't work if the app can't access this
library. This is quite sure to happen (e.g. Adwaita's icons are vector).

(cherry picked from commit f68de22683)
2017-04-11 01:41:57 +03:00
Thomas Tuegel
69d9061908 dropbox: 23.4.17 -> 23.4.18
This update has not been officially announced upstream, but version 23.4.17 no
longer works.

(cherry picked from commit 33194ec649)
2017-04-10 09:29:35 -05:00
Thomas Tuegel
a6ad5cf378 dropbox: 22.4.24 -> 23.4.17
(cherry picked from commit 333923c88b)
2017-04-10 09:29:26 -05:00
Franz Pletz
749a66b42a crowd service: fix secure sso cookies
Crowd didn't detect a secure connection before.

(cherry picked from commit f1f9020224)
2017-04-10 15:39:55 +02:00
Jörg Thalheim
44941030eb wireguard: 0.0.20170320.1 -> 0.0.20170409
(cherry picked from commit cbe0062325)
2017-04-10 14:29:51 +02:00
Vladimír Čunát
451478c14f glibc: fix i686 crashes via an upstream patch
Fixes #23177.

(cherry picked from commits c30b12b9a5 and e47ac55a21)
2017-04-10 11:21:19 +02:00
Lancelot SIX
52b27c68df pythonPackages.django_1_8: 1.8.17 -> 1.8.18
This is a security release. See
https://www.djangoproject.com/weblog/2017/apr/04/security-releases/

(cherry picked from commit c6bc54e319)
2017-04-10 10:58:19 +02:00
Lancelot SIX
1e4bb86ec3 pythonPackages.django_1_9: 1.9.12 -> 1.9.13
This is a security release. See
https://www.djangoproject.com/weblog/2017/apr/04/security-releases/

(cherry picked from commit 3f401926f9)
2017-04-10 10:58:11 +02:00
Lancelot SIX
40f99ae2a6 pythonPackages.django_1_10: 1.10.6 -> 1.10.7
This is a security release. See
https://www.djangoproject.com/weblog/2017/apr/04/security-releases/

(cherry picked from commit af60375392)
2017-04-10 10:58:02 +02:00
Nikolay Amiantov
26ae0e146a qt56.qtwebengine: patch more library paths
Backport 040b86a96e.

(cherry picked from commit ef1e28f5f6)
2017-04-10 11:39:25 +03:00
Nikolay Amiantov
13715a912b thunderbird: don't use system Cairo
Fix random segfaults.

Trimmed down version of b023370f37.
2017-04-10 11:39:08 +03:00
Joachim Fasting
7426a81a1c grsecurity: 4.9.20-201703310823 -> 4.9.21-201704091948
(cherry picked from commit 7701cbca6b)
2017-04-10 10:09:48 +02:00
David McFarland
12a39478fd mesa: patch vulkan manifests when any driver is enabled
(cherry picked from commit f2655dd0c7)
/cc #24757.
2017-04-09 23:26:17 +02:00
Shea Levy
250c890014 haskell-lib: Add overrideSrc helper
(cherry picked from commit a6c39ed207)
2017-04-09 11:58:24 -04:00
Andrew Miller
ec7865b525 hy: Fix build inputs (#24747)
* hy: Fix build inputs

Appdirs needs to be in `propogatedBuildInputs` for hy to run

* hy: fix typo in dependency list
2017-04-09 01:11:11 +02:00
Christoph Hrdinka
a00c4aea5f nsd: 4.1.14 -> 4.1.15 2017-04-08 21:50:12 +02:00
Michael Raskin
f3a0c16db6 glusterfs: 3.9.1 -> 3.10.1 2017-04-08 18:53:51 +02:00
Tim Steinbach
5f45f42fe5 docker-edge: init at 17.04
(cherry picked from commit 1e589239b3)
2017-04-08 08:21:47 -04:00
Tim Steinbach
2e885216ed docker: 17.03.0 -> 17.03.1
(cherry picked from commit aefb9671bf)
2017-04-08 08:21:39 -04:00
Tim Steinbach
b37957a620 docker: 1.13.1 -> 17.03.0-ce
(cherry picked from commit aed4918795)
2017-04-08 08:21:00 -04:00
Joachim Fasting
b348e75558 docker: use removeReferencesTo
(cherry picked from commit c4fe196087)
2017-04-08 08:20:52 -04:00
Linus Heckemann
565dc2855f Add removeReferencesTo for removing specific refs
This allows for a less blanket approach than nuke-refs, targetting specific
references that we know we don't want rather than all references that we don't
know we want.

(cherry picked from commit 603b799bcb)
2017-04-08 08:20:31 -04:00
Tim Steinbach
cae3e55543 linux: 4.4.59 -> 4.4.60
(cherry picked from commit 79f9544eca)
2017-04-08 08:05:10 -04:00
Tim Steinbach
d098c2074d linux: 4.10.8 -> 4.10.9
(cherry picked from commit 1988c1fa41)
2017-04-08 08:02:35 -04:00
Tim Steinbach
3f4d221036 linux: 4.9.20 -> 4.9.21
(cherry picked from commit 016a319b50)
2017-04-08 07:59:45 -04:00
Tomasz Jan Góralczyk
645137cdc9 purple-facebook: 0.9.0 -> 0.9.3
(cherry picked from commit 90b2290ca3)
2017-04-08 10:24:56 +02:00
Tyson Whitehead
ab5d7e08ab tensorflow: depend on cudatoolkit 8 and cudnn 5.1 (#24686)
(cherry-picked from commit f37b34fe7c)
2017-04-07 16:36:00 +02:00
Franz Pletz
536d3cac2e gitlab: 8.17.4 -> 8.17.5
Fixes security issues:

  https://about.gitlab.com/2017/04/05/gitlab-9-dot-0-dot-4-security-release/

(cherry picked from commit d3ef8dc633)
2017-04-06 21:13:30 +02:00
Eelco Dolstra
3603ca8ef3 Add 17.03 AMIs 2017-04-06 17:48:01 +02:00
Bas van Dijk
fd8a238598 strongswan: 5.5.1 -> 5.5.2
(cherry picked from commit bd948391e6)
2017-04-06 16:50:41 +02:00
Vladimír Čunát
c87abfae79 knot-resolver: update the source hash
Just nitpick changes in the tarball, minutes after the release.

(cherry picked from commit 44168b4b22)
2017-04-05 16:08:35 +02:00
Vladimír Čunát
1970d7d45c knot-resolver: maintenance 1.2.4 -> 1.2.5
(cherry picked from commit 12839e4599)
2017-04-05 15:49:47 +02:00
Jörg Thalheim
f6558e671a network-manager: fix segfaults on startup
(adapted from patch in 052cd88921)
2017-04-05 13:16:44 +02:00
Shea Levy
56e5561fbd nix-plugins: 2.0.6 -> 2.0.7.
Fixes warning on nix 1.12

(cherry picked from commit f038db24a6)
2017-04-04 22:50:09 -04:00
Shea Levy
abdd895355 nix-plugins: 2.0.3 -> 2.0.6.
Fixes incompatibility between build-time and link-time nix version

(cherry picked from commit fe319f8ebd)
2017-04-04 22:35:47 -04:00
Niklas Hambüchen
aed302a1ab Fix consul version being "unknown-unknown". Fixes #24606.
See https://github.com/hashicorp/consul/blob/v0.7.5/scripts/build.sh#L44
for how consul's build script does it.

(cherry picked from commit 7bf66e00664e8dde9e9b3460ceabedc8a95a0dd3)

fixes #24608
2017-04-04 21:40:15 +02:00
Shea Levy
10ab187259 nix-plugins: 2.0.2 -> 2.0.3
Fixes darwin build

(cherry picked from commit 3f023c8989)
2017-04-04 15:11:51 -04:00
Volth
6c5128c9c8 kernel: fix 9p issues
[tuomas: rename the patch from 9p-hacks to something slighly more
meaningful]
Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>

(cherry picked from commit ed41d50e9f)
2017-04-04 19:39:28 +03:00
Shea Levy
7dfef27cf0 nix-plugins: Bump, unbreak
(cherry picked from commit 9904019841)
2017-04-04 11:29:48 -04:00
Vladimír Čunát
ce3ab704b2 palemoon: switch to gcc-4.9
Upstream recommends that due to stability problems.
I tested it builds and starts.

(cherry picked from commit 9497da7e23)
2017-04-04 09:45:42 +02:00
Carles Pagès
9626bc7db7 Update 17.03 release notes
(cherry picked from commit d5a623cb39)
2017-04-03 23:00:05 +02:00
Vladimír Čunát
d560fbcdbc Merge #24574: ntp: security 4.2.8p9 -> 4.2.8p10
(cherry picked from commit 59b548069c)
2017-04-03 18:58:00 +02:00
Graham Christensen
6018464c49 docker: test for socket permissions
(cherry picked from commit c7453084ef)
2017-04-03 09:12:52 -04:00
Alexey Shmalko
6c59d851e2 docker: fix socket permissions
Docker socket is world writable. This means any user on the system is
able to invoke docker command. (Which is equal to having a root access
to the machine.)

This commit makes socket group-writable and owned by docker group.

Inspired by
https://github.com/docker/docker/blob/master/contrib/init/systemd/docker.socket

(cherry picked from commit fa4fe71105)
2017-04-03 09:12:48 -04:00
Shea Levy
6024dd4067 haskellPackages: Export haskellSrc2nix and hackage2nix
Allows using a different haskell package set to generate the nix
expressions (during eval time) than the one used to actually build the
package (at build time).

(cherry picked from commit 1feca4cae3)
2017-04-03 08:28:03 -04:00
ndowens
19e03a1b7e epdfview: Fixed SRC URL; Cosmetic Change (#24568)
(cherry picked from commit 969ed8832c)

Upstream has disappeared.
2017-04-03 11:47:46 +02:00
Alexander Kirchhoff
b152bbd699 pam_ssh_agent_auth: Re-allow multiple authorized keys files
This functionality was initially introduced in
3644f9124a to fix
https://github.com/NixOS/nixos/pull/52, but was broken in the update from 0.9.5
to 0.10.3.  The original patch does not cleanly apply due to reformatting and
parameter changes upstream, but the adaptations of the patch to the new version
are not too severe.

(cherry picked from commit 3948891112)
2017-04-03 11:29:33 +02:00
David McFarland
d1c477e007 Revert "openssl: add custom build of 1.0.2 for steam"
No longer necessary. See https://github.com/NixOS/nixpkgs/pull/23034#issuecomment-291005754

This reverts commit a50784b34e.

(cherry picked from commit 2c006ca805)
2017-04-03 09:05:40 +02:00
David McFarland
11e196d288 Revert "steam: use custom openssl"
No longer necessary. See https://github.com/NixOS/nixpkgs/pull/23034#issuecomment-291005754

This reverts commit a120bad30c.

(cherry picked from commit 398823da6e)
2017-04-03 09:05:40 +02:00
Shea Levy
e840e05425 initrd-ssh: Use initrd secrets for host keys
(cherry picked from commit 3a26d09e15)
2017-04-02 16:33:58 -04:00
Shea Levy
acf8b78bef systemd-boot: Support initrd secrets
(cherry picked from commit b09490a322)
2017-04-02 16:33:57 -04:00
Shea Levy
a687c0f93b Add facility to append secrets to the initrd
(cherry picked from commit 59c0977300)
2017-04-02 16:33:55 -04:00
Carles Pagès
4deb4b9c11 doc: fix overlays paths
It was not updated with 9d6a55aefd.

(cherry picked from commit cc779bc421)
2017-04-02 10:18:12 +02:00
Domen Kožar
d74699501e Merge pull request #24531 from nh2/fix-24529-acme-dir-permissions-17.03
Fix acme dir permissions 17.03
2017-04-01 15:16:46 +02:00
Niklas Hambüchen
9cebf250df acme: Use chown -R for challenges directory. Fixes #24529.
Commit 75f131da02 added
`chown 'nginx:nginx' '/var/lib/acme'` to the pre-start script,
but since it doesn't use `chown -R`, it is possible that there
are older existing subdirs (like `acme-challenge`)
that are owned to `root` from before that commit went it.
2017-04-01 14:42:21 +02:00
Vaibhav Sagar
0a1483b83a pycairo: fix build with Python 3.6
Apply the same patch as for Python 3.5 so that this builds correctly.
Addresses #24501.

(cherry picked from commit d9b36c36c5)
2017-04-01 09:58:27 +02:00
Joachim Fasting
0c041520c3 grsecurity: 4.9.19-201703300917 -> 4.9.20-201703310823
(cherry picked from commit a41668f441)
2017-04-01 00:28:07 +02:00
romildo
b5616cffd6 gworkspace: 0.9.3 -> 0.9.4
(cherry picked from commit 1f9e7f3aa7)

Contains several bugfixes.  See
https://lists.gnu.org/archive/html/info-gnu/2016-07/msg00004.html
2017-04-01 00:28:05 +02:00
romildo
bf955716bc gnustep.back: add runtime dependency on libXmu
Fix the failure of running applications like GWorkspace, which depends
on 'back'. It fails with a message similar to the one below:

Error (objc-load):/nix/store/fpxksxkl26qd5a7ay52mzv5qbj8di6b5-gnustep-back-0.25.0/lib/GNUstep/Bundles/libgnustep-back-025.bundle/./libgnustep-back-025: undefined symbol: XmuLookupStandardColormap

(cherry picked from commit 8765d1edda)
2017-04-01 00:28:04 +02:00
Maximilian Bosch
498db7d4d4 geogebra: 5-0-346-0 -> 5-0-350-0
(cherry picked from commit 1e295260e2)

Source goes 404 on update
2017-04-01 00:28:01 +02:00
Nikolay Amiantov
a552d8afae mumble: patch python scripts
(cherry picked from commit 1eccb75f26)
2017-03-31 23:13:33 +03:00
Nikolay Amiantov
985a8f65a3 mumble_git: wrap with Qt dependencies
Fixes #14084.

(cherry picked from commit d8c47a20b8)
2017-03-31 23:13:31 +03:00
Jörg Thalheim
897813e6a4 vis: use correct separator for LUA_CPATH/LUA_PATH
(cherry picked from commit df4b6ae3ba)
2017-03-31 21:18:51 +02:00
Sander van der Burg
699a57d97d Regenerate NPM expressions with node2nix 1.2.0 2017-03-31 21:01:55 +02:00
Shea Levy
8e7d50fd2b webkitgtk24x: Fix build on darwin
(cherry picked from commit c923c6c7c5)
2017-03-31 07:47:43 -07:00
Eelco Dolstra
1484e4026a sshd.nix: Alternative fix for #19589
AFAICT, this issue only occurs when sshd is socket-activated. It turns
out that the preStart script's stdout and stderr are connected to the
socket, not just the main command's. So explicitly connect stderr to
the journal and redirect stdout to stderr.

(cherry picked from commit 80b40fdf03)
2017-03-31 16:20:01 +02:00
Eelco Dolstra
1847793b65 Revert "sshd: separate key generation into another service"
This reverts commit 1a74eedd07. It
breaks NixOps, which expects that

  rm -f /etc/ssh/ssh_host_ed25519_key*
  systemctl restart sshd
  cat /etc/ssh/ssh_host_ed25519_key.pub

works.

(cherry picked from commit 4e79b0b075)
2017-03-31 16:20:01 +02:00
Tim Steinbach
94df466303 oh-my-zsh: 2017-02-27 -> 2017-03-30
(cherry picked from commit e872abe872)
2017-03-31 09:23:08 -04:00
Tim Steinbach
af9680f765 oh-my-zsh: 2017-02-20 -> 2017-02-27
(cherry picked from commit 435b8ed1fc)
2017-03-31 09:23:05 -04:00
Tim Steinbach
dbdd033063 linux: 4.4.58 -> 4.4.59
(cherry picked from commit cb791371c5)
2017-03-31 09:19:23 -04:00
Tim Steinbach
8bb0789ab4 linux: 4.10.7 -> 4.10.8
(cherry picked from commit bff456bd55)
2017-03-31 09:17:08 -04:00
Tim Steinbach
64c789781c linux: 4.9.19 -> 4.9.20
(cherry picked from commit 501429d120)
2017-03-31 09:14:36 -04:00
Eelco Dolstra
4f18dc4a65 Update 17.03 release notes
(cherry picked from commit e241fb87a1)
2017-03-31 15:01:55 +02:00
Tristan Helmich
6986b0c1d8 emby: 3.2.4 -> 3.2.10
(cherry picked from commit 00689b20a8)
2017-03-31 14:22:18 +02:00
Tim Steinbach
36547de8e6 linux: 4.4.57 -> 4.4.58
(cherry picked from commit 6b5193bcd9)
2017-03-31 14:07:30 +02:00
Rickard Nilsson
e30ac6b728 haskellPackages.tailfile-hinotify: Disable test suite
(cherry picked from commit 37847f263c)
2017-03-31 11:18:09 +02:00
Tim Steinbach
31b4482e52 linux: 4.10.6 -> 4.10.7
(cherry picked from commit ecca152887)
2017-03-30 22:14:27 -04:00
Eelco Dolstra
830cfc0203 Revert "update-users-groups.pl: Keep track of deallocated UIDs/GIDs"
This reverts commit 1447e55906. Let's
not do scary changes to update-users-groups.pl one day before release
:-)
2017-03-30 22:56:38 +02:00
Joachim Fasting
78ec18ce55 grsecurity: 4.9.18-201703261106 -> 4.9.19-201703300917
(cherry picked from commit 4d4488e793)
2017-03-30 22:53:37 +02:00
Joachim Fasting
5c6490e39e linux_4_9: 4.9.18 -> 4.9.19
(cherry picked from commit f9cb8775b3)
2017-03-30 22:52:26 +02:00
Robin Gloster
1849e695b0 Release Notes 17.03: add some visual structure 2017-03-30 18:32:09 +02:00
Robin Gloster
e005c15647 qt-gstreamer: fix build and do not mark wrong pkgs as broken
(cherry picked from commit f9a1060199)
2017-03-30 18:32:09 +02:00
Robin Gloster
47d758081e docs: 16.09 -> 17.03
(cherry picked from commit 80c916b6ce)
2017-03-30 18:32:08 +02:00
Robin Gloster
569d45d060 Release Notes 17.03: update 2017-03-30 18:32:08 +02:00
Michal Rus
23fdea4c73 bitlbee-facebook: 2015-08-27 → 1.1.0
(cherry picked from commit 2cef2c58ea)

backported because not functional due protocol changes: https://github.com/NixOS/nixpkgs/pull/24454#issue-218024169
2017-03-30 18:08:02 +02:00
Robin Gloster
d94e3739bb wxmupen64plus: fix eval
(cherry picked from commit f0512f4ceb)
2017-03-30 17:37:59 +02:00
Robin Gloster
ef1801048a zeroad: do not build on i686
(cherry picked from commit 520ce40bb3)
2017-03-30 16:25:00 +02:00
Robin Gloster
e369cb866c wxmupen64plus: mark as broken
(cherry picked from commit 5c04b32b6c)
2017-03-30 16:24:59 +02:00
Robin Gloster
15b9666d7d vimiv: mark as broken
cc @aszlig

(cherry picked from commit 62303628ce)
2017-03-30 16:24:59 +02:00
Robin Gloster
9a0751c519 ultrastardx: mark as broken
(cherry picked from commit c38d6b493e)
2017-03-30 16:24:59 +02:00
Robin Gloster
608f739334 telepathy_rakia: remove
(cherry picked from commit 9330991a37)
2017-03-30 16:24:58 +02:00
Robin Gloster
956bf9832d tclgpg: remove
(cherry picked from commit 4a702e8b74)
2017-03-30 16:24:58 +02:00
Robin Gloster
22214577c9 tkabber: remove
(cherry picked from commit 8e3a595eb1)
2017-03-30 16:24:58 +02:00
Robin Gloster
63541f6a90 rustc: don't build on i686
(cherry picked from commit 9f86136cef)
2017-03-30 16:24:57 +02:00
Robin Gloster
f7dc710f23 qt-gstreamer: fix build
(cherry picked from commit c47cc7e163)
2017-03-30 16:24:57 +02:00
Robin Gloster
530a293559 nix-exec: fix build
(cherry picked from commit 84db2dffe9)
2017-03-30 16:24:57 +02:00
Robin Gloster
28f1a2e8e4 ncbi_tools: mark as broken and remove -fPIC
PIC is used by default since 16.09

(cherry picked from commit b9948fedc6)
2017-03-30 16:24:56 +02:00
Robin Gloster
d4e72d4809 murmur_git: mark as broken
(cherry picked from commit 9b89d68ef0)
2017-03-30 16:24:56 +02:00
Robin Gloster
d5569e7cb1 maxima-ecl: mark as broken
(cherry picked from commit 13ab07d95a)
2017-03-30 16:24:56 +02:00
Robin Gloster
cf4c7fa932 libsingular: does not build on i686
(cherry picked from commit 536b782450)
2017-03-30 16:24:56 +02:00
Robin Gloster
a7d95c8eb1 freestyle: mark as broken
(cherry picked from commit cc82423366)
2017-03-30 16:24:55 +02:00
Robin Gloster
f8d7f40a67 boomerang: mark as broken
(cherry picked from commit 877aaeff61)
2017-03-30 16:24:55 +02:00
Robin Gloster
1327728a75 quagga service: disable
(cherry picked from commit 8a18e1f7f1)
2017-03-30 16:24:55 +02:00
Robin Gloster
34f34f1e17 panomatic: remove
(cherry picked from commit ce953d0bc9)
2017-03-30 16:24:54 +02:00
Joachim Fasting
fb614a239a aliceml: mark as broken
Tried fixing it, but gave up ... Has likely been non-functional for a
while, without anybody noticing.

(cherry picked from commit ad902fbba1)
2017-03-30 14:18:25 +02:00
Joachim Fasting
10528867bd rl-notes 17.03: notes about changes to torbrowser user state 2017-03-30 14:18:18 +02:00
Joachim Fasting
9d3ef695da nixos/dnscrypt-proxy test: exercise plugin loading
(cherry picked from commit 543f5263d2)
2017-03-30 13:36:43 +02:00
Joachim Fasting
9613677176 rl-notes 17.03: add notes about changes to the dnscrypt-proxy interface 2017-03-30 13:30:01 +02:00
Joachim Fasting
e72a0a36b8 nixos/dnscrypt-proxy: remove the resolverList option
This option was initially added to make it easier to use an
up-to-date list, but now that we always use an up-to-date list
from upstream, there's no point to the option.

From now on, you can either use a resolver listed by dnscrypt
upstream or a custom resolver.

(cherry picked from commit 472002f216)
2017-03-30 13:29:58 +02:00
Joachim Fasting
f1f6c70411 nixos/dnscrypt-proxy: add example of how to use the cache plugin
(cherry picked from commit 540740598e)
2017-03-30 13:29:57 +02:00
Joachim Fasting
57621032b1 nixos/dnscrypt-proxy: replace unimportant options with extraArgs
Removes tcpOnly and ephemeralKeys: reifying them as nixos
options adds little beyond improved discoverability.  Until
17.09 we'll automatically translate these options into extraArgs
for convenience.

Unless reifying an option is necessary for conditional
computation or greatly simplifies configuration/reduces risk of
misconfiguration, it should go into extraArgs instead.

(cherry picked from commit 719813caf6)
2017-03-30 13:29:56 +02:00
Joachim Fasting
4bce01f198 nixos/dnscrypt-proxy: grant daemon access to load plugins
(cherry picked from commit bb6361b81a)
2017-03-30 13:29:55 +02:00
Joachim Fasting
e8515db770 nixos/dnscrypt-proxy docs: reword section on forwarding
Newer versions of DNSCrypt proxy *can* cache lookups (via
plugin); make the wording more neutral wrt. why one might want
to run the proxy in a forwarding setup.

(cherry picked from commit 5279ec111f)
2017-03-30 13:29:50 +02:00
Robin Gloster
30581300d7 sitecopy: remove
(cherry picked from commit a79891f6b2)
2017-03-30 12:08:38 +02:00
Robin Gloster
915863eeb8 sage: mark as broken
(cherry picked from commit f87de53883)
2017-03-30 12:08:37 +02:00
Robin Gloster
7dd7bd45b2 jclasslib: remove
(cherry picked from commit 2b7128808d)
2017-03-30 12:08:37 +02:00
Robin Gloster
5614ef4ff2 hawkthorne: mark as broken
(cherry picked from commit b5ad5c3d80)
2017-03-30 12:08:37 +02:00
Peter Hoeg
4d6c02daee gcalcli: fix notifications on linux
Couple of things:

 - fix the path to notify-send
 - add a standard icon to the notification
 - rename the notification from "gcalcli" to "Calendar"

Lastly, there are no tests, so do not try to run them.

(cherry picked from commit f67ec45de6)
2017-03-30 12:08:37 +02:00
Vasiliy Solovey
335c15e1bc webstorm: 2016.3.3 -> 2017.1
(cherry picked from commit 97941b54f9)
2017-03-30 12:08:36 +02:00
Aleksey Zhukov
202cc67311 pycharm-professional: 2016.3.2 -> 2017.1
(cherry picked from commit 43dc7604c1)
2017-03-30 12:08:36 +02:00
Aleksey Zhukov
867267989e pycharm-community: 2016.3.2 -> 2017.1
(cherry picked from commit 5030fafdee)
2017-03-30 12:08:36 +02:00
NWDD
c15756b2bb add xnwdd <Guillermo NWDD> as a maintainer
(cherry picked from commit 0f72dee000)
2017-03-30 00:16:02 -04:00
Robin Gloster
6e0cd0281f guileLint: mark as broken 2017-03-30 01:17:47 +02:00
Robin Gloster
a3a984d2cc rXrs: mark as broken (X ∈ {3, 4, 5}) 2017-03-29 23:00:09 +02:00
Eelco Dolstra
1447e55906 update-users-groups.pl: Keep track of deallocated UIDs/GIDs
When a user or group is revived, this allows it to be allocated the
UID/GID it had before.

A consequence is that UIDs and GIDs are no longer reused.

Fixes #24010.

(cherry picked from commit a57bcd38b4)
2017-03-29 20:36:52 +02:00
Frederik Rietdijk
f164d27053 spotify: unbreak
after the upgrade in 3c090f0e5a

(cherry picked from commit ffd29517dd)
2017-03-29 18:05:24 +02:00
Dan Peebles
e38604916e libuv: disable tests (temporarily) on Darwin
They're flaky, break Hydra builds regularly, and lots of stuff depends
transitively on libuv.
(cherry picked from commit 15a1743d87)
2017-03-29 15:06:17 +00:00
Rob Vermaas
f79be2cfa3 dd-agent: fix by adding uptime as dependency. 2017-03-29 14:55:26 +00:00
Thomas Tuegel
d477193029 dropbox: patch all files in output
(cherry picked from commit 97518649fb)
2017-03-29 07:41:09 -05:00
Thomas Tuegel
bf66a181fe dropbox: leave RPATH-shrinking to patchelf setup hook
(cherry picked from commit 2e591bac0d)
2017-03-29 07:41:02 -05:00
Thomas Tuegel
152c9ed87f dropbox: set INTERP for some DYN objects
(cherry picked from commit 096c72e255)
2017-03-29 07:40:55 -05:00
Thomas Tuegel
a2dc26262c dropbox: remove more useless vendored libraries
(cherry picked from commit c076b9326f)
2017-03-29 07:40:46 -05:00
Thomas Tuegel
65d994fd06 dropbox: wrap as any other Qt application
(cherry picked from commit 3c96a53608)
2017-03-29 07:40:36 -05:00
Thomas Tuegel
2afbc4e014 Revert "dropbox: use vendored Qt 5 libraries"
This reverts commit 9125bab708.

The vendored libraries have a problem with xkbcommon.

(cherry picked from commit 1d8d6d564d)
2017-03-29 07:40:20 -05:00
Frederik Rietdijk
474273d860 pythonPackages.pyudev: fix package
- the function loading the udev library was moved to another file
- the test runner did not work correctly, causing it to fail on Python
3.
- the test runner now works correctly, but there's a bunch of tests
failing and therefore tests are disabled. The package does seem to
function (as in, it can load the library again).

(cherry picked from commit 078412521e)
2017-03-29 08:37:27 +02:00
Joachim Fasting
f7a4b7ea49 pythonPackages.pyudev: 0.20.0 -> 0.21.0
Also move expression

(cherry picked from commit 61edb1cb2e)
2017-03-29 08:37:19 +02:00
Marius Bakke
035534973b pythonPackages.pyudev: 0.16.1 -> 0.20.0
(cherry picked from commit 3051dafeb6)
2017-03-29 08:37:08 +02:00
Joachim Fasting
3d37289023 torbrowser: support obfs and fte transports
meek still broken, but then, sending all your traffic to Amazon seems like
something you'd do only if everything else fails.

(cherry picked from commit 6911ae7c0c)
2017-03-29 00:02:44 +02:00
Joachim Fasting
2c310a86ca torbrowser: hard-code path to wrapper in desktop file
(cherry picked from commit f2cf8ffdcb)
2017-03-29 00:02:41 +02:00
Joachim Fasting
e0e237ebaa torbrowser: correct internal note about geoip
(cherry picked from commit 2ad44935f1)
2017-03-29 00:02:40 +02:00
Joachim Fasting
6dd0750423 torbrowser: reduce risk of stale Nix store references
This patch restructures the expression and wrapper to minimize Nix store
references captured by the user's state directory.

The previous version would write lots of references to the Nix store into
the user's state directory, resulting in synchronization issues between
the Store and the local state directory.  At best, this would cause TBB to
stop working when the version used to instantiate the local state was
garbage collected; at worst, a user would continue to use the old version
even after an upgrade.

To solve the issue, hard-code as much as possible at the Store side and
minimize the amount of stuff being copied into the local state dir.
Currently, only a few files generated at firefox startup and fontconfig
cache files end up capturing store paths; these files are simply removed
upon every startup.  Otherwise, no capture should occur and the user
should always be using the TBB associated with the tor-browser wrapper
script.

To check for stale Store paths, do
   `grep -Ero '/nix/store/[^/]+' ~/.local/share/tor-browser`
This command should *never* return any other store path than the one
associated with the current tor-browser wrapper script, even after an
update (assuming you've run tor-browser at least once after updating).
Deviations from this general rule are considered bugs from now on.

Note that no attempt has been made to support pluggable transports; they
are still broken with this patch (to be fixed in a follow-up patch).

User visible changes:
- Wrapper retains only environment variables required for TBB to work
- pulseaudioSupport can be toggled independently of mediaSupport (the
  latter weakly implies the former).
- Store local state under $TBB_HOME.  Defaults to $XDG_DATA_HOME/tor-browser
- Stop obnoxious first-run stuff (NoScript redirect, in particular)
- Set desktop item GenericName to Web Browser

Some minor enhancements:
- Disable Hydra builds
- Specify system -> source mapping to make it easier to
  extend supported platforms.

(cherry picked from commit ecd0e1a2c7)
2017-03-29 00:02:39 +02:00
Joachim Fasting
ed44bb70ec torbrowser: callPackage can fill in missing params from xorg
(cherry picked from commit 116953ffc9)
2017-03-29 00:02:38 +02:00
Joachim Fasting
6e04800f25 surf-webkit2: 2017-03-06 -> 2017-03-22
Fixes a race condition

(cherry picked from commit 101cb04b6a)
2017-03-29 00:02:37 +02:00
Joachim Fasting
a26c5e5c43 surf-webkit2: init at 2017-03-06
(cherry picked from commit 69ce1ed526)
2017-03-29 00:02:36 +02:00
Joachim Fasting
de5d4dc147 rl-notes 17.03: add note about pre-NSS dnscrypt-proxy 2017-03-29 00:02:35 +02:00
Joachim Fasting
4030549d01 nixos/dnscrypt-proxy: log resolver list verification failure
Otherwise, the service unit just fails for no discernable
reason.  Verifcation failure is bad so it ought to be easily
discoverable.

(cherry picked from commit f122f0147b)
2017-03-29 00:02:34 +02:00
Joachim Fasting
7e4d99d7da nixos/dnscrypt-proxy: get resolver list from github
The list has disappeared from its ordinary location at
download.dnscrypt.org.

(cherry picked from commit de15e7894b)
2017-03-29 00:02:29 +02:00
Franz Pletz
743dbcc888 jool: 3.5.2 -> 3.5.3
(cherry picked from commit c4b2f9f784)
2017-03-28 20:14:55 +02:00
Franz Pletz
7082b7da86 libvirt packages: fix & clean up dependencies
(cherry picked from commit 0018cd5a2d)
2017-03-28 19:48:21 +02:00
Volth
3500a892b5 virt-viewer: 2.0 -> 5.0
(cherry picked from commit d4294265fd)
2017-03-28 19:48:21 +02:00
Domen Kožar
7dcd3c471f Merge branch 'staging-17.03' into release-17.03 2017-03-28 16:06:57 +02:00
Rob Vermaas
e4b09922cf nixUnstable: update to 1.12pre5122_c60715e
(cherry picked from commit 4da11d7c9b)
2017-03-28 11:32:07 +00:00
Kosyrev Serge
38b2e27c15 virtualbox: a more maintenance-free way of patching refs to dlopen()-affected dependencies
(cherry picked from commit 0c3138e602)
2017-03-28 01:32:31 +03:00
Nikolay Amiantov
1ad1fa4547 virtualbox: wrap with Qt dependencies
Fixes GTK file open dialogs. Also make sure that linked applications really
exist, and update their list.

(cherry picked from commit 52451067c7)
2017-03-28 00:30:30 +03:00
Daiderd Jordan
c59b7f8194 Merge pull request #24303 from ljli/emacs-mac
emacsMacport: name change and description
(cherry picked from commit c476cc3c3d)
2017-03-27 22:09:21 +02:00
Vladimír Čunát
1731c07ffb treewide: purge maintainers.urkud
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.

(cherry picked from commit 96d41e393d)
There were just a few trivial conflicts.
2017-03-27 19:55:01 +02:00
Domen Kožar
83492ec47e Nix, Hydra: bump to 2017-03-21 2017-03-27 18:21:03 +02:00
Nikolay Amiantov
ab0b179da4 buildDotnetPackage: don't depend on invalid quoting in makeWrapper
Fixes #24387.

(cherry picked from commit 50adc53207)
2017-03-27 17:26:52 +02:00
Robin Gloster
3a00742421 Revert "Revert "gdm module: only make xserver args overrideable""
This reverts commit 4e57e7f7c6.

This actually broke gnome3 and didn't fix anything, I failed bisecting.

(cherry picked from commit d1228f95e9)
2017-03-27 17:21:32 +02:00
Franz Pletz
0d3b0920a9 libvirt: 3.0.0 -> 3.1.0
Missing in 1cca97cf18.

(cherry picked from commit d8dd2fb9e5)
2017-03-27 17:09:31 +02:00
Eelco Dolstra
05a2866f2d systemd: Include https://github.com/NixOS/systemd/pull/8
(cherry picked from commit 6ef630a125)
2017-03-27 15:39:51 +02:00
Benjamin Staffin
21c69b132c dropbox-cli: include dropbox icon (#24368)
(cherry picked from commit 6c116b86eb)
2017-03-27 12:31:11 +02:00
Jiri Danek
86e363d11e idea-community: 2016.3.5 -> 2017.1
(cherry picked from commit da13619591)
2017-03-27 12:31:09 +02:00
Maximilian Bosch
9628a71e8c idea.phpstorm: 2016.3.2 -> 2017.1
(cherry picked from commit bde3acbd2a)
2017-03-27 12:30:40 +02:00
Franz Pletz
fc77d48fd6 libvirt: make guest suspend work, use upstream units
(cherry picked from commit d545772640)
2017-03-27 12:30:39 +02:00
Franz Pletz
a3406d19f6 libvirt: build with attr and apparmor
(cherry picked from commit ddb608814a)
2017-03-27 12:30:39 +02:00
Franz Pletz
0d0d419eeb virt-manager: needs file for building translations
(cherry picked from commit 160fd7231e)
2017-03-27 12:30:39 +02:00
Volth
c0bc736733 libvirt: 3.0.0 -> 3.1.0
(cherry picked from commit 1cca97cf18)
2017-03-27 12:30:38 +02:00
aszlig
d3ef98182d nixos/tests/virtualbox: Fix @shell@ expansion
This has surfaced since f803270b7e.

The commit bumped bash to version 4.4, which caused to change the order
of --subst-var flags in substituteAll, which this test was relying on,
because it added a @shell@ to boot.initrd.postMountCommands.

Our substituter is currently working a bit like this:

original.replace('@var1@', 'val1').replace('@var2@', 'val2')...

Unfortunately, this means that if @var2@ occurs within @var1@ it is
replaced by the new value, so the order of the substvars actually
matter. I highly doubt that we want a behaviour like this and I'm
wondering why it didn't occur to me as a problem while writing the
initial implementation of the VirtualBox tests.

Whether to get rid of this and disallowing substitution of substvars
within substvars is another topic which I think needs discussion in a
different place.

As for now, I'm using stdenv.shell, because the closure size of this
should fit within the initrd, so it's fine especially because it's just
a test.

Tested with the net-hostonlyif and systemd-detect-virt tests and they
both succeed with this change.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: @globin on IRC
(cherry picked from commit ee39d4b98a)
2017-03-27 12:29:08 +02:00
Tim Steinbach
3108fdf75f linux: 4.11-rc3 -> 4.11-rc4
(cherry picked from commit 310bb3e6bb)
2017-03-27 12:28:57 +02:00
Joachim Fasting
4d3929019c grsecurity: 4.9.17-201703221829 -> 4.9.18-201703261106
(cherry picked from commit 5fe81c1bdb)
2017-03-27 12:28:39 +02:00
c74d
8d45eda4a2 google-compute-image: fix Yama LSM option conflict
Having fixed the Google Compute Engine image build process's copying
of store paths in PR #24264, I ran `nixos-rebuild --upgrade switch`...
and the GCE image broke again, because it sets the NixOS configuration
option for the sysctl variable `kernel.yama.ptrace_scope` to
`mkDefault "1"`, i.e., with override priority 1000, and now the
`sysctl` module sets the same option to `mkDefault "0"` (this was
changed in commit 86721a5f78).

This patch raises the override priority of the Google Compute Engine
image configuration's definition of the Yama sysctl option to 500
(still lower than the priority of an unmodified option definition).

I have tested that this patch allows the Google Compute Engine image
to again build successfully for me.

(cherry picked from commit a4ac5506f5)
2017-03-27 12:28:27 +02:00
Arnold Krille
2bd74c578e network-interfaces: reload bridges on conf changes
And adopt the tests to add an interface and remove it again.

It should work when deactivating rstp, it will not work when activating
rstp for the first bridge as then the userspace daemon is not yet
available. But once one bridge is active with stp, it should work with
the reload for any further bridge.

Fixes #21745. Also see #22547.

(cherry picked from commit 68729958e8)
2017-03-27 12:27:40 +02:00
Lancelot SIX
099a2917b0 pythonPackages.django: 1.10.5 -> 1.10.6
This is a bugfix release.

(cherry picked from commit d284e37a59)
2017-03-27 10:02:53 +02:00
Thomas Tuegel
1d3e218c5c dropbox: 21.4.25 -> 22.4.24
(cherry picked from commit 84b768456a)
2017-03-26 13:17:54 -05:00
Robin Gloster
b1e7e94fd7 pcre2: 10.22 -> 10.23 + security fix
CVE-2017-7186

refs nixos/security#57 #24319

(cherry picked from commit 0aaa77eca2d52865e81f30602ae5bd6108835ebb)
2017-03-26 17:13:13 +02:00
Robin Gloster
90dee08531 pcre: 8.39 -> 8.40 + security fix
CVE-2017-7186

refs nixos/security#57 #24319

(cherry picked from commit 6b9c81aa18)
2017-03-26 16:42:10 +02:00
Thomas Tuegel
7674887ed5 Merge branch 'release-17.03--drop-qt-5.7' into release-17.03 2017-03-26 09:36:08 -05:00
Thomas Tuegel
83237d0ef3 dropbox: use vendored Qt 5 libraries 2017-03-26 09:34:11 -05:00
Thomas Tuegel
6e86883688 rapcad: mark broken with Qt 5.6 2017-03-26 09:34:03 -05:00
Thomas Tuegel
75d8638f79 Remove zoom-us
This package needs maintenance, but has no maintainer: proprietary Qt-based
packages should use the vendor-provided Qt libraries.
2017-03-26 09:23:01 -05:00
Thomas Tuegel
21c09cca98 Remove Qt 5.5
The community support window for Qt 5.5 has ended. All packages should

- update to Qt 5.8, or
- pin to Qt 5.6 (the 3-year long-term support release), or
- for proprietary software, use the vendored libraries.
2017-03-26 09:23:01 -05:00
Thomas Tuegel
34f7fed023 openshot-qt: correct packaging errors and pin to Qt 5.6 2017-03-26 09:22:49 -05:00
Thomas Tuegel
7840d2fb79 supercollider: pin to Qt 5.6 2017-03-26 09:22:49 -05:00
Thomas Tuegel
acc9ee33ad zoom-us: pin to Qt 5.6 2017-03-26 09:22:48 -05:00
Thomas Tuegel
754eee12c0 redis-desktop-manager: pin to Qt 5.6 2017-03-26 09:22:48 -05:00
Thomas Tuegel
469668b560 trojita: pin to Qt 5.6 2017-03-26 09:22:48 -05:00
Thomas Tuegel
9725174fd9 teamspeak_client: pin to Qt 5.6 2017-03-26 09:22:48 -05:00
Thomas Tuegel
ef89c4f132 ricochet: pin to Qt 5.6 2017-03-26 09:22:48 -05:00
Thomas Tuegel
867bb060de rapcad: broken on Qt 5.6 2017-03-26 09:22:47 -05:00
Thomas Tuegel
2e4e63df71 qgroundcontrol: broken on Qt 5.6 2017-03-26 09:22:47 -05:00
Thomas Tuegel
5392c0f612 notepadqq: correct packaging errors and pin to Qt 5.6 2017-03-26 09:22:47 -05:00
Thomas Tuegel
4d4511d769 smtube: pin to Qt 5.6 2017-03-26 09:22:47 -05:00
Thomas Tuegel
78ca07180e musescore: broken with Qt 5.6 2017-03-26 09:22:47 -05:00
Thomas Tuegel
ee1f473424 mumble: pin to Qt 5.6 2017-03-26 09:22:11 -05:00
Thomas Tuegel
b53e833660 luminanceHDR: pin to Qt 5.6 2017-03-26 09:22:11 -05:00
Thomas Tuegel
8e9b6e7c44 goldendict: pin to Qt 5.6 2017-03-26 09:22:11 -05:00
Thomas Tuegel
5f34c8f260 cutegram: broken with Qt 5.6 2017-03-26 09:22:11 -05:00
Thomas Tuegel
2a3cc28b6c sigil: pin to Qt 5.6 2017-03-26 09:22:10 -05:00
Thomas Tuegel
21cbf20ad2 cool-retro-term: pin to Qt 5.6 2017-03-26 09:22:10 -05:00
Thomas Tuegel
49c63cbb98 apitrace: pin to Qt 5.6 2017-03-26 09:22:10 -05:00
Thomas Tuegel
4ddd8910d4 Remove Qt 5.7
The community support window for Qt 5.7 has ended. All packages should

- update to Qt 5.8, or
- pin to Qt 5.6 (the 3-year long-term support release), or
- for proprietary software, use the vendored libraries.
2017-03-26 09:22:10 -05:00
Thomas Tuegel
bd97dd48de fdr: pin to Qt 5.6 2017-03-26 09:20:21 -05:00
Tim Steinbach
8d5a2e4e9c linux: 4.4.56 -> 4.4.57
(cherry picked from commit 23d0f01e95)
2017-03-26 10:09:19 -04:00
Tim Steinbach
244c9a9712 linux: 4.10.5 -> 4.10.6
(cherry picked from commit c0411ea229)
2017-03-26 10:05:41 -04:00
Tim Steinbach
0d0f427f37 linux: 4.9.17 -> 4.9.18
(cherry picked from commit 422a8b9cd1)
2017-03-26 10:01:25 -04:00
Dmitry Kalinkin
8c6e9177a4 citrix-receiver: fix wrapper, direct dl url, $PWD needs escaping
(edited by @obadz, closes #24320)

(cherry picked from commit 7035325c62)
2017-03-26 14:37:11 +01:00
ndowens
beab3073c9 jasper: 2.0.10 -> 2.0.12
(cherry picked from commit 6c17ad677c)
2017-03-26 08:25:27 -04:00
Leon Isenberg
8a30429bc8 libguestfs: add qemu to wrapped PATH
virt-df doesn't find qemu-img otherwise.

(cherry picked from commit 65029beb38)
2017-03-26 14:10:49 +02:00
Edward Tjörnhammar
eacd671c2e nixos, openafs-client: correct serviceConfig
(cherry picked from commit 958668ab80)
2017-03-26 13:46:57 +02:00
Christine Koppelt
ab1078806e NixOS Manual: Update version numbers
(cherry picked from commit e5c927cb8d)
2017-03-26 11:24:59 +02:00
Willi Butz
9d96d30497 spotify: 1.0.49.125.g72ee7853-111 -> 1.0.52.717.g2f08534a-47
(cherry picked from commit 3c090f0e5a)
2017-03-26 10:35:37 +02:00
Nikolay Amiantov
50cc86cc07 ibus-engines: use wrapPythonPrograms
This is needed now that PYTHONPATH is not propagated. Also several packages
with additional dependencies are now properly wrapped.

(cherry picked from commit 66b05cd4e6)
2017-03-26 02:43:36 +03:00
Nikolay Amiantov
bb271fb141 ibus: wrap with GTK dependencies
Without this ibus can't load its settings.
Also don't propagate PYTHONPATH.

(cherry picked from commit 99434abff7)
2017-03-26 02:43:33 +03:00
Vladimír Čunát
02694562ee texlive: fix CVE-2016-10243
https://github.com/NixOS/security/issues/104
(cherry picked from commit 8c4339a9dc)
2017-03-25 23:04:19 +01:00
ndowens
41894d5632 potrace: 1.13 -> 1.14
(cherry picked from commit 56504fcb2c)
2017-03-25 22:59:49 +01:00
Jörg Thalheim
8ce595fcd1 keepassx-community: 2.1.2 -> 2.1.3
fixes https://github.com/NixOS/security/issues/105

(cherry picked from commit 5e0cbbbdb6)
2017-03-25 21:40:15 +01:00
Michael Raskin
a8baac668f graphicsmagick: patch for CVE-2017-6335
(cherry picked from commit 7b706900e7)
2017-03-25 21:09:35 +01:00
Franz Pletz
d3124a5259 irssi: 1.0.1 -> 1.0.2 for CVE-2017-7191
See https://irssi.org/security/irssi_sa_2017_03.txt.

(cherry picked from commit b00cfd49d5)
2017-03-25 20:45:46 +01:00
Willi Butz
fc7b87af70 manticore: fix compiling pml sources
Compiler depends on sources that weren't present in the output.

(cherry picked from commit 53dde42153)
2017-03-25 20:14:47 +01:00
Guillaume Maudoux
77243451fe wrapFirefox: fix default-browser update
Set MOZ_APP_LAUNCHER for firefox as per [1] (see [2] for detailed discussion).
Firefox will recognise itself across verions, skipping the 'not-the-default-browser' prompt.
Firefox will also write sane paths to the generated desktop file, should someone ever set it as default through the 'not-the-default-browser' prompt.
Also removed the unnecessary libtrick cruft.

[1] https://bugzilla.mozilla.org/show_bug.cgi?id=611953
[2] https://bugzilla.mozilla.org/show_bug.cgi?id=593948

(cherry picked from commit 816beccf50)
2017-03-25 17:37:48 +01:00
Dan Peebles
ea5800bd4b minikube: switch to build from source & fix on Darwin
Linux behavior should be largely unchanged but we now build minikube
ourselves. Unfortunately localkube is still tricky to build so I pull in
a binary version from upstream.

(cherry picked from commit fe339d281b)
2017-03-25 16:49:14 +01:00
Peter Hoeg
6e6af33ec4 minikube: 0.16.0 -> 0.17.1
(cherry picked from commit 35dbe4d0f1)
2017-03-25 16:49:09 +01:00
Richard Zetterberg
70426c48e8 nftables: adds information regarding nftables and Docker (#24326)
(cherry picked from commit dc10688edb)
2017-03-25 16:35:24 +01:00
Shea Levy
818c0e2d98 nix-buffer support: Make process-environment changes actually local
(cherry picked from commit f087b75941)
2017-03-25 11:13:35 -04:00
Willi Butz
3a0a58ce5d manticore: fix build, remove builder.sh (see #23253)
(cherry picked from commit 55d21cad95)
2017-03-25 17:06:43 +02:00
Tim Steinbach
338afb9a54 Merge pull request #24323 from NeQuissimus/git_2_12_2
git: 2.12.0 -> 2.12.2
2017-03-25 11:02:32 -04:00
Nikolay Amiantov
082666f48c phpfpm service: don't use private /tmp
This breaks local PostgreSQL connections.

(cherry picked from commit 417844b596)
2017-03-25 14:53:16 +01:00
Robin Gloster
c2ad3e4f70 networkd: fix setting both defaultGateway{,6}
(cherry picked from commit 6b8ad8b581)
2017-03-25 14:31:06 +01:00
Maximilian Bosch
0e494727a7 phpPackages.composer: 1.3.2 -> 1.4.1
(cherry picked from commit 73edc1d5f8)
2017-03-25 14:31:06 +01:00
Robin Gloster
2f1f9b1213 gitkraken: clean-up
(cherry picked from commit 4f9e590c06)
2017-03-25 12:52:52 +01:00
NWDD
7b5ef78f18 gitkraken: 2.1.0 -> 2.2.0
also added myself as a maintainer
(cherry picked from commit a8f269d014)
2017-03-25 12:45:18 +01:00
NWDD
68a0fa8436 gitkraken: init at 2.1.0
(cherry picked from commit 0aa29fa4d8)
2017-03-25 12:45:12 +01:00
Nikolay Amiantov
39326c645d zenity: fix for non-GNOME 3
(cherry picked from commit a381ee89cd)
2017-03-25 14:40:28 +03:00
Maximilian Bosch
8183006443 geogebra: 5-0-338-0 -> 5-0-346-0
(cherry picked from commit 9787b2b808)
2017-03-25 00:09:27 +01:00
Maximilian Bosch
8cdf7b3893 geogebra: 5-0-331-0 -> 5-0-338-0
(cherry picked from commit 2df3b5ca7f)
2017-03-25 00:09:20 +01:00
Peter Simons
16b894028e Merge pull request #24279 from LumiGuide/ghcjsHEAD-upgrade-to-latest-LTS
ghcjsHEAD: upgrade ghcjs-boot packages(cherry picked from commit 011466857b)
2017-03-24 23:14:47 +01:00
Thomas Tuegel
ba554d8382 Revert "qt5: 5.6.2 -> 5.7.1"
This reverts commit 6542ea7f31.

I included this commit from master by accident. The stable release should use
the Qt 5.6 long-term support release by default because Qt 5.7 is already out of
its support window.
2017-03-24 15:17:46 -05:00
Shea Levy
34c645ba20 Add setupSystemdUnits function.
Allows setting up and managing a set of systemd units on any systemd distribution.

(cherry picked from commit 9a777013d1)
2017-03-24 15:48:04 -04:00
Bjørn Forsman
b94092c301 perlPackages.OpenGL: 0.6703 -> 0.70
Fixes https://github.com/NixOS/nixpkgs/issues/19271 ("slic3r gui
fails").
2017-03-24 19:19:32 +01:00
Joachim Fasting
3e4130e7c9 dnscrypt-proxy service: systemd notification under apparmor
(cherry picked from commit f815a7697e)
2017-03-24 18:43:30 +01:00
Thomas Tuegel
1dbb9628c8 Merge branch 'release-17.03--plasma-5' into release-17.03 2017-03-24 09:43:25 -05:00
Thomas Tuegel
c6195b6b28 plasma-workspace: propagate Qt-based inputs 2017-03-24 09:44:49 -05:00
Thomas Tuegel
60c9bf91e1 sddm: fix wrapper
When I reduced the closure size, I broke the built-in theme. When I reverted
that fix, the built-in theme worked but the Plasma theme was broken. Now the
wrapper is fixed so that both themes work.
2017-03-24 08:02:53 -05:00
Thomas Tuegel
ccc1042f76 nixos/plasma5: also test SDDM theme 2017-03-24 08:02:24 -05:00
Nikolay Amiantov
03c07ac02e octoprint-plugins.m33-fio: fix incompatibility with new OctoPrint
(cherry picked from commit 8c98df0136)
2017-03-24 15:53:23 +03:00
Tim Steinbach
4367e3e249 Merge pull request #24262 from peterhoeg/u/kodi_stable
kodi: 17.0 -> 17.1
2017-03-24 08:36:18 -04:00
Peter Hoeg
d1619fefcb kodi: 17.0 -> 17.1
(cherry picked from commit 7833436098)
2017-03-24 13:24:00 +01:00
Robin Gloster
f83f09411c Revert "gdm module: only make xserver args overrideable"
This reverts commit a5aa926902.

This allows gdm to run again, the test is still failing.

(cherry picked from commit 4e57e7f7c6)
2017-03-24 10:37:29 +01:00
c74d
d370e5fa22 google-compute-image: copy store paths with rsync
In `nixos/modules/virtualisation/google-compute-image.nix`, copy store
paths with `rsync -a` rather than `cp -prd`, because `rsync` seems
better able to handle the hard-links that may be present in the store,
whereas `cp` may fail to copy them.

I have tested that the Google Compute Engine image builds successfully
for me with this patch, whereas it did not without this patch.

This is the same fix applied for Azure images in commit
097ef6e435.

Fixes #23973.

(cherry picked from commit e0e520a519)
2017-03-24 02:16:24 +01:00
Robin Gloster
3a368d7629 wrapGAppsHook: fix eval 2017-03-24 01:39:10 +01:00
Robin Gloster
d8f297d4d4 makeQtWrapper: fix eval 2017-03-24 01:28:40 +01:00
Peter Hoeg
c1b5643bcd kodi: 17.0 -> 17.1
(cherry picked from commit 7833436098)
2017-03-24 08:22:26 +08:00
Thomas Tuegel
056db1c725 Revert "sddm: propagate qtbase input"
This reverts commit 40db6380f6.

Despite testing this in QEMU on my own machine, it breaks SDDM for everyone
else.
2017-03-23 18:56:39 -05:00
Robin Gloster
3ff736b9a8 kdeWrapper: fix eval 2017-03-24 00:20:42 +01:00
Nikolay Amiantov
310e6ef791 antimicro: wrap Qt application
(cherry picked from commit 82f7f8ad9a)
2017-03-24 01:51:54 +03:00
Nikolay Amiantov
0d9f47f265 makeQtWrapper, kdeWrapper: add GTK3 dependencies
(cherry picked from commit a40b7d07e9)
2017-03-24 01:51:31 +03:00
Nikolay Amiantov
0bd1b026d1 wrapGAppsHook: propagate dconf
It's effectively required for GTK3 applications because various parts of the library use GIO to store settings.

Also propagate GTK for clarity (it should be there anyway).

(cherry picked from commit 670744e1fa)
2017-03-24 01:50:20 +03:00
ndowens
9b2970fc30 awesomewm: 4.0 -> 4.1
(cherry picked from commit 6a851cde94)
2017-03-23 23:23:52 +01:00
Robin Gloster
6b9a2f6e8c mpd: fix i686-linux build
See upstream https://github.com/MaxKellermann/MPD/pull/24, not clear if
this will be merged upstream as the author has been quite uncooperative.

Github patch URL (https://github.com/MaxKellermann/MPD/pull/24.patch)
sadly does not work for this.

(cherry picked from commit d6e2366b1c)
2017-03-23 23:17:05 +01:00
Robin Gloster
2ae4257b0b linux: drop 3.12 and 4.1
Support ends before 17.09 is released:
https://www.kernel.org/category/releases.html

(cherry picked from commit 37f7470269)
2017-03-23 22:08:02 +01:00
romildo
9f8df21635 awesome: menubar should take XDG_HOME_DIR and XDG_DATA_DIRS into account
(cherry picked from commit b1a9bcfb16)
2017-03-23 22:07:06 +01:00
Benjamin Staffin
be6d5c672b nixos: Use xkbDir consistently so it has an effect
(cherry picked from commit b79c284952)
2017-03-23 22:07:05 +01:00
Tim Steinbach
b1097b9cb3 linux: 4.10.4 -> 4.10.5 2017-03-23 16:43:47 -04:00
Tim Steinbach
e9c35e0a02 linux: 4.4.55 -> 4.4.56 2017-03-23 16:39:45 -04:00
Vladimír Čunát
61e3a58274 knot-dns: maintenance 2.4.1 -> 2.4.2
(cherry picked from commit 070ae18422)
2017-03-23 16:36:37 +01:00
Robin Gloster
1394a0c0a2 security-wrapper: link old wrapper dir to new one
This makes setuid wrappers not fail after upgrading.

references #23641, #22914, #19862, #16654

(cherry picked from commit e82baf043e)
2017-03-23 16:21:19 +01:00
Robin Gloster
3bfeceb6a6 Revert "security-wrapper: Don't remove the old paths yet as that can create migration pain"
This reverts commit 4c751ced37.

This does not fix the issue as /run is now mounted with nosuid.

(cherry picked from commit 45f486f096)
2017-03-23 16:21:12 +01:00
Symphorien Gibol
b51de57928 grub module: fix useOSProber when installing grub as EFI
(cherry picked from commit a6665adde8)
2017-03-23 13:38:37 +01:00
Joachim Fasting
587030466a tribler: fixup revision
Using `rev = "v${revision}"` results in a "bad reference" error;
use the plain revision instead.

(cherry picked from commit a49df2a894)
2017-03-23 12:57:46 +01:00
Nikolay Amiantov
30c7678e8f qt5.qtwebengine: add proprietary codecs support
(cherry picked from commit 3a948e6b07)
2017-03-23 14:53:43 +03:00
Nikolay Amiantov
d5bd98e192 qt5.qtwebengine: use system libraries where possible
Fixes #23987.

(cherry picked from commit 040b86a96e)
2017-03-23 14:53:43 +03:00
Nikolay Amiantov
15fdfa9296 srtp: build as shared library
(cherry picked from commit 5a04d38ca6)
2017-03-23 14:53:43 +03:00
Nikolay Amiantov
64d459302b nss: propagate nspr
(cherry picked from commit 1715e3643b)
2017-03-23 14:53:43 +03:00
Nikolay Amiantov
9cc4b2f8d8 qt5.qtwebengine: patch more library paths
Adapted from chromium derivation. Fixes qutebrowser crash.

(cherry picked from commit a7a858aa52)
2017-03-23 14:53:43 +03:00
ndowens
73a85de298 gpa: 0.9.9 -> 0.9.10
(cherry picked from commit 2477196fb1)

Bug fixes
2017-03-23 12:27:28 +01:00
Joachim Fasting
a78916e790 electrum: 2.8.1 -> 2.8.2
Release 2.8.2
  * show paid invoices in history tab
  * improve CPFP dialog
  * fixes for trezor, keepkey
  * other minor bugfixes
https://github.com/spesmilo/electrum/blob/master/RELEASE-NOTES

(cherry picked from commit c6322a28d4)
2017-03-23 12:27:25 +01:00
Joachim Fasting
c88b345193 electrum: 2.7.18 -> 2.8.1
See https://github.com/spesmilo/electrum/blob/master/RELEASE-NOTES

Also
- patch .desktop file to include full path to electrum
- add dep on pysocks
- remove dep on pyasn; per the changelog, it has not been used since v2.1
- replace dep on slowaes with pyaes

(cherry picked from commit d575efc5f0)
2017-03-23 12:27:24 +01:00
Joachim Fasting
5d7139bc33 pythonPackages.pyaes: init at 1.6.0
(cherry picked from commit 617d8af325)

For electrum
2017-03-23 12:27:19 +01:00
Joachim Fasting
1a1d365351 pythonPackages.mnemonic: 0.12 -> 0.17
(cherry picked from commit 9cc2083dac)

For electrum
2017-03-23 12:27:12 +01:00
Joachim Fasting
040b9f4aae pythonPackages.trezor: 0.7.4 -> 0.7.12
(cherry picked from commit 10a0f1c2af)

For electrum
2017-03-23 12:27:01 +01:00
Robin Gloster
6b3a77ac51 Revert "Revert "kmod-blacklist-ubuntu: 9.3 -> 22.1""
This reverts commit 8c410f4b18 with a fix
to make the tests run correctly. bochs-drm must not be blacklisted for
that.

(cherry picked from commit 785e45ac06)
2017-03-23 10:14:29 +01:00
Joachim Fasting
ea4a1b403c grsecurity: 4.9.16-201703180820 -> 4.9.17-201703221829
(cherry picked from commit 94ab4932ae)
2017-03-23 10:04:21 +01:00
Joachim Fasting
027d0f0244 linux_4_9: 4.9.16 -> 4.9.17
(cherry picked from commit a2fdf72ec4)
2017-03-23 10:04:16 +01:00
Vladimír Čunát
ec281ca1bc Merge #24236: remove bbenoist from maintainers
(cherry picked from commit e0bf35f0e5)
2017-03-23 08:54:42 +01:00
Jörg Thalheim
0f99379863 munin: fix tests by replacing cron with systemd timer
(cherry picked from commit b4169bb8dd)
2017-03-22 22:26:24 +01:00
ndowens
be4f0f1688 munin: 2.0.30 -> 2.0.33; for CVE-2017-6188
(cherry picked from commit 2e06a585bc)
2017-03-22 22:26:12 +01:00
Jörg Thalheim
bd67d5ddfa pythonPackages.libnacl: enable tests
(cherry picked from commit 597865725f)
2017-03-22 16:52:48 +01:00
Marti Serra
ed593f2472 pythonPackages.libnacl: init at 1.5.0
(cherry picked from commit c883cefc6f)
2017-03-22 16:52:33 +01:00
Marti Serra
56ee190671 tribler: from 6.4.3 to 7.0.0-beta
removed old unused dependencies,
changed enablePlayer to true by default,
added myself as maintainer.

(cherry picked from commit ad75bffb06)
2017-03-22 15:46:58 +01:00
Robin Gloster
6c36f10bb0 Revert "php: Add a dev output"
This reverts commit bccb9366a7.

This breaks phpPackages.*

cc @edolstra
2017-03-22 15:46:39 +01:00
Guillaume Maudoux
9387019eae openssl: default to default profile CA on darwin
(cherry picked from commit c86f05e7ce)
2017-03-22 15:45:06 +01:00
Guillaume Maudoux
d1e15d6e0a curl: Use default trust store of TLS backend
Having curl fall back to openssl's CA means that we need not patch curl
to respect NIX_SSL_CERT_FILE. It will work in all the cases.

This reverts commit fb4c43dd8a "curl: Use CA bundle in nix default profile by default"
If we want to reintroduce that feature, this needs to go inside openssl

(cherry picked from commit 8ecb94bb97)
2017-03-22 15:44:59 +01:00
Guillaume Maudoux
c1401e1e4c curl, git: Fix curl default CA, let git use it
Improve patching of curl to use NIX_SSL_CERT_FILE as default CA
Remove patches from git, as git uses curl and passes its environment
variables to curl.

(cherry picked from commit 525a663174)
2017-03-22 15:44:20 +01:00
Vladimír Čunát
5954e76282 Merge branch 'staging-17.03' into release-17.03 2017-03-22 15:20:52 +01:00
Robin Gloster
acefaff33d nixos-container: check for correct path for chattr
Could fail on destroy if the container wasn't created correctly

(cherry picked from commit 91e74ed3b2)
2017-03-22 15:16:05 +01:00
Robin Gloster
443c7c0713 nixos-container: allow _ in container name
fixes #15089

(cherry picked from commit 3ac02dfc40)
2017-03-22 15:16:04 +01:00
Robin Gloster
26db09a5f0 nixos-container: don't use host's $NIXOS_CONFIG
fixes #22948

(cherry picked from commit 9b9416cca4)
2017-03-22 15:16:04 +01:00
Franz Pletz
05b0d31e97 matrix-synapse: 0.19.2 -> 0.19.3
(cherry picked from commit 28a4c998fa)
2017-03-22 15:14:16 +01:00
Robin Gloster
f3a9cccdad mailcore2: fix build with newer icu
(cherry picked from commit 66c384ab4a)
2017-03-22 14:07:40 +01:00
Thomas Tuegel
9fe20dd70a nixos/sddm: replace themes option with package option
(cherry picked from commit a96e047b31)
2017-03-22 07:48:51 -05:00
Thomas Tuegel
e94a1d922b sddmPlasma5: provide top-level package for theme
(cherry picked from commit 203c4926e3)
2017-03-22 07:48:44 -05:00
Thomas Tuegel
4e3a21a287 nixos/plasma5: do not include extra-cmake-modules in sddm
Fixes #24126.

(cherry picked from commit 7ca62935bb)
2017-03-22 07:48:36 -05:00
Thomas Tuegel
40db6380f6 sddm: propagate qtbase input
(cherry picked from commit 3de6ccd5b2)
2017-03-22 07:48:26 -05:00
Thomas Tuegel
df60c426d2 makeQtWrapper: wrap with runtime XDG dirs
(cherry picked from commit 7aee677a10)
2017-03-22 07:48:19 -05:00
Eelco Dolstra
bccb9366a7 php: Add a dev output
This reduces the closure size from 438 to 174 MiB.

(cherry picked from commit b751036a74)
2017-03-22 13:34:37 +01:00
Eelco Dolstra
f056e4e67c php: Strip modules
This reduces the closure size from 566 to 438 MiB.

(cherry picked from commit 3ff08d6f13)
2017-03-22 13:34:37 +01:00
Eelco Dolstra
b048479758 system-config-printer: Strip binaries in $out/etc
This reduces its closure size from 484 to 281 MiB.

(cherry picked from commit 6dd5846f1b)
2017-03-22 13:34:37 +01:00
Eelco Dolstra
006d9380bb ibus: Use dev output
This removes glib.dev from the runtime closure, reducing its size from
357 to 253 MiB.

(cherry picked from commit 7c60ba1d41)
2017-03-22 13:34:37 +01:00
Eelco Dolstra
2351b0d047 subversion: Clean up more *.la files
This removes some -dev paths from the closure of subversionClient and
gitFull.

(cherry picked from commit f6c73f1e37)
2017-03-22 13:34:37 +01:00
Eelco Dolstra
2cc62aece8 rtmpdump: Use multiple outputs
This reduces the runtime closure size from 80 to 23 MiB.

(cherry picked from commit 1824832e17)
2017-03-22 13:34:37 +01:00
Eelco Dolstra
b593afbbc9 gconf: Use a dev output
This reduces the closure size of gconf from 225 to 63 MiB.

(cherry picked from commit 3ab897c6cf)
2017-03-22 13:34:36 +01:00
Eelco Dolstra
b8b4646e6d diffoscope: Don't propagate build inputs
This reduces the runtime closure size from 297 to 132 MiB.

(cherry picked from commit 96d7f35e96)
2017-03-22 13:34:36 +01:00
Eelco Dolstra
e884561b0f apache-httpd: Strip modules
We did this for 2.2 (cc61d31902) but
lost this for 2.4. This reduces the Apache closure size from 312 MiB
to 102 MiB (primarily by getting rid of -dev outputs).

(cherry picked from commit 4e5461127d)
2017-03-22 13:34:33 +01:00
Michael Raskin
e94a9dc960 oneteam: remove
(cherry picked from commit d2cd304ad7)
2017-03-22 13:17:57 +01:00
Michael Raskin
a5711eba3c oneteam: fix fixable problems, mark broken as it fell behind Firefox too much
(cherry picked from commit ede70972a4)
2017-03-22 13:17:56 +01:00
Herwig Hochleitner
3fef0e72ff chromium: 57.0.2987.98 -> 57.0.2987.110
(cherry picked from commit 92985364e1)
2017-03-22 13:03:39 +01:00
Joachim Fasting
37e11e50e4 pax-utils: meta cleanups
- Description from upstream
- A more informative homepage
- Per upstream, pax-utils should work for unix-likes beyond linux

(cherry picked from commit 41e2ffa1d7)
2017-03-22 13:01:53 +01:00
Joachim Fasting
27ce71c702 nixos/tor: add missing option type
(cherry picked from commit 95eaa3aec3)
2017-03-22 13:01:32 +01:00
Frederik Rietdijk
aee4063076 Python docs: small fixes
(cherry picked from commit ce6cd33c65)
2017-03-22 12:56:37 +01:00
Tim Steinbach
399fa5b27f linux: 4.11-rc2 -> 4.11-rc3 2017-03-21 20:33:06 -04:00
Robin Gloster
c458d7cf94 haskellPackages.yi-keymap-vim: dontCheck
Tries to access path outside of sandbox.

(cherry picked from commit 693d0e7fea)
2017-03-22 01:27:48 +01:00
ndowens
552f6b3341 enginepkcs11: libp11 version 0.4.0 and above contain enginepkcs11
enginepkcs11: Removed from all-packages.nix
(cherry picked from commit 112a91c2f7)
2017-03-22 00:52:38 +01:00
Robin Gloster
97aff04826 elvis: fix build
(cherry picked from commit c5f818f74d)
2017-03-22 00:47:27 +01:00
Robin Gloster
fb4dced1c8 mutter: fix on i686-linux
(cherry picked from commit 242031a34e)
2017-03-21 23:58:19 +01:00
Nikolay Amiantov
844c4fac3f qt5.qtwebengine: fix library paths
Without this it would try to find files in qtbase.

(cherry picked from commit 7eb9a85b90)
2017-03-22 01:40:31 +03:00
ndowens
9b6a6cff6c tnef: 1.4.12 - > 1.4.14; Advisory X41-2017-004
(cherry picked from commit 41abf78fc0)
2017-03-21 23:25:37 +01:00
Frederik Rietdijk
7e224746b6 pythonPackages.pygobject2: fixup conversation to buildPythonPackage
(cherry picked from commit 8143413e59)
2017-03-21 21:59:41 +01:00
Domen Kožar
56196a6c10 haskell: use new justStaticExecutables and add purescript
(cherry picked from commit f67a89e248)
Signed-off-by: Domen Kožar <domen@dev.si>
2017-03-21 21:27:37 +01:00
Domen Kožar
548e2671c5 haskell: add justStaticExecutables combinator
(cherry picked from commit db23fe1581)
Signed-off-by: Domen Kožar <domen@dev.si>
2017-03-21 21:27:32 +01:00
Vladimír Čunát
cd3fb4605a mesa: maintenance 17.0.1 -> 17.0.2
(cherry picked from commit 39eda57d2a)
2017-03-21 20:24:06 +01:00
Nikolay Amiantov
ef94c6dc1d mesa: enable texture floats only for drivers
To be on more safe side. This shouldn't matter theoretically as nothing in core
Mesa depends on them.

(cherry picked from commit 328bcdae25)
2017-03-21 20:23:49 +01:00
Nikolay Amiantov
0c06c488f3 mesa: enable texture floats for drivers
(cherry-picked from 261d7caed7 and 328bcdae25)
2017-03-21 22:22:53 +03:00
Thomas Tuegel
3a4038a594 mesa: allow overriding driver compilation
(cherry picked from commit eccc1fa9bb)
This is to sync expression code with master/staging;
the derivations evaluate the same, at least on x86_64-linux.
2017-03-21 20:22:36 +01:00
Nikolay Amiantov
d648522aef udev module: filter duplicate udev paths
Fixes #24174

(cherry picked from commit 6555ec03c3)
2017-03-21 21:29:51 +03:00
Nikolay Amiantov
ebca84224a octoprint: 1.3.1 -> 1.3.2
Fix startup wizard and cleanup dependencies.

(cherry picked from commit d3e2957c90)
2017-03-21 21:29:40 +03:00
Nikolay Amiantov
f4f55a8192 python.pkgs.websocket_client: 0.32.0 -> 0.40.0
(cherry picked from commit 6f884349e6)
2017-03-21 21:29:29 +03:00
Nikolay Amiantov
ae43118b2b python.pkgs.sockjs-tornado: init at 1.0.3
(cherry picked from commit c7ee41bc13)
2017-03-21 21:29:18 +03:00
Eelco Dolstra
1e8c01784a Allow attaching to non-child processes by default
The inability to run strace or gdb is the kind of
developer-unfriendliness that we're used to from OS X, let's not do it
on NixOS.

This restriction can be re-enabled by setting

  boot.kernel.sysctl."kernel.yama.ptrace_scope" = 1;

It might be nice to have a NixOS module for enabling hardened defaults.

Xref #14392.

Thanks @abbradar.

(cherry picked from commit 86721a5f78)
2017-03-21 20:52:05 +03:00
Eelco Dolstra
dffc300e56 nix-daemon.nix: Make the 1.12 check less strict
(cherry picked from commit 78bb734452)
2017-03-21 20:51:58 +03:00
Carlos D
128837a584 Expand on creating USB bootable for OS X
(cherry picked from commit e6a02918ce)
2017-03-21 17:57:50 +01:00
Nikolay Amiantov
80888e21e9 mesa: enable texture floats by default
(cherry picked from commit 261d7caed7)
2017-03-21 17:57:13 +01:00
HeeL
47051c876a Fix mkdir for fetchgx to not throw an exception
(cherry picked from commit cd2627da0d)
2017-03-21 17:55:43 +01:00
Eelco Dolstra
5acae6d484 Revert "nixos-container: Use machinectl shell (#18825)"
This reverts commit
c37e76b4d2. Unfortunately, using
"machinectl shell" has two bad side effects:

* It sends the command's stderr to stdout.

* It doesn't propagate the command's exit status.

This broke NixOps.

PR #18825.

(cherry picked from commit cb49c14324)
2017-03-21 17:55:35 +01:00
Evan Danaher
84561b005c nginx: disallow alias directive on server level; it doesn't work.
(cherry picked from commit a09246948c)
2017-03-21 17:55:27 +01:00
Evan Danaher
4bea988a7e nginx: Assert that either root or alias is null.
If both are set, nginx won't start.  More error checking is certainly in
order, but this seems like a reasonable start.

(cherry picked from commit e7358b192a)
2017-03-21 17:55:27 +01:00
Evan Danaher
6448a3e113 nginx: Add alias configuration option for hosts and locations.
It's like root, but doesn't keep the prefix.

(cherry picked from commit ff2e2e82cc)
2017-03-21 17:55:27 +01:00
Eelco Dolstra
a0134b9622 nix: 1.11.7 -> 1.11.8
(cherry picked from commit 2cb25f8b59)
2017-03-21 11:57:44 -04:00
Domen Kožar
b9608a9a2e git, openssl, curl: Respect $NIX_SSL_CERT_FILE
Slightly modified version of 942dbf89c6

Signed-off-by: Domen Kožar <domen@dev.si>
2017-03-21 16:04:24 +01:00
Parnell Springmeyer
cbbb8897e3 security-wrapper: Don't remove the old paths yet as that can create migration pain
(cherry picked from commit 4c751ced37)
2017-03-21 13:40:43 +01:00
Robin Gloster
36262fc9cb fetch-*: add md5 support removal to rl-notes
(cherry picked from commit c066dc8416)
2017-03-21 13:39:10 +01:00
Robin Gloster
7ea9cdfa96 fetch-*: remove md5 support
fixes #4491

(cherry picked from commit f57185db95)
2017-03-21 13:38:19 +01:00
Franz Pletz
fc2214900c gitlab: add rake task to delete tokens
The information disclosure was caued by CVE-2017-0882.

(cherry picked from commit 219e91b4c6)
2017-03-21 13:17:54 +01:00
Franz Pletz
049c9d4617 gitlab module: explicitely create pages shared path
Fixes creation of backups.

(cherry picked from commit 4bd12fa7b2)
2017-03-21 13:17:54 +01:00
Franz Pletz
cce54583d4 gitlab: 8.16.6 -> 8.17.4 for CVE-2017-0882
(cherry picked from commit 29f57ac447)
2017-03-21 13:17:54 +01:00
Robin Gloster
777bf85013 ponyc: segfaults on i686
(cherry picked from commit 37c31c635d)
2017-03-21 13:13:12 +01:00
Frederik Rietdijk
504323c928 Python: replace mkPythonDerivation with buildPythonPackage and format="other";
This way all Python packages use the same function,
`buildPythonPackage`.

(cherry picked from commit 3760c8c7fd)
2017-03-21 13:10:02 +01:00
Frederik Rietdijk
5d25fd14f8 Python changelog
(cherry picked from commit 4263c53f66)
2017-03-21 11:06:39 +01:00
Robin Gloster
7c65cc8f12 clooj: fix url
(cherry picked from commit 9c730bc40b)
2017-03-21 11:01:26 +01:00
Franz Pletz
0b6812ee9a nixos/treewide: systemd.time is in manvolume 7
cc #23396

(cherry picked from commit fb50cde71e)
2017-03-21 08:33:48 +01:00
Franz Pletz
21cb5af4ec zfs.autoScrub service: init
(cherry picked from commit 7566b36259)
2017-03-21 08:33:44 +01:00
Joachim Schiele
1afee76d45 Update python.md (#23669)
* Update python.md

this makes it clear how to alter `attributes` by using `packageOverrides`

* Update python.md

* Update python.md

* Update python.md

* Update python.md

* Update python.md

* Update python.md

(cherry picked from commit 91debcb482)
2017-03-21 02:17:52 +01:00
Robin Gloster
e87e108146 nix-daemon: fix autoOptimiseStore option
(cherry picked from commit c808801937)
2017-03-21 02:17:39 +01:00
Jörg Thalheim
a334a1737b wireguard: 0.0.20170223 -> 0.0.20170320.1
(cherry picked from commit 818a37598c)
2017-03-21 01:48:00 +01:00
Robin Gloster
b2a5f4f0c2 rl-notes 17.03: info on python module location
closes #11567

(cherry picked from commit 5e0f932de0)
2017-03-20 23:29:18 +01:00
Vladimír Čunát
2722b1cedc Merge #23983: update kmod and kmod-blacklist-ubuntu 2017-03-20 23:15:53 +01:00
Robin Gloster
758f85e113 packetbeat: 5.2.1 -> 5.2.2, build from source
(cherry picked from commit 10239a084f)
2017-03-20 23:10:04 +01:00
Robin Gloster
df435d394c metricbeat: 5.2.1 -> 5.2.2, build from source
(cherry picked from commit 4d08d1aa8f)
2017-03-20 23:10:04 +01:00
Robin Gloster
6e3827d2d6 heartbeat: 5.2.1 -> 5.2.2, build from source
(cherry picked from commit 66d0c4b1bd)
2017-03-20 23:10:04 +01:00
Robin Gloster
b38224a245 filebeat: 5.2.1 -> 5.2.2, build from source
(cherry picked from commit a0d087b6fe)
2017-03-20 23:10:03 +01:00
Tristan Helmich
07b67e65e9 packetbeat: init at 5.2.1
(cherry picked from commit 8338506abe)
2017-03-20 23:10:03 +01:00
Tristan Helmich
2de49241d9 filebeat: init at 5.2.1
(cherry picked from commit 9fe3b0eb13)
2017-03-20 23:10:03 +01:00
Tristan Helmich
7e097d9ab7 metricbeat: init at 5.2.1
(cherry picked from commit 9fce67264d)
2017-03-20 23:10:03 +01:00
Tristan Helmich
2ef4093a35 heartbeat: init at 5.2.1
(cherry picked from commit 9dfb7e42ad)
2017-03-20 23:10:03 +01:00
Benno Fünfstück
6204045f4e drbd: fix output file location (#23541)
drbd was installing files into $out/nix/store/... due to the usage of DESTDIR
(setting both DESTDIR + prefix to $out will cause files to be installed into $out/$out/...)
(cherry picked from commit 8c0074dd9f)
2017-03-20 23:10:03 +01:00
Willi Butz
b3c5d0d9ef martyr: fixed build, removed build.sh, added meta (see #23253)
(cherry picked from commit 4bfde8f5b4)
2017-03-21 00:04:47 +02:00
Nikolay Amiantov
47dd221e05 makeTest: don't rely on makeWrapper not quoting newlines
(cherry picked from commit 1f0ce0eaf8)
2017-03-20 22:10:11 +01:00
Robin Gloster
183a48e99f jdepend: 2.9.0 -> 2.9.1, fix build
(cherry picked from commit 1c3308e9c1)
2017-03-20 21:34:44 +01:00
Robin Gloster
14a28e3ebf doc: remove double space
(cherry picked from commit 72a5cf11cc)
2017-03-20 20:59:57 +01:00
Robin Gloster
147934ea61 Revert "doc: remove double space"
This reverts commit 6393d43380.

Commit added too much changes.

(cherry picked from commit 88341c4d2b)
2017-03-20 20:58:47 +01:00
Robin Gloster
f8f111c9f1 doc: remove double space
(cherry picked from commit 6393d43380)
2017-03-20 20:47:43 +01:00
Matthias Beyer
b69de8c001 doc: Add rust documentation (#23510)
(cherry picked from commit 315e1a23c0)
2017-03-20 20:45:14 +01:00
Philipp Steinpass
d5978c0f48 Added option and description for nix store auto-optimisation.
(cherry picked from commit 68c6d90417)
2017-03-20 20:45:01 +01:00
Franz Pletz
5e4b43df13 nginx: explicitly use stable version
Also updates the documention of the NixOS option `services.nginx.package`
that upstream recommends using the mainline version instead.

Fixes #21665.

(cherry picked from commit c13922f012)
2017-03-20 20:05:47 +01:00
Franz Pletz
a535c14363 nixos: enable nginx test
cc #23279

(cherry picked from commit 7151e74883)
2017-03-20 20:05:39 +01:00
Susan Potter
77641e8d1f nginx service: add commonHttpConfig option
(cherry picked from commit 251b9ca0e7)

cc #23279
2017-03-20 20:05:21 +01:00
Thomas Tuegel
9f4e6cda67 nixos/plasma5: do not set kimpanel as default IBus panel
kimpanel does not show installed IBus engines or allow switching input
methods. kimpanel does show configured keyboard layouts through kxkb, so I
believe there is some problem communicating with IBus. No error messages are
produced in the log and I have been unable to discover the cause. I have no
intention of continuing to work on kimpanel at this time, so it should be
disabled. The GTK+ 3-based panel provided by IBus is perfectly serviceable in
the interim.

(cherry picked from commit d709cdd829)
2017-03-20 10:24:33 -05:00
Robin Gloster
96d99cca00 virtualbox: 5.1.14 -> 5.1.18
(cherry picked from commit 07252dc83b)
2017-03-20 16:06:03 +01:00
Robin Gloster
94125831e7 fast-neural-doodle: mark as broken
(cherry picked from commit ed59de18b5)
2017-03-20 15:09:49 +01:00
romildo
98d2ac5c7c lumina: fix kwindowsystem and oxygen-icons5 attributes
(cherry picked from commit 501d9c7186)
2017-03-20 15:09:49 +01:00
rnhmjoj
17c1e13ed7 firefox: reenable ALSA backend
(cherry picked from commit 918f331104)
2017-03-20 15:09:49 +01:00
Franz Pletz
6db771b77e wireshark: 2.2.4 -> 2.2.5 for multiple CVEs
Fixes:

  * CVE-2017-5596
  * CVE-2017-5597
  * CVE-2017-6467
  * CVE-2017-6468
  * CVE-2017-6469
  * CVE-2017-6470
  * CVE-2017-6471
  * CVE-2017-6472
  * CVE-2017-6473
  * CVE-2017-6474

(cherry picked from commit 7b27e1c3c9)
2017-03-20 14:46:36 +01:00
Nikolay Amiantov
fe5da114ca makeTest: don't rely on makeWrapper not quoting newlines
(cherry picked from commit 1f0ce0eaf8)
2017-03-20 16:16:08 +03:00
Nikolay Amiantov
ec5b12b2e6 samba: enable parallel building
(cherry picked from commit 21439ef416)
2017-03-20 15:31:09 +03:00
Sander van der Burg
7185762996 dd-agent: bind to pymongo 2.9.1 to fix the MongoDB monitoring
(cherry picked from commit 20194e2696)
2017-03-20 10:43:55 +01:00
Daiderd Jordan
980ded0b29 znc: 1.6.4 -> 1.6.5
(cherry picked from commit 908e3ffd65)

Bugfix release
2017-03-20 01:48:06 +01:00
ndowens
d0b600ac12 feh: 2.18.1 -> 2.18.2
(cherry picked from commit 705b2d9b66)

Bugfix release
2017-03-20 01:48:00 +01:00
Will Dietz
8de060ba40 neo4j service: neo4j-wrapper is deprecated, merge into neo4j.conf
(cherry picked from commit cb73cb9e62)
2017-03-20 00:29:07 +01:00
Will Dietz
943d10e4f7 neo4j service: fix package installed into env to match running service
(cherry picked from commit 515fc22263)
2017-03-20 00:29:05 +01:00
Will Dietz
34a110c620 neo4j: 3.1.1 -> 3.1.2
(cherry picked from commit 5d849c72f1)
2017-03-20 00:29:04 +01:00
ndowens
10347d7918 mg: 20110905 -> 20161005; Remove un-needed configure patch
mg: 20110905 -> 20161005
(cherry picked from commit d6114f6c6b)
2017-03-20 00:29:03 +01:00
ndowens
a336fb8831 nano: 2.7.3 -> 2.7.5
(cherry picked from commit 685ac5287b)
2017-03-20 00:29:02 +01:00
Mikhail Volkhov
85d91b3eb9 sage: fix build at 6.8
(cherry picked from commit 78c0cecc5f)
2017-03-20 00:28:56 +01:00
Jan Malakhovski
6a0155d2b7 nixos: torify: disable by default, add some documentation as of why
This `tsocks` wrapper leaks DNS requests to clearnet, meanwhile Tor comes with
`torsocks` which doesn't.

Previous commits to this file state that all of this still useful somehow.
Assuming that it's true, at least let's not confuse users with two different tools
and don't clash with the `tsocks` binary from nixpkgs by disabling this by default.

(cherry picked from commit a04782581a)
2017-03-19 20:51:58 +01:00
Jan Malakhovski
2022882677 nixos: tor: add enableGeoIP
(cherry picked from commit 6d25f77a64)
2017-03-19 20:51:55 +01:00
Joachim Fasting
046ae1f6f2 nixos/dnscrypt-proxy: simplify module logic related to apparmor
(cherry picked from commit 9325c3a616)
2017-03-19 20:51:54 +01:00
Joachim Fasting
77916a4a94 nixos/dnscrypt-proxy: support reload
(cherry picked from commit 83052ef9db)
2017-03-19 20:51:53 +01:00
Joachim Fasting
7f60074823 nixos/dnscrypt-proxy: inline option renamings
In an effort to make the module more self-contained.

(cherry picked from commit c0a8a9205b)
2017-03-19 20:51:52 +01:00
Joachim Fasting
482a7a667b nixos/dnscrypt-proxy: inline top-level binding (cleanup)
(cherry picked from commit 563c8e1496)
2017-03-19 20:51:51 +01:00
Joachim Fasting
8c6b6b7064 nixos/dnscrypt-proxy: use example.com in example values
It is the canonical example domain after all.

(cherry picked from commit c6da2c7c2b)
2017-03-19 20:51:50 +01:00
Joachim Fasting
b40b58febf nixos/dnscrypt-proxy: indicate update status
Make it easier for the user to tell when the list is updated
and, at their option, see what changed.

(cherry picked from commit 06520c7fb7)
2017-03-19 20:51:49 +01:00
Joachim Fasting
c3cff5f762 nixos/dnscrypt-proxy: more fs isolation for the updater
It'd be better to do the update as an unprivileged user; for
now, we do our best to minimize the surface available.  We
filter mount syscalls to prevent the process from undoing the fs
isolation.

(cherry picked from commit 5f27abec23)
2017-03-19 20:51:48 +01:00
Joachim Fasting
4c1bdf24d3 nixos/dnscrypt-proxy: support updating before nss is up
Resolve download.dnscrypt.org using hostip with a bootstrap
resolver (hard-coded to Google Public DNS for now), to ensure
that we can get an up-to-date resolver list without working name
service lookups. This makes us more robust to the upstream
resolver list getting out of date and other DNS configuration
problems.

We use the curl --resolver switch to allow https cert validation
(we'd need to do --insecure if using just the ip addr). Note
that we don't rely on https for security but it's nice to have
it ...

(cherry picked from commit e72aaa73ea)
2017-03-19 20:51:47 +01:00
Joachim Fasting
9b767f19c6 nixos/dnscrypt-proxy: refactoring
Use mkMerge to make the code a little more ergonomic and easier
to follow (to my eyes, anyway ...).  Also take the opportunity
to do some minor cleanups & tweaks, but no functional changes.

(cherry picked from commit adf044e1fb)
2017-03-19 20:51:41 +01:00
Nikolay Amiantov
bcea7502ed steamPackages.steam-runtime-wrapped: override vulkan-loader
This way we get /run/opengl-driver as a search path.
Fixes #24056.

(cherry picked from commit 9748828e78)
2017-03-19 22:01:35 +03:00
Jörg Thalheim
d1d930e8e6 createrepo_c: fix build
(cc: @copumpkin)

(cherry picked from commit d21c647ddb)
2017-03-19 17:30:19 +01:00
Jörg Thalheim
312bae9e2d createrepo_c: add missing patches
(cherry picked from commit a4c5fc068a)
2017-03-19 17:29:17 +01:00
Tim Steinbach
2e61020220 linux: 4.4.54 -> 4.4.55 2017-03-19 12:19:03 -04:00
Tim Steinbach
adcecdd46e linux: 4.10.3 -> 4.10.4 2017-03-19 12:14:00 -04:00
Kosyrev Serge
80cff1f3ca nvidia-x11: $bin can be empty
(cherry picked from commit d860a68fd0)
2017-03-19 18:54:19 +03:00
Kosyrev Serge
b2a97cadd1 nvidia-x11: don't patch things if libsOnly requested
(cherry picked from commit d18f55269c)
2017-03-19 18:54:12 +03:00
Cray Elliott
7b200151e6 nvidia_x11_beta: add patch to support Linux 4.10.x
thanks to bendlas for the review for pointing out a way to grab the patch remotely!

(cherry picked from commit 8799254eac)
2017-03-19 18:54:02 +03:00
Cray Elliott
2841d8b2b9 nvidia_x11: 375.26 -> 375.39
nvidia_x11_beta: 378.09 -> 378.13

(cherry picked from commit 12083de992)
2017-03-19 18:53:53 +03:00
Robin Gloster
39332aaecf rapidsvn: fix build
(cherry picked from commit 9c7b771a6e)
2017-03-19 15:57:38 +01:00
Ben Darwin
acb79583e2 mark old seg3d as broken for now since it no longer builds with stock gcc version and flags
(cherry picked from commit f02ac9588f)
2017-03-19 15:27:40 +01:00
Nikolay Amiantov
0bd37b4da9 makeWrapper: quote paths (#23511)
Fixes https://github.com/NixOS/nixpkgs/pull/22962#commitcomment-21144939

Also run ShellCheck.

(cherry picked from commit 7ff6eec5fd)
For ZHF #23253 to fix e.g. blink.
2017-03-19 13:59:12 +01:00
Vladimír Čunát
fc0d67b507 Merge branch 'release-17.03' into staging-17.03 2017-03-19 13:58:41 +01:00
Frederik Rietdijk
0b93d2b9e3 pythonPackages.pytest-django: fix hash patch setuptools_scm
Do the files change over time..?

(cherry picked from commit 48deda9f36)
2017-03-19 10:15:11 +01:00
Frederik Rietdijk
b4edc0b53a pythonPackages.django_guardian: fix eval
(cherry picked from commit 2e72372c05)
2017-03-19 09:45:30 +01:00
Frederik Rietdijk
a2e1c15654 pythonPackages.pytest-django: unpin setuptools_scm
- unpin setuptools_scm
- move to file in folder following guidelines
- use PyPI/upstream name

(cherry picked from commit 645c2189d1)
2017-03-19 09:44:54 +01:00
Domen Kožar
c11c1ac24d setuptools_scm: 1.11.1 -> 1.15.0
(cherry picked from commit f32fc9b03e)
2017-03-19 09:39:05 +01:00
Frederik Rietdijk
d685191d1d kdelibs: remove sanitize patch
because its included in 4.14.30 which was part of Applications 16.12.3.
https://github.com/NixOS/nixpkgs/pull/23992#issuecomment-287553865

(cherry picked from commit 2478f7b92c)
2017-03-19 09:25:06 +01:00
Joachim Fasting
35e6ef8066 linux_4_9: 4.9.15 -> 4.9.16
(cherry picked from commit b5da6ca213)
2017-03-19 01:54:18 +01:00
Joachim Fasting
07c2541594 grsecurity: 4.9.15-201703150049 -> 4.9.16-201703180820
(cherry picked from commit d4409817a6)
2017-03-19 01:54:10 +01:00
Vladimír Čunát
b249f7f1a8 Merge branch 'staging-17.03' into release-17.03 2017-03-18 22:08:50 +01:00
Robin Gloster
f7fcede7c2 gnome_mplayer: fix src and build
(cherry picked from commit 4e2f802ce8)
2017-03-18 12:48:55 +01:00
Joachim Schiele
23391146e0 nixos/release.nix: added tests.wordpress
(cherry picked from commit 6022a79cbc)
2017-03-18 12:21:51 +01:00
Nick Hu
244d44e7fe tvheadend: fix typo in package description
(cherry picked from commit ff7506d665)
2017-03-18 12:21:35 +01:00
Joachim Fasting
e10f141541 libsodium: 1.0.11 -> 1.0.12
(cherry picked from commit 3fac05b951)
2017-03-18 12:20:21 +01:00
Benno Fünfstück
69427c7143 atom: avoid using LD_PRELOAD. Fixes glibc compat issues
The wrapper for Atom was loading libraries via LD_PRELOAD, for example
libxkbfile. Now, if you installed atom via nix-env and happened to use a newer
nixpkgs for that than what your system environment is build against, you could
end up with an error like this:

```
uname: relocation error:
/nix/store/68sa3m89shpfaqq1b9xp5p1360vqhwx6-glibc-2.25/lib/libdl.so.2:
symbol _dl_catch_error, version GLIBC_PRIVATE not defined in file libc.so.6
with link time reference
```

This happens because atom calls the `uname` executable from the system to
determine the platform. Because that inherits the `LD_PRELOAD` environment
variable, so the libxkbfile library that the `atom` wrapper was build against
is loaded into `uname`. But since `atom` comes from `nix-env`, the `libxkbfile`
it was built with might be compiled against a newer version of `glibc` than
`uname`, which comes from the system, was! Having two versions of glibc loaded
into the same processes results in chaos.

To fix this, we avoid setting `LD_PRELOAD` and instead use patchelf to set the
correct RPATH. RPATH is not inherited by child processes, so the above issue
can no longer occur.

The only small complication here is that the library that actually loads
libxkbfile is not the atom binary itself, but a node extension that atom uses.
So instead of setting the RPATH on `atom` only, we also set the `rpath` on all
node extensions (`*.node`) the output.

(cherry picked from commit a4d6e2cf16)
2017-03-18 12:19:28 +01:00
Will Dietz
24c5f09b9a neo4j service: increase file limit, per warning emitted at startup (#23961)
(cherry picked from commit 63f1a14ae5)
2017-03-18 12:18:47 +01:00
Franz Pletz
2105794eec nixos/treewide: remove boolean examples for options
They contain no useful information and increase the length of the
autogenerated options documentation.

See discussion in #18816.

(cherry picked from commit 9536169074)
2017-03-18 12:18:33 +01:00
Vladimír Čunát
d9a5fa5780 Merge branch 'release-17.03' into staging-17.03
Solving firefox conflicts (parallel updates).
2017-03-18 10:50:54 +01:00
Lluís Batlle i Rossell
b288f0529c amule: 2.3.1 -> 2.3.2
(cherry picked from commit f77ae4e726)
2017-03-18 09:36:56 +01:00
obadz
f9458bae63 citrix-receiver: add link to webpage with all versions and adjust to change in nix-prefetch-url
Helps with #23975

(cherry picked from commit 17bfb6a08a)
2017-03-18 02:19:10 +00:00
taku0
1f984c0e05 firefox-esr: 52.0esr -> 52.0.1esr
(cherry picked from commit a038f91871)
2017-03-18 02:44:09 +01:00
taku0
a30906fd9c firefox, firefox-bin: 52.0 -> 52.0.1
(cherry picked from commit 3f175876e8)
2017-03-18 02:44:06 +01:00
taku0
4b140619b4 firefox, firefox-bin: 51.0.1 -> 52.0, firefox-esr: 45.7esr -> 52.0esr
(cherry picked from commit a24aaae602)
2017-03-18 02:44:05 +01:00
Nikolay Amiantov
b944312eb5 emacs: fix runtime GTK3 dependencies
Fixes #23845.

(cherry picked from commit a8785daf0e)
2017-03-18 01:33:16 +03:00
Thomas Tuegel
25d450c067 KDE Applications: 16.12.2 -> 16.12.3
(cherry picked from commit 06ece41778)
2017-03-17 16:46:27 -05:00
Tim Steinbach
ca750a5320 linux: 4.4.53 -> 4.4.54 2017-03-17 17:26:01 -04:00
Tim Steinbach
5579e81783 linux: 4.10.2 -> 4.10.3 2017-03-17 17:23:14 -04:00
Robin Gloster
9bfa7c9c3b robomongo: mark as broken
(cherry picked from commit 427edf1e5d)
2017-03-17 17:28:32 +01:00
Pascal Bach
ca4ae433db prometheus-unifi-exporter: init at 0.4.0
(cherry picked from commit 3728143cbc)
2017-03-17 15:44:48 +01:00
Kamil Chmielewski
fadb858e88 ponyc: 0.11.0 -> 0.11.3
(cherry picked from commit 017fddb4be)
2017-03-17 15:36:57 +01:00
Michael Raskin
7b401c71ce nixos: tests: firefox: make more comprehensive
Run Firefox inside an XTerm, it doesn't crash mysteriously this way.
Also try opening developer tools and checking that Firefox doesn't
crash in the process.

(cherry picked from commit 14a3412048)
2017-03-17 15:24:48 +01:00
Linus Heckemann
8cff9b9ccf renpy: mark as broken
(cherry picked from commit 9b62e41c1e)
2017-03-17 15:24:37 +01:00
Léo Gaspard
05fcddf977 dhparams module: condition on enable option (#23661)
Hence, the init/cleanup service only runs when the dhparams module is enabled.
(cherry picked from commit 66e54f25a1)
2017-03-17 15:23:59 +01:00
Profpatsch
0786d9f4ad modules/mlmmj: fix a typo in listaddress folder
(cherry picked from commit 6da60bb101)
2017-03-17 15:22:26 +01:00
Volth
15cc795817 icewm: fix CFGDIR
(cherry picked from commit fd61a33d2b)
2017-03-17 15:21:10 +01:00
Michael Raskin
df5a4710ff Merge pull request #23924 from 7c6f434c/improve-firefox-test
nixos: tests: firefox: make more comprehensive

(cherry picked from commit f9fb38fcae)
The test will block the channel without the xterm change.
2017-03-17 13:10:51 +01:00
Vladimír Čunát
fa39bc1f60 Merge #23917: fix firefox crashes
(cherry picked from commit 9adcebb1a9)
2017-03-17 12:35:40 +01:00
Vladimír Čunát
cbec258044 Merge branch 'release-17.03' into staging-17.03 2017-03-17 12:34:44 +01:00
Peter Hoeg
c4ff11220b kmod: 23 -> 24
(cherry picked from commit 89724f152a)
2017-03-17 16:05:30 +08:00
Peter Hoeg
820b0966ca kmod-blacklist-ubuntu: 9.3 -> 22.1
(cherry picked from commit 0c262a639e)
2017-03-17 16:05:24 +08:00
Will Dietz
3879491de2 timewarrior: patch to install all themes; use default install target.
(cherry picked from commit dc32b87082)
2017-03-16 18:53:11 +01:00
Jörg Thalheim
3913327e09 taskjuggler: remove 2.x series
The version was released 8 years ago and does not build anymore

(cherry picked from commit 61f20c94ca)
2017-03-16 18:42:35 +01:00
Daniel Brockman
112e07c234 jshon: fix null termination in read_stream.
This fixes a somewhat critical (security?) bug.

We are trying to get it merged upstream but have had no response from
the ordinary maintainer in over a week.

(See <https://github.com/keenerd/jshon/issues/53>.)

fixes #23727

(cherry picked from commit 5d6ea2d64e)
2017-03-16 18:35:05 +01:00
Joachim Fasting
b86fd7db88 travis: send emails iff commit caused the build to start failing
This setting should ensure that email notifications are sent
*only* when the commit caused the build to start failing.  That
is, no more "the build is still failing" spam.

As an alternative we could consider disabling email
notifications outright and possibly enable IRC notifications
instead.

(cherry picked from commit 541b3ec1bc)
2017-03-16 15:57:33 +01:00
Kamil Chmielewski
98cc721bc4 chromium: flashplayer: 24.0.0.221 -> 25.0.0.127
[Critical security fix]
https://github.com/NixOS/nixpkgs/pull/23889
2017-03-16 13:51:33 +01:00
Kamil Chmielewski
1f87bd6d3e go2nix: 1.1.1 -> 1.2.0
(cherry picked from commit d16b08ac85)
2017-03-16 12:55:59 +01:00
Kranium Gikos Mendoza
86252115c7 sipp: 3.4-beta2 -> 3.5.1
fixes #23945
2017-03-16 11:31:31 +01:00
Shea Levy
55da471ae5 buildGoModule: share the buildFlagsArray with the parallel subprocesses
(cherry picked from commit d6c3e74425)
2017-03-15 23:39:56 +01:00
Nikolay Amiantov
186bd52fe2 wireshark-gtk: wrap properly
(cherry picked from commit 545e267adf)
2017-03-16 00:58:50 +03:00
Renaud
7e46b92f28 JBoss AS: list known vulnerability
CVE-2015-7501

Warning in JBoss module

(cherry picked from commit 72619a86c9)
2017-03-15 17:34:19 -04:00
Joachim Fasting
893a539fcd linux_4_9: 4.9.14 -> 4.9.15
(cherry picked from commit 12648a455b)
2017-03-15 20:16:12 +01:00
Volth
d588913bae lxc: ensure directory /var/lib/lxc/rootfs
(cherry picked from commit bcc4c261be)
2017-03-15 12:44:20 +01:00
Bart Brouns
fdff442c50 physlock: fix issue 21935
(cherry picked from commit bb3ef8a95c)
2017-03-15 12:01:31 +01:00
Mogria
15e0502f99 sublime3: fix hardcoded /bin/bash when executing commands for build systems (#23561)
* sublime3: replace hardcoded /bin/bash with /usr/bin/env

exec.py in Default.package-sublime calls /bin/bash with subprocess.
See Issue #12011. Because of this builds could not be started from
withtin Sublime Text.

* sublime3: use wrapped of bash to fix internal build system

Without the wrapped version of bash (a symlink to $bash/bin/bash)
with LD_PRELOAD to glibc an relocation error occurs when trying
to run builds from within Sublime Text 3.  See Issue #12011.

(cherry picked from commit 1893ed54dc)
2017-03-15 11:40:00 +01:00
Jörg Thalheim
8ab704359b mpd: 0.20.5 -> 0.20.6
(cherry picked from commit 53d6b64a37cb1f57008c8074d32182ed0dad98c3)
2017-03-15 09:43:01 +01:00
Benjamin Staffin
b1b4653c64 nixos: Add a menu launcher for the NixOS manual
(cherry picked from commit 638e1b8243)
2017-03-15 04:40:38 -04:00
Lancelot SIX
073a8e8ba5 pythonPackages.celery_3: drop
(cherry picked from commit 1ca372e4d2)
2017-03-15 09:10:21 +01:00
Lancelot SIX
3e88ef2cb0 pythonPackages.django-raster: 0.3 -> 0.3.1
(cherry picked from commit 9041f0d8d9)
2017-03-15 09:10:04 +01:00
Nikolay Amiantov
02187c0319 python.pkgs.bleach: 1.5.0 -> 2.0.0
Fixes #23854.

(cherry picked from commit 648db95651)
2017-03-15 08:54:30 +01:00
Frederik Rietdijk
c5506e6868 pythonPackages.pywatchman: disable python 3.x and disable tests
(cherry picked from commit 4a615d90af)
2017-03-15 08:54:30 +01:00
Frederik Rietdijk
9dd8320d8d pythonPackages.dateparser: mark as broken
(cherry picked from commit 6a6d48be4e)
2017-03-15 08:54:30 +01:00
Frederik Rietdijk
6a3674d87b pythonPackages.pygal: 2.0.10 -> 2.3.1
(cherry picked from commit fd68cd4ed7)
2017-03-15 08:54:30 +01:00
Herwig Hochleitner
3d2e995abb pythonPackages.parsedatetime: 2.1 -> 2.3
(cherry picked from commit b27dfdbe66)
2017-03-15 08:54:30 +01:00
Frederik Rietdijk
bd776c33ec pythonPackages.configparser: fix with namespace packages
(cherry picked from commit d7378da028)
2017-03-15 08:54:30 +01:00
Frederik Rietdijk
04d8f8912b pythonPackages.pytest-virtualenv: 1.1.0 -> 1.2.7
(cherry picked from commit 4bfa709562)
2017-03-15 08:54:30 +01:00
Frederik Rietdijk
ec2d55c595 pythonPackages.pytest-shutil: 1.1.1 -> 1.2.8
(cherry picked from commit c9d9f072e5)
2017-03-15 08:54:30 +01:00
Frederik Rietdijk
53ebd7a2ce pythonPackages.ipython_genutils: 0.1.0 -> 0.2.0
(cherry picked from commit fc55e80ee7)
2017-03-15 08:54:30 +01:00
Frederik Rietdijk
95975a7009 pythonPackages.pyzmq: 15.2.0 -> 16.0.2
(cherry picked from commit 88a3861c7b)
2017-03-15 08:54:30 +01:00
Frederik Rietdijk
9c444a2b2b pythonPackages.prompt_toolkit: 1.0.9 -> 1.0.13
(cherry picked from commit db512addef)
2017-03-15 08:54:30 +01:00
Frederik Rietdijk
e38ceac67c pythonPackages.pickleshare: 0.5 -> 0.7.4
(cherry picked from commit c7268fa2a9)
2017-03-15 08:54:30 +01:00
Frederik Rietdijk
8eebf546dc pythonPackages.pathpy: 8.1.2 -> 10.1
(cherry picked from commit 47f77d6104)
2017-03-15 08:54:30 +01:00
Frederik Rietdijk
2880b669fb pythonPackages.pathlib2: 2.1.0 -> 2.2.1
(cherry picked from commit bd0a0c7908)
2017-03-15 08:54:30 +01:00
Frederik Rietdijk
e2f73955c2 pythonPackages.notebook: 4.3.2 -> 4.4.1
(cherry picked from commit 0c11ce6541)
2017-03-15 08:54:30 +01:00
Frederik Rietdijk
23c4eed888 pythonPackages.nbformat: 4.2.0 -> 4.3.0
(cherry picked from commit 044014826b)
2017-03-15 08:54:30 +01:00
Frederik Rietdijk
c1bbd2a30d pythonPackages.jupyter_core: 4.2.1 -> 4.3.0
(cherry picked from commit fbb30ee46f)
2017-03-15 08:54:30 +01:00
Frederik Rietdijk
1ea43b1809 pythonPackages.jupyter_client: 4.4.0 -> 5.0.0
(cherry picked from commit 2a1cceac16)
2017-03-15 08:54:30 +01:00
Frederik Rietdijk
ac7cd6d9ea pythonPackages.ipython: 5.2.1 -> 5.3.0
(cherry picked from commit 065383cde8)
2017-03-15 08:54:30 +01:00
Bjørn Forsman
5028bbaba7 qt57.full: add missing modules
qtquickcontrols2, qtwebchannel, qtwebengine, qtwebkit.

Added in the same order as the modules are listed in default.nix (and
then reformatted the block).

(cherry picked from commit db937b9d60)
2017-03-15 08:39:00 +01:00
Bjørn Forsman
7b710ef6d0 qt56.full: add missing modules
qtquickcontrols2, qtwebkit.

Added in the same order as the modules are listed in default.nix (and
then reformatted the block).

(The qt55 expression already has all modules in *full.)

(cherry picked from commit 961c73a78c)
2017-03-15 08:39:00 +01:00
Bas van Dijk
bc56929a89 wordpress: security upgrade: 4.7.2 -> 4.7.3 & other improvements (#23837)
* Moved the wordpress sources derivation to the attribute pkgs.wordpress. This
  makes it easier to override.

* Also introduce the `package` option for the wordpress virtual host config which
  defaults to pkgs.wordpress.

* Also fixed the test in nixos/tests/wordpress.nix.
(cherry picked from commit 308c09d41f)
2017-03-15 08:38:28 +01:00
Herwig Hochleitner
dc857403dd chromium: 56.0.2924.87 -> 57.0.2987.98 [Security]
(cherry picked from commit 49207a62f3)
2017-03-15 07:29:20 +01:00
Joachim Fasting
a6ef71693d grsecurity: 4.9.14-201703121245 -> 4.9.15-201703150049
Contains a fix for the n_hdlc double free bug.

(cherry picked from commit 9e60a17cb8)
2017-03-15 07:29:17 +01:00
Sander van der Burg
d9c1a77b89 disnix: 0.6 -> 0.7
(cherry picked from commit a26c51116d)
2017-03-14 23:19:53 +01:00
Franz Pletz
863deb36ff atlassian-crowd: 2.10.1 -> 2.11.1
(cherry picked from commit 5b946fdafc)
2017-03-14 23:10:54 +01:00
Franz Pletz
06165365f7 linux_4_10: 4.10.1 -> 4.10.2
(cherry picked from commit 44bd7c45dc)
2017-03-14 23:10:54 +01:00
Franz Pletz
b54314296d linux_testing: 4.11-rc1 -> 4.11-rc2
(cherry picked from commit a691c06556)
2017-03-14 23:10:53 +01:00
Franz Pletz
36854bb855 nixos/users-groups: chown home on createHome
Fixes #23619.

(cherry picked from commit 9ea35eae7a)
2017-03-14 23:10:53 +01:00
Robert Helgesson
3905792c94 eclipses: add dependencies as build inputs
Having `glib` in the build inputs will allow its build hook to
trigger. Also adds `gsettings_desktop_schemas` as a dependency since
Eclipse appears to need the schemas under certain circumstances.

(cherry picked from commit 5228bc9f2e)
2017-03-14 20:59:15 +01:00
taku0
3c61bc12b0 flashplayer: 24.0.0.221 -> 25.0.0.127 (#23889)
(cherry picked from commit c3772678e9)
2017-03-14 16:03:00 +01:00
Robin Gloster
adaf48857b refind: mark as broken
(cherry picked from commit c555556af5)
2017-03-14 15:37:16 +01:00
Robin Gloster
118011a090 hol: mark as broken
(cherry picked from commit f70a896094)
2017-03-14 15:37:16 +01:00
Robin Gloster
1ed93035fe urt: remove
(cherry picked from commit 770794cbfe)
2017-03-14 14:42:06 +01:00
Willi Butz
73fdfb5422 spotify: get source via https instead of plain http
(cherry picked from commit e4eb46129d)
2017-03-14 14:33:53 +01:00
Wei-Ming Yang
33793389ba fix the incorrect elasticsearch plugin name
elasticsearch_analisys_lemmagen -> elasticsearch_analysis_lemmagen
(cherry picked from commit 330c7e4a5f)
2017-03-14 14:33:16 +01:00
Peter Simons
235e798fc8 esniper: 2.32.0 -> 2.33.0
(cherry picked from commit 58807f75bc)
2017-03-14 14:16:04 +01:00
Frederik Rietdijk
3c6777a1c9 hypothesis: disabled for Python 3.3
(cherry picked from commit a312abedeb)
2017-03-14 10:50:15 +01:00
Tim Steinbach
57e0f0da8f linux: 4.1.38 -> 4.1.39
(cherry picked from commit 18684a4892)
2017-03-13 20:16:47 -04:00
Tim Steinbach
591d91b358 linux: 4.4.52 -> 4.4.53
(cherry picked from commit 9ac82a773c)
2017-03-13 20:16:44 -04:00
Vladimír Čunát
1c6cb9cb05 Merge #23860: llvmPackages_4: rc3 -> release
(cherry picked from commit bfed19cfaa)
2017-03-14 00:05:17 +01:00
Tim Steinbach
d4465f80a8 Merge pull request #23846 from mayflower/jenkins_2.49
jenkins: 2.44 -> 2.49(cherry picked from commit bc1f692e49)
2017-03-13 18:10:14 -04:00
Frederik Rietdijk
197b247e6b hypothesis: 3.6.0 -> 3.6.1
(cherry picked from commit 57e768f58e)
2017-03-13 16:39:17 +01:00
Frederik Rietdijk
eca54d99c6 pythonPackages.traitlets: 4.3.1 -> 4.3.2
(cherry picked from commit 8aee2b5c4f)
2017-03-13 16:39:17 +01:00
Frederik Rietdijk
019350ac01 ipython_genutils: fix for python 3.3 and 3.4
(cherry picked from commit 891a051df1)
2017-03-13 16:39:17 +01:00
Frederik Rietdijk
b095c99989 pythonPackages.hypothesis: fix for python 3.3
(cherry picked from commit 6f90badeac)
2017-03-13 16:39:17 +01:00
Robin Gloster
2d817a37e0 emboss: fix build
(cherry picked from commit e2a13af49c)
2017-03-13 13:16:20 +01:00
Robin Gloster
fec49efc98 ispc: fix build
(cherry picked from commit dbbdccdd65)
2017-03-13 12:08:29 +01:00
Robin Gloster
82b389fcfc ponyc: 0.10.0 -> 0.11.0
(cherry picked from commit 80bd50a6e4)
2017-03-13 11:44:04 +01:00
Robin Gloster
64f3d0c1be purePackages.octave: 0.7 -> 0.9
(cherry picked from commit c836651084)
2017-03-13 11:04:09 +01:00
Vladimír Čunát
ed509de913 Merge branch 'release-17.03' into staging-17.03 2017-03-13 10:38:23 +01:00
Vladimír Čunát
63ae3f061a gnutls: bugfix+security 3.5.9 -> 3.5.10
http://gnutls.org/security.html#GNUTLS-SA-2017-3
(cherry picked from commit b264486cf1)
2017-03-13 10:37:58 +01:00
Joachim Fasting
a83862ef10 tinycc: 0.9.27pre-20170220 -> 20170225
Contains a fix for x86-64 asm gen and unified cross-compilation.

(cherry picked from commit 3c37edb928)
2017-03-13 09:26:48 +01:00
Jörg Thalheim
f7cbccbf42 pump.io: fix tests
fixes #23568

(cherry picked from commit 41625dcab6)
2017-03-13 09:24:51 +01:00
Rodney Lorrimar
b5009c2cf1 pumpio service: don't keep secrets in nix store
Added extra config options to allow reading passwords from file rather
than the world-readable nix store.

The full config.json file is created at service startup.

Relevant to #18881

(cherry picked from commit f488b1811b)
2017-03-13 09:24:41 +01:00
Rodney Lorrimar
bb8dd2f2d0 pumpio service: adjust upload directory config for 3.0.0
These changes are backwards compatible.

(cherry picked from commit f1a1490135)
2017-03-13 09:24:24 +01:00
Rodney Lorrimar
6866170eaa pump.io: 1.0.0 -> 3.0.0
The package stopped building for some unknown reason (npm could no
longer fetch a module).

This is one of the build failures listed in #23253.

    http://hydra.nixos.org/build/49551309
    http://hydra.nixos.org/build/49548753

Easiest fix is to upgrade to latest stable version and regenerate
packages with node2nix.

The databank-memcached dependency needed to be dropped due to
dependency failures.

(cherry picked from commit 252e58a95e)
2017-03-13 09:20:24 +01:00
Rodney Lorrimar
321481b4d5 nodePackages: support github:owner/repo scheme for package deps
JS devs found a new way to be annoying - adjust code accordingly.

Have also put this change in PR svanderburg/node2nix#40

(cherry picked from commit 453529bd60)
2017-03-13 09:17:38 +01:00
José Romildo Malaquias
80345b551a enlightenment: 0.21.5 -> 0.21.7 (#23791)
(cherry picked from commit 16023ef598)
Bug fix/stability release for 0.21.x
2017-03-13 01:19:43 +01:00
José Romildo Malaquias
08381c07e0 qbittorrent: 3.3.10 -> 3.3.11 (#23703)
(cherry picked from commit 196f64d675)
Fixes a number of bugs, including some security issues with the
web interface.
2017-03-13 01:19:41 +01:00
tv
0af596f21e exim: 4.88 -> 4.89 (#23670)
(cherry picked from commit ba0b527456)
Contains multiple bug fixes.
2017-03-13 01:19:34 +01:00
Kranium Gikos Mendoza
e47b819ef1 asterisk: use fetchsvn for vendored library
(cherry picked from commit ac61ddef8f)
/cc #23124, #23253.  It failed to build otherwise.
2017-03-12 23:36:03 +01:00
Vladimír Čunát
a3939d186d clisp-tip: make the build more reliable
Hydra shows it sometimes fails without autoconf:
http://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.clisp-tip.x86_64-linux
I can't say I understand why this happened.

(cherry picked from commit 848423f223)
/cc #23253 and maintainers @7c6f434c, @tohl.
2017-03-12 23:11:36 +01:00
obadz
9037001880 coreclr: mark broken
(cherry picked from commit 1dd16a9374)
2017-03-12 21:32:42 +00:00
c74d
d44bf4c937 ripgrep: install man-page
Modify the `ripgrep` package to install the tool's manual page.

I have tested this commit per nixpkgs manual section 11.1 ("Making
patches").

(cherry picked from commit a856dd50b5e9d7f4de1acd158c4ae548f6de86be)
2017-03-12 22:12:48 +01:00
Rodney Lorrimar
a99e4f28e9 scala: put docs in correct subdirectory
Under NixOS, /run/current-system/sw/share/doc was getting the license
file, etc.

(cherry picked from commit e333a71478)
2017-03-12 20:33:48 +01:00
Nikolay Amiantov
03938aa359 makeDBusConf: re-add XDG directories for session bus
Fixes #23770.

(cherry picked from commit c05ac3ea12)
2017-03-12 22:17:33 +03:00
Joachim Fasting
74c77fa944 linux_4_9: 4.9.13 -> 4.9.14
(cherry picked from commit 8091c1b208)
2017-03-12 19:59:19 +01:00
Joachim Fasting
537aa63248 grsecurity: 4.9.13-201703052141 -> 4.9.14-201703121245
(cherry picked from commit 4c211bdc63)
2017-03-12 19:59:13 +01:00
ndowens
463eb1649f drumstick: 1.0.2 -> 1.1.0
(cherry picked from commit 45cfd3969a)
2017-03-12 20:24:12 +02:00
Thomas Tuegel
b45aee491f Merge pull request #23766 from orivej/kcachegrind-kdelibs
kcachegrind: init at 16.2.2

(cherry picked from commit 28e78fd3dc)
It's just adding a new package (back).
2017-03-12 19:05:29 +01:00
Vladimír Čunát
1f86d1d5bb haskellPackages.llvm-general-darwin: fix #23794
by hiding under llvm-general.  There seems no use in a separately named
attribute.  The derivations are unchanged.

(cherry picked from commit 69448187a4)
2017-03-12 18:22:42 +01:00
zetok
4d25eaafa7 gresecurity docs: fix incorrect option (#23789)
(cherry picked from commit 4ca17dd6c0)
2017-03-12 15:06:50 +01:00
Tuomas Tynkkynen
68cc97d306 linux_testing: 4.10-rc7 -> 4.11-rc1
Some config options got removed, so conditionalize them.

(cherry picked from commit 77c49794cd)
2017-03-11 16:11:42 +02:00
Franz Pletz
907a1f03b2 firmwareLinuxNonfree: 2017-02-06 -> 2017-03-11
Fixes #22365.

(cherry picked from commit c3c69535aa)
2017-03-11 15:09:29 +01:00
Robin Gloster
56f3c6b10a msilbc: fix build
(cherry picked from commit 330b0d194600001251170f66b335c2ef89b7a432)
2017-03-11 15:07:26 +01:00
Robin Gloster
e60ab0c2aa lightdm_qt: fix build
(cherry picked from commit d6d796812a)
2017-03-11 14:53:43 +01:00
Robin Gloster
1712e583e7 suil-qt5: fix build
(cherry picked from commit 91bbd73ffa)
2017-03-11 14:48:05 +01:00
Joachim Fasting
ead8fb7e8a vndr: meta.licence -> license
(cherry picked from commit 5bf3b4c7ff)
2017-03-11 14:43:00 +01:00
Joachim Fasting
8106e0f3a2 pythonPackages.pep257: meta.lecense -> license
(cherry picked from commit ba499aa845)
2017-03-11 14:42:46 +01:00
Gregor Kleen
ae81e79c10 das_watchdog: fix service type
(cherry picked from commit 899fd868ea)
2017-03-11 14:36:14 +01:00
Franz Pletz
543eeae23d qemu_test: don't apply patch for CVE-2016-9602
Both patches are conflicting. Keeping the vulnerability unpatched in qemu
binaries used for nixos test is tolerable.

(cherry picked from commit 3a4e2376e4)
2017-03-11 13:45:24 +01:00
Franz Pletz
f2c121f3ff batman-adv: 2016.5 -> 2017.0.1
(cherry picked from commit 71161443b4)
2017-03-11 09:42:13 +01:00
Franz Pletz
55e094c482 phpfpm module: set correct nixos sendmail path
(cherry picked from commit 323d0fdd5a)
2017-03-11 09:42:12 +01:00
Franz Pletz
8be6bebec1 qemu: fetch vnc bugfix patch from debian
This version of the patch applies cleanly to the 2.8.0 release.

(cherry picked from commit 621e7a9945)
2017-03-11 09:42:12 +01:00
Franz Pletz
c554cbf8c2 wget: add patch for CVE-2017-6508
(cherry picked from commit 39e8db7849)
2017-03-11 09:15:15 +01:00
Franz Pletz
641ad2e922 qemu: add patches for multiple CVEs
New upstream patch function and patches for fixing a bug in the patch for
CVE-2017-5667 and the following security issues:

  * CVE-2016-7907
  * CVE-2016-9602
  * CVE-2016-10155
  * CVE-2017-2620
  * CVE-2017-2630
  * CVE-2017-5525
  * CVE-2017-5526
  * CVE-2017-5579
  * CVE-2017-5856
  * CVE-2017-5857
  * CVE-2017-5987
  * CVE-2017-6058

(cherry picked from commit c512180f9c)
2017-03-11 09:15:14 +01:00
Franz Pletz
50586f2441 linux: 3.12.70 -> 3.12.71
(cherry picked from commit ff2313a6c6)
2017-03-11 09:15:14 +01:00
Franz Pletz
57e693ca43 lxc: add patch for CVE-2017-5985
(cherry picked from commit 3bd44428cf)
2017-03-11 09:15:14 +01:00
Franz Pletz
952e7f3910 pidgin: 2.11.0 -> 2.12.0 for CVE-2017-2640
Also removes unmaintained plugins.

See https://bitbucket.org/pidgin/www/src/tip/htdocs/ChangeLog.

(cherry picked from commit 4e0375cb59)
2017-03-11 09:15:13 +01:00
Michael Raskin
328eb9da7c libreoffice-still: apply the patch for ICU 58
see #17126

(cherry picked from commit f3a4f31554)
2017-03-10 22:41:52 +01:00
Susan Potter
a0ccb7019c dd-agent: 5.5.2 -> 5.11.2
(cherry picked from commit 35f9f63a39)
2017-03-10 17:47:57 +01:00
Susan Potter
ac6baf242e dd-agent: fix Python missing dependencies and versions
(cherry picked from commit 17a8d19032)
2017-03-10 17:47:47 +01:00
Raymond Gauthier
f51f167008 brscan4: 0.4.3-4 -> 0.4.4-2
Also add missing linux32 support.

(cherry picked from commit c7d9032b51)
2017-03-10 16:27:43 +02:00
Nikolay Amiantov
39691e1c39 networkmanagerapplet: add dconf and glib_networking
Fixes #23700.

(cherry picked from commit 7dcc40b674)
2017-03-10 16:15:09 +03:00
Peter Hoeg
064cda9b1a dropbox: 20.4.19 -> 21.4.25
(cherry picked from commit bb1496332ed66dbbd851fa13bf52929e384d1e32)
2017-03-10 14:23:49 +08:00
Vladimír Čunát
ab0824edf8 Merge #23663: thunderbird*: security 45.7.1 -> 45.8.0
(cherry picked from commit 7b7496a256)
2017-03-10 01:07:54 +01:00
Tuomas Tynkkynen
d2a52af05c simavr: Disable parallel build
http://hydra.nixos.org/build/49945319/nixlog/1/raw
(cherry picked from commit 5bb99ca0f6)
2017-03-10 01:59:52 +02:00
Tuomas Tynkkynen
8af59cfa04 john: Disable parallel build
http://hydra.nixos.org/build/49940032/nixlog/1/raw
(cherry picked from commit e7ce27f9ce)
2017-03-10 01:49:53 +02:00
Tuomas Tynkkynen
b8df6bebb0 pshs: 0.3 -> 0.3.1, fix source location
(cherry picked from commit fe20a32751)
2017-03-10 01:21:11 +02:00
Vladimír Čunát
1d92624ec2 Merge older staging-17.03 into release-17.03
Done more testing of the mesa bump; Hydra looks OK.
2017-03-09 22:24:23 +01:00
Lancelot SIX
804329a5ab qgis: 2.18.3 -> 2.18.4
(cherry picked from commit be20195704)
2017-03-09 21:38:14 +01:00
rnhmjoj
a7e26c9d9b ostinato: refactor
(cherry picked from commit 1665102688)
2017-03-09 22:28:59 +02:00
rnhmjoj
b77a47dbef libpcap: fix missing remote-ext.h error
(cherry picked from commit 4c33ea35b7)
2017-03-09 22:28:59 +02:00
Vladimír Čunát
0dd1ecef35 knot-resolver: maintenance 1.2.3 -> 1.2.4
(cherry picked from commit 74f92e9556)
2017-03-09 21:26:28 +01:00
edef
f84dcaa9d2 verilator: fix Perl shebangs
(cherry picked from commit 2c02c84cdc)
2017-03-09 18:27:26 +01:00
Orivej Desh
7f172a4c57 nixos/iso-image: support boot from USB disks
(cherry picked from commit 838051e9cd)
2017-03-09 16:05:53 +02:00
taku0
4c58afd1a2 firefox, firefox-bin: 51.0.1 -> 52.0, firefox-esr: 45.7esr -> 52.0esr
(cherry picked from commit a24aaae602)
2017-03-09 14:40:09 +01:00
Alexey Shmalko
ebdb5431c0 nss: 3.28.1 -> 3.28.3
This should fix firefox build, which fails due to nss being too old.

(cherry picked from commit cb670556c5)
2017-03-09 14:39:55 +01:00
Alexey Shmalko
feb38d4d54 sqlite: 3.16.2 -> 3.17.0
Firefox requires the latest sqlite to build:
```
checking for sqlite3 >= 3.17.0... Requested 'sqlite3 >= 3.17.0' but version of SQLite is 3.16.2
configure: error: Library requirements (sqlite3 >= 3.17.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.
```

(cherry picked from commit d4bb1c786f)
2017-03-09 14:39:55 +01:00
Alexey Shmalko
b602a308ab icu: 57.1 -> 58.2
Firefox requires new version of the icu to build:
```
checking for icu-i18n >= 58.1... Requested 'icu-i18n >= 58.1' but version of icu-i18n is 57.1
configure: error: Library requirements (icu-i18n >= 58.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.
```

(cherry picked from commit 28598c01e7)
2017-03-09 14:39:54 +01:00
Robin Gloster
5bef185ce0 Merge branch 'release-17.03' into staging-17.03 2017-03-09 14:35:53 +01:00
Joachim Fasting
b9e4091687 torbrowser: 6.5 -> 6.5.1
(cherry picked from commit 74f8e0fd7a)
2017-03-09 14:25:44 +01:00
Nikolay Amiantov
1478639ab0 primus: fix if nvidia is not used
Fixes #23628

(cherry picked from commit f36b72107c)
2017-03-09 14:38:40 +03:00
Shea Levy
08b49cfc54 stripDirs: Silence annoying 'File format not recognized' errors
(cherry picked from commit d39be63a10)
2017-03-08 19:19:18 -05:00
Jens Grunert
74af3800ad missing dconf in buildInput
(cherry picked from commit 6fb645037d)
2017-03-09 00:59:57 +01:00
Jens Grunert
1efa074939 corebird: missing dependencies (glib_networking)
(cherry picked from commit 7771db2eb6)
2017-03-09 00:59:32 +01:00
Tuomas Tynkkynen
cdd5709e45 raspberrypifw, linux_rpi: 1.20161020 -> 1.20170303
(cherry picked from commit 5f5b87107f)
2017-03-08 21:36:24 +02:00
Tuomas Tynkkynen
b89623e936 gtkglextmm: Mark as broken
No release since 2010. Build broken. Sounds like a library, but no
users. GNOME 2 stuff.

http://hydra.nixos.org/build/49554500/nixlog/3
(cherry picked from commit 8dce538640)
2017-03-08 20:16:51 +02:00
Tuomas Tynkkynen
6c0b2366e8 delve: Disable on i686
(cherry picked from commit a3a21a7245)
2017-03-08 20:10:24 +02:00
Rickard Nilsson
a6209c29be haskellPackages.streaming-eversion: dontCheck
(cherry picked from commit fb5369dbe9)
2017-03-08 17:21:48 +01:00
Jörg Thalheim
c554a0c97f purple-facebook: 2016-04-09 -> 0.9.0
(cherry picked from commit 2df1d3f828)
2017-03-08 15:31:57 +01:00
Profpatsch
9dc3f75b0b networking/bonds: fix examples
After the change of the bonding options, the examples were not quite correct.
The diff is over-the top because the new `let` needs everything indented.

Also add a small docstring to the `networkd` attr in the networking test.

(cherry picked from commit 22c265182f)
2017-03-08 15:21:23 +01:00
Tuomas Tynkkynen
2461c2977f mess: Mark broken
Even fixing the source urls doesn't make it build.

(cherry picked from commit 413bc03986)
2017-03-08 16:14:52 +02:00
Tuomas Tynkkynen
c5a10ac56f libp11: Fetch src from GitHub
(cherry picked from commit c8402dde15)
2017-03-08 15:35:07 +02:00
Ricardo Ardissone
ade5837350 gplates: use boost 160
update 161 changed reference parameters for optional
https://hydra.nixos.org/build/49707856/nixlog/1
http://www.boost.org/doc/libs/1_61_0/libs/optional/doc/html/boost_ooptional/relnotes.html

(cherry picked from commit e17d3d4ef1)
2017-03-08 13:05:36 +02:00
Tuomas Tynkkynen
0ccfb448f3 grub2: Make EFI grub work on aarch64
(cherry picked from commit a9a706770a)
2017-03-08 00:34:56 +02:00
Vladimír Čunát
f2a123c66e mesa: maintenance 17.0.0 -> 17.0.1
(cherry picked from commit 17b64e8929)
2017-03-07 22:00:50 +01:00
Vladimír Čunát
f9489cc540 Merge #23583: inetutils: fix whois for canadian domains
(cherry picked from commit 09c7601c20)
2017-03-07 21:33:34 +01:00
ndowens
ee0e856a47 scanmem: 0.15.6 -> 0.16
(cherry picked from commit cc9b960f48)
2017-03-07 17:27:46 +01:00
Peter Simons
83ba40c369 haskell-QuickCheck: fix build with ghc-7.6.x
(cherry picked from commit e0908699ff)
2017-03-07 15:44:36 +01:00
Robin Gloster
7206060114 memtest86Plus: fix runtime errors with fortify hardening
fixes #6630

(cherry picked from commit 32eecf9877)
2017-03-07 15:41:56 +01:00
Joachim Fasting
3007826374 grsecurity: 4.9.13-201702270729 -> 201703052141
(cherry picked from commit 17d80c49fa)
2017-03-07 15:19:08 +01:00
Joachim Fasting
3df572e156 btsync module: remove redundant example
The default value already gives a good example of what values to
put here.

(cherry picked from commit f278793fdb)
2017-03-07 15:19:03 +01:00
Tristan Helmich
b28a514e7e graylog: 2.2.1 -> 2.2.2
(cherry picked from commit 1af3a9854f)
2017-03-07 15:13:46 +01:00
Franz Pletz
d37b68dee3 phpfpm service: fix phpOptions
Broken due to #23216.

(cherry picked from commit d7674dabba)
2017-03-07 15:09:43 +01:00
Peter Simons
37ea115baf Synchronize R infrastructure with 'master'. 2017-03-07 14:58:21 +01:00
Robin Gloster
1fc9116c48 kiwix: remove unused param
(cherry picked from commit b94e253e69)
2017-03-07 14:16:43 +01:00
Robin Gloster
74541fc6af kiwix: fix eval and build
(cherry picked from commit 09d7f7dfbd)
2017-03-07 14:16:43 +01:00
Jan Malakhovski
50394ae5b9 kiwix: fix the build by using custom ctpp2
(cherry picked from commit 8698782554)
2017-03-07 14:16:43 +01:00
Jan Malakhovski
bf2a7853d0 kiwix: refactor expression, push pugixml into its own derivation
(cherry picked from commit 659fb3b757)
2017-03-07 14:16:42 +01:00
Joachim Fasting
68bf6ef61e nixos/modules: use defaultText/literalExample where applicable
Primarily to fix rendering of default values/examples but also
to avoid unnecessary work.

(cherry picked from commit 15da23d5c1)
2017-03-07 14:16:31 +01:00
Joachim Fasting
ad65b288e8 search module: add missing types
(cherry picked from commit 540163e4a4)
2017-03-07 14:15:52 +01:00
Eelco Dolstra
fc5d50ed58 Remove nixFallback
This causes unintended schema upgrades, and is no longer needed now
that we have nixos/modules/installer/tools/nix-fallback-paths.nix.

(cherry picked from commit d72a34311a)
2017-03-07 13:04:35 +01:00
Benno Fünfstück
24472d433c mpdris2: install locale files to correct location
The package included outdated intltool makefiles, resulting in installation of
local files to `$out/'@DATADIRNAME'`. Running `intltoolize -f` forces
regeneration of the Makefile and fixes the issue.

(cherry picked from commit f9b08c9dbb)
2017-03-07 13:02:45 +01:00
Benno Fünfstück
906cea1196 dvdisaster: fix $out variable expansion (makeFlags)
Make requires variables with more than one letter to be surrounded by parentheses,
like `$(out)`. Just writing `$out` will be interpreted as `$o` followed by `ut`, so
the package installed its documentaion to `ut/share/doc`.

/cc maintainers @jgeerds @nckx

(cherry picked from commit 3449107d68)
2017-03-07 13:02:35 +01:00
Jörg Thalheim
e95acf6e81 xfstests: set correct echo binary
(cherry picked from commit 13ed7e6631)
2017-03-07 13:01:48 +01:00
Matthias Beyer
431893ccfb Wrap command in <command>
(cherry picked from commit 87f57de8e5)
2017-03-07 12:56:35 +01:00
Matthias Beyer
edb47a364e nixos doc xfce: Tabs -> spaces
(cherry picked from commit 0a18a56375)
2017-03-07 12:56:21 +01:00
Matthias Beyer
cd6c5976eb doc: Remove indention from program listings
(cherry picked from commit c56587eb30)
2017-03-07 12:56:07 +01:00
Matthias Beyer
0cb1e29ebe nixos doc xfce: Fix missing space
(cherry picked from commit 1e3dec3baa)
2017-03-07 12:55:55 +01:00
Joachim Schiele
94fcc17b94 nixos/tests/leaps.nix: fixed race condition
(cherry picked from commit f8ad48ea1d)
2017-03-07 12:54:34 +01:00
Peter Simons
502892f563 leksah: mark build as broken to fix evaluation error 2017-03-07 12:22:55 +01:00
Peter Simons
5612f7e7b1 haskell-lol-cpp: disable build on i686 to avoid https://github.com/cpeikert/Lol/issues/29 2017-03-07 11:25:39 +01:00
Peter Simons
23fea89e18 Disable integer-simple variant of GHC 7.6.3 due to http://hydra.nixos.org/build/49538087.
Cc: @basvandijk
2017-03-07 11:21:37 +01:00
Jörg Thalheim
64c6df5e24 lxcfs: 2.0.4 -> unstable-2017-03-02
(cherry picked from commit 94497a0ef3)
2017-03-07 10:53:23 +01:00
Will Dietz
08a4888c3a mendeley: 1.16.3 -> 1.17.8, multiple improvements
* don't use bundled qt
* fix link-handler script, autorun as 'normal'
* fix execution on grsec kernels

(cherry picked from commit 37315d65a0)
2017-03-07 10:23:43 +01:00
Jan Malakhovski
586e9598ef nixos: network-interfaces-scripted: don't require mstpd when rstp is off
(cherry picked from commit 55996b8daf)
2017-03-06 20:43:34 -05:00
Daiderd Jordan
f518d5e6cf znc: 1.6.3 -> 1.6.4
(cherry picked from commit 6f88f8ca1b)
2017-03-06 20:11:08 -05:00
Graham Christensen
6111f6a756 mailpile: mark as insecure, pending removal
(cherry picked from commit 85b47bbd5e)
2017-03-06 18:03:15 -05:00
Robert Helgesson
9279742eed photivo: fix build with lensfun >= 0.3
(cherry picked from commit 747b62f909)
2017-03-06 17:46:06 -05:00
Robert Helgesson
7618a9f481 javasvn: remove
Upstream URL is invalid and the package has not had direct attention
since June 2006.

(cherry picked from commit a3e6b41d36)
2017-03-06 23:36:37 +01:00
Bart Brouns
3cce70d3ab kdenlive: phonon-backend-vlc -> phonon-backend-gstreamer
(cherry picked from commit abc0421c46)
2017-03-06 23:01:21 +01:00
Franz Pletz
fbab9a9622 youtubeDL: 2017.02.27 -> 2017.03.07
(cherry picked from commit 3fa2a5dc23)
2017-03-06 22:46:14 +01:00
Jörg Thalheim
0b43cdf03e dmtcp: 2.3.1 -> 2.5.0
(cherry picked from commit 46ba5acd82)
2017-03-06 22:02:17 +01:00
Jörg Thalheim
cdc3eb0745 xapian-ruby: link against correct xapian
(cherry picked from commit b10fb4624b)
2017-03-06 20:25:02 +01:00
Ricardo Ardissone
fa63a32348 tome4: 1.4.6 -> 1.4.9 2017-03-06 19:45:46 +01:00
Bart Brouns
606c50e9fe guitarix: remove webkit, add compile flags (#23455)
as recomended by the author: https://sourceforge.net/p/guitarix/mailman/message/33688855/

(cherry picked from commit 00ffbf060c)
2017-03-06 19:30:39 +01:00
Benno Fünfstück
84cb907ca1 phonon-backend-gstreamer: don't create $out/$out/share/icons
The build system tries to update the mtime of the icons directory if
`DESTDIR` is unset. That code has bug though that does not deal well
with absolute `CMAKE_SHARE_PREFIX` resulting a double prefix bug.

Setting `DESTDIR=/` (should be a no-op) fixes this.

(cherry picked from commit 128901e09f)
2017-03-06 18:22:41 +01:00
Benno Fünfstück
eb4c867506 ocamlgraph: fix binary location (binaries had double prefix path)
Due to setting `DESTDIR` *and* `exec_prefix` (defaulted to `$prefix`), binaries
ended up in `$out/$out/bin` instead of just $out/bin. Not setting `DESTDIR` and adapting
the `LIBDIR` patch a little fixes this issue.

(cherry picked from commit dd23d08b90)
2017-03-06 18:22:41 +01:00
Benno Fünfstück
60ddd43610 hhvm: fix location of include files in $out
Fixes a "double prefix" issue, where parts of the include files
for hhvm where located in `$out/$out/include` instead of `$out/include`.

(cherry picked from commit 029c3f917e)
2017-03-06 18:22:40 +01:00
Benno Fünfstück
72727f90bb opensc: remove obsolete DESTDIR patch
This patch was actively causing harm, because it lead to a "double prefix"
issue where the etc files were installed into $out/$out/etc instead of just
$out/etc.

(cherry picked from commit c0bfcdf3a6)
2017-03-06 18:22:40 +01:00
Peter Hoeg
fa2539bb81 xca: build against qt 5.6 as 5.7 segfaults
(cherry picked from commit 3f34000358)
2017-03-06 18:22:40 +01:00
Peter Hoeg
5bbc3e5c70 qsyncthing: build against qt 5.6 as 5.7 segfaults
(cherry picked from commit 4618585e5e)
2017-03-06 18:22:40 +01:00
Jaka Hudoklin
632f979869 pulseaudio module: set cookie env variable if running in systen wide mode
(cherry picked from commit c5607ceec5)
2017-03-06 18:22:40 +01:00
Eric Sagnes
77f498780e fcitx: fix fcitx-qt5 attribute path
(cherry picked from commit acb1032968)
2017-03-06 18:22:40 +01:00
Thomas Strobel
b8306929ef improve: modules/virtualisation/qemu-vm.nix
disk image for qemu VM with bootloader:
* remove redundant command
* improve readability
* improve execution speed
* make output more reproducible

(cherry picked from commit b9a7aacef7)
2017-03-06 18:22:40 +01:00
Anderson Torres
cb2c5caf13 sound-of-sorting: 0.6.5 -> 20150721 (#23549)
* sound-of-sorting: 0.6.5 -> 20150721

* sound-of-sorting: correct unstable version format

(cherry picked from commit e96a2f8450)
2017-03-06 18:01:04 +01:00
Alexey Muranov
91fe20cad0 doc: fix code highlighting, use valid Nix syntax
Fix code syntax highlighting by specifying language in every code block
and adding some context to Nix code blocks to make them valid
expressions.  Use the same markup style for all code blocks.  Reformat
some code blocks.

fixes #23535

(cherry picked from commit 34afc31c49)
2017-03-06 17:52:14 +01:00
Alexey Muranov
1fdaa6620c doc: cleanup whitespace in python.md
(cherry picked from commit 97c9ed0ba1)
2017-03-06 17:51:35 +01:00
Thomas Strobel
ad24ba30d3 fix: "nixos-rebuild build-vm-with-bootloader"
(cherry picked from commit 0a8d9779c5)
2017-03-06 17:43:40 +01:00
Eelco Dolstra
17f6e7bfde nix-daemon: Remove a bunch of unnecessary environment variables
(cherry picked from commit 3971876585)
2017-03-06 16:54:59 +01:00
Eelco Dolstra
630e3809a1 Fix incorrect $NIX_BUILD_HOOK on Nix 1.12
(cherry picked from commit 3070c88798)
2017-03-06 16:54:59 +01:00
Eelco Dolstra
02546ff817 nixos-rebuild: Sync /nix/store only
We only care about /nix/store because its contents might be out of
sync with /nix/var/nix/db. Syncing other filesystems might cause
unnecessary delays or hangs (e.g. I encountered a case where an NFS
mount was taking a very long time to sync).

(cherry picked from commit 136f77b7b9)
2017-03-06 16:54:59 +01:00
Thomas Tuegel
3cc2a33d9b nixos/doc/manual: rename plasma5 desktop
(cherry picked from commit ecb65eceaa)
2017-03-06 16:54:00 +01:00
Thomas Tuegel
cf74cb2b7c nixos-generate-config: rename plasma5 desktop
(cherry picked from commit d91637c546)
2017-03-06 16:54:00 +01:00
Thomas Tuegel
5a1ff8cf05 nixos: fix renaming warning in graphical profile
(cherry picked from commit 8e6bdcc731)
2017-03-06 16:54:00 +01:00
Thomas Tuegel
8df2ea5217 nixos/tests/trac: fix renaming warning
(cherry picked from commit 60817e4715)
2017-03-06 16:54:00 +01:00
Thomas Tuegel
6502e9ffe0 nixos/tests/phabricator: fix renaming warning
(cherry picked from commit e7b0b2bb66)
2017-03-06 16:53:59 +01:00
Thomas Tuegel
f6cd3bda44 nixos/tests/plasma5: fix test name
(cherry picked from commit dcee54c935)
2017-03-06 16:53:59 +01:00
Thomas Tuegel
8dc7f7d508 nixos: fix renaming warning in KDE closure
(cherry picked from commit 7755fcd543)
2017-03-06 16:53:09 +01:00
Thomas Tuegel
f769c470cf nixos/tests: fix Plasma 5 test
(cherry picked from commit 0da421ce17)
2017-03-06 16:47:54 +01:00
Thomas Tuegel
d1ed241f42 iso_graphical: fix warning about Plasma 5 desktop module name
(cherry picked from commit 80e883a7c3)
2017-03-06 16:47:12 +01:00
Thomas Tuegel
678f5dde01 fricas: 1.2.2 -> 1.3.1
(cherry picked from commit 28cb067600)
2017-03-06 16:45:49 +01:00
Tuomas Tynkkynen
befc166834 sbagen: Fix build
(cherry picked from commit 064a1e09ad)
2017-03-06 17:13:55 +02:00
Peter Simons
c0ecd3109f Synchronize Haskell package set from 'master'. 2017-03-06 14:39:41 +01:00
Rob Vermaas
fce036d164 Update nixUnstable 2017-03-06 13:31:06 +00:00
ndowens
6c2e2556b6 flacon: 2.0.1 -> 2.1.1
fixes #23529

(cherry picked from commit 4ae0e8c9a9)
2017-03-06 10:47:18 +01:00
Ricardo Ardissone
4e6a5b57cd pcsxr: remove name conflict with zlib 1.2.9
(cherry picked from commit 92d8680785)
2017-03-06 09:01:06 +01:00
Renaud
c7509af0fb uriparser: 0.8.2 -> 0.8.4
Fixed the Makefile for the doc : there is no .map files to install in
this release since dot outputs images in PNG and SVG

fixes #23456

(cherry picked from commit f39e718cab)
2017-03-06 08:44:09 +01:00
Jörg Thalheim
19746a1dcc Merge pull request #23284 from veprbl/release-17.03_herwig_fix
herwig: disable i686-linux
2017-03-06 08:32:44 +01:00
Jörg Thalheim
e5a4ad8de3 alliance: mark as broken
there is no maintainer for this package and even debian looks
for a new maintainer.

(cherry picked from commit 99e74e9509)
2017-03-06 08:29:27 +01:00
Jörg Thalheim
f100d4d049 fcron: add missing meta.platforms
(cherry picked from commit 82fda65c8a)
2017-03-05 23:43:48 +01:00
Henry Till
0cac30f534 racket: disable i686 builds
ref #23253

(cherry picked from commit 6ed6731e36)
2017-03-05 23:28:49 +01:00
Jörg Thalheim
6bc2d872aa fcron: 3.1.2 -> 3.2.1
fixes #23320 #23413

(cherry picked from commit 947815f59f)
2017-03-05 22:46:11 +01:00
Vladimír Čunát
5c1fdb1df4 Merge #22562: xfce4-mailwatch-plugin: init at 1.2.0
(cherry picked from commit 8bcbd4fca3)
2017-03-05 21:12:55 +01:00
Matthias Beyer
2fbc8a970d xfce4-mpc-plugin: init at 0.4.5 (#22560)
(cherry picked from commit 20c2f51967)
2017-03-05 21:12:48 +01:00
Matthias Beyer
028aa8b556 xfce-timer-plugin: init at 1.6.0 (#22563)
(cherry picked from commit 21c51c570e)
2017-03-05 21:12:44 +01:00
Jesper Geertsen Jonsson
7c767a3cab grsecurity docs: fix syntax and indentation errors
Closes https://github.com/NixOS/nixpkgs/pull/23515

(cherry picked from commit 056e57678d)
2017-03-05 16:09:06 +01:00
Alistair Bill
4ff9732b6a msgpack-tools: fix sandbox build
(cherry picked from commit fa5ecc2d1a)
2017-03-05 15:17:48 +01:00
Théo Zimmermann
7d1f0c2f69 coq: default version 8.4pl6 -> 8.6 2017-03-05 13:15:54 +00:00
Théo Zimmermann
855c488115 coq_8_4: ocaml dependency 4.01 -> 4.02 2017-03-05 13:15:40 +00:00
Bjørn Forsman
77777e6d45 nixos/nix-daemon: doc: use literalExample
Makes the example more readable by not squashed everything onto one
single line.

(cherry picked from commit 316e7d6764)
2017-03-05 14:08:19 +01:00
zraexy
3cafb672b2 eclipse: Do not use webkitgtk2 by default
Tell callPackage to not include webkitgtk2 due to the fact that it has
multiple vulnerabilities.

(cherry picked from commit 49ea0e2736)
2017-03-05 11:35:58 +01:00
zraexy
9bc2992d97 eclipse: import builder instead of callPackage
Switched from callPackage to import so that dependencies are passed
instead of being grabbed from pkgs.

[Bjørn: wrap overlong line.]

(cherry picked from commit 7582da5d8b)
2017-03-05 11:35:57 +01:00
Bjørn Forsman
a9d2aaa66b eclipse: add aliases for "latest" versions
Add aliases like "eclipse-cpp = eclipse-cpp-46" so that user
configurations can point to "eclipse-cpp" and have it not regularly
break as nixpkgs is updated.

(cherry picked from commit 81de55118d)
2017-03-05 11:35:57 +01:00
rnhmjoj
29332b43ea libchop: fix package
(cherry picked from commit fc12998c3a)
2017-03-05 07:47:49 +01:00
Shea Levy
8e72857c55 Add locateDominatingFile lib function
(cherry picked from commit 56e71f62dc)
2017-03-04 13:17:17 -05:00
Joachim Fasting
5de841bf9f mu: leave mug off by default
This unbreaks the package after marking legacy webkit as
insecure.  Per upstream, mug is a toy.

(cherry picked from commit 7b914b2986)
2017-03-04 19:16:16 +01:00
Graham Christensen
84deb2205c jitsi: 2.8.5426 -> 2.10.5550 for CVE-2017-5603
(cherry picked from commit 6011e3ea93)
2017-03-04 09:10:08 -05:00
Frederik Rietdijk
75fc482ee4 pythonPackages.sympy: disable tests
(cherry picked from commit dc2bf68d7b)
2017-03-04 14:29:55 +01:00
Peter Simons
cb1af9fd4f haskell-arithmoi: test suite fails on i686 2017-03-04 14:11:06 +01:00
Vincent Laporte
08a31de873 solc: fix build
Prevent the download of jsoncpp to happen at build time.
Don’t treat warnings as errors, since there is a warning about the major() macros in GNU libc.
2017-03-04 14:05:54 +01:00
Vincent Laporte
f891d53896 ocamlPackages.core_extended_p4: fix build on linux 2017-03-04 14:05:35 +01:00
Peter Simons
3e3dfdd085 haskell-diagrams-lib: test suite fails on i686 2017-03-04 14:03:24 +01:00
Léo Gaspard
2f95a293c3 openldap module: fix paths for example includes
(cherry picked from commit 0e2bd7e248)
2017-03-04 13:31:08 +01:00
Daiderd Jordan
994a373001 vim-plugins: add some more plugins
(cherry picked from commit 5262f5e3a2)
2017-03-04 13:24:17 +01:00
Daiderd Jordan
936a6c0f8f vim-plugins: update with https sources
(cherry picked from commit f14b001e27)
2017-03-04 13:24:16 +01:00
Daiderd Jordan
f7636f9d96 vim-plugins: use https for github repositories
(cherry picked from commit 8977b1f2ee)
2017-03-04 13:24:06 +01:00
ndowens
996ea7dcee smc: 6.3.0 -> 6.6.0
(cherry picked from commit d8a7b507d9)
2017-03-04 13:10:24 +01:00
mimadrid
51b53fd8a3 gparted: 0.26.1 -> 0.28.1
(cherry picked from commit 04283047a5)
2017-03-04 12:58:57 +01:00
mimadrid
e5e3cec6a2 qshowdiff: fix build
(cherry picked from commit 2b38cbb329)
2017-03-04 12:48:59 +01:00
rnhmjoj
d0088e29ad mitmproxy: 1.0.2 -> 2.0.6
(cherry picked from commit 6c08b145ab)
2017-03-04 12:59:07 +02:00
rnhmjoj
e81caaa513 kaitaistruct: init at 0.6
(cherry picked from commit 9b6164ffb9)
2017-03-04 12:59:01 +02:00
Tuomas Tynkkynen
16bd655eee kernel config: Enable IP_MULTICAST
This is lacking on ARM and causes libuv tests to fail.

(cherry picked from commit 57c6fac3e9)
2017-03-04 12:58:56 +02:00
Vladimír Čunát
25c590f910 xorg.xorgserver: security 1.19.1 -> 1.19.2
Various bugfixes including CVE-2017-2624.
It seems to run without any problems for me.

(cherry picked from commit da3c0ac19c)
2017-03-04 09:06:13 +01:00
Frederik Rietdijk
d0a7bce84b pythonPackages.jupyter: set priority
in order to prevent a collision.

(cherry picked from commit f8e5b8dbe2)
2017-03-04 08:19:40 +01:00
Nikolay Amiantov
40284858de liferea: add libnotify
I've accidentially removed it from build inputs.

Notice that GNOME 3 icons weren't removed accidentially -- it works without
them for me on XFCE.

(cherry picked from commit fe265f129e)
2017-03-04 01:16:21 +03:00
Nikolay Amiantov
e8291b381d liferea: 1.10.19 -> 1.12-rc2
It's a release candidate but it works with new WebKitGTK and we don't build old
one anymore because of vulnerabilities.

(cherry picked from commit 4a6ba21bdd)
2017-03-04 01:16:17 +03:00
Joachim Fasting
5436f4d63e torchat: mark as broken
Looks abandoned by upstream (last commit 2014, no response on
issue tracker).  For an application of this nature it seems
prudent to simply mark the package as broken instead of
attempting to fix the build.

Prospective users can check out richochet or tor messenger.

(cherry picked from commit db2f87a998)
2017-03-03 23:08:32 +01:00
Michael Raskin
20512381c5 vim_configurable: enable ximSupport by default
(cherry picked from commit 8eccd34f10)
It seems a realtively useful tiny change and 17.03 is only beta ATM.
2017-03-03 21:36:04 +01:00
ndowens
4668318706 trash-cli: 0.12.9.14 -> 0.17.1.14
(cherry picked from commit 477014fd6a)
2017-03-03 21:11:43 +01:00
Franz Pletz
ed26f005e1 xca: fix build
cc #23253

(cherry picked from commit 3d2e118a55)
2017-03-03 21:04:39 +01:00
Bart Brouns
1b52b27929 beast: mark as broken
(cherry picked from commit 0297fdc764)
2017-03-03 20:17:57 +01:00
Joachim Fasting
86f6b49f1f Revert "guitarix: webkitgtk2 -> webkitgtk (#23390)"
This reverts commit fbfb1017b7.

See c48f6b152fbdc29c1379d681ee916485c81f53c1
2017-03-03 17:22:46 +01:00
Bart Brouns
fbfb1017b7 guitarix: webkitgtk2 -> webkitgtk (#23390)
(cherry picked from commit 0e2a8cd01c)
2017-03-03 17:01:32 +01:00
Bart Brouns
d56cbf6780 VoiceOfFaust: fix pitchTracker (#23394)
(cherry picked from commit 3d3096b229)
2017-03-03 17:01:26 +01:00
Tom Hunger
6431f49ddc pandas: Mark broken in i686.See #23253.
(cherry picked from commit 59036096b7)
2017-03-03 16:36:25 +01:00
Frederik Rietdijk
c7808fd50c Python 3.6 fixup expat and libffi, fixes #23406
(cherry picked from commit a1f6b8b5fc)
2017-03-03 16:28:55 +01:00
Frederik Rietdijk
9e11df2b95 Python 3.4: fixup expat and libffi, fixes #23325
(cherry picked from commit b588ed95b9)
2017-03-03 16:28:19 +01:00
Robin Gloster
75e9a4973f scid: fix build
(cherry picked from commit fc57e634f3)
2017-03-03 15:18:15 +01:00
Vladimír Čunát
5b0c9d4f92 luajitPackages.mpack.meta.broken = true
It seems only to link succesfully to vanilla lua.
http://hydra.nixos.org/build/49554613

(cherry picked from commit 913aae40ba)
2017-03-03 14:12:03 +01:00
Robin Gloster
872ef22924 ikarus: remove
unmaintained, only works on 32 bit

(cherry picked from commit bb9a37a2a5)
2017-03-03 13:44:20 +01:00
Benno Fünfstück
f3dcb1a92c xrectsel: remove unnecessary DESTDIR=$out
This avoids files being installed to $out/nix/store

(cherry picked from commit ac592121b9)
2017-03-03 13:44:14 +01:00
Benno Fünfstück
a561b2176a ffcast: remove unnecessary DESTDIR=$out
This avoids files being installed to $out/nix/store

(cherry picked from commit a8458bb506)
2017-03-03 13:44:13 +01:00
Benno Fünfstück
cdffb1771e boinc: fix location of /etc in $out
Looks like the latest version no longer requires the patch, and the patch instead resulted in
/etc files being installed to `$out/$out/etc` instead of `$out/etc`

(cherry picked from commit 253d736398)
2017-03-03 13:44:13 +01:00
Robin Gloster
4f4994412f libclc: fix evaluation
(cherry picked from commit 75c3f00971)
2017-03-03 12:40:50 +01:00
Benno Fünfstück
e13f6d34de libbladeRF: fix udev rule location in $out
Shell variables in cmakeFlags are not expanded, so the rules instead ended up
in `$out/'$out'/etc/udev/rules.d`.
2017-03-03 12:31:54 +01:00
Benno Fünfstück
e2773cd699 vbam: fix location of etc in output
Shell variables are not expanded in cmakeFlags, so the etc files ended up in
`$out/'$out'/etc` instead of the expected `$out/etc`.
2017-03-03 12:31:52 +01:00
Carles Pagès
026cca444c hexen: mark as broken
Does not build and is not maintained.

(cherry picked from commit 0f9517eb9e)
2017-03-03 12:05:12 +01:00
Domen Kožar
2f4003b561 haskellPackages.http-api-data: dontCheck 2017-03-03 11:45:47 +01:00
Eric Bailey
e7af40894c erlangR19: 19.2 -> 19.2.3
This fixes dialyzer for me.

- http://erlang.org/pipermail/erlang-bugs/2017-January/005213.html
- e27119948f

(cherry picked from commit 6e9133fec1)
2017-03-03 10:53:46 +01:00
Carles Pagès
1e95b664ec pfixtools: fix build with unbound-1.6.1
(cherry picked from commit 86a1d6f4aa)
2017-03-03 10:24:58 +01:00
Peter Simons
e42bc77fd4 Drop obsolete, unmaintained haskell.packages.lts-x_y package sets.
Stack no longer uses them since a long time: https://github.com/commercialhaskell/stack/issues/2259.

(cherry picked from commit 09a593b3de)
2017-03-03 09:28:44 +01:00
Vladimír Čunát
8639a3eac7 Merge #23408: llvm: 4.0rc2 -> 4rc3
and rename attributes 4.0 -> 4

(cherry picked from commit 92f454e73c)
2017-03-03 08:27:06 +01:00
Joachim Fasting
0efeb766e4 nvidiabl: mark as broken on kernels >4.4
All builds on kernels >4.4 fail.

(cherry picked from commit c5785dc3eb)
2017-03-03 00:24:31 +01:00
Joachim Fasting
637337f1e0 cryptodev: mark as broken for kernels >4.4
All builds for kernels above 4.4 fail; there is no newer
upstream version.

(cherry picked from commit 7f31a8e359)
2017-03-03 00:24:29 +01:00
Joachim Fasting
60a64b2933 tor: split out geoip data
Saves about 5.2 MiB.

To use geoip, add something like
```
GeoIPFile ${tor.geoip}/share/tor/geoip
GeoIPv6File ${tor.geoip}/share/tor/geoip6
```
to torrc

(cherry picked from commit c44a41c73f)
2017-03-03 00:24:28 +01:00
Bart Brouns
8874e3fce5 synthv1: 0.7.6 -> 0.8.0
(cherry picked from commit 33e23934a7)
2017-03-03 01:13:35 +02:00
Tuomas Tynkkynen
79b276acb8 gf2x: Disable i686 build
http://hydra.nixos.org/build/49552136/nixlog/3/raw
(cherry picked from commit 1254f1a46a)
2017-03-03 00:23:30 +02:00
Spencer Janssen
c586ecba37 cockatrice: 2015-09-24 -> 2017-01-20
(cherry picked from commit b67ce6baf9)
2017-03-03 00:16:22 +02:00
Peter Simons
aa4a99c48c Synchronize Haskell infrastructure with 'master' at b923fd5253. 2017-03-02 23:03:43 +01:00
rnhmjoj
5435ad7f68 gitfs: 0.2.5 -> 0.4.5.1
(cherry picked from commit 1b9875220f)
2017-03-02 23:52:04 +02:00
Itai Zukerman
b12aacc7c1 bazel: add gcc to PATH and simplify patch
Removed patches that are purely for testing.
Removed dependencies that seemed to not be needed.
Expand all instances of #!/bin/bash, not just those at the start of scripts.

(cherry picked from commit 1f709ad136)
2017-03-02 16:13:50 +01:00
Maximilian Güntner
b8ae045cac ipfs: 0.4.5 -> 0.4.6
(cherry picked from commit aa429e6775)
2017-03-02 16:13:50 +01:00
Gauthier POGAM--LE MONTAGNER
b42688d7f5 atom: 1.14.3 -> 1.14.4
(cherry picked from commit 869bc1c07e)
2017-03-02 16:13:50 +01:00
Graham Christensen
17a3e979a4 kdeApplications.kdelibs: patch for insecure URL passing
(cherry picked from commit 7abda54bbb)
2017-03-02 08:34:43 -05:00
Graham Christensen
9daae5bb85 kdeFrameworks.kio: patch for insecure URL passing
(cherry picked from commit 5ce06263a3)
2017-03-02 08:28:25 -05:00
Robin Gloster
0bbcbd2679 btrfs-dedupe: dependency is broken on i686
(cherry picked from commit 6034d429fc)
2017-03-02 14:24:19 +01:00
Robin Gloster
c0d8c6ec84 libsForQt5.qmltermwidget: fix build
(cherry picked from commit c1866cade9)
2017-03-02 14:14:10 +01:00
Katona László
a0296b2683 cytoscape: fixed issue with startup script
(cherry picked from commit 085502dd80)
2017-03-02 14:14:10 +01:00
Gregor Kleen
bd265c553a locate: fix security.wrappers
(cherry picked from commit 3deb85bc63)
2017-03-02 13:42:16 +01:00
Anders Papitto
ac396e9aeb Revert "buildRustPackage: fix deprecated use of registry.index config key"
This reverts commit e8aa8cc94b.

(cherry picked from commit 095cf1b903)
2017-03-02 13:40:55 +01:00
Robin Gloster
1b9e238057 d4x: remove
removed in debian in 2010

(cherry picked from commit 306eb6ded0)
2017-03-02 13:21:44 +01:00
Robin Gloster
8b646305ce cuter: fix build
(cherry picked from commit feffa1aabf)
2017-03-02 13:02:25 +01:00
Robin Gloster
042b815b4f cuter: fix indentation
(cherry picked from commit eebb5f20a3)
2017-03-02 13:02:25 +01:00
Domen Kožar
7f31bf388f electron: 1.4.13 -> 1.4.15 2017-03-02 12:57:06 +01:00
Robin Gloster
594651e713 maintainers/hydra-eval-failures: flush stdout more often
(cherry picked from commit c5367a4409)
2017-03-02 11:46:53 +01:00
Andreas Herrmann
481630a5f6 blitz: switch back to boost-1.60
The build fails with boost-1.62.
More specifically, the test of the boost-serialization integration fails
due to the protected destructor in the class template `MemoryBlock`.

(cherry picked from commit 5a68d5484e)
2017-03-02 11:41:13 +01:00
Robin Gloster
c50d41189c haskellPackages.cabal-lenses: add comment to upstream issue 2017-03-02 11:04:46 +01:00
ndowens
df3a82dc1e speedtest-cli: 0.3.4 -> 1.0.2
(cherry picked from commit 32cf5c4d02)
2017-03-02 11:02:34 +01:00
ndowens
2b5141ccef enca: 1.16 -> 1.19
(cherry picked from commit 775e8eb4a4)
2017-03-02 11:02:34 +01:00
ndowens
ceea1b8fd0 highlight: 3.28 -> 3.35
(cherry picked from commit 9655567c09)
2017-03-02 11:02:34 +01:00
ndowens
ac1bb0d36d kytea: 0.4.6 -> 0.4.7; source was still pointing to version 0.4.6
(cherry picked from commit 8f29ca2104)
2017-03-02 11:02:33 +01:00
ndowens
cb5208851a swaks:20130209.0 -> 20170101.0
(cherry picked from commit 021046a72e)
2017-03-02 11:02:33 +01:00
ndowens
8d9d4122e2 quicktun: 2.2.4 -> 2.2.5
(cherry picked from commit d072ac28f8)
2017-03-02 11:02:33 +01:00
Vladimír Čunát
bfca6a9e5f tested job: drop the hibernate test on i686 for now
/cc #23107.

(cherry picked from commit 45344fdf19)
2017-03-02 11:02:32 +01:00
ndowens
46ff3c037f discount: 2.2.0 -> 2.2.2
Discount: added missing update
(cherry picked from commit 3df8bef60e)
2017-03-02 11:02:22 +01:00
Charles Strahan
b47d680763 mesos: fix build with latest gcc/glibc
/cc #23253

(cherry picked from commit 2c0225add6)
2017-03-02 11:02:22 +01:00
Tobias Geerinckx-Rice
a9c8a484d1 phc-intel: 0.4.0-rev22 -> 0.4.0-rev24
Fixes Hydra failures on kernel >= 4.10 by only supporting kernel >= 4.10.

(cherry picked from commit b12b4eaca6)
2017-03-02 11:02:15 +01:00
ndowens
e005041cab di: 4.42 -> 4.43
(cherry picked from commit 204850c975)
2017-03-02 11:02:15 +01:00
Eelco Dolstra
acddebc840 nixUnstable: 1.12pre4997_1351b0d -> 1.12pre5060_fa125b9
(cherry picked from commit f5e53aea5d)
2017-03-02 10:54:35 +01:00
Peter Hoeg
fba286ec64 dropbox: 19.4.13 -> 20.4.19
(cherry picked from commit 1fbcce4448)
2017-03-02 11:47:04 +08:00
rnhmjoj
78d80da512 eztrace: add missing dependency
(cherry picked from commit 83462da296)
2017-03-02 04:01:26 +02:00
Tuomas Tynkkynen
ed0dd35025 lkl: Broken on i686
http://hydra.nixos.org/build/49534265
(cherry picked from commit 439facec2a)
2017-03-02 04:01:06 +02:00
Tuomas Tynkkynen
5a2b3c38e6 radeontools: Mark as broken
The upstream release is from 2004. The website of this software talks
about configuring XFree86. I *highly* doubt this software is of any use
nowadays.

(cherry picked from commit 256e764226)
2017-03-02 02:30:21 +02:00
Joachim Fasting
f90e5baa92 tor: 0.2.9.9 -> 0.2.9.10
The 0.2.9 series is now a long-term support release, which will
receive backported security fixes until at least 2020.

tor should now build against libressl, as in
```nix
tor.override { openssl = libressl; }
```

Also re-enable the test-suite; works fine on my end.

(cherry picked from commit 05054e34c0)
2017-03-02 00:14:22 +01:00
Joachim Fasting
fe132d2645 openisns: fix empty lib output
Looks like enable-shared defaults to false, so we actually
ended up with no usable object files in the lib output.

This also appears to have broken open-iscsi, as evinced by

/nix/store/[...]-binutils-2.27/bin/ld: cannot find -lisns
collect2: error: ld returned 1 exit status
make[1]: *** [Makefile:57: iscsid] Error 1

https://hydra.nixos.org/build/49437400/log/raw

With this patch, open-iscsi builds fine here.

(cherry picked from commit ab6d358ebf)
2017-03-01 21:42:56 +01:00
Tuomas Tynkkynen
923aaf88bb memtest86: Mark as broken
It fails with hardening-related errors like:

reloc.o: In function `.L41':
reloc.c:(.text+0x452): undefined reference to `__stack_chk_fail_local'

... and several others as well!

Since nobody has noticed that this package has been broken the entire
16.09 release, it's probably not worth to try fixing it.

(Note that this is a different package from memtest86plus!)

(cherry picked from commit 8dcfa44a53)
2017-03-01 22:26:45 +02:00
ndowens
589a4ecaae catdoc: 0.94.2 -> 0.95
(cherry picked from commit c393512809)
2017-03-01 19:26:42 +01:00
Shea Levy
c73744f419 haskell generic-builder: Pass through the list of haskell build inputs.
Useful for building custom envs.

(cherry picked from commit c153036525)
2017-03-01 13:01:20 -05:00
Bjørn Forsman
2ebc198933 simavr: 1.3 -> 1.5 (fixes build)
(cherry picked from commit 96d774747b)
2017-03-01 18:12:20 +01:00
ndowens
d60e77f1c8 hwinfo: 21.23 -> 21.38
(cherry picked from commit d12030d175)
2017-03-01 17:58:40 +01:00
Robin Gloster
cd9edfbcf6 haskellPackages.cabal-lenses: fix build
(cherry picked from commit b2919b454f)
2017-03-01 17:27:24 +01:00
Tuomas Tynkkynen
4569de16d8 trinity: Apply upstream commit as a patch to fix build
Needed since glibc 2.25.

(cherry picked from commit 0495b34782)
2017-03-01 17:13:00 +01:00
Shea Levy
9a9c0282d5 Merge branch 'release-17.03' of github.com:NixOS/nixpkgs into release-17.03 2017-03-01 11:11:57 -05:00
Robin Gloster
d6f06f8584 haskellPackages.rank1dynamic: fix build
(cherry picked from commit a3e4321297)
2017-03-01 17:10:29 +01:00
Robin Gloster
8e1aca5e8c haskellPackages.OrderedBits: fix build
(cherry picked from commit fd770dd176)
2017-03-01 17:10:28 +01:00
Shea Levy
4cbf067425 haskell generic-builder: Pass through the ghcEnv.
Will be useful for nix-buffer

(cherry picked from commit a27bc8b317)
2017-03-01 11:10:19 -05:00
Shea Levy
fcfc629c2f nixBufferBuilders.withPackages: Fix buffer count logic
(cherry picked from commit bae77363c3)
2017-03-01 11:10:17 -05:00
Christoph Hrdinka
730d675ef3 retroarch.beetle-saturn: set platforms to x86_64-linux
cc #23253.

Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
2017-03-01 16:19:57 +01:00
Robin Gloster
c3a8685fcf haskellPackages.machines: fix build
(cherry picked from commit 12ca09d14e)
2017-03-01 15:56:52 +01:00
Robin Gloster
86292f517e haskellPackages.gl: fix build
(cherry picked from commit eea7819af8)
2017-03-01 15:51:43 +01:00
Robin Gloster
c66cbafdbb haskellPackages.DPutils: fix build 2017-03-01 15:40:09 +01:00
Michael Raskin
14b680a698 profanity: 0.5.0 -> 0.5.1
(cherry picked from commit b8812dfeac)
2017-03-01 15:40:03 +01:00
Jörg Thalheim
7b61c6aef0 cockatrice: add unstable version prefix
(cherry picked from commit fb81abdc7d)
2017-03-01 14:10:41 +01:00
Nikolay Amiantov
8c80d71781 kmscon service: disable systemd-vconsole-setup
cc #22470.

(cherry picked from commit 516a7fc7bd)
2017-03-01 13:48:19 +03:00
Vladimír Čunát
c29b34d1f0 ploticus: fixup a manual-page symlink
With new man compression this caused a build error.

(cherry picked from commit 64d4bfd139)
2017-03-01 11:43:21 +01:00
Vladimír Čunát
6b31dbd7ef unbound: only use the two-phase build on Linux
Hydra shows some problems on Darwin with structure defns/decls.
http://hydra.nixos.org/build/49463873/nixlog/1/raw

(cherry picked from commit 5c89ab7cb6)
2017-03-01 11:43:21 +01:00
Gabriel Ebner
fdf0adf4ea qt5.qttools: fix path to qhelpgenerator
(cherry picked from commit ffcc897090)
2017-03-01 11:43:21 +01:00
Vladimír Čunát
7934c12dab libuv: disable a problematic test on Darwin
(cherry picked from commit e6541423b6)
2017-03-01 11:43:21 +01:00
Vladimír Čunát
09a8feb709 xorg.libX11: 1.6.4 -> 1.6.5
It seems like a maintenance release.

(cherry picked from commit 59d1ce1c7a)
2017-03-01 11:43:20 +01:00
Vladimír Čunát
cfcfd11443 Merge #23245: break gnutls -> openssl dependency
(cherry picked from commit 18bd007714)
2017-03-01 11:42:52 +01:00
Vladimír Čunát
8ffb8b783a Merge #22854: mesa: 13.0.x -> 17.0.0
The versioning scheme is changing to start with the year.

(cherry picked from commit a9c7610874)
2017-03-01 11:42:51 +01:00
Vladimír Čunát
2755f490a5 binutils: drop the $dev/bin symlink
Fixes #18839.  I suspect I once added this just because of some
deficiencies in an early development version of the multiple-output
framework in stdenv.

(cherry picked from commit e2e270d1e2)
2017-03-01 11:42:42 +01:00
Vladimír Čunát
74ccd31491 compress-man-pages: skip compressed manpages
Because of bash 4.4 the semantics GLOBIGNORE changed.
This resulted in already compressed manpages to be compressed twice.
Also be careful about symlinks to fix #21777, e.g. the ledger example.

(cherry picked from commit 20ffc3cd73)
2017-03-01 11:42:41 +01:00
Frederik Rietdijk
d40b604b59 Python 2.7: increase priority - fixup
From the manual:

> This attribute should be a number, with a higher value denoting a
lower priority. The default priority is 0.

Just passing -5 or -10 wasn't sufficient, so let's make it -100.

(cherry picked from commit 079353e208)
2017-03-01 11:42:41 +01:00
Frederik Rietdijk
9d2594813e pythonPackages.packaging: 16.7 -> 16.8
(cherry picked from commit 57afc0f5ef)
2017-03-01 11:42:41 +01:00
Frederik Rietdijk
53fd4bc07e pythonPackages.pyparsing: 2.1.8 -> 2.1.10
(cherry picked from commit 1b66b6a5ff)
2017-03-01 11:42:40 +01:00
Frederik Rietdijk
92105f8212 Python 2.7: increase priority
Higher priority than Python 3.x so that `/bin/python` points to
`/bin/python2` in case both 2 and 3 are installed.

(cherry picked from commit 4bc1d02698)
2017-03-01 11:42:40 +01:00
Frederik Rietdijk
bee7854032 Merge pull request #22585 from FRidh/repr
Python: deterministic interpreters
(cherry picked from commit 04c41e753b)
2017-03-01 11:42:17 +01:00
Vladimír Čunát
7f8f848128 findutils: add the forgotten file (I'm sorry)
/cc #23152.

(cherry picked from commit f157956266)
2017-03-01 11:42:12 +01:00
Vladimír Čunát
851b93c427 Merge #23171: curl: 7.53.0 -> 7.53.1
(cherry picked from commit 39e736b3d9)
2017-03-01 11:42:05 +01:00
Vladimír Čunát
d0bc55412d findutils: fixup sandboxed build after #23152
(cherry picked from commit 2f726fed9f)
2017-03-01 11:41:50 +01:00
Franz Pletz
9117d57d84 utillinux: 2.29 -> 2.29.2 for CVE-2017-2616
cc #23072

(cherry picked from commit 9d14ea4295)
2017-03-01 11:41:48 +01:00
Eelco Dolstra
ac54ef17e4 Merge pull request #23152 from mogria/updatedb-standalone
findutils: updatedb now uses writable database outside of /nix/store by default
(cherry picked from commit 0081c6a04c)
2017-03-01 11:41:36 +01:00
Frederik Rietdijk
58286f1876 Merge pull request #22863 from romildo/upd.pygments
pygments: 2.1.3 -> 2.2.0
(cherry picked from commit 4810677227)
2017-03-01 11:41:34 +01:00
Peter Hoeg
d8df9a7983 libbsd: 0.8.2 -> 0.8.3
(cherry picked from commit fa03b8279f)
2017-03-01 09:10:26 +01:00
Joachim Fasting
c4e5b084c6 pan: sha1 -> sha256
(cherry picked from commit 026366b00b)
2017-03-01 09:10:26 +01:00
Joachim Fasting
38ad03ffaa rhash: sha1 -> sha256
(cherry picked from commit 56ae1e25af)
2017-03-01 09:10:26 +01:00
Joachim Fasting
3f53158cab cdparanoia: sha1 -> sha256
(cherry picked from commit a6ee264f1b)
2017-03-01 09:10:26 +01:00
Jörg Thalheim
9aee654160 cheat: 2.1.27 -> 2.1.28
(cherry picked from commit f876ae4b92)
2017-03-01 09:10:22 +01:00
Benjamin Staffin
0546ba6748 bazel: Wrap so java is present at runtime
Bazel can't start up without javac in $PATH.

(cherry picked from commit 7c17c10bab)
2017-03-01 09:09:19 +01:00
Benjamin Staffin
e2efc8abdb bazel: consolidate bazel test invocations
This way it can run them in parallel.

(cherry picked from commit 14ef7c0c59)
2017-03-01 09:08:42 +01:00
Nikolay Amiantov
2e189e0378 samba test: fix race condition
(cherry picked from commit a6c6d08430)
2017-03-01 03:18:10 +03:00
Eelco Dolstra
24e0d444f6 blender: 2.78b -> 2.78c
(cherry picked from commit ffb0fb51d4)

To fix build with CUDA support.
2017-03-01 03:18:10 +03:00
Nikolay Amiantov
dd07dbf254 opensubdiv: 3.0.5 -> 3.2.0
Also remove cudatoolkit override as we have cudatoolkit = cudatoolkit8 now.

(cherry picked from commit d7ecf89580)

Fixes build with CUDA support, as we are early in the testing cycle it's easier
to just backport the new version.
2017-03-01 03:18:09 +03:00
Nikolay Amiantov
63da2b3975 blender: fix libOpenCL path
(cherry picked from commit fe33c28ec9)
2017-03-01 03:18:09 +03:00
Joachim Fasting
126ea604ea tinycc: restrict platforms to x86_64-linux
(cherry picked from commit 3c178fe769)

cc https://github.com/NixOS/nixpkgs/issues/23253
2017-03-01 00:51:02 +01:00
rnhmjoj
228e6db7da arx-libertatis: 2016-07-27 -> 2017-02-26
(cherry picked from commit d35ff57b4e)
2017-03-01 02:25:24 +03:00
Nikolay Amiantov
0157385807 networkmanagerapplet: add librsvg
Fix tray icon. Also use wrapGAppsHook instead of custom wrapper.

(cherry picked from commit 8aa73bbf55)
2017-03-01 02:21:47 +03:00
Nikolay Amiantov
99750797ab python3.pkgs.protobuf3_0: fix build
I spent some time trying to fix tests instead but have no idea what happens.

(cherry picked from commit 6c5cbfd091)
2017-03-01 02:15:26 +03:00
Bart Brouns
910393215a qmidinet: 0.4.1 -> 0.4.2
(cherry picked from commit 1e74a156c3)
2017-03-01 00:05:12 +01:00
Robert Helgesson
78f4270714 gpsbabel: 1.5.2 -> 1.5.3
(cherry picked from commit 61237e1738)
2017-03-01 00:02:46 +01:00
Robert Helgesson
981681c703 gpsbabel: require qt4 rather than qtbase
(cherry picked from commit cf9cb1bac3)
2017-03-01 00:02:32 +01:00
Bart Brouns
abe0f09bbf drumkv1: 0.7.6 -> 0.8.0
(cherry picked from commit 9dabf88e72)
2017-02-28 23:43:55 +01:00
Bart Brouns
1f619485b7 samplv1: 0.7.6 -> 0.8.0
(cherry picked from commit 40d47d457e)
2017-02-28 23:43:54 +01:00
Bart Brouns
4802a3d72a qjackctl: 0.4.3 -> 0.4.4
(cherry picked from commit 3e8c302525)
2017-02-28 23:43:53 +01:00
ndowens
e025c02430 wgetpaste: 2.25 -> 2.28
(cherry picked from commit d02209edf2)
2017-02-28 23:37:16 +01:00
ndowens
bf30a8c192 fop: 1.1 -> 2.1
(cherry picked from commit 0e0af18b57)
2017-02-28 23:30:39 +01:00
Jörg Thalheim
9be1331512 keepassxc: 2.1.0 -> 2.1.2
also enable http plugin again. Readme mention using the protocol be a
security risk because it is unencrypted, but the connections stays local
(127.0.0.1) and the plugins has to explicitly enabled in settings
(disabled by default).

(cherry picked from commit 61785c5531)
2017-02-28 21:52:54 +01:00
rnhmjoj
2f8055bd03 palemoon: 27.0.3 -> 27.1.1
(cherry picked from commit 62c5f68847)
2017-02-28 20:35:44 +01:00
Franz Pletz
2edf4a0870 multisync: remove, no release in > 10 years
Upstream suggests to use opensync.

cc #23253

(cherry picked from commit bfa067179e)
2017-02-28 19:18:22 +01:00
Franz Pletz
5e9c8332b1 youtubeDL: 2017.02.24.1 -> 2017.02.27
(cherry picked from commit a36e1e2c35)
2017-02-28 18:36:20 +01:00
Franz Pletz
3e3f051ae0 phpPackages.redis22: not supported with php >= 7
cc #23253

(cherry picked from commit c4fd85a451)
2017-02-28 18:36:20 +01:00
Thomas Tuegel
b377ba33e3 qt57: update community releases automatically
(cherry picked from commit 0e5cce32d8)
2017-02-28 11:15:47 -06:00
Jörg Thalheim
94ff97c19f gpodder: disable iPodSupport by default
gpodder has an indirect dependency on libplist (pulled by libgpod),
which has known security vulnerabilities.

(cherry picked from 49f9c202f6)
2017-02-28 18:07:02 +01:00
Jörg Thalheim
9a6de5e9c1 haka: replace sha1 with sha256
(cherry picked from commit be23e983ae)
2017-02-28 18:05:26 +01:00
Jörg Thalheim
07ee46d114 lua5_{2,3}: replace sha1 with sha256
(cherry picked from commit a6e2d5fcbb)
2017-02-28 18:05:25 +01:00
Bjørn Forsman
9bc7d2797f sysdig: give the source tarball a meaningful name
(cherry picked from commit fc8e0ccc2e)
2017-02-28 18:05:25 +01:00
Willi Butz
616643c176 openconnect_openssl: added missing dependecy gmp
(cherry picked from commit b13378c479)
2017-02-28 17:58:09 +01:00
Dmitry Kalinkin
e24dde9a44 herwig: disable i686-linux 2017-02-28 11:52:26 -05:00
Jörg Thalheim
d7519e9b46 cantata: 1.5.1 -> 2.0.1
(cherry picked from commit 6405bbe867)
2017-02-28 17:51:25 +01:00
Itai Zukerman
aa51bf9dfc bazel: replace patch with patchShebangs and substituteInPlace
(cherry picked from commit 17835f14c5)
2017-02-28 17:42:06 +01:00
Robin Gloster
f20fa1a0b0 lincity: fix build
(cherry picked from commit 75707b748c)
2017-02-28 17:34:11 +01:00
Robin Gloster
c64c26af8c libjson_rpc_cpp_0_2_1: remove
(cherry picked from commit 8ddfbe34bc)
2017-02-28 17:16:39 +01:00
Robin Gloster
3c17e2ca00 libjson-rpc-cpp: 0.6.0 -> 0.7.0, fix build
(cherry picked from commit efd9331333)
2017-02-28 17:16:39 +01:00
Robin Gloster
64f8593551 libclc: 2015-08-07 -> 2017-02-25
(cherry picked from commit 4c04d4e6e2)
2017-02-28 17:16:39 +01:00
makefu
7a5d245712 exfat-nofuse: exclude 4.1 kernel build
(cherry picked from commit b4ff1ba4a9)
2017-02-28 17:01:54 +01:00
Jörg Thalheim
cefbfffee1 sysdig: 0.14.0 -> 0.15.0
(cherry picked from 479c6c1ef0)
2017-02-28 16:45:11 +01:00
Bart Brouns
267037590f ardour: 5.6 -> 5.8
(cherry picked from commit 3fc79cb5ac)
2017-02-28 16:12:14 +01:00
Robin Gloster
4d044529e7 libcm: remove
umaintained, broken and not used for 10 years

(cherry picked from commit be84f410cd)
2017-02-28 16:10:45 +01:00
makefu
a7e3c70aa0 exfat-nofuse: build only for kernels < 4.10
(cherry picked from commit af7ccaf8c8)
2017-02-28 16:10:45 +01:00
Felix Richter
64f4235f01 mhddfs: fix-format-security (#23276)
* mhddfs: fix-format-security

* mhddfs: use fputs instead of fprintf

(cherry picked from commit e748e18dde)
2017-02-28 16:10:45 +01:00
Franz Pletz
f7c76321a3 bzflag: 2.4.2 -> 2.4.8
(cherry picked from commit e0b04b4c37)
2017-02-28 16:02:52 +01:00
Franz Pletz
168d60715b linuxPackages.ixgbevf: 3.2.2 -> 4.0.3
cc #23253

(cherry picked from commit 40e84506ec)
2017-02-28 16:02:52 +01:00
Franz Pletz
e4d93872df linuxPackages.e1000e: 3.3.1 -> 3.3.5.3
cc #23253

(cherry picked from commit 163db1bbf9)
2017-02-28 16:02:51 +01:00
Robin Gloster
0fa7ce86fa btanks: fix build
(cherry picked from commit 768fac6c36)
2017-02-28 15:52:24 +01:00
Robin Gloster
3f15b3bbc2 clearsilver: fix build
fixes CVE-2011-4357
cc @grahamc, @fpletz, @domenkozar, @rbvermaa

(cherry picked from commit 6784a44296)
2017-02-28 15:19:32 +01:00
Thomas Tuegel
a639a2b214 kwindowsystem: mark broken on Qt 5.5
(cherry picked from commit cff0e06ed7)
2017-02-28 15:19:12 +01:00
Thomas Tuegel
5b12b22b53 attica: mark broken on Qt 5.5
(cherry picked from commit a7d3a084b9)
2017-02-28 15:19:12 +01:00
Thomas Tuegel
128d7624e4 sonnet: mark broken on Qt 5.5
(cherry picked from commit a821be7a06)
2017-02-28 15:19:12 +01:00
Thomas Tuegel
a67116cf1b kconfig: mark broken on Qt 5.5
(cherry picked from commit a8cc6d909b)
2017-02-28 15:19:11 +01:00
Thomas Tuegel
2e92561a3f karchive: mark broken on Qt 5.5
(cherry picked from commit 9cd0754191)
2017-02-28 15:19:11 +01:00
Thomas Tuegel
40ddafe1d6 kwidgetsaddons: mark broken on Qt 5.5
(cherry picked from commit b682464f4e)
2017-02-28 15:19:11 +01:00
Thomas Tuegel
07806156de kcoreaddons: mark broken on Qt 5.5
(cherry picked from commit 49f554aae0)
2017-02-28 15:19:11 +01:00
Thomas Tuegel
25b8455669 ki18n: mark broken on Qt 5.5
(cherry picked from commit eb340b5753)
2017-02-28 15:19:10 +01:00
Thomas Tuegel
7949fad41f kitemviews: mark broken on Qt 5.5
(cherry picked from commit 4208845583)
2017-02-28 15:19:10 +01:00
Thomas Tuegel
a3e2cc0fda kdbusaddons: mark broken on Qt 5.5
(cherry picked from commit c1630b5337)
2017-02-28 15:19:10 +01:00
Thomas Tuegel
da684ca5f6 kguiaddons: mark broken on Qt 5.5
(cherry picked from commit ffa8be8a0a)
2017-02-28 15:19:10 +01:00
Thomas Tuegel
4a11f7aa81 kcodecs: mark broken on Qt 5.5
(cherry picked from commit be580f91d8)
2017-02-28 15:19:09 +01:00
Thomas Tuegel
e749f36b88 solid: mark broken on Qt 5.5
(cherry picked from commit 6ddaa3f746)
2017-02-28 15:19:09 +01:00
Thomas Tuegel
08cdd06f5c syntax-highlighting: mark broken on Qt 5.5
(cherry picked from commit e1bd5c96ea)
2017-02-28 15:19:09 +01:00
Thomas Tuegel
c7a902454a kwayland: mark broken on Qt 5.5
(cherry picked from commit 78b6a1ad14)
2017-02-28 15:19:08 +01:00
Thomas Tuegel
2e7ccc379b bluez-qt: mark broken on Qt 5.5
(cherry picked from commit 34df5c5684)
2017-02-28 15:19:08 +01:00
Thomas Tuegel
131d78008b kplotting: mark broken on Qt 5.5
(cherry picked from commit 29d0bf7434)
2017-02-28 15:19:08 +01:00
Thomas Tuegel
98099c148e kitemmodels: mark broken on Qt 5.5
(cherry picked from commit e77114e72b)
2017-02-28 15:19:08 +01:00
Thomas Tuegel
9da0a0699b ipe: build with C++11 for Qt 5.7
(cherry picked from commit fca36b617d)
2017-02-28 15:19:07 +01:00
Thomas Tuegel
67fb814852 kidletime: mark broken on Qt 5.5
(cherry picked from commit 5f372535cd)
2017-02-28 15:19:07 +01:00
Thomas Tuegel
5461879752 kdnssd: mark broken on Qt 5.5
(cherry picked from commit e5283531c4)
2017-02-28 15:19:07 +01:00
Thomas Tuegel
19850cda15 networkmanager-qt: mark broken on Qt 5.5
(cherry picked from commit 3acf24e67e)
2017-02-28 15:19:07 +01:00
Thomas Tuegel
7771d8b98f threadweaver: mark broken on Qt 5.5
(cherry picked from commit e7b2300a0c)
2017-02-28 15:19:06 +01:00
Thomas Tuegel
80584e11a1 modemmanager-qt: mark broken on Qt 5.5
(cherry picked from commit a0b0dd2a32)
2017-02-28 15:19:06 +01:00
Thomas Tuegel
867236a297 pinentry_qt5: build with C++11 for Qt 5.7
(cherry picked from commit b31a63d2e5)
2017-02-28 15:19:06 +01:00
Robin Gloster
0d4e06e546 maintainers/hydra-eval-failures.py: default to 17.03 2017-02-28 15:16:27 +01:00
Franz Pletz
2aec643bed linuxPackages.jool: only supported on linux < 4.10
cc #23253

(cherry picked from commit d733d36cc6)
2017-02-28 14:50:15 +01:00
Franz Pletz
1b1d168623 linuxPackages.sch_cake: only supported in linux >= 4.4
cc #23253

(cherry picked from commit 616e5c1953)
2017-02-28 14:50:14 +01:00
Herwig Hochleitner
78998c5be2 gnome-22: drop bijiben due to dependency on webkitgtk24x
(cherry picked from commit 4f981cb3f4)
2017-02-28 07:55:03 -05:00
Rommel M. Martinez
c5bbee7534 emem: 0.2.28 -> 0.2.29
(cherry picked from commit ac9c40643c)
2017-02-28 13:48:17 +01:00
Joachim Fasting
fd7679b607 tinycc: 0.9.27pre-20170108 -> 20170220
tinycc has been relicensed to MIT.

(cherry picked from commit bcdbd637fc)
2017-02-28 13:14:33 +01:00
Peter Hoeg
cdf779e8d0 s3fs: minor cleanups
(cherry picked from commit 23004ec6dc)
2017-02-28 13:14:33 +01:00
Lancelot SIX
810fc81107 screen: 4.5.0 -> 4.5.1 for CVE-2017-5618
See https://lists.gnu.org/archive/html/info-gnu/2017-02/msg00010.html
for release announcement
(cherry picked from commit 6d9a3f0dcd)
2017-02-28 13:12:06 +01:00
Tristan Helmich
61046285a9 matrix-synapse: 0.19.1 -> 0.19.2
(cherry picked from commit 0cb62ab661)

cc #23267
2017-02-28 13:04:06 +01:00
Bart Brouns
111c02a1e1 ranger: 1.8.0 -> 1.8.1
(cherry picked from commit 2cfa9c6af2)

cc #23268
2017-02-28 13:01:11 +01:00
Tristan Helmich
38609b2d0b micropolis: fix build (patch changed)
(cherry picked from commit 3c16812acf)

cc #23269 #23253
2017-02-28 12:54:28 +01:00
Alexey Shmalko
b3418d5b22 virtualbox: fix build
The issue was caused by upgrading `qt` from `qt56` to `qt57`, which
now requires C++11.

For more info, see https://github.com/NixOS/nixpkgs/issues/23257.

(cherry picked from commit 0d31a76813)
2017-02-28 09:46:12 +01:00
Benjamin Staffin
95ec60a3f3 bazel: Log test errors to stderr during checkPhase
Otherwise it's difficult or impossible to retrieve them, particularly
from a hydra build.

(cherry picked from commit d348b80f31)
2017-02-28 09:46:12 +01:00
Franz Pletz
3433c1af01 phpfpm service: add target and slice
(cherry picked from commit ec4ead0bfe)
2017-02-28 00:08:02 +01:00
Franz Pletz
f0e9dd541a phpfpm service: one service per pool for isolation
(cherry picked from commit e3d58dae7f)
2017-02-28 00:08:02 +01:00
Leon Isenberg
f969b1c816 haskell: add semigroups dependency to optparse-applicative for GHC < 8
(cherry picked from commit 386ddc739c)
2017-02-28 00:00:45 +01:00
Leon Isenberg
1e72bec881 haskell: break dependency cycle between QuickCheck and semigroups for GHC < 8
The cycle:
QuickCheck -> semigroups
semigroups -> hashable
semigroups -> unordered-containers
unordered-containers -> hashable
unordered-containers -> QuickCheck # test suite only
hashable -> QuickCheck # test suite only

(cherry picked from commit 24c93619e9)
2017-02-28 00:00:45 +01:00
Leon Isenberg
13d29e7d7a haskell: add semigroups dependency to Quickcheck for GHC < 8
(cherry picked from commit 1aa6d77af4)
2017-02-28 00:00:44 +01:00
Leon Isenberg
919bc48fc0 haskell: ghc710x packages: remove obsolete configurations
(cherry picked from commit 172a2bbeaf)
2017-02-28 00:00:44 +01:00
Shea Levy
1ad7e1d3a1 fwupd: Fix localstatedir
(cherry picked from commit e292d166e8)
2017-02-28 00:00:39 +01:00
Robin Gloster
69d75ce207 release-notes: add new services for 17.03 + misc additions 2017-02-27 21:50:24 +01:00
Robin Gloster
6c9fb36526 release 17.03-beta 2017-02-27 20:12:01 +01:00
62070 changed files with 1214067 additions and 6171006 deletions

View File

@@ -1,34 +0,0 @@
{
"name": "nixpkgs",
"image": "mcr.microsoft.com/devcontainers/universal:5-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",
"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"
}
}

View File

@@ -1,5 +1,5 @@
# EditorConfig configuration for nixpkgs
# https://EditorConfig.org
# http://EditorConfig.org
# Top-most EditorConfig file
root = true
@@ -11,94 +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
[*.{bash,css,js,json,lock,md,nix,pl,pm,py,rb,sh,xml}]
# Match nix/ruby files, set indent to spaces with width of two
[*.{nix,rb}]
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
[*.json]
insert_final_newline = 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
# see https://manual.jule.dev/project/code-style.html#indentions
[*.jule]
indent_style = tab
[jule.mod]
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,315 +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
# fetchgit, fetchurl, fetchzip:
# format after refactoring with lib.extendMkDerivation (#455994)
aeddd850c6d3485fc1af2edfb111e58141d18dc1
# 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
# haskell-updates: nixfmt-rfc-style
9e296dcf846294e0aa94af7d3235e82eee7fe055
# 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
# systemd: nixfmt
b1c5cd3e794cdf89daa5e4f0086274a416a1cded
#nixos/nextcloud: remove with lib usage
b6088b0d8e13e8d18464d78935f0130052784658
f7611cad5154a9096faa26d156a4079577bfae17
# nixf-diagnose
90e7159c559021ac4f4cc1222000f08a91feff69 # !autorebase nix-shell --run treefmt
c283f32d296564fd649ef3ed268c1f1f7b199c49 # !autorebase nix-shell --run treefmt
91a8fee3aaf79348aa2dc1552a29fc1b786c5133 # !autorebase nix-shell --run treefmt
# aliases: keep-sorted
48ce0739044bd6eba83c3a43bd4ad1046399cdad # !autorebase nix-shell --run treefmt
# treewide: clean up 'meta = with' pattern
567e8dfd8eddc5468e6380fc563ab8a27422ab1d
# nixfmt 1.2.0
28096cc5e3d8334fbe1845925f000f8c8c5e0aac # !autorebase nix-shell --run treefmt

64
.gitattributes vendored
View File

@@ -1,64 +0,0 @@
# node/js lock files
**/package-lock.json linguist-generated
**/yarn.nix linguist-generated
**/yarn.lock linguist-generated
# Rust lock files
**/Cargo.lock linguist-generated
pkgs/build-support/rust/**/Cargo.lock -linguist-generated
# NuGet, Gradle and others
**/deps.json linguist-generated
# Ruby lock files
**/gemset.nix linguist-generated
**/Gemfile.lock linguist-generated
# PHP lock files
**/composer.lock linguist-generated
# various package managers and tools
**/deps.nix linguist-generated
**/deps.toml linguist-generated
pkgs/applications/editors/emacs-modes/*-generated.nix linguist-generated
pkgs/development/r-modules/*-packages.nix linguist-generated
pkgs/development/haskell-modules/hackage-packages.nix linguist-generated
pkgs/development/beam-modules/hex-packages.nix linguist-generated
doc/** linguist-documentation
doc/default.nix linguist-documentation=false
nixos/doc/** linguist-documentation
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
# Avoid munging line endings when using Git for Windows, and instead keep files
# using LF line endings. This particularly affects scripts committed in the
# nixpkgs repository.
#
# - `text` without `=auto` would mean "Git should always munge line endings on
# this file so there will never be a CRLF in the repository, and the line
# endings in the working directory should respect the local Git
# configuration."
# - `text=auto` means "Git should try to work out if this file is a text file.
# If it is, it should do the line-ending munging as for `text`, and if it
# isn't, it should leave the file alone."
# - `eol=lf` means "Ignore any local configuration about how line
# endings normally work on this platform. This file should always and only
# have LF line endings in the repo (so if there's a CR in the repo, it's
# meant to be there in addition to any end-of-line mark), and the selected
# attribute is how the file should appear in the working directory."
#
# See https://github.com/NixOS/nixpkgs/issues/423762 for historical context.
* text=auto eol=lf
# Don't force LF line endings for diff/patch files, as they might be correctly
# patching CRLF line endings from an upstream source package.
*.diff !text !eol
*.patch !text !eol

49
.github/CONTRIBUTING.md vendored Normal file
View File

@@ -0,0 +1,49 @@
# 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 commits in the following way:
```
(pkg-name | service-name): (from -> to | init at version | refactor | etc)
(Motivation for change. Additional information.)
```
Examples:
* nginx: init at 2.0.1
* firefox: 3.0 -> 3.1.1
* hydra service: add bazBaz option
Dual baz behavior is needed to do foo.
* nginx service: 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 dot at the end
See the nixpkgs manual for more details 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 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).

13
.github/ISSUE_TEMPLATE.md vendored Normal file
View File

@@ -0,0 +1,13 @@
## Issue description
### Steps to reproduce
## Technical details
* System: (NixOS: `nixos-version`, Ubuntu/Fedora: `lsb_release -a`, ...)
* Nix version: (run `nix-env --version`)
* Nixpkgs version: (run `nix-instantiate --eval '<nixpkgs>' -A lib.nixpkgsVersion`)

View File

@@ -1,145 +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 (26.11)"
- "- Stable (26.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: "textarea"
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%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
- label: "I assert that I have read the [automation/AI policy](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#automationai-policy) and that this issue report complies with 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,159 +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 (26.11)"
- "- Stable (26.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: "textarea"
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/nix-darwin/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%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
- label: "I assert that I have read the [automation/AI policy](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#automationai-policy) and that this issue report complies with 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,149 +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 (26.11)"
- "- Stable (26.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: "textarea"
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 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%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
- label: "I assert that I have read the [automation/AI policy](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#automationai-policy) and that this issue report complies with 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,155 +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 (26.11)"
- "- Stable (26.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%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
- label: "I assert that I have read the [automation/AI policy](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#automationai-policy) and that this issue report complies with 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,128 +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 (26.11)"
- "- Stable (26.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%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
- label: "I assert that I have read the [automation/AI policy](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#automationai-policy) and that this issue report complies with 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,103 +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 (26.11)"
- "- Stable (26.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%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
- label: "I assert that I have read the [automation/AI policy](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#automationai-policy) and that this issue report complies with 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,109 +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+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
- label: "I assert that I have read the [automation/AI policy](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#automationai-policy) and that this issue report complies with 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,91 +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+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
- label: "I assert that I have read the [automation/AI policy](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#automationai-policy) and that this issue report complies with 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,161 +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%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
- label: "I assert that I have read the [automation/AI policy](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#automationai-policy) and that this issue report complies with 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,36 +0,0 @@
name: "Request: Nix Package"
description: "Package requests are no longer accepted. Please open a Pull Request with your desired package instead."
title: "Package Request"
labels: ["0.kind: packaging request", "4.workflow: auto-close"]
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>
Thank you for your interest in packaging new software in Nixpkgs. Unfortunately, to mitigate the unsustainable growth of unmaintained packages, **Nixpkgs is no longer accepting package requests** via Issues.
As a [volunteer community][community], we are always open to new contributors. If you wish to see this package in Nixpkgs, **we encourage you to [contribute] it yourself**, via a Pull Request. Anyone can [become a package maintainer][maintainers]! You can find language-specific packaging information in the [Nixpkgs Manual][nixpkgs]. Should you need any help, please reach out to the community on [Matrix] or [Discourse].
[community]: https://nixos.org/community
[contribute]: https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#quick-start-to-adding-a-package
[maintainers]: https://github.com/NixOS/nixpkgs/blob/master/maintainers/README.md
[nixpkgs]: https://nixos.org/manual/nixpkgs/unstable/
[Matrix]: https://matrix.to/#/#dev:nixos.org
[Discourse]: https://discourse.nixos.org/c/dev/14
---
- type: "checkboxes"
id: "ignored"
attributes:
label: "Issues for new package requests are not accepted. Please open a Pull Request instead."
options:
- label: "I didn't read any of that."

View File

@@ -1,42 +1,19 @@
###### 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
- [ ] Tested using sandboxing
([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS,
or option `build-use-sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file)
on non-NixOS)
- Built on platform(s)
- [ ] NixOS
- [ ] macOS
- [ ] Linux
- [ ] 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/`)
- [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).
<!-- 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.
- [ ] Follows the [automation/AI policy].
[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
[automation/AI policy]: https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#automationai-policy
[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

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,136 +0,0 @@
name: Checkout
description: 'Checkout into trusted / untrusted / pinned folders consistently.'
inputs:
merged-as-untrusted-at:
description: "Whether and which SHA to checkout for the merge commit in the ./nixpkgs/untrusted folder."
target-as-trusted-at:
description: "Whether and which SHA to checkout for the target commit in the ./nixpkgs/trusted folder."
untrusted-pin-bump:
description: "Commit that bumps ci/pinned.json; when set, ./nixpkgs/untrusted and ./nixpkgs/untrusted-pinned are derived from this commit."
runs:
using: composite
steps:
- uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
env:
MERGED_SHA: ${{ inputs.merged-as-untrusted-at }}
TARGET_SHA: ${{ inputs.target-as-trusted-at }}
PIN_BUMP_SHA: ${{ inputs.untrusted-pin-bump }}
with:
script: |
const { rm, writeFile } = require('node:fs/promises')
const { spawn } = require('node:child_process')
const { join } = require('node:path')
async function run(cmd, ...args) {
return new Promise((resolve, reject) => {
const proc = spawn(cmd, args, {
stdio: 'inherit'
})
proc.on('close', (code) => {
if (code === 0) resolve()
else reject(code)
})
})
}
// These are set automatically by the spare checkout for .github/actions.
// Undo them, otherwise git fetch below will not do anything.
await run('git', 'config', 'unset', 'remote.origin.promisor')
await run('git', 'config', 'unset', 'remote.origin.partialclonefilter')
// Getting the pinned SHA via API allows us to do one single fetch call for all commits.
// Otherwise we would have to fetch merged/target first, read pinned, fetch again.
// A single fetch call comes with a lot less overhead. The fetch takes essentially the
// same time no matter whether its 1, 2 or 3 commits at once.
async function getPinnedSha(ref) {
if (!ref) return undefined
const { content, encoding } = (await github.rest.repos.getContent({
...context.repo,
path: 'ci/pinned.json',
ref,
})).data
const pinned = JSON.parse(Buffer.from(content, encoding).toString())
return pinned.pins.nixpkgs.revision
}
// Getting the pin-bump diff via the API avoids issues with `git fetch`
// thin-packs not having enough base objects to be applied locally.
// Returns a unified diff suitable for `git apply`.
async function getPinBumpDiff(ref) {
const { data } = await github.rest.repos.getCommit({
mediaType: { format: 'diff' },
...context.repo,
ref,
})
return data
}
const pin_bump_sha = process.env.PIN_BUMP_SHA
const commits = [
{
sha: process.env.MERGED_SHA,
path: 'untrusted',
},
{
sha: await getPinnedSha(pin_bump_sha || process.env.MERGED_SHA),
path: 'untrusted-pinned'
},
{
sha: process.env.TARGET_SHA,
path: 'trusted',
},
{
sha: await getPinnedSha(process.env.TARGET_SHA),
path: 'trusted-pinned'
}
].filter(({ sha }) => Boolean(sha))
console.log('Checking out the following commits:', commits)
// Fetching all commits at once is much faster than doing multiple checkouts.
// This would fail without --refetch, because the we had a partial clone before, but changed it above.
await run('git', 'fetch', '--depth=1', '--refetch', 'origin', ...(commits.map(({ sha }) => sha)))
// On Linux, checking out onto tmpfs takes 1s and is faster by at least 10x.
// Currently, on Darwin we can only allocate 3.5GB, which isn't enough.
// See https://github.com/NixOS/nixpkgs/pull/506437
await run('mkdir', 'nixpkgs')
if (process.env.RUNNER_OS === 'Linux') {
await run('sudo', 'mount', '-t', 'tmpfs', 'tmpfs', 'nixpkgs')
}
// Git worktree setup can race when multiple worktrees are created and
// initialized at the same time against one repository. See #511286.
// Keep the setup sequential so shared repo config updates cannot contend.
for (const { sha, path } of commits) {
await run('git', 'worktree', 'add', join('nixpkgs', path), sha, '--no-checkout')
await run('git', '-C', join('nixpkgs', path), 'sparse-checkout', 'disable')
await run('git', '-C', join('nixpkgs', path), 'checkout', '--progress')
}
// Apply pin bump to untrusted worktree
if (pin_bump_sha) {
console.log('Fetching ci/pinned.json bump commit:', pin_bump_sha)
await writeFile('pin-bump.patch', await getPinBumpDiff(pin_bump_sha))
console.log('Applying untrusted ci/pinned.json bump to ./nixpkgs/untrusted')
try {
await run('git', '-C', join('nixpkgs', 'untrusted'), 'apply', '--3way', join('..', '..', 'pin-bump.patch'))
} catch {
core.setFailed([
`Failed to apply ci/pinned.json bump commit ${pin_bump_sha}.`,
`This commit does not apply cleanly onto the untrusted base ${process.env.MERGED_SHA}.`,
`Please rebase the PR or ensure the pin bump is standalone.`
].join(' '))
return
} finally {
await rm('pin-bump.patch')
}
}
console.log('final disk usage:')
await run('df', '-h')

View File

@@ -1,9 +0,0 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
labels: []
commit-message:
prefix: ".github"

View File

@@ -1,23 +0,0 @@
# This file is used by .github/workflows/bot.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,47 +0,0 @@
# This file is used by .github/workflows/bot.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.11":
- all:
- changed-files:
- any-glob-to-any-file:
- .github/actions/**/*
- .github/workflows/*
- .github/labeler*.yml
- ci/**/*.*
- maintainers/github-teams.json
- base-branch: ['master']
"backport release-26.05":
- all:
- changed-files:
- any-glob-to-any-file:
- .github/actions/**/*
- .github/workflows/*
- .github/labeler*.yml
- ci/**/*.*
- maintainers/github-teams.json
- base-branch: ['master']
# keep-sorted end

641
.github/labeler.yml vendored
View File

@@ -1,641 +0,0 @@
# This file is used by .github/workflows/bot.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'
- '^staging-nixos-\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/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/li/libcosmicAppHook/*
- pkgs/by-name/po/pop-launcher/*
- 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/rancher/default.nix
- nixos/modules/services/cluster/rancher/k3s.nix
- nixos/tests/rancher/**/*
- pkgs/applications/networking/cluster/k3s/**/*
"6.topic: kernel":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/packages/linux.section.md
- lib/kernel.nix
- nixos/doc/manual/configuration/linux-kernel.chapter.md
- nixos/modules/system/boot/kernel.nix
- nixos/tests/kernel-generic/**/*
- pkgs/build-support/kernel/**/*
- pkgs/os-specific/linux/kernel/**/*
- pkgs/top-level/linux-kernels.nix
"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/**/*
- pkgs/by-name/ca/caja/**/*
- pkgs/by-name/ca/caja-*/**/*
- pkgs/by-name/li/libmatekbd/**/*
- pkgs/by-name/li/libmatemixer/**/*
- pkgs/by-name/li/libmateweather/**/*
- pkgs/by-name/ma/marco/**/*
- pkgs/by-name/ma/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/**/*
- pkgs/by-name/mu/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/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/desktop-managers/plasma6.nix
- nixos/tests/plasma6.nix
- pkgs/kde/**/*
"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: tree-sitter":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/packages/python-tree-sitter.section.md
- pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/**/*
- pkgs/applications/editors/emacs/elisp-packages/manual-packages/treesit-grammars/**/*
- pkgs/applications/editors/vim/plugins/nvim-treesitter/**/*
- pkgs/by-name/*/*tree-sitter*/**/*
- pkgs/by-name/ne/neovim-unwrapped/treesitter-parsers.nix
- pkgs/development/python-modules/*tree-sitter*/**/*
"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/**/*
- pkgs/by-name/ga/garcon/**/*
- pkgs/by-name/li/libxfce4*/**/*
- pkgs/by-name/th/thunar/**/*
- pkgs/by-name/th/thunar-*/**/*
- pkgs/by-name/tu/tumbler/**/*
- pkgs/by-name/xf/xfce4-*/**/*
- pkgs/by-name/xf/xfconf/**/*
- pkgs/by-name/xf/xfdesktop/**/*
- pkgs/by-name/xf/xfwm4/**/*
"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,77 +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 `prepare` job 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>
```
## Required Status Checks
The "Required Status Checks" branch ruleset is implemented in two top-level workflows: `pull-request-target.yml` and `merge-group.yml`.
The PR workflow defines all checks that need to succeed to add a Pull Request to the Merge Queue.
If no Merge Queue is set up for a branch, the PR workflow defines the checks required to merge into the target branch.
The Merge Group workflow defines all checks that are run as part of the Merge Queue.
Only when these pass, a Pull Request is finally merged into the target branch.
They don't apply when no Merge Queue is set up.
Both workflows work with the same `no PR failures` status check.
This name can never be changed, because it's used in the branch ruleset for these rules.

View File

@@ -1,97 +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 # adding the 'has: port to stable' and 'has: backport failed' label
pull-requests: write # creating backport pull requests
defaults:
run:
shell: bash
jobs:
backport:
name: Backport Pull Request
if: vars.NIXPKGS_CI_CLIENT_ID && github.event.pull_request.merged == true && (github.event.action != 'labeled' || startsWith(github.event.label.name, 'backport'))
runs-on: ubuntu-slim
timeout-minutes: 3
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@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
id: app-token
with:
client-id: ${{ vars.NIXPKGS_CI_CLIENT_ID }}
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
permission-contents: write
permission-pull-requests: write
permission-workflows: write
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
ref: ${{ github.event.pull_request.head.sha }}
token: ${{ steps.app-token.outputs.token }}
persist-credentials: true
- 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@66065406958f46e82238fd59546f5a99e69e22aa # v4.5.2
with:
# Config README: https://github.com/korthout/backport-action#backport-action
add_author_as_reviewer: true
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.
> [!TIP]
> If you maintain all packages touched by this pull request, and they are all located under `pkgs/by-name/*`, you can comment **`@NixOS/nixpkgs-merge-bot merge`** to automatically merge this PR using the [`nixpkgs-merge-bot`](https://github.com/NixOS/nixpkgs/blob/master/ci/README.md#nixpkgs-merge-bot).
- 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@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
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' ]
})
- name: "Add 'has: failed backport' label"
if: steps.backport.outputs.was_successful == 'false'
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
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: failed backport' ]
})

View File

@@ -1,130 +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: Bot
on:
schedule:
# Run every 10m
# i.e., at each of the listed minutes, every hour
- cron: '05,15,25,35,45,55 * * * *'
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: bot-${{ 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 # managing issue labels and comments
pull-requests: write # managing pull request labels and comments
defaults:
run:
shell: bash
jobs:
run:
runs-on: ubuntu-slim
if: github.event_name != 'schedule' || github.repository_owner == 'NixOS'
env:
# TODO: Remove after 2026-03-04, when Node 24 becomes the default.
# https://github.blog/changelog/2025-09-19-deprecation-of-node-20-on-github-actions-runners/
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true"
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: |
ci/github-script
- name: Install dependencies
run: npm install @actions/artifact@6.2.1 bottleneck@2.19.5
# 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@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_CLIENT_ID
id: app-token
with:
client-id: ${{ vars.NIXPKGS_CI_CLIENT_ID }}
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
permission-administration: read
permission-contents: write
permission-issues: write
permission-members: read
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: Run bot
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
github-token: ${{ steps.app-token.outputs.token || github.token }}
retries: 3
script: |
require('./ci/github-script/bot.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@f27b608878404679385c85cfa523b85ccb86e213 # v6.1.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 || github.token }}
configuration-path: .github/labeler.yml # default
sync-labels: true
- uses: actions/labeler@f27b608878404679385c85cfa523b85ccb86e213 # v6.1.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 || github.token }}
configuration-path: .github/labeler-no-sync.yml
sync-labels: false
- uses: actions/labeler@f27b608878404679385c85cfa523b85ccb86e213 # v6.1.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 || github.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,112 +0,0 @@
name: Build
on:
workflow_call:
inputs:
artifact-prefix:
required: true
type: string
baseBranch:
required: true
type: string
mergedSha:
required: true
type: string
targetSha:
required: true
type: string
secrets:
# Should only be provided in the merge queue, not in pull requests,
# where we're evaluating untrusted code.
CACHIX_AUTH_TOKEN_GHA:
required: false
permissions: {}
defaults:
run:
shell: bash
jobs:
build:
strategy:
fail-fast: false
matrix:
include:
- runner: ubuntu-24.04
name: x86_64-linux
systems: x86_64-linux
builds: [shell, manual-nixos, lib-tests, tarball]
desc: shell, docs, lib, tarball
- runner: ubuntu-24.04-arm
name: aarch64-linux
systems: aarch64-linux
builds: [shell, manual-nixos, manual-nixpkgs]
desc: shell, docs
- runner: macos-14
name: darwin
systems: aarch64-darwin x86_64-darwin
builds: [shell]
desc: shell
name: '${{ matrix.name }}: ${{ matrix.desc }}'
runs-on: ${{ matrix.runner }}
timeout-minutes: 60
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: .github/actions
- name: Checkout the merge commit
uses: ./.github/actions/checkout
with:
merged-as-untrusted-at: ${{ inputs.mergedSha }}
target-as-trusted-at: ${{ inputs.targetSha }}
- uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6
with:
# Sandbox is disabled on MacOS by default.
extra_nix_config: sandbox = true
- uses: cachix/cachix-action@5f2d7c5294214f71b873db4b969586b980625e71 # v17
continue-on-error: true
with:
# The nixpkgs-gha cache should not be trusted or used outside of Nixpkgs and its forks' CI.
name: ${{ vars.CACHIX_NAME || 'nixpkgs-gha' }}
extraPullNames: nixpkgs-gha
authToken: ${{ secrets.CACHIX_AUTH_TOKEN_GHA }}
pushFilter: '(-source$|-nixpkgs-tarball-)'
- run: nix-env --install -f nixpkgs/trusted-pinned -A nix-build-uncached
- name: Build shell
if: contains(matrix.builds, 'shell')
run: echo "${{ matrix.systems }}" | xargs -n1 nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A shell --argstr system
- name: Build NixOS manual
if: |
contains(matrix.builds, 'manual-nixos') && !cancelled() &&
(contains(fromJSON(inputs.baseBranch).type, 'primary')
|| startsWith(fromJSON(inputs.baseBranch).branch, 'staging-nixos')
)
run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A manual-nixos --out-link nixos-manual
- name: Build Nixpkgs manual
if: contains(matrix.builds, 'manual-nixpkgs') && !cancelled()
run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A manual-nixpkgs
- name: Build lib tests
if: contains(matrix.builds, 'lib-tests') && !cancelled()
run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A lib-tests
- name: Build tarball
if: contains(matrix.builds, 'tarball') && !cancelled()
run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A tarball
- name: Upload NixOS manual
if: |
contains(matrix.builds, 'manual-nixos') && !cancelled() &&
contains(fromJSON(inputs.baseBranch).type, 'primary')
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
with:
name: ${{ inputs.artifact-prefix }}nixos-manual-${{ matrix.name }}
path: nixos-manual

View File

@@ -1,173 +0,0 @@
name: Check
on:
workflow_call:
inputs:
baseBranch:
required: false
type: string
headBranch:
required: false
type: string
mergedSha:
required: true
type: string
targetSha:
required: true
type: string
secrets:
# Can be provided in pull requests because the job it is used in does
# not evaluate untrusted code.
NIXPKGS_COMMIT_CHECK_APP_PRIVATE_KEY:
required: false
# Can be provided in pull requests because the job it is used in does
# not evaluate untrusted code.
NIXPKGS_MANUAL_EDIT_CHECK_APP_PRIVATE_KEY:
required: false
# Should only be provided in the merge queue, not in pull requests,
# where we're evaluating untrusted code.
CACHIX_AUTH_TOKEN_GHA:
required: false
permissions: {}
defaults:
run:
shell: bash
jobs:
commits:
if: inputs.baseBranch && inputs.headBranch
permissions:
pull-requests: write # submitting PR reviews
runs-on: ubuntu-slim
timeout-minutes: 3
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
path: trusted
sparse-checkout: |
ci/github-script
- name: Install dependencies
run: npm install bottleneck@2.19.5
- uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
if: github.event_name != 'pull_request' && vars.NIXPKGS_COMMIT_CHECK_CLIENT_ID
id: app-token
with:
client-id: ${{ vars.NIXPKGS_COMMIT_CHECK_CLIENT_ID }}
private-key: ${{ secrets.NIXPKGS_COMMIT_CHECK_APP_PRIVATE_KEY }}
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: Check commits
id: check
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
env:
TARGETS_STABLE: ${{ fromJSON(inputs.baseBranch).stable && !contains(fromJSON(inputs.headBranch).type, 'development') }}
with:
github-token: ${{ steps.app-token.outputs.token || github.token }}
script: |
const targetsStable = JSON.parse(process.env.TARGETS_STABLE)
require('./trusted/ci/github-script/commits.js')({
github,
context,
core,
dry: context.eventName == 'pull_request',
cherryPicks: context.eventName == 'pull_request' || targetsStable,
})
- name: Log current API rate limits
env:
GH_TOKEN: ${{ steps.app-token.outputs.token || github.token }}
run: gh api /rate_limit | jq
manual-file-edits:
if: inputs.baseBranch && inputs.headBranch
permissions:
pull-requests: write
runs-on: ubuntu-slim
timeout-minutes: 3
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
path: trusted
sparse-checkout: |
ci/github-script
- uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
if: github.event_name != 'pull_request' && vars.NIXPKGS_MANUAL_EDIT_CHECK_CLIENT_ID
id: app-token
with:
client-id: ${{ vars.NIXPKGS_MANUAL_EDIT_CHECK_CLIENT_ID }}
private-key: ${{ secrets.NIXPKGS_MANUAL_EDIT_CHECK_APP_PRIVATE_KEY }}
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: Discourage manual edits to certain files
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
github-token: ${{ steps.app-token.outputs.token || github.token }}
script: |
require('./trusted/ci/github-script/manual-file-edits.js')({
github,
context,
core,
dry: context.eventName == 'pull_request',
repoPath: 'trusted',
})
- name: Log current API rate limits
env:
GH_TOKEN: ${{ steps.app-token.outputs.token || github.token }}
run: gh api /rate_limit | jq
owners:
runs-on: ubuntu-24.04-arm
timeout-minutes: 5
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: .github/actions
- name: Checkout merge and target commits
uses: ./.github/actions/checkout
with:
merged-as-untrusted-at: ${{ inputs.mergedSha }}
target-as-trusted-at: ${{ inputs.targetSha }}
- uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6
- uses: cachix/cachix-action@5f2d7c5294214f71b873db4b969586b980625e71 # v17
continue-on-error: true
with:
# The nixpkgs-gha cache should not be trusted or used outside of Nixpkgs and its forks' CI.
name: ${{ vars.CACHIX_NAME || 'nixpkgs-gha' }}
extraPullNames: nixpkgs-gha
authToken: ${{ secrets.CACHIX_AUTH_TOKEN_GHA }}
pushFilter: -source$
- name: Build codeowners validator
run: nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A codeownersValidator
- name: Validate codeowners
env:
OWNERS_FILE: nixpkgs/untrusted/ci/OWNERS
REPOSITORY_PATH: nixpkgs/untrusted
# Omits "owners", which checks whether GitHub handles exist, but fails with nested team
# structures.
CHECKS: "duppatterns,files,syntax"
# Set this to "notowned,avoid-shadowing" to check that all files are owned by somebody
EXPERIMENTAL_CHECKS: "avoid-shadowing"
run: result/bin/codeowners-validator

View File

@@ -1,54 +0,0 @@
name: Comment
on:
issue_comment:
types: [created]
# This is used as fallback without app only.
# This happens when testing in forks without setting up that app.
permissions:
pull-requests: write # adding reactions to comments
defaults:
run:
shell: bash
jobs:
# The `bot` workflow reacts to comments with @NixOS/nixpkgs-merge-bot references, but might only
# pick up a comment after up to 10 minutes. To give the user instant feedback, this job adds
# a reaction to these comments.
react:
name: React with eyes
runs-on: ubuntu-slim
timeout-minutes: 2
if: contains(github.event.comment.body, '@NixOS/nixpkgs-merge-bot merge')
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: |
ci/github-script
# Use the GitHub App to make sure the reaction happens with the same user who will later merge.
- uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_CLIENT_ID
id: app-token
with:
client-id: ${{ vars.NIXPKGS_CI_CLIENT_ID }}
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
permission-pull-requests: write
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
github-token: ${{ steps.app-token.outputs.token || github.token }}
retries: 3
script: |
const { handleMergeComment } = require('./ci/github-script/merge.js')
const { body, node_id } = context.payload.comment
await handleMergeComment({
github,
body,
node_id,
reaction: 'EYES',
})

View File

@@ -1,59 +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-slim
if: github.event.changes.base.ref.from && github.event.changes.base.ref.from != github.event.pull_request.base.ref
timeout-minutes: 2
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@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
id: app-token
with:
client-id: ${{ vars.NIXPKGS_CI_CLIENT_ID }}
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
permission-pull-requests: write
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
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,495 +0,0 @@
name: Eval
on:
workflow_call:
inputs:
artifact-prefix:
required: true
type: string
mergedSha:
required: true
type: string
headSha:
required: false # only required when testVersions is true
type: string
targetSha:
required: true
type: string
systems:
required: true
type: string
testVersions:
required: false
default: false
type: boolean
secrets:
# Can be provided in pull requests because the job it is used in does
# not evaluate untrusted code.
NIXPKGS_BRANCH_CHECK_APP_PRIVATE_KEY:
required: false
# Should only be provided in the merge queue, not in pull requests,
# where we're evaluating untrusted code.
CACHIX_AUTH_TOKEN_GHA:
required: false
permissions: {}
defaults:
run:
shell: bash
jobs:
versions:
if: inputs.testVersions
runs-on: ubuntu-slim
outputs:
versions: ${{ steps.versions.outputs.versions }}
ciPinBumpCommit: ${{ steps.find-pinned-commit.outputs.ciPinBumpCommit }}
ciPinBumpCommitShort: ${{ steps.find-pinned-commit.outputs.ciPinBumpCommitShort }}
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
path: trusted
sparse-checkout: |
ci/supportedVersions.nix
- name: Check out the PR at the test merge commit
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
ref: ${{ inputs.mergedSha }}
path: untrusted
sparse-checkout: |
ci/pinned.json
- name: Find commit that touched ci/pinned.json
id: find-pinned-commit
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
env:
TARGET_SHA: ${{ inputs.targetSha }}
HEAD_SHA: ${{ inputs.headSha }}
with:
script: |
const targetSha = process.env.TARGET_SHA
const headSha = process.env.HEAD_SHA
if (!targetSha || !headSha) {
core.setFailed('Error: Both targetSha and headSha inputs are required when testVersions is true.')
return
}
// Compare the two commits to get the list of commits in between
const comparison = await github.rest.repos.compareCommitsWithBasehead({
...context.repo,
basehead: `${targetSha}...${headSha}`,
})
if(comparison.data.commits.length > 50) {
core.setFailed('Error: Too many commits in comparison, cannot reliably find pinned.json change.')
return
}
const logRateLimit = async (label) => {
const { data } = await github.rest.rateLimit.get()
const { remaining, limit, used } = data.rate
core.info(`[Rate Limit ${label}] ${remaining}/${limit} remaining (${used} used)`)
}
await logRateLimit('before commit filtering')
// Filter commits that modified ci/pinned.json
const commitsModifyingPinned = (
await Promise.all(
comparison.data.commits.map(async (commit) => {
const commitDetails = await github.rest.repos.getCommit({
...context.repo,
ref: commit.sha,
})
const modifiesPinned = commitDetails.data.files?.some(
(file) => file.filename === "ci/pinned.json"
)
return modifiesPinned ? commit.sha : null
})
)
).filter((sha) => sha !== null)
await logRateLimit('after commit filtering')
if (commitsModifyingPinned.length === 0) {
// This should not happen as testVersions should only be true
// when ci/pinned.json was modified in the PR.
core.setFailed("Error: ci/pinned.json was not modified in this PR")
return
} else if (commitsModifyingPinned.length > 1) {
core.setFailed([
"Error: Multiple commits touch ci/pinned.json in this PR:",
...commitsModifyingPinned,
"Please ensure only a single commit modifies ci/pinned.json for accurate version matrix evaluation."
].join("\n"))
return
}
const ciPinBumpCommit = commitsModifyingPinned[0]
core.setOutput("ciPinBumpCommit", ciPinBumpCommit)
core.setOutput("ciPinBumpCommitShort", ciPinBumpCommit.substring(0, 7))
core.info(`Found pinned.json commit: ${ciPinBumpCommit}`)
- name: Install Nix
uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6
- name: Load supported versions
id: versions
run: |
echo "versions=$(trusted/ci/supportedVersions.nix --arg pinnedJson untrusted/ci/pinned.json)" >> "$GITHUB_OUTPUT"
eval:
runs-on: ubuntu-24.04-arm
needs: versions
if: ${{ !cancelled() && !failure() }}
strategy:
fail-fast: false
matrix:
system: ${{ fromJSON(inputs.systems) }}
version:
- "" # Default Eval triggering rebuild labels and such.
- ${{ fromJSON(needs.versions.outputs.versions || '[]') }} # Only for ci/pinned.json updates.
# Failures for versioned Evals will be collected in a separate job below
# to not interrupt main Eval's compare step.
continue-on-error: ${{ matrix.version != '' }}
name: ${{ matrix.system }}${{ matrix.version && format(' @ {0} ({1})', matrix.version, needs.versions.outputs.ciPinBumpCommitShort) || '' }}
timeout-minutes: 20
steps:
# This is not supposed to be used and just acts as a fallback.
# Without swap, when Eval runs OOM, it will fail badly with a
# job that is sometimes not interruptible anymore.
# If Eval starts swapping, decrease chunkSize to keep it fast.
- name: Enable swap
run: |
sudo fallocate -l 10G /swap
sudo chmod 600 /swap
sudo mkswap /swap
sudo swapon /swap
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: .github/actions
- name: Check out the PR at merged and target commits
uses: ./.github/actions/checkout
with:
# For versioned evals, use the target as the untrusted base and apply the pin-bump commit
merged-as-untrusted-at: ${{ matrix.version && inputs.targetSha || inputs.mergedSha }}
untrusted-pin-bump: ${{ matrix.version && needs.versions.outputs.ciPinBumpCommit }}
target-as-trusted-at: ${{ inputs.targetSha }}
- name: Install Nix
uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6
- uses: cachix/cachix-action@5f2d7c5294214f71b873db4b969586b980625e71 # v17
continue-on-error: true
with:
# The nixpkgs-gha cache should not be trusted or used outside of Nixpkgs and its forks' CI.
name: ${{ vars.CACHIX_NAME || 'nixpkgs-gha' }}
extraPullNames: nixpkgs-gha
authToken: ${{ secrets.CACHIX_AUTH_TOKEN_GHA }}
pushFilter: '(-source|-single-chunk)$'
- name: Evaluate the ${{ matrix.system }} output paths at the merge commit
env:
MATRIX_SYSTEM: ${{ matrix.system }}
MATRIX_VERSION: ${{ matrix.version || 'nixVersions.latest' }}
run: |
nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A eval.singleSystem \
--argstr evalSystem "$MATRIX_SYSTEM" \
--arg chunkSize 8000 \
--argstr nixPath "$MATRIX_VERSION" \
--out-link merged
# If it uses too much memory, slightly decrease chunkSize.
# Note: Keep the same further down in sync!
- name: Evaluate the ${{ matrix.system }} output paths at the target commit
env:
MATRIX_SYSTEM: ${{ matrix.system }}
run: |
TARGET_DRV=$(nix-instantiate nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.singleSystem \
--argstr evalSystem "$MATRIX_SYSTEM" \
--arg chunkSize 8000 \
--argstr nixPath "nixVersions.latest")
# Try to fetch this from Cachix a few times, for up to 30 seconds. This avoids running Eval
# twice in the Merge Queue, when a later item finishes Eval at the merge commit earlier.
for _i in {1..6}; do
# Using --max-jobs 0 will cause nix-build to fail if this can't be substituted from cachix.
if nix-build "$TARGET_DRV" --max-jobs 0; then
break
fi
sleep 5
done
# Either fetches from Cachix or runs Eval itself. The fallback is required
# for pull requests into wip-branches without merge queue.
nix-build "$TARGET_DRV" --out-link target
- name: Compare outpaths against the target branch
env:
MATRIX_SYSTEM: ${{ matrix.system }}
run: |
nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A eval.diff \
--arg beforeDir ./target \
--arg afterDir ./merged \
--argstr evalSystem "$MATRIX_SYSTEM" \
--out-link diff
- name: Upload outpaths diff and stats
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
with:
name: ${{ inputs.artifact-prefix }}${{ matrix.version && format('{0}-', matrix.version) || '' }}diff-${{ matrix.system }}
path: diff/*
compare:
runs-on: ubuntu-24.04-arm
needs: [eval]
if: ${{ !cancelled() && !failure() }}
permissions:
pull-requests: write # submitting 'wrong branch' reviews
statuses: write # creating 'Eval Summary' commit statuses
timeout-minutes: 5
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: .github/actions
- name: Check out the PR at the target commit
uses: ./.github/actions/checkout
with:
merged-as-untrusted-at: ${{ inputs.mergedSha }}
target-as-trusted-at: ${{ inputs.targetSha }}
- name: Download output paths and eval stats for all systems
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
with:
pattern: ${{ inputs.artifact-prefix }}diff-*
path: diff
merge-multiple: true
- name: Install Nix
uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6
- name: Combine all output paths and eval stats
run: |
nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.combine \
--arg diffDir ./diff \
--out-link combined
- name: Upload the maintainer list
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
with:
name: ${{ inputs.artifact-prefix }}maintainers
path: combined/maintainers.json
- name: Compare against the target branch
env:
TARGET_SHA: ${{ inputs.mergedSha }}
run: |
git -C nixpkgs/trusted diff --name-only "$TARGET_SHA" \
| jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json
# Use the target branch to get accurate maintainer info
nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.compare \
--arg combinedDir ./combined \
--arg touchedFilesJson ./touched-files.json \
--out-link comparison
cat comparison/step-summary.md >> "$GITHUB_STEP_SUMMARY"
- name: Upload the comparison results
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
with:
name: ${{ inputs.artifact-prefix }}comparison
path: comparison/*
- name: Add eval summary to commit statuses
if: ${{ github.event_name == 'pull_request_target' }}
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
script: |
const { readFile } = require('node:fs/promises')
const changed = JSON.parse(await readFile('comparison/changed-paths.json', 'utf-8'))
const removedByKernel = Object.fromEntries(
Object.entries(changed.attrdiffByKernel ?? {}).map(([kernel, diff]) => [
kernel,
diff.removed.length,
]),
)
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(', ') +
(
Object.values(removedByKernel).some((count) => count > 0)
? ' — Removed: ' + [
`linux ${removedByKernel.linux ?? 0}`,
`darwin ${removedByKernel.darwin ?? 0}`
].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
})
- uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
if: github.event_name == 'pull_request_target' && vars.NIXPKGS_BRANCH_CHECK_CLIENT_ID
id: app-token
with:
client-id: ${{ vars.NIXPKGS_BRANCH_CHECK_CLIENT_ID }}
private-key: ${{ secrets.NIXPKGS_BRANCH_CHECK_APP_PRIVATE_KEY }}
permission-pull-requests: write
# It's fine to reuse this app in the 'pull-request-target / prepare' job,
# because that job has to run before this one.
- name: Request changes if PR is against an inappropriate branch
if: ${{ github.event_name == 'pull_request_target' }}
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
github-token: ${{ steps.app-token.outputs.token || github.token }}
script: |
require('./nixpkgs/trusted/ci/github-script/check-target-branch.js')({
github,
context,
core,
dry: context.eventName == 'pull_request',
})
# Creates a matrix of Eval performance for various versions and systems.
report:
runs-on: ubuntu-slim
needs: [versions, eval]
steps:
- name: Download output paths and eval stats for all versions
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
with:
pattern: "*-diff-*"
path: versions
- name: Add version comparison table to job summary
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
env:
ARTIFACT_PREFIX: ${{ inputs.artifact-prefix }}
SYSTEMS: ${{ inputs.systems }}
VERSIONS: ${{ needs.versions.outputs.versions }}
CI_PIN_BUMP_COMMIT: ${{ needs.versions.outputs.ciPinBumpCommit }}
with:
script: |
const { readFileSync } = require('node:fs')
const path = require('node:path')
const prefix = process.env.ARTIFACT_PREFIX
const systems = JSON.parse(process.env.SYSTEMS)
const versions = JSON.parse(process.env.VERSIONS)
const ciPinBumpCommit = process.env.CI_PIN_BUMP_COMMIT
core.summary.addHeading('Lix/Nix version comparison')
core.summary.addRaw(`\n*Evaluated at commit: \`${ciPinBumpCommit}\` (commit that modified ci/pinned.json)*\n`, true)
core.summary.addTable(
[].concat(
[
[{ data: 'Version', header: true }].concat(
systems.map((system) => ({ data: system, header: true })),
),
],
versions.map((version) =>
[{ data: version }].concat(
systems.map((system) => {
try {
const artifact = path.join('versions', `${prefix}${version}-diff-${system}`)
const time = Math.round(
parseFloat(
readFileSync(
path.join(artifact, 'after', system, 'total-time'),
'utf-8',
),
),
)
const diff = JSON.parse(
readFileSync(path.join(artifact, system, 'diff.json'), 'utf-8'),
)
const attrs = []
.concat(diff.added, diff.removed, diff.changed, diff.rebuilds)
// There are some special attributes, which are ignored for rebuilds.
// These only have a single path component, because they lack the `.<system>` suffix.
.filter((attr) => attr.split('.').length > 1)
if (attrs.length > 0) {
core.setFailed(
`${version} on ${system} has changed outpaths!\n` +
`Note: This indicates that commit ${ciPinBumpCommit} ` +
`(which modified ci/pinned.json) also contains other ` +
`changes affecting package outputs. ` +
`Please ensure ci/pinned.json is updated in a standalone commit.`
)
return { data: ':x:' }
}
return { data: time }
} catch {
core.warning(`${version} on ${system} did not produce artifact.`)
return { data: ':warning:' }
}
}),
),
),
),
)
core.summary.addRaw(
'\n*Evaluation time in seconds without downloading dependencies.*',
true,
)
core.summary.addRaw('\n*:warning: Job did not report a result.*', true)
core.summary.addRaw(
'\n*:x: Job produced different outpaths than the target branch.*',
true,
)
core.summary.write()
misc:
if: ${{ github.event_name != 'push' }}
runs-on: ubuntu-24.04-arm
timeout-minutes: 10
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: .github/actions
- name: Checkout the merge commit
uses: ./.github/actions/checkout
with:
merged-as-untrusted-at: ${{ inputs.mergedSha }}
- name: Install Nix
uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6
- name: Ensure flake outputs on all systems still evaluate
run: nix flake check --all-systems --no-build './nixpkgs/untrusted?shallow=1'
- name: Query nixpkgs with aliases enabled to check for basic syntax errors
run: |
time nix-env -I ./nixpkgs/untrusted -f ./nixpkgs/untrusted -qa '*' --option restrict-eval true --option allow-import-from-derivation false >/dev/null
- name: Ensure NixOS modules meta is valid
run: |
time nix-instantiate -I ./nixpkgs/untrusted --strict --eval --json ./nixpkgs/untrusted/nixos --arg configuration '{}' --attr config.meta --option restrict-eval true --option allow-import-from-derivation false

View File

@@ -1,152 +0,0 @@
name: Lint
on:
workflow_call:
inputs:
mergedSha:
required: true
type: string
targetSha:
required: true
type: string
secrets:
# Should only be provided in the merge queue, not in pull requests,
# where we're evaluating untrusted code.
CACHIX_AUTH_TOKEN_GHA:
required: false
permissions: {}
defaults:
run:
shell: bash
jobs:
treefmt:
runs-on: ubuntu-24.04-arm
timeout-minutes: 10
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: .github/actions
- name: Checkout the merge commit
uses: ./.github/actions/checkout
with:
merged-as-untrusted-at: ${{ inputs.mergedSha }}
- uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6
# TODO: Figure out how to best enable caching for the treefmt job. Cachix won't work well,
# because the cache would be invalidated on every commit - treefmt checks every file.
# Maybe we can cache treefmt's eval-cache somehow.
- 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 nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -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
timeout-minutes: 10
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: .github/actions
- name: Checkout the merge commit
uses: ./.github/actions/checkout
with:
merged-as-untrusted-at: ${{ inputs.mergedSha }}
- uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6
- uses: cachix/cachix-action@5f2d7c5294214f71b873db4b969586b980625e71 # v17
continue-on-error: true
with:
# The nixpkgs-gha cache should not be trusted or used outside of Nixpkgs and its forks' CI.
name: ${{ vars.CACHIX_NAME || 'nixpkgs-gha' }}
extraPullNames: nixpkgs-gha
authToken: ${{ secrets.CACHIX_AUTH_TOKEN_GHA }}
pushFilter: -source$
- name: Parse all nix files
run: |
# Tests multiple versions at once, let's make sure all of them run, so keep-going.
nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A parse --keep-going
nixpkgs-vet:
runs-on: ubuntu-24.04-arm
timeout-minutes: 10
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: .github/actions
- name: Checkout merge and target commits
uses: ./.github/actions/checkout
with:
merged-as-untrusted-at: ${{ inputs.mergedSha }}
target-as-trusted-at: ${{ inputs.targetSha }}
- uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6
- uses: cachix/cachix-action@5f2d7c5294214f71b873db4b969586b980625e71 # v17
continue-on-error: true
with:
# The nixpkgs-gha cache should not be trusted or used outside of Nixpkgs and its forks' CI.
name: ${{ vars.CACHIX_NAME || 'nixpkgs-gha' }}
extraPullNames: nixpkgs-gha
authToken: ${{ secrets.CACHIX_AUTH_TOKEN_GHA }}
pushFilter: -source$
- 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 nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A nixpkgs-vet --arg base "./nixpkgs/trusted" --arg head "./nixpkgs/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
commits:
# Only check commits if we have access to the pull_request context.
#
# Luckily there's no need to lint commit messages in the Merge Queue, because
# changes to the target branch can't change commit messages on the base branch.
if: ${{ github.event.pull_request.number }}
runs-on: ubuntu-slim
timeout-minutes: 5
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: true # Needed to run git fetch for large PRs.
path: trusted
- name: Check commit messages
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
script: |
const checkCommitMessages = require('./trusted/ci/github-script/lint-commits.js')
checkCommitMessages({
github,
context,
core,
repoPath: 'trusted',
})

View File

@@ -1,145 +0,0 @@
name: Merge Group
on:
merge_group:
workflow_call:
inputs:
artifact-prefix:
required: true
type: string
mergedSha:
required: true
type: string
targetSha:
required: true
type: string
permissions: {}
jobs:
prepare:
runs-on: ubuntu-slim
outputs:
baseBranch: ${{ steps.prepare.outputs.base }}
mergedSha: ${{ steps.prepare.outputs.mergedSha }}
targetSha: ${{ steps.prepare.outputs.targetSha }}
systems: ${{ steps.prepare.outputs.systems }}
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: |
ci/github-script/supportedSystems.js
- id: prepare
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
env:
MERGED_SHA: ${{ inputs.mergedSha }}
TARGET_SHA: ${{ inputs.targetSha }}
with:
script: |
const { classify } = require('./ci/supportedBranches.js')
const supportedSystems = require('./ci/github-script/supportedSystems.js')
const baseBranch = (
context.payload.merge_group?.base_ref ??
context.payload.pull_request.base.ref
).replace(/^refs\/heads\//, '')
const baseClassification = classify(baseBranch)
core.setOutput('base', baseClassification)
core.info('base classification:', baseClassification)
const mergedSha = context.payload.merge_group?.head_sha ?? process.env.MERGED_SHA
core.setOutput('mergedSha', mergedSha)
core.info(`mergedSha: ${mergedSha}`)
const targetSha = context.payload.merge_group?.base_sha ?? process.env.TARGET_SHA
core.setOutput('targetSha', targetSha)
core.info(`targetSha: ${targetSha}`)
const systems = await supportedSystems({ github, context, targetSha })
core.setOutput('systems', systems)
check:
name: Check
needs: [prepare]
uses: ./.github/workflows/check.yml
permissions:
pull-requests: write # cherry-picks: unused in merge queue but required for check workflow
secrets:
CACHIX_AUTH_TOKEN_GHA: ${{ secrets.CACHIX_AUTH_TOKEN_GHA }}
with:
mergedSha: ${{ needs.prepare.outputs.mergedSha }}
targetSha: ${{ needs.prepare.outputs.targetSha }}
lint:
name: Lint
needs: [prepare]
uses: ./.github/workflows/lint.yml
secrets:
CACHIX_AUTH_TOKEN_GHA: ${{ secrets.CACHIX_AUTH_TOKEN_GHA }}
with:
mergedSha: ${{ needs.prepare.outputs.mergedSha }}
targetSha: ${{ needs.prepare.outputs.targetSha }}
eval:
name: Eval
needs: [prepare]
uses: ./.github/workflows/eval.yml
# The eval workflow requests these permissions so we must explicitly allow them,
# even though they are unused when working with the merge queue.
permissions:
pull-requests: write # compare: unused in merge queue but required by eval workflow
statuses: write # compare: unused in merge queue but required by eval workflow
secrets:
CACHIX_AUTH_TOKEN_GHA: ${{ secrets.CACHIX_AUTH_TOKEN_GHA }}
with:
artifact-prefix: ${{ inputs.artifact-prefix }}
mergedSha: ${{ needs.prepare.outputs.mergedSha }}
targetSha: ${{ needs.prepare.outputs.targetSha }}
systems: ${{ needs.prepare.outputs.systems }}
build:
name: Build
needs: [prepare]
uses: ./.github/workflows/build.yml
secrets:
CACHIX_AUTH_TOKEN_GHA: ${{ secrets.CACHIX_AUTH_TOKEN_GHA }}
with:
artifact-prefix: ${{ inputs.artifact-prefix }}
baseBranch: ${{ needs.prepare.outputs.baseBranch }}
mergedSha: ${{ needs.prepare.outputs.mergedSha }}
targetSha: ${{ needs.prepare.outputs.targetSha }}
# This job's only purpose is to create the target for the "Required Status Checks" branch ruleset.
# It "needs" all the jobs that should block the Merge Queue.
unlock:
if: github.event_name != 'pull_request' && always()
# Modify this list to add or remove jobs from required status checks.
needs:
- check
- lint
- eval
- build
runs-on: ubuntu-slim
permissions:
statuses: write # creating 'no PR failures' commit status
steps:
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
env:
RESULTS: ${{ toJSON(needs.*.result) }}
with:
script: |
const { serverUrl, repo, runId, payload } = context
const target_url =
`${serverUrl}/${repo.owner}/${repo.repo}/actions/runs/${runId}`
await github.rest.repos.createCommitStatus({
...repo,
sha: payload.merge_group.head_sha,
// WARNING:
// Do NOT change the name of this, otherwise the rule will not catch it anymore.
// This would prevent all PRs from merging.
context: 'no PR failures',
state: JSON.parse(process.env.RESULTS).every(result => result == 'success') ? 'success' : 'error',
target_url,
})

View File

@@ -1,86 +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' || github.event_name == 'workflow_dispatch'
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.11
into: staging-next-25.11
- from: staging-next-25.11
into: staging-25.11
- from: release-25.11
into: staging-nixos-25.11
- from: release-26.05
into: staging-next-26.05
- from: staging-next-26.05
into: staging-26.05
- from: release-26.05
into: staging-nixos-26.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:
NIXPKGS_CI_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
# Resets the target branch of the current haskell-updates PR.
# This makes GitHub hide all the commits that are already part of staging and gives us a much clearer PR view.
haskell-updates:
needs: periodic-merge
runs-on: ubuntu-slim
permissions:
pull-requests: write
steps:
- name: Find PR and update target branch
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
script: |
// There will at most be a single haskell-updates PR anyway, so no need to paginate.
await Promise.all(
(
await github.rest.pulls.list({
...context.repo,
state: 'open',
head: `${context.repo.owner}:haskell-updates`,
})
).data.map((pr) =>
github.rest.pulls.update({
...context.repo,
pull_number: pr.number,
// Just updating to the same branch to trigger a UI update.
// This is staging most of the time, but could be staging-next in rare cases.
base: pr.base.ref,
}),
),
)

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 (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' || github.event_name == 'workflow_dispatch'
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
- from: master
into: staging-nixos
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:
NIXPKGS_CI_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}

View File

@@ -1,69 +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
secrets:
NIXPKGS_CI_APP_PRIVATE_KEY:
required: true
defaults:
run:
shell: bash
jobs:
merge:
runs-on: ubuntu-24.04-arm
timeout-minutes: 5
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@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
id: app-token
with:
client-id: ${{ vars.NIXPKGS_CI_CLIENT_ID }}
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
permission-contents: write
permission-pull-requests: write
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
- 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
if: ${{ failure() }}
env:
BODY_TEXT: |
Periodic merge from `${{ inputs.from }}` into [`${{ inputs.into }}`](https://github.com/NixOS/nixpkgs/tree/${{ inputs.into }}) has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).
GH_TOKEN: ${{ steps.app-token.outputs.token }}
run: |
gh pr comment 105153 --body "$BODY_TEXT"

View File

@@ -1,169 +0,0 @@
name: PR
on:
pull_request_target:
workflow_call:
inputs:
artifact-prefix:
required: true
type: string
secrets:
NIXPKGS_CI_APP_PRIVATE_KEY:
required: true
NIXPKGS_BRANCH_CHECK_APP_PRIVATE_KEY:
required: true
NIXPKGS_COMMIT_CHECK_APP_PRIVATE_KEY:
required: true
NIXPKGS_MANUAL_EDIT_CHECK_APP_PRIVATE_KEY:
required: true
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-slim
permissions:
pull-requests: write # submitting 'wrong branch' reviews
outputs:
baseBranch: ${{ steps.prepare.outputs.base }}
headBranch: ${{ steps.prepare.outputs.head }}
mergedSha: ${{ steps.prepare.outputs.mergedSha }}
targetSha: ${{ steps.prepare.outputs.targetSha }}
systems: ${{ steps.prepare.outputs.systems }}
touched: ${{ steps.prepare.outputs.touched }}
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout-cone-mode: true # default, for clarity
sparse-checkout: |
ci/github-script
# It's fine to reuse this app in the 'eval / compare' job,
# because this job has to run before that one.
- uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
if: vars.NIXPKGS_BRANCH_CHECK_CLIENT_ID && github.actor != 'dependabot[bot]'
id: app-token
with:
client-id: ${{ vars.NIXPKGS_BRANCH_CHECK_CLIENT_ID }}
private-key: ${{ secrets.NIXPKGS_BRANCH_CHECK_APP_PRIVATE_KEY }}
permission-pull-requests: write
- id: prepare
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
github-token: ${{ steps.app-token.outputs.token || github.token }}
retries: 10
# The default for this includes code 422, which happens regularly for us when comparing commits:
# 422 - Server Error: Sorry, this diff is taking too long to generate.
# Listing all other values from here to effectively remove 422:
# https://github.com/octokit/plugin-retry.js/blob/9a2443746c350b3beedec35cf26e197ea318a261/src/index.ts#L14
retry-exempt-status-codes: 400,401,403,404
script: |
require('./ci/github-script/prepare.js')({
github,
context,
core,
dry: context.eventName == 'pull_request',
})
check:
name: Check
needs: [prepare]
uses: ./.github/workflows/check.yml
permissions:
# cherry-picks
pull-requests: write
secrets:
NIXPKGS_COMMIT_CHECK_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_COMMIT_CHECK_APP_PRIVATE_KEY }}
NIXPKGS_MANUAL_EDIT_CHECK_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_MANUAL_EDIT_CHECK_APP_PRIVATE_KEY }}
with:
baseBranch: ${{ needs.prepare.outputs.baseBranch }}
headBranch: ${{ needs.prepare.outputs.headBranch }}
mergedSha: ${{ needs.prepare.outputs.mergedSha }}
targetSha: ${{ needs.prepare.outputs.targetSha }}
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
pull-requests: write
statuses: write
secrets:
NIXPKGS_BRANCH_CHECK_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_BRANCH_CHECK_APP_PRIVATE_KEY }}
with:
artifact-prefix: ${{ inputs.artifact-prefix }}
mergedSha: ${{ needs.prepare.outputs.mergedSha }}
headSha: ${{ github.event.pull_request.head.sha }}
targetSha: ${{ needs.prepare.outputs.targetSha }}
systems: ${{ needs.prepare.outputs.systems }}
testVersions: ${{ contains(fromJSON(needs.prepare.outputs.touched), 'pinned') && !contains(fromJSON(needs.prepare.outputs.headBranch).type, 'development') }}
bot:
name: Bot
needs: [prepare, eval]
uses: ./.github/workflows/bot.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 }}
build:
name: Build
needs: [prepare]
uses: ./.github/workflows/build.yml
with:
artifact-prefix: ${{ inputs.artifact-prefix }}
baseBranch: ${{ needs.prepare.outputs.baseBranch }}
mergedSha: ${{ needs.prepare.outputs.mergedSha }}
targetSha: ${{ needs.prepare.outputs.targetSha }}
# This job's only purpose is to create the target for the "Required Status Checks" branch ruleset.
# It "needs" all the jobs that should block merging a PR.
unlock:
if: github.event_name != 'pull_request' && always()
# Modify this list to add or remove jobs from required status checks.
needs:
- check
- lint
- eval
- build
runs-on: ubuntu-slim
permissions:
statuses: write
steps:
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
env:
RESULTS: ${{ toJSON(needs.*.result) }}
with:
script: |
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,
// WARNING:
// Do NOT change the name of this, otherwise the rule will not catch it anymore.
// This would prevent all PRs from merging.
context: 'no PR failures',
state: JSON.parse(process.env.RESULTS).every(status => status == 'success') ? 'success' : 'error',
target_url,
})

View File

@@ -1,92 +0,0 @@
name: Review
on:
workflow_run:
workflows:
- Reviewed
types: [completed]
# This is used as fallback without app only.
# This happens when testing in forks without setting up that app.
permissions:
pull-requests: write # minimizing dismissed reviews and adding reactions
defaults:
run:
shell: bash
jobs:
process:
runs-on: ubuntu-slim
timeout-minutes: 2
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: |
ci/github-script
# Use the GitHub App to make sure the reaction happens with the same user who will later merge.
- uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_CLIENT_ID
id: app-token
with:
client-id: ${{ vars.NIXPKGS_CI_CLIENT_ID }}
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
permission-pull-requests: write
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
github-token: ${{ steps.app-token.outputs.token || github.token }}
retries: 3
script: |
const { handleMergeComment } = require('./ci/github-script/merge.js')
// 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
})).map(review => {
// The `check` 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.
if (review.user?.login == 'github-actions[bot]' && review.state == 'DISMISSED')
return github.graphql(`
mutation($node_id:ID!) {
minimizeComment(input: {
classifier: RESOLVED,
subjectId: $node_id
})
{ clientMutationId }
}`,
{ node_id: review.node_id }
)
// The `bot` workflow reacts to comments with @NixOS/nixpkgs-merge-bot references, but might only
// pick up a comment after up to 10 minutes. To give the user instant feedback, this job adds
// a reaction to these comments.
return handleMergeComment({
github,
body: review.body,
node_id: review.node_id,
reaction: 'EYES',
})
})
)
)
)

View File

@@ -1,17 +0,0 @@
name: Reviewed
on:
pull_request_review:
types: [submitted, dismissed]
permissions: {}
defaults:
run:
shell: bash
jobs:
trigger:
runs-on: ubuntu-slim
steps:
- run: echo This is a no-op only used as a trigger for workflow_run.

View File

@@ -1,80 +0,0 @@
name: Teams
on:
schedule:
# Every Tuesday at 19:42 (randomly chosen)
- cron: '42 19 * * 1'
workflow_dispatch:
permissions: {}
defaults:
run:
shell: bash
jobs:
sync:
if: github.event_name != 'schedule' || github.repository_owner == 'NixOS'
runs-on: ubuntu-slim
steps:
# Use a GitHub App to create the PR so that CI gets triggered and to
# request team member lists.
- uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
id: app-token
with:
client-id: ${{ vars.NIXPKGS_CI_CLIENT_ID }}
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
permission-administration: read
permission-contents: write
permission-members: read
permission-pull-requests: write
- name: Fetch source
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout: |
ci/github-script
maintainers/github-teams.json
- name: Install dependencies
run: npm install bottleneck@2.19.5
- name: Synchronise teams
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
github-token: ${{ steps.app-token.outputs.token }}
script: |
require('./ci/github-script/get-teams.js')({
github,
context,
core,
outFile: "maintainers/github-teams.json"
})
- name: Get GitHub App User Git String
id: user
env:
GH_TOKEN: ${{ steps.app-token.outputs.token }}
APP_SLUG: ${{ steps.app-token.outputs.app-slug }}
run: |
name="${APP_SLUG}[bot]"
userId=$(gh api "/users/$name" --jq .id)
email="$userId+$name@users.noreply.github.com"
echo "git-string=$name <$email>" >> "$GITHUB_OUTPUT"
- name: Create Pull Request
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
with:
token: ${{ steps.app-token.outputs.token }}
add-paths: maintainers/github-teams.json
author: ${{ steps.user.outputs.git-string }}
committer: ${{ steps.user.outputs.git-string }}
commit-message: "maintainers/github-teams.json: Automated sync"
branch: pr/github-team-sync
title: "maintainers/github-teams.json: Automated sync"
body: |
This is an automated PR to sync the GitHub teams with access to this repository to the `lib.teams` list.
This PR can be merged without taking any further action.

View File

@@ -1,123 +0,0 @@
name: Test
on:
pull_request:
concurrency:
group: test-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
cancel-in-progress: true
permissions: {}
jobs:
prepare:
runs-on: ubuntu-slim
outputs:
merge-group: ${{ steps.files.outputs.merge-group }}
mergedSha: ${{ steps.prepare.outputs.mergedSha }}
pr: ${{ steps.files.outputs.pr }}
push: ${{ steps.files.outputs.push }}
targetSha: ${{ steps.prepare.outputs.targetSha }}
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
with:
persist-credentials: false
sparse-checkout-cone-mode: true # default, for clarity
sparse-checkout: |
ci/github-script
- id: prepare
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
retries: 10
# The default for this includes code 422, which happens regularly for us when comparing commits:
# 422 - Server Error: Sorry, this diff is taking too long to generate.
# Listing all other values from here to effectively remove 422:
# https://github.com/octokit/plugin-retry.js/blob/9a2443746c350b3beedec35cf26e197ea318a261/src/index.ts#L14
retry-exempt-status-codes: 400,401,403,404
script: |
require('./ci/github-script/prepare.js')({
github,
context,
core,
// Review comments will be posted by the main PR workflow on the pull_request_target event.
dry: true,
})
- name: Determine changed files
id: files
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
with:
script: |
const files = (await github.paginate(github.rest.pulls.listFiles, {
...context.repo,
pull_number: context.payload.pull_request.number,
per_page: 100,
})).map(file => file.filename)
if (files.some(file => [
'.github/workflows/build.yml',
'.github/workflows/check.yml',
'.github/workflows/eval.yml',
'.github/workflows/lint.yml',
'.github/workflows/merge-group.yml',
'.github/workflows/test.yml',
'ci/github-script/supportedSystems.js',
'ci/pinned.json',
'ci/supportedBranches.js',
].includes(file))) core.setOutput('merge-group', true)
if (files.some(file => [
'.github/actions/checkout/action.yml',
'.github/workflows/bot.yml',
'.github/workflows/build.yml',
'.github/workflows/check.yml',
'.github/workflows/eval.yml',
'.github/workflows/lint.yml',
'.github/workflows/pull-request-target.yml',
'.github/workflows/test.yml',
'ci/github-script/bot.js',
'ci/github-script/check-target-branch.js',
'ci/github-script/commits.js',
'ci/github-script/get-pr-commit-details.js',
'ci/github-script/lint-commits.js',
'ci/github-script/merge.js',
'ci/github-script/prepare.js',
'ci/github-script/reviewers.js',
'ci/github-script/reviews.js',
'ci/github-script/supportedSystems.js',
'ci/github-script/withRateLimit.js',
'ci/pinned.json',
'ci/supportedBranches.js',
].includes(file))) core.setOutput('pr', true)
merge-group:
if: needs.prepare.outputs.merge-group
name: Merge Group
needs: [prepare]
uses: ./.github/workflows/merge-group.yml
# Those are actually only used on the merge_group event, but will throw an error if not set.
permissions:
pull-requests: write # unused on pull_request, required by merge-group workflow
statuses: write # unused on pull_request, required by merge-group workflow
with:
artifact-prefix: mg-
mergedSha: ${{ needs.prepare.outputs.mergedSha }}
targetSha: ${{ needs.prepare.outputs.targetSha }}
pr:
if: needs.prepare.outputs.pr
name: PR
needs: [prepare]
uses: ./.github/workflows/pull-request-target.yml
# Those are actually only used on the pull_request_target event, but will throw an error if not set.
permissions:
issues: write # unused on pull_request, required by bot workflow
pull-requests: write # unused on pull_request, required by PR workflow
statuses: write # unused on pull_request, required by PR workflow
secrets:
NIXPKGS_CI_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
NIXPKGS_BRANCH_CHECK_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_BRANCH_CHECK_APP_PRIVATE_KEY }}
NIXPKGS_COMMIT_CHECK_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_COMMIT_CHECK_APP_PRIVATE_KEY }}
NIXPKGS_MANUAL_EDIT_CHECK_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_MANUAL_EDIT_CHECK_APP_PRIVATE_KEY }}
with:
artifact-prefix: pr-

14
.github/zizmor.yml vendored
View File

@@ -1,14 +0,0 @@
# This file defines the ignore rules for zizmor.
#
# For rules that contain a high number of false positives, prefer listing them here
# instead of adding ignore comments. Note that zizmor cannot ignore by line-within-a-string, so
# there are some ignore items that encompass multiple problems within one `run` block. An issue
# tracking this is at https://github.com/woodruffw/zizmor/issues/648.
#
# For more info, see the documentation: https://woodruffw.github.io/zizmor/usage/#ignoring-results
rules:
dangerous-triggers:
disable: true
secrets-outside-env:
disable: true

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,45 +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>
jopejoe1 <nixpkgs@missing.ninja> <jopejoe1@missing.ninja>
jopejoe1 <nixpkgs@missing.ninja> <jopejoe1>
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>
Noah Biewesch <dev@noahbiewesch.com> <90870942+trueNAHO@users.noreply.github.com>
quantenzitrone <nix@dev.quantenzitrone.eu>
quantenzitrone <nix@dev.quantenzitrone.eu> <74491719+Quantenzitrone@users.noreply.github.com>
quantenzitrone <nix@dev.quantenzitrone.eu> <74491719+quantenzitrone@users.noreply.github.com>
quantenzitrone <nix@dev.quantenzitrone.eu> <general@dev.quantenzitrone.eu>
quantenzitrone <nix@dev.quantenzitrone.eu> <quantenzitrone@protonmail.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>
toastal <toastal@posteo.net>
toastal <toastal@posteo.net> <561087+toastal@users.noreply.github.com>
toastal <toastal@posteo.net> <toastal@protonmail.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>

14
.mention-bot Normal file
View File

@@ -0,0 +1,14 @@
{
"userBlacklist": [
"civodul",
"jhasse",
"shlevy",
"bbenoist"
],
"alwaysNotifyForPaths": [
{ "name": "FRidh", "files": ["pkgs/top-level/python-packages.nix", "pkgs/development/interpreters/python/*", "pkgs/development/python-modules/*" ] },
{ "name": "LnL7", "files": ["pkgs/stdenv/darwin/*", "pkgs/os-specific/darwin/*"] },
{ "name": "copumpkin", "files": ["pkgs/stdenv/darwin/*", "pkgs/os-specific/darwin/apple-source-releases/*"] }
],
"fileBlacklist": ["pkgs/top-level/all-packages.nix"]
}

25
.travis.yml Normal file
View File

@@ -0,0 +1,25 @@
language: nix
matrix:
include:
- os: linux
sudo: false
script:
- ./maintainers/scripts/travis-nox-review-pr.sh nixpkgs-verify nixpkgs-manual nixpkgs-tarball nixpkgs-unstable
- ./maintainers/scripts/travis-nox-review-pr.sh nixos-options nixos-manual
- os: linux
sudo: required
dist: trusty
before_script:
- sudo mount -o remount,exec,size=2G,mode=755 /run/user
script: ./maintainers/scripts/travis-nox-review-pr.sh nox pr
- os: osx
osx_image: xcode7.3
script: ./maintainers/scripts/travis-nox-review-pr.sh nox pr
env:
global:
- GITHUB_TOKEN=5edaaf1017f691ed34e7f80878f8f5fbd071603f
notifications:
email:
on_success: never
on_failure: change

View File

@@ -1 +0,0 @@
lib/.version

1
.version Normal file
View File

@@ -0,0 +1 @@
17.03

View File

@@ -1,965 +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][pr-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 two checkboxes are 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 on the targeted branch;
- the package should reside in `pkgs/by-name`.
Required status checks prevent PRs that fail them ("PR / ..." jobs) from being merged. Ofborg is not required by the checks.
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 [`nixpkgs-committers` repository](https://github.com/NixOS/nixpkgs-committers) 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` | [`staging-nixos`][test-driver-rebuild] |
| --- | --- | --- | --- | --- |
| Used for development | ✔️ | ❌ | ✔️ | ✔️ |
| Built by Hydra | ✔️ | ✔️ | ❌ | ❌ |
| [Mass rebuilds][mass-rebuild] | ❌ | ⚠️ Only to fix Hydra builds | ✔️ | ❌[^1] |
| Critical security fixes | ✔️ for non-mass-rebuilds | ✔️ for mass-rebuilds | ❌ | ✔️ |
| Automatically merged into | `staging-next` & `staging-nixos` | `staging` | - | - |
| Manually merged into | - | `master` | `staging-next` | `master` |
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`
- `staging-nixos`/`staging-nixos-YY.MM`
[^1]: Except changes that cause no more rebuilds than kernel updates
# 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 **500 or more**, consider targeting the `staging` branch instead of `master`; if the number is **1000 or more**, the pull request causes a mass rebuild, and should target the `staging` branch.
See [previously merged pull requests to the staging branches](https://github.com/NixOS/nixpkgs/issues?q=base%3Astaging+-base%3Astaging-next+is%3Amerged) to get a sense for what changes are considered mass rebuilds.
Please note that changes to the Linux kernel are an exception to this rule.
These PRs go to `staging-nixos`, see [the next section for more context](#changes-rebuilding-all-tests).
### Changes rebuilding all NixOS tests
[test-driver-rebuild]: #changes-rebuilding-all-nixos-tests
Changes causing a rebuild of all NixOS tests get a special [`10.rebuild-nixos-tests`](https://github.com/NixOS/nixpkgs/issues?q=state%3Aopen%20label%3A10.rebuild-nixos-tests) label.
These changes pose a significant impact on the build infrastructure.
Hence, these PRs should either target a `staging`-branch or `staging-nixos`-branch, provided one of following conditions applies:
* The label `10.rebuild-nixos-tests` is set, or
* The PR is a change affecting the Linux kernel.
The branch gets merged whenever mainline kernel updates or critical security fixes land on the branch.
This usually happens on a weekly basis.
Backports are not handled by such a branch.
The relevant PRs from this branch must be backported manually.
## 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.
## Review and Merge conventions
Comments on Pull Requests are considered non-blocking by default.
Every blocking comment must be explicitly marked as such by using GitHub's "Request Changes" review type.
A reviewer who submits a blocking review should be available for discussion and re-review.
An abandoned review may be dismissed after reasonable time was given at the discretion of the merger.
All suggestions for change, blocking or not, should be acknowledged before merge.
This can happen implicitly by applying the suggestion, or explicitly by rejecting it.
To make changes on commit structure and commit messages or apply simple suggestions, committers are encouraged to [checkout the PR](https://cli.github.com/manual/gh_pr_checkout) and push directly to the contributor's branch before merging.
Committers will carefully weigh the cost of another review cycle against the feelings of the contributor when pushing to their branch.
They should also transparently communicate which changes they made.
If a contributor does not want committers to push to their branch, they must uncheck the "Allow edits and access to secrets by maintainers" box explicitly.
> [!WARNING]
> Committers: Branches created via `gh pr checkout` can't be pushed with `--force-with-lease`, so do a sanity check before pushing.
## 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
{ tag = version; }
```
instead of
```nix
{ tag = "${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 an 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)`.
- Any style choices not covered here but that can be expressed as general rules should be left at the discretion of the authors of changes and _not_ commented in reviews.
The purpose of this is:
- to avoid churn as contributors with different style preferences undo each other's changes,
- to ensure that style rules are written down and consistent (and can thus be followed when authoring changes, reducing review cycles),
- and to encourage reviews to focus on more impactful considerations.
# 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.
# Automation/AI policy
Every contribution to Nixpkgs and related development venues, including code, documentation, and communication on GitHub and Matrix, must have a **responsible person in the loop** who is accountable for that contribution and reviews it before submission, and must **transparently disclose** any nontrivial use of automation to produce it, including but not limited to LLMbased AI tools.
The following sections give more detail.
## Scope
Any use of automated tools to generate nontrivial amounts of output as part of a contribution, in whole or in part, verbatim or edited, is covered by this policy, except as listed in the Exemptions section.
Both LLMbased AI tools and handwritten automation are covered.
Contributions include code and documentation in commits, commit messages, pull request summaries and reviews, issue and vulnerability reports, GitHub comments, Matrix messages, and Discourse posts.
The covered venues are the GitHub repositories for Nixpkgs and [related projects](https://github.com/orgs/NixOS/teams/nixpkgs-core/repositories) under the jurisdiction of the Nixpkgs core team, Matrix rooms that are focused on development of those projects, and Discourse topics about Nixpkgs development.
## Accountability
Everyone who submits a contribution to Nixpkgs is responsible for it, regardless of the use of automated tooling.
Before submission, they must establish a reasonable level of understanding of the contribution and expectation of its correctness.
A contributor submitting a contribution intended for inclusion in Nixpkgs is also responsible for ensuring that it is [appropriately licensed](https://github.com/NixOS/nixpkgs/blob/master/COPYING) and credited, and not encumbered by any incompatible copyright.
When output from automated tooling is used in contributions, a contributor must establish confidence in that output.
This can be achieved by establishing confidence in the correctness of the toolings logic, manual review of the included output, or using further automation to verify the output (e.g. programmatically checking whether a refactor avoids causing rebuilds).
As the inner workings of LLMbased AI tools cannot be sufficiently understood at present, only the latter two options are available when those are used; vibe coding without review is not permitted.
When automation is used to verify output, the verification tooling itself must be disclosed and reviewed in line with this policy.
This policy applies equally to any further discussion of a contribution.
Comments and reviews must separately satisfy the same requirements of understanding, review, and disclosure.
Contributors are expected to be able to answer questions about their contribution and respond to feedback appropriately, without simply forwarding messages back and forth to automated tools.
It is not permitted to submit automated contributions without any manual review or intervention, outside of standard community automation.
Automation without any manual review must not be used as the sole arbiter of whether to merge a change.
## Transparency
All covered use of automated tooling for a contribution must be disclosed as part of that contribution.
In the case of LLMbased AI tooling used for commits, this **must** be in the form of an `Assisted-by:` Git commit trailer, including at least the tool name and the primary model name and version used for the contribution.
A `Co-authored-by:` trailer does not satisfy this policy.
Any adequate form of disclosure is permitted for other kinds of tooling and contribution.
Pull request summaries and review comments must be disclosed separately to commits.
## Exemptions
The following situations are fully or partially exempt:
* Use of standard deterministic editor/IDE/formatter/text transformation tooling to produce changes that the author manually reviews and understands is exempt, including inline “autocompletion” (even if LLMbased) of short, rote snippets of text that do not contribute anything beyond boilerplate the author would have written anyway.
* Use of standard community automation is exempt, such as `nix-update`, the official Nixpkgs CI bots, the @r-ryantm update bot, other maintainerapproved bots that run update scripts, and the Nixpkgs security tracker bot.
* Use of AI tools for research, testing, debugging, or private review is out of scope, if no substantial amount of their output is included in the resulting contribution.
However, if these tools had a significant technical influence on your contribution, you are still responsible for it per the Accountability section, and are expected to disclose this where relevant.
* Use of machine translation is exempt from the requirement to understand the translated output.
However, the requirements of appropriate confidence in the original text, responsibility, and disclosure still apply, and you are encouraged to additionally include the original untranslated contribution.
* Use of automation in a contribution clearly marked as not being ready for merge (e.g. a draft pull request) is exempt from the requirement for full selfreview, as long as some amount of review has been done and it is expected that the requirements will be met by the time it is marked as ready.
This does not waive any other requirement.
* Use of automated tools to develop upstream software packaged inside Nixpkgs is not in scope.
## Enforcement
If you believe that someone is using automation without appropriate disclosure and review, you can politely ask them if thats the case and point them to this policy as appropriate.
Please assume good faith and remain civil; its not always possible to determine, and it is more likely that someone overlooked this policy than deliberately violated it.
If you think someone is continuing to break the policy after this, please escalate to the [Nixpkgs core team](https://nixos.org/community/teams/nixpkgs-core/) rather than fighting over it.
If a contribution is clearly in violation of the policy (e.g. the contributor admits it was not followed, or there are AI tool attributions that do not meet our required format), it can be closed or hidden, preferably after informing the contributor of the policy and giving them a chance to address the violations.
Deliberate violations of this policy are considered to break the [Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) clause against “Wasting other peoples time with low quality contributions, including but not limited to LLM and bot spam”.
Repeated violations are grounds for further moderation action.
## Credits
This policy takes inspiration from similar policies in [LLVM](https://llvm.org/docs/AIToolPolicy.html), [Mesa](https://gitlab.freedesktop.org/mesa/mesa/-/blob/mesa-26.1.0-rc1/docs/submittingpatches.rst?ref_type=tags), [Fedora](https://docs.fedoraproject.org/en-US/council/policy/ai-contribution-policy/), and the [Linux kernel](https://docs.kernel.org/7.0/process/coding-assistants.html), along with [a proposal by the author of Anubis](https://xeiaso.net/notes/2025/assisted-by-footer/).

13
COPYING
View File

@@ -1,4 +1,4 @@
Copyright (c) 2003-2026 Eelco Dolstra and the Nixpkgs/NixOS contributors
Copyright (c) 2003-2017 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,14 @@ 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.). Also, the license does not apply
to some of the binaries used for bootstrapping Nixpkgs (e.g.,
pkgs/stdenv/linux/tools/bash). 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.

102
README.md
View File

@@ -1,84 +1,42 @@
<p align="center">
<a href="https://nixos.org">
<picture>
<source media="(prefers-color-scheme: light)" srcset="https://brand.nixos.org/logos/nixos-logo-default-gradient-black-regular-horizontal-minimal.svg">
<source media="(prefers-color-scheme: dark)" srcset="https://brand.nixos.org/logos/nixos-logo-default-gradient-white-regular-horizontal-minimal.svg">
<img src="https://brand.nixos.org/logos/nixos-logo-default-gradient-black-regular-horizontal-minimal.svg" width="500px" alt="NixOS logo">
</picture>
</a>
</p>
[<img src="http://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>
[![Build Status](https://travis-ci.org/NixOS/nixpkgs.svg?branch=master)](https://travis-ci.org/NixOS/nixpkgs)
[![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 140,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](http://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 git://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-17.03` for the latest
release and `nixos-unstable` for the latest successful build of master:
# Community
```
% git remote update channels
% git rebase channels/nixos-17.03
```
* [Discourse Forum](https://discourse.nixos.org/)
* [Matrix Chat](https://matrix.to/#/#space: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.)
For pull-requests, please rebase onto nixpkgs `master`.
# 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 Branding](https://github.com/NixOS/branding) - NixOS branding
# Continuous Integration and Distribution
Nixpkgs and NixOS are built and tested by our continuous integration system, [Hydra](https://hydra.nixos.org/).
[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/)
* [Nix Wiki](https://nixos.org/wiki/) (deprecated, see milestone ["Move the Wiki!"](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22Move+the+wiki%21%22))
* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
* [Continuous package builds for the NixOS 26.05 release](https://hydra.nixos.org/jobset/nixos/release-26.05)
* [Continuous package builds for 17.03 release](https://hydra.nixos.org/jobset/nixos/release-17.03)
* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
* [Tests for the NixOS 26.05 release](https://hydra.nixos.org/job/nixos/release-26.05/tested#tabs-constituents)
* [Tests for 17.03 release](https://hydra.nixos.org/job/nixos/release-17.03/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).
Communication:
# Contributing
Nixpkgs is among the most active projects on GitHub.
While thousands of open issues and pull requests might seem like a lot at first, it helps to 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.
* [Mailing list](http://lists.science.uu.nl/mailman/listinfo/nix-dev)
* [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos)

538
ci/OWNERS
View File

@@ -1,538 +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
/shell.nix @infinisil @NixOS/Security
# Libraries
/lib @infinisil @hsjobeki
/lib/generators.nix @infinisil @hsjobeki
/lib/cli.nix @infinisil @hsjobeki
/lib/debug.nix @infinisil @hsjobeki
/lib/asserts.nix @infinisil @hsjobeki
/lib/path/* @infinisil @hsjobeki
/lib/fileset @infinisil @hsjobeki
/maintainers/github-teams.json @infinisil
/maintainers/computed-team-list.nix @infinisil
## Standard environmentrelated libraries
/lib/customisation.nix @alyssais @NixOS/stdenv
/lib/derivations.nix @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/top-level/config.nix @jopejoe1
/pkgs/top-level/make-tarball.nix @jopejoe1
/pkgs/top-level/packages-config.nix @jopejoe1
/pkgs/top-level/packages-info.nix @jopejoe1
/pkgs/top-level/release-lib.nix @jopejoe1
/pkgs/top-level/release.nix @jopejoe1
/pkgs/stdenv @philiptaron @NixOS/stdenv
/pkgs/stdenv/generic @Ericson2314 @NixOS/stdenv
/pkgs/stdenv/generic/problems.nix @infinisil
/pkgs/test/problems @infinisil
/pkgs/stdenv/generic/check-meta.nix @infinisil @Ericson2314 @adisbladis @NixOS/stdenv
/pkgs/stdenv/generic/meta-types.nix @infinisil @adisbladis @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
/pkgs/pkgs-lib/formats/json2x @Stunkymonkey @h7x4 @figsoda
# Nixpkgs build-support
/pkgs/build-support/writers @lassulus
# 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.
# Otherwise keep in-sync with lib.teams.nix.
pkgs/tools/package-management/nix/ @Artturin @Ericson2314 @lovesegfault @Mic92 @philiptaron @roberth @tomberek @xokdvium @raitobezarius
nixos/modules/installer/tools/nix-fallback-paths.nix @Artturin @Ericson2314 @lovesegfault @Mic92 @philiptaron @roberth @tomberek @xokdvium @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 @GetPsyched @hsjobeki
/doc/redirects.json @GetPsyched
/nixos/doc/manual/redirects.json @GetPsyched
# NixOS integration test driver
/nixos/lib/test-driver @tfc
/nixos/lib/testing @tfc
# NixOS QEMU virtualisation
/nixos/modules/virtualisation/qemu-vm.nix @raitobezarius
/nixos/modules/services/backup/libvirtd-autosnapshot.nix @6543
# 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 @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
# 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
# ROCm
/pkgs/development/rocm-modules @NixOS/rocm
# 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/compilers/ghc/9.6.6-debian-binary.nix @sternenseemann @maralorn @wolfgangwalther @OPNA2608
/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 @marcusramberg
/pkgs/top-level/perl-packages.nix @stigtsp @marcusramberg
/pkgs/development/perl-modules @stigtsp @marcusramberg
# R
/pkgs/applications/science/math/R @jbedo
/pkgs/development/r-modules @jbedo
# Rust
/pkgs/development/compilers/rust @alyssais @Mic92 @winterqt
/pkgs/build-support/rust @winterqt
/pkgs/build-support/rust/fetch-cargo-vendor* @TomaSajt
/doc/languages-frameworks/rust.section.md @winterqt
# 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 @NixOS/llvm
/pkgs/development/compilers/emscripten @raitobezarius
/doc/toolchains/llvm.chapter.md @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/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 @leona-ya @theCapypara
# Licenses
/lib/licenses @alyssais @emilazy @jopejoe1
# Qt
/pkgs/development/libraries/qt-5 @K900 @NickCao @SuperSandro2000
/pkgs/development/libraries/qt-6 @K900 @NickCao @SuperSandro2000
# KDE Frameworks 5
/pkgs/development/libraries/kde-frameworks @K900 @NickCao @SuperSandro2000
# KDE / Plasma 6
/pkgs/kde @K900 @NickCao @SuperSandro2000
/maintainers/scripts/kde @K900 @NickCao @SuperSandro2000
# 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
# 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
/doc/packages/linux.section.md @NixOS/linux-kernel
/lib/kernel.nix @NixOS/linux-kernel
/nixos/doc/manual/configuration/linux-kernel.chapter.md @NixOS/linux-kernel
/nixos/modules/system/boot/kernel.nix @NixOS/linux-kernel
/nixos/tests/kernel-generic/ @NixOS/linux-kernel
/pkgs/build-support/kernel/ @NixOS/linux-kernel
/pkgs/os-specific/linux/kernel/ @NixOS/linux-kernel
/pkgs/top-level/linux-kernels.nix @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
/pkgs/development/interpreters/dhall @Gabriella439
# Agda
/pkgs/build-support/agda @NixOS/agda
/pkgs/top-level/agda-packages.nix @NixOS/agda
/pkgs/development/libraries/agda @NixOS/agda
/doc/languages-frameworks/agda.section.md @NixOS/agda
/nixos/tests/agda @NixOS/agda
# Idris
/pkgs/development/idris-modules @Infinisil
/pkgs/development/compilers/idris2 @mattpolzin
# 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
## nvim-treesitter
/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @NixOS/neovim @figsoda
/pkgs/applications/editors/vim/plugins/utils/nvim-treesitter @NixOS/neovim @figsoda
# VsCode Extensions
/pkgs/applications/editors/vscode/extensions
# PHP interpreter, packages, extensions, tests and documentation
/doc/languages-frameworks/php.section.md @aanderse @ma27 @talyz
/nixos/tests/php @aanderse @ma27 @talyz
/pkgs/build-support/php/build-pecl.nix @aanderse @ma27 @talyz
/pkgs/development/interpreters/php @jtojnar @aanderse @ma27 @talyz
/pkgs/development/php-packages @aanderse @ma27 @talyz
/pkgs/top-level/php-packages.nix @jtojnar @aanderse @ma27 @talyz
# Docker tools
/pkgs/build-support/docker @roberth @jhol
/nixos/tests/docker-tools* @roberth @jhol
/doc/build-helpers/images/dockertools.section.md @roberth @jhol
# Blockchains
/pkgs/applications/blockchains @mmahut @RaghavSood
# Go
/doc/languages-frameworks/go.section.md @kalbasit @katexochen @Mic92
/pkgs/build-support/go @kalbasit @katexochen @Mic92
/pkgs/development/compilers/go @kalbasit @katexochen @Mic92
# 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.* @adamcstephens @bendlas @christoph-heiss @emilylange @nycodeghg @pyrox0 @tebriel
pkgs/by-name/fo/forgejo/ @adamcstephens @bendlas @christoph-heiss @emilylange @nycodeghg @pyrox0 @tebriel
nixos/tests/forgejo.nix @adamcstephens @bendlas @christoph-heiss @emilylange @nycodeghg @pyrox0 @tebriel
# 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/prefetch-npm-deps @winterqt
/doc/languages-frameworks/javascript.section.md @winterqt
/pkgs/development/tools/pnpm @Scrumplex @gepbird
/pkgs/build-support/node/fetch-pnpm-deps @Scrumplex @gepbird
/pkgs/test/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 @RossComputerGuy
/doc/hooks/zig.section.md @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/by-name/gn/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 @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/by-name/au/authelia/ @06kellyjac @nicomem
# OctoDNS
pkgs/by-name/oc/octodns/ @anthonyroussel
# Teleport
/pkgs/build-support/teleport @arianvp @justinas @sigma @tomberek @techknowlogick @JuliusFreudenberger
pkgs/by-name/te/teleport* @arianvp @justinas @sigma @tomberek @techknowlogick @JuliusFreudenberger
# Warp-terminal
pkgs/by-name/wa/warp-terminal/ @emilytrau @imadnyc @FlameFlag @johnrtitor
# Nim
/doc/languages-frameworks/nim.section.md @NixOS/nim
/pkgs/build-support/build-nim-package.nix @NixOS/nim
/pkgs/build-support/build-nim-sbom.nix @NixOS/nim
/pkgs/top-level/nim-overrides.nix @NixOS/nim
# Radicle
/pkgs/build-support/fetchradicle/ @NixOS/radicle
/pkgs/build-support/fetchradiclepatch/ @NixOS/radicle
# Zellij plugins
/pkgs/by-name/ze/zellij/plugins/ @PerchunPak

View File

@@ -1,106 +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.
## GitHub specific code
Some of the code is specific to GitHub.
This code is currently spread out over multiple places and written in both Bash and JavaScript.
The goal is to eventually have all GitHub specific code in `ci/github-script` and written in JavaScript via `actions/github-script`.
A lot of code has already been migrated, but some Bash code still remains.
New CI features need to be introduced in JavaScript, not Bash.
## Nixpkgs merge bot
The Nixpkgs merge bot empowers package maintainers by enabling them to merge PRs related to their own packages.
It serves as a bridge for maintainers to quickly respond to user feedback, facilitating a more self-reliant approach.
Especially when considering there are roughly 20 maintainers for every committer, this bot is a game-changer.
Following [RFC 172], the merge bot was originally implemented as a [python webapp](https://github.com/NixOS/nixpkgs-merge-bot), which has now been integrated into [`ci/github-script/bot.js`](./github-script/bot.js) and [`ci/github-script/merge.js`](./github-script/merge.js).
### Using the merge bot
To merge a PR, maintainers can simply comment:
```gfm
@NixOS/nixpkgs-merge-bot merge
```
The next time the bot runs it will verify the below constraints, then (if satisfied) merge the PR.
The merge bot will reference [#306934](https://github.com/NixOS/nixpkgs/issues/306934) on PRs it merges successfully, [#305350](https://github.com/NixOS/nixpkgs/issues/305350) for unsuccessful attempts, or [#371492](https://github.com/NixOS/nixpkgs/issues/371492) if an error occurs.
These issues effectively list PRs the merge bot has interacted with.
### Merge bot constraints
To ensure security and a focused utility, the bot adheres to specific limitations:
- The PR targets one of the [development branches](#branch-classification).
- The PR only touches files of packages located under `pkgs/by-name/*`.
- The PR is either:
- approved by a [committer][@NixOS/nixpkgs-committers].
- backported via label.
- opened by a [committer][@NixOS/nixpkgs-committers].
- opened by [@r-ryantm](https://nix-community.github.io/nixpkgs-update/r-ryantm/).
- The user attempting to merge is a member of [@NixOS/nixpkgs-maintainers].
- The user attempting to merge is a maintainer of all packages touched by the PR.
### Approving merge bot changes
Changes to the bot can usually be approved by the [@NixOS/nixpkgs-ci] team, as with other CI changes.
However, additional acknowledgement from the [@NixOS/nixpkgs-core] team is required for changes to what the merge bot will merge, who is eligible to use the merge bot, or similar changes in scope.
## `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 and `haskell-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.
[@NixOS/nixpkgs-maintainers]: https://github.com/orgs/NixOS/teams/nixpkgs-maintainers
[@NixOS/nixpkgs-committers]: https://github.com/orgs/NixOS/teams/nixpkgs-committers
[@NixOS/nixpkgs-ci]: https://github.com/orgs/NixOS/teams/nixpkgs-ci
[@NixOS/nixpkgs-core]: https://github.com/orgs/NixOS/teams/nixpkgs-core
[RFC 172]: https://github.com/NixOS/rfcs/pull/172

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,205 +0,0 @@
let
pinned = (builtins.fromJSON (builtins.readFile ./pinned.json)).pins;
in
{
system ? builtins.currentSystem,
nixpkgs ? null,
nixPath ? "nixVersions.latest",
}:
let
nixpkgs' =
if nixpkgs == null then
fetchTarball {
inherit (pinned.nixpkgs) url;
sha256 = pinned.nixpkgs.hash;
}
else
nixpkgs;
pkgs = import nixpkgs' {
inherit system;
# Nixpkgs generally — and CI specifically — do not use aliases,
# because we want to ensure they are not load-bearing.
allowAliases = false;
};
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.biome = {
enable = true;
# Disable settings validation because its inputs are liable to hash mismatch
validate.enable = false;
settings.formatter = {
useEditorconfig = true;
};
settings.javascript.formatter = {
quoteStyle = "single";
semicolons = "asNeeded";
};
settings.json.formatter.enabled = false;
};
settings.formatter.biome.excludes = [
"*.min.js"
"pkgs/*"
];
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;
package = pkgs.nixfmt;
};
programs.yamlfmt = {
enable = true;
settings.formatter = {
retain_line_breaks = true;
};
};
settings.formatter.yamlfmt.excludes = [
# 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"
];
programs.nixf-diagnose = {
enable = true;
ignore = [
# Rule names can currently be looked up here:
# https://github.com/nix-community/nixd/blob/main/libnixf/src/Basic/diagnostic.py
# TODO: Remove the following and fix things.
"sema-unused-def-lambda-noarg-formal"
"sema-unused-def-lambda-witharg-arg"
"sema-unused-def-lambda-witharg-formal"
"sema-unused-def-let"
# Keep this rule, because we have `lib.or`.
"or-identifier"
# TODO: remove after outstanding prelude diagnostics issues are fixed:
# https://github.com/nix-community/nixd/issues/761
# https://github.com/nix-community/nixd/issues/762
"sema-primop-removed-prefix"
"sema-primop-overridden"
"sema-constant-overridden"
"sema-primop-unknown"
];
};
settings.formatter.nixf-diagnose = {
# Ensure nixfmt cleans up after nixf-diagnose.
priority = -1;
excludes = [
# Auto-generated; violates sema-extra-with
# Can only sensibly be removed when --auto-fix supports multiple fixes at once:
# https://github.com/inclyc/nixf-diagnose/issues/13
"pkgs/servers/home-assistant/component-packages.nix"
# https://github.com/nix-community/nixd/issues/708
"nixos/maintainers/scripts/azure-new/examples/basic/system.nix"
];
};
settings.formatter.editorconfig-checker = {
command = "${pkgs.lib.getExe pkgs.editorconfig-checker}";
options = [
"-disable-indent-size"
# TODO: Remove this once this upstream issue is fixed:
# https://github.com/editorconfig-checker/editorconfig-checker/issues/505
"-disable-charset"
];
includes = [ "*" ];
priority = 1;
};
# TODO: Upstream this into treefmt-nix eventually:
# https://github.com/numtide/treefmt-nix/issues/387
settings.formatter.markdown-code-runner = {
command = pkgs.lib.getExe pkgs.markdown-code-runner;
options =
let
config = pkgs.writers.writeTOML "markdown-code-runner-config" {
presets.nixfmt = {
language = "nix";
command = [ (pkgs.lib.getExe pkgs.nixfmt) ];
};
};
in
[ "--config=${config}" ];
includes = [ "*.md" ];
};
programs.zizmor.enable = true;
};
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;
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.lib.getAttrFromPath (pkgs.lib.splitString "." nixPath) pkgs;
};
# 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 { inherit pkgs; });
nixpkgs-vet = pkgs.callPackage ./nixpkgs-vet.nix {
nix = pkgs.nixVersions.latest;
};
parse = pkgs.lib.recurseIntoAttrs {
nix_latest = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.latest; };
nix_2_28 = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.nix_2_28; };
lix = pkgs.callPackage ./parse.nix { nix = pkgs.lix; };
lix_latest = pkgs.callPackage ./parse.nix { nix = pkgs.lixPackageSets.latest.lix; };
};
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;
nix = pkgs.nixVersions.latest;
};
}

View File

@@ -1,48 +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.baseline
```
The two most important arguments are:
- `--arg evalSystems`: The set of systems for which `nixpkgs` should be evaluated.
Defaults to the [supported systems](../../pkgs/top-level/release-supported-systems.json) for the branch.
Example: `--arg evalSystems '["x86_64-linux" "aarch64-darwin"]'`
- `--arg quickTest`: Enables testing a single chunk of the current system only for quick iteration.
Example: `--arg quickTest true`
The following arguments can be used to fine-tune performance:
- `--max-jobs`: The maximum number of derivations to run at the same time.
Only each supported system 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 number of cores on your system divided by `--max-jobs`.
- `--arg 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.
The default is 5000.
Example: `--arg chunkSize 10000`
Note that 16GB memory is the recommended minimum, while with less than 8GB memory evaluation time suffers greatly.
## Local eval with rebuilds / comparison
To compare two commits locally, first run the following on the baseline commit:
```
nix-build ci -A eval.baseline --out-link baseline
```
Then, on the commit with your changes:
```
nix-build ci -A eval.full --arg baseline ./baseline
```
Keep in mind to otherwise pass the same set of arguments for both commands (`evalSystems`, `quickTest`, `chunkSize`).
Running this command will evaluate the difference between the baseline statistics and the ones at the time of running the command.
From that difference, it will produce a human-readable report in `$out/step-summary.md`.
If no packages were added or removed, then performance statistics will also be generated as part of this report.

View File

@@ -1,85 +0,0 @@
# This expression will, as efficiently as possible, dump a
# *superset* of all attrpaths of derivations which might be
# part of a release on *any* platform.
#
# This expression runs single-threaded under all current Nix
# implementations, but much faster and with much less memory
# used than ./outpaths.nix itself.
#
# Once you have the list of attrnames you can split it up into
# $NUM_CORES batches and evaluate the outpaths separately for each
# batch, in parallel.
#
# To dump the attrnames:
#
# nix-instantiate --eval --strict --json ci/eval/attrpaths.nix -A names
#
{
lib ? import (path + "/lib"),
trace ? false,
path ? ./../..,
extraNixpkgsConfigJson ? "{}",
}:
let
# TODO: Use mapAttrsToListRecursiveCond when this PR lands:
# https://github.com/NixOS/nixpkgs/pull/395160
justAttrNames =
path: value:
let
result =
if path == [ "AAAAAASomeThingsFailToEvaluate" ] || !(lib.isAttrs value) then
[ ]
else if lib.isDerivation value then
[ path ]
else
lib.pipe value [
(lib.mapAttrsToList (
name: value:
lib.addErrorContext "while evaluating package set attribute path '${
lib.showAttrPath (path ++ [ name ])
}'" (justAttrNames (path ++ [ name ]) value)
))
lib.concatLists
];
in
lib.traceIf trace "** ${lib.showAttrPath path}" result;
outpaths = import ./outpaths.nix {
inherit path;
extraNixpkgsConfig = builtins.fromJSON extraNixpkgsConfigJson;
attrNamesOnly = true;
};
paths = [
# Some of the following are based on variants, which are disabled with `attrNamesOnly = true`.
# Until these have been removed from release.nix / hydra, we manually add them to the list.
[
"pkgsLLVM"
"stdenv"
]
[
"pkgsArocc"
"stdenv"
]
[
"pkgsZig"
"stdenv"
]
[
"pkgsStatic"
"stdenv"
]
[
"pkgsMusl"
"stdenv"
]
]
++ justAttrNames [ ] outpaths;
names = map lib.showAttrPath paths;
in
{
inherit paths names;
}

View File

@@ -1,47 +0,0 @@
# This turns ./outpaths.nix into chunks of a fixed size.
{
lib ? import ../../lib,
path ? ../..,
# The file containing all available attribute paths, which are split into chunks here
attrpathFile,
chunkSize,
myChunk,
includeBroken,
systems,
extraNixpkgsConfigJson,
}:
let
attrpaths = lib.importJSON attrpathFile;
myAttrpaths = lib.sublist (chunkSize * myChunk) chunkSize attrpaths;
unfiltered = import ./outpaths.nix {
inherit path;
inherit includeBroken systems;
extraNixpkgsConfig = builtins.fromJSON extraNixpkgsConfigJson;
};
# Turns the unfiltered recursive attribute set into one that is limited to myAttrpaths
filtered =
let
recurse =
index: paths: attrs:
lib.mapAttrs (
name: values:
if attrs ? ${name} then
if lib.any (value: lib.length value <= index + 1) values then
attrs.${name}
else
recurse (index + 1) values attrs.${name}
# Make sure nix-env recurses as well
// {
recurseForDerivations = true;
}
else
null
) (lib.groupBy (a: lib.elemAt a index) paths);
in
recurse 0 myAttrpaths unfiltered;
in
filtered

View File

@@ -1,317 +0,0 @@
import argparse
import json
import numpy as np
import os
import pandas as pd
from dataclasses import asdict, dataclass
from pathlib import Path
from scipy.stats import ttest_rel
from tabulate import tabulate
from typing import Final
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
...
See https://github.com/NixOS/nix/blob/187520ce88c47e2859064704f9320a2d6c97e56e/src/libexpr/eval.cc#L2846
for the ultimate source of this data.
Args:
json_data (dict): JSON data containing metrics.
Returns:
dict: Flattened metrics with keys as metric names.
"""
flat_metrics = {}
for key, value in json_data.items():
# This key is duplicated as `time.cpu`; we keep that copy.
if key == "cpuTime":
continue
if isinstance(value, (int, float)):
flat_metrics[key] = value
elif isinstance(value, dict):
for subkey, subvalue in value.items():
assert isinstance(subvalue, (int, float)), subvalue
flat_metrics[f"{key}.{subkey}"] = subvalue
else:
assert isinstance(value, (float, int, dict)), (
f"Value `{value}` has unexpected type"
)
return flat_metrics
def load_all_metrics(path: Path) -> dict:
"""
Loads all stats JSON files in the specified file or directory and extracts metrics.
These stats JSON files are created by Nix when the `NIX_SHOW_STATS` environment variable is set.
If the provided path is a directory, it must have the structure $path/$system/$stats,
where $path is the provided path, $system is some system from `lib.systems.doubles.*`,
and $stats is a stats JSON file.
If the provided path is a file, it is a stats JSON file.
Args:
path (Path): Directory containing JSON files or a stats JSON file.
Returns:
dict: Dictionary with filenames as keys and extracted metrics as values.
"""
metrics = {}
if path.is_dir():
for system_dir in path.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)
else:
with path.open() as f:
metrics[path.name] = flatten_data(json.load(f))
return metrics
def metric_table_name(name: str, explain: bool) -> str:
"""
Returns the name of the metric, plus a footnote to explain it if needed.
"""
return f"{name}[^{name}]" if explain else name
METRIC_EXPLANATION_FOOTNOTE: Final[str] = """
[^time.cpu]: Number of seconds of CPU time accounted by the OS to the Nix evaluator process. On UNIX systems, this comes from [`getrusage(RUSAGE_SELF)`](https://man7.org/linux/man-pages/man2/getrusage.2.html).
[^time.gc]: Number of seconds of CPU time accounted by the Boehm garbage collector to performing GC.
[^time.gcFraction]: What fraction of the total CPU time is accounted towards performing GC.
[^gc.cycles]: Number of times garbage collection has been performed.
[^gc.heapSize]: Size in bytes of the garbage collector heap.
[^gc.totalBytes]: Size in bytes of all allocations in the garbage collector.
[^envs.bytes]: Size in bytes of all `Env` objects allocated by the Nix evaluator. These are almost exclusively created by [`nix-env`](https://nix.dev/manual/nix/stable/command-ref/nix-env.html).
[^list.bytes]: Size in bytes of all [lists](https://nix.dev/manual/nix/stable/language/syntax.html#list-literal) allocated by the Nix evaluator.
[^sets.bytes]: Size in bytes of all [attrsets](https://nix.dev/manual/nix/stable/language/syntax.html#list-literal) allocated by the Nix evaluator.
[^symbols.bytes]: Size in bytes of all items in the Nix evaluator symbol table.
[^values.bytes]: Size in bytes of all values allocated by the Nix evaluator.
[^envs.number]: The count of all `Env` objects allocated.
[^nrAvoided]: The number of thunks avoided being created.
[^nrExprs]: The number of expression objects ever created.
[^nrFunctionCalls]: The number of function calls ever made.
[^nrLookups]: The number of lookups into an attrset ever made.
[^nrOpUpdateValuesCopied]: The number of attrset values copied in the process of merging attrsets.
[^nrOpUpdates]: The number of attrsets merge operations (`//`) performed.
[^nrPrimOpCalls]: The number of function calls to primops (Nix builtins) ever made.
[^nrThunks]: The number of [thunks](https://nix.dev/manual/nix/latest/language/evaluation.html#laziness) ever made. A thunk is a delayed computation, represented by an expression reference and a closure.
[^sets.number]: The number of attrsets ever made.
[^symbols.number]: The number of symbols ever added to the symbol table.
[^values.number]: The number of values ever made.
[^envs.elements]: The number of values contained within an `Env` object.
[^list.concats]: The number of list concatenation operations (`++`) performed.
[^list.elements]: The number of values contained within a list.
[^sets.elements]: The number of values contained within an attrset.
[^sizes.Attr]: Size in bytes of the `Attr` type.
[^sizes.Bindings]: Size in bytes of the `Bindings` type.
[^sizes.Env]: Size in bytes of the `Env` type.
[^sizes.Value]: Size in bytes of the `Value` type.
"""
@dataclass(frozen=True)
class PairwiseTestResults:
updated: pd.DataFrame
equivalent: pd.DataFrame
@staticmethod
def tabulate(table, headers) -> str:
return tabulate(
table, headers, tablefmt="github", floatfmt=".4f", missingval="-"
)
def updated_to_markdown(self, explain: bool) -> str:
assert not self.updated.empty
# Header (get column names and format them)
return self.tabulate(
headers=[str(column) for column in self.updated.columns],
table=[
[
# The metric acts as its own footnote name
metric_table_name(row["metric"], explain),
# Check for no change and NaN in p_value/t_stat
*[
None if np.isnan(val) or np.allclose(val, 0) else val
for val in row[1:]
],
]
for _, row in self.updated.iterrows()
],
)
def equivalent_to_markdown(self, explain: bool) -> str:
assert not self.equivalent.empty
return self.tabulate(
headers=[str(column) for column in self.equivalent.columns],
table=[
[
# The metric acts as its own footnote name
metric_table_name(row["metric"], explain),
row["value"],
]
for _, row in self.equivalent.iterrows()
],
)
def to_markdown(self, explain: bool) -> str:
result = ""
if not self.equivalent.empty:
result += "## Unchanged values\n\n"
result += self.equivalent_to_markdown(explain)
if not self.updated.empty:
result += ("\n\n" if result else "") + "## Updated values\n\n"
result += self.updated_to_markdown(explain)
if explain:
result += METRIC_EXPLANATION_FOOTNOTE
return result
@dataclass(frozen=True)
class Equivalent:
metric: str
value: float
@dataclass(frozen=True)
class Comparison:
metric: str
mean_before: float
mean_after: float
mean_diff: float
mean_pct_change: float
@dataclass(frozen=True)
class ComparisonWithPValue(Comparison):
p_value: float
t_stat: float
def metric_sort_key(name: str) -> str:
if name in ("time.cpu", "time.gc", "time.gcFraction"):
return (1, name)
elif name.startswith("gc"):
return (2, name)
elif name.endswith(("bytes", "Bytes")):
return (3, name)
elif name.startswith("nr") or name.endswith("number"):
return (4, name)
else:
return (5, name)
def perform_pairwise_tests(
before_metrics: dict, after_metrics: dict
) -> PairwiseTestResults:
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()
},
key=metric_sort_key,
)
updated = []
equivalent = []
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) == 0:
continue
before_arr = np.array(before_vals)
after_arr = np.array(after_vals)
diff = after_arr - before_arr
# If there's no difference, add it all to the equivalent output.
if np.allclose(diff, 0):
equivalent.append(Equivalent(metric=key, value=before_vals[0]))
else:
pct_change = 100 * diff / before_arr
result = Comparison(
metric=key,
mean_before=np.mean(before_arr),
mean_after=np.mean(after_arr),
mean_diff=np.mean(diff),
mean_pct_change=np.mean(pct_change),
)
# If there are enough values to perform a t-test, do so.
if len(before_vals) > 1:
t_stat, p_val = ttest_rel(after_arr, before_arr)
result = ComparisonWithPValue(
**asdict(result), p_value=p_val, t_stat=t_stat
)
updated.append(result)
return PairwiseTestResults(
updated=pd.DataFrame(map(asdict, updated)),
equivalent=pd.DataFrame(map(asdict, equivalent)),
)
def main():
parser = argparse.ArgumentParser(
description="Performance comparison of Nix evaluation statistics"
)
parser.add_argument(
"--explain", action="store_true", help="Explain the evaluation statistics"
)
parser.add_argument(
"before", help="File or directory containing baseline (data before)"
)
parser.add_argument(
"after", help="File or directory containing comparison (data after)"
)
options = parser.parse_args()
before_stats = Path(options.before)
after_stats = Path(options.after)
before_metrics = load_all_metrics(before_stats)
after_metrics = load_all_metrics(after_stats)
pairwise_test_results = perform_pairwise_tests(before_metrics, after_metrics)
markdown_table = pairwise_test_results.to_markdown(explain=options.explain)
print(markdown_table)
if __name__ == "__main__":
main()

View File

@@ -1,309 +0,0 @@
{
callPackage,
lib,
jq,
runCommand,
writeText,
python3,
stdenvNoCC,
makeWrapper,
codeowners,
}:
let
python = python3.withPackages (ps: [
ps.numpy
ps.pandas
ps.scipy
ps.tabulate
]);
cmp-stats = stdenvNoCC.mkDerivation {
pname = "cmp-stats";
version = lib.trivial.release;
dontUnpack = true;
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
runHook preInstall
mkdir -p $out/share/cmp-stats
cp ${./cmp-stats.py} "$out/share/cmp-stats/cmp-stats.py"
makeWrapper ${python.interpreter} "$out/bin/cmp-stats" \
--add-flags "$out/share/cmp-stats/cmp-stats.py"
runHook postInstall
'';
meta = {
description = "Performance comparison of Nix evaluation statistics";
license = lib.licenses.mit;
mainProgram = "cmp-stats";
maintainers = with lib.maintainers; [ philiptaron ];
};
};
in
{
combinedDir,
touchedFilesJson,
ownersFile ? ../../OWNERS,
}:
let
# Usually we expect a derivation, but when evaluating in multiple separate steps, we pass
# nix store paths around. These need to be turned into (fake) derivations again to track
# dependencies properly.
# We use two steps for evaluation, because we compare results from two different checkouts.
# CI additionalls spreads evaluation across multiple workers.
combined = if lib.isDerivation combinedDir then combinedDir else lib.toDerivation combinedDir;
/*
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", "package4"],
removed: ["package4"],
},
attrdiffByKernel: {
darwin: {
added: [],
changed: ["package2", "package4"],
removed: ["package4"],
},
linux: {
added: ["package1"],
changed: ["package3", "package4"],
removed: [],
},
},
attrdiffByPlatform: {
aarch64-darwin: {
added: [],
changed: ["package2"],
removed: ["package4"],
},
aarch64-linux: {
added: ["package1"],
changed: ["package3"],
removed: [],
},
x86_64-linux: {
added: [],
changed: ["package4"],
removed: [],
},
},
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
groupAttrdiffByKernel
groupAttrdiffByPlatform
groupByPlatform
extractPackageNames
getLabels
;
# Attrs
# - keys: "added", "changed", "removed" and "rebuilds"
# - values: lists of `packagePlatformPath`s
diffAttrs = builtins.fromJSON (builtins.readFile "${combined}/combined-diff.json");
rebuildsPackagePlatformAttrs = convertToPackagePlatformAttrs diffAttrs.rebuilds;
changed-paths =
let
attrdiff = lib.mapAttrs (_: extractPackageNames) {
inherit (diffAttrs) added changed removed;
};
attrdiffByPlatform = groupAttrdiffByPlatform {
inherit (diffAttrs) added changed removed;
};
attrdiffByKernel = groupAttrdiffByKernel {
inherit (diffAttrs) added changed removed;
};
rebuildsByPlatform = groupByPlatform rebuildsPackagePlatformAttrs;
rebuildsByKernel = groupByKernel rebuildsPackagePlatformAttrs;
rebuildCountByKernel = lib.mapAttrs (
kernel: kernelRebuilds: lib.length kernelRebuilds
) rebuildsByKernel;
rebuildNames = extractPackageNames diffAttrs.rebuilds;
in
writeText "changed-paths.json" (
builtins.toJSON {
inherit attrdiff attrdiffByKernel attrdiffByPlatform;
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
// {
"10.rebuild-nixos-tests" =
lib.elem "nixosTests.simple-container" rebuildNames || lib.elem "nixosTests.simple-vm" rebuildNames;
};
}
);
getMaintainers = callPackage ./maintainers.nix { };
inherit
(getMaintainers {
affectedAttrPaths = map (a: a.packagePath) (
convertToPackagePlatformAttrs (diffAttrs.changed ++ diffAttrs.removed)
);
changedFiles = lib.importJSON touchedFilesJson;
})
users
teams
packages
;
in
runCommand "compare"
{
# Don't depend on -dev outputs to reduce closure size for CI.
nativeBuildInputs = map lib.getBin [
jq
cmp-stats
codeowners
];
users = builtins.toJSON users;
teams = builtins.toJSON teams;
packages = builtins.toJSON (lib.map (lib.concatStringsSep ".") packages);
passAsFile = [
"users"
"teams"
"packages"
];
}
''
mkdir $out
cp ${changed-paths} $out/changed-paths.json
{
echo
echo "# Packages"
echo
jq -r -f ${./generate-step-summary.jq} < ${changed-paths}
} >> $out/step-summary.md
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
cmp-stats --explain ${combined}/before/stats ${combined}/after/stats >> $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
jq -r '.[]' "${touchedFilesJson}" > ./touched-files
readarray -t touchedFiles < ./touched-files
echo "This PR touches ''${#touchedFiles[@]} files"
# TODO: Move ci/OWNERS to Nix and produce owners.json instead of owners.txt.
touch "$out/owners.txt"
for file in "''${touchedFiles[@]}"; do
result=$(codeowners --file "${ownersFile}" "$file")
# Remove the file prefix and trim the surrounding spaces
read -r owners <<< "''${result#"$file"}"
if [[ "$owners" == "(unowned)" ]]; then
echo "File $file is unowned"
continue
fi
echo "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
echo -e "\e[33mCodeowner \"$entry\" for file $file is not valid: Must start with \"@\"\e[0m"
# 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]}
echo "$entry" >> "$out/owners.txt"
done
done
cp "$usersPath" "$out/maintainers.json"
cp "$teamsPath" "$out/teams.json"
cp "$packagesPath" "$out/packages.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,159 +0,0 @@
# Figure out which maintainers (users/teams) are relevant for a PR:
# - All maintainers that can be linked directly to changedFiles
# - Maintainers of affectedAttrPaths if a file directly related to the attribute is in changedFiles
#
# Files and attributes are linked in various ways:
# - pkgs/by-name/<attr>/* is linked to pkgs.<attr>
# - The file position of various attributes of pkgs.<attr>
# - Explicitly specified file positions in derivations
#
# Test with
# nix-instantiate --eval --strict --json test.nix -A result | jq
#
# Empty list as an output means success
# Dependencies coming from the CI-pinned Nixpkgs
{
lib,
}:
# Function arguments
{
# Files that were changed
# Type: ListOf (Nixpkgs-root-relative path)
changedFiles,
# Attributes whose value was affected by the change
# Type: ListOf (ListOf String)
affectedAttrPaths,
# Nixpkgs used to check maintainers. Customisable for testing
pkgs ? import ../../.. {
system = "x86_64-linux";
# We should never try to ping maintainers through package aliases, this can only lead to errors.
# One example case is, where an attribute is a throw alias, but then re-introduced in a PR.
# This would trigger the throw. By disabling aliases, we can fallback gracefully below.
config.allowAliases = false;
overlays = [ ];
},
}:
let
nixpkgsRoot = toString ../../.. + "/";
stripNixpkgsRootFromKeys = lib.mapAttrs' (
file: value: lib.nameValuePair (lib.removePrefix nixpkgsRoot file) value
);
moduleMeta = (pkgs.nixos { }).config.meta;
# Currently just nixos module maintainers, but in the future we can use this for code owners too
fileUsers = stripNixpkgsRootFromKeys moduleMeta.maintainers;
fileTeams = stripNixpkgsRootFromKeys moduleMeta.teams;
anyMatchingFile = filename: lib.any (lib.hasPrefix filename) changedFiles;
anyMatchingFiles = files: lib.any anyMatchingFile files;
relevantFilenames =
drv:
(lib.unique (
map (pos: lib.removePrefix nixpkgsRoot pos.file) (
lib.filter (x: x != null) [
(drv.meta.maintainersPosition or null)
(drv.meta.teamsPosition or null)
(lib.unsafeGetAttrPos "src" drv)
(lib.unsafeGetAttrPos "pname" drv)
(lib.unsafeGetAttrPos "version" drv)
]
++ lib.optionals (drv ? meta.position) [
# 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); }
]
)
));
relevantAffectedAttrPaths = lib.filter (
attrPath:
# Some packages might be reported as changed on a different platform, but
# not even have an attribute on the platform the maintainers are requested on.
# Fallback to `null` for these to filter them out
let
package = lib.attrByPath attrPath null pkgs;
in
package != null && anyMatchingFiles (relevantFilenames package)
) affectedAttrPaths;
# Extract attributes that changed from by-name paths.
# This allows pinging reviewers for pure refactors.
changedByNameAttrPaths = lib.pipe changedFiles [
(lib.filter (changed: lib.hasPrefix "pkgs/by-name/" changed))
(map (lib.splitString "/"))
# Filters out e.g. pkgs/by-name/README.md
(lib.filter (path: lib.length path > 3))
(map (path: lib.elemAt path 3))
(map lib.singleton)
# Filter out new packages
(lib.filter (attrPath: lib.hasAttrByPath attrPath pkgs))
];
# An attribute can appear in affected *and* touched
attrPathsToGetMaintainersFor = lib.unique (relevantAffectedAttrPaths ++ changedByNameAttrPaths);
attrPathEntities = lib.concatMap (
attrPath:
let
package = lib.getAttrFromPath attrPath pkgs;
in
# meta.maintainers also contains all individual team members.
# We only want to ping individuals if they're added individually as maintainers, not via teams.
userPings { inherit attrPath; } (package.meta.nonTeamMaintainers or [ ])
++ lib.concatMap (teamPings { inherit attrPath; }) (package.meta.teams or [ ])
) attrPathsToGetMaintainersFor;
changedFileEntities = lib.concatMap (
file:
userPings { inherit file; } (fileUsers.${file} or [ ])
++ lib.concatMap (teamPings { inherit file; }) (fileTeams.${file} or [ ])
) changedFiles;
userPings =
context:
map (maintainer: {
type = "user";
userId = maintainer.githubId;
inherit context;
});
teamPings =
context: team:
if team ? githubId then
[
{
type = "team";
teamId = team.githubId;
inherit context;
}
]
else
userPings context team.members;
byType = lib.groupBy (ping: ping.type) (attrPathEntities ++ changedFileEntities);
byUser = lib.pipe (byType.user or [ ]) [
(lib.groupBy (ping: toString ping.userId))
(lib.mapAttrs (_user: lib.map (pkg: pkg.context)))
];
byTeam = lib.pipe (byType.team or [ ]) [
(lib.groupBy (ping: toString ping.teamId))
(lib.mapAttrs (_team: lib.map (pkg: pkg.context)))
];
in
{
users = byUser;
teams = byTeam;
packages = attrPathsToGetMaintainersFor;
}

View File

@@ -1,311 +0,0 @@
{
pkgs ? import ../../.. {
config = { };
overlays = [ ];
},
lib ? pkgs.lib,
}:
let
fun = import ./maintainers.nix { inherit lib; };
utils = import ./utils.nix { inherit lib; };
mockPkgs =
{
packages ? [ ],
modules ? [ ],
githubTeams ? true,
}:
lib.updateManyAttrsByPath
(lib.imap0 (i: p: {
path = p;
update = _: {
meta.maintainersPosition.file = lib.concatStringsSep "/" p;
meta.nonTeamMaintainers = [ { githubId = i; } ];
meta.teams =
if githubTeams then [ { githubId = i + 100; } ] else [ { members = [ { githubId = i + 100; } ]; } ];
};
}) packages)
{
nixos =
{ }:
{
config.meta.maintainers = lib.listToAttrs (
lib.imap0 (i: m: lib.nameValuePair m [ { githubId = i; } ]) modules
);
config.meta.teams = lib.listToAttrs (
lib.imap0 (
i: m:
lib.nameValuePair m (
if githubTeams then [ { githubId = i + 100; } ] else [ { members = [ { githubId = i + 100; } ]; } ]
)
) modules
);
};
};
tests = {
testEmpty = {
expr = fun {
pkgs = mockPkgs { };
changedFiles = [ ];
affectedAttrPaths = [ ];
};
expected = {
packages = [ ];
teams = { };
users = { };
};
};
testNonExistentAffected = {
expr = fun {
pkgs = mockPkgs { };
changedFiles = [ "a" ];
affectedAttrPaths = [ [ "b" ] ];
};
expected = {
packages = [ ];
teams = { };
users = { };
};
};
testIrrelevantAffected = {
expr = fun {
pkgs = mockPkgs {
packages = [ [ "b" ] ];
};
changedFiles = [ "a" ];
affectedAttrPaths = [ [ "b" ] ];
};
expected = {
packages = [ ];
teams = { };
users = { };
};
};
testRelevantAffected = {
expr = fun {
pkgs = mockPkgs {
packages = [ [ "b" ] ];
};
# Also tests that subpaths work
changedFiles = [ "b/c" ];
affectedAttrPaths = [ [ "b" ] ];
};
expected = {
packages = [ [ "b" ] ];
teams."100" = [
{ attrPath = [ "b" ]; }
];
users."0" = [
{ attrPath = [ "b" ]; }
];
};
};
testRelevantAffectedNonGitHub = {
expr = fun {
pkgs = mockPkgs {
packages = [ [ "b" ] ];
githubTeams = false;
};
changedFiles = [ "b/c" ];
affectedAttrPaths = [ [ "b" ] ];
};
expected = {
packages = [ [ "b" ] ];
teams = { };
users."0" = [
{ attrPath = [ "b" ]; }
];
users."100" = [
{ attrPath = [ "b" ]; }
];
};
};
testByNameChanged = {
expr = fun {
pkgs = mockPkgs {
packages = [ [ "hello" ] ];
};
changedFiles = [ "pkgs/by-name/he/hello/sources.json" ];
affectedAttrPaths = [ ];
};
expected = {
packages = [ [ "hello" ] ];
teams."100" = [
{ attrPath = [ "hello" ]; }
];
users."0" = [
{ attrPath = [ "hello" ]; }
];
};
};
testByNameNonExistentChanged = {
expr = fun {
pkgs = mockPkgs {
packages = [ ];
};
# Happens when a new package was added to pkgs/by-name
changedFiles = [ "pkgs/by-name/he/hello/sources.json" ];
affectedAttrPaths = [ ];
};
expected = {
packages = [ ];
teams = { };
users = { };
};
};
testByNameReadmeChanged = {
expr = fun {
pkgs = mockPkgs {
packages = [ [ "hello" ] ];
};
changedFiles = [ "pkgs/by-name/README.md" ];
affectedAttrPaths = [ ];
};
expected = {
packages = [ ];
teams = { };
users = { };
};
};
testNoDuplicates = {
expr = fun {
pkgs = mockPkgs {
packages = [ [ "hello" ] ];
};
changedFiles = [
"hello"
"pkgs/by-name/he/hello/sources.json"
];
affectedAttrPaths = [ [ "hello" ] ];
};
expected = {
packages = [ [ "hello" ] ];
teams."100" = [
{ attrPath = [ "hello" ]; }
];
users."0" = [
{ attrPath = [ "hello" ]; }
];
};
};
testModuleMaintainers = {
expr = fun {
pkgs = mockPkgs {
modules = [ "a" ];
};
changedFiles = [ "a" ];
affectedAttrPaths = [ ];
};
expected = {
packages = [ ];
teams."100" = [
{ file = "a"; }
];
users."0" = [
{ file = "a"; }
];
};
};
testModuleMaintainersNonGithub = {
expr = fun {
pkgs = mockPkgs {
modules = [ "a" ];
githubTeams = false;
};
changedFiles = [ "a" ];
affectedAttrPaths = [ ];
};
expected = {
packages = [ ];
teams = { };
users."100" = [
{ file = "a"; }
];
users."0" = [
{ file = "a"; }
];
};
};
testGroupAttrdiffByPlatform = {
expr = utils.groupAttrdiffByPlatform {
added = [
"new-tool.aarch64-linux"
"new-tool.x86_64-darwin"
];
changed = [
"updated-tool.x86_64-darwin"
"shared-tool.x86_64-darwin"
];
removed = [
"removed-tool.aarch64-darwin"
"shared-tool.aarch64-darwin"
];
};
expected = {
aarch64-darwin = {
added = [ ];
changed = [ ];
removed = [
"removed-tool"
"shared-tool"
];
};
aarch64-linux = {
added = [ "new-tool" ];
changed = [ ];
removed = [ ];
};
x86_64-darwin = {
added = [ "new-tool" ];
changed = [
"shared-tool"
"updated-tool"
];
removed = [ ];
};
};
};
testGroupAttrdiffByKernel = {
expr =
let
grouped = utils.groupAttrdiffByKernel {
added = [
"new-tool.aarch64-linux"
"new-tool.x86_64-darwin"
];
changed = [
"updated-tool.x86_64-darwin"
"shared-tool.x86_64-darwin"
];
removed = [
"removed-tool.aarch64-darwin"
"shared-tool.aarch64-darwin"
];
};
in
lib.mapAttrs (_: diff: lib.mapAttrs (_: lib.sort lib.lessThan) diff) grouped;
expected = {
darwin = {
added = [ "new-tool" ];
changed = [
"shared-tool"
"updated-tool"
];
removed = [
"removed-tool"
"shared-tool"
];
};
linux = {
added = [ "new-tool" ];
changed = [ ];
removed = [ ];
};
};
};
};
in
{
result = lib.runTests tests;
}

View File

@@ -1,239 +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.init 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) (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 (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;
/*
Group an attrdiff-style mapping by a derived key such as platform or kernel.
Turns
{
added = [ "new-tool.aarch64-linux" "new-tool.x86_64-darwin" ];
changed = [ "updated-tool.x86_64-darwin" "shared-tool.x86_64-darwin" ];
removed = [ "removed-tool.aarch64-darwin" "shared-tool.aarch64-darwin" ];
}
into
{
aarch64-darwin = {
added = [ ];
changed = [ ];
removed = [ "removed-tool" "shared-tool" ];
};
aarch64-linux = {
added = [ "new-tool" ];
changed = [ ];
removed = [ ];
};
x86_64-darwin = {
added = [ "new-tool" ];
changed = [ "shared-tool" "updated-tool" ];
removed = [ ];
};
}
when used with `groupByPlatform`.
*/
groupAttrdiffBy =
grouper: attrdiff:
let
groupedByKind = lib.mapAttrs (
_: packagePlatformPaths:
grouper (convertToPackagePlatformAttrs (uniqueStrings packagePlatformPaths))
) attrdiff;
groups = uniqueStrings (lib.flatten (map builtins.attrNames (lib.attrValues groupedByKind)));
in
lib.genAttrs groups (group: lib.mapAttrs (_: byGroup: byGroup.${group} or [ ]) groupedByKind);
groupAttrdiffByPlatform = groupAttrdiffBy groupByPlatform;
groupAttrdiffByKernel = groupAttrdiffBy groupByKernel;
/*
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,326 +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,
busybox,
jq,
nix,
}:
{
# The number of attributes per chunk, see ./README.md for more info.
chunkSize ? 5000,
# Whether to just evaluate a single chunk for quick testing
quickTest ? false,
# Don't try to eval packages marked as broken.
includeBroken ? false,
# Customize the config used to evaluate nixpkgs
extraNixpkgsConfig ? { },
}:
let
nixpkgs =
with lib.fileset;
toSource {
root = ../..;
fileset = unions (
map (lib.path.append ../..) [
".version"
"ci/eval/attrpaths.nix"
"ci/eval/chunk.nix"
"ci/eval/outpaths.nix"
"default.nix"
"doc"
"lib"
"maintainers"
"modules"
"nixos"
"pkgs"
]
);
};
supportedSystems = builtins.fromJSON (
builtins.readFile ../../pkgs/top-level/release-supported-systems.json
);
attrpathsSuperset =
{
evalSystem,
}:
runCommand "attrpaths-superset.json"
{
src = nixpkgs;
# Don't depend on -dev outputs to reduce closure size for CI.
nativeBuildInputs = map lib.getBin [
busybox
nix
];
}
''
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/ci/eval/attrpaths.nix" \
-A paths \
-I "$src" \
--argstr extraNixpkgsConfigJson ${lib.escapeShellArg (builtins.toJSON extraNixpkgsConfig)} \
--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 ? builtins.currentSystem,
# The path to the `paths.json` file from `attrpathsSuperset`
attrpathFile ? "${attrpathsSuperset { inherit evalSystem; }}/paths.json",
}:
let
singleChunk = writeShellScript "single-chunk" ''
set -euo pipefail
chunkSize=$1
myChunk=$2
system=$3
outputDir=$4
# Default is 5, higher values effectively disable the warning.
# This randomly breaks Eval.
export GC_LARGE_ALLOC_WARN_INTERVAL=1000
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}/ci/eval/chunk.nix" \
--eval-system "$system" \
--option restrict-eval true \
--option allow-import-from-derivation false \
--query --available \
--out-path --json \
--meta \
--show-trace \
--arg chunkSize "$chunkSize" \
--arg myChunk "$myChunk" \
--arg attrpathFile "${attrpathFile}" \
--arg systems "[ \"$system\" ]" \
--arg includeBroken ${lib.boolToString includeBroken} \
--argstr extraNixpkgsConfigJson ${lib.escapeShellArg (builtins.toJSON extraNixpkgsConfig)} \
-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}"
{
# Don't depend on -dev outputs to reduce closure size for CI.
nativeBuildInputs = map lib.getBin [
busybox
jq
nix
];
env = {
inherit evalSystem chunkSize;
};
__structuredAttrs = true;
unsafeDiscardReferences.out = true;
}
''
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 -m | grep Mem | awk '{print $7}')
freeSwap=$(free -m | grep Swap | awk '{print $4}')
echo "Available memory: $(( availMemory )) MiB, free swap: $(( freeSwap )) 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 ]] || (( freeSwap < $(<$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
cat "$chunkOutputDir"/result/* | jq -s 'add | map_values(.meta)' > $out/${evalSystem}/meta.json
'';
diff = callPackage ./diff.nix { };
combine =
{
diffDir,
}:
runCommand "combined-eval"
{
# Don't depend on -dev outputs to reduce closure size for CI.
nativeBuildInputs = map lib.getBin [
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),
rebuilds: (.rebuilds + $item.rebuilds)
})
' > $out/combined-diff.json
# Combine maintainers from all systems
cat ${diffDir}/*/maintainers.json | jq -s '
add | group_by(.package) | map({
key: .[0].package,
value: map(.maintainers) | flatten | unique
}) | from_entries
' > $out/maintainers.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 { };
baseline =
{
# Whether to evaluate on a specific set of systems, by default all are evaluated
evalSystems ? if quickTest then [ "x86_64-linux" ] else supportedSystems,
}:
symlinkJoin {
name = "nixpkgs-eval-baseline";
paths = map (
evalSystem:
singleSystem {
inherit evalSystem;
}
) evalSystems;
};
full =
{
# Whether to evaluate on a specific set of systems, by default all are evaluated
evalSystems ? if quickTest then [ "x86_64-linux" ] else supportedSystems,
baseline,
# What files have been touched? Defaults to none; use the expression below to calculate it.
# ```
# git diff --name-only --merge-base master HEAD \
# | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json
# ```
touchedFilesJson ? builtins.toFile "touched-files.json" "[ ]",
}:
let
diffs = symlinkJoin {
name = "nixpkgs-eval-diffs";
paths = map (
evalSystem:
diff {
inherit evalSystem;
beforeDir = baseline;
afterDir = singleSystem {
inherit evalSystem;
};
}
) evalSystems;
};
comparisonReport = compare {
combinedDir = combine { diffDir = diffs; };
inherit touchedFilesJson;
};
in
comparisonReport;
in
{
inherit
attrpathsSuperset
singleSystem
diff
combine
compare
# The above three are used by separate VMs in a GitHub workflow,
# while the below are intended for testing on a single local machine
baseline
full
;
}

View File

@@ -1,111 +0,0 @@
{
lib,
runCommand,
writeText,
}:
{
beforeDir,
afterDir,
evalSystem,
}:
let
# Usually we expect a derivation, but when evaluating in multiple separate steps, we pass
# nix store paths around. These need to be turned into (fake) derivations again to track
# dependencies properly.
# We use two steps for evaluation, because we compare results from two different checkouts.
# CI additionalls spreads evaluation across multiple workers.
before = if lib.isDerivation beforeDir then beforeDir else lib.toDerivation beforeDir;
after = if lib.isDerivation afterDir then afterDir else lib.toDerivation afterDir;
/*
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> ],
rebuilds: [ <keys in the second object with values not present at all in first object> ],
}
*/
diff =
old: new:
let
filterKeys = cond: attrs: lib.attrNames (lib.filterAttrs cond attrs);
oldOutputs = lib.pipe old [
(lib.mapAttrsToList (_: lib.attrValues))
lib.concatLists
(lib.flip lib.genAttrs (_: true))
];
in
{
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;
# A "rebuild" is every attrpath ...
rebuilds = filterKeys (
_: pkg:
# ... that has at least one output ...
lib.any (
output:
# ... which has not been built in "old" already.
!(oldOutputs ? ${output})
) (lib.attrValues pkg)
) new;
};
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 before;
afterAttrs = getAttrs after;
diffAttrs = diff beforeAttrs afterAttrs;
diffJson = writeText "diff.json" (builtins.toJSON diffAttrs);
# The maintainer list is not diffed, but just taken as is, to provide a map
# of maintainers on the target branch. A list of GitHub IDs is sufficient for
# all our purposes and reduces size massively.
meta = lib.importJSON "${after}/${evalSystem}/meta.json";
maintainers = lib.pipe meta [
(lib.mapAttrsToList (
k: v: {
# splits off the platform suffix
package = lib.pipe k [
(lib.splitString ".")
lib.init
(lib.concatStringsSep ".")
];
maintainers = map (m: m.githubId) v.maintainers or [ ];
}
))
# Some paths don't have a platform suffix, those will appear with an empty package here.
(lib.filter ({ package, maintainers }: package != "" && maintainers != [ ]))
];
maintainersJson = writeText "maintainers.json" (builtins.toJSON maintainers);
in
runCommand "diff" { } ''
mkdir -p $out/${evalSystem}
cp -r --no-preserve=mode ${before} $out/before
cp -r --no-preserve=mode ${after} $out/after
# JSON files will be processed above explicitly, so avoid copying over
# the source files to keep the artifacts smaller.
find $out/before $out/after -iname '*.json' -delete
cp ${diffJson} $out/${evalSystem}/diff.json
cp ${maintainersJson} $out/${evalSystem}/maintainers.json
''

View File

@@ -1,115 +0,0 @@
#!/usr/bin/env nix-shell
# When using as a callable script, passing `--argstr path some/path` overrides $PWD.
#!nix-shell -p nix -i "nix-env -qaP --no-name --out-path -f ci/eval/outpaths.nix"
{
includeBroken ? true, # set this to false to exclude meta.broken packages from the output
path ? ./../..,
# used by ./attrpaths.nix
attrNamesOnly ? false,
# Set this to `null` to build for builtins.currentSystem only
systems ? builtins.fromJSON (
builtins.readFile (path + "/pkgs/top-level/release-supported-systems.json")
),
# Customize the config used to evaluate nixpkgs
extraNixpkgsConfig ? { },
}:
let
lib = import (path + "/lib");
nixpkgsJobs =
import (path + "/pkgs/top-level/release.nix")
# Compromise: accuracy vs. resources needed for evaluation.
{
inherit attrNamesOnly;
supportedSystems = if systems == null then [ builtins.currentSystem ] else systems;
nixpkgsArgs = {
config = {
allowAliases = false;
allowBroken = includeBroken;
allowUnfree = true;
allowInsecurePredicate = x: true;
allowVariants = !attrNamesOnly;
checkMeta = true;
# Silence the `x86_64-darwin` deprecation warning.
allowDeprecatedx86_64Darwin = true;
handleEvalIssue =
reason: errormsg:
let
fatalErrors = [
"unknown-meta"
"broken-outputs"
];
in
if builtins.elem reason fatalErrors then
abort errormsg
# hydra does not build unfree packages, so tons of them are broken yet not marked meta.broken.
else if
!includeBroken
&& builtins.elem reason [
"broken"
"unfree"
]
then
throw "broken"
else if builtins.elem reason [ "unsupported" ] then
throw "unsupported"
else
true;
inHydra = true;
}
// extraNixpkgsConfig;
__allowFileset = false;
};
};
nixosJobs = import (path + "/nixos/release.nix") {
inherit attrNamesOnly;
supportedSystems = lib.filter (lib.hasSuffix "-linux") (
if systems == null then [ builtins.currentSystem ] else systems
);
};
recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; };
# release-lib leaves recurseForDerivations as empty attrmaps;
# that would break nix-env and we also need to recurse everywhere.
tweak = lib.mapAttrs (
name: val:
if name == "recurseForDerivations" then
true
else if lib.isAttrs val && val.type or null != "derivation" then
recurseIntoAttrs (tweak val)
else
val
);
# Some of these contain explicit references to platform(s) we want to avoid;
# some even (transitively) depend on ~/.nixpkgs/config.nix (!)
blacklist = [
"tarball"
"metrics"
"manual"
"darwin-tested"
"unstable"
"stdenvBootstrapTools"
"moduleSystem"
"lib-tests" # these just confuse the output
];
in
tweak (
(removeAttrs nixpkgsJobs blacklist)
// {
nixosTests = lib.filterAttrs (
name: _: name == "simple-container" || name == "simple-vm"
) nixosJobs.tests;
}
)

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,825 +0,0 @@
module.exports = async ({ github, context, core, dry }) => {
const path = require('node:path')
const { DefaultArtifactClient } = await import('@actions/artifact')
const { readFile, writeFile } = require('node:fs/promises')
const withRateLimit = require('./withRateLimit.js')
const { classify } = require('../supportedBranches.js')
const { handleMerge } = require('./merge.js')
const { handleReviewers } = require('./reviewers.js')
const artifactClient = new DefaultArtifactClient()
// Detect if running in a fork (not NixOS/nixpkgs)
const isFork = context.repo.owner !== 'NixOS'
const orgId = (
await github.rest.orgs.get({
org: context.repo.owner,
})
).data.id
async function downloadMaintainerMap(branch) {
let run
const commits = (
await github.rest.repos.listCommits({
...context.repo,
sha: branch,
// We look at 10 commits to find a maintainer map, but this is an arbitrary number. The
// head commit might not have a map, if the queue was bypassed to merge it. This happens
// frequently on staging-esque branches. The branch with the highest chance of getting
// 10 consecutive bypassing commits is the stable staging-next branch. Luckily, this
// also means that the number of PRs open towards that branch is very low, so falling
// back to slightly imprecise maintainer data from master only has a marginal effect.
per_page: 10,
})
).data
for (const commit of commits) {
const run = (
await github.rest.actions.listWorkflowRuns({
...context.repo,
workflow_id: 'merge-group.yml',
status: 'success',
exclude_pull_requests: true,
per_page: 1,
head_sha: commit.sha,
})
).data.workflow_runs[0]
if (!run) continue
const artifact = (
await github.rest.actions.listWorkflowRunArtifacts({
...context.repo,
run_id: run.id,
name: 'maintainers',
})
).data.artifacts[0]
if (!artifact || artifact.expired) continue
await artifactClient.downloadArtifact(artifact.id, {
findBy: {
repositoryName: context.repo.repo,
repositoryOwner: context.repo.owner,
token: core.getInput('github-token'),
},
path: path.resolve(path.join('branches', branch)),
expectedHash: artifact.digest,
})
return JSON.parse(
await readFile(
path.resolve(path.join('branches', branch, 'maintainers.json')),
'utf-8',
),
)
}
// We get here when none of the 10 commits we looked at contained a maintainer map.
// For the master branch, we don't have any fallback options, so we error out.
// In forks without merge-group history, return empty map to allow testing.
if (branch === 'master') {
if (isFork) {
core.warning(
'No maintainer map found. Using empty map (expected in forks without merge-group history).',
)
return {}
}
throw new Error('No maintainer map found.')
}
// For other branches, we select a suitable fallback below.
const { stable, version } = classify(branch)
const release = `release-${version}`
if (stable && branch !== release) {
// Only fallback to the release branch from *other* stable branches.
// Explicitly avoids infinite recursion.
return await getMaintainerMap(release)
} else {
// Falling back to master as last resort.
// This can either be the case for unstable staging-esque or wip branches,
// or for the primary stable branch (release-XX.YY).
return await getMaintainerMap('master')
}
}
// Simple cache for maintainer maps to avoid downloading the same artifacts
// over and over again. Ultimately returns a promise, so the result must be
// awaited for.
const maintainerMaps = {}
function getMaintainerMap(branch) {
if (!maintainerMaps[branch]) {
maintainerMaps[branch] = downloadMaintainerMap(branch)
}
return maintainerMaps[branch]
}
// Caching the list of team members saves API requests when running the bot on the schedule and
// processing many PRs at once.
const members = {}
function getTeamMembers(team_slug) {
if (context.eventName === 'pull_request') {
// We have no chance of getting a token in the pull_request context with the right
// permissions to access the members endpoint below. Thus, we're pretending to have
// no members. This is OK; because this is only for the Test workflow, not for
// real use.
return []
}
// Forks don't have NixOS teams, return empty list
if (isFork) {
return []
}
if (!members[team_slug]) {
members[team_slug] = github.paginate(github.rest.teams.listMembersInOrg, {
org: context.repo.owner,
team_slug,
per_page: 100,
})
}
return members[team_slug]
}
// Caching users saves API requests when running the bot on the schedule and processing
// many PRs at once. It also helps to encapsulate the special logic we need, because
// actions/github doesn't support that endpoint fully, yet.
const users = {}
function getUser(id) {
if (!users[id]) {
users[id] = github
.request({
method: 'GET',
url: '/user/{id}',
id,
})
.then((resp) => resp.data)
.catch((e) => {
// User may have deleted their account
if (e.status === 404) return null
throw e
})
}
return users[id]
}
// Same for teams
const teams = {}
function getTeam(id) {
if (!teams[id]) {
teams[id] = github
.request({
method: 'GET',
url: '/organizations/{orgId}/team/{id}',
orgId,
id,
})
.then((resp) => resp.data)
.catch((e) => {
// Team may have been deleted
if (e.status === 404) return null
throw e
})
}
return teams[id]
}
async function handlePullRequest({ item, stats, events }) {
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
log('author', pull_request.user?.login)
const maintainers = await getMaintainerMap(pull_request.base.ref)
const merge_bot_eligible = await handleMerge({
github,
context,
core,
log,
dry,
pull_request,
events,
maintainers,
getTeamMembers,
getUser,
})
// Check for any human reviews other than the PR author, GitHub actions and other GitHub apps.
const reviews = (
await github.graphql(
`query($owner: String!, $repo: String!, $pr: Int!) {
repository(owner: $owner, name: $repo) {
pullRequest(number: $pr) {
# Unlikely that there's ever more than 100 reviews, so let's not bother,
# but once https://github.com/actions/github-script/issues/309 is resolved,
# it would be easy to enable pagination.
reviews(first: 100) {
nodes {
state
user: author {
# Only get users, no bots
... on User {
login
# Set the id field in the resulting JSON to GraphQL's databaseId
# databaseId in GraphQL-land is the same as id in REST-land
id: databaseId
}
}
onBehalfOf(first: 100) {
nodes {
slug
}
}
}
}
}
}
}`,
{
owner: context.repo.owner,
repo: context.repo.repo,
pr: pull_number,
},
)
).repository.pullRequest.reviews.nodes.filter(
(r) =>
// The `... on User` makes it such that .login only exists for users,
// but we still need to filter the others out.
// Accounts could be deleted as well, so don't count them.
r.user?.login &&
// Also exclude author reviews, can't request their review in any case
r.user.id !== pull_request.user?.id,
)
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 =
Date.now() - 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,
'2.status: merge-bot eligible': merge_bot_eligible,
'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: 'pull-request-target.yml',
event: 'pull_request_target',
exclude_pull_requests: true,
head_sha: pull_request.head.sha,
})
).data.workflow_runs[0] ??
// TODO: Remove this after 2026-02-01, at which point all pr.yml artifacts will have expired.
(
await github.rest.actions.listWorkflowRuns({
...context.repo,
// In older PRs, we need pr.yml instead of pull-request-target.yml.
workflow_id: 'pr.yml',
event: 'pull_request_target',
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(Date.now() + 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 changedPaths = JSON.parse(
await readFile(`${pull_number}/changed-paths.json`, 'utf-8'),
)
const evalLabels = changedPaths.labels
// Fetch all PR commits to check their messages for package patterns
const prCommits = await github.paginate(github.rest.pulls.listCommits, {
...context.repo,
pull_number,
per_page: 100,
})
const commitSubjects = prCommits.map(
(c) => c.commit.message.split('\n')[0],
)
// Label new package PRs: "packagename: init at X.Y.Z"
// Exclude NixOS module commits like "nixos/timekpr: init at 0.5.8"
const newPackagePattern = /^(?<!nixos\/)\S+: init at\b/
const hasNewPackages = changedPaths.attrdiff?.added?.length > 0
const commitsIndicateNewPackage = commitSubjects.some((msg) =>
newPackagePattern.test(msg),
)
evalLabels['8.has: package (new)'] =
hasNewPackages && commitsIndicateNewPackage
// Label package update PRs: "packagename: X.Y.Z -> A.B.C"
// Matches versions like: 1.2.3, 0-unstable-2024-01-15, 1.3rc1, alpha, unstable
// Exclude NixOS module commits like "nixos/ncps: types.str -> types.path"
const updatePackagePattern =
/^(?<!nixos\/)\S+: [\w.-]*\d[\w.-]* (->|→) [\w.-]*\d[\w.-]*$/
const commitsIndicateUpdate = commitSubjects.some((msg) =>
updatePackagePattern.test(msg),
)
evalLabels['8.has: package (update)'] = commitsIndicateUpdate
// TODO: Get "changed packages" information from list of changed by-name files
// in addition to just the Eval results, to make this work for these packages
// when Eval results have expired as well.
let packages
try {
packages = JSON.parse(
await readFile(`${pull_number}/packages.json`, 'utf-8'),
)
} catch (e) {
if (e.code !== 'ENOENT') throw e
// TODO: Remove this fallback code once all old artifacts without packages.json
// have expired. This should be the case in ~ February 2026.
packages = Array.from(
new Set(
Object.values(
JSON.parse(
await readFile(`${pull_number}/maintainers.json`, 'utf-8'),
),
).flat(1),
),
)
}
Object.assign(prLabels, evalLabels, {
'11.by: package-maintainer':
Boolean(packages.length) &&
packages.every((pkg) =>
maintainers[pkg]?.includes(pull_request.user.id),
),
'12.approved-by: package-maintainer': packages.some((pkg) =>
maintainers[pkg]?.some((m) => approvals.has(m)),
),
})
if (!pull_request.draft) {
let owners = []
try {
// TODO: Create owner map similar to maintainer map.
owners = (await readFile(`${pull_number}/owners.txt`, 'utf-8')).split(
'\n',
)
} catch (e) {
// Older artifacts don't have the owners.txt, yet.
if (e.code !== 'ENOENT') throw e
}
let team_maintainers = []
try {
team_maintainers = Object.keys(
JSON.parse(await readFile(`${pull_number}/teams.json`, 'utf-8')),
).map((id) => parseInt(id))
} catch (e) {
// Older artifacts don't have the teams.json, yet.
if (e.code !== 'ENOENT') throw e
}
// We set this label earlier already, but the current PR state can be very different
// after handleReviewers has requested reviews, so update it in this case to prevent
// this label from flip-flopping.
prLabels['9.needs: reviewer'] = await handleReviewers({
github,
context,
core,
log,
dry,
pull_request,
reviews,
// TODO: Use maintainer map instead of the artifact.
user_maintainers: Object.keys(
JSON.parse(
await readFile(`${pull_number}/maintainers.json`, 'utf-8'),
),
).map((id) => parseInt(id)),
team_maintainers,
owners,
getUser,
getTeam,
})
}
}
return prLabels
}
// Returns true if the issue was closed. In this case, the labeling does not need to
// continue for this issue. Returns false if no action was taken.
async function handleAutoClose(item) {
const issue_number = item.number
if (item.labels.some(({ name }) => name === '0.kind: packaging request')) {
const body = [
'Thank you for your interest in packaging new software in Nixpkgs. Unfortunately, to mitigate the unsustainable growth of unmaintained packages, **Nixpkgs is no longer accepting package requests** via Issues.',
'',
'As a [volunteer community][community], we are always open to new contributors. If you wish to see this package in Nixpkgs, **we encourage you to [contribute] it yourself**, via a Pull Request. Anyone can [become a package maintainer][maintainers]! You can find language-specific packaging information in the [Nixpkgs Manual][nixpkgs]. Should you need any help, please reach out to the community on [Matrix] or [Discourse].',
'',
'[community]: https://nixos.org/community',
'[contribute]: https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#quick-start-to-adding-a-package',
'[maintainers]: https://github.com/NixOS/nixpkgs/blob/master/maintainers/README.md',
'[nixpkgs]: https://nixos.org/manual/nixpkgs/unstable/',
'[Matrix]: https://matrix.to/#/#dev:nixos.org',
'[Discourse]: https://discourse.nixos.org/c/dev/14',
].join('\n')
core.info(`Issue #${item.number}: auto-closed`)
if (!dry) {
await github.rest.issues.createComment({
...context.repo,
issue_number,
body,
})
await github.rest.issues.update({
...context.repo,
issue_number,
state: 'closed',
state_reason: 'not_planned',
})
}
return true
}
return false
}
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 = {}
const events = await github.paginate(
github.rest.issues.listEventsForTimeline,
{
...context.repo,
issue_number,
per_page: 100,
},
)
const latest_event_at = new Date(
events
.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
...(item.labels.some(({ name }) => name === '5.scope: tracking')
? ['cross-referenced']
: []),
'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))
const is_stale = latest_event_at < stale_at
if (item.pull_request || context.payload.pull_request) {
// No need to compute merge commits for stale PRs over and over again.
// This increases the repo size on GitHub's side unnecessarily and wastes
// a lot of API requests, too. Any relevant change will result in the
// stale status to change and thus pick up the PR again for labeling.
if (!is_stale) {
stats.prs++
Object.assign(
itemLabels,
await handlePullRequest({ item, stats, events }),
)
}
} else {
stats.issues++
if (item.labels.some(({ name }) => name === '4.workflow: auto-close')) {
// If this returns true, the issue was closed. In this case we return, to not
// label the issue anymore. Most importantly this avoids unlabeling stale issues
// which are closed via auto-close.
if (await handleAutoClose(item)) return
}
}
// 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'] && is_stale,
})
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 label 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 })
}
}
// Controls level of parallelism. Applies to both the number of concurrent requests
// as well as the number of concurrent workers going through the list of PRs.
// We'll only boost concurrency when we're running many PRs in parallel on a schedule,
// but not for single PRs. This avoids things going wild, when we accidentally make
// too many API requests on treewides.
const maxConcurrent = context.payload.pull_request ? 1 : 20
await withRateLimit({ github, core, maxConcurrent }, 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: 'bot.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 ?? Date.now() - 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.
Date.now() - 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 after 2025-11-04, 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 && !artifact.expired) {
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),
)
// Instead of handling all items in parallel we set up some workers to handle the queue
// with more controlled parallelism. This avoids problems with `pull_request` fetched at
// the beginning getting out of date towards the end, because it took the whole job 20
// minutes or more to go through 100's of PRs.
await Promise.all(
Array.from({ length: maxConcurrent }, async () => {
while (true) {
const item = items.pop()
if (!item) break
try {
await handle({ item, stats })
} catch (e) {
core.setFailed(`${e.message}\n${e.cause.stack}`)
}
}
}),
)
}
})
}

View File

@@ -1,221 +0,0 @@
/// @ts-check
// TODO: should this be combined with the branch checks in prepare.js?
// They do seem quite similar, but this needs to run after eval,
// and prepare.js obviously doesn't.
const { classify, split } = require('../supportedBranches.js')
const { readFile } = require('node:fs/promises')
const { postReview, dismissReviews } = require('./reviews.js')
const reviewKey = 'check-target-branch'
/**
* @param {{
* github: InstanceType<import('@actions/github/lib/utils').GitHub>,
* context: import('@actions/github/lib/context').Context
* core: import('@actions/core')
* dry: boolean
* }} CheckTargetBranchProps
*/
async function checkTargetBranch({ github, context, core, dry }) {
/**
* @type {{
* attrdiff: {
* added: string[],
* changed: string[],
* removed: string[],
* },
* attrdiffByKernel: Record<string, {
* added: string[],
* changed: string[],
* removed: string[],
* }>,
* attrdiffByPlatform: Record<string, {
* added: string[],
* changed: string[],
* removed: string[],
* }>,
* labels: Record<string, boolean>,
* rebuildCountByKernel: Record<string, number>,
* rebuildsByKernel: Record<string, string[]>,
* rebuildsByPlatform: Record<string, string[]>,
* }}
*/
const changed = JSON.parse(
await readFile('comparison/changed-paths.json', 'utf-8'),
)
const pull_number = context.payload.pull_request?.number
if (!pull_number) {
core.warning(
'Skipping checkTargetBranch: no pull_request number (is this being run as part of a merge group?)',
)
return
}
const prInfo = (
await github.rest.pulls.get({
...context.repo,
pull_number,
})
).data
const base = prInfo.base.ref
const head = prInfo.head.ref
const baseClassification = classify(base)
const headClassification = classify(head)
// Don't run on, e.g., staging-nixos to master merges.
if (headClassification.type.includes('development')) {
core.info(
`Skipping checkTargetBranch: PR is from a development branch (${head})`,
)
await dismissReviews({
github,
context,
core,
dry,
reviewKey,
})
return
}
// Don't run on PRs against staging branches, wip branches, haskell-updates, etc.
if (!baseClassification.type.includes('primary')) {
core.info(
`Skipping checkTargetBranch: PR is against a non-primary base branch (${base})`,
)
await dismissReviews({
github,
context,
core,
dry,
reviewKey,
})
return
}
const maxRebuildCount = Math.max(
...Object.values(changed.rebuildCountByKernel),
)
const rebuildsAllTests =
changed.attrdiff.changed.includes('nixosTests.simple-container') ||
changed.attrdiff.changed.includes('nixosTests.simple-vm')
// https://github.com/NixOS/nixpkgs/pull/521157
// These should go to master and release-xx.xx when backported
let isExemptKernelUpdate = false
if (prInfo.changed_files === 1) {
const changedFiles = (
await github.rest.pulls.listFiles({
...context.repo,
pull_number,
})
).data
isExemptKernelUpdate =
changedFiles.length === 1 &&
changedFiles[0].filename ===
'pkgs/os-specific/linux/kernel/xanmod-kernels.nix'
}
// https://github.com/NixOS/nixpkgs/pull/483194#issuecomment-3793393218
const isExemptHomeAssistantUpdate =
maxRebuildCount <= 1500 && head === 'wip-home-assistant'
core.info(
[
`checkTargetBranch: this PR:`,
` * causes ${maxRebuildCount} rebuilds`,
` * ${rebuildsAllTests ? 'rebuilds' : 'does not rebuild'} all NixOS tests`,
` * ${isExemptKernelUpdate ? 'is' : 'is not'} an exempt kernel update`,
` * ${isExemptHomeAssistantUpdate ? 'is' : 'is not'} an exempt home-assistant update`,
].join('\n'),
)
if (
maxRebuildCount >= 1000 &&
!isExemptHomeAssistantUpdate &&
!isExemptKernelUpdate
) {
const desiredBranch =
base === 'master' ? 'staging' : `staging-${split(base).version}`
const body = [
`The PR's base branch is set to \`${base}\`, but this PR causes ${maxRebuildCount} rebuilds.`,
'It is therefore considered a mass rebuild.',
`Please [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 [the right base branch for your changes](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#branch-conventions) (probably \`${desiredBranch}\`).`,
].join('\n')
await postReview({
github,
context,
core,
dry,
body,
event: 'REQUEST_CHANGES',
reviewKey,
})
} else if (rebuildsAllTests && !isExemptKernelUpdate) {
let branchText
if (base === 'master' && maxRebuildCount >= 500) {
branchText = '(probably either `staging-nixos` or `staging`)'
} else if (base === 'master') {
branchText = '(probably `staging-nixos`)'
} else if (maxRebuildCount >= 500) {
branchText = `(probably either \`staging-nixos-${split(base).version}\` or \`staging-${split(base).version}\`)`
} else {
branchText = `(probably \`staging-nixos-${split(base).version}\`)`
}
const body = [
`The PR's base branch is set to \`${base}\`, but this PR rebuilds all NixOS tests.`,
base === 'master' && maxRebuildCount >= 500
? `Since this PR also causes ${maxRebuildCount} rebuilds, it may also be considered a mass rebuild.`
: '',
`Please [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 [the right base branch for your changes](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#branch-conventions) ${branchText}.`,
].join('\n')
await postReview({
github,
context,
core,
dry,
body,
event: 'REQUEST_CHANGES',
reviewKey,
})
} else if (
maxRebuildCount >= 500 &&
!isExemptKernelUpdate &&
!isExemptHomeAssistantUpdate
) {
const stagingBranch =
base === 'master' ? 'staging' : `staging-${split(base).version}`
const body = [
`The PR's base branch is set to \`${base}\`, and this PR causes ${maxRebuildCount} rebuilds.`,
`Please consider whether this PR causes a mass rebuild according to [our conventions](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#branch-conventions).`,
`If it does cause a mass rebuild, please [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 [the right base branch for your changes](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#branch-conventions) (probably \`${stagingBranch}\`).`,
`If it does not cause a mass rebuild, this message can be ignored.`,
].join('\n')
await postReview({
github,
context,
core,
dry,
body,
event: 'REQUEST_CHANGES',
reviewKey,
})
} else {
core.info('checkTargetBranch: this PR is against an appropriate branch.')
await dismissReviews({
github,
context,
core,
dry,
reviewKey,
})
}
}
module.exports = checkTargetBranch

View File

@@ -1,322 +0,0 @@
module.exports = async ({ github, context, core, dry, cherryPicks }) => {
const { execFileSync } = require('node:child_process')
const { classify } = require('../supportedBranches.js')
const withRateLimit = require('./withRateLimit.js')
const { dismissReviews, postReview } = require('./reviews.js')
const reviewKey = 'check-commits'
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.endsWith('Check / commits')).html_url +
'?pr=' +
pull_number
async function extract({ sha, commit }) {
const noCherryPick = Array.from(
commit.message.matchAll(/^Not-cherry-picked-because: (.*)$/gm),
).at(0)
if (noCherryPick)
return {
sha,
commit,
severity: 'important',
message: `${sha} is not a cherry-pick, because: ${noCherryPick[1]}. Please review this commit manually.`,
type: 'no-cherry-pick',
}
// Using the last line with "cherry" + hash, because a chained backport
// can result in multiple of those lines. Only the last one counts.
const cherry = Array.from(
commit.message.matchAll(/cherry.*([0-9a-f]{40})/g),
).at(-1)
if (!cherry)
return {
sha,
commit,
severity: 'warning',
message: `Couldn't locate the cherry-picked commit's hash in the commit message of ${sha}.`,
type: 'no-commit-hash',
}
const original_sha = cherry[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.`,
}
return {
sha,
commit,
original_sha,
}
}
function diff({ sha, commit, original_sha }) {
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.`,
type: 'diff',
}
}
// For now we short-circuit the list of commits when cherryPicks should not be checked.
// This will not run any checks, but still trigger the "dismiss reviews" part below.
const commits = !cherryPicks
? []
: await github.paginate(github.rest.pulls.listCommits, {
...context.repo,
pull_number,
})
const extracted = await Promise.all(commits.map(extract))
const fetch = extracted
.filter(({ severity }) => !severity)
.flatMap(({ sha, original_sha }) => [sha, original_sha])
if (fetch.length > 0) {
// Fetching all commits we need for diff at once is much faster than any other method.
execFileSync('git', [
'-C',
__dirname,
'fetch',
'--depth=2',
'origin',
...fetch,
])
}
const results = extracted.map((result) =>
result.severity ? result : diff(result),
)
// 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)}`)
switch (severity) {
case 'error':
core.error(message)
break
case 'warning':
core.warning(message)
break
default:
core.info(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.
// An empty results array will always trigger this condition, which is helpful
// to clean up reviews created by the prepare step when on the wrong branch.
if (results.every(({ severity }) => severity === 'info')) {
await dismissReviews({ github, context, dry, reviewKey })
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(
'This report is automatically generated by the `PR / Check / cherry-pick` CI workflow.',
true,
)
core.summary.addEOL()
core.summary.addRaw(
"Some of the commits in this PR require the author's and reviewer's attention.",
true,
)
core.summary.addEOL()
if (results.some(({ type }) => type === 'no-commit-hash')) {
core.summary.addRaw(
'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.',
true,
)
core.summary.addRaw(
'This requires changes to the unstable `master` and `staging` branches first, before backporting them.',
true,
)
core.summary.addEOL()
core.summary.addRaw(
'Occasionally, commits are not cherry-picked at all, for example when updating minor versions of packages which have already advanced to the next major on unstable.',
true,
)
core.summary.addRaw(
'These commits can optionally be marked with a `Not-cherry-picked-because: <reason>` footer.',
true,
)
core.summary.addEOL()
}
if (results.some(({ type }) => type === 'diff')) {
core.summary.addRaw(
'Sometimes it is not possible to cherry-pick exactly the same patch.',
true,
)
core.summary.addRaw(
'This most frequently happens when resolving merge conflicts.',
true,
)
core.summary.addRaw(
'The range-diff will help to review the resolution of conflicts.',
true,
)
core.summary.addEOL()
}
core.summary.addRaw(
'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.',
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[!${{ important: 'IMPORTANT', warning: 'WARNING', error: 'CAUTION' }[severity]}]`,
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()
// Posting a review 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.
await postReview({ github, context, core, dry, body, reviewKey })
})
}

View File

@@ -1,117 +0,0 @@
// @ts-check
const { promisify } = require('node:util')
const execFile = promisify(require('node:child_process').execFile)
/**
* @typedef {{
* subject: string,
* sha: string,
* author: { name: string, email: string },
* committer: { name: string, email: string}
* changedPaths: string[],
* changedPathSegments: Set<string>,
* }} Commit
*/
/**
* @param {{
* args: string[]
* core: import('@actions/core'),
* quiet?: boolean,
* repoPath?: string,
* }} RunGitProps
*/
async function runGit({ args, repoPath, core, quiet }) {
if (repoPath) {
args = ['-C', repoPath, ...args]
}
if (!quiet) {
core.info(`About to run \`git ${args.map((s) => `'${s}'`).join(' ')}\``)
}
return await execFile('git', args)
}
/**
* Gets the SHA, subject and changed files for each commit in the given PR.
*
* Don't use GitHub API at all: the "list commits on PR" endpoint has a limit
* of 250 commits and doesn't return the changed files.
*
* @param {{
* core: import('@actions/core'),
* pr: Awaited<ReturnType<InstanceType<import('@actions/github/lib/utils').GitHub>["rest"]["pulls"]["get"]>>["data"]
* repoPath?: string,
* }} GetCommitMessagesForPRProps
*
* @returns {Promise<Commit[]>}
*/
async function getCommitDetailsForPR({ core, pr, repoPath }) {
await runGit({
args: ['fetch', `--depth=1`, 'origin', pr.base.sha],
repoPath,
core,
})
await runGit({
args: ['fetch', `--depth=${pr.commits + 1}`, 'origin', pr.head.sha],
repoPath,
core,
})
const shas = (
await runGit({
args: [
'rev-list',
`--max-count=${pr.commits}`,
`${pr.base.sha}..${pr.head.sha}`,
],
repoPath,
core,
})
).stdout
.split('\n')
.map((s) => s.trim())
.filter(Boolean)
return Promise.all(
shas.map(async (sha) => {
// Subject, author name, author email, committer name, committer email (all tab-seperated)
// then a blank line, then filenames.
const result = (
await runGit({
args: [
'log',
'--format=%s\t%aN\t%aE\t%cN\t%cE',
'--name-only',
'-1',
sha,
],
repoPath,
core,
quiet: true,
})
).stdout.split('\n')
const [subject, authorName, authorEmail, committerName, committerEmail] =
result[0].split('\t')
const changedPaths = result.slice(2, -1)
const changedPathSegments = new Set(
changedPaths.flatMap((path) => path.split('/')),
)
return {
sha,
subject,
author: { name: authorName, email: authorEmail },
committer: { name: committerName, email: committerEmail },
changedPaths,
changedPathSegments,
}
}),
)
}
module.exports = { getCommitDetailsForPR }

View File

@@ -1,85 +0,0 @@
const excludeTeams = [
/^voters.*$/,
/^nixpkgs-maintainers$/,
/^nixpkgs-committers$/,
]
module.exports = async ({ github, context, core, outFile }) => {
const withRateLimit = require('./withRateLimit.js')
const { writeFileSync } = require('node:fs')
const org = context.repo.owner
const result = {}
await withRateLimit({ github, core }, async () => {
// Turn an Array of users into an Object, mapping user.login -> user.id
function makeUserSet(users) {
// Sort in-place and build result by mutation
users.sort((a, b) => (a.login > b.login ? 1 : -1))
return users.reduce((acc, user) => {
acc[user.login] = user.id
return acc
}, {})
}
// Process a list of teams and append to the result variable
async function processTeams(teams) {
for (const team of teams) {
core.notice(`Processing team ${team.slug}`)
if (!excludeTeams.some((regex) => team.slug.match(regex))) {
const members = makeUserSet(
await github.paginate(github.rest.teams.listMembersInOrg, {
org,
team_slug: team.slug,
role: 'member',
}),
)
const maintainers = makeUserSet(
await github.paginate(github.rest.teams.listMembersInOrg, {
org,
team_slug: team.slug,
role: 'maintainer',
}),
)
result[team.slug] = {
description: team.description,
id: team.id,
maintainers,
members,
name: team.name,
}
}
await processTeams(
await github.paginate(github.rest.teams.listChildInOrg, {
org,
team_slug: team.slug,
}),
)
}
}
const teams = await github.paginate(github.rest.repos.listTeams, {
...context.repo,
})
await processTeams(teams)
})
// Sort the teams by team name
const sorted = Object.keys(result)
.sort()
.reduce((acc, key) => {
acc[key] = result[key]
return acc
}, {})
const json = `${JSON.stringify(sorted, null, 2)}\n`
if (outFile) {
writeFileSync(outFile, json)
} else {
console.log(json)
}
}

View File

@@ -1,223 +0,0 @@
// @ts-check
const { classify } = require('../supportedBranches.js')
const { getCommitDetailsForPR } = require('./get-pr-commit-details.js')
/** @typedef {import('./get-pr-commit-details.js').Commit} Commit */
/**
* @param {{
* github: InstanceType<import('@actions/github/lib/utils').GitHub>,
* context: typeof import('@actions/github').context,
* core: import('@actions/core'),
* repoPath?: string,
* }} LintCommitsProps
*/
async function lintCommits({ github, context, core, repoPath }) {
// This check should only be run when we have the pull_request context.
const pull_number = context.payload.pull_request?.number
if (!pull_number) {
core.info('This is not a pull request. Skipping checks.')
return
}
const pr = (
await github.rest.pulls.get({
...context.repo,
pull_number,
})
).data
const baseBranchType = classify(
pr.base.ref.replace(/^refs\/heads\//, ''),
).type
const headBranchType = classify(
pr.head.ref.replace(/^refs\/heads\//, ''),
).type
if (
baseBranchType.includes('development') &&
headBranchType.includes('development') &&
pr.base.repo.id === pr.head.repo?.id
) {
// This matches, for example, PRs from NixOS:staging-next to NixOS:master, or vice versa.
// Ignore them: we should only care about PRs introducing *new* commits.
// We still want to run on PRs from, e.g., Someone:master to NixOS:master, though.
core.info(
'This PR is from one development branch to another. Skipping checks.',
)
return
}
const commits = await getCommitDetailsForPR({ core, pr, repoPath })
await checkCommitMessages({ commits, core })
await checkCommitMetadata({ commits, core })
}
/**
* @param {{
* commits: Commit[],
* core: import('@actions/core'),
* }} CheckCommitMessagesProps
*/
async function checkCommitMessages({ commits, core }) {
const failures = new Set()
const conventionalCommitTypes = [
'build',
'chore',
'ci',
'doc',
'docs',
'feat',
'feature',
'fix',
'perf',
'refactor',
'style',
'test',
]
/**
* @param {string[]} types e.g. ["fix", "feat"]
* @param {string?} sha commit hash
*/
function makeConventionalCommitRegex(types, sha = null) {
core.info(
`${
sha
? `Conventional commit types for ${sha?.slice(0, 16)}`
: 'Default conventional commit types'
}: ${JSON.stringify(types)}`,
)
return new RegExp(`^(${types.join('|')})!?(\\(.*\\))?!?:`)
}
// Optimize for the common case that we don't have path segments with the
// same name as a conventional commit type.
const fullConventionalCommitRegex = makeConventionalCommitRegex(
conventionalCommitTypes,
)
for (const commit of commits) {
const logMsgStart = `Commit ${commit.sha}'s message's subject ("${commit.subject}")`
// If we have a commit `perf: ...`, and we touch a file containing the path
// segment "perf", we don't want to flag this.
const filteredTypes = conventionalCommitTypes.filter(
(type) => !commit.changedPathSegments.has(type),
)
const conventionalCommitRegex =
filteredTypes.length === conventionalCommitTypes.length
? fullConventionalCommitRegex
: makeConventionalCommitRegex(filteredTypes, commit.sha)
if (!commit.subject.includes(': ')) {
core.error(
`${logMsgStart} was detected as not meeting our guidelines because ` +
'it does not contain a colon followed by a whitespace. ' +
'There are likely other issues as well.',
)
failures.add(commit.sha)
}
if (commit.subject.endsWith('.')) {
core.error(
`${logMsgStart} was detected as not meeting our guidelines because ` +
'it ends in a period. There may be other issues as well.',
)
failures.add(commit.sha)
}
const fixups = ['amend!', 'fixup!', 'squash!']
if (fixups.some((s) => commit.subject.startsWith(s))) {
core.error(
`${logMsgStart} was detected as not meeting our guidelines because ` +
`it begins with "${fixups.find((s) => commit.subject.startsWith(s))}". ` +
'Did you forget to run `git rebase -i --autosquash`?',
)
failures.add(commit.sha)
}
if (conventionalCommitRegex.test(commit.subject)) {
core.error(
`${logMsgStart} was detected as not meeting our guidelines because ` +
'it seems to use conventional commit (conventionalcommits.org) ' +
'formatting. Nixpkgs has its own, different, commit message ' +
'formatting standards.',
)
failures.add(commit.sha)
}
if (!failures.has(commit.sha)) {
core.info(`${logMsgStart} passed our automated checks!`)
}
}
if (failures.size !== 0) {
core.error(
'Please review the guidelines at ' +
'<https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#commit-conventions>, ' +
'as well as the applicable area-specific guidelines linked there.',
)
core.setFailed('Committers: merging is discouraged.')
}
}
/**
* @param {{
* commits: Commit[],
* core: import('@actions/core'),
* }} CheckGitFieldsProps
*/
async function checkCommitMetadata({ commits, core }) {
const failures = new Set()
/** @type {(s: string) => boolean} */
const isEmail = (s) => /^.+@.*$/.test(s)
for (const commit of commits) {
if (!commit.author.name) {
core.error(`Commit ${commit.sha} author's name field is missing`)
failures.add(commit.sha)
}
if (!commit.author.email || !isEmail(commit.author.email)) {
core.error(
`Commit ${commit.sha} author's email field is missing or invalid`,
)
failures.add(commit.sha)
}
if (!commit.committer.name) {
core.error(`Commit ${commit.sha} committer's name field is missing`)
failures.add(commit.sha)
}
if (!commit.committer.email || !isEmail(commit.committer.email)) {
core.error(
`Commit ${commit.sha} committer's email field is missing or invalid`,
)
failures.add(commit.sha)
}
if (!failures.has(commit.sha)) {
core.info(
`Commit ${commit.sha}'s git fields passed our automated checks!`,
)
}
}
if (failures.size !== 0) {
core.error(
'Please add the missing commit fields. ' +
'You can use the noreply email address generated for you by GitHub ' +
'(https://docs.github.com/en/account-and-profile/reference/email-addresses-reference#your-noreply-email-address) ' +
"if you'd like.",
)
core.setFailed('Committers: merging is discouraged.')
}
}
module.exports = lintCommits

View File

@@ -1,95 +0,0 @@
// @ts-check
const { classify } = require('../supportedBranches.js')
const { getCommitDetailsForPR } = require('./get-pr-commit-details')
/**
* @param {{
* github: InstanceType<import('@actions/github/lib/utils').GitHub>,
* context: import('@actions/github/lib/context').Context,
* core: import('@actions/core'),
* repoPath?: string,
* dry: boolean,
* }} CheckManualFileEditsProps
*/
async function checkManualFileEdits({ github, context, core, repoPath, dry }) {
const { dismissReviews, postReview } = require('./reviews.js')
const reviewKey = 'manual-file-edits'
const pull_number = context.payload.pull_request?.number
if (!pull_number) {
core.info('This is not a pull request. Skipping checks.')
return
}
const pr = (
await github.rest.pulls.get({
...context.repo,
pull_number,
})
).data
if (pr.user.login.endsWith('[bot]')) {
core.info('This is a bot, so these checks do not apply.')
return
}
const baseBranchType = classify(
pr.base.ref.replace(/^refs\/heads\//, ''),
).type
const headBranchType = classify(
pr.head.ref.replace(/^refs\/heads\//, ''),
).type
if (
baseBranchType.includes('development') &&
headBranchType.includes('development') &&
pr.base.repo.id === pr.head.repo?.id
) {
// This matches, for example, PRs from NixOS:staging-next to NixOS:master, or vice versa.
// Ignore them: we should only care about PRs introducing *new* commits.
// We still want to run on PRs from, e.g., Someone:master to NixOS:master, though.
core.info(
'This PR is from one development branch to another. Skipping checks.',
)
return
}
const details = await getCommitDetailsForPR({ core, pr, repoPath })
if (
details.some(({ changedPaths }) =>
changedPaths.includes('maintainers/github-teams.json'),
)
) {
postReview({
github,
context,
core,
dry,
event: 'REQUEST_CHANGES',
body: [
'maintainers/github-teams.json is supposed to accurately reflect the state of the teams in GitHub.\n',
'Therefore, it should not be edited manually.\n',
'All changes to teams listed in maintainers/github-teams.json should be performed in GitHub by a team maintainer.\n',
"Team maintainers are listed in the github-teams.json file and in GitHub's UI.\n",
'If there is no team maintainer available, an org owner can make the needed change, please contact one by',
'following the instructions at https://github.com/NixOS/org/blob/main/doc/github-org-owners.md#how-to-contact-the-team.\n',
'Thank you!',
].reduce(
(prev, curr) => prev + (!prev || prev.endsWith('\n') ? '' : ' ') + curr,
'',
),
reviewKey,
})
} else {
dismissReviews({
github,
context,
core,
dry,
reviewKey,
})
}
}
module.exports = checkManualFileEdits

View File

@@ -1,354 +0,0 @@
const { classify } = require('../supportedBranches.js')
function runChecklist({
committers,
events,
files,
pull_request,
log,
maintainers,
user,
userIsMaintainer,
}) {
const allByName = files.every(
({ filename }) =>
filename.startsWith('pkgs/by-name/') && filename.split('/').length > 4,
)
const packages = files
.filter(({ filename }) => filename.startsWith('pkgs/by-name/'))
.map(({ filename }) => filename.split('/')[3])
.filter(Boolean)
const eligible = !packages.length
? new Set()
: packages
.map((pkg) => new Set(maintainers[pkg]))
.reduce((acc, cur) => acc?.intersection(cur) ?? cur)
const approvals = new Set(
events
.filter(
({ event, state, commit_id }) =>
event === 'reviewed' &&
state === 'approved' &&
// Only approvals for the current head SHA count, otherwise authors could push
// bad code between the approval and the merge.
commit_id === pull_request.head.sha,
)
.map(({ user }) => user?.id)
// Some users have been deleted, so filter these out.
.filter(Boolean),
)
const checklist = {
'PR targets a [development branch](https://github.com/NixOS/nixpkgs/blob/-/ci/README.md#branch-classification).':
classify(pull_request.base.ref).type.includes('development'),
'PR touches only files of packages in `pkgs/by-name/`.': allByName,
'PR is at least one of:': {
'Approved by a [committer](https://github.com/orgs/NixOS/teams/nixpkgs-committers).':
committers.intersection(approvals).size > 0,
'Backported via label.':
pull_request.user.login === 'nixpkgs-ci[bot]' &&
pull_request.head.ref.startsWith('backport-'),
'Opened by a [committer](https://github.com/orgs/NixOS/teams/nixpkgs-committers).':
committers.has(pull_request.user.id),
'Opened by [@r-ryantm](https://nix-community.github.io/nixpkgs-update/r-ryantm/).':
pull_request.user.login === 'r-ryantm',
},
'PR is not a draft': !pull_request.draft,
}
if (user) {
checklist[
`${user.login} is a member of [@NixOS/nixpkgs-maintainers](https://github.com/orgs/NixOS/teams/nixpkgs-maintainers).`
] = userIsMaintainer
if (allByName) {
// We can only determine the below, if all packages are in by-name, since
// we can't reliably relate changed files to packages outside by-name.
checklist[
`${user.login} is a maintainer of all touched packages on the ${pull_request.base.ref} branch.`
] = eligible.has(user.id)
}
} else {
// This is only used when no user is passed, i.e. for labeling.
checklist['PR has maintainers eligible to merge.'] = eligible.size > 0
}
const result = Object.values(checklist).every((v) =>
typeof v === 'boolean' ? v : Object.values(v).some(Boolean),
)
log('checklist', JSON.stringify(checklist))
log('eligible', JSON.stringify(Array.from(eligible)))
log('result', result)
return {
checklist,
eligible,
result,
}
}
// The merge command must be on a separate line and not within codeblocks or html comments.
// Codeblocks can have any number of ` larger than 3 to open/close. We only look at code
// blocks that are not indented, because the later regex wouldn't match those anyway.
function hasMergeCommand(body) {
return (body ?? '')
.replace(/<!--.*?-->/gms, '')
.replace(/(^`{3,})[^`].*?\1/gms, '')
.match(/^@NixOS\/nixpkgs-merge-bot merge\s*$/m)
}
async function handleMergeComment({ github, body, node_id, reaction }) {
if (!hasMergeCommand(body)) return
await github.graphql(
`mutation($node_id: ID!, $reaction: ReactionContent!) {
addReaction(input: {
content: $reaction,
subjectId: $node_id
})
{ clientMutationId }
}`,
{ node_id, reaction },
)
}
async function handleMerge({
github,
context,
core,
log,
dry,
pull_request,
events,
maintainers,
getTeamMembers,
getUser,
}) {
const pull_number = pull_request.number
const committers = new Set(
(await getTeamMembers('nixpkgs-committers')).map(({ id }) => id),
)
const files = (
await github.rest.pulls.listFiles({
...context.repo,
pull_number,
per_page: 100,
})
).data
// Early exit to prevent treewides from using up a lot of API requests (and time!) to list
// all the files in the pull request. For now, the merge-bot will not work when 100 or more
// files are touched in a PR - which should be more than fine.
// TODO: Find a more efficient way of downloading all the *names* of the touched files,
// including an early exit when the first non-by-name file is found.
if (files.length >= 100) return false
// Only look through comments *after* the latest (force) push.
const lastPush = events.findLastIndex(
({ event, sha, commit_id }) =>
['committed', 'head_ref_force_pushed'].includes(event) &&
(sha ?? commit_id) === pull_request.head.sha,
)
const comments = events.slice(lastPush + 1).filter(
({ event, body, user, node_id }) =>
['commented', 'reviewed'].includes(event) &&
hasMergeCommand(body) &&
// Ignore comments where the user has been deleted already.
user &&
// Ignore comments which had already been responded to by the bot.
(dry ||
!events.some(
({ event, body }) =>
['commented'].includes(event) &&
// We're only testing this hidden reference, but not the author of the comment.
// We'll just assume that nobody creates comments with this marker on purpose.
// Additionally checking the author is quite annoying for local debugging.
body.match(new RegExp(`^<!-- comment: ${node_id} -->$`, 'm')),
)),
)
async function merge() {
if (dry) {
core.info(`Merging #${pull_number}... (dry)`)
return ['Merge completed (dry)']
}
// Using GraphQL mutations instead of the REST /merge endpoint, because the latter
// doesn't work with Merge Queues. We now have merge queues enabled on all development
// branches, so we don't need a fallback for regular merges.
try {
const resp = await github.graphql(
`mutation($node_id: ID!, $sha: GitObjectID) {
enqueuePullRequest(input: {
expectedHeadOid: $sha,
pullRequestId: $node_id
})
{
clientMutationId,
mergeQueueEntry { mergeQueue { url } }
}
}`,
{ node_id: pull_request.node_id, sha: pull_request.head.sha },
)
log('merge', 'Queued for merge')
return [
`:heavy_check_mark: [Queued](${resp.enqueuePullRequest.mergeQueueEntry.mergeQueue.url}) for merge (#306934)`,
]
} catch (e) {
log('Enqueuing failed', e.response.errors[0].message)
}
// If required status checks are not satisfied, yet, the above will fail. In this case
// we can enable auto-merge. We could also only use auto-merge, but this often gets
// stuck for no apparent reason.
try {
await github.graphql(
`mutation($node_id: ID!, $sha: GitObjectID) {
enablePullRequestAutoMerge(input: {
expectedHeadOid: $sha,
pullRequestId: $node_id
})
{ clientMutationId }
}`,
{ node_id: pull_request.node_id, sha: pull_request.head.sha },
)
log('merge', 'Auto-merge enabled')
return [
`:heavy_check_mark: Enabled Auto Merge (#306934)`,
'',
'> [!TIP]',
'> Sometimes GitHub gets stuck after enabling Auto Merge. In this case, leaving another approval should trigger the merge.',
]
} catch (e) {
log('Auto Merge failed', e.response.errors[0].message)
throw new Error(e.response.errors[0].message)
}
}
for (const comment of comments) {
log('comment', comment.node_id)
async function react(reaction) {
if (dry) {
core.info(`Reaction ${reaction} on ${comment.node_id} (dry)`)
return
}
await handleMergeComment({
github,
body: comment.body,
node_id: comment.node_id,
reaction,
})
}
async function isMaintainer(username) {
try {
return (
(
await github.rest.teams.getMembershipForUserInOrg({
org: context.repo.owner,
team_slug: 'nixpkgs-maintainers',
username,
})
).data.state === 'active'
)
} catch (e) {
if (e.status === 404) return false
else throw e
}
}
const { result, eligible, checklist } = runChecklist({
committers,
events,
files,
pull_request,
log,
maintainers,
user: comment.user,
userIsMaintainer: await isMaintainer(comment.user.login),
})
const body = [
`<!-- comment: ${comment.node_id} -->`,
`@${comment.user.login} wants to merge this PR.`,
'',
'Requirements to merge this PR with `@NixOS/nixpkgs-merge-bot merge`:',
...Object.entries(checklist).flatMap(([msg, res]) =>
typeof res === 'boolean'
? `- :${res ? 'white_check_mark' : 'x'}: ${msg}`
: [
`- :${Object.values(res).some(Boolean) ? 'white_check_mark' : 'x'}: ${msg}`,
...Object.entries(res).map(
([msg, res]) =>
` - ${res ? ':white_check_mark:' : ':white_large_square:'} ${msg}`,
),
],
),
'',
]
if (eligible.size > 0 && !eligible.has(comment.user.id)) {
const users = await Promise.all(
Array.from(eligible, async (id) => (await getUser(id)).login),
)
body.push(
'> [!TIP]',
'> Maintainers eligible to merge are:',
...users.map((login) => `> - ${login}`),
'',
)
}
if (result) {
await react('ROCKET')
try {
body.push(...(await merge()))
} catch (e) {
// Remove the HTML comment with node_id reference to allow retrying this merge on the next run.
body.shift()
body.push(`:x: Merge failed with: ${e} (#371492)`)
}
} else {
await react('THUMBS_DOWN')
body.push(':x: Pull Request could not be merged (#305350)')
}
if (dry) {
core.info(body.join('\n'))
} else {
await github.rest.issues.createComment({
...context.repo,
issue_number: pull_number,
body: body.join('\n'),
})
}
if (result) break
}
const { result } = runChecklist({
committers,
events,
files,
pull_request,
log,
maintainers,
})
// Returns a boolean, which indicates whether the PR is merge-bot eligible in principle.
// This is used to set the respective label in bot.js.
return result
}
module.exports = {
handleMerge,
handleMergeComment,
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,16 +0,0 @@
{
"private": true,
"//": [
"Keep `@actions/core` and `@actions/github` in sync with",
"https://github.com/actions/github-script/blob/main/package.json.",
"Keep `@actions/artifact` and `bottleneck` in sync with",
"`.github/workflows/bot.yml`."
],
"dependencies": {
"@actions/artifact": "6.2.1",
"@actions/core": "1.10.1",
"@actions/github": "9.1.0",
"bottleneck": "2.19.5",
"commander": "14.0.3"
}
}

View File

@@ -1,239 +0,0 @@
const { classify } = require('../supportedBranches.js')
const { postReview, dismissReviews } = require('./reviews.js')
const reviewKey = 'prepare'
const supportedSystems = require('./supportedSystems.js')
module.exports = async ({ github, context, core, dry }) => {
const pull_number = context.payload.pull_request.number
for (const retryInterval of [5, 10, 20, 40, 80]) {
core.info('Checking whether the pull request can be merged...')
const prInfo = (
await github.rest.pulls.get({
...context.repo,
pull_number,
})
).data
if (prInfo.state !== 'open') throw new Error('PR is not open anymore.')
if (prInfo.mergeable == null) {
core.info(
`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
}
const { base, head } = prInfo
const baseClassification = classify(base.ref)
core.setOutput('base', baseClassification)
console.log('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)
console.log('head classification:', headClassification)
if (baseClassification.type.includes('channel')) {
const { stable, version } = baseClassification
const correctBranch = stable ? `release-${version}` : 'master'
const body = [
'The `nixos-*` and `nixpkgs-*` branches are pushed to by the channel release script and should not be merged into directly.',
'',
`Please target \`${correctBranch}\` instead.`,
].join('\n')
await postReview({ github, context, core, dry, body, reviewKey })
throw new Error('The PR targets a channel branch.')
}
if (headClassification.type.includes('wip')) {
// In the following, we look at the git history to determine the base branch that
// this Pull Request branched off of. This is *supposed* to be the branch that it
// merges into, but humans make mistakes. Once that happens we want to error out as
// early as possible.
// To determine the "real base", we are looking at the merge-base of primary development
// branches and the head of the PR. The merge-base which results in the least number of
// commits between that base and head is the real base. We can query for this via GitHub's
// REST API. There can be multiple candidates for the real base with the same number of
// commits. In this case we pick the "best" candidate by a fixed ordering of branches,
// as defined in ci/supportedBranches.js.
//
// These requests take a while, when comparing against the wrong release - they need
// to look at way more than 10k commits in that case. Thus, we try to minimize the
// number of requests across releases:
// - First, we look at the primary development branches only: master and release-xx.yy.
// The branch with the fewest commits gives us the release this PR belongs to.
// - We then compare this number against the relevant staging branches for this release
// to find the exact branch that this belongs to.
// All potential development branches
const branches = (
await github.paginate(github.rest.repos.listBranches, {
...context.repo,
per_page: 100,
})
).map(({ name }) => classify(name))
// All stable primary development branches from latest to oldest.
const releases = branches
.filter(({ stable, type }) => type.includes('primary') && stable)
.sort((a, b) => b.version.localeCompare(a.version))
async function mergeBase({ branch, order, version }) {
const { data } = await github.rest.repos.compareCommitsWithBasehead({
...context.repo,
basehead: `${branch}...${head.sha}`,
// Pagination for this endpoint is about the commits listed, which we don't care about.
per_page: 1,
// Taking the second page skips the list of files of this changeset.
page: 2,
})
return {
branch,
order,
version,
commits: data.total_commits,
sha: data.merge_base_commit.sha,
}
}
// Multiple branches can be OK at the same time, if the PR was created of a merge-base,
// thus storing as array.
let candidates = [await mergeBase(classify('master'))]
for (const release of releases) {
const nextCandidate = await mergeBase(release)
if (candidates[0].commits === nextCandidate.commits)
candidates.push(nextCandidate)
if (candidates[0].commits > nextCandidate.commits)
candidates = [nextCandidate]
// The number 10000 is principally arbitrary, but the GitHub API returns this value
// when the number of commits exceeds it in reality. The difference between two stable releases
// is certainly more than 10k commits, thus this works for us as well: If we're targeting
// a wrong release, the number *will* be 10000.
if (candidates[0].commits < 10000) break
}
core.info(`This PR is for NixOS ${candidates[0].version}.`)
// Secondary development branches for the selected version only.
const secondary = branches.filter(
({ branch, type, version }) =>
type.includes('secondary') && version === candidates[0].version,
)
// Make sure that we always check the current target as well, even if its a WIP branch.
secondary.push(classify(base.ref))
for (const branch of secondary) {
const nextCandidate = await mergeBase(branch)
if (candidates[0].commits === nextCandidate.commits)
candidates.push(nextCandidate)
if (candidates[0].commits > nextCandidate.commits)
candidates = [nextCandidate]
}
// If the current branch is among the candidates, this is always better than any other,
// thus sorting at -1.
candidates = candidates
.map((candidate) =>
candidate.branch === base.ref
? { ...candidate, order: -1 }
: candidate,
)
.sort((a, b) => a.order - b.order)
const best = candidates.at(0)
core.info('The base branches for this PR are:')
core.info(`github: ${base.ref}`)
core.info(
`candidates: ${candidates.map(({ branch }) => branch).join(',')}`,
)
core.info(`best candidate: ${best.branch}`)
if (best.branch !== base.ref) {
const current = await mergeBase(classify(base.ref))
const body = [
`The PR's base branch is set to \`${current.branch}\`, but ${current.commits === 10000 ? 'at least 10000' : current.commits - best.commits} commits from the \`${best.branch}\` 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:`,
`- If the changes should go to the \`${best.branch}\` 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).`,
`- If the changes should go to the \`${current.branch}\` branch, rebase your PR onto the correct merge-base:`,
' ```bash',
` # git rebase --onto $(git merge-base upstream/${current.branch} HEAD) $(git merge-base upstream/${best.branch} HEAD)`,
` git rebase --onto ${current.sha} ${best.sha}`,
` git push --force-with-lease`,
' ```',
].join('\n')
await postReview({
github,
context,
core,
dry,
body,
event: 'REQUEST_CHANGES',
reviewKey,
})
} else {
await dismissReviews({ github, context, core, dry, reviewKey })
}
}
let mergedSha, targetSha
if (prInfo.mergeable) {
core.info('The PR can be merged.')
mergedSha = prInfo.merge_commit_sha
targetSha = (
await github.rest.repos.getCommit({
...context.repo,
ref: prInfo.merge_commit_sha,
})
).data.parents[0].sha
} else {
core.warning('The PR has a merge conflict.')
mergedSha = head.sha
targetSha = (
await github.rest.repos.compareCommitsWithBasehead({
...context.repo,
basehead: `${base.sha}...${head.sha}`,
})
).data.merge_base_commit.sha
}
core.info(
`Checking the commits:\nmerged: ${mergedSha}\ntarget: ${targetSha}`,
)
core.setOutput('mergedSha', mergedSha)
core.setOutput('targetSha', targetSha)
const systems = await supportedSystems({ github, context, targetSha })
core.setOutput('systems', systems)
const files = (
await github.paginate(github.rest.pulls.listFiles, {
...context.repo,
pull_number: context.payload.pull_request.number,
per_page: 100,
})
).map((file) => file.filename)
const touched = []
if (files.includes('ci/pinned.json')) touched.push('pinned')
core.setOutput('touched', touched)
return
}
throw new Error(
"Not retrying anymore. It's likely that GitHub is having internal issues: check https://www.githubstatus.com.",
)
}

View File

@@ -1,188 +0,0 @@
async function handleReviewers({
github,
context,
core,
log,
dry,
pull_request,
reviews,
user_maintainers,
team_maintainers,
owners,
getUser,
getTeam,
}) {
const pull_number = pull_request.number
// Users that the PR has already reached, e.g. they've left a review or have been requested for one
const users_reached = new Set([
...pull_request.requested_reviewers.map(({ login }) => login.toLowerCase()),
...reviews.map(({ user }) => user.login.toLowerCase()),
])
log('reviewers - users_reached', Array.from(users_reached).join(', '))
// Same for teams
const teams_reached = new Set([
...pull_request.requested_teams.map(({ slug }) => slug.toLowerCase()),
...reviews.flatMap(({ onBehalfOf }) =>
onBehalfOf.nodes.map(({ slug }) => slug.toLowerCase()),
),
])
log('reviewers - teams_reached', Array.from(teams_reached).join(', '))
// Early sanity check, before we start making any API requests. The list of maintainers
// does not have duplicates so the only user to filter out from this list would be the
// PR author. Therefore, we check for a limit of 15+1, where 15 is the limit we check
// further down again.
// This is to protect against huge treewides consuming all our API requests for no
// reason.
if (user_maintainers.length + team_maintainers.length > 16) {
core.warning('Too many potential reviewers, skipping review requests.')
// Return a boolean on whether the "needs: reviewers" label should be set.
return users_reached.size === 0 && teams_reached.size === 0
}
// Users that should be reached
var users_to_reach = new Set([
...(
await Promise.all(
user_maintainers.map(async (id) => {
const user = await getUser(id)
// User may have deleted their account
return user?.login?.toLowerCase()
}),
)
).filter(Boolean),
...owners
.filter((handle) => handle && !handle.includes('/'))
.map((handle) => handle.toLowerCase()),
])
// We can't request a review from the author.
.difference(new Set([pull_request.user?.login.toLowerCase()]))
// Filter users to repository collaborators. If they're not, they can't be requested
// for review. In that case, they probably missed their invite to the maintainers team.
users_to_reach = new Set(
(
await Promise.all(
Array.from(users_to_reach, async (username) => {
// TODO: Restructure this file to only do the collaborator check for those users
// who were not already part of a team. Being a member of a team makes them
// collaborators by definition.
try {
await github.rest.repos.checkCollaborator({
...context.repo,
username,
})
return username
} catch (e) {
if (e.status !== 404) throw e
core.warning(
`PR #${pull_number}: User ${username} cannot be requested for review because they don't exist or are not a repository collaborator, ignoring. They probably missed the automated invite to the maintainers team (see <https://github.com/NixOS/nixpkgs/issues/234293>).`,
)
}
}),
)
).filter(Boolean),
)
log('reviewers - users_to_reach', Array.from(users_to_reach).join(', '))
// Similar for teams
var teams_to_reach = new Set([
...(
await Promise.all(
team_maintainers.map(async (id) => {
const team = await getTeam(id)
// Team may have been deleted
return team?.slug?.toLowerCase()
}),
)
).filter(Boolean),
...owners
.map((handle) => handle.split('/'))
.filter(
([org, slug]) =>
org.toLowerCase() === context.repo.owner.toLowerCase() && slug,
)
.map(([, slug]) => slug.toLowerCase()),
])
teams_to_reach = new Set(
(
await Promise.all(
Array.from(teams_to_reach, async (slug) => {
try {
await github.rest.teams.checkPermissionsForRepoInOrg({
org: context.repo.owner,
team_slug: slug,
owner: context.repo.owner,
repo: context.repo.repo,
})
return slug
} catch (e) {
if (e.status !== 404) throw e
core.warning(
`PR #${pull_number}: Team ${slug} cannot be requested for review because it doesn't exist or has no repository permissions, ignoring. Probably wasn't added to the nixpkgs-maintainers team (see https://github.com/NixOS/nixpkgs/tree/master/maintainers#maintainer-teams)`,
)
}
}),
)
).filter(Boolean),
)
log('reviewers - teams_to_reach', Array.from(teams_to_reach).join(', '))
if (users_to_reach.size + teams_to_reach.size > 15) {
core.warning(
`Too many reviewers (users: ${Array.from(users_to_reach).join(', ')}, teams: ${Array.from(teams_to_reach).join(', ')}), skipping review requests.`,
)
// Return a boolean on whether the "needs: reviewers" label should be set.
return users_reached.size === 0 && teams_reached.size === 0
}
// We don't want to rerequest reviews from people who already reviewed or were requested
const users_not_yet_reached = Array.from(
users_to_reach.difference(users_reached),
)
log('reviewers - users_not_yet_reached', users_not_yet_reached.join(', '))
// We don't want to rerequest reviews from teams who already reviewed or were requested
const teams_not_yet_reached = Array.from(
teams_to_reach.difference(teams_reached),
)
log('reviewers - teams_not_yet_reached', teams_not_yet_reached.join(', '))
if (
users_not_yet_reached.length === 0 &&
teams_not_yet_reached.length === 0
) {
log('Has reviewer changes', 'false (skipped)')
} else if (dry) {
core.info(
`Requesting user reviewers for #${pull_number}: ${users_not_yet_reached.join(', ')} (dry)`,
)
core.info(
`Requesting team reviewers for #${pull_number}: ${teams_not_yet_reached.join(', ')} (dry)`,
)
} else {
// We had tried the "request all reviewers at once" thing in the past, but it didn't work out:
// https://github.com/NixOS/nixpkgs/commit/034613f860fcd339bd2c20c8f6bc259a2f9dc034
// If we're hitting API errors here again, we'll need to investigate - and possibly reverse
// course.
await github.rest.pulls.requestReviewers({
...context.repo,
pull_number,
reviewers: users_not_yet_reached,
team_reviewers: teams_not_yet_reached,
})
}
// Return a boolean on whether the "needs: reviewers" label should be set.
return (
users_not_yet_reached.length === 0 &&
teams_not_yet_reached.length === 0 &&
users_reached.size === 0 &&
teams_reached.size === 0
)
}
module.exports = {
handleReviewers,
}

View File

@@ -1,271 +0,0 @@
// @ts-check
const eventToState = {
COMMENT: 'COMMENTED',
REQUEST_CHANGES: 'CHANGES_REQUESTED',
}
// Use substring checks in order to allow testing in forks
// Usernames must also end in "[bot]"
const reviewUsers = [
'github-actions',
'nixpkgs-ci',
'branch-check',
'commit-check',
'manual-edit',
]
/**
* @typedef {InstanceType<import('@actions/github/lib/utils').GitHub>} GitHub
* @typedef {typeof import('@actions/github').context} Context
*
* @typedef {Awaited<ReturnType<GitHub['rest']['pulls']['listReviews']>>['data'][number]} Review
* @typedef {Review & { user: NonNullable<Review['user']> }} ReviewWithNonNullUser
*/
/**
* @param {{
* github: GitHub,
* context: Context,
* core: import('@actions/core'),
* dry: boolean,
* reviewKey?: string,
* }} DismissReviewsProps
*/
async function dismissReviews({ github, context, core, dry, reviewKey }) {
const pull_number = context.payload.pull_request?.number
if (!pull_number) {
core.warning('dismissReviews called outside of pull_request context')
return
}
if (dry) {
return
}
const allReviews = await github.paginate(github.rest.pulls.listReviews, {
...context.repo,
pull_number,
})
const reviews = /** @type {ReviewWithNonNullUser[]} */ (
allReviews.filter(
(review) =>
review.user &&
review.state !== 'DISMISSED' &&
review.user.login.endsWith('[bot]') &&
reviewUsers.some((substr) => review.user?.login.includes(substr)),
)
)
const reviewsByUser = reviews.reduce(
(prev, curr) => {
if (!(curr.user.login in prev)) {
prev[curr.user.login] = []
}
prev[curr.user.login].push(curr)
return prev
},
/** @type {Record<string, ReviewWithNonNullUser[]> } */ ({}),
)
const commentRegex = new RegExp(
/<!-- nixpkgs review key: (.*)(?:; resolved: .*)? -->/,
)
const reviewKeyRegex = new RegExp(
`<!-- (nixpkgs review key: ${reviewKey})(?:; resolved: .*)? -->`,
)
const commentResolvedRegex = new RegExp(
/<!-- nixpkgs review key: .*; resolved: true -->/,
)
let reviewsToMinimize = reviews
const /** @type {ReviewWithNonNullUser[]} */ reviewsToDismiss = []
const /** @type {ReviewWithNonNullUser[]} */ reviewsToResolve = []
if (reviewKey && reviews.every((review) => commentRegex.test(review.body))) {
reviewsToMinimize = reviews.filter((review) =>
reviewKeyRegex.test(review.body),
)
}
for (const reviewsForUser of Object.values(reviewsByUser)) {
// Make sure that we don't dismiss all reviews by a user if they
// have any reviews we don't want to dismiss.
if (
reviewsForUser.every(
(review) =>
commentResolvedRegex.test(review.body) ||
(reviewKey && reviewKeyRegex.test(review.body)) ||
// If we are called by check-commits and the review body is clearly
// from `commits.js`, then we can safely dismiss the review.
// This helps with pre-existing reviews (before the comments were added).
(reviewKey &&
reviewKey === 'check-commits' &&
review.body.includes('PR / Check / cherry-pick')),
)
) {
reviewsToDismiss.push(
...reviewsForUser.filter(
(review) => review.state === 'CHANGES_REQUESTED',
),
)
} else {
reviewsToResolve.push(
...reviewsForUser.filter(
(review) =>
review.state === 'CHANGES_REQUESTED' &&
!commentResolvedRegex.test(review.body) &&
reviewsToMinimize.some(
(toMinimize) => toMinimize.node_id === review.node_id,
),
),
)
}
}
await Promise.all([
...reviewsToMinimize.map(async (review) =>
github.graphql(
`mutation($node_id:ID!) {
minimizeComment(input: {
classifier: OUTDATED,
subjectId: $node_id
})
{ clientMutationId }
}`,
{ node_id: review.node_id },
),
),
...reviewsToDismiss.map(async (review) =>
github.rest.pulls.dismissReview({
...context.repo,
pull_number,
review_id: review.id,
message: 'Review dismissed automatically',
}),
),
...reviewsToResolve.map(async (review) =>
github.rest.pulls.updateReview({
...context.repo,
pull_number,
review_id: review.id,
body: review.body.replace(
reviewKeyRegex,
`<!-- nixpkgs review key: ${reviewKey}; resolved: true -->`,
),
}),
),
])
}
/**
* @param {{
* github: GitHub,
* context: Context,
* core: import('@actions/core'),
* dry: boolean,
* body: string,
* event: keyof eventToState,
* reviewKey: string,
* }} PostReviewProps
*/
async function postReview({
github,
context,
core,
dry,
body,
event = 'REQUEST_CHANGES',
reviewKey,
}) {
const pull_number = context.payload.pull_request?.number
if (!pull_number) {
core.warning('postReview called outside of pull_request context')
return
}
const reviewKeyRegex = new RegExp(
`<!-- (nixpkgs review key: ${reviewKey})(?:; resolved: .*)? -->`,
)
const reviewKeyComment = `<!-- nixpkgs review key: ${reviewKey}; resolved: false -->`
body = body + '\n\n' + reviewKeyComment
const reviews = (
await github.paginate(github.rest.pulls.listReviews, {
...context.repo,
pull_number,
})
).filter(
(review) =>
review.user &&
review.state !== 'DISMISSED' &&
review.user.login.endsWith('[bot]') &&
reviewUsers.some((substr) => review.user?.login.includes(substr)),
)
/** @type {null | Review} */
let pendingReview
const matchingReviews = reviews.filter((review) =>
reviewKeyRegex.test(review.body),
)
if (matchingReviews.length === 0) {
pendingReview = null
} else if (
matchingReviews.length === 1 &&
matchingReviews[0].state === eventToState[event]
) {
pendingReview = matchingReviews[0]
} else {
await dismissReviews({
github,
context,
core,
dry,
reviewKey,
})
pendingReview = null
}
if (dry) {
if (pendingReview)
core.info(`pending review found: ${pendingReview.html_url}`)
else core.info('no pending review found')
core.info(body)
} else {
if (pendingReview) {
await Promise.all([
github.rest.pulls.updateReview({
...context.repo,
pull_number,
review_id: pendingReview.id,
body,
}),
github.graphql(
`mutation($node_id:ID!) {
unminimizeComment(input: {
subjectId: $node_id
})
{ clientMutationId }
}`,
{ node_id: pendingReview.node_id },
),
])
} else {
await github.rest.pulls.createReview({
...context.repo,
pull_number,
event,
body,
})
}
}
}
module.exports = {
dismissReviews,
postReview,
}

View File

@@ -1,130 +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, options = {}) {
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: true,
...options,
})
}
program
.command('prepare')
.description('Prepare relevant information 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')
.option('--no-dry', 'Make actual modifications')
.action(async (owner, repo, pr, options) => {
const prepare = (await import('./prepare.js')).default
await run(prepare, owner, repo, pr, options)
})
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')
.option('--no-cherry-picks', 'Do not expect cherry-picks.')
.action(async (owner, repo, pr, options) => {
const commits = (await import('./commits.js')).default
await run(commits, owner, repo, pr, options)
})
program
.command('bot')
.description('Run automation on pull requests and issues.')
.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 bot = (await import('./bot.js')).default
const tmp = mkdtempSync(join(tmpdir(), 'github-script-'))
try {
process.env.GITHUB_WORKSPACE = tmp
process.chdir(tmp)
await run(bot, owner, repo, pr, options)
} finally {
rmSync(tmp, { recursive: true })
}
})
program
.command('get-teams')
.description('Fetch the list of teams with GitHub and output it to a file')
.argument('<owner>', 'Owner of the GitHub repository to label (Example: NixOS)')
.argument('<repo>', 'Name of the GitHub repository to label (Example: nixpkgs)')
.argument('[outFile]', 'Path to the output file (Example: github-teams.json). If not set, prints to stdout')
.action(async (owner, repo, outFile, options) => {
const getTeams = (await import('./get-teams.js')).default
await run(getTeams, owner, repo, undefined, { ...options, outFile })
})
program
.command('lint-commits')
.description('Lint for common errors in commit messages')
.argument('<owner>', 'Owner of the GitHub repository to run on (Example: NixOS)')
.argument('<repo>', 'Name of the GitHub repository to run on (Example: nixpkgs)')
.argument('<pr>', 'Number of the Pull Request to run on')
.action(async (owner, repo, pr, options) => {
const checkCommitMessages = (await import('./lint-commits.js')).default
await run(checkCommitMessages, owner, repo, pr, options)
})
program
.command('check-target-branch')
.description('Check that the PR is made against the correct branch')
.argument('<owner>', 'Owner of the GitHub repository to run on (Example: NixOS)')
.argument('<repo>', 'Name of the GitHub repository to run on (Example: nixpkgs)')
.argument('<pr>', 'Number of the Pull Request to run on')
.action(async (owner, repo, pr, options) => {
const checkCommitMessages = (await import('./check-target-branch.js')).default
await run(checkCommitMessages, owner, repo, pr, options)
})
program
.command('manual-file-edits')
.description("Error when files that shouldn't be edited manually are")
.argument('<owner>', 'Owner of the GitHub repository to run on (Example: NixOS)')
.argument('<repo>', 'Name of the GitHub repository to run on (Example: nixpkgs)')
.argument('<pr>', 'Number of the Pull Request to run on')
.action(async (owner, repo, pr, options) => {
const checkManualFileEdits = (await import('./manual-file-edits.js')).default
await run(checkManualFileEdits, owner, repo, pr, options)
})
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,10 +0,0 @@
module.exports = async ({ github, context, targetSha }) => {
const { content, encoding } = (
await github.rest.repos.getContent({
...context.repo,
path: 'pkgs/top-level/release-supported-systems.json',
ref: targetSha,
})
).data
return JSON.parse(Buffer.from(content, encoding).toString())
}

View File

@@ -1,63 +0,0 @@
module.exports = async ({ github, core, maxConcurrent = 1 }, 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,
// 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,60 +0,0 @@
{
lib,
nix,
nixpkgs-vet,
runCommand,
}:
{
base ? ../.,
head ? ../.,
}:
let
filtered =
with lib.fileset;
path:
toSource {
fileset = difference (gitTracked path) (unions [
(path + /.github)
(path + /ci)
]);
root = path;
};
filteredBase = filtered base;
filteredHead = filtered head;
in
runCommand "nixpkgs-vet"
{
nativeBuildInputs = [
nixpkgs-vet
];
env.NIXPKGS_VET_NIX_PACKAGE = nix;
}
''
export NIX_STATE_DIR=$(mktemp -d)
$NIXPKGS_VET_NIX_PACKAGE/bin/nix-store --init
nixpkgs-vet --base ${filteredBase} ${filteredHead}
# TODO: Upstream into nixpkgs-vet, see:
# https://github.com/NixOS/nixpkgs-vet/issues/164
badFiles=$(find ${filteredHead}/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 ${filteredHead} | 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,41 +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
nix-store --init
cd "${nixpkgs}"
# This will only show the first parse error, not all of them. That's fine, because
# the other CI jobs will report in more detail. This job is about checking parsing
# across different implementations / versions, not about providing the best DX.
# Returning all parse errors requires significantly more resources.
find . -type f -iname '*.nix' | xargs -P $(nproc) nix-instantiate --parse 2>&1 >/dev/null | {
# Also fail on (deprecation) warnings printed to stderr.
if grep "warning"; then
echo "Failing due to warnings in stderr" >&2
exit 1
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": "02f3fa0374fa13707d42d55d58ecc76b091f223c",
"url": "https://github.com/NixOS/nixpkgs/archive/02f3fa0374fa13707d42d55d58ecc76b091f223c.tar.gz",
"hash": "0z8d33c5g0gk9a74ppqq77npisf9xx9c8ai9isxa2hyjx4lv1pki"
},
"treefmt-nix": {
"type": "Git",
"repository": {
"type": "GitHub",
"owner": "numtide",
"repo": "treefmt-nix"
},
"branch": "main",
"submodules": false,
"revision": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
"url": "https://github.com/numtide/treefmt-nix/archive/790751ff7fd3801feeaf96d7dc416a8d581265ba.tar.gz",
"hash": "1zah3dmbpn3ap5acg22kq1j19dg32gj73l43yamjcxhc38sv9kd5"
}
},
"version": 5
}

View File

@@ -1,82 +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'],
'staging-nixos': ['development', 'secondary'],
'haskell-updates': ['development', 'secondary'],
nixos: ['channel'],
nixpkgs: ['channel'],
}
// "order" ranks the development branches by how likely they are the intended base branch
// when they are an otherwise equally good fit according to ci/github-script/prepare.js.
const orderConfig = {
master: 0,
release: 1,
staging: 2,
'staging-nixos': 2,
'haskell-updates': 3,
'staging-next': 4,
}
function split(branch) {
return {
...branch.match(
/(?<prefix>.+?)(-(?<version>\d{2}\.\d{2}|unstable)(?:-(?<suffix>.*))?)?$/,
).groups,
}
}
function classify(branch) {
const { prefix, version } = split(branch)
return {
branch,
order: orderConfig[prefix] ?? Infinity,
stable: (version ?? 'unstable') !== 'unstable',
type: typeConfig[prefix] ?? ['wip'],
version: version ?? 'unstable',
}
}
module.exports = { classify, split }
// 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')
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')
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,32 +0,0 @@
#!/usr/bin/env -S nix-instantiate --eval --strict --json --arg unused true
# Unused argument to trigger nix-instantiate calling this function with the default arguments.
{
pinnedJson ? ./pinned.json,
}:
let
pinned = (builtins.fromJSON (builtins.readFile pinnedJson)).pins;
nixpkgs = fetchTarball {
inherit (pinned.nixpkgs) url;
sha256 = pinned.nixpkgs.hash;
};
pkgs = import nixpkgs {
config.allowAliases = false;
};
inherit (pkgs) lib;
lix = lib.pipe pkgs.lixPackageSets [
(lib.filterAttrs (_: set: lib.isDerivation set.lix or null && set.lix.meta.available))
lib.attrNames
(lib.filter (name: lib.match "lix_[0-9_]+|git" name != null))
(map (name: "lixPackageSets.${name}.lix"))
];
nix = lib.pipe pkgs.nixVersions [
(lib.filterAttrs (_: drv: lib.isDerivation drv && drv.meta.available))
lib.attrNames
(lib.filter (name: lib.match "nix_[0-9_]+|git" name != null))
(map (name: "nixVersions.${name}"))
];
in
lix ++ nix

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,32 +1,8 @@
let
missingFeatures = map ({ description, ... }: description) (import ./lib/minfeatures.nix).missing;
in
let requiredVersion = import ./lib/minver.nix; in
if missingFeatures != [ ] then
if ! builtins ? nixVersion || builtins.compareVersions requiredVersion builtins.nixVersion == 1 then
abort ''
This version of Nixpkgs requires an implementation of Nix with the following features:
- ${builtins.concatStringsSep "\n- " missingFeatures}
You are evaluating with Nix ${builtins.nixVersion or "(too old to know)"}, please upgrade:
- If you are running NixOS, `nixos-rebuild' can be used to upgrade your system.
- Alternatively, with Nix > 2.0 `nix upgrade-nix' can be used to imperatively
upgrade Nix. You may use `nix-env --version' to check which version you have.
- 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
For more information, please see the NixOS release notes at
https://nixos.org/nixos/manual or locally at
${toString ./nixos/doc/manual/release-notes}.
If you need further help, see https://nixos.org/nixos/support.html
''
abort "This version of Nixpkgs requires Nix >= ${requiredVersion}, please upgrade! See https://nixos.org/wiki/How_to_update_when_Nix_is_too_old_to_evaluate_Nixpkgs"
else

View File

@@ -1,485 +0,0 @@
# Contributing to the Nixpkgs reference manual
This directory houses the source 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 to an 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 get 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 explains 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.
**For prose style, see the [documentation styleguide](./styleguide.md).**
### 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.
Not everything has been migrated to this format yet.
Please always use it for new content.
When changing existing content, update formatting if possible, but avoid excessive diffs.
### Examples first
Put examples before detailed explanations (see the [styleguide](./styleguide.md) for the rationale).
Use this structure for each documented item:
1. Title
2. Abstract (optional, one sentence max)
3. Example
4. Explanation (details, edge cases, types, defaults)
Rendered example:
````markdown
## `lib.toUpper`
Converts all characters in a string to uppercase.
:::{.example #ex-lib-toUpper}
# Converting a string to uppercase
```nix
lib.toUpper "hello"
=> "HELLO"
```
:::
Only acts on ASCII characters.
Unicode characters are passed through unchanged.
````
### Writing Function Documentation
Function documentation is *reference documentation*, for which
[diataxis Reference documentation](https://diataxis.fr/reference/) (8 minutes) is **mandatory reading**.
On top of the diataxis framework, which provides a balanced perspective on what reference documentation should contain, we apply a specific style rule to function documentation:
the first sentence is in present tense, active voice, and the subject is omitted, referring implicitly to the name of the function.
For example:
```nix
/**
Subtracts value `b` from value `a`.
Returns the difference as a number.
*/
subtractValues # ...elided code
```
Renders as:
```md
## `subtractValues`
Subtracts value `b` from value `a`.
Returns the difference as a number.
```
### Callouts and examples
Use the [admonition syntax](#admonitions) for callouts and examples.
### `callPackage`-compatible examples
Provide at least one example per function.
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 footnote 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](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,5 +0,0 @@
document.addEventListener('DOMContentLoaded', () => {
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)',
)
})

Some files were not shown because too many files have changed in this diff Show More