diff --git a/doc/hooks/index.md b/doc/hooks/index.md index 42a6553344b2..050345c98a55 100644 --- a/doc/hooks/index.md +++ b/doc/hooks/index.md @@ -25,6 +25,7 @@ patch-rc-path-hooks.section.md perl.section.md pkg-config.section.md postgresql-test-hook.section.md +premake.section.md python.section.md scons.section.md tetex-tex-live.section.md diff --git a/doc/hooks/premake.section.md b/doc/hooks/premake.section.md new file mode 100644 index 000000000000..b2c2d8fb637c --- /dev/null +++ b/doc/hooks/premake.section.md @@ -0,0 +1,7 @@ +# Premake {#premake-hook} + +This setup hook attempts to configure the package using [the Premake build configuration system](https://premake.github.io/). It overrides the `configurePhase` by default, if none exists. + +[]{#premake-hook-premakefile} The Premakefile to use can be specified by setting `premakefile` in the derivation. + +[]{#premake-hook-premakeFlagsArray} The flags passed to Premake can be configured by adding strings to the `premakeFlags` list. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bc493ce83872..78100e49ad34 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3277,7 +3277,10 @@ github = "callumio"; githubId = 16057677; name = "Callum Leslie"; - keys = [ { fingerprint = "BC82 4BB5 1656 D144 285E A0EC D382 C4AF EECE AA90"; } ]; + keys = [ + { fingerprint = "BC82 4BB5 1656 D144 285E A0EC D382 C4AF EECE AA90"; } + { fingerprint = "890B 06FB 209A 3E44 9491 C028 03B0 1F42 7831 BCFD"; } + ]; }; calvertvl = { email = "calvertvl@gmail.com"; diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 4f773fccd23a..e609253950f1 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -243,7 +243,7 @@ - `forgejo` and `forgejo-lts` no longer support the opt-in feature [PAM (Pluggable Authentication Module)](https://forgejo.org/docs/latest/user/authentication/#pam-pluggable-authentication-module). -- `gitea` no longer supports the opt-in feature [PAM (Pluggable Authentication Module)][https://docs.gitea.com/usage/authentication#pam-pluggable-authentication-module]. +- `gitea` no longer supports the opt-in feature [PAM (Pluggable Authentication Module)](https://docs.gitea.com/usage/authentication#pam-pluggable-authentication-module). - `services.ddclient.use` has been deprecated: `ddclient` now supports separate IPv4 and IPv6 configuration. Use `services.ddclient.usev4` and `services.ddclient.usev6` instead. diff --git a/nixos/modules/services/matrix/dendrite.nix b/nixos/modules/services/matrix/dendrite.nix index 5152dfadf2e5..fdd91d776254 100644 --- a/nixos/modules/services/matrix/dendrite.nix +++ b/nixos/modules/services/matrix/dendrite.nix @@ -258,7 +258,7 @@ in default = { }; description = '' Configuration for dendrite, see: - + for available options with which to populate settings. ''; }; diff --git a/nixos/modules/services/networking/netbird.nix b/nixos/modules/services/networking/netbird.nix index e68c39946fe3..d39c373dbc94 100644 --- a/nixos/modules/services/networking/netbird.nix +++ b/nixos/modules/services/networking/netbird.nix @@ -35,9 +35,7 @@ let cfg = config.services.netbird; in { - meta.maintainers = with maintainers; [ - misuzu - ]; + meta.maintainers = with maintainers; [ ]; meta.doc = ./netbird.md; options.services.netbird = { diff --git a/nixos/tests/netbird.nix b/nixos/tests/netbird.nix index 7342e8d04a39..887747437c22 100644 --- a/nixos/tests/netbird.nix +++ b/nixos/tests/netbird.nix @@ -2,9 +2,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "netbird"; - meta = with pkgs.lib.maintainers; { - maintainers = [ misuzu ]; - }; + meta.maintainers = with pkgs.lib.maintainers; [ ]; nodes = { node = { ... }: { diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/applications/audio/tageditor/default.nix index 3fd4f9ecf6af..173ced9ca525 100644 --- a/pkgs/applications/audio/tageditor/default.nix +++ b/pkgs/applications/audio/tageditor/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "tageditor"; - version = "3.9.2"; + version = "3.9.3"; src = fetchFromGitHub { owner = "martchus"; repo = pname; rev = "v${version}"; - hash = "sha256-Bmi1U/SmYENlwsysAHsgFODU7R1RnU3xqbwhPEwsGcM="; + hash = "sha256-KAtOnTf3foOILDfTjVpkCOG6jsyS5fv0/Wv9Zcut2oE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/sublime/4/packages.nix b/pkgs/applications/editors/sublime/4/packages.nix index 9bfbbd1c1d69..50588587f599 100644 --- a/pkgs/applications/editors/sublime/4/packages.nix +++ b/pkgs/applications/editors/sublime/4/packages.nix @@ -5,15 +5,15 @@ let in { sublime4 = common { - buildVersion = "4169"; - x64sha256 = "jk9wKC0QgfhiHDYUcnDhsmgJsBPOUmCkyvQeI54IJJ4="; - aarch64sha256 = "/W/xGbE+8gGu1zNh6lERZrfG9Dh9QUGkYiqTzp216JI="; + buildVersion = "4180"; + x64sha256 = "pl42AR4zWF3vx3wPSZkfIP7Oksune5nsbmciyJUv8D4="; + aarch64sha256 = "zRg2jfhi+g6iLrMF1TGAYT+QQKSNI1W4Yv1bz9oEXHg="; } { }; sublime4-dev = common { - buildVersion = "4175"; + buildVersion = "4178"; dev = true; - x64sha256 = "xncyxAaFJLLMko/iF6fhnpkOEHzD3nzWWGQCRK9srq4="; - aarch64sha256 = "oqz1HASwmv0B1T3ZQBdIOZD9wYcHbni8tovW7jGp3KM="; + x64sha256 = "2eTdb5MzXK3QbAEzl1yxURj4m/PqGHPVnHZV2WzD6Jc="; + aarch64sha256 = "NLLOB4WnujMx3+wf6Evi+yBWM6463EZoNL2wEdJA8BA="; } { }; } diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix index 0dc44c4eb647..96c363f6cf92 100644 --- a/pkgs/applications/misc/fuzzel/default.nix +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -24,14 +24,14 @@ assert svgSupport -> enableCairo; stdenv.mkDerivation (finalAttrs: { pname = "fuzzel"; - version = "1.10.2"; + version = "1.11.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fuzzel"; rev = finalAttrs.version; - hash = "sha256-I+h93/I1Kra2S5QSi2XgICAVrcUmO9cmb8UttVuzjwg="; + hash = "sha256-FM5HvPfLVmuKpS3/0m2QM/lSRcWsVpnwtJ++L3Uo5Dc="; }; depsBuildBuild = [ diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index fe15d4b45e7b..2d37a6868310 100644 --- a/pkgs/applications/misc/process-compose/default.nix +++ b/pkgs/applications/misc/process-compose/default.nix @@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config"; in buildGoModule rec { pname = "process-compose"; - version = "1.24.2"; + version = "1.27.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-R+FkaCAI7Kkxd1UfdmeYo9BEUN0HUGZf2UDKxEvlTlQ="; + hash = "sha256-v8tcnndAP4+1cRWW2LmAsmSIvALdeESuuv2QmRQhq/s="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -43,7 +43,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-xGQf6E5QQyFdCUoFkPhWMlE6RQnQEJ/P6fBtUsaRz/Y="; + vendorHash = "sha256-G4ar+9ARBwR77t/6NswUDXpUw38rYnLy9lIep302mNI="; doCheck = false; diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 9d017e086f94..a993a57deb40 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -35,14 +35,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ }: stdenv.mkDerivation (finalAttrs: { - version = "1.6.1"; + version = "1.6.2"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - hash = "sha256-ZyYByMNMlXRjCCrvr5l+ePkWDrX7uxleVvxr09YeURQ="; + hash = "sha256-L56aX5UFFodSR2YHWt6Y+s83q3YoAuYvyqXP/XVMp20="; }; buildInputs = [ diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index be658136505c..d4788c80bafc 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.7.1"; + version = "7.7.2"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Bs7bKB9P6TzlH4ztXFsQ1Q81nxNR5n6cuZ6Ap23nLUw="; + sha256 = "sha256-orn1pxHefYCp0vPsZ4TI5Y76tpR8dOcEmxA3cHwfYQU="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/krelay/default.nix b/pkgs/applications/networking/cluster/krelay/default.nix index 3b1bbfd73896..fdf8e90c0477 100644 --- a/pkgs/applications/networking/cluster/krelay/default.nix +++ b/pkgs/applications/networking/cluster/krelay/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "krelay"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "knight42"; repo = pname; rev = "v${version}"; - hash = "sha256-MnIeWsFpxSpE01uZtfI8Mhg6TSI9quz2TDKaMmBYbR0="; + hash = "sha256-TonkGh4j+xLGgSpspCedg6c2NpIZIzp5pv8VtWFssPk="; }; - vendorHash = "sha256-N8r+C+j9hyAWdDXTzJgFNUfjL1mROr2KfyY0+XEdZVk="; + vendorHash = "sha256-Qz3q/503A5QmsgEaDqChxS2tcUEJGmeT6YE6R3LBbcY="; subPackages = [ "cmd/client" ]; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 7096c6265b65..c960d0b473b2 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -2,17 +2,18 @@ , curl, fuse3, fetchpatch2 , desktopToDarwinBundle , glib, gtk3, gettext, libxkbfile, libX11, python3 -, freerdp3, libssh, libgcrypt, gnutls, vte +, freerdp3, libssh, libgcrypt, gnutls , pcre2, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon , libsecret, libsoup_3, spice-protocol, spice-gtk, libepoxy, at-spi2-core -, openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk_4_1, harfbuzz +, openssl, gsettings-desktop-schemas, json-glib, libsodium, harfbuzz , wayland # The themes here are soft dependencies; only icons are missing without them. , adwaita-icon-theme , withKf5Wallet ? stdenv.isLinux, libsForQt5 , withLibsecret ? stdenv.isLinux -, withVte ? true +, withWebkitGtk ? false, webkitgtk_4_1 +, withVte ? true, vte }: stdenv.mkDerivation (finalAttrs: { @@ -50,9 +51,10 @@ stdenv.mkDerivation (finalAttrs: { openssl adwaita-icon-theme json-glib libsodium harfbuzz python3 wayland - ] ++ lib.optionals stdenv.isLinux [ fuse3 libappindicator-gtk3 libdbusmenu-gtk3 webkitgtk_4_1 ] + ] ++ lib.optionals stdenv.isLinux [ fuse3 libappindicator-gtk3 libdbusmenu-gtk3 ] ++ lib.optionals withLibsecret [ libsecret ] ++ lib.optionals withKf5Wallet [ libsForQt5.kwallet ] + ++ lib.optionals withWebkitGtk [ webkitgtk_4_1 ] ++ lib.optionals withVte [ vte ]; cmakeFlags = [ @@ -62,11 +64,11 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_AVAHI=OFF" "-DWITH_KF5WALLET=${if withKf5Wallet then "ON" else "OFF"}" "-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}" + "-DWITH_WEBKIT2GTK=${if withWebkitGtk then "ON" else "OFF"}" ] ++ lib.optionals stdenv.isDarwin [ "-DHAVE_LIBAPPINDICATOR=OFF" "-DWITH_CUPS=OFF" "-DWITH_ICON_CACHE=OFF" - "-DWITH_WEBKIT2GTK=OFF" ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [ diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 72dd93f5d33f..d272645ee506 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -11,9 +11,9 @@ in } { }; sublime-merge-dev = common { - buildVersion = "2099"; + buildVersion = "2100"; dev = true; - aarch64sha256 = "6rfUwzSBCJ3CRrL5E4+wBQ3FuB3PaAUCwh5pDtAbNKE="; - x64sha256 = "qIXDlsdaxY8wvky/ClwhZykZTVrUShsV56utb6BRCWQ="; + aarch64sha256 = "BL0hk/8hf660I1HUQMQwvZxB6TpXpygQxOYtuDGfrYw="; + x64sha256 = "NePJt2WttsbqJsduGX6UsOzAce2xW4Mc8Nq9We+ZCSM="; } { }; } diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 5fcd8d694f44..7717c5015cb7 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -152,8 +152,8 @@ let x86-64-v4 = versionAtLeast ccVersion "11.0"; # Intel - skylake = versionAtLeast ccVersion "6.0"; - skylake-avx512 = versionAtLeast ccVersion "6.0"; + skylake = true; + skylake-avx512 = true; cannonlake = versionAtLeast ccVersion "8.0"; icelake-client = versionAtLeast ccVersion "8.0"; icelake-server = versionAtLeast ccVersion "8.0"; @@ -164,7 +164,7 @@ let alderlake = versionAtLeast ccVersion "12.0"; # AMD - znver1 = versionAtLeast ccVersion "6.0"; + znver1 = true; znver2 = versionAtLeast ccVersion "9.0"; znver3 = versionAtLeast ccVersion "11.0"; znver4 = versionAtLeast ccVersion "13.0"; @@ -202,9 +202,9 @@ let else if targetPlatform.isAarch64 then (if isGNU then { - cortex-a53 = versionAtLeast ccVersion "4.8"; # gcc 8c075f - cortex-a72 = versionAtLeast ccVersion "5.1"; # gcc d8f70d - "cortex-a72.cortex-a53" = versionAtLeast ccVersion "5.1"; # gcc d8f70d + cortex-a53 = true; + cortex-a72 = true; + "cortex-a72.cortex-a53" = true; }.${tune} or false else if isClang then { diff --git a/pkgs/by-name/ag/agate/package.nix b/pkgs/by-name/ag/agate/package.nix index 90e2cf394a50..8d83b45bec78 100644 --- a/pkgs/by-name/ag/agate/package.nix +++ b/pkgs/by-name/ag/agate/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "agate"; - version = "3.3.8"; + version = "3.3.9"; src = fetchFromGitHub { owner = "mbrubeck"; repo = "agate"; rev = "v${version}"; - hash = "sha256-HK4ZTpRe6dEvBnjZLisSGXJmD5gTPEnf6f/gN0AHUsI="; + hash = "sha256-u+v9RydB6OIsq2zOSmTDuejneb2uNFhRXsVNlGcPABs="; }; - cargoHash = "sha256-yRCH4TRZ3m7ZG/NAEi1YDisSoad6FxCyojtXVvwbU9w="; + cargoHash = "sha256-oNI+UsxDdHSQGtl6vhxNWSiYVc8TV/vG8UoQX2w4ZoM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index 60ab7d12dafd..695714175c50 100644 --- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix +++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -38,7 +38,6 @@ stdenvNoCC.mkDerivation { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ artturin - diniamo johnrtitor ]; }; diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index 65b9fd1e1f00..387681956e51 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -2,11 +2,11 @@ let pname = "anytype"; - version = "0.42.6"; + version = "0.42.8"; name = "Anytype-${version}"; src = fetchurl { url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage"; - hash = "sha256-ubYk3CsdaUW4AtMYskmFunznUAVcBdbJh4dyGgSs1Io="; + hash = "sha256-MIPKfwIZQah6K+WOQZsTpVcOrws+f4oVa7BoW29K5BA="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 { diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json index 7e19554b72a8..350ca60dfd95 100644 --- a/pkgs/by-name/au/audiobookshelf/source.json +++ b/pkgs/by-name/au/audiobookshelf/source.json @@ -1,9 +1,9 @@ { "owner": "advplyr", "repo": "audiobookshelf", - "rev": "24923c0009446e2db26ec366b25dd38deb2e2573", - "hash": "sha256-afNz4dTEr/6STn6cqSHxugn5ofa0jY4HvUnckJabxdo=", - "version": "2.13.3", - "depsHash": "sha256-fRz4qUxd8lZODQikP011FtvyFCz4fehESUfBmSBLwtA=", - "clientDepsHash": "sha256-VGbwiCuDjA1rtUpLw7gO+Xb5/D09evf/Jrb93H0QCH8=" + "rev": "ce213c3d89458baeb77324ce59a5f2137740564e", + "hash": "sha256-7vPhvsjGJQvus5Mmx8543OuBeuPWC/4cLfHHYmN2lnk=", + "version": "2.13.4", + "depsHash": "sha256-1CmtuzE8R6zkb0DT7gt9MrxErAw0mqY2AkJZh3PjuBQ=", + "clientDepsHash": "sha256-BfrVN70i1e4JWELxLS0jliHLfG4/kN8tj8aQOjsnZ/M=" } diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix index 40c2d9d630ba..5fb86282c392 100644 --- a/pkgs/by-name/bn/bngblaster/package.nix +++ b/pkgs/by-name/bn/bngblaster/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bngblaster"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "rtbrick"; repo = "bngblaster"; rev = finalAttrs.version; - hash = "sha256-VPzlORjLcsHY/rSYFlzKb5dh9D7j302dcRFULVjQSa0="; + hash = "sha256-h4m/tPiLFRi3Dwh6QPmnCCZR4XNOZaz9xoDhOXAcIEQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/cn/cntb/package.nix b/pkgs/by-name/cn/cntb/package.nix index c54695abf703..75efd4e0727c 100644 --- a/pkgs/by-name/cn/cntb/package.nix +++ b/pkgs/by-name/cn/cntb/package.nix @@ -9,7 +9,13 @@ owner = "contabo"; repo = "cntb"; rev = "v${version}"; - hash = "sha256-clDIrZdvEy4oO0ZvqDNLJbr4Ij8D5dcyZPxey6zLV6Q="; + hash = "sha256-5JOO9tWMjy81wSB9Vq/gBYZ0xfrhES0dm/cTqXP8HiI"; + # docs contains two files with the same name but different cases, + # this leads to a different hash on case insensitive filesystems (e.g. darwin) + # https://github.com/contabo/cntb/issues/34 + postFetch = '' + rm -rf $out/openapi/docs + ''; }; subPackages = [ "." ]; diff --git a/pkgs/by-name/gf/gfortran6/package.nix b/pkgs/by-name/gf/gfortran6/package.nix deleted file mode 100644 index c6a91e99bf54..000000000000 --- a/pkgs/by-name/gf/gfortran6/package.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ wrapCC, gcc6 }: -wrapCC ( - gcc6.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - } -) diff --git a/pkgs/by-name/gp/gpscorrelate/package.nix b/pkgs/by-name/gp/gpscorrelate/package.nix index e7109c851f26..b0e87221f8da 100644 --- a/pkgs/by-name/gp/gpscorrelate/package.nix +++ b/pkgs/by-name/gp/gpscorrelate/package.nix @@ -48,6 +48,11 @@ stdenv.mkDerivation rec { doCheck = true; + preCheck = '' + # https://github.com/dfandrich/gpscorrelate/issues/29 + rm tests/data/test005.* + ''; + installTargets = [ "install" "install-po" "install-desktop-file" ]; meta = with lib; { diff --git a/pkgs/by-name/ne/nextpnr/package.nix b/pkgs/by-name/ne/nextpnr/package.nix index 840ecf152491..b6b2eb07bdc1 100644 --- a/pkgs/by-name/ne/nextpnr/package.nix +++ b/pkgs/by-name/ne/nextpnr/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCURRENT_GIT_VERSION=${lib.substring 0 7 (lib.elemAt srcs 0).rev}" - "-DARCH=generic;ice40;ecp5;gowin" + "-DARCH=generic;ice40;ecp5;gowin;himbaechel" "-DBUILD_TESTS=ON" "-DICESTORM_INSTALL_PREFIX=${icestorm}" "-DTRELLIS_INSTALL_PREFIX=${trellis}" @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { "-DUSE_OPENMP=ON" # warning: high RAM usage "-DSERIALIZE_CHIPDBS=OFF" + "-DHIMBAECHEL_GOWIN_DEVICES=all" ] ++ (lib.optional enableGui "-DBUILD_GUI=ON") ++ (lib.optional (enableGui && stdenv.isDarwin) @@ -80,6 +81,7 @@ stdenv.mkDerivation rec { wrapQtApp $out/bin/nextpnr-ice40 wrapQtApp $out/bin/nextpnr-ecp5 wrapQtApp $out/bin/nextpnr-gowin + wrapQtApp $out/bin/nextpnr-himbaechel ''; strictDeps = true; diff --git a/pkgs/by-name/oi/oink/package.nix b/pkgs/by-name/oi/oink/package.nix index c3f4cf4be5bf..405e807e4c33 100644 --- a/pkgs/by-name/oi/oink/package.nix +++ b/pkgs/by-name/oi/oink/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "oink"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "rlado"; repo = "oink"; rev = "v${version}"; - hash = "sha256-XbS4DPNPYfIEnATIG0u+7HPQmtX5rvl77j/3mdVB//8="; + hash = "sha256-nA1M+TIj2mWhaftS5y4D2zIs7HAI4eDRjSdmLUifGKg="; }; vendorHash = null; diff --git a/pkgs/by-name/op/open62541/package.nix b/pkgs/by-name/op/open62541/package.nix index cad730b4b32a..dd32cfbe844c 100644 --- a/pkgs/by-name/op/open62541/package.nix +++ b/pkgs/by-name/op/open62541/package.nix @@ -168,6 +168,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/open62541/open62541/releases/tag/v${finalAttrs.version}"; license = licenses.mpl20; maintainers = with maintainers; [ panicgh ]; - platforms = platforms.linux; + platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix index 95823c5798d6..e9c53a53e203 100644 --- a/pkgs/by-name/ov/ovn/package.nix +++ b/pkgs/by-name/ov/ovn/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "ovn"; - version = "24.03.3"; + version = "24.09.0"; src = fetchFromGitHub { owner = "ovn-org"; repo = "ovn"; rev = "refs/tags/v${version}"; - hash = "sha256-W25Tq5Z7SYIBkq6doNz9WPiPsdDhnbys03rmF4m02eM="; + hash = "sha256-0KXr9oxZqIhPD0HIkDUECCjfEK50JkkJxx8xsZIoAnc="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/pa/patch2pr/package.nix b/pkgs/by-name/pa/patch2pr/package.nix index a563034ee0e3..2ab7f6b7760f 100644 --- a/pkgs/by-name/pa/patch2pr/package.nix +++ b/pkgs/by-name/pa/patch2pr/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "patch2pr"; - version = "0.26.1"; + version = "0.27.0"; src = fetchFromGitHub { owner = "bluekeyes"; repo = "patch2pr"; rev = "v${version}"; - hash = "sha256-7mN5tp0QUlITCPeotMU61FUl0xmr78RMxUsIlq+F3DE="; + hash = "sha256-HKPw9yKJGakY2XTuMr2Beq+UxMnu/je3aEHsM1UR/Sk="; }; - vendorHash = "sha256-YRhB0L1kIPZahS0K94vKr2iexhXkwl3GaNsk16WiLAU="; + vendorHash = "sha256-1ufdkCvTi5hNlpwZZKrkfpoRhWUp7fwHuZ1BPbkkxkY="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/by-name/pl/plumber/package.nix b/pkgs/by-name/pl/plumber/package.nix index 8571bd7ca096..fc907e880241 100644 --- a/pkgs/by-name/pl/plumber/package.nix +++ b/pkgs/by-name/pl/plumber/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "plumber"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "streamdal"; repo = pname; rev = "v${version}"; - hash = "sha256-20rc9TLiCkt9k/Gtr5aoheGiiqOp1eURSqg4p1jTnkE="; + hash = "sha256-L8vpaqt9yCIP3TLPSNUrOC6hXc71mzl4lqiaoNS6zls="; }; vendorHash = null; diff --git a/pkgs/by-name/po/power-profiles-daemon/package.nix b/pkgs/by-name/po/power-profiles-daemon/package.nix index 94028f106eab..7908e0e7b726 100644 --- a/pkgs/by-name/po/power-profiles-daemon/package.nix +++ b/pkgs/by-name/po/power-profiles-daemon/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "power-profiles-daemon"; - version = "0.22"; + version = "0.23"; outputs = [ "out" @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "upower"; repo = "power-profiles-daemon"; rev = finalAttrs.version; - hash = "sha256-NzaneS/Za73HSK2abBZNmP+ZPbhIG+JXfBTPHm2vBeU="; + hash = "sha256-kX8adu+GXxkaHtARUKp51K3Jf9xO+l12vctsJzIavyM="; }; nativeBuildInputs = diff --git a/pkgs/by-name/ru/ruff/Cargo.lock b/pkgs/by-name/ru/ruff/Cargo.lock index 0b513d1e4f25..02d1a20d7cc8 100644 --- a/pkgs/by-name/ru/ruff/Cargo.lock +++ b/pkgs/by-name/ru/ruff/Cargo.lock @@ -194,6 +194,15 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + [[package]] name = "bstr" version = "1.10.0" @@ -511,6 +520,15 @@ dependencies = [ "rustc-hash 1.1.0", ] +[[package]] +name = "cpufeatures" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +dependencies = [ + "libc", +] + [[package]] name = "crc32fast" version = "1.4.0" @@ -616,6 +634,16 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + [[package]] name = "ctrlc" version = "3.4.5" @@ -694,6 +722,16 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + [[package]] name = "dirs" version = "4.0.0" @@ -879,6 +917,16 @@ dependencies = [ "libc", ] +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + [[package]] name = "getopts" version = "0.2.21" @@ -1112,6 +1160,8 @@ dependencies = [ "globset", "lazy_static", "linked-hash-map", + "pest", + "pest_derive", "regex", "serde", "similar", @@ -1707,6 +1757,51 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +[[package]] +name = "pest" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pest_meta" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + [[package]] name = "phf" version = "0.11.2" @@ -1936,6 +2031,7 @@ dependencies = [ "smallvec", "static_assertions", "tempfile", + "test-case", "thiserror", "tracing", "walkdir", @@ -2091,7 +2187,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.6.4" +version = "0.6.5" dependencies = [ "anyhow", "argfile", @@ -2284,7 +2380,7 @@ dependencies = [ [[package]] name = "ruff_linter" -version = "0.6.4" +version = "0.6.5" dependencies = [ "aho-corasick", "annotate-snippets 0.9.2", @@ -2604,7 +2700,7 @@ dependencies = [ [[package]] name = "ruff_wasm" -version = "0.6.4" +version = "0.6.5" dependencies = [ "console_error_panic_hook", "console_log", @@ -2935,6 +3031,17 @@ dependencies = [ "syn", ] +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + [[package]] name = "sharded-slab" version = "0.1.7" @@ -3335,6 +3442,18 @@ version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + [[package]] name = "unic-char-property" version = "0.9.0" diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index 4dc3f31818bb..79c70c88f65c 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/${version}"; - hash = "sha256-AldYWbLtkVtM1sWBCgNym9RZ0QszIh59vQhoysl5/3I="; + hash = "sha256-1V95S0FWHzCxztgip+rbCjji4O71D+QdcSZ/hbABeKg="; }; cargoLock = { @@ -31,6 +31,13 @@ rustPlatform.buildRustPackage rec { }; }; + # Revert the change made in https://github.com/astral-sh/ruff/pull/13299 + # It was causing linking issues: https://github.com/NixOS/nixpkgs/pull/341674#issuecomment-2351172084 + postPatch = '' + substituteInPlace crates/ruff_benchmark/Cargo.toml \ + --replace-fail '"unprefixed_malloc_on_supported_platforms"' ' ' + ''; + nativeBuildInputs = [ installShellFiles ]; buildInputs = [ diff --git a/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix b/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix index f0ddde526f0b..17ba3aa9e4b2 100644 --- a/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix +++ b/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix @@ -1,9 +1,9 @@ { lib , tailscale -, buildGoModule +, buildGo123Module }: -buildGoModule { +buildGo123Module { inherit (tailscale) version src vendorHash CGO_ENABLED; pname = "tailscale-gitops-pusher"; diff --git a/pkgs/by-name/ta/tailscale-nginx-auth/package.nix b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix index 455374e03de8..919a2e77a66b 100644 --- a/pkgs/by-name/ta/tailscale-nginx-auth/package.nix +++ b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, buildGoModule, tailscale }: +{ lib, stdenv, buildGo123Module, tailscale }: -buildGoModule { +buildGo123Module { pname = "tailscale-nginx-auth"; inherit (tailscale) version src vendorHash; diff --git a/pkgs/data/misc/clash-geoip/default.nix b/pkgs/data/misc/clash-geoip/default.nix index 28b2fab1309d..885d952c3230 100644 --- a/pkgs/data/misc/clash-geoip/default.nix +++ b/pkgs/data/misc/clash-geoip/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "clash-geoip"; - version = "20240812"; + version = "20240912"; src = fetchurl { url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb"; - sha256 = "sha256-wX5qBZIwdGFzOlk42SDs8T4QhDovEJ6twyghX/JRgjY="; + sha256 = "sha256-3Cxq5vA53g7+LUgvSneuq7UBjdKppvcVy3fh/cOwDI8="; }; dontUnpack = true; diff --git a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix index f7f79e89dc9c..8feb342638c9 100644 --- a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix +++ b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell-extension-EasyScreenCast"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "EasyScreenCast"; repo = "EasyScreenCast"; rev = finalAttrs.version; - hash = "sha256-rRRMFAdWseTxW6W194TE3yNlnpPX7gLViLPLQW6zuSI="; + hash = "sha256-5PJB+lm4NKeNpS2vg9xaVl5aUR0Rofmt6sEKXfuGG6c="; }; patches = [ diff --git a/pkgs/development/compilers/gcc/all.nix b/pkgs/development/compilers/gcc/all.nix index deb2cf8cfdb7..232241989b9a 100644 --- a/pkgs/development/compilers/gcc/all.nix +++ b/pkgs/development/compilers/gcc/all.nix @@ -1,13 +1,12 @@ { lib , stdenv , gccStdenv -, gcc7Stdenv +, gcc9Stdenv , callPackage -, isl_0_11, isl_0_14, isl_0_17, isl_0_20 +, isl_0_17, isl_0_20 , libcCross , threadsCross , noSysDirs -, cloog_0_18_0, cloog , lowPrio , wrapCC }@args: @@ -27,16 +26,10 @@ let threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { }; isl = if stdenv.isDarwin then null else if atLeast "9" then isl_0_20 - else if atLeast "7" then isl_0_17 - else if atLeast "6" then (if stdenv.targetPlatform.isRedox then isl_0_17 else isl_0_14) - else /* "5" */ isl_0_11; - } // lib.optionalAttrs (!(atLeast "6")) { - cloog = if stdenv.isDarwin - then null - else /* 5 */ cloog_0_18_0; - } // lib.optionalAttrs (atLeast "6" && !(atLeast "9")) { + else /* atLeast "7" */ isl_0_17; + } // lib.optionalAttrs (!(atLeast "9")) { # gcc 10 is too strict to cross compile gcc <= 8 - stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; + stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc9Stdenv else stdenv; }))); in lib.nameValuePair attrName pkg; diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix index 9a254ef59c02..8e087623879d 100644 --- a/pkgs/development/compilers/gcc/common/builder.nix +++ b/pkgs/development/compilers/gcc/common/builder.nix @@ -13,7 +13,6 @@ let version: stdenv.buildPlatform.isDarwin && stdenv.buildPlatform.isx86_64 - && lib.versionAtLeast version "6" && lib.versionOlder version "10"; in diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index f8e2ef6508b0..104851930213 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -6,7 +6,6 @@ , version , binutils, gmp, mpfr, libmpc, isl -, cloog ? null , enableLTO , enableMultilib @@ -18,7 +17,6 @@ , langCC , langD ? false , langFortran -, langJava ? false, javaAwtGtk ? false, javaAntlr ? null, javaEcj ? null , langAda ? false , langGo , langObjC @@ -29,7 +27,6 @@ }: assert !enablePlugin -> disableGdbPlugin; -assert langJava -> lib.versionOlder version "7"; # Note [Windows Exception Handling] # sjlj (short jump long jump) exception handling makes no sense on x86_64, @@ -165,7 +162,6 @@ let ++ lib.optional langCC "c++" ++ lib.optional langD "d" ++ lib.optional langFortran "fortran" - ++ lib.optional langJava "java" ++ lib.optional langAda "ada" ++ lib.optional langGo "go" ++ lib.optional langObjC "objc" @@ -197,11 +193,6 @@ let # Optional features ++ lib.optional (isl != null) "--with-isl=${isl}" - ++ lib.optionals (lib.versionOlder version "5" && cloog != null) [ - "--with-cloog=${cloog}" - "--disable-cloog-version-check" - "--enable-cloog-backend=isl" - ] # Ada options, gcc can't build the runtime library for a cross compiler ++ lib.optional langAda @@ -209,18 +200,6 @@ let then "--enable-libada" else "--disable-libada") - # Java options - ++ lib.optionals langJava [ - "--with-ecj-jar=${javaEcj}" - - # Follow Sun's layout for the convenience of IcedTea/OpenJDK. See - # . - "--enable-java-home" - "--with-java-home=\${prefix}/lib/jvm/jre" - ] - ++ lib.optional javaAwtGtk "--enable-java-awt=gtk" - ++ lib.optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" - ++ import ../common/platform-flags.nix { inherit (stdenv) targetPlatform; inherit lib; } ++ lib.optionals (targetPlatform != hostPlatform) crossConfigureFlags ++ lib.optional disableBootstrap' "--disable-bootstrap" diff --git a/pkgs/development/compilers/gcc/common/dependencies.nix b/pkgs/development/compilers/gcc/common/dependencies.nix index d81a732b4189..f76b5fe601a9 100644 --- a/pkgs/development/compilers/gcc/common/dependencies.nix +++ b/pkgs/development/compilers/gcc/common/dependencies.nix @@ -6,7 +6,6 @@ , texinfo , which , gettext -, pkg-config ? null , gnused , patchelf , gmp @@ -14,21 +13,12 @@ , libmpc , libucontext ? null , libxcrypt ? null -, cloog ? null , darwin ? null , isl ? null , zlib ? null , gnat-bootstrap ? null , flex ? null -, boehmgc ? null -, zip ? null -, unzip ? null -, gtk2 ? null -, libart_lgpl ? null , perl ? null -, xlibs ? null -, langJava ? false -, javaAwtGtk ? false , langAda ? false , langGo ? false , langRust ? false @@ -52,7 +42,6 @@ in gettext ] ++ optionals (perl != null) [ perl ] - ++ optionals javaAwtGtk [ pkg-config ] ++ optionals (with stdenv.targetPlatform; isVc4 || isRedox && flex != null) [ flex ] ++ optionals langAda [ gnat-bootstrap ] ++ optionals langRust [ cargo ] @@ -83,15 +72,11 @@ in ++ [ targetPackages.stdenv.cc.bintools # For linking code at run-time ] - ++ optionals (lib.versionOlder version "5" && cloog != null) [ cloog ] ++ optionals (isl != null) [ isl ] ++ optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc zip unzip ] - ++ optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs) ++ optionals (langGo && stdenv.hostPlatform.isMusl) [ libucontext ] ++ optionals (lib.versionAtLeast version "14" && stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk.frameworks.CoreServices ] ; - # threadsCross.package after gcc6 so i assume its okay for 4.8 and 4.9 too depsTargetTarget = optionals (!withoutTargetLibc && threadsCross != { } && threadsCross.package != null) [ threadsCross.package ]; } diff --git a/pkgs/development/compilers/gcc/common/meta.nix b/pkgs/development/compilers/gcc/common/meta.nix index a578705a66ec..4e864f95a611 100644 --- a/pkgs/development/compilers/gcc/common/meta.nix +++ b/pkgs/development/compilers/gcc/common/meta.nix @@ -23,6 +23,6 @@ in ''; platforms = platforms.unix; - maintainers = if versionOlder version "5" then [ maintainers.veprbl ] else teams.gcc.members; + maintainers = teams.gcc.members; } diff --git a/pkgs/development/compilers/gcc/common/pre-configure.nix b/pkgs/development/compilers/gcc/common/pre-configure.nix index 75f59163bdac..9e1764eae916 100644 --- a/pkgs/development/compilers/gcc/common/pre-configure.nix +++ b/pkgs/development/compilers/gcc/common/pre-configure.nix @@ -4,7 +4,6 @@ , gnat-bootstrap ? null , langAda ? false , langFortran -, langJava ? false , langJit ? false , langGo , withoutTargetLibc @@ -13,18 +12,13 @@ , pkgsBuildTarget }: -assert langJava -> lib.versionOlder version "7"; -assert langAda -> gnat-bootstrap != null; let - needsLib - = (lib.versionOlder version "7" && (langJava || langGo)) - || (lib.versions.major version == "4" && lib.versions.minor version == "9" && targetPlatform.isDarwin); -in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' +assert langAda -> gnat-bootstrap != null; + +lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET" -'' + lib.optionalString needsLib '' - export lib=$out; '' + lib.optionalString langAda '' export PATH=${gnat-bootstrap}/bin:$PATH '' diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 9dda950dc125..f7e2e06bb79a 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -27,7 +27,6 @@ , threadsCross ? null # for MinGW , withoutTargetLibc ? false , gnused ? null -, cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages , pkgsBuildTarget , libxcrypt @@ -37,17 +36,6 @@ , majorMinorVersion , cctools , darwin - -# only for gcc<=6.x -, langJava ? false -, flex -, boehmgc ? null -, zip ? null, unzip ? null, pkg-config ? null -, gtk2 ? null, libart_lgpl ? null -, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null -, libXrender ? null, xorgproto ? null -, libXrandr ? null, libXi ? null -, x11Support ? langJava }: let @@ -80,8 +68,6 @@ let atLeast10 = versionAtLeast version "10"; atLeast9 = versionAtLeast version "9"; atLeast8 = versionAtLeast version "8"; - atLeast7 = versionAtLeast version "7"; - atLeast6 = versionAtLeast version "6"; is14 = majorVersion == "14"; is13 = majorVersion == "13"; is12 = majorVersion == "12"; @@ -90,7 +76,6 @@ let is9 = majorVersion == "9"; is8 = majorVersion == "8"; is7 = majorVersion == "7"; - is6 = majorVersion == "6"; disableBootstrap = atLeast11 && !stdenv.hostPlatform.isDarwin && (atLeast12 -> !profiledCompiler); @@ -104,12 +89,7 @@ let stageNameAddon = optionalString withoutTargetLibc "-nolibc"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}${stageNameAddon}-"; - javaAwtGtk = langJava && x11Support; - xlibs = [ - libX11 libXt libSM libICE libXtst libXrender libXrandr libXi - xorgproto - ]; - callFile = callPackageWith ({ + callFile = callPackageWith { # lets inherit majorVersion @@ -128,7 +108,6 @@ let binutils buildPackages cargo - cloog withoutTargetLibc darwin disableBootstrap @@ -174,63 +153,18 @@ let texinfo threadsCross which - zip zlib ; - } // optionalAttrs (!atLeast7) { - inherit - boehmgc - flex - gnat-bootstrap - gtk2 - langAda - langJava - libICE - libSM - libX11 - libXi - libXrandr - libXrender - libXt - libXtst - libart_lgpl - pkg-config - unzip - x11Support - xorgproto - javaAwtGtk - xlibs - ; - javaEcj = fetchurl { - # The `$(top_srcdir)/ecj.jar' file is automatically picked up at - # `configure' time. - - # XXX: Eventually we might want to take it from upstream. - url = "ftp://sourceware.org/pub/java/ecj-4.3.jar"; - sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx"; - }; - - # Antlr (optional) allows the Java `gjdoc' tool to be built. We want a - # binary distribution here to allow the whole chain to be bootstrapped. - javaAntlr = fetchurl { - url = "https://www.antlr.org/download/antlr-4.4-complete.jar"; - sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz"; - }; - }); + }; in -# We enable the isl cloog backend. -assert !atLeast6 -> (cloog != null -> isl != null); - -assert langJava -> !atLeast7 && zip != null && unzip != null && zlib != null && boehmgc != null && perl != null; # for `--enable-java-home' - # Make sure we get GNU sed. assert stdenv.buildPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; -assert (atLeast6 && !is7 && !is8) -> (langAda -> gnat-bootstrap != null); +assert (!is7 && !is8) -> (langAda -> gnat-bootstrap != null); # TODO: fixup D bootstapping, probably by using gdc11 (and maybe other changes). # error: GDC is required to build d @@ -243,40 +177,19 @@ assert threadsCross != {} -> stdenv.targetPlatform.isWindows; # If turned on, we can't provide reproducible builds anymore assert reproducibleBuild -> profiledCompiler == false; -# We need all these X libraries when building AWT with GTK. -assert !atLeast7 -> (x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []); - pipe ((callFile ./common/builder.nix {}) ({ pname = "${crossNameAddon}${name}"; inherit version; - src = if is6 && stdenv.targetPlatform.isVc4 then fetchFromGitHub { - owner = "itszor"; - repo = "gcc-vc4"; - rev = "e90ff43f9671c760cf0d1dd62f569a0fb9bf8918"; - sha256 = "0gxf66hwqk26h8f853sybphqa5ca0cva2kmrw5jsiv6139g0qnp8"; - } else if is6 && stdenv.targetPlatform.isRedox then fetchFromGitHub { - owner = "redox-os"; - repo = "gcc"; - rev = "f360ac095028d286fc6dde4d02daed48f59813fa"; # `redox` branch - sha256 = "1an96h8l58pppyh3qqv90g8hgcfd9hj7igvh2gigmkxbrx94khfl"; - } else fetchurl { - url = if atLeast7 - then "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz" - else if atLeast6 - then "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.xz" - else "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; + src = fetchurl { + url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; ${if is10 || is11 || is13 then "hash" else "sha256"} = gccVersions.srcHashForVersion version; }; inherit patches; - outputs = - if atLeast7 - then [ "out" "man" "info" ] ++ optional (!langJit) "lib" - else if (langJava || langGo || (if atLeast6 then langJit else targetPlatform.isDarwin)) then ["out" "man" "info"] - else [ "out" "lib" "man" "info" ]; + outputs = [ "out" "man" "info" ] ++ optional (!langJit) "lib"; setOutputFlags = false; @@ -285,7 +198,7 @@ pipe ((callFile ./common/builder.nix {}) ({ hardeningDisable = [ "format" "pie" "stackclashprotection" ] ++ optionals (is11 && langAda) [ "fortify3" ]; - postPatch = optionalString atLeast7 '' + postPatch = '' configureScripts=$(find . -name configure) for configureScript in $configureScripts; do patchShebangs $configureScript @@ -293,7 +206,7 @@ pipe ((callFile ./common/builder.nix {}) ({ '' # This should kill all the stdinc frameworks that gcc and friends like to # insert into default search paths. - + optionalString (atLeast6 && hostPlatform.isDarwin) '' + + optionalString hostPlatform.isDarwin '' substituteInPlace gcc/config/darwin-c.c${optionalString atLeast12 "c"} \ --replace 'if (stdinc)' 'if (0)' @@ -314,18 +227,18 @@ pipe ((callFile ./common/builder.nix {}) ({ '' echo "fixing the {GLIBC,UCLIBC,MUSL}_DYNAMIC_LINKER macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h do - grep -q ${optionalString (!atLeast6) "LIBC"}_DYNAMIC_LINKER "$header" || continue + grep -q _DYNAMIC_LINKER "$header" || continue echo " fixing $header..." sed -i "$header" \ -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \ -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' done - '' + optionalString (atLeast6 && targetPlatform.libc == "musl") '' + '' + optionalString (targetPlatform.libc == "musl") '' sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' ) )) - + optionalString (atLeast7 && targetPlatform.isAvr) ('' + + optionalString targetPlatform.isAvr ('' makeFlagsArray+=( '-s' # workaround for hitting hydra log limit 'LIMITS_H_TEST=false' @@ -382,12 +295,8 @@ pipe ((callFile ./common/builder.nix {}) ({ # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the # library headers and binaries, regarless of the language being compiled. # - # Note: When building the Java AWT GTK peer, the build system doesn't honor - # `--with-gmp' et al., e.g., when building - # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add - # them to $CPATH and $LIBRARY_PATH in this case. - # - # Likewise, the LTO code doesn't find zlib. + # The LTO code doesn't find zlib, so we just add it to $CPATH and + # $LIBRARY_PATH in this case. # # Cross-compiling, we need gcc not to read ./specs in order to build the g++ # compiler (after the specs for the cross-gcc are created). Having @@ -395,18 +304,14 @@ pipe ((callFile ./common/builder.nix {}) ({ CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] ++ optional (zlib != null) zlib - ++ optional langJava boehmgc - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] )); LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ( optional (zlib != null) zlib - ++ optional langJava boehmgc - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] )); + NIX_LDFLAGS = optionalString hostPlatform.isSunOS "-lm"; + inherit (callFile ./common/extra-target-flags.nix { }) EXTRA_FLAGS_FOR_TARGET EXTRA_LDFLAGS_FOR_TARGET @@ -417,14 +322,10 @@ pipe ((callFile ./common/builder.nix {}) ({ + optionalString (stdenv.cc.isClang && targetPlatform != hostPlatform) " -Wno-register"; } // optionalAttrs (!is7 && !atLeast12 && stdenv.cc.isClang && targetPlatform != hostPlatform) { NIX_CFLAGS_COMPILE = "-Wno-register"; - } // optionalAttrs (!atLeast7) { - inherit langJava; - } // optionalAttrs atLeast6 { - NIX_LDFLAGS = optionalString hostPlatform.isSunOS "-lm"; }); passthru = { - inherit langC langCC langObjC langObjCpp langAda langFortran langGo langD langJava version; + inherit langC langCC langObjC langObjCpp langAda langFortran langGo langD version; isGNU = true; hardeningUnsupportedFlags = optional ( @@ -458,8 +359,7 @@ pipe ((callFile ./common/builder.nix {}) ({ badPlatforms = # avr-gcc8 is maintained for the `qmk` package if (is8 && targetPlatform.isAvr) then [] - else if !(is6) then [ "aarch64-darwin" ] - else platforms.darwin; + else [ "aarch64-darwin" ]; } // optionalAttrs is10 { badPlatforms = if targetPlatform != hostPlatform then [ "aarch64-darwin" ] else [ ]; }; @@ -472,11 +372,6 @@ pipe ((callFile ./common/builder.nix {}) ({ doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv } // optionalAttrs enableMultilib { dontMoveLib64 = true; -} // optionalAttrs (is6 && langJava) { - postFixup = '' - target="$(echo "$out/libexec/gcc"/*/*/ecj*)" - patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target" - ''; } )) ([ diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index db4a756733cb..b226975ef034 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -32,8 +32,6 @@ let atLeast10 = lib.versionAtLeast version "10"; atLeast9 = lib.versionAtLeast version "9"; atLeast8 = lib.versionAtLeast version "8"; - atLeast7 = lib.versionAtLeast version "7"; - atLeast6 = lib.versionAtLeast version "6"; is14 = majorVersion == "14"; is13 = majorVersion == "13"; is12 = majorVersion == "12"; @@ -42,7 +40,6 @@ let is9 = majorVersion == "9"; is8 = majorVersion == "8"; is7 = majorVersion == "7"; - is6 = majorVersion == "6"; inherit (lib) optionals optional; in @@ -57,7 +54,7 @@ in ## 1. Patches relevant to gcc>=12 on every platform #################################### [] -++ optional (atLeast6 && !atLeast12) ./fix-bug-80431.patch +++ optional (!atLeast12) ./fix-bug-80431.patch ++ optional (targetPlatform != hostPlatform) ./libstdc++-target.patch ++ optionals (noSysDirs) ( [(if atLeast12 then ./gcc-12-no-sys-dirs.patch else ./no-sys-dirs.patch)] ++ @@ -72,7 +69,7 @@ in ) ++ optional (atLeast12 && langAda) ./gnat-cflags-11.patch ++ optional langFortran (if atLeast12 then ./gcc-12-gfortran-driving.patch else ./gfortran-driving.patch) -++ optional atLeast7 ./ppc-musl.patch +++ [ ./ppc-musl.patch ] ++ optional (atLeast9 && langD) ./libphobos.patch @@ -177,14 +174,13 @@ in "9" = [ ../patches/9/AvailabilityInternal.h-fixincludes.patch ]; "8" = [ ../patches/8/AvailabilityInternal.h-fixincludes.patch ]; "7" = [ ../patches/7/AvailabilityInternal.h-fixincludes.patch ]; - "6" = [ ../patches/6/AvailabilityInternal.h-fixincludes.patch ]; }.${majorVersion} or []) ## Windows # Obtain latest patch with ../update-mcfgthread-patches.sh -++ optional (atLeast6 && !atLeast13 && !withoutTargetLibc && targetPlatform.isMinGW && threadsCross.model == "mcf") +++ optional (!atLeast13 && !withoutTargetLibc && targetPlatform.isMinGW && threadsCross.model == "mcf") (./. + "/${majorVersion}/Added-mcf-thread-model-support-from-mcfgthread.patch") @@ -228,7 +224,7 @@ in ## gcc 9.0 and older ############################################################################## ++ optional (majorVersion == "9") ./9/fix-struct-redefinition-on-glibc-2.36.patch -++ optional (atLeast7 && !atLeast10 && targetPlatform.isNetBSD) ./libstdc++-netbsd-ctypes.patch +++ optional (!atLeast10 && targetPlatform.isNetBSD) ./libstdc++-netbsd-ctypes.patch # Make Darwin bootstrap respect whether the assembler supports `--gstabs`, # which is not supported by the clang integrated assembler used by default on Darwin. @@ -266,35 +262,8 @@ in (./. + "/${majorVersion}/gcc8-asan-glibc-2.34.patch") (./. + "/${majorVersion}/0001-Fix-build-for-glibc-2.31.patch") ] -++ optional ((is6 || is7) && targetPlatform.libc == "musl" && targetPlatform.isx86_32) (fetchpatch { +++ optional (is7 && targetPlatform.libc == "musl" && targetPlatform.isx86_32) (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/main/gcc/gcc-6.1-musl-libssp.patch?id=5e4b96e23871ee28ef593b439f8c07ca7c7eb5bb"; sha256 = "1jf1ciz4gr49lwyh8knfhw6l5gvfkwzjy90m7qiwkcbsf4a3fqn2"; }) -++ optional ((is6 || is7 || is8) && !atLeast9 && targetPlatform.libc == "musl") ./libgomp-dont-force-initial-exec.patch - - - -## gcc 6.0 and older ############################################################################## - -++ optional (is6 && langGo) ./gogcc-workaround-glibc-2.36.patch -++ optional is6 ./9/fix-struct-redefinition-on-glibc-2.36.patch -++ optional (is6 && !stdenv.targetPlatform.isRedox) ./use-source-date-epoch.patch -++ optional (is6 && !stdenv.targetPlatform.isRedox) ./6/0001-Fix-build-for-glibc-2.31.patch -++ optionals (is6 && langAda) [ - ./gnat-cflags.patch - ./6/gnat-glibc234.patch -] - -# The clang-based assembler used in darwin.binutils (LLVM >11) does not support piping input. -# Fortunately, it does not exhibit the problem GCC has with the cctools assembler. -# This patch can be dropped should darwin.binutils ever implement support. -++ optional (!atLeast7 && hostPlatform.isDarwin && lib.versionAtLeast (lib.getVersion stdenv.cc) "12") ./4.9/darwin-clang-as.patch - -# Building libstdc++ with flat namespaces results in trying to link CoreFoundation, which -# defaults to the impure, system location and causes the build to fail. -++ optional (is6 && hostPlatform.isDarwin) ./6/libstdc++-disable-flat_namespace.patch - -## gcc 5.0 and older ############################################################################## - -++ optional (!atLeast6) ./parallel-bconfig.patch - +++ optional ((is7 || is8) && !atLeast9 && targetPlatform.libc == "musl") ./libgomp-dont-force-initial-exec.patch diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix deleted file mode 100644 index 3a6f926b3f32..000000000000 --- a/pkgs/development/libraries/cloog-ppl/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ fetchurl, lib, stdenv, ppl, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "cloog-ppl"; - version = "0.15.11"; - - src = fetchurl { - url = "mirror://gcc/infrastructure/${pname}-${version}.tar.gz"; - sha256 = "0psdm0bn5gx60glfh955x5b3b23zqrd92idmjr0b00dlnb839mkw"; - }; - - propagatedBuildInputs = [ ppl ]; - - nativeBuildInputs = [ autoreconfHook ]; - - patches = [ ./fix-ppl-version.patch ]; - - configureFlags = [ "--with-ppl=${ppl}" ]; - - preAutoreconf = '' - touch NEWS ChangeLog AUTHORS - ''; - - doCheck = true; - - meta = { - description = "CLooG-PPL, the Chunky Loop Generator"; - mainProgram = "cloog"; - - longDescription = '' - CLooG is a free software library to generate code for scanning - Z-polyhedra. That is, it finds a code (e.g., in C, FORTRAN...) that - reaches each integral point of one or more parameterized polyhedra. - CLooG has been originally written to solve the code generation problem - for optimizing compilers based on the polytope model. Nevertheless it - is used now in various area e.g., to build control automata for - high-level synthesis or to find the best polynomial approximation of a - function. CLooG may help in any situation where scanning polyhedra - matters. While the user has full control on generated code quality, - CLooG is designed to avoid control overhead and to produce a very - effective code. - ''; - - # CLooG-PPL is actually a port of GLooG from PolyLib to PPL. - homepage = "http://www.cloog.org/"; - - license = lib.licenses.gpl2Plus; - - maintainers = [ ]; - - /* Leads to an ICE on Cygwin: - - make[3]: Entering directory `/tmp/nix-build-9q5gw5m37q5l4f0kjfv9ar8fsc9plk27-ppl-0.10.2.drv-1/ppl-0.10.2/src' - /bin/sh ../libtool --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I. -I.. -I.. -I../src -g -O2 -frounding-math -W -Wall -c -o Box.lo Box.cc - libtool: compile: g++ -DHAVE_CONFIG_H -I. -I.. -I.. -I../src -g -O2 -frounding-math -W -Wall -c Box.cc -DDLL_EXPORT -DPIC -o .libs/Box.o - In file included from checked.defs.hh:595, - from Checked_Number.defs.hh:27, - from Coefficient.types.hh:15, - from Coefficient.defs.hh:26, - from Box.defs.hh:28, - from Box.cc:24: - checked.inlines.hh: In function `Parma_Polyhedra_Library::Result Parma_Polyhedra_Library::Checked::input_generic(Type&, std::istream&, Parma_Polyhedra_Library::Rounding_Dir)': - checked.inlines.hh:607: internal compiler error: in invert_truthvalue, at fold-const.c:2719 - Please submit a full bug report, - with preprocessed source if appropriate. - See for instructions. - make[3]: *** [Box.lo] Error 1 - - */ - platforms = lib.platforms.unix; # Once had cygwin problems - }; -} diff --git a/pkgs/development/libraries/cloog-ppl/fix-ppl-version.patch b/pkgs/development/libraries/cloog-ppl/fix-ppl-version.patch deleted file mode 100644 index 8440d839411b..000000000000 --- a/pkgs/development/libraries/cloog-ppl/fix-ppl-version.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -rupN src/configure.in cloog-ppl-0.15.11/configure.in ---- src/configure.in 2014-04-13 13:33:43.349392305 +0200 -+++ cloog-ppl-0.15.11/configure.in 2014-04-13 13:34:12.695379888 +0200 -@@ -337,11 +337,7 @@ if test "x$with_ppl" != "x" -a "x$with_p - [AC_MSG_ERROR(Can't find PPL headers.)]) - - AC_MSG_CHECKING([for version 0.10 (or later revision) of PPL]) -- AC_TRY_COMPILE([#include "ppl_c.h"],[ -- #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10 -- choke me -- #endif -- ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR(Can't find correct version of PPL.) ]) -+ AC_MSG_RESULT([yes]) - - LIBS="$LIBS -lppl_c -lppl -lgmpxx" - AC_DEFINE([CLOOG_PPL_BACKEND], 1, [Use the PPL backend]) diff --git a/pkgs/development/libraries/cloog/0.18.0.nix b/pkgs/development/libraries/cloog/0.18.0.nix deleted file mode 100644 index a1ba3aaf93f3..000000000000 --- a/pkgs/development/libraries/cloog/0.18.0.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ fetchurl, lib, stdenv, gmp, isl }: - -stdenv.mkDerivation rec { - pname = "cloog"; - version = "0.18.0"; - - src = fetchurl { - url = "http://www.bastoul.net/cloog/pages/download/count.php3?url=./cloog-${version}.tar.gz"; - sha256 = "1c4aa8dde7886be9cbe0f9069c334843b21028f61d344a2d685f88cb1dcf2228"; - }; - - buildInputs = [ gmp ]; - - propagatedBuildInputs = [ isl ]; - - configureFlags = [ "--with-isl=system" ]; - - enableParallelBuilding = true; - - doCheck = true; - - meta = { - description = "Library that generates loops for scanning polyhedra"; - mainProgram = "cloog"; - - longDescription = '' - CLooG is a free software library to generate code for scanning - Z-polyhedra. That is, it finds a code (e.g., in C, FORTRAN...) that - reaches each integral point of one or more parameterized polyhedra. - CLooG has been originally written to solve the code generation problem - for optimizing compilers based on the polytope model. Nevertheless it - is used now in various area e.g., to build control automata for - high-level synthesis or to find the best polynomial approximation of a - function. CLooG may help in any situation where scanning polyhedra - matters. While the user has full control on generated code quality, - CLooG is designed to avoid control overhead and to produce a very - effective code. - ''; - - homepage = "http://www.cloog.org/"; - - license = lib.licenses.gpl2Plus; - - /* Leads to an ICE on Cygwin: - - make[3]: Entering directory `/tmp/nix-build-9q5gw5m37q5l4f0kjfv9ar8fsc9plk27-ppl-0.10.2.drv-1/ppl-0.10.2/src' - /bin/sh ../libtool --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I. -I.. -I.. -I../src -g -O2 -frounding-math -W -Wall -c -o Box.lo Box.cc - libtool: compile: g++ -DHAVE_CONFIG_H -I. -I.. -I.. -I../src -g -O2 -frounding-math -W -Wall -c Box.cc -DDLL_EXPORT -DPIC -o .libs/Box.o - In file included from checked.defs.hh:595, - from Checked_Number.defs.hh:27, - from Coefficient.types.hh:15, - from Coefficient.defs.hh:26, - from Box.defs.hh:28, - from Box.cc:24: - checked.inlines.hh: In function `Parma_Polyhedra_Library::Result Parma_Polyhedra_Library::Checked::input_generic(Type&, std::istream&, Parma_Polyhedra_Library::Rounding_Dir)': - checked.inlines.hh:607: internal compiler error: in invert_truthvalue, at fold-const.c:2719 - Please submit a full bug report, - with preprocessed source if appropriate. - See for instructions. - make[3]: *** [Box.lo] Error 1 - - */ - platforms = lib.platforms.unix; # Once had cygwin problems - }; -} diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix deleted file mode 100644 index 3ae266c61cdd..000000000000 --- a/pkgs/development/libraries/cloog/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ fetchurl, lib, stdenv, gmp, isl }: - -stdenv.mkDerivation rec { - pname = "cloog"; - version = "0.18.4"; - - src = fetchurl { - url = "http://www.bastoul.net/cloog/pages/download/count.php3?url=./${pname}-${version}.tar.gz"; - sha256 = "03km1aqaiy3sbqc2f046ms9x0mlmacxlvs5rxsvjj8nf20vxynij"; - }; - - buildInputs = [ gmp ]; - - propagatedBuildInputs = [ isl ]; - - configureFlags = [ "--with-isl=system" ]; - - enableParallelBuilding = true; - # Breaks the test cases as it reuses 'cloog_temp' file name for different tests. - enableParallelChecking = false; - - doCheck = true; - - meta = { - description = "Library that generates loops for scanning polyhedra"; - mainProgram = "cloog"; - - longDescription = '' - CLooG is a free software library to generate code for scanning - Z-polyhedra. That is, it finds a code (e.g., in C, FORTRAN...) that - reaches each integral point of one or more parameterized polyhedra. - CLooG has been originally written to solve the code generation problem - for optimizing compilers based on the polytope model. Nevertheless it - is used now in various area e.g., to build control automata for - high-level synthesis or to find the best polynomial approximation of a - function. CLooG may help in any situation where scanning polyhedra - matters. While the user has full control on generated code quality, - CLooG is designed to avoid control overhead and to produce a very - effective code. - ''; - - homepage = "http://www.cloog.org/"; - - license = lib.licenses.gpl2Plus; - - /* Leads to an ICE on Cygwin: - - make[3]: Entering directory `/tmp/nix-build-9q5gw5m37q5l4f0kjfv9ar8fsc9plk27-ppl-0.10.2.drv-1/ppl-0.10.2/src' - /bin/sh ../libtool --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I. -I.. -I.. -I../src -g -O2 -frounding-math -W -Wall -c -o Box.lo Box.cc - libtool: compile: g++ -DHAVE_CONFIG_H -I. -I.. -I.. -I../src -g -O2 -frounding-math -W -Wall -c Box.cc -DDLL_EXPORT -DPIC -o .libs/Box.o - In file included from checked.defs.hh:595, - from Checked_Number.defs.hh:27, - from Coefficient.types.hh:15, - from Coefficient.defs.hh:26, - from Box.defs.hh:28, - from Box.cc:24: - checked.inlines.hh: In function `Parma_Polyhedra_Library::Result Parma_Polyhedra_Library::Checked::input_generic(Type&, std::istream&, Parma_Polyhedra_Library::Rounding_Dir)': - checked.inlines.hh:607: internal compiler error: in invert_truthvalue, at fold-const.c:2719 - Please submit a full bug report, - with preprocessed source if appropriate. - See for instructions. - make[3]: *** [Box.lo] Error 1 - - */ - platforms = lib.platforms.unix; # Once had cygwin problems - }; -} diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix deleted file mode 100644 index a11d9eca6a6e..000000000000 --- a/pkgs/development/libraries/isl/0.11.1.nix +++ /dev/null @@ -1,8 +0,0 @@ -import ./generic.nix { - version = "0.11.1"; - urls = [ - "https://src.fedoraproject.org/repo/pkgs/gcc/isl-0.11.1.tar.bz2/bce1586384d8635a76d2f017fb067cd2/isl-0.11.1.tar.bz2" - ]; - sha256 = "13d9cqa5rzhbjq0xf0b2dyxag7pqa72xj9dhsa03m8ccr1a4npq9"; - patches = [ ./fix-gcc-build.diff ]; -} diff --git a/pkgs/development/libraries/isl/0.14.1.nix b/pkgs/development/libraries/isl/0.14.1.nix deleted file mode 100644 index 1a368d2523e0..000000000000 --- a/pkgs/development/libraries/isl/0.14.1.nix +++ /dev/null @@ -1,8 +0,0 @@ -import ./generic.nix rec { - version = "0.14.1"; - urls = [ - "mirror://sourceforge/libisl/isl-${version}.tar.xz" - "https://libisl.sourceforge.io/isl-${version}.tar.xz" - ]; - sha256 = "0xa6xagah5rywkywn19rzvbvhfvkmylhcxr6z9z7bz29cpiwk0l8"; -} diff --git a/pkgs/development/libraries/isl/fix-gcc-build.diff b/pkgs/development/libraries/isl/fix-gcc-build.diff deleted file mode 100644 index 6fbd1f9d478b..000000000000 --- a/pkgs/development/libraries/isl/fix-gcc-build.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru isl-0.11.1/include/isl/int.h isl-0.11.1.new/include/isl/int.h ---- isl-0.11.1/include/isl/int.h 2012-11-29 09:47:32.000000000 +0100 -+++ isl-0.11.1.new/include/isl/int.h 2013-10-27 15:35:31.348553812 +0100 -@@ -14,7 +14,7 @@ - #include - #include - #if defined(__cplusplus) --#include -+#include - #endif - - #if defined(__cplusplus) diff --git a/pkgs/development/libraries/nanosvg/default.nix b/pkgs/development/libraries/nanosvg/default.nix index 2033069d77e2..29861777889b 100644 --- a/pkgs/development/libraries/nanosvg/default.nix +++ b/pkgs/development/libraries/nanosvg/default.nix @@ -1,18 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, unstableGitUpdater }: stdenv.mkDerivation { pname = "nanosvg"; - version = "unstable-2022-12-04"; + version = "0-unstable-2023-12-30"; src = fetchFromGitHub { owner = "memononen"; repo = "nanosvg"; - rev = "9da543e8329fdd81b64eb48742d8ccb09377aed1"; - hash = "sha256-VOiN6583DtzGYPRkl19VG2QvSzl4T9HaynBuNcvZf94="; + rev = "93ce879dc4c04a3ef1758428ec80083c38610b1f"; + hash = "sha256-ZtenaXJqMZr2+BxYENG1zUoQ+Qoxlxy0m/1YfJBKAFk="; }; nativeBuildInputs = [ cmake ]; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "Simple stupid SVG parser"; homepage = "https://github.com/memononen/nanosvg"; @@ -20,4 +22,3 @@ stdenv.mkDerivation { platforms = platforms.all; }; } - diff --git a/pkgs/development/libraries/tbox/default.nix b/pkgs/development/libraries/tbox/default.nix index b2406d19e701..9d1afcec84e1 100644 --- a/pkgs/development/libraries/tbox/default.nix +++ b/pkgs/development/libraries/tbox/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "tbox"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "tboox"; repo = pname; rev = "v${version}"; - hash = "sha256-VM6LOTVwM47caXYiH+6c7t174i0W5MY1dg2Y5yutlcc="; + hash = "sha256-cwpZ7F8WzT/46HrckHe0Aug2mxirCkNA68aCxg/FcsE="; }; configureFlags = [ diff --git a/pkgs/development/python-modules/aiormq/default.nix b/pkgs/development/python-modules/aiormq/default.nix index 7dd16b1f4811..0c80e4354264 100644 --- a/pkgs/development/python-modules/aiormq/default.nix +++ b/pkgs/development/python-modules/aiormq/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiormq"; - version = "6.8.0"; + version = "6.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mosquito"; repo = "aiormq"; rev = "refs/tags/${version}"; - hash = "sha256-XD1g4JXQJlJyXuZbo4hYW7cwQhy8+p4/inwNw2WOD9Y="; + hash = "sha256-3+PoDB5Owy8BWBUisX0i1mV8rqs5K9pBFQwup8vKxlg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 4933ca6ee46f..fc0e5f9ab36e 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -30,12 +30,12 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.17.3"; + version = "2.17.4"; src = fetchPypi { pname = "ansible_core"; inherit version; - hash = "sha256-kXVXBlM5/jbnB46b6kfu+rbWh3871DX6Xw12bQTFhIU="; + hash = "sha256-RKHzAHZ5ZTa6JFXK0Y025ihw8E5jLjyi6+lw176s8k0="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/development/python-modules/chroma-hnswlib/default.nix b/pkgs/development/python-modules/chroma-hnswlib/default.nix index 52fe37696132..fb8bdc1deea1 100644 --- a/pkgs/development/python-modules/chroma-hnswlib/default.nix +++ b/pkgs/development/python-modules/chroma-hnswlib/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "chroma-hnswlib"; - version = "0.7.5"; + version = "0.7.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "chroma-core"; repo = "hnswlib"; rev = "refs/tags/${version}"; - hash = "sha256-KU/t37MZMFeNWPme+rgCHchZH7B8timIV2EH40laXkA="; + hash = "sha256-pjz5SGg2drO6fkml9ojFG7/Gq3/Y7vPaOHc+3LKnjUw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dep-logic/default.nix b/pkgs/development/python-modules/dep-logic/default.nix index 5b0897a8346e..e29decc1002f 100644 --- a/pkgs/development/python-modules/dep-logic/default.nix +++ b/pkgs/development/python-modules/dep-logic/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dep-logic"; - version = "0.4.4"; + version = "0.4.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pdm-project"; repo = "dep-logic"; rev = "refs/tags/${version}"; - hash = "sha256-7w5yN+3/u7mcGwBZAgTc/HHpZGyVZzSTWktmmcVSqpA="; + hash = "sha256-z5PXecu63/9sO73ruYX6+ZIq2DSVYljd3bKapJIemDA="; }; nativeBuildInputs = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/django-admin-sortable2/default.nix b/pkgs/development/python-modules/django-admin-sortable2/default.nix index 29d9e7b82689..1fb7a4c825a7 100644 --- a/pkgs/development/python-modules/django-admin-sortable2/default.nix +++ b/pkgs/development/python-modules/django-admin-sortable2/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "django-admin-sortable2"; - version = "2.2.2"; + version = "2.2.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "jrief"; repo = "django-admin-sortable2"; rev = "refs/tags/${version}"; - hash = "sha256-BgydzSrbEMC6fE3W9TqjedBYtxMhK/bsYexNTXnJfUo="; + hash = "sha256-ZXaLe6H6il27DXMwclKR4iRGyus6zyYt3rNWRsLPHSU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-ckeditor/default.nix b/pkgs/development/python-modules/django-ckeditor/default.nix index 4b7a5ee3303b..1396b45d6024 100644 --- a/pkgs/development/python-modules/django-ckeditor/default.nix +++ b/pkgs/development/python-modules/django-ckeditor/default.nix @@ -14,21 +14,21 @@ buildPythonPackage rec { pname = "django-ckeditor"; - version = "6.7"; - format = "pyproject"; + version = "6.7.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "django-ckeditor"; - repo = pname; + repo = "django-ckeditor"; rev = "refs/tags/${version}"; - hash = "sha256-mZQ5s3YbumYmT0zRWPFIvzt2TbtDLvVcJjZVAwn31E8="; + hash = "sha256-tPwWXQAKoHPpZDZ+fnEoOA29at6gUXBw6CcPdireTr8="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ django django-js-asset pillow diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix index 1282fdfc9952..1a560f24f770 100644 --- a/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/pkgs/development/python-modules/duckdb-engine/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "duckdb-engine"; - version = "0.13.1"; + version = "0.13.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { repo = "duckdb_engine"; owner = "Mause"; rev = "refs/tags/v${version}"; - hash = "sha256-6aVVs3ii8pJOSaLx0maoFmiMvbUh/LOdizmPSpqPiM4="; + hash = "sha256-zao8kzzQbnjwJqjHyqDkgmXa3E9nlBH2W0wh7Kjk/qw="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix index 65dd79a8498b..83e063e9cc54 100644 --- a/pkgs/development/python-modules/langchain-aws/default.nix +++ b/pkgs/development/python-modules/langchain-aws/default.nix @@ -2,25 +2,31 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies boto3, langchain-core, numpy, - poetry-core, - pytestCheckHook, - pytest-asyncio, + + # tests langchain-standard-tests, + pytest-asyncio, + pytestCheckHook, }: buildPythonPackage rec { pname = "langchain-aws"; - version = "0.1.17"; + version = "0.2.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-n9nQheuUZMrjZMpR3aqbrRb/AhcgiF4CFO9ROh9aFNc="; + hash = "sha256-P9CfAVpKh7djhUQc3DyyJTWqs9RbrTeLyynLei0x00o="; }; postPatch = '' diff --git a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix index 24c1fe66d5eb..0d9ce18648f6 100644 --- a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix +++ b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix @@ -1,38 +1,42 @@ { lib, - azure-identity, buildPythonPackage, fetchFromGitHub, - freezegun, + + # build-system + poetry-core, + + # dependencies + azure-identity, langchain-core, langchain-openai, + + # tests + freezegun, lark, pandas, - poetry-core, pytest-asyncio, pytest-mock, pytest-socket, pytestCheckHook, - pythonOlder, requests-mock, responses, syrupy, toml, + nix-update-script, }: buildPythonPackage rec { pname = "langchain-azure-dynamic-sessions"; - version = "0.1.0"; + version = "0.2.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-azure-dynamic-sessions==${version}"; - hash = "sha256-jz4IBMnWuk8FsSsyfLN14B0xWZrmZrvEW95a45S+FOo="; + hash = "sha256-tgvoOSr4tpi+tFBan+kw8FZUfUJHcQXv9e1nyeGP0so="; }; sourceRoot = "${src.name}/libs/partners/azure-dynamic-sessions"; diff --git a/pkgs/development/python-modules/langchain-chroma/default.nix b/pkgs/development/python-modules/langchain-chroma/default.nix index 2331babc4d7e..d5a5a53ac90f 100644 --- a/pkgs/development/python-modules/langchain-chroma/default.nix +++ b/pkgs/development/python-modules/langchain-chroma/default.nix @@ -12,20 +12,22 @@ buildPythonPackage rec { pname = "langchain-chroma"; - version = "0.1.2"; + version = "0.1.4"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-chroma==${version}"; - hash = "sha256-PQ3bepiAqzWhQdKofQSzQKxRrwI6dxBfSNV91462aJE="; + hash = "sha256-pU7H8OYXa+JjdkSO36xESPI6r3xA+9cFXxeJnfpYuHc="; }; sourceRoot = "${src.name}/libs/partners/chroma"; build-system = [ poetry-core ]; + pythonRelaxDeps = [ "chromadb" ]; + dependencies = [ langchain-core chromadb diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index ba7b07d1aea6..8f42413117ae 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -12,6 +12,7 @@ langchain-core, langchain, langsmith, + pydantic-settings, pyyaml, requests, sqlalchemy, @@ -37,26 +38,29 @@ buildPythonPackage rec { pname = "langchain-community"; - version = "0.2.16"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-community==${version}"; - hash = "sha256-0FKbx/ZPX7sioof5pMdqpnVWc46+eOiTIseyxwYK49E="; + hash = "sha256-8kF7KlXcWbquRtp8EumkFYhGd0onxifVZsts0SU1dzE="; }; sourceRoot = "${src.name}/libs/community"; build-system = [ poetry-core ]; + pythonRelaxDeps = [ "pydantic-settings" ]; + dependencies = [ aiohttp dataclasses-json langchain-core langchain langsmith + pydantic-settings pyyaml requests sqlalchemy diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index 4fa5de47893e..0d835c4078c5 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.2.38"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-core==${version}"; - hash = "sha256-3nRirzQe5KCVoeJ29fYelYuOD6r4adJof4NXreyfrzY="; + hash = "sha256-BCqrJuy7R2jT3QmTvYwn8gHX7bc6Tq8HArK+F3PjBhw="; }; sourceRoot = "${src.name}/libs/core"; @@ -102,6 +102,12 @@ buildPythonPackage rec { # Compares with machine-specific timings "test_rate_limit_invoke" "test_rate_limit_stream" + # flaky: assert (1726352133.7419367 - 1726352132.2697523) < 1 + "test_benchmark_model" + + # TypeError: exceptions must be derived from Warning, not + "test_chat_prompt_template_variable_names" + "test_create_model_v2" ] ++ lib.optionals stdenv.isDarwin [ # Langchain-core the following tests due to the test comparing execution time with magic values. diff --git a/pkgs/development/python-modules/langchain-huggingface/default.nix b/pkgs/development/python-modules/langchain-huggingface/default.nix index 774482e5bbcd..51f201ea694f 100644 --- a/pkgs/development/python-modules/langchain-huggingface/default.nix +++ b/pkgs/development/python-modules/langchain-huggingface/default.nix @@ -2,39 +2,44 @@ lib, buildPythonPackage, fetchFromGitHub, - freezegun, + + # build-system + poetry-core, + + # dependencies huggingface-hub, langchain-core, sentence-transformers, tokenizers, transformers, + + # tests + freezegun, + httpx, lark, pandas, - poetry-core, pytest-asyncio, pytest-mock, pytest-socket, pytestCheckHook, - pythonOlder, requests-mock, responses, syrupy, toml, + nix-update-script, }: buildPythonPackage rec { pname = "langchain-huggingface"; - version = "0.0.3"; + version = "0.1.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-huggingface==${version}"; - hash = "sha256-4k3C6T2N7SBM/wP8KAwMQqt9DkXDdYNt2i/OkZilWw0="; + hash = "sha256-ESWhhjWjCbBV/3KjeSwEQzvK6os1mmc3at+8gonfGt4="; }; sourceRoot = "${src.name}/libs/partners/huggingface"; @@ -51,6 +56,7 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun + httpx lark pandas pytest-asyncio diff --git a/pkgs/development/python-modules/langchain-mongodb/default.nix b/pkgs/development/python-modules/langchain-mongodb/default.nix index 0b0a6b22fd63..9d8f59e3c771 100644 --- a/pkgs/development/python-modules/langchain-mongodb/default.nix +++ b/pkgs/development/python-modules/langchain-mongodb/default.nix @@ -2,37 +2,42 @@ lib, buildPythonPackage, fetchFromGitHub, - freezegun, - langchain, + + # build-system + poetry-core, + + # dependencies langchain-core, + numpy, pymongo, + + freezegun, + httpx, + langchain, lark, pandas, - poetry-core, pytest-asyncio, + pytestCheckHook, pytest-mock, pytest-socket, - pytestCheckHook, - pythonOlder, requests-mock, responses, syrupy, toml, + nix-update-script, }: buildPythonPackage rec { pname = "langchain-mongodb"; - version = "0.1.8"; + version = "0.2.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-mongodb==${version}"; - hash = "sha256-fjSvn9O/CrKBexcwuILXFR7AGx/tZtGDWjA0L6XV4Hk="; + hash = "sha256-Jd9toXkS9dGtSIrJQ/5W+swV1z2BJOJKBtkyGzj3oSc="; }; sourceRoot = "${src.name}/libs/partners/mongodb"; @@ -41,22 +46,18 @@ buildPythonPackage rec { dependencies = [ langchain-core + numpy pymongo ]; nativeCheckInputs = [ freezegun + httpx langchain - lark - pandas pytest-asyncio - pytest-mock - pytest-socket pytestCheckHook - requests-mock - responses + pytest-mock syrupy - toml ]; pytestFlagsArray = [ "tests/unit_tests" ]; diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix index 5bb20007a7ed..1410e72aeac1 100644 --- a/pkgs/development/python-modules/langchain-openai/default.nix +++ b/pkgs/development/python-modules/langchain-openai/default.nix @@ -2,38 +2,42 @@ lib, buildPythonPackage, fetchFromGitHub, - freezegun, + + # build-system + poetry-core, + + # dependencies langchain-core, - langchain-standard-tests, openai, tiktoken, + + # tests + freezegun, + langchain-standard-tests, lark, pandas, - poetry-core, pytest-asyncio, + pytestCheckHook, pytest-mock, pytest-socket, - pytestCheckHook, - pythonOlder, requests-mock, responses, syrupy, toml, + nix-update-script, }: buildPythonPackage rec { pname = "langchain-openai"; - version = "0.1.23"; + version = "0.2.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-openai==${version}"; - hash = "sha256-j+oaC0xmvDBsAREXwKF+kmFlplN43ROH6n9j1+H1ufk="; + hash = "sha256-3wTSvvPOMZciEqPxpcjrcqEpK//qwsEmvZnlZBfjltQ="; }; sourceRoot = "${src.name}/libs/partners/openai"; @@ -57,9 +61,9 @@ buildPythonPackage rec { lark pandas pytest-asyncio + pytestCheckHook pytest-mock pytest-socket - pytestCheckHook requests-mock responses syrupy diff --git a/pkgs/development/python-modules/langchain-standard-tests/default.nix b/pkgs/development/python-modules/langchain-standard-tests/default.nix index 9b45f412f337..3bec0ee76be3 100644 --- a/pkgs/development/python-modules/langchain-standard-tests/default.nix +++ b/pkgs/development/python-modules/langchain-standard-tests/default.nix @@ -1,10 +1,19 @@ { lib, buildPythonPackage, + + # build-system poetry-core, + + # dependencies httpx, langchain-core, + syrupy, + + # buildInputs pytest, + + # tests numpy, pytest-asyncio, pytestCheckHook, @@ -23,8 +32,9 @@ buildPythonPackage rec { build-system = [ poetry-core ]; dependencies = [ - langchain-core httpx + langchain-core + syrupy ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index 5832e387e303..a19f3ceb7d7e 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -10,31 +10,35 @@ langchain-core, # tests + httpx, pytest-asyncio, pytestCheckHook, }: buildPythonPackage rec { pname = "langchain-text-splitters"; - version = "0.2.4"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-text-splitters==${version}"; - hash = "sha256-8n5eImRXOG/3tN/59Gd2/GpoGpt7P2ABj0T4pJi6xrk="; + hash = "sha256-Z0UAUhOjC0wgCY/f1aWsnjFyOPYz/6JnloEKT6b6Ii0="; }; sourceRoot = "${src.name}/libs/text-splitters"; build-system = [ poetry-core ]; - dependencies = [ langchain-core ]; + dependencies = [ + langchain-core + ]; pythonImportsCheck = [ "langchain_text_splitters" ]; nativeCheckInputs = [ + httpx pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 59f0c09ec10c..c2184e84254f 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -27,6 +27,7 @@ # tests freezegun, + httpx, lark, pandas, pytest-asyncio, @@ -41,14 +42,14 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.2.16"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain==${version}"; - hash = "sha256-8n5eImRXOG/3tN/59Gd2/GpoGpt7P2ABj0T4pJi6xrk="; + hash = "sha256-2dHsZWn1MN/gLnUdYp84gbtWkvB0j0iieij4W9tzPzY="; }; sourceRoot = "${src.name}/libs/langchain"; @@ -75,6 +76,7 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun + httpx lark pandas pytest-asyncio diff --git a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix index b8bf9df2eaa9..e94cca80eb54 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "langgraph-checkpoint-sqlite"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/checkpointsqlite==${version}"; - hash = "sha256-TUiZOf34jhs+nkeTsprtTdoVqDt7kZd8NxYLKX4l0kQ="; + hash = "sha256-/pHJtK691anqn2It4ZstCGXJS0JGtdKZvqS9f3ly+FQ="; }; sourceRoot = "${src.name}/libs/checkpoint-sqlite"; diff --git a/pkgs/development/python-modules/langgraph-checkpoint/default.nix b/pkgs/development/python-modules/langgraph-checkpoint/default.nix index 82323a80488c..3857de5bd735 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint/default.nix @@ -39,6 +39,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # AssertionError + "test_serde_jsonplus" + ]; + passthru = { updateScript = langgraph-sdk.updateScript; }; diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix index cb442e8919f4..80e2faa68258 100644 --- a/pkgs/development/python-modules/langgraph/default.nix +++ b/pkgs/development/python-modules/langgraph/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -35,14 +36,14 @@ buildPythonPackage rec { pname = "langgraph"; - version = "0.2.19"; + version = "0.2.21"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/${version}"; - hash = "sha256-qJIZAHftIKyWK0A/MjilalmmB8b8E7JtLnFn156hE08="; + hash = "sha256-1Ch2V85omAKnXK9rMihNtyjIoOvmVUm8Dbdo5GBoik4="; }; postgresqlTestSetupPost = '' @@ -61,6 +62,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "langgraph" ]; + # postgresql doesn't play nicely with the darwin sandbox: + # FATAL: could not create shared memory segment: Operation not permitted + doCheck = !stdenv.isDarwin; + nativeCheckInputs = [ aiosqlite dataclasses-json diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 16e3b19f71b3..c45edec702bc 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -1,37 +1,40 @@ { lib, stdenv, - anthropic, - attr, buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + orjson, + pydantic, + requests, + + # tests + anthropic, dataclasses-json, fastapi, - fetchFromGitHub, freezegun, httpx, instructor, - orjson, - poetry-core, - pydantic, pytest-asyncio, pytestCheckHook, - pythonOlder, - requests, uvicorn, + attr, }: buildPythonPackage rec { pname = "langsmith"; - version = "0.1.99"; + version = "0.1.120"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-aN5HiQAXX7ZlVBzkit4DAw+7KQHI3ck1DLvBPDSKVhM="; + hash = "sha256-K8QIlyQnaTKCBoRCsTQ26KovIIw8uK6HBynEplrB6wI="; }; sourceRoot = "${src.name}/python"; @@ -89,12 +92,12 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "Client library to connect to the LangSmith LLM Tracing and Evaluation Platform"; homepage = "https://github.com/langchain-ai/langsmith-sdk"; changelog = "https://github.com/langchain-ai/langsmith-sdk/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ natsukium ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; mainProgram = "langsmith"; }; } diff --git a/pkgs/development/python-modules/obspy/default.nix b/pkgs/development/python-modules/obspy/default.nix index be94fa1bd0c7..8133d63c6f2e 100644 --- a/pkgs/development/python-modules/obspy/default.nix +++ b/pkgs/development/python-modules/obspy/default.nix @@ -1,9 +1,13 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies decorator, - future, lxml, matplotlib, numpy, @@ -14,18 +18,22 @@ buildPythonPackage rec { pname = "obspy"; - version = "1.2.2"; - format = "setuptools"; + version = "1.4.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "a0f2b0915beeb597762563fa0358aa1b4d6b09ffda49909c760b5cdf5bdc419e"; + src = fetchFromGitHub { + owner = "obspy"; + repo = "obspy"; + rev = "refs/tags/${version}"; + hash = "sha256-Y833OWWBDYduyky0+MRbPoBtATTytak87hgh68QAgfw="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + pythonRelaxDeps = [ "sqlalchemy" ]; + + dependencies = [ decorator - future lxml matplotlib numpy @@ -39,10 +47,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "obspy" ]; - meta = with lib; { + meta = { description = "Python framework for seismological observatories"; homepage = "https://www.obspy.org"; - license = licenses.lgpl3; - maintainers = [ maintainers.ametrine ]; + changelog = "https://github.com/obspy/obspy/releases/tag/${version}"; + license = lib.licenses.lgpl3Only; + maintainers = [ lib.maintainers.ametrine ]; }; } diff --git a/pkgs/development/python-modules/particle/default.nix b/pkgs/development/python-modules/particle/default.nix index 0fe769d05238..112b733ed284 100644 --- a/pkgs/development/python-modules/particle/default.nix +++ b/pkgs/development/python-modules/particle/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "particle"; - version = "0.25.0"; - format = "pyproject"; + version = "0.25.1"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-ji1fo2VV5q8hi2bpe5WFsdT1IIV4XZbAZ3NvCy5X9a0="; + hash = "sha256-lwZ0jpWnBt/9SUJts5MpgZf+GvgZchxdLG5RV2Sh+wE="; }; postPatch = '' @@ -32,12 +32,12 @@ buildPythonPackage rec { --replace '"--benchmark-disable",' "" ''; - nativeBuildInputs = [ + build-system = [ hatch-vcs hatchling ]; - propagatedBuildInputs = [ + dependencies = [ attrs deprecated hepunits @@ -51,13 +51,17 @@ buildPythonPackage rec { pythonImportsCheck = [ "particle" ]; - disabledTestPaths = [ "tests/particle/test_performance.py" ]; + disabledTestPaths = [ + # Requires pytest-benchmark and pytest-cov which we want to avoid using, as + # it doesn't really test functionality. + "tests/particle/test_performance.py" + ]; - meta = with lib; { + meta = { description = "Package to deal with particles, the PDG particle data table and others"; homepage = "https://github.com/scikit-hep/particle"; changelog = "https://github.com/scikit-hep/particle/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ doronbehar ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ doronbehar ]; }; } diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index 5280c2d91255..5495d50eec85 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -187,12 +187,15 @@ buildPythonPackage rec { pythonImportsCheck = [ "fitz" ]; - meta = with lib; { + meta = { description = "Python bindings for MuPDF's rendering library"; homepage = "https://github.com/pymupdf/PyMuPDF"; changelog = "https://github.com/pymupdf/PyMuPDF/releases/tag/${version}"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ teto ]; - platforms = platforms.unix; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ teto ]; + platforms = lib.platforms.unix; + # ImportError: cannot import name '_mupdf' from partially initialized module 'mupdf' + # (most likely due to a circular import) + broken = true; }; } diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 2a1a3f42593a..f7632133b545 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.8.8"; + version = "1.8.9"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TtJF6IHQdpx9OZ6wACmON1HQXhvvi67QZU/gI+zsy2Q="; + hash = "sha256-0ARkSUzmrqyRSPl3EXU7NzcnaWf+Zbt4zQZ626gvfEs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/wikitextparser/default.nix b/pkgs/development/python-modules/wikitextparser/default.nix index df3ecfa5e2dc..1b5fe1da7e3a 100644 --- a/pkgs/development/python-modules/wikitextparser/default.nix +++ b/pkgs/development/python-modules/wikitextparser/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "wikitextparser"; - version = "0.55.13"; + version = "0.56.2"; format = "pyproject"; src = fetchFromGitHub { owner = "5j9"; repo = "wikitextparser"; rev = "v${version}"; - hash = "sha256-qLctOX0BsKAn2JzfmV2sTLJ/KcNfaJFAjOB3pxd5LQI="; + hash = "sha256-g0Hvxw8evmCebM2joGT7XMnakVjDG74VJmZhlvUiQMU="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix index c717be75ad08..afaa956bbcab 100644 --- a/pkgs/development/tools/bacon/default.nix +++ b/pkgs/development/tools/bacon/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "2.20.0"; + version = "2.21.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pfILpDJbHLAwv/hUoMBjQSEyFAmU5VmVYY8lyf6j6NQ="; + hash = "sha256-WIjTFP5koNQeHiTcVxQ18eZEdHzmpBFinvfNtirG+pg="; }; - cargoHash = "sha256-5LwWTmka13Pht7lgBH50AnEC0Y71v1OCuaqloMlr/20="; + cargoHash = "sha256-YaVnfwf0jyZTe6B35z9Zm9247kGU/G6nu23sHg9lnAk="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/development/tools/lurk/default.nix b/pkgs/development/tools/lurk/default.nix index e82445b8a7f4..b9c8dcb36abc 100644 --- a/pkgs/development/tools/lurk/default.nix +++ b/pkgs/development/tools/lurk/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "lurk"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "jakwai01"; repo = pname; rev = "v${version}"; - hash = "sha256-u37q5AJe6zsPNe5L+k3uVP7r92X4v3qhApPKYndZif4="; + hash = "sha256-99WdRyE2avoH5Ea277Dx/HNcOdWxOamR41W7dQQadpo="; }; - cargoHash = "sha256-1hKyrlCDsOe+F88lg4+I5JMxG44CN2MOLi4GlaDBctk="; + cargoHash = "sha256-BUIMtJCzK//bZuvn9iptBd7lVMGyWFNJ/0oTfwPu0DE="; postPatch = '' substituteInPlace src/lib.rs \ diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 0fd75a8de856..167768a27e36 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "6.10"; + version = "6.11"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-dl7HGqHeL+NzY8HkDHt2afwdQMRLtdOLqOjNgsTtzwc="; + hash = "sha256-gyYlg6NSnwLDUBqouKx3K0y8A9yTTpi6tuSINibig6U="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/tools/sqldef/default.nix b/pkgs/development/tools/sqldef/default.nix index a47e280dba68..5b357fb11ee6 100644 --- a/pkgs/development/tools/sqldef/default.nix +++ b/pkgs/development/tools/sqldef/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "sqldef"; - version = "0.17.18"; + version = "0.17.19"; src = fetchFromGitHub { owner = "k0kubun"; repo = "sqldef"; rev = "v${version}"; - hash = "sha256-mFQ8E56qlS6UDaXZFsWQBy71Q8DOIMo1Qcmyg1vde5M="; + hash = "sha256-euIP6ev1qc+75MA9vlTZHY7LT03AM8hya+sPWohvCWI="; }; proxyVendor = true; - vendorHash = "sha256-Bvo+1o4eTJi9zjF/NQ6zBfoAFFlq4egi2nRE8BtaOfM="; + vendorHash = "sha256-+5vfQoTRCbwY/Ydq21VG/xt6CeOWHIup8bxWI/2v24A="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index 5baad629a273..d0feae3c2520 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.191.3"; + version = "1.192.5"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-8T58CrXbLxrw8TNRNB48w3zGOgBW+L/zWpsaGyWnLy8="; + hash = "sha256-heGW7SS4OOZrKCdVHoGlYS4NAu29jncwE1cMwHDYB4c="; }; vendorHash = "sha256-RiSZaNbMwOmKGzgFpeLmAjsiNg1ADMNAtMH7wHj/vlw="; diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index ac09bf88d3e0..cce9c36b259f 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.24.4"; + version = "1.24.5"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-nXWa8+kOIXCYgBB6lunb3kAqOPrCREdjWDd0ZIAHknQ="; + hash = "sha256-WuiLtAC+2ZkQUb7v2Jm3GfjyJkuTo+JAz0CiRVBWqGE="; }; - cargoHash = "sha256-j0eTXgjukYNxJrga1MJLPJDnM6UJjoNXZdu8E5Efe0k="; + cargoHash = "sha256-twr87xoynfJ8e7xh0B0z7HDKasKoTYZ+CxIlu4xWS4I="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/development/web/function-runner/default.nix b/pkgs/development/web/function-runner/default.nix index 846690d8e4b4..6ea238f53523 100644 --- a/pkgs/development/web/function-runner/default.nix +++ b/pkgs/development/web/function-runner/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "function-runner"; - version = "6.0.0"; + version = "6.2.1"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ccj34BtP+KdfOr0jIGsSVtwbYRouv93kDORgOLPFXKk="; + sha256 = "sha256-5X/d6phYXmJcCacHvGkk5o/J91SdlFamxJrqc5X/Y4Y="; }; - cargoHash = "sha256-Hs2xWGBlMLZlVMPByDVWNAytxMC7Nd3BUQLz1DJlTl4="; + cargoHash = "sha256-D6BTP/a3wOpcOLnGUASyBL3pzAieAllLzEZuaEv2Oco="; meta = with lib; { description = "CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure"; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 5fdb66011ed3..e1d681b1a5cd 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -266,6 +266,7 @@ stdenv.mkDerivation (finalAttrs: { (musl-patches + "/0018-pass-correct-parameters-to-getdents64.patch") (musl-patches + "/0019-Adjust-for-musl-headers.patch") (musl-patches + "/0020-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch") + (musl-patches + "/0021-errno-util-Make-STRERROR-portable-for-musl.patch") (musl-patches + "/0022-sd-event-Make-malloc_trim-conditional-on-glibc.patch") (musl-patches + "/0023-shared-Do-not-use-malloc_info-on-musl.patch") (musl-patches + "/0024-avoid-missing-LOCK_EX-declaration.patch") diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix index 92a6b328b2cc..ad8c8b8c2bbb 100644 --- a/pkgs/os-specific/linux/tcp-wrappers/default.nix +++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix @@ -2,7 +2,7 @@ let vanillaVersion = "7.6.q"; - patchLevel = "26"; + patchLevel = "33"; in stdenv.mkDerivation rec { pname = "tcp-wrappers"; version = "${vanillaVersion}-${patchLevel}"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { debian = fetchurl { url = "mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_${version}.debian.tar.xz"; - sha256 = "1dcdhi9lwzv7g19ggwxms2msq9fy14rl09rjqb10hwv0jix7z8j8"; + hash = "sha256-Lykjyu4hKDS/DqQ8JAFhKDffHrbJ9W1gjBKNpdaNRew="; }; prePatch = '' @@ -28,11 +28,6 @@ in stdenv.mkDerivation rec { # Fix __BEGIN_DECLS usage (even if it wasn't non-standard, this doesn't include sys/cdefs.h) patches = [ ./cdecls.patch ]; - postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' - substituteInPlace Makefile \ - --replace '-DNETGROUP' '-DUSE_GETDOMAIN' - ''; - buildInputs = [ libnsl ]; makeFlags = [ "REAL_DAEMON_DIR=$(out)/bin" "linux" "AR:=$(AR)" ]; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index d222563fa0fd..10b88a04c707 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -15,7 +15,7 @@ }: let - version = "1.72.1"; + version = "1.74.0"; in buildGoModule { pname = "tailscale"; @@ -25,7 +25,7 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-b1o3UHotVs5/+cpMx9q8bvt6BSM2QamLDUNyBNfb58A="; + hash = "sha256-KTg1rxyCgvZAwkGxhFXLff5UggKlqa6VLMItK81JV2k="; }; patches = [ @@ -37,7 +37,7 @@ buildGoModule { }) ]; - vendorHash = "sha256-M5e5dE1gGW3ly94r3SxCsBmVwbBmhVtaVDW691vxG/8="; + vendorHash = "sha256-HJEgBs2GOzXvRa95LdwySQmG4/+QwupFDBGrQT6Y2vE="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ] ++ [ installShellFiles ]; diff --git a/pkgs/tools/misc/github-backup/default.nix b/pkgs/tools/misc/github-backup/default.nix index f555ca74d611..6958bf579b5a 100644 --- a/pkgs/tools/misc/github-backup/default.nix +++ b/pkgs/tools/misc/github-backup/default.nix @@ -1,21 +1,23 @@ { lib -, python3 -, fetchPypi +, python3Packages +, fetchFromGitHub , git , git-lfs }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "github-backup"; - version = "0.45.2"; + version = "0.46.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-wn2JRMLfqhhTREeYM+mcs68xlkRWKMlxKXToa83pu2g="; + src = fetchFromGitHub { + owner = "josegonzalez"; + repo = "python-github-backup"; + rev = "refs/tags/${version}"; + hash = "sha256-kSxkD8vWBvaT7C0sS9rs3CEP2yeWsAJ0kjPlrGezoLU="; }; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/tools/networking/curl/CVE-2024-8096.patch b/pkgs/tools/networking/curl/CVE-2024-8096.patch new file mode 100644 index 000000000000..0f780f08c326 --- /dev/null +++ b/pkgs/tools/networking/curl/CVE-2024-8096.patch @@ -0,0 +1,200 @@ +From aeb1a281cab13c7ba791cb104e556b20e713941f Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Tue, 20 Aug 2024 16:14:39 +0200 +Subject: [PATCH] gtls: fix OCSP stapling management + +Reported-by: Hiroki Kurosawa +Closes #14642 +--- + lib/vtls/gtls.c | 146 ++++++++++++++++++++++++------------------------ + 1 file changed, 73 insertions(+), 73 deletions(-) + +diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c +index 03d6fcc038aac3..c7589d9d39bc81 100644 +--- a/lib/vtls/gtls.c ++++ b/lib/vtls/gtls.c +@@ -850,6 +850,13 @@ static CURLcode gtls_client_init(struct Curl_cfilter *cf, + init_flags |= GNUTLS_NO_TICKETS; + #endif + ++#if defined(GNUTLS_NO_STATUS_REQUEST) ++ if(!config->verifystatus) ++ /* Disable the "status_request" TLS extension, enabled by default since ++ GnuTLS 3.8.0. */ ++ init_flags |= GNUTLS_NO_STATUS_REQUEST; ++#endif ++ + rc = gnutls_init(>ls->session, init_flags); + if(rc != GNUTLS_E_SUCCESS) { + failf(data, "gnutls_init() failed: %d", rc); +@@ -1321,104 +1328,97 @@ Curl_gtls_verifyserver(struct Curl_easy *data, + infof(data, " server certificate verification SKIPPED"); + + if(config->verifystatus) { +- if(gnutls_ocsp_status_request_is_checked(session, 0) == 0) { +- gnutls_datum_t status_request; +- gnutls_ocsp_resp_t ocsp_resp; ++ gnutls_datum_t status_request; ++ gnutls_ocsp_resp_t ocsp_resp; ++ gnutls_ocsp_cert_status_t status; ++ gnutls_x509_crl_reason_t reason; + +- gnutls_ocsp_cert_status_t status; +- gnutls_x509_crl_reason_t reason; ++ rc = gnutls_ocsp_status_request_get(session, &status_request); + +- rc = gnutls_ocsp_status_request_get(session, &status_request); ++ if(rc == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) { ++ failf(data, "No OCSP response received"); ++ return CURLE_SSL_INVALIDCERTSTATUS; ++ } + +- infof(data, " server certificate status verification FAILED"); ++ if(rc < 0) { ++ failf(data, "Invalid OCSP response received"); ++ return CURLE_SSL_INVALIDCERTSTATUS; ++ } + +- if(rc == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) { +- failf(data, "No OCSP response received"); +- return CURLE_SSL_INVALIDCERTSTATUS; +- } ++ gnutls_ocsp_resp_init(&ocsp_resp); + +- if(rc < 0) { +- failf(data, "Invalid OCSP response received"); +- return CURLE_SSL_INVALIDCERTSTATUS; +- } ++ rc = gnutls_ocsp_resp_import(ocsp_resp, &status_request); ++ if(rc < 0) { ++ failf(data, "Invalid OCSP response received"); ++ return CURLE_SSL_INVALIDCERTSTATUS; ++ } + +- gnutls_ocsp_resp_init(&ocsp_resp); ++ (void)gnutls_ocsp_resp_get_single(ocsp_resp, 0, NULL, NULL, NULL, NULL, ++ &status, NULL, NULL, NULL, &reason); + +- rc = gnutls_ocsp_resp_import(ocsp_resp, &status_request); +- if(rc < 0) { +- failf(data, "Invalid OCSP response received"); +- return CURLE_SSL_INVALIDCERTSTATUS; +- } ++ switch(status) { ++ case GNUTLS_OCSP_CERT_GOOD: ++ break; + +- (void)gnutls_ocsp_resp_get_single(ocsp_resp, 0, NULL, NULL, NULL, NULL, +- &status, NULL, NULL, NULL, &reason); ++ case GNUTLS_OCSP_CERT_REVOKED: { ++ const char *crl_reason; + +- switch(status) { +- case GNUTLS_OCSP_CERT_GOOD: ++ switch(reason) { ++ default: ++ case GNUTLS_X509_CRLREASON_UNSPECIFIED: ++ crl_reason = "unspecified reason"; + break; + +- case GNUTLS_OCSP_CERT_REVOKED: { +- const char *crl_reason; +- +- switch(reason) { +- default: +- case GNUTLS_X509_CRLREASON_UNSPECIFIED: +- crl_reason = "unspecified reason"; +- break; +- +- case GNUTLS_X509_CRLREASON_KEYCOMPROMISE: +- crl_reason = "private key compromised"; +- break; +- +- case GNUTLS_X509_CRLREASON_CACOMPROMISE: +- crl_reason = "CA compromised"; +- break; +- +- case GNUTLS_X509_CRLREASON_AFFILIATIONCHANGED: +- crl_reason = "affiliation has changed"; +- break; ++ case GNUTLS_X509_CRLREASON_KEYCOMPROMISE: ++ crl_reason = "private key compromised"; ++ break; + +- case GNUTLS_X509_CRLREASON_SUPERSEDED: +- crl_reason = "certificate superseded"; +- break; ++ case GNUTLS_X509_CRLREASON_CACOMPROMISE: ++ crl_reason = "CA compromised"; ++ break; + +- case GNUTLS_X509_CRLREASON_CESSATIONOFOPERATION: +- crl_reason = "operation has ceased"; +- break; ++ case GNUTLS_X509_CRLREASON_AFFILIATIONCHANGED: ++ crl_reason = "affiliation has changed"; ++ break; + +- case GNUTLS_X509_CRLREASON_CERTIFICATEHOLD: +- crl_reason = "certificate is on hold"; +- break; ++ case GNUTLS_X509_CRLREASON_SUPERSEDED: ++ crl_reason = "certificate superseded"; ++ break; + +- case GNUTLS_X509_CRLREASON_REMOVEFROMCRL: +- crl_reason = "will be removed from delta CRL"; +- break; ++ case GNUTLS_X509_CRLREASON_CESSATIONOFOPERATION: ++ crl_reason = "operation has ceased"; ++ break; + +- case GNUTLS_X509_CRLREASON_PRIVILEGEWITHDRAWN: +- crl_reason = "privilege withdrawn"; +- break; ++ case GNUTLS_X509_CRLREASON_CERTIFICATEHOLD: ++ crl_reason = "certificate is on hold"; ++ break; + +- case GNUTLS_X509_CRLREASON_AACOMPROMISE: +- crl_reason = "AA compromised"; +- break; +- } ++ case GNUTLS_X509_CRLREASON_REMOVEFROMCRL: ++ crl_reason = "will be removed from delta CRL"; ++ break; + +- failf(data, "Server certificate was revoked: %s", crl_reason); ++ case GNUTLS_X509_CRLREASON_PRIVILEGEWITHDRAWN: ++ crl_reason = "privilege withdrawn"; + break; +- } + +- default: +- case GNUTLS_OCSP_CERT_UNKNOWN: +- failf(data, "Server certificate status is unknown"); ++ case GNUTLS_X509_CRLREASON_AACOMPROMISE: ++ crl_reason = "AA compromised"; + break; + } + +- gnutls_ocsp_resp_deinit(ocsp_resp); ++ failf(data, "Server certificate was revoked: %s", crl_reason); ++ break; ++ } + +- return CURLE_SSL_INVALIDCERTSTATUS; ++ default: ++ case GNUTLS_OCSP_CERT_UNKNOWN: ++ failf(data, "Server certificate status is unknown"); ++ break; + } +- else +- infof(data, " server certificate status verification OK"); ++ ++ gnutls_ocsp_resp_deinit(ocsp_resp); ++ if(status != GNUTLS_OCSP_CERT_GOOD) ++ return CURLE_SSL_INVALIDCERTSTATUS; + } + else + infof(data, " server certificate status verification SKIPPED"); diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index b0be18452b11..033657371747 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -63,6 +63,9 @@ stdenv.mkDerivation (finalAttrs: { # fixes https://github.com/curl/curl/issues/14344 # https://github.com/curl/curl/pull/14390 ./fix-sigpipe-leak.patch + ] ++ lib.optionals gnutlsSupport [ + # https://curl.se/docs/CVE-2024-8096.html + ./CVE-2024-8096.patch ]; # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index b65ad77b4527..366d1374bde3 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -110,7 +110,7 @@ buildGoModule rec { changelog = "https://github.com/netbirdio/netbird/releases/tag/v${version}"; description = "Connect your devices into a single secure private WireGuard®-based mesh network with SSO/MFA and simple access controls"; license = licenses.bsd3; - maintainers = with maintainers; [ misuzu vrifox ]; + maintainers = with maintainers; [ vrifox ]; mainProgram = "netbird"; }; } diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 54aab020e7ee..b44ccd5394a6 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "clamav"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz"; - hash = "sha256-1nqymeXKBdrT2imaXqc9YCCTcqW+zX8TuaM8KQM4pOY="; + hash = "sha256-oxjngKw5prPWxGlxOC+W7d6Xzki442HrgOY0Fe1Batg="; }; patches = [ diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index 61c663b527d8..b149649a75eb 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.31"; + version = "2.0.32"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jMQpnob6J3lPkrjsh8abNA5/8FVYk/xtWiylWFPk1WM="; + sha256 = "sha256-J8DAHwbpcSQtOWOkWjya3zXRhr9Dje2QzumDmeq2rR0="; }; - cargoHash = "sha256-55nfiC8tWZNgK0il+N9NMzq525xqWd2IdDHhPLMYaXU="; + cargoHash = "sha256-M0MX2ZjVsJuWQ6nuxpF1VDYIlGPAsebRbxZ40oSYVO0="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 19bfd3ff3eef..8d13703498d2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -243,6 +243,9 @@ mapAliases ({ citra = throw "citra has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 citra-nightly = throw "citra-nightly has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 citra-canary = throw "citra-canary has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 + cloog = throw "cloog has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 + cloog_0_18_0 = throw "cloog_0_18_0 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 + cloogppl = throw "cloogppl has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 clang-ocl = throw "'clang-ocl' has been replaced with 'rocmPackages.clang-ocl'"; # Added 2023-10-08 inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17 clpm = throw "'clpm' has been removed from nixpkgs"; # Added 2024-04-01 @@ -510,10 +513,14 @@ mapAliases ({ garage_0_7_3 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 garmin-plugin = throw "garmin-plugin has been removed, as it is unmaintained upstream and no longer works with modern browsers."; # Added 2024-01-12 garmindev = throw "'garmindev' has been removed as the dependent software 'qlandkartegt' has been removed"; # Added 2023-04-17 - gcc48 = throw "'gcc48' has been removed from nixpkgs"; # Added 2024-09-10 - gcc49 = throw "'gcc49' has been removed from nixpkgs"; # Added 2024-09-11 - gcc49Stdenv = throw "'gcc49Stdenv' has been removed from nixpkgs"; # Added 2024-09-11 + gcc48 = throw "gcc48 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-10 + gcc49 = throw "gcc49 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11 + gcc49Stdenv = throw "gcc49Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11 + gcc6 = throw "gcc6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 + gcc6Stdenv = throw "gcc6Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" then gcc10Stdenv else stdenv; # Added 2024-03-21 + gcj = gcj6; # Added 2024-09-13 + gcj6 = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 gcl_2_6_13_pre = throw "'gcl_2_6_13_pre' has been removed in favor of 'gcl'"; # Added 2024-01-11 geekbench4 = throw "'geekbench4' has been renamed to 'geekbench_4'"; # Added 2023-03-10 geekbench5 = throw "'geekbench5' has been renamed to 'geekbench_5'"; # Added 2023-03-10 @@ -702,6 +709,8 @@ mapAliases ({ ipfs-migrator = kubo-migrator; # Added 2022-09-27 iproute = iproute2; # moved from top-level 2021-03-14 irrlichtmt = throw "irrlichtmt has been removed because it was moved into the Minetest repo"; # Added 2024-08-12 + isl_0_11 = throw "isl_0_11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 + isl_0_14 = throw "isl_0_14 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 iso-flags-png-320x420 = lib.warn "iso-flags-png-320x420 has been renamed to iso-flags-png-320x240" iso-flags-png-320x240; # Added 2024-07-17 ### J ### diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7af2a949ef06..712713ce501b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6755,16 +6755,6 @@ with pkgs; clolcat = callPackage ../tools/misc/clolcat { }; - cloog = callPackage ../development/libraries/cloog { - isl = isl_0_14; - }; - - cloog_0_18_0 = callPackage ../development/libraries/cloog/0.18.0.nix { - isl = isl_0_11; - }; - - cloogppl = callPackage ../development/libraries/cloog-ppl { }; - cloud-utils = callPackage ../tools/misc/cloud-utils { }; cloudlist = callPackage ../tools/security/cloudlist { }; @@ -8952,8 +8942,6 @@ with pkgs; ised = callPackage ../tools/misc/ised { }; isl = isl_0_20; - isl_0_11 = callPackage ../development/libraries/isl/0.11.1.nix { }; - isl_0_14 = callPackage ../development/libraries/isl/0.14.1.nix { }; isl_0_17 = callPackage ../development/libraries/isl/0.17.1.nix { }; isl_0_20 = callPackage ../development/libraries/isl/0.20.0.nix { }; isl_0_24 = callPackage ../development/libraries/isl/0.24.0.nix { }; @@ -14909,7 +14897,6 @@ with pkgs; extraBuildInputs = lib.optional stdenv.hostPlatform.isDarwin clang.cc; }; - gcc6Stdenv = overrideCC gccStdenv buildPackages.gcc6; gcc7Stdenv = overrideCC gccStdenv buildPackages.gcc7; gcc8Stdenv = overrideCC gccStdenv buildPackages.gcc8; gcc9Stdenv = overrideCC gccStdenv buildPackages.gcc9; @@ -15003,7 +14990,7 @@ with pkgs; }; inherit (callPackage ../development/compilers/gcc/all.nix { inherit noSysDirs; }) - gcc6 gcc7 gcc8 gcc9 gcc10 gcc11 gcc12 gcc13 gcc14; + gcc7 gcc8 gcc9 gcc10 gcc11 gcc12 gcc13 gcc14; gcc_latest = gcc14; @@ -15017,18 +15004,6 @@ with pkgs; enableLTO = false; }; - gcj = gcj6; - gcj6 = wrapCC (gcc6.cc.override { - name = "gcj"; - langJava = true; - langFortran = false; - langCC = false; - langC = false; - profiledCompiler = false; - inherit zip unzip zlib boehmgc gettext pkg-config perl; - inherit (gnome2) libart_lgpl; - }); - gnat = gnat12; # When changing this, update also gnatPackages gnat11 = wrapCC (gcc11.cc.override { @@ -25762,7 +25737,9 @@ with pkgs; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; - tailscale = callPackage ../servers/tailscale { }; + tailscale = callPackage ../servers/tailscale { + buildGoModule = buildGo123Module; + }; tailscale-systray = callPackage ../applications/misc/tailscale-systray { };