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
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
Vladimír Čunát
8041851753
Merge #256378 : cups: 2.4.6 -> 2.4.7
...
...into staging
2023-09-27 13:03:35 +02:00
Vladimír Čunát
93c0a7c196
Merge #254240 : ghostscript: 10.01.2 -> 10.02.0
...
...into staging
2023-09-27 12:43:22 +02:00
github-actions[bot]
9a4dae4abd
Merge master into staging-next
2023-09-27 06:01:00 +00:00
Artturi
54de1010e7
Merge pull request #257139 from Artturin/flashfocusupd
2023-09-27 08:26:18 +03:00
github-actions[bot]
3bfcfd7eef
Merge master into staging-next
2023-09-26 06:01:00 +00:00
Artturin
9f78b12f14
flashfocus: use python3Packages
2023-09-25 00:27:26 +03:00
Artturin
bed792a175
flashfocus: 2.3.1 -> 2.4.0
2023-09-25 00:25:16 +03:00
R. Ryantm
00e1294414
urbit: 2.11 -> 2.12
2023-09-24 03:50:23 +00:00
github-actions[bot]
ab2ecc25c1
Merge master into staging-next
2023-09-23 18:00:59 +00:00
R. Ryantm
949e9c666d
dxvk_2: 2.2 -> 2.3
2023-09-23 09:11:16 +00:00
Yaya
50bf74d608
cups: 2.4.6 -> 2.4.7
...
https://github.com/OpenPrinting/cups/releases/tag/v2.4.7
Fixes CVE-2023-4504
2023-09-20 21:00:09 +00:00
Robert Scott
4d2b986d7e
ghostscript: 10.01.2 -> 10.02.0
2023-09-18 20:31:13 +01:00
github-actions[bot]
3c56b929c1
Merge master into staging-next
2023-09-18 06:01:00 +00:00
Legion Orsetti
b6ae95f74b
vencord: 1.4.6 -> 1.4.7
2023-09-17 22:10:59 +02:00
github-actions[bot]
d2fdbb7e40
Merge master into staging-next
2023-09-17 18:00:59 +00:00
Elis Hirwing
c3b9ae0547
platformsh: 3.79.2 -> 4.10.0
...
Also:
- Follow the rename of the repository
- Switch to the new composer builder
2023-09-17 15:07:02 +02:00
github-actions[bot]
757197a9df
Merge staging-next into staging
2023-09-12 12:01:40 +00:00
github-actions[bot]
92f41becba
Merge master into staging-next
2023-09-12 12:01:13 +00:00
Matthias Beyer
b74826751e
Merge pull request #252120 from sbancuz/patch-1
...
tmuxPlugins.catppuccin: unstable-2023-07-15 -> unstable-2023-08-21
2023-09-12 11:16:09 +02:00
Robert Scott
c45a792653
ghostscript.tests.test-corpus-render: unstable-2022-12-01 -> unstable-2023-05-19
2023-09-09 14:23:41 +01:00
Yureka
ef69e91c60
Merge branch 'waf-cross' of https://github.com/atorres1985-contrib/nixpkgs into HEAD
2023-09-09 08:27:19 +02:00
github-actions[bot]
9df0a1c6a2
Merge staging-next into staging
2023-09-08 18:01:25 +00:00
github-actions[bot]
87ae839e33
Merge master into staging-next
2023-09-08 18:00:54 +00:00
Sandro Jäckel
fccf04b620
treewide: replace -DCMAKE_BUILD_TYPE in cmakeFlags with cmakeBuildType
2023-09-08 14:18:26 +00:00
Weijia Wang
db76ee42c2
jack-example-tools: add darwin support
2023-09-08 15:48:38 +02:00
pennae
6054951ae5
Merge pull request #253299 from pennae/jack-tools
...
jack-example-tools: init at 4
2023-09-08 15:23:25 +02:00
Artturi
6946977de0
Merge pull request #252874 from atorres1985-contrib/waf-cross
2023-09-07 21:39:12 +03:00
github-actions[bot]
204bfce523
Merge staging-next into staging
2023-09-07 00:02:49 +00:00
Weijia Wang
1d9eef8230
Merge pull request #253726 from reckenrode/jack2-fix
...
jack2: fix build on Darwin
2023-09-07 01:06:20 +02:00
