Jan Tojnar
d1b77f990f
Merge branch 'staging-next' into staging
...
Conflicts:
pkgs/applications/networking/browsers/firefox/common.nix between f6c5761935a373324120
2022-05-15 07:08:29 +02:00
github-actions[bot]
7e7fb6332c
Merge master into staging-next
2022-05-14 18:01:09 +00:00
Sergei Trofimovich
4281933727
foomatic-filters: add -fcommon workaround
...
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:
ld: foomatic_rip-options.o:/build/foomatic-filters-4.0.17/options.c:49: multiple definition of
`cupsfilter'; foomatic_rip-foomaticrip.o:/build/foomatic-filters-4.0.17/foomaticrip.c:158: first defined here
2022-05-14 12:12:30 +01:00
github-actions[bot]
fe71877bbd
Merge staging-next into staging
2022-05-13 18:03:04 +00:00
github-actions[bot]
bcb22e9a7b
Merge master into staging-next
2022-05-13 18:01:23 +00:00
rnhmjoj
74b5bb9050
sc-controller: 0.4.8.6 -> 0.4.8.7
2022-05-13 10:40:38 +02:00
Nick Cao
f6c5761935
firefox-unwrapped: fix cross compilation
2022-05-13 13:28:52 +08:00
github-actions[bot]
da834a289d
Merge staging-next into staging
2022-05-12 00:02:59 +00:00
Theodore Ni
b1e6ccc862
cliscord: fix build on Darwin
...
Security needs to be added as a buildInput.
2022-05-11 16:51:17 -05:00
github-actions[bot]
7dbfbc2e90
Merge staging-next into staging
2022-05-11 18:10:52 +00:00
Rick van Schijndel
d14b6e65ff
samsung-unified-linux-driver_4_00_39: drop
...
Broken since 2018-10-03
2022-05-11 19:23:05 +02:00
github-actions[bot]
2282e994f2
Merge staging-next into staging
2022-05-10 00:02:52 +00:00
Rick van Schijndel
081d4ccd71
Merge pull request #170705 from jansol/xow
...
xow: 0.5 -> unstable-2022-04-24
2022-05-09 21:24:43 +02:00
github-actions[bot]
629adb097a
Merge staging-next into staging
2022-05-09 18:01:59 +00:00
Sandro
7814586dfa
Merge pull request #172049 from zhaofengli/uboot-riscv64-zicsr
...
ubootQemuRiscv64Smode: Fix build with binutils 2.38
2022-05-09 14:58:51 +02:00
Adam Joseph
ce9122d1e8
pressureaudio: remove autoreconfHook to fix build for ZHF
...
pressureaudio's nix expression uses `src = pulseaudio.src`, so when
pulseaudio switched over to meson an dropped autoreconfHook the same
should have been done here as well.
2022-05-09 04:15:19 -07:00
github-actions[bot]
31938a3f5c
Merge staging-next into staging
2022-05-09 00:03:28 +00:00
github-actions[bot]
f39e774f11
Merge master into staging-next
2022-05-09 00:02:27 +00:00
Sandro
fd9aa19396
Merge pull request #171953 from Artturin/netcatbsd
...
netcat-openbsd: init at 1.218-5
2022-05-08 23:59:19 +02:00
Zhaofeng Li
34724f221e
ubootQemuRiscv64Smode: Fix build with binutils 2.38
2022-05-08 02:46:32 -07:00
Joel
194f81efa1
rich-cli: 1.7.0 -> 1.8.0
2022-05-08 13:21:08 +10:00
Artturin
51838e184e
flashfocus: use make it possible to use nc_flash_window
...
it is faster than flash_window
it needs netcat-openbsd
2022-05-07 17:10:22 +03:00
github-actions[bot]
ff5c4d3404
Merge master into staging-next
2022-05-06 06:01:36 +00:00
Bernardo Meurer
e6b94ad07e
Merge pull request #171602 from malob/treewide-mainProgram
...
treewide: add meta.mainProgram to many packages
2022-05-05 18:16:09 -07:00
github-actions[bot]
5b965b95d5
Merge master into staging-next
2022-05-05 12:04:22 +00:00
Fabian Affolter
39cdd05c72
Merge pull request #171533 from fabaff/textual-bump
...
python310Packages.textual: 0.1.15 -> 0.1.18, rich-cli: 1.5.1 -> 1.7.0
2022-05-05 08:07:53 +02:00
github-actions[bot]
375b571b04
Merge master into staging-next
2022-05-05 06:01:10 +00:00
Malo Bourgon
16e15fa68f
treewide: add meta.mainProgram to many packages
2022-05-04 18:08:19 -07:00
Fabian Affolter
2efd1090cf
rich-cli: 1.5.1 -> 1.7.0
2022-05-04 16:23:18 +02:00
Mario Rodas
7b1a798741
platformsh: 3.79.1 -> 3.79.2
...
https://github.com/platformsh/platformsh-cli/releases/tag/v3.79.2
2022-05-04 04:20:00 +00:00
github-actions[bot]
46944fe032
Merge staging-next into staging
2022-05-03 00:02:25 +00:00
Sandro
556eb21b30
Merge pull request #158132 from deinferno/pantum-driver
...
pantum-driver: init at 1.1.84
2022-05-03 00:15:07 +02:00
deinferno
129a6899a0
pantum-driver: init at 1.1.84
2022-05-02 22:44:05 +05:00
Vladimír Čunát
9478ec747c
Merge branch 'staging-next-2022-04-23'
...
Close #169965 : the PR and real 'staging-next' branch contained
extra systemd rebuild that I wanted to avoid in this iteration.
(to save Hydra's work)
2022-05-02 09:12:51 +02:00
github-actions[bot]
677697c12f
Merge staging-next into staging
2022-05-01 18:01:35 +00:00
github-actions[bot]
da9b549e31
Merge master into staging-next
2022-05-01 18:01:03 +00:00
Mario Rodas
915c233daf
Merge pull request #170958 from SuperSandro2000/platformsh
...
platformsh: fix version parsing with nix-env
2022-05-01 10:12:27 -05:00
Vladimír Čunát
c480cc2895
Merge branch 'master' into staging-next-2022-04-23
2022-04-30 23:02:28 +02:00
R. Ryantm
b918d3c71c
platformsh: 3.79.0 -> 3.79.1
...
https://github.com/platformsh/platformsh-cli/releases/tag/v3.79.1
2022-04-30 10:36:26 +00:00
Sandro Jäckel
4aa7c71088
platformsh: fix version parsing with nix-env
2022-04-30 02:32:29 +02:00
Robert Scott
f5db448b86
Merge pull request #170336 from risicle/ris-ghostscript-9.56.1
...
ghostscript: 9.55.0 -> 9.56.1
2022-04-30 01:24:51 +01:00
Robert Scott
2047e6eb7d
ghostscript: 9.55.0 -> 9.56.1
2022-04-29 22:36:08 +01:00
github-actions[bot]
cbdf1f436c
Merge staging-next into staging
2022-04-29 12:01:53 +00:00
github-actions[bot]
8fcc2694d6
Merge master into staging-next
2022-04-29 12:01:18 +00:00
Artturi
20a38d4e06
Merge pull request #170820 from hexchen/fix/kyodialog3
...
cups-kyodialog3: fix download URL
2022-04-29 13:03:26 +03:00
github-actions[bot]
fbd67854c6
Merge staging-next into staging
2022-04-29 06:01:45 +00:00
github-actions[bot]
2254d18031
Merge master into staging-next
2022-04-29 06:01:11 +00:00
Artturi
f706bf055d
Merge pull request #170808 from msfjarvis/hs/2022-04-29/scrcpy-1.24
...
scrcpy: 1.23 -> 1.24
2022-04-29 03:33:43 +03:00
github-actions[bot]
03ecebd53a
Merge staging-next into staging
2022-04-29 00:03:11 +00:00
github-actions[bot]
619828db66
Merge master into staging-next
2022-04-29 00:02:35 +00:00
hexchen
3612596e61
cups-kyodialog3: fix download URL
2022-04-28 22:10:25 +00:00
Harsh Shandilya
c7e4f2d4ce
scrcpy: 1.23 -> 1.24
2022-04-29 00:56:49 +05:30
R. Ryantm
20bc45ebeb
platformsh: v3.78.0 -> v3.79.0
2022-04-28 07:59:12 +00:00
Jan Solanti
e8f4f984df
xow: 0.5 -> unstable-2022-04-24
...
Fixes build with newer compilers.
2022-04-28 03:31:24 +03:00
Vladimír Čunát
51554cbbdb
Merge branch 'master' into staging-next-2022-04-23
2022-04-27 22:50:17 +02:00
github-actions[bot]
da11317d1c
Merge staging-next into staging
2022-04-27 06:01:39 +00:00
github-actions[bot]
2ac5c4af82
Merge master into staging-next
2022-04-27 06:01:04 +00:00
Bernardo Meurer
d6b996030d
Merge pull request #170528 from lovesegfault/rpi-full-tree
...
feat: add support for the RaspberryPi CM4
2022-04-26 20:55:16 -07:00
Bernardo Meurer
0594277183
ubootRaspberryPi4_64bit: remove NVMe support patches
2022-04-26 19:09:06 -07:00
Bernardo Meurer
21b28447eb
uboot: add node on where rpi-cm4 patches come from
2022-04-26 19:05:27 -07:00
Bernardo Meurer
77bb75d6a2
ubootRaspberryPi4_64bit: rebase patch series
2022-04-26 19:05:26 -07:00
Bernardo Meurer
cff95d1193
ubootRaspberryPi4_64bit: add patch for USB stall with non-MSD USB devices
2022-04-26 19:05:25 -07:00
Bernardo Meurer
b30105b7c2
ubootRaspberryCM4_64bit: merge with ubootRaspberryPi4_64bit
2022-04-26 19:05:23 -07:00
github-actions[bot]
45a2d659a4
Merge staging-next into staging
2022-04-27 00:02:50 +00:00
github-actions[bot]
8261a7aaba
Merge master into staging-next
2022-04-27 00:02:17 +00:00
Congee
a356e86676
tpm2-pkcs11: 1.7.0 -> 1.8.0
2022-04-26 16:25:06 -07:00
Bernardo Meurer
323f123f6a
ubootRaspberryCM4_64bit: add all NVME patches
2022-04-26 15:22:36 -07:00
Bernardo Meurer
ca0c9279ab
ubootRaspberryCM4_64bit: enable USB and NVME
2022-04-26 15:22:35 -07:00
Bernardo Meurer
d094a3e175
uboot: enable parallel building again
2022-04-26 15:22:34 -07:00
Bernardo Meurer
f6f41cf740
uboot: 2021.10 -> 2022.01
2022-04-26 15:22:27 -07:00
Bernardo Meurer
faf42ffbd0
ubootRaspberryCM4_64bit: init
2022-04-26 15:22:25 -07:00
github-actions[bot]
1dd75b14e7
Merge staging-next into staging
2022-04-25 12:09:44 +00:00
github-actions[bot]
073cad8fd6
Merge master into staging-next
2022-04-25 12:04:02 +00:00
Sandro
33d1f7c0bd
Merge pull request #169575 from Ma27/ghostscript-openjpeg
...
ghostscript: use system-wide openjpeg
2022-04-25 02:01:24 +02:00
Soner Sayakci
0d92d898ed
platformsh: init at v3.78.0
2022-04-24 08:40:25 +00:00
Maximilian Bosch
d9218155d2
ghostscript: use system-wide openjpeg
...
The following error occurs when using `imagemagickBig`:
$ ./result/bin/identify sample.jp2
[1] 699089 IOT instruction (core dumped) ./result/bin/identify sample.jp2
When looking at the call-trace it seems as if certain symbols, e.g.
`opj_malloc` are mixed up:
#8 0x00007f78c79ad2f5 in MagickSignalHandler.cold () from /nix/store/bqy80qiw6czqh7vsmmmivwdswp9zzjgl-imagemagick-7.1.0-29/lib/libMagickCore-7.Q16HDRI.so.10
#9 <signal handler called>
#10 0x00007f78c5a6095f in opj_malloc () from /nix/store/wg6ly83k1k1fjiygiv1jr7li3p6dwsvq-ghostscript-with-X-9.55.0/lib/libgs.so.9
#11 0x00007f78c5a60981 in opj_calloc () from /nix/store/wg6ly83k1k1fjiygiv1jr7li3p6dwsvq-ghostscript-with-X-9.55.0/lib/libgs.so.9
#12 0x00007f78c4f48e24 in opj_create_decompress () from /nix/store/qwalb0kjz1p9c4j48qkk6ql47ds2lnhh-openjpeg-2.4.0/lib/libopenjp2.so.7
The `opj_create_decompress()` is called from the `openjpeg`-integration
of `imagemagick` and thus shouldn't affect `ghostscript` at all.
However, `ghostscript` (`libgs.so` to be precise) also exposes e.g.
`opj_malloc`:
$ objdump -t /nix/store/wg6ly83k1k1fjiygiv1jr7li3p6dwsvq-ghostscript-with-X-9.55.0/lib/libgs.so.9.55|grep opj_malloc
0000000000205940 g F .text 000000000000002b opj_malloc
Because of that, two incompatible symbols are used in the same process
and thus the `identify`-call breaks because the wrong one is used. To
work around that I decided to use the system-wide openjpeg instead.
I'm not sure why `libgs.so` wants to expose these symbols anyways, but
with that workaround the problem is solved.
Even though it's mentioned that ghostscript's openjpeg is heavily
patched, I think that this is somewhat outdated or at least irrelevant
considering that both ArchLinux[1] and Fedora[2] use the system-wide
`openjpeg` instead.
[1] bafcb5473b/trunk/PKGBUILD (L50)e4eec13ab6/f/ghostscript.spec (_245)
2022-04-23 00:54:22 +02:00
Artturi
785373a76f
Merge pull request #166605 from siraben/remove-redundant-stdenv
2022-04-22 20:25:38 +03:00
Infinidoge
088112c897
acpilight: set mainProgram = "xbacklight"
2022-04-19 19:12:32 -04:00
Madoura
b18031c413
treewide/meta: Remove chiiruno and replace with Madouura ( #169096 )
...
* maintainers: remove chiiruno
* nixos/zeronet.nix: replace chiiruno with Madouura
* nixos/hydron: replace chiiruno with Madouura
* nixos/tests/bcachefs: replace chiiruno with Madouura
* lutris: replace chiiruno with Madouura
* qtchan: replace chiiruno with Madouura
* tinygo: replace chiiruno with Madouura
* vlang: replace chiiruno with Madouura
* merkletools: replace chiiruno with Madouura
* easyjson: replace chiiruno with Madouura
* quicktemplate: replace chiiruno with Madouura
* statik: replace chiiruno with Madouura
* dumb: replace chiiruno with Madouura
* sndio: replace chiiruno with Madouura
* hydron: replace chiiruno with Madouura
* edid-decode-unstable: replace chiiruno with Madouura
* tewisay: replace chiiruno with Madouura
* svt-av1: replace chiiruno with Madouura
2022-04-18 02:13:36 +03:00
github-actions[bot]
f6bedc13d1
Merge master into staging-next
2022-04-17 18:01:03 +00:00
Builditluc
c17f2305a8
maintainers: add builditluc
2022-04-17 12:28:34 +02:00
Builditluc
b46d723185
wiki-tui: 0.4.5 -> 0.4.7
2022-04-17 12:22:10 +02:00
Ben Siraphob
259fa13d53
treewide: remove nativeBuildInputs that are in stdenv
2022-04-16 21:46:46 +03:00
Martin Weinelt
a7fc5aaa76
Merge remote-tracking branch 'origin/master' into staging-next
2022-04-15 13:30:48 +02:00
Malo Bourgon
0e802eafad
treewide: add meta.mainProgram to many packages
2022-04-14 10:24:01 -07:00
Rick van Schijndel
a13f4f6c1c
jackaudio: remove unneeded PKGCONFIG variable
...
Not needed anymore after setting this correctly in the wafHook.
2022-04-10 17:12:11 +02:00
Lassulus
ce1e3ab634
Merge pull request #162322 from jyooru/init/python3Packages.rich-cli
...
rich-cli: init at 1.5.1
2022-04-09 18:31:45 +01:00
Sandro
d9b51276a5
Merge pull request #162121 from ghostbuster91/init/tmux-thumbs
2022-04-08 15:09:47 +02:00
Thiago Kenji Okada
abeeb001a1
Merge pull request #166988 from Misterio77/add-argononed
...
argononed: init at unstable-2022-03-26
2022-04-06 00:11:42 +01:00
Gabriel Fontes
bfc562ab9a
argononed: init at unstable-2022-03-26
2022-04-05 13:59:50 -03:00
github-actions[bot]
c46200d454
Merge master into staging-next
2022-04-03 18:01:07 +00:00
ajs124
63828897eb
packetbeat: remove after being marked broken for over two years
...
It was marked in commit 5aa4b19
2022-04-03 16:14:59 +01:00
ghostbuster91
2355463094
tmux-thumbs: init at 0.7.1
2022-04-03 13:04:03 +02:00
Alyssa Ross
ac5a927919
Merge remote-tracking branch 'nixpkgs/master' into staging-next
...
Conflicts:
pkgs/development/python-modules/einops/default.nix
pkgs/development/python-modules/elegy/default.nix
2022-03-31 11:46:46 +00:00
Ben Siraphob
21faf9fc29
treewide: move autoconf, automake to nativeBuildInputs
2022-03-30 20:17:24 -05:00
Jan Tojnar
997bb5e42c
Merge branch 'master' into staging-next
...
; Conflicts:
; pkgs/development/python-modules/dnspython/default.nix
; pkgs/development/python-modules/googleapis-common-protos/default.nix
2022-03-28 17:55:31 +02:00
Sandro
dd45456b84
Merge pull request #165936 from ckiee/logiops-init
2022-03-28 16:36:16 +02:00
ckie
d999e48102
logiops: init at 0.2.3
...
Pretty easy to package. Opened issue with upstream to get rid of the one
patch needed: https://github.com/PixlOne/logiops/issues/307
2022-03-28 16:17:51 +03:00
github-actions[bot]
e3d20dfaa5
Merge master into staging-next
2022-03-27 18:01:05 +00:00
Sandro
1bf32e43de
Merge pull request #163474 from reckenrode/dxvk-refactor
2022-03-27 17:00:33 +02:00
Randy Eckenrode
2f4eedc401
dxvk: 1.10 -> 1.10.1
2022-03-26 21:04:44 -04:00
github-actions[bot]
811b90f085
Merge master into staging-next
2022-03-26 12:01:14 +00:00
Sandro
5d0af57b93
Merge pull request #165040 from S-NA/systemd-sndio-service
2022-03-26 11:50:29 +01:00
Vladimír Čunát
0a8b4eddd2
Merge branch 'master' into staging-next
2022-03-25 10:16:56 +01:00
S. Nordin Abouzahra
e3c0eb7171
sndio: install systemd service
2022-03-24 15:48:03 -04:00
Bernardo Meurer
057a4d3abf
cups-brother-mfcl2750dw: fix download url
2022-03-23 16:41:33 -07:00
Bernardo Meurer
a3cfdf39a7
cups-brother-mfcl2750dw: init at 4.0.0-1
2022-03-23 14:49:49 -07:00
github-actions[bot]
c80dabe3b1
Merge staging-next into staging
2022-03-23 06:01:55 +00:00
Shawn8901
3bf28598c1
autoadb: init at unstable-2020-06-01 ( #165244 )
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-03-23 06:29:45 +01:00
github-actions[bot]
e452d308f5
Merge staging-next into staging
2022-03-22 12:02:02 +00:00
Sandro
5b874cadbf
Merge pull request #163582 from Stunkymonkey/treewide-fetchFromGitHub-1
2022-03-22 07:27:54 +01:00
github-actions[bot]
03c279d7ea
Merge staging-next into staging
2022-03-22 00:02:58 +00:00
R. Ryantm
56c8868908
t-rec: 0.6.0 -> 0.7.3
2022-03-21 19:20:06 +00:00
zowoq
6431086967
Merge remote-tracking branch 'origin/staging-next' into staging
...
Conflicts:
pkgs/development/python-modules/symengine/default.nix
2022-03-16 16:03:43 +10:00
Ryan Mulligan
0ab73f9a3f
Merge pull request #162535 from astro/pacemaker
...
pacemaker: init
2022-03-15 16:06:56 -07:00
Pascal Wittmann
6e3ee89576
Merge pull request #164290 from r-ryantm/auto-update/xlockmore
...
xlockmore: 5.68 -> 5.69
2022-03-15 22:42:30 +01:00
Sandro
a31cb9033e
Merge pull request #161396 from vs49688/orfix
2022-03-15 20:00:44 +01:00
R. Ryantm
7c24c71e1f
xlockmore: 5.68 -> 5.69
2022-03-15 16:55:31 +00:00
Felix Buehler
8322c182fa
alock: switch to fetchFromGitHub
2022-03-14 19:32:50 +01:00
Felix Buehler
e5c1b1f17e
xtrlock-pam: switch to fetchFromGitHub
2022-03-14 19:32:50 +01:00
Joel
22208a7a6e
rich-cli: init at 1.5.1
2022-03-11 16:04:40 +10:00
github-actions[bot]
8379968bb2
Merge staging-next into staging
2022-03-10 06:02:07 +00:00
github-actions[bot]
c46a02f957
Merge master into staging-next
2022-03-10 06:01:29 +00:00
Ivv
2705aef804
Merge pull request #163429 from bartsch/maintainer-add-bartsch
...
Add bartsch to maintainers list and uboot package
2022-03-10 04:11:10 +01:00
github-actions[bot]
b4fed0cbba
Merge staging-next into staging
2022-03-09 18:05:08 +00:00
github-actions[bot]
d30e2aa8f5
Merge master into staging-next
2022-03-09 18:01:14 +00:00
Randy Eckenrode
f29e152b7e
dxvk: support version-specific MoltenVK patches
...
While it’s unlikely, it’s possible that different MoltenVK versions
could require their own compatability patches. Support that by making
the `moltenvk` derivation provide the patch via `passthru`. There is no
package with the patch applied because the patch should never be used by
anything other than DXVK.
2022-03-09 11:31:10 -05:00
Randy Eckenrode
e2369cb9c9
dxvk: refactor to better support Darwin and Linux
...
- Move the synchronization primitive changes to their own patch, so it
can be applied conditionally on Darwin. Also, document why this change
is needed; and
- Refactor how `src` is handled to support allowing Darwin and Linux to
diverge in case the Darwin patches do not apply to the latest version.
This should address some post-merger concerns that were raised about
Darwin’s blocking updates for Linux.
2022-03-09 11:18:05 -05:00
Alyssa Ross
43aa75b313
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
...
Conflicts:
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
nixos/doc/manual/release-notes/rl-2205.section.md
2022-03-09 11:20:38 +00:00
Daniel Martin
18ffc28a0f
uboot: add bartsch to maintainers
2022-03-09 11:15:44 +01:00
Daniel Martin
3cee68f916
uboot: Add Olimex A20 OLinuXino Lime2 with eMMC
...
Since hardware revision K, every Lime2 has got an eMMC:
https://github.com/OLIMEX/OLINUXINO/blob/master/HARDWARE/A20-OLinuXino-LIME2/hardware_revision_changes_log.txt
Co-authored-by: Samuel Dionne-Riel <samuel@dionne-riel.com>
2022-03-09 10:09:03 +01:00
Zane van Iperen
3c7e3a328c
openrussian-cli: refactor to use lua.withPackages instead of luaPackages
2022-03-09 16:12:00 +10:00
Astro
70c1e849c0
nixos/tests/pacemaker: init
2022-03-09 01:19:10 +01:00
Ryan Mulligan
2b78cfdb09
pacemaker: init at 2.1.2
2022-03-08 20:26:52 +01:00
github-actions[bot]
4a35c77022
Merge master into staging-next
2022-03-08 12:01:21 +00:00
Sandro
7bcf2dbdda
Merge pull request #161522 from reckenrode/dxvk
2022-03-08 12:54:34 +01:00
Randy Eckenrode
5fb9ee7f05
dxvk: init at 1.10
2022-03-07 15:15:19 -05:00
github-actions[bot]
137a689db1
Merge staging-next into staging
2022-03-07 00:02:59 +00:00
github-actions[bot]
b4b1ce4d4f
Merge master into staging-next
2022-03-07 00:02:12 +00:00
Guillaume Girol
8dd5f28691
Merge pull request #161625 from fortuneteller2k/i3a
...
i3a: init at 2.0.1
2022-03-06 21:57:14 +00:00
github-actions[bot]
fade30f7b2
Merge staging-next into staging
2022-03-05 12:01:44 +00:00
Martin Weinelt
1227158d0b
Merge remote-tracking branch 'origin/master' into staging-next
2022-03-05 12:56:25 +01:00
R. Ryantm
5218aba132
lilypond: 2.22.1 -> 2.22.2
2022-03-04 20:41:47 -06:00
github-actions[bot]
465d584100
Merge staging-next into staging
2022-03-03 12:11:56 +00:00
github-actions[bot]
c29f27003c
Merge master into staging-next
2022-03-03 12:06:44 +00:00
R. Ryantm
bfaf867dcb
xscreensaver: 6.02 -> 6.03
2022-03-03 08:08:20 +00:00
zowoq
64a89aac86
Merge staging-next into staging
...
Conflicts:
pkgs/development/libraries/sqlite/default.nix
2022-03-01 16:20:52 +10:00
github-actions[bot]
bfb0bc0461
Merge master into staging-next
2022-02-28 18:05:41 +00:00
Felix Buehler
1573dbdcd0
treewide: fix versions starting with 'v'
2022-02-28 13:05:18 +01:00
github-actions[bot]
b178b1c43a
Merge staging-next into staging
2022-02-28 00:02:46 +00:00
