Commit Graph

11659 Commits

Author SHA1 Message Date
R. Ryantm
1b6022e263 boron: 2.0.8 -> 2.1.0 2024-04-29 06:20:14 +00:00
Jan Tojnar
1b2ebb8fbb Merge branch 'master' into staging-next 2024-04-28 17:33:27 +02:00
Frederik Rietdijk
5772ac5a75 Removing FRidh as active maintainer of packages
In the past I was very active with Python packaging.
For several years now I was hardly around as maintainer,
so it does not make sense I am listed as a maintainer for
these makes. Looking back, I should have removed myself
as maintainer already much longer ago. Anyway, better late
than never.

It's been a fun ride, and  I do intend to occasionally contribute
to Nixpkgs, but not in the same way it once was.
2024-04-28 12:20:07 +02:00
Weijia Wang
37876dbdad Merge branch 'master' into staging-next 2024-04-27 05:44:19 +02:00
Weijia Wang
88679d4eff Merge pull request #305432 from r-ryantm/auto-update/janet
janet: 1.33.0 -> 1.34.0
2024-04-27 04:09:06 +02:00
Ben Wolsieffer
f9de72f247 pythonCatchConflictsHook: split propagated-build-inputs on runs of whitespace
Currently, nix-support/propagated-build-inputs is parsed by splitting on
a single space. This means that if this file contains multiple spaces
separating two paths, the build_inputs list will end up containing an
empty string.

Instead, call split() with no arguments, which splits on runs of
whitespace and also ignores whitespace at the beginning and end of the
string, eliminating the need for strip().
2024-04-26 21:05:42 -04:00
Ben Wolsieffer
7f14d675a7 pythonCatchConflictsHook: cleanup due to visiting each path once
Now that we only visit each path once, a few things can be simplified.
We no longer have to keep a list of different dependency chains leading
to a package, since only one chain will ever be found. Also, the already
visited check also takes care of cycles, so the other cycle check can be
removed.
2024-04-26 21:05:42 -04:00
Ben Wolsieffer
a25e43e6d7 pythonCatchConflictsHook: prevent exponential worst-case
The hook performs a depth first search on the graph defined by
propagatedBuildInputs. This traverses all paths through the graph,
except for any cycles. In the worst case with a highly connected graph,
this search can take exponential time. In practice, this means that in
cases with long dependency chains and multiple packages depending on the
same package, the hook can take several hours to run.

Avoid this problem by keeping track of already visited paths and only
visiting each path once. This makes the search complete in linear time.

The visible effect of this change is that, if a conflict is found, only
one dependency chain that leads to the conflicting package is printed,
rather than all the possible dependency chains.
2024-04-26 21:05:42 -04:00
Ben Wolsieffer
21833407b4 pythonCatchConflictsHook: add test for multiple dependency chains
Add a test where a conflicting package can be found at the end of
multiple dependency chains. This is far too simple an example to
demonstrate the ill effects of exponential time complexity, but does
serve to demonstrate how the error output changes when each path is only
visited once.
2024-04-26 21:05:41 -04:00
Jan Tojnar
eb04659fc2 treewide: wrapGAppsHook → wrapGAppsHook3
This was achieved using the following command:

    sd 'wrapGAppsHook\b' wrapGAppsHook3 (rg -l 'wrapGAppsHook\b')

And then manually reverted the following changes:

- alias in top-level.nix
- function name in wrap-gapps-hook.sh
- comment in postFixup of at-spi2-core
- comment in gtk4
- comment in preFixup of 1password-gui/linux.nix
- comment in postFixup of qgis/unwrapped-ltr.nix and qgis/unwrapped.nix
- comment in postFixup of telegram-desktop
- comment in postFixup of fwupd
- buildCommand of mongodb-compass
- postFixup of xflux-gui
- comment in a patch in kdePackages.kde-gtk-config and plasma5Packages.kde-gtk-config
- description of programs.sway.wrapperFeatures.gtk NixOS option (manual rebuild)
2024-04-27 02:23:22 +02:00
Vladimír Čunát
d157c07324 Merge branch 'master' into staging-next 2024-04-25 20:43:34 +02:00
elcuervo
6663dbfa1b ruby_3_2: 3.2.3 -> 3.2.4 2024-04-25 14:39:12 -03:00
github-actions[bot]
d0efe40740 Merge master into staging-next 2024-04-25 06:01:20 +00:00
R. Ryantm
7c219aea66 nelua: unstable-2024-02-03 -> unstable-2024-04-20 2024-04-25 00:31:54 +00:00
Mario Rodas
acba655f26 Merge pull request #306286 from marsam/ruby
ruby: 3.1.4 -> 3.1.5, 3.2.3 -> 3.2.4, 3.3.0 -> 3.3.1
2024-04-24 07:56:46 -05:00
Vladimír Čunát
1b357187a9 Merge branch 'master' into staging-next 2024-04-24 08:22:34 +02:00
Mario Rodas
2becf6e837 maintainers: drop marsam 2024-04-24 04:20:00 +00:00
Mario Rodas
126feda420 Merge pull request #306116 from ereslibre/bump-wasmtime
wasmtime: 19.0.2 -> 20.0.0
2024-04-23 20:28:50 -05:00
Mario Rodas
c41af36650 Merge pull request #306200 from ereslibre/bump-wamr
wamr: 1.3.2 -> 2.0.0
2024-04-23 19:00:24 -05:00
Yt
cffb1159fd Merge pull request #305100 from chiroptical/chiroptical/erlang-27-rc3
erlang_27: rc2 -> rc3
2024-04-23 21:03:35 +00:00
Rafael Fernández López
db9700fdf0 wamr: 1.3.2 -> 2.0.0 2024-04-23 09:31:39 +02:00
Mario Rodas
e49c774d68 ruby_3_3: 3.3.0 -> 3.3.1
Changelog: https://github.com/ruby/ruby/releases/tag/v3_3_1

