diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-01-25 00:02:13 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-25 00:02:13 +0000 |
commit | a4b5a14b07c5a3f90bc868ee26a0a685b3f7f893 (patch) | |
tree | f6bfeddb541b02e74e942f0bd509eae703c62f9e /pkgs/development | |
parent | 0a95fd24f004b0aecf8c1a980c5069266ad78ccd (diff) | |
parent | 7b1be1e6d433903eecc598729f4d4ba216a12a4c (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development')
18 files changed, 346 insertions, 191 deletions
diff --git a/pkgs/development/compilers/go/1.22.nix b/pkgs/development/compilers/go/1.22.nix new file mode 100644 index 0000000000000..ac02062a41f54 --- /dev/null +++ b/pkgs/development/compilers/go/1.22.nix @@ -0,0 +1,189 @@ +{ lib +, stdenv +, fetchurl +, tzdata +, substituteAll +, iana-etc +, Security +, Foundation +, xcbuild +, mailcap +, buildPackages +, pkgsBuildTarget +, threadsCross +, testers +, skopeo +, buildGo122Module +}: + +let + useGccGoBootstrap = stdenv.buildPlatform.isMusl; + goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap121.nix { }; + + skopeoTest = skopeo.override { buildGoModule = buildGo122Module; }; + + goarch = platform: { + "aarch64" = "arm64"; + "arm" = "arm"; + "armv5tel" = "arm"; + "armv6l" = "arm"; + "armv7l" = "arm"; + "i686" = "386"; + "mips" = "mips"; + "mips64el" = "mips64le"; + "mipsel" = "mipsle"; + "powerpc64le" = "ppc64le"; + "riscv64" = "riscv64"; + "s390x" = "s390x"; + "x86_64" = "amd64"; + }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); + + # We need a target compiler which is still runnable at build time, + # to handle the cross-building case where build != host == target + targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; + + isCross = stdenv.buildPlatform != stdenv.targetPlatform; +in +stdenv.mkDerivation (finalAttrs: { + pname = "go"; + version = "1.22rc2"; + + src = fetchurl { + url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; + hash = "sha256-0ZOofbgiOCHh7oke3+42yOrJugz4PkLt5keVp96Kfyc="; + }; + + strictDeps = true; + buildInputs = [ ] + ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; + + depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ]; + + depsBuildTarget = lib.optional isCross targetCC; + + depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package; + + postPatch = '' + patchShebangs . + ''; + + patches = [ + (substituteAll { + src = ./iana-etc-1.17.patch; + iana = iana-etc; + }) + # Patch the mimetype database location which is missing on NixOS. + # but also allow static binaries built with NixOS to run outside nix + (substituteAll { + src = ./mailcap-1.17.patch; + inherit mailcap; + }) + # prepend the nix path to the zoneinfo files but also leave the original value for static binaries + # that run outside a nix server + (substituteAll { + src = ./tzdata-1.19.patch; + inherit tzdata; + }) + ./remove-tools-1.11.patch + ./go_no_vendor_checks-1.22.patch + ]; + + GOOS = stdenv.targetPlatform.parsed.kernel.name; + GOARCH = goarch stdenv.targetPlatform; + # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. + # Go will nevertheless build a for host system that we will copy over in + # the install phase. + GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; + GOHOSTARCH = goarch stdenv.buildPlatform; + + # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those + # to be different from CC/CXX + CC_FOR_TARGET = + if isCross then + "${targetCC}/bin/${targetCC.targetPrefix}cc" + else + null; + CXX_FOR_TARGET = + if isCross then + "${targetCC}/bin/${targetCC.targetPrefix}c++" + else + null; + + GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]); + GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = 1; + + GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go"; + + buildPhase = '' + runHook preBuild + export GOCACHE=$TMPDIR/go-cache + # this is compiled into the binary + export GOROOT_FINAL=$out/share/go + + export PATH=$(pwd)/bin:$PATH + + ${lib.optionalString isCross '' + # Independent from host/target, CC should produce code for the building system. + # We only set it when cross-compiling. + export CC=${buildPackages.stdenv.cc}/bin/cc + ''} + ulimit -a + + pushd src + ./make.bash + popd + runHook postBuild + ''; + + preInstall = '' + # Contains the wrong perl shebang when cross compiling, + # since it is not used for anything we can deleted as well. + rm src/regexp/syntax/make_perl_groups.pl + '' + (if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then '' + mv bin/*_*/* bin + rmdir bin/*_* + ${lib.optionalString (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) '' + rm -rf pkg/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} pkg/tool/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} + ''} + '' else lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) '' + rm -rf bin/*_* + ${lib.optionalString (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) '' + rm -rf pkg/${finalAttrs.GOOS}_${finalAttrs.GOARCH} pkg/tool/${finalAttrs.GOOS}_${finalAttrs.GOARCH} + ''} + ''); + + installPhase = '' + runHook preInstall + mkdir -p $GOROOT_FINAL + cp -a bin pkg src lib misc api doc go.env $GOROOT_FINAL + mkdir -p $out/bin + ln -s $GOROOT_FINAL/bin/* $out/bin + runHook postInstall + ''; + + disallowedReferences = [ goBootstrap ]; + + passthru = { + inherit goBootstrap skopeoTest; + tests = { + skopeo = testers.testVersion { package = skopeoTest; }; + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "go version"; + version = "go${finalAttrs.version}"; + }; + }; + }; + + meta = with lib; { + changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor finalAttrs.version}"; + description = "The Go Programming language"; + homepage = "https://go.dev/"; + license = licenses.bsd3; + maintainers = teams.golang.members; + platforms = platforms.darwin ++ platforms.linux; + mainProgram = "go"; + }; +}) diff --git a/pkgs/development/compilers/go/go_no_vendor_checks-1.22.patch b/pkgs/development/compilers/go/go_no_vendor_checks-1.22.patch new file mode 100644 index 0000000000000..bd545d50948f0 --- /dev/null +++ b/pkgs/development/compilers/go/go_no_vendor_checks-1.22.patch @@ -0,0 +1,23 @@ +Starting from go1.14, go verifes that vendor/modules.txt matches the requirements +and replacements listed in the main module go.mod file, and it is a hard failure if +vendor/modules.txt is missing. + +Relax module consistency checks and switch back to pre go1.14 behaviour if +vendor/modules.txt is missing regardless of go version requirement in go.mod. + +This has been ported from FreeBSD: https://reviews.freebsd.org/D24122 +See https://github.com/golang/go/issues/37948 for discussion. + +diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go +index b2cb44100e..05bf3829d5 100644 +--- a/src/cmd/go/internal/modload/vendor.go ++++ b/src/cmd/go/internal/modload/vendor.go +@@ -159,7 +159,7 @@ func checkVendorConsistency(indexes []*modFileIndex, modFiles []*modfile.File, m + panic(fmt.Errorf("not in workspace mode but number of indexes is %v, not 1", len(indexes))) + } + index := indexes[0] +- if gover.Compare(index.goVersion, "1.14") < 0 { ++ if gover.Compare(index.goVersion, "1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { + // Go versions before 1.14 did not include enough information in + // vendor/modules.txt to check for consistency. + // If we know that we're on an earlier version, relax the consistency check. diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix deleted file mode 100644 index 369e9ff825f7f..0000000000000 --- a/pkgs/development/libraries/live555/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ lib -, stdenv -, fetchurl -, darwin -, openssl - -# major and only downstream dependency -, vlc -}: - -stdenv.mkDerivation rec { - pname = "live555"; - version = "2023.05.10"; - - src = fetchurl { - urls = [ - "http://www.live555.com/liveMedia/public/live.${version}.tar.gz" - "https://download.videolan.org/contrib/live555/live.${version}.tar.gz" - "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz" - ]; - sha256 = "sha256-6ph9x4UYELkkJVIE9r25ycc5NOYbPcgAy9LRZebvGFY="; - }; - - nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools; - - buildInputs = [ openssl ]; - - postPatch = '' - substituteInPlace config.macosx-catalina \ - --replace '/usr/lib/libssl.46.dylib' "${lib.getLib openssl}/lib/libssl.dylib" \ - --replace '/usr/lib/libcrypto.44.dylib' "${lib.getLib openssl}/lib/libcrypto.dylib" - sed -i -e 's|/bin/rm|rm|g' genMakefiles - sed -i \ - -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \ - config.linux - '' # condition from icu/base.nix - + lib.optionalString (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") '' - substituteInPlace liveMedia/include/Locale.hh \ - --replace '<xlocale.h>' '<locale.h>' - ''; - - configurePhase = '' - runHook preConfigure - - ./genMakefiles ${ - if stdenv.isLinux then - "linux" - else if stdenv.isDarwin then - "macosx-catalina" - else - throw "Unsupported platform ${stdenv.hostPlatform.system}"} - - runHook postConfigure - ''; - - makeFlags = [ - "DESTDIR=${placeholder "out"}" - "PREFIX=" - ]; - - enableParallelBuilding = true; - - passthru.tests = { - inherit vlc; - }; - - meta = with lib; { - homepage = "http://www.live555.com/liveMedia/"; - description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)"; - changelog = "http://www.live555.com/liveMedia/public/changelog.txt"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 336a08e0532fc..a56d63aa3b1e0 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.5.8"; + version = "5.5.10"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-C3A7mNsiTe50jKD98zjU37GL20zw5SNSVte+GtrvbFA="; + hash = "sha256-yBB66H8l+kjVcpmt3gYzggRgfxjFvMPwy3rcYuKYqks="; }; postPatch = '' diff --git a/pkgs/development/python-modules/blurhash-python/default.nix b/pkgs/development/python-modules/blurhash-python/default.nix index 71b2961ee3def..2b0232a7e9b91 100644 --- a/pkgs/development/python-modules/blurhash-python/default.nix +++ b/pkgs/development/python-modules/blurhash-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "blurhash-python"; - version = "1.2.1"; + version = "1.2.2"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "woltapp"; repo = "blurhash-python"; rev = "v${version}"; - hash = "sha256-z7V2Ck8h12Vuj/5/s9ZP/uqQ4olo8xwg+ZR3iW4ca/M="; + hash = "sha256-Cz+PkPp1knvT3U5ofyb1PstM9kzBOkgPbx03LgOLXgw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index d15f45e7d0412..dd6780e899dc7 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.25"; + version = "1.34.26"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-cyIZICHgSSIE0iOqyIDU0r39OQ8+fzh00enhmPgkg2c="; + hash = "sha256-65EItCrdCs4ocQQr+0HToSRqHkR8tHp3EEIniopoSb8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cvss/default.nix b/pkgs/development/python-modules/cvss/default.nix index 140852cb98be1..120325a7b8e58 100644 --- a/pkgs/development/python-modules/cvss/default.nix +++ b/pkgs/development/python-modules/cvss/default.nix @@ -2,47 +2,44 @@ , buildPythonPackage , fetchFromGitHub , jsonschema -, pytestCheckHook +, unittestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "cvss"; - version = "2.6"; - format = "setuptools"; + version = "3.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "RedHatProductSecurity"; - repo = pname; + repo = "cvss"; rev = "refs/tags/v${version}"; - hash = "sha256-gD9MreJQPaxziy02Wt3BGFiIoQ/+pW3KqiNfNlTijJY="; + hash = "sha256-xrkWpE13Y4KgQEZjitWE3Ka+IyfShqE2cj0/yzsAnX4="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ jsonschema - pytestCheckHook + unittestCheckHook ]; pythonImportsCheck = [ "cvss" ]; - disabledTests = [ - # Tests require additional data - "test_calculator" - "test_cvsslib" - "test_json_ordering" - "test_json_schema_repr" - "test_random" - "test_rh_vector" - "test_simple" - "test_simple_31" - ]; + preCheck = '' + cd tests + ''; meta = with lib; { - description = "Library for CVSS2/3"; + description = "Library for CVSS2/3/4"; homepage = "https://github.com/RedHatProductSecurity/cvss"; changelog = "https://github.com/RedHatProductSecurity/cvss/releases/tag/v${version}"; license = with licenses; [ lgpl3Plus ]; diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index c7b41c27823a9..d1fdd1ce85802 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "3.7.0"; + version = "3.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc-data"; rev = "refs/tags/${version}"; - hash = "sha256-ycC6NWvU00yUEHu62H5VLKDEZEHyIo4+TBwj5XaswII="; + hash = "sha256-i9pFdGMzUypUFZKtE4k1w116r+NjfIECg1a6xw9TpG0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index c4fc1b7c78c02..ec46ef9edfc8b 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.41.0"; + version = "3.42.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -67,7 +67,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc"; rev = "refs/tags/${version}"; - hash = "sha256-j4UkPHav97s5GAuR9yYWaI1ObfKcsyozlTDC9jeBfK4="; + hash = "sha256-NTviaNhGe3hisP32Ccp1wHTrKXHZZP7gJFwDy7BlI/M="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 9609365f7fef5..f06dd4109abeb 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2024.1.7"; + version = "2024.1.8"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = "hahomematic"; rev = "refs/tags/${version}"; - hash = "sha256-98biJ/BXFZV55FMRvT8QexzWVB2rfF/YVa66+HU06mI="; + hash = "sha256-ln+Dich2I503LA5nIWK9k3B83LjIBsRUmBv2xJmFRQI="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix index d48a84025e4c8..94d3058a8a158 100644 --- a/pkgs/development/python-modules/reptor/default.nix +++ b/pkgs/development/python-modules/reptor/default.nix @@ -15,6 +15,7 @@ , pytest , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , pyyaml , reptor , requests @@ -22,16 +23,17 @@ , setuptools , sqlparse , termcolor -, toml +, tomli , tomli-w +, tomlkit , urllib3 , xmltodict }: buildPythonPackage rec { pname = "reptor"; - version = "0.7"; - format = "pyproject"; + version = "0.8"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -39,10 +41,13 @@ buildPythonPackage rec { owner = "Syslifters"; repo = "reptor"; rev = "refs/tags/${version}"; - hash = "sha256-d76Hsf+leJKYOh7k/RVuo6adfjMW6yAYt+vh7KNh7sA="; + hash = "sha256-YnDAjbj3TTr+WajuW6Dq3f+fjeJxrWk7VNWKhh9O7Zw="; }; + pythonRelaxDeps = true; + nativeBuildInputs = [ + pythonRelaxDepsHook setuptools ]; @@ -61,7 +66,8 @@ buildPythonPackage rec { rich sqlparse termcolor - toml + tomli + tomlkit tomli-w urllib3 xmltodict diff --git a/pkgs/development/python-modules/sphinx-notfound-page/default.nix b/pkgs/development/python-modules/sphinx-notfound-page/default.nix index e9f5d9c4519dc..0621c2867d03f 100644 --- a/pkgs/development/python-modules/sphinx-notfound-page/default.nix +++ b/pkgs/development/python-modules/sphinx-notfound-page/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , flit-core , pythonImportsCheckHook +, pythonOlder # documentation build dependencies , sphinxHook , sphinx-prompt @@ -12,18 +13,25 @@ , sphinxemoji # runtime dependencies , sphinx +, setuptools }: buildPythonPackage rec { pname = "sphinx-notfound-page"; version = "1.0.0"; - format = "pyproject"; - outputs = [ "out" "doc" ]; + pyproject = true; + + disabled = pythonOlder "3.8"; + + outputs = [ + "out" + "doc" + ]; src = fetchFromGitHub { owner = "readthedocs"; repo = "sphinx-notfound-page"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-tG71UuYbdlWNgq6Y5xRH3aWc9/eTr/RlsRNWSUjrbBE="; }; @@ -38,13 +46,22 @@ buildPythonPackage rec { sphinxemoji ]; - propagatedBuildInputs = [ sphinx ]; + buildInputs = [ + sphinx + ]; - pythonImportsCheck = [ "notfound" ]; + propagatedBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "notfound" + ]; meta = with lib; { description = "A sphinx extension to create a custom 404 page with absolute URLs hardcoded"; homepage = "https://github.com/readthedocs/sphinx-notfound-page"; + changelog = "https://github.com/readthedocs/sphinx-notfound-page/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ kaction ]; }; diff --git a/pkgs/development/python-modules/sphinx-version-warning/default.nix b/pkgs/development/python-modules/sphinx-version-warning/default.nix index 1fb89f3a28490..7561fcd0dba56 100644 --- a/pkgs/development/python-modules/sphinx-version-warning/default.nix +++ b/pkgs/development/python-modules/sphinx-version-warning/default.nix @@ -3,13 +3,15 @@ , fetchFromGitHub , fetchpatch , pythonImportsCheckHook +, pythonOlder +, setuptools , sphinx -, sphinxHook , sphinx-autoapi +, sphinx-prompt , sphinx-rtd-theme , sphinx-tabs -, sphinx-prompt , sphinxemoji +, sphinxHook }: # Latest tagged release release "1.1.2" (Nov 2018) does not contain @@ -18,9 +20,14 @@ buildPythonPackage { pname = "sphinx-version-warning"; version = "unstable-2019-08-10"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.7"; - outputs = [ "out" "doc" ]; + outputs = [ + "out" + "doc" + ]; src = fetchFromGitHub { owner = "humitos"; @@ -40,21 +47,27 @@ buildPythonPackage { nativeBuildInputs = [ pythonImportsCheckHook - sphinxHook sphinx-autoapi + sphinx-prompt sphinx-rtd-theme sphinx-tabs - sphinx-prompt sphinxemoji + sphinxHook + setuptools ]; - propagatedBuildInputs = [ sphinx ]; + buildInputs = [ + sphinx + ]; - pythonImportsCheck = [ "versionwarning" ]; + pythonImportsCheck = [ + "versionwarning" + ]; meta = with lib; { description = "A sphinx extension to show a warning banner at the top of your documentation"; homepage = "https://github.com/humitos/sphinx-version-warning"; + changelog = "https://github.com/humitos/sphinx-version-warning/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ kaction ]; }; diff --git a/pkgs/development/python-modules/switchbot-api/default.nix b/pkgs/development/python-modules/switchbot-api/default.nix new file mode 100644 index 0000000000000..32df6d5185ca4 --- /dev/null +++ b/pkgs/development/python-modules/switchbot-api/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "switchbot-api"; + version = "2.0.0"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "SeraphicCorp"; + repo = "py-switchbot-api"; + rev = "refs/tags/v${version}"; + hash = "sha256-QM8oVfd+hdVNdhOgI3ujyY82Im0Yr5Nl+OcqzEtZ7XE="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Module has no tests + doCheck= false; + + pythonImportsCheck = [ + "switchbot_api" + ]; + + meta = with lib; { + description = "An asynchronous library to use Switchbot API"; + homepage = "https://github.com/SeraphicCorp/py-switchbot-api"; + changelog = "https://github.com/SeraphicCorp/py-switchbot-api/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index b5b1d54e24a92..8b5e1f66b6508 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.37.0"; + version = "4.37.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -62,7 +62,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-om/UAQ7UvwAiEClUDLxVC7cbd4Ye8VPcu3Gnug919xg="; + hash = "sha256-1W6Ec3+zdv75qd6s6Ogy/wkAKc+lA0xjZNAcMo8Q3ns="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/language-servers/jdt-language-server/default.nix b/pkgs/development/tools/language-servers/jdt-language-server/default.nix deleted file mode 100644 index 626db26e89b1b..0000000000000 --- a/pkgs/development/tools/language-servers/jdt-language-server/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib -, stdenv -, fetchurl -, python3 -, jdk -}: - -let - timestamp = "202401111522"; -in -stdenv.mkDerivation (finalAttrs: { - pname = "jdt-language-server"; - version = "1.31.0"; - - src = fetchurl { - url = "https://download.eclipse.org/jdtls/milestones/${finalAttrs.version}/jdt-language-server-${finalAttrs.version}-${timestamp}.tar.gz"; - hash = "sha256-bCX2LQt00d2SqxmvuvvlBB6wbCuFPqtX9/Qv5v6wH3w="; - }; - - sourceRoot = "."; - - buildInputs = [ - # Used for the included wrapper - python3 - ]; - - postPatch = '' - # We store the plugins, config, and features folder in different locations - # than in the original package. In addition, hard-code the path to the jdk - # in the wrapper, instead of searching for it in PATH at runtime. - substituteInPlace bin/jdtls.py \ - --replace "jdtls_base_path = Path(__file__).parent.parent" "jdtls_base_path = Path(\"$out/share/java/jdtls/\")" \ - --replace "java_executable = get_java_executable(known_args.validate_java_version)" "java_executable = '${lib.getExe jdk}'" - ''; - - installPhase = - let - # The application ships with different config directories for each platform. - # Note the application come with ARM variants as well, although the - # current included wrapper doesn't use them. - configDir = if stdenv.isDarwin then "config_mac" else "config_linux"; - in - '' - install -Dm444 -t $out/share/java/jdtls/plugins/ plugins/* - install -Dm444 -t $out/share/java/jdtls/features/ features/* - install -Dm444 -t $out/share/java/jdtls/${configDir} ${configDir}/* - install -Dm555 -t $out/bin bin/jdtls - install -Dm444 -t $out/bin bin/jdtls.py - ''; - - meta = { - homepage = "https://github.com/eclipse/eclipse.jdt.ls"; - description = "Java language server"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.epl20; - maintainers = with lib.maintainers; [ matt-snider ]; - platforms = lib.platforms.all; - mainProgram = "jdtls"; - }; -}) diff --git a/pkgs/development/tools/misc/fzf-make/default.nix b/pkgs/development/tools/misc/fzf-make/default.nix index ddb2ea849cd94..ec59149f5260b 100644 --- a/pkgs/development/tools/misc/fzf-make/default.nix +++ b/pkgs/development/tools/misc/fzf-make/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "fzf-make"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "kyu08"; repo = "fzf-make"; rev = "v${version}"; - hash = "sha256-wQ39qysRu5i5Po7G3uC/qHcssUhhIWwBdRwPiWgA004="; + hash = "sha256-MeJRXvMshhnNWNkEtOfxKMLLqoLjOREuDGcRHTnOxS8="; }; - cargoHash = "sha256-Kjr5lWEX1iki1C+r8OziCgu0WAvPcNk7U4uhQzCAWLA="; + cargoHash = "sha256-pHunUez3bsGwcSuQzx3DEDSKxx6UlUcuU35frEsc0+8="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index db2a4165ac375..75379b5e8203e 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -10,14 +10,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.8.2"; - vendorHash = "sha256-bscRqFYV2qzTmu04l00/iMsFQR5ITPBFVr9BQwVGFU8="; + version = "5.8.4"; + vendorHash = "sha256-ACK0JCaS1MOCgUi2DMEjIcKf/nMCcrdDyIdioBZv7qw="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-P5VitZL6KYplMpWdwTkzJEqf5UoSB5HaH/0kL2CbUEA="; + hash = "sha256-b6vjJaRSi5qNl4qpOEndqdZkaWxeI/6GnBiBIM2Vwr8="; }; ldflags = [ |