summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* libaom: disable NEON on armv7l•••(cherry picked from commit b7066a57deb8bb3f13ab7f2ef5e389c0559edac0) origin/backport-136079-to-release-21.05Kranium Gikos Mendoza2021-09-261-0/+4
* nvidia_x11: 470.57.02 → 470.63.01•••(cherry picked from commit ff0dfaaee0975cc0deb118f51120e281eccc6497) Required since the kernel upgrade on 21.05, compilation for the driver fails on 5.14. See [this comment][https://github.com/NixOS/nixpkgs/issues/132840#issuecomment-920847065] for more details. Fabián Heredia Montiel2021-09-261-4/+4
* Merge pull request #139495 from NixOS/backport-139485-to-release-21.05•••[Backport release-21.05] libnatpmp: make files in $out/lib executableArtturi2021-09-261-0/+4
|\
| * libnatpmp: make files in $out/lib executable•••Fixes https://github.com/NixOS/nixpkgs/issues/139197 (cherry picked from commit be3bc77e3175f055e634ca1375d7cbdb60facfad) Artturin2021-09-261-0/+4
|/
* Merge pull request #139440 from NixOS/backport-139401-to-release-21.05•••[Backport release-21.05] perlPackages.ConvertASN1: 0.27 -> 0.33Robert Scott2021-09-251-3/+3
|\
| * perlPackages.ConvertASN1: 0.27 -> 0.33•••Fixes CVE-2013-7488. https://metacpan.org/dist/Convert-ASN1/changes (cherry picked from commit ccb5c2285b2f8110ae469ac23e2cad63f761ed95) Thomas Gerbet2021-09-251-3/+3
* | Merge pull request #139446 from NixOS/backport-138623-to-release-21.05Maciej Krüger2021-09-251-3/+3
|\ \
| * | nixUnstable: 2.4pre20210908_3c56f62 -> 2.4pre20210922_bcd73eb•••Changes: https://github.com/nixos/nix/compare/3c56f62...bcd73eb I figured that now with an actual 2.4 release around the corner[1] we could bump it a bit more often considering that it seems to contain mostly bugfixes, so that upstream receives a bit more feedback. [1] https://discourse.nixos.org/t/tweag-nix-dev-update-17/15037 (cherry picked from commit 615d368aa000279f1c63d9c5521859181b5fbfe3) Maximilian Bosch2021-09-251-3/+3
* | | Merge pull request #139417 from sersorrel/backport-playerctl-v2.4.1•••[21.05] playerctl: 2.3.1 -> 2.4.1figsoda2021-09-251-2/+2
|\ \ \ | |/ / |/| |
| * | playerctl: 2.3.1 -> 2.4.1•••(cherry picked from commit b01290e0ecef1b2a57760fdd0facf0f0f48610ae) Reason: fixes a crash with TrackList and Playlists interfaces [1] [1]: https://github.com/altdesktop/playerctl/pull/215 R. RyanTM2021-09-251-2/+2
* | | Merge pull request #139423 from NixOS/backport-139336-to-release-21.05•••[Backport release-21.05] nix-output-monitor: 1.0.3.2 -> 1.0.3.3maralorn2021-09-251-2/+2
|\ \ \
| * | | nix-output-monitor: 1.0.3.2 -> 1.0.3.3•••(cherry picked from commit f779a0ff03497e83dab5b04182c13cd2ef347274) Malte Brandy2021-09-251-2/+2
| | |/ | |/|
* | | Merge pull request #139405 from eduarrrd/backport•••[21.05] psi-notify: init at 1.2.1figsoda2021-09-252-0/+41
|\ \ \ | |/ / |/| |
| * | psi-notify: init at 1.2.1•••(cherry picked from commit 37ec684a5c010aa7cf51abaf29691ef2333d6625) Eduard Bachmakov2021-09-252-0/+41
* | | Merge pull request #139340 from NixOS/backport-138250-to-release-21.05•••[Backport release-21.05] nix-output-monitor: 1.0.3.1 -> 1.0.3.2maralorn2021-09-251-2/+2
|\ \ \ | |_|/ |/| |
| * | nix-output-monitor: 1.0.3.1 -> 1.0.3.2•••(cherry picked from commit a96fe065eee37d61972386b96d1573102b12b4a2) Malte Brandy2021-09-241-2/+2
* | | Merge pull request #139329 from NixOS/backport-139318-to-release-21.05•••[Backport release-21.05] chromium: 94.0.4606.54 -> 94.0.4606.61Michael Weiss2021-09-251-3/+3
|\ \ \ | |_|/ |/| |
| * | chromium: 94.0.4606.54 -> 94.0.4606.61•••(cherry picked from commit 15bb3ac5a92552e1264bb457084eea72b263e179) Michael Weiss2021-09-241-3/+3
| |/
* | Merge pull request #139358 from primeos/ungoogled-chromium-backport•••[21.05] ungoogled-chromium: 93.0.4577.82 -> 94.0.4606.54Michael Weiss2021-09-255-47/+14
|\ \
| * | ungoogled-chromium: name -> pname•••A partial backport of e4e631ebb81 to keep the diff minimal. Michael Weiss2021-09-251-1/+1
| * | ungoogled-chromium: 93.0.4577.82 -> 94.0.4606.54•••(cherry picked from commit afaf8d094b98f8099cf29d789d33b122af6ad1ca) Michael Weiss2021-09-254-43/+10
| * | chromiumBeta: 94.0.4606.54 -> 95.0.4638.17•••(cherry picked from commit b9468515932d827651838700969fc6b415590af0) Michael Weiss2021-09-251-3/+3
|/ /
* / zerotierone: 1.6.5 -> 1.6.6•••(cherry picked from commit 62207eec010d76e69b1ba75eb7f72af0c223a9c8) Daniel Fullmer2021-09-241-2/+2
|/
* Merge pull request #139203 from NixOS/backport-138852-to-release-21.05•••[Backport release-21.05] nixos/discourse: add discourse.admin.skipCreate optionKim Lindberger2021-09-241-6/+20
|\
| * nixos/discourse: add discourse.admin.skipCreate option•••(cherry picked from commit 6a9003f31682e57a2a630f5cfdefa2969a64b1b1) Ryan Mulligan2021-09-231-6/+20
* | Merge pull request #139220 from primeos/chromium-backport•••[21.05] chromium: 93.0.4577.82 -> 94.0.4606.54Michael Weiss2021-09-241-15/+15
|\ \
| * | chromium: 93.0.4577.82 -> 94.0.4606.54•••https://chromereleases.googleblog.com/2021/09/stable-channel-update-for-desktop_21.html This update includes 19 security fixes. CVEs: CVE-2021-37956 CVE-2021-37957 CVE-2021-37958 CVE-2021-37959 CVE-2021-37960 CVE-2021-37961 CVE-2021-37962 CVE-2021-37963 CVE-2021-37964 CVE-2021-37965 CVE-2021-37966 CVE-2021-37967 CVE-2021-37968 CVE-2021-37969 CVE-2021-37970 CVE-2021-37971 CVE-2021-37972 (cherry picked from commit 8d8b451f725b63edec06b033ff2bdaa2f0885b4e) Michael Weiss2021-09-231-9/+9
| * | chromiumDev: 95.0.4638.10 -> 95.0.4638.17•••(cherry picked from commit 56d99a735113e48d2ea51084804c5a59c5603a5f) Michael Weiss2021-09-231-3/+3
| * | chromiumBeta: 94.0.4606.50 -> 94.0.4606.54•••(cherry picked from commit 7af2448b6cc227ea85f6076e5b8ee0f517c66d42) Michael Weiss2021-09-231-3/+3
|/ /
* / imagemagick: 7.1.0-6 -> 7.1.0-8•••(cherry picked from commit 279bff87fe97e998e959b7121b48bb0642ff053f) Kerstin Humm2021-09-231-2/+2
|/
* Merge pull request #139190 from adisbladis/2105-poetry2nix-1_20_0•••poetry2nix: 1.16.1 -> 1.20.0 (21.05)adisbladis2021-09-2315-246/+951
|\
| * poetry2nix: 1.16.1 -> 1.20.0adisbladis2021-09-2315-246/+951
|/
* Merge pull request #139098 from taku0/thunderbird-bin-91.1.1_release-21.05•••[21.05] thunderbird, thunderbird-bin: 91.1.0 -> 91.1.1 Bernardo Meurer2021-09-234-305/+263
|\
| * thunderbird: 91.1.0 -> 91.1.1•••no-buildconfig-90.patch is applied by firefox/common.nix. D124361.diff is incorporated into the upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1727113 taku02021-09-233-44/+2
| * thunderbird-bin: 91.1.0 -> 91.1.1taku02021-09-231-261/+261
* | discord: 0.0.15 → 0.0.16•••(cherry picked from commit a22f2688941dd02a69cc422ba349e80030cd474f) Moritz Hedtke2021-09-221-3/+2
|/
* Merge pull request #139055 from obsidiansystems/dn-backport-21.05-add-ghcjs•••[backport release-21.05] ghcjs 8.10.7: initJohn Ericson2021-09-2219-327/+392
|\
| * Remove old ghcjs files•••(cherry picked from commit 0918598005195303347d675a75f6ea8540ca806a) Divam2021-09-238-411/+0
| * ghcjs: init at 8.10.7•••The src points to the obsidiansystems repo as it has the ghcjs ported from 8.10.5 to 8.10.7, and a bunch of other fixes (#812, #811, #809) (cherry picked from commit ba25b274f4bb0240a8ffa71e41b55712930af3d8) Modified the stm_2_5_0_1 -> stm_2_5_0_0 Divam2021-09-2310-0/+459
| * haskellPackages.happy_1_19_12: init at 1.19.12•••(generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh) (cherry picked from commit be7c76ae6419a00c7f76429afb7ff4591dee60ad) Divam2021-09-232-0/+17
| * haskellPackages.ghcjs-base: 0.2.0.0 -> 0.2.0.3•••(cherry picked from commit c8b255cf25574808d81cc2a3b6195cc9592956eb) Divam2021-09-231-3/+3
|/
* Merge pull request #139037 from obsidiansystems/ghc-8_10_7-21.05•••[backport release-21.05] ghc 8.10.7: initJohn Ericson2021-09-226-3/+396
|\
| * ghc: add the Cabal ghcjs support patch•••(cherry picked from commit feac31b1f05bf8be4681b461987f26a37a47c60f) Divam2021-09-231-0/+9
| * ghc8.10.7: fix mingw build•••(cherry picked from commit eea8e3eacec12fe4e46d3ecb8e3cbbd03a10b2f0) Alexandre Esteves2021-09-231-1/+14
| * ghc: 8.10.6 -> 8.10.7•••https://www.haskell.org/ghc/download_ghc_8_10_7.html (cherry picked from commit 9eca744cc0484e417deb260076241efb0a6c159d) sternenseemann2021-09-234-10/+10
| * ghc 8.10.6: Init•••Backport which adds, rather than updates, the GHC release. ---- The only big change is required for darwin since GHC 8.10.5 now runs xattr in the install phase on darwin: * https://gitlab.haskell.org/ghc/ghc/-/commit/11e1dcde0d3137a8ee5cd32697b2925ea4e84b95 * https://gitlab.haskell.org/ghc/ghc/-/commit/ec451cac39de919621c783fec809c26fb9f0d1c8 Unfortunately, it uses the host /usr/bin/xattr by default which is present in the build due to a lack of sandboxing on darwin. That xattr version however still requires Python 2.7 whereas Python 3.8 is in PATH in our build. We solve this by setting the XATTR environment variable. We can't use python3Packages.xattr since GHC expects Apple's fork of xattr which provides some extra flags to utilize. Co-authored-by: Cheng Shao <cheng.shao@tweag.io> (Adapted from cb330ce4f05f5a6e2da3021e9cbf4ea2eb592631) sternenseemann2021-09-234-3/+299
| * darwin.xattr: init at 61.60.1•••(cherry picked from commit 283d622397539f196416657da9dc804a4ca89846) sternenseemann2021-09-232-0/+75
|/
* Merge pull request #137369 from NixOS/backport-134007-to-release-21.05•••[Backport release-21.05] fragments: init at 1.5Robert Scott2021-09-226-1/+168
|\
| * fragments: init at 1.5•••(cherry picked from commit 1a7238dd323483d3929865bea8c6223ae7cad484) origin/backport-134007-to-release-21.05Angus Trau2021-09-113-0/+105
| * transmission: fix missing optional dependencies•••(cherry picked from commit 37134b6072dd01e55f12a8c3a501f7969398a808) Angus Trau2021-09-111-1/+11