github-actions[bot]
0537539006
Merge master into staging-next
2023-03-22 12:01:22 +00:00
Martin Weinelt
ffe3165b27
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
- nixos/doc/manual/release-notes/rl-2305.section.md
2023-03-21 12:35:53 +01:00
Stanisław Pitucha
3ecd7073e6
stabber: fix darwin build
2023-03-21 14:50:28 +11:00
jopejoe1
7cee2ad598
hplip: fix broken/hardcoded paths in .desktop files
2023-03-20 16:04:21 +01:00
github-actions[bot]
c70342c89c
Merge master into staging-next
2023-03-19 00:02:27 +00:00
Weijia Wang
57ee518715
Merge pull request #221883 from ereslibre/bump-fastly
...
fastly: 8.0.0 -> 8.1.0
2023-03-18 23:01:02 +02:00
Rafael Fernández López
891812fd2b
fastly: 8.0.0 -> 8.1.0
2023-03-18 18:53:54 +01:00
github-actions[bot]
2394986204
Merge master into staging-next
2023-03-17 12:01:17 +00:00
Weijia Wang
32f39395a7
Merge pull request #210101 from helsinki-systems/upd/jitsi
...
Update of all Jitsi Meet components
2023-03-17 12:23:14 +02:00
Vladimír Čunát
0f9354bfee
Merge #218309 : ffmpeg: ffmpeg_4 → ffmpeg_5
...
...into staging
2023-03-16 11:11:31 +01:00
Martin Weinelt
6b67186fe9
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
- pkgs/development/python-modules/crownstone-cloud/default.nix
- pkgs/development/python-modules/exrex/default.nix
- pkgs/development/python-modules/mkdocs-minify/default.nix
- pkgs/development/python-modules/myjwt/default.nix
- pkgs/development/tools/analysis/checkov/default.nix
2023-03-14 08:14:26 +01:00
Artturi
b978bf0f0f
Merge pull request #220570 from Artturin/fixlints1
2023-03-14 02:15:55 +02:00
Atemu
9bd2506458
treewide: make ffmpeg_4-dependant packages depend on ffmpeg_4
...
These packages were identified as broken when ffmpeg = ffmpeg_5.
Tested _only_ by building them. If you are a maintainer of one of these
packages, please test whether your package still works.
2023-03-13 16:42:22 -06:00
Harsh Shandilya
a8cfd27522
scrcpy: 1.25 -> 2.0 ( #220783 )
2023-03-13 22:15:09 +01:00
Martin Weinelt
d03d74aa67
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
- pkgs/development/python-modules/aiopulse/default.nix
- pkgs/development/python-modules/identify/default.nix
- pkgs/development/python-modules/spur/default.nix
2023-03-12 23:28:23 +01:00
ckie
24469dbb73
Merge pull request #220824 from 9ary/dxvk-dll-overrides
...
dxvk: fix DLL override setup
dxvk: fix unbound variable warning in setup_dxvk.sh
dxvk: fix all shellcheck warnings
2023-03-12 21:58:20 +02:00
Anderson Torres
0871493aa5
kitty-themes: move to kitty directory
2023-03-12 14:42:55 -03:00
novenary
b09533e71e
dxvk: fix all shellcheck warnings
2023-03-12 19:41:01 +02:00
novenary
f67a9f0e27
dxvk: fix unbound variable warning in setup_dxvk.sh
2023-03-12 19:25:23 +02:00
novenary
2fc61b77cf
dxvk: fix DLL override setup
...
`basename srcpath` simply prints "srcpath" which results in a single DLL
override for srcpath.dll to be installed... clearly not what we want.
2023-03-12 14:51:25 +02:00
github-actions[bot]
140a35879a
Merge master into staging-next
2023-03-11 12:01:11 +00:00
K900
68cd4eeded
cups-filters: fix build with qpdf >= 11.3.0
2023-03-11 10:23:11 +03:00
Artturin
cab4a24c34
treewide: fix lints
...
Arg to lib.optional is a list
build time tool in buildInputs
2023-03-11 00:55:17 +02:00
Martin Weinelt
da1a690688
Merge remote-tracking branch 'origin/master' into staging-next
2023-03-10 01:50:42 +01:00
Rafael Fernández López
737e372a78
fastly: use viceroy from nix
2023-03-09 12:01:41 -08:00
github-actions[bot]
cb98531909
Merge master into staging-next
2023-03-05 18:01:28 +00:00
Ryan Lahfa
8aa37eb7f2
Merge pull request #218877 from jnsgruk/catppuccin-tmux
...
tmuxPlugins: init catppuccin theme at e2561de
2023-03-05 16:04:29 +01:00
Martin Weinelt
8a085cd8e3
Merge remote-tracking branch 'origin/master' into staging-next
2023-03-05 15:36:16 +01:00
R. Ryantm
bd73d9f9bd
fastly: 7.0.0 -> 7.0.1
2023-03-05 09:07:56 +00:00
github-actions[bot]
6c8444842c
Merge staging-next into staging
2023-03-02 12:02:00 +00:00
R. Ryantm
cefa675791
urbit: 1.21 -> 1.22
2023-03-02 02:11:56 +00:00
github-actions[bot]
8855eae01b
Merge staging-next into staging
2023-03-02 00:03:07 +00:00
Weijia Wang
6600612738
Merge pull request #218541 from r-ryantm/auto-update/urbit
...
urbit: 1.20 -> 1.21
2023-03-01 23:17:28 +02:00
Jon Seager
7da77056fb
tmuxPlugins: init catppuccin theme at e2561de
2023-03-01 12:37:48 +00:00
github-actions[bot]
758a48fae4
Merge staging-next into staging
2023-03-01 00:03:05 +00:00
Fabian Affolter
e9f8c25f1c
Merge pull request #217762 from joelkoen/rich-cli
...
rich-cli: fix dependency versions
2023-03-01 00:28:50 +01:00
Joel Koen
9f1539702d
rich-cli: fix dependency versions
2023-02-27 17:32:47 +10:00
Nick Cao
46d7460023
Merge pull request #218531 from SuperSandro2000/hplip-fix-link
...
hplip: fix patch download link
2023-02-27 14:26:42 +08:00
R. Ryantm
625157f81d
urbit: 1.20 -> 1.21
2023-02-27 00:53:20 +00:00
Sandro Jäckel
fb7c2cdb51
hplip: fix patch download link
2023-02-27 00:56:34 +01:00
R. Ryantm
c73a83b29d
fastly: 6.0.6 -> 7.0.0
2023-02-26 08:00:32 +00:00
Weijia Wang
39de70289c
Merge pull request #217336 from r-ryantm/auto-update/lilypond
...
lilypond: 2.24.0 -> 2.24.1
2023-02-24 19:00:13 +02:00
Mario Rodas
ad539c9f3c
Merge pull request #217814 from r-ryantm/auto-update/wiki-tui
...
wiki-tui: 0.6.3 -> 0.6.4
2023-02-24 06:47:32 -05:00
R. Ryantm
1320d26ed6
wiki-tui: 0.6.3 -> 0.6.4
2023-02-23 09:14:11 +00:00
Artturin
3251013cc1
treewide: env.NIX_CFLAGS_COMPILE use toString on result of optionals
...
env values must be strings
2023-02-22 21:23:05 +02:00
Artturin
226e149145
treewide: env.NIX_CFLAGS_COMPILE use optionalString instead of optional
...
env values must be strings
2023-02-22 21:23:05 +02:00
Artturin
f9fdf2d402
treewide: move NIX_CFLAGS_COMPILE to the env attrset
...
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper
this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
2023-02-22 21:23:04 +02:00
Artturin
6f6cc4a22d
treewide: use toString on list NIX_CFLAGS_COMPILE
...
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper
2023-02-22 21:23:04 +02:00
Ryan Mulligan
27a45b0e10
Merge pull request #216731 from matthew-levan/vere
...
urbit: remove old urbit; init at 1.20
2023-02-21 09:05:04 -08:00
Matthew LeVan
0e973e43c0
urbit: remove old urbit; init at 1.20
2023-02-21 11:27:05 -05:00