dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
- pkgs/development/python-modules/deebot-client/default.nix
- pkgs/development/python-modules/pytest-examples/default.nix
- pkgs/development/python-modules/w3lib/default.nix
This commit is contained in:
Martin Weinelt 2024-07-05 13:04:01 +02:00
commit fda13875da
92 changed files with 4257 additions and 357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/check-by-name.yml vendored
View File

@ -58,7 +58,7 @@ jobs:
if [[ "$mergeable" == "null" ]]; then
if (( retryCount == 0 )); then
echo "Not retrying anymore, probably GitHub is having internal issues"
echo "Not retrying anymore. It's likely that GitHub is having internal issues: check https://www.githubstatus.com/"
exit 1
else
(( retryCount -= 1 )) || true

8
maintainers/maintainer-list.nix
View File

@ -2420,14 +2420,6 @@
githubId = 7118777;
keys = [ { fingerprint = "E9A3 7864 2165 28CE 507C CA82 72EA BF75 C331 CD25"; } ];
};
Benjamin-L = {
name = "Benjamin Lee";
email = "benjamin@computer.surgery";
matrix = "@benjamin:computer.surgery";
github = "Benjamin-L";
githubId = 6504174;
keys = [ { fingerprint = "9D84 09A0 44FC 1EEB AE2D FA30 FB96 24E2 885D 55A4"; } ];
};
benkuhn = {
email = "ben@ben-kuhn.com";
github = "ben-kuhn";

4
nixos/doc/manual/release-notes/rl-2411.section.md
View File

@ -90,6 +90,10 @@
- `services.ddclient.use` has been deprecated: `ddclient` now supports separate IPv4 and IPv6 configuration. Use `services.ddclient.usev4` and `services.ddclient.usev6` instead.
- `teleport` has been upgraded from major version 15 to major version 16.
Refer to upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/)
and [release notes for v16](https://goteleport.com/docs/changelog/#1600-061324).
- `vaultwarden` lost the capability to bind to privileged ports. If you rely on
this behavior, override the systemd unit to allow `CAP_NET_BIND_SERVICE` in
your local configuration.

13
nixos/modules/services/networking/cloudflare-dyndns.nix
View File

@ -28,6 +28,16 @@ in
'';
};
frequency = mkOption {
type = types.nullOr types.str;
default = "*:0/5";
description = ''
Run cloudflare-dyndns with the given frequency (see
{manpage}`systemd.time(7)` for the format).
If null, do not run automatically.
'';
};
proxied = mkOption {
type = types.bool;
default = false;
@ -67,7 +77,6 @@ in
description = "CloudFlare Dynamic DNS Client";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
startAt = "*:0/5";
environment = {
CLOUDFLARE_DOMAINS = toString cfg.domains;
@ -88,6 +97,8 @@ in
in
"${pkgs.cloudflare-dyndns}/bin/cloudflare-dyndns ${toString args}";
};
} // optionalAttrs (cfg.frequency != null) {
startAt = cfg.frequency;
};
};
}

15
nixos/tests/graylog.nix
View File

