diff options
61 files changed, 745 insertions, 207 deletions
diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index 575d3368326d6..6d9b61b0647cc 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -125,17 +125,41 @@ $ cd path/to/nixpkgs $ nix-build -A your-package.tests ``` +Note that Hydra and [`nixpkgs-review`](https://github.com/Mic92/nixpkgs-review) don't build these derivations by default, and that ([`@ofborg`](https://github.com/NixOS/ofborg)) only builds them when evaluating PRs for that particular package (or when manually instructed). + #### Package tests {#var-meta-tests-packages} -Tests that are part of the source package are often executed in the `installCheckPhase`. +Tests that are part of the source package are often executed in the `installCheckPhase`. This phase is also suitable for performing a `--version` test for packages that support such flag. Here's an example: + +```nix +# Say the package is git +stdenv.mkDerivation(finalAttrs: { + pname = "git"; + version = "..."; + # ... + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck -Prefer `passthru.tests` for tests that are introduced in nixpkgs because: + echo checking if 'git --version' mentions ${finalAttrs.version} + $out/bin/git --version | grep ${finalAttrs.version} + + runHook postInstallCheck + ''; + # ... +}) +``` + +Most programs distributed by Nixpkgs support such a `--version` flag, and it can help give confidence that the package at least got compiled properly. However, tests that are slightly non trivial will better fit into `passthru.tests`, because: * `passthru.tests` tests the 'real' package, independently from the environment in which it was built -* we can run `passthru.tests` independently +* We can run and debug a `passthru.tests` independently, after the package was built (useful if it takes a long time). * `installCheckPhase` adds overhead to each build -For more on how to write and run package tests, see [](#sec-package-tests). +It is also possible to still use `passthru.tests` to test the version, with [testVersion](#tester-testVersion). + +For more on how to write and run package tests, see [`pkgs/README.md`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#package-tests). #### NixOS tests {#var-meta-tests-nixos} diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index 72217e7a8af2b..3ca9deec8961d 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -138,7 +138,7 @@ in systemd.tmpfiles.settings.opengl = { "/run/opengl-driver"."L+".argument = toString package; - "/run/opengl-drive-32" = + "/run/opengl-driver-32" = if pkgs.stdenv.isi686 then { "L+".argument = "opengl-driver"; } else if cfg.driSupport32Bit then diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix index 2228766aca963..93f806b75eb11 100644 --- a/nixos/modules/installer/netboot/netboot.nix +++ b/nixos/modules/installer/netboot/netboot.nix @@ -37,11 +37,6 @@ with lib; # here and it causes a cyclic dependency. boot.loader.grub.enable = false; - # !!! Hack - attributes expected by other modules. - environment.systemPackages = [ pkgs.grub2_efi ] - ++ (lib.optionals (lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.syslinux) - [pkgs.grub2 pkgs.syslinux]); - fileSystems."/" = mkImageMediaOverride { fsType = "tmpfs"; options = [ "mode=0755" ]; diff --git a/nixos/modules/services/networking/inadyn.nix b/nixos/modules/services/networking/inadyn.nix index baa4302096c2c..7022673538c8a 100644 --- a/nixos/modules/services/networking/inadyn.nix +++ b/nixos/modules/services/networking/inadyn.nix @@ -202,7 +202,7 @@ in startAt = cfg.interval; serviceConfig = { Type = "oneshot"; - ExecStart = ''${lib.getExe pkgs.inadyn} -f ${configFile} --cache-dir ''${CACHE_DIRECTORY}/inadyn -1 --foreground -l ${cfg.logLevel}''; + ExecStart = ''${lib.getExe pkgs.inadyn} -f ${configFile} --cache-dir ''${CACHE_DIRECTORY} -1 --foreground -l ${cfg.logLevel}''; LoadCredential = "config:${configFile}"; CacheDirectory = "inadyn"; diff --git a/pkgs/applications/audio/goodvibes/default.nix b/pkgs/applications/audio/goodvibes/default.nix index d2eb394e59b3d..f857e6971e9b8 100644 --- a/pkgs/applications/audio/goodvibes/default.nix +++ b/pkgs/applications/audio/goodvibes/default.nix @@ -1,13 +1,14 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , meson , ninja , pkg-config , glib , glib-networking , gtk3 -, libsoup +, libsoup_3 , keybinder3 , gst_all_1 , wrapGAppsHook3 @@ -17,14 +18,21 @@ stdenv.mkDerivation rec { pname = "goodvibes"; - version = "0.7.9"; + version = "0.8.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-yXrCE3nsdZP4JHKVslzQafjZ380zC8sZv5TJf8dJqJw="; + hash = "sha256-KflLEc6BFA3pBY9HukEm5NluGi2igFNP6joOMdmZ0Ds="; }; + patches = [ + # Fixes a compilation error + (fetchpatch { + url = "https://gitlab.com/goodvibes/goodvibes/-/commit/e332f831b91ee068a1a58846d7607b30ab010116.patch"; + hash = "sha256-PzbTltbD0xWJAytCGg1TAwBLrICP+9QZbCbG1QQ8Qmw="; + }) + ]; nativeBuildInputs = [ meson @@ -40,7 +48,7 @@ stdenv.mkDerivation rec { # for libsoup TLS support glib-networking gtk3 - libsoup + libsoup_3 keybinder3 ] ++ (with gst_all_1; [ gstreamer diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index 4ba40b417c8cb..29f9cf69292ed 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -38,14 +38,14 @@ let in stdenv.mkDerivation rec { pname = "mame"; - version = "0.265"; + version = "0.266"; srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${srcVersion}"; - hash = "sha256-jXGmABFeoT8g2UtVV159gUpdWcBvb9aX3uiFi2neVQI="; + hash = "sha256-nggpDKcZURwC4SQHiRnF7lJNaAWSniVHvsF/IjAPd9E="; }; outputs = [ "out" "tools" ]; diff --git a/pkgs/applications/misc/dialect/default.nix b/pkgs/applications/misc/dialect/default.nix index 9eb7db6212cc7..87c2ded56d852 100644 --- a/pkgs/applications/misc/dialect/default.nix +++ b/pkgs/applications/misc/dialect/default.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , wrapGAppsHook4 , python3 -, appstream-glib , blueprint-compiler , desktop-file-utils , meson @@ -15,21 +14,21 @@ , libsoup_3 , glib-networking , libadwaita +, libsecret , nix-update-script }: python3.pkgs.buildPythonApplication rec { pname = "dialect"; - version = "2.3.0"; - - format = "other"; + version = "2.4.1"; + pyproject = false; # built with meson src = fetchFromGitHub { owner = "dialect-app"; repo = "dialect"; rev = version; fetchSubmodules = true; - hash = "sha256-A6jZHcSzHSmHLvyegyzxjQ6+jL6rLb7oefhryXoSrH4="; + hash = "sha256-WEeTdUdhDSfStu+rBYcuk6miuh5e0AsodbyF93Mg4mo="; }; nativeBuildInputs = [ @@ -51,6 +50,7 @@ python3.pkgs.buildPythonApplication rec { libsoup_3 glib-networking libadwaita + libsecret ]; propagatedBuildInputs = with python3.pkgs; [ @@ -74,12 +74,12 @@ python3.pkgs.buildPythonApplication rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { homepage = "https://github.com/dialect-app/dialect"; description = "A translation app for GNOME"; - maintainers = with maintainers; [ aleksana ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ aleksana ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; mainProgram = "dialect"; }; } diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 10b952569b1b7..58753489ad49f 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "2.3.3"; + version = "2.4.1"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-nodWxHLVg5bSuixQirAsVfQZ1g38IgZJEl/3O/b3NIE="; + hash = "sha256-kHNjdwAIGJi1/ryEioRwZIYm4UziT2Ig1y2PgnbA0ZE="; }; - vendorHash = "sha256-mAA5S9t+mHMxSV8l7H9XxJ80k4pJRWDDZ0BSJrmQO1I="; + vendorHash = "sha256-cWOnIEvVer+USqNQJmhZ7pYSJfzY2xjq2oTxRd/y94w="; proxyVendor = true; diff --git a/pkgs/applications/science/robotics/mujoco/default.nix b/pkgs/applications/science/robotics/mujoco/default.nix index 76c18a788c30d..03abaa2e29b4d 100644 --- a/pkgs/applications/science/robotics/mujoco/default.nix +++ b/pkgs/applications/science/robotics/mujoco/default.nix @@ -11,7 +11,7 @@ let pin = { - + # TODO: Check the following file and ensure the dependencies are up-to-date # See https://github.com/google-deepmind/mujoco/blob/<VERSION>/cmake/MujocoDependencies.cmake#L17-L64 abseil-cpp = fetchFromGitHub { owner = "abseil"; @@ -129,7 +129,7 @@ let in stdenv.mkDerivation rec { pname = "mujoco"; - version = "3.1.5"; + version = "3.1.6"; # Bumping version? Make sure to look though the MuJoCo's commit # history for bumped dependency pins! @@ -137,7 +137,7 @@ in stdenv.mkDerivation rec { owner = "google-deepmind"; repo = "mujoco"; rev = "refs/tags/${version}"; - hash = "sha256-XKN489oexHf2/Gv0MVxXUzqyeJJTJXV99+fNi8shdsg="; + hash = "sha256-64zUplr1E5WSb5RpTW9La1zKVT67a1VrftiUqc2SHlU="; }; patches = [ ./mujoco-system-deps-dont-fetch.patch ]; @@ -177,12 +177,16 @@ in stdenv.mkDerivation rec { passthru.pin = { inherit (pin) lodepng eigen3 abseil-cpp; }; - meta = with lib; { + meta = { description = "Multi-Joint dynamics with Contact. A general purpose physics simulator."; homepage = "https://mujoco.org/"; changelog = "https://github.com/google-deepmind/mujoco/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ samuela tmplt ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + GaetanLepage + samuela + tmplt + ]; broken = stdenv.isDarwin; }; } diff --git a/pkgs/by-name/al/alt-tab-macos/package.nix b/pkgs/by-name/al/alt-tab-macos/package.nix index e5b22dedcb82e..0654ea53b8978 100644 --- a/pkgs/by-name/al/alt-tab-macos/package.nix +++ b/pkgs/by-name/al/alt-tab-macos/package.nix @@ -2,17 +2,17 @@ lib, stdenvNoCC, fetchurl, - gitUpdater, + nix-update-script, unzip, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "alt-tab-macos"; - version = "6.69.0"; + version = "6.70.1"; src = fetchurl { url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip"; - hash = "sha256-v0HeucpDGdnK0p9zoYUbEBoHzRMlcJBEIIS1vQZ00A0="; + hash = "sha256-4LdlLoc6hMF1jIlHeC89m1unStCsID6/nWJuuYUX96o="; }; sourceRoot = "."; @@ -28,10 +28,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.updateScript = gitUpdater { - url = "https://github.com/lwouis/alt-tab-macos"; - rev-prefix = "v"; - }; + passthru.updateScript = nix-update-script { }; meta = { description = "Windows alt-tab on macOS"; diff --git a/pkgs/by-name/ch/challenger/package.nix b/pkgs/by-name/ch/challenger/package.nix new file mode 100644 index 0000000000000..ca3a7cf365340 --- /dev/null +++ b/pkgs/by-name/ch/challenger/package.nix @@ -0,0 +1,81 @@ +{ + lib, + stdenv, + fetchgit, + autoreconfHook, + libgcrypt, + pkg-config, + texinfo, + curl, + gnunet, + jansson, + libgnurl, + libmicrohttpd, + libsodium, + libtool, + postgresql, + taler-exchange, + taler-merchant, + runtimeShell, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "challenger"; + version = "0.10.0"; + + src = fetchgit { + url = "https://git.taler.net/challenger.git"; + rev = "v${finalAttrs.version}"; + hash = "sha256-fjT3igPQ9dQtOezwZVfK5fBaL22FKOCbjUF0U1urK0g="; + }; + + # https://git.taler.net/challenger.git/tree/bootstrap + preAutoreconf = '' + # Generate Makefile.am in contrib/ + pushd contrib + rm -f Makefile.am + find wallet-core/challenger/ -type f -printf ' %p \\\n' | sort > Makefile.am.ext + # Remove extra '\' at the end of the file + truncate -s -2 Makefile.am.ext + cat Makefile.am.in Makefile.am.ext >> Makefile.am + # Prevent accidental editing of the generated Makefile.am + chmod -w Makefile.am + popd + ''; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + libgcrypt + pkg-config + texinfo + ]; + + buildInputs = [ + curl + gnunet + jansson + libgcrypt + libgnurl + libmicrohttpd + libsodium + libtool + postgresql + taler-exchange + taler-merchant + ]; + + preFixup = '' + substituteInPlace $out/bin/challenger-{dbconfig,send-post.sh} \ + --replace-fail "/bin/bash" "${runtimeShell}" + ''; + + meta = { + description = "OAuth 2.0-based authentication service that validates user can receive messages at a certain address"; + homepage = "https://git.taler.net/challenger.git"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ wegank ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ch/chatgpt-shell-cli/package.nix b/pkgs/by-name/ch/chatgpt-shell-cli/package.nix new file mode 100644 index 0000000000000..25ab95c94127d --- /dev/null +++ b/pkgs/by-name/ch/chatgpt-shell-cli/package.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, jq +, curl +, glow +, makeWrapper +}: + +let + pname = "chatgpt-shell-cli"; + + # no tags + version = "master"; +in +stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "0xacx"; + repo = "chatgpt-shell-cli"; + rev = version; + hash = "sha256-hYLrUya4UCsIB1J/n+jp1jFRCEqnGFJOr3ATxm0zwdY="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install -Dm755 chatgpt.sh -t $out/bin + + runHook postInstall + ''; + + postInstall = '' + wrapProgram $out/bin/chatgpt.sh \ + --prefix PATH : ${lib.makeBinPath [ jq curl glow ]} + ''; + + meta = with lib; { + homepage = "https://github.com/0xacx/chatGPT-shell-cli"; + description = "Simple shell script to use OpenAI's ChatGPT and DALL-E from the terminal. No Python or JS required."; + license = licenses.mit; + maintainers = with maintainers; [ jfvillablanca ]; + }; + } diff --git a/pkgs/by-name/cy/cyanrip/package.nix b/pkgs/by-name/cy/cyanrip/package.nix index e1f1ae1648afb..d3266c1dc3115 100644 --- a/pkgs/by-name/cy/cyanrip/package.nix +++ b/pkgs/by-name/cy/cyanrip/package.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cyanrip"; - version = "0.9.2"; + version = "0.9.3.1"; src = fetchFromGitHub { owner = "cyanreg"; repo = "cyanrip"; rev = "v${finalAttrs.version}"; - hash = "sha256-sWgHf8S4GZDAIvMUf5KvGy2y0JcUbRS53IjArdgokqc="; + hash = "sha256-GAPHsYQYJQOBV4ok7omqhiDPKX+VC4Bw3Msb3pd8Zo8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/by-name/du/dub/package.nix index d815a9515dc6e..9f419d1e10f41 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/by-name/du/dub/package.nix @@ -1,56 +1,49 @@ -{ lib, stdenv, fetchFromGitHub, curl, libevent, rsync, ldc, dcompiler ? ldc }: - -assert dcompiler != null; - -stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +, curl +, ldc +, libevent +, rsync +}: + +stdenv.mkDerivation (finalAttrs: { pname = "dub"; - version = "1.33.0"; + version = "1.38.0"; enableParallelBuilding = true; src = fetchFromGitHub { owner = "dlang"; repo = "dub"; - rev = "v${version}"; - sha256 = "sha256-4Mha7WF6cg3DIccfpvOnheuvgfziv/7wo8iFsPXO4yY="; + rev = "v${finalAttrs.version}"; + hash = "sha256-+cG7tR4nAL4fhk9/1FMkfjQ8Rtqf+uTvGfVegmnjloY="; }; - dubvar = "\\$DUB"; postPatch = '' patchShebangs test - - - # Can be removed with https://github.com/dlang/dub/pull/1368 - substituteInPlace test/fetchzip.sh \ - --replace "dub remove" "\"${dubvar}\" remove" ''; - nativeBuildInputs = [ dcompiler libevent rsync ]; + nativeBuildInputs = [ ldc libevent rsync ]; buildInputs = [ curl ]; buildPhase = '' - for dc_ in dmd ldmd2 gdmd; do - echo "... check for D compiler $dc_ ..." - dc=$(type -P $dc_ || echo "") - if [ ! "$dc" == "" ]; then - break - fi - done - if [ "$dc" == "" ]; then - exit "Error: could not find D compiler" - fi - echo "$dc_ found and used as D compiler to build $pname" - $dc ./build.d - ./build + runHook preBuild + + export DMD=${ldc}/bin/ldmd2 + ldc2 -run ./build.d + + runHook postBuild ''; doCheck = !stdenv.isDarwin; checkPhase = '' + runHook preCheck + export DUB=$NIX_BUILD_TOP/source/bin/dub export PATH=$PATH:$NIX_BUILD_TOP/source/bin/ - export DC=${dcompiler.out}/bin/${if dcompiler.pname=="ldc" then "ldc2" else dcompiler.pname} - echo "DC out --> $DC" + export DC=${lib.getExe ldc} export HOME=$TMP rm -rf test/issue502-root-import @@ -138,21 +131,29 @@ stdenv.mkDerivation rec { rm -r test/sdl-package-simple rm -r test/dpath-variable # requires execution of dpath-variable.sh rm -r test/use-c-sources + rm -r test/pr2642-cache-db + rm -r test/pr2644-describe-artifact-path + rm -r test/pr2647-build-deep ./test/run-unittest.sh + + runHook postCheck ''; installPhase = '' - mkdir -p $out/bin - cp bin/dub $out/bin + runHook preInstall + + install -Dm755 bin/dub $out/bin/dub + + runHook postInstall ''; meta = with lib; { - description = "Package and build manager for D applications and libraries"; - mainProgram = "dub"; + description = "Package and build manager for D programs and libraries"; homepage = "https://code.dlang.org/"; license = licenses.mit; + mainProgram = "dub"; maintainers = with maintainers; [ jtbx ]; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; -} +}) diff --git a/pkgs/by-name/ge/geesefs/package.nix b/pkgs/by-name/ge/geesefs/package.nix new file mode 100644 index 0000000000000..5d0277040141a --- /dev/null +++ b/pkgs/by-name/ge/geesefs/package.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +}: + +let version = "0.41.0"; +in buildGoModule { + pname = "geesefs"; + inherit version; + + src = fetchFromGitHub { + owner = "yandex-cloud"; + repo = "geesefs"; + rev = "v${version}"; + hash = "sha256-tOioEimL4+xf19sdMwRS8tRmKKxLXmR8DWMEmvRqdJM="; + }; + + # hashes differ per architecture otherwise. + proxyVendor = true; + vendorHash = "sha256-pO6ZngGw9vp47cstOTpQ/lBpBQRXIUuSuhsldZPR5Sk="; + + subPackages = [ "." ]; + + meta = { + homepage = "https://github.com/yandex-cloud/geesefs"; + description = "Finally, a good FUSE FS implementation over S3"; + license = [ lib.licenses.mit ]; + maintainers = [ lib.maintainers.flokli ]; + platforms = lib.platforms.unix; + mainProgram = "geesefs"; + }; +} diff --git a/pkgs/by-name/ii/iina/package.nix b/pkgs/by-name/ii/iina/package.nix index 2288a688cf0dd..d2c19a077ff92 100644 --- a/pkgs/by-name/ii/iina/package.nix +++ b/pkgs/by-name/ii/iina/package.nix @@ -1,17 +1,18 @@ -{ lib -, fetchurl -, stdenv -, undmg -, nix-update-script +{ + lib, + fetchurl, + stdenvNoCC, + undmg, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "iina"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { - url = "https://github.com/iina/iina/releases/download/v${version}/IINA.v${version}.dmg"; - hash = "sha256-feUPWtSi/Vsnv1mjGyBgB0wFMxx6r6UzrUratlAo14w="; + url = "https://github.com/iina/iina/releases/download/v${finalAttrs.version}/IINA.v${finalAttrs.version}.dmg"; + hash = "sha256-O4uRmfQaGMKqizDlgk0MnazMHVkXaDLqZQ9TP8vcajg="; }; nativeBuildInputs = [ undmg ]; @@ -26,13 +27,17 @@ stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { - homepage = "https://iina.io/"; + meta = { description = "The modern media player for macOS"; - platforms = platforms.darwin; - license = licenses.gpl3; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + homepage = "https://iina.io/"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ + arkivm + donteatoreo + stepbrobd + ]; mainProgram = "iina"; - maintainers = with maintainers; [ arkivm stepbrobd ]; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; -} +}) diff --git a/pkgs/by-name/ke/keypunch/package.nix b/pkgs/by-name/ke/keypunch/package.nix index b903a4d2d1a2c..31365c7431ceb 100644 --- a/pkgs/by-name/ke/keypunch/package.nix +++ b/pkgs/by-name/ke/keypunch/package.nix @@ -60,5 +60,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; mainProgram = "keypunch"; maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/la/latexminted/package.nix b/pkgs/by-name/la/latexminted/package.nix index c1c391c51144c..fc5cb3a3a7e91 100644 --- a/pkgs/by-name/la/latexminted/package.nix +++ b/pkgs/by-name/la/latexminted/package.nix @@ -7,12 +7,12 @@ python3Packages.buildPythonApplication rec { pname = "latexminted"; - version = "0.1.0b2"; + version = "0.1.0b5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Yl/2zvNMYuYkwR5tDZ0vhBLO964GBUx1DeyLK/Q3T5c="; + hash = "sha256-1K43rX3hs+ywMzOyeKX+GmAGUVHTDZB3Yo87dZ/uYaQ="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/lp/LPCNet/package.nix b/pkgs/by-name/lp/LPCNet/package.nix new file mode 100644 index 0000000000000..0d94114f4e6dc --- /dev/null +++ b/pkgs/by-name/lp/LPCNet/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchurl, + cmake, + codec2, + # for tests + octave, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "LPCNet"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "drowe67"; + repo = "LPCNet"; + rev = "v${finalAttrs.version}"; + hash = "sha256-tHZLKXmuM86A6OpfS3CRRjhFbqj1Q/w1w56msdgLHb0="; + }; + passthru = { + # Prebuilt neural network model that is needed during the build - can be overrwritten + nnmodel = fetchurl { + url = "http://rowetel.com/downloads/deep/lpcnet_191005_v1.0.tgz"; + hash = "sha256-UJRAkkdR/dh/+qVoPuPd3ZN69cgzuRBMzOZdUWFJJsg="; + }; + }; + preConfigure = '' + mkdir build + cp \ + ${finalAttrs.finalPackage.passthru.nnmodel} \ + build/${finalAttrs.finalPackage.passthru.nnmodel.name} + ''; + + prePatch = '' + patchShebangs *.sh unittest/*.sh + ''; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ codec2 ]; + nativeCheckInputs = [ octave ]; + + doCheck = true; + preCheck = '' + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}/build/source/build/src" + ''; + + meta = with lib; { + description = "Experimental Neural Net speech coding for FreeDV"; + homepage = "https://github.com/drowe67/LPCNet"; + license = licenses.bsd3; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/by-name/ma/mactop/package.nix b/pkgs/by-name/ma/mactop/package.nix new file mode 100644 index 0000000000000..0d2730fd4dd47 --- /dev/null +++ b/pkgs/by-name/ma/mactop/package.nix @@ -0,0 +1,34 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "mactop"; + version = "0.1.8"; + + src = fetchFromGitHub { + owner = "context-labs"; + repo = "mactop"; + rev = "refs/tags/v${version}"; + hash = "sha256-BcBUOI5EE04ZTPoHGrNQjctsDFbMoe/6MZaLj/58c34="; + }; + + vendorHash = "sha256-/KecVx4Gp776t8gFSO29E1q9v29nwrKIWZYCpj7IlSo="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "Terminal-based monitoring tool 'top' designed to display real-time metrics for Apple Silicon chips"; + homepage = "https://github.com/context-labs/mactop"; + changelog = "https://github.com/context-labs/mactop/releases/tag/${src.rev}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + mainProgram = "mactop"; + platforms = [ "aarch64-darwin" ]; + }; +} diff --git a/pkgs/by-name/rt/rtl_fm_streamer/package.nix b/pkgs/by-name/rt/rtl_fm_streamer/package.nix new file mode 100644 index 0000000000000..05874d6461085 --- /dev/null +++ b/pkgs/by-name/rt/rtl_fm_streamer/package.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, libusb1 +, libev +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "rtl_fm_streamer"; + version = "unstable-2021-06-08"; + + src = fetchFromGitHub { + owner = "AlbrechtL"; + repo = "rtl_fm_streamer"; + rev = "ceb2bf06883f986ed01aa57c84989ba35b6b9a27"; + sha256 = "sha256-9M7GS6AC7HEJge04vl7V6ZdtwWvbMu/Rhaf9fwQa9WA="; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '/etc/udev/rules.d' "$out/etc/udev/rules.d" + + substituteInPlace rtl-sdr.rules \ + --replace 'MODE:="0666"' 'ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev"' + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + libusb1 + libev + ]; + + cmakeFlags = [ + (lib.cmakeBool "INSTALL_UDEV_RULES" stdenv.isLinux) + ]; + + meta = { + description = "Turns your Realtek RTL2832 based DVB dongle into a FM radio stereo receiver"; + homepage = "https://github.com/AlbrechtL/rtl_fm_streamer"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ doronbehar ]; + broken = stdenv.isDarwin && stdenv.isx86_64; + }; +}) diff --git a/pkgs/by-name/us/usql/package.nix b/pkgs/by-name/us/usql/package.nix index 1297da876c318..4071e6510d90b 100644 --- a/pkgs/by-name/us/usql/package.nix +++ b/pkgs/by-name/us/usql/package.nix @@ -11,18 +11,18 @@ buildGoModule rec { pname = "usql"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-O0NsxOPp09W6FFdVjoCBUDSEkMct/MX/sLWDpoCmwwM="; + hash = "sha256-ahaRrSRk8n8gjFy/B/yG1ORUlNcmMuUF9eyirZMhxeI="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-4WGxstIwjq7u+4UZ03IAONi58Vlg3p82fEOkfPS3eT4="; + vendorHash = "sha256-f0rpkYGaorOaIikUVcibyDMTbBJK6DF5EguSPHolsIk="; proxyVendor = true; # Exclude drivers from the bad group diff --git a/pkgs/by-name/wo/workout-tracker/package.nix b/pkgs/by-name/wo/workout-tracker/package.nix index ab15fced522c5..599973001df09 100644 --- a/pkgs/by-name/wo/workout-tracker/package.nix +++ b/pkgs/by-name/wo/workout-tracker/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "workout-tracker"; - version = "0.14.3"; + version = "0.15.0"; src = fetchFromGitHub { owner = "jovandeginste"; repo = "workout-tracker"; rev = "refs/tags/v${version}"; - hash = "sha256-NGj3W6SYZauaAhMinPzsSXM8Dqy+B+am985JJjh6xTs="; + hash = "sha256-pZe3X2W885MIV0stDTjQgcDDNgM4OUpUbReY+9RrYsw="; }; vendorHash = null; diff --git a/pkgs/development/compilers/go/1.21.nix b/pkgs/development/compilers/go/1.21.nix index 4d9982f2b265f..3351616233009 100644 --- a/pkgs/development/compilers/go/1.21.nix +++ b/pkgs/development/compilers/go/1.21.nix @@ -47,11 +47,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.21.10"; + version = "1.21.11"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-kA4K/okAwe5lqKjE8MWjygLc+FwdHLE6ZSviLCE5k5Q="; + hash = "sha256-Qq7pvytpVsdaetaqPwpRtYIf/qxX9aLnM6LW6uHm2dI="; }; strictDeps = true; diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index a848accf16669..b36eb44229d18 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -79,6 +79,11 @@ stdenv.mkDerivation (finalAttrs: { configureFlagsArray+=("--elfinterp=$(< $NIX_CC/nix-support/dynamic-linker)") ''; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ + "-Wno-error=implicit-int" + "-Wno-error=int-conversion" + ]); + # Test segfault for static build doCheck = !stdenv.hostPlatform.isStatic; diff --git a/pkgs/development/libraries/webp-pixbuf-loader/default.nix b/pkgs/development/libraries/webp-pixbuf-loader/default.nix index b3f4e4d483901..78496c0e919e3 100644 --- a/pkgs/development/libraries/webp-pixbuf-loader/default.nix +++ b/pkgs/development/libraries/webp-pixbuf-loader/default.nix @@ -52,6 +52,9 @@ stdenv.mkDerivation rec { GDK_PIXBUF_MODULEDIR="$out/${moduleDir}" \ gdk-pixbuf-query-loaders --update-cache + # gdk-pixbuf disables the thumbnailer in cross-builds (https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/fc37708313a5fc52083cf10c9326f3509d67701f) + # and therefore makeWrapper will fail because 'gdk-pixbuf-thumbnailer' the executable does not exist. + '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # It assumes gdk-pixbuf-thumbnailer can find the webp loader in the loaders.cache referenced by environment variable, breaking containment. # So we replace it with a wrapped executable. mkdir -p "$out/bin" diff --git a/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/pkgs/development/libraries/wxwidgets/wxGTK32.nix index 3094f253a01ab..1664552b8ce0b 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK32.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK32.nix @@ -51,23 +51,15 @@ let in stdenv.mkDerivation rec { pname = "wxwidgets"; - version = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - hash = "sha256-YkV150sDsfBEHvHne0GF6i8Y5881NrByPkLtPAmb24E="; + hash = "sha256-ibkXs693xO+z3JuMvlG4b/+A8f4Lf5TYqdDa67fb9ck="; }; - patches = [ - (fetchpatch { - name = "avoid_gtk3_crash.patch"; - url = "https://github.com/wxWidgets/wxWidgets/commit/8ea22b5e92bf46add0b20059f6e39a938858ff97.patch"; - hash = "sha256-zAyqVTdej4F3R7vVMLiKkXqJTAHDtGYJnyjaRyDmMOM="; - }) - ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 71edeb8387458..cf941b68d4025 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.68.0"; + version = "3.69.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "adafruit_platformdetect"; inherit version; - hash = "sha256-wJgnwe8szhLMQWABiWC8nluuJICezuhy//OMeMIjftk="; + hash = "sha256-J+4VSA+2xZCNoLrICNXpmIG8tU6cnOn4EjEnN1VFGYU="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index 0b4bf7483d84a..0a7e40e46ed9a 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "aiomisc"; - version = "17.5.19"; + version = "17.5.24"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-0tcWfi4zxqDDMknDPOLNm+S+K1qmHQ5n/PqNFyNbwZg="; + hash = "sha256-9/7QI9z5dYADNRIWBelrUoNe/LaHqpb/Ch4e1Z9I1s4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/azure-storage-queue/default.nix b/pkgs/development/python-modules/azure-storage-queue/default.nix index 8f3a18b51c6ef..50f5d701138b5 100644 --- a/pkgs/development/python-modules/azure-storage-queue/default.nix +++ b/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "azure-storage-queue"; - version = "12.9.0"; + version = "12.10.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mBAbDhfaDUcM9XALbEDP50Q57Dycds84OYCW5zcbnRs="; + hash = "sha256-dnuj1czNtPcJdOXOYdFkx6t0cyz7K0Qd2HN2aaIRbag="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 53044a7531721..56d6af0a7f0fd 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.120"; + version = "1.34.121"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-GXkBOFjyXhrti7Xmn60xedVnB1Fsfw9Sr5OYDQCIhWc="; + hash = "sha256-tqLJmBDBbkfVmHKmYSW/6H1a+5e1YTZXoVxoddXjU24="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 21bc9037d1470..e7581a39eddfe 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.120"; + version = "1.34.121"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-oeSSAAEsb7/0eyK6cURO+fQ1P+ErEa8bBjCHsIEe508="; + hash = "sha256-8OvFc9QA/HxK1thXU+N9pi8oZenlTH01KAtifZuoS94="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix new file mode 100644 index 0000000000000..0e89c528057bd --- /dev/null +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -0,0 +1,62 @@ +{ + lib, + attrs, + buildPythonPackage, + docstring-parser, + fetchFromGitHub, + importlib-metadata, + poetry-core, + poetry-dynamic-versioning, + pydantic, + pytest-mock, + pytestCheckHook, + pythonOlder, + rich, + rich-rst, + typing-extensions, +}: + +buildPythonPackage rec { + pname = "cyclopts"; + version = "2.6.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "BrianPugh"; + repo = "cyclopts"; + rev = "refs/tags/v${version}"; + hash = "sha256-GWUD9Qu2EKrT7nwlmSpJ31LWSvv6mASxsXGznumusdw="; + }; + + build-system = [ + poetry-core + poetry-dynamic-versioning + ]; + + dependencies = [ + attrs + docstring-parser + importlib-metadata + rich + rich-rst + typing-extensions + ]; + + nativeCheckInputs = [ + pydantic + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "cyclopts" ]; + + meta = with lib; { + description = "Module to create CLIs based on Python type hints"; + homepage = "https://github.com/BrianPugh/cyclopts"; + changelog = "https://github.com/BrianPugh/cyclopts/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix index a5a91f975c786..70cc28459df35 100644 --- a/pkgs/development/python-modules/dsmr-parser/default.nix +++ b/pkgs/development/python-modules/dsmr-parser/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dsmr-parser"; - version = "1.4.0"; + version = "1.4.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "ndokter"; repo = "dsmr_parser"; rev = "refs/tags/v${version}"; - hash = "sha256-4L7hLDd/hYYdhnkcPRK48FnHutbyDXpnhQoVXUQLoDo="; + hash = "sha256-lP4KU3k7dGYHv24uNffTNe60u11Xg7YG05F/joVZu/Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix b/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix index b824fd0009708..d0631dcf3963f 100644 --- a/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix +++ b/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix @@ -8,7 +8,6 @@ notebook, pyyaml, tornado, - nose, pytestCheckHook, selenium, }: @@ -35,7 +34,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - nose pytestCheckHook selenium ]; diff --git a/pkgs/development/python-modules/langchain-chroma/default.nix b/pkgs/development/python-modules/langchain-chroma/default.nix new file mode 100644 index 0000000000000..fb11a1abeed4a --- /dev/null +++ b/pkgs/development/python-modules/langchain-chroma/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + chromadb, + langchain-core, + numpy, + poetry-core, + pytestCheckHook, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "langchain-chroma"; + version = "0.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langchain"; + rev = "refs/tags/langchain-chroma==${version}"; + hash = "sha256-PW4vfZVccuYnaR0jtOfHVaXXYoUyQbCfB8NwM+mXFGc="; + }; + + sourceRoot = "${src.name}/libs/partners/chroma"; + + build-system = [ poetry-core ]; + + dependencies = [ + langchain-core + chromadb + numpy + ]; + + pythonImportsCheck = [ "langchain_chroma" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "langchain-chroma==(.*)" + ]; + }; + + meta = { + description = "Build context-aware reasoning applications"; + homepage = "https://github.com/langchain-ai/langchain"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/development/python-modules/langfuse/default.nix b/pkgs/development/python-modules/langfuse/default.nix new file mode 100644 index 0000000000000..ba8cb7db308f6 --- /dev/null +++ b/pkgs/development/python-modules/langfuse/default.nix @@ -0,0 +1,63 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + backoff, + httpx, + idna, + langchain, + llama-index, + openai, + packaging, + poetry-core, + pydantic, + pythonRelaxDepsHook, + wrapt, +}: + +buildPythonPackage rec { + pname = "langfuse"; + version = "2.33.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "langfuse"; + repo = "langfuse-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-ZPCL3Xle4qEw2pNIcja252meep26W/RbVEk2suzywYI="; + }; + + build-system = [ poetry-core ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRelaxDeps = [ "packaging" ]; + + dependencies = [ + backoff + httpx + idna + packaging + pydantic + wrapt + ]; + + optional-dependencies = { + langchain = [ langchain ]; + llama-index = [ llama-index ]; + openai = [ openai ]; + }; + + pythonImportsCheck = [ "langfuse" ]; + + # tests require network access and openai api key + doCheck = false; + + meta = { + description = "Instrument your LLM app with decorators or low-level SDK and get detailed tracing/observability"; + homepage = "https://github.com/langfuse/langfuse-python"; + changelog = "https://github.com/langfuse/langfuse-python/releases/tag/${src.rev}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/development/python-modules/mujoco/default.nix b/pkgs/development/python-modules/mujoco/default.nix index 2ff364503060a..3f8fd526e6439 100644 --- a/pkgs/development/python-modules/mujoco/default.nix +++ b/pkgs/development/python-modules/mujoco/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mujoco"; - version = "3.1.5"; + inherit (mujoco) version; pyproject = true; @@ -28,7 +28,7 @@ buildPythonPackage rec { # in the project's CI. src = fetchPypi { inherit pname version; - hash = "sha256-kJm6YAE0HMnji3uUuO96ZzRsdjj6PpT1IHQ6NXiR8pY="; + hash = "sha256-fPiIdSbwcedBHcAs4c1mXjm0tgg/3/Sf4TSKgtIxRlE="; }; nativeBuildInputs = [ @@ -82,11 +82,14 @@ buildPythonPackage rec { '' ); - meta = with lib; { + meta = { description = "Python bindings for MuJoCo: a general purpose physics simulator."; homepage = "https://mujoco.org/"; changelog = "https://github.com/google-deepmind/mujoco/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ tmplt ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + GaetanLepage + tmplt + ]; }; } diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index 9b0177ce10ecd..e7494472a12dd 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.21.0"; + version = "2.22.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-cs04HGmKG1I42AYH1BOfm9tnbSQuCAxo5KOdJ4/ysos="; + hash = "sha256-Kvse8eSlhzIBJvvJ7KoV0FCf9muQHkFS4ozwWp0WLz0="; }; build-system = [ diff --git a/pkgs/development/python-modules/ray/binary-hashes.nix b/pkgs/development/python-modules/ray/binary-hashes.nix index 10f3e946bdf86..45e06d9caff8d 100644 --- a/pkgs/development/python-modules/ray/binary-hashes.nix +++ b/pkgs/development/python-modules/ray/binary-hashes.nix @@ -1,8 +1,8 @@ { cp310 = { - hash = "sha256-VWEPjq5lzlaGvedaV4LOY+KgESzNImK4rNcHJk2m2+o="; + hash = "sha256-e0B3uGc5Yp4BC8bQAaiQCaouH+qUxAjA7jB2f8DA6m0="; }; cp311 = { - hash = "sha256-FcEJ/ZlpMmMjyL2wcBzZryHIX0ZQAvdJUGIvmlgOxOU="; + hash = "sha256-cZX0rjCgfyGqAM99lFZI7WlotjyksCpb3H/DCFP0lBA="; }; } diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index 412dffc4925f9..e169a6a66f101 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -53,7 +53,7 @@ let pname = "ray"; - version = "2.23.0"; + version = "2.24.0"; in buildPythonPackage rec { inherit pname version; @@ -122,7 +122,7 @@ buildPythonPackage rec { "virtualenv" ]; - propagatedBuildInputs = [ + dependencies = [ attrs aiohttp aiohttp-cors @@ -158,12 +158,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "ray" ]; - meta = with lib; { + meta = { description = "A unified framework for scaling AI and Python applications"; homepage = "https://github.com/ray-project/ray"; changelog = "https://github.com/ray-project/ray/releases/tag/ray-${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ billhuang ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ billhuang ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 7bccaef947209..640d64b51b20a 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.9.0"; + version = "0.9.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-5rlPGmyBdEG9qjJPpEPr1oXLYlZiBtXzupPpVRrR9wA="; + hash = "sha256-Y07QBUZs7olagoJ+ihIpgkAt9yit+4WK/2YDfvHPYOk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/rich-argparse/default.nix b/pkgs/development/python-modules/rich-argparse/default.nix index 459c5db23f99a..69d657d9b15c7 100644 --- a/pkgs/development/python-modules/rich-argparse/default.nix +++ b/pkgs/development/python-modules/rich-argparse/default.nix @@ -3,33 +3,35 @@ buildPythonPackage, fetchFromGitHub, hatchling, - rich, pytestCheckHook, + pythonOlder, + rich, }: buildPythonPackage rec { pname = "rich-argparse"; - version = "1.4.0"; - format = "pyproject"; + version = "1.5.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "hamdanal"; repo = "rich-argparse"; rev = "refs/tags/v${version}"; - hash = "sha256-iQ8x8UM0zmb2qYUpSh6RSEaBMrDpwY0ZHaJ9GJqn4Hs="; + hash = "sha256-NcsEGImUAqwZI6Ga3UIqnoELvz6WRKyVqGkR4jPIKPI="; }; - propagatedBuildInputs = [ - hatchling - rich - ]; + build-system = [ hatchling ]; + + dependencies = [ rich ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "rich_argparse" ]; meta = with lib; { - description = "Format argparse help output using rich."; + description = "Format argparse help output using rich"; homepage = "https://github.com/hamdanal/rich-argparse"; changelog = "https://github.com/hamdanal/rich-argparse/blob/v${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/securityreporter/default.nix b/pkgs/development/python-modules/securityreporter/default.nix index e8ec6c6510cfa..4535749ac2aaa 100644 --- a/pkgs/development/python-modules/securityreporter/default.nix +++ b/pkgs/development/python-modules/securityreporter/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "securityreporter"; - version = "1.0.2"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "dongit-org"; repo = "python-reporter"; rev = "refs/tags/v${version}"; - hash = "sha256-mBZVsoDnDRYHdcFzi4kuwmAJDRdpysUbNRcDzIhYRGY="; + hash = "sha256-Ddq1qjaQemawK+u3ArlsChrkzRbcuaj5LrswyTGwTrg="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 2e8518013be4c..f08fcd85ab5a7 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1163"; + version = "3.0.1164"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-b+b9z+UK0juhQW55mwTTY/j73Aio7N2aTYHEcwvX5RE="; + hash = "sha256-Z1/iSfhZ74gpQ6DdwcnlThz8kSQphXMUe7PsHiZQQu4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix index 6951192f52c48..6a3932588b4e7 100644 --- a/pkgs/development/python-modules/torchrl/default.nix +++ b/pkgs/development/python-modules/torchrl/default.nix @@ -150,6 +150,10 @@ buildPythonPackage rec { "test_trans_parallel_env_check" "test_trans_serial_env_check" "test_transform_env" + + # undeterministic + "test_distributed_collector_updatepolicy" + "test_timeit" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index ead211c160b1d..b192152f66bce 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "9.1.0"; + version = "9.1.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-jOjja+nuh2asYcIO5QVwmXC1vGlbzEhRnMyvq2paCPU="; + hash = "sha256-LluMl5NdyI4aobxNoLtBv5BU4sAq/EhqvqNAxhOA5Og="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/youless-api/default.nix b/pkgs/development/python-modules/youless-api/default.nix index 7d5cf2f89b3e6..d331e4f1771e5 100644 --- a/pkgs/development/python-modules/youless-api/default.nix +++ b/pkgs/development/python-modules/youless-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "youless-api"; - version = "2.0.0"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "gjong"; repo = "youless-python-bridge"; rev = "refs/tags/${version}"; - hash = "sha256-FnbfwjrzorLDUi9GJLY+pt5zSn4VpVC3Umc/FH46Pzo="; + hash = "sha256-gygChn5yXuTrVGP82ijKJHcjEuNTu6ZNikc87n8WTrI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 2e270c265a068..2c6437656e0e3 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.112"; + version = "3.2.128"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-VE9dxDDIZVT1aajEWHXbui711HjFvgZMEbXCBiq1nKc="; + hash = "sha256-BnfSKEetEofNs/74K0Pxqs6q55YQPGKAhV++pVl2tug="; }; patches = [ ./flake8-compat-5.x.patch ]; diff --git a/pkgs/development/tools/goperf/default.nix b/pkgs/development/tools/goperf/default.nix index b4147456711df..f49859dd0db29 100644 --- a/pkgs/development/tools/goperf/default.nix +++ b/pkgs/development/tools/goperf/default.nix @@ -8,15 +8,15 @@ buildGoModule rec { pname = "goperf"; - version = "0-unstable-2024-05-10"; + version = "0-unstable-2024-06-04"; src = fetchgit { url = "https://go.googlesource.com/perf"; - rev = "bedb9135df6d63a551db71a3fa872a2816e90cf2"; - hash = "sha256-e2dr/eeKoc0Vpxx29bmxhfYsj13oEFs9h1/mBmDbWM4="; + rev = "3b48cf0e01640b30e676c2d0ffe23b85992be961"; + hash = "sha256-QOTTBc0pxVU2wf1BJt2GiTs28AuMlrjJ50J47EmQt+U="; }; - vendorHash = "sha256-MtDvOn+cjlEtObzmYnsQa2BkgIeKr/j18wk5QK3JDuk="; + vendorHash = "sha256-O1FxOtRcg4zM2X1YcVFBsy1OsRMZXmAT0ZmGWmCn81g="; passthru.updateScript = writeShellScript "update-goperf" '' export UPDATE_NIX_ATTR_PATH=goperf diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index e13f3a157b641..6db6644d88fe7 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -30,6 +30,14 @@ let inherit sha256; }; + meta = with lib; { + homepage = "https://www.nvidia.com/object/unix.html"; + license = licenses.unfreeRedistributable; + platforms = nvidia_x11.meta.platforms; + mainProgram = "nvidia-settings"; + maintainers = with maintainers; [ abbradar aidalgol ]; + }; + libXNVCtrl = stdenv.mkDerivation { pname = "libXNVCtrl"; version = nvidia_x11.settingsVersion; @@ -62,6 +70,10 @@ let cp NVCtrlLib.h $out/include/NVCtrl cp -P libXNVCtrl.so* $out/lib ''; + + meta = meta // { + description = "NVIDIA NV-CONTROL X extension"; + }; }; in @@ -102,21 +114,20 @@ stdenv.mkDerivation { fi ''; - nativeBuildInputs = [ pkg-config m4 addOpenGLRunpath ]; + nativeBuildInputs = [ pkg-config m4 addOpenGLRunpath ] + ++ lib.optionals withGtk3 [ wrapGAppsHook3 ]; - buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ] - ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook3 ]; + buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 dbus ] + ++ lib.optionals (withGtk2 || lib.versionOlder nvidia_x11.settingsVersion "525.53") [ gtk2 ] + ++ lib.optionals withGtk3 [ gtk3 librsvg ]; installFlags = [ "PREFIX=$(out)" ]; - postInstall = '' - ${lib.optionalString (!withGtk2) '' - rm -f $out/lib/libnvidia-gtk2.so.* - ''} - ${lib.optionalString (!withGtk3) '' - rm -f $out/lib/libnvidia-gtk3.so.* - ''} - + postInstall = lib.optionalString (!withGtk2) '' + rm -f $out/lib/libnvidia-gtk2.so.* + '' + lib.optionalString (!withGtk3) '' + rm -f $out/lib/libnvidia-gtk3.so.* + '' + '' # Install the desktop file and icon. # The template has substitution variables intended to be replaced resulting # in absolute paths. Because absolute paths break after the desktop file is @@ -141,12 +152,7 @@ stdenv.mkDerivation { inherit libXNVCtrl; }; - meta = with lib; { - homepage = "https://www.nvidia.com/object/unix.html"; + meta = meta // { description = "Settings application for NVIDIA graphics cards"; - license = licenses.unfreeRedistributable; - platforms = nvidia_x11.meta.platforms; - mainProgram = "nvidia-settings"; - maintainers = with maintainers; [ abbradar aidalgol ]; }; } diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix index 0ea8b179c8477..6ac81c919b2ff 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "mushroom"; - version = "3.6.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "piitaya"; repo = "lovelace-mushroom"; rev = "v${version}"; - hash = "sha256-vMBjVPMofQb2mXFCkkEQM8TcOI9BBoosppbBr8jUKh4="; + hash = "sha256-sH0Qgiv4VeWwWV3RFnp2M4RH79S+PR8Z2nhPtQp0EnY="; }; - npmDepsHash = "sha256-nufQRdBiYzB9+eTYNb0iwLIAF9OQ7feVfMFcGjFowoc="; + npmDepsHash = "sha256-L7r417eCfelQM6ZxxJvkZdGBhPmcM2mSHvLa8RN0D8k="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 2e4df7b51dc9f..12be474fa5aec 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -12,13 +12,13 @@ buildGoModule rec { # See https://docs.mattermost.com/upgrade/extended-support-release.html # When a new ESR version is available (e.g. 8.1.x -> 9.5.x), update # the version regex in passthru.updateScript as well. - version = "9.5.5"; + version = "9.5.6"; src = fetchFromGitHub { owner = "mattermost"; repo = "mattermost"; rev = "v${version}"; - hash = "sha256-ZaFXuYm9SEE9ARN5PG8vjt9WnNfGiALilGzjfnDP7aA="; + hash = "sha256-bLnvbduP6h9o82BQUNh9MyFpW/Cbl6c5o9hrPV0Z8+0="; }; # Needed because buildGoModule does not support go workspaces yet. @@ -34,7 +34,7 @@ buildGoModule rec { webapp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - hash = "sha256-tgds8eTBeisuJcLgtx6zOiFUcVL1oU0LLbPqmh4SQUU="; + hash = "sha256-ZlvO/7kdMopIHBDdFp6wSQCR+NobGdDC6PcVd1iG16E="; }; vendorHash = "sha256-TJCtgNf56A1U0EbV5gXjTro+YudVBRWiSZoBC3nJxnE="; diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index eebb57eaa8632..001ec55fb8d6e 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.93.6"; + version = "0.94.4"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-5HGLzdygcM7GldtU24Arbr/AaGJYlyqEVIpc+arfFsw="; + hash = "sha256-wPP3ca76y+Tdp/GgoIMS3DdxDi7hXLUShO5anRaX4ks="; }; - vendorHash = "sha256-wGgzVtQc4e0thiM9fJb7BxJl348wCDZvPCx0+Qlw0mQ="; + vendorHash = "sha256-P34ff6yPnQcAUlNEnfFCu1QG31eoWM7h1OrznoFlRDo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/filesystems/cpcfs/default.nix b/pkgs/tools/filesystems/cpcfs/default.nix index 3b1d54ba427cd..654a889614406 100644 --- a/pkgs/tools/filesystems/cpcfs/default.nix +++ b/pkgs/tools/filesystems/cpcfs/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ncurses readline ronn ]; + env.NIX_CFLAGS_COMPILE = "-std=gnu89"; + postPatch = '' substituteInPlace Makefile \ --replace '-ltermcap' '-lncurses' \ diff --git a/pkgs/tools/package-management/lix/common.nix b/pkgs/tools/package-management/lix/common.nix index 7154dd49c5f6e..e0d504774235c 100644 --- a/pkgs/tools/package-management/lix/common.nix +++ b/pkgs/tools/package-management/lix/common.nix @@ -260,7 +260,7 @@ let passthru = { inherit aws-sdk-cpp boehmgc; tests = { - misc = nixosTests.nix-misc.lix.passthru.override { nixPackage = self; }; + misc = nixosTests.nix-misc.lix; }; }; diff --git a/pkgs/tools/security/ghauri/default.nix b/pkgs/tools/security/ghauri/default.nix index fc7cfd2bb1e15..426cb66b7e6f1 100644 --- a/pkgs/tools/security/ghauri/default.nix +++ b/pkgs/tools/security/ghauri/default.nix @@ -5,17 +5,21 @@ python3.pkgs.buildPythonApplication rec { pname = "ghauri"; - version = "1.3.2"; - format = "setuptools"; + version = "1.3.4"; + pyproject = true; src = fetchFromGitHub { owner = "r0oth3x49"; repo = "ghauri"; rev = "refs/tags/${version}"; - hash = "sha256-zd+Uf2t8yBWi07+BJYYYQ+4fIissuBdXjj877ul4gAQ="; + hash = "sha256-1xrswAxavUz3ybmT0E00pjiR8pmHvuBXE4zhAPnz5MQ="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ + setuptools + ]; + + dependencies = with python3.pkgs; [ chardet colorama requests @@ -31,10 +35,10 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Tool for detecting and exploiting SQL injection security flaws"; - mainProgram = "ghauri"; homepage = "https://github.com/r0oth3x49/ghauri"; changelog = "https://github.com/r0oth3x49/ghauri/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "ghauri"; }; } diff --git a/pkgs/tools/security/govulncheck/default.nix b/pkgs/tools/security/govulncheck/default.nix index 1151ee52bd5b0..13e2aa17bddae 100644 --- a/pkgs/tools/security/govulncheck/default.nix +++ b/pkgs/tools/security/govulncheck/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "govulncheck"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "golang"; repo = "vuln"; rev = "refs/tags/v${version}"; - hash = "sha256-aDt4TCbs5yBeJu/Fr95uI3BvPBaclnQMuJYPUXT7S+I="; + hash = "sha256-kpAk6Gn/uXWPzg6thp2RYrP0kouMmEaVxZSaJpf445Y="; }; patches = [ @@ -23,7 +23,7 @@ buildGoModule rec { }) ]; - vendorHash = "sha256-YsZ9CchThybwgUjBg6hDQZ0bEEO18lidbGf9CIfzICc="; + vendorHash = "sha256-0RtnyeOuvOv8cv4pFjRAR7VJB2FG6hqMML+Vz/FAjFM="; subPackages = [ "cmd/govulncheck" @@ -40,6 +40,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://pkg.go.dev/golang.org/x/vuln/cmd/govulncheck"; downloadPage = "https://github.com/golang/vuln"; + changelog = "https://github.com/golang/vuln/releases/tag/v${version}"; description = "The database client and tools for the Go vulnerability database, also known as vuln"; mainProgram = "govulncheck"; longDescription = '' diff --git a/pkgs/tools/video/go2rtc/default.nix b/pkgs/tools/video/go2rtc/default.nix index 90a982335facc..44ebfbc4c4f99 100644 --- a/pkgs/tools/video/go2rtc/default.nix +++ b/pkgs/tools/video/go2rtc/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go2rtc"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "AlexxIT"; repo = "go2rtc"; rev = "refs/tags/v${version}"; - hash = "sha256-GqZs11g05xc3Nob/jqGbG/rFYBhyEPNdXYJuJBiAyko="; + hash = "sha256-p79LX7tHkQTVBWmXsKHMcXpC5idMgBmDtZxq+kQ0GEo="; }; - vendorHash = "sha256-5c3oauklMD9fEnVGPyWq6hR5jz6pSnq2kmdq+0JBfpo="; + vendorHash = "sha256-mUdUMZf3KhJyE0iv2yvWtkHa+pyXcv2RTZY+JtBLrSQ="; CGO_ENABLED = 0; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f785b8a4ef2dc..cb83ada8daa55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7410,8 +7410,6 @@ with pkgs; dt-schema = callPackage ../development/tools/dt-schema { }; - dub = callPackage ../development/tools/build-managers/dub { }; - inherit (import ../build-support/dlang/dub-support.nix { inherit callPackage; }) buildDubPackage dub-to-nix; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ecedeed228d2..4bdc28beeeca7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2682,6 +2682,8 @@ self: super: with self; { cyclonedx-python-lib = callPackage ../development/python-modules/cyclonedx-python-lib { }; + cyclopts = callPackage ../development/python-modules/cyclopts { }; + cymem = callPackage ../development/python-modules/cymem { }; cypari2 = callPackage ../development/python-modules/cypari2 { }; @@ -6489,6 +6491,8 @@ self: super: with self; { langchain = callPackage ../development/python-modules/langchain { }; + langchain-chroma = callPackage ../development/python-modules/langchain-chroma { }; + langchain-community = callPackage ../development/python-modules/langchain-community { }; langchain-core = callPackage ../development/python-modules/langchain-core { }; @@ -6499,6 +6503,8 @@ self: super: with self; { langdetect = callPackage ../development/python-modules/langdetect { }; + langfuse = callPackage ../development/python-modules/langfuse { }; + langid = callPackage ../development/python-modules/langid { }; langsmith = callPackage ../development/python-modules/langsmith { }; |