Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from NixOS:master #119

Merged
merged 68 commits into from
Dec 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
2e6f50c
nixos/no-x-libs: add intel-vaapi-driver
SuperSandro2000 Sep 1, 2023
ff61f2b
gnome.gdm: Simplify DESTDIR hack
jtojnar Nov 19, 2023
8ef5fcf
upower: Simplify DESTDIR hack
jtojnar Nov 19, 2023
3524808
ticktick: 1.0.80 -> 2.0.0
MikaelFangel Nov 26, 2023
1a242ec
darktile: 0.0.10 -> 0.0.11
MikaelFangel Oct 8, 2023
f5375ec
bitcoin: 25.1 -> 26.0
prusnak Dec 6, 2023
9537527
nixos/installation-device: remove warning about mdadm
Stunkymonkey Dec 10, 2023
3bff45a
darktile: add aarch64-linux to badPlatforms
MikaelFangel Dec 11, 2023
c45fb30
python310Packages.aioguardian: 2023.11.0 -> 2023.12.0
r-ryantm Dec 18, 2023
e028a52
php81: 8.1.26 -> 8.1.27
drupol Dec 21, 2023
9d236a8
php82: 8.2.13 -> 8.2.14
drupol Dec 21, 2023
f743f1d
python310Packages.simplisafe-python: 2023.10.0 -> 2023.12.0
r-ryantm Dec 22, 2023
ee3e7ac
php83: 8.3.0 -> 8.3.1
drupol Dec 21, 2023
4a67cc2
vscode-extensions.asvetliakov.vscode-neovim: 1.0.1 -> 1.5.0
MikaelFangel Dec 22, 2023
2ed176b
txtpbfmt: unstable-2023-03-28 -> unstable-2023-10-25
aaronjheng Dec 23, 2023
5802b1d
kubectx: 0.9.4 -> 0.9.5
aaronjheng Dec 23, 2023
83078b0
nwjs: 0.82.0 -> 0.83.0
MikaelFangel Dec 23, 2023
6a16b6e
svdtools: 0.3.6 -> 0.3.8
r-ryantm Dec 24, 2023
91b4457
librewolf-unwrapped: 120.0.1-1 -> 121.0-1
squalus Dec 24, 2023
167624a
lsp-plugins: 1.2.13 -> 1.2.14
yuyuyureka Dec 24, 2023
60907d4
just: 1.17.0 -> 1.18.1
adamcstephens Dec 24, 2023
ed528ca
backblaze-b2: add missing dependency setuptools
linyinfeng Dec 22, 2023
5ab79e1
backblaze-b2: add a version test
linyinfeng Dec 22, 2023
870cf99
rubyPackages: update
marsam Dec 25, 2023
a53336a
xsubfind3r: 0.4.0 -> 0.7.0
r-ryantm Dec 25, 2023
d6ec710
xwaylandvideobridge: 0.3.0 -> 0.4.0
r-ryantm Dec 25, 2023
93459c3
python311Packages.aioguardian: update disabled
fabaff Dec 25, 2023
5a85f6a
baresip: 3.6.0 -> 3.7.0
r-ryantm Dec 25, 2023
7a9b7e9
teams-for-linux: 1.3.22 -> 1.4.1
chvp Dec 13, 2023
78d486b
hplip: add support for qtwayland
doronbehar Dec 25, 2023
3a54623
hplip: don't double wrap with qt env
doronbehar Dec 25, 2023
49db25d
rust: set sourceProvenance for bootstrap binary
linsui Dec 18, 2023
a454446
cheat: 4.4.0 -> 4.4.2
r-ryantm Dec 25, 2023
4c10797
Merge pull request #268535 from jtojnar/destdir-hack-cleanups
jtojnar Dec 25, 2023
647d3ff
Merge pull request #276567 from adamcstephens/just/1.18.1
adamcstephens Dec 25, 2023
e110773
Merge pull request #272548 from prusnak/bitcoin
prusnak Dec 25, 2023
f36a80e
cwiid: fix cross-compilation
vs49688 Dec 25, 2023
c86bade
Merge pull request #276436 from r-ryantm/auto-update/svdtools
emilylange Dec 25, 2023
e2a637a
Merge pull request #276549 from yu-re-ka/lsp-plugins-1-2-14
emilylange Dec 25, 2023
d6984a0
Merge pull request #276712 from doronbehar/pkg/hplip
doronbehar Dec 25, 2023
62266db
eask: 0.8.1 -> 0.9.1
r-ryantm Dec 25, 2023
7772d03
Merge pull request #276725 from marsam/update-rubypackages
marsam Dec 25, 2023
fb5b139
Merge pull request #259867 from MikaelFangel/update-darktile
marsam Dec 25, 2023
13c733c
Merge pull request #270279 from MikaelFangel/update-ticktick
marsam Dec 25, 2023
fd6565d
Merge pull request #276131 from MikaelFangel/update-vscode-neovim
marsam Dec 25, 2023
3b29ec8
Merge pull request #276270 from aaronjheng/kubectx
marsam Dec 25, 2023
1fc970b
Merge pull request #276257 from aaronjheng/txtpbfmt
marsam Dec 25, 2023
a730613
Merge pull request #275980 from linyinfeng/b2-cli-fix
Atemu Dec 25, 2023
a0ca61d
Merge pull request #276397 from MikaelFangel/update-nwjs
marsam Dec 25, 2023
18c3a62
Merge pull request #276730 from r-ryantm/auto-update/cheat
Mic92 Dec 25, 2023
b0ea079
Merge pull request #276632 from r-ryantm/auto-update/xsubfind3r
fabaff Dec 25, 2023
70ef077
Merge pull request #275149 from r-ryantm/auto-update/python310Package…
fabaff Dec 25, 2023
4d8e7df
cargo: fix description and homepage
Mic92 Dec 25, 2023
e25b2d4
rustc: link to https homepage
Mic92 Dec 25, 2023
18730a0
Merge pull request #276543 from squalus/librewolf
mweinelt Dec 25, 2023
695f623
Merge pull request #276756 from r-ryantm/auto-update/eask
NickCao Dec 25, 2023
a5ac2d8
kanata: mention breaking changes of v1.5.0
jian-lin Dec 25, 2023
2100a51
phpExtensions.apcu: remove obsolete patch
drupol Dec 25, 2023
5391c84
Merge pull request #276775 from linj-fork/pr/kanata-rl
jian-lin Dec 25, 2023
7d54909
Merge pull request #253263 from SuperSandro2000/nox-intel-vaapi-driver
NickCao Dec 25, 2023
e98a9c4
Merge pull request #276681 from r-ryantm/auto-update/baresip
7c6f434c Dec 25, 2023
5494aa2
Merge pull request #273308 from Stunkymonkey/install-device-fix-mdadm
lheckemann Dec 25, 2023
32ea06b
Merge pull request #275887 from drupol/bump/php/december-2023
drupol Dec 25, 2023
d1a42e9
Merge pull request #275214 from linsui/rustc
zowoq Dec 25, 2023
904b22f
Merge pull request #276635 from r-ryantm/auto-update/xwaylandvideobridge
NickCao Dec 25, 2023
2293e04
python311Packages.simplisafe-python: refactor
fabaff Dec 25, 2023
3569705
Merge pull request #276046 from r-ryantm/auto-update/python310Package…
NickCao Dec 26, 2023
d2a5f16
Merge pull request #273932 from chvp/upd/teams
lilyinstarlight Dec 26, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions nixos/doc/manual/release-notes/rl-2405.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `mkosi` was updated to v19. Parts of the user interface have changed. Consult the
[release notes](https://github.com/systemd/mkosi/releases/tag/v19) for a list of changes.

- The `kanata` package has been updated to v1.5.0, which includes [breaking changes](https://github.com/jtroo/kanata/releases/tag/v1.5.0).

- The latest available version of Nextcloud is v28 (available as `pkgs.nextcloud28`). The installation logic is as follows:
- If [`services.nextcloud.package`](#opt-services.nextcloud.package) is specified explicitly, this package will be installed (**recommended**)
- If [`system.stateVersion`](#opt-system.stateVersion) is >=24.05, `pkgs.nextcloud28` will be installed by default.
Expand Down
1 change: 1 addition & 0 deletions nixos/modules/config/no-x-libs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ with lib;
};
imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; };
imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; };
intel-vaapi-driver = super.intel-vaapi-driver.override { enableGui = false; };
libdevil = super.libdevil-nox;
libextractor = super.libextractor.override { gtkSupport = false; };
libva = super.libva-minimal;
Expand Down
2 changes: 2 additions & 0 deletions nixos/modules/profiles/installation-device.nix
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ with lib;
];

