summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #148546 from NixOS/revert-147715-p/tested-keymapArtturi2021-12-241-1/+1
|\ \ \ \ \
| * | | | | Revert "nixosTests.keymap.qwertz: reduce platforms in `tested`"origin/revert-147715-p/tested-keymapArtturi2021-12-041-1/+1
* | | | | | Merge pull request #151088 from NixOS/backport-151063-to-release-21.11•••[Backport release-21.11] graylog: 3.3.15 -> 3.3.16Maximilian Bosch2021-12-241-2/+2
|\ \ \ \ \ \
| * | | | | | graylog: 3.3.15 -> 3.3.16•••Bump log4j 2 to 2.6.0. https://www.graylog.org/post/announcing-graylog-v3-3-16 (cherry picked from commit ea5bc4fe75cb6695d446c026a8dd3ec7e54b1f9f) origin/backport-151063-to-release-21.11Thomas Gerbet2021-12-171-2/+2
* | | | | | | coqPackages.mathcomp-word: init at 1.0•••(cherry picked from commit b6b1a7368abf0d6966da6bca4742e6349f831f6a) Vincent Laporte2021-12-242-0/+28
* | | | | | | Merge pull request #151999 from NixOS/backport-151988-to-release-21.11•••[Backport release-21.11] slurm: 21.08.4.1 -> 21.08.5.1markuskowa2021-12-241-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | slurm: 21.08.4.1 -> 21.08.5.1•••(cherry picked from commit eb543d3b026ba73054763a8f1f025ba0e9d65f27) R. Ryantm2021-12-241-2/+2
|/ / / / / /
* | | | | | Merge #151587: staging-next: 21.11 iteration 4Vladimír Čunát2021-12-2433-820/+187
|\ \ \ \ \ \
| * \ \ \ \ \ Merge release-21.11 into staging-next-21.11github-actions[bot]2021-12-2421-1693/+1853
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #151906 from NixOS/backport-151517-to-release-21.11•••[Backport release-21.11] firefox: use libvpx instead of libvpx_1_8Thiago Kenji Okada2021-12-231-2/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | firefox: use libvpx instead of libvpx_1_8•••(cherry picked from commit 038b313075aaf79da3afaedc44bc298cc5516119) Nick Cao2021-12-231-2/+2
|/ / / / / /
* | | | | | Merge pull request #151888 from NixOS/backport-151384-to-release-21.11•••[Backport release-21.11] firefox-unwrapped: 95.0.1 -> 95.0.2Thiago Kenji Okada2021-12-231-2/+2
|\ \ \ \ \ \
| * | | | | | firefox-unwrapped: 95.0.1 -> 95.0.2•••(cherry picked from commit a233df3bc97aebbbd95e20171549d321dc2b35a6) R. Ryantm2021-12-231-2/+2
* | | | | | | Merge pull request #151487 from NixOS/backport-151331-to-release-21.11•••[Backport release-21.11] hedgedoc: 1.9.0 -> 1.9.2Thiago Kenji Okada2021-12-233-1254/+1389
|\ \ \ \ \ \ \
| * | | | | | | hedgedoc: 1.9.0 -> 1.9.2•••ChangeLogs: * https://github.com/hedgedoc/hedgedoc/releases/tag/1.9.1 * https://github.com/hedgedoc/hedgedoc/releases/tag/1.9.2 (cherry picked from commit f5c724877ec4720013d4d1755af9a741259bec68) Maximilian Bosch2021-12-213-1254/+1389
* | | | | | | | Merge pull request #151486 from NixOS/backport-151317-to-release-21.11•••[Backport release-21.11] wiki-js: 2.5.219 -> 2.5.260Thiago Kenji Okada2021-12-231-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | wiki-js: 2.5.219 -> 2.5.260•••ChangeLogs: * https://github.com/Requarks/wiki/releases/tag/2.5.254 * https://github.com/Requarks/wiki/releases/tag/2.5.255 * https://github.com/Requarks/wiki/releases/tag/2.5.260 Closes #150400 (cherry picked from commit 8d3a362748ebc1c0d7daeb32c1929a5a93f943d9) Maximilian Bosch2021-12-211-2/+2
| |/ / / / / / /
* | | | | | | | Merge pull request #151485 from NixOS/backport-151322-to-release-21.11•••[Backport release-21.11] gotify-cli: 2.2.0 -> 2.2.1Thiago Kenji Okada2021-12-231-5/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | gotify-cli: 2.2.0 -> 2.2.1•••Changes: https://github.com/gotify/cli/compare/v2.2.0...v2.2.1 (cherry picked from commit eeea72560c312f7bfe234252c3ff960780367425) Maximilian Bosch2021-12-211-5/+3
| |/ / / / / / /
* | | | | | | | Merge pull request #151483 from NixOS/backport-151314-to-release-21.11•••[Backport release-21.11] grafana: 8.3.2 -> 8.3.3Thiago Kenji Okada2021-12-231-4/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | grafana: 8.3.2 -> 8.3.3•••ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.3.3 Note: I had to copy `defaults.ini` from the Git repo rather than from `srcStatic`. This is because the `srcStatic`-variant missed some config changes[1] which caused the test to fail like this: postgresql # [ 24.754735] grafana-start[900]: Failed to start grafana. error: section "tracing.opentelemetry.jaeger" does not exist postgresql # [ 24.756013] grafana-start[900]: section "tracing.opentelemetry.jaeger" does not exist postgresql # [ 24.762057] systemd[1]: grafana.service: Main process exited, code=exited, status=1/FAILURE postgresql # [ 24.765443] systemd[1]: grafana.service: Failed with result 'exit-code'. postgresql # [ 24.767419] systemd[1]: grafana.service: Consumed 1.598s CPU time, no IP traffic. [1] https://github.com/grafana/grafana/commit/d993b1241582b2ba93f323946a9e52e3a1e3ca9a#diff-0c326c4f02797b088fc566e64fbfe2162390f52f2fec1483ec3a413a7f11c910 (cherry picked from commit 8af12f8ebd6f7cf9a6a00fd97aa6373c18895fbc) Maximilian Bosch2021-12-211-4/+6
| |/ / / / / / /
* | | | | | | | Merge pull request #151735 from NixOS/backport-150922-to-release-21.11•••[Backport release-21.11] nixos/systemd: set TZDIR for PID 1Thiago Kenji Okada2021-12-232-0/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | nixos/systemd: set TZDIR for PID 1•••Fixes #105049 (cherry picked from commit 901d4f13a3e30b4f4634c721b5cde6fabcd5405c) Naïm Favier2021-12-222-0/+13
* | | | | | | | | Merge pull request #151718 from NixOS/backport-151276-to-release-21.11•••[Backport release-21.11] Update nixos-rebuild man page to reflect target-host changeThiago Kenji Okada2021-12-231-6/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update nixos-rebuild man page to reflect target-host change•••See: https://github.com/NixOS/nixpkgs/pull/126614 (cherry picked from commit 558375993e156c3c5034368f32ff9fd5c87f5604) rembo102021-12-221-6/+2
* | | | | | | | | | Merge pull request #151730 from NixOS/backport-151619-to-release-21.11•••[Backport release-21.11] webkitgtk: 2.34.1 -> 2.34.3Thiago Kenji Okada2021-12-231-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | webkitgtk: 2.34.2 -> 2.34.3•••(cherry picked from commit f6cd576e4504201140f0bf324418040d6bc825e5) Philipp2021-12-221-2/+2
| * | | | | | | | | | webkitgtk: 2.34.1 -> 2.34.2•••(cherry picked from commit e3ebd4e356f84e66d6547fd40de4424ce04603ba) R. Ryantm2021-12-221-2/+2
* | | | | | | | | | | Merge pull request #151756 from NixOS/backport-151426-to-release-21.11•••[Backport release-21.11] knot-dns: 3.1.4 -> 3.1.5Thiago Kenji Okada2021-12-231-4/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | knot-dns: make passthru.tests usable on non-Linux•••(cherry picked from commit b1c17320afa9e9d64be3380df8f7517aac277130) Vladimír Čunát2021-12-221-1/+2
| * | | | | | | | | | | knot-dns: add knot-resolver build into passthru.tests•••(cherry picked from commit c83103e77ce9ccb54246a5830c63e0d7d922907d) Vladimír Čunát2021-12-221-2/+5
| * | | | | | | | | | | knot-dns: 3.1.4 -> 3.1.5•••https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.1.5 (cherry picked from commit 0fe64c69291b82c50c78c60b85f5c56606703342) Vladimír Čunát2021-12-221-2/+2
* | | | | | | | | | | | Merge pull request #151789 from NixOS/backport-151689-to-release-21.11•••[Backport release-21.11] haskell.compiler.ghcjs: Don't use upstream `config.sub`Thiago Kenji Okada2021-12-231-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | haskell.compiler.ghcjs: Don't use upstream `config.sub`•••Before this change the `ghcjs` build fails with: ``` checking host system type... Invalid configuration `js-ghcjs': machine `js-unknown' not recognized configure: error: …/bin/bash …/configured-ghcjs-src/lib/boot/pkg/unix/config.sub js-ghcjs failed ``` This fails because the `updateAutotoolsGnuConfigScriptsHook` overrides the `config.sub` in the `unix` boot package to use the newer upstream version of `config.sub`, but the newer version is incompatible with the `js-ghcjs` host string used to configure the `unix` package. The fix is to undo the override, because the `config.sub` vendored within `ghc` supports the host string correctly. (cherry picked from commit 69125bc160be89bf5dabd4ef77498b02c6cc69e3) Gabriella Gonzalez2021-12-221-0/+5
* | | | | | | | | | | | | Merge pull request #151825 from NixOS/backport-151769-to-release-21.11•••[Backport release-21.11] signal-desktop: 5.26.0 -> 5.26.1Thiago Kenji Okada2021-12-231-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | signal-desktop: 5.26.0 -> 5.26.1•••(cherry picked from commit db68f29fa02157897cf1ac201399a94eba1a2759) R. Ryantm2021-12-221-2/+2
* | | | | | | | | | | | | | Merge pull request #151827 from NixOS/backport-149761-to-release-21.11•••[Backport release-21.11] emacsMacport: 8.2 -> 8.3Thiago Kenji Okada2021-12-231-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | emacsMacport: 8.2 -> 8.3•••(cherry picked from commit 24198ef746d82e890d2da911e867d6eb56c9414d) Atemu2021-12-221-2/+3
| * | | | | | | | | | | | | emacsMacport: don't explicitly unpack the tarballs as gzip•••tar's -z flag only works for gzip-compressed tarballs. When passed a tarball compressed with a different compressor (like xz), tar will fail to extract it. Since tar can auto-detect a compressed tarball and use the appropriate decompressor itself since forever, this is unecessary now. (cherry picked from commit a6f973b534ec3ecca53007fdc18b6db4e63f410b) Atemu2021-12-221-2/+2
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #151452 from NixOS/backport-151279-to-release-21.11•••[Backport release-21.11] firefox-bin: 95.0 -> 95.0.2Thiago Kenji Okada2021-12-231-393/+393
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | firefox-bin: 95.0.1 -> 95.0.2•••(cherry picked from commit cd2e8e29498d5ba910f28773773c76892be137fb) taku02021-12-201-393/+393
| * | | | | | | | | | | | | firefox-bin: 95.0 -> 95.0.1•••(cherry picked from commit 3ee12cf5287be7c50fb16e5428373cebf9eb9dd1) taku02021-12-201-393/+393
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | ocamlPackages.batteries: 3.3.0 → 3.4.0•••(cherry picked from commit 15d9d0372ee21180aa050be3a775fe848bef99e0) Vincent Laporte2021-12-231-6/+12
* | | | | | | | | | | | | Merge pull request #151793 from rnhmjoj/pr-mutt-backport•••[21.11] mutt: 2.1.3 -> 2.1.4Michele Guerini Rocco2021-12-231-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | mutt: 2.1.3 -> 2.1.4•••(cherry picked from commit de20b501f4f61b474c98cc8e16b8d5dbe138f89f) Sergei Trofimovich2021-12-221-2/+2
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #151859 from NixOS/backport-151852-to-release-21.11•••[Backport release-21.11] hydrus: 466 -> 467Bobby Rong2021-12-231-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | hydrus: 466 -> 467•••(cherry picked from commit d41201d708f38c0e15d2bff7cd2f36e4c0744bf1) Daniel Olsen2021-12-231-2/+2
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #151854 from NixOS/backport-149407-to-release-21.11•••[Backport release-21.11] swift: Fix test failure during buildBobby Rong2021-12-231-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use lib.makeLibraryPath•••(cherry picked from commit 9ce1ca6400c1c756b6b3893e5b304e1ab4f3eca6) Connor Brewster2021-12-231-3/+3
| * | | | | | | | | | | | | swift: Fix libuuid path in LIBRARY_PATH that was causing a test failure•••(cherry picked from commit 7ff4e9a588255949889c4382b2e57ec090c824e7) Connor Brewster2021-12-231-3/+3
|/ / / / / / / / / / / / /