diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7f3335b74d09..0e6570805996 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17212,6 +17212,13 @@ github = "NiklasVousten"; githubId = 24965952; }; + nikolaiser = { + name = "Nikolai Sergeev"; + email = "mail@nikolaiser.com"; + githubId = 5569482; + github = "nikolaiser"; + keys = [ { fingerprint = "FF23 8141 F4E9 1896 6162 F0CD 980B 9E9C 5686 F13A"; } ]; + }; nikolaizombie1 = { name = "Fabio J. Matos Nieves"; email = "fabio.matos999@gmail.com"; @@ -19404,6 +19411,18 @@ } ]; }; + prince213 = { + name = "Sizhe Zhao"; + email = "prc.zhao@outlook.com"; + matrix = "@prince213:matrix.org"; + github = "Prince213"; + githubId = 25235514; + keys = [ + { + fingerprint = "2589 45E5 C556 7B4D B36C 3E28 A64B 5235 356E 16D1"; + } + ]; + }; princemachiavelli = { name = "Josh Hoffer"; email = "jhoffer@sansorgan.es"; diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix deleted file mode 100644 index 5a398a4af5dd..000000000000 --- a/pkgs/applications/editors/sigil/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, - makeWrapper, - boost, - xercesc, - qtbase, - qttools, - qtwebengine, - qtsvg, - python3Packages, -}: - -stdenv.mkDerivation rec { - pname = "sigil"; - version = "2.4.2"; - - src = fetchFromGitHub { - repo = "Sigil"; - owner = "Sigil-Ebook"; - tag = version; - hash = "sha256-/lnSNamLkPLG8tn0w8F0zFyypMUXyMhgxA2WyQFegKw="; - }; - - pythonPath = with python3Packages; [ lxml ]; - - nativeBuildInputs = [ - cmake - pkg-config - makeWrapper - ]; - - buildInputs = [ - boost - xercesc - qtbase - qttools - qtwebengine - qtsvg - python3Packages.lxml - ]; - - prePatch = '' - sed -i '/^QTLIB_DIR=/ d' src/Resource_Files/bash/sigil-sh_install - ''; - - dontWrapQtApps = true; - - preFixup = '' - wrapProgram "$out/bin/sigil" \ - --prefix PYTHONPATH : $PYTHONPATH \ - ''${qtWrapperArgs[@]} - ''; - - meta = { - description = "Free, open source, multi-platform ebook (ePub) editor"; - homepage = "https://github.com/Sigil-Ebook/Sigil/"; - license = lib.licenses.gpl3; - # currently unmaintained - platforms = lib.platforms.linux; - mainProgram = "sigil"; - }; -} diff --git a/pkgs/applications/misc/kemai/default.nix b/pkgs/applications/misc/kemai/default.nix index 3c80d820a129..4a26b3b8a74c 100644 --- a/pkgs/applications/misc/kemai/default.nix +++ b/pkgs/applications/misc/kemai/default.nix @@ -2,55 +2,62 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, - cmake, + + # buildInputs + libXScrnSaver, magic-enum, - range-v3, - spdlog, + + # nativeBuildInputs qtbase, qtconnectivity, - qttools, qtlanguageserver, + qttools, + range-v3, + spdlog, qtwayland, + + # nativeBuildInputs + cmake, wrapQtAppsHook, - libXScrnSaver, + + # passthru nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kemai"; - version = "0.10.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "AlexandrePTJ"; repo = "kemai"; - rev = version; - hash = "sha256-wclBAgeDyAIw/nGF6lzIwbwdoZMBTu+tjxsnIxIkODM="; + tag = finalAttrs.version; + hash = "sha256-2Cyrd0fKaEHkDaKF8lFwuoLvl6553rp3ET2xLUUrTnk="; }; - patches = [ - # Backport the fix for an issue where LICENSE.txt ends up in /bin - # Remove in next release - (fetchpatch { - url = "https://github.com/AlexandrePTJ/kemai/commit/e279679dd7308efebe004252d168d7308f3b99ce.patch"; - hash = "sha256-5cmRRMVATf4ul4HhaQKiE0yTN2qd+MfNFQzGTLLpOyg="; - }) - ]; + postPatch = '' + substituteInPlace \ + src/client/parser.cpp \ + src/client/kimaiCache.cpp \ + --replace-fail \ + "#include " \ + "#include " + ''; buildInputs = [ - qtbase - qtconnectivity - qttools - qtlanguageserver libXScrnSaver magic-enum + qtbase + qtconnectivity + qtlanguageserver + qttools range-v3 spdlog ] ++ lib.optional stdenv.hostPlatform.isLinux qtwayland; + cmakeFlags = [ - "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" - "-DFETCHCONTENT_QUIET=OFF" - "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS" + (lib.cmakeBool "KEMAI_ENABLE_UPDATE_CHECK" false) + (lib.cmakeBool "KEMAI_BUILD_LOCAL_DEPENDENCIES" false) ]; nativeBuildInputs = [ @@ -62,13 +69,14 @@ stdenv.mkDerivation rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Kimai desktop client written in QT6"; homepage = "https://github.com/AlexandrePTJ/kemai"; - license = licenses.mit; - maintainers = with maintainers; [ poelzi ]; - platforms = platforms.unix; - broken = stdenv.hostPlatform.isDarwin; + changelog = "https://github.com/AlexandrePTJ/kemai/blob/${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ poelzi ]; + platforms = lib.platforms.unix; + badPlatforms = [ lib.systems.inspect.patterns.isDarwin ]; mainProgram = "Kemai"; }; -} +}) diff --git a/pkgs/by-name/ad/adw-gtk3/package.nix b/pkgs/by-name/ad/adw-gtk3/package.nix index d4fe6e32ee4e..d8f25e1a80ab 100644 --- a/pkgs/by-name/ad/adw-gtk3/package.nix +++ b/pkgs/by-name/ad/adw-gtk3/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "adw-gtk3"; - version = "5.7"; + version = "5.8"; src = fetchFromGitHub { owner = "lassekongo83"; repo = "adw-gtk3"; tag = "v${finalAttrs.version}"; - hash = "sha256-10NxXNbKQt39c5R+mgcvzjyZO7Z/lcVi+vArH+K35k8="; + hash = "sha256-Z/A2vn/P0EWoihYHFk+ELsxffzA8ypxv61ZURCSC/W0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/al/alejandra/package.nix b/pkgs/by-name/al/alejandra/package.nix index 0c39e55ecce1..d694755d2de5 100644 --- a/pkgs/by-name/al/alejandra/package.nix +++ b/pkgs/by-name/al/alejandra/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "alejandra"; - version = "3.1.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "kamadorueda"; repo = "alejandra"; rev = version; - hash = "sha256-g0SSfTWZ5mtMOpQic+eqq9sXMy1E/7yKxxfupZd9V4A="; + hash = "sha256-Oi1n2ncF4/AWeY6X55o2FddIRICokbciqFYK64XorYk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-17HoU0GcJlTP254RqFX4gZxEflwJGSbBULA/rg0paUc="; + cargoHash = "sha256-IX4xp8llB7USpS/SSQ9L8+17hQk5nkXFP8NgFKVLqKU="; passthru.tests = { version = testers.testVersion { package = alejandra; }; diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix index 8347e677dced..5aa617445dd0 100644 --- a/pkgs/by-name/au/automatic-timezoned/package.nix +++ b/pkgs/by-name/au/automatic-timezoned/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.67"; + version = "2.0.72"; src = fetchFromGitHub { owner = "maxbrunet"; repo = "automatic-timezoned"; rev = "v${version}"; - sha256 = "sha256-j7wQ7jUiXpiDdGBDSiGkIcnnrwkJZESiwB4yqxp0moU="; + sha256 = "sha256-q4Z4NcgHWcl+w7+7e1QWwGsxrQVbyHGUuJxWfzEm5bM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-AIZnpE9ULyZnKNOtpoTP1VQYXMAxEuDiHWdEJGiGo5Q="; + cargoHash = "sha256-lTn4UCBuGc0eJ5CgRdpDSGmPxzRQ4wHQ1oseKRjRKR8="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/by-name/bp/bpftrace/package.nix b/pkgs/by-name/bp/bpftrace/package.nix index 705e28a646bf..b7eea6280cc1 100644 --- a/pkgs/by-name/bp/bpftrace/package.nix +++ b/pkgs/by-name/bp/bpftrace/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.23.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "bpftrace"; repo = "bpftrace"; rev = "v${version}"; - hash = "sha256-OAT8nw5fFhKINK8Jy+RJXSvfU40G4fpR/5J1GPoyewY="; + hash = "sha256-5pNQuz2ffsixu4AMrw0lth5dHavO6I9Ew3ePOhtUiDE="; }; buildInputs = with llvmPackages; [ diff --git a/pkgs/by-name/ca/cargo-mobile2/package.nix b/pkgs/by-name/ca/cargo-mobile2/package.nix index c03a5b7045d3..89cd6327686f 100644 --- a/pkgs/by-name/ca/cargo-mobile2/package.nix +++ b/pkgs/by-name/ca/cargo-mobile2/package.nix @@ -13,7 +13,7 @@ let inherit (darwin.apple_sdk.frameworks) CoreServices; pname = "cargo-mobile2"; - version = "0.17.5"; + version = "0.17.6"; in rustPlatform.buildRustPackage { inherit pname version; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { owner = "tauri-apps"; repo = pname; rev = "cargo-mobile2-v${version}"; - hash = "sha256-eaKj2S1qiG6qQd7yG4RrK/a+1IsgBybodSTfERDvGE4="; + hash = "sha256-kIy5Ic7Zk6twcEbZN/wRLwMK0XeMF0lNkFDIc2vO944="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { # sourceRoot = "${src.name}/tooling/cli"; useFetchCargoVendor = true; - cargoHash = "sha256-IW/2Xp52TlqYtvXZqSDv9/Uv9B/thM360ecbbWLXPNE="; + cargoHash = "sha256-An9EuNv+6ttNKp50RutzxtHl/RS5gn9sUNlWtipAujk="; preBuild = '' mkdir -p $out/share/ diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index ca8ba21bae81..4f0b282a7982 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -14,13 +14,13 @@ }: let pname = "clash-verge-rev"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "clash-verge-rev"; repo = "clash-verge-rev"; tag = "v${version}"; - hash = "sha256-CiVwFSCbCxFm8naogpL73gUp8HNHwcIiygSVon4WNZk="; + hash = "sha256-MJD1FWh/43pOffdWznCVPyGVXcIyqhXzmoEmyM8Tspg="; }; src-service = fetchFromGitHub { @@ -32,7 +32,7 @@ let service-cargo-hash = "sha256-lMOQznPlkHIMSm5nOLuGP9qJXt3CXnd+q8nCu+Xbbt8="; npm-hash = "sha256-v9+1NjXo/1ogmep+4IP+9qoUR1GJz87VGeOoMzQ1Rfw="; - vendor-hash = "sha256-nU3bIxD5zggTScNGH3HmnnXUGkLMwnQbIBVI1DmIpFs="; + vendor-hash = "sha256-y3XVHi00mnuVFxSd02YBgfWuXYRVIs+e0tITXNOFRsA="; service = callPackage ./service.nix { inherit diff --git a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix index bf0cae5f8eaf..b0018e8b18e6 100644 --- a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix +++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix @@ -4,7 +4,6 @@ src, libayatana-appindicator, vendor-hash, - fetchpatch, glib, webui, pkg-config, @@ -16,6 +15,7 @@ meta, webkitgtk_4_1, openssl, + jq, }: rustPlatform.buildRustPackage { @@ -30,20 +30,7 @@ rustPlatform.buildRustPackage { OPENSSL_NO_VENDOR = 1; }; - patches = [ - (fetchpatch { - name = "fix-service-mode-mihomo-check.patch"; - url = "https://github.com/clash-verge-rev/clash-verge-rev/commit/16d4f9fe7ee95b7312a10bf216c818c3e144dea7.patch"; - hash = "sha256-FQHm1jjo0W1IokMDJGWVMVV9DWItG1prX+TIysL12DA="; - }) - ]; - - prePatch = '' - cd .. - ''; - postPatch = '' - cd src-tauri substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" @@ -54,11 +41,10 @@ rustPlatform.buildRustPackage { --replace-fail '"kwriteconfig5"' '"${libsForQt5.kconfig}/bin/kwriteconfig5"' \ --replace-fail '"kwriteconfig6"' '"${kdePackages.kconfig}/bin/kwriteconfig6"' - substituteInPlace ./tauri.conf.json \ - --replace-fail '"frontendDist": "../dist",' '"frontendDist": "${webui}",' \ - --replace-fail '"beforeBuildCommand": "pnpm run web:build"' '"beforeBuildCommand": ""' - sed -i -e '/externalBin/d' -e '/resources/d' tauri.conf.json - sed -i -e '/sidecar/d' -e '/resources/d' tauri.linux.conf.json + cat tauri.conf.json | jq 'del(.bundle.resources) | del(.bundle.externalBin) | .build.frontendDist = "${webui}" | .build.beforeBuildCommand = ""' > tauri.conf.json.2 + mv tauri.conf.json.2 tauri.conf.json + cat tauri.linux.conf.json | jq 'del(.bundle.externalBin)' > tauri.linux.conf.json.2 + mv tauri.linux.conf.json.2 tauri.linux.conf.json chmod 777 ../.cargo rm ../.cargo/config.toml ''; @@ -66,6 +52,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config rustPlatform.cargoSetupHook + jq ]; buildInputs = [ diff --git a/pkgs/by-name/co/coroot-node-agent/package.nix b/pkgs/by-name/co/coroot-node-agent/package.nix index b6ff5c566804..cb8f3ec9840f 100644 --- a/pkgs/by-name/co/coroot-node-agent/package.nix +++ b/pkgs/by-name/co/coroot-node-agent/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "coroot-node-agent"; - version = "1.23.15"; + version = "1.23.16"; src = fetchFromGitHub { owner = "coroot"; repo = "coroot-node-agent"; rev = "v${version}"; - hash = "sha256-3rr8LWaEhhAvzJisVj2uLK3O5us5/XEOpl7RFL2GBxw="; + hash = "sha256-gd43AL8fnRU7zvQj5GEqX5sbX8JxISXdNfKbzx1eJuE="; }; - vendorHash = "sha256-SxyIlyDHuu8Ls1+/rujWE9elZiTfSYWIrV8vP5xsqTU="; + vendorHash = "sha256-czrw7KnBRdoY/SuiZznhViUN9C+BYjH8difcQPFIHU8="; buildInputs = [ systemdLibs ]; diff --git a/pkgs/by-name/de/delve/package.nix b/pkgs/by-name/de/delve/package.nix index 686df217888b..6b7e51b078e9 100644 --- a/pkgs/by-name/de/delve/package.nix +++ b/pkgs/by-name/de/delve/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "delve"; - version = "1.24.1"; + version = "1.24.2"; src = fetchFromGitHub { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - hash = "sha256-QAFCJ5oQYHDXrNLptRdAWzzbX6J9XVgnmsB3eZ3Lko8="; + hash = "sha256-BFezzZpkF88xYsOcn3pI2zsH+OTRLvuwqa3CaU9Fk44="; }; vendorHash = null; diff --git a/pkgs/by-name/es/espup/package.nix b/pkgs/by-name/es/espup/package.nix index cc0916d2f808..94a47fd236b0 100644 --- a/pkgs/by-name/es/espup/package.nix +++ b/pkgs/by-name/es/espup/package.nix @@ -11,23 +11,22 @@ stdenv, darwin, testers, - espup, - gitUpdater, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "espup"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "esp-rs"; repo = "espup"; - rev = "v${version}"; - hash = "sha256-sPWGpQi9JrkdaPV2jvwaY9zjb8urK+ibhvxw/CC2UOQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-1muyZd7jhhDkif/8mX7QZEMnV105jNMHT0RaZPinD/4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-k6hczvuEvutUWOrKYFUltA0ZD+AHa8E0+5YW1+0TKQA="; + cargoHash = "sha256-fX6nl0DZZNiH/VWR9eWMnTuBW9r1jz3IWIxbOGC4Amg="; nativeBuildInputs = [ pkg-config @@ -68,22 +67,24 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/espup completions zsh) ''; - passthru.updateScript = gitUpdater { }; - passthru.tests.version = testers.testVersion { - package = espup; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; }; - meta = with lib; { + meta = { description = "Tool for installing and maintaining Espressif Rust ecosystem"; homepage = "https://github.com/esp-rs/espup/"; - license = with licenses; [ + license = with lib.licenses; [ mit asl20 ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ knightpp beeb ]; mainProgram = "espup"; }; -} +}) diff --git a/pkgs/by-name/fn/fn-cli/package.nix b/pkgs/by-name/fn/fn-cli/package.nix index 2ecde032d33a..bb2662ba5e31 100644 --- a/pkgs/by-name/fn/fn-cli/package.nix +++ b/pkgs/by-name/fn/fn-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.40"; + version = "0.6.41"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - hash = "sha256-myLoLpEiyVTDsFx97AFiS9KNAOQd7NU+W8PJl95a7k0="; + hash = "sha256-V+mwi83nNoFZGl2Cob1Jt1LESQUGmo0MfqDFJYMdQaI="; }; vendorHash = null; diff --git a/pkgs/by-name/gl/glamoroustoolkit/package.nix b/pkgs/by-name/gl/glamoroustoolkit/package.nix index a02ab557e3fe..e850fcda9fe2 100644 --- a/pkgs/by-name/gl/glamoroustoolkit/package.nix +++ b/pkgs/by-name/gl/glamoroustoolkit/package.nix @@ -27,12 +27,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; - version = "1.1.16"; + version = "1.1.19"; src = fetchzip { url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; stripRoot = false; - hash = "sha256-AQLyVA0DeyoxK54b/hs9HqDkS1k57Vi+JjKuFAh+ZYM="; + hash = "sha256-rfn3IC3N6b7w40H7I7GmPv7xjCa+Ackh5GQ3lWbcdZY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix index f4531c2c82e6..e2b8a72ee143 100644 --- a/pkgs/by-name/hy/hydralauncher/package.nix +++ b/pkgs/by-name/hy/hydralauncher/package.nix @@ -6,10 +6,10 @@ }: let pname = "hydralauncher"; - version = "3.3.1"; + version = "3.4.0"; src = fetchurl { url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage"; - hash = "sha256-CscQnbMCK+dAWQacKIRwHl1Dqpau5+EyuH1pZhLrJ/Q="; + hash = "sha256-d2ZtCAbj7xYkLhsuTPi9/ORb+Nkk5KbGvaDSaawqGcU="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; diff --git a/pkgs/by-name/im/immich-go/package.nix b/pkgs/by-name/im/immich-go/package.nix index c5489541fc69..8cbe4d22a60a 100644 --- a/pkgs/by-name/im/immich-go/package.nix +++ b/pkgs/by-name/im/immich-go/package.nix @@ -9,13 +9,13 @@ }: buildGoModule rec { pname = "immich-go"; - version = "0.25.0"; + version = "0.25.2"; src = fetchFromGitHub { owner = "simulot"; repo = "immich-go"; tag = "v${version}"; - hash = "sha256-C7QfuCJNraOan6N67k7k30hKwJUDzRCNvWpJM3N328s="; + hash = "sha256-YTijKTelSFDVYSx0XocOx2OqEDCtoIMGBLEH3uUbg20="; # Inspired by: https://github.com/NixOS/nixpkgs/blob/f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c/pkgs/applications/graphics/pdfcpu/default.nix#L20-L32 # The intention here is to write the information into files in the `src`'s @@ -32,7 +32,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-J8vqii0X6GGmOCJ6L9lILz9NQEPa7Idg/ULrdRqBS9U="; + vendorHash = "sha256-AC+nXaUvnppEIPDthfWDffeoh8hcsd3wDynmF34XBD8="; # options used by upstream: # https://github.com/simulot/immich-go/blob/v0.25.0/.goreleaser.yaml diff --git a/pkgs/by-name/ju/justbuild/package.nix b/pkgs/by-name/ju/justbuild/package.nix index 23166ba8c212..37a9b5b01ef6 100644 --- a/pkgs/by-name/ju/justbuild/package.nix +++ b/pkgs/by-name/ju/justbuild/package.nix @@ -33,13 +33,13 @@ let in stdenv.mkDerivation rec { pname = "justbuild"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "just-buildsystem"; repo = "justbuild"; rev = "refs/tags/v${version}"; - hash = "sha256-HewKW2yezsc7mYZ6r3c0w/M3ybPzXqLPUL8N+plqE8o="; + hash = "sha256-EPRWJRo6vE4QizmWuh7yW3fZOIuS9I8EMiloBiqfVxs="; }; bazelapi = fetchurl { diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix index 412385bf625e..6c4d5a680b3a 100644 --- a/pkgs/by-name/lu/lunatask/package.nix +++ b/pkgs/by-name/lu/lunatask/package.nix @@ -6,12 +6,12 @@ }: let - version = "2.0.19"; + version = "2.0.20"; pname = "lunatask"; src = fetchurl { url = "https://github.com/lunatask/lunatask/releases/download/v${version}/Lunatask-${version}.AppImage"; - hash = "sha256-JJyGpVak0bBouvFduD5mWna0QlUwQ898HGdnL7fGvPA="; + hash = "sha256-yhlRN2Owp+wbNgoAgJD4U21LvaZc+sSCfyp0AU0slWo="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/ma/magic-enum/package.nix b/pkgs/by-name/ma/magic-enum/package.nix index 0b9ffcd9dae5..c4bae5ef975f 100644 --- a/pkgs/by-name/ma/magic-enum/package.nix +++ b/pkgs/by-name/ma/magic-enum/package.nix @@ -4,17 +4,16 @@ stdenv, cmake, nix-update-script, - testers, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "magic-enum"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "Neargye"; repo = "magic_enum"; - tag = "v${version}"; - hash = "sha256-1pO9FWd0InXqg8+lwRF3YNFTAeVLjqoI9v15LjWxnZY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-P6fl/dcGOSE1lTJwZlimbvsTPelHwdQdZr18H4Zji20="; }; nativeBuildInputs = [ cmake ]; @@ -23,8 +22,8 @@ stdenv.mkDerivation rec { # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly # (setting it to an absolute path causes include files to go to $out/$out/include, # because the absolute path is interpreted with root at $out). - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_LIBDIR=lib" + (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") ]; passthru = { @@ -34,8 +33,8 @@ stdenv.mkDerivation rec { meta = { description = "Static reflection for enums (to string, from string, iteration) for modern C++"; homepage = "https://github.com/Neargye/magic_enum"; - changelog = "https://github.com/Neargye/magic_enum/releases/tag/v${version}"; + changelog = "https://github.com/Neargye/magic_enum/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ Alper-Celik ]; }; -} +}) diff --git a/pkgs/by-name/na/natscli/package.nix b/pkgs/by-name/na/natscli/package.nix index 48bb782524c9..5e09551fbb21 100644 --- a/pkgs/by-name/na/natscli/package.nix +++ b/pkgs/by-name/na/natscli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "natscli"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "nats-io"; repo = "natscli"; tag = "v${version}"; - hash = "sha256-Ya3nNgPa9MEiDDwoBv8oXi7+Hji9fhUNIm55jJ6w++8="; + hash = "sha256-yYE04QayL2WeZZa2I4lThCzqalxhSGFB7LYlqSGE2SA="; }; - vendorHash = "sha256-NLsIX0B2YKGNWeAuKIQUs/2sXokUr6PYO5qvvfbbN1Y="; + vendorHash = "sha256-WtfvuccRm6jx04jz+8MGjn4mrJ7nvtdACwyL2OjE+tc="; ldflags = [ "-s" diff --git a/pkgs/by-name/os/ospd-openvas/package.nix b/pkgs/by-name/os/ospd-openvas/package.nix index 336554863447..be4f4712b5aa 100644 --- a/pkgs/by-name/os/ospd-openvas/package.nix +++ b/pkgs/by-name/os/ospd-openvas/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ospd-openvas"; - version = "22.8.1"; + version = "22.8.2"; pyproject = true; src = fetchFromGitHub { owner = "greenbone"; repo = "ospd-openvas"; tag = "v${version}"; - hash = "sha256-x/QDo5knECHDQJGj3JEMXfAiT2dDVWKJjJx/ryk8s8k="; + hash = "sha256-UrEcT65SlhJ33QHbAarAuVVSsZlzo/5JxlKSTL7/lsM="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-scala/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-scala/package.nix new file mode 100644 index 000000000000..37c0cdf79c8a --- /dev/null +++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-scala/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "pulumi-scala"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "VirtusLab"; + repo = "besom"; + tag = "v${version}"; + hash = "sha256-ZOWC8S4OP2URfrzeegMmrJ9yC5xwCuC1cdEtBEsaCdk="; + }; + + sourceRoot = "source/language-plugin/pulumi-language-scala"; + vendorHash = "sha256-GGkHKLKtcx/uW9CvrFIFKr2sZD3Mx0RYQM3lI9HvMXY="; + + postInstall = '' + mv $out/bin/language-host $out/bin/${meta.mainProgram} + ''; + + meta = { + description = "Besom - a Pulumi SDK for Scala. Also, incidentally, a broom made of twigs tied round a stick. Brooms and besoms are used for protection, to ward off evil spirits, and cleansing of ritual spaces"; + homepage = "https://github.com/VirtusLab/besom"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nikolaiser ]; + mainProgram = "pulumi-language-scala"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/re/readarr/package.nix b/pkgs/by-name/re/readarr/package.nix index c01cc63a1443..33385bd93690 100644 --- a/pkgs/by-name/re/readarr/package.nix +++ b/pkgs/by-name/re/readarr/package.nix @@ -24,15 +24,15 @@ let ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-lpINlPOZL7dMxrxzmPr6O4yK2kK9irTQ7gL64xBR0G0="; - arm64-linux_hash = "sha256-rn0J93wpwGNz9wbfVRa2P/Sj+YrN0EeKhDGdAlpzZAE="; - x64-osx_hash = "sha256-eWo6E76x+cI34T8FcbGEgmYA+J3CZj3YgtiolP77+JU="; + x64-linux_hash = "sha256-bVPUN500vTUdWCz6U1oP0uqLW+LChbCKZMhnYInQ54I="; + arm64-linux_hash = "sha256-qYG1uFyn26J6ElTeeI8Ozf6kVhm6EZKKMJ+4UFRhlqQ="; + x64-osx_hash = "sha256-qQK9KDX8KFAIzCdSpc7SWggYZm9cD8bv80BTdmT2MqA="; } ."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.4.12.2753"; + version = "0.4.13.2760"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/by-name/sa/saucectl/package.nix b/pkgs/by-name/sa/saucectl/package.nix index a9a6a573f46c..a9c20acb0f05 100644 --- a/pkgs/by-name/sa/saucectl/package.nix +++ b/pkgs/by-name/sa/saucectl/package.nix @@ -5,7 +5,7 @@ }: let pname = "saucectl"; - version = "0.194.1"; + version = "0.194.2"; in buildGoModule { inherit pname version; @@ -14,7 +14,7 @@ buildGoModule { owner = "saucelabs"; repo = "saucectl"; tag = "v${version}"; - hash = "sha256-WsaM1FgbUVcd+6p+OdmIHNs2BVG8lEGgDqY2z9Du7Rg="; + hash = "sha256-DxTqhyDO7kA1uIToU3kePA/0rXLVIq58QK6tFE3dayw="; }; ldflags = [ diff --git a/pkgs/by-name/si/sigil/package.nix b/pkgs/by-name/si/sigil/package.nix new file mode 100644 index 000000000000..9fdb16fe57a7 --- /dev/null +++ b/pkgs/by-name/si/sigil/package.nix @@ -0,0 +1,72 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + boost, + xercesc, + python3Packages, + qt6, +}: + +stdenv.mkDerivation rec { + pname = "sigil"; + version = "2.4.2"; + + src = fetchFromGitHub { + repo = "Sigil"; + owner = "Sigil-Ebook"; + tag = version; + hash = "sha256-/lnSNamLkPLG8tn0w8F0zFyypMUXyMhgxA2WyQFegKw="; + }; + + pythonPath = with python3Packages; [ lxml ]; + + nativeBuildInputs = [ + cmake + pkg-config + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + boost + xercesc + qt6.qtbase + qt6.qttools + qt6.qtwebengine + qt6.qtsvg + python3Packages.lxml + ]; + + prePatch = '' + sed -i '/^QTLIB_DIR=/ d' src/Resource_Files/bash/sigil-sh_install + ''; + + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' + runHook preInstall + + mkdir -p $out/Applications + mv bin/Sigil.app $out/Applications + # https://github.com/NixOS/nixpkgs/issues/186653 + chmod -x $out/Applications/Sigil.app/Contents/lib/*.dylib \ + $out/Applications/Sigil.app/Contents/polyfills/*.js \ + $out/Applications/Sigil.app/Contents/python3lib/*.py \ + $out/Applications/Sigil.app/Contents/hunspell_dictionaries/*.{aff,dic} + + runHook postInstall + ''; + + preFixup = '' + qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH") + ''; + + meta = { + description = "Free, open source, multi-platform ebook (ePub) editor"; + homepage = "https://github.com/Sigil-Ebook/Sigil/"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ prince213 ]; + platforms = with lib.platforms; linux ++ darwin; + mainProgram = "sigil"; + }; +} diff --git a/pkgs/by-name/si/signal-desktop-source/package.nix b/pkgs/by-name/si/signal-desktop-source/package.nix index f5073bd71d7f..006a890b40a9 100644 --- a/pkgs/by-name/si/signal-desktop-source/package.nix +++ b/pkgs/by-name/si/signal-desktop-source/package.nix @@ -64,13 +64,13 @@ let ''; }); - version = "7.49.0"; + version = "7.50.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "Signal-Desktop"; tag = "v${version}"; - hash = "sha256-URWDSHiPK+DCh8giT8YFW2HNY0tYNokqbAKBpBWZKD0="; + hash = "sha256-APdwETadRIQRJ/Wdxqnr2R5H/7Qqbacpp+SV16jesDw="; }; sticker-creator = stdenv.mkDerivation (finalAttrs: { @@ -130,15 +130,15 @@ stdenv.mkDerivation (finalAttrs: { ; hash = if withAppleEmojis then - "sha256-QBlouzA3PhRGiL94sCQS/zRSdsFbKf4VI20x3seMpE4=" + "sha256-BcKHVMrD8b9u/5hNtAY5V2vjTVHItob0EG89soFSwa4=" else - "sha256-LKSFptmJyfI0ACo1egZ2LAY5pAXexu9UNjIhD79rJ9E="; + "sha256-GdeCIUV0aTwnEV55/RnpESDBrkpcVVa+1XhUmUIgBPU="; }; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; SIGNAL_ENV = "production"; - SOURCE_DATE_EPOCH = 1743627521; + SOURCE_DATE_EPOCH = 1744232207; }; preBuild = '' diff --git a/pkgs/by-name/si/sish/package.nix b/pkgs/by-name/si/sish/package.nix index 64ff70b09b27..93e517a19599 100644 --- a/pkgs/by-name/si/sish/package.nix +++ b/pkgs/by-name/si/sish/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "sish"; - version = "2.17.0"; + version = "2.18.0"; src = fetchFromGitHub { owner = "antoniomika"; repo = "sish"; tag = "v${version}"; - hash = "sha256-HsN/NQ82tHqdh295fSkJ8SW5oqKF8TJ4ck1VwmNZtk8="; + hash = "sha256-SSBGyfaG59/7SqUFnvFdkhno4pTTLHHxVWBEPTz0m1Q="; }; - vendorHash = "sha256-8QNqq/FV8/eZcDnYiRayxsoDTPU+WgDYdURM0Mgzt8s="; + vendorHash = "sha256-0dtfZp8hzoPc3oQN6E7T8ZOhDmU2JeZ3YcB3QMUoPKI="; ldflags = [ "-s" diff --git a/pkgs/by-name/su/suitesparse-graphblas/package.nix b/pkgs/by-name/su/suitesparse-graphblas/package.nix index c4a89eeb4733..e5069b3b8989 100644 --- a/pkgs/by-name/su/suitesparse-graphblas/package.nix +++ b/pkgs/by-name/su/suitesparse-graphblas/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "10.0.2"; + version = "10.0.3"; outputs = [ "out" @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - hash = "sha256-5FrVVLKZ9WDa+a3Tq9WrhMfhvbVLGMKtKZH0h9h/3tk="; + hash = "sha256-/ieCvfHAU86rSW7hIDzY0IK6DqZeZ2u7vrDWV7rOUaI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/te/terraform-local/package.nix b/pkgs/by-name/te/terraform-local/package.nix index 9907829421f9..1b7b1fc72b0c 100644 --- a/pkgs/by-name/te/terraform-local/package.nix +++ b/pkgs/by-name/te/terraform-local/package.nix @@ -5,12 +5,12 @@ }: python3Packages.buildPythonApplication rec { pname = "terraform_local"; - version = "0.20.1"; + version = "0.21.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ki/9KglAmfzoHgf+wR6LteBQH696q5KE/Fi/tTEqCIg="; + hash = "sha256-W9Q4jWCaoUYpsVlVjtPasOf3/LYjltFDgkq1c2Dxy9s="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/by-name/tw/twitch-cli/package.nix b/pkgs/by-name/tw/twitch-cli/package.nix index 64b0ee6fd247..6d97656a1ffd 100644 --- a/pkgs/by-name/tw/twitch-cli/package.nix +++ b/pkgs/by-name/tw/twitch-cli/package.nix @@ -8,20 +8,20 @@ buildGoModule rec { pname = "twitch-cli"; - version = "1.1.24"; + version = "1.1.25"; src = fetchFromGitHub { owner = "twitchdev"; repo = pname; rev = "v${version}"; - hash = "sha256-kRyJl2SxppVGCO/6wrsb8cO+wpBT1nBsyI/JsPRYzMc="; + hash = "sha256-+6/o2vhj1iaT0hkyQRedn7ga1dhNZOupX4lOadnTDU0="; }; patches = [ ./application-name.patch ]; - vendorHash = "sha256-Z5bWS4oqjkEfOsvBzupKKnF6rJPU0TLVdwxDkIKcBQY="; + vendorHash = "sha256-LPpUnielSeGE0k68z+M565IqXQUIkAh5xloOqcbfh20="; ldflags = [ "-s" diff --git a/pkgs/by-name/tw/twitch-hls-client/package.nix b/pkgs/by-name/tw/twitch-hls-client/package.nix index 190a8e94b5b7..a0a2150e5189 100644 --- a/pkgs/by-name/tw/twitch-hls-client/package.nix +++ b/pkgs/by-name/tw/twitch-hls-client/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "twitch-hls-client"; - version = "1.3.13"; + version = "1.3.14"; src = fetchFromGitHub { owner = "2bc4"; repo = "twitch-hls-client"; rev = version; - hash = "sha256-H446qXFwRGippLMZemkW8sVhTV3YGpKmAvD8QBamAlo="; + hash = "sha256-g7pnTu6NHvtge7vUyG1Cms6hv4ozPgawMUKYGU7VRak="; }; useFetchCargoVendor = true; - cargoHash = "sha256-sqhB2Lj3RK1OyXy87Be9aOkfcksqz+5VfRTlKuswerU="; + cargoHash = "sha256-Suq+j4/lmkEMg6VlLT8UcPcVjDyBLyjUaqPXdqDo3dU="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/wa/wakapi/package.nix b/pkgs/by-name/wa/wakapi/package.nix index be54d855a8ba..6e9421717852 100644 --- a/pkgs/by-name/wa/wakapi/package.nix +++ b/pkgs/by-name/wa/wakapi/package.nix @@ -6,7 +6,7 @@ nix-update-script, }: let - version = "2.13.2"; + version = "2.13.3"; in buildGoModule { pname = "wakapi"; @@ -16,7 +16,7 @@ buildGoModule { owner = "muety"; repo = "wakapi"; tag = version; - hash = "sha256-+Kd2SLxfnPWrjJBaH4EH0SlSsDV648KOMIlXACoMwY4="; + hash = "sha256-J+h0FNVXkSHZr7Hb/q5T5TF0CVRd7e+iJg5b/oGPmsw="; }; vendorHash = "sha256-8SjBRagqdzJvW8eCKLeHBOQL4qX83USMIDDyS+8Mpvo="; diff --git a/pkgs/by-name/wa/wasabiwallet/package.nix b/pkgs/by-name/wa/wasabiwallet/package.nix index bb3d0ea440ff..cf8d0db7d115 100644 --- a/pkgs/by-name/wa/wasabiwallet/package.nix +++ b/pkgs/by-name/wa/wasabiwallet/package.nix @@ -27,18 +27,18 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "2.0.8.1"; + version = "2.5.1"; src = fetchurl { - url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "sha256-9q93C8Q4MKrpvAs6cb4sgo3PDVhk9ZExeHIZ9Qm8P2w="; + url = "https://github.com/WalletWasabi/WalletWasabi/releases/download/v${version}/Wasabi-${version}-linux-x64.tar.gz"; + sha256 = "sha256-DTgxLg8NwjHX085Ai6zxXgjL3x8ZHqVIpvxk/KRl+7w="; }; dontBuild = true; desktopItem = makeDesktopItem { name = "wasabi"; - exec = "wasabiwallet"; + exec = "wasabiwallet-desktop"; desktopName = "Wasabi"; genericName = "Bitcoin wallet"; comment = meta.description; @@ -58,13 +58,15 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/opt/${pname} $out/bin $out/share/applications - cp -Rv . $out/opt/${pname} - makeWrapper "$out/opt/${pname}/wassabee" "$out/bin/${pname}" \ - --suffix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath runtimeLibs}" + # The weird path is an upstream packaging error and could be fixed in the upcoming release + cp -Rv ./runner/work/WalletWasabi/WalletWasabi/build/linux-x64/* $out/opt/${pname} - makeWrapper "$out/opt/${pname}/wassabeed" "$out/bin/${pname}d" \ - --suffix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath runtimeLibs}" + for nameMap in "wassabee:desktop" "wassabeed:daemon" "wcoordinator:coordinator" "wbackend:backend"; do + IFS=":" read -r filename wrappedname <<< "$nameMap" + makeWrapper "$out/opt/${pname}/$filename" "$out/bin/${pname}-$wrappedname" \ + --suffix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath runtimeLibs}" + done cp -v $desktopItem/share/applications/* $out/share/applications ''; diff --git a/pkgs/by-name/xc/xcp/package.nix b/pkgs/by-name/xc/xcp/package.nix index 2165afeda87d..be16eedd941b 100644 --- a/pkgs/by-name/xc/xcp/package.nix +++ b/pkgs/by-name/xc/xcp/package.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "xcp"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "tarka"; repo = "xcp"; rev = "v${version}"; - hash = "sha256-tAECD3gNx6RDzEJhGt2nrykxHfh4S1qJKt9yNdZpuGs="; + hash = "sha256-TI9lveFJsb/OgGQRiPW5iuatB8dsc7yxBs1rb148nEY="; }; # no such file or directory errors doCheck = false; useFetchCargoVendor = true; - cargoHash = "sha256-plWq+p6NqOjonkdsGAL7hHBwVzFtkkgTNWNKEOBNZeU="; + cargoHash = "sha256-9cNu0cgoo0/41daJwy/uWIXa2wFhYkcPhJfA/69DVx0="; meta = with lib; { description = "Extended cp(1)"; diff --git a/pkgs/by-name/xl/xl2tpd/package.nix b/pkgs/by-name/xl/xl2tpd/package.nix index 9921812ed5cc..f6b9abecb94b 100644 --- a/pkgs/by-name/xl/xl2tpd/package.nix +++ b/pkgs/by-name/xl/xl2tpd/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "xl2tpd"; - version = "1.3.18"; + version = "1.3.19"; src = fetchFromGitHub { owner = "xelerance"; repo = "xl2tpd"; rev = "v${version}"; - sha256 = "sha256-Uc3PeTf/ow9p8noPcMLdT6S5dks9igDU6CC9koy+ff4="; + sha256 = "sha256-Oyy64b5xrKOYSkiCtWksh0vKGDXHsmUNlNgVTRXftOw="; }; buildInputs = [ libpcap ]; diff --git a/pkgs/development/python-modules/aider-chat/default.nix b/pkgs/development/python-modules/aider-chat/default.nix index eb0393992c50..3987cbcb931f 100644 --- a/pkgs/development/python-modules/aider-chat/default.nix +++ b/pkgs/development/python-modules/aider-chat/default.nix @@ -124,7 +124,7 @@ let ]; }; - version = "0.81.1"; + version = "0.81.2"; aider-chat = buildPythonPackage { pname = "aider-chat"; inherit version; @@ -137,7 +137,7 @@ let owner = "Aider-AI"; repo = "aider"; tag = "v${version}"; - hash = "sha256-TNSdsJBmF/9OCkFe1dZV0y7X2FSTjgp3YV4HGlA9GMc="; + hash = "sha256-zksPkqEmED2HShAhknVvkktyEc9S/kgU7bQGp1jS71A="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/arxiv/default.nix b/pkgs/development/python-modules/arxiv/default.nix index 5a8d67201460..ad01b4b3a17e 100644 --- a/pkgs/development/python-modules/arxiv/default.nix +++ b/pkgs/development/python-modules/arxiv/default.nix @@ -16,14 +16,14 @@ }: buildPythonPackage rec { pname = "arxiv"; - version = "2.1.3"; + version = "2.2.0"; pyproject = true; src = fetchFromGitHub { owner = "lukasschwab"; repo = "arxiv.py"; tag = version; - hash = "sha256-Niu3N0QTVxucboQx1FQq1757Hjj1VVWeDZn7O7YtjWY="; + hash = "sha256-/lXUWRJ1lbRPWUC/gMRA0NIcuV0HNzFlUVLyhcPAsCQ="; }; build-system = [ setuptools ]; @@ -63,7 +63,7 @@ buildPythonPackage rec { meta = { description = "Python wrapper for the arXiv API"; homepage = "https://github.com/lukasschwab/arxiv.py"; - changelog = "https://github.com/lukasschwab/arxiv.py/releases/tag/${version}"; + changelog = "https://github.com/lukasschwab/arxiv.py/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = [ lib.maintainers.octvs ]; }; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index cb46b540c2cc..23d3e45397f2 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.37.30"; + version = "1.37.31"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-3zWAmkl7it06aMcV8EtJzOx8Luybt4WIilffOKOOpdE="; + hash = "sha256-qy6PeHf925f1D0cS8+b/r6CyD7xqGscBlADTsiYZNss="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/drivelib/default.nix b/pkgs/development/python-modules/drivelib/default.nix index 0135ca72954c..1f4c5fb93415 100644 --- a/pkgs/development/python-modules/drivelib/default.nix +++ b/pkgs/development/python-modules/drivelib/default.nix @@ -4,8 +4,10 @@ expiringdict, fetchPypi, google-api-python-client, + google-auth, google-auth-httplib2, google-auth-oauthlib, + oauth2client, pythonOlder, setuptools, versioneer, @@ -36,8 +38,10 @@ buildPythonPackage rec { dependencies = [ expiringdict google-api-python-client + google-auth google-auth-httplib2 google-auth-oauthlib + oauth2client ]; # Tests depend on a google auth token diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix index 5b450374ddb2..2468e2a25ba9 100644 --- a/pkgs/development/python-modules/mizani/default.nix +++ b/pkgs/development/python-modules/mizani/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "mizani"; - version = "0.13.2"; + version = "0.13.3"; pyproject = true; src = fetchFromGitHub { owner = "has2k1"; repo = "mizani"; tag = "v${version}"; - hash = "sha256-ccw6GvwB23D0nHjbyAthm4pX7u2MpJM1N3EL2eRnZHI="; + hash = "sha256-nnkGZwvSEGXyqF6hQHtfXFCQYX8IEl3YTIABxtNAl40="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index 600f52fcd14f..34fce1a15757 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.26.0"; + version = "1.27.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; tag = "v${version}"; - hash = "sha256-zCnv+1/rQzo1+Kya8y8M9hljrygT9ZhHstpm14FL9mE="; + hash = "sha256-SMb/iw/3TYfWr/1GBF+FKCpgwI32nzpkYw+xQTQmWrQ="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 98704a25c3b9..bed2ab300a94 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -434,8 +434,8 @@ rec { "sha256-Ip3JFGZnN112dRHwGbtx/Qu9lIhBkbeB5dTIJ3TJFEo="; mypy-boto3-dynamodb = - buildMypyBoto3Package "dynamodb" "1.37.12" - "sha256-Dk16Fvudunqresm6j/NyH5aWqEhLHu1pO3lJFkt4Bbo="; + buildMypyBoto3Package "dynamodb" "1.37.31" + "sha256-TYe2qFBZqrCAywaKLGUSWE5CTbkigO+as5E0sXgEOYI="; mypy-boto3-dynamodbstreams = buildMypyBoto3Package "dynamodbstreams" "1.37.0" @@ -574,8 +574,8 @@ rec { "sha256-JSVZVCZ6P5A+EqjXHmbbDIdE1rKrdSwNcZvUbYxKpSA="; mypy-boto3-glue = - buildMypyBoto3Package "glue" "1.37.29" - "sha256-LL7zn9WjB7NyFYN2bs54X9v5i+ax2GpDDFzMcm6t5N0="; + buildMypyBoto3Package "glue" "1.37.31" + "sha256-wUofbzr8JoxrbsxVgiOTFdZBObxLml6yOqTVItV73eE="; mypy-boto3-grafana = buildMypyBoto3Package "grafana" "1.37.0" @@ -590,8 +590,8 @@ rec { "sha256-RVay0BEbaqtWdNpJo3eswTIq+rRnLuDPRcvOPsrl8xQ="; mypy-boto3-groundstation = - buildMypyBoto3Package "groundstation" "1.37.0" - "sha256-Cr6VKzjij95Bs5lza+wxNNVWBFR10SL9wRku5tlFeGQ="; + buildMypyBoto3Package "groundstation" "1.37.31" + "sha256-sdfOAC4jlcz8AjessEO2u9NWbBqM3CCL6oJrJHYG6wk="; mypy-boto3-guardduty = buildMypyBoto3Package "guardduty" "1.37.0" @@ -1370,8 +1370,8 @@ rec { "sha256-UW0b40n+M8za5guDPxhU5cRvtbkqzX6G7M2UaxNq5ws="; mypy-boto3-transfer = - buildMypyBoto3Package "transfer" "1.37.29" - "sha256-sTjua+D1wGOa/8lod+/cafll9lk3NFI6vkE7NlGKmyU="; + buildMypyBoto3Package "transfer" "1.37.31" + "sha256-2YiHVXvLrc72mi78aUHkQ5zkD747y9DvNbXUFewJaro="; mypy-boto3-translate = buildMypyBoto3Package "translate" "1.37.0" diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix index a54f14c99602..4a09be82ecf9 100644 --- a/pkgs/development/python-modules/openrazer/common.nix +++ b/pkgs/development/python-modules/openrazer/common.nix @@ -1,19 +1,19 @@ { lib, fetchFromGitHub }: rec { - version = "3.9.0"; + version = "3.10.1"; pyproject = true; src = fetchFromGitHub { owner = "openrazer"; repo = "openrazer"; - rev = "v${version}"; - hash = "sha256-MLwhqLPWdjg1ZUZP5Sig37RgZEeHlU+DyELpyMif6iY="; + tag = "v${version}"; + hash = "sha256-igrGx7Y6ENtZatJCTAW43/0q6ZjljJ9/kU3QFli4yIU="; }; - meta = with lib; { + meta = { homepage = "https://openrazer.github.io/"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ evanjs ] ++ teams.lumiguide.members; - platforms = platforms.linux; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ evanjs ] ++ lib.teams.lumiguide.members; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/pkgs/development/python-modules/openrazer/daemon.nix index 0bcfd6b51654..a6a089bd2845 100644 --- a/pkgs/development/python-modules/openrazer/daemon.nix +++ b/pkgs/development/python-modules/openrazer/daemon.nix @@ -33,6 +33,9 @@ buildPythonPackage ( postPatch = '' substituteInPlace openrazer_daemon/daemon.py \ --replace-fail "plugdev" "openrazer" + patchShebangs run_openrazer_daemon.py + substituteInPlace run_openrazer_daemon.py \ + --replace-fail "/usr/share" "$out/share" ''; nativeBuildInputs = [ @@ -46,7 +49,7 @@ buildPythonPackage ( gtk3 ]; - propagatedBuildInputs = [ + dependencies = [ daemonize dbus-python pygobject3 diff --git a/pkgs/development/python-modules/openrazer/pylib.nix b/pkgs/development/python-modules/openrazer/pylib.nix index 577f8595aba6..9f711dafa64e 100644 --- a/pkgs/development/python-modules/openrazer/pylib.nix +++ b/pkgs/development/python-modules/openrazer/pylib.nix @@ -20,7 +20,7 @@ buildPythonPackage ( nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ dbus-python numpy openrazer-daemon diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index 96a8b8f280ba..7f44fd294552 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.28.5"; + version = "1.28.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; tag = "v${version}"; - hash = "sha256-CJ4hq3Eeub426jU0mXMEvqynJb9ekAG2QhfZxbgxV8U="; + hash = "sha256-f1XCNDc2oNJ/EM8S12nCSYtQh7nUi4UROEzTuOH41Ds="; }; pythonRelaxDeps = [ @@ -76,7 +76,7 @@ buildPythonPackage rec { meta = with lib; { description = "Capture a URL with Playwright"; homepage = "https://github.com/Lookyloo/PlaywrightCapture"; - changelog = "https://github.com/Lookyloo/PlaywrightCapture/releases/tag/v${version}"; + changelog = "https://github.com/Lookyloo/PlaywrightCapture/releases/tag/${src.tag}"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/plugp100/default.nix b/pkgs/development/python-modules/plugp100/default.nix index 0cc356e3d15b..29963f6e968d 100644 --- a/pkgs/development/python-modules/plugp100/default.nix +++ b/pkgs/development/python-modules/plugp100/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "plugp100"; - version = "5.1.3"; + version = "5.1.4"; src = fetchFromGitHub { owner = "petretiandrea"; repo = "plugp100"; - rev = version; - sha256 = "sha256-V+9cVBMN8H4oFU51T9BDrLF46xgQHqIsMj8nuPedUGA="; + tag = version; + sha256 = "sha256-a/Rv5imVJOJNaLzPozK8+XMZZsR5HyIXbCmq2Flkd+I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index 846667aaf457..0cc07789a927 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "kubie"; - version = "0.25.1"; + version = "0.25.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "sha256-aZM4rIYDEO1oezHeG2cL0O3hWrj7OJFzW/uFaX+cczw="; + sha256 = "sha256-+sSooE0KJqvWFdR63qazOMmSS8dV7MirYZ+sk7BnGQ4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-xRm1c7c7hZg419+2SgMpfX2w5HhLGYVA5HF+GnBZ+Yg="; + cargoHash = "sha256-Yf8fAW65K7SLaRpvegjWBLVDV33sMGV+I1rqlWvx5Ss="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/rust/cargo-codspeed/default.nix b/pkgs/development/tools/rust/cargo-codspeed/default.nix index 3d8fef633af4..92f732f7d81d 100644 --- a/pkgs/development/tools/rust/cargo-codspeed/default.nix +++ b/pkgs/development/tools/rust/cargo-codspeed/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-codspeed"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "CodSpeedHQ"; repo = "codspeed-rust"; rev = "v${version}"; - hash = "sha256-VAl9UceVDS2XltP3G1YxNp07R+PmuJGJ8zvtxblcQLc="; + hash = "sha256-eKZDoOI9mbJC6lbO6Q8tTMj5RtHqOs9YCvTmn7/I/9w="; }; useFetchCargoVendor = true; - cargoHash = "sha256-QkBc8WOzcqBwmVZN/n8ySeAAd0aotzqJ9xMJB/Qgfhg="; + cargoHash = "sha256-JX6Y7qh3cyGPqBRfFvUM/sNx5aoMappQcnlPTFWTH2w="; nativeBuildInputs = [ curl diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 2e75ab7c8764..32712ab6fc74 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -14,13 +14,13 @@ postgresqlBuildExtension rec { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; - version = "2.19.1"; + version = "2.19.2"; src = fetchFromGitHub { owner = "timescale"; repo = "timescaledb"; tag = version; - hash = "sha256-OaDBCspZKscnmKjZK7duijT3I9WFjm6I1hLEkzXsBKU="; + hash = "sha256-H46lhvM6rA9J4nLRLeFArCc7tqmVmpWztsGFAboSM0k="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a29b6203c19d..8c54dc07f2ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5155,8 +5155,6 @@ with pkgs; shiv = with python3Packages; toPythonApplication shiv; - sigil = qt6.callPackage ../applications/editors/sigil { }; - slither-analyzer = with python3Packages; toPythonApplication slither-analyzer; # aka., pgp-tools