Compare commits

..

1473 Commits

Author SHA1 Message Date
Jörg Thalheim
cd63096d6d Merge #101611: firefox-bin: 81.0.2 -> 82.0
(cherry picked from commit 2f31499703)
vcunat tested it briefly on 20.09.
2020-10-27 10:46:12 +01:00
Domen Kožar
1f401964bb Merge pull request #101731 from r-burns/backport-goaccess
[20.09] goaccess: fix build on darwin
2020-10-27 10:40:37 +01:00
R. RyanTM
13d0c311e3 gqrx: 2.13 -> 2.13.2
(cherry picked from commit 3ff7bf9166)
2020-10-27 08:58:28 +01:00
R. RyanTM
dea3973e98 gqrx: 2.12.1 -> 2.13
(cherry picked from commit 90b1417a1d)
2020-10-27 08:58:21 +01:00
Max Hausch
5bae0f41ec Update matio: 1.5.17 -> 1.5.18
(cherry picked from commit ae61f4f1cc)
2020-10-27 08:11:09 +01:00
WORLDofPEACE
d352ff3024 rl-2009: release on a Tuesday
Because hydra took it's good old time

(cherry picked from commit 5a08ab936b)
2020-10-27 03:05:14 -04:00
Jonathan Ringer
9a0b14b097 treewide: mark broken, q-z 2020-10-26 19:14:59 -07:00
Jonathan Ringer
87b50c25ba treewide: mark python packages broken 2020-10-26 19:14:59 -07:00
Jonathan Ringer
9151a596d9 treewide: mark qt and linuxPackages as disabled 2020-10-26 19:14:59 -07:00
Jonathan Ringer
1a1d940f07 treewide: intial mark broken for 20.09 2020-10-26 19:14:59 -07:00
Jonathan Ringer
7a2686d415 release-notes-2009: add contributions section
(cherry picked from commit 51ca426eb5)
2020-10-26 21:50:31 -04:00
Jonathan Ringer
0aecedd132 nixos/docs/rl-2009.xml: normalize highlights, reorder entries 2020-10-26 17:20:01 -07:00
Jonathan Ringer
67000e6cea README.md: update stable release links
(cherry picked from commit 366bebd53a)
2020-10-26 20:14:57 -04:00
Jonathan Ringer
523decb1ee contributing.md: mention rebased or squashed merges
(cherry picked from commit 96e4438959)
2020-10-26 20:14:57 -04:00
WORLDofPEACE
f73904baff Merge pull request #101768 from worldofpeace/cinnamon-backports
[20.09] Cinnamon backports
2020-10-26 16:55:23 -04:00
Kirill Elagin
f8ac00411d pantheon.wingpanel-indicator-bluetooth: 2.1.5 -> 2020-10-01
* Fix device duplicates:
  https://github.com/elementary/wingpanel-indicator-bluetooth/pull/116

(cherry picked from commit a05f7f73a5)
2020-10-26 16:53:12 -04:00
Tim Steinbach
efe4ba95b4 docker-edge: Fix test
(cherry picked from commit c851af868f)
2020-10-26 16:26:13 -04:00
Doron Behar
b7c930a3bd spidermonkey_78: init at 78.1.0
* format

Co-authored-by: WORLDofPEACE <worldofpeace@protonmail.ch>
(cherry picked from commit 1d45990efb)
2020-10-26 13:50:23 -04:00
WORLDofPEACE
1c46527bb6 Revert "nixos/pantheon: install nixos wallpaper"
This reverts commit 5100e4f250.

Fixes https://github.com/NixOS/nixpkgs/issues/100293
Though it's only a workaround for now.
See https://github.com/elementary/switchboard-plug-pantheon-shell/issues/246#issuecomment-716713218
We trigger the broken scenario where we have two subdirectories. Reverting
that commit undoes this.

(cherry picked from commit ace69f768b)
2020-10-26 13:47:27 -04:00
Martin Weinelt
1541698868 Merge pull request #101776 from IvarWithoutBones/backport-myfitnesspal
[20.09] pythonPackages.myfitnesspal: fix build
2020-10-26 17:57:50 +01:00
IvarWithoutBones
f2980aa9b1 pythonPackages.myfitnesspal: fix build
(cherry picked from commit 7cea8833eb)
2020-10-26 17:23:02 +01:00
WORLDofPEACE
53b104bfdb cinnamon.cjs: don't use fork, 4.6.0 -> 2020-10-19
The code in that fork was been integrated into cjs master https://github.com/linuxmint/cjs/pull/84

(cherry picked from commit feac386ca9)
2020-10-26 10:55:29 -04:00
R. RyanTM
7b97ce6f8e cinnamon.cinnamon-session: 4.6.1 -> 4.6.2
(cherry picked from commit 7e6fd55ec6)
2020-10-26 10:36:04 -04:00
R. RyanTM
a53b4f8d3f cinnamon.cinnamon-menus: 4.6.0 -> 4.6.1
(cherry picked from commit 4078818d60)
2020-10-26 10:36:04 -04:00
R. RyanTM
b223f2c8a1 cinnamon.cinnamon-desktop: 4.6.1 -> 4.6.4
(cherry picked from commit 79c6d40e2c)
2020-10-26 10:36:04 -04:00
Maciej Krüger
f5ea85f4c9 cinnamon.cjs: 4.6.0 -> 4.6.0-gjs1.66.0
(cherry picked from commit b77e830d9e)
2020-10-26 10:36:04 -04:00
Maciej Krüger
d5d5a70cac cinnamon.cinnamon-common: add patch for new cjs
(cherry picked from commit 1e80ede78d)
2020-10-26 10:36:04 -04:00
Maciej Krüger
e3ce7e1002 cinnamon.cinnamon-settings-daemon: fix csd-backlight-helper build, fixes #101128
(cherry picked from commit 6e0f7d5bcf)
2020-10-26 10:35:14 -04:00
rnhmjoj
22515f10eb nixos/dnscrypt-wrapper: fix key rotation script
Fix an error in the validation code when the public key is in a
nonstandard location. The check command fails and the key is
incorrectly assumed to be expiring.

(cherry picked from commit 9e04bba0af)
2020-10-26 13:53:09 +01:00
Ryan Burns
edfbd838c4 goaccess: fix build on darwin
(cherry picked from commit d8b38de1e1)
2020-10-25 21:03:04 -07:00
WORLDofPEACE
9f5b72bfd7 Merge pull request #101704 from worldofpeace/backport-101516
[20.09] GNOME polishing from Q.A findings
2020-10-25 19:27:31 -04:00
WORLDofPEACE
157744e954 installation-cd-graphical-gnome: add firefox to favorite-apps
(cherry picked from commit 39d1599767)
2020-10-25 18:42:45 -04:00
WORLDofPEACE
b38395cb4a nixos/gnome3: add gnome-calendar to favorites
(cherry picked from commit 7df6af303e)
2020-10-25 18:42:45 -04:00
WORLDofPEACE
dca668313a nixos/gnome3: add favoriteAppsOverride option
Rather messy and only needed for the installation cd, so it's
an internal option.

(cherry picked from commit 9cee7772e6)
2020-10-25 18:42:45 -04:00
WORLDofPEACE
aa14e0ad2b nixos/flatpak: introduce guiPackages
This adds basically an indirection to systemPackages
to automatically install an interface for flatpak for their respective
environments. e.g if I enable pantheon and flatpak you'll get appcenter,
and on gnome you'll see gnome-software.

https://github.com/NixOS/nixpkgs/issues/99648#issuecomment-706691174
(cherry picked from commit d89deddd5d)
2020-10-25 18:42:45 -04:00
WORLDofPEACE
161ca697f7 nixos/gnome3: don't ship gnome-software
This serves no purpose without flatpak https://github.com/NixOS/nixpkgs/issues/99648#issuecomment-706691174

(cherry picked from commit b1587f9e19)
2020-10-25 18:42:45 -04:00
WORLDofPEACE
6e4e94d969 nixos/gnome3: don't put epiphany in favorite apps
(cherry picked from commit 70dc25abd9)
2020-10-25 18:42:44 -04:00
Justin Humm
7da4553df6 tor-browser-bundle-bin: 9.5.4 -> 10.0.2
(cherry picked from commit 03d85e8aac)
2020-10-25 19:44:34 +01:00
Nikolay Korotkiy
9cba601c95 xournalpp: 1.0.18 -> 1.0.19
(cherry picked from commit d2a28d3b38)
2020-10-25 19:36:40 +01:00
Jon Banafato
48167759c5 keepassxc: 2.6.1 -> 2.6.2
KeePassXC has a new release. [Changelog](https://github.com/keepassxreboot/keepassxc/releases/tag/2.6.2)

(cherry picked from commit bc5cf003aa)
2020-10-25 18:53:49 +01:00
rnhmjoj
f979f5199b arx-libertatis: 2019-07-22 -> 2020-10-20
(cherry picked from commit 883006d6bf)
2020-10-25 15:23:41 +01:00
rnhmjoj
42054073bb arx-libertatis: remove old override
(cherry picked from commit 9ae47f9e64)
2020-10-25 15:23:35 +01:00
Claudio Bley
f5ad6d9f77 fritzing: 0.9.3b -> 0.9.4
Notes:

* fritzing still needs an older version of libgit2
* releases no longer directly correspond to tags in the git repository, they are
  using build numbers instead
* the fritzing-parts repository is no longer versioned at all, the master branch
  contains the latest stable release
* a `parts.db` file needs to be generated from the fritzing-parts files during
  the build

(cherry picked from commit 0f6b8b7964)
Otherwise it wouldn't build.  Master PR: #98381.
2020-10-25 10:28:09 +01:00
Vladimír Čunát
708c2daa39 Merge #100446: python*Packages.apprise: fix dependencies
(cherry picked from commit ed217bcc35)
2020-10-25 08:44:47 +01:00
r-burns
997f7a355a bacula: fix build on darwin (#101526)
(cherry picked from commit 4e88622ac9)
2020-10-25 00:05:39 -04:00
Ryan Burns
a617a2f6d6 blugon: fix build on darwin
(cherry picked from commit c58233a34a)
2020-10-24 23:24:15 -04:00
Benjamin Hipple
9fda0b6e3d Merge pull request #101489 from buckley310/release-20.09
[20.09] brave: 1.12.112 -> 1.15.76
2020-10-24 23:00:07 -04:00
Fabian Möller
f928b39139 nixosTests.ferm: fix network timeout
The subtests could start before the server has configured it's IP
addresses and therefore timeout.

(cherry picked from commit 253954232e)
2020-10-24 15:04:44 -07:00
WORLDofPEACE
77d3b0f5d7 pantheon.wingpanel-indicator-session: 2.2.8 -> 2020-09-13
Lots of bugfixes but mostly https://github.com/elementary/wingpanel-indicator-session/pull/126
which fixes https://github.com/NixOS/nixpkgs/issues/95658

(cherry picked from commit 95c05e6c44)
2020-10-24 13:20:30 -04:00
WORLDofPEACE
b387760d1b pantheon.switchboard-plug-about: patch some bugfixes
Hopefully fix https://github.com/NixOS/nixpkgs/issues/101221.
Though that issue is flaky on the reproducibility.

(cherry picked from commit 372e3a118d)
2020-10-24 12:46:42 -04:00
WORLDofPEACE
7c847c8f9b Merge pull request #101572 from B4dM4n/backport-certmgr-test-fix
[20.09] nixosTests.certmgr: fix systemd test
2020-10-24 12:16:46 -04:00
Fabian Möller
f14e31ead9 nixosTests.certmgr: fix systemd test
Nginx fails to start, because it can't read the certificate file. This
happens because PrivateTmp is set for the service, which makes the
system wide /tmp inaccessible.

(cherry picked from commit e83bd25aec)
2020-10-24 18:03:52 +02:00
WORLDofPEACE
89d75bc743 nixos/lightdm: make lightdm user shell bash
In https://github.com/NixOS/nixpkgs/issues/100119 pantheon's greeter
has g-s-d running which allows brightness controls via pkexec.
This is changed in newer versions of g-s-d (pantheon uses a fork currently),
but whenever brightness is changed with a shell of `shadow` we get
```
Oct 10 23:51:44 kirXps pkexec[18722]: lightdm: Executing command [USER=root] [TTY=unknown] [CWD=/var/lib/lightdm] [COMMAND=/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper /sys/devices/pci0000:00/0000:00:02.0/drm/card0/card0-eDP-1/intel_backlight 65587]
```

I'm not sure this should be strictly needed, so we should try to
revert later on when pantheon's g-s-d is updated.

(cherry picked from commit c134f6443a)
2020-10-24 11:59:45 -04:00
WORLDofPEACE
0d21510b4a nixos/tools: add desktopConfiguration option
We now have a GNOME ISO so it would be nice to seed that one
with configuration on how to enable it.

(cherry picked from commit 99d5111246)
2020-10-24 11:36:04 -04:00
WORLDofPEACE
3e594ad891 nixos/tools: add firefox to systemPackages example
This is in the graphical iso's.

(cherry picked from commit 2d6a694842)
2020-10-24 11:36:04 -04:00
WORLDofPEACE
46cecda569 nixos/tools: don't call Plasma KDE
(cherry picked from commit 3b20eb47f1)
2020-10-24 11:36:04 -04:00
WORLDofPEACE
0ae904dc44 nixos/tools: comment about libinput
(cherry picked from commit 9f1a43cefa)
2020-10-24 11:36:04 -04:00
WORLDofPEACE
ce1f2a6d5a nixos/tools: don't mention pinentryFlavor
We don't need to actually set this as it find a good
default automatically. This could confuse the user into thinking they need
to set it themselves.

(cherry picked from commit 12825bc21f)
2020-10-24 11:36:03 -04:00
WORLDofPEACE
87a8e50529 Merge pull request #100225 from worldofpeace/pantheon-update-mutter-20.09
[20.09] [dontmerge] gnome3.mutter334: 3.34.5 -> 3.34.6, update patches
2020-10-24 11:32:06 -04:00
Bjørn Forsman
95d26c9a9f parallel: fix calculation of max line length
parallel >= 20200822 uses /bin/echo to calculate the max allowed line
length. Patch it to a correct path, so that it doesn't (silently) fail
and fall back to a low value of 324.

Before:
  $ parallel --max-line-length-allowed
  324

After:
  $ parallel --max-line-length-allowed
  131063

Fixes: 16ca8725ff ("parallel: 20200722 -> 20200822")
(cherry picked from commit 3d4e133e77)
2020-10-24 10:37:53 +02:00
Vladimír Čunát
daa86b8422 Merge #101380: thunderbird*: 78.3.2 -> 78.4.0
(cherry picked from commit c0a646edd0)
Re-tested both a bit on 20.09.
2020-10-24 09:56:10 +02:00
TredwellGit
7cfeb7ae7a mumble: 1.3.2 -> 1.3.3
https://github.com/mumble-voip/mumble/releases/tag/1.3.3
(cherry picked from commit 1bc72b3494)
2020-10-23 23:30:42 +02:00
Sean Buckley
f469958869 brave: 1.12.112 -> 1.15.76 2020-10-23 14:24:41 -04:00
Stig Palmquist
b58f6e4731 mariadb: 10.4.14 -> 10.4.15
Fixes CVE-2020-15180

(cherry picked from commit 2929f5edb9)
2020-10-23 09:18:24 -07:00
WORLDofPEACE
fadb52fd45 nixos/display-managers: add sessionData.desktops to XDG_DATA_DIRS
Fixes #100108

Alternative to https://github.com/NixOS/nixpkgs/pull/100112 which doesn't break stuff.

(cherry picked from commit 755ba171c7)
2020-10-23 11:47:28 -04:00
Martin Weinelt
70b255f98f Merge pull request #101439 from IvarWithoutBones/backport-pyotp
[20.09] pythonPackages.pyotp: disable on Python27
2020-10-23 13:01:02 +02:00
Vincent Laporte
3179e7f344 cryptoverif: 2.01pl1 → 2.03pl1
(cherry picked from commit 2cb651ad14)
2020-10-23 10:20:50 +02:00
IvarWithoutBones
f041a6d077 pythonPackages.pyotp: disable on Python27
(cherry picked from commit 7a34808502)
2020-10-23 04:26:37 +02:00
Martin Weinelt
1d10a2af91 Merge pull request #101435 from nh2/pitivi-fix-startup-svg-error-20.09
[20.09] pitivi: Fix .svg loading at startup, see #56943 #89691
2020-10-23 03:52:58 +02:00
Niklas Hambüchen
0d84bb40cb pitivi: Fix .svg loading at startup, see #56943 #89691
(cherry picked from commit 4bf0061d28)
2020-10-23 02:52:40 +02:00
Vladimír Čunát
7d29f0696d Merge branch 'staging-20.09' into release-20.09 2020-10-22 21:12:29 +02:00
Michael Weiss
e6dcf54004 Merge pull request #101357 from primeos/signal-desktop-backport
[20.09] signal-desktop: 1.37.1 -> 1.37.2
2020-10-22 18:56:41 +02:00
Anderson Torres
1690a722be Merge pull request #100896 from jbedo/singularity-20.09
[20.09] singularity: 3.6.2 -> 3.6.4
2020-10-22 11:17:29 -03:00
Bas van Dijk
36fa21dc1b Merge pull request #101378 from basvandijk/rocksdb-jemalloc-release-20.09
rocksdb: enable optional jemalloc support
2020-10-22 16:02:00 +02:00
Bas van Dijk
58aea2fed9 rocksdb: enable optional jemalloc support
(cherry picked from commit f2b8a45cde)
2020-10-22 15:44:00 +02:00
Pavol Rusnak
9397611d6d zoom-us: 5.3.465578.0920 -> 5.3.469451.0927
(cherry picked from commit fe35b97d91)
2020-10-22 14:20:55 +02:00
Graham Bennett
ff260202d9 zoom-us: 5.2.458699.0906 -> 5.3.465578.0920
(cherry picked from commit 4d9e297272)
2020-10-22 14:20:47 +02:00
Amit Aryeh Levy
753e422c9c zoom-us: 5.2.454870.0831 -> 5.2.458699.0906
(cherry picked from commit 3d9adca641)
2020-10-22 14:20:41 +02:00
Amit Aryeh Levy
52ac3c8308 zoom-us: 5.2.446620.0816 -> 5.2.454870.0831
thanks to @doronbehar for changes to update script

(cherry picked from commit 548ded0ad5)
2020-10-22 14:20:35 +02:00
Amit Aryeh Levy
5033c2a304 zoom-us: 5.1.422789.0705 -> 5.2.446620.0816
(cherry picked from commit 71ac9f191a)
2020-10-22 14:20:14 +02:00
Maximilian Bosch
3095f9cccf hydra-unstable: 2020-09-02 -> 2020-10-20
(cherry picked from commit 1bb8808e1a)
2020-10-22 13:53:02 +02:00
Michael Weiss
32b381172e signal-desktop: 1.37.1 -> 1.37.2
(cherry picked from commit d8cbc9d331)
2020-10-22 13:38:29 +02:00
R. RyanTM
0864c12440 atlassian-jira: 8.12.0 -> 8.13.0
(cherry picked from commit 590bedc5ec)
2020-10-22 13:15:46 +02:00
Eelco Dolstra
4c29522d13 nixUnstable: 3.0pre20200829_f156513 -> 3.0pre20201020_e0ca98c
(cherry picked from commit f25bb567f6)
2020-10-22 12:31:42 +02:00
Eelco Dolstra
7de510989d kdeconnect: 20.08.1 -> 20.08.2
Fixes an invalid MIME type.

(cherry picked from commit 42bf61811b)
2020-10-22 12:30:09 +02:00
Eelco Dolstra
7b8c86ed16 kdeconnect: Use Qt 5.12
Fixes #99951.

  $ kdeconnect-app
  Cannot mix incompatible Qt library (5.12.7) with this library (5.15.0)
  Aborted (core dumped)

(cherry picked from commit fa08ce096e)
2020-10-22 12:30:04 +02:00
Justin Humm
259b0ce0f7 freetype: patch CVE-2020-15999
We can't backport https://github.com/NixOS/nixpkgs/pull/101199 as it
would break freetype API, but this patch should fix the issue.
2020-10-22 12:21:40 +02:00
WilliButz
b08a6294e7 grafana: 7.2.1 -> 7.2.2
(cherry picked from commit f7bc6be76c)
2020-10-22 12:05:09 +02:00
TredwellGit
35e7dd32bb chromium: 86.0.4240.75 -> 86.0.4240.111
https://chromereleases.googleblog.com/2020/10/stable-channel-update-for-desktop_20.html

CVE-2020-16000 CVE-2020-16001 CVE-2020-16002 CVE-2020-15999 CVE-2020-16003

(cherry picked from commit 7dc2d9f819)
Backport of #101306.
2020-10-22 11:52:09 +02:00
Michael Weiss
415ac1f5fa chromiumDev: M87 -> M88
(cherry picked from commit aee3076ba7)
2020-10-22 11:51:40 +02:00
Michael Weiss
761a9b428c chromiumBeta: M86 -> M87
(cherry picked from commit a667bc7ae1)
2020-10-22 11:51:26 +02:00
Justin Humm
e9600daab3 Revert "freetype: 2.10.2 -> 2.10.4"
This reverts commit a583a60bec.

As it broke at least ghostscript and therefore caused a huge amount of
dependency failures.
2020-10-22 11:34:49 +02:00
Maximilian Bosch
a43ca1cf16 element-desktop: 1.7.9 -> 1.7.10
https://github.com/vector-im/element-desktop/releases/tag/v1.7.10
(cherry picked from commit d976433296)
2020-10-22 11:06:01 +02:00
Maximilian Bosch
d9c8818294 element-web: 1.7.9 -> 1.7.10
https://github.com/vector-im/element-web/releases/tag/v1.7.10
(cherry picked from commit 96f29b90a1)
2020-10-22 11:06:00 +02:00
davidak
64cc6754d5 limesurvey: 3.23.0+200813 -> 3.23.7+201006
(cherry picked from commit 98cbf7b90d)
2020-10-22 01:37:37 +02:00
TredwellGit
a583a60bec freetype: 2.10.2 -> 2.10.4
https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/
(cherry picked from commit 3775af7057)
2020-10-22 00:50:11 +02:00
Raphael Borun Das Gupta
9e627ad00e python3Packages.scrapy-fake-useragent: fix license
which upstream changed to MIT with alecxe/scrapy-fake-useragent@0ea7614

(cherry picked from commit 44465f606e)
2020-10-21 14:38:23 -07:00
Vincent Laporte
e3efb20e98 ocamlPackages.safepass: 2.0 → 3.0
(cherry picked from commit 4b3e97daa4)
2020-10-21 22:53:58 +02:00
Mario Rodas
3870956dc1 python38Packages.scrapy-fake-useragent: fix build
(cherry picked from commit 71e7f74ca6)
2020-10-21 13:14:58 -07:00
symphorien
2d6b0921b6 nixos/sslh: fix usage of the now removed ssl probe (#101087)
and document

(cherry picked from commit 9e8eaea484)
2020-10-21 21:35:25 +02:00
Kim Lindberger
e6f3d79a38 Merge pull request #100564 from talyz/20.09-nomachine-6.13.3
nomachine-client: 6.11.2 -> 6.12.3
2020-10-21 19:02:22 +02:00
Anderson Torres
ddf80b09c3 Merge pull request #101020 from jmpunkt/libreoffice-qt-backport
[20.09] libreoffice-qt: fix compilation
2020-10-21 08:55:12 -03:00
Anderson Torres
7ee58b7b54 Merge pull request #101133 from maxxk/odpic-4.0.2-stable
[20.09] odpic: 3.3.0 -> 4.0.2
2020-10-21 08:54:31 -03:00
Anderson Torres
50531288b8 Merge pull request #101197 from ruuda/mopidy-local-backport
[20.09] mopidy-local: init at 3.1.1
2020-10-21 08:52:40 -03:00
Andreas Rammhold
dc8b9b4f44 Merge pull request #101206 from andir/20.09/firefox-82
[20.09] firefox: 81.0.2 -> 82.0, firefox-esr: 78.3.1 -> 78.4.0esr
2020-10-21 12:04:02 +02:00
Jean-François Roche
418db3d00a python3Package.python-markdown-math: remove support for python 2.7
As stated in its changelog [1], python 2.7 is no longer supported.

[1] https://github.com/mitya57/python-markdown-math/blob/master/changelog#L4

(cherry picked from commit 8781030dfa)
2020-10-20 21:14:28 -07:00
Ruud van Asseldonk
1c0f086c46 mopidy-local-sqlite: remove
This plugin has been merged into the newer "mopidy-local" plugin which I
just added. "mopidy-local-images" and "mopidy-local-sqlite" were added
originally for Mopidy Iris, but Iris now works with mopidy-local, and
does not need the older ones any more.

Backporting because mopidy-local-sqlite is broken in 20.09.

(cherry picked from commit b82ca4d2e1)
2020-10-20 19:56:15 +02:00
Ruud van Asseldonk
6bfec173cc mopidy-local-images: remove
This plugin has been merged into the newer "mopidy-local" plugin which I
just added. "mopidy-local-images" and "mopidy-local-sqlite" were added
originally for Mopidy Iris, but Iris now works with mopidy-local, and
does not need the older plugins any more.

Backporting because mopidy-local-images is broken in 20.09.

(cherry picked from commit 79a823ceae)
2020-10-20 19:55:52 +02:00
Ruud van Asseldonk
cb317147c6 mopidy-local: init at 3.1.1
Mopidy-Local is the successor to Mopidy-Local-SQLite and
Mopidy-Local-Images, which are already packaged. I had to make
gobject-introspection a propagated build input, otherwise
Mopidy-Local can't import Mopidy.

Backporting because mopidy-local-sqlite and mopidy-local-images are
broken in 20.09 without this change and the subsequent removals.

(cherry picked from commit 7565d00a7c)
2020-10-20 19:55:12 +02:00
Andreas Rammhold
c9ffe3a126 firefox: 78.3.1esr -> 78.4.0esr
(cherry picked from commit 910a4bc162a3a2d884999d0ba3e65a454721f10a)
2020-10-20 18:38:16 +02:00
Andreas Rammhold
2fa9c1a237 firefox: 81.0.2 -> 82.0
(cherry picked from commit df959d06c40af7f275741530ad7158faf0a46e1a)
2020-10-20 18:38:15 +02:00
Andreas Rammhold
9bba8841e0 firefox: suport newer NSS version for next firefox bump 2020-10-20 18:38:15 +02:00
Andreas Rammhold
b17924169d nss_latest: init at 3.57 2020-10-20 18:38:15 +02:00
Marc 'risson' Schmitt
7b32c9dd0c nixos/initrd-network: fix /etc/resolv.conf when multiple dns servers from DHCP
Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>
(cherry picked from commit 9e6bede5ab)
2020-10-20 08:56:53 -07:00
Justin Humm
4cdfa432fc opensc: patch for CVE-2020-26570, CVE-2020-26572
(cherry picked from commit c4237e2be1)
2020-10-20 17:32:44 +02:00
Robert Hensing
13abaaba0c Merge pull request #101123 from r-burns/backport-spooles
[20.09] spooles: fix build on darwin
2020-10-20 16:24:25 +02:00
Robert Hensing
a8e89c1f0b Merge pull request #101122 from r-burns/backport-perl-linux
[20.09] perlPackages.Linux*: disable on non-Linux platforms
2020-10-20 16:22:38 +02:00
Maxim Krivchikov
dafad4082b odpic: 3.3.0 -> 4.0.2
python3Packages.cx-oracle is broken with current odpic version

(cherry picked from commit 5abf2b4f68)
2020-10-20 13:22:07 +03:00
Vladimír Čunát
05334ad785 Merge #100808: thunderbird*: 78.3.2 -> 78.3.3
(cherry picked from commit 176243b059)
Re-tested both of them briefly atop 20.09 as well.
2020-10-20 08:51:14 +02:00
freezeboy
bd409c97e6 brotli: 1.0.7 -> 1.0.9 (PR #100436)
Fixes CVE-2020-8927.

(cherry picked from commit 347696a30b)
2020-10-20 08:06:25 +02:00
Vladimír Čunát
550971ee52 Merge #99158: xorg.libX11: 1.6.8 -> 1.6.12 (security)
(cherry picked from commit b623690daf)
I trust this is regression-free with sufficient probability.
https://lists.x.org/archives/xorg-announce/2020-August/003056.html
https://lists.x.org/archives/xorg-announce/2020-July/003050.html
2020-10-20 08:06:21 +02:00
Jonathan Ringer
e3c3fb2109 kdeFrameworks.plasma-framework: aligned with QtQuick 2.12
Aligned plasma-framework with qt5.12
see https://github.com/NixOS/nixpkgs/issues/98536
2020-10-19 20:40:22 -07:00
Robert Scott
5e199f944c Merge pull request #100926 from bcdarwin/update-elastix-release-20.09
[20.09] elastix: 5.0.0 -> 5.0.1; unbreak OS X build
2020-10-20 00:18:37 +01:00
Jean-François Roche
d6054302c9 pythonPackages.pytest-cram: 0.2.0 -> 0.2.2
(cherry picked from commit d0908c6133)
2020-10-19 14:59:42 -07:00
Konrad Borowski
af136e9d2c kdeApplications.kpat: restore 2020-10-19 14:57:43 -07:00
Milan
892dd85dd2 percona-server: 5.6.43-84.3 -> 5.6.49-89.0 (#97923)
Fixes build with recent versions of glibc.

ZHF: #97479(cherry picked from commit c15bcdd91f)
2020-10-19 13:28:27 -07:00
Aluísio Augusto Silva Gonçalves
2cddaafacf nixos/doc: fix itemization in the 20.09 release notes
(cherry picked from commit cba9843aa0)
2020-10-19 22:27:18 +02:00
Ryan Burns
1fb25d74c9 perlPackages.Linux*: disable on non-Linux platforms
(cherry picked from commit b7e4ac43e4)
2020-10-19 12:39:50 -07:00
Ryan Burns
79d1ba6c04 spooles: fix build on darwin
(cherry picked from commit c04219a9d5)
2020-10-19 12:37:53 -07:00
Christian Kauhaus
722734d1d7 Merge pull request #100159 from helsinki-systems/bp/asteriskupd
[20.09] asterisk: Bump all packages
2020-10-19 20:47:17 +02:00
Maximilian Bosch
0aee4508fb grafana: 7.2.0 -> 7.2.1
https://github.com/grafana/grafana/releases/tag/v7.2.1
(cherry picked from commit fcbf2ee8b5)
2020-10-19 17:52:14 +02:00
Maximilian Bosch
eb29fbb113 epson-escpr2: 1.1.17 -> 1.1.23
(cherry picked from commit b6f990947c)
2020-10-19 17:52:13 +02:00
Mario Rodas
41b11ef47d terraform_0_13: 0.13.2 -> 0.13.4
Changelogs:
* https://github.com/hashicorp/terraform/releases/tag/v0.13.3
* https://github.com/hashicorp/terraform/releases/tag/v0.13.4

(cherry picked from commit eb6e2ac2c0)
(cherry picked from commit 25e2e677d3)
2020-10-19 17:20:54 +02:00
makefu
b555b3a657 python3Packages.pyhaversion: add missing semantic-version
(cherry picked from commit 92bf2d7c03)
2020-10-19 08:14:32 -07:00
Robert Scott
4fc26351e0 pythonPackages.pymc3: fix build
(modified cherry-pick of commit 3c3295a02d)
2020-10-19 08:13:52 -07:00
Robert Scott
9673e47e38 pythonPackages.fastprogress: init at 1.0.0
(cherry picked from commit 9a09285f5a)
2020-10-19 08:13:52 -07:00
Robert Scott
9b01e41d18 python3Packages.Theano: add pythonImportsCheck
(modified cherry pick of commit 4a9dba6c44)

some tricks are required to make this work because #93560 and #97597
didn't make it into this branch, but this example shows what is required
to import theano from within a nix build environment on this branch.
2020-10-19 08:13:52 -07:00
Jean-François Roche
c8a4fd81a9 python3Package.pytest-flask: remove support for python 2.7
As stated in its changelog [1], python 2.7 is no longer supported.

[1] https://github.com/pytest-dev/pytest-flask/blob/master/docs/changelog.rst

(cherry picked from commit e07cf5d4bf)
2020-10-19 08:11:26 -07:00
Martin Weinelt
d7f29f9389 Merge pull request #101035 from jfroche/backport-fix/galario
[20.09] python{2,3}Packages.galario: 1.2.1 -> 1.2.2
2020-10-19 15:33:28 +02:00
Sarah Brofeldt
7dc9cb1d80 Merge pull request #101059 from srhb/k8s-1.19.3-bp
[20.09] kubernetes: 1.19.1 -> 1.19.3
2020-10-19 15:32:53 +02:00
Martin Weinelt
8606c4f489 Merge pull request #101066 from 0x4A6F/release-20.09-routinator
[20.09] routinator: 0.7.1 -> 0.8.0
2020-10-19 15:20:18 +02:00
0x4A6F
35ba06a00f routinator: 0.7.1 -> 0.8.0
Backport of #99999

Upgrade to [v0.8.0](https://github.com/NLnetLabs/routinator/releases/tag/v0.8.0).
Fixes [CVE-2020-17366](https://nvd.nist.gov/vuln/detail/CVE-2020-17366).

(cherry picked from commit b52ed6a1fe)
2020-10-19 12:11:56 +00:00
Bas van Dijk
ba2ec4867d Merge pull request #101055 from basvandijk/rocksdb-optionally-disable-shared-lib-release-20.09
rocksdb: support disabling building shared lib
2020-10-19 13:42:59 +02:00
Johan Thomsen
c157bc779f kubernetes: 1.19.1 -> 1.19.3
(cherry picked from commit c1fa775058)
Backport of #101025
2020-10-19 12:00:45 +02:00
Bas van Dijk
d56b86a205 rocksdb: support disabling building shared lib
This is needed to build `pkgsStatic.rocksdb`.

(cherry picked from commit c6109efca6)
2020-10-19 10:53:45 +02:00
Bas van Dijk
dfe0fba7ab Merge pull request #100988 from basvandijk/netaddr-0.8.0-release-20.09
Cherry-pick netaddr-0.8.0 upgrade on release-20.09
2020-10-19 10:30:38 +02:00
Justin Bedo
7aa0ff7dfd singularity: 3.6.3 -> 3.6.4
Important security release addressing CVE-2020-15229.
2020-10-19 09:12:17 +11:00
Jean-François Roche
5749abe020 python{2,3}Packages.galario: 1.2.1 -> 1.2.2
Upgrading fixes the tests

(cherry picked from commit cbd37d0128)
2020-10-18 23:27:41 +02:00
Maciej Krüger
fc8ed1f7c6 Merge pull request #97667 from mkg20001/unity-back 2020-10-18 21:20:39 +02:00
marius david
6fff8726ea libreoffice-qt: fix compilation
(cherry picked from commit 6e72633c42)
2020-10-18 20:01:42 +02:00
Andrew Childs
8ef805fecd pythonPackages.netaddr: 0.7.19 -> 0.8.0
Updating to >= 0.7.20 fixes tests on macOS Catalina and newer:

        #   inet_pton has to be different on Mac OSX *sigh*
        assert IPAddress('010.000.000.001', flags=INET_PTON) == IPAddress('10.0.0.1')
>       assert int_to_str(0xffff) == '::0.0.255.255'
E       AssertionError: assert '::ffff' == '::0.0.255.255'
E         - ::0.0.255.255
E         + ::ffff

(cherry picked from commit c32441811f)
2020-10-18 17:28:11 +02:00
Gabriel Ebner
43e8ec412f freecad: add missing python module for addon manager
(cherry picked from commit 5bc7030a25)
2020-10-18 16:29:48 +02:00
Robert Scott
ea84d47419 Merge pull request #100907 from r-burns/backport-feh
[20.09] feh: fix build on darwin
2020-10-18 11:45:17 +01:00
Vladimír Čunát
2a38527e70 Merge #100432: python3Packages.perfplot: 0.5.0 -> 0.8.4 2020-10-18 10:50:30 +02:00
Vladimír Čunát
6b4b2056df Merge #93333: julia: Remove version 0.7 and 1.1
(cherry picked from commit 04821fbe46)
2020-10-18 10:31:18 +02:00
Raghav Sood
10e804fb69 can-isotp: 20180629 -> 20200910
(cherry picked from commit 09bc8c8d85)
2020-10-18 10:17:45 +02:00
Vladimír Čunát
3efb70d144 Merge #98415: wordnet: Fix darwin build
(cherry picked from commit 81b1356944)
2020-10-18 10:08:55 +02:00
Ben Darwin
6f22d6d69a elastix: 5.0.0 -> 5.0.1; unbreak OS X build
(cherry picked from commit e20652da9b)
2020-10-18 00:47:21 -04:00
Ryan Burns
d1d151cafd feh: fix build on darwin
Darwin doesn't support inotify, needed for autoreload

(cherry picked from commit 942ad9a49a)
2020-10-17 18:05:40 -07:00
Philippe Hürlimann
33f067f9f3 trigger: apply review suggestions
(cherry picked from commit 85e5e5afa3)
2020-10-17 13:47:49 -07:00
Philippe Hürlimann
181e76fa2a trigger: 0.6.6 -> 0.6.6.1
fix linker flag for trigger
added tinyxml-2 as dependency as it's not shipped anymore
improved description

(cherry picked from commit f85e2e1eeb)
2020-10-17 13:47:49 -07:00
Tim Steinbach
ac81495910 linux/hardened/patches/5.9: init at 5.9.1.a 2020-10-17 15:30:31 -04:00
Tim Steinbach
36236709f7 linux: 5.9 -> 5.9.1 2020-10-17 15:30:26 -04:00
Austin Seipp
087d34de49 linux: init 5.9
Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 0a614d2fb5)
2020-10-17 15:29:58 -04:00
Tim Steinbach
18a5de8fbd linux/hardened/patches/5.8: 5.8.15.a -> 5.8.16.a 2020-10-17 15:28:50 -04:00
Tim Steinbach
30b2ec6245 linux/hardened/patches/5.4: 5.4.71.a -> 5.4.72.a 2020-10-17 15:28:49 -04:00
Tim Steinbach
fba2a1da90 linux/hardened/patches/4.19: 4.19.151.a -> 4.19.152.a 2020-10-17 15:28:49 -04:00
Tim Steinbach
323bbb6aac linux/hardened/patches/4.14: 4.14.201.a -> 4.14.202.a 2020-10-17 15:28:48 -04:00
Tim Steinbach
f0980bdf37 linux: 5.8.15 -> 5.8.16 2020-10-17 15:28:42 -04:00
Tim Steinbach
8ac2624aa3 linux: 5.4.71 -> 5.4.72 2020-10-17 15:28:42 -04:00
Tim Steinbach
a26cb1ad5e linux: 4.9.239 -> 4.9.240 2020-10-17 15:28:41 -04:00
Tim Steinbach
8594ed8378 linux: 4.4.239 -> 4.4.240 2020-10-17 15:28:41 -04:00
Tim Steinbach
07b023fd2a linux: 4.19.151 -> 4.19.152 2020-10-17 15:28:40 -04:00
Tim Steinbach
f2d048aef1 linux: 4.14.201 -> 4.14.202 2020-10-17 15:28:39 -04:00
Ben Darwin
8a10daf5b9 itk: remove -march=corei7 and -mtune=native flags from cmake build files
- probable cause of build failure on Hydra on branch release-20.09

(cherry picked from commit 83a1ce3d2b)
2020-10-17 11:36:37 -07:00
Jean-François Roche
31db508f19 devpi-server: fix tests
Tests relied on a function that has no order guarantee. A fix was merged
to devpi master [1]. We point the package to this commit which should fix
the failing tests on hydra.

[1] https://github.com/devpi/devpi/pull/821

(cherry picked from commit 3a57ec4744)
2020-10-17 11:20:05 -07:00
Sandro Jäckel
497baa1559 kmon: 1.4.0 -> 1.5.1
Closes #99482

(cherry picked from commit 24123898d2)
2020-10-17 11:14:35 -07:00
Jean-François Roche
c6fa7bbd61 python{2,3}Package.pytest-bdd: upgrade and fix test
(cherry picked from commit 5071556760)
2020-10-17 10:54:12 -07:00
rnhmjoj
a76fe1ec66 monero-gui: fix install path
(cherry picked from commit 101bb7814b)
2020-10-17 15:26:16 +02:00
rnhmjoj
cc21c05182 monero-gui: 0.17.0.1 -> 0.17.1.0
(cherry picked from commit 9bf0008d68)
2020-10-17 15:25:19 +02:00
rnhmjoj
5a71dc4b12 monero: 0.17.0.1 -> 0.17.1.0
(cherry picked from commit bf627ae0e0)
2020-10-17 15:25:17 +02:00
Tim Steinbach
9f8961a14b Merge pull request #100769 from andersk/linux-hardened
linux/hardened/patches: Update

(cherry picked from commit 3b6ba05d3d)
2020-10-16 19:12:42 -04:00
John Ericson
8b56565791 Merge pull request #100676 from obsidiansystems/ipfs_latest-for-stable
[20.09] ipfs: Add 0.7.0 in addition
2020-10-16 18:38:53 -04:00
Michael Weiss
f6047c8b6f Merge pull request #100703 from primeos/signal-desktop-backport
[20.09] signal-desktop: 1.36.3 -> 1.37.1
2020-10-16 23:11:34 +02:00
tnias
84f6c8fcb1 nixos/chromium: update link in docs (#93794)
(cherry picked from commit 0da7593dce)
2020-10-16 23:06:00 +02:00
Maximilian Bosch
fe922da9f1 matrix-synapse: 1.21.0 -> 1.21.2
https://github.com/matrix-org/synapse/releases/tag/v1.21.1 [1]
https://github.com/matrix-org/synapse/releases/tag/v1.21.2

[1] Not really relevant for as since only a bug in the Debian packaging
    was fixed.

(cherry picked from commit 8886cb63e2)
2020-10-16 22:10:23 +02:00
Michael Weiss
da361cccf7 signal-desktop: 1.36.3 -> 1.37.1
(cherry picked from commit db33f99343)
2020-10-16 12:14:44 +02:00
Jonathan Ringer
f1e7afd21d python3Packages.dask: limit processes on tests
(cherry picked from commit 2c5d3313e2)
2020-10-15 23:49:00 -07:00
Vladimír Čunát
6b75df4fa5 Merge #100494: thunderbird-*: 78.3.1 -> 78.3.2 2020-10-16 08:12:23 +02:00
Luflosi
aee9c60624 ipfs: Add 0.7.0 in addition
IPFS has been evolving quite fast lately, so I think tracking new
release in stable NixOS is prudent.

(cherry picked from commit b75e431454)
2020-10-16 00:15:52 -04:00
John Ericson
27949d611a ipfs: prepare to add 0.7 in addition 2020-10-16 00:04:51 -04:00
Luflosi
da221d8e56 ipfs: avoid warning during build when moving directory
Trying to move a directory into itself will result in a warning:
mv: cannot move 'ipfs-src' to a subdirectory of itself, 'ipfs-src/ipfs-src'

This can be prevented by excluding that directory.

(cherry picked from commit d385065f70)
2020-10-15 22:58:20 -04:00
Luflosi
05d9031399 ipfs: remove executable bit from systemd units
IPFS would complain with warnings like
Configuration file /nix/store/...-ipfs-0.6.0/etc/systemd/system/ipfs.service is marked executable. Please remove executable permission bits. Proceeding anyway.

(cherry picked from commit 1a382e983f)
2020-10-15 22:58:20 -04:00
R. RyanTM
848f952b49 python27Packages.cma: 2.7.0 -> 3.0.3
(cherry picked from commit 209ef57162)
2020-10-15 15:08:03 -07:00
ajs124
3b2c5da4fc Merge pull request #100628 from helsinki-systems/bp/100604
[20.09] nixos/icingaweb2: Fix php packages
2020-10-15 21:04:40 +02:00
Janne Heß
b37eda2e73 nixos/icingaweb2: Fix php packages
(cherry picked from commit e2da1219d4)
2020-10-15 20:43:21 +02:00
Anderson Torres
7eda317006 Merge pull request #100551 from austinbutler/toggl-backport
[20.09] python3Packages.toggl-cli: 2.1.0 -> 2.2.1
2020-10-15 05:04:50 -03:00
talyz
43974d4b0d nomachine-client: 6.11.2 -> 6.12.3
(cherry picked from commit e635dccfdd)
2020-10-15 09:44:16 +02:00
Jan Tojnar
9ca3b74564 Revert "nixos/display-managers: install sessionData.desktops"
This reverts commit ee9f8ac6c0.

It created infinite recursion when using LXQt, since lxqt module
uses `config.system.path` in `services.xserver.desktopManager.session`.
`config.system.path` is a `buildEnv` that depends on `environment.systemPackages`.
2020-10-15 07:34:02 +02:00
Austin Butler
768a38a347 python3Packages.toggl-cli: 2.1.0 -> 2.2.1
(cherry picked from commit 059413e201)
(cherry picked from commit 4d4dec3f58)
2020-10-14 22:21:11 -07:00
Austin Butler
0cd33a5f70 pythonPackages.inquirer: fix build
(cherry picked from commit 0f7b1d4a72)
(cherry picked from commit 81f306f4a8)
2020-10-14 22:20:40 -07:00
Austin Butler
62d0ee1b5f python3Packages.notify-py: init at 0.2.3
(cherry picked from commit dbf902b13d)
(cherry picked from commit 05f0c4151d)
2020-10-14 22:20:08 -07:00
Austin Butler
a237e9c6a7 pythonPackages.blessed: 1.15.0 -> 1.17.10
(cherry picked from commit a231baa237)
(cherry picked from commit 9326e1a528)
2020-10-14 22:19:38 -07:00
Austin Butler
2450fe820b python3Packages.google_cloud_asset: fix build, 2.0.0 -> 2.1.0
(cherry picked from commit 326a5f7132)
2020-10-14 22:17:59 -07:00
Austin Butler
f1bad0a622 python3Packages.libcst: 0.3.12 -> 0.3.13
(cherry picked from commit 80b03e4045)
2020-10-14 22:17:59 -07:00
Austin Butler
8a0b8ca540 python3Packages.google-cloud-org-policy: init at 0.1.2
(cherry picked from commit c9c4730f11)
2020-10-14 22:17:59 -07:00
Austin Butler
b9982c2df9 python3Packages.google-cloud-access-context-manager: init at 0.1.2
(cherry picked from commit 906d77af8b)
2020-10-14 22:17:59 -07:00
Elis Hirwing
b64c4c38bb Merge pull request #100505 from etu/2009-php-pear
[20.09] php: Fix pear path
2020-10-15 07:00:43 +02:00
Benjamin Hipple
cf726f5af9 Merge pull request #100509 from p-h/backport-opencl-build-fix
[20.09] opencl-info: fix build
2020-10-14 19:45:58 -04:00
Benjamin Hipple
3b16d1f82c Merge pull request #100500 from uvNikita/backport/titlecase
[20.09] pythonPackages.titlecase: fix missing dependencies
2020-10-14 19:28:52 -04:00
Jan Tojnar
e168809150 ufraw: mark broken
It does not build so let's mark it broken in order for gimp-with-plugins not to be broken.

Fixes: https://github.com/NixOS/nixpkgs/issues/98103
(cherry picked from commit db64508779)
2020-10-14 23:56:51 +02:00
Frederik Rietdijk
ad0d203452 Merge pull request #100428 from FRidh/qt
20.09: pythonPackages: use latest qt version instead of 5.14
2020-10-14 21:09:56 +02:00
Demyan Rogozhin
4fcfdd1566 opencl-info: fix build
(cherry picked from commit 26d930cb76)
2020-10-14 18:24:11 +02:00
Elis Hirwing
4ad7fb4078 php: Fix pear path
(cherry picked from commit 5a12d2797c)
2020-10-14 17:26:43 +02:00
rnhmjoj
6e46bc48f3 tremc: set license to GPL 3+
(cherry picked from commit c3e6fbe81e)
2020-10-14 17:09:06 +02:00
rnhmjoj
4f06e9dd82 tremc: 0.9.1 -> 0.9.2
(cherry picked from commit a92c678c3f)
2020-10-14 17:08:31 +02:00
Nikita Uvarov
c32feac836 pythonPackages.titlecase: fix missing dependencies 2020-10-14 15:32:13 +02:00
Tim Steinbach
0b6f61d993 linux: Remove 5.7
`nix-shell -p nixpkgs-review --run "nixpkgs-review wip"` does not find any issues
2020-10-14 09:01:24 -04:00
Tim Steinbach
97597594fa linux: 5.8.14 -> 5.8.15 2020-10-14 09:00:51 -04:00
Tim Steinbach
615aacf411 linux: 5.4.70 -> 5.4.71 2020-10-14 09:00:50 -04:00
Tim Steinbach
a6ef01ceb2 linux: 4.9.238 -> 4.9.239 2020-10-14 09:00:49 -04:00
Tim Steinbach
8d30e7ccc8 linux: 4.4.238 -> 4.4.239 2020-10-14 09:00:49 -04:00
Tim Steinbach
b042f240ff linux: 4.19.150 -> 4.19.151 2020-10-14 09:00:48 -04:00
Tim Steinbach
a64432bb20 linux: 4.14.200 -> 4.14.201 2020-10-14 09:00:47 -04:00
Tim Steinbach
79c329ea07 linux/hardened/patches/5.7: remove 2020-10-14 09:00:46 -04:00
Tim Steinbach
6044d870fa linux: Remove 5.7
I forgot to remove a file in 6d174dd5e0
2020-10-14 09:00:45 -04:00
taku0
819fe31294 thunderbird-bin: 78.2.2 -> 78.3.2
(cherry picked from commit 456106fe2a)
2020-10-14 21:52:16 +09:00
taku0
568a9acd6e thunderbird: 78.2.2 -> 78.3.2
(cherry picked from commit e46afe0f89)
2020-10-14 21:52:16 +09:00
Rok Garbas
0f778778c2 Merge pull request #100469 from taku0/flashplayer-32.0.0.445_release-20.09
[20.09] flashplayer: 32.0.0.433 -> 32.0.0.445 (Critical security fix)
2020-10-14 14:11:46 +02:00
Rok Garbas
cfb6541e75 Merge pull request #100457 from taku0/firefox-bin-81.0.2_release-20.09
[20.09] firefox, firefox-bin: 81.0 -> 81.0.2, firefox-esr: 78.3.0esr -> 78.3.1esr
2020-10-14 14:04:06 +02:00
Dominique Martinet
4da5ac1966 confinement: fix assert for serviceConfig.ProtectSystem
serviceConfig.ProtectSystem is usually a string so if set, the assert
itself would error out leaving no useable trace:

  # nixos-rebuild switch --show-trace
  building Nix...
  building the system configuration...
  error: while evaluating the attribute 'config.system.build.toplevel' at /nix/var/nix/profiles/per-user/root/channels/nixos/nixos/modules/system/activation/top-level.nix:293:5:
  while evaluating 'foldr' at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/lists.nix:52:20, called from /nix/var/nix/profiles/per-user/root/channels/nixos/nixos/modules/system/activation/top-level.nix:128:12:
  while evaluating 'fold'' at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/lists.nix:55:15, called from /nix/var/nix/profiles/per-user/root/channels/nixos/lib/lists.nix:59:8:
  while evaluating anonymous function at /nix/var/nix/profiles/per-user/root/channels/nixos/nixos/modules/system/activation/top-level.nix:121:50, called from undefined position:
  while evaluating the attribute 'assertion' at /nix/var/nix/profiles/per-user/root/channels/nixos/nixos/modules/security/systemd-confinement.nix:163:7:
  value is a string while a Boolean was expected

Fix the check to give a sensible assert message instead; the attribute
should either be not set or false bool to pass.

Closes: #99000
(cherry picked from commit f8d78b9f67)
2020-10-14 11:58:30 +02:00
taku0
a9144ad7f8 flashplayer: 32.0.0.433 -> 32.0.0.445
(cherry picked from commit 52dcd5b211)
2020-10-14 12:28:28 +09:00
Jean-François Roche
07e16bcf98 zope_filerepresentation: fix test
(cherry picked from commit 74d875206a)
2020-10-13 17:46:37 -07:00
taku0
9ab4152b11 firefox-esr: 78.3.0esr -> 78.3.1esr
(cherry picked from commit 560cc80818)
2020-10-14 09:26:53 +09:00
taku0
13b25d516c firefox-bin: 81.0 -> 81.0.2
(cherry picked from commit 68a9d42e0d)
2020-10-14 09:26:53 +09:00
taku0
6be1f2aaca firefox: 81.0 -> 81.0.2
(cherry picked from commit 05b955a133)
2020-10-14 09:26:53 +09:00
Maximilian Bosch
1c6330175b nixos/tests/systemd-networkd-vrf: fix eval
The `Metric`-values of routes defined via `networkd` must be integers.

(cherry picked from commit b199005979)
2020-10-13 22:42:53 +02:00
Nikita Uvarov
22d85996a6 caffeine-ng: add missing dependencies, fix bin paths
(cherry picked from commit 35e0d35113)
cc #99667
2020-10-13 16:25:58 -04:00
devhell
dadad9e21f profanity: Introduce OMEMO fix
It looks like the entire 0.9-series has some OMEMO issues where messages
will appear to be sent, but in reality they're not. This patch has been
picked from the upstream repo and addresses the issue so that OMEMO is
back in a usable state.

My thanks to @aszlig for helping and testing this.

(cherry picked from commit 373d1dd03d)
2020-10-13 21:41:59 +02:00
Ashish SHUKLA
16ef60841a libmesode: Add a patch from upstream to fix SSL verification
(cherry picked from commit 45f96c9100)
2020-10-13 21:41:43 +02:00
Robert Scott
3e2c25e5ff python3Packages.perfplot: 0.5.0 -> 0.8.4, fixing build
(cherry picked from commit 50d4da34db)
2020-10-13 19:01:28 +01:00
Robert Scott
fd862db73f python3Packages.rich: init at 8.0.0
(cherry picked from commit 5b66067eb9)
2020-10-13 19:01:28 +01:00
Robert Scott
6910052205 python3Packages.dufte: init at 0.2.9
(cherry picked from commit b5b8839e0a)
2020-10-13 19:01:28 +01:00
Michele Guerini Rocco
a8da27d4b0 Merge pull request #100420 from rnhmjoj/powerdns-backports
[20.09] Powerdns backports
2020-10-13 19:59:04 +02:00
Frederik Rietdijk
5f9c8a1976 kile: use qt 5.12 2020-10-13 19:28:18 +02:00
Frederik Rietdijk
d1e6022b0c kile: 2.9.92 -> 2.9.93
(cherry picked from commit 7489347335)
2020-10-13 19:22:02 +02:00
Doron Behar
3234443199 kdoctools, kapidox: Remove out of top-level scope
They do depend on qt5, and putting them in top level scope could cause
qt5 incompatibilities errors.

(cherry picked from commit 6b6f680831)
2020-10-13 19:05:30 +02:00
Doron Behar
0a7698042d python3.pkgs.sip: 4.19.22 -> 4.19.24
(cherry picked from commit 98e6fdd6a6)
2020-10-13 18:57:38 +02:00
Doron Behar
f382a99b88 kdeconnect: 1.3.5 -> 20.08.1
Update many dependencies. Add a patch that fixes a build. Use
`libsForQt5` instead of `libsForQt514`.

(cherry picked from commit dfcde0341f)
2020-10-13 18:56:37 +02:00
Frederik Rietdijk
f66b4727d1 puddletag: mark broken
(cherry picked from commit c0d5cf4993)
2020-10-13 18:56:28 +02:00
Frederik Rietdijk
0a835dc982 openshot-qt: consustently use qt 5.14
(cherry picked from commit 5d4117bd12)
2020-10-13 18:56:28 +02:00
Frederik Rietdijk
a0b965a456 qutebrowser: use current qt (5.15) again instead of 5.14
For security reasons [1] we upgrade to the latest Qt, despite this
breaking a feature, which is why 5.14 was forced earlier.

[1] https://github.com/NixOS/nixpkgs/pull/99456#issuecomment-703523943

(cherry picked from commit 902c567974)
2020-10-13 18:56:28 +02:00
Frederik Rietdijk
bfb4a3ec5d dupeguru: mark as broken
(cherry picked from commit b9af2d2259)
2020-10-13 18:56:28 +02:00
Frederik Rietdijk
471a56f24b cadence: use qt 5.14 consistently
(cherry picked from commit 64388b5b55)
2020-10-13 18:56:28 +02:00
Frederik Rietdijk
2725251920 qgis: consistently use qt 5.14
(cherry picked from commit 93111343dc)
2020-10-13 18:56:27 +02:00
Frederik Rietdijk
11ac36825b qgis: 3.10.9 -> 3.10.10
(cherry picked from commit 084c4da16a)
2020-10-13 18:56:27 +02:00
Frederik Rietdijk
5bb95efb7f qscintilla: 2.11.2 -> 2.11.5, fix license
(cherry picked from commit ae37cb3610)
2020-10-13 18:56:27 +02:00
Doron Behar
383e605b22 webmacs: Use qt5.15, as pyqt5 in it (#99956)
(cherry picked from commit 179986f378)
2020-10-13 18:56:27 +02:00
Doron Behar
5d0961754a rapid-photo-downloader: Use qt5.15, as pyqt5 in it (#99956)
(cherry picked from commit 1fa76554c8)
2020-10-13 18:56:27 +02:00
Doron Behar
fb7035ef07 qpaeq: Use qt5.15, as pyqt5 in it (#99956)
(cherry picked from commit 38d517f634)
2020-10-13 18:56:27 +02:00
Doron Behar
0ee4d1e4e8 qnotero: Use qt5.15, as pyqt5 in it (#99956)
(cherry picked from commit 0cbd755852)
2020-10-13 18:56:26 +02:00
Doron Behar
560e5f9f76 qarte: Use qt5.15, as pyqt5 in it (#99956)
(cherry picked from commit 8b8febd15f)
2020-10-13 18:56:26 +02:00
Doron Behar
a986ec6161 manuskript: Use qt5.15, as pyqt5 in it (#99956)
(cherry picked from commit a9a2cc99b9)
2020-10-13 18:56:26 +02:00
Doron Behar
fe739f14aa leo-editor: Use qt5.15, as pyqt5 in it (#99956)
(cherry picked from commit dfec61ea28)
2020-10-13 18:56:26 +02:00
Doron Behar
023936e84c kcc: Use qt5.15, as pyqt5 in it (#99956)
(cherry picked from commit 36caf7ea26)
2020-10-13 18:56:12 +02:00
Doron Behar
990a86534b inkcut: Use qt5.15, as pyqt5 in it (#99956)
(cherry picked from commit aa20203d3c)
2020-10-13 18:56:12 +02:00
Doron Behar
39fc72820c gmic-qt-krita: Use qt5.15 - as used by krita (#99956)
(cherry picked from commit 32a362bb61)
2020-10-13 18:56:12 +02:00
Doron Behar
28992861a0 krita: Use qt5.15 - same as pyqt5 in it (#99956)
(cherry picked from commit 2aff7cf32c)
2020-10-13 18:56:12 +02:00
Doron Behar
e5d127dc13 vorta: Fix double wrapping
(cherry picked from commit 883b21debe)
2020-10-13 18:56:11 +02:00
Doron Behar
a44e9a7581 libsForQt5.kpeoplevcard: init at 0.1
(cherry picked from commit 8b16b8cb56)
2020-10-13 18:56:11 +02:00
Doron Behar
4a87f3298b libsForQt5.pulseaudio-qt: init at 1.2.0
(cherry picked from commit faedc6a226)
2020-10-13 18:56:11 +02:00
Doron Behar
7f8c6469ee freecad: Use libsForQt5 and not qt5.14
(#99956).

(cherry picked from commit 244ef6c24b)
2020-10-13 18:56:11 +02:00
Doron Behar
0fcb1f759a git-annex-metadata-gui: fix qt wrapping
Wrap application with wrapQtAppsHook and no double wrapping.

(cherry picked from commit f4b8c8f1df)
2020-10-13 18:56:11 +02:00
Doron Behar
df17b2db6b friture: Use qt5.15 just like pyqt5
Don't double wrap executables.

(cherry picked from commit 62738d495c)
2020-10-13 18:56:11 +02:00
Doron Behar
f508825dce flent: Use qt5.15 just like pyqt5 use in it (#99956)
Bonus: Spare double wrapping.
(cherry picked from commit 3d8267ee88)
2020-10-13 18:56:10 +02:00
Doron Behar
c16a20f2c5 cq-editor: Use qt5.15 completely.
Don't mix qt5.14 and pyqt5 which uses qt5.15 (#99956).

(cherry picked from commit 16c2b3c614)
2020-10-13 18:56:10 +02:00
Doron Behar
b8ba7b4510 electrum-ltc: Use default qt5.15.
The same as used by pyqt5 (#99956).

Also: Fix double wrapping.
(cherry picked from commit bc0113e2c2)
2020-10-13 18:56:10 +02:00
Doron Behar
8bcf0f2b29 dupeguru: Don't override qt5 version.
Since Python's pyqt5 is using qt5.15, it should use the same version as
well.

(cherry picked from commit 56d047f0b0)
2020-10-13 18:56:10 +02:00
Doron Behar
9e49c8416e python3.pkgs.androguard: rewrite
Add an optional withGui flag to turn off gui as most of the time it's
not needed since this is a python library.

Use a GitHub tarball to optionally enable tests, currently disabled by
default, but next release' tests should pass (tested the beta release
tag).

Wrap qt apps properly, without double wrapping, if gui is enabled.

(cherry picked from commit 36b7e89f19)
2020-10-13 18:56:10 +02:00
Doron Behar
61b17d4b49 python3.pkgs.nose-timer: init at 1.0.0
(cherry picked from commit cd5b560541)
2020-10-13 18:56:10 +02:00
Doron Behar
fdb39df357 electron-cash: 4.1.0 -> 4.1.1
Remove included upstream patches. Use qt5.15 (#99956). Spare double
wrapping by using `makeWrapperArgs+=()`.

(cherry picked from commit 2edd4edcb9)
2020-10-13 18:56:10 +02:00
Doron Behar
cdf7e80179 cura, curaLulzbot: Use qt5.15
Since now Python packages use qt5.15, this should too.

(cherry picked from commit f3e5c93d03)
2020-10-13 18:56:09 +02:00
Doron Behar
8d4e21df1a ffado: Use libsForQt5 (not 514)
(cherry picked from commit 5cbf0c1beb)
2020-10-13 18:56:09 +02:00
Doron Behar
f1cf9e1d6f retext: Fix build by using default qt5.15.
Bonus: Set `makeWrapperArgs` instead of calling `wrapQtApp` - to prevent
double wrapping.

(cherry picked from commit 198e025172)
2020-10-13 18:56:09 +02:00
Doron Behar
be17f03858 calibre-py{2,3}: Use libsForQt5 - same is used in python-packages.nix
(cherry picked from commit 2d238fc6b0)
2020-10-13 18:56:09 +02:00
Frederik Rietdijk
bc4fd743f1 carla: 2.1.1 -> 2.2.0 and use the default qt515
(cherry picked from commit 1561163203)
2020-10-13 18:56:09 +02:00
Doron Behar
224f675279 pythonPackages.pyqtwebengine: Apply qt5.14 patch only if needed
Since we now use qt5.15 in all python modules (defaulting to the same
qt5 used in all-packages.nix), That patch is not required, but it will
be needed if qt5.14 is used if pythonInterpreters is overridden, which
is likely to happen like it happend to qutebrowser for instance. See:
2667af4062

(cherry picked from commit 15bfdf8e51)
2020-10-13 18:56:09 +02:00
Frederik Rietdijk
8569001121 qutebrowser: minor fixup regarding use of qt 514
In 3fafb02125
the Qt version used by Qutebrowser was downgraded from 5.15 to 5.14.
Let's be consistent by also setting qt514 and including a comment so one
can trace why it is used.

(Note that downgrade gave it the same Qt version as used by the Python
packages set at the time, so in principle the override could be
removed.)

(cherry picked from commit 4bccbd9592)
2020-10-13 18:56:08 +02:00
Frederik Rietdijk
3a733b6889 pythonPackages: use current qt5 instead of 5.14
(cherry picked from commit edac19f166)
2020-10-13 18:56:08 +02:00
Doron Behar
dba7e99cc3 python3.pkgs.pyqt5: 5.14.2 -> 5.15.1
(cherry picked from commit 0331c39d4e)
2020-10-13 18:56:08 +02:00
Frederik Rietdijk
9be992a000 docs: python39 is available
(cherry picked from commit 748bc99520)
2020-10-13 18:54:32 +02:00
R. RyanTM
9fbace91c4 python37Packages.canonicaljson: 1.3.0 -> 1.4.0
(cherry picked from commit ed9c3d4796)
2020-10-13 16:50:19 +02:00
Maximilian Bosch
c7c4e67667 matrix-synapse: 1.20.1 -> 1.21.0
https://github.com/matrix-org/synapse/releases/tag/v1.21.0
(cherry picked from commit 87414de4ca)
2020-10-13 16:48:45 +02:00
Aaron Andersen
bfe193c61c dnsdist: update compile flags
(cherry picked from commit 872cfe067e)
2020-10-13 16:03:14 +02:00
Martin Weinelt
89abecae69 pdns-recursor: 4.3.4 -> 4.3.5
Fixes: CVE-2020-25829
(cherry picked from commit f931e3e55d)
2020-10-13 15:47:49 +02:00
Aaron Andersen
0f8ec7daa1 powerdns: add nixos test to passthru.tests
(cherry picked from commit 6019fb179b)
2020-10-13 15:47:46 +02:00
Aaron Andersen
811d9e95a6 powerdns: compile with systemd support
(cherry picked from commit 94c98805cb)
2020-10-13 15:47:43 +02:00
Aaron Andersen
a708a30383 powerdns: update configure flags
(cherry picked from commit 7b2b0cc77c)
2020-10-13 15:47:41 +02:00
Aaron Andersen
9d5b974be0 pdns-recursor: add nixos test to passthru.tests
(cherry picked from commit 75dd806963)
2020-10-13 15:47:37 +02:00
Aaron Andersen
8bd02aea34 pdns-recursor: 4.3.3 -> 4.3.4
(cherry picked from commit 84f8419899)
2020-10-13 15:47:23 +02:00
Maximilian Bosch
f7fe019d53 flake.nix: allow inclusion of nixpkgs as path:/.../
When adding `nixpkgs` as flake-input using the `path`-fetcher, you
currently get the following error since neither `lastModifiedDate` nor
`lastModified` are stored in `flake.lock` for paths:

```
error: --- EvalError --------------------------------------------------------------------------- nix-build
at: (48:71) in file: /nix/store/147clg8svaxyj7pl80ra9kmmm72mdg94-source/flake.nix

    47|                   system.nixos.versionSuffix =
    48|                     ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified)}.${self.shortRev or "dirty"}";
      |                                                                       ^
    49|                   system.nixos.revision = final.mkIf (self ? rev) self.rev;

attribute 'lastModified' missing
```

This patch adds the fallback-value `19700101` to `versionSuffix` if none
of `lastModified{,Date}` are set in the lockfile.

(cherry picked from commit 3743c42f23)
2020-10-13 13:53:28 +02:00
Domen Kožar
cf542e991c Merge pull request #99619 from jmpunkt/jwm-gettext-fix-backport
[20.09] jwm: fix gettext requirement
2020-10-13 12:39:28 +02:00
Domen Kožar
298cda452e Merge pull request #99613 from OPNA2608/backport-20.09-update-cheesecutter-unstable-2020-04-03
[20.09] cheesecutter: unstable-2019-12-06 -> unstable-2020-04-03
2020-10-13 12:38:46 +02:00
Domen Kožar
05c0b20507 Merge pull request #98791 from freezeboy/backport-rsibreak
[20.09] rsibreak: 0.12.8 -> 0.12.13
2020-10-13 12:36:17 +02:00
Domen Kožar
1c5341c5ea Merge pull request #100365 from risicle/ris-poetry-1.1.1-r20.09
[20.09] pythonPackages.poetry: 1.0.10 -> 1.1.1
2020-10-13 12:36:02 +02:00
Domen Kožar
b3d764a125 Merge pull request #97736 from RaghavSood/solc/backport
[20.09] solc: 0.6.8 -> 0.7.1
2020-10-13 12:32:10 +02:00
Domen Kožar
a08fa83a05 Merge pull request #100364 from das-g/foundationsdb-backport
[20.09] foundationdb: fix build for current glibc version
2020-10-13 12:31:12 +02:00
Domen Kožar
70eb779b2f Merge pull request #100180 from tricktron/20.09-bazel_1-fix
[20.09] bazel_1: fix build on darwin
2020-10-13 12:30:27 +02:00
zowoq
1609e64a9e podman: 2.1.0 -> 2.1.1
https://github.com/containers/podman/releases/tag/v2.1.1
(cherry picked from commit bbeed7ecf8)
2020-10-13 19:51:28 +10:00
Sascha Grunert
f77d8ded1f podman: 2.0.6 -> 2.1.0
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
(cherry picked from commit 5c27f0dd65)
2020-10-13 19:51:19 +10:00
Vincent Laporte
63470cc8ed tamarin-prover: 1.4.1 → 1.6.0 (#100148)
(cherry picked from commit 33b7529b01)
2020-10-13 10:19:56 +02:00
Maximilian Bosch
a7a13a97c1 Merge pull request #100362 from fadenb/graylog_3.3.8_20.09
[20.09] graylog: 3.3.7 -> 3.3.8
2020-10-13 09:18:02 +02:00
Sarah Brofeldt
cc9ec4dafa Merge pull request #98811 from srhb/bp-ceph-1525
ceph: 15.2.4 -> 15.2.5 (#98664)
2020-10-13 09:07:55 +02:00
Diego Rodriguez
36d7be8ba4 kubernetes-helm: 3.3.1 -> 3.3.4
(cherry picked from commit 53fcb502fe)
2020-10-13 16:29:35 +10:00
Jonathan Ringer
fa1ddb4e98 nixos/doc: add nvidia prime changes
(cherry picked from commit 82e2fdea1e)
2020-10-12 23:05:54 -07:00
Aaron Andersen
1d48c57d69 Merge pull request #100336 from aanderse/pdns-cve-20.09
powerdns: 4.2.1 -> 4.2.3 [20.09 backport]
2020-10-12 20:09:04 -04:00
WORLDofPEACE
2324dcef76 Merge pull request #100224 from worldofpeace/pantheon-stuff-20.09
[20.09] Pantheon stuff
2020-10-12 18:49:42 -04:00
WORLDofPEACE
2728fc6d8f pantheon.wingpanel-applications-menu: add switchboard-with-plugs deps
Fixes https://github.com/NixOS/nixpkgs/issues/100209

(cherry picked from commit b808ad4294)
2020-10-12 18:47:28 -04:00
WORLDofPEACE
9490ea1127 pantheon.elementary-session-settings: cleanup
(cherry picked from commit a48be6a7f2)
2020-10-12 18:47:28 -04:00
WORLDofPEACE
d8d5afc207 pantheon.elementary-settings-daemon: don't patch autostarts
These are now generated to be patched as a part of the elementary-session-settings
build.

(cherry picked from commit a4572eb18e)
2020-10-12 18:47:28 -04:00
WORLDofPEACE
373ba0a506 pantheon.elementary-session-settings: 2020-06-11 -> 2020-07-06
Because gnome-session now uses 'enabled' systemd session we have
to make this use --builtin [0]

[0]: fa15cbd83f

(cherry picked from commit 17d7060f5d)
2020-10-12 18:47:28 -04:00
Austin Butler
31b3749d1f python3Packages.poetry: 1.1.0 -> 1.1.1
(cherry picked from commit aabdb540a4)
2020-10-12 22:44:49 +01:00
Austin Butler
184a1c0bb0 pythonPackages.poetry: 1.0.10 -> 1.1.0
(cherry picked from commit 9243c64e7f)
2020-10-12 22:44:48 +01:00
Austin Butler
16be5d8a18 pythonPackages.poetry-core: 1.0.0a9 -> 1.0.0
(cherry picked from commit 8b7914fc9b)
2020-10-12 22:44:48 +01:00
Tristan Helmich
f80720d9f8 graylog: 3.3.7 -> 3.3.8
Bumps Graylog and integration plugins to version 3.3.8.

(cherry picked from commit 26c66d0f33)
2020-10-12 20:54:40 +00:00
Raphael Borun Das Gupta
f5a433f98d foundationdb: fix build: use glibc's gettid()
to avoid build error due to conflicting declaration:

    flow/Profiler.actor.cpp: In function 'uint64_t gettid()':
    flow/Profiler.actor.cpp:56:17: error: ambiguating new declaration of 'uint64_t gettid()'
      FILE* f;
                     ^
    In file included from /nix/store/4wy9j24psf9ny4di3anjs7yk2fvfb0gq-glibc-2.31-dev/include/unistd.h:1170:0,
                     from ./flow/Platform.h:49,
                     from ./flow/flow.h:40,
                     from flow/Profiler.actor.cpp:39:
    /nix/store/4wy9j24psf9ny4di3anjs7yk2fvfb0gq-glibc-2.31-dev/include/bits/unistd_ext.h:34:16: note: old declaration '__pid_t gettid()'
     extern __pid_t gettid (void) __THROW;
                    ^~~~~~

(cherry picked from commit 450de176cf)
2020-10-12 22:49:49 +02:00
Raphael Borun Das Gupta
1be1a64d5f foundationdb: fix "was not declared" build errors
Since glibc 2.28, `<sys/types.h>` no longer includes
`<sys/sysmacros.h>`, which provides these macros,
so we have to explicitly import the latter, too, to fix the following
build problems:

    flow/Platform.cpp: In function 'void getDiskStatistics(const string&, uint64_t&, uint64_t&, uint64_t&, uint64_t&, uint64_t&, uint64_t&)':
    flow/Platform.cpp:626:56: error: 'gnu_dev_major' was not declared in this scope
       if(majorId == (unsigned int) gnu_dev_major(buf.st_dev) && minorId == (unsigned int) gnu_dev_minor(buf.st_dev)) {
                                                            ^
    flow/Platform.cpp:626:111: error: 'gnu_dev_minor' was not declared in this scope
       if(majorId == (unsigned int) gnu_dev_major(buf.st_dev) && minorId == (unsigned int) gnu_dev_minor(buf.st_dev)) {
                                                                                                                   ^

(cherry picked from commit 4406883af1)
2020-10-12 22:49:49 +02:00
Raphael Borun Das Gupta
80e14acc37 foundationdb: refresh gcc-fixes-patch
by applying it to apple/foundationdb@5.1.7 and running

    git diff > ${path_to_nixpkgs}/pkgs/servers/foundationdb/patches/gcc-fixes.patch

again.

(cherry picked from commit f1e628e7af)
2020-10-12 22:49:49 +02:00
Dmitry Kalinkin
6899c10886 Merge pull request #100083 from veprbl/pr/arrow_cpp_1_0_1_backport
[20.09] arrow-cpp: 1.0.0 -> 1.0.1
2020-10-12 16:21:10 -04:00
Robert Scott
73c72929d1 python3Packages.cocotb: 1.3.1 -> 1.3.2
doesn't seem we can remove Makefile.inc fixup yet

(cherry picked from commit 0b5d5d6828)
2020-10-12 12:08:32 -07:00
Robert Scott
6fa7f94768 python3Packages.cocotb: fix tests
(cherry picked from commit 78413483d3)
2020-10-12 12:08:32 -07:00
Matthew Bauer
6c2310c9af python3Packages.tensorflow: use cudatoolkit 11
(cherry picked from commit 59eecacd2d)
2020-10-12 12:07:35 -07:00
Matthew Bauer
f69610ad72 python3Packages.h5py: 2.9.0 -> 2.10.0
also disable on python 2.7
Co-authored-by: Jon <jonringer@users.noreply.github.com>

(cherry picked from commit 9cd240c14a)
2020-10-12 12:07:35 -07:00
Matthew Bauer
b48aa3ab28 python3Packages.tensorflow-estimator: 2.2.0 -> 2.3.0
(cherry picked from commit 74338f636a)
2020-10-12 12:07:35 -07:00
Arnout Engelen
3d1769aef9 python3Packages.tensorflow_2: 2.1.0 -> 2.3.0
Also:
- patch to remove scipy requirement
- add cuda to RPATH
- don’t include nvidia_x11 (This isn’t needed, we can get it from
/run/opengl-driver being in the RPATH.)

Co-authored-by: Arnout Engelen <arnout@bzzt.net>
Co-authored-by: Daniël de Kok <me@github.danieldk.eu>
(cherry picked from commit 1e19d446bf)
2020-10-12 12:07:35 -07:00
Jonathan Ringer
c827d81d2c python3Packages.tensorly: disable resource intensive tests
(cherry picked from commit 74c997d025)
2020-10-12 12:07:35 -07:00
Jonathan Ringer
38b2c947a3 python3Packages.clifford: fix tests
(cherry picked from commit d65aba684f)
2020-10-12 12:07:35 -07:00
Jonathan Ringer
37f591931c python3Packages.mask-rcnn: use tensorflow_2
(cherry picked from commit b25c404b09)
2020-10-12 12:07:35 -07:00
Jonathan Ringer
63c7dbf425 python3Packages.intake: fix tests
(cherry picked from commit 7c841a294c)
2020-10-12 12:07:35 -07:00
Jonathan Ringer
b01099fdd4 python3Packages.datashader: ignore flakey dask tests
(cherry picked from commit c65c94d08b)
2020-10-12 12:07:35 -07:00
Robert Scott
2ab20c9541 pythonPackages.wxPython: fix build on darwin
(cherry picked from commit 49b4cd546c)
2020-10-12 12:02:58 -07:00
WORLDofPEACE
538aa99275 Merge pull request #99909 from asbachb/20.09/security/netbeans
[20.09] backport:netbeans: 12.0 -> 12.1 - fix CVE-2020-11986
2020-10-12 12:03:46 -04:00
Maximilian Bosch
d7dde1475b element-desktop: 1.7.8 -> 1.7.9
https://github.com/vector-im/element-desktop/releases/tag/v1.7.9
(cherry picked from commit 7db09ea70a)
2020-10-12 16:46:08 +02:00
Maximilian Bosch
85c6c834ef element-web: 1.7.8 -> 1.7.9
https://github.com/vector-im/element-web/releases/tag/v1.7.9
(cherry picked from commit 50394cec59)
2020-10-12 16:46:04 +02:00
Aaron Andersen
b08606bd45 powerdns: 4.2.1 -> 4.2.3
(cherry picked from commit 85fa83bfb1)
2020-10-12 10:41:45 -04:00
rnhmjoj
ca3477ec93 sc-controller: fix broken svg icons
The gdk-pixbuf module exposed by librsvg wasn't detected
due to strictDeps being enabled by default in python packages.

(cherry picked from commit 65cbea4563)
2020-10-12 15:42:56 +02:00
Anderson Torres
ad072be6a7 Merge pull request #100253 from risicle/ris-django-anymail-8.1-r20.09
[20.09] pythonPackages.django-anymail: 6.1.0 -> 8.1, fixing build
2020-10-12 08:45:23 -03:00
Anderson Torres
a893539769 Merge pull request #100277 from ruuda/backport
[20.09] pythonPackages.google_cloud_dataproc: add missing deps
2020-10-12 08:44:41 -03:00
Lucas Savva
2920c04e34 nixos/acme: Fix ocspMustStaple option and add test
Some of the testing setup for OCSP checking was wrong and
has been fixed too.

(cherry picked from commit 1edd91ca09)
2020-10-11 23:45:27 +02:00
Florian Klink
2edc352b22 Merge pull request #100270 from p-h/backport-pystemd-0.8.0
[20.09] pystemd: 0.6.0 -> 0.8.0
2020-10-11 22:59:29 +02:00
Ruud van Asseldonk
e76d5f4efd pythonPackages.google_cloud_dataproc: add missing deps 2020-10-11 22:43:04 +02:00
Ruud van Asseldonk
e08911f186 pythonPackages.proto-plus: init at 1.10.1
I am adding this package because it is a dependency of
google_cloud_dataproc.
2020-10-11 22:43:03 +02:00
Ruud van Asseldonk
7911f87840 pythonPackages.libcst: init at 0.3.12
I am adding this package because it is a dependency of
google_cloud_dataproc.
2020-10-11 22:43:03 +02:00
Philippe Hürlimann
1ffb9a53e8 pystemd: 0.6.0 -> 0.8.0
(cherry picked from commit ea34b5d333)
2020-10-11 21:04:13 +02:00
Florian Klink
1467c169ab golden-cheetah: 3.5-RC2X -> 3.5
(cherry picked from commit 43dc271256)
2020-10-11 19:35:36 +02:00
Florian Klink
87f329dfcc golden-cheetah: fix build with bison 3.7
Currently, GoldenCheetah fails to build with Bison >=3.7 (which we use
for some time).

This applies the commit from https://github.com/GoldenCheetah/GoldenCheetah/pull/3590.

Upstream issue: https://github.com/GoldenCheetah/GoldenCheetah/issues/3586

(cherry picked from commit a73c1259d1)
2020-10-11 19:35:36 +02:00
Tim Steinbach
547c1680c7 rtl88x2bu: 2020-05-19 -> 2020-08-20
(cherry picked from commit 184e3824eb)
2020-10-11 13:19:28 -04:00
Mario Rodas
158b81ebad Merge pull request #100220 from fadenb/graylog_3.3.7_20.09
[20.09] graylog: 3.3.6 -> 3.3.7
2020-10-11 11:54:58 -05:00
Robert Scott
ed877dc131 pythonPackages.django-anymail: 6.1.0 -> 8.1, fixing build
(cherry picked from commit fb20a2f141)
2020-10-11 16:10:51 +01:00
Robert Scott
2966772fce Merge pull request #100237 from risicle/ris-arviz-xarray-r20.09
[20.09] pythonPackages.xarray, pythonPackages.arviz: bump/fix build
2020-10-11 16:08:27 +01:00
Michael Weiss
5cd8cea55c Merge pull request #100166 from jonringer/backport-fqdn
[20.09] doc: Document a workaround for using an FQDN as hostname
2020-10-11 16:02:10 +02:00
Robert Scott
58a97c5612 pythonPackages.arviz: 0.7.0 -> 0.10.0, fixing tests
(cherry picked from commit 6cd6626691)
2020-10-11 14:01:50 +01:00
Frederik Rietdijk
f534bee0e4 python3Packages.xarray: 0.16.0 -> 0.16.1
(cherry picked from commit 4e1f8e4e31)
2020-10-11 14:01:49 +01:00
WORLDofPEACE
be8f3ec15c [20.09] gnome3.mutter334: 3.34.5 -> 3.34.6, update patches
Now managing patches using my git-series.

* drop xwayland-path
  It now uses find_program.path()

* add 0008-build-bump-ABI-to-sysprof-capture-4.patch
  This allows us to build with the sysprof in nixpkgs.

This is a version of the update using a series just for the gnome
stack on 20.09 (21.03 has 3.38 and sysprof-4).
2020-10-11 06:40:50 -04:00
Tristan Helmich
99fcc1baf6 graylog: 3.3.6 -> 3.3.7
Bumps Graylog and integration plugins to version 3.3.7.
(cherry picked from commit 4115906195)
2020-10-11 09:57:46 +00:00
Vladimír Čunát
7a452bccea thunderbird*-68: mark as insecure
(cherry picked from commit 230728216a)
2020-10-11 11:17:05 +02:00
WORLDofPEACE
006e716e79 nixos/gnome3: don't install epiphany default
See https://github.com/NixOS/nixpkgs/issues/98819

(cherry picked from commit 13b192749c)
2020-10-10 23:29:28 -04:00
IvarWithoutBones
5ed3b0798a pythonPackages.pyotp: fix tests
(cherry picked from commit ae23d0bf634d460be9e75702f369a08c1c2e64ba)
2020-10-10 19:44:42 -07:00
Thibault Gagnaux
c8f9a54743 python3Packages.fs: fix tests on darwin
Refactors to pytestCheckHook and removes unused nose dependency.

(cherry picked from commit 66afda2857)
2020-10-10 19:23:34 -07:00
Robert Scott
c9fa6aa160 oq: fix build
this patch is actually included in the already-released oq 1.1.2, but we
can't upgrade to that because it requires crystal 0.35, which we don't
seem to have yet

enable for darwin

(cherry picked from commit 892712e260)
2020-10-10 19:05:29 -07:00
Robert Scott
e8556296e1 sleepyhead: fix build
switch back to qt 5.12

(cherry picked from commit ae31bec12b)
2020-10-10 19:02:43 -07:00
Robert Scott
460db363bb partimage: fix build
the move to glibc 2.30 broke the build of this old package, fortunately
debian have a patch to fix it

(cherry picked from commit 5983c412d7)
2020-10-10 19:01:47 -07:00
Robert Scott
c0528be9cb lockdep: 4.1.2 -> 5.0.21, fix build, enable tests
required a bit of an overhaul to ensure we're compiling against *this*
kernel's headers, not those in glibc which are presumably from some other
random kernel version.

would be nice to update to a more recent version, the build of this tool
reportedly got broken soon after this release.

(cherry picked from commit b3951d18df)
2020-10-10 18:47:59 -07:00
Josef Kemetmüller
37547b5f42 python.pkgs.scikit-optimize: 0.6 -> 0.8.1
This fixes the build of scikit-optimize.

(cherry picked from commit b8f130e2b4)
2020-10-10 18:17:59 -07:00
Robert Scott
c4ea77f594 packetdrill: 1.0 -> unstable-2020-08-22, fix build
also switch to cmake build

(cherry picked from commit 87fad4d39e)
2020-10-10 18:07:31 -07:00
Anderson Torres
8d4a4dd64a Merge pull request #100184 from OPNA2608/update/palemoon-28.14.2@20.09
[20.09] palemoon: 28.13.0 -> 28.14.2
2020-10-10 22:04:31 -03:00
OPNA2608
806e74c6ed palemoon: 28.13.0 -> 28.14.2
(cherry picked from commit 559cf217d6)
2020-10-11 01:27:32 +02:00
Thibault Gagnaux
ea5505ff0e bazel_1: fix build on darwin
Use clang_8 instead of clang_7 on darwin to fix thread_local storage error.

(cherry picked from commit f7aafe6345)
2020-10-10 23:22:07 +02:00
Robert Scott
51aaa3fa1b Merge pull request #100153 from tricktron/20.09-fsspec-fix
[20.09] python3Packages.fsspec: fix tests on linux
2020-10-10 22:01:32 +01:00
Jan Tojnar
dd039151df nixos/doc: Mention fontconfig changes in 20.09 RN
This is a major change but it should not cause any issues.

(cherry picked from commit be2f1cb15c)
2020-10-10 16:47:57 -04:00
Jiehong Ma
c0bab38b5b doc: add the removal of Python 3.5 to the 20.09 release notes (#95765)
(cherry picked from commit 63c7735733)
2020-10-10 16:45:09 -04:00
Robert Scott
9f16269774 Merge pull request #100154 from tricktron/20.09-bazel_0-fix
[20.09] bazel_0: fix build on darwin
2020-10-10 20:24:37 +01:00
Michael Weiss
4cbe1d56c9 doc: Document a workaround for using an FQDN as hostname
Since #76542 this workaround is required to use a FQDN as hostname. See
#94011 and #94022 for the related discussion. Due to some
potential/unresolved issues (legacy software, backward compatibility,
etc.) we're documenting this workaround [0].

[0]: https://github.com/NixOS/nixpkgs/issues/94011#issuecomment-705952300

(cherry picked from commit 4a600af1b1)
2020-10-10 10:49:46 -07:00
Martin Weinelt
fd341a576e Merge pull request #99642 from risicle/ris-olsrd-0.9.8-r20.09
[20.09] olsrd: 0.9.6.1 -> 0.9.8, fix build
2020-10-10 19:41:51 +02:00
Henri Menke
523564d2f8 zfsUnstable: 2.0.0-rc2 -> 2.0.0-rc3
(cherry picked from commit 952b698689)
2020-10-10 10:35:35 -07:00
Gabor Greif
909ef02aa1 llvm_11: 11.0.0rc3 -> 11.0.0rc5
(cherry picked from commit a64eabfe7c)
2020-10-10 18:32:04 +02:00
Gabor Greif
c012a0c447 llvm_11: 11.0.0rc2 -> 11.0.0rc3
(cherry picked from commit 1c0cbf8aea)
2020-10-10 18:32:03 +02:00
Michael Weiss
86c8ef01aa chromium: Disable VA-API by default
This is done to avoid driver specific issues and restores the previous
behaviour. Like before video acceleration can be enabled without having
to rebuild Chromium.

(cherry picked from commit 73b67da169)
2020-10-10 18:27:09 +02:00
TredwellGit
42f30f3ae1 chromium: Fix and enable our ANGLE support
This will additionally install the following files:
libEGL.so libGLESv2.so
libVkICD_mock_icd.so libvk_swiftshader.so libvulkan.so

libEGL.so and libGLESv2.so are required to fix our ANGLE support.
The rest should help with the Vulkan support (currently an experimental
feature that is disabled by default).

(cherry picked from commit 757bbdd948)
2020-10-10 18:26:56 +02:00
Michael Weiss
ef5d0d606e chromium: 85.0.4183.121 -> 86.0.4240.75
https://chromereleases.googleblog.com/2020/10/stable-channel-update-for-desktop.html

This update includes 35 security fixes.

CVEs:
CVE-2020-15967 CVE-2020-15968 CVE-2020-15969 CVE-2020-15970
CVE-2020-15971 CVE-2020-15972 CVE-2020-15990 CVE-2020-15991
CVE-2020-15973 CVE-2020-15974 CVE-2020-15975 CVE-2020-15976
CVE-2020-6557 CVE-2020-15977 CVE-2020-15978 CVE-2020-15979
CVE-2020-15980 CVE-2020-15981 CVE-2020-15982 CVE-2020-15983
CVE-2020-15984 CVE-2020-15985 CVE-2020-15986 CVE-2020-15987
CVE-2020-15992 CVE-2020-15988 CVE-2020-15989

(cherry picked from commit f79703e50c)
2020-10-10 18:26:55 +02:00
Janne Heß
03416d8eae asterisk: Bump all packages
All packages were outdated.
Asterisk 15 is not supported anymore, but there is 17 now.

All versions bumped pjproject to 2.10 which requires overriding the
prefix.

Since Asterisk 17, `make install-headers` seems to be needed.

(cherry picked from commit c5e8dbc4f1)
2020-10-10 17:21:00 +02:00
Thibault Gagnaux
d4ac747a9e bazel_0: fix build on darwin
Fixes `error: thread-local storage is not supported for the current target` by
upgrading clang_7 -> to clang_8 which supports thread-local storage.

(cherry picked from commit fd2c495e97)
2020-10-10 16:33:03 +02:00
Thibault Gagnaux
4188bf40dd python3Packages.fsspec: fix tests on linux
Disables flaky test. Has been resolved in https://github.com/intake/filesystem_spec/issues/432 and
can thus be enabled again starting from version `0.8.4`.

(cherry picked from commit 0a9641b3bb)
2020-10-10 16:25:48 +02:00
gnidorah
ef619aa977 rambox: 0.7.6 -> 0.7.7
(cherry picked from commit 86630c774d)
2020-10-10 11:18:42 +02:00
gnidorah
4533fdcf06 rambox: 0.7.5 -> 0.7.6
(cherry picked from commit cac4080c44)
2020-10-10 11:18:41 +02:00
WORLDofPEACE
bda8628b2b gnomeExtensions.dash-to-dock: 2020-04-20 -> 69
This version supports both 3.36 and 3.38.

(cherry picked from commit 8cee2ba640)
2020-10-09 20:24:51 -04:00
WORLDofPEACE
ee9f8ac6c0 nixos/display-managers: install sessionData.desktops
Fixes https://github.com/NixOS/nixpkgs/issues/100108

(cherry picked from commit 3cd2b59b8c)
2020-10-09 19:31:55 -04:00
Dmitry Kalinkin
1cd0f2d326 pyhton3Packages.ibis-framework: fix tests for pandas 1.1
(cherry picked from commit c9f7ef3f12)
cc #100099
2020-10-09 16:46:28 -04:00
Jiehong Ma
fa1afc07b9 doc: add AMD rocm and vulkan to 20.09 release notes (#95765)
(cherry picked from commit c3e4594eaf)
2020-10-09 16:39:48 -04:00
Dmitry Kalinkin
f11f085725 dmtx-utils: enable on darwin
(cherry picked from commit eca072f96b)
2020-10-09 16:13:50 -04:00
Dmitry Kalinkin
4106f64d85 arrow-cpp: 1.0.0 -> 1.0.1
(cherry picked from commit 6b74dfe376)
2020-10-09 09:16:07 -04:00
Tim Steinbach
60ec8e5c61 linux/hardened/patches/5.8: 5.8.12.a -> 5.8.14.a
(cherry picked from commit 8293f9509e)
2020-10-09 08:42:34 -04:00
Tim Steinbach
753177c404 linux/hardened/patches/5.4: 5.4.68.a -> 5.4.70.a
(cherry picked from commit edf17457ed)
2020-10-09 08:42:34 -04:00
Tim Steinbach
7ab55cf443 linux/hardened/patches/4.19: 4.19.148.a -> 4.19.150.a
(cherry picked from commit 6f4d132a08)
2020-10-09 08:42:33 -04:00
Tim Steinbach
80abe104ca linux/hardened/patches/4.14: 4.14.199.a -> 4.14.200.a
(cherry picked from commit 84c56e0dbb)
2020-10-09 08:42:33 -04:00
Vladimír Čunát
a786d00cda knot-dns: 2.9.6 -> 2.9.7
https://gitlab.nic.cz/knot/knot-dns/-/tags/v2.9.7
NixPkgs master is on 3.0.x already.
2020-10-09 12:02:51 +02:00
Maximilian Bosch
0b8799ecaa yarn2nix-moretea: re-add support for git:// URLs from yarn.lock
@lheckemann already added it to `yarn2nix` a while ago[1], but it seems
as it was forgotten to include when adding `yarn2nix` sources to
`nixpkgs` itself.

Without this patch, you cannot add dependencies to your `package.json`
with URLs like `git://github.com/.../` as building the expression would
fail like this:

```
curl: (1) Protocol "git" not supported or disabled in libcurl
error: cannot download git___github.com_sstur_nodeftpd.git from any mirror
```

Co-authored-by: Linus Heckemann <git@sphalerite.org>

[1] https://github.com/nix-community/yarn2nix/pull/141

(cherry picked from commit 0c49f1896e)
2020-10-09 10:02:06 +02:00
Robert Scott
99fa7616c0 pythonPackages.sievelib: fix build by adding patch
this fixes installation with newer pip versions

also give a name to an existing patch

(cherry picked from commit 4d111fdf39)
2020-10-08 19:41:02 -07:00
Mario Rodas
6f9084711d Merge pull request #99942 from toonn/release-20.09
wire-desktop backport to release-20.09
2020-10-08 18:19:30 -05:00
Maximilian Bosch
555375859b nixos/nextcloud: --database-pass must not be empty for pgsql/mysql
This is a breaking change from `nextcloud20`. However, the affected test
is still passing with an unused database password and socket
authentication.

(cherry picked from commit 9cbe30e129)
2020-10-08 23:12:03 +02:00
Maximilian Bosch
452603b385 nixos/nextcloud: update nginx config for nextcloud20
See #97666 for further context.

(cherry picked from commit 227ba90b28)
2020-10-08 23:12:03 +02:00
Maximilian Bosch
8597315fae nextcloud20: init
(cherry picked from commit 71098fba81)
2020-10-08 23:12:03 +02:00
Maximilian Bosch
e30e8842ce nixos/nextcloud: fix nginx config to allow copy/move-operations again
(cherry picked from commit 609c4f497d)
2020-10-08 23:12:03 +02:00
Robert Scott
8690f062b3 Merge pull request #99966 from wkral/backport-gym-fix
[20.09] python3Packages.gym: fix dependency constraints
2020-10-08 21:10:45 +01:00
Tim Steinbach
a6dca580a2 jenkins: 2.249.1 -> 2.249.2
(cherry picked from commit 553ec1bf72)
2020-10-08 14:51:39 -04:00
Robert Scott
b4b1835559 Merge pull request #99923 from austinbutler/alerta-server-backport
[20.09] python3Packages.alerta-server: fix build
2020-10-08 19:38:27 +01:00
Robert Scott
ac49519150 Merge pull request #99891 from risicle/ris-matplotlib-darwin-fix-r20.09
[20.09] matplotlib: Disable LTO on darwin.
2020-10-08 19:30:39 +01:00
Austin Seipp
d0077a6c72 Merge pull request #98577 from NieDzejkob/chez-backport
[20.09] chez-modules: Fix path to csv-site.
2020-10-08 12:36:45 -05:00
rnhmjoj
305ff0c412 monero-gui: fix aarch64 build
(cherry picked from commit fa2f50f313e5df635587cbb23a3b7e2846731166)
2020-10-08 18:15:23 +02:00
rnhmjoj
d8475fa0e7 monero: apply patch to fix monero-gui build
This is a more appropriate solution to fix a
build error in monero-gui.

(cherry picked from commit b5ca332b1d)
2020-10-08 18:15:23 +02:00
rnhmjoj
cf7ff15f73 monero-gui: use the cmake build system
(cherry picked from commit 059292cc64)
2020-10-08 18:15:23 +02:00
rnhmjoj
4d03da7ee7 monero: export patched sources
This is needed to build monero-gui without duplicating code.

(cherry picked from commit 59fe3e87c3)
2020-10-08 18:15:23 +02:00
rnhmjoj
f6cc6a7897 monero: force use of system libraries
(cherry picked from commit cc90474581)
2020-10-08 18:15:23 +02:00
Pavol Rusnak
d30b5ef852 monero-gui: 0.16.0.3 -> 0.17.0.1
(cherry picked from commit e40ede1821)
2020-10-08 18:15:22 +02:00
Pavol Rusnak
11b824181a monero: 0.16.0.3 -> 0.17.0.1
(cherry picked from commit d6921aa4bf)
2020-10-08 18:15:22 +02:00
Claudio Bley
31cf6ac8d8 notmuch: 0.30.1c80020 -> 0.31
(cherry picked from commit f53bc76ee5)
2020-10-08 18:12:23 +02:00
ajs124
ed00b86684 Merge pull request #100018 from helsinki-systems/bp/sogo501
[20.09] sogo: 5.0.0 -> 5.0.1
2020-10-08 17:03:14 +02:00
Lassulus
e8ca6081f5 Merge pull request #99904 from Sohalt/electricsheep-20.09
[20.09] electricsheep: 2.7b33-2017-10-20 -> 3.0.2-2019-10-05, fix build
2020-10-08 13:48:50 +02:00
Janne Heß
438a182a1d sogo: 5.0.0 -> 5.0.1
(cherry picked from commit 3f69715b63)
2020-10-08 10:37:09 +02:00
Vladimír Čunát
1c6e95a1e5 Merge branch 'staging-20.09' into release-20.09
It's mostly rebuilt, especially the two x86 platforms.
https://hydra.nixos.org/eval/1617854
2020-10-08 10:20:34 +02:00
Jonathan Ringer
bcba98c529 python3Packages.sphinx-argparse: reintroduce
was accidently removed in 6b23dc8f96

(cherry picked from commit 7621902c12)
2020-10-07 17:40:38 -07:00
Martin Weinelt
1e77c4225f Merge pull request #99484 from mweinelt/20.09/lilypond
[20.09] lilypond: add patch to restrict embedded-{ps,svg} when -dsafe is used
2020-10-07 21:21:24 +02:00
William Kral
5e3527e42d python3Packages.gym: fix dependency constraints
(cherry picked from commit c097e85a2f)
2020-10-07 10:29:14 -07:00
Tim Steinbach
97d9ec2b12 linux: 5.8.13 -> 5.8.14 2020-10-07 08:24:06 -04:00
Tim Steinbach
41f3b9e95d linux: 5.4.69 -> 5.4.70 2020-10-07 08:24:06 -04:00
Tim Steinbach
880571eabc linux: 4.19.149 -> 4.19.150 2020-10-07 08:24:05 -04:00
Shea Levy
4fe38f7b11 zulip: Don't use buildFHSUserEnvBubblewrap.
For as-yet unknown reasons, this causes zulip to launch with a grey screen.

See https://github.com/NixOS/nixpkgs/pull/97264#issuecomment-704454645

(cherry picked from commit c800d20b67)
2020-10-07 07:58:55 -04:00
David Anderson
7bd0f6ffdf jasper: remove, abandoned upstream.
Jasper has been marked insecure for a while, and upstream has not
been responsive to CVEs for over a year.

Fixes #55388.

Signed-off-by: David Anderson <dave@natulte.net>
(cherry picked from commit 3a38cef8f9)
2020-10-07 13:12:42 +02:00
Dan Callahan
f57d914ae8 digikam: fix broken icons
Ensures that the Breeze icon theme is available to digikam.
Without this, digikam breaks in strange ways.

Fixes #65322
Fixes #78225

(cherry picked from commit afec4b31bd)
2020-10-07 13:12:17 +02:00
Andreas Rammhold
8c2b1d4a06 Merge pull request #99692 from worldofpeace/pipewire-firefox-20.09
[20.09] firefox: enable pipewire+webrtc for wayland users
2020-10-07 12:51:55 +02:00
toonn
7a61b768d1 wire-desktop: mac 3.18.3728 -> 3.20.3912
(cherry picked from commit 4448bd4e10)
2020-10-07 12:36:23 +02:00
toonn
02743360a7 wire-desktop: linux 3.18.2925 -> 3.20.2934
(cherry picked from commit ad9d115682)
2020-10-07 12:36:06 +02:00
Austin Butler
2983b1c1be python3Packages.alerta-server: fix build
(cherry picked from commit 9050ae07cf)
2020-10-06 21:25:06 -07:00
Andreas Rammhold
de4dc6b447 nixos/security/acme: order after nss-lookup.target
This should hopefully solve races with DNS servers (such as unbound)
during the activation of a new generation. Previously unbound could
still be unavailable and thus the acme script would fail.

(cherry picked from commit 2c0ee52d91)
2020-10-06 17:16:11 -07:00
Benjamin Asbach
56c840de2c netbeans: 12.0 -> 12.1
This fixes #99814

(cherry picked from commit 69027b0c95)
2020-10-07 00:56:13 +02:00
sohalt
afa708a951 electricsheep: 2.7b33-2017-10-20 -> 3.0.2-2019-10-05, fix build
(cherry picked from commit 3718d52f26)
2020-10-06 23:08:45 +02:00
WORLDofPEACE
e350a3327e Merge pull request #99897 from andir/20.09/use-configured-nix-for-installer
[20.09] nixos/installer: drop the extra nixUnstable in nixos-install
2020-10-06 16:59:32 -04:00
Vincent Laporte
d5b88037ae ocamlPackages.earley: 2.0.0 → 3.0.0
(cherry picked from commit e7ebd6be80)
2020-10-06 22:37:20 +02:00
Andreas Rammhold
0f6fffa4d0 nixos/installer: drop the extra nixUnstable in nixos-install
The only nix version available in the installer should be the version
configure in the module system. If someone needs `nixUnstable` in their
`nixos-install` they should probably set the module option and not just
add it to the closure.

(cherry picked from commit 544059b01f)
2020-10-06 22:31:17 +02:00
WORLDofPEACE
001334b47c nixos/gnome3: add realtime-scheduling option
This adds an option services.gnome3.experimental-features.realtime-scheduling
See this comment for the motivation [0].
Having gnome-shell launched with capability seemed harmless at first,
but it caused these issues [1] [2] for people who aren't even using
the feature. It makes more sense to make this optional.

[0]: https://github.com/NixOS/nixpkgs/issues/90201#issuecomment-683304279
[1]: https://github.com/NixOS/nixpkgs/issues/90201
[2]: https://github.com/NixOS/nixpkgs/issues/86730

(cherry picked from commit 656cd70ea8)
2020-10-06 16:30:45 -04:00
WORLDofPEACE
ad10d15421 nixos/plasma5: add spectacle default
Fixes https://github.com/NixOS/nixpkgs/issues/99680.

In the future I think it would be nice if plasma5 could assume
an approach for an interface we have in the gnome3 module [0].
Notably being able to exclude packages with an option from
the default environment and having a default environment that
is useful to the average user. See [1], currently plasma5 defaults
are very "hard core hacker" with the most bare bones setup.

[0]: https://github.com/NixOS/nixpkgs/issues/67310
[1]: https://github.com/NixOS/nixpkgs/issues/67310#issuecomment-524649585

(cherry picked from commit 55bc3e44b7)
2020-10-06 16:28:13 -04:00
Jonathan Ringer
695d9d3c8a python3Packages.localzone: 0.9.6 -> 0.9.7
(cherry picked from commit 0093e4e6a9)
2020-10-06 12:04:42 -07:00
Jonathan Ringer
a5a96e0cfa ape: don't inherit lexicon from pkgs scope
(cherry picked from commit 90e5082576)
2020-10-06 12:04:42 -07:00
Shea Levy
a4e6bf389d matplotlib: Disable LTO on darwin.
Needs #19312 or equivalent to work.

(cherry picked from commit 31579c6b0a)
2020-10-06 20:04:39 +01:00
R. RyanTM
b60f5e90cf python27Packages.identify: 1.4.29 -> 1.5.5
(cherry picked from commit def388af0a)
Signed-off-by: Domen Kožar <domen@dev.si>
2020-10-06 19:38:21 +02:00
Domen Kožar
16325b3d66 nix-linter: 2019-04-26 -> 2020-09-25
(cherry picked from commit a05f231884)
Signed-off-by: Domen Kožar <domen@dev.si>
2020-10-06 19:34:13 +02:00
Vladimír Čunát
9af5e0568d Merge branch 'release-20.09' into staging-20.09
A few thousand rebuild's happened; estimate:
    929 x86_64-darwin
   2924 x86_64-linux
2020-10-06 15:14:33 +02:00
Shea Levy
0caacb6242 zulip: 5.4.0 -> 5.4.3
(cherry picked from commit 34c015f1ec)
2020-10-06 09:00:12 -04:00
WORLDofPEACE
7c5f35fc48 nixos/gnome3: fixup unconditional code
(cherry picked from commit afdeb406b0)
2020-10-06 07:38:29 -04:00
Andreas Rammhold
c9c0b90b62 firefox: ensure pipewire is only enabled with wayland & webrtc
This ensures that we aren't applying any of the experiemental pipewire
patches when the dependencies aren't enabled. As of now pipewire only
works with wayland and webrtc. If either of them are not activated we
can't build with pipewireSupport and we should not.
2020-10-06 12:10:08 +02:00
Raphael Borun Das Gupta
0d345f5fd6 python39: 3.9.0rc2 -> 3.9.0
(cherry picked from commit 3696bc0e89)
2020-10-06 08:33:10 +02:00
Matt Votava
3c4e4be514 nixos/gnome3: don't enable modules for excludePackages
(cherry picked from commit bc970e94e7)
2020-10-06 01:19:36 -04:00
Cole Mickens
57fb6514b8 firefox: enable pipewire+webrtc for wayland users
(cherry picked from commit 31e54cdde3)
2020-10-06 01:12:56 -04:00
WORLDofPEACE
ff3215f7f1 Merge pull request #99670 from santicalcagno/backport
[20.09] fbpanel: fix build by adding gdk-pixbuf-xlib
2020-10-06 01:07:03 -04:00
WORLDofPEACE
8545b4abdc Merge pull request #99690 from cole-h/nixos-install-add-store-20.09
[20.09] nixos-install: use mountpoint as store
2020-10-06 01:05:16 -04:00
Cole Helbling
4798cb54a8 nixos-install: use mountpoint as store
Otherwise, it's possible building a flake may cause the live CD to run
out of memory.

(cherry picked from commit 3bbe4c322a)
2020-10-05 21:50:12 -07:00
Mario Rodas
7badbf18c4 chipsec: disable on non-Linux
(cherry picked from commit f3031298b2)
2020-10-05 20:20:24 -05:00
Mario Rodas
0262cae27f chipsec: disable on non-Linux
(cherry picked from commit 2cdc05763f)
2020-10-05 20:20:24 -05:00
Mario Rodas
a2d537a779 Merge pull request #99643 from risicle/ris-terraform-compliance-fix-r20.09
[20.09] terraform-compliance: fix build
2020-10-05 20:05:49 -05:00
Santiago Calcagno
9e77444b6e fbpanel: fix build by adding gdk-pixbuf-xlib
(cherry picked from commit 104017def0)
2020-10-05 19:13:38 -03:00
Robert Scott
adf11e9085 pythonPackages.islpy: fix build
also convert to pytestCheckHook

(cherry picked from commit be1281bc0b)
2020-10-05 14:54:49 -07:00
Léo Gaspard
b70fdcd506 matrix-synapse module: fix documentation and add release notes (#99564)
(cherry picked from commit e0c48efc17)
2020-10-05 23:36:29 +02:00
WORLDofPEACE
9b36117af0 Merge pull request #99657 from cole-h/fix-nix-shell-and-borg-20.09
[20.09] top-level: ignore unexpected args
2020-10-05 17:01:25 -04:00
Cole Helbling
c2c7a5cecd top-level: ignore unexpected args
This fixes both `nix-shell` failing to eval with `nixUnstable`, as well
as ofborg's failure to eval on aarch64 due to passing an "unexpected
arg" (1112e3a8c8/ofborg/src/nix.rs (L334-L340)).

(cherry picked from commit 11eddd61bc)
2020-10-05 13:23:51 -07:00
Cole Helbling
9f76b6edd1 Revert "top-level: fix nix-shell eval w/nixUnstable"
This reverts commit fa6064ad86.

(cherry picked from commit d91cab87b1)
2020-10-05 13:23:51 -07:00
Tim Steinbach
e8228cb0f0 ena: 2.2.7 -> 2.2.11
(cherry picked from commit 1687c719f8)
2020-10-05 16:16:26 -04:00
Tim Steinbach
a537813e08 rtl8821cu: 2020-05-16 -> 2020-08-21
(cherry picked from commit 6fbd64645c)
2020-10-05 16:15:58 -04:00
Tim Steinbach
d5052d6a90 rtl8812au: 5.6.4.2_35491.20200318 -> 5.6.4.2_35491.20200702
(cherry picked from commit ce79348fe4)
2020-10-05 16:15:24 -04:00
Jonas Meurer
ba1ad328ed jwm: fix gettext requirement
Jwm requests a specific version of gettext. Since the current version
of gettext is higher, the build fails. Gettext supports to request
a minimum version (since 0.19.6). A patch is introduces which requests
the minimum version 0.19.6.

(cherry picked from commit 1a22a73dde)
2020-10-05 21:03:50 +02:00
WORLDofPEACE
5c68755102 Merge pull request #99629 from ttuegel/staging-20.09--plasma-switch-user
systemd: show CanMultiSession again
2020-10-05 14:19:43 -04:00
Drew Risinger
259f722437 terraform-compliance: fix build
* Disables lock of pythonPackages.ipython to allow
    building with what's in nixpkgs

(cherry picked from commit 85ce380564)
2020-10-05 19:04:13 +01:00
Christoph Neidahl
724d372a3a cheesecutter: unstable-2019-12-06 -> unstable-2020-04-03
(cherry picked from commit e782471d2b)
2020-10-05 19:58:12 +02:00
Robert Scott
af049d1f9e olsrd: 0.9.6.1 -> 0.9.8, fix build
incorporate patch fixing build against bison 3.7 pinched from openwrt

(cherry picked from commit 36d66c0b43)
2020-10-05 18:37:40 +01:00
Tim Steinbach
1b40fb34fd Revert "Revert "linux-hardened: 5.7 -> 5.8""
This reverts commit ad3a5d5092.
2020-10-05 11:32:10 -04:00
Tim Steinbach
e178d83cf8 Merge pull request #99622 from NeQuissimus/fix_hardened_58
tests/hardened: Fix usage with 5.8

(cherry picked from commit 0913d8c4d5)
2020-10-05 11:31:56 -04:00
Thomas Tuegel
9aa7dfeb6f systemd: show CanMultiSession again
(cherry picked from commit 4e384ddc11)
2020-10-05 09:50:53 -05:00
Eelco Dolstra
67c303e753 nixos-generate-config: Add missing newline
(cherry picked from commit b551f06097)
2020-10-05 14:46:23 +02:00
Vladimír Čunát
ad3a5d5092 Revert "linux-hardened: 5.7 -> 5.8"
This reverts commit 4712b946e4.
This broke a test and has been blocking the channel for over a week.
(see https://github.com/nixos/nixpkgs/commit/4712b946e )
2020-10-05 05:13:30 +02:00
WORLDofPEACE
b5ba70103b Merge pull request #99537 from mdevlamynck/backport
[20.09] sawfish: fix build by replacing gdk-pixbuf with gdk-pixbuf-xlib
2020-10-04 19:42:51 -04:00
Robert Scott
b2ac083574 Merge pull request #99543 from risicle/ris-hidapi-darwin-fix-r20.09
[20.09] pythonPackages.hidapi: fix build on darwin
2020-10-04 22:35:46 +01:00
Justin Humm
77660fc646 monoid: 2016-07-21 -> 2018-06-03
Also applied a patch, so we can build with python3Packages.fontforge, as
fontforge doesn't have python2 bindings anymore.

(cherry picked from commit b6b8503f85)
2020-10-04 21:40:42 +02:00
Jonathan Ringer
27fcfaa2c0 nixpkgs-review: 2.4.1 -> 2.4.2
(cherry picked from commit a51c51c6b0)
2020-10-04 09:14:01 -07:00
Jonathan Ringer
cf5bea5a04 nixpkgs-review: 2.4.0 -> 2.4.1
(cherry picked from commit 6d812f2a73)
2020-10-04 09:14:01 -07:00
Robert Scott
54e4fdfe85 Merge pull request #99548 from risicle/ris-gomplate-init-r20.09
[20.09] gomplate: init at 3.8.0
2020-10-04 16:46:18 +01:00
Maximilian Bosch
ec20ddd254 nixos/nextcloud: fix nginx-config for Nextcloud 19 and older
It seems as I misconfigured `nginx` for certain cases such as the
`ldap`-plugin[1] in 42f6244899. This patch
fixes the `nginx`-config to match the upstream recommendations[2].

Also added a comment to the module to remind myself to ensure that
`nginx` will work with both v19 and v20 as soon as the latter is
released and can be packaged in `nixpkgs`.

Co-authored-by: nivadis <nivadis@users.noreply.github.com>

[1] https://github.com/nextcloud/server/issues/16194#issuecomment-688839888
[2] https://docs.nextcloud.com/server/19/admin_manual/installation/nginx.html

(cherry picked from commit 8d8871c565)
2020-10-04 14:05:52 +02:00
Robert Scott
ff2e0ca52d gomplate: init at 3.8.0
(cherry picked from commit d451ecbc9c)
2020-10-04 12:59:12 +01:00
Thomas Tuegel
0c218a4c2e Merge pull request #99542 from ttuegel/release-20.09--plasma-missing-attrs
[20.09] kdenetworking-filesharing: move to top level
2020-10-04 06:55:12 -05:00
Robert Scott
63f0d994c9 pythonPackages.hidapi: fix build on darwin
also add pythonImportsCheck

(cherry picked from commit bd55969cf9)
2020-10-04 12:13:51 +01:00
Thomas Tuegel
10f69167e2 kdenetworking-filesharing: move to top level 2020-10-04 05:43:47 -05:00
Matthias Devlamynck
424805d8c0 sawfish: fix build by replacing gdk-pixbuf with gdk-pixbuf-xlib
(cherry picked from commit 5dba52e6ce)
2020-10-04 10:50:49 +02:00
rnhmjoj
3bef8645ca qutebrowser: downgrade Qt to 5.14
There are a number of unresolved issues with Qt 5.15, the most
important one being the inability to properly restore sessions[1].
For now it's better to stay at the earlier version.

[1]: https://github.com/qutebrowser/qutebrowser/issues/5359

(cherry picked from commit 3fafb02125)
2020-10-04 10:43:21 +02:00
Maximilian Bosch
25d8b5f2be lambda-mod-zsh-theme: 2019-04-17 -> 2020-10-03, cleanup derivation
(cherry picked from commit 748871ad42)
2020-10-03 20:04:34 +02:00
Thomas Tuegel
b5dae77322 Merge pull request #99473 from ttuegel/release-20.09--digikam
[20.09] digikam: 6.4.0 -> 7.1.0
2020-10-03 12:03:17 -05:00
Martin Weinelt
3d482c78e7 Merge pull request #99489 from acairncross/fix-nbval-backport
[20.09] Fix nbval backport
2020-10-03 18:55:43 +02:00
Aiken Cairncross
f27d90945e python3Packages.nbval: Fix tests
(cherry picked from commit a5f1cf97b6)
2020-10-03 17:38:09 +01:00
Elis Hirwing
beea5227d0 php73: 7.3.20 -> 7.3.23
- https://www.php.net/ChangeLog-7.php#7.3.21
 - https://www.php.net/ChangeLog-7.php#7.3.22
 - https://www.php.net/ChangeLog-7.php#7.3.23

(cherry picked from commit e04af50179)
2020-10-03 17:46:51 +02:00
Elis Hirwing
07c6f1f8ea php74: 7.4.8 -> 7.4.11
https://www.php.net/ChangeLog-7.php#7.4.9
https://www.php.net/ChangeLog-7.php#7.4.10
https://www.php.net/ChangeLog-7.php#7.4.11
(cherry picked from commit a792db658f)
2020-10-03 17:28:14 +02:00
R. RyanTM
2460e9d5dc python27Packages.pytesseract: 0.3.5 -> 0.3.6
(cherry picked from commit b8c6c2499c)
2020-10-03 17:27:56 +02:00
Martin Weinelt
410952d2a6 lilypond: add patch to restrict embedded-{ps,svg} when -dsafe is used
Fixes: CVE-2020-17353
Closes: #96802
(cherry picked from commit 500d7b81f9)
2020-10-03 16:59:38 +02:00
Aaron Andersen
de32158a87 Merge pull request #99388 from helsinki-systems/backport/20.09/wordpress
[20.09]: wordpress: 5.4.2 -> 5.5.1
2020-10-03 10:39:33 -04:00
Jonas Meurer
00d578a298 nixos/moodle: add missing PHP module (#99476)
ZHF: #97479

Backport of #99163
2020-10-03 15:51:37 +02:00
Thomas Tuegel
a4fea834cb digikam: 6.4.0 -> 7.1.0
(cherry picked from commit b10e170cb3)
2020-10-03 08:47:50 -05:00
Robert Scott
9d31d9ab08 opencascade-occt, opencascade-occt730: fix build on darwin
(cherry picked from commit 0724d7ef59)
2020-10-03 15:46:57 +02:00
Robert Scott
8d6f5beb3e Merge pull request #99362 from mdevlamynck/backport
[20.09] effitask: fix build
2020-10-03 13:04:36 +01:00
0x4A6F
48a32515f0 nixos: Conform with RFC 1123 in networking.hostName
Conform to RFC 1123 [0], specifically to "2.1 Host Names and Numbers",
which allow starting host name with alphanumerical instead of alphabetical characters.
RFC 1123 updates RFC 952 [1], which is referenced in "man 5 hosts".

[0]: https://tools.ietf.org/html/rfc1123
[1]: https://tools.ietf.org/html/rfc952

(cherry picked from commit c232d4b587)
2020-10-02 22:02:17 +02:00
Robert Scott
a5bf6a222b Merge pull request #99338 from risicle/ris-precice-2.1.0-r20.09
[20.09] precice: fix build, 2.0.2 -> 2.1.0, enable for darwin
2020-10-02 20:40:57 +01:00
Tim Steinbach
55a8dcdc53 linux: 5.8.12 -> 5.8.13 2020-10-02 11:28:15 -04:00
Tim Steinbach
612d3d92bf linux: 4.9.237 -> 4.9.238 2020-10-02 11:28:15 -04:00
ajs124
0850f673de wordpress: 5.4.2 -> 5.5.1
(cherry picked from commit c56f278337)
2020-10-02 15:26:06 +02:00
Silvan Mosberger
0f47048fdd Merge pull request #99249 from yorickvP/backport-vm-nl
[20.09] nixos/victoriametrics: escape newlines in ExecStart
2020-10-02 12:55:17 +02:00
Andreas Rammhold
ee7a485da4 Merge pull request #99333 from andir/nixos-20.09-rl-mysql
[20.09] update mysql release notes
2020-10-02 11:19:23 +02:00
Maximilian Bosch
498c69ef5c gitea: 1.12.4 -> 1.12.5
https://github.com/go-gitea/gitea/releases/tag/v1.12.5
(cherry picked from commit 31ce2ee748)
2020-10-02 11:07:33 +02:00
Matthias Devlamynck
ed6a21f970 effitask: fix build
(cherry picked from commit ab0e7bffa0)
2020-10-02 08:37:02 +02:00
aszlig
718037a7ee nixos/plasma5: Fix eval of colord-kde/wacomtablet
Regression introduced by 053b05d14d.

The commit in question essentially removed the "with pkgs;" from the
scope around the various packages added to environment.systemPackages.

Since services.colord.enable and services.xserver.wacom.enable are false
by default, the change above didn't directly result in an evaluation
error.

Tested evaluation before and after this change via:

  for cfg in hardware.bluetooth.enable \
             networking.networkmanager.enable \
             hardware.pulseaudio.enable \
             powerManagement.enable \
             services.colord.enable \
             services.samba.enable \
             services.xserver.wacom.enable; do
    nix-instantiate --eval nixos --arg configuration '{
      services.xserver.desktopManager.plasma5.enable = true;
      '"$cfg"' = true;
    }' -A config.environment.systemPackages > /dev/null
  done

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @ttuegel
(cherry picked from commit 7447bdc523)
2020-10-02 00:58:34 -04:00
WORLDofPEACE
6bf45c4066 nixos/dnscrypt-proxy2: version the example file
I've frequently used the master version that has non backwards compatible keys.

(cherry picked from commit 46e5b14b4a)
2020-10-02 00:33:23 -04:00
Gabriel Ebner
1ee07fb597 freecadStable: init at 0.18.4
(cherry picked from commit 58121fe1b0)
2020-10-01 17:29:30 -07:00
Gabriel Ebner
c193c58c7a opencascade-occt730: init at 7.3.0p3
(cherry picked from commit 78c10375d8)
2020-10-01 17:29:30 -07:00
Gabriel Ebner
c9d21d0fdd python3Packages.pivy: 0.6.5a2 -> 0.6.5
(cherry picked from commit 96dfa21d37)
2020-10-01 17:29:30 -07:00
Gabriel Ebner
324685c771 libsForQt5.soqt: 1.6.0a -> 1.6.0
(cherry picked from commit 0b536960ac)
2020-10-01 17:29:30 -07:00
Gabriel Ebner
2e5b646421 coin3d: unstable-2019-06-12 -> 4.0.0
(cherry picked from commit 11dd6f4584)
2020-10-01 17:29:30 -07:00
Gabriel Ebner
01af965586 freecad: 0.18.4 -> unstable-2020-09-25
(cherry picked from commit 22301b66cd)
2020-10-01 17:29:30 -07:00
Henri Menke
c40a7064dc zfsUnstable: 2.0.0-rc1 -> 2.0.0-rc2
(cherry picked from commit a115901f72)
2020-10-01 17:01:26 -07:00
Silvan Mosberger
9d69eb7bfa man-pages: Make it findable by manpages
Previously `nix-shell -p man-pages` wouldn't work, because `man` by
default looks up man pages only for the packages that appear in PATH.
Since man-pages didn't have anything in $out/bin though, it wouldn't be
put on PATH.

This fixes that by just creating an empty $out/bin

(cherry picked from commit 75d24ef5e7)
2020-10-02 00:53:21 +02:00
Andreas Rammhold
0260afe5f5 nixos/mysql: reorder the release notes on breaking changes a bit
The piece about what commands to run *before* the upgrade should be more
prominent.
2020-10-01 23:23:11 +02:00
Andreas Rammhold
7061a3a4dc nixos/mysql: put the bullet points in a listing
This makes them a lot more readable in the rendered HTML compared to
some inline dashes.
2020-10-01 23:16:01 +02:00
Robert Scott
6f3203bde2 precice: enable for darwin
(cherry picked from commit 509208ea45)
2020-10-01 22:15:10 +01:00
Robert Scott
48b48f5015 precice: 2.0.2 -> 2.1.0
(cherry picked from commit c943e6bc14)
2020-10-01 22:15:07 +01:00
Robert Scott
ab04f71814 precice: fix build
cmake gets confused with python 3.8's version number, switch back to 3.7
for now until upstream's resolved that

(cherry picked from commit 5afdaa28a6)
2020-10-01 22:14:55 +01:00
Lancelot SIX
11b4cc52db pythonPackages.pyscreenshot: add missing pillow dependency
(cherry picked from commit 46159bcf20)
2020-10-01 10:23:52 -07:00
Austin Butler
e56ca65fc1 pythonPackages.pyscreenshot: add missing dependencies
(cherry picked from commit 5bcc4b27f9)
2020-10-01 10:23:52 -07:00
Austin Butler
bf7ea19e6f python3Packages.mss: init at 6.0.0
(cherry picked from commit af2dc4d401)
2020-10-01 10:23:52 -07:00
Austin Butler
53767dfab8 pythonPackages.entrypoint2: init at 0.2.1
(cherry picked from commit 84d74ae9c9)
2020-10-01 10:23:52 -07:00
Tristan Helmich (omniIT)
a3d1bd3ba2 element-web: 1.7.7 -> 1.7.8
(cherry picked from commit f10049cef3)
2020-10-01 17:35:09 +02:00
Tristan Helmich (omniIT)
0ec5a75d72 element-desktop: 1.7.7 -> 1.7.8
(cherry picked from commit 0bf368d339)
2020-10-01 17:35:09 +02:00
Eelco Dolstra
66cd39409e emacs: Remove references from emacs.pdmp
This reduces the Emacs closure size from 1324 MiB to 424 MiB.

Fixes #98755.

(cherry picked from commit 8e13d34944)
2020-10-01 16:31:21 +02:00
Tim Steinbach
bfbe4de06d Merge pull request #99266 from NeQuissimus/linux_4_14_200
linux: 4.14.199 -> 4.14.200
(cherry picked from commit 2f177a2f21)
2020-10-01 09:04:16 -04:00
Tim Steinbach
1be6713414 Merge pull request #99267 from NeQuissimus/linux_4_19_149
linux: 4.19.148 -> 4.19.149
(cherry picked from commit b2a80bebe9)
2020-10-01 09:04:12 -04:00
Tim Steinbach
de727c294c Merge pull request #99269 from NeQuissimus/linux_4_4_238
linux: 4.4.237 -> 4.4.238
(cherry picked from commit ea11b55f44)
2020-10-01 09:04:09 -04:00
Tim Steinbach
59a633e496 Merge pull request #99270 from NeQuissimus/linux_5_4_69
linux: 5.4.68 -> 5.4.69
(cherry picked from commit de6f754b6e)
2020-10-01 09:04:04 -04:00
Marek Fajkus
510a2d97a5 corefonts: fix hash mismatch update
(cherry picked from commit b529c6cf65)
2020-10-01 14:37:18 +02:00
Konrad Borowski
46ce4b1d12 htop: 3.0.1 -> 3.0.2
(cherry picked from commit 4efe18bdee)
2020-10-01 13:10:26 +02:00
Yorick
ff45b4b883 nixos/victoriametrics: escape newlines in ExecStart
Fixes #96206

(cherry picked from commit c1bef53ab5)
2020-10-01 11:49:37 +02:00
Niclas Thall
81217f0f69 pythonPackages.lmtpd: upgrade to Python 3
Python 2 support was dropped on
3546d4660f

ZHF: #97479
https://hydra.nixos.org/build/127641301
(cherry picked from commit 109c7f95ca)
2020-09-30 23:45:15 -07:00
Niclas Thall
97a95f7d7c pythonPackages.pygraphviz: upgrade to Python 3
Python 2 support was dropped on
c341911c15

ZHF: #97479
https://hydra.nixos.org/build/127631797
(cherry picked from commit a29f812f36)
2020-09-30 23:19:08 -07:00
Niclas Thall
e6138834f3 python3Packages.pybase64: Upgrade to python 3
Python 2 ist supported.

ZHF: #97479
https://hydra.nixos.org/build/127647482
(cherry picked from commit 486174da11)
2020-09-30 23:18:56 -07:00
Niclas Thall
594835d0a0 pythonPackages.pure-eval: upgrade to Python 3
ZHF: NixOS#97479
https://hydra.nixos.org/build/127622386
(cherry picked from commit 15e1e144df)
2020-09-30 23:18:46 -07:00
Vladimír Čunát
b3dea4a166 Merge branch 'staging-20.09' into release-20.09
Only a few thousand aarch64 jobs are missing;
that platform is just a bit behind currently.
2020-09-30 23:39:05 +02:00
Maximilian Bosch
8cd2cc9e32 packer: 1.6.3 -> 1.6.4
https://github.com/hashicorp/packer/releases/tag/v1.6.4
(cherry picked from commit 0c56c7357f)
2020-09-30 20:42:06 +02:00
Robert Scott
f8d804b621 Merge pull request #99110 from risicle/ris-minizinc-fix-r20.09
[20.09] minizinc: fix build against bison 3.7
2020-09-30 18:48:29 +01:00
Vladimír Čunát
1b0e08d928 libbpf: 0.1.0 -> 0.1.1
This adds just a single tiny bugfix commit.
https://github.com/libbpf/libbpf/releases/tag/v0.1.1

(cherry picked from commit 1838227d81)
2020-09-30 18:52:45 +02:00
Vladimír Čunát
575aba5b48 thunderbird*: switch default: 68 -> 78
I didn't feel comfortable with *immediately* removing 68,
even though nixers have rollbacks etc.

(cherry picked from commit 2be22836b1)
2020-09-30 18:16:19 +02:00
Maximilian Bosch
61cb8de5ac Merge pull request #99080 from fadenb/graylog_3.3.6_20.09
[20.09] graylog: 3.3.4 -> 3.3.6
2020-09-30 13:38:27 +02:00
Vincent Laporte
07e5844fdf ikos: 2.1 → 3.0
(cherry picked from commit 22b076e1c3)
2020-09-30 08:09:11 +02:00
Jonathan Ringer
f340be7c96 kdeApplications: expose missing packages 2020-09-29 20:36:49 -07:00
WORLDofPEACE
663ff8739c gegl_0_4: make vapi dependencies explicit
(cherry picked from commit 6f35dac541)
2020-09-29 18:34:59 -04:00
Bruno Bigras
76556c6d3d openresty: 1.15.8.3 -> 1.17.8.2
(cherry picked from commit aca8ce740b)
2020-09-29 14:48:21 -07:00
Raphael Borun Das Gupta
c5bd733440 pythonPackages.namedlist: bitbucket -> gitlab.com
adapt meta.homepage, as upstream has moved to gitlab.com

(cherry picked from commit 638612dadf)
2020-09-29 14:46:31 -07:00
Raphael Borun Das Gupta
08653a9f7d pythonPackages.namedlist: 1.7 -> 1.8
(cherry picked from commit 9a2f904e8f)
2020-09-29 14:46:31 -07:00
Robert Scott
46e16fe093 pythonPackages.ruffus: 2.8.1 -> 2.8.4, fix build
simplify test execution by skipping their makefile entirely. disable tests
on darwin as they are very flaky & hang often. this is probably ok because
we're not hacking this package's source to get it installed, and the user
is probably getting something very similar as they would get using a
regular pip installation.

(cherry picked from commit 85e6474eee)
2020-09-29 14:46:07 -07:00
Lily Ballard
3ef78fba49 macvim: 8.2.539 -> 8.2.1719
(cherry picked from commit 9daf3b994b)
2020-09-29 14:24:50 -07:00
Lily Ballard
3b48734cac macvim: Properly link against Nix ncurses
Since we're not using the Nix compiler, our buildInputs aren't
automatically exposed to the compiler, which means it was actually
compiling against system libncurses instead of Nix libncurses.

Also remove the `-Wno-error` from the make flags (and the unnecessary
`PREFIX` definition) in favor of using a much more targeted error
suppression at the configure flags. This works around an issue where
implicit function definitions are considered an error and the configure
script was trying to compile a file tht invoked an ncurses function
without including the relevant header.

(cherry picked from commit d3b1d59d84)
2020-09-29 14:24:50 -07:00
Robert Scott
9711427004 minizinc: fix build against bison 3.7
fixed in upstream development branch

enable for darwin

(cherry picked from commit 9f65c524bb)
2020-09-29 19:07:51 +01:00
Maximilian Bosch
cb0c38404c bandwhich: 0.18.1 -> 0.19.0
https://github.com/imsnif/bandwhich/releases/tag/0.19.0
(cherry picked from commit 372884ffa5)
2020-09-29 18:51:50 +02:00
Enno Richter
b562e7dbd1 iptraf: mark as broken
(cherry picked from commit 5b65d3e7bc)
2020-09-29 08:30:07 -07:00
Tim Steinbach
1bc3ad378c linux/hardened/patches/5.8: 5.8.11.a -> 5.8.12.a
(cherry picked from commit 9109a8fcd5)
2020-09-29 08:36:56 -04:00
Tristan Helmich (omniIT)
b7cd334a12 graylog: 3.3.4 -> 3.3.6
Bumps Graylog and integration plugins to version 3.3.6.
Fixes wrong description of aggregates plugin.

(cherry picked from commit dee78b7032)
2020-09-29 08:59:39 +00:00
Tim Steinbach
4712b946e4 linux-hardened: 5.7 -> 5.8 2020-09-28 19:10:49 -04:00
Tim Steinbach
5b40fd3b1e linux/hardened/patches/5.4: 5.4.67.a -> 5.4.68.a 2020-09-28 19:10:49 -04:00
Tim Steinbach
c4858ba931 linux/hardened/patches/4.19: 4.19.144.a -> 4.19.148.a 2020-09-28 19:10:49 -04:00
Tim Steinbach
e9eb9027be linux/hardened/patches/4.14: 4.14.197.a -> 4.14.199.a 2020-09-28 19:10:49 -04:00
Tim Steinbach
4b9d60960f linux_latest-libre: 17624 -> 17688 2020-09-28 19:10:49 -04:00
Tim Steinbach
c975fd1da3 linux: 5.8.11 -> 5.8.12 2020-09-28 19:10:49 -04:00
Tim Steinbach
957435dce1 linux: 5.4.67 -> 5.4.68 2020-09-28 19:10:49 -04:00
Tim Steinbach
9a81f3387d linux: 4.19.147 -> 4.19.148 2020-09-28 19:10:49 -04:00
Andreas Rammhold
277114e99a nixos/security/wrapper: ensure the tmpfs is not world writeable
The /run/wrapper directory is a tmpfs. Unfortunately, it's mounted with
its root directory has the standard (for tmpfs) mode: 1777 (world writeable,
sticky -- the standard mode of shared temporary directories). This means that
every user can create new files and subdirectories there, but can't
move/delete/rename files that belong to other users.
2020-09-28 22:57:43 +02:00
Austin Butler
c0c97eaaef python3Packages.alerta: add missing dependency
(cherry picked from commit c0b1d136c5)
2020-09-28 13:07:16 -07:00
Austin Butler
4b9a73815f pythonPackages.requests-hawk: init at 1.0.1
(cherry picked from commit 3b1ee7b011)
2020-09-28 13:07:16 -07:00
Austin Butler
857e0d386b maintainers: add austinbutler
(cherry picked from commit 2bdce0e50c)
2020-09-28 13:07:16 -07:00
Austin Butler
e0ce168104 pythonPackages.mohawk: init at 1.1.0
(cherry picked from commit 8be7347e2b)
2020-09-28 13:07:16 -07:00
Thibault Gagnaux
c09d6ead8f python3Packages.fsspec: fix tests on darwin, 0.7.4 -> 0.8.3
(cherry picked from commit 4dbd770f30)
2020-09-28 12:58:45 -07:00
Shea Levy
44346a50c7 system76-firmware: 1.0.17 -> 1.0.18
(cherry picked from commit 55dc3b76f0)
2020-09-28 13:11:03 -04:00
Lancelot SIX
e7700d0e79 skypeforlinux: 8.63.0.76 -> 8.64.0.81
(cherry picked from commit 29620dbaa9)
2020-09-28 13:15:43 +01:00
Ferran Pujol Camins
e0d6afb703 chromaprint: fix derivation
(cherry picked from commit c12cfa428c)
2020-09-28 11:06:51 +02:00
Michael Raskin
2f9ab67618 Merge pull request #98989 from 7c6f434c/release-20.09
[20.09] wpsoffice: revert ffmpeg version
2020-09-28 06:24:42 +00:00
Michael Raskin
bd07da3142 Merge pull request #98988 from 7c6f434c/wpsoffice-ffmpeg
wpsoffice: keep using ffmpeg_3
(cherry picked from commit 064e082296)
2020-09-28 07:57:43 +02:00
Thomas Tuegel
ddb27d8496 Merge pull request #98657 from ttuegel/release-20.09--kde-applications-qt-5.15
[20.09] Build some KDE Applications with Qt 5.15
2020-09-27 21:05:48 -05:00
Robert Scott
ffe1e1628f Merge pull request #98971 from r-burns/backport-sshping
[20.09] sshping: fix build on darwin
2020-09-28 00:08:50 +01:00
Ryan Burns
914b165df0 sshping: fix build on darwin
Fix hardcoded C++ compiler

(cherry picked from commit e1d834aa09)
2020-09-27 14:30:15 -07:00
Robert Scott
f5dc26ea06 Merge pull request #98963 from r-burns/backport-projectm
[20.09] projectm: fix build on darwin
2020-09-27 22:24:38 +01:00
Maximilian Bosch
491ac6006a stellarium: 0.20.2 -> 0.20.3
https://github.com/Stellarium/stellarium/releases/tag/v0.20.3
(cherry picked from commit b8d1e39a28)
2020-09-27 22:14:44 +02:00
Maximilian Bosch
f8bd03c7fd roundcube: 1.4.8 -> 1.4.9
https://github.com/roundcube/roundcubemail/releases/tag/1.4.9
(cherry picked from commit f09ae7e371)
2020-09-27 22:14:44 +02:00
Ryan Burns
7703bfa827 projectm: fix build on darwin
(cherry picked from commit d10d6dfa4a)
2020-09-27 12:11:24 -07:00
Robert Scott
f762fc2a7c pythonPackages.chameleon: fix tests by switching to github source
tests are no longer included in the pypi tarball

(cherry picked from commit d9cb2736b4)
2020-09-27 11:57:47 -07:00
Andrew Fontaine
1b01b51021 minio: support building on darwin
Modified build command and flags to allow successful build on Darwin
systems. Based on flags in GitHub issue from minio project [0]

[0]: https://github.com/minio/minio/issues/10188#issuecomment-668223207

(cherry picked from commit 5e1cb57bf8)
2020-09-27 11:40:26 -07:00
zowoq
4e6dc105be bettercap: build on darwin
(cherry picked from commit 2e30e228b7)
2020-09-27 11:40:26 -07:00
Ferran Pujol Camins
0987a89771 chromaprint: add darwin compatibility
(cherry picked from commit c6dd555bde)
2020-09-27 11:40:26 -07:00
Mario Rodas
5e30a6bb86 opencv: enable videoio on darwin
(cherry picked from commit 1966a0a4e1)
2020-09-27 11:40:26 -07:00
Mario Rodas
6ca2947331 tab: enable on darwin
(cherry picked from commit c193d3b494)
2020-09-27 11:40:26 -07:00
Mario Rodas
94174cb835 exiv2: fix build on darwin
(cherry picked from commit de7719a240)
2020-09-27 11:40:26 -07:00
Thibault Gagnaux
188915bfaf notebook: fix tests on darwin, 6.1.3 -> 6.1.4
(cherry picked from commit 2030061cef)
2020-09-27 11:37:10 -07:00
Robert Scott
575f476578 pythonPackages.git-annex-adapter: 0.2.1 -> 0.2.2, fix build
(cherry picked from commit 704c258ea7)
2020-09-27 11:34:05 -07:00
Robert Scott
3a207c9593 pythonPackages.datatable: 0.10.1 -> 0.11.0, fix build
once we've made some alterations to the source (which doesn't seem to have
been shipped in a ready-to-build state), we can use the funny custom build
system to build a wheel which can then be installed by the pipInstallHook.

running the tests is again annoying because an ini file setting pytest's
python_files parameter is missing, meaning we have to inject our own.

(cherry picked from commit d7365fad89)
2020-09-27 11:25:03 -07:00
Maximilian Bosch
c57d809ef5 nixos/nextcloud: drop nextcloud17, deprecate nextcloud18
Both packages will get EOLed within the lifetime of 20.09. `nextcloud17`
can be removed entirely (the attribute-path is kept however to provide
meaningful errors), however `nextcloud18` must be kept as `insecure` to
make sure that users from `nextcloud17` can properly upgrade to
`nextcloud19` on NixOS 20.09.

(cherry picked from commit 6b48deee54)
2020-09-27 20:04:25 +02:00
Martin Puppe
3e771553a3 nextcloud18: 18.0.7 -> 18.0.9
(cherry picked from commit 731d55baad)
2020-09-27 20:04:25 +02:00
Martin Puppe
5806cedcc1 nextcloud19: 19.0.1 -> 19.0.3
(cherry picked from commit 85ece7792b)
2020-09-27 20:04:25 +02:00
Thomas Tuegel
8209ea2b95 tellico: do not import kdeApplications 2020-09-27 12:22:52 -05:00
Dmitry Kalinkin
3826d75904 pythonPackages.fastparquet: disable broken test
(cherry picked from commit 3821543de7)
cc #97479
2020-09-27 12:50:53 -04:00
Johannes Rosenberger
54ef32d2c6 fix passing qt5 version to pythonInterpreters
fixes c88f3adb17, which resulted in
qt 5.15 being used in pythonPackages, despite 5.14 being
declared, and adapts qutebrowser accordingly.

'callPackage { pkgs = pkgs // { … }; }' does not work, because
it does not take into account the recursive evaluation of nixpkgs:

`pkgs/development/interpreters/python/default.nix` calls
`pkgs/top-level/python-packages.nix` with `callPackage`.
Thus, even if the former gets passed the updated `pkgs`,
the latter always gets passed `pkgs.pkgs`.

For the change in the qt5 version to apply consistently, 'pkgs.extend'
must be used.

qutebrowser only used the right qt5 version (5.15) because all
pythonPackages used it anyway.

(cherry picked from commit 626ce32e9f)
2020-09-27 18:34:03 +02:00
Thomas Tuegel
9f34e63158 kdewebkit: build with all available Qt versions 2020-09-27 09:17:40 -05:00
Robert Scott
da9dc61675 Merge pull request #98897 from risicle/ris-snowflake-conn-2.3.2-r20.09
[20.09] pythonPackages.snowflake-connector-python: 2.2.10 -> 2.3.2, fix build
2020-09-27 14:33:00 +01:00
Thomas Tuegel
4f5aaf549b trojita: correctly import library dependencies 2020-09-27 07:59:00 -05:00
Thomas Tuegel
225a416491 zanshin: correctly import library dependencies 2020-09-27 07:58:35 -05:00
Thomas Tuegel
94114e27f3 kmymoney: correctly import library dependencies 2020-09-27 07:58:13 -05:00
Thomas Tuegel
4fe1902d65 digikam: correctly import library dependencies 2020-09-27 07:58:01 -05:00
R. RyanTM
0e49dc9306 nco: 4.9.3 -> 4.9.5
(cherry picked from commit 477c40126e)
2020-09-27 13:10:10 +01:00
Thomas Tuegel
38a7ffa304 calligra: correctly import library dependencies 2020-09-27 06:18:05 -05:00
Thomas Tuegel
7495ade57e kwave: Build with Qt 5.15 2020-09-27 06:18:02 -05:00
Thomas Tuegel
5d9aebd76b minuet: Build with Qt 5.15 2020-09-27 06:18:01 -05:00
Thomas Tuegel
4a0a4953da kaddressbook: Build with Qt 5.15 2020-09-27 06:18:01 -05:00
Thomas Tuegel
f39b9bba74 akregator: Build with Qt 5.15 2020-09-27 06:18:01 -05:00
Thomas Tuegel
f099c42a82 kitinerary: Build with Qt 5.15 2020-09-27 06:18:01 -05:00
Thomas Tuegel
656f39417f kleopatra: Build with Qt 5.15 2020-09-27 06:18:00 -05:00
Thomas Tuegel
117cb768df kgpg: Build with Qt 5.15 2020-09-27 06:18:00 -05:00
Thomas Tuegel
bf86b8f81c elisa: Build with Qt 5.15 2020-09-27 06:18:00 -05:00
Thomas Tuegel
78227d526b kdeApplications: Build KDE PIM applications with Qt 5.15 2020-09-27 06:18:00 -05:00
Thomas Tuegel
4b047b3df4 kdeApplications: Include breeze-qt5 theme by default 2020-09-27 06:17:59 -05:00
Thomas Tuegel
850928102a breeze-qt5: Build with all Qt 5 versions 2020-09-27 06:17:59 -05:00
Thomas Tuegel
fd0ecc5bfc kdeApplications: Remove recursion 2020-09-27 06:17:59 -05:00
Thomas Tuegel
e36eae29fc mkLibsForQt5: import more libraries from kdeApplications 2020-09-27 06:17:59 -05:00
Thomas Tuegel
b3c7e3f41f kdiagram: 2.6.0 -> 2.7.0 2020-09-27 06:17:59 -05:00
Mario Rodas
ba756b6a15 Merge pull request #98927 from tricktron/backport-curio
[20.09] python3Packages.curio: fix tests on darwin
2020-09-27 06:07:42 -05:00
Frederik Rietdijk
0cfe5377e8 python39: 3.9.0rc1 -> 3.9.0rc2
(cherry picked from commit 74f3e9cce1)
2020-09-27 11:49:59 +02:00
Frederik Rietdijk
d4a8eb213b pkgsStatic.fmt: don't build shared libs
The change in `static.nix` was added in
https://github.com/NixOS/nixpkgs/pull/76875 but apparently
`enabledShared` got removed in the master/staging-next merge.

(cherry picked from commit 759a2815ec)
2020-09-27 11:32:40 +02:00
Thibault Gagnaux
fb4b2e5ce4 python3Packages.curio: fix tests on darwin
Refactors to pytestCheckHook.

(cherry picked from commit 22cd2a23bf)
2020-09-27 11:17:13 +02:00
rnhmjoj
be95370a8c nixos/tests/ncdns: more tests and disable DNSSEC
- DNSSEC is currently disable because it's failing
- Separately test .bit domain on ncdns and pdns-recursor
- Test for the SOA record of the bit. zone

(cherry picked from commit d7ae8ab35f)

Fixes failing nixosTests.ncdns test
2020-09-27 10:20:34 +02:00
Frank Doepper
2a7af8c36d shotcut: 20.07.11 -> 20.09.13, mlt: 6.20.0 -> 6.22.1
and add updateScript

(cherry picked from commit c835358078)
2020-09-26 19:09:00 -07:00
WORLDofPEACE
de27955cf2 Merge pull request #98902 from cole-h/shadow-owns-shadow-20.09
[20.09] nixos/update-users-groups: /etc/shadow owned by root:shadow
2020-09-26 21:30:46 -04:00
Cole Helbling
f35b375216 nixos/update-users-groups: /etc/shadow owned by root:shadow
(cherry picked from commit 937359fcf1)
2020-09-26 18:27:05 -07:00
Robert Scott
2a904dc80b pythonPackages.accupy: remove perfplot from checkInputs
they were only used for performance tests that aren't useful to us -
disabling these tests allows us to decouple from an unnecessary build
dependency.

convert to pytestCheckHook.

(cherry picked from commit 99175cfbf6)
2020-09-26 18:07:58 -07:00
Robert Scott
32b19dad66 Merge pull request #98891 from r-burns/backport-samba
[20.09] samba: 4.12.5 -> 4.12.6, fix build on darwin
2020-09-27 01:08:37 +01:00
Robert Scott
4fb8141281 pythonPackages.snowflake-sqlalchemy: add pythonImportsCheck
better than nothing

(cherry picked from commit 70ae442fcf)
2020-09-27 00:02:20 +01:00
Robert Scott
612303df1f pythonPackages.snowflake-connector-python: 2.2.10 -> 2.3.2, fix build
the relaxed version constraints don't seem to be specific avoidance of
buggy versions, just upstream cautiously prohibiting untested versions

if there *are* specific reasons, they're hidden away in upstream's jira

(cherry picked from commit 96f034655f)
2020-09-27 00:02:15 +01:00
Maximilian Bosch
e7c26a78e6 matrix-synapse: 1.19.3 -> 1.20.1
https://github.com/matrix-org/synapse/releases/tag/v1.20.0
https://github.com/matrix-org/synapse/releases/tag/v1.20.1
(cherry picked from commit 631d92d8dc)
2020-09-27 00:54:07 +02:00
Maximilian Bosch
52cab67005 neomutt: apply two patches for regressions in the sidebar
The following patches were pushed to `master` after the release and fix
two regressions in the sidebar of NeoMutt:

* 9675367 (sidebar: prevent the divider colour bleeding out): a small
  fix for ANSI colors to not break the layout.

* 6078653 (Fix <sidebar-{next,prev}-new>): fixes invalid conditions in
  if-statements.

Considering their release cycle I figured that it is reasonable to apply
those on top of `20200925` for now.

(cherry picked from commit 004676ce9c)
2020-09-27 00:54:07 +02:00
Ryan Burns
103028665d samba: 4.12.5 -> 4.12.6, fix build on darwin
Upstream commit https://gitlab.com/samba-team/devel/samba/-/commit/6e263432
fixes compilation on BSD/macOS.

(cherry picked from commit 680bdea2f0)
2020-09-26 15:38:56 -07:00
WORLDofPEACE
a90e595068 Merge pull request #98862 from ttuegel/release-20.09--libvlc
[20.09] Build standalone libvlc
2020-09-26 13:07:14 -04:00
Lassulus
138f0c8e41 Merge pull request #98789 from woffs/ytv379-20.09
[20.09] youtube-viewer: 3.7.5 -> 3.7.9
2020-09-26 17:49:51 +02:00
Vladimír Čunát
aba5f002d1 Merge #98628: thunderbird*: 78.2.2 -> 78.3.1 (security)
(cherry picked from commit 4212f719bb)
Re-tested both a bit atop 20.09.
2020-09-26 15:58:09 +02:00
Thomas Tuegel
3199a70fa6 Merge pull request #98846 from ttuegel/libvlc
Build standalone libvlc

(cherry picked from commit 6882716623)
2020-09-26 08:24:41 -05:00
Maximilian Bosch
a8219eaeb3 packer: 1.6.2 -> 1.6.3
https://github.com/hashicorp/packer/releases/tag/v1.6.3
(cherry picked from commit 740f01413b)
2020-09-26 14:04:04 +02:00
Maximilian Bosch
4327b304ff gotify-cli: 2.1.1 -> 2.2.0
https://github.com/gotify/cli/releases/tag/v2.2.0
(cherry picked from commit d37d976601)
2020-09-26 14:04:03 +02:00
Robert Scott
40c9bae6c3 Merge pull request #98569 from maxxk/parse-1.18.0-stable
[20.09] python3Packages.parse: 1.16.0 -> 1.18.0, python-docx: run behave tests
2020-09-26 11:30:51 +01:00
Florian Klink
17ecf6e5be nixos/datadog: Don't recommend dd_url for sites, add proper option
Turns out, `dd_url` should only be used in proxy scenarios, not to point
datadog to their EU endpoint - `site` should be used for that.

The `dd_url` setting doesn't affect APM, Logs or Live Process intake
which have their own "*_dd_url" settings.

(cherry picked from commit 8d52cf501f)
2020-09-26 12:30:21 +02:00
Michael Weiss
733b856a14 signal-desktop: 1.36.2 -> 1.36.3
(cherry picked from commit 2e6844040e)
2020-09-26 12:16:46 +02:00
Vladimír Čunát
a9226f2b3a Merge #98684: brotli: fix patch URL
(cherry picked from commit 779ad182cf)
2020-09-26 09:54:26 +02:00
Vladimír Čunát
4a98a62425 Merge #98651: firefox*: updates (into release-20.09) 2020-09-26 07:46:09 +02:00
WORLDofPEACE
e9a993e90d Merge pull request #97522 from volth/cpan2nix-2020-09-09
[staging-20.09] perlPackages: bulk update
2020-09-25 20:13:46 -04:00
Drew Risinger
9d831f8316 verilog: add tests
Run recommended self-tests from iverilog's CI.

Tests add about a minute to the build time on local machine
(2 -> 3 mins).

(cherry picked from commit ba886f7b1a)
2020-09-25 19:34:32 -04:00
Drew Risinger
27bd57bc4b verilog: cleanup
Meta attributes were out of date or not in current style,
and some attributes of derivation were redundant.

(cherry picked from commit 0d9a6e2da5)
2020-09-25 19:34:32 -04:00
Sarah Brofeldt
c680c499bf ceph: 15.2.4 -> 15.2.5 (#98664)
(cherry picked from commit c099d421db)
2020-09-26 01:13:34 +02:00
Olli Helenius
038b067cd0 kismet: 2020-04-R2 -> 2020-09-R2
(cherry picked from commit 4463f819b6)
2020-09-25 14:39:08 -07:00
freezeboy
1a9ecdf240 rsibreak: 0.12.8 -> 0.12.13
(cherry picked from commit 88c8a3c69f)
2020-09-25 22:29:10 +02:00
Robert Scott
f80bada223 Merge pull request #98783 from r-burns/backport-aragorn
[20.09] aragorn: fix build on darwin
2020-09-25 21:07:14 +01:00
Robert Scott
1c6dc9e98c Merge pull request #98782 from r-burns/backport-libkml
[20.09] libkml: fix tests on darwin
2020-09-25 20:58:21 +01:00
Robert Scott
2f5cbdbda5 Merge pull request #98780 from r-burns/backport-pciutils
[20.09] pciutils: fix build on darwin
2020-09-25 20:47:33 +01:00
Robert Scott
0ed8c8fc0e Merge pull request #98678 from povik/20.09-pysdl2-fix
[20.09] python3.pkgs.pysdl2: fix build
2020-09-25 20:42:26 +01:00
Frank Doepper
cb6859078d youtube-viewer: 3.7.5 -> 3.7.9
(cherry picked from commit 2ab6756314)
2020-09-25 21:35:58 +02:00
Ryan Burns
3345d53f6f aragorn: fix build on darwin
Use environment-specified $CC for C compiler

(cherry picked from commit 6cc2d3e6f2)
2020-09-25 12:12:51 -07:00
Ryan Burns
3c3346ec20 libkml: fix tests on darwin
Darwin tests require rpath setup for libs in build dir

(cherry picked from commit 357014e09c)
2020-09-25 12:10:14 -07:00
Ryan Burns
113c22dba4 pciutils: fix build on darwin
Add IOKit to macOS prereqs, and patch Makefile to use $CC

(cherry picked from commit 00bf15f23c)
2020-09-25 12:04:09 -07:00
TredwellGit
82eb369511 wireshark: 3.2.5 -> 3.2.7
https://www.wireshark.org/docs/relnotes/wireshark-3.2.7.html
https://www.wireshark.org/docs/relnotes/wireshark-3.2.6.html
(cherry picked from commit 5a1c55f911)
2020-09-25 20:43:03 +02:00
Robert Scott
883b340639 Merge pull request #98579 from risicle/ris-fierce-fix-r20.09
[20.09] fierce: fix build
2020-09-25 19:38:12 +01:00
freezeboy
bb76286704 rpm-ostree: 2020.4 -> 2020.5
(cherry picked from commit 7db8abb774)
2020-09-25 20:10:17 +02:00
Lassulus
bc30b9d4cc Merge pull request #98757 from woffs/tuxpaint-desktop-20.09
[20.09] tuxpaint: install desktop file
2020-09-25 17:58:47 +02:00
Andrew Fontaine
8fe375c0b6 nextcloud-client: 3.0.0 -> 3.0.2
Contains upstream fix for maintaining folder links when upgrading from
2.x to 3.x.

(cherry picked from commit 57883eea4a)
2020-09-25 17:35:00 +02:00
claudiiii
35709c0ebd nextcloud-client: 2.6.5 -> 3.0.0
(cherry picked from commit 5703813f78)
2020-09-25 17:35:00 +02:00
Norbert Melzer
53eac87c8d lefthook: use go 1.14 to build (#97963)
Due to some changes in `go` from 1.14 to 1.15 the lefthook tool
currently can't start external programs and errors each test it tries
to run, making it effectively useless.

This is a temporary fix to make `lefthook` usable again until the
upstream issue was fixed and a new release has been cut.

Upstream issue: https://github.com/Arkweid/lefthook/issues/151

(cherry picked from commit 4312e2460a)
2020-09-25 17:19:24 +02:00
zimbatm
a3ba14dff1 Merge pull request #98753 from woffs/dvdbackup-20.09
[20.09] dvdbackup: fix build with libdvdread >= 6.1.0
2020-09-25 15:12:53 +00:00
Maximilian Bosch
4a7e2572f4 neomutt: 20200821 -> 20200925
https://github.com/neomutt/neomutt/releases/tag/20200925
(cherry picked from commit 2d94370264)
2020-09-25 16:55:26 +02:00
Maximilian Bosch
57a12055ae lnav: 0.8.5 -> 0.9.0
https://github.com/tstack/lnav/releases/tag/v0.9.0
(cherry picked from commit 1a08a381a0)
2020-09-25 16:55:26 +02:00
Ingo Blechschmidt
b9b0217474 tuxpaint: install desktop file
(cherry picked from commit faec169f0d)
2020-09-25 15:53:29 +02:00
Frank Doepper
e460fae7fc dvdbackup: fix build with libdvdread >= 6.1.0
(cherry picked from commit e8d1a486fb)
2020-09-25 15:48:41 +02:00
Maximilian Bosch
f3d099fb1d virtualbox: re-add support for virtio
For some reason the original source tarball for version 6.1.14 didn't
bundle the sources for `virtio`-support causing a build-failure.

After this was reported, a new tarball named
`VirtualBox-6.1.14a.tar.bz2` was published which fixes the issue[1].

[1] https://www.virtualbox.org/ticket/19862

(cherry picked from commit 579404c4a5)
2020-09-25 15:40:37 +02:00
Magicloud
07504c9364 virtualbox: 6.1.10 -> 6.1.14
6.1.14 is the latest release of Virtualbox.

Also disabled VirtIO since the source tarball does not include necessary source code.

Closes #97999
(cherry picked from commit e1538e43b9)
2020-09-25 15:40:06 +02:00
Michael Weiss
2a078e8057 signal-desktop: 1.36.1 -> 1.36.2
(cherry picked from commit 6b0794caa5)
2020-09-25 13:48:37 +02:00
R. RyanTM
b0a587f2ef freeipmi: 1.6.5 -> 1.6.6
(cherry picked from commit f5c2f51dae)
2020-09-25 09:50:00 +01:00
Johannes Schleifenbaum
38e59a3385 dbeaver: 7.2.0 -> 7.2.1
(cherry picked from commit 0a07c8c67e)
2020-09-25 09:31:13 +01:00
Farid Zakaria
e703709952 jruby: fix shebang for binaries in JRuby
There are a variety of additional scripts that are included with the
JRuby installation that use JRuby itself.

For instance the `bin/gem` had the following contents:

```bash
❯ cat /nix/store/kglkqf56ii83yl6yrgcaj5r3s9m2fzr0-jruby-9.2.13.0/bin/gem

load File.join(File.dirname(__FILE__), 'jgem')
```

This is clearly wrong. Patchshebangs was not picking up the fix as part
of stdenv because the patch is not a build input but the final output
itself.

We have to rely on substituteInPlace so that we get the correct version.

```bash
❯ cat /nix/store/k4fnrn0dcsh2wzw81217r0ywsspb468f-jruby-9.2.13.0/bin/gem

```

(cherry picked from commit 8da7bd63ca)
2020-09-25 10:06:48 +02:00
Michael Raskin
152522d69d Merge pull request #98578 from risicle/ris-cvc3-fix-r20.09
[20.09] cvc3: fix build against bison 3.7
2020-09-25 07:34:52 +00:00
Robert Scott
72b01f5bc3 pythonPackages.cozy: fix build
to allow building with dictionaries 0.0.2

(cherry picked from commit 7486a8d587)
2020-09-24 21:27:47 -07:00
Jan Tojnar
c9b329cdf9 nixos/doc: Improve code listings
By adding prompts and replaceables and removing unnecessary indentation.

(cherry picked from commit e6ce041cae)
2020-09-24 22:52:36 +02:00
Jan Tojnar
cc870b11c9 doc: Improve code listings
By adding prompts and removing unnecessary indentation.

(cherry picked from commit e1af37634b)
2020-09-24 22:52:36 +02:00
Martin Povišer
b3db371d85 python3.pkgs.pysdl2: fix build
Update patches after version bump.

(cherry picked from commit d82e165609)
2020-09-24 21:59:47 +02:00
Jakub Kądziołka
17b6d3fd0f chez: add env hook
As a follow-up to #97927, chez can now find its libraries in a
nix-shell, and derivations for such libraries don't need to handle the
search path themselves.

(cherry picked from commit 8f60607a0b)
2020-09-24 21:57:57 +02:00
Jakub Kądziołka
7d001444c1 chez-modules: Fix path to csv-site.
It seems that the installation path for chez modules no longer includes
the Chez version. This fixes the build for chez-mit and chez-scmutils.

(cherry picked from commit 72ccc9b885)
2020-09-24 21:57:39 +02:00
Robert Scott
f5ee72eef6 truvari: 1.3.4 -> 2.0.2, fixing build
seeing it has no tests, use pythonImportsCheck in an attempt to detect
total breakage, even though it's not intended to be used as an importable
module

(cherry picked from commit ecd5886830)
2020-09-24 09:02:35 -07:00
Robert Scott
3fac393b55 pythonPackages.acebinf: init at 1.0.2
(cherry picked from commit e61102d5c2)
2020-09-24 09:02:35 -07:00
Robert Scott
37adf57813 pythonPackages.pytabix: init at 0.1
(cherry picked from commit 4543e54991)
2020-09-24 09:02:35 -07:00
Robert Scott
be0629f44c pythonPackages.bwapy: init at 0.1.4
(cherry picked from commit ccf4645500)
2020-09-24 09:02:35 -07:00
Robert Scott
a63d237f73 bwa: include static library and some key headers in output
(cherry picked from commit f1d2491057)
2020-09-24 09:02:35 -07:00
Robert Scott
38ee58ad93 truvari: fix build
be less strict about versions

(cherry picked from commit 4637721bc1)
2020-09-24 09:02:35 -07:00
Robert Scott
32db921ab6 pythonPackages.rabbitpy: 1.0.0 -> 2.0.1
(cherry picked from commit 16ed0c3069)
2020-09-24 09:02:02 -07:00
Robert Scott
5a99ef8259 Revert "python: pamqp: 2.3.0 -> 3.0.1"
No version of pythonPackages.rabbitpy currently exists that supports 3.0.1

This reverts commit 4250cdeee9.

(cherry picked from commit 178d1b119c)
2020-09-24 09:02:02 -07:00
Robert Scott
c9fdd325ba pythonPackages.gssapi: 1.6.2 -> 1.6.9
(cherry picked from commit 9a472166af)
2020-09-24 08:57:17 -07:00
Robert Scott
b20ffa72ac pythonPackages.gssapi: fix tests
the failing tests appear to also be causing trouble upstream

(cherry picked from commit fb570ba1de)
2020-09-24 08:57:17 -07:00
sohalt
00c8e6fb07 avy: 2017.10.16 -> 2019.05.01
(cherry picked from commit 40722346b8)
2020-09-24 08:53:07 -07:00
Tim Steinbach
f6ae2015aa linux/hardened/patches/5.8: 5.8.10.a -> 5.8.11.a
(cherry picked from commit a7e1ae6b51)
2020-09-24 11:49:10 -04:00
Tim Steinbach
a99f8faeaa linux/hardened/patches/5.4: 5.4.65.a -> 5.4.67.a
(cherry picked from commit 63ea043960)
2020-09-24 11:49:10 -04:00
Tim Steinbach
bfd956031c linux/hardened/patches/5.4: 5.4.64.a -> 5.4.65.a
(cherry picked from commit 1c61a932bb)
2020-09-24 11:49:00 -04:00
Florian Klink
778cd18c87 nixos/datadog: allow specifying dd_url (#97775)
Useful when you want to point datadog to another endpoint, either
because you need a proxy to send out data, or because you use their EU
endpoint.

(cherry picked from commit 2865a8867f)
2020-09-24 17:43:07 +02:00
taku0
d9fe9633b5 firefox: 80.0.1 -> 81.0
(cherry picked from commit 0669cd9d3f)
2020-09-24 22:22:19 +09:00
taku0
676742ed6e firefox-bin: 80.0.1 -> 81.0
(cherry picked from commit 3ad81fd022)
2020-09-24 22:22:18 +09:00
taku0
64a2ce6218 firefox-esr: 78.2.0esr -> 78.3.0esr
(cherry picked from commit 2460e0e6cd)
2020-09-24 22:22:18 +09:00
Rok Garbas
a04a485f89 Merge pull request #98648 from raboof/rename-guide-to-nixpkgs-manual-20.09
doc: rename guide to 'Nixpkgs Manual'
2020-09-24 15:08:32 +02:00
Arnout Engelen
37a617b3da doc: rename guide to 'Nixpkgs Manual'
For consistency with 'NixOS Manual' and 'Nix Manual', to better match what it's
often called in practice, and to match its URL and HTML title.
2020-09-24 15:06:45 +02:00
Lars Jellema
d447429cc2 gnat: fix build
(cherry picked from commit 7ea5b08cfc)
2020-09-23 23:47:11 -07:00
Daniël de Kok
b91d034c6d Merge pull request #98411 from danieldk/freeoffice-2018.978-20.09
[20.09] freeoffice: 976 -> 978
2020-09-24 08:19:40 +02:00
WORLDofPEACE
c8e389d512 Merge pull request #98585 from wkral/backport-ihatemoney
[20.09] python3Packages.ihatemoney: disable sandbox unfriendly tests, fix passthru
2020-09-23 15:52:29 -04:00
Jonathan Ringer
81d4751677 python3Packages.ihatemoney: disable sandbox unfriendly tests, fix passthru
(cherry picked from commit 43d588b0af)
2020-09-23 12:35:43 -07:00
WORLDofPEACE
bc260badae Merge pull request #98524 from jonringer/cut-beta
nixos: now beta
2020-09-23 15:34:13 -04:00
Robert Scott
2e19fee916 fierce: fix build
because we're playing with its install requirements, add a
pythonImportsCheck to give us a chance to discover brokenness. technically
this isn't a realistic test of end user behaviour as this is really an
application, not a python module, but it seems to have a pretty stable
import name of `fierce`, so it works.

(cherry picked from commit 1aa888ba53)
2020-09-23 19:18:36 +01:00
Robert Scott
189520cc63 Merge pull request #98342 from maxxk/lldb5_6-python37-20.09
[20.09] lldb_5, lldb_6: add patch for >=python-3.7
2020-09-23 19:12:07 +01:00
Robert Scott
f12987a1be cvc3: enable for darwin
it may be possible to get it building under clang with some work, but
switching it to gcc for now allows us to enable it

(cherry picked from commit fc709e6dfe)
2020-09-23 18:32:10 +01:00
Robert Scott
f2e3ca764c cvc3: fix build against bison 3.7
for some reason bison 3.7 output references $x_defs.h files under the name
$x.hpp. create symlinks to make this work.

(cherry picked from commit 53a8a415ac)
2020-09-23 18:32:00 +01:00
Michele Guerini Rocco
9eb814f798 Merge pull request #98574 from mweinelt/20.09/nixos/tests/magnetico
[20.09] nixosTests.magnetico: wait for open port and make curl actually fail
2020-09-23 19:27:26 +02:00
Maxim Krivchikov
1189b50831 python3Packages.behave: skip test failing on darwin
Timing-based test is flaky on Darwin:
https://github.com/NixOS/nixpkgs/pull/97737#issuecomment-691489824

(cherry picked from commit 0f34c4eb33)
2020-09-23 20:16:38 +03:00
Maxim Krivchikov
dc12a5ab74 python3Packages.python-docx: run behave tests
Previously the problematic "behave" dependency
was not even used at checkPhase.

(cherry picked from commit f690cacb06)
2020-09-23 20:16:37 +03:00
Maxim Krivchikov
5f19aca104 python3Packages.parse: 1.16.0 -> 1.18.0
(cherry picked from commit 6543cbf571)
2020-09-23 20:16:37 +03:00
Maxim Krivchikov
fc83817ba6 lldb_5, lldb_6: add patch for >=python-3.7
(cherry picked from commit 172f3a197e)
2020-09-23 20:06:02 +03:00
Martin Weinelt
94ee827023 nixosTests.magnetico: wait for open port and make curl actually fail
(cherry picked from commit 76aeb20d91)
2020-09-23 18:38:03 +02:00
Jonathan Ringer
c0beb143e5 orangefs: 2.9.7 -> 2.9.8, fix build
(cherry picked from commit aa25c65766)
2020-09-23 09:34:06 -07:00
freezeboy
a6b6b8623c python3Packages.fluent-logger: relax version for msgpack
Also add imports tests as we can't do more using the pip release

(cherry picked from commit e3c1b8782a)
2020-09-23 09:32:46 -07:00
freezeboy
4a3e6cdacc python3Packages.google_resumable_media,python2Packages.google_resumable_media: fix tests
(cherry picked from commit 908d8c3459)
2020-09-23 09:32:21 -07:00
freezeboy
fb33dae2ef python3Packages.crc32c: init at 1.0.0
(cherry picked from commit 2468315f2b)
2020-09-23 09:32:21 -07:00
freezeboy
c298a03cc2 crc32c: enable static
(cherry picked from commit 160f169f03)
2020-09-23 09:32:21 -07:00
Matt Votava
5b945725cb python2Packages.trytond: disable for python2
(cherry picked from commit 5f4b880b40)
2020-09-23 09:26:11 -07:00
Matt Votava
3e7e3d2f18 pythonPackages.bcrypt: use 3.1.x for python older than 3.6
(cherry picked from commit 0051c0a4a5)
2020-09-23 09:26:11 -07:00
WilliButz
780b4e027e grafana: 7.1.5 -> 7.2.0
(cherry picked from commit 1a0a53ff83)
2020-09-23 18:07:27 +02:00
Maximilian Bosch
fc6ba468f5 curlie: 1.3.1 -> 1.5.4
(cherry picked from commit 23370afced)
2020-09-23 18:06:46 +02:00
Tim Steinbach
e8669f7cfa linux: 5.8.10 -> 5.8.11 2020-09-23 09:05:17 -04:00
Tim Steinbach
e19303b14b linux: 5.4.66 -> 5.4.67 2020-09-23 09:05:17 -04:00
Tim Steinbach
14e4f4dbb4 linux: 4.9.236 -> 4.9.237 2020-09-23 09:05:17 -04:00
Tim Steinbach
843c56b06a linux: 4.4.236 -> 4.4.237 2020-09-23 09:05:17 -04:00
Tim Steinbach
6377350c58 linux: 4.19.146 -> 4.19.147 2020-09-23 09:05:17 -04:00
Tim Steinbach
102df6c6f2 linux: 4.14.198 -> 4.14.199 2020-09-23 09:05:17 -04:00
Shea Levy
1991ea85b1 Merge branch 'system76-firmware-and-nixos-20.09' into release-20.09 2020-09-23 08:14:31 -04:00
Shea Levy
affe6660bb Add system76 NixOS module
(cherry picked from commit 4b1850bad3)
2020-09-23 08:11:04 -04:00
Shea Levy
3efe313b1d linuxPackages.system76-acpi: Install hwdb rules
(cherry picked from commit 9f43146ec4)
2020-09-23 06:50:29 -04:00
Shea Levy
09246c92d2 linuxPackages.system76: Install hwdb rules
(cherry picked from commit 452fda1d7e)
2020-09-23 06:50:29 -04:00
Shea Levy
6fc7532b2c firmware-manager: Init at 0.1.1
(cherry picked from commit b694eb6e6a)
2020-09-23 06:50:29 -04:00
Shea Levy
670d1a4a94 system76-firmware: Init at 1.0.17
(cherry picked from commit f43c02c7ff)
2020-09-23 06:50:29 -04:00
Bryan Gardiner
eb47f4cc97 linuxPackages.system76-io: init at 1.0.1
(cherry picked from commit 8ea0979284)
2020-09-23 06:50:28 -04:00
Bryan Gardiner
2f78b89265 linuxPackages.system76-acpi: init at 1.0.1
(cherry picked from commit 649b00db5b)
2020-09-23 06:50:28 -04:00
Bryan Gardiner
899bfaf5a9 linuxPackages.system76: init at 1.0.9
(cherry picked from commit 6d7f0bca40)
2020-09-23 06:50:28 -04:00
Michael Weiss
1d3d507043 chromium: 85.0.4183.102 -> 85.0.4183.121
https://chromereleases.googleblog.com/2020/09/stable-channel-update-for-desktop_21.html

This update includes 10 security fixes.

CVEs:
CVE-2020-15960 CVE-2020-15961 CVE-2020-15962 CVE-2020-15963
CVE-2020-15965 CVE-2020-15966 CVE-2020-15964

(cherry picked from commit d1a27a5f00)
2020-09-23 12:11:50 +02:00
Gabriel Ebner
ce00ac55e0 chromium: use jre8
(cherry picked from commit 705ecdc192)
2020-09-23 12:11:50 +02:00
Michael Weiss
2a4f1e08e3 chromiumDev: M86 -> M87
(cherry picked from commit e249baca22)
2020-09-23 12:11:50 +02:00
Michael Weiss
aed7150466 chromium: update.py: Keep the channel order consistent
This makes Git diffs way easier to read.
Using sort_keys=True is usually better but with this implementation the
output is a bit nicer to read IMO.

(cherry picked from commit ceb3acfa8b)
2020-09-23 12:11:49 +02:00
Vladimír Čunát
b58d38c787 gnutls: 3.6.14 -> 3.6.15
Security: on-wire alert could cause NULL pointer dereference.
https://lists.gnupg.org/pipermail/gnutls-help/2020-September/004669.html
(cherry picked from commit 2363e6eb9c)
2020-09-23 10:40:58 +02:00
Cole Helbling
a780c60f9f nixos/stage-1: set up /dev/fd
Otherwise, stage-2-init.sh will complain about not having access to
/dev/fd/62 as of systemd v246.

On IRC, flokli said:

    15:14 <flokli> cole-h: hmmm... I could imagine some of the setup inside /dev has been moved into other parts of systemd
    15:14 <flokli> And given we run systemd much later (outside initramfs only) it doesn't work properly here
    15:17 <flokli> We probably don't invoke udev correctly

(cherry picked from commit 4586810487)
2020-09-23 09:58:23 +02:00
Vincent Laporte
9b0e8d7a29 why3: 1.3.1 -> 1.3.3
(cherry picked from commit 64b68b30e9)
2020-09-23 09:40:06 +02:00
Robert Scott
8c4d4eaa81 birdfont: fix build on non-nixos/debian systems
to do this we need to prevent platform.version() from using uname to
discover this is a debian kernel and try dpkg nonsense

(cherry picked from commit 0b67d9e87a)
2020-09-22 23:07:40 -07:00
Robert Scott
ff3baa2a56 xmlbird: fix build with python 3.8
also force use of gccStdenv to fix darwin build

(cherry picked from commit 781b870c91)
2020-09-22 23:07:40 -07:00
(cdep)illabout
aa37cc1e7a tests.haskell-shellFor: get compiling again
(cherry picked from commit bdc7deed61)
2020-09-22 23:05:24 -07:00
Jonathan Ringer
cc9d3bf73f nixos: now beta 2020-09-22 21:58:55 -07:00
Stig Palmquist
9214e9509b perl-cross: fix . being included in INC
perl-cross set `default_inc_excludes_dot` to undefined by default. This
sets `-Ddefault_inc_excludes_dot` explicitly when cross compiling.

(cherry picked from commit e2926577a1)
2020-09-22 17:06:37 -07:00
Vincent Laporte
bf55f0c071 coqPackages.metalib: 20170713 → 20200527
(cherry picked from commit a1f8e0b4a1)
2020-09-22 22:06:47 +02:00
Robert Scott
0b887c636f Merge pull request #98240 from Pamplemousse/backport_verilator
[20.09] verilator: 4.040 -> 4.100
2020-09-22 19:10:39 +01:00
Vladimír Čunát
888d3a4c37 Merge branch 'staging-20.09' into release-20.09
aarch64 and darwin still have a few thousand builds to finish,
but it seems OK to merge already.
2020-09-22 19:34:18 +02:00
William Kral
4eec4a7a75 python3Packages.word2vec: fix build and tests
(cherry picked from commit 6a4e785931)
2020-09-22 10:09:10 -07:00
Lancelot SIX
7e5277bcb2 pythonPackages.django: 2.2.15 -> 2.2.16
See https://docs.djangoproject.com/en/dev/releases/2.2.16/

(cherry picked from commit bd4805b659)
2020-09-22 17:18:15 +01:00
Vincent Laporte
6e31319063 hop: fix build
The configure process tries to escape the sandbox by writing into /tmp

(cherry picked from commit 943fa12e6a)
2020-09-22 16:16:57 +02:00
Claudio Bley
ba0bd29a1a tensorflow: Fix compilation with numpy 1.19.x
Numpy introduced a breaking API change in version 1.19.x, see [1].

There is a simple fix [2] available in the master branch.

[1]: https://github.com/tensorflow/tensorflow/issues/40688
[2]: 75ea0b3147

(cherry picked from commit 8f5bfd6af1)
2020-09-21 23:40:10 -07:00
Pamplemousse
8e0373f183 topydo: Don't fail build on tests
Signed-off-by: Pamplemousse <xav.maso@gmail.com>
(cherry picked from commit c603f62628)
2020-09-21 23:12:56 -07:00
Pamplemousse
14b64adfec verilator: 4.040 -> 4.100
Signed-off-by: Pamplemousse <xav.maso@gmail.com>
(cherry picked from commit 9839c0b292)
2020-09-21 19:56:42 -07:00
Vladimír Čunát
a3783f968b Merge #97970: thunderbird*-78: 78.2.1 -> 78.2.2 2020-09-21 21:35:22 +02:00
Vladimír Čunát
cdf6be7489 Merge #97922: nixosTests.signal-desktop: fix
(cherry picked from commit cf09899749)
2020-09-21 21:35:18 +02:00
Markus Kowalewski
969984bb84 slurm: 20.02.4.1 -> 20.02.5.1
(cherry picked from commit 84d11cdb40)
2020-09-21 21:19:06 +02:00
Vladimír Čunát
bfba40c197 thunderbird.meta.maintainers: add myself
I've been keeping an eye on it anyway, and the current meta.maintainers
don't seem to be active around thunderbird.

(cherry picked from commit d33267c639)
2020-09-21 21:01:37 +02:00
Vladimír Čunát
ac9d85f5a1 thunderbird-78: fix #97994: broken UI in 78.2.2
(cherry picked from commit 114202e369)
2020-09-21 21:01:07 +02:00
Bruno Bigras
b11f9622a7 nwg-launchers: 0.2.0 -> 0.3.3; fix nwggrid not showing apps
(cherry picked from commit 1d5fb043fa)
2020-09-21 11:11:13 -07:00
oxalica
dc925f544e nix-prefetch: fix compatibility with nixUnstable again 2020-09-21 19:52:38 +02:00
Gabriel Ebner
a8ec124a80 Merge pull request #98409 from drewrisinger/zhf/py-spyder-20.09
[20.09] spyder: fix build
2020-09-21 19:51:34 +02:00
Daniël de Kok
283adf1d1e freeoffice: 976 -> 978
Fixes #98385.

(cherry picked from commit ac49c2f72a)
2020-09-21 19:20:10 +02:00
Doron Behar
3bbf7d3a96 Merge pull request #98326 from schmittlauch/cawbird-v1.2.1-back
[20.09] cawbird: 1.1.0 -> 1.2.1
2020-09-21 19:28:42 +03:00
r-burns
7a5d897281 libversion: fix tests on Darwin (#98361)
(cherry picked from commit a2228f4c18)
cc #98361
2020-09-21 12:00:12 -04:00
Théo Zimmermann
4c1ae47e8c ocamlPackages.zarith: 1.9 -> 1.10
(cherry picked from commit 0bbeca2ff9)
2020-09-21 13:54:12 +02:00
Ryan Burns
39a54c9899 lizardfs: fix build
Build failure was due to upstream issue, now fixed in the v3.13 RC.

https://github.com/lizardfs/lizardfs/issues/655
https://github.com/lizardfs/lizardfs/pull/677
(cherry picked from commit f5a61c2604)
2020-09-21 06:51:10 -05:00
MetaDark
a4f66d2178 linuxPackages.xpadneo: 0.8.2 -> 0.8.3
(cherry picked from commit 3ac630bbe9)
2020-09-21 06:47:24 -05:00
Mario Rodas
40e8b267b6 Merge pull request #98344 from r-burns/openssh_hpn_backport
[20.09] openssh_hpn: fix source
2020-09-21 06:30:39 -05:00
Mario Rodas
69fe518870 Merge pull request #98355 from risicle/ris-vmmlib-fix-r20.09
[20.09] vmmlib: fix build
2020-09-21 06:25:45 -05:00
Ryan Burns
6ab3306a22 liboping: fix build on Darwin
(cherry picked from commit bf71f459d2)
2020-09-21 06:24:14 -05:00
r-burns
c4e178a4c6 iproute_mptcp: fix preConfigure (#97747) (#98378)
(cherry picked from commit d0edb00019)

Co-authored-by: freezeboy <freezeboy@users.noreply.github.com>
2020-09-21 10:39:46 +02:00
Vladimír Čunát
397fc9bd79 Merge branch 'release-20.09' into staging-20.09 2020-09-21 09:50:28 +02:00
Jonathan Ringer
775b368bb9 streamlit: fix build
(cherry picked from commit 07660b28bc)
2020-09-21 00:09:16 -07:00
Kirill Elagin
3f5944efc3 prometheus: Unbreak IPv6 listenAddress
The format of the listenAddress option was recently changed to separate
the address and the port parts. There is now a legacy check that
tells users to update to the new format. This legacy check produces
a false positive on IPv6 addresses, since they contain colons.

Fix the regex to make it not match colons within IPv6 addresses.

(cherry picked from commit a4afd525cb)
2020-09-21 08:14:30 +02:00
Vincent Laporte
cad20521d2 fontmatrix: 0.6.0 → 0.6.0-qt5 (#97800)
This is an unofficial port of Fontmatrix 0.6.0 to Qt5

Co-authored-by: symphorien <symphorien@users.noreply.github.com>
(cherry picked from commit 4e155d6be9)
2020-09-21 08:08:45 +02:00
Drew Risinger
24c19a6903 python3Packages.spyder: fix build
* Remove version locks that don't match what's in nixpkgs

(cherry picked from commit 3b6800c76a)
2020-09-20 23:48:18 -04:00
Mario Rodas
907dcbaac5 Merge pull request #98356 from risicle/ris-svgbob-fix-20.09
[20.09] svgbob: fix build
2020-09-20 21:07:15 -05:00
Robert Scott
b142f339bf svgbob: fix build
loosen lint settings

(cherry picked from commit a28068a992)
2020-09-21 00:27:46 +01:00
sohalt
36fe916089 sonic-lineup: 1.0.1 -> 1.1, fix build
(cherry picked from commit 60078b4662)
2020-09-20 15:39:40 -07:00
Ryan Burns
d395c81088 openssh_hpn: fix source
(cherry picked from commit f8473b1d39)
2020-09-20 15:32:49 -07:00
Robert Scott
29d5187e8c libgumath, pythonPackages.gumath: unstable-2018-11-27 -> unstable-2019-08-01
this is the most recent commit to upstream's master at time of writing

includes fixes of python package for darwin

(cherry picked from commit eb86bff30d)
2020-09-20 15:23:18 -07:00
Robert Scott
87186252a7 libxnd, pythonPackages.xnd: unstable-2018-11-27 -> unstable-2019-08-01
this is the most recent commit to upstream's master at time of writing

includes fixes of python package for darwin

(cherry picked from commit dcd6847ddb)
2020-09-20 15:23:18 -07:00
Robert Scott
15667a227a libndtypes, pythonPackages.ndtypes: unstable-2018-11-27 -> unstable-2019-08-01
this is the most recent commit to upstream's master at time of writing

includes fixes of python package for darwin

(cherry picked from commit 044533c99b)
2020-09-20 15:23:18 -07:00
Raphael Borun Das Gupta
5ec6c556af pythonPackages.mock-open: 1.3.2 -> 1.4.0
(cherry picked from commit 355d255d6c)
2020-09-20 15:22:54 -07:00
Raphael Borun Das Gupta
01f1b3850f pythonPackages.mock-open: 1.3.1 -> 1.3.2
(cherry picked from commit b103ddb9ab)
2020-09-20 15:22:54 -07:00
Robert Scott
40bc5616f5 vmmlib: fix build
provide lapack instead of blas, causing gaussian elimination tests to
no longer fail

remove some trailing spaces from the longDescription to please the linter.
sorry.

(cherry picked from commit 566605626c)
2020-09-20 23:11:00 +01:00
zowoq
640d5c9c6b gitAndTools.gh: 0.12.0 -> 1.0.0
https://github.com/cli/cli/releases/tag/v1.0.0
(cherry picked from commit ec63faba64)
2020-09-21 08:03:21 +10:00
zowoq
bab5197fb5 gitAndTools.gh: 0.11.1 -> 0.12.0
https://github.com/cli/cli/releases/tag/v0.12.0
(cherry picked from commit ec22086628)
2020-09-21 08:03:08 +10:00
Austin Butler
1db586cfc6 pythonPackages.glom: fix tests
(cherry picked from commit 05f994426f)
2020-09-20 14:33:15 -07:00
Cole Helbling
379f99e422 nixos-rebuild: add flake support for build-vm
This relies on users using `nixpkgs.lib.nixosSystem` to define their
system; otherwise, the `vm` and `vmWithBootLoader` attributes will not
exist.

(cherry picked from commit e26b348689)
2020-09-20 15:11:05 -04:00
Maximilian Bosch
3114b4586e matrix-synapse: 1.19.2 -> 1.19.3
https://github.com/matrix-org/synapse/releases/tag/v1.19.3
(cherry picked from commit 44c558b219)
2020-09-20 19:38:23 +02:00
Ben Darwin
45fea15a04 python3Packages.graspy: 0.2.0 -> 0.3.0
(cherry picked from commit 1179840f9a)
2020-09-20 09:29:15 -07:00
Ben Darwin
21230980fc python3Packages.hyppo: init at 0.1.3
(cherry picked from commit 5315ce0e40)
2020-09-20 09:29:15 -07:00
Martin Weinelt
fed9e9887d pythonPackages.junos_eznc: fix build
(cherry picked from commit a5f77e0583)
2020-09-20 08:21:14 -07:00
Martin Weinelt
7a31d95c73 pythonPackages.yamlordereddictloader: init at 0.4.0
(cherry picked from commit d956ed6ac8)
2020-09-20 08:21:14 -07:00
Martin Weinelt
6b57dab091 python3Packages.ntc-templates: init at 1.5.0
(cherry picked from commit 278d069304)
2020-09-20 08:21:14 -07:00
Martin Weinelt
fc3415f7db pythonPackages.textfsm: init at 1.1.1
(cherry picked from commit 6898bcff08)
2020-09-20 08:21:14 -07:00
Orivej Desh
aecec982d0 solfege: fix build with texinfo 6.7
makeinfo seems right to fail when input encoding is not declared and is not UTF-8.

texinfo was updated in #95910.

(cherry picked from commit 19f7f150a4)
2020-09-20 08:20:58 -07:00
Robert Scott
ff494d76ef pforth: fix build with patch
patch from upstream fixes build with gnumake>=4.3

(cherry picked from commit 7621c8b1fc)
2020-09-20 08:20:29 -07:00
Robert Scott
ca19375f50 sslyze: fix build
need to further relax cryptography module version requirements

(cherry picked from commit d61c16cda4)
2020-09-20 08:19:38 -07:00
Ryan Burns
b582883fd9 docker_18_09: fix build
The cross-compilation patch introduced in
https://github.com/NixOS/nixpkgs/pull/92140
fixes an issue introduced in Docker CE 19.03,
and will not apply to (and is not needed for)
previous versions.
2020-09-20 08:17:57 -07:00
Trolli Schmittlauch
6f77ca1405 cawbird: 1.1.0 -> 1.2.1
- regular version bump to 1.2.0, then bugfix release on top
- changes: see
    - https://github.com/IBBoard/cawbird/releases/tag/v1.2.0
    - https://github.com/IBBoard/cawbird/releases/tag/v1.2.1

(cherry picked from commit 0b3ffb512c)
2020-09-20 17:09:06 +02:00
Luflosi
bb83ca4039 youtube-dl: 2020.09.14 -> 2020.09.20
https://github.com/ytdl-org/youtube-dl/releases/tag/2020.09.20
(cherry picked from commit 907fd8d6f6)
cc #98319
2020-09-20 10:48:45 -04:00
Vladimír Čunát
cd88f36a97 Merge branch 'staging-20.09' into release-20.09
Rebuild of this commit is done, except for a few thousand darwin jobs.
2020-09-20 07:51:49 +02:00
WORLDofPEACE
67ba80396d celluloid: 0.19 -> 0.20
https://github.com/celluloid-player/celluloid/releases/tag/v0.20
(cherry picked from commit 670fe111f4)
2020-09-20 00:40:35 -04:00
Jonathan Ringer
5a6ec511b6 python3Packages.lightparam: fix source and deps
(cherry picked from commit 2a35f66439)
2020-09-19 20:28:30 -07:00
Dennis Gosnell
187a2da74e Merge pull request #98269 from KaiHa/pr/sbv-backport
haskellPackages.sbv: fix tests
2020-09-20 12:12:58 +09:00
Doron Behar
2311d65989 Merge pull request #98287 from bbigras/backport-gnome-timepp
[20.09] gnomeExtensions.timepp: unstable-2019-03-30 -> unstable-2020-03-15; unbreak pkg
2020-09-19 23:34:56 +03:00
Bruno Bigras
34acf56fa9 gnomeExtensions.timepp: unstable-2019-03-30 -> unstable-2020-03-15; unbreak package
(cherry picked from commit 1127b73eee)
2020-09-19 15:25:22 -04:00
Thomas Tuegel
6af88205cb Merge pull request #98273 from ttuegel/staging-20.09--mariadb-connector-c-multiple-outputs
mariadb-connector-c: multiple outputs
2020-09-19 13:35:23 -05:00
WORLDofPEACE
d1befddac3 Merge pull request #98170 from liff/zhf-backport/wordgrinder
[20.09] wordgrinder: fix build
2020-09-19 13:16:44 -04:00
WORLDofPEACE
76266a5fbf Merge pull request #98260 from ryantm/revertmonit
[20.09] Revert "nixos/monit: Allow splitting the config in multiple files"
2020-09-19 13:16:32 -04:00
Thomas Tuegel
d44e1ac0a7 mariadb-connector-c: multiple outputs
(cherry picked from commit c0825ddbe9)
2020-09-19 05:55:21 -05:00
Kai Harries
0c9bbf8bc2 haskellPackages.sbv: fix tests
By patching paths of the external provers and excluding not available
provers from the test.

ZHF: #97479
(cherry picked from commit f40afea417)
2020-09-19 11:59:35 +02:00
squalus
bfb429d7ec ungoogled-chromium: 84.0.4147.89-1 -> 85.0.4183.102-1
based on chromium master@05f5001c

(cherry picked from commit 54a0a400f2)
2020-09-19 11:50:34 +02:00
Olli Helenius
182c9afd70 wordgrinder: fix build
(cherry picked from commit 8cb1e75e3b)
2020-09-19 11:44:33 +03:00
Ryan Mulligan
ca33a6c3f0 Revert "nixos/monit: Allow splitting the config in multiple files"
(cherry picked from commit 61863c5155)
2020-09-18 22:02:22 -07:00
Anderson Torres
bea7aa233d Merge pull request #98254 from Mathnerd314/20.09-unnethack
[20.09] unnethack: 5.2.0 -> 5.3.2, fix build
2020-09-19 00:43:15 -03:00
Mathnerd314
d6d7be3baf unnethack: 5.2.0 -> 5.3.2 (#97595)
Co-authored-by: Jon <jonringer@users.noreply.github.com>
(cherry picked from commit 47ba35d6d4)
2020-09-18 19:51:21 -06:00
Jonathan Ringer
e7091baacc python3Packages.runway-python: add missing deps
(cherry picked from commit a9162ffdaa)
2020-09-18 18:44:33 -07:00
Jonathan Ringer
e81788363d python3Packages.hickle: disable tests
Incompatible with astropy>=4.0

(cherry picked from commit 389ab45924)
2020-09-18 18:41:41 -07:00
Jonathan Ringer
a57cd670b8 python2Packages.hickle: disable
```
  Processing ./hickle-4.0.1-py2-none-any.whl
  ERROR: Package 'hickle' requires a different Python: 2.7.18 not in '>=3.5'
```

(cherry picked from commit f1325cdfe7)
2020-09-18 18:41:41 -07:00
Robert Scott
c22c22bf64 Merge pull request #98236 from wkral/backport-py-irc
[20.09] python3Packages.irc: fix build
2020-09-19 02:23:57 +01:00
William Kral
fc18eddeef python3Packages.irc: fix build
(cherry picked from commit 7567bd6d89)
2020-09-18 14:54:53 -07:00
Peter Simons
497587ae2f haskell-headed-megaparsec: disable broken build
The package needs megaparsec 9.x, which we don't use by default.
2020-09-18 21:04:35 +02:00
Robert Scott
4910c6ba83 Merge pull request #98201 from povik/libiio-fix-backport
[20.09] python3.pkgs.libiio: fix build
2020-09-18 19:09:16 +01:00
William Kral
344d782f95 python3Packages.requests-aws4auth: fix build
(cherry picked from commit 5f0f2b85cb)
2020-09-18 10:19:32 -07:00
Martin Povišer
0bfcc861ab python3.pkgs.cartopy: 0.17 -> 0.18
Fixes build. Formerly cartopy tests were failing, likely since update of
matplotlib to 3.3.0.

(cherry picked from commit 20472523e7)
2020-09-18 10:18:29 -07:00
Tim Steinbach
e036652424 linux/hardened/patches/5.8: 5.8.9.a -> 5.8.10.a
(cherry picked from commit deea9b8a4a)
2020-09-18 08:39:07 -04:00
Tim Steinbach
e9c968a272 linux/hardened/patches/5.8: 5.8.8.a -> 5.8.9.a
(cherry picked from commit b585d60082)
2020-09-18 08:39:07 -04:00
Martin Povišer
cedbe71354 python3.pkgs.libiio: fix build
Add missing setuptools dependency.

(cherry picked from commit ce0a59cb9f)
2020-09-18 10:25:04 +02:00
Niklas Hambüchen
66cadca583 ntfy: Switch to python3. Also fixes test failure.
Fixes test error:

    AttributeError: 'module' object has no attribute 'test_prowl'

(cherry picked from commit 35593698d5)
2020-09-18 08:21:23 +02:00
Dmitry Kalinkin
774e3cb348 texlive: fix arara
(cherry picked from commit 37d65c8698)
cc #97609
2020-09-17 21:38:22 -04:00
Aaron Andersen
6f0f1bb64f Merge pull request #98017 from aanderse/tomcat-native
tomcat-native: 1.2.24 -> 1.2.25 [20.09]
2020-09-17 19:17:43 -04:00
Tim Steinbach
594723985c linux: 5.8.9 -> 5.8.10 2020-09-17 09:59:34 -04:00
Tim Steinbach
7eb8362d10 linux: 5.4.65 -> 5.4.66 2020-09-17 09:59:34 -04:00
Tim Steinbach
91968e58cf linux: 4.19.145 -> 4.19.146 2020-09-17 09:59:34 -04:00
Maximilian Bosch
e20e342bd5 react-native-debugger: fix eval
(cherry picked from commit 501eaab47a)
2020-09-17 14:53:49 +02:00
Demyan Rogozhin
df4c3f4fbd react-native-debugger: 0.9.10 -> 0.11.4
(cherry picked from commit 114ad1a7c5)
2020-09-17 14:53:49 +02:00
Demyan Rogozhin
def97800ce react-native-debugger: fix build
(cherry picked from commit e77d4ecac2)
2020-09-17 14:53:49 +02:00
Mauricio Collares
6c6f85e071 signal-desktop: ringrtc depends on libpulseaudio
voice/video calls should now work, fixing #98082

(cherry picked from commit 3df04beafc)
2020-09-17 14:22:10 +02:00
Frederik Rietdijk
06da165c5e Revert "python: gsd: 1.7.0 -> 1.9.3"
Incorrect update. Should not update the Python 2 version.

This reverts commit d1a46d4ff3.

(cherry picked from commit af92611103)
2020-09-17 11:36:57 +02:00
Lancelot SIX
95d45c2383 pythonPackages.pyslurm: mark as broken
(cherry picked from commit 00f16b7e0c)
2020-09-17 07:57:47 +01:00
Andrei Lapshin
8e68ff6b4b nixos/plasma5: Fix build with config.services.colord.enable = true
Fix build with enabled colord service after https://github.com/NixOS/nixpkgs/pull/97456

(cherry picked from commit 19b5ef48fc)
2020-09-17 00:42:15 -04:00
WORLDofPEACE
7df3404150 Merge pull request #98146 from mkg20001/cinrelback
[20.09] cinnamon release notes
2020-09-17 00:30:21 -04:00
Maciej Krüger
b13997485f release-notes: mention cinnamon
(cherry picked from commit bc3d459ceb)
2020-09-17 06:27:22 +02:00
ajs124
ad7755193f Merge pull request #98117 from tokudan/2009-matrix
matrix-synapse: 1.19.1 -> 1.19.2 [20.09]
2020-09-16 23:07:42 +02:00
Frederik Rietdijk
958394d55f pythonPackages: set qt version by overriding pkgs
(cherry picked from commit c88f3adb17)
2020-09-16 21:18:36 +02:00
ajs124
12822e9336 matrix-synapse: 1.19.1 -> 1.19.2
(cherry picked from commit 21779aece5)
2020-09-16 19:32:46 +02:00
Daniël de Kok
ee27689215 Merge pull request #98028 from danieldk/softmaker-office-1020-20.09
[20.09] softmaker-office: 1018 -> 1020
2020-09-16 06:52:28 +02:00
Anderson Torres
fd491ec80f Merge pull request #97764 from superherointj/release-20.09
[20.09] nixos/dmidecode: added recommended patches
2020-09-15 23:16:28 -03:00
Mario Rodas
ea4b39d48a nodejs-12_x: 12.18.3 -> 12.18.4
https://github.com/nodejs/node/releases/tag/v12.18.4
(cherry picked from commit 095a32182d)
2020-09-15 19:39:31 -05:00
Mario Rodas
05a6efb508 nodejs-10_x: 10.22.0 -> 10.22.1
https://github.com/nodejs/node/releases/tag/v10.22.1
(cherry picked from commit afeed1fe58)
2020-09-15 19:39:30 -05:00
Josef Kemetmüller
f3b68ac434 cli-visualizer: Fix build
(cherry picked from commit ce065c6251)
2020-09-15 11:47:35 -07:00
Jonathan Ringer
797c5a8141 python3Packages.graphite_beacon: fix deps, add nixos test
(cherry picked from commit 2003495474)
2020-09-15 11:10:19 -07:00
Matthew Bauer
914d526230 pytorch: update to use passthru's for checks
This makes the checks a little easier to understand - we can just
check it in the passthru. Also increase major check for cuda 11.

(cherry picked from commit c85fc341b0)
2020-09-15 10:43:57 -05:00
JesusMtnez
3b8ddb2f1e jitsi-meet-electron: 2.2.0 -> 2.3.1
(cherry picked from commit 5b19fa94ac)
2020-09-15 10:56:51 -04:00
Maximilian Bosch
1bb3a05a11 citrix_workspace: add 20.09.0
ChangeLog: https://docs.citrix.com/en-us/citrix-workspace-app-for-linux/whats-new.html#whats-new-in-2009

Also removed 19.12.0 which will be out of maintenance in April 2021
which is still within the lifetime of 20.09.

(cherry picked from commit b632ca6963)
2020-09-15 15:41:39 +02:00
Dennis Gosnell
7c27289295 Merge pull request #98019 from charukiewicz/release-20.09
hledger, hledger-lib, hledger-ui, and hledger-web: v1.19 -> v1.19.1
2020-09-15 21:16:46 +09:00
(cdep)illabout
5d77421642 hledger: 1.19 -> 1.19.1 2020-09-15 20:34:03 +09:00
Daniël de Kok
a46fae030f softmaker-office: 1018 -> 1020
(cherry picked from commit e2c8ae9881)
2020-09-15 08:22:59 +02:00
pancho horrillo
af8a177463 caddy1: fix build (#97988)
main.go gets overwritten in order to build caddy with telemetry
disabled, but the global variable `run` got neglected, and this in turn
broke the test in caddy/main_test.go.

This commit fixes that, and build can now complete.

(cherry picked from commit c814b0ef24)
2020-09-14 21:39:01 -07:00
Robert Scott
4c1163d755 pythonPackages.holidays: fix build by adding korean-lunar-calendar dependency
(cherry picked from commit 9fb14d899d)
2020-09-14 20:54:47 -07:00
Robert Scott
8ef4ff9a64 pythonPackages.korean-lunar-calendar: init at 0.2.1
(cherry picked from commit cf5a892a24)
2020-09-14 20:54:47 -07:00
nyanloutre
a40c69ed47 pythonPackage.python-gitlab: add missing tests requirements
(cherry picked from commit 9225192bf6)
2020-09-14 20:03:59 -07:00
charukiewicz
434540dbcd version bumps of hledger, hledger-lib, hledger-ui, and hledger-web from v1.19 to v1.19.1 2020-09-14 20:41:32 -05:00
Aaron Andersen
af23c989e9 tomcat-native: 1.2.24 -> 1.2.25
(cherry picked from commit cc34aad0d7)
2020-09-14 19:56:54 -04:00
Henri Menke
ded557901c nixos/shadowsocks: add test without plugin
(cherry picked from commit 9d60354fae)
2020-09-14 23:21:21 +02:00
Henri Menke
f16bc4cf54 nixos/shadowsocks: add extraConfig
(cherry picked from commit e587b5a8a8)
2020-09-14 23:21:09 +02:00
Florian Klink
d242782c7f bash-completion: disable tests
Unfortunately, they're very flaky. Let's disable them for now.

(cherry picked from commit 3bfdbea881)
2020-09-14 23:08:54 +02:00
Vincent Laporte
27c9f6f783 ott: 0.30 → 0.31
(cherry picked from commit cc4a33d78c)
2020-09-14 21:43:23 +02:00
Robert Scott
be6fc631bf Merge pull request #97956 from fgaz/zhf-backports/drawpile
[20.09] drawpile: fix build by adding libsecret
2020-09-14 20:02:50 +01:00
Maximilian Bosch
ba68572dea element-desktop: 1.7.5 -> 1.7.7
https://github.com/vector-im/element-desktop/releases/tag/v1.7.6
https://github.com/vector-im/element-desktop/releases/tag/v1.7.7
(cherry picked from commit 441818c4ff)
2020-09-14 19:11:09 +02:00
Maximilian Bosch
b6465d263d element-web: 1.7.5 -> 1.7.7
https://github.com/vector-im/element-web/releases/tag/v1.7.6
https://github.com/vector-im/element-web/releases/tag/v1.7.7
(cherry picked from commit 33d02b3396)
2020-09-14 19:11:09 +02:00
Josef Kemetmüller
ffe2d44646 python.pkgs.geopandas: 0.8.0 -> 0.8.1
This fixes the geopandas build, which did break with the update of
pandas from 1.0.5 to 1.1.0.

(cherry picked from commit dc2e45e3e5)
2020-09-14 09:56:33 -07:00
Florian Klink
a1abac1f1f systemd: 246 -> 246.4
This bumps systemd to the latest stable maintenance release.

 - dc2e82af33 core: create per-user inaccessible node from the service manager
 - 0b3c497347 nspawn,pid1: pass "inaccessible" nodes from cntr mgr to pid1 payload via /run/host
 - 2239965c29 coredump: don't convert s → µs twice
 - 61d29b7f8c firstboot: fill empty color if ansi_color unavailable from os-release
 - 9678a3daf6 varlink: do not parse invalid messages twice
 - 4e516dcbc1 userdbctl: add forgotten --output mode in help
 - aee20dfbd8 shared/{user,group}-record-nss: adjust filtering of "valid" passwords
 - 5933d77afe doc: cross link sd_listen_fd() docs a bit
 - 97fdde3239 Rework how we cache mtime to figure out if units changed
 - 0500968241 core: always try to reload not-found unit
 - 8ae22f0d64 pid1: use the cache mtime not clock to "mark" load attempts
 - 715507c277 core: rename manager_unit_file_maybe_loadable_from_cache()
 - 20ad76d0a7 man: document fd ownership for sd-bus fd marshalling
 - 38ae73fafd resolved: make sure we initialize t->answer_errno before completing the transaction
 - a1ba0fbef6 homed: fix log message to honor real homework path
 - d6b1e659b3 src/shared/dissect-image.c: fix build without blkdid (#16901)
 - e42f9add21 analyze: fix error handling in one case
 - 4804ce1488 units: add missing usb-gadget.target
 - 5ad4e68c37 man: extend on the usec/sec discrepancy
 - 2fb612371d login/logind: Include sys/stat.h for struct stat usage
 - 5e884e7ee0 partition/makefs: Include missing sys/file.h header
 - 7bbc3807da network: dhcp6: logs only new address
 - 2056429e0f Don't run test-repart when loop devices are not available
 - dcbea51c5a man: clarify that several networkctl commands takes device names
 - 16e4cfcc82 networkctl: label command does not take any argument
 - 2352921244 missing: Add new Linux capability
 - 8b29c4a4f9 tty-ask-pw-agent: properly propagate error
 - f7ce2e9839 tty-ask-pw-agent: the message string might not be set
 - 29cba5c9ef tty-ask-pw-agent: make sure "--list" works correctly
 - e1ce367d73 add "list" verb to autocompleted commands
 - 1f4cb5da1e shell-completion/zsh: add missing verbs for networkctl
 - a4236a2764 path: Improve $PATH search directory case
 - b7cef386bd path: Skip directories when finalising $PATH search
 - 122945f315 rules: don't install 80-drivers.rules when kmod is disabled
 - 42fab2d454 zsh: correct journalctl command completion parsing
 - ed3f97f962 basic/missing_syscall: fix syscall numbers for arm64 :(
 - ba6e7f7c46 shared/install: fix preset operations for non-service instantiated units
 - d39f139348 nss-resolve: treat BUS_ERROR_NO_SUCH_UNIT the same as SD_BUS_ERROR_SERVICE_UNKNOWN too
 - 9bb3e64d71 various: treat BUS_ERROR_NO_SUCH_UNIT the same as SD_BUS_ERROR_SERVICE_UNKNOWN
 - 6d802dd596 man: drop reference to long gone .busname unit type
 - a29656804b man: fix a fix of a typo in systemd.service example
 - 21ce0f5b33 network: can: Fix CAN initialization
 - cab5cde8c9 man: update autogenerated dbus api lists
 - 0d8000522b man: fix invalid tag place
 - ea94f218be man: add conditionals to more man pages
 - ef91325349 meson: add ENABLE_ANALYZE conditional
 - 83f7c0a7ec core: add missing conditions/asserts to unit file parsing
 - 716718155d analyze: rework condition testing
 - 5c4c7581bc sd-bus: fix error handling on readv()
 - 6cd058f305 user-runtime-dir: deal gracefully with missing logind properties
 - 6a2d73638d shared/seccomp: do not use ifdef guards around textual syscall names
 - 7355ac9689 machine-id-setup: don't use KVM or container manager supplied uuid if in chroot env
 - 496a71f444 man: Fix typo in systemd-tmpfiles
 - 6c5d216ad8 homework: downgrade chattr failure log message
 - 1708f06a00 homework: explicitly close cryptsetup context, to not keep loopback device busy
 - a21eaa2a3a homework: correct error passed into log message
 - 3a2d169f36 homework: sync everything to disk before we rename LUKS loopback file into place
 - 84e1ab74d2 homed: downgrade quota message in containers
 - 8b62cadf36 analyze-security: do not assign badness to filtered-out syscalls
 - 29854a5437 NEWS: clarify two points
 - 4cb4fb82f7 meson: add min version for libfdisk
 - 76331f86f6 load-fragment: fix grammar in error messages
 - 1e53c2d70f Fix function description in logind man page
 - 669066564d network: do not fail if UseMTU=yes on DHCP lease lost
 - a2a3f16cdc missing_syscall: do not use function name that may conflict with glibc
 - 4091dcd469 missing_syscall: fix pidfd_{send_signal,open} numbers for alpha
 - 7875daf52b network: wait for previous address removal before configuring static addresses
 - 120064b4a1 network: only process non-error message
 - f44ec1de15 test: accept that char device 0/0 can now be created witout privileges
 - 946e4c43bb tools/make-man-index: fix purpose text that contains tags
 - dae0586e91 test-fs-util: skip encrypted path test if we get EACCES
 - 0d026c9b0d Newer Glibc use faccessat2 to implement faccessat
 - fde6520d46 namespace: fix minor memory leak
 - 208ba581f4 man: fix incorrectly placed full stop
 - 6c81d57828 man: fix typo
 - 53a8d2588e bless-boot: add missing verb to --help
 - 4cfa0ac4fd user-record: deal with invalid GECOS fields gracefully
 - ae5234ef48 user-util: add mangle_gecos() call for turning strings into fields suitable as GECOS fields
 - 972391ac39 fix typo in systemctl help
 - 443aacfcda man: clarify that LogNamespace= is for system services only
 - 5aec8fe54e _sd-common.h: avoid parsing errors with Coverity
 - f9ad4ea2ca analyze: fix 'cat-config systemd/zram-generator.conf'
 - dda6fec1df man: describe that changing Storage= does not move existing data
 - 2bbd33e476 core: reset bus error before reuse
 - b81504a3c7 nspawn: Fix incorrect usage of putenv
 - cb263973ac man: fix typo in systemd.service
 - 73b432e7ef network: fix DHCPv6 Prefix Delegation example after option rename

(cherry picked from commit 6c5e621bad)
2020-09-14 18:48:31 +02:00
Doron Behar
5605f3acee Merge pull request #97725 from drewrisinger/zhf/parso-20.09
[20.09] python3Packages.parso: disable on python 2.7
2020-09-14 19:45:47 +03:00
Nikolay Korotkiy
ba10637048 pythonPackages.timezonefinder: fix build
(cherry picked from commit 9c0a900a9d)
2020-09-14 17:14:47 +01:00
Tim Steinbach
5f5d8947d2 linux: 5.8.8 -> 5.8.9 2020-09-14 08:43:59 -04:00
Tim Steinbach
c71f07ec88 linux: 5.4.64 -> 5.4.65 2020-09-14 08:43:59 -04:00
Tim Steinbach
30c2a51ad0 linux: 4.9.235 -> 4.9.236 2020-09-14 08:43:59 -04:00
Tim Steinbach
cfde64b305 linux: 4.4.235 -> 4.4.236 2020-09-14 08:43:59 -04:00
Tim Steinbach
b07cb146f7 linux: 4.19.144 -> 4.19.145 2020-09-14 08:43:59 -04:00
Tim Steinbach
9447a07a10 linux: 4.14.197 -> 4.14.198 2020-09-14 08:43:59 -04:00
Doron Behar
23ff83bbf8 gotify-cli: Add version and commit to ldflags
(cherry picked from commit b027fc3df8)
2020-09-14 12:56:10 +02:00
taku0
c37c04ee7e thunderbird-bin: 78.2.1 -> 78.2.2
(cherry picked from commit eff618541e)
2020-09-14 19:30:03 +09:00
taku0
1b2aa767ec thunderbird: 78.2.1 -> 78.2.2
(cherry picked from commit 5bcc37d79e)
2020-09-14 19:30:02 +09:00
adisbladis
4ee4f7ce83 Merge pull request #97965 from elohmeier/bp-qtstylepluginsfix
[20.09] qtstyleplugins: Fix build with qt>=5.15
2020-09-14 12:29:56 +02:00
adisbladis
5cc3d11f3e qtstyleplugins: Fix build with qt>=5.15
(cherry picked from commit ff6c3a9e34)
2020-09-14 09:46:48 +02:00
Maximilian Bosch
c1dbaed781 top-level: fix nix-shell eval w/nixUnstable
For a full description of the underlying issue please read
https://github.com/NixOS/nix/issues/4003

(cherry picked from commit fa6064ad86)
2020-09-14 09:10:53 +02:00
Luflosi
8af2978ed7 youtube-dl: 2020.09.06 -> 2020.09.14
https://github.com/ytdl-org/youtube-dl/releases/tag/2020.09.14
(cherry picked from commit 4a11f046a6)
2020-09-14 08:52:35 +02:00
Francesco Gazzetta
2bea9c2267 drawpile: fix build by adding libsecret
(cherry picked from commit 1c8d65f940)
2020-09-14 08:05:45 +02:00
WORLDofPEACE
f6ef6485e3 Merge pull request #97929 from TethysSvensson/fixBusybox-20.09
[20.09] busybox: Fix 404 error by using git instead
2020-09-14 00:36:17 -04:00
Anderson Torres
c13c1a21cd Merge pull request #97932 from OPNA2608/backport-20.09-update-palemoon-28.13.0
[20.09] palemoon: 28.12.0 -> 28.13.0
2020-09-14 01:11:13 -03:00
Christoph Neidahl
48b66b89ba palemoon: 28.12.0 -> 28.13.0
(cherry picked from commit 5efe403c93)
2020-09-13 23:08:48 +02:00
Tethys Svensson
e09e7a88cd busybox: Use git to fetch debian.script from debian
Debian has yanked the upstream tarball we use to get default.script. We
could simply bump the version number to get the new tarball, but to
avoid the problem in the future, we should instead fetch it from git.

(cherry picked from commit a9597f9573)
2020-09-13 22:13:59 +02:00
Tethys Svensson
f6d9962180 fetchgitlab: Escape a few more characters in the revision
(cherry picked from commit 43cd431b44)
2020-09-13 22:13:55 +02:00
freezeboy
5d5307af50 python2Packages.green: remove
(cherry picked from commit 96acb3a772)
2020-09-13 10:25:12 -07:00
marius david
2a7ea4b1ff instead: 3.3.1 -> 3.3.2; fix compilation
(cherry picked from commit 43d9d1d7d8)
2020-09-13 09:40:52 -07:00
freezeboy
7d6f1c0784 python2Packages.cx_Freeze: remove
(cherry picked from commit e3912be86a)
2020-09-13 09:38:18 -07:00
Robert Scott
0e96315492 Merge pull request #97900 from freezeboy/backport-cfn-lint
[20.09] cfn-lint: fixed importlib_resources version bounds
2020-09-13 16:23:28 +01:00
freezeboy
a4f291932a python2Packages.flask-api: remove (#97766) (#97901) 2020-09-13 16:51:44 +02:00
Matthieu Coudron
3e2c474358 Merge pull request #97909 from risicle/ris-pulp-fix-r20.09
[20.09] pythonPackages.pulp: fix by adding new dependency amply
2020-09-13 16:50:30 +02:00
Robert Scott
c551ac874b pythonPackages.pulp: fix by adding new dependency amply
(cherry picked from commit 26e023bfa7)
2020-09-13 14:37:43 +01:00
Robert Scott
1c3b1c29ec pythonPackages.amply: init at 0.1.2
(cherry picked from commit c305f3fac3)
2020-09-13 14:37:36 +01:00
Robert Scott
7cbec82872 pythonPackages.httpx: fix tests
test suite contained a literal timestamp which expired, fixed upstream

(cherry picked from commit 92a9db2e3e)
2020-09-13 15:22:30 +02:00
freezeboy
8dc96c40be cfn-lint: fixed importlib_resources version bounds
Also, added import checks to have a minimal test for the package

(cherry picked from commit 037b8aefef)
2020-09-13 14:02:10 +02:00
Robert Scott
67906104b7 Merge pull request #97896 from freezeboy/backport-lp_solve
[20.09] Backport lp solve
2020-09-13 11:33:20 +01:00
freezeboy
38fad02bda lp_solve: fix buildCommand some binaries moved
(cherry picked from commit 3fc3fd14cf)
2020-09-13 12:09:57 +02:00
Vincent Laporte
567e4a93cd ocamlPackages.batteries: 3.0.0 → 3.1.0
(cherry picked from commit e2dffb60a5)
2020-09-13 12:00:18 +02:00
Vladimír Čunát
21398f8334 Merge #97612: firefox-esr-68: drop
(cherry picked from commit 544c8dbdfb)
2020-09-13 09:55:21 +02:00
Robert Scott
195daf80b5 Merge #97847 python27Packages.anytree: fix build
(cherry picked from commit 9a8bd1e564)
2020-09-13 08:38:07 +02:00
Ryan Mulligan
df2a179eb7 nixos/jitsi-meet: add docs
(cherry picked from commit 531c08a1d9)
2020-09-12 22:03:23 -07:00
Jörg Thalheim
39dfaa4da7 python3.pkgs.python-language-server: fix jedi integration
recent jedi/parso versions uses Path instead of str.

(cherry picked from commit b99096b1f0)
2020-09-12 21:54:16 -07:00
Jörg Thalheim
b88dd6ec20 python3.pkgs.jedi: fix compatibility with parso
The current version is fundamentally broken as tested with
python-language-server because parso now uses Path instead of str
in many instances.

Backporting of the fixes is not trivial and likely breaks more stuff
than it fixes due to other refactorings in jedi, hence using a recent
commit in master seems more reasonably.

(cherry picked from commit 12a9a93d68)
2020-09-12 21:54:16 -07:00
Jörg Thalheim
520b4e9690 python3.pkgs.python-language-server: 0.33.1 -> 0.34.1
(cherry picked from commit b0a8c8af6f)
2020-09-12 21:54:16 -07:00
Jörg Thalheim
caf305b548 python-engineio: 3.13.0 -> 3.13.2 (fix build)
(cherry picked from commit 12fc3e0718)
2020-09-12 21:54:16 -07:00
Robert Scott
e0508c8180 Merge pull request #97824 from wkral/backport-python-minio-test-fix
[20.09] python3Packages.minio: fix cred tests
2020-09-13 02:35:25 +01:00
Robert Scott
562672a3d6 Merge pull request #97858 from treed/backport-acme-client-zhf
[20.09] acme-client: build with gcc
2020-09-13 02:11:38 +01:00
Martin Weinelt
2f3fff09bb Merge pull request #97874 from mweinelt/20.09/hass
[20.09] home-assistant: drop protobuf override
2020-09-13 02:54:10 +02:00
Martin Weinelt
8d112e8898 home-assistant: drop protobuf override
aioesphome was updated to 2.6.3 which requires protobuf>=3.12.2,<4.0.

(cherry picked from commit 68c4099d73)
2020-09-13 01:59:15 +02:00
Sarah Brofeldt
81a70da6e3 Merge pull request #97869 from srhb/bp-kb-1.19.1
20.09: Merge pull request #96446 from saschagrunert/k8s
2020-09-13 01:12:16 +02:00
Anderson Torres
063598ce0b Merge pull request #97854 from wkral/backport-ytree-fix
[20.09] ytree: fix build
2020-09-12 19:55:30 -03:00
Sarah Brofeldt
5115acdc7e Merge pull request #96446 from saschagrunert/k8s
kubernetes: 1.18.8 -> 1.19.1
(cherry picked from commit 701064bb10)

Backport of #96446
2020-09-13 00:47:50 +02:00
Vladimír Čunát
093ae1b549 Merge branch 'staging-20.09' into release-20.09
It's not the latest commit but the one with binaries available.
2020-09-12 22:10:40 +02:00
Vladimír Čunát
ea62e2144e gcc10: 10.1.0 -> 10.2.0
(cherry picked from commit 51ccf2d4ba)
It's supposed to be just bugfixes and it isn't used much so far.
2020-09-12 22:10:25 +02:00
Ted Reed
590026b08f acme-client: build with gcc
acme-client fails to build with clang, which breaks the build on darwin.

(cherry picked from commit e45ddaeddf)
2020-09-12 12:58:20 -07:00
Gabriel Ebner
4d730eebf3 python3Packages.websockets: make tests deterministic
(cherry picked from commit b5fcd79c3f)
2020-09-12 21:48:20 +02:00
Vincent Laporte
183b44daa3 ocamlPackages.ptmap: 2.0.4 → 2.0.5
(cherry picked from commit 5f83bf3012)
2020-09-12 21:34:39 +02:00
Vincent Laporte
8ee39f837e reason: 3.6.0 → 3.6.2
(cherry picked from commit d3e701f5f7)
2020-09-12 21:33:55 +02:00
William Kral
db7c226abd ytree: fix build
(cherry picked from commit 0a10ec483b)
2020-09-12 10:52:07 -07:00
Maximilian Bosch
5573fdc6b4 gotify-server: fix UI
In version 2.0.15 `gotify` switched to `packr` at 2.x which is why the
UI can't be served properly via HTTP and causes an empty 500 response and
the following errors in `journald`:

```
2020/09/12 19:18:33 [Recovery] 2020/09/12 - 19:18:33 panic recovered:
GET / HTTP/1.1
Host: localhost:8080
Accept: */*
User-Agent: curl/7.72.0

stat /home/ma27/Projects/ui/build/index.html: no such file or directory
```

This wasn't caught by the VM-test as it only tested the REST and push
APIs. Using their internal `packr.go` script in our build as it's the
case in the upstream build-system[1] fixes the issue.

[1] https://github.com/gotify/server/pull/277/files#diff-b67911656ef5d18c4ae36cb6741b7965R48

(cherry picked from commit 4a559f8fee)
2020-09-12 19:32:36 +02:00
freezeboy
387364f9fe newman: init at 5.2.0 (#97838)
(cherry picked from commit 554c1c4c24)
2020-09-12 15:29:44 +00:00
freezeboy
37fd028ec1 jackmix, jackmix_jack1: fix build, add alsaLib dependency (#97843)
(cherry picked from commit 6dafaa5258)
2020-09-12 15:22:16 +00:00
Frederik Rietdijk
1ff85d4c4b Revert "utils.bash: revert #93560 for darwin, unblocks channels"
Revert the hack and the original faulty commit.

This reverts commit 48264ee506.

Revert "Purity checking should accept $TMP and not just /tmp"

This reverts commit fb777be7d2.

(cherry picked from commit e560459c5b)
2020-09-12 08:43:35 +02:00
Frederik Rietdijk
1402752a68 Revert "utils.bash: also "fix" cc-wrapper and pkg-config-wrapper"
Follow up to the revert in e560459c5b.

This reverts commit 1936b11f63.

(cherry picked from commit 5ceea5705a)
2020-09-12 08:43:35 +02:00
Jonathan Ringer
4946cc3aec python3Packages.minio: fix cred tests
(cherry picked from commit 9716fcd940)
2020-09-11 19:52:20 -07:00
WORLDofPEACE
a49bcf5971 gnome-3: freeze for 20.09 2020-09-11 20:52:44 -04:00
Thomas Tuegel
a5028307e9 Merge pull request #97802 from ttuegel/staging-20.09--97670
kconfigwidgets: install plugin in .out
2020-09-11 18:17:18 -05:00
WORLDofPEACE
e2aba0636b Merge pull request #97741 from endgame/aws-sam-cli-bounds-backport
[20.09] aws-sam-cli: fix version bounds
2020-09-11 16:54:42 -04:00
Thomas Tuegel
d998cbb8b2 kconfigwidgets: install plugin in .out
(cherry picked from commit d489e70a08)
2020-09-11 15:29:39 -05:00
Jack Kelly
ce2ffef438 aws-sam-cli: fix version bounds
(cherry picked from commit 1e67b4a646)
2020-09-12 06:18:02 +10:00
Tethys Svensson
cda641eb95 nixos/systemd-boot: Temporarily ignore errors
This is a temporary fix for #97433. A more proper fix has been
implemented upstream in systemd/systemd#17001, however until it gets
backported, we are stuck with ignoring the error.

After the backport lands, this commit should be reverted.

(cherry picked from commit b32701bc54)
2020-09-11 22:10:33 +02:00
Félix Baylac-Jacqué
b668c6a1e9 Merge pull request #97755 from andir/20.09/prosody-0-11-6
[20.09] prosody: 0.11.5 -> 0.11.6
2020-09-11 21:58:41 +02:00
WORLDofPEACE
72fdecc8d2 nixos/gdm: fix option descriptions
If we use '' '' for strings with mkEnableOption they get a trailing space
before the period.

(cherry picked from commit b552ded466)
2020-09-11 14:15:13 -04:00
Emery Hemingway
53b3834022 nim: remove stdlib indirection in wrapper
Fix #97601
2020-09-11 20:02:19 +02:00
WORLDofPEACE
281c8991a2 nixos/tools/nixos-install: add jq to path
(cherry picked from commit a39ad85726)
2020-09-11 13:04:03 -04:00
WORLDofPEACE
2cb819c0d6 Merge pull request #97786 from ttuegel/release-20.09--97669
plasma-workspace: fix path to qdbus
2020-09-11 12:02:20 -04:00
WORLDofPEACE
ff343f1106 Merge pull request #97787 from ttuegel/release-20.09--97735
nixos/plasma5: fix build with hardware.bluetooth.enable = true
2020-09-11 12:00:55 -04:00
Orivej Desh
1f9f801f71 nixos/plasma5: fix build with hardware.bluetooth.enable = true after #97456
(cherry picked from commit 21b2900bd4)
2020-09-11 10:57:05 -05:00
Thomas Tuegel
b2f6053415 plasma-workspace: remove dependency on qtbase.dev
(cherry picked from commit 3bdf44875a)
2020-09-11 10:53:01 -05:00
Vladimír Čunát
e2bf65470e Merge branch 'staging-20.09' into release-20.09
It's all rebuilt: https://hydra.nixos.org/eval/1612452
2020-09-11 15:26:08 +02:00
Domen Kožar
18f9a651f5 Merge pull request #97749 from Luflosi/backport-j
[20.09] j: fix build on darwin
2020-09-11 14:29:34 +02:00
Maximilian Bosch
3fdb6b8801 bandwhich: 0.17.0 -> 0.18.1
ChangeLogs:

* https://github.com/imsnif/bandwhich/releases/tag/0.18.1
* https://github.com/imsnif/bandwhich/releases/tag/0.18.0

Also applied a fix[1] for rDNS support which broke with `systemd-v246`
because the `resolv-conf` crate didn't support the `options
trust_ad`-declaration in systemd's `/etc/resolv.conf`[2].

[1] https://github.com/imsnif/bandwhich/pull/184
[2] https://github.com/imsnif/bandwhich/issues/166#issuecomment-691014450

(cherry picked from commit 8149ab158b)
2020-09-11 14:11:29 +02:00
Vladimír Čunát
3f99424c9a Merge #97746: test-driver.py: defaulting keepVmState
(cherry picked from commit 2bb1868f76)
I re-checked some of the regressed tests on 20.09.
2020-09-11 13:52:33 +02:00
superherointj
3b5a1fb0d0 nixos/dmidecode: added recommended patches
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
(cherry picked from commit d284d3203a)
2020-09-11 08:47:13 -03:00
Lassulus
ae8cbb739f Merge pull request #97712 from nyanloutre/maj_electron_cash_20_09
electron-cash: 4.0.14 -> 4.1.0
2020-09-11 13:07:44 +02:00
Félix Baylac-Jacqué
e9f3523736 prosody: 0.11.5 -> 0.11.6
See https://blog.prosody.im/prosody-0.11.6-released/ for the release
notes.

(cherry picked from commit b47cabb6ac)
2020-09-11 12:16:12 +02:00
Luflosi
efc358ed37 [20.09] j: fix build on darwin
(cherry picked from commit fbefec0)
2020-09-11 11:37:35 +02:00
Michael Weiss
2b4b36a3eb signal-desktop: 1.35.1 -> 1.36.1
(cherry picked from commit f192636304)
2020-09-11 11:30:45 +02:00
Martin Weinelt
8ab64ff68a pythonPackages.supervisor: drop glibc-2.31 patch
A fix was integrated into the 4.2.1 release.

(cherry picked from commit 4607f02589)
2020-09-11 11:17:25 +02:00
Maximilian Bosch
947219c33e wdisplays: fix startup on sway 1.5
Starting `wdisplays` on a NixOS 20.09 with `sway-1.5` breaks with the
following output:

```
(wdisplays:28400): Gtk-WARNING **: 10:26:38.619: Could not load a pixbuf from /org/gtk/libgtk/theme/Adwaita/assets/bullet-symbolic.svg.
This may indicate that pixbuf loaders or the mime database could not be found.
Gdk-Message: 10:26:38.752: Error reading events from display: Success
```

The first two warnings can be fixed by adding `wrapGAppsHook`. The last
error is an upstream bug that can be fixed by applying the patch from a
pending PR[1].

[1] https://github.com/cyclopsian/wdisplays/pull/20

(cherry picked from commit 0a21d06682)
2020-09-11 11:12:22 +02:00
Raghav Sood
be3cb555a4 solc: 0.6.8 -> 0.7.1
(cherry picked from commit 3fab5dda5b)
2020-09-11 13:44:07 +08:00
Drew Risinger
2e4b24fab7 python3Packages.parso: disable on python 2.7
* Disabled on python 2.7
* Updated meta
* Changed to pytestCheckHook

(cherry picked from commit 8f6436a825)
2020-09-10 20:37:42 -04:00
Robert Scott
da320dba12 pythonPackages.pysnow: fix build & tests
(cherry picked from commit 9627ae4f9a)
2020-09-10 16:59:51 -07:00
Robert Scott
ddfce992cd pythonPackages.pyjet: fix tests
tests are now pytest tests, and not included in the pypi tarball

(cherry picked from commit ef82f49fc0)
2020-09-10 16:58:58 -07:00
Robert Scott
1b14d6e44d Merge pull request #97704 from treed/backport-rpm-darwin
[20.09] rpm: add openmp when building with clang
2020-09-11 00:57:00 +01:00
Robert Scott
44cbbdcf22 pythonPackages.pq: fix build
we can't run the tests anyway, so remove fragile attempts to patch them

(cherry picked from commit 70c56dd486)
2020-09-10 16:56:29 -07:00
Robert Scott
5d891798e2 pythonPackages.hiredis: fix tests
just requires the source-directory-hiding trick

(cherry picked from commit 483fa86c36)
2020-09-10 16:56:23 -07:00
zowoq
2b26ce72c7 go_1_14: 1.14.8 -> 1.14.9
(cherry picked from commit 619061532a)
2020-09-11 09:54:48 +10:00
zowoq
1e190dd3ce go: 1.15.1 -> 1.15.2
(cherry picked from commit 240d8246e8)
2020-09-11 09:54:36 +10:00
Daniël de Kok
f1784d3bc6 clpeak: fix build
The build of clpeak recently started failing because opencl-clhpp was
updated. The latest version of opencl-hpp does not ship the deprecated
cl.hpp header anymore.

(cherry picked from commit 5f6738228d)
2020-09-10 16:47:47 -07:00
Drew Risinger
b6a1ccd933 python3Packages.nmigen: fix build
Tried to debug failure & traced it to subprocess.Popen calling fork_exec()
with a bad path, but couldn't reproduce error from manual debugging
using ``nix-shell``.

Bad path meaning that most paths were of form /nix/store/.../bin/sby,
but one path was "sby" only. That's my only guess as to what would
be causing this failure.

(cherry picked from commit b03c729c88)
2020-09-10 15:21:37 -07:00
Maximilian Bosch
0e9a35b52c vorta: 0.7.0 -> 0.7.1
https://github.com/borgbase/vorta/releases/tag/v0.7.1
(cherry picked from commit 195842dd86)
2020-09-10 23:55:13 +02:00
Jonathan Ringer
d9717d34a0 python3Packages.executor: 21.3 -> 23.1, fix tests
(cherry picked from commit 5916b96370)
2020-09-10 14:45:23 -07:00
nyanloutre
889e9ff4e5 electron-cash: 4.0.14 -> 4.1.0
(cherry picked from commit d3958aa3fa)
2020-09-10 23:41:00 +02:00
Tethys Svensson
2c239b1e95 discord-canary: 0.0.111 -> 0.0.112
(cherry picked from commit 1937fd3f19)
2020-09-10 14:26:46 -07:00
Tethys Svensson
afeff10b59 discord-ptb: 0.0.21 -> 0.0.22
(cherry picked from commit 3ca40eebf9)
2020-09-10 14:26:46 -07:00
Tethys Svensson
4055b3a225 discord: 0.0.11 -> 0.0.12
(cherry picked from commit 977147bd04)
2020-09-10 14:26:46 -07:00
Ted Reed
f70d5740f3 rpm: add openmp when building with clang
The Darwin build has been broken with a missing header file "omp.h";
llvmPackages.openmp provides it.

Including this library is only necessary when clang is used.

(cherry picked from commit b8e0f0cd72)
2020-09-10 13:19:26 -07:00
Vincent Laporte
1d71e17fb4 coqPackages.Verdi: enable for Coq 8.12
(cherry picked from commit 5f3be6b669)
2020-09-10 22:14:12 +02:00
Vincent Laporte
8df6852749 coqPackages.paco: enable for Coq 8.12
(cherry picked from commit 7f797b9521)
2020-09-10 22:11:15 +02:00
arcnmx
f96ce3a5a6 Fix arch eval error introduced in #61019
This occurs when using a `platform.gcc.arch` that isn't one of the
pre-existing hard-coded options.

(cherry picked from commit 8f3efbde4e)
2020-09-10 14:49:11 -05:00
Félix Baylac-Jacqué
5500dc83c3 test-driver.py: fix VM state directory deletion
The previous version of the code would only kick in if the state
directory path pointed at a *file*, which never occurs. Making that
codepath actually work reveals an ordering bug, which this patch fixes
as well.

It also replaces the confusing, imperative case log message "delete VM
state directory" with "deleting VM state directory".

Finally, we hint the user about how to prevent this deletion. IE. by
passing the --keep-vm-state flag.

Bug report:
https://github.com/NixOS/nixpkgs/pull/91046#issuecomment-685568750

Credit goes to Edef for the rebase on top of a recent nixpkgs commit
and for writing most of this commit message.

Co-authored-by: edef <edef@edef.eu>
(cherry picked from commit ecb73fd555)
2020-09-10 21:31:49 +02:00
Dominique Martinet
c3dea4d115 systemd-confinement: handle ExecStarts etc being lists
systemd-confinement's automatic package extraction does not work correctly
if ExecStarts ExecReload etc are lists.

Add an extra flatten to make things smooth.

Fixes #96840.

(cherry picked from commit fd196452f0)
2020-09-10 21:17:53 +02:00
Robert Scott
06fc6d1d7f Merge pull request #97676 from danieldk/age-backport
[20.09] postgresqlPackages.age: fix build
2020-09-10 19:42:00 +01:00
Izorkin
2aec639e1c nixos/nginx: remove option enableSandbox
(cherry picked from commit 535896671b)
2020-09-10 20:34:30 +02:00
Vladimír Čunát
5c60bbb987 nixos release notes: fixup build after #96991
(cherry picked from commit ec49caa0b0)
2020-09-10 19:59:20 +02:00
WORLDofPEACE
f4c73ef127 Merge pull request #97593 from Patryk27/fix-lxd-tests-backport-20.09
[20.09] lxd: Backport #97550
2020-09-10 13:16:23 -04:00
WORLDofPEACE
4b87b6f516 Merge pull request #97648 from immae/fix_ejabberd
[20.09] ejabberd: fix failing tests
2020-09-10 13:15:49 -04:00
WORLDofPEACE
d8845663d9 Merge pull request #97637 from erikarvstedt/fix-pypkgs-20.09
[20.09] Fix paperless and other Python pkgs
2020-09-10 13:15:32 -04:00
WORLDofPEACE
6ce30567ba Merge pull request #97636 from ryneeverett/backport-lxpanel-20.03-zhf
[20.09] lxpanel: fix build by switching to gdk-pixbuf-xlib
2020-09-10 13:13:46 -04:00
Gabriel Ebner
92947e4ae0 mlton: use $TMPDIR
(cherry picked from commit 213feab38a)
2020-09-10 18:11:27 +02:00
Daniël de Kok
3cdd40ed27 postgresqlPackages.age: fix build
The build broke by a recent bison update. Use bison_3_5.

(cherry picked from commit 58b66c0dcb)
2020-09-10 17:58:57 +02:00
Ismaël Bouya
faf2373e8f nagios: fix build
The compiler complains about dl* function missing, this commit adds the
necessary flag to pass to gcc to make it build correctly

(cherry picked from commit 213623e291)
2020-09-10 08:55:33 -07:00
Mikolaj Galkowski
b8de5a6834 unityhub: update to 2.3.2
(cherry picked from commit 60c3ade786)
2020-09-10 17:09:21 +02:00
Mikolaj Galkowski
3a757abce1 unityhub: fix editor with versions >= 2020.1.3f1 not opening
(cherry picked from commit 1c4de332c3)
2020-09-10 17:09:20 +02:00
Gabriel Ebner
4e43b8a9e7 Merge pull request #97625 from drewrisinger/zhf/pyfakefs-20.09
[20.09] python3Packages.pyfakefs: disable on py2.7
2020-09-10 16:38:20 +02:00
Tim Steinbach
9a3d3bbd90 jenkins: 2.235.5 -> 2.249.1 2020-09-10 10:36:54 -04:00
Tim Steinbach
59407f47bb linux/hardened/patches/5.8: 5.8.7.a -> 5.8.8.a 2020-09-10 10:36:46 -04:00
Tim Steinbach
07f3bf7c8d linux/hardened/patches/5.4: 5.4.63.a -> 5.4.64.a 2020-09-10 10:36:46 -04:00
Tim Steinbach
eca85f3930 linux/hardened/patches/4.19: 4.19.143.a -> 4.19.144.a 2020-09-10 10:36:46 -04:00
Tim Steinbach
4bcb41d47e linux/hardened/patches/4.14: 4.14.196.a -> 4.14.197.a 2020-09-10 10:36:46 -04:00
Tim Steinbach
e305495a58 linux: 5.8.7 -> 5.8.8 2020-09-10 10:36:46 -04:00
Tim Steinbach
43003fb2c2 linux: 5.4.63 -> 5.4.64 2020-09-10 10:36:46 -04:00
Tim Steinbach
699b8d3deb linux: 4.19.143 -> 4.19.144 2020-09-10 10:36:46 -04:00
Tim Steinbach
49243408ee linux: 4.14.196 -> 4.14.197 2020-09-10 10:36:46 -04:00
Ismaël Bouya
1a8d8dd6a6 ejabberd: fix failing tests
This commit fixes the ejabberd tests for hydra:

mod_http_upload and mod_disco need to be explicitly enabled, and a
handler needs to be setup to make it work. Also, the client needs to be
able to contact the server.

The commit also fixes the situation where http upload failed: in that
case the client would wait forever because nothing catched the error.

Finally, there remains a non-reproducible error where ejabberd server
fails to start with an error like:
format: "Failed to create cookie file '/var/lib/ejabberd/.erlang.cookie': eacces"
(happens ~15%) I tried to check existence of /var/lib/ejabberd/ in
pre-start script and saw nothing that would explain this error, so I
gave up about this error in particular.

(cherry picked from commit cdaec7e9ed)
2020-09-10 12:03:49 +02:00
Michael Weiss
5a27ca12f9 chromium: 85.0.4183.83 -> 85.0.4183.102
https://chromereleases.googleblog.com/2020/09/stable-channel-update-for-desktop.html

This update includes 5 security fixes.

CVEs:
CVE-2020-6573 CVE-2020-6574 CVE-2020-6575 CVE-2020-6576 CVE-2020-15959

(cherry picked from commit a9c78519d6)
2020-09-10 10:24:00 +02:00
William Kral
4a1d2f7507 jwt-cli: fix build
(cherry picked from commit fb5a153c26)
2020-09-10 17:19:18 +10:00
Erik Arvstedt
83bc4e3caa paperless: fix build
Paperless was dependent on older older versions of recently updated
Python packages.
2020-09-10 09:14:54 +02:00
Erik Arvstedt
72c9c5bea5 python3Packages.django_extensions: 2.2.8 -> 3.0.8 2020-09-10 09:14:54 +02:00
Erik Arvstedt
79693de9a7 python3Packages.django-picklefield: fix tests 2020-09-10 09:14:54 +02:00
ryneeverett
803517d3d1 lxpanel: fix build by switching to gdk-pixbuf-xlib
The build has been broken since gdk-pixbuf-xlib was broken out into a
separate package in #88086.

For some reason if I just add gdk-pixbuf-xlib.dev the headers don't make it
into CFLAGS.

(cherry picked from commit 5b49a74747)
2020-09-10 07:12:37 +00:00
Gabriel Ebner
87aa949c77 nixos/qt5ct: do not require qtstyleplugins
These do not build with qt 5.15.

(cherry picked from commit 4bf695e988)
2020-09-10 08:51:45 +02:00
Patryk Wychowaniec
5585bd755d lxd: s/sha256/hash
(cherry picked from commit 183d9abdaf)
2020-09-10 07:45:33 +02:00
Patryk Wychowaniec
567bec03f5 lxd: add wait_for_file() to ensure LXD is actually running
(cherry picked from commit 93b8435915)
2020-09-10 07:45:29 +02:00
Patryk Wychowaniec
d5442b726f lxd: use stable URL for Alpine's image
(cherry picked from commit 04111cb356)
2020-09-10 07:45:07 +02:00
Vincent Laporte
16b3748827 coqPackages.paramcoq: init at 1.1.2 for Coq 8.12
(cherry picked from commit 6e08d23707)
2020-09-10 07:00:21 +02:00
Jörg Thalheim
ed443268ce nixos/installer: enable sshd by default
Right now the UX for installing NixOS on a headless system is very bad.
To enable sshd without physical steps users have to have either physical
access or need to be very knowledge-able to figure out how to modify the
installation image by hand to put an `sshd.service` symlink in the
right directory in /nix/store. This is in particular a problem on ARM
SBCs (single board computer) but also other hardware where network is
the only meaningful way to access the hardware.

This commit enables sshd by default. This does not give anyone access to
the NixOS installer since by default. There is no user with a non-empty
password or key. It makes it easy however to add ssh keys to the
installation image (usb stick, sd-card on arm boards) by simply mounting
it and adding a keys to `/root/.ssh/authorized_keys`.
Importantly this should not require nix/nixos on the machine that
prepare the installation device and even feasiable on non-linux systems
by using ext4 third party drivers.

Potential new threats: Since this enables sshd by default a
potential bug in openssh could lead to remote code execution. Openssh
has a very good track-record over the last 20 years, which makes it
far more likely that Linux itself would have a remote code execution
vulnerability. It is trusted by millions of servers on many operating
systems to be exposed to the internet by default.

Co-authored-by: Samuel Dionne-Riel <samuel@dionne-riel.com>
(cherry picked from commit a5872edf2f)
2020-09-10 06:15:32 +02:00
Drew Risinger
9c17cc2510 python3Packages.pyfakefs: disable on py2.7
* No longer supports python < 3.5, so disabled.
* Enables tests that were disabled due to bugs.
* Add changelog

(cherry picked from commit a9d7ea7781)
2020-09-09 23:18:50 -04:00
worldofpeace
26c98e742f rl-2009: document rngd
(cherry picked from commit ca674c1769)
2020-09-09 21:54:07 -04:00
nicoo
fc5f50a949 nixos/modules/security/rngd: Disable by default
`rngd` seems to be the root cause for slow boot issues, and its functionality is
redundant since kernel v3.17 (2014), which introduced a `krngd` task (in kernel
space) that takes care of pulling in data from hardware RNGs:

> commit be4000bc4644d027c519b6361f5ae3bbfc52c347
> Author: Torsten Duwe <duwe@lst.de>
> Date:   Sat Jun 14 23:46:03 2014 -0400
>
>     hwrng: create filler thread
>
>     This can be viewed as the in-kernel equivalent of hwrngd;
>     like FUSE it is a good thing to have a mechanism in user land,
>     but for some reasons (simplicity, secrecy, integrity, speed)
>     it may be better to have it in kernel space.
>
>     This patch creates a thread once a hwrng registers, and uses
>     the previously established add_hwgenerator_randomness() to feed
>     its data to the input pool as long as needed. A derating factor
>     is used to bias the entropy estimation and to disable this
>     mechanism entirely when set to zero.

Closes: #96067
(cherry picked from commit e64d3f60fb)
2020-09-09 21:54:07 -04:00
Piotr Bogdan
159760a955 nixos/openvpn: path now requires conversion to a string
Following changes in https://github.com/NixOS/nixpkgs/pull/91092 the `path` attribute is now a list
instead of being a string. This resulted resulted in the following evaluation error:

"cannot coerce a list to a string, at [...]/nixos/modules/services/networking/openvpn.nix:16:18"

so we now need to convert it to the right type ourselves.

Closes https://github.com/NixOS/nixpkgs/issues/97360.

(cherry picked from commit cb141359bf)
2020-09-10 02:03:25 +02:00
WORLDofPEACE
6294ee2fbd Merge pull request #97604 from mkg20001/rolling
[20.09] cinnamon fixes
2020-09-09 19:08:20 -04:00
Maciej Krüger
03c54b978f nixos/cinnamon: add warpinator & blueberry pkgs
(cherry picked from commit 8c4dd13e3f)
2020-09-09 23:55:15 +02:00
Maciej Krüger
8b6f99c4c5 cinnamon.warpinator: license fix
(cherry picked from commit 9b9d0fd5d5)
2020-09-09 23:55:15 +02:00
Maciej Krüger
28dec5fe33 cinnamon.warpinator: init at 1.0.8
(cherry picked from commit bf9e9cd08a)
2020-09-09 23:55:15 +02:00
Robert Hensing
3b50998b4f Merge pull request #97490 from risicle/ris-jug-fix-r20.09
[20.09] pythonPackages.jug: fix tests
2020-09-09 22:59:13 +02:00
Maximilian Bosch
820c16b2e2 pass-wayland: use proper derivation for .withExtensions
The `pass.withExtensions`-function uses `buildEnv` to create a
derivation which contains a `pass`-package and a list of extensions for
it.

However, this function always uses the `pass`-attribute for `buildEnv` which
will break e.g. `passmenu` or `pass show -c` on desktops using Wayland (and
`pass-wayland.withExtensions`) since the default `pass`-package without
support for Wayland's clipboard is used.

This patch replaces the `pass`-attribute in the derivation with
`pass-wayland` to work around this issue.

(cherry picked from commit 1186c16889)
2020-09-09 22:51:18 +02:00
Robert Hensing
32c45947ab Merge pull request #97508 from OPNA2608/backport-20.09-palemoon-wrapping-libpulseaudio
[20.09] palemoon: Add libpulseaudio to wrapper
2020-09-09 22:47:38 +02:00
Gabriel Ebner
b0349fc6e1 ncftp: do not override $TMPDIR
(cherry picked from commit 07999f480b)
2020-09-09 22:13:35 +02:00
Milan Pässler
1309be91f1 flashrom: fix aarch64 build
(cherry-picked from commit f7e0ff0f35)
2020-09-09 21:18:08 +02:00
WORLDofPEACE
9089e5aad5 Merge pull request #97580 from zookatron/release-20.09
[20.09] csvkit: fix failing test
2020-09-09 15:06:44 -04:00
WORLDofPEACE
fc35e4da08 Merge pull request #97573 from woffs/recoll-qt5-20.09
[20.09] recoll: qt4 -> qt5, fix build
2020-09-09 15:05:59 -04:00
Gabriel Ebner
a824b76b79 mlton: use callPackage
(cherry picked from commit ad0d43e1a7)
2020-09-09 20:51:03 +02:00
Gabriel Ebner
3a8c2b75c2 mlton: fix build
(cherry picked from commit a7f9d336b7)
2020-09-09 20:51:03 +02:00
Tim Zook
ca58161d1c [20.09] csvkit: fix failing test
The build for this package was failing due to failing tests that were caused by a breaking change in a dependency. The requirements.txt for this package does not pin specific versions so it was trying to build with the new version of the dependency and failing. This commit overrides the version of the dependency that is used to build the package.

(cherry picked from commit 32c9ee2cfc)
2020-09-09 13:29:19 -05:00
Robert Scott
c6e9ba3d89 pythonPackages.jug: fix tests
these seem to have switched to pytest tests in 2.0.2

(cherry picked from commit 570dbab975)
2020-09-09 19:21:05 +01:00
WilliButz
3265417378 codimd: build with nodejs-12_x instead of nodejs-10_x
The codimd test is now exposed via passthru.tests

(cherry picked from commit 46e3949819)
2020-09-09 19:48:52 +02:00
William Kral
786a346d0b python3Packages.jq: 0.1.8 -> 1.0.2
(cherry picked from commit cf54ef99b6)
2020-09-09 10:39:59 -07:00
Frank Doepper
ab77e4d4a4 recoll: qt4 -> qt5, fix build
(cherry picked from commit 9cdfa8adc2)
2020-09-09 19:39:37 +02:00
WORLDofPEACE
1d6f2020d1 Merge pull request #97567 from cole-h/release-20.09
[20.09] verilog: unstable-2019-08-01 -> unstable-2020-08-24
2020-09-09 12:59:58 -04:00
Cole Helbling
ea1009728a verilog: unstable-2019-08-01 -> unstable-2020-08-24
The build would previously fail due to a change in bison's behavior (see
5b699c1be7
for more information). Updating to a more recent version fixes this
issue.

(cherry picked from commit 339f6248f6)
2020-09-09 09:51:12 -07:00
Thomas Tuegel
8d94bf05d2 Merge pull request #97524 from ttuegel/staging-20.09--plasma5-qt-5.12
[20.09] Plasma 5: Revert to Qt 5.12
2020-09-09 11:45:29 -05:00
makefu
46f14c8f1b pythonPackages.pyhaversion: py3k only
(cherry picked from commit b30dfc4f4b)
2020-09-09 18:30:38 +02:00
makefu
f053f1c83e pythonPackages.aresponses: only py3k
(cherry picked from commit 467dcc5b75)
2020-09-09 18:30:36 +02:00
Tim Steinbach
ca0615ca4a linux/hardened/patches/5.8: init at 5.8.7.a 2020-09-09 12:25:58 -04:00
Tim Steinbach
0be4612d3c linux/hardened/patches/5.4: 5.4.61.a -> 5.4.63.a 2020-09-09 12:25:58 -04:00
Tim Steinbach
8e78d438a0 linux/hardened/patches/4.19: 4.19.142.a -> 4.19.143.a 2020-09-09 12:25:58 -04:00
Tim Steinbach
1b136af5a0 linux/hardened/patches/4.14: 4.14.195.a -> 4.14.196.a 2020-09-09 12:25:58 -04:00
Tim Steinbach
e8bcb18ed8 linux: 5.4.62 -> 5.4.63 2020-09-09 12:25:58 -04:00
Tim Steinbach
86b2fa90c3 Merge pull request #97288 from Atemu/update/linux_5_8
linux_5_8: 5.8.6 -> 5.8.7
2020-09-09 12:25:43 -04:00
Frederik Rietdijk
0615f935d9 Merge release-20.09 into staging-20.09 2020-09-09 18:21:46 +02:00
WORLDofPEACE
b8244d1f3f Merge pull request #97559 from fgaz/zhf-backports/maintainers-build-fix
[20.09] maintainers/build: skip packages without meta
2020-09-09 12:21:25 -04:00
WORLDofPEACE
81d088f79d Merge pull request #97558 from minijackson/jellyfin-stateVersion-20.09-releaseNotes-backport
[20.09] Jellyfin state version 20.09 release notes backport
2020-09-09 12:12:36 -04:00
Francesco Gazzetta
558d5ce485 maintainers/build: skip packages without meta
Some packages do not have a meta attribute, and made the script crash.

(cherry picked from commit b4496d4095)
2020-09-09 18:06:39 +02:00
Minijackson
57414330ce nixos/jellyfin: document stateVersion 20.09 in release notes
(cherry picked from commit ad48050cad)
2020-09-09 18:03:44 +02:00
Vladimír Čunát
e6ff3ab9df Merge #97528: aegisub: fix build with make 4.3
(cherry picked from commit e7979aadea)
2020-09-09 17:56:58 +02:00
WORLDofPEACE
dfafbfb4cf Merge pull request #97552 from prusnak/electron-20.09
[20.09] Electron updates
2020-09-09 11:51:59 -04:00
midchildan
b55a44dd66 dmd: relax ld purity check for checkPhase
Fix #97420

(cherry picked from commit 5e8e75a0c6)
ZHF: #97479
Fixes #97549
2020-09-09 11:49:49 -04:00
WORLDofPEACE
fe7ff327f3 Merge pull request #97554 from arapov/release-20.09
[20.09] nodePackages.node-red: fix build
2020-09-09 11:48:11 -04:00
Pavol Rusnak
a049411995 1password-gui: move required electron version to package definition
(cherry picked from commit 1c10ce66c5)
2020-09-09 17:40:59 +02:00
worldofpeace
0281de09d3 electron: move definition into generic.nix
(cherry picked from commit 504750252a)
2020-09-09 17:40:54 +02:00
Pavol Rusnak
d04dd0af69 electron_7: 7.3.1 -> 7.3.3
(cherry picked from commit 6954f77845)
2020-09-09 17:40:48 +02:00
Pavol Rusnak
b4c85510a4 electron_8: 8.3.1 -> 8.5.1
(cherry picked from commit 4599eb4595)
2020-09-09 17:40:43 +02:00
Pavol Rusnak
e579db441e electron_9: 9.0.2 -> 9.3.0
(cherry picked from commit b7f0533d2a)
2020-09-09 17:40:39 +02:00
Pavol Rusnak
86e0afa4ed electron_10: init at 10.1.1
(cherry picked from commit 8d9fadd3e0)
2020-09-09 17:40:34 +02:00
Anton Arapov
08d766de1c nodePackages.node-red: fix build
resolves issue #89205

Signed-off-by: Anton Arapov <arapov@gmail.com>
(cherry picked from commit e5701710e3)
2020-09-09 17:40:08 +02:00
WORLDofPEACE
3ea149361a Merge pull request #97547 from IvarWithoutBones/backport-xwallpaper
[20.09] xwallpaper: remove libseccomp dependency
2020-09-09 11:07:43 -04:00
IvarWithoutBones
6aca5b354b xwallpaper: formatting fix
(cherry picked from commit cff6e7b161)
2020-09-09 17:01:23 +02:00
IvarWithoutBones
89c2e38e83 xwallpaper: remove libseccomp dependency
(cherry picked from commit 4008f2c6ea)
2020-09-09 17:01:06 +02:00
Thomas Tuegel
195158b278 appstream-qt: multiple outputs 2020-09-09 10:59:37 -04:00
Thomas Tuegel
c70f96ca59 nixos/plasma5: use qt512 2020-09-09 10:59:37 -04:00
Thomas Tuegel
37a2b71b52 sddm: use qt512 2020-09-09 10:59:37 -04:00
Thomas Tuegel
14bd8c888b colord-kde: use qt512 2020-09-09 10:59:37 -04:00
Thomas Tuegel
f101cb2d47 khotkeys: not broken with qt512 2020-09-09 10:59:37 -04:00
Thomas Tuegel
ce4eb0b79b plasma5: pin to qt512 2020-09-09 10:59:37 -04:00
Vladimír Čunát
8ab01ebd34 knot-resolver: 5.1.2 -> 5.1.3
https://gitlab.nic.cz/knot/knot-resolver/-/tags/v5.1.3
(cherry picked from commit 3c45610ddd)
It contains primarily bugfixes, and 20.09 only just forked anyway.
2020-09-09 16:55:25 +02:00
worldofpeace
fbf9074f92 Merge remote-tracking branch 'upstream/release-20.09' into staging-20.09 2020-09-09 10:25:52 -04:00
WORLDofPEACE
234823228a Merge pull request #97537 from taku0/flashplayer-32.0.0.433_20.09
[20.09] flashplayer: 32.0.0.414 -> 32.0.0.433
2020-09-09 10:22:45 -04:00
taku0
b9599213f7 flashplayer: 32.0.0.414 -> 32.0.0.433
(cherry picked from commit 807e4ae439)
2020-09-09 21:40:07 +09:00
Maximilian Bosch
3f4fc5fa29 python3Packages.todoist: fix build
See https://hydra.nixos.org/build/126777642
ZHF #97479

(cherry picked from commit f961ac6695)
2020-09-09 13:36:58 +02:00
volth
f59e416056 perlPackages: group aliases 2020-09-09 09:35:36 +00:00
volth
7980e04dcc undo efc70eb6d7 2020-09-09 09:35:36 +00:00
volth
eedd4746f7 [cpan2nix] perlPackages.NetAmazonS3: 0.89 -> 0.91 2020-09-09 09:35:31 +00:00
volth
f820e2aeee [cpan2nix] perlPackages.Catmandu: 1.2012 -> 1.2013 2020-09-09 09:35:29 +00:00
volth
ca32556a66 [cpan2nix] perlPackages.CatalystDevel: 1.40 -> 1.41 2020-09-09 09:35:26 +00:00
volth
64508a8ce5 [cpan2nix] perlPackages.CatalystXScriptServerStarman: cleanup 2020-09-09 09:35:26 +00:00
volth
c72f059d2f [cpan2nix] perlPackages.DistZillaPluginTestPodLinkCheck: cleanup 2020-09-09 09:35:18 +00:00
volth
c0c72c4f75 [cpan2nix] perlPackages.CatalystPluginSessionStateCookie: 0.17 -> 0.18 2020-09-09 09:35:17 +00:00
volth
8644d1975f [cpan2nix] perlPackages.CatalystViewTT: 0.44 -> 0.45 2020-09-09 09:35:14 +00:00
volth
4e41dd4f3d [cpan2nix] perlPackages.CatalystPluginStaticSimple: cleanup 2020-09-09 09:35:10 +00:00
volth
82a1f311a3 [cpan2nix] perlPackages.CatalystPluginConfigLoader: 0.34 -> 0.35 2020-09-09 09:35:10 +00:00
volth
664d7997c7 [cpan2nix] perlPackages.DistZilla: cleanup 2020-09-09 09:35:09 +00:00
volth
f624344dab [cpan2nix] perlPackages.Connector: 1.28 -> 1.32 2020-09-09 09:35:03 +00:00
volth
a564ff17c6 [cpan2nix] perlPackages.HTMLFormFu: cleanup 2020-09-09 09:35:02 +00:00
volth
5b51533bb7 [cpan2nix] perlPackages.TestLWPUserAgent: cleanup 2020-09-09 09:34:54 +00:00
volth
704ee7c114 [cpan2nix] perlPackages.PlackMiddlewareDebug: cleanup 2020-09-09 09:34:54 +00:00
volth
ad49ed3ec5 [cpan2nix] perlPackages.LWPUserAgentDNSHosts: 0.13 -> 0.14 2020-09-09 09:34:53 +00:00
volth
2021d942c4 [cpan2nix] perlPackages.DBIxClassHelpers: cleanup 2020-09-09 09:34:53 +00:00
volth
e09f3a9f86 [cpan2nix] perlPackages.TestFakeHTTPD: 0.08 -> 0.09 2020-09-09 09:34:52 +00:00
volth
1ab3d002b1 [cpan2nix] perlPackages.AppSqitch: cleanup 2020-09-09 09:34:48 +00:00
volth
071d7f5b84 [cpan2nix] perlPackages.RTClientREST: cleanup 2020-09-09 09:34:37 +00:00
volth
0337f17edd [cpan2nix] perlPackages.TestPodLinkCheck: cleanup 2020-09-09 09:34:33 +00:00
volth
1a54bf5857 [cpan2nix] perlPackages.MooseXMethodAttributes: 0.31 -> 0.32 2020-09-09 09:34:23 +00:00
volth
58880b4bff [cpan2nix] perlPackages.DataVisitor: 0.30 -> 0.31 2020-09-09 09:34:21 +00:00
volth
0a912213d6 [cpan2nix] perlPackages.LaTeXML: cleanup 2020-09-09 09:34:18 +00:00
volth
9979866b49 [cpan2nix] perlPackages.DateTimeFormatNatural: 1.09 -> 1.10 2020-09-09 09:34:13 +00:00
volth
096afd1caf [cpan2nix] perlPackages.Moose: 2.2012 -> 2.2013 2020-09-09 09:34:12 +00:00
volth
f35fad0059 [cpan2nix] perlPackages.AnyEventRabbitMQ: cleanup 2020-09-09 09:34:08 +00:00
volth
72c87f6cd6 [cpan2nix] perlPackages.DateTimeFormatISO8601: 0.08 -> 0.14 2020-09-09 09:34:07 +00:00
volth
8c923f4db8 [cpan2nix] perlPackages.DateTimeFormatBuilder: 0.82 -> 0.83 2020-09-09 09:34:06 +00:00
volth
647590b224 [cpan2nix] perlPackages.CodeTidyAll: cleanup 2020-09-09 09:34:05 +00:00
volth
62dc8a9c1a [cpan2nix] perlPackages.DateTimeFormatStrptime: cleanup 2020-09-09 09:34:05 +00:00
volth
f6207d98d3 [cpan2nix] perlPackages.DateTime: cleanup 2020-09-09 09:34:04 +00:00
volth
416f244b6a [cpan2nix] perlPackages.AppClusterSSH: 4.15 -> 4.16 2020-09-09 09:34:04 +00:00
volth
f61a8abc99 [cpan2nix] perlPackages.CryptOpenPGP: cleanup 2020-09-09 09:34:03 +00:00
volth
4069d5e7a2 [cpan2nix] perlPackages.DateTimeLocale: 1.25 -> 1.28 2020-09-09 09:34:02 +00:00
volth
42583462d4 [cpan2nix] perlPackages.TestPerlTidy: cleanup 2020-09-09 09:34:02 +00:00
volth
ab32d4aa9d [cpan2nix] perlPackages.LogDispatchouli: 2.019 -> 2.022 2020-09-09 09:34:02 +00:00
volth
f1d60433a3 [cpan2nix] perlPackages.W3CLinkChecker: cleanup 2020-09-09 09:34:01 +00:00
volth
1ab9f21c8a [cpan2nix] perlPackages.CPANUploader: 0.103014 -> 0.103015 2020-09-09 09:33:57 +00:00
volth
9fcde078d6 [cpan2nix] perlPackages.MetaCPANClient: 2.026000 -> 2.028000 2020-09-09 09:33:56 +00:00
volth
7f66a318d5 [cpan2nix] perlPackages.ModuleCPANTSAnalyse: cleanup 2020-09-09 09:33:56 +00:00
volth
78eaafcdd2 [cpan2nix] perlPackages.Mojomysql: 1.19 -> 1.20 2020-09-09 09:33:55 +00:00
volth
1aa2c65be5 [cpan2nix] perlPackages.CGICompile: 0.24 -> 0.25 2020-09-09 09:33:54 +00:00
volth
0cb9374396 [cpan2nix] perlPackages.Appperlbrew: cleanup 2020-09-09 09:33:53 +00:00
volth
8b7fbf5fea [cpan2nix] perlPackages.LogDispatch: 2.69 -> 2.70 2020-09-09 09:33:52 +00:00
volth
4519f37cfb [cpan2nix] perlPackages.DateTimeTimeZone: cleanup 2020-09-09 09:33:51 +00:00
volth
370b81b477 [cpan2nix] perlPackages.MojoSQLite: 3.003 -> 3.004 2020-09-09 09:33:42 +00:00
volth
2970f34b79 [cpan2nix] perlPackages.WWWMechanize: cleanup 2020-09-09 09:33:41 +00:00
volth
379c8208cb [cpan2nix] perlPackages.CryptSSLeay: cleanup 2020-09-09 09:33:39 +00:00
volth
2dcd8314e4 [cpan2nix] perlPackages.HTMLMason: cleanup 2020-09-09 09:33:38 +00:00
volth
c7072aeb19 [cpan2nix] perlPackages.SQLTranslator: cleanup 2020-09-09 09:33:37 +00:00
volth
f98994bbe2 [cpan2nix] perlPackages.GnuPGInterface: cleanup 2020-09-09 09:33:36 +00:00
volth
abbe385ff3 [cpan2nix] perlPackages.CPANMini: cleanup 2020-09-09 09:33:33 +00:00
volth
fa4709b069 [cpan2nix] perlPackages.SystemCommand: cleanup 2020-09-09 09:33:30 +00:00
volth
66dc4bab06 [cpan2nix] perlPackages.DevelDeclare: cleanup 2020-09-09 09:33:28 +00:00
volth
219fb726dc [cpan2nix] perlPackages.AlienGMP: cleanup 2020-09-09 09:33:28 +00:00
volth
feb71b35b9 [cpan2nix] perlPackages.LWPProtocolHttps: 6.07 -> 6.09 2020-09-09 09:33:27 +00:00
volth
5aad49e0f2 [cpan2nix] perlPackages.ApacheAuthCookie: cleanup 2020-09-09 09:33:27 +00:00
volth
21313abd0c [cpan2nix] perlPackages.MojoPg: cleanup 2020-09-09 09:33:25 +00:00
volth
e8d6b3aa4e [cpan2nix] perlPackages.HTTPEntityParser: 0.22 -> 0.24 2020-09-09 09:33:24 +00:00
volth
e33e4cae4a [cpan2nix] perlPackages.XMLLibXML: cleanup 2020-09-09 09:33:22 +00:00
volth
6801304d30 [cpan2nix] perlPackages.Alienm4: cleanup 2020-09-09 09:33:19 +00:00
volth
0955083540 [cpan2nix] perlPackages.XMLParser: 2.44 -> 2.46 2020-09-09 09:33:19 +00:00
volth
d8431c8a24 [cpan2nix] perlPackages.Alienpatch: cleanup 2020-09-09 09:33:16 +00:00
volth
614ede7e98 [cpan2nix] perlPackages.TemplateToolkit: 3.008 -> 3.009 2020-09-09 09:33:16 +00:00
volth
d3a4685159 [cpan2nix] perlPackages.NetFreeDB: cleanup 2020-09-09 09:33:15 +00:00
volth
a77c437ec2 [cpan2nix] perlPackages.Mouse: cleanup 2020-09-09 09:33:15 +00:00
volth
8747a8d521 [cpan2nix] perlPackages.LWP: 6.45 -> 6.47 2020-09-09 09:33:14 +00:00
volth
21cc537394 [cpan2nix] perlPackages.SQLAbstract: cleanup 2020-09-09 09:33:13 +00:00
volth
b68e2f1153 [cpan2nix] perlPackages.HTMLFormatTextWithLinks: cleanup 2020-09-09 09:33:13 +00:00
volth
31985af51f [cpan2nix] perlPackages.OpenAPIClient: 0.24 -> 0.25 2020-09-09 09:33:12 +00:00
volth
fdb84e00b1 [cpan2nix] perlPackages.MooXlate: cleanup 2020-09-09 09:33:12 +00:00
volth
369aae6e4d [cpan2nix] perlPackages.GamesSolitaireVerify: cleanup 2020-09-09 09:33:11 +00:00
volth
6222174269 [cpan2nix] perlPackages.CGIEmulatePSGI: cleanup 2020-09-09 09:33:10 +00:00
volth
2428f27101 [cpan2nix] perlPackages.AlienLibxml2: cleanup 2020-09-09 09:33:10 +00:00
volth
e7dc155fb3 [cpan2nix] perlPackages.PPIxQuoteLike: 0.011 -> 0.012 2020-09-09 09:33:10 +00:00
volth
db1acff1a7 [cpan2nix] perlPackages.MojoliciousPluginOpenAPI: 3.33 -> 3.35 2020-09-09 09:33:10 +00:00
volth
441a5f51ad [cpan2nix] perlPackages.DBDMariaDB: cleanup 2020-09-09 09:33:09 +00:00
volth
5c88f66026 [cpan2nix] perlPackages.Clipboard: cleanup 2020-09-09 09:33:09 +00:00
volth
5afc69cd90 [cpan2nix] perlPackages.Redis: 1.996 -> 1.998 2020-09-09 09:33:08 +00:00
volth
955408448e [cpan2nix] perlPackages.JSONValidator: 4.00 -> 4.02 2020-09-09 09:33:07 +00:00
volth
12919157c6 [cpan2nix] perlPackages.CGI: 4.49 -> 4.50 2020-09-09 09:33:07 +00:00
volth
ba680c0acd [cpan2nix] perlPackages.podlinkcheck: cleanup 2020-09-09 09:33:07 +00:00
volth
f121a00844 [cpan2nix] perlPackages.SubHandlesVia: 0.013 -> 0.014 2020-09-09 09:33:03 +00:00
volth
fd67127cc2 [cpan2nix] perlPackages.NetPrometheus: cleanup 2020-09-09 09:33:01 +00:00
volth
01c62532e1 [cpan2nix] perlPackages.MailDKIM: 1.20200513.1 -> 1.20200907 2020-09-09 09:33:00 +00:00
volth
f08acb145d [cpan2nix] perlPackages.HTMLRewriteAttributes: cleanup 2020-09-09 09:32:59 +00:00
volth
34fdce8802 [cpan2nix] perlPackages.HTMLForm: cleanup 2020-09-09 09:32:59 +00:00
volth
2685b309bd [cpan2nix] perlPackages.GetoptLongDescriptive: cleanup 2020-09-09 09:32:59 +00:00
volth
10ffaa21ba [cpan2nix] perlPackages.AltCryptRSABigInt: cleanup 2020-09-09 09:32:58 +00:00
volth
0cb5e16b63 [cpan2nix] perlPackages.AlienBuild: 2.26 -> 2.29 2020-09-09 09:32:58 +00:00
volth
5984d160f9 [cpan2nix] perlPackages.HTMLParser: 3.72 -> 3.75 2020-09-09 09:32:55 +00:00
volth
1e39862556 [cpan2nix] perlPackages.DataMessagePack: cleanup 2020-09-09 09:32:54 +00:00
volth
edfac3e950 [cpan2nix] perlPackages.ConfigGitLike: cleanup 2020-09-09 09:32:54 +00:00
volth
d7b7e8b408 [cpan2nix] perlPackages.Specio: cleanup 2020-09-09 09:32:54 +00:00
volth
0e41fa5fdc [cpan2nix] perlPackages.PerlPrereqScannerNotQuiteLite: 0.9911 -> 0.9913
dependencies:
perlPackages.URIcpan: init at 1.007
2020-09-09 09:32:53 +00:00
volth
d85e3c33f9 [cpan2nix] perlPackages.MojoliciousPluginStatus: cleanup 2020-09-09 09:32:52 +00:00
volth
e4475b36f7 [cpan2nix] perlPackages.MailBox: 3.008 -> 3.009 2020-09-09 09:32:52 +00:00
volth
78146d163e [cpan2nix] perlPackages.PPIxRegexp: 0.072 -> 0.074 2020-09-09 09:32:48 +00:00
volth
8ed1f96a57 [cpan2nix] perlPackages.MooXStrictConstructor: cleanup 2020-09-09 09:32:47 +00:00
volth
d94857961b [cpan2nix] perlPackages.HTTPMessage: 6.24 -> 6.25 2020-09-09 09:32:47 +00:00
volth
9b691837c0 [cpan2nix] perlPackages.DBIxSearchBuilder: 1.67 -> 1.68 2020-09-09 09:32:46 +00:00
volth
6db918afa0 [cpan2nix] perlPackages.TestMost: cleanup 2020-09-09 09:32:44 +00:00
volth
92ff56fb98 [cpan2nix] perlPackages.Sereal: 4.014 -> 4.018 2020-09-09 09:32:44 +00:00
volth
07f068b484 [cpan2nix] perlPackages.ListAllUtils: 0.16 -> 0.18 2020-09-09 09:32:42 +00:00
volth
200f82b203 [cpan2nix] perlPackages.IOAsync: cleanup 2020-09-09 09:32:42 +00:00
volth
9304cdad59 [cpan2nix] perlPackages.Moo: cleanup 2020-09-09 09:32:40 +00:00
volth
c9010c69d0 [cpan2nix] perlPackages.ModuleSignature: 0.83 -> 0.87 2020-09-09 09:32:40 +00:00
volth
8dfa8eeb9c [cpan2nix] perlPackages.FileBOM: cleanup 2020-09-09 09:32:39 +00:00
volth
46d650b39b [cpan2nix] perlPackages.EmailMIME: cleanup 2020-09-09 09:32:39 +00:00
volth
c9801eaa61 [cpan2nix] perlPackages.DBDCSV: 0.54 -> 0.55 2020-09-09 09:32:39 +00:00
volth
306ad711df [cpan2nix] perlPackages.Test2PluginNoWarnings: 0.08 -> 0.09 2020-09-09 09:32:38 +00:00
volth
c20cb35a8c [cpan2nix] perlPackages.SerealEncoder: 4.014 -> 4.018 2020-09-09 09:32:38 +00:00
volth
0b9aea7ce7 [cpan2nix] perlPackages.LocaleCodes: 3.64 -> 3.65 2020-09-09 09:32:36 +00:00
volth
09a258f9fc [cpan2nix] perlPackages.IPCRun: cleanup 2020-09-09 09:32:35 +00:00
volth
b2947f851a [cpan2nix] perlPackages.FileMap: 0.66 -> 0.67 2020-09-09 09:32:35 +00:00
volth
2c5e15cd68 [cpan2nix] perlPackages.DateManip: cleanup 2020-09-09 09:32:34 +00:00
volth
1107b86bcd [cpan2nix] perlPackages.SerealDecoder: 4.014 -> 4.018 2020-09-09 09:32:25 +00:00
volth
f06f956969 [cpan2nix] perlPackages.Pegex: cleanup 2020-09-09 09:32:24 +00:00
volth
c494dfe757 [cpan2nix] perlPackages.MailTransport: 3.004 -> 3.005 2020-09-09 09:32:23 +00:00
volth
839dbe3aad [cpan2nix] perlPackages.LinguaStem: 0.84 -> 2.30 2020-09-09 09:32:23 +00:00
volth
d72a8f325a [cpan2nix] perlPackages.FFICheckLib: cleanup 2020-09-09 09:32:22 +00:00
volth
2a6a19a694 [cpan2nix] perlPackages.CPANPLUS: cleanup 2020-09-09 09:32:22 +00:00
volth
18a38e8490 [cpan2nix] perlPackages.XSObjectMagic: cleanup 2020-09-09 09:32:21 +00:00
volth
150a6fdd7b [cpan2nix] perlPackages.Test2Suite: 0.000130 -> 0.000135 2020-09-09 09:32:21 +00:00
volth
5a607492a7 [cpan2nix] perlPackages.StringUtil: 1.26 -> 1.31 2020-09-09 09:32:19 +00:00
volth
f3ce752b74 [cpan2nix] perlPackages.POSIXstrftimeCompiler: 0.42 -> 0.44 2020-09-09 09:32:18 +00:00
volth
38d468eabf [cpan2nix] perlPackages.PDFAPI2: 2.037 -> 2.038 2020-09-09 09:32:18 +00:00
volth
3d4571bf1d [cpan2nix] perlPackages.MailMessage: cleanup 2020-09-09 09:32:16 +00:00
volth
413db9668a [cpan2nix] perlPackages.Gtk3SimpleList: cleanup 2020-09-09 09:32:15 +00:00
volth
9028d3b428 [cpan2nix] perlPackages.Future: cleanup 2020-09-09 09:32:14 +00:00
volth
54ab2130cc [cpan2nix] perlPackages.Dotenv: cleanup 2020-09-09 09:32:14 +00:00
volth
82176b93c3 [cpan2nix] perlPackages.ArchiveZip: cleanup 2020-09-09 09:32:13 +00:00
volth
6b760a2440 [cpan2nix] perlPackages.TestMockModule: cleanup 2020-09-09 09:32:12 +00:00
volth
5d27b509e4 [cpan2nix] perlPackages.TestMetricsAny: cleanup 2020-09-09 09:32:12 +00:00
volth
9b5bdf3e20 [cpan2nix] perlPackages.Gtk3: cleanup 2020-09-09 09:32:09 +00:00
volth
9ea978fe8f [cpan2nix] perlPackages.FileLibMagic: 1.22 -> 1.23 2020-09-09 09:32:07 +00:00
volth
1f732dce92 [cpan2nix] perlPackages.AuthenKrb5Admin: cleanup 2020-09-09 09:32:05 +00:00
volth
6114b9fc38 [cpan2nix] perlPackages.TextTemplate: 1.58 -> 1.59 2020-09-09 09:32:04 +00:00
volth
0949d73704 [cpan2nix] perlPackages.TestTrailingSpace: cleanup 2020-09-09 09:32:04 +00:00
volth
9650ec4589 [cpan2nix] perlPackages.StructDumb: cleanup 2020-09-09 09:32:03 +00:00
volth
4aacb8e30c [cpan2nix] perlPackages.MetricsAny: 0.05 -> 0.06 2020-09-09 09:32:02 +00:00
volth
2da2372600 [cpan2nix] perlPackages.HashMerge: 0.300 -> 0.302 2020-09-09 09:32:02 +00:00
volth
8d1d9e2c19 [cpan2nix] perlPackages.AuthenKrb5: cleanup 2020-09-09 09:32:00 +00:00
volth
c391a388f6 [cpan2nix] perlPackages.TypeTiny: 1.010002 -> 1.010006 2020-09-09 09:31:59 +00:00
volth
9f61a1d67c [cpan2nix] perlPackages.TestFatal: 0.014 -> 0.016 2020-09-09 09:31:58 +00:00
volth
ed30193c78 [cpan2nix] perlPackages.NetDNSResolverMock: cleanup 2020-09-09 09:31:56 +00:00
volth
5bd755dd7a [cpan2nix] perlPackages.MailAuthenticationResults: 1.20200331.1 -> 1.20200824.1 2020-09-09 09:31:56 +00:00
volth
987ade36e0 [cpan2nix] perlPackages.Coro: 6.55 -> 6.57 2020-09-09 09:31:54 +00:00
volth
85f722fd53 [cpan2nix] perlPackages.CGISimple: cleanup 2020-09-09 09:31:53 +00:00
volth
739b8b8c41 [cpan2nix] perlPackages.YAMLPP: 0.022 -> 0.025 2020-09-09 09:31:52 +00:00
volth
657abff028 [cpan2nix] perlPackages.TestWarnings: cleanup 2020-09-09 09:31:50 +00:00
volth
042e71f65b [cpan2nix] perlPackages.POE: cleanup 2020-09-09 09:31:48 +00:00
volth
fba9289eea [cpan2nix] perlPackages.MojoliciousPluginAssetPack: 2.08 -> 2.09 2020-09-09 09:31:47 +00:00
volth
b7016e325a [cpan2nix] perlPackages.MathPrimeUtil: cleanup 2020-09-09 09:31:46 +00:00
volth
593886145a [cpan2nix] perlPackages.DevelPatchPerl: cleanup 2020-09-09 09:31:44 +00:00
volth
943bc56bf9 [cpan2nix] perlPackages.DevelCheckOS: cleanup 2020-09-09 09:31:44 +00:00
volth
124640298b [cpan2nix] perlPackages.CryptRandom: cleanup 2020-09-09 09:31:43 +00:00
volth
9796cbeacd [cpan2nix] perlPackages.CryptJWT: 0.028 -> 0.029 2020-09-09 09:31:43 +00:00
volth
e06ec9b92b [cpan2nix] perlPackages.AnyEventHTTP: cleanup 2020-09-09 09:31:40 +00:00
volth
043fcd19f1 [cpan2nix] perlPackages.StringInterpolate: cleanup 2020-09-09 09:31:35 +00:00
volth
8fdafb7173 [cpan2nix] perlPackages.NetIPv6Addr: 0.96 -> 1.01 2020-09-09 09:31:33 +00:00
volth
ce0f766ff0 [cpan2nix] perlPackages.ModuleCompile: 0.37 -> 0.38 2020-09-09 09:31:32 +00:00
volth
d40888e79d [cpan2nix] perlPackages.Inline: 0.83 -> 0.86 2020-09-09 09:31:31 +00:00
volth
30e7d78e8d [cpan2nix] perlPackages.IOSocketSSL: cleanup 2020-09-09 09:31:31 +00:00
volth
e58abcc805 [cpan2nix] perlPackages.IOPager: cleanup 2020-09-09 09:31:31 +00:00
volth
56e13cfd7f [cpan2nix] perlPackages.HTTPTinyish: 0.16 -> 0.17 2020-09-09 09:31:30 +00:00
volth
6bb811f286 [cpan2nix] perlPackages.Glib: cleanup 2020-09-09 09:31:30 +00:00
volth
be1c82a529 [cpan2nix] perlPackages.GD: 2.71 -> 2.72 2020-09-09 09:31:29 +00:00
volth
0083824507 [cpan2nix] perlPackages.ExtUtilsCppGuess: cleanup 2020-09-09 09:31:27 +00:00
volth
d3c3bdb14f [cpan2nix] perlPackages.EV: cleanup 2020-09-09 09:31:27 +00:00
volth
416ae6fe82 [cpan2nix] perlPackages.IOCompress: 2.093 -> 2.096 2020-09-09 09:31:24 +00:00
volth
06b5b9d330 [cpan2nix] perlPackages.ack: v3.3.1 -> v3.4.0 2020-09-09 09:31:20 +00:00
volth
16cda9185b [cpan2nix] perlPackages.TextTable: cleanup 2020-09-09 09:31:18 +00:00
volth
845b283d1e [cpan2nix] perlPackages.TestCompile: v2.4.0 -> v2.4.1 2020-09-09 09:31:16 +00:00
volth
11dec3c71f [cpan2nix] perlPackages.SearchXapian: cleanup 2020-09-09 09:31:14 +00:00
volth
60107e2e92 [cpan2nix] perlPackages.NetDNS: 1.24 -> 1.26 2020-09-09 09:31:11 +00:00
volth
a121ea007a [cpan2nix] perlPackages.MojoliciousPluginWebpack: 0.12 -> 0.13 2020-09-09 09:31:10 +00:00
volth
0375ff6e18 [cpan2nix] perlPackages.ModuleScanDeps: 1.27 -> 1.29 2020-09-09 09:31:09 +00:00
volth
0890ef411e [cpan2nix] perlPackages.ListCompare: 0.53 -> 0.55 2020-09-09 09:31:06 +00:00
volth
a16d4a1627 [cpan2nix] perlPackages.JSONMaybeXS: cleanup 2020-09-09 09:31:05 +00:00
volth
ad165d2940 [cpan2nix] perlPackages.HTTPDate: cleanup 2020-09-09 09:31:04 +00:00
volth
e144f1ff7e [cpan2nix] perlPackages.FileUtil: 4.161950 -> 4.201720 2020-09-09 09:31:02 +00:00
volth
010e512358 [cpan2nix] perlPackages.ExtUtilsF77: 1.23 -> 1.24 2020-09-09 09:31:01 +00:00
volth
c81ac8de88 [cpan2nix] perlPackages.EmailMIMEContentType: cleanup 2020-09-09 09:31:00 +00:00
volth
f212863a93 [cpan2nix] perlPackages.DBDSQLite: 1.64 -> 1.66 2020-09-09 09:30:58 +00:00
volth
a00f2f64d1 [cpan2nix] perlPackages.DBDPg: 3.12.3 -> 3.14.2 2020-09-09 09:30:58 +00:00
volth
f797425d6c [cpan2nix] perlPackages.ConfigIniFiles: cleanup 2020-09-09 09:30:56 +00:00
volth
feb965a3de [cpan2nix] perlPackages.Clone: cleanup 2020-09-09 09:30:56 +00:00
volth
145a7c8096 [cpan2nix] perlPackages.vidir: 0.042 -> 0.050 2020-09-09 09:30:51 +00:00
volth
cf3296a693 [cpan2nix] perlPackages.threadsshared: removed built-in 2020-09-09 09:30:51 +00:00
volth
3d26c72c47 [cpan2nix] perlPackages.bignum: removed built-in 2020-09-09 09:30:47 +00:00
volth
757240f13f [cpan2nix] perlPackages.YAMLLibYAML: cleanup 2020-09-09 09:30:46 +00:00
volth
718328ceec [cpan2nix] perlPackages.Version: 0.9924 -> 0.9927 2020-09-09 09:30:43 +00:00
volth
86b530b3c9 [cpan2nix] perlPackages.Tk: cleanup 2020-09-09 09:30:41 +00:00
volth
e2d8d7eb70 [cpan2nix] perlPackages.TimeDate: cleanup 2020-09-09 09:30:39 +00:00
volth
9f3a3b2b23 [cpan2nix] perlPackages.ThreadQueue: removed built-in 2020-09-09 09:30:37 +00:00
volth
65fbb72032 [cpan2nix] perlPackages.TextCSV_XS: 1.43 -> 1.44 2020-09-09 09:30:33 +00:00
volth
c76d63e417 [cpan2nix] perlPackages.TextAligner: cleanup 2020-09-09 09:30:32 +00:00
volth
a5b2176380 [cpan2nix] perlPackages.Testutf8: cleanup 2020-09-09 09:30:32 +00:00
volth
b378f2dbdd [cpan2nix] perlPackages.TestTempDirTiny: cleanup 2020-09-09 09:30:31 +00:00
volth
9b8aa5cd7b [cpan2nix] perlPackages.TestSimple13: 1.302175 -> 1.302177 2020-09-09 09:30:31 +00:00
volth
4e274cceb6 [cpan2nix] perlPackages.TestRequires: cleanup 2020-09-09 09:30:28 +00:00
volth
a4b61c7174 [cpan2nix] perlPackages.TestMemoryGrowth: 0.03 -> 0.04 2020-09-09 09:30:26 +00:00
volth
12104b468e [cpan2nix] perlPackages.TestDeep: cleanup 2020-09-09 09:30:24 +00:00
volth
366256fed7 [cpan2nix] perlPackages.SysMmap: cleanup 2020-09-09 09:30:21 +00:00
volth
e76f3a6bab [cpan2nix] perlPackages.Storable: removed built-in 2020-09-09 09:30:17 +00:00
volth
3b839fca12 [cpan2nix] perlPackages.StatisticsChiSquare: cleanup 2020-09-09 09:30:17 +00:00
volth
1c761b4993 [cpan2nix] perlPackages.ScalarListUtils: cleanup 2020-09-09 09:30:14 +00:00
volth
ff22c6525b [cpan2nix] perlPackages.SafeHole: cleanup 2020-09-09 09:30:13 +00:00
volth
db7edc0387 [cpan2nix] perlPackages.RegexpGrammars: cleanup 2020-09-09 09:30:11 +00:00
volth
3a1554b478 [cpan2nix] perlPackages.PkgConfig: 0.23026 -> 0.24026 2020-09-09 09:30:06 +00:00
volth
f84860d54e [cpan2nix] perlPackages.Perlosnames: cleanup 2020-09-09 09:30:06 +00:00
volth
07c8f29de1 [cpan2nix] perlPackages.PerlIOLayers: cleanup 2020-09-09 09:30:05 +00:00
volth
d214d39c3e [cpan2nix] perlPackages.PathTiny: cleanup 2020-09-09 09:30:04 +00:00
volth
ce8ad25aa6 [cpan2nix] perlPackages.Parent: cleanup 2020-09-09 09:30:03 +00:00
volth
a6e6589377 [cpan2nix] perlPackages.OggVorbisHeaderPurePerl: 1.0 -> 1.04 2020-09-09 09:30:00 +00:00
volth
f0612109c3 [cpan2nix] perlPackages.NetSNPP: cleanup 2020-09-09 09:29:58 +00:00
volth
fdbd6dfece [cpan2nix] perlPackages.NetSFTPForeign: 1.90 -> 1.91 2020-09-09 09:29:57 +00:00
volth
051beb3bb9 [cpan2nix] perlPackages.NetPing: cleanup 2020-09-09 09:29:56 +00:00
volth
6ca1b8d618 [cpan2nix] perlPackages.NetOpenSSH: cleanup 2020-09-09 09:29:56 +00:00
volth
67967e4f6e [cpan2nix] perlPackages.MozillaCA: cleanup 2020-09-09 09:29:55 +00:00
volth
1ac482a114 [cpan2nix] perlPackages.ModernPerl: cleanup 2020-09-09 09:29:52 +00:00
volth
012d41be88 [cpan2nix] perlPackages.MathPari: cleanup 2020-09-09 09:29:50 +00:00
volth
85a36e9834 [cpan2nix] perlPackages.MathBigRat: removed built-in 2020-09-09 09:29:49 +00:00
volth
c5243bbba8 [cpan2nix] perlPackages.MathBigIntLite: 0.18 -> 0.19 2020-09-09 09:29:49 +00:00
volth
06c92315ff [cpan2nix] perlPackages.MathBigInt: 1.999816 -> 1.999818 2020-09-09 09:29:49 +00:00
volth
fdc8009bee [cpan2nix] perlPackages.MP3Tag: cleanup 2020-09-09 09:29:47 +00:00
volth
d7fe19dbfc [cpan2nix] perlPackages.MP3Info: cleanup 2020-09-09 09:29:47 +00:00
volth
1301d46be1 [cpan2nix] perlPackages.MCE: 1.872 -> 1.874 2020-09-09 09:29:46 +00:00
volth
fad732a3fc [cpan2nix] perlPackages.LogJournald: cleanup 2020-09-09 09:29:46 +00:00
volth
aa7a3189ec [cpan2nix] perlPackages.LogLog4perl: 1.49 -> 1.52 2020-09-09 09:29:45 +00:00
volth
bac36fbaf9 [cpan2nix] perlPackages.JSONParse: 0.56 -> 0.57 2020-09-09 09:29:41 +00:00
volth
2ade24dc1f [cpan2nix] perlPackages.JSONPP: 4.04 -> 4.05 2020-09-09 09:29:40 +00:00
volth
269e90b3b4 [cpan2nix] perlPackages.Importer: 0.025 -> 0.026 2020-09-09 09:29:40 +00:00
volth
8b882bc913 [cpan2nix] perlPackages.Imager: cleanup 2020-09-09 09:29:40 +00:00
volth
809cc5ec4c [cpan2nix] perlPackages.IPCSystemSimple: cleanup 2020-09-09 09:29:38 +00:00
volth
66e10e06a4 [cpan2nix] perlPackages.IPCSysV: 2.07 -> 2.08 2020-09-09 09:29:38 +00:00
volth
4964f14020 [cpan2nix] perlPackages.IOTee: 0.65 -> 0.66 2020-09-09 09:29:36 +00:00
volth
a909242f76 [cpan2nix] perlPackages.GitAutofixup: cleanup 2020-09-09 09:29:31 +00:00
volth
6bf2fe6fc3 [cpan2nix] perlPackages.GetoptLong: 2.51 -> 2.52 2020-09-09 09:29:31 +00:00
volth
a4870c355e [cpan2nix] perlPackages.Filter: 1.59 -> 1.60 2020-09-09 09:29:29 +00:00
volth
0d379fd903 [cpan2nix] perlPackages.FileTemp: removed built-in 2020-09-09 09:29:28 +00:00
volth
5816e32480 [cpan2nix] perlPackages.FileSlurp: 9999.30 -> 9999.32 2020-09-09 09:29:27 +00:00
volth
35395e094a [cpan2nix] perlPackages.FilePath: 2.16 -> 2.17 2020-09-09 09:29:27 +00:00
volth
86a732adb6 [cpan2nix] perlPackages.ExtUtilsManifest: removed built-in 2020-09-09 09:29:24 +00:00
volth
c0b518c4c8 [cpan2nix] perlPackages.ExtUtilsInstall: 2.14 -> 2.16 2020-09-09 09:29:24 +00:00
volth
6459b738ee [cpan2nix] perlPackages.ExtUtilsMakeMaker: 7.44 -> 7.46 2020-09-09 09:29:22 +00:00
volth
b37b6eb95e [cpan2nix] perlPackages.ExporterTiny: cleanup 2020-09-09 09:29:19 +00:00
volth
96745d9393 [cpan2nix] perlPackages.Encode: 3.06 -> 3.07 2020-09-09 09:29:17 +00:00
volth
a9a23fb6eb [cpan2nix] perlPackages.DeviceSerialPort: cleanup 2020-09-09 09:29:14 +00:00
volth
67efe59295 [cpan2nix] perlPackages.DevelPPPort: 3.58 -> 3.60 2020-09-09 09:29:13 +00:00
volth
062468aa29 [cpan2nix] perlPackages.DevelLeak: cleanup 2020-09-09 09:29:13 +00:00
volth
049f3b8ac3 [cpan2nix] perlPackages.DevelHide: cleanup 2020-09-09 09:29:13 +00:00
volth
8d2302e718 [cpan2nix] perlPackages.DataUUID: cleanup 2020-09-09 09:29:12 +00:00
volth
02c95ec228 [cpan2nix] perlPackages.DataSerializer: cleanup 2020-09-09 09:29:12 +00:00
volth
4fb7c6744f [cpan2nix] perlPackages.DataDumper: removed built-in 2020-09-09 09:29:10 +00:00
volth
d0b6281fba [cpan2nix] perlPackages.DBI: cleanup 2020-09-09 09:29:10 +00:00
volth
d08ddd79d0 [cpan2nix] perlPackages.CryptX: 0.068 -> 0.069 2020-09-09 09:29:08 +00:00
volth
06a6679c69 [cpan2nix] perlPackages.CryptECB: cleanup 2020-09-09 09:29:04 +00:00
volth
14bfbb95c8 [cpan2nix] perlPackages.ConvertUU: cleanup 2020-09-09 09:29:03 +00:00
volth
6e37a7f358 [cpan2nix] perlPackages.ConvertBencode: cleanup 2020-09-09 09:29:03 +00:00
volth
f6b71c94ff [cpan2nix] perlPackages.CompressRawZlib: 2.093 -> 2.096 2020-09-09 09:29:02 +00:00
volth
56594a6007 [cpan2nix] perlPackages.CompressRawBzip2: 2.093 -> 2.096 2020-09-09 09:29:02 +00:00
volth
62eacd4d46 [cpan2nix] perlPackages.CompressBzip2: 2.27 -> 2.28 2020-09-09 09:29:02 +00:00
volth
ecc7e56df1 [cpan2nix] perlPackages.commonsense: cleanup 2020-09-09 09:29:01 +00:00
volth
0778127e4f [cpan2nix] perlPackages.ClassTiny: 1.006 -> 1.008 2020-09-09 09:29:01 +00:00
volth
698e73b6f5 [cpan2nix] perlPackages.ClassLoader: cleanup 2020-09-09 09:28:59 +00:00
volth
4381d49fa5 [cpan2nix] perlPackages.CatalystManual: 5.9010 -> 5.9011 2020-09-09 09:28:57 +00:00
volth
36ae652992 [cpan2nix] perlPackages.CacheMemcachedFast: cleanup 2020-09-09 09:28:56 +00:00
volth
70ddd22e93 [cpan2nix] perlPackages.CacheFastMmap: cleanup 2020-09-09 09:28:56 +00:00
volth
b0be696f3a [cpan2nix] perlPackages.CPANPerlReleases: 5.20200607 -> 5.20200820 2020-09-09 09:28:55 +00:00
volth
48e6dc1415 [cpan2nix] perlPackages.CGIMinimal: cleanup 2020-09-09 09:28:55 +00:00
volth
d0f43f614e [cpan2nix] perlPackages.CDDBFile: cleanup 2020-09-09 09:28:54 +00:00
volth
e5063952e0 [cpan2nix] perlPackages.BusinessISSN: cleanup 2020-09-09 09:28:54 +00:00
volth
dd4571a395 [cpan2nix] perlPackages.BCOW: cleanup 2020-09-09 09:28:53 +00:00
volth
b1bb5d7728 [cpan2nix] perlPackages.ArchiveTar: 2.36 -> 2.38 2020-09-09 09:28:53 +00:00
volth
31c9783064 [cpan2nix] perlPackages.Apprainbarf: cleanup 2020-09-09 09:28:52 +00:00
volth
58fa55d394 perl: remove obsolete patch 2020-09-09 09:28:07 +00:00
volth
f3877602da perlPackages: make it easier for the parser 2020-09-09 09:28:07 +00:00
Christoph Neidahl
ddd5f56ed7 palemoon: Add libpulseaudio to wrapper
(cherry picked from commit 5ee5bbef84)
2020-09-09 08:25:10 +02:00
misuzu
cb8686599b nixosTests.3proxy: fix flakiness
(cherry picked from commit 0c688868e7)
2020-09-08 21:50:00 -07:00
Vincent Laporte
69ab6a3e69 coqPackages.coqprime: init at 8.12 for Coq 8.12
(cherry picked from commit 607b0ae7ae)
2020-09-09 06:39:22 +02:00
WORLDofPEACE
ffe1621ea0 Merge pull request #97495 from jonringer/backport-xdis
[20.09] python3Packages.xdis: 4.2.4 -> 5.0.4, fix build
2020-09-08 21:29:48 -04:00
Jonathan Ringer
05a966fe15 python3Packages.xdis: 4.2.4 -> 5.0.4, fix build
(cherry picked from commit ff7e38b954)
2020-09-08 18:21:29 -07:00
John Ericson
2c3d422964 androidndk: Avoid depending on target-sensative openjdk
We just need jdk for this script that helps set up toolchains. The
script might need to know about the target platform, but the interpreter
that runs it (or part of it) doesn't.
2020-09-08 18:06:08 -07:00
John Ericson
55dd61043a lib.systems.examples: Bump android SDK to 21
074bc78cc8 evidently meant to do this, but
forgot.
2020-09-08 18:06:08 -07:00
John Ericson
9f68e349ff androidndkPkgs: Take version from underlying package
We can now do this, so let's.
2020-09-08 18:06:08 -07:00
John Ericson
1ae53f4d54 deployAndroidPackage: Use pname and version 2020-09-08 18:06:08 -07:00
John Ericson
b5476ce450 cc-wrapper: Fix for prebuilt android
We don't want to use Nix-built GCC's libs with prebuilt clang in this
case.
2020-09-08 18:06:08 -07:00
WORLDofPEACE
8d2040c265 Merge pull request #97492 from romildo/release-20.09.upd.ubuntu-themes
[20.09] ubuntu-themes: 19.04 -> 20.10
2020-09-08 20:48:57 -04:00
José Romildo Malaquias
525c0716ff ubuntu-themes: 19.04 -> 20.10
(cherry picked from commit 8ec4d97e9c)
2020-09-08 21:40:54 -03:00
WORLDofPEACE
d861ca40a3 Merge pull request #97489 from davidak/backport-defaultPackages
[20.09] add defaultPackages option
2020-09-08 20:38:48 -04:00
davidak
b78318e1c8 nixos/config: add defaultPackages option
readd perl (used in shell scripts), rsync (needed for NixOps) and strace (common debugging tool)

they where previously removed in https://github.com/NixOS/nixpkgs/pull/91213

Co-authored-by: Timo Kaufmann <timokau@zoho.com>
Co-authored-by: 8573 <8573@users.noreply.github.com>
(cherry picked from commit 74b3d66baf)
2020-09-09 02:29:18 +02:00
WORLDofPEACE
e83908c966 Merge pull request #97483 from cole-h/release-20.09
[20.09] cantata: add perl for dynamic playlists
2020-09-08 19:56:36 -04:00
Cole Helbling
524369c4ba cantata: add perl for dynamic playlists
Cantata wants to check if perl is available at runtime, but we already patch the
script shebangs, making it unnecessary to be available at runtime --
thus, patch out this check.

(cherry picked from commit fca7cc57ad)
2020-09-08 16:50:59 -07:00
WORLDofPEACE
3369f09a39 Merge pull request #97477 from kolaente/backport/20.09-jetbrains
Backport/20.09 jetbrains
2020-09-08 19:21:20 -04:00
kolaente
029b4a828e Update jetbrains.webstorm 2020.2 -> 2020.2.1
(cherry picked from commit ee939c9d18)
2020-09-08 23:20:35 +02:00
kolaente
7f7c971bc0 Update jetbrains.ruby-mine 2020.2 -> 2020.2.1
(cherry picked from commit 7b46916f94)
2020-09-08 23:20:35 +02:00
kolaente
a2436acaa2 Update jetbrains.rider 2020.2 -> 2020.2.1
(cherry picked from commit fe552e4534)
2020-09-08 23:20:35 +02:00
kolaente
01ab40b984 Update jetbrains.pycharm-professional 2020.2 -> 2020.2.1
(cherry picked from commit 2fa77fecfa)
2020-09-08 23:20:35 +02:00
kolaente
790939c31a Update jetbrains.pycharm-community 2020.2 -> 2020.2.1
(cherry picked from commit b5a8a3b87d)
2020-09-08 23:20:35 +02:00
kolaente
b444588ce6 Update jetbrains.phpstorm 2020.2 -> 2020.2.1
(cherry picked from commit d0ce498d54)
2020-09-08 23:20:35 +02:00
kolaente
fda5a96cc8 Update jetbrains.mps 2020.2 -> 2020.2.1
(cherry picked from commit 1ae3cac8fc)
2020-09-08 23:20:34 +02:00
kolaente
3be0a9f2fc Update jetbrains.idea-ultimate 2020.2 -> 2020.2.1
(cherry picked from commit 1281a5748c)
2020-09-08 23:20:34 +02:00
kolaente
2a98201737 Update jetbrains.idea-community 2020.2 -> 2020.2.1
(cherry picked from commit 70706259a4)
2020-09-08 23:20:34 +02:00
kolaente
ce8ecced45 Update jetbrains.goland 2020.2.1 -> 2020.2.2
(cherry picked from commit 120d6ed2fc)
2020-09-08 23:20:34 +02:00
kolaente
308922abba Update jetbrains.datagrip 2020.2 -> 2020.2.2
(cherry picked from commit 977620b029)
2020-09-08 23:20:34 +02:00
kolaente
c90cd42c01 Update jetbrains.clion 2020.2 -> 2020.2.1
(cherry picked from commit 487ea9d055)
2020-09-08 23:20:34 +02:00
zowoq
c411fe8ae0 Merge pull request #97428 from zowoq/2009-editorconfig
[20.09] .github/workflows/editorconfig.yml: remove
2020-09-09 06:39:42 +10:00
Maximilian Bosch
9211dc6a74 linuxPackages.wireguard: 1.0.20200729 -> 1.0.20200908
https://lists.zx2c4.com/pipermail/wireguard/2020-September/005817.html
(cherry picked from commit c73ef96b7e)
2020-09-08 22:34:35 +02:00
Maximilian Bosch
6ba161261d iwd: 1.8 -> 1.9
https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog?h=1.9
(cherry picked from commit a59a88cf3e)
2020-09-08 20:40:50 +02:00
Maximilian Bosch
3f4a519fc8 ell: 0.32 -> 0.33
https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=0.33
(cherry picked from commit f3ea9452fb)
2020-09-08 20:40:50 +02:00
Jonathan Ringer
ce77f2dbcb allegro: fix build, use texinfo6_5
(cherry picked from commit cceb63ff0a)
2020-09-08 10:25:03 -07:00
Oleksii Filonenko
ff6f1a65b1 Merge pull request #97439 from xfix/backport-caddy 2020-09-08 15:16:31 +03:00
Sylvain Fankhauser
17aa84a9f4 caddy: 2.0.0 -> 2.1.1
(cherry picked from commit 94ed8606c6)
2020-09-08 12:43:30 +02:00
Sylvain Fankhauser
efeb51f81d caddy: address remaining MR comments for v2
(cherry picked from commit b8bfe941fa)
2020-09-08 12:43:30 +02:00
Oleksii Filonenko
05eb101fbb release-notes/rl-2009: add item about Caddy v2
(cherry picked from commit c3a7c89a20)
2020-09-08 12:43:30 +02:00
Oleksii Filonenko
9527d0be18 caddy: 1.0.5 -> 2.0.0
Rename legacy v1 to `caddy1`

(cherry picked from commit 6322325a53)
2020-09-08 12:43:29 +02:00
Oleksii Filonenko
54ad14abfc nixosTests.caddy: update to v2
- Update configuration syntax
- Add filalex77 as a maintainer

(cherry picked from commit 06d2d84519)
2020-09-08 12:43:29 +02:00
Oleksii Filonenko
80a5560db9 nixos/caddy: use v2 by default
(cherry picked from commit d71cadacd9)
2020-09-08 12:43:29 +02:00
Oleksii Filonenko
e2b51af18a nixos/caddy: add support for v2
(cherry picked from commit 8cc592abfa)
2020-09-08 12:43:29 +02:00
Thomas Tuegel
f6b34a610d Merge pull request #97410 from ttuegel/release-20.09--qt-5.15
Qt 5.15
2020-09-08 05:18:41 -05:00
zowoq
4ea52040b6 [20.09] .github/workflows/editorconfig.yml: remove 2020-09-08 17:16:49 +10:00
zowoq
d351e49b64 the-way: disable check
disable until buildRustPackage supports setting test-threads in packages

(cherry picked from commit 8b1690a77e)
2020-09-08 17:10:46 +10:00
zowoq
4fee137f80 gitAndTools.git-interactive-rebase-tool: disable check
disable until buildRustPackage supports setting test-threads in packages

(cherry picked from commit e4cc68f766)
2020-09-08 17:10:39 +10:00
zowoq
c570cd1d1b castor: disable check
disable until buildRustPackage supports setting test-threads in packages

(cherry picked from commit 6a593a7d59)
2020-09-08 17:10:28 +10:00
Thomas Tuegel
a13a01924e Merge pull request #97242 from ttuegel/qt-5.15
Qt 5.15.0

(cherry picked from commit 0b3cc29f09)
2020-09-07 20:20:09 -05:00
WORLDofPEACE
ce03bc9939 Merge pull request #97408 from mkg20001/cinnamon20.09
[20.09] nixos/cinnamon: init
2020-09-07 20:51:49 -04:00
Maciej Krüger
cf795410be nixos/cinnamon: init
Co-Authored-By: WORLDofPEACE <worldofpeace@protonmail.ch>
(cherry picked from commit 04ea3a0ff6)
2020-09-08 02:15:05 +02:00
Maciej Krüger
8f1f3fc449 cinnamon.cinnamon-settings-daemon: add dev output
(cherry picked from commit 907f761b0a)
2020-09-08 02:15:05 +02:00
Maciej Krüger
315be74347 mint-x-icons: remove other package and expose from cinnamon namespace
(cherry picked from commit 996bdf7cd4)
2020-09-08 02:15:05 +02:00
Maciej Krüger
d1dd7f8bf2 vanilla-dmz: 0.4.4 -> 0.4.5 (+license fix)
The package debian/copyright states Attribution-ShareAlike 3.0 Unported
(CC BY-SA 3.0) which is cc-by-sa-30, was wrongly cc-by-nc-sa-30 which is
unfree

(cherry picked from commit b5839daf69)
2020-09-08 02:15:04 +02:00
Maciej Krüger
78a009a125 cinnamon.cinnamon-gsettings-overrides: init
(cherry picked from commit c08e45ff3b)
2020-09-08 02:15:04 +02:00
Maciej Krüger
209c4111dd mint-artwork: init at 1.4.3
(cherry picked from commit 4da4af45f7)
2020-09-08 02:15:04 +02:00
Maciej Krüger
213592f88b cinnamon.mint-x-icons: init at 1.5.5
(cherry picked from commit a5a97c3f64)
2020-09-08 02:15:04 +02:00
Maciej Krüger
1e57e1c073 cinnamon.*: now maintained by cinnamon team
(cherry picked from commit dd8233b72d)
2020-09-08 02:15:03 +02:00
Maciej Krüger
8611055877 cinnamon.cinnamon-common: patch & expose sessions
(cherry picked from commit 66f42fee47)
2020-09-08 02:15:03 +02:00
Maciej Krüger
fc97ec431f cinnamon.cinnamon-common: fix nma missing
(cherry picked from commit ec854b0c0d)
2020-09-08 02:15:03 +02:00
Maciej Krüger
2c0316e77a cinnamon.xapps: 1.6.10 -> 1.8.9
(cherry picked from commit 95eb753e67)
2020-09-08 02:15:03 +02:00
Maciej Krüger
f1aa20e9e8 cinnamon.nemo: 4.4.1 -> 4.6.5
(cherry picked from commit 0a7e5e4d01)
2020-09-08 02:15:02 +02:00
Maciej Krüger
f1c6a2bc78 cinnamon.muffin: 4.4.2 -> 4.6.3
(cherry picked from commit 9e13c3be9c)
2020-09-08 02:15:02 +02:00
Maciej Krüger
5973ece9f0 cinnamon.mint-y-icons: unstable -> 1.4.3
(cherry picked from commit b4abc9ba35)
2020-09-08 02:15:02 +02:00
Maciej Krüger
f44b919bbb cinnamon.mint-themes: 1.8.0 -> 1.8.6
(cherry picked from commit f11433c0dc)
2020-09-08 02:15:02 +02:00
Maciej Krüger
568d278282 cinnamon.cinnamon-session: 4.4.0 -> 4.6.4
(cherry picked from commit 527e625fc1)
2020-09-08 02:15:01 +02:00
Maciej Krüger
958cc63038 cinnamon.cinnamon-common: 4.4.1 -> 4.6.1
(cherry picked from commit 415bed22bb)
2020-09-08 02:15:01 +02:00
Maciej Krüger
7d96b5a2e5 cinnamon.cinnamon-session: 4.4.1 -> 4.6.1
(cherry picked from commit bd501a59d9)
2020-09-08 02:15:01 +02:00
Maciej Krüger
3215ad48ae cinnamon.cinnamon-screensaver: 4.4.0 -> 4.6.0
(cherry picked from commit 74b5685bba)
2020-09-08 02:15:01 +02:00
R. RyanTM
6b118aa234 cinnamon.cjs: 4.4.0 -> 4.6.0
(cherry picked from commit d078731ce5)
2020-09-08 02:15:01 +02:00
R. RyanTM
a0d0d05bd8 cinnamon.cinnamon-desktop: 4.4.1 -> 4.6.1
(cherry picked from commit 02b2bf7396)
2020-09-08 02:15:00 +02:00
R. RyanTM
383b991a7a cinnamon.cinnamon-menus: 4.4.0 -> 4.6.0
(cherry picked from commit 5676e96110)
2020-09-08 02:15:00 +02:00
Maciej Krüger
dec359780d cinnamon.cinnamon-control-center: 4.4.0 -> 4.6.0
(cherry picked from commit c768edfecf)
2020-09-08 02:15:00 +02:00
Maciej Krüger
c934811213 arc-theme: enable cinnamon
(cherry picked from commit 1e605712d2)
2020-09-08 02:15:00 +02:00
Maciej Krüger
f0e2178774 teams: add cinnamon team
(cherry picked from commit 4689b34d4f)
2020-09-08 02:14:59 +02:00
WORLDofPEACE
94b8935729 Merge pull request #97399 from samueldr/feature/20.09/remove-rpi4-image
sd-image-raspberrypi4: remove from stable channel
2020-09-07 18:12:43 -04:00
Samuel Dionne-Riel
1a675534b6 sd-image-raspberrypi4: remove from stable channel
As described at the moment this was introduced, this is not intended to
be a stable product for NixOS.
2020-09-07 17:22:56 -04:00
Jonathan Ringer
0cebf41b66 Release 20.09 alpha 2020-09-07 13:47:45 -07:00
67549 changed files with 1828553 additions and 5986025 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

@@ -17,13 +17,10 @@ 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 json/lockfiles/markdown/nix/perl/python/ruby/shell/docbook files, set indent to spaces
[*.{json,lock,md,nix,pl,pm,py,rb,sh,xml}]
indent_style = space
# Match docbook files, set indent width of one
@@ -31,15 +28,11 @@ indent_style = space
indent_size = 1
# Match json/lockfiles/markdown/nix/ruby files, set indent width of two
[*.{js,json,lock,md,nix,rb}]
[*.{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 perl/python/shell scripts, set indent width of four
[*.{pl,pm,py,sh}]
indent_size = 4
# Match gemfiles, set indent to spaces with width of two
@@ -47,11 +40,6 @@ indent_size = 4
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
@@ -59,46 +47,66 @@ insert_final_newline = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
[*.{asc,key,ovpn}]
[*.{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
[deps.nix]
insert_final_newline = unset
trim_trailing_whitespace = unset
charset = unset
[eggs.nix]
trim_trailing_whitespace = unset
[registry.dat]
[gemset.nix]
insert_final_newline = unset
[node-{composition,packages}.nix]
insert_final_newline = unset
[nixos/modules/services/networking/ircd-hybrid/*.{conf,in}]
trim_trailing_whitespace = unset
[nixos/tests/systemd-networkd-vrf.nix]
trim_trailing_whitespace = unset
[pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json]
indent_size = unset
[pkgs/build-support/dotnetenv/Wrapper/**]
end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset
[pkgs/build-support/upstream-updater/**]
trim_trailing_whitespace = unset
[pkgs/development/compilers/elm/registry.dat]
end_of_line = unset
insert_final_newline = unset
# see https://manual.jule.dev/project/code-style.html#indentions
[*.jule]
indent_style = tab
[pkgs/development/lisp-modules/quicklisp-to-nix.nix]
indent_size = unset
[jule.mod]
[pkgs/development/haskell-modules/hackage-packages.nix]
indent_style = unset
indent_size = unset
trim_trailing_whitespace = unset
[pkgs/development/mobile/androidenv/generated/{addons,packages}.nix]
trim_trailing_whitespace = unset
[pkgs/development/node-packages/node-packages.nix]
insert_final_newline = unset
# Keep this hint at the bottom:
# Please don't add entries for subfolders here.
# Create <subfolder>/.editorconfig instead.
[pkgs/servers/dict/wordnet_structures.py]
indent_size = unset
trim_trailing_whitespace = unset
[pkgs/top-level/emscripten-packages.nix]
trim_trailing_whitespace = unset
[pkgs/top-level/perl-packages.nix]
indent_size = unset

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

50
.gitattributes vendored
View File

@@ -1,26 +1,5 @@
# 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
**/node-packages.nix linguist-generated
pkgs/applications/editors/emacs-modes/*-generated.nix linguist-generated
pkgs/development/r-modules/*-packages.nix linguist-generated
@@ -35,30 +14,3 @@ nixos/doc/default.nix linguist-documentation=false
nixos/modules/module-list.nix merge=union
# pkgs/top-level/all-packages.nix merge=union
ci/OWNERS linguist-language=CODEOWNERS
# 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

210
.github/CODEOWNERS vendored Normal file
View File

@@ -0,0 +1,210 @@
# CODEOWNERS file
#
# This file is used to describe who owns what in this repository. This file does not
# replace `meta.maintainers` but is instead used for other things than derivations
# and modules, like documentation, package sets, and other assets.
#
# For documentation on this file, see https://help.github.com/articles/about-codeowners/
# Mentioned users will get code review requests.
# This file
/.github/CODEOWNERS @edolstra
# GitHub actions
/.github/workflows @Mic92 @zowoq
# EditorConfig
/.editorconfig @Mic92 @zowoq
# Libraries
/lib @edolstra @nbp @infinisil
/lib/systems @nbp @ericson2314 @matthewbauer
/lib/generators.nix @edolstra @nbp @Profpatsch
/lib/cli.nix @edolstra @nbp @Profpatsch
/lib/debug.nix @edolstra @nbp @Profpatsch
/lib/asserts.nix @edolstra @nbp @Profpatsch
# Nixpkgs Internals
/default.nix @nbp
/pkgs/top-level/default.nix @nbp @Ericson2314
/pkgs/top-level/impure.nix @nbp @Ericson2314
/pkgs/top-level/stage.nix @nbp @Ericson2314 @matthewbauer
/pkgs/top-level/splice.nix @Ericson2314 @matthewbauer
/pkgs/top-level/release-cross.nix @Ericson2314 @matthewbauer
/pkgs/stdenv/generic @Ericson2314 @matthewbauer
/pkgs/stdenv/cross @Ericson2314 @matthewbauer
/pkgs/build-support/cc-wrapper @Ericson2314 @orivej
/pkgs/build-support/bintools-wrapper @Ericson2314 @orivej
/pkgs/build-support/setup-hooks @Ericson2314
# Nixpkgs build-support
/pkgs/build-support/writers @lassulus @Profpatsch
# NixOS Internals
/nixos/default.nix @nbp @infinisil
/nixos/lib/from-env.nix @nbp @infinisil
/nixos/lib/eval-config.nix @nbp @infinisil
/nixos/doc/manual/configuration/abstractions.xml @nbp
/nixos/doc/manual/configuration/config-file.xml @nbp
/nixos/doc/manual/configuration/config-syntax.xml @nbp
/nixos/doc/manual/configuration/modularity.xml @nbp
/nixos/doc/manual/development/assertions.xml @nbp
/nixos/doc/manual/development/meta-attributes.xml @nbp
/nixos/doc/manual/development/option-declarations.xml @nbp
/nixos/doc/manual/development/option-def.xml @nbp
/nixos/doc/manual/development/option-types.xml @nbp
/nixos/doc/manual/development/replace-modules.xml @nbp
/nixos/doc/manual/development/writing-modules.xml @nbp
/nixos/doc/manual/man-nixos-option.xml @nbp
/nixos/modules/installer/tools/nixos-option.sh @nbp
# NixOS integration test driver
/nixos/lib/test-driver @tfc
# Updaters
## update.nix
/maintainers/scripts/update.nix @jtojnar
/maintainers/scripts/update.py @jtojnar
## common-updater-scripts
/pkgs/common-updater/scripts/update-source-version @jtojnar
# Python-related code and docs
/maintainers/scripts/update-python-libraries @FRidh
/pkgs/top-level/python-packages.nix @FRidh @jonringer
/pkgs/development/interpreters/python @FRidh
/pkgs/development/python-modules @FRidh @jonringer
/doc/languages-frameworks/python.section.md @FRidh
# Haskell
/pkgs/development/compilers/ghc @cdepillabout
/pkgs/development/haskell-modules @cdepillabout
/pkgs/development/haskell-modules/default.nix @cdepillabout
/pkgs/development/haskell-modules/generic-builder.nix @cdepillabout
/pkgs/development/haskell-modules/hoogle.nix @cdepillabout
# Perl
/pkgs/development/interpreters/perl @volth
/pkgs/top-level/perl-packages.nix @volth
/pkgs/development/perl-modules @volth
# R
/pkgs/applications/science/math/R @peti
/pkgs/development/r-modules @peti
# Ruby
/pkgs/development/interpreters/ruby @alyssais
/pkgs/development/ruby-modules @alyssais
# Rust
/pkgs/development/compilers/rust @Mic92 @LnL7
/pkgs/build-support/rust @andir
# Darwin-related
/pkgs/stdenv/darwin @NixOS/darwin-maintainers
/pkgs/os-specific/darwin @NixOS/darwin-maintainers
# C compilers
/pkgs/development/compilers/gcc @matthewbauer
/pkgs/development/compilers/llvm @matthewbauer
# Compatibility stuff
/pkgs/top-level/unix-tools.nix @matthewbauer
/pkgs/development/tools/xcbuild @matthewbauer
# Beam-related (Erlang, Elixir, LFE, etc)
/pkgs/development/beam-modules @gleber
/pkgs/development/interpreters/erlang @gleber
/pkgs/development/interpreters/lfe @gleber
/pkgs/development/interpreters/elixir @gleber
/pkgs/development/tools/build-managers/rebar @gleber
/pkgs/development/tools/build-managers/rebar3 @gleber
/pkgs/development/tools/erlang @gleber
# Jetbrains
/pkgs/applications/editors/jetbrains @edwtjo
# Eclipse
/pkgs/applications/editors/eclipse @rycee
# Licenses
/lib/licenses.nix @alyssais
# Qt / KDE
/pkgs/applications/kde @ttuegel
/pkgs/desktops/plasma-5 @ttuegel
/pkgs/development/libraries/kde-frameworks @ttuegel
/pkgs/development/libraries/qt-5 @ttuegel
# PostgreSQL and related stuff
/pkgs/servers/sql/postgresql @thoughtpolice
/nixos/modules/services/databases/postgresql.xml @thoughtpolice
/nixos/modules/services/databases/postgresql.nix @thoughtpolice
/nixos/tests/postgresql.nix @thoughtpolice
# Hardened profile & related modules
/nixos/modules/profiles/hardened.nix @joachifm
/nixos/modules/security/hidepid.nix @joachifm
/nixos/modules/security/lock-kernel-modules.nix @joachifm
/nixos/modules/security/misc.nix @joachifm
/nixos/tests/hardened.nix @joachifm
/pkgs/os-specific/linux/kernel/hardened-config.nix @joachifm
# Network Time Daemons
/pkgs/tools/networking/chrony @thoughtpolice
/pkgs/tools/networking/ntp @thoughtpolice
/pkgs/tools/networking/openntpd @thoughtpolice
/nixos/modules/services/networking/ntp @thoughtpolice
# Dhall
/pkgs/development/dhall-modules @Gabriel439 @Profpatsch
/pkgs/development/interpreters/dhall @Gabriel439 @Profpatsch
# Idris
/pkgs/development/idris-modules @Infinisil
# Bazel
/pkgs/development/tools/build-managers/bazel @mboes @Profpatsch
# NixOS modules for e-mail and dns services
/nixos/modules/services/mail/mailman.nix @peti
/nixos/modules/services/mail/postfix.nix @peti
/nixos/modules/services/networking/bind.nix @peti
/nixos/modules/services/mail/rspamd.nix @peti
# Emacs
/pkgs/applications/editors/emacs-modes @adisbladis
/pkgs/applications/editors/emacs @adisbladis
/pkgs/top-level/emacs-packages.nix @adisbladis
# VimPlugins
/pkgs/misc/vim-plugins @jonringer @softinio
# VsCode Extensions
/pkgs/misc/vscode-extensions @jonringer
# Prometheus exporter modules and tests
/nixos/modules/services/monitoring/prometheus/exporters.nix @WilliButz
/nixos/modules/services/monitoring/prometheus/exporters.xml @WilliButz
/nixos/tests/prometheus-exporters.nix @WilliButz
# PHP interpreter, packages, extensions, tests and documentation
/doc/languages-frameworks/php.section.md @NixOS/php
/nixos/tests/php @NixOS/php
/pkgs/build-support/build-pecl.nix @NixOS/php
/pkgs/development/interpreters/php @NixOS/php
/pkgs/top-level/php-packages.nix @NixOS/php
# Podman, CRI-O modules and related
/nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq
/nixos/modules/virtualisation/cri-o.nix @NixOS/podman @zowoq
/nixos/modules/virtualisation/podman.nix @NixOS/podman @zowoq
/nixos/tests/cri-o.nix @NixOS/podman @zowoq
/nixos/tests/podman.nix @NixOS/podman @zowoq
# Blockchains
/pkgs/applications/blockchains @mmahut
# Go
/pkgs/development/compilers/go @kalbasit @Mic92 @zowoq
/pkgs/development/go-modules @kalbasit @Mic92 @zowoq
/pkgs/development/go-packages @kalbasit @Mic92 @zowoq

63
.github/CONTRIBUTING.md vendored Normal file
View File

@@ -0,0 +1,63 @@
# 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)
* Make sure there is no open issue on the topic
* [Submit a new issue](https://github.com/NixOS/nixpkgs/issues/new/choose) by choosing the kind of topic and fill out the template
## Submitting changes
* Format the commit messages in the following way:
```
(pkg-name | nixos/<module>): (from -> to | init at version | refactor | etc)
(Motivation for change. Additional information.)
```
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).
Examples:
* nginx: init at 2.0.1
* firefox: 54.0.1 -> 55.0
* nixos/hydra: add bazBaz option
Dual baz behavior is needed to do foo.
* nixos/nginx: refactor config generation
The old config generation system used impure shell scripts and could break in specific circumstances (see #1234).
* `meta.description` should:
* Be capitalized.
* Not start with the package name.
* Not have a period at the end.
* `meta.license` must be set and fit the upstream license.
* If there is no upstream license, `meta.license` should default to `stdenv.lib.licenses.unfree`.
* `meta.maintainers` must be set.
See the nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes) and on how to [submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes).
## Writing good commit messages
In addition to writing properly formatted commit messages, it's important to include relevant information so other developers can later understand *why* a change was made. While this information usually can be found by digging code, mailing list/Discourse archives, pull request discussions or upstream changes, it may require a lot of work.
For package version upgrades and such a one-line commit message is usually sufficient.
## Backporting changes
Follow these steps to backport a change into a release branch in compliance with the [commit policy](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches).
1. Take note of the commits in which the change was introduced into `master` branch.
2. Check out the target _release branch_, e.g. `release-20.09`. Do not use a _channel branch_ like `nixos-20.09` or `nixpkgs-20.09`.
3. Create a branch for your change, e.g. `git checkout -b backport`.
4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe <original commit>` and add a reason. Otherwise use `git cherry-pick -x <original commit>`. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. Please also ensure the commits exists 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.
5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.09`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.09]`.
## Reviewing contributions
See the nixpkgs manual for more details on how to [Review contributions](https://nixos.org/nixpkgs/manual/#chap-reviewing-contributions).

11
.github/ISSUE_TEMPLATE.md vendored Normal file
View File

@@ -0,0 +1,11 @@
## Issue description
### Steps to reproduce
## Technical details
Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result.

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."

43
.github/ISSUE_TEMPLATE/bug_report.md vendored Normal file
View File

@@ -0,0 +1,43 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: '0.kind: bug'
assignees: ''
---
**Describe the bug**
A clear and concise description of what the bug is.
**To Reproduce**
Steps to reproduce the behavior:
1. ...
2. ...
3. ...
**Expected behavior**
A clear and concise description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.
**Additional context**
Add any other context about the problem here.
**Notify maintainers**
<!--
Please @ people who are in the `meta.maintainers` list of the offending package or module.
If in doubt, check `git blame` for whoever last touched something.
-->
**Metadata**
Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result.
Maintainer information:
```yaml
# a list of nixpkgs attributes affected by the problem
attribute:
# a list of nixos modules affected by the problem
module:
```

View File

@@ -0,0 +1,18 @@
---
name: Packaging requests
about: For packages that are missing
title: ''
labels: '0.kind: packaging request'
assignees: ''
---
**Project description**
_describe the project a little_
**Metadata**
* homepage URL:
* source URL:
* license: mit, bsd, gpl2+ , ...
* platforms: unix, linux, darwin, ...

View File

@@ -1,42 +1,28 @@
<!--
^ 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.
To help with the large amounts of pull requests, we would appreciate your
reviews of other pull requests, especially simple package updates. Just leave a
comment describing what you have tested in the relevant package/service.
Reviewing helps to reduce the average time-to-merge for everyone.
Thanks a lot if you do!
List of open PRs: https://github.com/NixOS/nixpkgs/pulls
Reviewing guidelines: https://hydra.nixos.org/job/nixpkgs/trunk/manual/latest/download/1/nixpkgs/manual.html#chap-reviewing-contributions
-->
## Things done
###### Motivation for this change
###### Things done
<!-- Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. -->
- Built on platform:
- [ ] x86_64-linux
- [ ] aarch64-linux
- [ ] x86_64-darwin
- [ ] aarch64-darwin
- Tested, as applicable:
- [ ] [NixOS tests] in [nixos/tests].
- [ ] [Package tests] at `passthru.tests`.
- [ ] Tests in [lib/tests] or [pkgs/test] for functions and "core" functionality.
- [ ] Ran `nixpkgs-review` on this PR. See [nixpkgs-review usage].
- [ ] Tested basic functionality of all binary files, usually in `./result/bin/`.
- Nixpkgs Release Notes
- [ ] Package update: when the change is major or breaking.
- NixOS Release Notes
- [ ] Module addition: when adding a new NixOS module.
- [ ] Module update: when the change is significant.
- [ ] Fits [CONTRIBUTING.md], [pkgs/README.md], [maintainers/README.md] and other READMEs.
- [ ] 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
- [ ] Tested using sandboxing ([nix.useSandbox](https://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](https://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux)
- Built on platform(s)
- [ ] NixOS
- [ ] macOS
- [ ] other Linux distributions
- [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review wip"`
- [ ] Tested execution of all binary files (usually in `./result/bin/`)
- [ ] Determined the impact on package closure size (by running `nix path-info -S` before and after)
- [ ] Ensured that relevant documentation is up to date
- [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

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

41
.github/stale.yml vendored Normal file
View File

@@ -0,0 +1,41 @@
# Configuration for probot-stale - https://github.com/probot/stale
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 180
# Number of days of inactivity before a stale issue is closed
daysUntilClose: false
# Issues with these labels will never be considered stale
exemptLabels:
- "1.severity: security"
# Label to use when marking an issue as stale
staleLabel: "2.status: stale"
# Comment to post when marking an issue as stale. Set to `false` to disable
pulls:
markComment: |
Hello, I'm a bot and I thank you in the name of the community for your contributions.
Nixpkgs is a busy repository, and unfortunately sometimes PRs get left behind for too long. Nevertheless, we'd like to help committers reach the PRs that are still important. This PR has had no activity for 180 days, and so I marked it as stale, but you can rest assured it will never be closed by a non-human.
If this is still important to you and you'd like to remove the stale label, we ask that you leave a comment. Your comment can be as simple as "still important to me". But there's a bit more you can do:
If you received an approval by an unprivileged maintainer and you are just waiting for a merge, you can @ mention someone with merge permissions and ask them to help. You might be able to find someone relevant by using [Git blame](https://git-scm.com/docs/git-blame) on the relevant files, or via [GitHub's web interface](https://docs.github.com/en/github/managing-files-in-a-repository/tracking-changes-in-a-file). You can see if someone's a member of the [nixpkgs-committers](https://github.com/orgs/NixOS/teams/nixpkgs-committers) team, by hovering with the mouse over their username on the web interface, or by searching them directly on [the list](https://github.com/orgs/NixOS/teams/nixpkgs-committers).
If your PR wasn't reviewed at all, it might help to find someone who's perhaps a user of the package or module you are changing, or alternatively, ask once more for a review by the maintainer of the package/module this is about. If you don't know any, you can use [Git blame](https://git-scm.com/docs/git-blame) on the relevant files, or [GitHub's web interface](https://docs.github.com/en/github/managing-files-in-a-repository/tracking-changes-in-a-file) to find someone who touched the relevant files in the past.
If your PR has had reviews and nevertheless got stale, make sure you've responded to all of the reviewer's requests / questions. Usually when PR authors show responsibility and dedication, reviewers (privileged or not) show dedication as well. If you've pushed a change, it's possible the reviewer wasn't notified about your push via email, so you can always [officially request them for a review](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review), or just @ mention them and say you've addressed their comments.
Lastly, you can always ask for help at [our Discourse Forum](https://discourse.nixos.org/), or more specifically, [at this thread](https://discourse.nixos.org/t/prs-in-distress/3604) or at [#nixos' IRC channel](https://webchat.freenode.net/#nixos).
issues:
markComment: |
Hello, I'm a bot and I thank you in the name of the community for opening this issue.
To help our human contributors focus on the most-relevant reports, I check up on old issues to see if they're still relevant. This issue has had no activity for 180 days, and so I marked it as stale, but you can rest assured it will never be closed by a non-human.
The community would appreciate your effort in checking if the issue is still valid. If it isn't, please close it.
If the issue persists, and you'd like to remove the stale label, you simply need to leave a comment. Your comment can be as simple as "still important to me". If you'd like it to get more attention, you can ask for help by searching for maintainers and people that previously touched related code and @ mention them in a comment. You can use [Git blame](https://git-scm.com/docs/git-blame) or [GitHub's web interface](https://docs.github.com/en/github/managing-files-in-a-repository/tracking-changes-in-a-file) on the relevant files to find them.
Lastly, you can always ask for help at [our Discourse Forum](https://discourse.nixos.org/) or at [#nixos' IRC channel](https://webchat.freenode.net/#nixos).
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false

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,
})

21
.github/workflows/pending-clear.yml vendored Normal file
View File

@@ -0,0 +1,21 @@
name: "clear pending status"
on:
check_suite:
types: [ completed ]
jobs:
action:
runs-on: ubuntu-latest
steps:
- name: clear pending status
if: github.repository_owner == 'NixOS' && github.event.check_suite.app.name == 'OfBorg'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
curl \
-X POST \
-H "Accept: application/vnd.github.v3+json" \
-H "Authorization: token $GITHUB_TOKEN" \
-d '{"state": "success", "target_url": " ", "description": " ", "context": "Wait for ofborg"}' \
"https://api.github.com/repos/NixOS/nixpkgs/statuses/${{ github.event.check_suite.head_sha }}"

20
.github/workflows/pending-set.yml vendored Normal file
View File

@@ -0,0 +1,20 @@
name: "set pending status"
on:
pull_request_target:
jobs:
action:
runs-on: ubuntu-latest
steps:
- name: set pending status
if: github.repository_owner == 'NixOS'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
curl \
-X POST \
-H "Accept: application/vnd.github.v3+json" \
-H "Authorization: token $GITHUB_TOKEN" \
-d '{"state": "failure", "target_url": " ", "description": "This failed status will be cleared when ofborg finishes eval.", "context": "Wait for ofborg"}' \
"https://api.github.com/repos/NixOS/nixpkgs/statuses/${{ github.event.pull_request.head.sha }}"

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

22
.gitignore vendored
View File

@@ -2,26 +2,13 @@
,*
.*.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
@@ -33,10 +20,3 @@ __pycache__
# 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/

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>

View File

@@ -1 +0,0 @@
lib/.version

1
.version Normal file
View File

@@ -0,0 +1 @@
20.09

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/).

View File

@@ -1,4 +1,4 @@
Copyright (c) 2003-2026 Eelco Dolstra and the Nixpkgs/NixOS contributors
Copyright (c) 2003-2020 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

View File

@@ -1,20 +1,16 @@
<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>
<a href="https://nixos.org/nixos"><img src="https://nixos.org/logo/nixos-hires.png" width="500px" alt="NixOS logo" /></a>
</p>
<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>
<a href="https://www.codetriage.com/nixos/nixpkgs"><img src="https://www.codetriage.com/nixos/nixpkgs/badges/users.svg" alt="Code Triagers badge" /></a>
<a href="https://opencollective.com/nixos"><img src="https://opencollective.com/nixos/tiers/supporter/badge.svg?label=Supporter&color=brightgreen" alt="Open Collective supporters" /></a>
</p>
[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](https://github.com/nixos/nixpkgs) is a collection of over
40,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.
# Manuals
@@ -25,14 +21,16 @@ It also implements [NixOS](https://nixos.org/nixos/), a purely-functional Linux
# Community
* [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.)
* [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos)
* [NixOS Weekly](https://weekly.nixos.org/)
* [Community-maintained wiki](https://nixos.wiki/)
* [Community-maintained list of ways to get in touch](https://nixos.wiki/wiki/Get_In_Touch#Chat) (Discord, Matrix, Telegram, other IRC channels, etc.)
# Other Project Repositories
The sources of all official Nix-related projects are in the [NixOS organization on GitHub](https://github.com/NixOS/).
Here are some of the main ones:
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
@@ -40,37 +38,66 @@ Here are some of the main ones:
* [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
* [NixOS Artwork](https://github.com/NixOS/nixos-artwork) - NixOS artwork
# Continuous Integration and Distribution
Nixpkgs and NixOS are built and tested by our continuous integration system, [Hydra](https://hydra.nixos.org/).
Nixpkgs and NixOS are built and tested by our continuous integration
system, [Hydra](https://hydra.nixos.org/).
* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
* [Continuous package builds for the NixOS 26.05 release](https://hydra.nixos.org/jobset/nixos/release-26.05)
* [Continuous package builds for the NixOS 20.09 release](https://hydra.nixos.org/jobset/nixos/release-20.09)
* [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 the NixOS 20.09 release](https://hydra.nixos.org/job/nixos/release-20.09/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).
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://nixos.org/nix/manual/#sec-channels).
# 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.
Nixpkgs is among the most active projects on GitHub. While thousands
of open issues and pull requests might seem a lot at first, it helps
consider it in the context of the scope of the project. Nixpkgs
describes how to build over 40,000 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.
Community contributions are always welcome through GitHub Issues and
Pull Requests. When pull requests are made, our tooling automation bot,
[OfBorg](https://github.com/NixOS/ofborg) will perform various checks
to help ensure expression quality.
For more information about contributing to the project, please visit the [contributing page](CONTRIBUTING.md).
The *Nixpkgs maintainers* are people who have assigned themselves to
maintain specific individual packages. We encourage people who care
about a package to assign themselves as a maintainer. When a pull
request is made against a package, OfBorg will notify the appropriate
maintainer(s). The *Nixpkgs committers* are people who have been given
permission to merge.
Most contributions are based on and merged into these branches:
* `master` is the main branch where all small contributions go
* `staging` is branched from master, changes that have a big impact on
Hydra builds go to this branch
* `staging-next` is branched from staging and only fixes to stabilize
and security fixes with a big impact on Hydra builds should be
contributed to this branch. This branch is merged into master when
deemed of sufficiently high quality
For more information about contributing to the project, please visit
the [contributing page](https://github.com/NixOS/nixpkgs/blob/master/.github/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.
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:
You can donate to the NixOS foundation by using Open Collective:
<a href="https://opencollective.com/nixos#support"><img src="https://opencollective.com/nixos/tiers/supporter.svg?width=890" /></a>
@@ -78,7 +105,9 @@ You can donate to the NixOS Foundation through [SEPA bank transfers](https://nix
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.
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.

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

Some files were not shown because too many files have changed in this diff Show More