Artturin
3342d1a9a9
Merge branch 'master' into staging-next
2023-10-20 09:29:36 +03:00
Legion Orsetti
cb7081284c
vencord: 1.5.6 -> 1.5.7
2023-10-20 00:15:42 +02:00
github-actions[bot]
fe1d100fb0
Merge staging-next into staging
2023-10-19 12:01:37 +00:00
github-actions[bot]
25bcfa6c2f
Merge master into staging-next
2023-10-19 12:01:00 +00:00
R. Ryantm
13e62b2223
seafile-shared: 9.0.3 -> 9.0.4
2023-10-19 10:31:36 +00:00
R. Ryantm
52ed1bb836
fastly: 10.4.0 -> 10.5.0
2023-10-19 05:32:50 +00:00
github-actions[bot]
12edd19d9d
Merge staging-next into staging
2023-10-16 18:02:05 +00:00
github-actions[bot]
3a75845d38
Merge master into staging-next
2023-10-16 18:01:26 +00:00
Nick Cao
dd207e59ca
Merge pull request #261403 from r-ryantm/auto-update/pipes-rs
...
pipes-rs: 1.6.1 -> 1.6.2
2023-10-16 12:17:19 -04:00
R. Ryantm
0787cfa1f1
pipes-rs: 1.6.1 -> 1.6.2
2023-10-16 12:28:34 +00:00
github-actions[bot]
de49fc16bc
Merge staging-next into staging
2023-10-16 12:01:54 +00:00
Alyssa Ross
579ae9b989
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/development/python-modules/cirq-core/default.nix
2023-10-16 08:49:23 +00:00
github-actions[bot]
ae77d35744
Merge staging-next into staging
2023-10-16 00:03:09 +00:00
Weijia Wang
e2246cd1c7
Merge pull request #241283 from u2x1/master
...
cups-brother-hl2260d: init at 3.2.0-1
2023-10-15 23:36:25 +02:00
Martin Weinelt
94c8c31bee
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
- pkgs/development/python-modules/numba/default.nix
2023-10-15 22:31:34 +02:00
Artturi
a1acc2fd0a
Merge pull request #261008 from dr460nf1r3/ananicy-rules-update
2023-10-15 05:42:44 +03:00
Weijia Wang
833637c805
Merge pull request #260318 from r-ryantm/auto-update/lilypond-unstable
...
lilypond-unstable: 2.25.8 -> 2.25.9
2023-10-15 02:45:38 +02:00
Nico Jensch
0938648544
ananicy-rules-cachyos: unstable-2023-06-28 -> unstable-2023-10-11
2023-10-14 09:39:29 +02:00
github-actions[bot]
4da0322a88
Merge staging-next into staging
2023-10-12 12:02:01 +00:00
Alyssa Ross
1bb67a90ba
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/development/python-modules/bambi/default.nix
pkgs/development/python-modules/jaxopt/default.nix
2023-10-12 09:08:12 +00:00
Anderson Torres
fcf47b6740
base16-shell-preview: migrate to by-name
2023-10-11 23:42:04 -03:00
Anderson Torres
690f5d4a10
xscreensaver: migrate to by-name
2023-10-11 23:42:04 -03:00
Anderson Torres
c68e9ecaff
scimark: migrate to by-name
2023-10-11 23:42:04 -03:00
Anderson Torres
9617989334
sound-of-sorting: update
...
- add meta.mainProgram
- migrate to by-name
2023-10-11 23:42:04 -03:00
R. Ryantm
2b367ecd33
lilypond-unstable: 2.25.8 -> 2.25.9
2023-10-11 00:26:31 +00:00
github-actions[bot]
2e97a3af0d
Merge staging-next into staging
2023-10-11 00:02:39 +00:00
Fabián Heredia Montiel
d676e059d7
Merge remote-tracking branch 'origin/master' into staging-next
2023-10-10 15:07:12 -06:00
Legion Orsetti
da359b9289
vencord: 1.5.5 -> 1.5.6
2023-10-10 22:23:09 +02:00
github-actions[bot]
f1a87e41ca
Merge staging-next into staging
2023-10-09 00:03:06 +00:00
github-actions[bot]
2df946c4bd
Merge master into staging-next
2023-10-09 00:02:27 +00:00
Randy Eckenrode
26f624d940
dxvk: migrate to by-name
2023-10-08 16:10:33 -04:00
Alyssa Ross
182718fecc
Merge remote-tracking branch 'origin/staging-next' into staging
...
Conflicts:
pkgs/top-level/linux-kernels.nix
2023-10-07 19:52:18 +00:00
Vincenzo Mantova
9824aa47a5
sagetex: use new tex package structure
2023-10-07 18:49:19 +01:00
Jan Tojnar
76a7aa445a
Merge branch 'master' into staging-next
...
Conflicts:
- pkgs/development/python-modules/xdot/default.nix
between 2f244e36471a9a257cf7
2023-10-06 23:18:00 +02:00
Mario Rodas
3ebb2e6665
Merge pull request #258809 from fwam/vencord
...
vencord: 1.5.3 -> 1.5.5
2023-10-06 08:50:31 -05:00
Legion Orsetti
86d6401d3e
vencord: 1.5.3 -> 1.5.5
2023-10-06 10:29:49 +02:00
github-actions[bot]
7017e013bf
Merge staging-next into staging
2023-10-05 12:02:16 +00:00
Alyssa Ross
a838aa244f
Merge remote-tracking branch 'origin/master' into staging-next
...
The hash for pytensor is not correct, but that's also the case in
master, so a merge commit isn't the place to fix it.
Conflicts:
pkgs/development/python-modules/faadelays/default.nix
pkgs/development/python-modules/pytensor/default.nix
pkgs/tools/admin/rset/default.nix
2023-10-05 08:02:48 +00:00
Anderson Torres
a78b6f3272
scrcpy: remove lukeadams from meta.maintainers
2023-10-04 22:20:58 -03:00
Anderson Torres
492414af5f
treewide: remove cstrahan from meta.maintainers - part 1
...
All the packages here are now orphaned.
2023-10-04 22:20:58 -03:00
Maximilian Bosch
8bc5104a6e
treewide: refactor .attrs.sh detection
...
When specifying the `builder` attribute in `stdenv.mkDerivation`, this
will be effectively transformed into
builtins.derivation {
builder = stdenv.shell;
args = [ "-e" builder ];
}
This also means that `default-builder.sh` is never sourced and as a
result it's not guaranteed that `$NIX_ATTRS_SH_FILE` is set to a correct
location[1].
Also, we need to source `.attrs.sh` to source `$stdenv`. So, the
following is done now:
* If `$NIX_ATTRS_SH_FILE` points to a correct location, then use it.
Directly using `.attrs.sh` is problematic for `nix-shell(1)` usage
(see previous commit for more context), so prefer the environment
variable if possible.
* Otherwise, if `.attrs.sh` exists, then use it. See [1] for when this
can happen.
* If neither applies, it can be assumed that `__structuredAttrs` is
turned off and thus nothing needs to be done.
[1] It's possible that it doesn't exist at all - in case of Nix 2.3 or
it can point to a wrong location on older Nix versions with a bug in
`__structuredAttrs`.
2023-10-04 18:36:57 +02:00
Weijia Wang
0eb4c474a0
Merge branch 'master' into staging-next
2023-10-01 03:08:16 +02:00
Weijia Wang
fbfb2eb37f
Merge pull request #258110 from wegank/lilypond-unstable-bump
...
lilypond-unstable: 2.25.7 -> 2.25.8
2023-10-01 00:17:24 +02:00
Weijia Wang
85f79c13e2
lilypond-unstable: 2.25.7 -> 2.25.8
2023-09-30 01:05:58 +02:00
github-actions[bot]
50751b0602
Merge master into staging-next
2023-09-29 18:00:55 +00:00
Artturi
780adc2e33
Merge pull request #257807 from r-ryantm/auto-update/flashfocus
2023-09-29 19:28:33 +03:00
github-actions[bot]
bd2b03a095
Merge master into staging-next
2023-09-28 18:00:54 +00:00
Thiago Kenji Okada
a77c2b2177
Merge pull request #257701 from fwam/vencord
...
vencord: 1.4.7 -> 1.5.3
2023-09-28 15:07:27 +01:00
R. Ryantm
523c14df11
flashfocus: 2.4.0 -> 2.4.1
2023-09-28 09:33:50 +00:00
Legion Orsetti
17009f3ff7
vencord: 1.4.7 -> 1.5.3
2023-09-28 11:09:59 +02:00