Release Notes: https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-3-1-released/
2024-04-23 04:20:00 +00:00
Mario Rodas
938384a7a5 ruby_3_2: 3.2.3 -> 3.2.4
Changelog: https://github.com/ruby/ruby/releases/tag/v3_2_4

Release Notes: https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-2-4-released/
2024-04-23 04:20:00 +00:00
Mario Rodas
f6d863e1c2 ruby_3_1: 3.1.4 -> 3.1.5
Changelog: https://github.com/ruby/ruby/releases/tag/v3_1_5

Release Notes: https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-1-5-released/
2024-04-23 04:20:00 +00:00
Rafael Fernández López
a71a9aea0c wasmtime: 19.0.2 -> 20.0.0 2024-04-23 00:16:00 +02:00
github-actions[bot]
3aa8ef1d54 Merge staging-next into staging 2024-04-20 12:01:42 +00:00
R. Ryantm
5c4f18afbe janet: 1.33.0 -> 1.34.0 2024-04-20 01:09:37 +00:00
R. Ryantm
b9f8dcfaf1 babashka-unwrapped: 1.3.189 -> 1.3.190 2024-04-20 01:06:16 +00:00
chiroptical
6e6181d1d8 erlang_27: rc2 -> rc3 2024-04-18 13:06:29 -04:00
github-actions[bot]
5c2b2d5b74 Merge master into staging-next 2024-04-17 18:01:04 +00:00
Pol Dellaiera
7a445b4728 Merge pull request #303883 from abathur/bats_1_11
bats: 1.10.0 -> 1.11.0, resholve: fix related test breakage
2024-04-17 19:21:37 +02:00
github-actions[bot]
d94833deff Merge staging-next into staging 2024-04-17 18:01:36 +00:00
R. Ryantm
8f82a1f0d5 expr: 1.16.4 -> 1.16.5 2024-04-17 00:52:50 +00:00
Travis A. Everett
1f9a9252a7 bats: 0.10.0 -> 0.11.0
Also conditionally excludes pkill from resolution on macOS, since the
procps package should contain pkill on other platforms.
2024-04-16 15:58:16 -05:00
github-actions[bot]
d3b241dbfd Merge staging-next into staging 2024-04-16 18:01:24 +00:00
github-actions[bot]
feedc73bee Merge master into staging-next 2024-04-16 18:00:57 +00:00
Nick Cao
053be0cc59 Merge pull request #304435 from r-ryantm/auto-update/wazero
wazero: 1.7.0 -> 1.7.1
2024-04-16 09:38:46 -04:00
github-actions[bot]
0367a29b65 Merge staging-next into staging 2024-04-16 12:01:45 +00:00
github-actions[bot]
a459b363de Merge master into staging-next 2024-04-16 12:01:11 +00:00
Mario Rodas
6c8c1732ff Merge pull request #303451 from ereslibre/bump-wasmtime-19
wasmtime: 19.0.1 -> 19.0.2
2024-04-16 06:25:07 -05:00
github-actions[bot]
e506b5706f Merge staging-next into staging 2024-04-16 06:01:35 +00:00
github-actions[bot]
a34a6c51cd Merge master into staging-next 2024-04-16 06:01:08 +00:00
R. Ryantm
2638a70016 wazero: 1.7.0 -> 1.7.1 2024-04-16 04:54:00 +00:00
Mario Rodas
a7721427c1 Merge pull request #300750 from amarshall/ruby-cargohash-failure
ruby: improve failure message when missing cargoHash
2024-04-15 20:55:08 -05:00
github-actions[bot]
08524fc7d6 Merge staging-next into staging 2024-04-15 18:01:24 +00:00
github-actions[bot]
4d2386d2dd Merge master into staging-next 2024-04-15 18:00:56 +00:00
github-actions[bot]
d54f055fd4 Merge staging-next into staging 2024-04-15 12:01:29 +00:00
github-actions[bot]
4908c48bf5 Merge master into staging-next 2024-04-15 12:01:00 +00:00
Mario Rodas
573746b5c0 Merge pull request #303663 from anthonyroussel/update/ruby
bundler: 2.5.7 -> 2.5.9, ruby.rubygems: 3.5.7 -> 3.5.9
2024-04-15 02:08:02 -05:00
Vladimír Čunát
3bcf0470d8 Revert #303176: "buildLuarocksPackage: rework fixup phase"
This reverts commit ddefcf284c.
Breakages need figuring out, reverting for now:
https://github.com/NixOS/nixpkgs/pull/303176#issuecomment-2053910614
2024-04-15 07:17:32 +02:00