@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
nodes.machine = { pkgs, ... }: {
virtualisation.memorySize = 4096;
virtualisation.diskSize = 4096;
virtualisation.diskSize = 1024 * 6;
services.mongodb.enable = true;
services.elasticsearch.enable = true;
@ -65,9 +65,18 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
in ''
machine.start()
machine.wait_for_unit("graylog.service")
machine.wait_until_succeeds(
"journalctl -o cat -u graylog.service | grep 'Started REST API at <127.0.0.1:9000>'"
)
machine.wait_for_open_port(9000)
machine.succeed("curl -sSfL http://127.0.0.1:9000/")
machine.wait_until_succeeds(
"journalctl -o cat -u graylog.service | grep 'Graylog server up and running'"
)
session = machine.succeed(
"curl -X POST "
+ "-sSfL http://127.0.0.1:9000/api/system/sessions "
@ -87,6 +96,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
+ "-H 'x-requested-by: cli' "
)
machine.wait_until_succeeds(
"journalctl -o cat -u graylog.service | grep -E 'Input \[GELF UDP/Demo/[[:alnum:]]{24}\] is now RUNNING'"
)
machine.wait_until_succeeds(
"test \"$(curl -sSfL 'http://127.0.0.1:9000/api/cluster/inputstates' "
+ f"-u {session}:session "

1
nixos/tests/lomiri.nix
View File

@ -282,6 +282,7 @@ in {
# Testing any more would require more applications & setup, the fact that it's already being attempted is a good sign
machine.send_key("esc")
machine.sleep(2) # sleep a tiny bit so morph can close & the focus can return to LSS
machine.send_key("alt-f4")
# The ayatana indicators are an important part of the experience, and they hold the only graphical way of exiting the session.

2
nixos/tests/soju.nix
View File

@ -8,7 +8,7 @@ let
in
{
name = "soju";
meta.maintainers = with lib.maintainers; [ Benjamin-L ];
meta.maintainers = with lib.maintainers; [ ];
nodes.machine = { ... }: {
services.soju = {

1
nixos/tests/teleport.nix
View File

@ -10,6 +10,7 @@ let
packages = with pkgs; {
"default" = teleport;
"14" = teleport_14;
"15" = teleport_15;
};
minimal = package: {

4
pkgs/applications/graphics/komikku/default.nix
View File

@ -19,7 +19,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "komikku";
version = "1.49.0";
version = "1.50.0";
format = "other";
@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "valos";
repo = "Komikku";
rev = "v${version}";
hash = "sha256-AMlhhsbwLhofV/Sy/EXuE4l0UAwZf2Gxn9+x3MHno4Y=";
hash = "sha256-lyBXMctEL8Z6rscsSDHh7xLhjvnpN2q4qMVV2ek9Cyk=";
};
nativeBuildInputs = [

6
pkgs/applications/misc/lutris/default.nix
View File

@ -75,13 +75,13 @@ let
in
buildPythonApplication rec {
pname = "lutris-unwrapped";
version = "0.5.16";
version = "0.5.17";
src = fetchFromGitHub {
owner = "lutris";
repo = "lutris";
rev = "v${version}";
hash = "sha256-Ed1bhugBe97XmY050A5jCPcnLj0Fd7qPX2p/Ab+YbOE=";
hash = "sha256-Tr5k5LU0s75+1B17oK8tlgA6SlS1SHyyLS6UBKadUmw=";
};
nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ];
@ -121,7 +121,7 @@ buildPythonApplication rec {
postPatch = ''
substituteInPlace lutris/util/magic.py \
--replace "'libmagic.so.1'" "'${lib.getLib file}/lib/libmagic.so.1'"
--replace '"libmagic.so.1"' "'${lib.getLib file}/lib/libmagic.so.1'"
'';
nativeCheckInputs = [ xvfb-run nose2 flake8 ] ++ requiredTools;

8
pkgs/by-name/bi/bitwarden-desktop/package.nix
View File

@ -29,13 +29,13 @@ let
electron = electron_29;
in buildNpmPackage rec {
pname = "bitwarden-desktop";
version = "2024.6.0";
version = "2024.6.4";
src = fetchFromGitHub {
owner = "bitwarden";
repo = "clients";
rev = "desktop-v${version}";
hash = "sha256-qiUUrs23WHE3+KFsWDknuDSA6M3Zwjz9Jdjq6mn5XkE=";
hash = "sha256-oQ2VZoxePdYUC+xMKlRMpvPubSPULvt31XSh/OBw3Ec=";
};
patches = [
@ -60,7 +60,7 @@ in buildNpmPackage rec {
makeCacheWritable = true;
npmFlags = [ "--engine-strict" "--legacy-peer-deps" ];
npmWorkspace = "apps/desktop";
npmDepsHash = "sha256-Mgd15eFJtWoBqFFCsjmsnlNbcg5NDs1U7DlMkE0hIb8=";
npmDepsHash = "sha256-9d9pWrFYelAx/PPDHY3m92Frp8RSQuBqpiOjmWtm/1g=";
cargoDeps = rustPlatform.fetchCargoTarball {
name = "${pname}-${version}";
@ -76,7 +76,7 @@ in buildNpmPackage rec {
patches;
patchFlags = [ "-p4" ];
sourceRoot = "${src.name}/${cargoRoot}";
hash = "sha256-BL+j2hMwb3QGgS29Y6LjqnKscH+tEXMCOyivilHHwVI=";
hash = "sha256-ZmblY1APVa8moAR1waVBZPhrf5Wt1Gi6dvAxkhizckQ=";
};
cargoRoot = "apps/desktop/desktop_native";

4
pkgs/by-name/bo/boogie/package.nix
View File

@ -2,13 +2,13 @@
buildDotnetModule rec {
pname = "Boogie";
version = "3.1.6";
version = "3.2.0";
src = fetchFromGitHub {
owner = "boogie-org";
repo = "boogie";
rev = "v${version}";
sha256 = "sha256-Bli/vEzzVQTWicQJskK9cQC2XsFRwMxX9cAePXN511c=";
sha256 = "sha256-3+9zOoKk8IdqkxoMzjZofizyx+294mer3t6illXUr2M=";
};
projectFile = [ "Source/Boogie.sln" ];

4
pkgs/by-name/br/bruno/package.nix
View File

@ -28,13 +28,13 @@ let
in
buildNpmPackage' rec {
pname = "bruno";
version = "1.20.0";
version = "1.20.1";
src = fetchFromGitHub {
owner = "usebruno";
repo = "bruno";
rev = "v${version}";
hash = "sha256-NnRM+ERz5pViQ+rIRXAH3puFdhccpgQMQ+ICZQELA18=";
hash = "sha256-WUGdXPG/v8vmgI3a/X+J1EQUlbJdNaNAUx5whezMcAs=";
postFetch = ''
${lib.getExe npm-lockfile-fix} $out/package-lock.json

6
pkgs/by-name/ch/chezmoi/package.nix
View File

@ -8,16 +8,16 @@
let
argset = {
pname = "chezmoi";
version = "2.49.1";
version = "2.50.0";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${argset.version}";
hash = "sha256-DrilLcV6wyUVPPiDs5KiC8kztNCH4Fug5h35+xerLZU=";
hash = "sha256-l1c55vItMIfPbcwVWnpx3mlzT75KRlbd8V8DzQoQB2w=";
};
vendorHash = "sha256-3nufF280WuDNvhKn9xP9dnxNX2VC59nifuJp+ebUSvk=";
vendorHash = "sha256-5jc7i+vX6aGq//Zl924FIdjAVyqlusZfWRbc8aj3iLw=";
nativeBuildInputs = [
installShellFiles

39
pkgs/by-name/do/dopamine/package.nix Normal file
View File

@ -0,0 +1,39 @@
{
lib,
fetchurl,
appimageTools,
nix-update-script,
}:
appimageTools.wrapType2 rec {
pname = "dopamine";
version = "3.0.0-preview.26";
src = fetchurl {
url = "https://github.com/digimezzo/dopamine/releases/download/v${version}/Dopamine-${version}.AppImage";
hash = "sha256-wINHglhP4t5wNyHzIircW4Z5qC21ZbHBQD2AVp33/KQ=";
};
extraInstallCommands =
let
contents = appimageTools.extract { inherit pname version src; };
in
''
install -Dm644 ${contents}/dopamine.desktop $out/share/applications/dopamine.desktop
substituteInPlace $out/share/applications/dopamine.desktop \
--replace-fail 'Exec=AppRun' 'Exec=dopamine'
cp -r ${contents}/usr/share/icons $out/share
'';
passthru.updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; };
meta = {
changelog = "https://github.com/digimezzo/dopamine/blob/${version}/CHANGELOG.md";
description = "Audio player that keeps it simple";
homepage = "https://github.com/digimezzo/dopamine";
license = lib.licenses.gpl3Only;
mainProgram = "dopamine";
maintainers = with lib.maintainers; [ Guanran928 ];
platforms = [ "x86_64-linux" ];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
}

2
pkgs/by-name/ff/ffsubsync/package.nix
View File

@ -48,7 +48,7 @@ python3.pkgs.buildPythonApplication rec {
homepage = "https://github.com/smacke/ffsubsync";
description = "Automagically synchronize subtitles with video";
license = licenses.mit;
maintainers = with maintainers; [ Benjamin-L ];
maintainers = with maintainers; [ ];
mainProgram = "ffsubsync";
};
}

4
pkgs/by-name/la/latexminted/package.nix
View File

@ -7,12 +7,12 @@
python3Packages.buildPythonApplication rec {
pname = "latexminted";
version = "0.1.0b5";
version = "0.1.0b9";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-1K43rX3hs+ywMzOyeKX+GmAGUVHTDZB3Yo87dZ/uYaQ=";
hash = "sha256-QUFfoX1jv5pVQDEBGaVd1madfqbTWTJyXPh4gw7P5UE=";
};
build-system = with python3Packages; [

13
pkgs/data/themes/marwaita-manjaro/default.nix → pkgs/by-name/ma/marwaita-darkcyan/package.nix
View File

@ -5,17 +5,18 @@
, gtk-engine-murrine
, gtk_engines
, librsvg
, gitUpdater
}:
stdenv.mkDerivation rec {
pname = "marwaita-manjaro";
version = "20.1";
pname = "marwaita-darkcyan";
version = "20.2-unstable-2024-07-01";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
sha256 = "sha256-rEwSlLnDzW6iaPCf91mhL0PqycJAqm/ZmoRf35fl1RY=";
rev = "ad837492a377909e0e84f090c740f0296d311797";
hash = "sha256-1aCJEVh97Ze600zg8twwRQmoU7Z9tbvPG0Zl0HTyvA0=";
};
buildInputs = [
@ -37,8 +38,10 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "Manjaro Style (green version) of Marwaita GTK theme";
description = "Manjaro Style of Marwaita GTK theme";
homepage = "https://www.pling.com/p/1351213/";
license = licenses.gpl3Only;
platforms = platforms.unix;

48
pkgs/by-name/ma/marwaita-mint/package.nix Normal file
View File

@ -0,0 +1,48 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
, gitUpdater
, gdk-pixbuf
, gtk-engine-murrine
, gtk_engines
, librsvg
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "marwaita-mint";
version = "20.2-unstable-2024-07-01";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = "marwaita-mint";
rev = "ecdb79b45937466b7d8377d294838da3e8f4e61a";
hash = "sha256-57oZgacQQF6nZney0AxSbGfv45eeBLjXHBK6wp1251U=";
};
buildInputs = [
gdk-pixbuf
gtk_engines
librsvg
];
propagatedUserEnvPkgs = [
gtk-engine-murrine
];
installPhase = ''
runHook preInstall
mkdir -p $out/share/themes
cp -a Marwaita* $out/share/themes
runHook postInstall
'';
passthru.updateScript = gitUpdater { };
meta = {
description = "Variation for marwaita GTK theme based on linux mint color scheme";
homepage = "https://www.pling.com/p/1674243";
license = lib.licenses.gpl3Only;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ romildo ];
};
})

6
pkgs/data/themes/marwaita/default.nix → pkgs/by-name/ma/marwaita/package.nix
View File

@ -10,13 +10,13 @@
stdenvNoCC.mkDerivation rec {
pname = "marwaita";
version = "20.1";
version = "20.2-unstable-2024-07-01";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
hash = "sha256-3kVfZnqRJs0CPl+EICDjg2+NSwuz18QccHx63cVLpFY=";
rev = "da6614b0fcb14d83de94f9b23b75baec03b3bc68";
hash = "sha256-XP3mDa8KOyqd4ECnjvmfk84lU56qBYPGZAT9/fEp6N8=";
};
buildInputs = [

6
pkgs/by-name/me/melonDS/package.nix
View File

@ -23,13 +23,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "melonDS";
version = "0.9.5-unstable-2024-06-24";
version = "0.9.5-unstable-2024-07-04";
src = fetchFromGitHub {
owner = "melonDS-emu";
repo = "melonDS";
rev = "db20771ef36bfa5bc0dc624cf245844507724107";
hash = "sha256-XGDMA+0IOvl1UN2HgfLikpxHXl/p0z+Yv6fJs5xv08Y=";
rev = "25b5ac91bdcddf537e3ccd78c184eda1d8486086";
hash = "sha256-AsiFovjRHg1y/wtHxON6RGaYETPPc71mWVs6xZUJdoc=";
};
nativeBuildInputs = [

54
pkgs/by-name/ne/next-ls/package.nix Normal file
View File

@ -0,0 +1,54 @@
{
lib,
beam_minimal,
fetchFromGitHub,
}:
let
beamPackages = beam_minimal.packages.erlang_27;
elixir = beamPackages.elixir_1_17;
in
beamPackages.mixRelease rec {
pname = "next-ls";
version = "0.23.0";
src = fetchFromGitHub {
owner = "elixir-tools";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-wTEf0pxVIT7qmPufAN9vGR9rY31kWjNabYZwKe/hkVU=";
};
mixFodDeps = beamPackages.fetchMixDeps {
inherit src version elixir;
pname = "next-ls-deps";
hash = "sha256-4Rt5Q0fX+fbncvxyXdpIhgEvn9VYX/QDxDdnbanT21Q=";
};
inherit elixir;
inherit (beamPackages) erlang;
removeCookie = false;
# replace installPhase to change release target
installPhase = ''
runHook preInstall
mix release --no-deps-check --path $out plain
makeWrapper $out/bin/plain $out/bin/nextls --add-flags "eval \"System.no_halt(true); Application.ensure_all_started(:next_ls)\""
runHook postInstall
'';
meta = with lib; {
homepage = "https://www.elixir-tools.dev/next-ls/";
changelog = "https://github.com/elixir-tools/next-ls/releases/tag/v${version}";
description = "The language server for Elixir that just works";
license = licenses.mit;
mainProgram = "nextls";
maintainers = [ maintainers.adamcstephens ];
platforms = beamPackages.erlang.meta.platforms;
};
}

2
pkgs/by-name/ob/oboete/Cargo.lock generated
View File

@ -3445,7 +3445,7 @@ dependencies = [
[[package]]
name = "oboete"
version = "0.1.2"
version = "0.1.3"
dependencies = [
"ashpd",
"dirs",

4
pkgs/by-name/ob/oboete/package.nix
View File

@ -14,13 +14,13 @@
rustPlatform.buildRustPackage rec {
pname = "oboete";
version = "0.1.2";
version = "0.1.3";
src = fetchFromGitHub {
owner = "mariinkys";
repo = "oboete";
rev = "refs/tags/${version}";
hash = "sha256-FVdE5ZI6kqT9OeZ9mZusdOYRBTnAzntd7xlIMS1MUzM=";
hash = "sha256-6JwIwWcei4hbHZsfTNHMKQVTj5CcPRIS+QR0PY3yhvg=";
};
cargoLock = {

4
pkgs/by-name/tr/trealla/package.nix
View File

@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [
];
stdenv.mkDerivation (finalAttrs: {
pname = "trealla";
version = "2.53.2";
version = "2.53.10";
src = fetchFromGitHub {
owner = "trealla-prolog";
repo = "trealla";
rev = "v${finalAttrs.version}";
hash = "sha256-LquQDKgh1yZ0kUuLIDHM3b8Xe8mdh/ZjILGvnOMm+Os=";
hash = "sha256-JUC8iIfISRKvVMZo2DjmuZ9g9TxSW2+lGIhUpfH6i5Y=";
};
postPatch = ''

11
pkgs/by-name/wa/wakatime-cli/package.nix
View File

@ -8,16 +8,16 @@
buildGo122Module rec {
pname = "wakatime-cli";
version = "1.90.0";
version = "1.93.0";
src = fetchFromGitHub {
owner = "wakatime";
repo = "wakatime-cli";
rev = "v${version}";
hash = "sha256-A2YrDrXmMR4BJUOYuo3h3Pa5HqyYSoDr/qdH54INU3w=";
hash = "sha256-S4AvAGpaxp5lKi9RnLLaN8qLURYsLWIzhtXKRgQPuGc=";
};
vendorHash = "sha256-pejrUFcv9c4ZAE3Cuw7uytc1T2pr7SOZNJ/Wr8K+fas=";
vendorHash = "sha256-+9zdEIaKQlLcBwFaY5Fe5mpHWQDqfV+j1TPmDkdRjyk=";
ldflags = [
"-s"
@ -25,6 +25,11 @@ buildGo122Module rec {
"-X github.com/wakatime/wakatime-cli/pkg/version.Version=${version}"
];
postPatch = ''
substituteInPlace go.mod \
--replace-fail "go 1.22.4" "go 1.22.3"
'';
checkFlags =
let
skippedTests = [

6
pkgs/by-name/ya/yanic/package.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "yanic";
version = "1.5.2";
version = "1.6.1";
src = fetchFromGitHub {
owner = "FreifunkBremen";
repo = "yanic";
rev = "v${version}";
sha256 = "sha256-UxTlo8HkC5iTfcfTAlhSkRQo8QJhI03JDSSItuE7BCE=";
sha256 = "sha256-tXngAnq30xBxR1dpVbE4kMNhvX2Rt5D22EBytB6qHUI=";
};
vendorHash = "sha256-D9V53/+C/+iv1U4kVrYWzJ8iD0MA1QcR8f5ifejFhLo=";
vendorHash = "sha256-6UiiajKLzW5e7y0F6GMYDZP6xTyOiccLIKlwvOY7LRo=";
ldflags = [ "-s" "-w" ];

1
pkgs/development/compilers/swift/compiler/default.nix
View File

@ -701,6 +701,7 @@ in stdenv.mkDerivation {
maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ];
license = lib.licenses.asl20;
platforms = with lib.platforms; linux ++ darwin;
broken = stdenv.isDarwin;
# Swift doesn't support 32-bit Linux, unknown on other platforms.
badPlatforms = lib.platforms.i686;
timeout = 86400; # 24 hours.

15
pkgs/development/julia-modules/package-closure.nix
View File

@ -42,8 +42,9 @@ let
resolveCode1_8 = ''
import Pkg.API: handle_package_input!
import Pkg.Types: PRESERVE_NONE, project_deps_resolve!, registry_resolve!, stdlib_resolve!, ensure_resolved
import Pkg.Types: PRESERVE_NONE, UUID, VersionSpec, project_deps_resolve!, registry_resolve!, stdlib_resolve!, ensure_resolved
import Pkg.Operations: _resolve, assert_can_add, update_package_add
import TOML
foreach(handle_package_input!, pkgs)
@ -54,6 +55,18 @@ let
for pkg in pkgs
if pkg.name in keys(overrides)
pkg.path = overrides[pkg.name]
# Try to read the UUID from $(pkg.path)/Project.toml. If successful, put the package into ctx.env.project.deps.
# This is necessary for the ensure_resolved call below to succeed, and will allow us to use an override even
# if it does not appear in the registry.
# See https://github.com/NixOS/nixpkgs/issues/279853
project_toml = joinpath(pkg.path, "Project.toml")
if isfile(project_toml)
toml_data = TOML.parsefile(project_toml)
if haskey(toml_data, "uuid")
ctx.env.project.deps[pkg.name] = UUID(toml_data["uuid"])
end
end
end
end

3
pkgs/development/julia-modules/python/minimal_registry.py
View File

@ -56,7 +56,8 @@ for (uuid, versions) in uuid_to_versions.items():
# Write nothing in Compat.toml, because we've already resolved everything
with open(out_path / path / Path("Deps.toml"), "w") as f:
f.write('["%s"]\n' % info["version"])
toml.dump(project["deps"], f)
if "deps" in project:
toml.dump(project["deps"], f)
with open(out_path / path / Path("Versions.toml"), "w") as f:
f.write('["%s"]\n' % info["version"])
f.write('git-tree-sha1 = "%s"\n' % info["treehash"])

64
pkgs/development/julia-modules/tests/julia-top-n/app/Main.hs
View File

@ -5,6 +5,7 @@
{-# LANGUAGE LambdaCase #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE QuasiQuotes #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE ViewPatterns #-}
@ -19,7 +20,7 @@ import qualified Data.Aeson.KeyMap as HM
import qualified Data.ByteString.Lazy.Char8 as BL8
import qualified Data.List as L
import Data.String.Interpolate
import Data.Text as T
import Data.Text as T hiding (count)
import qualified Data.Vector as V
import qualified Data.Yaml as Yaml
import GHC.Generics
@ -60,34 +61,55 @@ julia = Label
main :: IO ()
main = do
clo <- parseCommandLineArgs argsParser (return ())
let Args {..} = optUserOptions clo
let args@(Args {..}) = optUserOptions clo
namesAndCounts :: [NameAndCount] <- Yaml.decodeFileEither countFilePath >>= \case
Left err -> throwIO $ userError ("Couldn't decode names and counts YAML file: " <> show err)
Right x -> pure x
runSandwichWithCommandLineArgs' defaultOptions argsParser $
runSandwichWithCommandLineArgs' defaultOptions argsParser $ do
miscTests args
describe ("Building environments for top " <> show topN <> " Julia packages") $
parallelN parallelism $
forM_ (L.take topN namesAndCounts) $ \(NameAndCount {..}) ->
introduce' (defaultNodeOptions { nodeOptionsVisibilityThreshold = 0 }) (T.unpack name) julia (newMVar Nothing) (const $ return ()) $ do
it "Builds" $ do
let cp = proc "nix" ["build", "--impure", "--no-link", "--json", "--expr"
, [i|with import ../../../../. {}; #{juliaAttr}.withPackages ["#{name}"]|]
]
output <- readCreateProcessWithLogging cp ""
juliaPath <- case A.eitherDecode (BL8.pack output) of
Right (A.Array ((V.!? 0) -> Just (A.Object (aesonLookup "outputs" -> Just (A.Object (aesonLookup "out" -> Just (A.String t))))))) -> pure (JuliaPath ((T.unpack t) </> "bin" </> "julia"))
x -> expectationFailure ("Couldn't parse output: " <> show x)
testExpr args name [i|#{juliaAttr}.withPackages ["#{name}"]|]
getContext julia >>= flip modifyMVar_ (const $ return (Just juliaPath))
miscTests :: Args -> SpecFree ctx IO ()
miscTests args@(Args {..}) = describe "Misc tests" $ do
describe "works for a package outside the General registry" $ do
testExpr args "HelloWorld" [iii|(#{juliaAttr}.withPackages.override {
packageOverrides = {
"HelloWorld" = pkgs.fetchFromGitHub {
owner = "codedownio";
repo = "HelloWorld.jl";
rev = "9b41c55df76eb87830dd3bd0b5601ee2582a37c6";
sha256 = "sha256-G+xpMRb0RopW/xWA8KCFF/S8wuHTQbpj0qwm9CihfSc=";
};
};
}) [ "HelloWorld" ]|]
it "Uses" $ do
getContext julia >>= readMVar >>= \case
Nothing -> expectationFailure "Build step failed."
Just (JuliaPath juliaPath) -> do
let cp = proc juliaPath ["-e", "using " <> T.unpack name]
createProcessWithLogging cp >>= waitForProcess >>= (`shouldBe` ExitSuccess)
-- * Low-level
aesonLookup :: Text -> HM.KeyMap v -> Maybe v
aesonLookup = HM.lookup . A.fromText
testExpr :: Args -> Text -> String -> SpecFree ctx IO ()
testExpr _args name expr = do
introduce' (defaultNodeOptions { nodeOptionsVisibilityThreshold = 0 }) (T.unpack name) julia (newMVar Nothing) (const $ return ()) $ do
it "Builds" $ do
let cp = proc "nix" ["build", "--impure", "--no-link", "--json", "--expr", [i|with import ../../../../. {}; #{expr}|]]
output <- readCreateProcessWithLogging cp ""
juliaPath <- case A.eitherDecode (BL8.pack output) of
Right (A.Array ((V.!? 0) -> Just (A.Object (aesonLookup "outputs" -> Just (A.Object (aesonLookup "out" -> Just (A.String t))))))) -> pure (JuliaPath ((T.unpack t) </> "bin" </> "julia"))
x -> expectationFailure ("Couldn't parse output: " <> show x)
getContext julia >>= flip modifyMVar_ (const $ return (Just juliaPath))
it "Uses" $ do
getContext julia >>= readMVar >>= \case
Nothing -> expectationFailure "Build step failed."
Just (JuliaPath juliaPath) -> do
let cp = proc juliaPath ["-e", "using " <> T.unpack name]
createProcessWithLogging cp >>= waitForProcess >>= (`shouldBe` ExitSuccess)
where
aesonLookup :: Text -> HM.KeyMap v -> Maybe v
aesonLookup = HM.lookup . A.fromText

70
pkgs/development/libraries/libeatmydata/LFS64.patch Normal file
View File

@ -0,0 +1,70 @@
From 59f04ad8730034a205a1a792662d4b5dc2006b7c Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 13 May 2024 09:53:23 +0200
Subject: [PATCH] Fix sync_file_range() with musl 1.2.4
musl 1.2.4 has removed the transitional LFS off64_t type.
sync_file_range is declared with off_t in musl, which is always 64
bits.
This assumes that the same is true of any other libc which doesn't
provide off64_t. If it's not, gcc will produce an error due to the
conflicting types of sync_file_range(), so it will be caught and can
be fixed.
---
configure.ac | 2 ++
libeatmydata/libeatmydata.c | 11 +++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4d101ba..f3c4a69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,8 @@ AC_CHECK_HEADERS_ONCE(pthread.h)
AC_CHECK_SIZEOF(mode_t)
AC_CHECK_SIZEOF(int)
+AC_CHECK_TYPES([off64_t])
+
AC_CHECK_TYPE(pthread_barrier_t,,,[
#ifdef HAVE_PTHREAD_H
#include <pthread.h>
diff --git a/libeatmydata/libeatmydata.c b/libeatmydata/libeatmydata.c
index 134afcd..0015f1f 100644
--- a/libeatmydata/libeatmydata.c
+++ b/libeatmydata/libeatmydata.c
@@ -35,6 +35,12 @@
#define CHECK_FILE "/tmp/eatmydata"
*/
+#ifdef HAVE_OFF64_T
+typedef off64_t sync_file_range_off;
+#else
+typedef off_t sync_file_range_off;
+#endif
+
typedef int (*libc_open_t)(const char*, int, ...);
#ifdef HAVE_OPEN64
typedef int (*libc_open64_t)(const char*, int, ...);
@@ -44,7 +50,7 @@ typedef int (*libc_sync_t)(void);
typedef int (*libc_fdatasync_t)(int);
typedef int (*libc_msync_t)(void*, size_t, int);
#ifdef HAVE_SYNC_FILE_RANGE
-typedef int (*libc_sync_file_range_t)(int, off64_t, off64_t, unsigned int);
+typedef int (*libc_sync_file_range_t)(int, sync_file_range_off, sync_file_range_off, unsigned int);
#endif
#ifdef HAVE_SYNCFS
typedef int (*libc_syncfs_t)(int);
@@ -259,7 +265,8 @@ int LIBEATMYDATA_API msync(void *addr, size_t length, int flags)
}
#ifdef HAVE_SYNC_FILE_RANGE
-int LIBEATMYDATA_API sync_file_range(int fd, off64_t offset, off64_t nbytes,
+int LIBEATMYDATA_API sync_file_range(int fd, sync_file_range_off offset,
+ sync_file_range_off nbytes,
unsigned int flags)
{
if (eatmydata_is_hungry()) {
--
2.45.1

5
pkgs/development/libraries/libeatmydata/default.nix
View File

@ -17,6 +17,11 @@ stdenv.mkDerivation rec {
sha256 = "sha256-0lrYDW51/KSr809whGwg9FYhzcLRfmoxipIgrK1zFCc=";
};
patches = [
# https://github.com/stewartsmith/libeatmydata/pull/36
./LFS64.patch
];
postPatch = ''
patchShebangs .
'';

4
pkgs/development/python-modules/ailment/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.2.108";
version = "9.2.109";
pyproject = true;
disabled = pythonOlder "3.11";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "angr";
repo = "ailment";
rev = "refs/tags/v${version}";
hash = "sha256-0Dzp6ws5/mrlQbtq3PqkX5K8DdJIkCejhfnY3pGLdtc=";
hash = "sha256-1/17bSpvhripv0wYEQnhW2Z52fFThPjl8mNPTu2DP5s=";
};
build-system = [ setuptools ];

4
pkgs/development/python-modules/angr/default.nix
View File

@ -36,7 +36,7 @@
buildPythonPackage rec {
pname = "angr";
version = "9.2.108";
version = "9.2.109";
pyproject = true;
disabled = pythonOlder "3.11";
@ -45,7 +45,7 @@ buildPythonPackage rec {
owner = "angr";
repo = "angr";
rev = "refs/tags/v${version}";
hash = "sha256-6DjcxmqxDz2aLzYLi/Uz+FsrzeARpJtEMh/Loctyfv8=";
hash = "sha256-hvWE812Gu63vTfDlOY80GuUMAS2jZDSxLs4EP0eSbQE=";
};
pythonRelaxDeps = [ "capstone" ];

4
pkgs/development/python-modules/anova-wifi/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "anova-wifi";
version = "0.14.0";
version = "0.15.0";
pyproject = true;
disabled = pythonOlder "3.10";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Lash-L";
repo = "anova_wifi";
rev = "refs/tags/v${version}";
hash = "sha256-a0nc8tbbSIOxLyIcPK5prqEDdz/J0aKwmGG52iHb59U=";
hash = "sha256-GtUONwlY7JVImE7KiBGCa7DsQLw1agGdemmTczpXBU8=";
};
postPatch = ''

4
pkgs/development/python-modules/archinfo/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.2.108";
version = "9.2.109";
pyproject = true;
disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "angr";
repo = "archinfo";
rev = "refs/tags/v${version}";
hash = "sha256-KMpTShw5aLQc1KMTuWVzhV7mV+Y9KnpNhVv153tggyM=";
hash = "sha256-hyUzJO8e2XMkz91wBt9PP0dx1uVDlX2KDBkT5v/M1YQ=";
};
build-system = [ setuptools ];

2
pkgs/development/python-modules/auditok/default.nix
View File

@ -49,6 +49,6 @@ buildPythonPackage rec {
homepage = "https://github.com/amsehili/auditok/";
changelog = "https://github.com/amsehili/auditok/blob/v${version}/CHANGELOG";
license = licenses.mit;
maintainers = with maintainers; [ Benjamin-L ];
maintainers = with maintainers; [ ];
};
}

4
pkgs/development/python-modules/boto3-stubs/default.nix
View File

@ -366,7 +366,7 @@
buildPythonPackage rec {
pname = "boto3-stubs";
version = "1.34.138";
version = "1.34.139";
pyproject = true;
disabled = pythonOlder "3.7";
@ -374,7 +374,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "boto3_stubs";
inherit version;
hash = "sha256-NHpxTfySZT/dDY7ZgByCoBxRBTyPoOQLy4gLOd6NBr0=";
hash = "sha256-MRteoVf/AXjzqVg+rniCIXBGevuHS6eGIWNNtOdOezY=";
};
build-system = [ setuptools ];

4
pkgs/development/python-modules/botocore-stubs/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "botocore-stubs";
version = "1.34.138";
version = "1.34.139";
pyproject = true;
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "botocore_stubs";
inherit version;
hash = "sha256-YiRtRxlej8GTmtVK0Rb9CjMLvSULPf9vmL1J2iWgK8A=";
hash = "sha256-7lWxJvHtOkR09YBg4DtlFMDDs+zOiki0FxEZ52V6FC0=";
};
nativeBuildInputs = [ poetry-core ];

14
pkgs/development/python-modules/cf-xarray/default.nix
View File

@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "cf-xarray";
version = "0.9.1";
version = "0.9.3";
pyproject = true;
disabled = pythonOlder "3.9";
@ -29,17 +29,17 @@ buildPythonPackage rec {
owner = "xarray-contrib";
repo = "cf-xarray";
rev = "refs/tags/v${version}";
hash = "sha256-Og84lB99576G3IZz8LNafF86TyYP+ooe2tL8wb60RPw=";
hash = "sha256-7eL8z2r1+X80QqiL/5XzfA+Jlx+WuKvuxIWG4YLCwfg=";
};
nativeBuildInputs = [
build-system = [
setuptools
setuptools-scm
wheel
xarray
];
propagatedBuildInputs = [ xarray ];
dependencies = [ xarray ];
passthru.optional-dependencies = {
all = [
@ -66,11 +66,11 @@ buildPythonPackage rec {
"cf_xarray/tests/test_helpers.py"
];
meta = with lib; {
meta = {
description = "Accessor for xarray objects that interprets CF attributes";
homepage = "https://github.com/xarray-contrib/cf-xarray";
changelog = "https://github.com/xarray-contrib/cf-xarray/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/claripy/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.2.108";
version = "9.2.109";
pyproject = true;
disabled = pythonOlder "3.11";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "angr";
repo = "claripy";
rev = "refs/tags/v${version}";
hash = "sha256-CTCgiwt/vMJugo1KS5zugbfwk/a3TeMX/ezk9wkMsoo=";
hash = "sha256-loDB5y5j8hVmQL2zZf/az6jsRJKRRNWlcRp2WjS90Hc=";
};
# z3 does not provide a dist-info, so python-runtime-deps-check will fail

6
pkgs/development/python-modules/cle/default.nix
View File

@ -19,14 +19,14 @@
let
# The binaries are following the argr projects release cycle
version = "9.2.108";
version = "9.2.109";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
owner = "angr";
repo = "binaries";
rev = "refs/tags/v${version}";
hash = "sha256-d3Hs3k7PmOZqvLoiHD9HctaEHHOafCefjUcKGBPIiHU=";
hash = "sha256-zuEDi4+qd5Inrd0t8StgnvrDnrYGvEPk/I5yxfEErYk=";
};
in
buildPythonPackage rec {
@ -40,7 +40,7 @@ buildPythonPackage rec {
owner = "angr";
repo = "cle";
rev = "refs/tags/v${version}";
hash = "sha256-3zzTH6WKAavB/lkLBastOdeKegO8IyKRGN7k2vnX5WA=";
hash = "sha256-+4VJ1fqnYPvgiCmU/+aKM+7YZkvDbCMxbWO3YqnELA8=";
};
build-system = [ setuptools ];

4
pkgs/development/python-modules/cyclonedx-python-lib/default.nix
View File

@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "cyclonedx-python-lib";
version = "7.4.1";
version = "7.5.0";
pyproject = true;
disabled = pythonOlder "3.9";
@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "CycloneDX";
repo = "cyclonedx-python-lib";
rev = "refs/tags/v${version}";
hash = "sha256-ATeSMS8WaJS/2CaeNQgaK/6zyQBw07+6YYTZdhZPJug=";
hash = "sha256-yBBtE9DfHzUNXHMCo3KoUAAsvkBshczmVtMCUTtQ9zg=";
};
build-system = [ poetry-core ];

4
pkgs/development/python-modules/cyclopts/default.nix
View File

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "cyclopts";
version = "2.9.1";
version = "2.9.3";
pyproject = true;
disabled = pythonOlder "3.8";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "BrianPugh";
repo = "cyclopts";
rev = "refs/tags/v${version}";
hash = "sha256-ZJMyshGN7DjAESEZA2NBDtIOkyem2H7TSQ4Uwcea0LQ=";
hash = "sha256-8D9HBWotn15fkHlwpXcpsC0VmaD7JuD0XVRJGRj1Ijg=";
};
build-system = [

4
pkgs/development/python-modules/deebot-client/default.nix
View File

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "deebot-client";
version = "8.1.0";
version = "8.1.1";
pyproject = true;
disabled = pythonOlder "3.12";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "DeebotUniverse";
repo = "client.py";
rev = "refs/tags/${version}";
hash = "sha256-j5D+ZOlthQEfFJQWfN4xecwd5vBSjdvCVzJuRzRuh9o=";
hash = "sha256-q52dMygpBzL92yW8DFIKpjxykGqW86CNM1xqxGf/JJ0=";
};
build-system = [

4
pkgs/development/python-modules/find-libpython/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "find-libpython";
version = "0.3.1";
version = "0.4.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "ktbarrett";
repo = "find_libpython";
rev = "refs/tags/v${version}";
hash = "sha256-DBBAgfYQ4UBFn5Osb1kpVBWbrZVBAvcVGQ/J4rJO/rQ=";
hash = "sha256-rYVGE9P5Xtm32kMoiqaZVMgnDbX3JBnI1uV80aNNOfw=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/google-cloud-securitycenter/default.nix
View File

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-securitycenter";
version = "1.31.0";
version = "1.32.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-1BbYIjVlAEz3cnPx3tzQ5z8z415X3TZJjUsr5aXcs4w=";
hash = "sha256-EQ3KkE+5mxaFrJ6+zfGFQKI013dY4TyrxxzvDE/KuME=";
};
build-system = [ setuptools ];

30
pkgs/development/python-modules/greeclimate/default.nix
View File

@ -4,6 +4,7 @@
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
setuptools,
netifaces,
pycryptodome,
pytest-asyncio,
@ -12,19 +13,21 @@
buildPythonPackage rec {
pname = "greeclimate";
version = "1.4.6";
format = "setuptools";
version = "2.0.0";
pyproject = true;
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "cmroche";
repo = "greeclimate";
rev = "refs/tags/v${version}";
hash = "sha256-yoCbFLtyPEtELp2ptpBBdJTE7yyMqUeMRWT3wfKk5JM=";
hash = "sha256-EHVUbvz0lz0gnmLd8XpIVo8OaZPr2k96l1Wu57pnIJE=";
};
propagatedBuildInputs = [
build-system = [ setuptools ];
dependencies = [
netifaces
pycryptodome
];
@ -34,6 +37,23 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTests = [
# OSError: [Errno 101] Network is unreachable
"test_get_device_info"
"test_device_bind"
"test_device_late_bind"
"test_update_properties"
"test_set_properties"
"test_uninitialized_properties"
"test_update_current_temp"
"test_send_temperature"
"test_enable_disable_sleep_mode"
"test_mismatch_temrec_farenheit"
"test_device_equality"
"test_issue_69_TemSen_40_should_not_set_firmware_v4"
"test_issue_87_quiet_should_set_2"
];
pythonImportsCheck = [
"greeclimate"
"greeclimate.device"

4
pkgs/development/python-modules/hstspreload/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "hstspreload";
version = "2024.6.1";
version = "2024.7.1";
pyproject = true;
disabled = pythonOlder "3.6";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "sethmlarson";
repo = "hstspreload";
rev = "refs/tags/${version}";
hash = "sha256-eeZR+UDQ6Cp1WTcz2duSTgQ+7vrF9T08aVT0mJk6ctA=";
hash = "sha256-WCmUYYPx8tJJ1Z3utjS8k6vePx/pZ6OZ+D0YjovqizQ=";
};
build-system = [ setuptools ];

4
pkgs/development/python-modules/inkbird-ble/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "inkbird-ble";
version = "0.5.7";
version = "0.5.8";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-JmhYYoKz3w3H/WSkJFXrNAsJOmGr+Ex3LGNmgdQgr3s=";
hash = "sha256-cUqU4XaY7CORhzy0AGjXI5c5ka+PnF4cHdyopyEBcLo=";
};
nativeBuildInputs = [ poetry-core ];

29
pkgs/development/python-modules/iodata/default.nix
View File

@ -2,37 +2,44 @@
buildPythonPackage,
lib,
fetchFromGitHub,
setuptools,
setuptools-scm,
numpy,
scipy,
attrs,
cython,
nose,
pytest-xdist,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "iodata";
version = "1.0.0a2";
format = "setuptools";
version = "1.0.0a4";
pyproject = true;
src = fetchFromGitHub {
owner = "theochem";
repo = pname;
rev = version;
hash = "sha256-GFTCYE19Re7WLhV8eU+0i8OMp/Tsms/Xj9DRTcgjcz4=";
rev = "refs/tags/v${version}";
hash = "sha256-ld6V+/8lg4Du6+mHU5XuXXyMpWwyepXurerScg/bf2Q=";
};
nativeBuildInputs = [
cython
nose
build-system = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dependencies = [
numpy
scipy
attrs
];
pythonImportsCheck = [ "iodata" ];
doCheck = false; # Requires roberto or nose and a lenghtly setup to find the cython modules
nativeCheckInputs = [
pytest-xdist
pytestCheckHook
];
meta = with lib; {
description = "Python library for reading, writing, and converting computational chemistry file formats and generating input files";

4
pkgs/development/python-modules/lacuscore/default.nix
View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "lacuscore";
version = "1.9.6";
version = "1.10.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "ail-project";
repo = "LacusCore";
rev = "refs/tags/v${version}";
hash = "sha256-SCObCYcZ+aDzWOkE5tzkKMkgAP/h7HDNyHXMFmYjiHQ=";
hash = "sha256-hbMMKV/LJSfCgl293Tm4kkpwoYYpgydV/reri9ONj+4=";
};
pythonRelaxDeps = [

4
pkgs/development/python-modules/mkdocs-jupyter/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "mkdocs-jupyter";
version = "0.24.6";
version = "0.24.8";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "mkdocs_jupyter";
inherit version;
hash = "sha256-ify+ipUjhk1UFt4aYHEWQLa8KXInnSrfRu0ndsLZ/3w=";
hash = "sha256-Cadi9ITVQNnA6UTTSyjLU2oyhp4iS0YOL8eRsUP3aUA=";
};
postPatch = ''

4
pkgs/development/python-modules/mkdocs-rss-plugin/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "mkdocs-rss-plugin";
version = "1.14.0";
version = "1.15.0";
pyproject = true;
disabled = pythonOlder "3.9";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "Guts";
repo = "mkdocs-rss-plugin";
rev = "refs/tags/${version}";
hash = "sha256-4/sLwdScYatDXfAGbEsiYMdQ7IYMSlA3X1u04G3XcOc=";
hash = "sha256-sGm6uWlZeW65uorfTK8pk8ZT2AE9nmsZhe+UYVrSr+8=";
};
postPatch = ''

12
pkgs/development/python-modules/monai/default.nix
View File

@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
pythonOlder,
pythonAtLeast,
ninja,
@ -16,8 +17,7 @@ buildPythonPackage rec {
pname = "monai";
version = "1.3.1";
pyproject = true;
# upper bound due to use of `distutils`; remove after next release:
disabled = pythonOlder "3.8" || pythonAtLeast "3.12";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "Project-MONAI";
@ -26,6 +26,14 @@ buildPythonPackage rec {
hash = "sha256-YjEJbDM9+PiC3Kse8NA/b/yJBsReaK6yIyEB9uktiEc=";
};
patches = [
(fetchpatch {
name = "remove-distutils";
url = "https://github.com/Project-MONAI/MONAI/commit/87862f0d5730d42d282e779fc1450f18b4869863.patch";
hash = "sha256-wApYfugDPWcuxwmd91peNqc0+l+SoMlT8hhx99oI2Co=";
})
];
preBuild = ''
export MAX_JOBS=$NIX_BUILD_CORES;
'';

11
pkgs/development/python-modules/parsel/default.nix
View File

@ -9,13 +9,14 @@
psutil,
pytestCheckHook,
pythonOlder,
setuptools,
w3lib,
}:
buildPythonPackage rec {
pname = "parsel";
version = "1.9.1";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.7";
@ -24,12 +25,9 @@ buildPythonPackage rec {
hash = "sha256-FOANwHcxyQMNtiDBlfyuiEtbSEjp+cUjxhGfcIzPqaw=";
};
postPatch = ''
substituteInPlace setup.py \
--replace '"pytest-runner",' ""
'';
build-system = [ setuptools ];
propagatedBuildInputs = [
dependencies = [
cssselect
jmespath
lxml
@ -47,6 +45,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python library to extract data from HTML and XML using XPath and CSS selectors";
homepage = "https://github.com/scrapy/parsel";
changelog = "https://github.com/scrapy/parsel/blob/v${version}/NEWS";
license = licenses.bsd3;
maintainers = with maintainers; [ fab ];
};

21
pkgs/development/python-modules/pint-pandas/default.nix
View File

@ -3,6 +3,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
setuptools,
setuptools-scm,
wheel,
@ -13,34 +14,36 @@
buildPythonPackage rec {
pname = "pint-pandas";
version = "0.4";
format = "pyproject";
version = "0.6";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "hgrecco";
repo = "pint-pandas";
rev = version;
hash = "sha256-FuH6wksSCkkL2AyQN46hwTnfeAZFwkWRl6KEEhsxmUY=";
rev = "refs/tags/${version}";
hash = "sha256-5/Qk6HZlfeKkfSqnVA8aADjJ99SUiurYCqSIUBPFIzc=";
};
nativeBuildInputs = [
build-system = [
setuptools
setuptools-scm
wheel
];
propagatedBuildInputs = [
dependencies = [
pint
pandas
];
nativeCheckInputs = [ pytestCheckHook ];
meta = with lib; {
meta = {
broken = stdenv.isDarwin;
description = "Pandas support for pint";
license = licenses.bsd3;
license = lib.licenses.bsd3;
homepage = "https://github.com/hgrecco/pint-pandas";
maintainers = with maintainers; [ doronbehar ];
maintainers = with lib.maintainers; [ doronbehar ];
};
}

14
pkgs/development/python-modules/pint/default.nix
View File

@ -25,16 +25,16 @@
buildPythonPackage rec {
pname = "pint";
version = "0.24";
format = "pyproject";
version = "0.24.1";
pyproject = true;
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "hgrecco";
repo = "pint";
rev = "refs/tags/${version}";
hash = "sha256-zMcLC3SSl/W7+xX4ah3ZV7fN/LIGJzatqH4MNK8/fec=";
hash = "sha256-PQAQvjMi7pFgNhUbw20vc306aTyEbCQNHGef/pxxpXo=";
};
build-system = [
@ -68,12 +68,12 @@ buildPythonPackage rec {
export HOME=$(mktemp -d)
'';
meta = with lib; {
meta = {
changelog = "https://github.com/hgrecco/pint/blob/${version}/CHANGES";
description = "Physical quantities module";
mainProgram = "pint-convert";
license = licenses.bsd3;
license = lib.licenses.bsd3;
homepage = "https://github.com/hgrecco/pint/";
maintainers = with maintainers; [ doronbehar ];
maintainers = with lib.maintainers; [ doronbehar ];
};
}

4
pkgs/development/python-modules/playwrightcapture/default.nix
View File

@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "playwrightcapture";
version = "1.24.11";
version = "1.25.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "Lookyloo";
repo = "PlaywrightCapture";
rev = "refs/tags/v${version}";
hash = "sha256-aDD+eovq6V7c69ORqekcfmDgTGJqvd2lYMIQ2+9TFYY=";
hash = "sha256-Sm6FfwUxW3t7gLwWd+ZJPyp0VSMPgGpuT3lrMurWOa0=";
};
pythonRelaxDeps = [

4
pkgs/development/python-modules/pylacus/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pylacus";
version = "1.9.0";
version = "1.10.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "ail-project";
repo = "PyLacus";
rev = "refs/tags/v${version}";
hash = "sha256-ytO9wtCkiC6CLWLkmSV/R+Rnx/W4Jv2dsgykZ2GB13U=";
hash = "sha256-HPd/kF79Xb5kyYdOpm6ny6/rRNeu8WkTv7rM1Kpb7YI=";
};
build-system = [ poetry-core ];

2
pkgs/development/python-modules/pysubs2/default.nix
View File

@ -29,6 +29,6 @@ buildPythonPackage rec {
description = "Python library for editing subtitle files";
mainProgram = "pysubs2";
license = licenses.mit;
maintainers = with maintainers; [ Benjamin-L ];
maintainers = with maintainers; [ ];
};
}

38
pkgs/development/python-modules/pytest-examples/default.nix
View File

@ -3,7 +3,6 @@
black,
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
hatchling,
pytest,
pytestCheckHook,
@ -13,60 +12,43 @@
buildPythonPackage rec {
pname = "pytest-examples";
version = "0.0.10";
format = "pyproject";
version = "0.0.12";
pyproject = true;
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "pydantic";
repo = "pytest-examples";
rev = "refs/tags/v${version}";
hash = "sha256-jCxOGDJlFkMH9VtaaPsE5zt+p3Z/mrVzhdNSI51/nVM=";
hash = "sha256-hTLTL3w4OEv8Pkzc/h9qDMnlhe6P+Q6XUImLVDsDKvk=";
};
patches = [
(fetchpatch {
url = "https://github.com/pydantic/pytest-examples/commit/551ba911713c2859caabc91b664723dd6bc800c5.patch";
hash = "sha256-Y3OU4fNyLADhBQGwX2jY0gagVV2q2dcn3kJRLUyCtZI=";
})
(fetchpatch {
url = "https://github.com/pydantic/pytest-examples/commit/3bef5d644fe3fdb076270833768e4c6df9148530.patch";
hash = "sha256-pf+WKzZNqgjbJiblMMLHWk23kjg4W9nm+KBmC8rG8Lw=";
})
];
postPatch = ''
# ruff binary is used directly, the ruff Python package is not needed
substituteInPlace pytest_examples/lint.py \
--replace "'ruff'" "'${ruff}/bin/ruff'"
--replace-fail "'ruff'" "'${lib.getExe ruff}'"
'';
pythonRemoveDeps = [ "ruff" ];
nativeBuildInputs = [
build-system = [
hatchling
];
buildInputs = [ pytest ];
propagatedBuildInputs = [ black ];
dependencies = [ black ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "pytest_examples" ];
disabledTests = [
# Test fails with latest ruff v0.1.2
# See https://github.com/pydantic/pytest-examples/issues/26
"test_ruff_error"
];
meta = with lib; {
meta = {
description = "Pytest plugin for testing examples in docstrings and markdown files";
homepage = "https://github.com/pydantic/pytest-examples";
changelog = "https://github.com/pydantic/pytest-examples/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/pyvex/default.nix
View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.2.108";
version = "9.2.109";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchPypi {
inherit pname version;
hash = "sha256-N1sGTjDiqmwyXdXpApUgVAmUPjwJUiEIaTZoWyrBpAs=";
hash = "sha256-GdKU+SbZbc81WSnqsxdiEuGUoBjmDPTrBfHs6zxehkg=";
};
build-system = [ setuptools ];

9
pkgs/development/python-modules/qcodes/default.nix
View File

@ -19,6 +19,7 @@
ipython,
ipywidgets,
jsonschema,
libcst,
matplotlib,
numpy,
opentelemetry-api,
@ -63,7 +64,7 @@
buildPythonPackage rec {
pname = "qcodes";
version = "0.45.0";
version = "0.46.0";
pyproject = true;
disabled = pythonOlder "3.9";
@ -72,7 +73,7 @@ buildPythonPackage rec {
owner = "microsoft";
repo = "Qcodes";
rev = "refs/tags/v${version}";
hash = "sha256-H91CpvxGQW0X+m/jlqXMc1RdI9w62lt5jgYOxZ2iPQg=";
hash = "sha256-CeAX3sBE21v68KnCe8z28WTc7zMPA7usRRGh+dNijjo=";
};
build-system = [
@ -132,6 +133,9 @@ buildPythonPackage rec {
opencensus
opencensus-ext-azure
];
refactor = [
libcst
];
zurichinstruments = [
# zhinst-qcodes
];
@ -140,6 +144,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
deepdiff
hypothesis
libcst
lxml
pip
pytest-asyncio

12
pkgs/development/python-modules/w3lib/default.nix
View File

@ -3,14 +3,14 @@
buildPythonPackage,
fetchPypi,
pytestCheckHook,
pythonAtLeast,
pythonOlder,
setuptools
}:
buildPythonPackage rec {
pname = "w3lib";
version = "2.2.1";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.7";
@ -19,16 +19,12 @@ buildPythonPackage rec {
hash = "sha256-dW/y2Uxk5ByNfAxZ/qEqXQvFXjOlMceYi0oWPeubB90=";
};
build-system = [ setuptools ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "w3lib" ];
disabledTests = lib.optionals (pythonAtLeast "3.11") [
# regressed on Python 3.11.4
# https://github.com/scrapy/w3lib/issues/212
"test_safe_url_string_url"
];
meta = with lib; {
description = "Library of web-related functions";
homepage = "https://github.com/scrapy/w3lib";

4
pkgs/development/python-modules/youless-api/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "youless-api";
version = "2.1.0";
version = "2.1.2";
pyproject = true;
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "gjong";
repo = "youless-python-bridge";
rev = "refs/tags/${version}";
hash = "sha256-gygChn5yXuTrVGP82ijKJHcjEuNTu6ZNikc87n8WTrI=";
hash = "sha256-MvGLIhkBbcGThKeqtlzVZct2o9PBLwcAELmn5pW3R6I=";
};
build-system = [ setuptools ];

4
pkgs/development/tools/analysis/checkov/default.nix
View File

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.2.171";
version = "3.2.174";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
rev = "refs/tags/${version}";
hash = "sha256-hFjFm13vs0fZ4aZl1hCrmw7AQejKtg+bcaDHC+Fx88M=";
hash = "sha256-5R5WKeXmT4hMhjd+Laafqx4UXfvGf+2lMh34XpMs3vQ=";
};
patches = [ ./flake8-compat-5.x.patch ];

6
pkgs/development/tools/analysis/frama-c/default.nix
View File

@ -37,12 +37,12 @@ in
stdenv.mkDerivation rec {
pname = "frama-c";
version = "28.1";
slang = "Nickel";
version = "29.0";
slang = "Copper";
src = fetchurl {
url = "https://frama-c.com/download/frama-c-${version}-${slang}.tar.gz";
hash = "sha256-AiC8dDt9okaM65JvMx7cfd+qfGA7pHli3j4zyOHj9ZM=";
hash = "sha256-0vuzuND/g5RYcunm+iWOk0pwY2DmmNrjtNX5ca3fdJM=";
};
preConfigure = ''

82
pkgs/games/astromenace/default.nix
View File

@ -1,33 +1,70 @@
{ fetchurl, lib, stdenv, cmake, xorg, libGLU, libGL, SDL, openal, fontconfig, freealut, freetype, libogg, libvorbis, runtimeShell }:
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, ninja
, makeWrapper
, xorg
, libGLU
, libGL
, SDL2
, openal
, fontconfig
, freealut
, freetype
, libogg
, libvorbis
, runtimeShell
}:
stdenv.mkDerivation rec {
pname = "astromenace";
version = "1.4.1";
version = "1.4.2";
src = fetchurl {
url = "mirror://sourceforge/openastromenace/astromenace-src-${version}.tar.bz2";
sha256 = "1rkz6lwjcd5mwv72kf07ghvx6z46kf3xs250mjbmnmjpn7r5sxwv";
src = fetchFromGitHub {
owner = "viewizard";
repo = "astromenace";
rev = "v${version}";
hash = "sha256-VFFFYHsBxkURHqOBeuRuIxRKsy8baw2izOZ/qXUkiW8=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ xorg.libICE xorg.libX11 xorg.libXinerama libGLU libGL SDL openal fontconfig freealut freetype libogg libvorbis ];
patches = [
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/astromenace/raw/5e6bc02d115a53007dc47ef8223d8eaa25607588/f/astromenace-gcc13.patch";
hash = "sha256-pkmTVR86vS+KCICxAp+d7upNWVnSNxwdKmxnbtqIvgU=";
})
];
postBuild = ''
./AstroMenace --pack --rawdata=../RAW_VFS_DATA
'';
nativeBuildInputs = [
cmake
ninja
makeWrapper
];
buildInputs = [
xorg.libICE
xorg.libX11
xorg.libXinerama
libGLU
libGL
SDL2
openal
fontconfig
freealut
freetype
libogg
libvorbis
];
installPhase = ''
mkdir -p $out/bin
cp AstroMenace $out
cp gamedata.vfs $out
cat > $out/bin/AstroMenace << EOF
#!${runtimeShell}
$out/AstroMenace --dir=$out
EOF
chmod 755 $out/bin/AstroMenace
runHook preInstall
mkdir -p $out/share/astromenace
install -Dm644 gamedata.vfs $out/share/astromenace/gamedata.vfs
install -Dm755 astromenace $out/bin/astromenace
wrapProgram $out/bin/astromenace \
--add-flags "--dir=$out/share/astromenace"
runHook postInstall
'';
meta = with lib; {
@ -35,6 +72,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.viewizard.com/";
license = licenses.gpl3Plus;
platforms = platforms.linux;
mainProgram = "AstroMenace";
mainProgram = "astromenace";
maintainers = with maintainers; [ fgaz ];
};
}

15
pkgs/os-specific/linux/nfs-utils/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchpatch, lib, pkg-config, util-linux, libcap, libtirpc, libevent
, sqlite, libkrb5, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers
, python3, buildPackages, nixosTests, rpcsvc-proto
, enablePython ? true
, python3, buildPackages, nixosTests, rpcsvc-proto, openldap
, enablePython ? true, enableLdap ? true
}:
let
@ -10,11 +10,11 @@ in
stdenv.mkDerivation rec {
pname = "nfs-utils";
version = "2.6.2";
version = "2.6.4";
src = fetchurl {
url = "mirror://kernel/linux/utils/nfs-utils/${version}/${pname}-${version}.tar.xz";
hash = "sha256-UgCHPoHE1hDiRi/CYv4YE18tvni3l5+VrM0VmuZNUBE=";
hash = "sha256-AbOw+5x9C7q/URTHNlQgMHSMeI7C/Zc0dEIB6bChEZ0=";
};
# libnfsidmap is built together with nfs-utils from the same source,
@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
buildInputs = [
libtirpc libcap libevent sqlite lvm2
libuuid keyutils libkrb5 tcp_wrappers
] ++ lib.optional enablePython python3;
] ++ lib.optional enablePython python3
++ lib.optional enableLdap openldap;
enableParallelBuilding = true;
@ -47,7 +48,7 @@ stdenv.mkDerivation rec {
"--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap
"--with-rpcgen=${buildPackages.rpcsvc-proto}/bin/rpcgen"
"--with-modprobedir=${placeholder "out"}/etc/modprobe.d"
];
] ++ lib.optional enableLdap "--with-ldap";
patches = lib.optionals stdenv.hostPlatform.isMusl [
# http://openwall.com/lists/musl/2015/08/18/10
@ -68,7 +69,7 @@ stdenv.mkDerivation rec {
substituteInPlace systemd/nfs-utils.service \
--replace "/bin/true" "${coreutils}/bin/true"
substituteInPlace tools/nfsrahead/Makefile.in \
substituteInPlace tools/nfsrahead/Makefile.in systemd/Makefile.in \
--replace "/usr/lib/udev/rules.d/" "$out/lib/udev/rules.d/"
substituteInPlace utils/mount/Makefile.in \

4
pkgs/os-specific/linux/oxtools/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "0xtools";
version = "1.2.4";
version = "2.0.2";
src = fetchFromGitHub {
owner = "tanelpoder";
repo = "0xtools";
rev = "v${finalAttrs.version}";
hash = "sha256-h0/HIbwb1CvFUh/NpozDUCjYGCH647lC7JhbpDCvaLk=";
hash = "sha256-S2jGF6wyjE9okbren/+p37zDr+eHUE8gJe/sbsXX4f4=";
};
postPatch = ''

35
pkgs/os-specific/linux/rtl8821ce/default.nix
View File

@ -1,19 +1,20 @@
{ lib
, stdenv
, fetchFromGitHub
, kernel
, bc
{
lib,
stdenv,
fetchFromGitHub,
kernel,
bc,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "rtl8821ce";
version = "${kernel.version}-unstable-2024-01-20";
version = "${kernel.version}-unstable-2024-03-26";
src = fetchFromGitHub {
owner = "tomaspinho";
repo = "rtl8821ce";
rev = "66983b69120a13699acf40a12979317f29012111";
hash = "sha256-Zxb9cOgP67QdCeTNEme0tAsBqd9j/2k+gcE1QKkUQU4=";
rev = "f119398d868b1a3395f40c1df2e08b57b2c882cd";
hash = "sha256-EfpKa5ZRBVM5T8EVim3cVX1PP1UM9CyG6tN5Br8zYww=";
};
hardeningDisable = [ "pic" ];
@ -34,12 +35,16 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with lib; {
meta = {
description = "Realtek rtl8821ce driver";
homepage = "https://github.com/tomaspinho/rtl8821ce";
license = licenses.gpl2Only;
platforms = platforms.linux;
maintainers = with maintainers; [ hhm ];
broken = stdenv.isAarch64 || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened);
license = lib.licenses.gpl2Only;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [
hhm
defelo
];
broken =
stdenv.isAarch64 || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened);
};
}
})

6
pkgs/servers/matrix-synapse/default.nix
View File

@ -32,20 +32,20 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.109.0";
version = "1.110.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "element-hq";
repo = "synapse";
rev = "v${version}";
hash = "sha256-AUaHgMKte1EIfI0EQm8YeQVtlXGTm+MZwq22WzYHGsE=";
hash = "sha256-DsDQgmHDU+iJ+00p1uch9Zj6lleDvdTQMy05hi8R9CM=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-KwRNn2Ypt87QRUTCsj00zsu6uQtP5MSuM6B2DemoFGs=";
hash = "sha256-J0JBp9pCP00Cjs6T4litjhY28mq0OJDBrRZVSQaS03w=";
};
postPatch = ''

4
pkgs/servers/monitoring/prometheus/knot-exporter.nix
View File

@ -6,13 +6,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "knot-exporter";
version = "3.3.6";
version = "3.3.7";
pyproject = true;
src = fetchPypi {
pname = "knot_exporter";
inherit version;
hash = "sha256-4Fdbu08RbivZF+Hnk+tI1DW9PyzQTI0TngAbZ60CcO8=";
hash = "sha256-5vAoUXXU4hxyRyIytWom40yp0pusshBmCbs0w6+tvF4=";
};
nativeBuildInputs = [

4
pkgs/servers/teleport/14/default.nix
View File

@ -10,8 +10,4 @@ import ../generic.nix (args // {
"rdp-rs-0.1.0" = "sha256-U52FVuqo2DH/7f0cQ1qcb1GbFZ97yxExVFMX5cs0zw4=";
};
};
extPatches = [
# https://github.com/NixOS/nixpkgs/issues/120738
../tsh_14.patch
];
})

4
pkgs/servers/teleport/15/default.nix
View File

@ -12,10 +12,6 @@ import ../generic.nix (args // {
"sspi-0.10.1" = "sha256-fkclC/plTh2d8zcmqthYmr5yXqbPTeFxI1VuaPX5vxk=";
};
};
extPatches = [
# https://github.com/NixOS/nixpkgs/issues/120738
../tsh_14.patch
];
# wasm-bindgen-cli version must match the version of wasm-bindgen in Cargo.lock
wasm-bindgen-cli = wasm-bindgen-cli.override {

3441
pkgs/servers/teleport/16/Cargo.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

22
pkgs/servers/teleport/16/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ wasm-bindgen-cli, ... }@args:
import ../generic.nix (args // {
version = "16.0.4";
hash = "sha256-svDqcYm6PbmPyHhN00VKn/sGRkfb7ah2N7BtEVdZ9hg=";
vendorHash = "sha256-H4Rwel/UAvxY8/4CfSbneJYjt9HHgsuNbYXUM6MtqXM=";
yarnHash = "sha256-OHNnN66MevDiH4Zr6Uq3Om65XBzf4O3AIrPvhlvhkbE=";
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"boring-4.7.0" = "sha256-ACzw4Bfo6OUrwvi3h21tvx5CpdQaWCEIDkslzjzy9o8=";
"ironrdp-async-0.1.0" = "sha256-nE5O/wRJ3vJqJG5zdYmpVkhx6JC6Yb92pR4EKSWSdkA=";
"sspi-0.10.1" = "sha256-fkclC/plTh2d8zcmqthYmr5yXqbPTeFxI1VuaPX5vxk=";
};
};
# wasm-bindgen-cli version must match the version of wasm-bindgen in Cargo.lock
wasm-bindgen-cli = wasm-bindgen-cli.override {
version = "0.2.92";
hash = "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0=";
cargoHash = "sha256-aACJ+lYNEU8FFBs158G1/JG8sc6Rq080PeKCMnwdpH0=";
};
})

3
pkgs/servers/teleport/default.nix
View File

@ -3,7 +3,8 @@ let
f = args: rec {
teleport_14 = import ./14 args;
teleport_15 = import ./15 args;
teleport = teleport_15;
teleport_16 = import ./16 args;
teleport = teleport_16;
};
# Ensure the following callPackages invocation includes everything 'generic' needs.
f' = lib.setFunctionArgs f (builtins.functionArgs (import ./generic.nix));

3
pkgs/servers/teleport/generic.nix
View File

@ -27,7 +27,7 @@
, version
, hash
, vendorHash
, extPatches ? null
, extPatches ? []
, cargoHash ? null
, cargoLock ? null
, yarnHash
@ -136,6 +136,7 @@ buildGoModule rec {
patches = extPatches ++ [
./0001-fix-add-nix-path-to-exec-env.patch
./rdpclient.patch
./tsh.patch
];
# Reduce closure size for client machines

10
pkgs/servers/teleport/tsh.patch
View File

@ -1,8 +1,8 @@
diff --git a/tool/tsh/tsh.go b/tool/tsh/tsh.go
index f73b0a4e46..6848286781 100644
--- a/tool/tsh/tsh.go
+++ b/tool/tsh/tsh.go
@@ -1065,10 +1065,11 @@ func Run(ctx context.Context, args []string, opts ...cliOption) error {
diff --git a/tool/tsh/common/tsh.go b/tool/tsh/common/tsh.go
index 5de21c69d0..3995c19e3c 100644
--- a/tool/tsh/common/tsh.go
+++ b/tool/tsh/common/tsh.go
@@ -1084,10 +1084,11 @@ func Run(ctx context.Context, args []string, opts ...CliOption) error {
var err error

17
pkgs/servers/teleport/tsh_14.patch
View File

@ -1,17 +0,0 @@
diff --git a/tool/tsh/common/tsh.go b/tool/tsh/common/tsh.go
index 5de21c69d0..3995c19e3c 100644
--- a/tool/tsh/common/tsh.go
+++ b/tool/tsh/common/tsh.go
@@ -1084,10 +1084,11 @@ func Run(ctx context.Context, args []string, opts ...CliOption) error {
var err error
- cf.executablePath, err = os.Executable()
+ tempBinaryPath, err := os.Executable()
if err != nil {
return trace.Wrap(err)
}
+ cf.executablePath = path.Dir(tempBinaryPath) + "/tsh"
// configs
setEnvFlags(&cf)

2
pkgs/tools/graphics/deqp-runner/default.nix
View File

@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://gitlab.freedesktop.org/anholt/deqp-runner";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ Benjamin-L ];
maintainers = with maintainers; [ ];
};
}

6
pkgs/tools/security/cnspec/default.nix
View File

@ -6,18 +6,18 @@
buildGoModule rec {
pname = "cnspec";
version = "11.10.0";
version = "11.11.0";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnspec";
rev = "refs/tags/v${version}";
hash = "sha256-tV7QDa7XSkr+HwegOwEnOjtn1IrLhE0PfrhjjRz0JbM=";
hash = "sha256-3cjtWdBovnRHFUS9TAPkGbg+XocgkkgJFfkljkyjqUg=";
};
proxyVendor = true;
vendorHash = "sha256-KS+fuoLFueI5cHQLiM1g6Qxq4UFKNVGauvchx2aP+RY=";
vendorHash = "sha256-9N1v2i2Cxs7t1d2eI9NQOOqlmc9evV15HH12HZ0gr4U=";
subPackages = [ "apps/cnspec" ];

2
pkgs/tools/security/metasploit/Gemfile
View File

@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.15"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.16"

11
pkgs/tools/security/metasploit/Gemfile.lock
View File

@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: b4a408704631fd0a0a4587f1f1a0017bcec9fb45
ref: refs/tags/6.4.15
revision: d21ca8b456e74278a0149a34ced9292692b5c52d
ref: refs/tags/6.4.16
specs:
metasploit-framework (6.4.15)
metasploit-framework (6.4.16)
aarch64
abbrev
actionpack (~> 7.0.0)
@ -51,6 +51,7 @@ GIT
nessus_rest
net-imap
net-ldap
net-sftp
net-smtp
net-ssh
network_interface
@ -297,6 +298,8 @@ GEM
net-ldap (0.19.0)
net-protocol (0.2.2)
timeout
net-sftp (4.0.0)
net-ssh (>= 5.0.0, < 8.0.0)
net-smtp (0.5.0)
net-protocol
net-ssh (7.2.3)
@ -481,4 +484,4 @@ DEPENDENCIES
metasploit-framework!
BUNDLED WITH
2.5.9
2.5.11

4
pkgs/tools/security/metasploit/default.nix
View File

@ -15,13 +15,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "6.4.15";
version = "6.4.16";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = "refs/tags/${version}";
hash = "sha256-CJXti/pX2Q59fJgRbAodUDMlMHIJH0eh3kOZxrQEllY=";
hash = "sha256-dCeSSxIIDMsEa6hQ43tcoRDMLkE3o+UzwsGOWE7jUPA=";
};
nativeBuildInputs = [

16
pkgs/tools/security/metasploit/gemset.nix
View File

@ -724,12 +724,12 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "b4a408704631fd0a0a4587f1f1a0017bcec9fb45";
sha256 = "0mln0jscd6a3vshlf7q9f8q2acsh3l56q4cqgiyhxnapza5yv588";
rev = "d21ca8b456e74278a0149a34ced9292692b5c52d";
sha256 = "1w2hwd75i3n1q8ryb8rp84pcq451bixy6l58dc2cn308295r49vl";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.4.15";
version = "6.4.16";
};
metasploit-model = {
groups = ["default"];
@ -891,6 +891,16 @@
};
version = "0.2.2";
};
net-sftp = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0r33aa2d61hv1psm0l0mm6ik3ycsnq8symv7h84kpyf2b7493fv5";
type = "gem";
};
version = "4.0.0";
};
net-smtp = {
groups = ["default"];
platforms = [];

1
pkgs/top-level/aliases.nix
View File

@ -862,6 +862,7 @@ mapAliases ({
mariadb-client = hiPrio mariadb.client; #added 2019.07.28
markdown-pp = throw "markdown-pp was removed from nixpkgs, because the upstream archived it on 2021-09-02"; # Added 2023-07-22
markmind = throw "markmind has been removed from nixpkgs, because it depended on an old version of electron"; # Added 2023-09-12
marwaita-manjaro = lib.warn "marwaita-manjaro has been renamed to marwaita-darkcyan" marwaita-darkcyan; # Added 2024-07-01
matrique = spectral; # Added 2020-01-27
matrixcli = throw "'matrixcli' has been removed due to being unmaintained and broken functionality. Recommend 'matrix-commander' as an alternative"; # Added 2024-03-09
matrix-recorder = throw "matrix-recorder has been removed due to being unmaintained"; # Added 2023-05-21

6
pkgs/top-level/all-packages.nix
View File

@ -13350,7 +13350,7 @@ with pkgs;
inherit (callPackages ../servers/teleport {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;
}) teleport_14 teleport_15 teleport;
}) teleport_14 teleport_15 teleport_16 teleport;
telepresence = callPackage ../tools/networking/telepresence {
pythonPackages = python3Packages;
@ -28601,14 +28601,10 @@ with pkgs;
martian-mono = callPackage ../data/fonts/martian-mono { };
marwaita = callPackage ../data/themes/marwaita { };
marwaita-icons = callPackage ../by-name/ma/marwaita-icons/package.nix {
inherit (kdePackages) breeze-icons;
};
marwaita-manjaro = callPackage ../data/themes/marwaita-manjaro { };
marwaita-peppermint = callPackage ../data/themes/marwaita-peppermint { };
marwaita-pop_os = callPackage ../data/themes/marwaita-pop_os { };

187
pkgs/top-level/release-cuda.nix
View File

@ -1,60 +1,163 @@
/*
Test CUDA packages.
This release file will not be tested on hydra.nixos.org
because it requires unfree software.
This release file is currently not tested on hydra.nixos.org
because it requires unfree software, but it is tested by
https://hydra.nix-community.org/jobset/nixpkgs/cuda-nixos-unstable.
Cf. https://github.com/nix-community/infra/pull/1335
Test for example like this:
$ hydra-eval-jobs pkgs/top-level/release-cuda.nix --option restrict-eval false -I foo=. --arg nixpkgs '{ outPath = ./.; revCount = 0; shortRev = "aabbcc"; }'
$ hydra-eval-jobs pkgs/top-level/release-cuda.nix -I .
*/
{ # The platforms for which we build Nixpkgs.
let
ensureList = x: if builtins.isList x then x else [ x ];
allowUnfreePredicate =
p:
builtins.all (
license:
license.free
|| license.redistributable
|| builtins.elem license.shortName [
"CUDA EULA"
"cuDNN EULA"
"NVidia OptiX EULA"
]
) (ensureList p.meta.license);
in
{
# The platforms for which we build Nixpkgs.
supportedSystems ? [
"x86_64-linux"
]
, # Attributes passed to nixpkgs.
nixpkgsArgs ? { config = { allowUnfree = true; inHydra = true; }; }
"aarch64-linux"
],
variant ? "cuda",
# Attributes passed to nixpkgs.
nixpkgsArgs ? {
config = {
inherit allowUnfreePredicate;
"${variant}Support" = true;
inHydra = true;
};
},
}:
assert builtins.elem variant [
"cuda"
"rocm"
null
];
let
release-lib = import ./release-lib.nix {
inherit supportedSystems nixpkgsArgs;
};
release-lib = import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; };
inherit (release-lib) linux mapTestOn packagePlatforms pkgs;
inherit (release-lib.lib) genAttrs;
# Package sets to evaluate
packageSets = [
"cudaPackages_10_0"
"cudaPackages_10_1"
"cudaPackages_10_2"
"cudaPackages_10"
"cudaPackages_11_0"
"cudaPackages_11_1"
"cudaPackages_11_2"
"cudaPackages_11_3"
"cudaPackages_11_4"
"cudaPackages_11_5"
"cudaPackages_11_6"
"cudaPackages_11"
"cudaPackages"
];
inherit (release-lib) lib;
inherit (release-lib)
linux
mapTestOn
packagePlatforms
pkgs
;
# Package sets to evaluate whole
packageSets = builtins.filter (lib.strings.hasPrefix "cudaPackages") (builtins.attrNames pkgs);
evalPackageSet = pset: mapTestOn { ${pset} = packagePlatforms pkgs.${pset}; };
jobs = (mapTestOn ({
# Packages to evaluate
python3.pkgs.caffeWithCuda = linux;
python3.pkgs.jaxlibWithCuda = linux;
python3.pkgs.libgpuarray = linux;
python3.pkgs.tensorflowWithCuda = linux;
python3.pkgs.pyrealsense2WithCuda = linux;
python3.pkgs.torchWithCuda = linux;
python3.pkgs.jaxlib = linux;
}) // (genAttrs packageSets evalPackageSet));
jobs =
mapTestOn {
blas = linux;
blender = linux;
faiss = linux;
lapack = linux;
magma = linux;
mpich = linux;
openmpi = linux;
ucx = linux;
in jobs
opencv = linux;
cctag = linux; # Failed in https://github.com/NixOS/nixpkgs/pull/233581
cholmod-extra = linux;
colmap = linux;
ctranslate2 = linux;
deepin.image-editor = linux;
ffmpeg-full = linux;
gimp = linux;
gpu-screen-recorder = linux;
gst_all_1.gst-plugins-bad = linux;
lightgbm = linux;
llama-cpp = linux;
meshlab = linux;
monado = linux; # Failed in https://github.com/NixOS/nixpkgs/pull/233581
noisetorch = linux;
obs-studio-plugins.obs-backgroundremoval = linux;
ollama = linux;
onnxruntime = linux;
openmvg = linux;
openmvs = linux;
opentrack = linux;
openvino = linux;
pixinsight = linux; # Failed in https://github.com/NixOS/nixpkgs/pull/233581
qgis = linux;
rtabmap = linux;
saga = linux;
suitesparse = linux;
truecrack-cuda = linux;
tts = linux;
ueberzugpp = linux; # Failed in https://github.com/NixOS/nixpkgs/pull/233581
wyoming-faster-whisper = linux;
xgboost = linux;
python3Packages = {
boxx = linux;
bpycv = linux;
caffe = linux;
catboost = linux;
chainer = linux;
cupy = linux;
faiss = linux;
faster-whisper = linux;
flax = linux;
gpt-2-simple = linux;
grad-cam = linux;
jaxlib = linux;
jax = linux;
Keras = linux;
kornia = linux;
libgpuarray = linux;
mmcv = linux;
mxnet = linux;
numpy = linux; # Only affected by MKL?
onnx = linux;
openai-triton = linux;
openai-whisper = linux;
opencv4 = linux;
opensfm = linux;
pycuda = linux;
pymc = linux;
pyrealsense2WithCuda = linux;
pytorch-lightning = linux;
pytorch = linux;
scikitimage = linux;
scikit-learn = linux; # Only affected by MKL?
scipy = linux; # Only affected by MKL?
spacy-transformers = linux;
tensorflow = linux;
tensorflow-probability = linux;
tesserocr = linux;
Theano = linux;
tiny-cuda-nn = linux;
torchaudio = linux;
torch = linux;
torchvision = linux;
transformers = linux;
ttstokenizer = linux;
vidstab = linux;
};
}
// (lib.genAttrs packageSets evalPackageSet);
in
jobs