BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2023-05-01 12:01:54 +00:00 committed by GitHub
commit cff4be2a2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
66 changed files with 1885 additions and 1250 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/kernel.nix
View file

@ -11,6 +11,7 @@ with lib;
yes = { tristate = "y"; optional = false; };
no = { tristate = "n"; optional = false; };
module = { tristate = "m"; optional = false; };
unset = { tristate = null; optional = false; };
freeform = x: { freeform = x; optional = false; };
/*

4
nixos/doc/manual/release-notes/rl-2305.section.md
View file

@ -46,7 +46,7 @@ In addition to numerous new and upgraded packages, this release has the followin
- [Cloudlog](https://www.magicbug.co.uk/cloudlog/), a web-based Amateur Radio logging application. Available as [services.cloudlog](#opt-services.cloudlog.enable).
- [Deepin Desktop Environment](https://github.com/linuxdeepin/dde), an elegant, easy to use and reliable desktop environment. Availabe as [services.xserver.desktopManager.deepin](options.html#opt-services.xserver.desktopManager.deepin).
- [Deepin Desktop Environment](https://github.com/linuxdeepin/dde), an elegant, easy to use and reliable desktop environment. Available as [services.xserver.desktopManager.deepin](options.html#opt-services.xserver.desktopManager.deepin).
- [fzf](https://github.com/junegunn/fzf), a command line fuzzyfinder. Available as [programs.fzf](#opt-programs.fzf.fuzzyCompletion).
@ -140,6 +140,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- `carnix` and `cratesIO` has been removed due to being unmaintained, use alternatives such as [naersk](https://github.com/nix-community/naersk) and [crate2nix](https://github.com/kolloch/crate2nix) instead.
- `services.asusd` configuration now uses strings instead of structured configuration, as upstream switched to the [RON](https://github.com/ron-rs/ron) configuration format. Support for structured configuration may return when [RON](https://github.com/ron-rs/ron) generation is implemented in nixpkgs.
- `checkInputs` have been renamed to `nativeCheckInputs`, because they behave the same as `nativeBuildInputs` when `doCheck` is set. `checkInputs` now denote a new type of dependencies, added to `buildInputs` when `doCheck` is set. As a rule of thumb, `nativeCheckInputs` are tools on `$PATH` used during the tests, and `checkInputs` are libraries which are linked to executables built as part of the tests. Similarly, `installCheckInputs` are renamed to `nativeInstallCheckInputs`, corresponding to `nativeBuildInputs`, and `installCheckInputs` are a new type of dependencies added to `buildInputs` when `doInstallCheck` is set. (Note that this change will not cause breakage to derivations with `strictDeps` unset, which are most packages except python, rust, ocaml and go packages).
- `buildDunePackage` now defaults to `strictDeps = true` which means that any library should go into `buildInputs` or `checkInputs`. Any executable that is run on the building machine should go into `nativeBuildInputs` or `nativeCheckInputs` respectively. Example of executables are `ocaml`, `findlib` and `menhir`. PPXs are libraries which are built by dune and should therefore not go into `nativeBuildInputs`.

60
nixos/modules/services/hardware/asusd.nix
View file

@ -2,8 +2,6 @@
let
cfg = config.services.asusd;
json = pkgs.formats.json { };
toml = pkgs.formats.toml { };
in
{
options = {
@ -19,55 +17,55 @@ in
};
animeConfig = lib.mkOption {
type = json.type;
default = { };
type = lib.types.nullOr lib.types.str;
default = null;
description = lib.mdDoc ''
The content of /etc/asusd/anime.conf.
The content of /etc/asusd/anime.ron.
See https://asus-linux.org/asusctl/#anime-control.
'';
};
asusdConfig = lib.mkOption {
type = json.type;
default = { };
type = lib.types.nullOr lib.types.str;
default = null;
description = lib.mdDoc ''
The content of /etc/asusd/asusd.conf.
The content of /etc/asusd/asusd.ron.
See https://asus-linux.org/asusctl/.
'';
};
auraConfig = lib.mkOption {
type = json.type;
default = { };
type = lib.types.nullOr lib.types.str;
default = null;
description = lib.mdDoc ''
The content of /etc/asusd/aura.conf.
The content of /etc/asusd/aura.ron.
See https://asus-linux.org/asusctl/#led-keyboard-control.
'';
};
profileConfig = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default = "";
default = null;
description = lib.mdDoc ''
The content of /etc/asusd/profile.conf.
The content of /etc/asusd/profile.ron.
See https://asus-linux.org/asusctl/#profiles.
'';
};
ledModesConfig = lib.mkOption {
type = lib.types.nullOr toml.type;
fanCurvesConfig = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default = null;
description = lib.mdDoc ''
The content of /etc/asusd/asusd-ledmodes.toml. Leave `null` to use default settings.
See https://asus-linux.org/asusctl/#led-keyboard-control.
The content of /etc/asusd/fan_curves.ron.
See https://asus-linux.org/asusctl/#fan-curves.
'';
};
userLedModesConfig = lib.mkOption {
type = lib.types.nullOr toml.type;
type = lib.types.nullOr lib.types.str;
default = null;
description = lib.mdDoc ''
The content of /etc/asusd/asusd-user-ledmodes.toml.
The content of /etc/asusd/asusd-user-ledmodes.ron.
See https://asus-linux.org/asusctl/#led-keyboard-control.
'';
};
@ -79,26 +77,18 @@ in
environment.etc =
let
maybeConfig = name: cfg: lib.mkIf (cfg != { }) {
source = json.generate name cfg;
maybeConfig = name: cfg: lib.mkIf (cfg != null) {
source = pkgs.writeText name cfg;
mode = "0644";
};
in
{
"asusd/anime.conf" = maybeConfig "anime.conf" cfg.animeConfig;
"asusd/asusd.conf" = maybeConfig "asusd.conf" cfg.asusdConfig;
"asusd/aura.conf" = maybeConfig "aura.conf" cfg.auraConfig;
"asusd/profile.conf" = lib.mkIf (cfg.profileConfig != null) {
source = pkgs.writeText "profile.conf" cfg.profileConfig;
mode = "0644";
};
"asusd/asusd-ledmodes.toml" = {
source =
if cfg.ledModesConfig == null
then "${pkgs.asusctl}/share/asusd/data/asusd-ledmodes.toml"
else toml.generate "asusd-ledmodes.toml" cfg.ledModesConfig;
mode = "0644";
};
"asusd/anime.ron" = maybeConfig "anime.ron" cfg.animeConfig;
"asusd/asusd.ron" = maybeConfig "asusd.ron" cfg.asusdConfig;
"asusd/aura.ron" = maybeConfig "aura.ron" cfg.auraConfig;
"asusd/profile.conf" = maybeConfig "profile.ron" cfg.profileConfig;
"asusd/fan_curves.ron" = maybeConfig "fan_curves.ron" cfg.fanCurvesConfig;
"asusd/asusd_user_ledmodes.ron" = maybeConfig "asusd_user_ledmodes.ron" cfg.userLedModesConfig;
};
services.dbus.enable = true;

2
nixos/modules/services/misc/fstrim.nix
View file

@ -34,7 +34,7 @@ in {
systemd.timers.fstrim = {
timerConfig = {
OnCalendar = cfg.interval;
OnCalendar = [ "" cfg.interval ];
};
wantedBy = [ "timers.target" ];
};

4
pkgs/applications/audio/pipecontrol/default.nix
View file

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "pipecontrol";
version = "0.2.8";
version = "0.2.10";
src = fetchFromGitHub {
owner = "portaloffreedom";
repo = pname;
rev = "v${version}";
sha256 = "sha256-x33L/oLgJFiHp19FzinVuGT9k73wOhdSaTTemq52ZVg=";
sha256 = "sha256-MSm9rW41x8qvPuDermOPIYpxgblk5hlKIQsUEAvCzMo=";
};
nativeBuildInputs = [

9
pkgs/applications/editors/vscode/extensions/default.nix
View file

@ -1807,11 +1807,16 @@ let
mktplcRef = {
name = "vscode-clangd";
publisher = "llvm-vs-code-extensions";
version = "0.1.23";
sha256 = "125incws4n688irqii3s2a1cznj0kvkbhv3sa8585chj5g4zvmfy";
version = "0.1.24";
sha256 = "sha256-yOpsYjjwHRXxbiHDPgrtswUtgbQAo+3RgN2s6UYe9mg=";
};
meta = {
description = "C/C++ completion, navigation, and insights";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=llvm-vs-code-extensions.vscode-clangd";
homepage = "https://github.com/clangd/vscode-clangd";
changelog = "https://marketplace.visualstudio.com/items/llvm-vs-code-extensions.vscode-clangd/changelog";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.wackbyte ];
};
};

59
pkgs/applications/misc/arianna/default.nix Normal file
View file

@ -0,0 +1,59 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, pkg-config
, baloo
, kfilemetadata
, kirigami2
, kirigami-addons
, kquickcharts
, plasma-framework
, qqc2-desktop-style
, qtbase
, qtquickcontrols2
, qtwebsockets
, qtwebengine
}:
mkDerivation rec {
pname = "arianna";
version = "1.0.0";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "graphics";
repo = "arianna";
rev = "v${version}";
hash = "sha256-X3PDGWsQ8Alj5fisZC1tTHQDLPmjtiLw0X9gMvh5KFI=";
};
nativeBuildInputs = [
cmake
extra-cmake-modules
pkg-config
];
buildInputs = [
baloo
kfilemetadata
kirigami2
kirigami-addons
kquickcharts
plasma-framework
qqc2-desktop-style
qtbase
qtquickcontrols2
qtwebsockets
qtwebengine
];
meta = with lib; {
description = "An Epub Reader for Plasma and Plasma Mobile";
homepage = "https://invent.kde.org/graphics/arianna";
license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ Thra11 ];
};
}

1
pkgs/applications/misc/taskjuggler/Gemfile
View file

@ -1,2 +1,3 @@
source 'https://rubygems.org'
gem 'taskjuggler'
gem 'webrick'

4
pkgs/applications/misc/taskjuggler/Gemfile.lock
View file

@ -26,12 +26,14 @@ GEM
timeout (0.3.2)
tins (1.32.1)
sync
webrick (1.8.1)
PLATFORMS
ruby
x86_64-linux
DEPENDENCIES
taskjuggler
webrick
BUNDLED WITH
2.4.12

10
pkgs/applications/misc/taskjuggler/gemset.nix
View file

@ -127,4 +127,14 @@
};
version = "1.32.1";
};
webrick = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r";
type = "gem";
};
version = "1.8.1";
};
}

4
pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
View file

@ -2,13 +2,13 @@
(if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec {
pname = "signalbackup-tools";
version = "20230426";
version = "20230429";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
hash = "sha256-RpPn3QWsCOW1RIucBp5oqR/zwnfIwG+McqAPwo0f5lM=";
hash = "sha256-uOZfEZ5Wf+4lz5FxPqsockAIA/um61OZ6mvjj51BGkg=";
};
postPatch = ''

6
pkgs/applications/networking/instant-messengers/tangram/default.nix
View file

@ -25,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "tangram";
version = "2.0";
version = "3.0";
src = fetchFromGitHub {
owner = "sonnyp";
repo = "Tangram";
rev = "v${version}";
hash = "sha256-ocHE8IztiNm9A1hbzzHXstWpPaOau/IrQ44ccxbsGb0=";
hash = "sha256-6QOkvsYFgFFyxnDlA5Xpl3FnsSZOj9ooehCPOmpKe8M=";
fetchSubmodules = true;
};
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace src/meson.build --replace "/app/bin/blueprint-compiler" "blueprint-compiler"
substituteInPlace {src/,}re.sonny.Tangram troll/gjspack/bin/gjspack \
substituteInPlace src/bin.js troll/gjspack/bin/gjspack \
--replace "#!/usr/bin/env -S gjs -m" "#!${gjs}/bin/gjs -m"
'';

14
pkgs/applications/networking/remote/vmware-horizon-client/default.nix
View file

@ -10,7 +10,7 @@
, configText ? ""
}:
let
version = "2206";
version = "2303";
sysArch =
if stdenv.hostPlatform.system == "x86_64-linux" then "x64"
@ -19,9 +19,12 @@ let
# For USB support, ensure that /var/run/vmware/<YOUR-UID>
# exists and is owned by you. Then run vmware-usbarbitrator as root.
bins = [ "vmware-view" "vmware-view-legacy" "vmware-usbarbitrator" ];
bins = [
"vmware-view"
"vmware-usbarbitrator"
];
mainProgram = "vmware-view-legacy";
mainProgram = "vmware-view";
# This forces the default GTK theme (Adwaita) because Horizon is prone to
# UI usability issues when using non-default themes, such as Adwaita-dark.
@ -36,8 +39,8 @@ let
pname = "vmware-horizon-files";
inherit version;
src = fetchurl {
url = "https://download3.vmware.com/software/CART23FQ2_LIN_2206_TARBALL/VMware-Horizon-Client-Linux-2206-8.6.0-20094634.tar.gz";
sha256 = "9819eae5708bf0d71156b81283e3a70100e2e22de9db827a8956ca8e83b2414a";
url = "https://download3.vmware.com/software/CART24FQ1_LIN_2303_TARBALL/VMware-Horizon-Client-Linux-2303-8.9.0-21435420.tar.gz";
sha256 = "a4dcc6afc0be7641e10e922ccbbab0a10adbf8f2a83e4b5372dfba095091fb78";
};
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
@ -93,6 +96,7 @@ let
pixman
vmwareHorizonClientFiles
xorg.libX11
xorg.libXau
xorg.libXcursor
xorg.libXext
xorg.libXi

2
pkgs/applications/office/zotero/default.nix
View file

@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
'';
desktopItem = makeDesktopItem {
name = "zotero-${version}";
name = "zotero";
exec = "zotero -url %U";
icon = "zotero";
comment = meta.description;

1922
pkgs/applications/system/asusctl/Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

33
pkgs/applications/system/asusctl/default.nix
View file

@ -13,32 +13,31 @@
rustPlatform.buildRustPackage rec {
pname = "asusctl";
version = "4.5.8";
version = "4.6.2";
src = fetchFromGitLab {
owner = "asus-linux";
repo = "asusctl";
rev = version;
hash = "sha256-6AitRpyLIq5by9/rXdIC8AChMVKZmR1Eo5GTo+DtGhc=";
hash = "sha256-qfl8MUSHjqlSnsaudoRD9fY5TM9zgy7L7DA+pctn/nc=";
};
cargoHash = "";
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"ecolor-0.20.0" = "sha256-tnjFkaCWmCPGw3huQN9VOAeiH+zk3Zk9xYoRKmg2WQg=";
"ecolor-0.21.0" = "sha256-m7eHX6flwO21umtx3dnIuVUnNsEs3ZCyOk5Vvp/lVfI=";
"notify-rust-4.6.0" = "sha256-jhCgisA9f6AI9e9JQUYRtEt47gQnDv5WsdRKFoKvHJs=";
"supergfxctl-5.0.2" = "sha256-zp92mWyWUEWUP4kEyHbiUyYTtp2kLv+gxkPzOu77fi8=";
"supergfxctl-5.1.1" = "sha256-AThaZ9dp5T/DtLPE6gZ9qgkw0xksiq+VCL9Y4G41voE=";
};
};
postPatch = ''
files="
daemon/src/config.rs
daemon/src/ctrl_anime/config.rs
daemon-user/src/daemon.rs
daemon-user/src/ctrl_anime.rs
daemon-user/src/user_config.rs
daemon-user/src/config.rs
rog-control-center/src/main.rs
rog-aura/src/aura_detection.rs
"
for file in $files; do
substituteInPlace $file --replace /usr/share $out/share
@ -63,23 +62,7 @@ rustPlatform.buildRustPackage rec {
doCheck = false;
postInstall = ''
install -Dm444 -t $out/share/dbus-1/system.d/ data/asusd.conf
install -Dm444 -t $out/share/rog-gui/layouts/ rog-aura/data/layouts/*
install -Dm444 -t $out/share/applications/ rog-control-center/data/rog-control-center.desktop
install -Dm444 -t $out/share/icons/hicolor/512x512/apps/ rog-control-center/data/rog-control-center.png data/icons/asus_notif_*
install -Dm444 -t $out/share/icons/hicolor/scalable/status/ data/icons/scalable/*
install -Dm444 -t $out/share/asusd/anime/asus/rog/ rog-anime/data/anime/asus/rog/Sunset.gif
install -Dm444 -t $out/share/asusd/anime/asus/gaming/ rog-anime/data/anime/asus/gaming/Controller.gif
install -Dm444 -t $out/share/asusd/anime/custom/ rog-anime/data/anime/custom/*
install -Dm444 -t $out/share/asusd/data/ data/asusd-ledmodes.toml
install -Dm444 data/asusd.rules $out/lib/udev/rules.d/99-asusd.rules
install -Dm444 -t $out/share/dbus-1/system.d/ data/asusd.conf
install -Dm444 -t $out/lib/systemd/system/ data/asusd.service
install -Dm444 -t $out/lib/systemd/user/ data/asusd-user.service
make prefix=$out install-data
'';
postFixup = ''

17
pkgs/applications/system/supergfxctl/default.nix
View file

@ -1,22 +1,33 @@
{ lib
, rustPlatform
, fetchFromGitLab
, fetchpatch
, pkg-config
, systemd
}:
rustPlatform.buildRustPackage rec {
pname = "supergfxctl";
version = "5.0.1";
version = "5.1.1";
src = fetchFromGitLab {
owner = "asus-linux";
repo = "supergfxctl";
rev = version;
hash = "sha256-4q+7F8s6y+oDkBUKIBBsXZ2EtADcChdnjmABjBUnH9k=";
hash = "sha256-AThaZ9dp5T/DtLPE6gZ9qgkw0xksiq+VCL9Y4G41voE=";
};
cargoSha256 = "sha256-nfs9sUq9569qXsC7JYMzrRPdQQm/l4HZANlG7827K8o=";
# fix reported version in Cargo.lock
# submitted upstream: https://gitlab.com/asus-linux/supergfxctl/-/merge_requests/31
# FIXME: remove for next update
cargoPatches = [
(fetchpatch {
url = "https://gitlab.com/asus-linux/supergfxctl/-/commit/8812dd208791d162881d72f785650a3344ec5151.diff";
hash = "sha256-eFFj2nIwGXHV1vMIpZvdvFPtfNLDfgqyGRt+VvB03LE=";
})
];
cargoSha256 = "sha256-gbRGUWfpCQjCxuTdQ+qwOeCDU17G3nNFkIPAgzmeL+E=";
postPatch = ''
substituteInPlace data/supergfxd.service --replace /usr/bin/supergfxd $out/bin/supergfxd

6
pkgs/applications/window-managers/i3/status-rust.nix
View file

@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "i3status-rust";
version = "0.31.0";
version = "0.31.1";
src = fetchFromGitHub {
owner = "greshake";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-xOwzNQGoa5rOEZnIt8738aGTHSWvgzN17TSc3hi+fcE=";
hash = "sha256-nAwAQUjoKeGaTixTdk9yIgdy4+j6t6cbvH4NpBdSyns=";
};
cargoHash = "sha256-rZmqyIe/FUIard35NFr5W/18t1auSYdAV54dlEprnm8=";
cargoHash = "sha256-/Z6HKOMIhQm52MlPty8ED9QPPJcM7juDpQQKgJVozyU=";
nativeBuildInputs = [ pkg-config makeWrapper ];

14
pkgs/desktops/gnome/misc/geary/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, fetchpatch2
, pkg-config
, gtk3
, vala
@ -54,6 +55,19 @@ stdenv.mkDerivation rec {
sha256 = "SJFm+H3Z0pAR9eW3lpTyWItHP34ZHFnOkBPIyODjY+c=";
};
patches = [
# Fix build with Vala 0.56.7 & 0.57+
# https://hydra.nixos.org/build/217892787
(fetchpatch2 {
url = "https://gitlab.gnome.org/GNOME/geary/-/commit/4a7ca820b1d3d6130fedf254dc5b4cd7efb58f2c.patch";
sha256 = "L63TMOkxTYu8jxX+IIc9owoa1TBmaeGXgW+8gfMtFw4=";
})
(fetchpatch2 {
url = "https://gitlab.gnome.org/GNOME/geary/-/commit/10f9c133a2ad515127d65f3bba13a0d91b75f4af.patch";
sha256 = "0yohy+FZyHW4MkImLQYNlcZyMekH7mXvO2yEuAm3fXw=";
})
];
nativeBuildInputs = [
appstream-glib
desktop-file-utils

15
pkgs/development/compilers/sbcl/2.x.nix
View file

@ -19,17 +19,16 @@ let
sha256 = "189gjqzdz10xh3ybiy4ch1r98bsmkcb4hpnrmggd4y2g5kqnyx4y";
};
"2.2.11" = {
sha256 = "sha256-NgfWgBZzGICEXO1dXVXGBUzEnxkSGhUCfmxWB66Elt8=";
};
"2.3.0" = {
sha256 = "sha256-v3Q5SXEq4Cy3ST87i1fOJBlIv2ETHjaGDdszTaFDnJc=";
};
# The loosely held nixpkgs convention for SBCL is to keep the last two
# versions.
# https://github.com/NixOS/nixpkgs/pull/200994#issuecomment-1315042841
"2.3.2" = {
sha256 = "sha256-RMwWLPpjMqmojHoSHRkDiCikuk9r/7d+8cexdAfLHqo=";
};
"2.3.4" = {
sha256 = "sha256-8RtHZMbqvbJ+WpxGshcgTRG82lNOc7+XBz1Xgx0gnE4=";
};
};
in with versionMap.${version};

3
pkgs/development/interpreters/python/cpython/default.nix
View file

@ -288,6 +288,9 @@ in with passthru; stdenv.mkDerivation {
./3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch
# Use sysconfigdata to find headers. Fixes cross-compilation of extension modules.
./3.7/fix-finding-headers-when-cross-compiling.patch
] ++ optionals stdenv.hostPlatform.isLoongArch64 [
# https://github.com/python/cpython/issues/90656
./loongarch-support.patch
];
postPatch = ''

50
pkgs/development/interpreters/python/cpython/loongarch-support.patch Normal file
View file

@ -0,0 +1,50 @@
diff --git a/configure b/configure
index 8133d47f61..334c98e208 100755
--- a/configure
+++ b/configure
@@ -6215,6 +6215,20 @@ cat > conftest.c <<EOF
# else
# error unknown platform triplet
# endif
+# elif defined(__loongarch__)
+# if defined(__loongarch_lp64)
+# if defined(__loongarch_soft_float)
+ loongarch64-linux-gnusf
+# elif defined(__loongarch_single_float)
+ loongarch64-linux-gnuf32
+# elif defined(__loongarch_double_float)
+ loongarch64-linux-gnu
+# else
+# error unknown platform triplet
+# endif
+# else
+# error unknown platform triplet
+# endif
# else
# error unknown platform triplet
# endif
diff --git a/configure.ac b/configure.ac
index 3f20d8980d..acde94a181 100644
--- a/configure.ac
+++ b/configure.ac
@@ -959,6 +959,20 @@ cat > conftest.c <<EOF
hppa-linux-gnu
# elif defined(__ia64__)
ia64-linux-gnu
+# elif defined(__loongarch__)
+# if defined(__loongarch_lp64)
+# if defined(__loongarch_soft_float)
+ loongarch64-linux-gnusf
+# elif defined(__loongarch_single_float)
+ loongarch64-linux-gnuf32
+# elif defined(__loongarch_double_float)
+ loongarch64-linux-gnu
+# else
+# error unknown platform triplet
+# endif
+# else
+# error unknown platform triplet
+# endif
# elif defined(__m68k__) && !defined(__mcoldfire__)
m68k-linux-gnu
# elif defined(__mips_hard_float) && defined(__mips_isa_rev) && (__mips_isa_rev >=6) && defined(_MIPSEL)

4
pkgs/development/libraries/aws-c-sdkutils/default.nix
View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-sdkutils";
version = "0.1.8";
version = "0.1.9";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-sdkutils";
rev = "v${version}";
sha256 = "sha256-7aLupTbKC2I7+ylySe1xq3q6YDP9ogLlsWSKBk+jI+Q=";
sha256 = "sha256-iKHO8awWWB8tvYCr+/R6hhK8a/PnanYYEAJ7zNOJC3w=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/java/commons/compress/default.nix
View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "1.22";
version = "1.23.0";
pname = "commons-compress";
src = fetchurl {
url = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz";
sha256 = "sha256-Bn3yxK1sw0U+iK6vXneVXNuRjBNzIugJAEBa+GEZSPc=";
sha256 = "sha256-m+7cc7h9xVXKlLBTTr2L91AFWDTN+hNSycxDNO0oBAI=";
};
installPhase = ''

4
pkgs/development/libraries/kirigami-addons/default.nix
View file

@ -12,14 +12,14 @@
mkDerivation rec {
pname = "kirigami-addons";
version = "0.7.2";
version = "0.8.0";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "libraries";
repo = pname;
rev = "v${version}";
sha256 = "sha256-2s9ShwYd2hOb18WRA2nLst6Q4UBHvFL+g7Grpjclz9I=";
hash = "sha256-ObbpM1gVVFhOIHOla5YS8YYe+JoPgdZ8kJ356wLTJq4=";
};
nativeBuildInputs = [

18
pkgs/development/libraries/science/math/openblas/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, perl, which
{ lib, stdenv, fetchFromGitHub, fetchpatch, perl, which
# Most packages depending on openblas expect integer width to match
# pointer width, but some expect to use 32-bit integers always
# (for compatibility with reference BLAS).
@ -106,6 +106,13 @@ let
DYNAMIC_ARCH = setDynamicArch false;
USE_OPENMP = true;
};
loongarch64-linux = {
BINARY = 64;
TARGET = setTarget "LOONGSONGENERIC";
DYNAMIC_ARCH = setDynamicArch false;
USE_OPENMP = true;
};
};
in
@ -145,6 +152,15 @@ stdenv.mkDerivation rec {
sha256 = "sha256-F6cXPqQai4kA5zrsa8E0Q7dD9zZHlwZ+B16EOGNXoXs=";
};
patches = lib.optionals stdenv.hostPlatform.isLoongArch64 [
# https://github.com/xianyi/OpenBLAS/pull/3626
(fetchpatch {
name = "openblas-0.3.21-fix-loong.patch";
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/openblas/files/openblas-0.3.21-fix-loong.patch?id=37ee4c70278eb41181f69e175575b0152b941655";
hash = "sha256-iWy11l3wEvzNV08LbhOjnSPj1SjPH8RMnb3ORz7V+gc";
})
];
postPatch = ''
# cc1: error: invalid feature modifier 'sve2' in '-march=armv8.5-a+sve+sve2+bf16'
substituteInPlace Makefile.arm64 --replace "+sve2+bf16" ""

16
pkgs/development/libraries/serf/default.nix
View file

@ -1,5 +1,6 @@
{ lib, stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, libkrb5
, pkg-config, libiconv }:
, pkg-config, libiconv
, fetchpatch }:
stdenv.mkDerivation rec {
pname = "serf";
@ -14,7 +15,18 @@ stdenv.mkDerivation rec {
buildInputs = [ apr openssl aprutil zlib libiconv ]
++ lib.optional (!stdenv.isCygwin) libkrb5;
patches = [ ./scons.patch ];
patches = [
./scons.patch
# https://issues.apache.org/jira/projects/SERF/issues/SERF-198
(fetchpatch {
url = "https://issues.apache.org/jira/secure/attachment/13019945/serf.patch";
hash = "sha256-3djDGG30R/gq74KJL8OJ/upMh1zDpqtwGylRzN0lXpY=";
})
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/libserf/raw/rawhide/f/libserf-1.3.9-errgetfunc.patch";
hash = "sha256-FQJvXOIZ0iItvbbcu4kR88j74M7fOi7C/0NN3o1/ub4=";
})
];
prefixKey = "PREFIX=";

4
pkgs/development/libraries/simgear/default.nix
View file

@ -4,7 +4,7 @@
, curl
}:
let
version = "2020.3.17";
version = "2020.3.18";
shortVersion = builtins.substring 0 6 version;
in
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
sha256 = "sha256-TF6c0Nz/G9MRwkYKpgEjC9gKvbrsdRtVnB1xR3SfN3w=";
sha256 = "sha256-bMHPJVaxckB5KezyurJDLG+wXuFt0ZAm6QNp8lc2Nso=";
};
nativeBuildInputs = [ cmake ];

17
pkgs/development/lisp-modules/packages.nix
View file

@ -591,6 +591,23 @@ let
lispLibs = with super; [ clim mcclim mcclim-layouts ];
};
kons-9 = build-asdf-system rec {
pname = "kons-9";
version = "trunk";
src = pkgs.fetchFromGitHub {
owner = "kaveh808";
repo = "kons-9";
rev = "95ad44fac0566f445c4b7bd040339dcff75ee992";
sha256 = "19rl7372j9f1cv2kl55r8vyf4dhcz4way4hkjgysbxzrb1psp17n";
};
systems = [ "kons-9" "kons-9/testsuite" ];
lispLibs = with super; [
closer-mop trivial-main-thread trivial-backtrace cffi cl-opengl cl-glu
cl-glfw3 cl-paths-ttf zpb-ttf cl-vectors origin clobber
org_dot_melusina_dot_confidence
];
};
});
in packages

4
pkgs/development/nim-packages/npeg/default.nix
View file

@ -2,12 +2,12 @@
buildNimPackage rec {
pname = "npeg";
version = "1.0.1";
version = "1.2.1";
src = fetchFromGitHub {
owner = "zevv";
repo = pname;
rev = version;
hash = "sha256-EN3wTSa+WveO7V29A2lJgWLwIlHzQE8t7T2m4u7niMc=";
hash = "sha256-kN91cp50ZL4INeRWqwrRK6CAkVXUq4rN4YlcN6WL/3Y=";
};
doCheck = true;
meta = src.meta // {

4
pkgs/development/python-modules/dbus-python-client-gen/default.nix
View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "dbus-python-client-gen";
version = "0.8.2";
version = "0.8.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "stratis-storage";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-RYgS4RNLLCtp+5gS/LlzdH7rlub48TSSSKhykkkBcuo=";
hash = "sha256-4Y4cL254ZlZKF6d6cStIOya3J4ZfypuumwKOdDNzuNc=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/deepwave/default.nix
View file

@ -18,14 +18,14 @@ let
in
buildPythonPackage rec {
pname = "deepwave";
version = "0.0.17";
version = "0.0.18";
format = "pyproject";
src = fetchFromGitHub {
owner = "ar4";
repo = pname;
rev = "v${version}";
hash = "sha256-4B3V87/voYs61pXhqmydLe48JsnRGuJlUYOOdmJlroA=";
hash = "sha256-DOOy+B12jgwJzQ90qzX50OFxYLPRcVdVYSE5gi3pqDM=";
};
# unable to find ninja although it is available, most likely because it looks for its pip version

4
pkgs/development/python-modules/django-phonenumber-field/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "django-phonenumber-field";
version = "7.0.2";
version = "7.1.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "stefanfoulis";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-y5eVyF6gBgkH+uQ2424kCe+XRB/ttbnJPkg6ToRxAmI=";
hash = "sha256-Ey/EuP3WzoGcPPJlDg97cznU5dqDPBLX/aEGPdBm9Fc=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

21
pkgs/development/python-modules/django-simple-captcha/default.nix
View file

@ -2,7 +2,6 @@
, buildPythonPackage
, fetchPypi
, python
, six
, testfixtures
, django
, django-ranged-response
@ -13,26 +12,32 @@
buildPythonPackage rec {
pname = "django-simple-captcha";
version = "0.5.14";
version = "0.5.17";
src = fetchPypi {
inherit pname version;
sha256 = "84b5c188e6ae50e9ecec5e5d734c5bc4d2a50fbbca7f59d2c12da9a3bbee5051";
extension = "zip";
hash = "sha256-lknmbatOce+sv+8C9IuDuRaEiYNSoatW8Whs5xAzsyg=";
};
nativeCheckInputs = [ testfixtures ];
nativeCheckInputs = [
testfixtures
];
checkPhase = ''
cd testproject
${python.interpreter} manage.py test captcha
'';
propagatedBuildInputs = [ django django-ranged-response six pillow ]
++ lib.optional withTTS flite;
propagatedBuildInputs = [
django
django-ranged-response
pillow
] ++ lib.optional withTTS flite;
meta = with lib; {
description = "An extremely simple, yet highly customizable Django application to add captcha images to any Django form";
description = "Customizable Django application to add captcha images to any Django form";
homepage = "https://github.com/mbi/django-simple-captcha";
changelog = "https://github.com/mbi/django-simple-captcha/blob/v${version}/CHANGES";
license = licenses.mit;
maintainers = with maintainers; [ mrmebelman schmittlauch ];
};

29
pkgs/development/python-modules/django-stubs-ext/default.nix
View file

@ -1,18 +1,39 @@
{ buildPythonPackage, django, fetchPypi, lib, typing-extensions }:
{ lib
, buildPythonPackage
, django
, fetchPypi
, pytestCheckHook
, pythonOlder
, typing-extensions
}:
buildPythonPackage rec {
pname = "django-stubs-ext";
version = "0.8.0";
version = "4.2.0";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-mpup4oCHN5Sd6WoPzosFTxLTjkYQEdd+vAdP/oxD38s=";
hash = "sha256-d4nwyuynFS/vB61rlN7HMQoF0Ljat395eeGdsAN7USc=";
};
# setup.cfg tries to pull in nonexistent LICENSE.txt file
postPatch = "rm setup.cfg";
propagatedBuildInputs = [ django typing-extensions ];
propagatedBuildInputs = [
django
typing-extensions
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"django_stubs_ext"
];
meta = with lib; {
description = "Extensions and monkey-patching for django-stubs";

21
pkgs/development/python-modules/django-stubs/default.nix
View file

@ -1,9 +1,11 @@
{ buildPythonPackage
{ lib
, buildPythonPackage
, django
, django-stubs-ext
, fetchPypi
, lib
, mypy
, pytestCheckHook
, pythonOlder
, tomli
, types-pytz
, types-pyyaml
@ -12,26 +14,35 @@
buildPythonPackage rec {
pname = "django-stubs";
version = "1.15.0";
version = "4.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-C7+esXLFsG7M/y1wTHw5BuSixhRt+MMu6fOlHikmVYE=";
hash = "sha256-k7r/gk8KBW5xA2tCO5QqdPB7kJ5F4/o4GFuRD1l8XAg=";
};
propagatedBuildInputs = [
django
django-stubs-ext
mypy
tomli
types-pytz
types-pyyaml
typing-extensions
] ++ lib.optionals (pythonOlder "3.11") [
tomli
];
nativeCheckInputs = [
pytestCheckHook
];
meta = with lib; {
description = "PEP-484 stubs for Django";
homepage = "https://github.com/typeddjango/django-stubs";
changelog = "https://github.com/typeddjango/django-stubs/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ elohmeier ];
};

7
pkgs/development/python-modules/docstring-parser/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "docstring-parser";
version = "0.14.1";
version = "0.15";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -16,8 +16,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "rr-";
repo = "docstring_parser";
rev = "${version}";
hash = "sha256-NIijq+QR0panVCGDEQrTlkAvHfIexwS0PxFikglxd74=";
rev = "refs/tags/${version}";
hash = "sha256-rnDitZn/xI0I9KMQv6gxzVYevWUymDgyFETjAnRlEHw=";
};
nativeBuildInputs = [
@ -35,6 +35,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Parse Python docstrings in various flavors";
homepage = "https://github.com/rr-/docstring_parser";
changelog = "https://github.com/rr-/docstring_parser/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ SomeoneSerge ];
};

72
pkgs/development/python-modules/elastic-transport/default.nix Normal file
View file

@ -0,0 +1,72 @@
{ lib
, aiohttp
, buildPythonPackage
, certifi
, fetchFromGitHub
, mock
, pytest-asyncio
, pytest-httpserver
, pytestCheckHook
, pythonOlder
, requests
, trustme
, urllib3
}:
buildPythonPackage rec {
pname = "elastic-transport";
version = "8.4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "elastic";
repo = "elastic-transport-python";
rev = "refs/tags/v${version}";
hash = "sha256-rZdl2gjY5Yg2Ls777tj12pPATMn//xVvEM4wkrZ3qUY=";
};
postPatch = ''
substituteInPlace setup.cfg \
--replace " --cov-report=term-missing --cov=elastic_transport" ""
'';
propagatedBuildInputs = [
urllib3
certifi
];
nativeCheckInputs = [
aiohttp
mock
pytest-asyncio
pytest-httpserver
pytestCheckHook
requests
trustme
];
pythonImportsCheck = [
"elastic_transport"
];
disabledTests = [
# Tests require network access
"fingerprint"
"ssl"
"test_custom_headers"
"test_custom_user_agent"
"test_default_headers"
"test_head"
"tls"
];
meta = with lib; {
description = "Transport classes and utilities shared among Python Elastic client libraries";
homepage = "https://github.com/elasticsearch/elastic-transport-python";
changelog = "https://github.com/elastic/elastic-transport-python/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

1
pkgs/development/python-modules/elasticsearch/default.nix
View file

@ -23,6 +23,7 @@ buildPythonPackage (rec {
meta = with lib; {
description = "Official low-level client for Elasticsearch";
homepage = "https://github.com/elasticsearch/elasticsearch-py";
changelog = "https://github.com/elastic/elasticsearch-py/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ desiderius ];
};

52
pkgs/development/python-modules/elasticsearch8/default.nix Normal file
View file

@ -0,0 +1,52 @@
{ lib
, aiohttp
, buildPythonPackage
, elastic-transport
, fetchPypi
, pythonOlder
, requests
, urllib3
}:
buildPythonPackage rec {
pname = "elasticsearch8";
version = "8.7.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-mRy48OYsm+0M1/D+abs83RiqN8wQr/Z6SZUY4TNg190=";
};
nativeBuildInputs = [
elastic-transport
];
propagatedBuildInputs = [
requests
];
passthru.optional-dependencies = {
async = [
aiohttp
];
};
# Check is disabled because running them destroy the content of the local cluster!
# https://github.com/elasticsearch/elasticsearch-py/tree/main/test_elasticsearch
doCheck = false;
pythonImportsCheck = [
"elasticsearch8"
];
meta = with lib; {
description = "Official low-level client for Elasticsearch";
homepage = "https://github.com/elasticsearch/elasticsearch-py";
changelog = "https://github.com/elastic/elasticsearch-py/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

74
pkgs/development/python-modules/es-client/default.nix Normal file
View file

@ -0,0 +1,74 @@
{ lib
, buildPythonPackage
, certifi
, click
, elastic-transport
, elasticsearch8
, fetchFromGitHub
, hatchling
, mock
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, pyyaml
, requests
, six
, voluptuous
}:
buildPythonPackage rec {
pname = "es-client";
version = "8.7.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "untergeek";
repo = "es_client";
rev = "refs/tags/v${version}";
hash = "sha256-DJIo0yFJGR9gw5UJnmgnBFZx0uXUEW3rWT49jhfnXkQ=";
};
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
certifi
click
elastic-transport
elasticsearch8
pyyaml
six
voluptuous
];
nativeCheckInputs = [
mock
pytest-asyncio
pytestCheckHook
requests
];
pythonImportsCheck = [
"es_client"
];
disabledTests = [
# Tests require network access
"test_bad_version_raises"
"test_client_info"
"test_multiple_hosts_raises"
"test_non_dict_passed"
"test_skip_version_check"
];
meta = with lib; {
description = "Module for building Elasticsearch client objects";
homepage = "https://github.com/untergeek/es_client";
changelog = "https://github.com/untergeek/es_client/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

19
pkgs/development/python-modules/plantuml-markdown/default.nix
View file

@ -8,19 +8,21 @@
, runCommand
, writeText
, plantuml-markdown
, pythonOlder
}:
let
buildPythonPackage rec {
pname = "plantuml-markdown";
version = "3.8.1";
in
buildPythonPackage {
inherit pname version;
version = "3.9.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "mikitex70";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-cDijr9BX7Mqgml76TU5dNWLWeF6LYb/gUeIrIJtqqCo=";
hash = "sha256-5+l3JkK/8S1KFXqa0++l3mIQ2KCpHe9+DiVqasBAZA0=";
};
propagatedBuildInputs = [
@ -33,7 +35,9 @@ buildPythonPackage {
# The package uses a custom script that downloads a certain version of plantuml for testing.
doCheck = false;
pythonImportsCheck = [ "plantuml_markdown" ];
pythonImportsCheck = [
"plantuml_markdown"
];
passthru.tests.example-doc =
let
@ -59,6 +63,7 @@ buildPythonPackage {
diagram which will be converted into an image and inserted in the document.
'';
homepage = "https://github.com/mikitex70/plantuml-markdown";
changelog = "https://github.com/mikitex70/plantuml-markdown/releases/tag/${version}";
license = licenses.bsd2;
maintainers = with maintainers; [ nikstur ];
};

4
pkgs/development/python-modules/pygti/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pygti";
version = "0.9.3";
version = "0.9.4";
disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "vigonotion";
repo = "pygti";
rev = "refs/tags/v${version}";
hash = "sha256-5Pc6gAI3xICS+f7tYwC9OVOAHJSW8AGPOvPYs0/6/iI=";
hash = "sha256-2T4Yw4XEOkv+IWyB4Xa2dPu929VH0tLeUjQ5S8EVXz0=";
};
nativeBuildInputs = [

7
pkgs/development/ruby-modules/gem-config/default.nix
View file

@ -27,6 +27,7 @@
, bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk
, bundler, libsass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie
, CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libmaxminddb, libyaml
, autoSignDarwinBinariesHook
}@args:
let
@ -325,7 +326,9 @@ in
};
grpc = attrs: {
nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isDarwin cctools;
nativeBuildInputs = [ pkg-config ]
++ lib.optional stdenv.isDarwin cctools
++ lib.optional (lib.versionAtLeast attrs.version "1.53.0" && stdenv.isDarwin && stdenv.isAarch64) autoSignDarwinBinariesHook;
buildInputs = [ openssl ];
hardeningDisable = [ "format" ];
env.NIX_CFLAGS_COMPILE = toString [
@ -342,7 +345,7 @@ in
postPatch = ''
substituteInPlace Makefile \
--replace '-Wno-invalid-source-encoding' ""
'' + lib.optionalString stdenv.isDarwin ''
'' + lib.optionalString (lib.versionOlder attrs.version "1.53.0" && stdenv.isDarwin) ''
# For < v1.48.0
substituteInPlace src/ruby/ext/grpc/extconf.rb \
--replace "ENV['AR'] = 'libtool -o' if RUBY_PLATFORM =~ /darwin/" ""

6
pkgs/development/tools/benthos/default.nix
View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "benthos";
version = "4.13.0";
version = "4.14.0";
src = fetchFromGitHub {
owner = "benthosdev";
repo = "benthos";
rev = "refs/tags/v${version}";
hash = "sha256-i4WsoZg22HCaDq6c9bQI3oAVGzW57Y6DrULyki3Hh+U=";
hash = "sha256-i+B5SfIfaAkZNKftD5iMObsRostwDThu+C1gEAir4Sc=";
};
vendorHash = "sha256-Q+oEYP/IpCDdwj/mLl5nVZ+t+mPYtRpNrAwta4viPMo=";
vendorHash = "sha256-mRT/23ieJbN5EjcMH1J9E/zYaiUb0TCRkp7PGlMV4jA=";
doCheck = false;

4
pkgs/development/tools/ktlint/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ktlint";
version = "0.48.2";
version = "0.49.0";
src = fetchurl {
url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint";
sha256 = "0hh3zm21a976px3lhf2przczspiyk88k68fmnwsknn281y9pyr70";
sha256 = "1vm064b591lp5yygryz0p0zdfwlp1nhl5dv2nzx0y92j3911q0yz";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/development/tools/vagrant/default.nix
View file

@ -5,9 +5,9 @@
let
# NOTE: bumping the version and updating the hash is insufficient;
# you must use bundix to generate a new gemset.nix in the Vagrant source.
version = "2.2.19";
version = "2.3.4";
url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
sha256 = "sha256-Tw5rHUZuJt6taCxNSEPo9koBLrpL6RUGrmxtNNPZyPk=";
sha256 = "sha256-Q+sUYcbc/SOgw4ZXDmwqh24G0jiLvA8fDJyZ45OqLw8=";
deps = bundlerEnv rec {
name = "${pname}-${version}";

330
pkgs/development/tools/vagrant/gemset.nix
View file

@ -34,50 +34,122 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
type = "gem";
};
version = "1.1.9";
version = "1.2.2";
};
date = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1";
type = "gem";
};
version = "3.3.3";
};
diff-lcs = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9";
type = "gem";
};
version = "1.5.0";
};
ed25519 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw";
sha256 = "0zb2dr2ihb1qiknn5iaj1ha1w9p7lj9yq5waasndlfadz225ajji";
type = "gem";
};
version = "1.2.4";
version = "1.3.0";
};
erubi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l";
sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7";
type = "gem";
};
version = "1.10.0";
version = "1.12.0";
};
excon = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15yrwawhvkjvfg0dsf8z81876ddj6161q0wh5s7pw4sim8z8pspr";
sha256 = "0j826kfvzn7nc5pv950n270r0sx1702k988ad11cdlav3dcxxw09";
type = "gem";
};
version = "0.88.0";
version = "0.99.0";
};
fake_ftp = {
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zl9q9m4x7lz9890g0h1qqj7hcxnwzpjfnfbxadjblps7b5054q4";
type = "gem";
};
version = "0.3.0";
};
ffi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ssxcywmb3flxsjdg13is6k01807zgzasdhj4j48dm7ac59cmksn";
sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
type = "gem";
};
version = "1.15.4";
version = "1.15.5";
};
google-protobuf = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zqyy07ps6zh0gi9nppmnsngzv5nx1qjv726mzhv83sh90rc25nm";
type = "gem";
};
version = "3.22.2";
};
googleapis-common-protos-types = {
dependencies = ["google-protobuf"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12w5bwaziz2iqb9dvgnskp2a7ifml6n4lyl9ypvnxj5bfrrwysap";
type = "gem";
};
version = "1.5.0";
};
grpc = {
dependencies = ["google-protobuf" "googleapis-common-protos-types"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kj4j1g6l9v92k3byqyfq2kmawy12cj898daxqn1jsw0b458k0dh";
type = "gem";
};
version = "1.53.0";
};
grpc-tools = {
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dal0xca2f301jrh049agmrbab21yjqd8npizzz55dhqn9dkwdsl";
type = "gem";
};
version = "1.53.0";
};
gssapi = {
dependencies = ["ffi"];
@ -91,15 +163,15 @@
version = "1.3.1";
};
gyoku = {
dependencies = ["builder"];
dependencies = ["builder" "rexml"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wn0sl14396g5lyvp8sjmcb1hw9rbyi89gxng91r7w4df4jwiidh";
sha256 = "1kd2q59xpm39hpvmmvyi6g3f1fr05xjbnxwkrdqz4xy7hirqi79q";
type = "gem";
};
version = "1.3.1";
version = "1.4.0";
};
hashicorp-checkpoint = {
groups = ["default"];
@ -127,10 +199,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf";
sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi";
type = "gem";
};
version = "1.8.11";
version = "1.12.0";
};
ipaddr = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ypic2hrmvvcgw7al72raphqv5cs1zvq4w284pwrkvfqsrqrqrsf";
type = "gem";
};
version = "1.2.5";
};
listen = {
dependencies = ["rb-fsevent" "rb-inotify"];
@ -138,10 +220,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ncfhdkjiwq9l1pm87ax2pa20kz2j0dz56vi74cnr5a6cfk0qb5p";
sha256 = "13rgkfar8pp31z1aamxf5y7cfq88wv6rxxcwy7cmm177qq508ycn";
type = "gem";
};
version = "3.7.0";
version = "3.8.0";
};
little-plugger = {
groups = ["default"];
@ -169,10 +251,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pkmhcxi8lp74bq5gz9lxrvaiv5w0745kk7s4bw2b1x07qqri0n9";
sha256 = "1zflchpx4g8c110gjdcs540bk5a336nq6nmx379rdg56xw0pjd02";
type = "gem";
};
version = "2.3.0";
version = "2.3.1";
};
mime-types = {
dependencies = ["mime-types-data"];
@ -180,20 +262,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh";
sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb";
type = "gem";
};
version = "3.3.1";
version = "3.4.1";
};
mime-types-data = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1z5wvk6qi4ws1kjh7xn1rfirqw5m72bwvqacck1fjpbh33pcrwxv";
sha256 = "1pky3vzaxlgm9gw5wlqwwi7wsw3jrglrfflrppvvnsrlaiz043z9";
type = "gem";
};
version = "3.2021.0901";
version = "3.2023.0218.1";
};
multi_json = {
groups = ["default"];
@ -205,16 +287,38 @@
};
version = "1.15.0";
};
net-ftp = {
dependencies = ["net-protocol" "time"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bqy9xg5225x102873j1qqq1bvnwfbi8lnf4357mpq6wimnw9pf9";
type = "gem";
};
version = "0.2.0";
};
net-protocol = {
dependencies = ["timeout"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91";
type = "gem";
};
version = "0.2.1";
};
net-scp = {
dependencies = ["net-ssh"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0b4h3ip8d1gkrc0znnw54hbxillk73mdnaf5pz330lmrcl1wiilg";
sha256 = "1si2nq9l6jy5n2zw1q59a5gaji7v9vhy8qx08h4fg368906ysbdk";
type = "gem";
};
version = "3.0.0";
version = "4.0.0";
};
net-sftp = {
dependencies = ["net-ssh"];
@ -222,20 +326,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "185vsybznqgqbb4i2qnxvf1gam8lb634nqcrq7r3i2zy1g6xd8mi";
sha256 = "0r33aa2d61hv1psm0l0mm6ik3ycsnq8symv7h84kpyf2b7493fv5";
type = "gem";
};
version = "3.0.0";
version = "4.0.0";
};
net-ssh = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jp3jgcn8cij407xx9ldb5h9c6jv13jc4cf6kk2idclz43ww21c9";
sha256 = "0yx0pb5fmziz92bw8qzbh8vf20lr56nd3s6q8h0gsgr307lki687";
type = "gem";
};
version = "6.1.0";
version = "7.1.0";
};
nori = {
groups = ["default"];
@ -247,15 +351,35 @@
};
version = "2.6.0";
};
pairing_heap = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15rcn0bd9z25dgbrsnjp9zva1hs22vnr54pzi9wjy62js2nfmx9r";
type = "gem";
};
version = "3.0.0";
};
rake = {
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
type = "gem";
};
version = "13.0.6";
};
rb-fsevent = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qsx9c4jr11vr3a9s5j83avczx9qn9rjaf32gxpc2v451hvbc0is";
sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423";
type = "gem";
};
version = "0.11.0";
version = "0.11.2";
};
rb-inotify = {
dependencies = ["ffi"];
@ -274,10 +398,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wpn2m28qs7s95nqg67dn5vpyh05q7d0w6sm4svhflm41cd0akr4";
sha256 = "0vpq1dmmlbggfk399s7jq2rrnjp6r8774amfli75bqhjn1sk2bxg";
type = "gem";
};
version = "0.2.7";
version = "0.2.8";
};
rexml = {
groups = ["default"];
@ -289,6 +413,82 @@
};
version = "3.2.5";
};
rgl = {
dependencies = ["pairing_heap" "rexml" "stream"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jjc2v9hg42bzg6w5yg3azrsdr31qmc6ff93xb5adfjqg337vzz3";
type = "gem";
};
version = "0.5.10";
};
rspec = {
dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c";
type = "gem";
};
version = "3.12.0";
};
rspec-core = {
dependencies = ["rspec-support"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0da45cvllbv39sdbsl65vp5djb2xf5m10mxc9jm7rsqyyxjw4h1f";
type = "gem";
};
version = "3.12.1";
};
rspec-expectations = {
dependencies = ["diff-lcs" "rspec-support"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6";
type = "gem";
};
version = "3.12.2";
};
rspec-its = {
dependencies = ["rspec-core" "rspec-expectations"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15zafd70gxly5i0s00nky14sj2n92dnj3xpj83ysl3c2wx0119ad";
type = "gem";
};
version = "1.3.0";
};
rspec-mocks = {
dependencies = ["diff-lcs" "rspec-support"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hfm17xakfvwya236graj6c2arr4sb9zasp35q5fykhyz8mhs0w2";
type = "gem";
};
version = "3.12.5";
};
rspec-support = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx";
type = "gem";
};
version = "3.12.0";
};
rubyntlm = {
groups = ["default"];
platforms = [];
@ -309,6 +509,60 @@
};
version = "2.3.2";
};
stream = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "016m9v81vpj14d8g5ins91zc4pzl7vf5f1gxl7jhfsfy601k7cv2";
type = "gem";
};
version = "0.5.5";
};
thor = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3";
type = "gem";
};
version = "0.18.1";
};
time = {
dependencies = ["date"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13pzdsgf3v06mymzipcpa7p80shyw328ybn775nzpnhc6n8y9g30";
type = "gem";
};
version = "0.2.2";
};
timeout = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6";
type = "gem";
};
version = "0.3.2";
};
vagrant-spec = {
dependencies = ["childprocess" "log4r" "rspec" "thor"];
groups = ["default"];
platforms = [];
source = {
fetchSubmodules = false;
rev = "708be5c53ea10131b19921c536eae012d1396a96";
sha256 = "0xnyai6wdx3xi5nhdvn7bpz73dlvnam4dckkwzd03apdssg6pnr6";
type = "git";
url = "https://github.com/hashicorp/vagrant-spec.git";
};
version = "0.0.1";
};
vagrant_cloud = {
dependencies = ["excon" "log4r" "rexml"];
groups = ["default"];
@ -330,6 +584,16 @@
};
version = "0.1.1";
};
webrick = {
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7";
type = "gem";
};
version = "1.7.0";
};
winrm = {
dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"];
groups = ["default"];

4
pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch
View file

@ -1,8 +1,8 @@
diff --git a/bin/vagrant b/bin/vagrant
index 0e6abdc..cb36e9c 100755
index 7ca30b391..d3f4ea61a 100755
--- a/bin/vagrant
+++ b/bin/vagrant
@@ -155,11 +155,6 @@ begin
@@ -221,11 +221,6 @@ begin
end
end

8
pkgs/games/anki/bin.nix
View file

@ -3,22 +3,22 @@
let
pname = "anki-bin";
# Update hashes for both Linux and Darwin!
version = "2.1.61";
version = "2.1.62";
sources = {
linux = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst";
sha256 = "sha256-f+PneP2vB7HFxI3mvkrm/kyvdBZgKbu5pYPUNR5XEO4=";
sha256 = "sha256-vsuR+pDqjPGejlxrDPCxKVnvTilRDGGhMDDKSQhVxVQ=";
};
# For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version
darwin-x86_64 = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg";
sha256 = "sha256-BctUHyy0U1frXRgZ3y8cpiWGnTm8XZdL018RjzhaJDg=";
sha256 = "sha256-8TMdNEnnlDQrk+TVlsmvFxoqrsCU2BRY6hnaC3PGdYo=";
};
darwin-aarch64 = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg";
sha256 = "sha256-lZ4HoVqbIouTmHkxV51mNI5EAfGJd3UmNG5Lqeiu0ys=";
sha256 = "sha256-zdrw3AE1ijlJryGf30YLr71TtoT6ANHvi+1BweZiFM8=";
};
};

8
pkgs/os-specific/linux/musl/default.nix
View file

@ -149,7 +149,13 @@ stdenv.mkDerivation rec {
homepage = "https://musl.libc.org/";
changelog = "https://git.musl-libc.org/cgit/musl/tree/WHATSNEW?h=v${version}";
license = licenses.mit;
platforms = platforms.linux;
platforms = [
"aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux"
"armv7l-linux" "i686-linux" "x86_64-linux" "m68k-linux"
"microblaze-linux" "microblazeel-linux" "mipsel-linux"
"mips64el-linux" "powerpc64-linux" "powerpc64le-linux"
"riscv64-linux" "s390x-linux"
];
maintainers = with maintainers; [ thoughtpolice dtzWill ];
};
}

6
pkgs/os-specific/linux/rtl8189es/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "rtl8189es-${kernel.version}-${version}";
version = "2022-10-30";
version = "2023-03-14";
src = fetchFromGitHub {
owner = "jwrdegoede";
repo = "rtl8189ES_linux";
rev = "e58bd86c9d9408c648b1246a0dd76b16856ec172";
sha256 = "sha256-KKly72N6ACBTB4CSBM6Q/S1wGMTg5NZA3QYslYPNUr8=";
rev = "ae7b31e55526ca0e01d2a3310118530bff4f1055";
sha256 = "sha256-l/xUxs63Y5LVT6ZafuRc+iaCXCSt2HwysYJLJ5hg3RM=";
};
nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies;

3
pkgs/servers/mpd/default.nix
View file

@ -165,9 +165,6 @@ let
outputs = [ "out" "doc" ]
++ lib.optional (builtins.elem "documentation" features_) "man";
# FIXME: workaround for Pipewire 0.3.64 deprecated API change, remove when fixed upstream
env.NIX_CFLAGS_COMPILE = toString [ "-DPW_ENABLE_DEPRECATED" ];
CXXFLAGS = lib.optionals stdenv.isDarwin [
"-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0"
];

6
pkgs/servers/unpackerr/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "unpackerr";
version = "0.11.1";
version = "0.11.2";
src = fetchFromGitHub {
owner = "davidnewhall";
repo = "unpackerr";
rev = "v${version}";
sha256 = "sha256-qoaJYCJoN8RcOM7Bk2zwNYqnKXB/GAlt29VZjY/MchU=";
sha256 = "sha256-Jxg1gaMTJ/BbL8TQfPcyt1hYnT/LcL4j+m+jSeh5QyA=";
};
vendorHash = "sha256-ArWeVNFHM37bmFFLNzqpXKmK9/DUi7+ZsRHpuLNfL0A=";
vendorHash = "sha256-yXFIBWOF72nXmT8+OSvF1aKBhCMBloLmGTfvNbV9ir4=";
buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ];

2
pkgs/stdenv/linux/make-bootstrap-tools.nix
View file

@ -20,7 +20,7 @@ in with pkgs; rec {
tarMinimal = gnutar.override { acl = null; };
busyboxMinimal = busybox.override {
useMusl = !stdenv.targetPlatform.isRiscV;
useMusl = lib.meta.availableOn stdenv.hostPlatform musl;
enableStatic = true;
enableMinimal = true;
extraConfig = ''

16
pkgs/tools/admin/nomachine-client/default.nix
View file

@ -1,8 +1,8 @@
{ lib, stdenv, file, fetchurl, makeWrapper,
autoPatchelfHook, jsoncpp, libpulseaudio }:
let
versionMajor = "7.10";
versionMinor = "1";
versionMajor = "8.4";
versionMinor = "2";
versionBuild_x86_64 = "1";
versionBuild_i686 = "1";
in
@ -14,22 +14,22 @@ in
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz";
sha256 = "sha256-alClFaNbQ76r8LukbygesWWXA5rx6VEzxK+bY5tOfO0=";
sha256 = "sha256-r4yRmnMd6uNay7CqmyqYj9F6huoqD8eBby+oDNk1T34=";
}
else if stdenv.hostPlatform.system == "i686-linux" then
fetchurl {
url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz";
sha256 = "sha256-UDvrjb/2rXvSvpiA+UwiVi4YyXhFLNiEtrszqjAPGXc=";
sha256 = "sha256-TvEU1hDvPXQbF7fMI89I2bhap1Y0oetUoFl3yR5eTGg=";
}
else
throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}";
# nxusb-legacy is only needed for kernel versions < 3
postUnpack = ''
mv $(find . -type f -name nxclient.tar.gz) .
mv $(find . -type f -name nxrunner.tar.gz) .
mv $(find . -type f -name nxplayer.tar.gz) .
rm -r NX/
tar xf nxclient.tar.gz
tar xf nxrunner.tar.gz
tar xf nxplayer.tar.gz
rm $(find . -maxdepth 1 -type f)
rm -r NX/share/src/nxusb-legacy
@ -40,7 +40,7 @@ in
buildInputs = [ jsoncpp libpulseaudio ];
installPhase = ''
rm bin/nxplayer bin/nxclient
rm bin/nxplayer bin/nxrunner
mkdir -p $out/NX
cp -r bin lib share $out/NX/
@ -68,7 +68,7 @@ in
postFixup = ''
makeWrapper $out/bin/nxplayer.bin $out/bin/nxplayer --set NX_SYSTEM $out/NX
makeWrapper $out/bin/nxclient.bin $out/bin/nxclient --set NX_SYSTEM $out/NX
makeWrapper $out/bin/nxrunner.bin $out/bin/nxrunner --set NX_SYSTEM $out/NX
# libnxcau.so needs libpulse.so.0 for audio to work, but doesn't
# have a DT_NEEDED entry for it.

16
pkgs/tools/backup/restic/rest-server.nix
View file

@ -2,27 +2,19 @@
buildGoModule rec {
pname = "restic-rest-server";
version = "0.11.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "restic";
repo = "rest-server";
rev = "v${version}";
hash = "sha256-ninPODztNzvB2js9cuNAuExQLK/OGOu80ZNW0BPrdds=";
hash = "sha256-FnT7AG9na/KdWimUqhcF1QndGdT+Nc8ao5zlSeN/fJ0=";
};
vendorSha256 = "sha256-8x5qYvIX/C5BaewrTNVbIIadL+7XegbRUZiEDWmJM+c=";
patches = [
(fetchpatch {
name = "backport_rest-server_tests_os.TempDir.patch";
url = "https://github.com/restic/rest-server/commit/a87a50ad114bdaddc895413396438df6ea0affbb.patch";
sha256 = "sha256-O6ENxTK2fCVTZZKTFHrvZ+3dT8TbgbIE0o3sYE/RUqc=";
})
];
vendorHash = "sha256-Q0XazJmfmAwR2wXD/RXO6nPiNyWFubBYL3kNFKBRMzc=";
meta = with lib; {
changelog = "https://github.com/restic/rest-server/blob/${src.rev}/CHANGELOG.md";
description = "A high performance HTTP server that implements restic's REST backend API";
homepage = "https://github.com/restic/rest-server";
platforms = platforms.unix;

6
pkgs/tools/misc/fzf/default.nix
View file

@ -24,16 +24,16 @@ let
in
buildGoModule rec {
pname = "fzf";
version = "0.39.0";
version = "0.40.0";
src = fetchFromGitHub {
owner = "junegunn";
repo = pname;
rev = version;
hash = "sha256-YEysMybjxWwvoX5wMphOZsXw1lV5XqPsp9+Q9V/8cAs=";
hash = "sha256-1+s4AqvDfeTxZcM3w2VPUY1oSStNBXs0x//t3X7/zAw=";
};
vendorHash = "sha256-yycwi7SLNmUnpsoP6QBXizVbibh/wEYZb1OqigLFJqs=";
vendorHash = "sha256-SSz4oHUgfMRbvpdIl1xepfckef1HDA1y646FWnyBp6o=";
outputs = [ "out" "man" ];

4
pkgs/tools/networking/haguichi/default.nix
View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "haguichi";
version = "1.4.5";
version = "1.4.6";
src = fetchFromGitHub {
owner = "ztefn";
repo = "haguichi";
rev = version;
hash = "sha256-bPeo+qTpTWYkE9PsfgooE2vsO9FIdNIdA+B5ml6i8s0=";
hash = "sha256-H/Aw8zJOioOLWxiM/pMb+QSIoEp3zIkLb26S6QN3hv0=";
};
nativeBuildInputs = [

4
pkgs/tools/networking/mu/default.nix
View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "mu";
version = "1.8.14";
version = "1.10.3";
src = fetchFromGitHub {
owner = "djcb";
repo = "mu";
rev = "v${version}";
hash = "sha256-m6if0Br9WRPR8POwOM0Iwido3UR/V0BlkuaLcWsf/c0=";
hash = "sha256-AqIPdKdNKLnAHIlqgs8zzm7j+iwNvDFWslvp8RjQPnI=";
};
postPatch = ''

4
pkgs/tools/security/buttercup-desktop/default.nix
View file

@ -2,10 +2,10 @@
let
pname = "buttercup-desktop";
version = "2.19.0";
version = "2.19.1";
src = fetchurl {
url = "https://github.com/buttercup/buttercup-desktop/releases/download/v${version}/Buttercup-linux-x86_64.AppImage";
sha256 = "sha256-0CoSgZvRYIGD8Jgk8FNZ7EesOpK5ccHe0LIbZnYyYJ0=";
sha256 = "sha256-ELJXPnr5lFHIgDsqjbGbcto0JLsi11sMe7UjOki5yQA=";
};
appimageContents = appimageTools.extractType2 { inherit pname src version; };

4
pkgs/tools/system/rsyslog/default.nix
View file

@ -62,11 +62,11 @@
stdenv.mkDerivation rec {
pname = "rsyslog";
version = "8.2302.0";
version = "8.2304.0";
src = fetchurl {
url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz";
hash = "sha256-JUFfhbZiYVzjyDB31TdYAp6HQ8tZKQRL/TVk49Ymo7k=";
hash = "sha256-0JDpAoPrS4Dei0Pl/8bktZxOOXDyqpHmO+7woRcg100=";
};
nativeBuildInputs = [

28
pkgs/top-level/all-packages.nix
View file

@ -17085,7 +17085,7 @@ with pkgs;
inherit (darwin) libobjc;
};
defaultGemConfig = callPackage ../development/ruby-modules/gem-config {
inherit (darwin) DarwinTools cctools;
inherit (darwin) DarwinTools cctools autoSignDarwinBinariesHook;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
bundix = callPackage ../development/ruby-modules/bundix { };
@ -22815,9 +22815,7 @@ with pkgs;
mtxclient = callPackage ../development/libraries/mtxclient { };
mu = callPackage ../tools/networking/mu {
texinfo = texinfo4;
};
mu = callPackage ../tools/networking/mu { };
mueval = callPackage ../development/tools/haskell/mueval { };
@ -23678,10 +23676,7 @@ with pkgs;
serd = callPackage ../development/libraries/serd { };
serf = callPackage ../development/libraries/serf {
openssl = openssl_1_1;
aprutil = aprutil.override { openssl = openssl_1_1; };
};
serf = callPackage ../development/libraries/serf { };
sfsexp = callPackage ../development/libraries/sfsexp { };
@ -24742,19 +24737,15 @@ with pkgs;
pkg = callPackage ../development/compilers/sbcl/bootstrap.nix {};
faslExt = "fasl";
};
sbcl_2_2_11 = wrapLisp {
pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.2.11"; };
faslExt = "fasl";
};
sbcl_2_3_0 = wrapLisp {
pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.0"; };
faslExt = "fasl";
};
sbcl_2_3_2 = wrapLisp {
pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.2"; };
faslExt = "fasl";
};
sbcl = sbcl_2_3_2;
sbcl_2_3_4 = wrapLisp {
pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.4"; };
faslExt = "fasl";
};
sbcl = sbcl_2_3_4;
sbclPackages = recurseIntoAttrs sbcl.pkgs;
@ -29008,6 +28999,8 @@ with pkgs;
argo-rollouts = callPackage ../applications/networking/cluster/argo-rollouts { };
arianna = libsForQt5.callPackage ../applications/misc/arianna { };
ario = callPackage ../applications/audio/ario { };
arion = callPackage ../applications/virtualization/arion { };
@ -34009,7 +34002,6 @@ with pkgs;
sublime-merge-dev;
inherit (callPackages ../applications/version-management/subversion {
openssl = openssl_1_1;
sasl = cyrus_sasl;
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
}) subversion;

2
pkgs/top-level/make-tarball.nix
View file

@ -32,6 +32,8 @@ pkgs.releaseTools.sourceTarball {
echo "git-revision is $(cat .git-revision)"
'';
requiredSystemFeatures = [ "big-parallel" ]; # 1 thread but ~36G RAM (!) see #227945
nixpkgs-basic-release-checks = import ./nixpkgs-basic-release-checks.nix
{ inherit nix pkgs nixpkgs supportedSystems; };

8
pkgs/top-level/nixpkgs-basic-release-checks.nix
View file

@ -1,6 +1,12 @@
{ supportedSystems, nixpkgs, pkgs, nix }:
pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; } ''
pkgs.runCommand "nixpkgs-release-checks"
{
src = nixpkgs;
buildInputs = [ nix ];
requiredSystemFeatures = [ "big-parallel" ]; # 1 thread but ~10G RAM; see #227945
}
''
set -o pipefail
export NIX_STORE_DIR=$TMPDIR/store

6
pkgs/top-level/python-packages.nix
View file

@ -3086,8 +3086,12 @@ self: super: with self; {
elastic-apm = callPackage ../development/python-modules/elastic-apm { };
elastic-transport = callPackage ../development/python-modules/elastic-transport { };
elasticsearch = callPackage ../development/python-modules/elasticsearch { };
elasticsearch8 = callPackage ../development/python-modules/elasticsearch8 { };
elasticsearch-dsl = callPackage ../development/python-modules/elasticsearch-dsl { };
elasticsearchdsl = self.elasticsearch-dsl;
@ -3192,6 +3196,8 @@ self: super: with self; {
eradicate = callPackage ../development/python-modules/eradicate { };
es-client = callPackage ../development/python-modules/es-client { };
espeak-phonemizer = callPackage ../development/python-modules/espeak-phonemizer { };
esphome-dashboard-api = callPackage ../development/python-modules/esphome-dashboard-api { };