summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* python39Packages.manticore: mark as broken on darwin•••(cherry picked from commit 36ea50ffe5e9882185874823405882157c45b5e8) origin/backport-174143-to-release-22.05Fabian Affolter2022-05-241-0/+2
* python39Packages.manticore: relax crytic-compile constraint•••(cherry picked from commit fd044175314798d06d142089cd98c6d32e5d35d2) Fabian Affolter2022-05-241-3/+5
* Merge pull request #174240 from NixOS/backport-174129-to-release-22.05•••[Backport release-22.05] adtool: mark brokenThiago Kenji Okada2022-05-241-0/+1
|\
| * adtool: mark broken•••Broke when updating OpenLDAP>2.5 and has not seen a change since 2017, which is at this point 5y in the past. I think it's safe to say that this tool deserves to being marked broken. (cherry picked from commit d2fa18e744522f9823fde46ee9f9548de71bf231) Martin Weinelt2022-05-241-0/+1
|/
* Merge pull request #174231 from NixOS/backport-174224-to-release-22.05Wael Nasreddine2022-05-235-1235/+509
|\
| * onlykey: 5.3.3 -> 5.3.4•••(cherry picked from commit 0094dccde866df787d16ddd4b53d83e3978ee694) Wael M. Nasreddine2022-05-243-1228/+490
| * onlykey-agent: 1.1.11 -> 1.1.13•••(cherry picked from commit 9ba84fb7f78b342888bcc7d8f155cce842f3388b) Wael M. Nasreddine2022-05-241-5/+17
| * onlykey-cli: 1.2.5 -> 1.2.9•••(cherry picked from commit ca32037807fb686859938ef01c1d31f596ab27ea) Wael M. Nasreddine2022-05-241-2/+2
* | Merge pull request #174234 from NixOS/backport-174217-to-release-22.05•••[Backport release-22.05] pantheon.elementary-mail: 6.4.0 -> 7.0.0Bobby Rong2022-05-241-16/+4
|\ \ | |/ |/|
| * pantheon.elementary-mail: 6.4.0 -> 7.0.0•••(cherry picked from commit 7e72954cad8010abc743a44b72a969a36f5bf3c4) Bobby Rong2022-05-241-16/+4
|/
* Merge pull request #174216 from NixOS/backport-174112-to-release-22.05•••[Backport release-22.05] pantheon-tweaks: 1.0.3 -> 1.0.4Bobby Rong2022-05-241-2/+2
|\
| * pantheon-tweaks: 1.0.3 -> 1.0.4•••(cherry picked from commit f60bb297340f473b25e8613ace6660f0d26d6912) Bobby Rong2022-05-241-2/+2
|/
* Merge pull request #174196 from NixOS/backport-174084-to-release-22.05•••[Backport release-22.05] python3Packages.aspy-refactor-imports: fix url and darwin test failureRobert Scott2022-05-231-1/+5
|\
| * python3Packages.aspy-refactor-imports: fix url and darwin test failure•••Signed-off-by: Florian Brandes <florian.brandes@posteo.de> (cherry picked from commit 2f4da397f07581a7e13cc0b6ddc363e1a4fddc9c) Florian Brandes2022-05-231-1/+5
* | Merge pull request #174188 from NixOS/backport-174182-to-release-22.05•••[Backport release-22.05] wallabag: 2.4.3 -> 2.5.0Martin Weinelt2022-05-241-2/+3
|\ \ | |/ |/|
| * wallabag: 2.4.3 -> 2.5.0•••https://github.com/wallabag/wallabag/releases/tag/2.5.0 (cherry picked from commit da56374a496b8a77ff7425030f2005fdddae26a3) Martin Weinelt2022-05-231-2/+3
* | Merge pull request #174191 from NixOS/backport-174148-to-release-22.05•••[Backport release-22.05] s3bro: remove use_2to3Robert Scott2022-05-231-6/+23
|\ \ | |/ |/|
| * s3bro: remove use_2to3•••(cherry picked from commit aa608e458c7f9eac3a9fdf7c546a7cf82fc4ffd3) Fabian Affolter2022-05-231-6/+23
|/
* 22.05 beta release22.05-betaJanne Heß2022-05-232-2/+2
* workflows: Replace 21.05 with 22.05Janne Heß2022-05-231-4/+4
* Merge remote-tracking branch 'origin/staging-next'•••* origin/staging-next: (62 commits) Re-Revert "lua: fix on darwin by using makeBinaryWrapper (#172749)" openldap: fix cross-compilation makeBinaryWrapper: fix codesign on aarch64-darwin python3Packages.ldap: fix linking with openldap 2.5+ Revert "lua: fix on darwin by using makeBinaryWrapper (#172749)" wine: enable parallel build again pkgsi686Linux.gdb: fix formatting for 32-bit systems gtk4: Fix incorrect merge nixos/openldap: use upstream unit defaults openldap: update maintainers openldap: 2.4.58 -> 2.6.2 Revert "Add mingwW64-llvm cross-system." lua: fix on darwin by using makeBinaryWrapper (#172749) python310Packages.python-mimeparse: execute tests pandas: fix darwin build gtk3: 3.24.33 -> 3.24.33-2022-03-11 gtk4: patch fixing g-c-c crashes e2fsprogs: patch for CVE-2022-1304 firefox-unwrapped: fix cross compilation rustc: expose correct llvmPackages for cross compile ... Janne Heß2022-05-2349-288/+578
|\
| * Merge master into staging-nextgithub-actions[bot]2022-05-2325-45/+581
| |\
| * \ Merge pull request #174049 from Mindavi/openldap/cross•••openldap: fix cross-compilationJanne Heß2022-05-231-0/+3
| |\ \
| | * | openldap: fix cross-compilationRick van Schijndel2022-05-231-0/+3
| * | | Re-Revert "lua: fix on darwin by using makeBinaryWrapper (#172749)"•••This reverts commit 9f4060c55289472edcd6a47b92cb3dc98380cbd8. After the previous merge commit this should work now. Vladimír Čunát2022-05-233-2/+6
| * | | Merge #174038: makeBinaryWrapper: fix codesign on aarch64-darwin•••...into staging-next Vladimír Čunát2022-05-231-2/+1
| |\ \ \
| | * | | makeBinaryWrapper: fix codesign on aarch64-darwin•••Reverts 8b79ef2c on aarch64-darwin, no-op on other platforms. Naïm Favier2022-05-221-2/+1
| | |/ /
| * | | Merge branch 'master' into staging-nextVladimír Čunát2022-05-2320-128/+167
| |\ \ \
| * \ \ \ Merge master into staging-nextgithub-actions[bot]2022-05-2375-197/+401
| |\ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge master into staging-nextgithub-actions[bot]2022-05-2251-1593/+1277
| |\ \ \ \
| * | | | | python3Packages.ldap: fix linking with openldap 2.5+Martin Weinelt2022-05-222-0/+98
| * | | | | Revert "lua: fix on darwin by using makeBinaryWrapper (#172749)"•••This reverts commit 92f4c6ed823ce10c484daa6582a908c5ae9ad61b. On aarch64-darwin this completely broke lua instead of improving it; let's revert at least until that's resolved. https://github.com/NixOS/nixpkgs/pull/172749#issuecomment-1133759233 Vladimír Čunát2022-05-223-6/+2
| * | | | | Merge #173981: wine: enable parallel build again•••...into staging-next Vladimír Čunát2022-05-221-3/+1
| |\ \ \ \ \
| | * | | | | wine: enable parallel build again•••The issue with dlltool was fixed in 4b0f59afccb060fd7bfd9b107a21bd8a0fdac775. Stefan Frijters2022-05-221-3/+1
| * | | | | | Merge master into staging-nextgithub-actions[bot]2022-05-2247-221/+429
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge master into staging-nextgithub-actions[bot]2022-05-2211-167/+47
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2022-05-2261-6561/+5485
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge #173844: gdb: fix formatting for 32-bit systems•••...into staging-next Vladimír Čunát2022-05-212-0/+72
| |\ \ \ \ \ \ \ \
| | * | | | | | | | pkgsi686Linux.gdb: fix formatting for 32-bit systems•••A few rare targets don't have clean format strings on 32-bit systems: https://github.com/NixOS/nixpkgs/pull/171216#issuecomment-1133541978 /build/gdb-12.1/_build/sim/../../sim/cris/sim-if.c:575:28: error: format '%lx' expects argument of type 'long unsigned int', but argument 4 has type 'bfd_size_type' {aka 'long long unsigned int'} [-Werror=format=] We pull in patch pending upstream inclusion. Sergei Trofimovich2022-05-212-0/+72
| * | | | | | | | | Merge master into staging-nextgithub-actions[bot]2022-05-2129-220/+259
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into staging-next•••Conflicts: - pkgs/applications/networking/browsers/firefox/common.nix between 318fae87c0b61eb2eabe6d96b5824cc6e282c513 and f6c57619358d51e71a5298503c84e1c1ce4f9f12. Jan Tojnar2022-05-21133-4790/+5830
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge master into staging-nextgithub-actions[bot]2022-05-2050-261/+1083
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2022-05-2072-1195/+1447
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge pull request #173668 from mweinelt/slapd-notify•••nixos/openldap: use upstream unit defaultsJanne Heß2022-05-201-3/+8
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | nixos/openldap: use upstream unit defaults•••OpenLDAP since version 2.5.4¹ supports sd_notify, so we should make use of it. Also updates the unit description and documentation with the values upstream provides. Starts slapd only after reaching `network-online.target`, which ensures binding to specific ip addresses is possible, since `network.target` only guarantees interfaces exist, but not that addressing is finished. [1] https://bugs.openldap.org/show_bug.cgi?id=8707 Martin Weinelt2022-05-191-3/+8
| * | | | | | | | | | | | | Merge master into staging-nextgithub-actions[bot]2022-05-2014-167/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2022-05-2033-134/+203
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | gtk4: Fix incorrect merge•••For some reason, https://github.com/NixOS/nixpkgs/commit/17a8a7deacaea8a5490ae2316d947982c86052c8 re-introduced the patch, even though it was removed in https://github.com/NixOS/nixpkgs/commit/ff29d2caa935a8e6216380dfcd7ee714fd8bd5bf. Jan Tojnar2022-05-191-10/+0
| * | | | | | | | | | | | | | | Merge master into staging-nextgithub-actions[bot]2022-05-1962-148/+579
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'staging' (older version) into staging-next•••The point is to bring in PR #173487 as intended by authors. Vladimír Čunát2022-05-1958-681/+85
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.52.0) at 2026-01-17 05:22:20 +0000