github-actions[bot]
b66506a79e
Merge staging-next into staging
2024-07-12 12:01:44 +00:00
Maximilian Bosch
c7f54ca757
Merge pull request #325904 from Shawn8901/update-epson-escpr2
...
epson-escpr2: 1.2.11 -> 1.2.12
2024-07-12 10:41:28 +00:00
Vladimír Čunát
2c053848df
Merge branch 'master' into staging
2024-07-11 22:05:05 +02:00
Nick Cao
9c7fcf487f
Merge pull request #323609 from NickCao/opensbi
...
opensbi: 1.4 -> 1.5
2024-07-11 08:59:38 -04:00
Martin Weinelt
176a56c40f
Merge remote-tracking branch 'origin/staging-next' into staging
...
Conflicts:
- pkgs/applications/misc/blender/default.nix
- pkgs/development/web/nodejs/nodejs.nix
2024-07-11 01:06:28 +02:00
Sandro
eec72fd9d1
Merge pull request #325178 from alois31/hplip
2024-07-10 14:05:52 +02:00
Alois Wohlschlager
57428640ff
hplip: 3.23.8 -> 3.24.4
...
Remove a patch that does no longer apply and seems to be not needed any more.
2024-07-10 05:55:13 +02:00
Alois Wohlschlager
ac20a96efd
hplip: fix dependencies
...
Wrapping with gobject-introspection is required so that hp-systray is able to
find dbus. Sip4 is outdated and seems no longer required.
2024-07-10 05:55:05 +02:00
Peder Bergebakken Sundt
e5b4380d11
Merge pull request #321089 from deinferno/master
...
pantum-driver: 1.1.106 -> 1.1.123
2024-07-10 00:17:15 +02:00
Shawn8901
b64581addf
epson-escpr2: 1.2.11 -> 1.2.12
2024-07-09 20:18:33 +02:00
Shawn8901
3996f01a89
epson-escpr2: format with nixfmt-rfc-style
2024-07-09 20:14:17 +02:00
Aleksana
13b2d037d0
Merge pull request #325016 from omidmnz/fix-lilypond-invoke-editor
...
lilypond: avoid resetting the PATH in makeWrapper
2024-07-09 20:38:46 +08:00
Leona Maroni
aab7c21bdb
Merge pull request #325682 from jchw-forks/fix/hplip
...
hplip: fix
2024-07-09 11:25:30 +02:00
Michael Hoang
eb725313bc
treewide: remove Enzime
2024-07-09 14:32:33 +10:00
John Chadwick
fc8576c062
hplip: fix
2024-07-08 20:26:45 -04:00
R. Ryantm
e7a4e19ed5
jitsi-meet-prosody: 1.0.7952 -> 1.0.8043
2024-07-08 05:05:10 +00:00
Weijia Wang
7038f0bab2
Merge pull request #320583 from r-ryantm/auto-update/cups
...
cups: 2.4.8 -> 2.4.10
2024-07-07 14:52:44 +02:00
Omid Momenzadeh
670ac47e52
lilypond: avoid resetting the PATH in makeWrapper
...
Using `--set` obscures the user's `PATH`, which
`lilypond-invoke-editor` depends on. The problem can be reproduced by
setting the `LYEDITOR` environment variable before executing
`lilypond-invoke-editor`.
2024-07-06 15:20:25 +03:30
Martin Weinelt
e7b1ee45cf
Merge remote-tracking branch 'origin/staging-next' into staging
...
Conflicts:
- pkgs/tools/misc/watchlog/default.nix
2024-07-06 01:52:35 +02:00
Martin Weinelt
d9610a9f2e
Merge remote-tracking branch 'origin/master' into staging-next
2024-07-06 01:51:14 +02:00
Marcus Ramberg
cd11caeb12
Merge pull request #311474 from redyf/add-tokyo-night-tmux
...
tmuxPlugins.tokyo-night-tmux: init at 1.5.3
2024-07-05 22:27:41 +02:00
github-actions[bot]
e14242d985
Merge staging-next into staging
2024-07-04 12:01:37 +00:00
Vladimír Čunát
44b36397c2
Merge branch 'master' into staging-next
...
Conflicts - GitHub wouldn't auto-resolve them but my local git did:
pkgs/development/cuda-modules/cuda/overrides.nix
2024-07-04 10:10:22 +02:00
Masum Reza
410d1213cd
Merge pull request #323983 from Aleksanaa/cargoSha256-change
...
treewide: remove all cargoSha256 usage
2024-07-04 10:50:18 +05:30
adisbladis
1be927ca66
Merge pull request #316983 from edolstra/let-float-json
...
Let-float various fromJSON calls to avoid repeated JSON reading/parsing
2024-07-04 13:47:08 +12:00
github-actions[bot]
aba75819b6
Merge master into staging-next
2024-07-03 18:01:04 +00:00
éclairevoyant
83a657cacd
Merge pull request #324353 from delan/bye
...
maintainers: remove delan
2024-07-03 17:39:29 +00:00
Vladimír Čunát
c76085b3a9
Merge branch 'master' into staging-next
2024-07-03 19:07:35 +02:00
aleksana
1862813d11
treewide: convert cargoSha256 to cargoHash
...
This is done with the following bash script:
```
#!/usr/bin/env bash
process_line() {
local filename=${1%:}
if [[ $4 =~ \"(.*)\"\; ]]; then
local sha256="${BASH_REMATCH[1]}"
fi
[[ -z $sha256 ]] && return 0
local hash=$(nix hash to-sri --type sha256 $sha256)
echo "Processing: $filename"
echo " $sha256 => $hash"
sed -i "s|cargoSha256 = \"$sha256\"|cargoHash = \"$hash\"|"
$filename
}
# split output by line
grep -r 'cargoSha256 = ' . | while IFS= read -r line; do
# split them further by space
read -r -a parts <<< "$line"
process_line "${parts[@]}"
done
```
2024-07-03 21:54:10 +08:00
Delan Azabani
01aa077998
maintainers: remove delan
2024-07-03 19:54:30 +08:00
Jussi Kuokkanen
9b4703cf14
pkgs/misc: remove licenses.gpl2
2024-07-03 14:24:14 +03:00
github-actions[bot]
d77a3adc09
Merge master into staging-next
2024-07-03 00:02:45 +00:00
Weijia Wang
3814f8ed46
Merge pull request #322685 from r-ryantm/auto-update/mxt-app
...
mxt-app: 1.36 -> 1.38
2024-07-02 23:10:41 +02:00
K900
665f1d6183
Merge remote-tracking branch 'origin/master' into staging-next
2024-07-02 08:32:46 +03:00
Janik H.
76cd1d2211
maintainers: drop janik
...
I guess my time has come as well...
With this commit, I'm not just dropping my maintainer entry, but I'm also
resigning from my duties as a board observer and NixCon project lead.
I also terminated my Summer of Nix contract today.
I'll also stop hosting the local NixOS meetup.
The only "project" I'll finish under the NixOS Foundation umbrella is
Google Summer of Code because the mentees aren't even remotely
responsible for why I'm leaving, and it would be unfair to leave them
hanging.
I'm grateful for all the things I was able to learn, for all the experiences
I could gather, and for all the friends I made along the way.
NixOS is what makes computers bearable for me, so I'll go and work on
some fork (*something something* you always meet twice in life).
2024-07-02 02:36:42 +02:00
pennae
5c5aaaaaae
maintainers: remove pennae
...
https://discourse.nixos.org/t/nca-jonringer-joint-announcement/48231
https://web.archive.org/web/20240701165505/https://discourse.nixos.org/t/nca-jonringer-joint-announcement/48231
we had little faith in the NCA process, but this is going deep, *deep*
into the territory of wilfully insulting all those had placed even a
modicum of trust in that process.
have you fucking nazi bar.
2024-07-01 18:56:40 +02:00
Martin Weinelt
9b79a05ae1
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
- pkgs/development/python-modules/flexcache/default.nix
- pkgs/development/python-modules/flexparser/default.nix
- pkgs/development/python-modules/odp-amsterdam/default.nix
- pkgs/development/python-modules/pint/default.nix
- pkgs/development/python-modules/uncertainties/default.nix
- pkgs/top-level/python-packages.nix
2024-07-01 01:07:21 +02:00
Nick Cao
2d1ae120c5
opensbi: 1.4 -> 1.5
...
Diff: https://github.com/riscv-software-src/opensbi/compare/v1.4...v1.5
2024-06-30 11:06:00 -04:00
Michele Guerini Rocco
373ef925ca
Merge pull request #323235 from rnhmjoj/pr-scc
...
sc-controller: 0.4.8.13 -> 0.4.8.17
2024-06-30 01:11:01 +02:00
K900
bde999c03e
Merge branch 'master' into staging-next
2024-06-29 10:13:13 +03:00
rnhmjoj
6ac745ef3c
sc-controller: 0.4.8.13 -> 0.4.8.17
...
The Ryochan7's fork has been archived, development continues over at
C0rn3j's fork. Hopefully this will me merged into the official
project sooner or later...
2024-06-28 22:20:50 +02:00
Ryan Hendrickson
c81ecdf95b
Merge pull request #322284 from rhendric/rhendric/genericUpdater-allowedVersions
...
common-updater-scripts: add allowedVersions parameter
2024-06-28 15:35:00 -04:00
R. Ryantm
a5b1a60fe8
mxt-app: 1.36 -> 1.38
2024-06-26 16:46:30 +00:00
github-actions[bot]
27074b7d07
Merge master into staging-next
2024-06-26 00:02:13 +00:00
Weijia Wang
68bf0f3d71
Merge pull request #321186 from r-ryantm/auto-update/lilypond-unstable
...
lilypond-unstable: 2.25.16 -> 2.25.17
2024-06-26 00:05:09 +02:00
Ryan Hendrickson
77a9e911a6
alock: use allowedVersions in updateScript
2024-06-25 17:45:57 -04:00
R. Ryantm
9088fd75eb
cups: 2.4.8 -> 2.4.10
2024-06-24 13:17:02 +00:00
github-actions[bot]
88140ced6d
Merge master into staging-next
2024-06-24 12:01:17 +00:00
Martin Weinelt
74f29cd4b6
libjack2: fix python 3.12 support
...
Backports the waf 2.0.26 update, which adds Python 3.12 support to the
build system.
2024-06-24 12:18:23 +02:00
Shawn8901
0415c9c1f4
epson-escpr2: 1.2.10 -> 1.2.11
2024-06-23 22:31:59 +02:00