diff --git a/README.md b/README.md index e0970f85ff23..d91a6228c57b 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

- Code Triagers badge + Contributors badge Open Collective supporters

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1e9a4fbed442..a62fd37127d4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1200,6 +1200,12 @@ githubId = 262763; name = "Ayaz Hafiz"; }; + azuwis = { + email = "azuwis@gmail.com"; + github = "azuwis"; + githubId = 9315; + name = "Zhong Jianxin"; + }; b4dm4n = { email = "fabianm88@gmail.com"; github = "B4dM4n"; @@ -8119,13 +8125,6 @@ githubId = 1001112; name = "Marcin Janczyk"; }; - mjlbach = { - email = "m.j.lbach@gmail.com"; - matrix = "@atrius:matrix.org"; - github = "mjlbach"; - githubId = 13316262; - name = "Michael Lingelbach"; - }; mjp = { email = "mike@mythik.co.uk"; github = "MikePlayle"; @@ -10115,6 +10114,20 @@ githubId = 16624; name = "Maxim Ivanov"; }; + reckenrode = { + name = "Randy Eckenrode"; + email = "randy@largeandhighquality.com"; + matrix = "@reckenrode:matrix.org"; + github = "reckenrode"; + githubId = 7413633; + keys = [ + # compare with https://keybase.io/reckenrode + { + longkeyid = "ed25519/0xFBF19A982CCE0048"; + fingerprint = "01D7 5486 3A6D 64EA AC77 0D26 FBF1 9A98 2CCE 0048"; + } + ]; + }; redfish64 = { email = "engler@gmail.com"; github = "redfish64"; @@ -13202,6 +13215,12 @@ githubId = 1297598; name = "Konrad Borowski"; }; + xgroleau = { + email = "xgroleau@gmail.com"; + github = "xgroleau"; + githubId = 31734358; + name = "Xavier Groleau"; + }; xiorcale = { email = "quentin.vaucher@pm.me"; github = "xiorcale"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 86bf52afdc52..c586254d7096 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -214,7 +214,6 @@ with lib.maintainers; { mguentner ekleog ralith - mjlbach dandellion sumnerevans ]; diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index bdd5e82bd263..f4197650ab23 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -58,8 +58,8 @@ let package = (cfg.package.override (oldArgs: { # Respect overrides that already exist in the passed package and # concat it with values passed via the module. - extraComponents = oldArgs.extraComponents ++ extraComponents; - extraPackages = ps: (oldArgs.extraPackages ps) ++ (cfg.extraPackages ps); + extraComponents = oldArgs.extraComponents or [] ++ extraComponents; + extraPackages = ps: (oldArgs.extraPackages or (_: []) ps) ++ (cfg.extraPackages ps); })); in { imports = [ diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 68333d43a5d7..a8fe14c58f05 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -173,13 +173,18 @@ sub parseSystemdIni { # # If a directory with the same basename ending in .d exists next to the unit file, it will be # assumed to contain override files which will be parsed as well and handled properly. -sub parseUnit { - my ($unitPath) = @_; +sub parse_unit { + my ($unit_path) = @_; # Parse the main unit and all overrides - my %unitData; - parseSystemdIni(\%unitData, $_) for glob("${unitPath}{,.d/*.conf}"); - return %unitData; + my %unit_data; + # Replace \ with \\ so glob() still works with units that have a \ in them + # Valid characters in unit names are ASCII letters, digits, ":", "-", "_", ".", and "\" + $unit_path =~ s/\\/\\\\/gmsx; + foreach (glob "${unit_path}{,.d/*.conf}") { + parseSystemdIni(\%unit_data, "$_") + } + return %unit_data; } # Checks whether a specified boolean in a systemd unit is true @@ -310,7 +315,7 @@ sub handleModifiedUnit { # Revert of the attempt: https://github.com/NixOS/nixpkgs/pull/147609 # More details: https://github.com/NixOS/nixpkgs/issues/74899#issuecomment-981142430 } else { - my %unitInfo = $newUnitInfo ? %{$newUnitInfo} : parseUnit($newUnitFile); + my %unitInfo = $newUnitInfo ? %{$newUnitInfo} : parse_unit($newUnitFile); if (parseSystemdBool(\%unitInfo, "Service", "X-ReloadIfChanged", 0) and not $unitsToRestart->{$unit} and not $unitsToStop->{$unit}) { $unitsToReload->{$unit} = 1; recordUnit($reloadListFile, $unit); @@ -412,12 +417,12 @@ while (my ($unit, $state) = each %{$activePrev}) { if (-e $prevUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) { if (! -e $newUnitFile || abs_path($newUnitFile) eq "/dev/null") { - my %unitInfo = parseUnit($prevUnitFile); + my %unitInfo = parse_unit($prevUnitFile); $unitsToStop{$unit} = 1 if parseSystemdBool(\%unitInfo, "Unit", "X-StopOnRemoval", 1); } elsif ($unit =~ /\.target$/) { - my %unitInfo = parseUnit($newUnitFile); + my %unitInfo = parse_unit($newUnitFile); # Cause all active target units to be restarted below. # This should start most changed units we stop here as @@ -451,8 +456,8 @@ while (my ($unit, $state) = each %{$activePrev}) { } else { - my %old_unit_info = parseUnit($prevUnitFile); - my %new_unit_info = parseUnit($newUnitFile); + my %old_unit_info = parse_unit($prevUnitFile); + my %new_unit_info = parse_unit($newUnitFile); my $diff = compare_units(\%old_unit_info, \%new_unit_info); if ($diff eq 1) { handleModifiedUnit($unit, $baseName, $newUnitFile, \%new_unit_info, $activePrev, \%unitsToStop, \%unitsToStart, \%unitsToReload, \%unitsToRestart, \%unitsToSkip); diff --git a/nixos/modules/system/boot/tmp.nix b/nixos/modules/system/boot/tmp.nix index 6edafd6695b6..cf6d19eb5f0e 100644 --- a/nixos/modules/system/boot/tmp.nix +++ b/nixos/modules/system/boot/tmp.nix @@ -48,7 +48,12 @@ in what = "tmpfs"; where = "/tmp"; type = "tmpfs"; - mountConfig.Options = [ "mode=1777" "strictatime" "rw" "nosuid" "nodev" "size=${toString cfg.tmpOnTmpfsSize}" ]; + mountConfig.Options = concatStringsSep "," [ "mode=1777" + "strictatime" + "rw" + "nosuid" + "nodev" + "size=${toString cfg.tmpOnTmpfsSize}" ]; } ]; diff --git a/nixos/tests/bpf.nix b/nixos/tests/bpf.nix index 233c7dab1ee2..e479cd057921 100644 --- a/nixos/tests/bpf.nix +++ b/nixos/tests/bpf.nix @@ -18,8 +18,12 @@ import ./make-test-python.nix ({ pkgs, ... }: { # simple BEGIN probe (user probe on bpftrace itself) print(machine.succeed("bpftrace -e 'BEGIN { print(\"ok\"); exit(); }'")) # tracepoint - print(machine.succeed("bpftrace -e 'tracepoint:syscalls:sys_enter_* { print(probe); exit(); }'")) + print(machine.succeed("bpftrace -e 'tracepoint:syscalls:sys_enter_* { print(probe); exit() }'")) # kprobe print(machine.succeed("bpftrace -e 'kprobe:schedule { print(probe); exit() }'")) + # BTF + print(machine.succeed("bpftrace -e 'kprobe:schedule { " + " printf(\"tgid: %d\", ((struct task_struct*) curtask)->tgid); exit() " + "}'")) ''; }) diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 3357d83342de..4f297b6521d1 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -145,6 +145,23 @@ import ./make-test-python.nix ({ pkgs, ...} : { systemd.services.test.serviceConfig."X-Test" = "test"; }; + unitWithBackslash.configuration = { + systemd.services."escaped\\x2ddash" = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.coreutils}/bin/true"; + ExecReload = "${pkgs.coreutils}/bin/true"; + }; + }; + }; + + unitWithBackslashModified.configuration = { + imports = [ unitWithBackslash.configuration ]; + systemd.services."escaped\\x2ddash".serviceConfig.X-Test = "test"; + }; + restart-and-reload-by-activation-script.configuration = { systemd.services = rec { simple-service = { @@ -433,6 +450,25 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "as well:") assert_contains(out, "would start the following units: test.service\n") + # Ensure \ works in unit names + out = switch_to_specialisation("${machine}", "unitWithBackslash") + assert_contains(out, "stopping the following units: test.service\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: escaped\\x2ddash.service\n") + assert_lacks(out, "as well:") + + out = switch_to_specialisation("${machine}", "unitWithBackslashModified") + assert_contains(out, "stopping the following units: escaped\\x2ddash.service\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_contains(out, "\nstarting the following units: escaped\\x2ddash.service\n") + assert_lacks(out, "the following new units were started:") + assert_lacks(out, "as well:") + with subtest("failing units"): # Let the simple service fail switch_to_specialisation("${machine}", "simpleServiceModified") diff --git a/pkgs/applications/audio/jmusicbot/default.nix b/pkgs/applications/audio/jmusicbot/default.nix index 3bc06abcbffa..60df749a1426 100644 --- a/pkgs/applications/audio/jmusicbot/default.nix +++ b/pkgs/applications/audio/jmusicbot/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp $src $out/lib/JMusicBot makeWrapper ${jre}/bin/java $out/bin/JMusicBot \ - --add-flags "-Xmx1G -Dnogui=true -jar $out/lib/JMusicBot" + --add-flags "-Xmx1G -Dnogui=true -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 -jar $out/lib/JMusicBot" ''; meta = with lib; { diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index ebda772b9bd3..e55a43f5ac2f 100644 --- a/pkgs/applications/audio/pyradio/default.nix +++ b/pkgs/applications/audio/pyradio/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.8.9.10"; + version = "0.8.9.12"; propagatedBuildInputs = with python3Packages; [ requests @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { owner = "coderholic"; repo = pname; rev = version; - sha256 = "1cvrvy5ll97yyrzakxr8lb25qxmzk9fvcabsgc98jf89ikxgax4w"; + sha256 = "sha256-ZBlb0wpw5/s3JuyV2OpGZwlY1UcQzLHP1/VhGlEr6Zo="; }; checkPhase = '' diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index 5e7f5c7cce2c..f6629fe222b9 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "tauon"; - version = "7.0.1"; + version = "7.1.0"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${version}"; - sha256 = "sha256-Sw9w6vFXk2Cx7LdfMsou9IDheVckdusc0iGWkVsVtCQ="; + sha256 = "sha256-p48fVuigfQuFrCUnTD5NTFtgiO3WaBeKOhGLoQU4O5U="; }; postPatch = '' diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 4e4835783e46..e5bdc28b80ef 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.22"; + version = "2.23"; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; rev = "v${version}"; - sha256 = "11n970ad0j57vlll5j30ngkrfyil23v1b29ickbnblcldvjbgwa5"; + sha256 = "sha256-CLQWbwwJnr6Al223GvV1hVNK13p2iAyjNF7PhdaU9N0="; }; # We have not packaged tests. @@ -36,8 +36,9 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://rednotebook.sourceforge.io/"; + changelog = "https://github.com/jendrikseipp/rednotebook/blob/v${version}/CHANGELOG.md"; description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ orivej tstrobel ]; }; } diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 3dafe2741634..19a754d92eed 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-24"; + version = "7.1.0-25"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-tTdtVUQDBfVS3Rze1KKKR4wL8t8+ka5Ku9qcl+DP6Eo="; + hash = "sha256-zSbngA56YnJ1W+ZlA6Q850NTtZovjue51zEgbKI3iqc="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix new file mode 100644 index 000000000000..624959ffa9ee --- /dev/null +++ b/pkgs/applications/graphics/rnote/default.nix @@ -0,0 +1,76 @@ +{ lib +, stdenv +, fetchFromGitHub +, desktop-file-utils +, gio-sharp +, glib +, gstreamer +, gtk4 +, libadwaita +, libxml2 +, meson +, ninja +, pkg-config +, poppler +, python3 +, rustPlatform +, shared-mime-info +, wrapGAppsHook4 +}: + +stdenv.mkDerivation rec { + pname = "rnote"; + version = "0.3.5"; + + src = fetchFromGitHub { + owner = "flxzt"; + repo = "rnote"; + rev = "v${version}"; + sha256 = "5g5SQJc5aopYxtHNP5T85TtcazovrveUCnMhJ90p2t4="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-vnLesWXdqNzlWNQsUVy03kfmcDNazQ1BbizQDoG1kgM="; + }; + + nativeBuildInputs = [ + desktop-file-utils # For update-desktop-database + meson + ninja + pkg-config + python3 # For the postinstall script + rustPlatform.cargoSetupHook + rustPlatform.rust.cargo + rustPlatform.rust.rustc + shared-mime-info # For update-mime-database + wrapGAppsHook4 + ]; + + buildInputs = [ + gio-sharp + glib + gstreamer + gtk4 + libadwaita + libxml2 + poppler + ]; + + postPatch = '' + pushd build-aux + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" + popd + ''; + + meta = with lib; { + homepage = "https://github.com/flxzt/rnote"; + description = "Simple drawing application to create handwritten notes"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ dotlambda yrd ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index 73c5a038aab6..68744831538c 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -1,27 +1,77 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, libpng, cairo, freetype -, json_c, fontconfig, gtkmm3, pangomm, glew, libGLU, xorg, pcre, wrapGAppsHook +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, wrapGAppsHook +, at-spi2-core +, cairo +, dbus +, freetype +, fontconfig +, glew +, gtkmm3 +, json_c +, libdatrie +, libepoxy +, libGLU +, libpng +, libselinux +, libsepol +, libthai +, libxkbcommon +, pangomm +, pcre +, util-linuxMinimal # provides libmount +, xorg +, zlib }: + stdenv.mkDerivation rec { pname = "solvespace"; - version = "v3.0"; + version = "3.0"; + src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "04aympdsjp37vp0p13mb8nwkc080hp9cdrjpyy5m1mhwkm8jm9k9"; + rev = "v${version}"; + hash = "sha256-aaYqUZ0c1lCL91fmxtKFAAE2uUWrjnDB3WdcqdutXhE="; fetchSubmodules = true; }; nativeBuildInputs = [ - pkg-config cmake wrapGAppsHook - ]; - buildInputs = [ - zlib libpng cairo freetype - json_c fontconfig gtkmm3 pangomm glew libGLU - xorg.libpthreadstubs xorg.libXdmcp pcre + cmake + pkg-config + wrapGAppsHook ]; - preConfigure = '' + buildInputs = [ + at-spi2-core + cairo + dbus + freetype + fontconfig + glew + gtkmm3 + json_c + libdatrie + libepoxy + libGLU + libpng + libselinux + libsepol + libthai + libxkbcommon + pangomm + pcre + util-linuxMinimal + xorg.libpthreadstubs + xorg.libXdmcp + xorg.libXtst + zlib + ]; + + postPatch = '' patch CMakeLists.txt < com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) + installPhase = '' + find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + rm -rf $out/tmp + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "sha256-dV7/U5GpFxhI13smZ587C6cVE4FRNPY0zexZkYK4Yqo="; + }; + +in makePackage { + pname = "openjfx-modular-sdk"; + + gradleProperties = '' + COMPILE_MEDIA = true + COMPILE_WEBKIT = false + ''; + + preBuild = '' + swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" + substituteInPlace build.gradle \ + --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ + --replace 'name: SWT_FILE_NAME' "files('$swtJar')" + ''; + + installPhase = '' + cp -r build/modular-sdk $out + ''; + + stripDebugList = [ "." ]; + + postFixup = '' + # Remove references to bootstrap. + export openjdkOutPath='${openjdk17_headless.outPath}' + find "$out" -name \*.so | while read lib; do + new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" + patchelf --set-rpath "$new_refs" "$lib" + done + ''; + + disallowedReferences = [ openjdk17_headless ]; + + passthru.deps = deps; + + meta = with lib; { + homepage = "http://openjdk.java.net/projects/openjfx/"; + license = licenses.gpl2; + description = "The next-generation Java client toolkit"; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index d4eb57815a80..a2cd8f44ce28 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -11,19 +11,20 @@ let in stdenv.mkDerivation rec { pname = "zig"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "ziglang"; repo = pname; rev = version; - hash = "sha256-Hfl1KKtGcopMrn+U9r0/qr/wReWJIgb8+IgwMoguv/0="; + hash = "sha256-x2c4c9RSrNWGqEngio4ArW7dJjW0gg+8nqBwPcR721k="; }; nativeBuildInputs = [ cmake llvmPackages.llvm.dev ]; + buildInputs = [ libxml2 zlib diff --git a/pkgs/development/libraries/boca/default.nix b/pkgs/development/libraries/boca/default.nix index ffbc99f79f7d..2c86bf981b70 100644 --- a/pkgs/development/libraries/boca/default.nix +++ b/pkgs/development/libraries/boca/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "BoCA"; - version = "1.0.5"; + version = "1.0.6a"; src = fetchFromGitHub { owner = "enzo1982"; repo = "boca"; rev = "v${version}"; - sha256 = "sha256-ooLPpwTxG7QBAGhEGhta4T06ZDWlPysocHbb/Sq7Wyo="; + sha256 = "sha256-LndlwdM5NlTv73Z1lMkHuIZkVfn48P/LssBnE4X9Sgc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix deleted file mode 100644 index 35ef9fba1051..000000000000 --- a/pkgs/development/libraries/git2/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, python3 -, zlib, libssh2, openssl, pcre, http-parser -, libiconv, Security -}: - -stdenv.mkDerivation rec { - pname = "libgit2"; - version = "1.3.0"; - # keep the version in sync with python3.pkgs.pygit2 and libgit2-glib - - src = fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "v${version}"; - sha256 = "sha256-7atNkOBzX+nU1gtFQEaE+EF1L+eex+Ajhq2ocoJY920="; - }; - - cmakeFlags = [ - "-DTHREADSAFE=ON" - "-DUSE_HTTP_PARSER=system" - ]; - - nativeBuildInputs = [ cmake python3 pkg-config ]; - - buildInputs = [ zlib libssh2 openssl pcre http-parser ] - ++ lib.optional stdenv.isDarwin Security; - - propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; - - doCheck = false; # hangs. or very expensive? - - meta = { - description = "The Git linkable library"; - homepage = "https://libgit2.github.com/"; - license = lib.licenses.gpl2; - platforms = with lib.platforms; all; - }; -} diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 2b6dfc8fb52c..6da3fc769ea6 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.6.0"; + version = "4.6.1"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "eC1ZUfv9WF/J7HbAnQfijmAUxy2wAftWf/8hf7luTYw="; + sha256 = "2FUI0hy7zWPVaKeGKvXs1juXjX1XmcvkBMkdI4nQ7F8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index 8e9fe4de88ae..0b5531d70c54 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -7,14 +7,11 @@ with lib; stdenv.mkDerivation rec { - name = let postfix = if gtkVersion == null then "glib" else "gtk${gtkVersion}"; - in "libdbusmenu-${postfix}-${version}"; - version = "${versionMajor}.${versionMinor}"; - versionMajor = "16.04"; - versionMinor = "0"; + pname = "libdbusmenu-${if gtkVersion == null then "glib" else "gtk${gtkVersion}"}"; + version = "16.04.0"; src = fetchurl { - url = "${meta.homepage}/${versionMajor}/${version}/+download/libdbusmenu-${version}.tar.gz"; + url = "https://launchpad.net/dbusmenu/${lib.versions.majorMinor version}/${version}/+download/libdbusmenu-${version}.tar.gz"; sha256 = "12l7z8dhl917iy9h02sxmpclnhkdjryn08r8i4sr8l3lrlm4mk5r"; }; diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix new file mode 100644 index 000000000000..dc12e643cb75 --- /dev/null +++ b/pkgs/development/libraries/libgit2/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, python3 +, zlib +, libssh2 +, openssl +, pcre +, http-parser +, libiconv +, Security +}: + +stdenv.mkDerivation rec { + pname = "libgit2"; + version = "1.4.0"; + # also check the following packages for updates: python3.pkgs.pygit2 and libgit2-glib + + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + sha256 = "sha256-21t7fD/5O+HIHUDEv8MqloDmAIm9sSpJYqreCD3Co2k="; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/libgit2/libgit2/commit/8bc9eda779b2e2602fc74944aba5d39198e0642f.patch"; + sha256 = "sha256-r2i4+WsrxIpSwH0g/AikBdAajBncXb1zz0uOQB0h1Jk="; + }) + ]; + + cmakeFlags = [ + "-DTHREADSAFE=ON" + "-DUSE_HTTP_PARSER=system" + "-DUSE_SSH=ON" + ]; + + nativeBuildInputs = [ cmake python3 pkg-config ]; + + buildInputs = [ zlib libssh2 openssl pcre http-parser ] + ++ lib.optional stdenv.isDarwin Security; + + propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; + + doCheck = false; # hangs. or very expensive? + + meta = { + description = "Linkable library implementation of Git that you can use in your application"; + homepage = "https://libgit2.org/"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index f79f82e9a782..5303dbed6ca8 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "8.0.27"; + version = "8.0.28"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - sha256 = "sha256-WIZpj8aCpeh0CCLtm0YbxRtgz5y6304cf+vllYSyv7c="; + sha256 = "sha256-yyb+neBaO18e0ioZlCm2eR7OGEM+sEZeKnP89EWGQgs="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dev.mysql.com/downloads/connector/cpp/"; description = "C++ library for connecting to mysql servers"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index a45884f72dc6..2e8a997299f1 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ndpi"; - version = "4.0"; + version = "4.2"; src = fetchFromGitHub { owner = "ntop"; repo = "nDPI"; rev = version; - sha256 = "0snzvlracc6s7r2pgdn0jqcc7nxjxzcivsa579h90g5ibhhplv5x"; + sha256 = "sha256-ZWWuyPGl+hbrfXdtPvCBqMReuJ4FiGx+qiI7qCz6wtQ="; }; configureScript = "./autogen.sh"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nDPI is a library for deep-packet inspection based on OpenDPI. ''; homepage = "https://www.ntop.org/products/deep-packet-inspection/ndpi/"; - license = with licenses; lgpl3; + license = with licenses; [ lgpl3Plus bsd3 ]; maintainers = with maintainers; [ takikawa ]; platforms = with platforms; unix; }; diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index a46ed1adee7c..4010ee684590 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Vulkan Header files and API registry"; homepage = "https://www.lunarg.com"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.asl20; maintainers = [ maintainers.ralith ]; }; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index e598d2c864be..077f881e722d 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libxcb -, libXrandr, wayland, vulkan-headers, addOpenGLRunpath }: +, libXrandr, wayland, moltenvk, vulkan-headers, addOpenGLRunpath }: stdenv.mkDerivation rec { pname = "vulkan-loader"; @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { }); nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libX11 libxcb libXrandr vulkan-headers wayland ]; + buildInputs = [ vulkan-headers ] + ++ lib.optionals (!stdenv.isDarwin) [ libX11 libxcb libXrandr wayland ]; - cmakeFlags = [ - "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share" - "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" - ]; + cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ] + ++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share" + ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share"; outputs = [ "out" "dev" ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "LunarG Vulkan loader"; homepage = "https://www.lunarg.com"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.asl20; maintainers = [ maintainers.ralith ]; }; diff --git a/pkgs/development/python-modules/aio-geojson-client/default.nix b/pkgs/development/python-modules/aio-geojson-client/default.nix index f347ed5cd1bf..f00a75961b9c 100644 --- a/pkgs/development/python-modules/aio-geojson-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-client/default.nix @@ -8,17 +8,21 @@ , haversine , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "aio-geojson-client"; - version = "0.15"; + version = "0.16"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-client"; rev = "v${version}"; - sha256 = "0sbzrzmny7x4bkbg6z0cjn4d10r50nxdyaq7g6lagwd8ijpkg8l3"; + hash = "sha256-u3SwrSxeBJrBTHfqKY/mAb2p1jqW2AvRsHomKsI81gM="; }; propagatedBuildInputs = [ @@ -34,7 +38,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "aio_geojson_client" ]; + pythonImportsCheck = [ + "aio_geojson_client" + ]; meta = with lib; { description = "Python module for accessing GeoJSON feeds"; diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix index b42ba55bfa74..f3076160f9c6 100644 --- a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix @@ -7,17 +7,21 @@ , pytest-asyncio , pytestCheckHook , pytz +, pythonOlder }: buildPythonPackage rec { pname = "aio-geojson-geonetnz-quakes"; - version = "0.13"; + version = "0.14"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-quakes"; rev = "v${version}"; - sha256 = "sha256-M1QleYVPqLFjxBmOlNJdydxDTk0JJf+GYVtOTC3YUTA="; + hash = "sha256-T3vQodb0/3YEjsyHLSI8DBKK75J8hvsaBqyQI7GkT3U="; }; propagatedBuildInputs = [ @@ -32,7 +36,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "aio_geojson_geonetnz_quakes" ]; + pythonImportsCheck = [ + "aio_geojson_geonetnz_quakes" + ]; meta = with lib; { description = "Python module for accessing the GeoNet NZ Quakes GeoJSON feeds"; diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 8e7d1b203097..3038f8720e70 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "25.0.0"; + version = "26.0.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-Y0WNBtQ9v0yhTVFfTvfcudWHOjzGagGB+/b++3Ie5Kk="; + sha256 = "sha256-nGot8UIeL0DNuw5+v7XmLjrNiJMfpsk1z2K2Tdo4Q+s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bc-python-hcl2/default.nix b/pkgs/development/python-modules/bc-python-hcl2/default.nix index e889fff9688a..42203a43da46 100644 --- a/pkgs/development/python-modules/bc-python-hcl2/default.nix +++ b/pkgs/development/python-modules/bc-python-hcl2/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , nose +, pythonOlder }: let @@ -19,11 +20,14 @@ let in buildPythonPackage rec { pname = "bc-python-hcl2"; - version = "0.3.24"; + version = "0.3.30"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YsiMkTPRSKR4511csJOv9/Jf1b3TVUM7N2lInejdNrQ="; + hash = "sha256-wfcTIPKbMPa7xpXzkFtxnxG2ZRFzTw35EP7f4zwHxcs="; }; # Nose is required during build process, so can not use `checkInputs`. diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix index b56ebbf50a7e..109487b88b94 100644 --- a/pkgs/development/python-modules/boost-histogram/default.nix +++ b/pkgs/development/python-modules/boost-histogram/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "boost-histogram"; - version = "1.2.1"; + version = "1.3.1"; disabled = !isPy3k; src = fetchPypi { pname = "boost_histogram"; inherit version; - sha256 = "a27842b2f1cfecc509382da2b25b03056354696482b38ec3c0220af0fc9b7579"; + sha256 = "sha256-Mc05Zlbzo3g04H0wTNuE2ZBrwhcmJqPZL+V30IvPQQ8="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/dict2xml/default.nix b/pkgs/development/python-modules/dict2xml/default.nix index 457e9d3e530b..a51ec5303cd2 100644 --- a/pkgs/development/python-modules/dict2xml/default.nix +++ b/pkgs/development/python-modules/dict2xml/default.nix @@ -1,18 +1,27 @@ -{ lib, fetchPypi, buildPythonPackage, six }: +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +}: buildPythonPackage rec { pname = "dict2xml"; - version = "1.7.0"; + version = "1.7.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0bfn8n8sb3slwx7ra8m8fbfy65k20h2qxcqfq99hwqrrkgcffihl"; + hash = "sha256-ZgCqMx8X7uODNhH3GJmkOnZhLKdVoVdpzyBJLEsaoBY="; }; - propagatedBuildInputs = [ six ]; + pythonImportsCheck = [ + "dict2xml" + ]; meta = with lib; { - description = "Super simple library to convert a Python dictionary into an xml string"; + description = "Library to convert a Python dictionary into an XML string"; homepage = "https://github.com/delfick/python-dict2xml"; license = licenses.mit; maintainers = with maintainers; [ johnazoidberg ]; diff --git a/pkgs/development/python-modules/georss-client/default.nix b/pkgs/development/python-modules/georss-client/default.nix index 2e5fc5da9e83..09365ff58586 100644 --- a/pkgs/development/python-modules/georss-client/default.nix +++ b/pkgs/development/python-modules/georss-client/default.nix @@ -11,14 +11,16 @@ buildPythonPackage rec { pname = "georss-client"; - version = "0.14"; + version = "0.15"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-client"; rev = "v${version}"; - sha256 = "sha256-rviXXNmDLEVNYOCkqvLT9EXSuVpI5wMlCXnlpUUl1P0="; + sha256 = "sha256-D1ggfEDU+vlFmi1USwdHj1due0PrCQCpKF4zaarHCFs="; }; propagatedBuildInputs = [ @@ -32,7 +34,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_client" ]; + pythonImportsCheck = [ + "georss_client" + ]; meta = with lib; { description = "Python library for accessing GeoRSS feeds"; diff --git a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix index e87c766c0caf..ae923138d295 100644 --- a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix +++ b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "georss-ign-sismologia-client"; - version = "0.4"; + version = "0.5"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-ign-sismologia-client"; rev = "v${version}"; - sha256 = "sha256-g7lZC5ZiJV8dNZJceLROqyBRZSuqaivGFhaQrKe4B7g="; + hash = "sha256-i3VdxntFwieCmB4ihHRSCV5YKDyYytl3XnU/G1LwLhg="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_ign_sismologia_client" ]; + pythonImportsCheck = [ + "georss_ign_sismologia_client" + ]; meta = with lib; { description = "Python library for accessing the IGN Sismologia GeoRSS feed"; diff --git a/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix b/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix index dc253dafe1e2..512db4d8deee 100644 --- a/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix +++ b/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "georss-ingv-centro-nazionale-terremoti-client"; - version = "0.5"; + version = "0.6"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-ingv-centro-nazionale-terremoti-client"; rev = "v${version}"; - sha256 = "1pd0qsr0n8f1169p2nz8s0zrbrxh0rdzaxdb3jmdymzp4xz28wb0"; + sha256 = "sha256-zqjo70NzpUt5zNEar0P1sl/gMb+ZcS+7GX7QGuFjMYY="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_ingv_centro_nazionale_terremoti_client" ]; + pythonImportsCheck = [ + "georss_ingv_centro_nazionale_terremoti_client" + ]; meta = with lib; { description = "Python library for accessing the INGV Centro Nazionale Terremoti GeoRSS feed"; diff --git a/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix b/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix index 089a72ef8112..344c74b057f4 100644 --- a/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix +++ b/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "georss-nrcan-earthquakes-client"; - version = "0.3"; + version = "0.4"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-nrcan-earthquakes-client"; rev = "v${version}"; - sha256 = "1brn6ycsw3d3znbqi2w2cxjw8hyfb44p2lra18rx2gyvgnkxg19l"; + hash = "sha256-FFm37+dCkdoZXgvAjYhcHOYFf0oQ37bxJb7vzbWDTro="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_nrcan_earthquakes_client" ]; + pythonImportsCheck = [ + "georss_nrcan_earthquakes_client" + ]; meta = with lib; { description = "Python library for accessing Natural Resources Canada Earthquakes feed"; diff --git a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix index 954e4a6237fb..e7ecd23b3c6e 100644 --- a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix +++ b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix @@ -9,13 +9,15 @@ buildPythonPackage rec { pname = "georss-qld-bushfire-alert-client"; version = "0.5"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-qld-bushfire-alert-client"; rev = "v${version}"; - sha256 = "sha256-G7rIoG48MTWngtXCT5xzcjntzsYxtVWVhXflLsWY/dk="; + hash = "sha256-G7rIoG48MTWngtXCT5xzcjntzsYxtVWVhXflLsWY/dk="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_qld_bushfire_alert_client" ]; + pythonImportsCheck = [ + "georss_qld_bushfire_alert_client" + ]; meta = with lib; { description = "Python library for accessing Queensland Bushfire Alert feed"; diff --git a/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix b/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix index 5428dfcbc53a..9328ac17aa5f 100644 --- a/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix +++ b/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix @@ -9,13 +9,15 @@ buildPythonPackage rec { pname = "georss-tfs-incidents-client"; version = "0.3"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-tfs-incidents-client"; rev = "v${version}"; - sha256 = "11nvwrjzax4yy6aj971yym05yyizwfafy4ccsyy1qpwbs6dwbw7m"; + hash = "sha256-9fDFm9GLXxy814wR75TjP3pfQPU+nCSV8Z509WXm24Y="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_tfs_incidents_client" ]; + pythonImportsCheck = [ + "georss_tfs_incidents_client" + ]; meta = with lib; { description = "Python library for accessing Tasmania Fire Service Incidents feed"; diff --git a/pkgs/development/python-modules/georss-wa-dfes-client/default.nix b/pkgs/development/python-modules/georss-wa-dfes-client/default.nix index ec6a5cd5f2e3..ff6c3a13ea7e 100644 --- a/pkgs/development/python-modules/georss-wa-dfes-client/default.nix +++ b/pkgs/development/python-modules/georss-wa-dfes-client/default.nix @@ -9,13 +9,15 @@ buildPythonPackage rec { pname = "georss-wa-dfes-client"; version = "0.3"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-wa-dfes-client"; rev = "v${version}"; - sha256 = "01fk67kc6ww88yzsans8g81i6j7s0276gma5fk76la1c8vj2ifs7"; + hash = "sha256-R7so5EYsKGrOdEXVZ44A+kgTA3pIW6W/R4hzw+Yx0wU="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_wa_dfes_client" ]; + pythonImportsCheck = [ + "georss_wa_dfes_client" + ]; meta = with lib; { description = "Python library for accessing WA Department of Fire and Emergency Services (DFES) feed"; diff --git a/pkgs/development/python-modules/gigalixir/default.nix b/pkgs/development/python-modules/gigalixir/default.nix index 99a878700d7f..e1ca84e21861 100644 --- a/pkgs/development/python-modules/gigalixir/default.nix +++ b/pkgs/development/python-modules/gigalixir/default.nix @@ -1,9 +1,9 @@ -{ buildPythonApplication +{ lib +, buildPythonApplication , click , fetchPypi , git , httpretty -, lib , qrcode , pygments , pyopenssl @@ -11,43 +11,54 @@ , requests , rollbar , stripe +, pythonOlder , sure }: buildPythonApplication rec { pname = "gigalixir"; version = "1.2.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-P70xsI/zwsoSgK1XCPzJSI5NQ58M431kmgo5gHXbaNw="; + hash = "sha256-P70xsI/zwsoSgK1XCPzJSI5NQ58M431kmgo5gHXbaNw="; }; + propagatedBuildInputs = [ + click + pygments + pyopenssl + qrcode + requests + rollbar + stripe + ]; + + checkInputs = [ + git + httpretty + pytestCheckHook + sure + ]; + postPatch = '' substituteInPlace setup.py \ --replace "'pytest-runner'," "" \ --replace "cryptography==" "cryptography>=" ''; - propagatedBuildInputs = [ - click - requests - stripe - rollbar - pygments - qrcode - pyopenssl + disabledTests = [ + # Test requires network access + "test_rollback_without_version" ]; - checkInputs = [ - httpretty - sure - pytestCheckHook - git + pythonImportsCheck = [ + "gigalixir" ]; - pythonImportsCheck = [ "gigalixir" ]; - meta = with lib; { description = "Gigalixir Command-Line Interface"; homepage = "https://github.com/gigalixir/gigalixir-cli"; diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index bf1c37c4a3c4..c99d5d0a8bff 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.10.4"; + version = "2.10.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YQ7VahPxoAM87RNCkFOUmMrLdKs0uHJ4e0dFgA4twpY="; + sha256 = "sha256-doxO6Q8SaRqXNNMQow8kPp2BawpiTtSm2yuzyaOl7RY="; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 38d5d13c2c46..2c1e308af66c 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.34.0"; + version = "0.34.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-XgVZwCXdUae1BA3WUm+mJ+zmnqLpp13ht+FRJ3udmQk="; + sha256 = "sha256-S2zbm0S6LhQSRW6wFdbvqZdXHqIqLRSkqxVTQdIRGT4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 89d86ee4eb43..18a5f0cd82aa 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.14.7"; + version = "1.14.8"; src = fetchPypi { inherit pname version; - sha256 = "8d8d171227e9c9eaadd4b037b3ddaa01055a33bacbdbeb57a5efbd273986665f"; + sha256 = "sha256-bDZVmaLLFnk7tifJtcVDCYK7WRyd6IhQAv+RtTm2ETM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index b91835954b1c..61b944b48836 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -14,6 +14,7 @@ , numpy , pandas , parsy +, poetry-core , pyarrow , pytest , pytest-mock @@ -49,7 +50,7 @@ in buildPythonPackage rec { pname = "ibis-framework"; version = "2.1.1"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -60,6 +61,8 @@ buildPythonPackage rec { sha256 = "sha256-n3fR6wvcSfIo7760seB+5SxtoYSqQmqkzZ9VlNQF200="; }; + nativeBuildInputs = [ poetry-core ]; + propagatedBuildInputs = [ atpublic cached-property @@ -77,7 +80,7 @@ buildPythonPackage rec { sqlalchemy tables toolz - ] ++ lib.optionals (pythonOlder "3.8") [ + ] ++ lib.optionals (pythonOlder "3.8" && lib.versionOlder version "3.0.0") [ importlib-metadata ]; @@ -90,8 +93,13 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace setup.py \ - --replace "atpublic>=2.3,<3" "atpublic>=2.3" + substituteInPlace pyproject.toml \ + --replace 'atpublic = ">=2.3,<3"' 'atpublic = ">=2.3"' + ''; + + preBuild = '' + # setup.py exists only for developer convenience and is automatically generated + rm setup.py ''; disabledTests = [ @@ -135,7 +143,7 @@ buildPythonPackage rec { done wait - + '' + lib.optionalString (lib.versionOlder version "3.0.0") '' export PYTEST_BACKENDS="${backendsString}" ''; diff --git a/pkgs/development/python-modules/iso4217/default.nix b/pkgs/development/python-modules/iso4217/default.nix index b1438f29a017..12cf40a6764e 100644 --- a/pkgs/development/python-modules/iso4217/default.nix +++ b/pkgs/development/python-modules/iso4217/default.nix @@ -16,14 +16,16 @@ let in buildPythonPackage rec { pname = "iso4217"; - version = "1.7"; + version = "1.8"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "dahlia"; repo = pname; rev = version; - hash = "sha256-Ih2l6bGM7i5TUkzJPkgx8EOOL4a3/qE28SUZS6M4sQc="; + hash = "sha256-L0vx6Aan6D1lusgBh/pcT373ZTxbtWpQnFKB2V0dxlA="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index deb47b0b6660..ec998b2f4d17 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.83"; + version = "1.2.84"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - sha256 = "sha256-QOTRmr7x4vB8shyxSNt6HX9+JnQ9vODGSR9aVQu+WSM="; + sha256 = "sha256-0ItNYdbGnIzgIh23Qtg9zQ5lm7zhY3qz+5s4MCfXN0E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/onvif-zeep-async/default.nix b/pkgs/development/python-modules/onvif-zeep-async/default.nix new file mode 100644 index 000000000000..5e9a86acc6bd --- /dev/null +++ b/pkgs/development/python-modules/onvif-zeep-async/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, httpx +, pythonOlder +, zeep +}: + +buildPythonPackage rec { + pname = "onvif-zeep-async"; + version = "1.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-O4H6oL9cFvgX6whoESA7eRI6+VoT1ncRk/tehQT1WcM="; + }; + + propagatedBuildInputs = [ + httpx + zeep + ]; + + pythonImportsCheck = [ + "onvif" + ]; + + # Tests are not shipped + doCheck = false; + + meta = with lib; { + description = "ONVIF Client Implementation in Python"; + homepage = "https://github.com/hunterjm/python-onvif-zeep-async"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix new file mode 100644 index 000000000000..6f359d3bc9a7 --- /dev/null +++ b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, poetry +, rich +, setuptools +}: + +buildPythonPackage rec { + version = "0.2.0"; + pname = "pipenv-poetry-migrate"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "yhino"; + repo = "pipenv-poetry-migrate"; + rev = "v${version}"; + hash = "sha256-2/e6uGwpUvzxXlz+51gUriE054bgNeJNyLDCIyiGflM="; + }; + + propagatedBuildInputs = [ + poetry + rich + setuptools + ]; + + postPatch = '' + substituteInPlace pyproject.toml --replace 'rich = "^9.6.1"' 'rich = ">9"' + ''; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "This is simple migration script, migrate pipenv to poetry"; + homepage = "https://github.com/yhino/pipenv-poetry-migrate"; + license = licenses.asl20; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 333542bdbcc9..03e3c255d3e3 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.16.4"; + version = "0.16.5"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; rev = "v${version}"; - sha256 = "sha256-G1PpVqq66uBAigrFxJVvcIKdyL3zTKxcosgkZTjy3Is="; + sha256 = "sha256-qvzocaqWIkhSdVm4x/pUIVtNBC0D5FRFEkonH7F6Oaw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyeconet/default.nix b/pkgs/development/python-modules/pyeconet/default.nix index bf878fd5acbc..581238c90ac6 100644 --- a/pkgs/development/python-modules/pyeconet/default.nix +++ b/pkgs/development/python-modules/pyeconet/default.nix @@ -3,15 +3,19 @@ , buildPythonPackage , fetchPypi , aiohttp +, pythonOlder }: buildPythonPackage rec { pname = "pyeconet"; - version = "0.1.14"; + version = "0.1.15"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-x0mkC2k65VrDhv7UavgDUuRWIQoAJMDtA7jNXNUJuVg="; + sha256 = "sha256-zxD2sjKWB/bmxwpVFgkKTngMhr4bVuW+qkSt+pbxqPY="; }; propagatedBuildInputs = [ @@ -21,7 +25,10 @@ buildPythonPackage rec { # Tests require credentials doCheck = false; - pythonImportsCheck = [ "pyeconet" ]; + + pythonImportsCheck = [ + "pyeconet" + ]; meta = with lib; { description = "Python interface to the EcoNet API"; diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 6f8a9fa69687..b8b405a8ecf0 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; - preCheck = '' + disabledTestPaths = [ # disable tests that require networking - rm test/test_repository.py - rm test/test_credentials.py - rm test/test_submodule.py - ''; + "test/test_repository.py" + "test/test_credentials.py" + "test/test_submodule.py" + ]; # Tests require certificates # https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582674047 @@ -44,11 +44,10 @@ buildPythonPackage rec { # https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582681068 doCheck = false; - disabled = !isPy3k; - meta = with lib; { description = "A set of Python bindings to the libgit2 shared library"; homepage = "https://pypi.python.org/pypi/pygit2"; license = licenses.gpl2; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pyhumps/default.nix b/pkgs/development/python-modules/pyhumps/default.nix index 3b6dd18665b5..51d5b8bce5ec 100644 --- a/pkgs/development/python-modules/pyhumps/default.nix +++ b/pkgs/development/python-modules/pyhumps/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , poetry-core , pytestCheckHook , pythonOlder @@ -28,11 +29,14 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # https://github.com/nficano/humps/pull/240 - substituteInPlace pyproject.toml \ - --replace 'version = "3.0.2"' 'version = "${version}"' - ''; + patches = [ + # Fix naming, https://github.com/nficano/humps/pull/246 + (fetchpatch { + name = "fix-naming.patch"; + url = "https://github.com/nficano/humps/commit/118f6bce785d170b10dd3afee467d26dcc8b425d.patch"; + sha256 = "sha256-oQxkLsihnHZlHiZEupwG9Dr1Ss1w+KjDsBtbEVDced4="; + }) + ]; pythonImportsCheck = [ "humps" diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix new file mode 100644 index 000000000000..00380f341fcb --- /dev/null +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -0,0 +1,58 @@ +{ lib +, aiohttp +, attrs +, backoff +, boto3 +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pyhumps +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, warrant-lite +}: + +buildPythonPackage rec { + pname = "pyoverkiz"; + version = "1.3.5"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "iMicknl"; + repo = "python-overkiz-api"; + rev = "v${version}"; + hash = "sha256-KxZYluXa15RojAyNe5hA8Yf/Q9/mVl+b0TrDGRE6iuM="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + attrs + aiohttp + backoff + pyhumps + boto3 + warrant-lite + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pyoverkiz" + ]; + + meta = with lib; { + description = "Module to interact with the Somfy TaHoma API or other OverKiz APIs"; + homepage = "https://github.com/iMicknl/python-overkiz-api"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-keycloak/default.nix b/pkgs/development/python-modules/python-keycloak/default.nix index 8e436b4eb7e5..6425869243ef 100644 --- a/pkgs/development/python-modules/python-keycloak/default.nix +++ b/pkgs/development/python-modules/python-keycloak/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "python-keycloak"; - version = "0.26.1"; + version = "0.27.0"; src = fetchFromGitHub { owner = "marcospereirampj"; repo = "python-keycloak"; rev = version; - sha256 = "sha256-YWDj/dLN72XMxDXpSPQvkxHF5xJ15xWJjw3vtfmxlwo="; + sha256 = "sha256-XCOfzzUs0K5/peprgpEXY2pX6wYOF7hg9ec1XPEYHCI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix index e11f5ff1eb53..49dc1589ad76 100644 --- a/pkgs/development/python-modules/python-socks/default.nix +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Core proxy client (SOCKS4, SOCKS5, HTTP) functionality for Python"; homepage = "https://github.com/romis2012/python-socks"; license = licenses.asl20; - maintainers = with maintainers; [ mjlbach ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index c808fe6acd2d..5b1ff139ff9c 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -1,20 +1,32 @@ -{ lib, buildPythonPackage, fetchPypi, requests }: +{ lib +, buildPythonPackage +, fetchPypi +, requests +, pythonOlder +}: buildPythonPackage rec { pname = "stripe"; - version = "2.65.0"; + version = "2.66.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "2e55d4d7262085de9cef2228f14581925c35350ba58a332352b1ec9e19a7b7a6"; + hash = "sha256-d8YDIjD3cUsaG0WQdPCMYNYMIpucO+rDcnGQY+PRQJw="; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + ]; # Tests require network connectivity and there's no easy way to disable them doCheck = false; - pythonImportsCheck = [ "stripe" ]; + pythonImportsCheck = [ + "stripe" + ]; meta = with lib; { description = "Stripe Python bindings"; diff --git a/pkgs/development/python-modules/wsdiscovery/default.nix b/pkgs/development/python-modules/wsdiscovery/default.nix new file mode 100644 index 000000000000..8ba797449494 --- /dev/null +++ b/pkgs/development/python-modules/wsdiscovery/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, click +, fetchFromGitHub +, mock +, netifaces +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "wsdiscovery"; + version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "andreikop"; + repo = "python-ws-discovery"; + rev = version; + hash = "sha256-6LGZogNRCnmCrRXvHq9jmHwqW13KQPpaGaao/52JPtk="; + }; + + propagatedBuildInputs = [ + click + netifaces + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "wsdiscovery" + ]; + + meta = with lib; { + description = "WS-Discovery implementation for Python"; + homepage = "https://github.com/andreikop/python-ws-discovery"; + license = with licenses; [ lgpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 335974f012ee..b28ac95ab61c 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.853"; + version = "2.0.859"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-qD6P3ppxckqiCB6wiypdVQtY+b3PN3dhuAQP5REDq3U="; + hash = "sha256-uvuAMD/upr8mvK/YCvvlPGIZBMZ0SHxXMdv18NIsOYM="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/analysis/oclgrind/default.nix b/pkgs/development/tools/analysis/oclgrind/default.nix index edad1f0dd9ee..3752fa8e251d 100644 --- a/pkgs/development/tools/analysis/oclgrind/default.nix +++ b/pkgs/development/tools/analysis/oclgrind/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "oclgrind"; - version = "19.10"; + version = "21.10"; src = fetchFromGitHub { owner = "jrprice"; repo = "oclgrind"; rev = "v${version}"; - sha256 = "12v5z5x3ls26p3y3yc4mqmh12cazc0nlrwvmfbn6cyg4af9dp0zn"; + sha256 = "sha256-DGCF7X2rPV1w9guxg2bMylRirXQgez24sG7Unlct3ow="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 64ab4a315de1..da73737530ed 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.41.0"; + version = "6.42.0"; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "sha256-kXyUukqLFIdaBpO+oimyrzmGm6bNwoQaRDIoMtZq45k="; + sha256 = "sha256-rVqHMhiuFLVTz/J9TGnA/42m9GaGORsf+CrUUqsdUfs="; }; nativeBuildInputs = [ unzip makeWrapper ]; @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://pmd.github.io/"; changelog = "https://pmd.github.io/pmd-${version}/pmd_release_notes.html"; platforms = platforms.unix; - license = with licenses; [ bsdOriginal asl20 lgpl3Plus ]; + license = with licenses; [ bsdOriginal asl20 ]; }; } diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix index 5ea43e5555bc..4c33ef57a47d 100644 --- a/pkgs/development/tools/analysis/randoop/default.nix +++ b/pkgs/development/tools/analysis/randoop/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - version = "4.2.6"; + version = "4.3.0"; pname = "randoop"; src = fetchurl { url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "sha256-69cKAyMwORG4A91OARmY4uQKgBZIx9N/zc7TZ086CK0="; + sha256 = "sha256-3svBmXcRvscaK8YD4qm/geQSJ6cAm0en/d7H09h41PQ="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index e8da9733ae90..78376b639c44 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -3,7 +3,7 @@ rec { gen = - { version, nativeVersion, sha256, defaultJava ? jdk8 }: + { version, nativeVersion, sha256, defaultJava ? jdk8, supportedPlatforms ? null }: { lib, stdenv, fetchurl, makeWrapper, unzip, java ? defaultJava , javaToolchains ? [ ], ncurses5, ncurses6 }: @@ -87,7 +87,7 @@ rec { changelog = "https://docs.gradle.org/${version}/release-notes.html"; downloadPage = "https://gradle.org/next-steps/?version=${version}"; license = licenses.asl20; - platforms = platforms.unix; + platforms = if (supportedPlatforms != null) then supportedPlatforms else platforms.unix; maintainers = with maintainers; [ lorenzleutgeb liff ]; }; }; @@ -100,6 +100,9 @@ rec { nativeVersion = "0.22-milestone-23"; sha256 = "0d56bgd2m64pzmycjk29hwdlhbpn1kkm7fjik1sibn6vslw71hlc"; defaultJava = jdk17; + # Gradle 7 ships some binaries that are only available for some platforms + # See https://github.com/gradle/native-platform#supported-platforms + supportedPlatforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" "x86_64-cygwin" "x86_64-windows" "i686-windows" ]; }; gradle_6 = gen { @@ -107,6 +110,9 @@ rec { nativeVersion = "0.22-milestone-20"; sha256 = "13qyk3f6namw27ynh6nxljxpk9r3l12vxl3f0qpglprdf3c6ydcb"; defaultJava = jdk11; + # Gradle 6 ships some binaries that are only available for some platforms + # See https://github.com/gradle/native-platform#supported-platforms + supportedPlatforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" "x86_64-cygwin" "x86_64-windows" "i686-windows" ]; }; # NOTE: No GitHub Release for the following versions. `update.sh` will not work. diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 717a6d7c6951..7c95565487d8 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-kWGj0THunXXv3fz9oRLPx314bBU8mdHElmz0v7ALNpE="; + hash = "sha256-ZgLg+pIdTBxMNXgFFL8jCbQa444pkgtnSx+QjMqQhag="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix index 74341c0a7b49..4acf2264fc9c 100644 --- a/pkgs/development/tools/omniorb/default.nix +++ b/pkgs/development/tools/omniorb/default.nix @@ -1,23 +1,36 @@ -{ lib, stdenv, fetchurl, python2 }: +{ lib +, stdenv +, fetchurl +, pkg-config +, python3 +}: + stdenv.mkDerivation rec { pname = "omniorb"; - - version = "4.2.4"; + version = "4.3.0"; src = fetchurl { url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2"; - sha256 = "0vvsvi5nx4k7kk4qh1pkf3f5fpz7wv4rsdna4hayihbnvz81rh18"; + hash = "sha256-l2BFojQfTpqFBosh9L2SiZMpKTPu7O/qNy2wngIZ6t0="; }; - buildInputs = [ python2 ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ python3 ]; + enableParallelBuilding = true; hardeningDisable = [ "format" ]; meta = with lib; { - description = "A robust high performance CORBA ORB for C++ and Python. It is freely available under the terms of the GNU Lesser General Public License (for the libraries), and GNU General Public License (for the tools). omniORB is largely CORBA 2.6 compliant"; + description = "A robust high performance CORBA ORB for C++ and Python"; + longDescription = '' + omniORB is a robust high performance CORBA ORB for C++ and Python. + It is freely available under the terms of the GNU Lesser General Public License + (for the libraries),and GNU General Public License (for the tools). + omniORB is largely CORBA 2.6 compliant. + ''; homepage = "http://omniorb.sourceforge.net/"; - license = licenses.gpl2Plus; + license = with licenses; [ gpl2Plus lgpl21Plus ]; maintainers = with maintainers; [ smironov ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/rust/probe-rs-cli/default.nix b/pkgs/development/tools/rust/probe-rs-cli/default.nix new file mode 100644 index 000000000000..4978c4a3c3e6 --- /dev/null +++ b/pkgs/development/tools/rust/probe-rs-cli/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, rustPlatform, fetchCrate, pkg-config, libusb1, AppKit }: + +rustPlatform.buildRustPackage rec { + pname = "probe-rs-cli"; + version = "0.12.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-XYrB/aKuFCe0FNe6N9vqDdr408tAiN6YvT5BL6lCxmU="; + }; + + cargoSha256 = "sha256-aXSJMSGNl2fzob1j/qiPHHZLisYQeU1gUO5cYbzSHYA="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + + meta = with lib; { + description = "CLI tool for on-chip debugging and flashing of ARM chips"; + homepage = "https://probe.rs/"; + changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ xgroleau ]; + }; +} diff --git a/pkgs/development/tools/sd-local/default.nix b/pkgs/development/tools/sd-local/default.nix index 3ec4163ac442..c1c5bbee0ac3 100644 --- a/pkgs/development/tools/sd-local/default.nix +++ b/pkgs/development/tools/sd-local/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.32"; + version = "1.0.40"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4VKTp4q2CoIWQTiSgs254deafuowiTpuLVJ79nmqAaA="; + sha256 = "sha256-/b9ZmwTw9DbdO0KI7rfT0YW0Xo2cxfwhk1TEfTe3ySU="; }; - vendorSha256 = "sha256-4xuWehRrmVdS2F6r00LZLKq/oHlWqCTQ/jYUKeIJ6DI="; + vendorSha256 = "sha256-43hcIIGqBscMjQzaIGdMqV5lq3od4Ls4TJdTeFGtu5Y="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 7d88df2feb03..aa58b37773ef 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "The SPIR-V Tools project provides an API and commands for processing SPIR-V modules"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.ralith ]; }; } diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index 99b51854e7d4..4ec62ed4d29d 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { description = "Lua Language Server coded by Lua "; homepage = "https://github.com/sumneko/lua-language-server"; license = licenses.mit; - maintainers = with maintainers; [ mjlbach ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux ++ platforms.darwin; mainProgram = "lua-language-server"; }; diff --git a/pkgs/development/tools/vendir/default.nix b/pkgs/development/tools/vendir/default.nix index a58a0e95a38f..e80bb0f14cdf 100644 --- a/pkgs/development/tools/vendir/default.nix +++ b/pkgs/development/tools/vendir/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vendir"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-vendir"; rev = "v${version}"; - sha256 = "sha256-6f9UF0UgwKG3Mdgy85pW2KVjC8nbnMTwQJqIWxA3Jp4="; + sha256 = "sha256-3l0ezObZK/QEmpBlqSm3R3e4pFM7KUnsxDrzvEYExnk="; }; vendorSha256 = null; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 35564704f68b..5ddbabe042ea 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2022.118.0"; + version = "2022.205.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "sha256-/BzoLiQLiBcWqThzDOVb4Y7s6WhcKnCRRhAzUi5Jstk="; + sha256 = "sha256-CzXgj3990qWOwIjhbU8vO29nDO/7HrGDtsc67VIenPI="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 7bf9a89e50f3..6ff9f6dfaf80 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -111,8 +111,10 @@ (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.2.0"; sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.2.0"; sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.2"; sha256 = "0db6d1b076nfqfn5mhy63l3gkfn5kr29hwcrx81ldr7y062r1b9y"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0-rc.1.21451.13"; sha256 = "0r6945jq7c2f1wjifq514zvngicndjqfnsjya6hqw0yzah0jr56c"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.2.0"; sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; sha256 = "11dg16x6g0gssb143qpghxz1s41himvhr7yhjwxs9hacx4ij2dm1"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.1.0"; sha256 = "0dl4qhjgifm6v3jsfzvzkvddyic77ggp9fq49ah661v45gk6ilgd"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.2.0"; sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) @@ -153,14 +155,16 @@ (fetchNuGet { pname = "NuGet.Protocol"; version = "5.11.0"; sha256 = "041pva6ykc5h6az7bb87mkg32c95cvxlixgspnd34zbdldr4ypdb"; }) (fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.0"; sha256 = "041351n1rbyqpfxqyxbvjgfrcbbawymbq96givz5pvdbabvyf5vq"; }) (fetchNuGet { pname = "NUnit"; version = "3.13.2"; sha256 = "00bkjgarkwbj497da9d7lajala1ns67h1kx53w4bapwkf32jlcvn"; }) - (fetchNuGet { pname = "OpenTabletDriver"; version = "0.5.3.1"; sha256 = "16xw8w943x9gvnnpbryahff5azzy8n26j2igyqgv88m352jd9rb8"; }) - (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.5.3.1"; sha256 = "17dxsvcz9g8kzydk5xlfz9kfxl62x9wi20609rh76wjd881bg1br"; }) + (fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.0.2"; sha256 = "0blwfs1cacxq0vs6fy7zjnsny8qdsr5jlxix3icmphyqgz0g4g39"; }) + (fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.0.2"; sha256 = "18q6gjayqrwk6n1kf359z94z8zyb3yz4hr1dpgglk51sq6wi2z84"; }) + (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.0.2"; sha256 = "12hf4v8j8asc9wlywpykajb8yrzx10w6h11qbykckmrfxvz8pc0a"; }) + (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.0.2"; sha256 = "0z2n5jysw06zp2cxmfqddbg3g88jdm1irr2hv04q8valq0plaq5c"; }) (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2021.1210.0"; sha256 = "0dn6fc31yllr5nizylvkfl2b603b5m9694nsn5mmkh8w43h0rkbq"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2022.118.0"; sha256 = "1c81r8s9zivj9hany0yqsza1y3nhh24zbkwwnjm0m6z4mls04l1y"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2022.204.0"; sha256 = "1dwg45k1qhxj4mhxw49djmab800yi7z7qnvl8ipicli4lg9k5lvf"; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2021.1221.0"; sha256 = "1ffxp4nsgbqw1f6nypirmc0a3h203qikbmxm2x8w3kgcfga5dx3k"; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2022.115.0"; sha256 = "0w2hnci93644ayfpgpsyxsifz38yklvn42fkgd860i3mn04lyl2z"; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2022.204.0"; sha256 = "1v4kfphjbkcxswx11c7xh93jwpsyvnskc0zia91d5bp5d11y3z32"; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.187"; sha256 = "0ididsxn3005dvs0hvx7bz2xzjsfpa8kmnyfqq4c2ybjxlx15gkw"; }) - (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.486-alpha"; sha256 = "0hp6wfjgpwdgy1ag2bpjkyalw92k6qg9pc5mriij6a5vhxzadhk3"; }) + (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.501-alpha"; sha256 = "03ixv0nhszsyyf0bvyd25nkyn3c3cndzbxnva19lagvf0l9gnvjg"; }) (fetchNuGet { pname = "ppy.squirrel.windows"; version = "1.9.0.5"; sha256 = "0nmhrg3q6izapfpwdslq80fqkvjj12ad9r94pd0nr2xx1zw0x1zl"; }) (fetchNuGet { pname = "Realm"; version = "10.8.0"; sha256 = "1ixpms8x9z5ia9yiqvhmgdlcrjvqrhbqnr8b9z6mlxwcms1z2f45"; }) (fetchNuGet { pname = "Realm.Fody"; version = "10.8.0"; sha256 = "0hj3cqan96y01k5qgs0knkqzg3rlr2794az68xqffd2vqphvqvqq"; }) @@ -298,6 +302,7 @@ (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0-rc.1.21451.13"; sha256 = "0v5bc80p35jj5b5xdgsn5r1v4w68gqz0sahi214rprrrlr3sl206"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) diff --git a/pkgs/games/pentobi/default.nix b/pkgs/games/pentobi/default.nix index 213f2c8e4f48..e0bd6909fb94 100644 --- a/pkgs/games/pentobi/default.nix +++ b/pkgs/games/pentobi/default.nix @@ -3,14 +3,14 @@ }: mkDerivation rec { - version = "19.1"; + version = "20.0"; pname = "pentobi"; src = fetchFromGitHub { owner = "enz"; repo = "pentobi"; rev = "v${version}"; - sha256 = "sha256-opJPMvaE8fDoGaBNHySqr/LRU/UPP6292G+nYyBBL08="; + sha256 = "sha256-DQM3IJ0pRkX4OsrjZGROg50LfKb621UnpvtqSjxchz8="; }; nativeBuildInputs = [ cmake docbook_xsl qttools ]; @@ -31,7 +31,7 @@ mkDerivation rec { meta = with lib; { description = "A computer opponent for the board game Blokus"; homepage = "https://pentobi.sourceforge.io"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = [ ]; platforms = platforms.linux; }; diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix index 82879d0a9d2d..b70ef8c3dab6 100644 --- a/pkgs/games/pioneer/default.nix +++ b/pkgs/games/pioneer/default.nix @@ -1,37 +1,68 @@ -{ fetchFromGitHub, lib, stdenv, cmake, pkg-config, curl, libsigcxx, SDL2 -, SDL2_image, freetype, libvorbis, libpng, assimp, libGLU, libGL -, glew +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, assimp +, curl +, freetype +#, glew +, libGL +, libGLU +, libpng +, libsigcxx +, libvorbis +, lua5_2 +, mesa +, SDL2 +, SDL2_image }: stdenv.mkDerivation rec { pname = "pioneer"; - version = "20210723"; + version = "20220203"; src = fetchFromGitHub{ owner = "pioneerspacesim"; repo = "pioneer"; rev = version; - sha256 = "sha256-w+ECVv96MoS69815+X0PqguDiGDhHoTnAnnYtLpMScI="; + hash = "sha256-HNVg8Lq6k6gQDmgOdpnBwJ57WSEnn5XwtqzmkDU1WGI="; }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace 'string(TIMESTAMP PROJECT_VERSION "%Y%m%d")' 'set(PROJECT_VERSION ${version})' + ''; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - curl libsigcxx SDL2 SDL2_image freetype libvorbis libpng - assimp libGLU libGL glew + assimp + curl + freetype + libGL + libGLU + libpng + libsigcxx + libvorbis + lua5_2 + mesa + SDL2 + SDL2_image ]; - preConfigure = '' - export PIONEER_DATA_DIR="$out/share/pioneer/data"; - ''; + cmakeFlags = [ + "-DPIONEER_DATA_DIR:PATH=${placeholder "out"}/share/pioneer/data" + "-DUSE_SYSTEM_LIBLUA:BOOL=YES" + ]; - makeFlags = [ "build-data" ]; + makeFlags = [ "all" "build-data" ]; meta = with lib; { description = "A space adventure game set in the Milky Way galaxy at the turn of the 31st century"; homepage = "https://pioneerspacesim.net"; license = with licenses; [ - gpl3 cc-by-sa-30 + gpl3Only cc-by-sa-30 ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index 1ff9f9d36d15..905d51438b68 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -2,16 +2,18 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.6.4"; + version = "3.6.5"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-WUEpYxzNcH9kJRn4nROoaeXTe1+D4/0VRqTwc7ac1hc="; + sha256 = "sha256-wnaT0+r599/RboeUfpCZTNd/M2kaCsckI9F+7r7leEE="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share/vassal $out/doc cp CHANGES LICENSE README.md $out @@ -21,6 +23,8 @@ stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/vassal \ --add-flags "-Duser.dir=$out -cp $out/share/vassal/Vengine.jar \ VASSAL.launch.ModuleManager" + + runHook postInstall ''; # Don't move doc to share/, VASSAL expects it to be in the root @@ -28,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A free, open-source boardgame engine"; - homepage = "http://www.vassalengine.org/"; + homepage = "https://vassalengine.org/"; license = licenses.lgpl21Only; maintainers = with maintainers; [ tvestelind ]; platforms = platforms.unix; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 4fb114829445..395fb6711d4d 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -195,6 +195,30 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; + asyncrun-vim = buildVimPluginFrom2Nix { + pname = "asyncrun.vim"; + version = "2022-02-03"; + src = fetchFromGitHub { + owner = "skywind3000"; + repo = "asyncrun.vim"; + rev = "fc6d524b9d81850c15b9b374a1b4a1374e243ec3"; + sha256 = "/144rx2txz+VnPI8y4w1z9DY5nBEmp64arApRGiHQXU="; + }; + meta.homepage = "https://github.com/skywind3000/asyncrun.vim"; + }; + + asynctasks-vim = buildVimPluginFrom2Nix { + pname = "asynctasks.vim"; + version = "2022-01-12"; + src = fetchFromGitHub { + owner = "skywind3000"; + repo = "asynctasks.vim"; + rev = "dfecf57c79ded5ead2911e32caff46d8cede8c5c"; + sha256 = "cw61N5K6GHwdT011oeFV+jzFw9tk4xahPcTnx5jwqPA="; + }; + meta.homepage = "https://github.com/skywind3000/asynctasks.vim"; + }; + ats-vim = buildVimPluginFrom2Nix { pname = "ats-vim"; version = "2020-09-04"; @@ -735,6 +759,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lua/"; }; + cmp-nvim-ultisnips = buildVimPluginFrom2Nix { + pname = "cmp-nvim-ultisnips"; + version = "2022-01-31"; + src = fetchFromGitHub { + owner = "quangnguyen30192"; + repo = "cmp-nvim-ultisnips"; + rev = "0e8f501facdcc5bfdb5664ee185e040464a79625"; + sha256 = "tQ3xkJ34q5+ioi6lQY7F/ZjGngzmv4FDkpNeU5sRqK0="; + }; + meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips"; + }; + cmp-omni = buildVimPluginFrom2Nix { pname = "cmp-omni"; version = "2022-01-08"; @@ -6423,6 +6459,18 @@ final: prev: meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; + telescope-asynctasks-nvim = buildVimPluginFrom2Nix { + pname = "telescope-asynctasks.nvim"; + version = "2021-10-22"; + src = fetchFromGitHub { + owner = "GustavoKatel"; + repo = "telescope-asynctasks.nvim"; + rev = "80bd6570e5423d14ad1e6fd56a199955ac1b895f"; + sha256 = "Ow7iSmosMs/hGEfnKKorZhS4tKVKal+pkZ52LIFsEu4="; + }; + meta.homepage = "https://github.com/GustavoKatel/telescope-asynctasks.nvim"; + }; + telescope-cheat-nvim = buildVimPluginFrom2Nix { pname = "telescope-cheat.nvim"; version = "2021-12-05"; @@ -6604,6 +6652,18 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; + telescope-ultisnips-nvim = buildVimPluginFrom2Nix { + pname = "telescope-ultisnips.nvim"; + version = "2021-09-27"; + src = fetchFromGitHub { + owner = "fhill2"; + repo = "telescope-ultisnips.nvim"; + rev = "f48b6d4f53b31507d3fd514905c6940409e8ada8"; + sha256 = "h2PfstopgjCMFYVOnzEX7gkkIHCamcJPJux5B+qYYww="; + }; + meta.homepage = "https://github.com/fhill2/telescope-ultisnips.nvim"; + }; + tender-vim = buildVimPluginFrom2Nix { pname = "tender.vim"; version = "2021-05-24"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 5e54d5577cbe..098530dcf31f 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -169,6 +169,7 @@ FelikZ/ctrlp-py-matcher feline-nvim/feline.nvim fenetikm/falcon fhill2/floating.nvim +fhill2/telescope-ultisnips.nvim fiatjaf/neuron.vim filipdutescu/renamer.nvim fisadev/vim-isort @@ -223,6 +224,7 @@ guns/vim-clojure-highlight guns/vim-clojure-static guns/vim-sexp guns/xterm-color-table.vim +GustavoKatel/telescope-asynctasks.nvim gyim/vim-boxdraw haringsrob/nvim_context_vt hashivim/vim-packer @@ -654,6 +656,7 @@ pwntester/octo.nvim python-mode/python-mode qnighy/lalrpop.vim qpkorr/vim-bufkill +quangnguyen30192/cmp-nvim-ultisnips Quramy/tsuquyomi racer-rust/vim-racer radenling/vim-dispatch-neovim @@ -761,6 +764,8 @@ SirVer/ultisnips sjl/gundo.vim sjl/splice.vim sk1418/last256 +skywind3000/asyncrun.vim +skywind3000/asynctasks.vim slashmili/alchemist.vim smiteshp/nvim-gps sodapopcan/vim-twiggy diff --git a/pkgs/os-specific/darwin/moltenvk/MoltenVK.xcodeproj.patch b/pkgs/os-specific/darwin/moltenvk/MoltenVK.xcodeproj.patch new file mode 100644 index 000000000000..abbb3b8fb0e1 --- /dev/null +++ b/pkgs/os-specific/darwin/moltenvk/MoltenVK.xcodeproj.patch @@ -0,0 +1,146 @@ +diff --git a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj +index c23afce4..12ac12f4 100644 +--- a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj ++++ b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj +@@ -365,13 +365,6 @@ + /* End PBXBuildFile section */ + + /* Begin PBXContainerItemProxy section */ +- 2F21D82E24983488009BEA5F /* PBXContainerItemProxy */ = { +- isa = PBXContainerItemProxy; +- containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */; +- proxyType = 1; +- remoteGlobalIDString = 2FEA0CFF2490381A00EEF3AD; +- remoteInfo = "MoltenVKSPIRVToMSLConverter-tvOS"; +- }; + 2FEA0D1B249040CA00EEF3AD /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */; +@@ -400,20 +393,6 @@ + remoteGlobalIDString = A93903C71C57E9ED00FE90DC; + remoteInfo = "MVKSPIRVToMSLConverter-macOS"; + }; +- A981499A1FB6B9CF005F00B4 /* PBXContainerItemProxy */ = { +- isa = PBXContainerItemProxy; +- containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */; +- proxyType = 1; +- remoteGlobalIDString = A93903B81C57E9D700FE90DC; +- remoteInfo = "MVKSPIRVToMSLConverter-iOS"; +- }; +- A9B1C7F4251AA5AF001D12CC /* PBXContainerItemProxy */ = { +- isa = PBXContainerItemProxy; +- containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */; +- proxyType = 1; +- remoteGlobalIDString = A9092A8C1A81717B00051823; +- remoteInfo = MoltenVKShaderConverter; +- }; + /* End PBXContainerItemProxy section */ + + /* Begin PBXFileReference section */ +@@ -1019,7 +998,6 @@ + buildRules = ( + ); + dependencies = ( +- 2F21D82F24983488009BEA5F /* PBXTargetDependency */, + ); + name = "MoltenVK-tvOS"; + productName = MoltenVK; +@@ -1039,7 +1017,6 @@ + buildRules = ( + ); + dependencies = ( +- A981499B1FB6B9CF005F00B4 /* PBXTargetDependency */, + ); + name = "MoltenVK-iOS"; + productName = MoltenVK; +@@ -1059,7 +1036,6 @@ + buildRules = ( + ); + dependencies = ( +- A9B1C7F5251AA5AF001D12CC /* PBXTargetDependency */, + ); + name = "MoltenVK-macOS"; + productName = MoltenVK; +@@ -1476,24 +1452,6 @@ + }; + /* End PBXSourcesBuildPhase section */ + +-/* Begin PBXTargetDependency section */ +- 2F21D82F24983488009BEA5F /* PBXTargetDependency */ = { +- isa = PBXTargetDependency; +- name = "MoltenVKSPIRVToMSLConverter-tvOS"; +- targetProxy = 2F21D82E24983488009BEA5F /* PBXContainerItemProxy */; +- }; +- A981499B1FB6B9CF005F00B4 /* PBXTargetDependency */ = { +- isa = PBXTargetDependency; +- name = "MVKSPIRVToMSLConverter-iOS"; +- targetProxy = A981499A1FB6B9CF005F00B4 /* PBXContainerItemProxy */; +- }; +- A9B1C7F5251AA5AF001D12CC /* PBXTargetDependency */ = { +- isa = PBXTargetDependency; +- name = MoltenVKShaderConverter; +- targetProxy = A9B1C7F4251AA5AF001D12CC /* PBXContainerItemProxy */; +- }; +-/* End PBXTargetDependency section */ +- + /* Begin XCBuildConfiguration section */ + 2FEA0AB824902F9F00EEF3AD /* Debug */ = { + isa = XCBuildConfiguration; +@@ -1586,11 +1544,12 @@ + GCC_WARN_UNUSED_VARIABLE = YES; + GENERATE_MASTER_OBJECT_FILE = YES; + HEADER_SEARCH_PATHS = ( +- "\"$(SRCROOT)/include\"", +- "\"$(SRCROOT)/../MoltenVKShaderConverter\"", +- "\"$(SRCROOT)/../MoltenVKShaderConverter/SPIRV-Cross\"", +- "\"$(SRCROOT)/../External/cereal/include\"", +- "\"${BUILT_PRODUCTS_DIR}\"", ++ "@@sourceRoot@@/outputs/include", ++ "@@sourceRoot@@/outputs/include/simd_workaround", ++ "@@sourceRoot@@/MoltenVKShaderConverter", ++ "@@cereal@@/include", ++ "@@spirv-cross@@/include/spirv_cross", ++ "@@vulkan-headers@@/include", + ); + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MACH_O_TYPE = staticlib; +@@ -1600,6 +1559,10 @@ + MVK_SKIP_DYLIB = ""; + "MVK_SKIP_DYLIB[sdk=appletvsimulator*]" = YES; + "MVK_SKIP_DYLIB[sdk=iphonesimulator*]" = YES; ++ OTHER_CFLAGS = ( ++ "-isystem", ++ "@@libcxx@@/include/c++/v1", ++ ); + PRELINK_LIBS = "${CONFIGURATION_BUILD_DIR}/libMoltenVKShaderConverter.a"; + PRODUCT_NAME = MoltenVK; + SKIP_INSTALL = YES; +@@ -1658,11 +1621,12 @@ + GCC_WARN_UNUSED_VARIABLE = YES; + GENERATE_MASTER_OBJECT_FILE = YES; + HEADER_SEARCH_PATHS = ( +- "\"$(SRCROOT)/include\"", +- "\"$(SRCROOT)/../MoltenVKShaderConverter\"", +- "\"$(SRCROOT)/../MoltenVKShaderConverter/SPIRV-Cross\"", +- "\"$(SRCROOT)/../External/cereal/include\"", +- "\"${BUILT_PRODUCTS_DIR}\"", ++ "@@sourceRoot@@/outputs/include", ++ "@@sourceRoot@@/outputs/include/simd_workaround", ++ "@@sourceRoot@@/MoltenVKShaderConverter", ++ "@@cereal@@/include", ++ "@@spirv-cross@@/include/spirv_cross", ++ "@@vulkan-headers@@/include", + ); + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MACH_O_TYPE = staticlib; +@@ -1672,6 +1636,10 @@ + MVK_SKIP_DYLIB = ""; + "MVK_SKIP_DYLIB[sdk=appletvsimulator*]" = YES; + "MVK_SKIP_DYLIB[sdk=iphonesimulator*]" = YES; ++ OTHER_CFLAGS = ( ++ "-isystem", ++ "@@libcxx@@/include/c++/v1", ++ ); + PRELINK_LIBS = "${CONFIGURATION_BUILD_DIR}/libMoltenVKShaderConverter.a"; + PRODUCT_NAME = MoltenVK; + SKIP_INSTALL = YES; diff --git a/pkgs/os-specific/darwin/moltenvk/MoltenVKShaderConverter.xcodeproj.patch b/pkgs/os-specific/darwin/moltenvk/MoltenVKShaderConverter.xcodeproj.patch new file mode 100644 index 000000000000..7a7ec7afa2ee --- /dev/null +++ b/pkgs/os-specific/darwin/moltenvk/MoltenVKShaderConverter.xcodeproj.patch @@ -0,0 +1,180 @@ +diff --git a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj +index c7842b63..d55f73ed 100644 +--- a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj ++++ b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj +@@ -3,7 +3,7 @@ + archiveVersion = 1; + classes = { + }; +- objectVersion = 52; ++ objectVersion = 48; + objects = { + + /* Begin PBXBuildFile section */ +@@ -33,9 +33,6 @@ + A920A8AC251B75B70076851C /* GLSLToSPIRVConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = A920A8A2251B75B70076851C /* GLSLToSPIRVConverter.h */; }; + A920A8AD251B75B80076851C /* GLSLToSPIRVConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = A920A8A2251B75B70076851C /* GLSLToSPIRVConverter.h */; }; + A920A8AE251B75B80076851C /* GLSLToSPIRVConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = A920A8A2251B75B70076851C /* GLSLToSPIRVConverter.h */; }; +- A920A8AF251B77900076851C /* glslang.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386FD24EEE93700199A05 /* glslang.xcframework */; }; +- A920A8B0251B77910076851C /* glslang.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386FD24EEE93700199A05 /* glslang.xcframework */; }; +- A920A8B1251B77920076851C /* glslang.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386FD24EEE93700199A05 /* glslang.xcframework */; }; + A925B71B1C78DEB2006E7ECD /* libMoltenVKShaderConverter.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A93903C71C57E9ED00FE90DC /* libMoltenVKShaderConverter.a */; }; + A928C9191D0488DC00071B88 /* SPIRVConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = A928C9171D0488DC00071B88 /* SPIRVConversion.h */; }; + A928C91A1D0488DC00071B88 /* SPIRVConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = A928C9171D0488DC00071B88 /* SPIRVConversion.h */; }; +@@ -55,12 +52,6 @@ + A97CC7411C7527F3004A5C7E /* MoltenVKShaderConverterTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A97CC73E1C7527F3004A5C7E /* MoltenVKShaderConverterTool.cpp */; }; + A98149681FB6A98A005F00B4 /* MVKStrings.h in Headers */ = {isa = PBXBuildFile; fileRef = A98149651FB6A98A005F00B4 /* MVKStrings.h */; }; + A98149691FB6A98A005F00B4 /* MVKStrings.h in Headers */ = {isa = PBXBuildFile; fileRef = A98149651FB6A98A005F00B4 /* MVKStrings.h */; }; +- A98386FA24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386F824EEE91A00199A05 /* SPIRVCross.xcframework */; }; +- A98386FB24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386F824EEE91A00199A05 /* SPIRVCross.xcframework */; }; +- A98386FC24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386F824EEE91A00199A05 /* SPIRVCross.xcframework */; }; +- A983870724EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A983870224EEE94800199A05 /* SPIRVTools.xcframework */; }; +- A983870824EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A983870224EEE94800199A05 /* SPIRVTools.xcframework */; }; +- A983870924EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A983870224EEE94800199A05 /* SPIRVTools.xcframework */; }; + A9A14E332244388700C080F3 /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9A14E322244388700C080F3 /* Metal.framework */; }; + A9B51BDD225E98BB00AC74D2 /* MVKOSExtensions.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9B51BDB225E98BB00AC74D2 /* MVKOSExtensions.mm */; }; + A9F042B21FB4D060009FCCB8 /* MVKCommonEnvironment.h in Headers */ = {isa = PBXBuildFile; fileRef = A9F042AA1FB4D060009FCCB8 /* MVKCommonEnvironment.h */; }; +@@ -115,9 +106,6 @@ + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( +- A983870824EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */, +- A98386FB24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */, +- A920A8B0251B77910076851C /* glslang.xcframework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +@@ -134,9 +122,6 @@ + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( +- A983870724EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */, +- A98386FA24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */, +- A920A8AF251B77900076851C /* glslang.xcframework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +@@ -144,9 +129,6 @@ + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( +- A983870924EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */, +- A98386FC24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */, +- A920A8B1251B77920076851C /* glslang.xcframework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +@@ -313,7 +295,7 @@ + A925B71D1C78DEBF006E7ECD /* PBXTargetDependency */, + ); + name = MoltenVKShaderConverter; +- productName = MetalGLShaderConverterTool; ++ productName = MoltenVKShaderConverter; + productReference = A964BD5F1C57EFBD00D930D8 /* MoltenVKShaderConverter */; + productType = "com.apple.product-type.tool"; + }; +@@ -349,7 +331,7 @@ + dependencies = ( + ); + name = "MoltenVKShaderConverter-macOS"; +- productName = "MetalGLShaderConverter-macOS"; ++ productName = MoltenVKShaderConverter; + productReference = A93903C71C57E9ED00FE90DC /* libMoltenVKShaderConverter.a */; + productType = "com.apple.product-type.library.static"; + }; +@@ -536,6 +518,17 @@ + OTHER_LDFLAGS = ( + "-ObjC", + "-w", ++ "-lMachineIndependent", ++ "-lGenericCodeGen", ++ "-lOGLCompiler", ++ "-lglslang", ++ "-lOSDependent", ++ "-lSPIRV", ++ "-lSPIRV-Tools", ++ "-lSPIRV-Tools-opt", ++ "-lspirv-cross-msl", ++ "-lspirv-cross-core", ++ "-lspirv-cross-glsl", + ); + SDKROOT = macosx; + }; +@@ -548,6 +541,17 @@ + OTHER_LDFLAGS = ( + "-ObjC", + "-w", ++ "-lMachineIndependent", ++ "-lGenericCodeGen", ++ "-lOGLCompiler", ++ "-lglslang", ++ "-lOSDependent", ++ "-lSPIRV", ++ "-lSPIRV-Tools", ++ "-lSPIRV-Tools-opt", ++ "-lspirv-cross-msl", ++ "-lspirv-cross-core", ++ "-lspirv-cross-glsl", + ); + SDKROOT = macosx; + }; +@@ -624,15 +628,24 @@ + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + HEADER_SEARCH_PATHS = ( +- "$(inherited)", +- "\"$(SRCROOT)\"", +- "\"$(SRCROOT)/SPIRV-Cross\"", +- "\"$(SRCROOT)/glslang\"", +- "\"$(SRCROOT)/glslang/External/spirv-tools/include\"", ++ "@@sourceRoot@@/Common", ++ "@@glslang@@/include", ++ "@@spirv-cross@@/include/spirv_cross", ++ "@@spirv-tools@@/include", ++ "@@spirv-headers@@/include/spirv/unified1/", + ); + IPHONEOS_DEPLOYMENT_TARGET = 9.0; ++ LIBRARY_SEARCH_PATHS = ( ++ "@@glslang@@/lib", ++ "@@spirv-cross@@/lib", ++ "@@spirv-tools@@/lib", ++ ); + MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.11; ++ OTHER_CFLAGS = ( ++ "-isystem", ++ "@@libcxx@@/include/c++/v1", ++ ); + PRODUCT_NAME = MoltenVKShaderConverter; + SKIP_INSTALL = YES; + TVOS_DEPLOYMENT_TARGET = 9.0; +@@ -683,15 +696,24 @@ + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + HEADER_SEARCH_PATHS = ( +- "$(inherited)", +- "\"$(SRCROOT)\"", +- "\"$(SRCROOT)/SPIRV-Cross\"", +- "\"$(SRCROOT)/glslang\"", +- "\"$(SRCROOT)/glslang/External/spirv-tools/include\"", ++ "@@sourceRoot@@/Common", ++ "@@glslang@@/include", ++ "@@spirv-cross@@/include/spirv_cross", ++ "@@spirv-tools@@/include", ++ "@@spirv-headers@@/include/spirv/unified1/", + ); + IPHONEOS_DEPLOYMENT_TARGET = 9.0; ++ LIBRARY_SEARCH_PATHS = ( ++ "@@glslang@@/lib", ++ "@@spirv-cross@@/lib", ++ "@@spirv-tools@@/lib", ++ ); + MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.11; ++ OTHER_CFLAGS = ( ++ "-isystem", ++ "@@libcxx@@/include/c++/v1", ++ ); + PRODUCT_NAME = MoltenVKShaderConverter; + SKIP_INSTALL = YES; + TVOS_DEPLOYMENT_TARGET = 9.0; diff --git a/pkgs/os-specific/darwin/moltenvk/createDylib.patch b/pkgs/os-specific/darwin/moltenvk/createDylib.patch new file mode 100644 index 000000000000..b4a990cd9891 --- /dev/null +++ b/pkgs/os-specific/darwin/moltenvk/createDylib.patch @@ -0,0 +1,13 @@ +diff --git a/Scripts/create_dylib.sh b/Scripts/create_dylib.sh +index 5ba75f67..a0405067 100755 +--- a/Scripts/create_dylib.sh ++++ b/Scripts/create_dylib.sh +@@ -57,6 +57,8 @@ ${MVK_SAN} \ + -framework Metal ${MVK_IOSURFACE_FWK} -framework ${MVK_UX_FWK} -framework QuartzCore -framework CoreGraphics ${MVK_IOKIT_FWK} -framework Foundation \ + --library-directory ${MVK_USR_LIB_DIR} \ + -o "${MVK_BUILT_PROD_DIR}/dynamic/${MVK_DYLIB_NAME}" \ ++-L@@sourceRoot@@/outputs/lib -L@@glslang@@/lib -L@@spirv-tools@@/lib -L@@spirv-cross@@/lib \ ++-lobjc -lMoltenVKShaderConverter -lGenericCodeGen -lMachineIndependent -lOGLCompiler -lOSDependent -lSPIRV -lSPIRV-Tools -lSPIRV-Tools-opt -lspirv-cross-core -lspirv-cross-glsl -lspirv-cross-msl -lspirv-cross-reflect \ + -force_load "${MVK_BUILT_PROD_DIR}/lib${PRODUCT_NAME}.a" + + if test "$CONFIGURATION" = Debug; then diff --git a/pkgs/os-specific/darwin/moltenvk/default.nix b/pkgs/os-specific/darwin/moltenvk/default.nix new file mode 100644 index 000000000000..243bc657c9bc --- /dev/null +++ b/pkgs/os-specific/darwin/moltenvk/default.nix @@ -0,0 +1,200 @@ +{ lib +, stdenv +, stdenvNoCC +, fetchurl +, fetchFromGitHub +, cctools +, sigtool +, cereal +, glslang +, spirv-cross +, spirv-headers +, spirv-tools +, vulkan-headers +, AppKit +, Foundation +, Metal +, QuartzCore +}: + +# Even though the derivation is currently impure, it is written to build successfully using +# `xcbuild`. Once the SDK on x86_64-darwin is updated, it should be possible to switch from being +# an impure derivation. +# +# The `sandboxProfile` was copied from the iTerm2 derivation. In order to build you at least need +# the `sandbox` option set to `relaxed` or `false`. Xcode should be available in the default +# location. +let + libcxx.dev = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr"; +in +stdenvNoCC.mkDerivation rec { + pname = "MoltenVK"; + version = "1.1.7"; + + buildInputs = [ + AppKit + Foundation + Metal + QuartzCore + ]; + + outputs = [ "out" "bin" ]; + + # MoltenVK requires specific versions of its dependencies. + # Pin them here except for cereal, which is four years old and has several CVEs. + passthru = { + glslang = (glslang.overrideAttrs (old: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "glslang"; + rev = "2742e959347ae2fac58acd0d022c92a0ff1f24bf"; + hash = "sha256-Q0sk4bPj/skPat1n4GJyuXAlZqpfEn4Td8Bm2IBNUqE="; + }; + })).override { + inherit (passthru) spirv-headers spirv-tools; + }; + spirv-cross = spirv-cross.overrideAttrs (old: { + cmakeFlags = (old.cmakeFlags or [ ]) ++ [ + "-DSPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross" + ]; + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Cross"; + rev = "131278458ea8eebe6a6e9c476fbcf71278726e1a"; + hash = "sha256-LrRYDFGv3Zxfy4qRNLwM2OOa8jbcq0ttPxDamCH21xU="; + }; + }); + spirv-headers = spirv-headers.overrideAttrs (_: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "spirv-headers"; + rev = "b42ba6d92faf6b4938e6f22ddd186dbdacc98d78"; + hash = "sha256-ks9JCj5rj+Xu++7z5RiHDkU3/sFXhcScw8dATfB/ot0"; + }; + }); + spirv-tools = (spirv-tools.overrideAttrs (old: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "spirv-tools"; + rev = "45dd184c790d6bfc78a5a74a10c37e888b1823fa"; + hash = "sha256-DSqZlwfNTbN4fyIrVBKltm5U2U4GthW3L+Ksw4lSVG8="; + }; + meta = old.meta // { + platforms = old.meta.platforms ++ lib.platforms.darwin; + }; + })).override { + inherit (passthru) spirv-headers; + }; + vulkan-headers = vulkan-headers.overrideAttrs (old: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Headers"; + rev = "1dace16d8044758d32736eb59802d171970e9448"; + hash = "sha256-C6YgxWcinI3QumcWmoJaiTAf0u6jSDc8sCIarn2t04k"; + }; + meta = old.meta // { + platforms = old.meta.platforms ++ lib.platforms.darwin; + }; + }); + }; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "MoltenVK"; + rev = "v${version}"; + hash = "sha256-I9QcjyE09qclWPCLAVfKEaifP89q1ftLh9cXWy9m7kw="; + }; + + patches = [ + # Specify the libraries to link directly since XCFrameworks are not being used. + ./createDylib.patch + # Move `mvkGitRevDerived.h` to a stable location + ./gitRevHeaderStability.patch + # Fix the Xcode projects to play nicely with `xcbuild`. + ./MoltenVKShaderConverter.xcodeproj.patch + ./MoltenVK.xcodeproj.patch + ]; + + postPatch = '' + substituteInPlace MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj \ + --replace @@sourceRoot@@ $(pwd) \ + --replace @@libcxx@@ "${libcxx.dev}" \ + --replace @@glslang@@ "${passthru.glslang}" \ + --replace @@spirv-cross@@ "${passthru.spirv-cross}" \ + --replace @@spirv-tools@@ "${passthru.glslang.spirv-tools}" \ + --replace @@spirv-headers@@ "${passthru.glslang.spirv-headers}" + substituteInPlace MoltenVK/MoltenVK.xcodeproj/project.pbxproj \ + --replace @@sourceRoot@@ $(pwd) \ + --replace @@libcxx@@ "${libcxx.dev}" \ + --replace @@cereal@@ "${cereal}" \ + --replace @@spirv-cross@@ "${passthru.spirv-cross}" \ + --replace @@vulkan-headers@@ "${passthru.vulkan-headers}" + substituteInPlace Scripts/create_dylib.sh \ + --replace @@sourceRoot@@ $(pwd) \ + --replace @@glslang@@ "${passthru.glslang}" \ + --replace @@spirv-tools@@ "${passthru.glslang.spirv-tools}" \ + --replace @@spirv-cross@@ "${passthru.spirv-cross}" + substituteInPlace Scripts/gen_moltenvk_rev_hdr.sh \ + --replace @@sourceRoot@@ $(pwd) \ + --replace '$(git rev-parse HEAD)' ${src.rev} + ''; + + dontConfigure = true; + + buildPhase = '' + # Build each project on its own because `xcbuild` fails to build `MoltenVKPackaging.xcodeproj`. + derived_data_path=$(pwd)/DerivedData + pushd MoltenVKShaderConverter + /usr/bin/xcodebuild build \ + -jobs $NIX_BUILD_CORES \ + -derivedDataPath "$derived_data_path" \ + -configuration Release \ + -project MoltenVKShaderConverter.xcodeproj \ + -scheme MoltenVKShaderConverter \ + -arch ${stdenv.targetPlatform.darwinArch} + popd + mkdir -p outputs/bin outputs/lib + declare -A outputs=( [MoltenVKShaderConverter]=bin [libMoltenVKShaderConverter.a]=lib ) + for output in "''${!outputs[@]}"; do + cp DerivedData/Build/Products/Release/$output "outputs/''${outputs[$output]}/$output" + done + + pushd MoltenVK + /usr/bin/xcodebuild build \ + -jobs $NIX_BUILD_CORES \ + -derivedDataPath "$derived_data_path" \ + -configuration Release \ + -project MoltenVK.xcodeproj \ + -scheme MoltenVK-macOS \ + -arch ${stdenv.targetPlatform.darwinArch} + popd + cp DerivedData/Build/Products/Release/dynamic/libMoltenVK.dylib outputs/lib/libMoltenVK.dylib + ''; + + installPhase = '' + mkdir -p "$out/lib" "$out/share/vulkan/icd.d" "$bin/bin" + cp outputs/bin/MoltenVKShaderConverter "$bin/bin/" + cp outputs/lib/libMoltenVK.dylib "$out/lib/" + ${cctools}/bin/install_name_tool -id "$out/lib/libMoltenVK.dylib" "$out/lib/libMoltenVK.dylib" + # FIXME: https://github.com/NixOS/nixpkgs/issues/148189 + /usr/bin/codesign -s - -f "$out/lib/libMoltenVK.dylib" + install -m644 MoltenVK/icd/MoltenVK_icd.json "$out/share/vulkan/icd.d/MoltenVK_icd.json" + substituteInPlace $out/share/vulkan/icd.d/MoltenVK_icd.json \ + --replace ./libMoltenVK.dylib "$out/share/vulkan/icd.d/MoltenVK_icd.json" + ''; + + sandboxProfile = '' + (allow file-read* file-write* process-exec mach-lookup) + ; block homebrew dependencies + (deny file-read* file-write* process-exec mach-lookup (subpath "/usr/local") (with no-log)) + ''; + + meta = { + description = "A Vulkan Portability implementation built on top of Apple’s Metal API"; + homepage = "https://github.com/KhronosGroup/MoltenVK"; + changelog = "https://github.com/KhronosGroup/MoltenVK/releases"; + maintainers = [ lib.maintainers.reckenrode ]; + license = lib.licenses.asl20; + platforms = lib.platforms.darwin; + }; +} diff --git a/pkgs/os-specific/darwin/moltenvk/gitRevHeaderStability.patch b/pkgs/os-specific/darwin/moltenvk/gitRevHeaderStability.patch new file mode 100644 index 000000000000..e28b9ee70b6a --- /dev/null +++ b/pkgs/os-specific/darwin/moltenvk/gitRevHeaderStability.patch @@ -0,0 +1,14 @@ +diff --git a/Scripts/gen_moltenvk_rev_hdr.sh b/Scripts/gen_moltenvk_rev_hdr.sh +index c49ea4e6..9b7d13d1 100755 +--- a/Scripts/gen_moltenvk_rev_hdr.sh ++++ b/Scripts/gen_moltenvk_rev_hdr.sh +@@ -2,7 +2,7 @@ + + # Record the MoltenVK GIT revision as a derived header file suitable for including in a build + MVK_GIT_REV=$(git rev-parse HEAD) +-MVK_HDR_FILE="${BUILT_PRODUCTS_DIR}/mvkGitRevDerived.h" ++MVK_HDR_FILE="@@sourceRoot@@/outputs/include/mvkGitRevDerived.h" ++mkdir -p $(dirname ${MVK_HDR_FILE}) + echo "// Auto-generated by MoltenVK" > "${MVK_HDR_FILE}" + echo "static const char* mvkRevString = \"${MVK_GIT_REV}\";" >> "${MVK_HDR_FILE}" +- diff --git a/pkgs/os-specific/darwin/sketchybar/default.nix b/pkgs/os-specific/darwin/sketchybar/default.nix new file mode 100644 index 000000000000..be44db38fe14 --- /dev/null +++ b/pkgs/os-specific/darwin/sketchybar/default.nix @@ -0,0 +1,44 @@ +{ lib, stdenv, fetchFromGitHub, Carbon, Cocoa, SkyLight }: + +let + inherit (stdenv.hostPlatform) system; + target = { + "aarch64-darwin" = "arm"; + "x86_64-darwin" = "x86"; + }.${system} or (throw "Unsupported system: ${system}"); +in + +stdenv.mkDerivation rec { + pname = "sketchybar"; + version = "2.4.3"; + + src = fetchFromGitHub { + owner = "FelixKratz"; + repo = "SketchyBar"; + rev = "v${version}"; + sha256 = "1370xjl8sas5nghxgjxmc1zgskf28g40pv7nxgh37scjwdrkrrvb"; + }; + + buildInputs = [ Carbon Cocoa SkyLight ]; + + postPatch = '' + sed -i -e '/^#include /d' src/*.[ch] src/*/*.[ch] + ''; + + makeFlags = [ + target + ]; + + installPhase = '' + mkdir -p $out/bin + cp ./bin/sketchybar_${target} $out/bin/sketchybar + ''; + + meta = with lib; { + description = "A highly customizable macOS status bar replacement"; + homepage = "https://github.com/FelixKratz/SketchyBar"; + platforms = platforms.darwin; + maintainers = [ maintainers.azuwis ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index caeaed455f7e..d6e4b059088d 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -7,7 +7,7 @@ python.pkgs.buildPythonApplication rec { pname = "bcc"; - version = "0.23.0"; + version = "0.24.0"; disabled = !stdenv.isLinux; @@ -15,7 +15,7 @@ python.pkgs.buildPythonApplication rec { owner = "iovisor"; repo = "bcc"; rev = "v${version}"; - sha256 = "sha256-iLVUwJTDQ8Bn38sgHOcIR8TYxIB+gIlfTgr9+gPU0gE="; + sha256 = "sha256-5Nq6LmphiyiiIyru/P2rCCmA25cwJIWn08oK1+eM3cQ="; }; format = "other"; diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 64934724c25c..636803f29097 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.15.19"; + version = "5.15.24"; release = "1"; suffix = "xanmod${release}-tt"; in @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-4DChsTFWm/9X0iV9yhWZqOz7dxfNbok7cFLKAYKs+Dw="; + sha256 = "sha256-O3OadPMBl74IK92w7IPGfiePeo/Ox+bIVr4XmOmPYTg="; }; structuredExtraConfig = with lib.kernel; { diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index 81e86fe77efc..8e6b9fa0663a 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -12,20 +12,15 @@ with builtins; stdenv.mkDerivation rec { pname = "libbpf"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - sha256 = "sha256-/MLPflnfooe7Wjy8M3CTowAi5oYpscruSkDsaVzhmYQ="; + sha256 = "sha256-NFVJ8JquWVzu+QoaaOMzhnu6/IqdP1FPhtJFidXA4L4="; }; - patches = [(fetchpatch { - url = "https://github.com/libbpf/libbpf/pull/41.diff"; - sha256 = "sha256-pg5WARqh6z0nkTHMBhftxwdV2SyswC2lfaCXCpez0VA="; - })]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ libelf zlib ]; @@ -38,7 +33,7 @@ stdenv.mkDerivation rec { postInstall = '' # install linux's libbpf-compatible linux/btf.h - install -Dm444 include/uapi/linux/btf.h -t $out/include/linux + install -Dm444 include/uapi/linux/*.h -t $out/include/linux ''; # FIXME: Multi-output requires some fixes to the way the pkg-config file is diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 3f58b0a536b3..145265017855 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -19,10 +19,10 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "510.47.03"; - sha256_64bit = "8qQh2ug2MY08DZZFnMs68n6Q5QyVsPqkKIr3Ynnl1pA="; - settingsSha256 = "lQRh8dG4NW2vLe4R6xx42BzAu3R6iLyrk3GOGKLfufQ="; - persistencedSha256 = "I8pIdBhbX9rfyhjQHGD5zjCwLF2zl2jc1Id+CTbSHKc="; + version = "510.54"; + sha256_64bit = "TCDezK4/40et/Q5piaMG+QJP2t+DGtwejmCFVnUzUWE="; + settingsSha256 = "ZWz5UN6Pa69NlmerKu30G+X8WfGlAwnVerDrO7TRO6w="; + persistencedSha256 = "MgWrBjKXJeRqF+ouT72tTiLPtn+lsS/Cp3oS61AWV8Q="; } else legacy_390; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index bdf0ed345bba..9da182daf3bb 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -613,7 +613,7 @@ "ondilo_ico" = ps: with ps; [ aiohttp-cors ondilo ]; "onewire" = ps: with ps; [ pi1wire pyownet ]; "onkyo" = ps: with ps; [ onkyo-eiscp ]; - "onvif" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: WSDiscovery onvif-zeep-async + "onvif" = ps: with ps; [ wsdiscovery ha-ffmpeg onvif-zeep-async ]; "open_meteo" = ps: with ps; [ open-meteo ]; "openalpr_cloud" = ps: with ps; [ ]; "openalpr_local" = ps: with ps; [ ]; @@ -636,7 +636,7 @@ "orvibo" = ps: with ps; [ orvibo ]; "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify "otp" = ps: with ps; [ pyotp ]; - "overkiz" = ps: with ps; [ ]; # missing inputs: pyoverkiz + "overkiz" = ps: with ps; [ pyoverkiz ]; "ovo_energy" = ps: with ps; [ ovoenergy ]; "owntracks" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors hass-nabucasa paho-mqtt ]; "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt python-openzwave-mqtt ]; @@ -1388,6 +1388,7 @@ "oncue" "ondilo_ico" "onewire" + "onvif" "open_meteo" "openalpr_cloud" "openalpr_local" @@ -1398,6 +1399,7 @@ "openuv" "openweathermap" "opnsense" + "overkiz" "ovo_energy" "owntracks" "ozw" diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index a56ef8c835e6..92f6d1f15ac7 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - sha256 = "sha256-vMRmxu1TNCw5c+PuSdAPdMJpZGLdcCTzpTNz/AFrWi8="; + sha256 = "lBAnMrU292URrZIxPvPIAO50GAFvvZHfUjKMYxZwGb8="; }; buildInputs = [ olm ]; - vendorSha256 = "sha256-bvbZ7Tnd6s6zr9trN4egR/9KV5cU09mQI+U1UxyYzlE="; + vendorSha256 = "KiNABUZ92gYprTdNAKKMjygr0BzQGVYVPRPMxvYi1VQ="; doCheck = false; diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 990ef950e6bd..814626fec125 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.41.5"; + version = "0.42.1"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "sha256-DH1xy1cTVDNNXyOIaayGHzOi4g0ZukNFFbZjufY+XLk="; + hash = "sha256-PmcVVAS/5mDhmOSoFvkZeYkbvFD/KOcgVYuScwD4Olg="; }; nativeBuildInputs = [ makeWrapper ]; @@ -14,13 +14,15 @@ stdenv.mkDerivation rec { dontUnpack = true; installPhase = '' + runHook preInstall makeWrapper ${jdk11}/bin/java $out/bin/metabase --add-flags "-jar $src" + runHook postInstall ''; meta = with lib; { description = "The easy, open source way for everyone in your company to ask questions and learn from data"; homepage = "https://metabase.com"; - license = licenses.agpl3; + license = licenses.agpl3Only; platforms = platforms.all; maintainers = with maintainers; [ schneefux thoughtpolice mmahut ]; }; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 1b8b1eb1108f..dfaf64380a91 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -5,7 +5,7 @@ , curl, libiconv, ncurses, openssl, pcre, pcre2 , libkrb5, libaio, liburing, systemd , CoreServices, cctools, perl -, jemalloc, less +, jemalloc, less, libedit # Server components , bzip2, lz4, lzo, snappy, xz, zlib, zstd , cracklib, judy, libevent, libxml2 @@ -15,7 +15,7 @@ , withStorageRocks ? true }: -let # in mariadb # spans the whole file +let libExt = stdenv.hostPlatform.extensions.sharedLibrary; @@ -43,7 +43,7 @@ commonOptions = packageSettings: rec { # attributes common to both builds ] ++ (packageSettings.extraBuildInputs or []) ++ lib.optionals stdenv.hostPlatform.isLinux ([ libkrb5 systemd ] ++ (if (lib.versionOlder version "10.6") then [ libaio ] else [ liburing ])) - ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl libedit ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) [ jemalloc ] ++ (if (lib.versionOlder version "10.5") then [ pcre ] else [ pcre2 ]); diff --git a/pkgs/tools/audio/mpd-discord-rpc/default.nix b/pkgs/tools/audio/mpd-discord-rpc/default.nix new file mode 100644 index 000000000000..9b8fc94d2edc --- /dev/null +++ b/pkgs/tools/audio/mpd-discord-rpc/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "mpd-discord-rpc"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "JakeStanger"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-FkdndkXj48JLKRwZ9lLVQrGU7QvBZvYC9Y2iYS0RiCY="; + }; + + cargoSha256 = "sha256-w6Usc86yn7mq/wxljSpko/JPnLHmkyeILKa31YsQrFg="; + + meta = with lib; { + description = "Rust application which displays your currently playing song / album / artist from MPD in Discord using Rich Presence"; + homepage = "https://github.com/JakeStanger/mpd-discord-rpc"; + license = licenses.mit; + maintainers = with maintainers; [ kranzes ]; + }; +} diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix index 1b151ece3d95..e55823e59ae4 100644 --- a/pkgs/tools/backup/tarsnap/default.nix +++ b/pkgs/tools/backup/tarsnap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, zlib, e2fsprogs }: +{ lib, stdenv, fetchurl, openssl, zlib, e2fsprogs, bash }: let zshCompletion = fetchurl { @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "tarsnap"; - version = "1.0.39"; + version = "1.0.40"; src = fetchurl { url = "https://www.tarsnap.com/download/tarsnap-autoconf-${version}.tgz"; - sha256 = "10i0whbmb345l2ggnf4vs66qjcyf6hmlr8f4nqqcfq0h5a5j24sn"; + sha256 = "1mbzq81l4my5wdhyxyma04sblr43m8p7ryycbpi6n78w1hwfbjmw"; }; preConfigure = '' @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace Makefile.in \ --replace "command -p mv" "mv" + substituteInPlace configure \ + --replace "command -p getconf PATH" "echo $PATH" ''; postInstall = '' diff --git a/pkgs/tools/misc/clickclack/default.nix b/pkgs/tools/misc/clickclack/default.nix index 0bcea9a2e8ea..c7e1cbee79a5 100644 --- a/pkgs/tools/misc/clickclack/default.nix +++ b/pkgs/tools/misc/clickclack/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "clickclack"; - version = "0.2"; + version = "0.2.2"; src = fetchFromSourcehut { owner = "~proycon"; repo = "clickclack"; rev = version; - sha256 = "sha256-hldtHSRdw6yP9lUFna5yvJ3mOTbQbbQNnGM7fMQmmtM="; + hash = "sha256-ABVfJRSzbQ6jIpON2g2wS52QsyNQVfW6+AhTvjkkf6s="; }; buildInputs = [ diff --git a/pkgs/tools/networking/oapi-codegen/default.nix b/pkgs/tools/networking/oapi-codegen/default.nix index 163341d06466..84327c8f5eef 100644 --- a/pkgs/tools/networking/oapi-codegen/default.nix +++ b/pkgs/tools/networking/oapi-codegen/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oapi-codegen"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "deepmap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pGkTCOQ2OR/9c5+L9UgESJjSMmz9FjfJw9NB8Nr6gRQ="; + sha256 = "sha256-Po0HCAK9h1GWSfKzV+1j3ddikCNIULbywx501GvRT/Q="; }; - vendorSha256 = "sha256-hvY64cmfvEeHniscD1WDyaeFpWeBJwsDNwr76e9F6ow="; + vendorSha256 = "sha256-GSNNOWhWpXRJEIzLoBci25sp9pu0W1mS18G8eFOsfhw="; # Tests use network doCheck = false; diff --git a/pkgs/tools/nix/alejandra/default.nix b/pkgs/tools/nix/alejandra/default.nix index 9135e8e14161..6eaa9f9c43cf 100644 --- a/pkgs/tools/nix/alejandra/default.nix +++ b/pkgs/tools/nix/alejandra/default.nix @@ -1,20 +1,22 @@ { lib , rustPlatform , fetchFromGitHub +, testVersion +, alejandra }: rustPlatform.buildRustPackage rec { pname = "alejandra"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "kamadorueda"; repo = "alejandra"; rev = version; - hash = "sha256-jj66PRqXASDNzdidkdfF2ezWM45Pw9Z+G4YNe8HRPhU="; + sha256 = "sha256-bM+z3s7oG0+8P7TVmyw7NW3eavN109zgsw9exUSQCaQ="; }; - cargoSha256 = "sha256-701lWa/2u10vCSRplL1ebYz29DxjpHY0SqjSWme1X1U="; + cargoSha256 = "sha256-GxQxyUyrDKTf+7cye0Ob/le06GnAI+FMGCUB5dts+k0="; meta = with lib; { description = "The Uncompromising Nix Code Formatter"; @@ -22,4 +24,8 @@ rustPlatform.buildRustPackage rec { license = licenses.unlicense; maintainers = with maintainers; [ _0x4A6F kamadorueda ]; }; + + passthru.tests = { + version = testVersion { package = alejandra; }; + }; } diff --git a/pkgs/tools/security/dnsx/default.nix b/pkgs/tools/security/dnsx/default.nix index 5b4f0a5da146..9ba91d186530 100644 --- a/pkgs/tools/security/dnsx/default.nix +++ b/pkgs/tools/security/dnsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dnsx"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "dnsx"; rev = "v${version}"; - sha256 = "sha256-92J9yRTSk2EP3lXCWH1+Ha+dx3dTNur6LIDMKbGmseI="; + sha256 = "sha256-+ZLnQtN5MnWnOpLHkaZMhhsFWgGhnhalkXLakJf1wKU="; }; - vendorSha256 = "sha256-692PcWFYNInWcZm9NQHLQmRHGFV9XUSFoCqHo7fcGEU="; + vendorSha256 = "sha256-RtYAggUWQ8b2qf5ly7BSRc+8npbLiWdM4h0Krdp4Py4="; meta = with lib; { description = "Fast and multi-purpose DNS toolkit"; diff --git a/pkgs/tools/security/libtpms/default.nix b/pkgs/tools/security/libtpms/default.nix index b49ce7305deb..d93f0135c20a 100644 --- a/pkgs/tools/security/libtpms/default.nix +++ b/pkgs/tools/security/libtpms/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libtpms"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "stefanberger"; repo = "libtpms"; rev = "v${version}"; - sha256 = "sha256-30P/YggrPEVpsh2qo751aW6RtrpIVe1XQWyYZm8P4yA="; + sha256 = "sha256-sfAmyx9MgzCVA1Da7hl6/sKxhS9ptaNLeSB8wmJIKDs="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/solo2-cli/default.nix b/pkgs/tools/security/solo2-cli/default.nix index e3518799504e..eaa2bc659a56 100644 --- a/pkgs/tools/security/solo2-cli/default.nix +++ b/pkgs/tools/security/solo2-cli/default.nix @@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.isDarwin [ PCSC IOKit CoreFoundation AppKit ]; postInstall = '' + install -D 70-solo2.rules $out/lib/udev/rules.d/70-solo2.rules installShellCompletion target/*/release/solo2.{bash,fish,zsh} ''; diff --git a/pkgs/tools/virtualization/shipyard/default.nix b/pkgs/tools/virtualization/shipyard/default.nix index 6994cc25b384..7407c3dc68ab 100644 --- a/pkgs/tools/virtualization/shipyard/default.nix +++ b/pkgs/tools/virtualization/shipyard/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "shipyard"; - version = "0.3.30"; + version = "0.3.44"; src = fetchFromGitHub { rev = "v${version}"; owner = "shipyard-run"; repo = pname; - sha256 = "sha256-NaCG0oG9j1yoXOsfnQXFd+PdZfJTOdvYndFIftIAnxE="; + sha256 = "sha256-ShL/j0vyKfbNcq/cAgEUCln6T7UE/qmPZOMw129210o="; }; - vendorSha256 = "sha256-YClNdtnakJJOEytTbopTXeZy218N4vHP3tQLavLgPbg="; + vendorSha256 = "sha256-mXYnmDppVqhjlkGVkvp1YaEwBEkHBUddxLof389huMQ="; ldflags = [ "-s" "-w" "-X main.version=${version}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0176033cf62a..5e11fca40bf1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -347,6 +347,10 @@ with pkgs; buildcatrust = with python3.pkgs; toPythonApplication buildcatrust; + probe-rs-cli = callPackage ../development/tools/rust/probe-rs-cli { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; + probe-run = callPackage ../development/tools/rust/probe-run { inherit (darwin.apple_sdk.frameworks) AppKit IOKit; }; @@ -3502,6 +3506,8 @@ with pkgs; mpdris2 = callPackage ../tools/audio/mpdris2 { }; + mpd-discord-rpc = callPackage ../tools/audio/mpd-discord-rpc { }; + mpd-mpris = callPackage ../tools/audio/mpd-mpris { }; mpris-scrobbler = callPackage ../tools/audio/mpris-scrobbler { }; @@ -9389,6 +9395,10 @@ with pkgs; rnnoise-plugin = callPackage ../development/libraries/rnnoise-plugin {}; + rnote = callPackage ../applications/graphics/rnote { + inherit (gst_all_1) gstreamer; + }; + rnp = callPackage ../tools/security/rnp { }; rnv = callPackage ../tools/text/xml/rnv { }; @@ -9755,6 +9765,10 @@ with pkgs; sixpair = callPackage ../tools/misc/sixpair {}; + sketchybar = callPackage ../os-specific/darwin/sketchybar { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa SkyLight; + }; + skippy-xd = callPackage ../tools/X11/skippy-xd {}; sks = callPackage ../servers/sks { }; @@ -12537,8 +12551,8 @@ with pkgs; hugs = callPackage ../development/interpreters/hugs { }; - inherit (javaPackages) openjfx11 openjfx15; - openjfx = openjfx15; + inherit (javaPackages) openjfx11 openjfx15 openjfx17; + openjfx = openjfx17; openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap; openjdk8 = javaPackages.compiler.openjdk8; @@ -12635,7 +12649,20 @@ with pkgs; julia_10 = callPackage ../development/compilers/julia/1.0.nix { gmp = gmp6; inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; - libgit2 = libgit2_0_27; + libgit2 = libgit2.overrideAttrs (_: rec { + version = "0.27.10"; + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + sha256 = "09jz2fzv0zl5058s0g1cpnw87a2rgg8wnjwlygi18i2n9nn6m0ad"; + }; + patches = []; + meta.knownVulnerabilities = [ + "CVE-2020-12278" + "CVE-2020-12279" + ]; + }); }; julia_15 = callPackage ../development/compilers/julia/1.5.nix { @@ -15703,7 +15730,9 @@ with pkgs; ttyd = callPackage ../servers/ttyd { }; - turbogit = callPackage ../development/tools/turbogit { }; + turbogit = callPackage ../development/tools/turbogit { + libgit2 = libgit2_1_3_0; + }; tweak = callPackage ../applications/editors/tweak { }; @@ -16714,32 +16743,19 @@ with pkgs; icon-lang = callPackage ../development/interpreters/icon-lang { }; - libgit2 = callPackage ../development/libraries/git2 { + libgit2 = callPackage ../development/libraries/libgit2 { inherit (darwin.apple_sdk.frameworks) Security; }; - libgit2_0_27 = libgit2.overrideAttrs (_: rec { - version = "0.27.10"; - src = fetchFromGitHub { + libgit2_1_3_0 = libgit2.overrideAttrs (_: rec { + version = "1.3.0"; + src = pkgs.fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "09jz2fzv0zl5058s0g1cpnw87a2rgg8wnjwlygi18i2n9nn6m0ad"; - }; - meta.knownVulnerabilities = [ - "CVE-2020-12278" - "CVE-2020-12279" - ]; - }); - - libgit2_1_1 = libgit2.overrideAttrs (_: rec { - version = "1.1.1"; - src = fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "v${version}"; - sha256 = "sha256-SxceIxT0aeiiiZCeSIe6EOa+MyVpQVaiv/ZZn6fkwIc="; + sha256 = "sha256-7atNkOBzX+nU1gtFQEaE+EF1L+eex+Ajhq2ocoJY920="; }; + patches = []; }); libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; @@ -20396,7 +20412,7 @@ with pkgs; vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { }; vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; - vulkan-loader = callPackage ../development/libraries/vulkan-loader { }; + vulkan-loader = callPackage ../development/libraries/vulkan-loader { inherit (darwin) moltenvk; }; vulkan-tools = callPackage ../tools/graphics/vulkan-tools { }; vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { }; vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { }; @@ -25707,9 +25723,7 @@ with pkgs; }; firefox-bin = wrapFirefox firefox-bin-unwrapped { - applicationName = "firefox"; pname = "firefox-bin"; - desktopName = "Firefox"; }; firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override { @@ -25719,7 +25733,6 @@ with pkgs; }; firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { - applicationName = "firefox"; pname = "firefox-beta-bin"; desktopName = "Firefox Beta"; }; @@ -25731,7 +25744,6 @@ with pkgs; }; firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { - applicationName = "firefox"; nameSuffix = "-devedition"; pname = "firefox-devedition-bin"; desktopName = "Firefox DevEdition"; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index ff23949ae4fa..d6ee88bc4f5e 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -148,6 +148,8 @@ impure-cmds // appleSourcePackages // chooseLibs // { lsusb = callPackage ../os-specific/darwin/lsusb { }; + moltenvk = callPackage ../os-specific/darwin/moltenvk { }; + opencflite = callPackage ../os-specific/darwin/opencflite { }; stubs = pkgs.callPackages ../os-specific/darwin/stubs { }; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index cf6474f0da5b..c8d9e85fbd77 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -8,9 +8,10 @@ let openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; openjfx15 = callPackage ../development/compilers/openjdk/openjfx/15.nix { }; + openjfx17 = callPackage ../development/compilers/openjdk/openjfx/17.nix { }; in { - inherit mavenbuild fetchMaven openjfx11 openjfx15; + inherit mavenbuild fetchMaven openjfx11 openjfx15 openjfx17; compiler = let @@ -170,7 +171,7 @@ in { ../development/compilers/openjdk/darwin/17.nix { inherit openjdk17-bootstrap; - openjfx = openjfx15; + openjfx = openjfx17; }; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 23a714597eec..fa713e8eaf0a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16715,12 +16715,12 @@ let NetSSLeay = buildPerlPackage { pname = "Net-SSLeay"; - version = "1.88"; + version = "1.92"; src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHRISN/Net-SSLeay-1.88.tar.gz"; - sha256 = "1pfgh4h3szcpvqlcimc60pjbk9zwls99x5863sva0wc47i4dl010"; + url = "mirror://cpan/authors/id/C/CH/CHRISN/Net-SSLeay-1.92.tar.gz"; + sha256 = "sha256-R8LyswDy5xYtcdaZ9jPdajWwYloAy9qMUKwBFEqTlqk="; }; - buildInputs = [ pkgs.openssl ]; + buildInputs = [ pkgs.openssl pkgs.zlib ]; doCheck = false; # Test performs network access. preConfigure = '' mkdir openssl diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 65704adecf1a..48a406b15909 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5645,6 +5645,8 @@ in { onnx = callPackage ../development/python-modules/onnx { }; + onvif-zeep-async = callPackage ../development/python-modules/onvif-zeep-async { }; + oocsi = callPackage ../development/python-modules/oocsi { }; open-garage = callPackage ../development/python-modules/open-garage { }; @@ -6082,6 +6084,8 @@ in { pipdate = callPackage ../development/python-modules/pipdate { }; + pipenv-poetry-migrate = callPackage ../development/python-modules/pipenv-poetry-migrate { }; + pip-tools = callPackage ../development/python-modules/pip-tools { }; pipx = callPackage ../development/python-modules/pipx { }; @@ -6149,6 +6153,8 @@ in { pynx584 = callPackage ../development/python-modules/pynx584 { }; + pyoverkiz = callPackage ../development/python-modules/pyoverkiz { }; + pyownet = callPackage ../development/python-modules/pyownet { }; pypoint = callPackage ../development/python-modules/pypoint { }; @@ -6910,7 +6916,9 @@ in { pygetwindow = callPackage ../development/python-modules/pygetwindow { }; - pygit2 = callPackage ../development/python-modules/pygit2 { }; + pygit2 = callPackage ../development/python-modules/pygit2 { + libgit2 = pkgs.libgit2_1_3_0; + }; PyGithub = callPackage ../development/python-modules/pyGithub { }; @@ -10565,6 +10573,8 @@ in { ws4py = callPackage ../development/python-modules/ws4py { }; + wsdiscovery = callPackage ../development/python-modules/wsdiscovery { }; + wsgi-intercept = callPackage ../development/python-modules/wsgi-intercept { }; wsgiprox = callPackage ../development/python-modules/wsgiprox { };