boot.swraid.enable = true;
# remove warning about unset mail
boot.swraid.mdadmConf = "PROGRAM ${pkgs.coreutils}/bin/true";

# Show all debug messages from the kernel but don't log refused packets
# because we have the firewall enabled. This makes installs from the
Expand Down
12 changes: 2 additions & 10 deletions pkgs/applications/audio/lsp-plugins/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,12 @@

stdenv.mkDerivation rec {
pname = "lsp-plugins";
version = "1.2.13";
version = "1.2.14";

src = fetchurl {
url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz";
sha256 = "sha256-eJO+1fCNzqjTdGrPlhIrHc3UimkJOydRqTq49IN+Iwo=";
sha256 = "sha256-GjNZ7ouKgpcb1+nuq+Q/WM5rSkeT2F+xb5exAOTt7po=";
};
patches = [
(fetchpatch {
url = "https://github.com/lsp-plugins/lsp-dsp-lib/commit/58c3f985f009c84347fa91236f164a9e47aafa93.patch";
stripLen = 1;
extraPrefix = "modules/lsp-dsp-lib/";
hash = "sha256-pCLucLijXOgp69xNjSRCRxgVoQziT0YiHLnQGbkefqE=";
})
];

outputs = [ "out" "dev" "doc" ];

Expand Down
10 changes: 5 additions & 5 deletions pkgs/applications/blockchains/bitcoin/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ let
in
stdenv.mkDerivation rec {
pname = if withGui then "bitcoin" else "bitcoind";
version = "25.1";
version = "26.0";

src = fetchurl {
urls = [
"https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
];
# hash retrieved from signed SHA256SUMS
sha256 = "bec2a598d8dfa8c2365b77f13012a733ec84b8c30386343b7ac1996e901198c9";
sha256 = "ab1d99276e28db62d1d9f3901e85ac358d7f1ebcb942d348a9c4e46f0fcdc0a1";
};

nativeBuildInputs =
Expand All @@ -55,9 +55,9 @@ stdenv.mkDerivation rec {
++ lib.optionals withGui [ qrencode qtbase qttools ];

postInstall = ''
installShellCompletion --cmd bitcoin-cli --bash contrib/completions/bash/bitcoin-cli.bash-completion
installShellCompletion --cmd bitcoind --bash contrib/completions/bash/bitcoind.bash-completion
installShellCompletion --cmd bitcoin-tx --bash contrib/completions/bash/bitcoin-tx.bash-completion
installShellCompletion --bash contrib/completions/bash/bitcoin-cli.bash
installShellCompletion --bash contrib/completions/bash/bitcoind.bash
installShellCompletion --bash contrib/completions/bash/bitcoin-tx.bash

installShellCompletion --fish contrib/completions/fish/bitcoin-cli.fish
installShellCompletion --fish contrib/completions/fish/bitcoind.fish
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/editors/vscode/extensions/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -344,8 +344,8 @@ let
mktplcRef = {
name = "vscode-neovim";
publisher = "asvetliakov";
version = "1.0.1";
sha256 = "1yf065syb5hskds47glnv18nk0fg7d84w1j72hg1pqb082gn1sdv";
version = "1.5.0";
sha256 = "1glad9xmzq58jc7js8afjmqrxgd3rqm80fk528wv5kqcmn90bgk3";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/misc/cheat/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@

buildGoModule rec {
pname = "cheat";
version = "4.4.0";
version = "4.4.2";

src = fetchFromGitHub {
owner = "cheat";
repo = "cheat";
rev = version;
sha256 = "sha256-lEMwPGXvgI8wtXska9ngAy9R2tr41Jq5yO6xQk9V5n4=";
sha256 = "sha256-GUU6VWfTmNS6ny12HnMr3uQmS7HI86Oupcmqx0MVAvE=";
};

subPackages = [ "cmd/cheat" ];
Expand Down
14 changes: 7 additions & 7 deletions pkgs/applications/networking/browsers/librewolf/src.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"packageVersion": "120.0.1-1",
"packageVersion": "121.0-1",
"source": {
"rev": "120.0.1-1",
"sha256": "0kvfa97m7dq1b030d62zblpb445fkbgb2w19bckxwxv7mx36awy7"
"rev": "121.0-1",
"sha256": "1vd4vz4i27p1lwx5ibaxqf7r1ll5zlvf54n6mqmaya3q0lrawb14"
},
"settings": {
"rev": "9dac02778ebed3e2614da52c36b7cede45f4f602",
"sha256": "0flk6v50cyiaajzcz9gm1hig00vkw9xdbjd5rdxidrmhcqxy24vy"
"rev": "41623492f2b6970972014f6ce196015d3d7f1b59",
"sha256": "0ayyyw44q0gh668bzlv6cfl7baa0818bnz83g53l5j2f10xd52by"
},
"firefox": {
"version": "120.0.1",
"sha512": "dd0e3eb234d58c39431d1f100834ef4bcc8cfb89ff471a37b948eda4dd3874b63b1979cda39a0db0dd3b4a579b5f09a7d2d1f39d26fd9f2b8d5635e4b8738b6c"
"version": "121.0",
"sha512": "52e9e21ce825c4e58f09fd2c7347f1ac4efbca47e119136a712f0d4ee80c769ef80a43bad74a4c88cd377f804f5780b07f7af5b779f3fb5d244fa095e6b3b18a"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
, dbusSupport ? true
}:
stdenv.mkDerivation rec {
version = "3.6.0";
version = "3.7.0";
pname = "baresip";
src = fetchFromGitHub {
owner = "baresip";
repo = "baresip";
rev = "v${version}";
hash = "sha256-cp9aaOtvFl9RUHPQRMkSjPvf0fJ29Bclh4SKnAHo7fE=";
hash = "sha256-A1S8pen0aPd3CmeRpttwivhwHnAv7Rk2lao8I/CWvo0=";
};
prePatch = lib.optionalString (!dbusSupport) ''
substituteInPlace cmake/modules.cmake --replace 'list(APPEND MODULES ctrl_dbus)' ""
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, makeWrapper
, makeDesktopItem
, copyDesktopItems
Expand All @@ -19,20 +20,30 @@

stdenv.mkDerivation (finalAttrs: {
pname = "teams-for-linux";
version = "1.3.22";
version = "1.4.1";

src = fetchFromGitHub {
owner = "IsmaelMartinez";
repo = "teams-for-linux";
rev = "v${finalAttrs.version}";
hash = "sha256-nyhAq06k0nNrGSbD0N1RNwcplYf5vO1BvnvEfNYGG0A=";
hash = "sha256-1URS9VPqV58p8RUA47j8sdqYqps1Ruo0aqdZXedvPX8=";
};

offlineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/yarn.lock";
hash = "sha256-ydhJXAvz3k6GwpnSL6brl9xFpb+ooi8Am89TkcE00hc=";
hash = "sha256-ef+JW5ud9LlRxaCJC2iOT5N7FgZO7IkAABJcMQPvIBA=";
};

patches = [
# remove when IsmaelMartinez/teams-for-linux#1058 is merged
(fetchpatch {
name = "teams-for-linux-fix-version.patch";
url = "https://github.com/IsmaelMartinez/teams-for-linux/commit/1d14947eef35c6a2e0cbdfcce405820f8dd36c68.diff";
hash = "sha256-kj2jEAqgZ0frUw85hY23mFYFcXz95z/WQSDymsheDfg=";
})
];


nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs copyDesktopItems makeWrapper ];

configurePhase = ''
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/office/ticktick/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "ticktick";
version = "1.0.80";
version = "2.0.0";

src = fetchurl {
url = "https://d2atcrkye2ik4e.cloudfront.net/download/linux/linux_deb_x64/${finalAttrs.pname}-${finalAttrs.version}-amd64.deb";
hash = "sha256-EK+8NFEim2gcFj9t6AGYdGVlyFj9Yq7NaOia3XKy3cc=";
hash = "sha256-LOllYdte+Y+pbjXI2zOQrwptmUo4Ck6OyYoEX6suY08=";
};

nativeBuildInputs = [
Expand Down
35 changes: 10 additions & 25 deletions pkgs/applications/terminal-emulators/darktile/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ stdenv
, fetchFromGitHub
, lib
, go
, pkg-config
, libX11
, libXcursor
Expand All @@ -12,20 +11,23 @@
, libXxf86vm
, libGL
, nixosTests
, buildGoModule
}:

stdenv.mkDerivation rec {
buildGoModule rec {
pname = "darktile";
version = "0.0.10";
version = "0.0.11";

src = fetchFromGitHub {
owner = "liamg";
repo = "darktile";
rev = "v${version}";
sha256 = "0pdj4yv3qrq56gb67p85ara3g8qrzw5ha787bl2ls4vcx85q7303";
hash = "sha256-M3vySAyYwqscR9n0GGXp1ttO/mhdSCponZNYJRBBI18=";
};

nativeBuildInputs = [ go pkg-config ];
vendorHash = null;

nativeBuildInputs = [ pkg-config ];

buildInputs = [
libX11
Expand All @@ -38,25 +40,6 @@ stdenv.mkDerivation rec {
libGL
];

postPatch = ''
substituteInPlace scripts/build.sh \
--replace "bash" "sh"
'';

postConfigure = ''
export GOPATH=$TMP/go
'';

makeFlags = [ "HOME=$TMP" ];

installPhase = ''
runHook preInstall

install -Dm755 darktile -t $out/bin

runHook postInstall
'';

passthru.tests.test = nixosTests.terminal-emulators.darktile;

meta = with lib; {
Expand All @@ -65,7 +48,9 @@ stdenv.mkDerivation rec {
downloadPage = "https://github.com/liamg/darktile/releases";
changelog = "https://github.com/liamg/darktile/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ flexagoon ];
platforms = platforms.linux;
badPlatforms = [ "aarch64-linux" ];
maintainers = with maintainers; [ mikaelfangel ];
mainProgram = "darktile";
};
}
35 changes: 18 additions & 17 deletions pkgs/desktops/gnome/core/gdm/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
, substituteAll
, meson
, ninja
, rsync
, pkg-config
, glib
, itstool
Expand Down Expand Up @@ -70,7 +69,6 @@ stdenv.mkDerivation (finalAttrs: {
meson
ninja
pkg-config
rsync
gobject-introspection
];

Expand Down Expand Up @@ -131,33 +129,36 @@ stdenv.mkDerivation (finalAttrs: {
'';

preInstall = ''
install -D ${override} $DESTDIR/$out/share/glib-2.0/schemas/org.gnome.login-screen.gschema.override
install -D ${override} "$DESTDIR/$out/share/glib-2.0/schemas/org.gnome.login-screen.gschema.override"
'';

postInstall = ''
# Move stuff from DESTDIR to proper location.
# We use rsync to merge the directories.
rsync --archive "$DESTDIR/etc" "$out"
rm --recursive "$DESTDIR/etc"
for o in $(getAllOutputNames); do
# debug is created later by _separateDebugInfo hook.
if [[ "$o" = "debug" ]]; then continue; fi
rsync --archive "$DESTDIR/''${!o}" "$(dirname "''${!o}")"
rm --recursive "$DESTDIR/''${!o}"
mv "$DESTDIR''${!o}" "$(dirname "''${!o}")"
done
# Ensure the DESTDIR is removed.
rmdir "$DESTDIR/nix/store" "$DESTDIR/nix" "$DESTDIR"

mv "$DESTDIR/etc" "$out"

# Ensure we did not forget to install anything.
rmdir --parents --ignore-fail-on-non-empty "$DESTDIR${builtins.storeDir}"
! test -e "$DESTDIR"

# We are setting DESTDIR so the post-install script does not compile the schemas.
glib-compile-schemas "$out/share/glib-2.0/schemas"
'';

# HACK: We want to install configuration files to $out/etc
# but GDM should read them from /etc on a NixOS system.
# With autotools, it was possible to override Make variables
# at install time but Meson does not support this
# so we need to convince it to install all files to a temporary
# location using DESTDIR and then move it to proper one in postInstall.
DESTDIR = "${placeholder "out"}/dest";
env = {
# HACK: We want to install configuration files to $out/etc
# but GDM should read them from /etc on a NixOS system.
# With autotools, it was possible to override Make variables
# at install time but Meson does not support this
# so we need to convince it to install all files to a temporary
# location using DESTDIR and then move it to proper one in postInstall.
DESTDIR = "dest";
};

separateDebugInfo = true;

Expand Down
8 changes: 5 additions & 3 deletions pkgs/development/compilers/rust/binary.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ rec {
inherit src;

meta = with lib; {
homepage = "http://www.rust-lang.org/";
homepage = "https://www.rust-lang.org/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
description = "A safe, concurrent, practical language";
maintainers = with maintainers; [ qknight ];
license = [ licenses.mit licenses.asl20 ];
Expand Down Expand Up @@ -70,8 +71,9 @@ rec {
inherit src;

meta = with lib; {
homepage = "http://www.rust-lang.org/";
description = "A safe, concurrent, practical language";
homepage = "https://doc.rust-lang.org/cargo/";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
description = "The Rust package manager";
maintainers = with maintainers; [ qknight ];
license = [ licenses.mit licenses.asl20 ];
};
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/embedded/svdtools/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@

rustPlatform.buildRustPackage rec {
pname = "svdtools";
version = "0.3.6";
version = "0.3.8";

src = fetchCrate {
inherit version pname;
hash = "sha256-bk6kv13HMDSRBjShWnRZJzb0YX0zKljPoEC6tebkVKI=";
hash = "sha256-daATz1bd5fwfYnfVbweJd/I6SsQyg2CC+MEZ5WLyZBw=";
};

cargoHash = "sha256-MdYzYmbI7ZNLeLZdnLIVo9y2rvmGevEGy7t+2FFu5yo=";
cargoHash = "sha256-TSLUBkPRab6cwlXJw8tHpqYjhLtVa+QJZq13Qj/0UzU=";

meta = with lib; {
description = "Tools to handle vendor-supplied, often buggy SVD files";
Expand Down
5 changes: 2 additions & 3 deletions pkgs/development/interpreters/php/8.1.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@

let
base = callPackage ./generic.nix (_args // {
version = "8.1.26";
hash = "sha256-g73iSchKoaBDqMjQ7qCTRcLK5puXhM3wIin8kW+7nqA=";
version = "8.1.27";
hash = "sha256-oV/XPqRPLfMLB9JHhuB9GUiw6j7tC4uEVzXVANwov/E=";
});

in
base.withExtensions ({ all, ... }: with all; ([
bcmath
Expand Down
Loading