diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-04-10 20:43:08 +0200 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-04-10 20:43:08 +0200 |
commit | 69bfdf2484041b9d242840c4e5017b4703383bb0 (patch) | |
tree | d8bdaa69e7990d7d6f09b594b3c425f742acd2d0 /nixpkgs/pkgs/development | |
parent | c8aee4b4363b6bf905a521b05b7476960e8286c8 (diff) | |
parent | d8fe5e6c92d0d190646fb9f1056741a229980089 (diff) | |
download | nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.tar nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.tar.gz nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.tar.bz2 nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.tar.lz nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.tar.xz nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.tar.zst nixlib-69bfdf2484041b9d242840c4e5017b4703383bb0.zip |
Merge commit 'd8fe5e6c'
Conflicts: nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development')
560 files changed, 13369 insertions, 2856 deletions
diff --git a/nixpkgs/pkgs/development/beam-modules/elixir-ls/default.nix b/nixpkgs/pkgs/development/beam-modules/elixir-ls/default.nix index 79945e81af25..2324d641244f 100644 --- a/nixpkgs/pkgs/development/beam-modules/elixir-ls/default.nix +++ b/nixpkgs/pkgs/development/beam-modules/elixir-ls/default.nix @@ -4,12 +4,12 @@ let pname = "elixir-ls"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "elixir-lsp"; repo = "elixir-ls"; rev = "v${version}"; - hash = "sha256-pd/ZkDpzlheEJfX7X6fFWY4Y5B5Y2EnJMBtuNHPuUJw="; + hash = "sha256-LVMwDoGR516rwNhhvibu7g4EsaG2O8WOb+Ja+nCQA+k="; fetchSubmodules = true; }; in @@ -21,7 +21,7 @@ mixRelease { mixFodDeps = fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version elixir; - hash = "sha256-yxcUljclKKVFbY6iUphnTUSqMPpsEiPcw4yUs6atU0c="; + hash = "sha256-yq2shufOZsTyg8iBGsRrAs6bC3iAa9vtUeS96c5xJl0="; }; # elixir-ls is an umbrella app @@ -37,7 +37,7 @@ mixRelease { # of the no-deps-check requirement buildPhase = '' runHook preBuild - mix do compile --no-deps-check, elixir_ls.release + mix do compile --no-deps-check, elixir_ls.release${lib.optionalString (lib.versionAtLeast elixir.version "1.16.0") "2"} runHook postBuild ''; diff --git a/nixpkgs/pkgs/development/compilers/atasm/default.nix b/nixpkgs/pkgs/development/compilers/atasm/default.nix index 74f54d8d03cf..d79fc686b269 100644 --- a/nixpkgs/pkgs/development/compilers/atasm/default.nix +++ b/nixpkgs/pkgs/development/compilers/atasm/default.nix @@ -1,19 +1,22 @@ { lib , stdenv -, fetchurl -, unzip +, fetchFromGitHub , zlib }: stdenv.mkDerivation rec { pname = "atasm"; - version = "1.09"; + version = "1.23"; - src = fetchurl { - url = "https://atari.miribilist.com/${pname}/${pname}${builtins.replaceStrings ["."] [""] version}.zip"; - hash = "sha256-26shhw2r30GZIPz6S1rf6dOLKRpgpLwrqCRZX3+8PvA="; + src = fetchFromGitHub { + owner = "CycoPH"; + repo = "atasm"; + rev = "V${version}"; + hash = "sha256-U1HNYTiXO6WZEQJl2icY0ZEVy82CsL1mKR7Xgj9OZ14="; }; + makefile = "Makefile"; + patches = [ # make install fails because atasm.txt was moved; report to upstream ./0000-file-not-found.diff @@ -23,10 +26,6 @@ stdenv.mkDerivation rec { dontConfigure = true; - nativeBuildInputs = [ - unzip - ]; - buildInputs = [ zlib ]; @@ -42,9 +41,10 @@ stdenv.mkDerivation rec { ''; preInstall = '' + mkdir -p $out/bin/ install -d $out/share/doc/${pname} $out/man/man1 installFlagsArray+=( - DESTDIR=$out + DESTDIR=$out/bin/ DOCDIR=$out/share/doc/${pname} MANDIR=$out/man/man1 ) @@ -55,9 +55,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://atari.miribilist.com/atasm/"; + homepage = "https://github.com/CycoPH/atasm"; description = "A commandline 6502 assembler compatible with Mac/65"; license = licenses.gpl2Plus; + changelog = "https://github.com/CycoPH/atasm/releases/tag/V${version}"; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; unix; }; diff --git a/nixpkgs/pkgs/development/compilers/crystal/build-package.nix b/nixpkgs/pkgs/development/compilers/crystal/build-package.nix index e1ff7d08fb54..cb5869392b6b 100644 --- a/nixpkgs/pkgs/development/compilers/crystal/build-package.nix +++ b/nixpkgs/pkgs/development/compilers/crystal/build-package.nix @@ -71,8 +71,7 @@ let in stdenv.mkDerivation (mkDerivationArgs // { - configurePhase = args.configurePhase or lib.concatStringsSep "\n" - ( + configurePhase = args.configurePhase or (lib.concatStringsSep "\n" ( [ "runHook preConfigure" ] @@ -83,7 +82,7 @@ stdenv.mkDerivation (mkDerivationArgs // { "cp shard.lock lib/.shards.info" ] ++ [ "runHook postConfigure" ] - ); + )); CRFLAGS = lib.concatStringsSep " " defaultOptions; diff --git a/nixpkgs/pkgs/development/compilers/crystal/default.nix b/nixpkgs/pkgs/development/compilers/crystal/default.nix index fb031eba18cb..f36ce4c25853 100644 --- a/nixpkgs/pkgs/development/compilers/crystal/default.nix +++ b/nixpkgs/pkgs/development/compilers/crystal/default.nix @@ -268,6 +268,16 @@ rec { }; }; + binaryCrystal_1_10 = genericBinary { + version = "1.10.1"; + sha256s = { + x86_64-linux = "sha256-F0LjdV02U9G6B8ApHxClF/o5KvhxMNukSX7Z2CwSNIs="; + aarch64-darwin = "sha256-5kkObQl0VIO6zqQ8TYl0JzYyUmwfmPE9targpfwseSQ="; + x86_64-darwin = "sha256-5kkObQl0VIO6zqQ8TYl0JzYyUmwfmPE9targpfwseSQ="; + aarch64-linux = "sha256-AzFz+nrU/HJmCL1hbCKXf5ej/uypqV1GJPVLQ4J3778="; + }; + }; + crystal_1_2 = generic { version = "1.2.2"; sha256 = "sha256-nyOXhsutVBRdtJlJHe2dALl//BUXD1JeeQPgHU4SwiU="; @@ -297,5 +307,12 @@ rec { llvmPackages = llvmPackages_15; }; - crystal = crystal_1_9; + crystal_1_11 = generic { + version = "1.11.2"; + sha256 = "sha256-BBEDWqFtmFUNj0kuGBzv71YHO3KjxV4d2ySTCD4HhLc="; + binary = binaryCrystal_1_10; + llvmPackages = llvmPackages_15; + }; + + crystal = crystal_1_11; } diff --git a/nixpkgs/pkgs/development/compilers/elm/default.nix b/nixpkgs/pkgs/development/compilers/elm/default.nix index 44e1459af84d..ca9f37ff5367 100644 --- a/nixpkgs/pkgs/development/compilers/elm/default.nix +++ b/nixpkgs/pkgs/development/compilers/elm/default.nix @@ -5,307 +5,52 @@ }: let - fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { }; + fetchElmDeps = pkgs.callPackage ./lib/fetchElmDeps.nix { }; # Haskell packages that require ghc 9.6 - hs96Pkgs = self: pkgs.haskell.packages.ghc96.override { - overrides = self: super: with pkgs.haskell.lib.compose; with lib; - let elmPkgs = rec { - elm = overrideCabal (drv: { - # sadly with parallelism most of the time breaks compilation - enableParallelBuilding = false; - preConfigure = fetchElmDeps { - elmPackages = (import ./packages/elm-srcs.nix); - elmVersion = drv.version; - registryDat = ./registry.dat; - }; - buildTools = drv.buildTools or [] ++ [ makeWrapper ]; - postInstall = '' - wrapProgram $out/bin/elm \ - --prefix PATH ':' ${lib.makeBinPath [ nodejs ]} - ''; - - description = "A delightful language for reliable webapps"; - homepage = "https://elm-lang.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ domenkozar turbomack ]; - }) (self.callPackage ./packages/elm.nix { }); - - inherit fetchElmDeps; - elmVersion = elmPkgs.elm.version; - }; - in elmPkgs // { - inherit elmPkgs; - - ansi-wl-pprint = overrideCabal (drv: { - jailbreak = true; - }) (self.callPackage ./packages/ansi-wl-pprint.nix {}); - }; - }; + hs96Pkgs = import ./packages/ghc9_6 { inherit pkgs lib makeWrapper nodejs fetchElmDeps; }; # Haskell packages that require ghc 8.10 - hs810Pkgs = self: pkgs.haskell.packages.ghc810.override { - overrides = self: super: with pkgs.haskell.lib.compose; with lib; - let elmPkgs = rec { - elmi-to-json = justStaticExecutables (overrideCabal (drv: { - prePatch = '' - substituteInPlace package.yaml --replace "- -Werror" "" - hpack - ''; - jailbreak = true; - - description = "Tool that reads .elmi files (Elm interface file) generated by the elm compiler"; - homepage = "https://github.com/stoeffel/elmi-to-json"; - license = licenses.bsd3; - maintainers = [ maintainers.turbomack ]; - }) (self.callPackage ./packages/elmi-to-json.nix {})); - - elm-instrument = justStaticExecutables (overrideCabal (drv: { - prePatch = '' - sed "s/desc <-.*/let desc = \"${drv.version}\"/g" Setup.hs --in-place - ''; - jailbreak = true; - # Tests are failing because of missing instances for Eq and Show type classes - doCheck = false; - - description = "Instrument Elm code as a preprocessing step for elm-coverage"; - homepage = "https://github.com/zwilias/elm-instrument"; - license = licenses.bsd3; - maintainers = [ maintainers.turbomack ]; - }) (self.callPackage ./packages/elm-instrument.nix {})); - }; - in elmPkgs // { - inherit elmPkgs; - - # We need attoparsec < 0.14 to build elm for now - attoparsec = self.attoparsec_0_13_2_5; - - # aeson 2.0.3.0 does not build with attoparsec_0_13_2_5 - aeson = doJailbreak self.aeson_1_5_6_0; - - # elm-instrument needs this - indents = self.callPackage ./packages/indents.nix {}; - - # elm-instrument's tests depend on an old version of elm-format, but we set doCheck to false for other reasons above - elm-format = null; - }; - }; + hs810Pkgs = import ./packages/ghc8_10 { inherit pkgs lib; }; # Haskell packages that require ghc 9.2 - hs92Pkgs = self: pkgs.haskell.packages.ghc92.override { - overrides = self: super: with pkgs.haskell.lib.compose; with lib; - let elmPkgs = rec { - /* - The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo: - `package/nix/build.sh` - */ - elm-format = justStaticExecutables (overrideCabal (drv: { - jailbreak = true; - - description = "Formats Elm source code according to a standard set of rules based on the official Elm Style Guide"; - homepage = "https://github.com/avh4/elm-format"; - license = licenses.bsd3; - maintainers = with maintainers; [ avh4 turbomack ]; - }) (self.callPackage ./packages/elm-format.nix {})); - }; - in elmPkgs // { - inherit elmPkgs; - - # Needed for elm-format - avh4-lib = doJailbreak (self.callPackage ./packages/avh4-lib.nix {}); - elm-format-lib = doJailbreak (self.callPackage ./packages/elm-format-lib.nix {}); - elm-format-test-lib = self.callPackage ./packages/elm-format-test-lib.nix {}; - elm-format-markdown = self.callPackage ./packages/elm-format-markdown.nix {}; - - # elm-format requires text >= 2.0 - text = self.text_2_0_2; - # unorderd-container's tests indirectly depend on text < 2.0 - unordered-containers = overrideCabal (drv: { doCheck = false; }) super.unordered-containers; - # relude-1.1.0.0's tests depend on hedgehog < 1.2, which indirectly depends on text < 2.0 - relude = overrideCabal (drv: { doCheck = false; }) super.relude; - }; - }; - - nodePkgs = pkgs.callPackage ./packages/node-composition.nix { - inherit pkgs nodejs; - inherit (pkgs.stdenv.hostPlatform) system; - }; - -in lib.makeScope pkgs.newScope (self: with self; { - inherit fetchElmDeps nodejs; - - /* Node/NPM based dependencies can be upgraded using script `packages/generate-node-packages.sh`. - - * Packages which rely on `bin-wrap` will fail by default - and can be patched using `patchBinwrap` function defined in `packages/lib.nix`. - - * Packages which depend on npm installation of elm can be patched using - `patchNpmElm` function also defined in `packages/lib.nix`. - */ - elmLib = let - hsElmPkgs = (hs810Pkgs self) // (hs96Pkgs self); - in import ./packages/lib.nix { - inherit lib; - inherit (pkgs) writeScriptBin stdenv; - inherit (hsElmPkgs.elmPkgs) elm; - }; + hs92Pkgs = import ./packages/ghc9_2 { inherit pkgs lib; }; - elm-json = callPackage ./packages/elm-json.nix { }; + # Patched, originally npm-downloaded, packages + patchedNodePkgs = import ./packages/node { inherit pkgs lib nodejs makeWrapper; }; - elm-test-rs = callPackage ./packages/elm-test-rs.nix { }; + assembleScope = self: basics: + (hs96Pkgs self).elmPkgs // (hs92Pkgs self).elmPkgs // (hs810Pkgs self).elmPkgs // (patchedNodePkgs self) // basics; +in +lib.makeScope pkgs.newScope + (self: assembleScope self + (with self; { + inherit fetchElmDeps nodejs; - elm-test = callPackage ./packages/elm-test.nix { }; -} // (hs96Pkgs self).elmPkgs // (hs92Pkgs self).elmPkgs // (hs810Pkgs self).elmPkgs // (with elmLib; with (hs96Pkgs self).elmPkgs; { - elm-verify-examples = let - patched = patchBinwrap [elmi-to-json] nodePkgs.elm-verify-examples // { - meta = with lib; nodePkgs.elm-verify-examples.meta // { - description = "Verify examples in your docs"; - homepage = "https://github.com/stoeffel/elm-verify-examples"; - license = licenses.bsd3; - maintainers = [ maintainers.turbomack ]; - }; - }; - in patched.override (old: { - preRebuild = (old.preRebuild or "") + '' - # This should not be needed (thanks to binwrap* being nooped) but for some reason it still needs to be done - # in case of just this package - # TODO: investigate, same as for elm-coverage below - sed 's/\"install\".*/\"install\":\"echo no-op\",/g' --in-place node_modules/elmi-to-json/package.json - ''; - }); + /* Node/NPM based dependencies can be upgraded using script `packages/generate-node-packages.sh`. - elm-coverage = let - patched = patchNpmElm (patchBinwrap [elmi-to-json] nodePkgs.elm-coverage); - in patched.override (old: { - # Symlink Elm instrument binary - preRebuild = (old.preRebuild or "") + '' - # Noop custom installation script - sed 's/\"install\".*/\"install\":\"echo no-op\"/g' --in-place package.json + * Packages which rely on `bin-wrap` will fail by default + and can be patched using `patchBinwrap` function defined in `packages/lib.nix`. - # This should not be needed (thanks to binwrap* being nooped) but for some reason it still needs to be done - # in case of just this package - # TODO: investigate - sed 's/\"install\".*/\"install\":\"echo no-op\",/g' --in-place node_modules/elmi-to-json/package.json - ''; - postInstall = (old.postInstall or "") + '' - mkdir -p unpacked_bin - ln -sf ${elm-instrument}/bin/elm-instrument unpacked_bin/elm-instrument - ''; - meta = with lib; nodePkgs.elm-coverage.meta // { - description = "Work in progress - Code coverage tooling for Elm"; - homepage = "https://github.com/zwilias/elm-coverage"; - license = licenses.bsd3; - maintainers = [ maintainers.turbomack ]; - }; - }); - - create-elm-app = patchNpmElm - nodePkgs.create-elm-app // { - meta = with lib; nodePkgs.create-elm-app.meta // { - description = "Create Elm apps with no build configuration"; - homepage = "https://github.com/halfzebra/create-elm-app"; - license = licenses.mit; - maintainers = [ maintainers.turbomack ]; - }; - }; - - elm-graphql = - nodePkgs."@dillonkearns/elm-graphql" // { - meta = with lib; nodePkgs."@dillonkearns/elm-graphql".meta // { - description = " Autogenerate type-safe GraphQL queries in Elm."; - license = licenses.bsd3; - maintainers = [ maintainers.pedrohlc ]; - }; - }; - - elm-review = - nodePkgs.elm-review // { - meta = with lib; nodePkgs.elm-review.meta // { - description = "Analyzes Elm projects, to help find mistakes before your users find them"; - homepage = "https://package.elm-lang.org/packages/jfmengels/elm-review/${nodePkgs.elm-review.version}"; - license = licenses.bsd3; - maintainers = [ maintainers.turbomack ]; - }; - }; - - elm-language-server = nodePkgs."@elm-tooling/elm-language-server" // { - meta = with lib; nodePkgs."@elm-tooling/elm-language-server".meta // { - description = "Language server implementation for Elm"; - homepage = "https://github.com/elm-tooling/elm-language-server"; - license = licenses.mit; - maintainers = [ maintainers.turbomack ]; - }; - }; - - elm-spa = nodePkgs."elm-spa".overrideAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ makeWrapper old.nodejs.pkgs.node-gyp-build ]; - - meta = with lib; nodePkgs."elm-spa".meta // { - description = "A tool for building single page apps in Elm"; - homepage = "https://www.elm-spa.dev/"; - license = licenses.bsd3; - maintainers = [ maintainers.ilyakooo0 ]; - }; - } - ); - - elm-optimize-level-2 = nodePkgs."elm-optimize-level-2" // { - meta = with lib; nodePkgs."elm-optimize-level-2".meta // { - description = "A second level of optimization for the Javascript that the Elm Compiler produces"; - homepage = "https://github.com/mdgriffith/elm-optimize-level-2"; - license = licenses.bsd3; - maintainers = [ maintainers.turbomack ]; - }; - }; - - elm-pages = nodePkgs."elm-pages".overrideAttrs ( - old: { - nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ makeWrapper old.nodejs.pkgs.node-gyp-build ]; - - # can't use `patches = [ <patch_file> ]` with a nodePkgs derivation; - # need to patch in one of the build phases instead. - # see upstream issue https://github.com/dillonkearns/elm-pages/issues/305 for dealing with the read-only problem - preFixup = '' - patch $out/lib/node_modules/elm-pages/generator/src/codegen.js ${./packages/elm-pages-fix-read-only.patch} - patch $out/lib/node_modules/elm-pages/generator/src/init.js ${./packages/elm-pages-fix-init-read-only.patch} - ''; - - postFixup = '' - wrapProgram $out/bin/elm-pages --prefix PATH : ${ - with pkgs.elmPackages; lib.makeBinPath [ elm elm-review elm-optimize-level-2 ] - } - ''; - - meta = with lib; nodePkgs."elm-pages".meta // { - description = "A statically typed site generator for Elm."; - homepage = "https://github.com/dillonkearns/elm-pages"; - license = licenses.bsd3; - maintainers = [ maintainers.turbomack maintainers.jali-clarke ]; - }; - } - ); - - elm-land = + * Packages which depend on npm installation of elm can be patched using + `patchNpmElm` function also defined in `packages/lib.nix`. + */ + elmLib = let - patched = patchNpmElm nodePkgs.elm-land; + hsElmPkgs = (hs810Pkgs self) // (hs96Pkgs self); in - patched.override (old: { - meta = with lib; nodePkgs."elm-land".meta // { - description = "A production-ready framework for building Elm applications."; - homepage = "https://elm.land/"; - license = licenses.bsd3; - maintainers = [ maintainers.zupo ]; - }; - } - ); + import ./lib { + inherit lib; + inherit (pkgs) writeScriptBin stdenv; + inherit (self) elm; + }; + + elm-json = callPackage ./packages/elm-json { }; - lamdera = callPackage ./packages/lamdera.nix {}; + elm-test-rs = callPackage ./packages/elm-test-rs { }; - elm-doc-preview = nodePkgs."elm-doc-preview".overrideAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ old.nodejs.pkgs.node-gyp-build ]; - }); + elm-test = callPackage ./packages/elm-test { }; - inherit (nodePkgs) elm-live elm-upgrade elm-xref elm-analyse elm-git-install; + lamdera = callPackage ./packages/lamdera { }; }) ) diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/lib.nix b/nixpkgs/pkgs/development/compilers/elm/lib/default.nix index 12e0600dc231..12e0600dc231 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/lib.nix +++ b/nixpkgs/pkgs/development/compilers/elm/lib/default.nix diff --git a/nixpkgs/pkgs/development/compilers/elm/fetchElmDeps.nix b/nixpkgs/pkgs/development/compilers/elm/lib/fetchElmDeps.nix index 9715bfbe037d..9715bfbe037d 100644 --- a/nixpkgs/pkgs/development/compilers/elm/fetchElmDeps.nix +++ b/nixpkgs/pkgs/development/compilers/elm/lib/fetchElmDeps.nix diff --git a/nixpkgs/pkgs/development/compilers/elm/lib/makeDotElm.nix b/nixpkgs/pkgs/development/compilers/elm/lib/makeDotElm.nix new file mode 100644 index 000000000000..ab62eb88e220 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/elm/lib/makeDotElm.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchurl, registryDat }: + +ver: deps: +let + cmds = lib.mapAttrsToList + (name: info: + let + pkg = stdenv.mkDerivation { + name = lib.replaceStrings [ "/" ] [ "-" ] name + "-${info.version}"; + + src = fetchurl { + url = "https://github.com/${name}/archive/${info.version}.tar.gz"; + meta.homepage = "https://github.com/${name}/"; + inherit (info) sha256; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out + cp -r * $out + ''; + }; + in + '' + mkdir -p .elm/${ver}/packages/${name} + cp -R ${pkg} .elm/${ver}/packages/${name}/${info.version} + '') + deps; +in +(lib.concatStrings cmds) + '' + mkdir -p .elm/${ver}/packages; + cp ${registryDat} .elm/${ver}/packages/registry.dat; + chmod -R +w .elm +'' diff --git a/nixpkgs/pkgs/development/compilers/elm/makeDotElm.nix b/nixpkgs/pkgs/development/compilers/elm/makeDotElm.nix deleted file mode 100644 index 43252747c3a3..000000000000 --- a/nixpkgs/pkgs/development/compilers/elm/makeDotElm.nix +++ /dev/null @@ -1,35 +0,0 @@ -{stdenv, lib, fetchurl, registryDat}: - -ver: deps: - let cmds = lib.mapAttrsToList (name: info: let - pkg = stdenv.mkDerivation { - name = lib.replaceStrings ["/"] ["-"] name + "-${info.version}"; - - src = fetchurl { - url = "https://github.com/${name}/archive/${info.version}.tar.gz"; - meta.homepage = "https://github.com/${name}/"; - inherit (info) sha256; - }; - - configurePhase = '' - true - ''; - - buildPhase = '' - true - ''; - - installPhase = '' - mkdir -p $out - cp -r * $out - ''; - }; - in '' - mkdir -p .elm/${ver}/packages/${name} - cp -R ${pkg} .elm/${ver}/packages/${name}/${info.version} - '') deps; - in (lib.concatStrings cmds) + '' - mkdir -p .elm/${ver}/packages; - cp ${registryDat} .elm/${ver}/packages/registry.dat; - chmod -R +w .elm - '' diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/bimap.nix b/nixpkgs/pkgs/development/compilers/elm/packages/bimap.nix deleted file mode 100644 index 41412d1639c7..000000000000 --- a/nixpkgs/pkgs/development/compilers/elm/packages/bimap.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ mkDerivation, base, containers, exceptions, lib, QuickCheck -, template-haskell -}: -mkDerivation { - pname = "bimap"; - version = "0.3.3"; - sha256 = "73829355c7bcbd3eedba22a382a04a3ab641702b00828790ec082ec2db3a8ad1"; - libraryHaskellDepends = [ base containers exceptions ]; - testHaskellDepends = [ - base containers exceptions QuickCheck template-haskell - ]; - homepage = "https://github.com/joelwilliamson/bimap"; - description = "Bidirectional mapping between two key types"; - license = lib.licenses.bsd3; -} diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elm-json.nix b/nixpkgs/pkgs/development/compilers/elm/packages/elm-json/default.nix index 5b988244cc97..16cd7f972ce4 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/elm-json.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/elm-json/default.nix @@ -17,12 +17,13 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256:nlpxlPzWk3wwDgczuMI9T6DFY1YtQpQ1R4BhdPbzZBs="; }; - cargoPatches = [ ./elm-json.patch ]; + cargoPatches = [ ./use-system-ssl.patch ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - curl openssl + curl + openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; cargoSha256 = "sha256:8SOpL8nfhYen9vza0LYpB/5fgVmBwG7vGMmFOaJskIc="; diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elm-json.patch b/nixpkgs/pkgs/development/compilers/elm/packages/elm-json/use-system-ssl.patch index 54df03019231..54df03019231 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/elm-json.patch +++ b/nixpkgs/pkgs/development/compilers/elm/packages/elm-json/use-system-ssl.patch diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elm-test-rs.nix b/nixpkgs/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix index 02f69c2d2f03..02f69c2d2f03 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/elm-test-rs.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/elm-test-rs/default.nix diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elm-test.nix b/nixpkgs/pkgs/development/compilers/elm/packages/elm-test/default.nix index eca45395c3df..eca45395c3df 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/elm-test.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/elm-test/default.nix diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/ghc8_10/default.nix b/nixpkgs/pkgs/development/compilers/elm/packages/ghc8_10/default.nix new file mode 100644 index 000000000000..f68e582b3d0b --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/elm/packages/ghc8_10/default.nix @@ -0,0 +1,79 @@ +{ pkgs, lib }: + +self: pkgs.haskell.packages.ghc810.override { + overrides = self: super: with pkgs.haskell.lib.compose; with lib; + let + elmPkgs = rec { + elmi-to-json = justStaticExecutables (overrideCabal + (drv: { + version = "unstable-2021-07-19"; + src = pkgs.fetchgit { + url = "https://github.com/stoeffel/elmi-to-json"; + sha256 = "0vy678k15rzpsn0aly90fb01pxsbqkgf86pa86w0gd94lka8acwl"; + rev = "6a42376ef4b6877e130971faf964578cc096e29b"; + fetchSubmodules = true; + }; + + prePatch = '' + substituteInPlace package.yaml --replace "- -Werror" "" + hpack + ''; + jailbreak = true; + + description = "Tool that reads .elmi files (Elm interface file) generated by the elm compiler"; + homepage = "https://github.com/stoeffel/elmi-to-json"; + license = licenses.bsd3; + maintainers = [ maintainers.turbomack ]; + }) + (self.callPackage ./elmi-to-json { })); + + elm-instrument = justStaticExecutables (overrideCabal + (drv: { + version = "unstable-2020-03-16"; + src = pkgs.fetchgit { + url = "https://github.com/zwilias/elm-instrument"; + sha256 = "167d7l2547zxdj7i60r6vazznd9ichwc0bqckh3vrh46glkz06jv"; + rev = "63e15bb5ec5f812e248e61b6944189fa4a0aee4e"; + fetchSubmodules = true; + }; + patches = [ + # Update code after breaking change in optparse-applicative + # https://github.com/zwilias/elm-instrument/pull/5 + (pkgs.fetchpatch { + name = "update-optparse-applicative.patch"; + url = "https://github.com/mdevlamynck/elm-instrument/commit/c548709d4818aeef315528e842eaf4c5b34b59b4.patch"; + sha256 = "0ln7ik09n3r3hk7jmwwm46kz660mvxfa71120rkbbaib2falfhsc"; + }) + ]; + + prePatch = '' + sed "s/desc <-.*/let desc = \"${drv.version}\"/g" Setup.hs --in-place + ''; + jailbreak = true; + # Tests are failing because of missing instances for Eq and Show type classes + doCheck = false; + + description = "Instrument Elm code as a preprocessing step for elm-coverage"; + homepage = "https://github.com/zwilias/elm-instrument"; + license = licenses.bsd3; + maintainers = [ maintainers.turbomack ]; + }) + (self.callPackage ./elm-instrument { })); + }; + in + elmPkgs // { + inherit elmPkgs; + + # We need attoparsec < 0.14 to build elm for now + attoparsec = self.attoparsec_0_13_2_5; + + # aeson 2.0.3.0 does not build with attoparsec_0_13_2_5 + aeson = doJailbreak self.aeson_1_5_6_0; + + # elm-instrument needs this + indents = self.callPackage ./indents { }; + + # elm-instrument's tests depend on an old version of elm-format, but we set doCheck to false for other reasons above + elm-format = null; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elm-instrument.nix b/nixpkgs/pkgs/development/compilers/elm/packages/ghc8_10/elm-instrument/default.nix index 02593b855077..7f6a25905e36 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/elm-instrument.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/ghc8_10/elm-instrument/default.nix @@ -1,28 +1,18 @@ -{ mkDerivation, fetchpatch, ansi-terminal, ansi-wl-pprint, base, binary +{ mkDerivation, ansi-terminal, ansi-wl-pprint, base, binary , bytestring, Cabal, cmark, containers, directory, elm-format -, fetchgit, filepath, free, HUnit, indents, json, mtl +, fetchgit, filepath, free, HUnit, indents, json, lib, mtl , optparse-applicative, parsec, process, QuickCheck, quickcheck-io -, split, lib, tasty, tasty-golden, tasty-hunit, tasty-quickcheck -, text +, split, tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "elm-instrument"; version = "0.0.7"; src = fetchgit { url = "https://github.com/zwilias/elm-instrument"; - sha256 = "167d7l2547zxdj7i60r6vazznd9ichwc0bqckh3vrh46glkz06jv"; - rev = "63e15bb5ec5f812e248e61b6944189fa4a0aee4e"; + sha256 = "14yfzwsyvgc6rzn19sdmwk2mc1vma9hcljnmjnmlig8mp0271v56"; + rev = "31b527e405a6afdb25bb87ad7bd14f979e65cff7"; fetchSubmodules = true; }; - patches = [ - # Update code after breaking change in optparse-applicative - # https://github.com/zwilias/elm-instrument/pull/5 - (fetchpatch { - name = "update-optparse-applicative.patch"; - url = "https://github.com/mdevlamynck/elm-instrument/commit/c548709d4818aeef315528e842eaf4c5b34b59b4.patch"; - sha256 = "0ln7ik09n3r3hk7jmwwm46kz660mvxfa71120rkbbaib2falfhsc"; - }) - ]; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath process ]; @@ -37,7 +27,7 @@ mkDerivation { quickcheck-io split tasty tasty-golden tasty-hunit tasty-quickcheck text ]; - homepage = "https://elm-lang.org"; + homepage = "http://elm-lang.org"; description = "Instrumentation library for Elm"; license = lib.licenses.bsd3; mainProgram = "elm-instrument"; diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elmi-to-json.nix b/nixpkgs/pkgs/development/compilers/elm/packages/ghc8_10/elmi-to-json/default.nix index f82f3e5179ac..fc2c76149a1a 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/elmi-to-json.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/ghc8_10/elmi-to-json/default.nix @@ -1,15 +1,15 @@ { mkDerivation, aeson, base, binary, bytestring, containers -, directory, fetchgit, filepath, ghc-prim, hpack -, optparse-applicative, lib, text, unliftio -, unordered-containers +, directory, fetchgit, filepath, ghc-prim, hpack, lib +, optparse-applicative, text, unliftio, unordered-containers }: mkDerivation { pname = "elmi-to-json"; version = "1.3.0"; src = fetchgit { url = "https://github.com/stoeffel/elmi-to-json"; - rev = "bd18efb59d247439b362272b480e67a16a4e424e"; - sha256 = "sha256-9fScXRSyTkqzeXwh/Jjza6mnENCThlU6KI366CLFcgY="; + sha256 = "0vy678k15rzpsn0aly90fb01pxsbqkgf86pa86w0gd94lka8acwl"; + rev = "6a42376ef4b6877e130971faf964578cc096e29b"; + fetchSubmodules = true; }; isLibrary = true; isExecutable = true; @@ -23,4 +23,5 @@ mkDerivation { prePatch = "hpack"; homepage = "https://github.com/stoeffel/elmi-to-json#readme"; license = lib.licenses.bsd3; + mainProgram = "elmi-to-json"; } diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/indents.nix b/nixpkgs/pkgs/development/compilers/elm/packages/ghc8_10/indents/default.nix index 85e765db3e50..85e765db3e50 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/indents.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/ghc8_10/indents/default.nix diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/ghc9_2/default.nix b/nixpkgs/pkgs/development/compilers/elm/packages/ghc9_2/default.nix new file mode 100644 index 000000000000..5ef5eff3bef1 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/elm/packages/ghc9_2/default.nix @@ -0,0 +1,53 @@ +{ pkgs, lib }: + +self: pkgs.haskell.packages.ghc92.override { + overrides = self: super: with pkgs.haskell.lib.compose; with lib; + let + elmPkgs = rec { + /* + The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo: + `package/nix/build.sh` + */ + elm-format = justStaticExecutables (overrideCabal + (drv: { + jailbreak = true; + doHaddock = false; + postPatch = '' + mkdir -p ./generated + cat <<EOHS > ./generated/Build_elm_format.hs + module Build_elm_format where + gitDescribe :: String + gitDescribe = "${drv.version}" + EOHS + ''; + + description = "Formats Elm source code according to a standard set of rules based on the official Elm Style Guide"; + homepage = "https://github.com/avh4/elm-format"; + license = licenses.bsd3; + maintainers = with maintainers; [ avh4 turbomack ]; + }) + (self.callPackage ./elm-format/elm-format.nix { })); + }; + + fixHaddock = overrideCabal (_: { + configureFlags = [ "--ghc-option=-Wno-error=unused-packages" ]; + doHaddock = false; + }); + in + elmPkgs // { + inherit elmPkgs; + + # Needed for elm-format + avh4-lib = fixHaddock (doJailbreak (self.callPackage ./elm-format/avh4-lib.nix { })); + elm-format-lib = fixHaddock (doJailbreak (self.callPackage ./elm-format/elm-format-lib.nix { })); + elm-format-test-lib = fixHaddock (self.callPackage ./elm-format/elm-format-test-lib.nix { }); + elm-format-markdown = fixHaddock (self.callPackage ./elm-format/elm-format-markdown.nix { }); + + # elm-format requires text >= 2.0 + text = self.text_2_0_2; + # unorderd-container's tests indirectly depend on text < 2.0 + unordered-containers = overrideCabal (drv: { doCheck = false; }) super.unordered-containers; + # relude-1.1.0.0's tests depend on hedgehog < 1.2, which indirectly depends on text < 2.0 + relude = overrideCabal (drv: { doCheck = false; }) super.relude; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/avh4-lib.nix b/nixpkgs/pkgs/development/compilers/elm/packages/ghc9_2/elm-format/avh4-lib.nix index f7f9381703c6..e320edfd1162 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/avh4-lib.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/ghc9_2/elm-format/avh4-lib.nix @@ -12,7 +12,6 @@ mkDerivation { fetchSubmodules = true; }; postUnpack = "sourceRoot+=/avh4-lib; echo source root reset to $sourceRoot"; - configureFlags = [ "--ghc-option=-Wno-error=unused-packages" ]; libraryHaskellDepends = [ array base bytestring directory filepath mtl pooled-io process relude text @@ -22,7 +21,6 @@ mkDerivation { relude tasty tasty-hspec tasty-hunit text ]; testToolDepends = [ tasty-discover ]; - doHaddock = false; description = "Common code for haskell projects"; license = lib.licenses.bsd3; } diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elm-format-lib.nix b/nixpkgs/pkgs/development/compilers/elm/packages/ghc9_2/elm-format/elm-format-lib.nix index a6b70414143f..290534bbea9a 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/elm-format-lib.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/ghc9_2/elm-format/elm-format-lib.nix @@ -24,7 +24,6 @@ mkDerivation { text ]; testToolDepends = [ tasty-discover ]; - doHaddock = false; description = "Common code used by elm-format and elm-refactor"; license = lib.licenses.bsd3; } diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elm-format-markdown.nix b/nixpkgs/pkgs/development/compilers/elm/packages/ghc9_2/elm-format/elm-format-markdown.nix index fdeb2e88d384..e57d2127822e 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/elm-format-markdown.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/ghc9_2/elm-format/elm-format-markdown.nix @@ -10,7 +10,6 @@ mkDerivation { }; postUnpack = "sourceRoot+=/elm-format-markdown; echo source root reset to $sourceRoot"; libraryHaskellDepends = [ base containers mtl text ]; - doHaddock = false; description = "Markdown parsing for Elm documentation comments"; license = lib.licenses.bsd3; } diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elm-format-test-lib.nix b/nixpkgs/pkgs/development/compilers/elm/packages/ghc9_2/elm-format/elm-format-test-lib.nix index ccd6264d6c16..43090abbeae4 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/elm-format-test-lib.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/ghc9_2/elm-format/elm-format-test-lib.nix @@ -21,7 +21,6 @@ mkDerivation { split tasty tasty-hspec tasty-hunit text ]; testToolDepends = [ tasty-discover ]; - doHaddock = false; description = "Test helpers used by elm-format-tests and elm-refactor-tests"; license = lib.licenses.bsd3; } diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elm-format.nix b/nixpkgs/pkgs/development/compilers/elm/packages/ghc9_2/elm-format/elm-format.nix index c4448f246425..82ec995e1ecc 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/elm-format.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/ghc9_2/elm-format/elm-format.nix @@ -3,7 +3,7 @@ , optparse-applicative, QuickCheck, quickcheck-io, relude, tasty , tasty-hspec, tasty-hunit, tasty-quickcheck, text }: -mkDerivation rec { +mkDerivation { pname = "elm-format"; version = "0.8.7"; src = fetchgit { @@ -24,18 +24,8 @@ mkDerivation rec { quickcheck-io relude tasty tasty-hspec tasty-hunit tasty-quickcheck text ]; - doHaddock = false; homepage = "https://elm-lang.org"; description = "A source code formatter for Elm"; license = lib.licenses.bsd3; mainProgram = "elm-format"; - postPatch = '' - mkdir -p ./generated - cat <<EOHS > ./generated/Build_elm_format.hs - module Build_elm_format where - - gitDescribe :: String - gitDescribe = "${version}" - EOHS - ''; } diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/ansi-wl-pprint.nix b/nixpkgs/pkgs/development/compilers/elm/packages/ghc9_6/ansi-wl-pprint/default.nix index 392ca5ab31b1..392ca5ab31b1 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/ansi-wl-pprint.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/ghc9_6/ansi-wl-pprint/default.nix diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/ghc9_6/default.nix b/nixpkgs/pkgs/development/compilers/elm/packages/ghc9_6/default.nix new file mode 100644 index 000000000000..13ba7faa0308 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/elm/packages/ghc9_6/default.nix @@ -0,0 +1,42 @@ +{ pkgs, lib, makeWrapper, nodejs, fetchElmDeps }: + +self: pkgs.haskell.packages.ghc96.override { + overrides = self: super: with pkgs.haskell.lib.compose; with lib; + let + elmPkgs = rec { + elm = overrideCabal + (drv: { + # sadly with parallelism most of the time breaks compilation + enableParallelBuilding = false; + preConfigure = fetchElmDeps { + elmPackages = (import ../elm-srcs.nix); + elmVersion = drv.version; + registryDat = ../../registry.dat; + }; + buildTools = drv.buildTools or [ ] ++ [ makeWrapper ]; + postInstall = '' + wrapProgram $out/bin/elm \ + --prefix PATH ':' ${lib.makeBinPath [ nodejs ]} + ''; + + description = "A delightful language for reliable webapps"; + homepage = "https://elm-lang.org/"; + license = licenses.bsd3; + maintainers = with maintainers; [ domenkozar turbomack ]; + }) + (self.callPackage ./elm { }); + + inherit fetchElmDeps; + elmVersion = elmPkgs.elm.version; + }; + in + elmPkgs // { + inherit elmPkgs; + + ansi-wl-pprint = overrideCabal + (drv: { + jailbreak = true; + }) + (self.callPackage ./ansi-wl-pprint { }); + }; +} diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elm.nix b/nixpkgs/pkgs/development/compilers/elm/packages/ghc9_6/elm/default.nix index 1071d50a84c9..1071d50a84c9 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/elm.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/ghc9_6/elm/default.nix diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/lamdera.nix b/nixpkgs/pkgs/development/compilers/elm/packages/lamdera/default.nix index e3dda4c31a52..c92d2d144d4b 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/lamdera.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/lamdera/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib +{ stdenv +, lib , fetchurl }: diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/node/default.nix b/nixpkgs/pkgs/development/compilers/elm/packages/node/default.nix new file mode 100644 index 000000000000..6d4d38a6d199 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/elm/packages/node/default.nix @@ -0,0 +1,139 @@ +{ pkgs, lib, nodejs, makeWrapper }: self: + +let + # Untouched npm-downloaded packages + nodePkgs = pkgs.callPackage ./node-composition.nix { + inherit pkgs nodejs; + inherit (pkgs.stdenv.hostPlatform) system; + }; +in +with self; with elmLib; { + inherit (nodePkgs) elm-live elm-upgrade elm-xref elm-analyse elm-git-install; + + elm-verify-examples = + let + patched = patchBinwrap [ elmi-to-json ] nodePkgs.elm-verify-examples // { + meta = with lib; nodePkgs.elm-verify-examples.meta // { + description = "Verify examples in your docs"; + homepage = "https://github.com/stoeffel/elm-verify-examples"; + license = licenses.bsd3; + maintainers = [ maintainers.turbomack ]; + }; + }; + in + patched.override (old: { + preRebuild = (old.preRebuild or "") + '' + # This should not be needed (thanks to binwrap* being nooped) but for some reason it still needs to be done + # in case of just this package + # TODO: investigate, same as for elm-coverage below + sed 's/\"install\".*/\"install\":\"echo no-op\",/g' --in-place node_modules/elmi-to-json/package.json + ''; + }); + + elm-coverage = + let + patched = patchNpmElm (patchBinwrap [ elmi-to-json ] nodePkgs.elm-coverage); + in + patched.override (old: { + # Symlink Elm instrument binary + preRebuild = (old.preRebuild or "") + '' + # Noop custom installation script + sed 's/\"install\".*/\"install\":\"echo no-op\"/g' --in-place package.json + + # This should not be needed (thanks to binwrap* being nooped) but for some reason it still needs to be done + # in case of just this package + # TODO: investigate + sed 's/\"install\".*/\"install\":\"echo no-op\",/g' --in-place node_modules/elmi-to-json/package.json + ''; + postInstall = (old.postInstall or "") + '' + mkdir -p unpacked_bin + ln -sf ${elm-instrument}/bin/elm-instrument unpacked_bin/elm-instrument + ''; + meta = with lib; nodePkgs.elm-coverage.meta // { + description = "Work in progress - Code coverage tooling for Elm"; + homepage = "https://github.com/zwilias/elm-coverage"; + license = licenses.bsd3; + maintainers = [ maintainers.turbomack ]; + }; + }); + + create-elm-app = patchNpmElm + nodePkgs.create-elm-app // { + meta = with lib; nodePkgs.create-elm-app.meta // { + description = "Create Elm apps with no build configuration"; + homepage = "https://github.com/halfzebra/create-elm-app"; + license = licenses.mit; + maintainers = [ maintainers.turbomack ]; + }; + }; + + elm-graphql = + nodePkgs."@dillonkearns/elm-graphql" // { + meta = with lib; nodePkgs."@dillonkearns/elm-graphql".meta // { + description = " Autogenerate type-safe GraphQL queries in Elm."; + license = licenses.bsd3; + maintainers = [ maintainers.pedrohlc ]; + }; + }; + + elm-review = + nodePkgs.elm-review // { + meta = with lib; nodePkgs.elm-review.meta // { + description = "Analyzes Elm projects, to help find mistakes before your users find them"; + homepage = "https://package.elm-lang.org/packages/jfmengels/elm-review/${nodePkgs.elm-review.version}"; + license = licenses.bsd3; + maintainers = [ maintainers.turbomack ]; + }; + }; + + elm-language-server = nodePkgs."@elm-tooling/elm-language-server" // { + meta = with lib; nodePkgs."@elm-tooling/elm-language-server".meta // { + description = "Language server implementation for Elm"; + homepage = "https://github.com/elm-tooling/elm-language-server"; + license = licenses.mit; + maintainers = [ maintainers.turbomack ]; + }; + }; + + elm-spa = nodePkgs."elm-spa".overrideAttrs ( + old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ makeWrapper old.nodejs.pkgs.node-gyp-build ]; + + meta = with lib; nodePkgs."elm-spa".meta // { + description = "A tool for building single page apps in Elm"; + homepage = "https://www.elm-spa.dev/"; + license = licenses.bsd3; + maintainers = [ maintainers.ilyakooo0 ]; + }; + } + ); + + elm-optimize-level-2 = nodePkgs."elm-optimize-level-2" // { + meta = with lib; nodePkgs."elm-optimize-level-2".meta // { + description = "A second level of optimization for the Javascript that the Elm Compiler produces"; + homepage = "https://github.com/mdgriffith/elm-optimize-level-2"; + license = licenses.bsd3; + maintainers = [ maintainers.turbomack ]; + }; + }; + + elm-pages = import ./elm-pages { inherit nodePkgs pkgs lib makeWrapper; }; + + elm-land = + let + patched = patchNpmElm nodePkgs.elm-land; + in + patched.override (old: { + meta = with lib; nodePkgs."elm-land".meta // { + description = "A production-ready framework for building Elm applications."; + homepage = "https://elm.land/"; + license = licenses.bsd3; + maintainers = [ maintainers.zupo ]; + }; + } + ); + + elm-doc-preview = nodePkgs."elm-doc-preview".overrideAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ old.nodejs.pkgs.node-gyp-build ]; + }); +} diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/node/elm-pages/default.nix b/nixpkgs/pkgs/development/compilers/elm/packages/node/elm-pages/default.nix new file mode 100644 index 000000000000..5502e26b415d --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/elm/packages/node/elm-pages/default.nix @@ -0,0 +1,28 @@ +{ nodePkgs, pkgs, lib, makeWrapper }: + +nodePkgs."elm-pages".overrideAttrs ( + old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ makeWrapper old.nodejs.pkgs.node-gyp-build ]; + + # can't use `patches = [ <patch_file> ]` with a nodePkgs derivation; + # need to patch in one of the build phases instead. + # see upstream issue https://github.com/dillonkearns/elm-pages/issues/305 for dealing with the read-only problem + preFixup = '' + patch $out/lib/node_modules/elm-pages/generator/src/codegen.js ${./fix-read-only.patch} + patch $out/lib/node_modules/elm-pages/generator/src/init.js ${./fix-init-read-only.patch} + ''; + + postFixup = '' + wrapProgram $out/bin/elm-pages --prefix PATH : ${ + with pkgs.elmPackages; lib.makeBinPath [ elm elm-review elm-optimize-level-2 ] + } + ''; + + meta = with lib; nodePkgs."elm-pages".meta // { + description = "A statically typed site generator for Elm."; + homepage = "https://github.com/dillonkearns/elm-pages"; + license = licenses.bsd3; + maintainers = [ maintainers.turbomack maintainers.jali-clarke ]; + }; + } +) diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elm-pages-fix-init-read-only.patch b/nixpkgs/pkgs/development/compilers/elm/packages/node/elm-pages/fix-init-read-only.patch index 9704ef9f7c08..9704ef9f7c08 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/elm-pages-fix-init-read-only.patch +++ b/nixpkgs/pkgs/development/compilers/elm/packages/node/elm-pages/fix-init-read-only.patch diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/elm-pages-fix-read-only.patch b/nixpkgs/pkgs/development/compilers/elm/packages/node/elm-pages/fix-read-only.patch index 547f89f86f69..547f89f86f69 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/elm-pages-fix-read-only.patch +++ b/nixpkgs/pkgs/development/compilers/elm/packages/node/elm-pages/fix-read-only.patch diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/generate-node-packages.sh b/nixpkgs/pkgs/development/compilers/elm/packages/node/generate-node-packages.sh index 49e697e43e88..66cc71ca32bb 100755 --- a/nixpkgs/pkgs/development/compilers/elm/packages/generate-node-packages.sh +++ b/nixpkgs/pkgs/development/compilers/elm/packages/node/generate-node-packages.sh @@ -1,11 +1,12 @@ #!/usr/bin/env bash -ROOT="$(realpath "$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")"/../../../../..)" +ROOT="$(realpath "$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")"/../../../../../..)" set -eu -o pipefail $(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \ + --nodejs-18 \ -i node-packages.json \ -o node-packages.nix \ -c node-composition.nix \ - --no-copy-node-env -e ../../../node-packages/node-env.nix + --no-copy-node-env -e ../../../../node-packages/node-env.nix diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix b/nixpkgs/pkgs/development/compilers/elm/packages/node/node-composition.nix index c825c6c66349..1f86de75e357 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/node/node-composition.nix @@ -5,7 +5,7 @@ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}: let - nodeEnv = import ../../../node-packages/node-env.nix { + nodeEnv = import ../../../../node-packages/node-env.nix { inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.json b/nixpkgs/pkgs/development/compilers/elm/packages/node/node-packages.json index 8112b01bc9e8..8112b01bc9e8 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.json +++ b/nixpkgs/pkgs/development/compilers/elm/packages/node/node-packages.json diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix b/nixpkgs/pkgs/development/compilers/elm/packages/node/node-packages.nix index 0efccbb5ff90..0efccbb5ff90 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/node/node-packages.nix diff --git a/nixpkgs/pkgs/development/compilers/elm/update.sh b/nixpkgs/pkgs/development/compilers/elm/update.sh index 4de11bd8ff5d..d718bd0fbb08 100755 --- a/nixpkgs/pkgs/development/compilers/elm/update.sh +++ b/nixpkgs/pkgs/development/compilers/elm/update.sh @@ -1,13 +1,21 @@ #!/usr/bin/env nix-shell #!nix-shell -p cabal2nix elm2nix -i bash ../../.. -cabal2nix https://github.com/ekmett/ansi-wl-pprint --revision d16e2f6896d76b87b72af7220c2e93ba15c53280 > packages/ansi-wl-pprint.nix +# Update all cabal packages. +cabal2nix 'https://github.com/zwilias/elm-instrument' --revision '0.0.7' > packages/ghc8_10/elm-instrument/default.nix +for subpath in 'avh4-lib' 'elm-format-lib' 'elm-format-markdown' 'elm-format-test-lib'; do + cabal2nix 'https://github.com/avh4/elm-format' --revision '0.8.7' \ + --subpath $subpath > packages/ghc9_2/elm-format/${subpath}.nix +done +cabal2nix 'https://github.com/avh4/elm-format' --revision '0.8.7' > packages/ghc9_2/elm-format/elm-format.nix +cabal2nix 'https://github.com/stoeffel/elmi-to-json' --revision '1.3.0' > packages/ghc8_10/elmi-to-json/default.nix +cabal2nix 'https://github.com/ekmett/ansi-wl-pprint' --revision 'v0.6.8.1' > packages/ghc9_6/ansi-wl-pprint/default.nix # We're building binaries from commit that npm installer is using since # November 1st release called 0.19.1-6 in npm registry. # These binaries are built with newer ghc version and also support Aarch64 for Linux and Darwin. # Upstream git tag for 0.19.1 is still pointing to original commit from 2019. -cabal2nix https://github.com/elm/compiler --revision 2f6dd29258e880dbb7effd57a829a0470d8da48b > packages/elm.nix +cabal2nix https://github.com/elm/compiler --revision 2f6dd29258e880dbb7effd57a829a0470d8da48b > packages/ghc9_6/elm/default.nix echo "need to manually copy registry.dat from an existing elm project" #elm2nix snapshot > registry.dat diff --git a/nixpkgs/pkgs/development/compilers/erg/default.nix b/nixpkgs/pkgs/development/compilers/erg/default.nix index 0ad4320c046a..aafaf93b814c 100644 --- a/nixpkgs/pkgs/development/compilers/erg/default.nix +++ b/nixpkgs/pkgs/development/compilers/erg/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "erg"; - version = "0.6.32"; + version = "0.6.33"; src = fetchFromGitHub { owner = "erg-lang"; repo = "erg"; rev = "v${version}"; - hash = "sha256-l+I6ue824dvZ1AmSS/y+Sh43OstJ5c+8xIXvoVpMFws="; + hash = "sha256-L154Ci2/Kw1NZcc7Sn2ROhrXBxIjZXr3DHHj4dvPHTI="; }; - cargoHash = "sha256-SRltpqTviC+Dq9pPBuLjctOXOKTYw+zVlvA9wi0iFWg="; + cargoHash = "sha256-LL+9tu9CnevqOqoYORJ/WxerwPrEEpw/OKhC+0xchIs="; nativeBuildInputs = [ makeWrapper diff --git a/nixpkgs/pkgs/development/compilers/flutter/flutter.nix b/nixpkgs/pkgs/development/compilers/flutter/flutter.nix index 03c2968f4ab9..bce45f200c2d 100644 --- a/nixpkgs/pkgs/development/compilers/flutter/flutter.nix +++ b/nixpkgs/pkgs/development/compilers/flutter/flutter.nix @@ -82,6 +82,10 @@ let "dartSdkVersion": "${dart.version}" } EOF + + # Suppress a small error now that `.gradle`'s location changed. + # Location changed because of the patch "gradle-flutter-tools-wrapper.patch". + mkdir -p "$out/packages/flutter_tools/gradle/.gradle" ''; installPhase = '' diff --git a/nixpkgs/pkgs/development/compilers/flutter/versions/3_19/patches/gradle-flutter-tools-wrapper.patch b/nixpkgs/pkgs/development/compilers/flutter/versions/3_19/patches/gradle-flutter-tools-wrapper.patch new file mode 100644 index 000000000000..de6080efbba8 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/flutter/versions/3_19/patches/gradle-flutter-tools-wrapper.patch @@ -0,0 +1,44 @@ +This patch introduces an intermediate Gradle build step to alter the behavior +of flutter_tools' Gradle project, specifically moving the creation of `build` +and `.gradle` directories from within the Nix Store to somewhere in `$HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev`. + +Without this patch, flutter_tools' Gradle project tries to generate `build` and `.gradle` +directories within the Nix Store. Resulting in read-only errors when trying to build a +Flutter Android app at runtime. + +This patch takes advantage of the fact settings.gradle takes priority over settings.gradle.kts to build the intermediate Gradle project +when a Flutter app runs `includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")` + +`rootProject.buildFileName = "/dev/null"` so that the intermediate project doesn't use `build.gradle.kts` that's in the same directory. + +The intermediate project makes a `settings.gradle` file in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` and `includeBuild`s it. +This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting +`rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`. + +Now the `.gradle` will be built in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/`, but `build` doesn't. +To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` as well, we need to set `buildDirectory`. +diff --git a/packages/flutter_tools/gradle/settings.gradle b/packages/flutter_tools/gradle/settings.gradle +new file mode 100644 +index 0000000000..b2485c94b4 +--- /dev/null ++++ b/packages/flutter_tools/gradle/settings.gradle +@@ -0,0 +1,19 @@ ++rootProject.buildFileName = "/dev/null" ++ ++def engineShortRev = (new File("$settingsDir/../../../bin/internal/engine.version")).text.take(10) ++def dir = new File("$System.env.HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev") ++dir.mkdirs() ++def file = new File(dir, "settings.gradle") ++ ++file.text = """ ++rootProject.projectDir = new File("$settingsDir") ++apply from: new File("$settingsDir/settings.gradle.kts") ++ ++gradle.allprojects { project -> ++ project.beforeEvaluate { ++ project.layout.buildDirectory = new File("$dir/build") ++ } ++} ++""" ++ ++includeBuild(dir) diff --git a/nixpkgs/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/nixpkgs/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index 858d7443ff62..34ed06e1de12 100644 --- a/nixpkgs/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/nixpkgs/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -107,7 +107,7 @@ let ++ lib.optional stdenv.isLinux autoPatchelfHook; propagatedBuildInputs = [ setJavaClassPath zlib ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation; + ++ lib.optional stdenv.isDarwin darwin.apple_sdk_11_0.frameworks.Foundation; buildInputs = lib.optionals stdenv.isLinux [ alsa-lib # libasound.so wanted by lib/libjsound.so @@ -165,33 +165,27 @@ let echo "Testing GraalVM" $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' - # Workaround GraalVM issue where the builder does not have access to the - # environment variables since 21.0.0 - # Only needed for native-image tests - # https://github.com/oracle/graal/pull/6095 - # https://github.com/oracle/graal/pull/6095 - # https://github.com/oracle/graal/issues/7502 - export NATIVE_IMAGE_DEPRECATED_BUILDER_SANITATION="true"; + extraNativeImageArgs="$(export -p | sed -n 's/^declare -x \([^=]\+\)=.*$/ -E\1/p' | tr -d \\n)" echo "Ahead-Of-Time compilation" - $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:-CheckToolchain -H:+ReportExceptionStackTraces HelloWorld + $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:-CheckToolchain -H:+ReportExceptionStackTraces -march=compatibility $extraNativeImageArgs HelloWorld ./helloworld | fgrep 'Hello World' ${# --static is only available in Linux lib.optionalString (stdenv.isLinux && !useMusl) '' echo "Ahead-Of-Time compilation with -H:+StaticExecutableWithDynamicLibC" - $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:+StaticExecutableWithDynamicLibC HelloWorld + $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:+StaticExecutableWithDynamicLibC -march=compatibility $extraNativeImageArgs HelloWorld ./helloworld | fgrep 'Hello World' echo "Ahead-Of-Time compilation with --static" - $out/bin/native-image --static HelloWorld + $out/bin/native-image $extraNativeImageArgs -march=compatibility --static HelloWorld ./helloworld | fgrep 'Hello World' ''} ${# --static is only available in Linux lib.optionalString (stdenv.isLinux && useMusl) '' echo "Ahead-Of-Time compilation with --static and --libc=musl" - $out/bin/native-image --static HelloWorld --libc=musl + $out/bin/native-image $extraNativeImageArgs -march=compatibility --libc=musl --static HelloWorld ./helloworld | fgrep 'Hello World' ''} diff --git a/nixpkgs/pkgs/development/compilers/graalvm/community-edition/default.nix b/nixpkgs/pkgs/development/compilers/graalvm/community-edition/default.nix index a29a81783c9c..bfc9c729689c 100644 --- a/nixpkgs/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/nixpkgs/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -1,23 +1,28 @@ { lib -, stdenv -, callPackage -, fetchurl +, pkgs }: +lib.makeScope pkgs.newScope (self: { - buildGraalvm = callPackage ./buildGraalvm.nix; + stdenv = + if pkgs.stdenv.isDarwin then + pkgs.darwin.apple_sdk_11_0.stdenv + else + pkgs.stdenv; - buildGraalvmProduct = callPackage ./buildGraalvmProduct.nix; + buildGraalvm = self.callPackage ./buildGraalvm.nix; - graalvm-ce = callPackage ./graalvm-ce { }; + buildGraalvmProduct = self.callPackage ./buildGraalvmProduct.nix; - graalvm-ce-musl = callPackage ./graalvm-ce { useMusl = true; }; + graalvm-ce = self.callPackage ./graalvm-ce { }; - graaljs = callPackage ./graaljs { }; + graalvm-ce-musl = self.callPackage ./graalvm-ce { useMusl = true; }; - graalnodejs = callPackage ./graalnodejs { }; + graaljs = self.callPackage ./graaljs { }; - graalpy = callPackage ./graalpy { }; + graalnodejs = self.callPackage ./graalnodejs { }; - truffleruby = callPackage ./truffleruby { }; -} + graalpy = self.callPackage ./graalpy { }; + + truffleruby = self.callPackage ./truffleruby { }; +}) diff --git a/nixpkgs/pkgs/development/compilers/llvm/17/default.nix b/nixpkgs/pkgs/development/compilers/llvm/17/default.nix index a9138e3c79b6..c8d956925345 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/17/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/17/default.nix @@ -213,6 +213,7 @@ in let (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) "-lunwind" ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; + nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; }; clangNoLibcxx = wrapCCWith rec { diff --git a/nixpkgs/pkgs/development/compilers/llvm/18/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/18/clang/default.nix new file mode 100644 index 000000000000..1e777c6132e4 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/18/clang/default.nix @@ -0,0 +1,139 @@ +{ lib, stdenv, llvm_meta +, monorepoSrc, runCommand +, substituteAll, cmake, ninja, libxml2, libllvm, version, python3 +, buildLlvmTools +, fixDarwinDylibNames +, enableManpages ? false +}: + +let + self = stdenv.mkDerivation (finalAttrs: rec { + pname = "clang"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + cp -r ${monorepoSrc}/clang-tools-extra "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; + + nativeBuildInputs = [ cmake ninja python3 ] + ++ lib.optional (lib.versionAtLeast version "18" && enableManpages) python3.pkgs.myst-parser + ++ lib.optional enableManpages python3.pkgs.sphinx + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + + buildInputs = [ libxml2 libllvm ]; + + cmakeFlags = [ + "-DCLANG_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/cmake/clang" + "-DCLANGD_BUILD_XPC=OFF" + "-DLLVM_ENABLE_RTTI=ON" + "-DLLVM_INCLUDE_TESTS=OFF" + ] ++ lib.optionals enableManpages [ + "-DCLANG_INCLUDE_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" + # Added in LLVM15: + # `clang-tidy-confusable-chars-gen`: https://github.com/llvm/llvm-project/commit/c3574ef739fbfcc59d405985a3a4fa6f4619ecdb + # `clang-pseudo-gen`: https://github.com/llvm/llvm-project/commit/cd2292ef824591cc34cc299910a3098545c840c7 + "-DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${buildLlvmTools.libclang.dev}/bin/clang-tidy-confusable-chars-gen" + "-DCLANG_PSEUDO_GEN=${buildLlvmTools.libclang.dev}/bin/clang-pseudo-gen" + ]; + + patches = [ + ./purity.patch + # https://reviews.llvm.org/D51899 + ./gnu-install-dirs.patch + ../../common/clang/add-nostdlibinc-flag.patch + (substituteAll { + src = ../../common/clang/clang-at-least-16-LLVMgold-path.patch; + libllvmLibdir = "${libllvm.lib}/lib"; + }) + ]; + + postPatch = '' + (cd tools && ln -s ../../clang-tools-extra extra) + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp + ''; + + outputs = [ "out" "lib" "dev" "python" ]; + + postInstall = '' + ln -sv $out/bin/clang $out/bin/cpp + + # Move libclang to 'lib' output + moveToOutput "lib/libclang.*" "$lib" + moveToOutput "lib/libclang-cpp.*" "$lib" + substituteInPlace $dev/lib/cmake/clang/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp." + + mkdir -p $python/bin $python/share/clang/ + mv $out/bin/{git-clang-format,scan-view} $python/bin + if [ -e $out/bin/set-xcode-analyzer ]; then + mv $out/bin/set-xcode-analyzer $python/bin + fi + mv $out/share/clang/*.py $python/share/clang + rm $out/bin/c-index-test + patchShebangs $python/bin + + mkdir -p $dev/bin + cp bin/{clang-tblgen,clang-tidy-confusable-chars-gen,clang-pseudo-gen} $dev/bin + ''; + + passthru = { + inherit libllvm; + isClang = true; + hardeningUnsupportedFlags = [ + "fortify3" + ]; + hardeningUnsupportedFlagsByTargetPlatform = targetPlatform: + lib.optional (!(targetPlatform.isx86_64 || targetPlatform.isAarch64)) "zerocallusedregs" + ++ (finalAttrs.passthru.hardeningUnsupportedFlags or []); + }; + + meta = llvm_meta // { + homepage = "https://clang.llvm.org/"; + description = "A C language family frontend for LLVM"; + longDescription = '' + The Clang project provides a language front-end and tooling + infrastructure for languages in the C language family (C, C++, Objective + C/C++, OpenCL, CUDA, and RenderScript) for the LLVM project. + It aims to deliver amazingly fast compiles, extremely useful error and + warning messages and to provide a platform for building great source + level tools. The Clang Static Analyzer and clang-tidy are tools that + automatically find bugs in your code, and are great examples of the sort + of tools that can be built using the Clang frontend as a library to + parse C/C++ code. + ''; + mainProgram = "clang"; + }; + } // lib.optionalAttrs enableManpages { + pname = "clang-manpages"; + + ninjaFlags = [ "docs-clang-man" ]; + + installPhase = '' + mkdir -p $out/share/man/man1 + # Manually install clang manpage + cp docs/man/*.1 $out/share/man/man1/ + ''; + + outputs = [ "out" ]; + + doCheck = false; + + meta = llvm_meta // { + description = "man page for Clang ${version}"; + }; + }); +in self diff --git a/nixpkgs/pkgs/development/compilers/llvm/18/clang/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/18/clang/gnu-install-dirs.patch new file mode 100644 index 000000000000..9517df973ad0 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/18/clang/gnu-install-dirs.patch @@ -0,0 +1,71 @@ +diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake +index 75b0080f6715..c895b884cd27 100644 +--- a/cmake/modules/AddClang.cmake ++++ b/cmake/modules/AddClang.cmake +@@ -119,8 +119,8 @@ macro(add_clang_library name) + install(TARGETS ${lib} + COMPONENT ${lib} + ${export_to_clangtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + + if (NOT LLVM_ENABLE_IDE) +diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt +index f2b0c5cddcbb..52f37fc368ce 100644 +--- a/lib/Headers/CMakeLists.txt ++++ b/lib/Headers/CMakeLists.txt +@@ -473,6 +473,7 @@ add_header_target("windows-resource-headers" ${windows_only_files}) + add_header_target("utility-resource-headers" ${utility_files}) + + get_clang_resource_dir(header_install_dir SUBDIR include) ++set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION_MAJOR}/include) + + ############################################################# + # Install rules for the catch-all clang-resource-headers target +diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt +index 4f23065a2472..6a0f55991e24 100644 +--- a/tools/libclang/CMakeLists.txt ++++ b/tools/libclang/CMakeLists.txt +@@ -234,7 +234,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) + COMPONENT + libclang-python-bindings + DESTINATION +- "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") ++ "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") + endforeach() + if(NOT LLVM_ENABLE_IDE) + add_custom_target(libclang-python-bindings) +diff --git a/tools/scan-build-py/CMakeLists.txt b/tools/scan-build-py/CMakeLists.txt +index 3aca22c0b0a8..3115353e3fe3 100644 +--- a/tools/scan-build-py/CMakeLists.txt ++++ b/tools/scan-build-py/CMakeLists.txt +@@ -88,7 +88,7 @@ foreach(lib ${LibScanbuild}) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib}) + install(FILES lib/libscanbuild/${lib} +- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild" + COMPONENT scan-build-py) + endforeach() + +@@ -106,7 +106,7 @@ foreach(resource ${LibScanbuildResources}) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource}) + install(FILES lib/libscanbuild/resources/${resource} +- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild/resources ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild/resources" + COMPONENT scan-build-py) + endforeach() + +@@ -122,7 +122,7 @@ foreach(lib ${LibEar}) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib}) + install(FILES lib/libear/${lib} +- DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libear ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear" + COMPONENT scan-build-py) + endforeach() + diff --git a/nixpkgs/pkgs/development/compilers/llvm/18/clang/purity.patch b/nixpkgs/pkgs/development/compilers/llvm/18/clang/purity.patch new file mode 100644 index 000000000000..5ce14a3479a0 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/18/clang/purity.patch @@ -0,0 +1,25 @@ +From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Thu, 18 May 2017 11:56:12 -0500 +Subject: [PATCH] "purity" patch for 5.0 + +--- + lib/Driver/ToolChains/Gnu.cpp | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp +index fe3c0191bb..c6a482bece 100644 +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -446,9 +446,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, + ToolChain.isPIEDefault(Args)); + if (IsPIE) + CmdArgs.push_back("-pie"); +- CmdArgs.push_back("-dynamic-linker"); +- CmdArgs.push_back(Args.MakeArgString(Twine(D.DyldPrefix) + +- ToolChain.getDynamicLinker(Args))); + } + } + +-- +2.11.0 diff --git a/nixpkgs/pkgs/development/compilers/llvm/18/compiler-rt/X86-support-extension.patch b/nixpkgs/pkgs/development/compilers/llvm/18/compiler-rt/X86-support-extension.patch new file mode 100644 index 000000000000..07013e5a6825 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/18/compiler-rt/X86-support-extension.patch @@ -0,0 +1,21 @@ +diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt +index 3a66dd9c3fb..7efc85d9f9f 100644 +--- a/lib/builtins/CMakeLists.txt ++++ b/lib/builtins/CMakeLists.txt +@@ -348,4 +348,8 @@ if (NOT MSVC) + ++ set(i486_SOURCES ${i386_SOURCES}) ++ set(i586_SOURCES ${i386_SOURCES}) ++ set(i686_SOURCES ${i386_SOURCES}) ++ + if (WIN32) + set(i386_SOURCES + ${i386_SOURCES} +@@ -723,6 +723,7 @@ else () + endif() + + foreach (arch ${BUILTIN_SUPPORTED_ARCH}) ++ message("arch: ${arch}") + if (CAN_TARGET_${arch}) + # For ARM archs, exclude any VFP builtins if VFP is not supported + if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") diff --git a/nixpkgs/pkgs/development/compilers/llvm/18/compiler-rt/darwin-targetconditionals.patch b/nixpkgs/pkgs/development/compilers/llvm/18/compiler-rt/darwin-targetconditionals.patch new file mode 100644 index 000000000000..425dc2af01e7 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/18/compiler-rt/darwin-targetconditionals.patch @@ -0,0 +1,71 @@ +diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp +--- a/lib/sanitizer_common/sanitizer_mac.cpp ++++ b/lib/sanitizer_common/sanitizer_mac.cpp +@@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) { + // Offset example: + // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4 + constexpr u16 GetOSMajorKernelOffset() { +- if (TARGET_OS_OSX) return 4; +- if (TARGET_OS_IOS || TARGET_OS_TV) return 6; +- if (TARGET_OS_WATCH) return 13; ++#if TARGET_OS_OSX ++ return 4; ++#endif ++#if TARGET_OS_IOS || TARGET_OS_TV ++ return 6; ++#endif ++#if TARGET_OS_WATCH ++ return 13; ++#endif + } + + using VersStr = char[64]; +@@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) { + u16 os_major = kernel_major - offset; + + const char *format = "%d.0"; +- if (TARGET_OS_OSX) { +- if (os_major >= 16) { // macOS 11+ +- os_major -= 5; +- } else { // macOS 10.15 and below +- format = "10.%d"; +- } ++#if TARGET_OS_OSX ++ if (os_major >= 16) { // macOS 11+ ++ os_major -= 5; ++ } else { // macOS 10.15 and below ++ format = "10.%d"; + } ++#endif + return internal_snprintf(vers, sizeof(VersStr), format, os_major); + } + +@@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) { + // Aligned versions example: + // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6 + static void MapToMacos(u16 *major, u16 *minor) { +- if (TARGET_OS_OSX) +- return; +- +- if (TARGET_OS_IOS || TARGET_OS_TV) ++#if !TARGET_OS_OSX ++#if TARGET_OS_IOS || TARGET_OS_TV + *major += 2; +- else if (TARGET_OS_WATCH) ++#elif TARGET_OS_WATCH + *major += 9; +- else ++#else + UNREACHABLE("unsupported platform"); ++#endif + + if (*major >= 16) { // macOS 11+ + *major -= 5; +@@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) { + *minor = *major; + *major = 10; + } ++#endif + } + + static MacosVersion GetMacosAlignedVersionInternal() { diff --git a/nixpkgs/pkgs/development/compilers/llvm/18/compiler-rt/default.nix b/nixpkgs/pkgs/development/compilers/llvm/18/compiler-rt/default.nix new file mode 100644 index 000000000000..f51316beb570 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/18/compiler-rt/default.nix @@ -0,0 +1,157 @@ +{ lib, stdenv, llvm_meta, version +, monorepoSrc, runCommand +, cmake, ninja, python3, xcbuild, libllvm, linuxHeaders, libxcrypt +, doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD +}: + +let + + useLLVM = stdenv.hostPlatform.useLLVM or false; + bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; + haveLibc = stdenv.cc.libc != null; + isDarwinStatic = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic; + inherit (stdenv.hostPlatform) isMusl; + + baseName = "compiler-rt"; + + src = runCommand "${baseName}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${baseName} "$out" + ''; +in + +stdenv.mkDerivation { + pname = baseName + lib.optionalString (haveLibc) "-libc"; + inherit version; + + inherit src; + sourceRoot = "${src.name}/${baseName}"; + + nativeBuildInputs = [ cmake ninja python3 libllvm.dev ] + ++ lib.optional stdenv.isDarwin xcbuild.xcrun; + buildInputs = + lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders; + + env.NIX_CFLAGS_COMPILE = toString ([ + "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" + ] ++ lib.optionals (!haveLibc) [ + # The compiler got stricter about this, and there is a usellvm patch below + # which patches out the assert include causing an implicit definition of + # assert. It would be nicer to understand why compiler-rt thinks it should + # be able to #include <assert.h> in the first place; perhaps it's in the + # wrong, or perhaps there is a way to provide an assert.h. + "-Wno-error=implicit-function-declaration" + ]); + + cmakeFlags = [ + "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" + "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" + "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" + ] ++ lib.optionals (haveLibc && stdenv.hostPlatform.libc == "glibc") [ + "-DSANITIZER_COMMON_CFLAGS=-I${libxcrypt}/include" + ] ++ lib.optionals (useLLVM || bareMetal || isMusl || isDarwinStatic) [ + "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" + "-DCOMPILER_RT_BUILD_XRAY=OFF" + "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" + "-DCOMPILER_RT_BUILD_MEMPROF=OFF" + "-DCOMPILER_RT_BUILD_ORC=OFF" # may be possible to build with musl if necessary + ] ++ lib.optionals (useLLVM || bareMetal) [ + "-DCOMPILER_RT_BUILD_PROFILE=OFF" + ] ++ lib.optionals ((useLLVM && !haveLibc) || bareMetal || isDarwinStatic ) [ + "-DCMAKE_CXX_COMPILER_WORKS=ON" + ] ++ lib.optionals ((useLLVM && !haveLibc) || bareMetal) [ + "-DCMAKE_C_COMPILER_WORKS=ON" + "-DCOMPILER_RT_BAREMETAL_BUILD=ON" + "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" + ] ++ lib.optionals (useLLVM && !haveLibc) [ + "-DCMAKE_C_FLAGS=-nodefaultlibs" + ] ++ lib.optionals (useLLVM) [ + "-DCOMPILER_RT_BUILD_BUILTINS=ON" + #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program + "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" + ] ++ lib.optionals (bareMetal) [ + "-DCOMPILER_RT_OS_DIR=baremetal" + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + "-DCMAKE_LIPO=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}lipo" + "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON" + "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}" + "-DDARWIN_osx_BUILTIN_ARCHS=${stdenv.hostPlatform.darwinArch}" + + # `COMPILER_RT_DEFAULT_TARGET_ONLY` does not apply to Darwin: + # https://github.com/llvm/llvm-project/blob/27ef42bec80b6c010b7b3729ed0528619521a690/compiler-rt/cmake/base-config-ix.cmake#L153 + "-DCOMPILER_RT_ENABLE_IOS=OFF" + ]; + + outputs = [ "out" "dev" ]; + + patches = [ + ./X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config + # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the + # extra `/`. + ./normalize-var.patch + # See: https://github.com/NixOS/nixpkgs/pull/186575 + ../../common/compiler-rt/darwin-plistbuddy-workaround.patch + # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 + # ../../common/compiler-rt/armv7l-15.patch + ]; + + # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks + # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra + # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd + # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by + # a flag and turn the flag off during the stdenv build. + postPatch = lib.optionalString (!stdenv.isDarwin) '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace cmake/config-ix.cmake \ + --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' + '' + lib.optionalString (useLLVM && !haveLibc) '' + substituteInPlace lib/builtins/aarch64/sme-libc-routines.c \ + --replace "<stdlib.h>" "<stddef.h>" + substituteInPlace lib/builtins/int_util.c \ + --replace "#include <stdlib.h>" "" + substituteInPlace lib/builtins/clear_cache.c \ + --replace "#include <assert.h>" "" + substituteInPlace lib/builtins/cpu_model${lib.optionalString (lib.versionAtLeast version "18") "/x86"}.c \ + --replace "#include <assert.h>" "" + ''; + + # Hack around weird upsream RPATH bug + postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin) '' + ln -s "$out/lib"/*/* "$out/lib" + '' + lib.optionalString (useLLVM && stdenv.hostPlatform.isLinux) '' + ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o + ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o + # Note the history of crt{begin,end}S in previous versions of llvm in nixpkg: + # The presence of crtbegin_shared has been added and removed; it's possible + # people have added/removed it to get it working on their platforms. + # Try each in turn for now. + ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbeginS.o + ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtendS.o + ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o + ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o + '' + lib.optionalString doFakeLibgcc '' + ln -s $out/lib/freebsd/libclang_rt.builtins-*.a $out/lib/libgcc.a + ''; + + meta = llvm_meta // { + homepage = "https://compiler-rt.llvm.org/"; + description = "Compiler runtime libraries"; + longDescription = '' + The compiler-rt project provides highly tuned implementations of the + low-level code generator support routines like "__fixunsdfdi" and other + calls generated when a target doesn't have a short sequence of native + instructions to implement a core IR operation. It also provides + implementations of run-time libraries for dynamic testing tools such as + AddressSanitizer, ThreadSanitizer, MemorySanitizer, and DataFlowSanitizer. + ''; + # "All of the code in the compiler-rt project is dual licensed under the MIT + # license and the UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + # compiler-rt requires a Clang stdenv on 32-bit RISC-V: + # https://reviews.llvm.org/D43106#1019077 + broken = stdenv.hostPlatform.isRiscV32 && !stdenv.cc.isClang; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/llvm/18/compiler-rt/normalize-var.patch b/nixpkgs/pkgs/development/compilers/llvm/18/compiler-rt/normalize-var.patch new file mode 100644 index 000000000000..2b25fd4a0744 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/18/compiler-rt/normalize-var.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake +index 4c85551d7766..297d7a47c54b 100644 +--- a/cmake/Modules/CompilerRTUtils.cmake ++++ b/cmake/Modules/CompilerRTUtils.cmake +@@ -328,8 +328,9 @@ macro(load_llvm_config) + endif() + endif() + +- set(LLVM_LIBRARY_OUTPUT_INTDIR +- ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) ++ get_filename_component(LLVM_LIBRARY_OUTPUT_INTDIR ++ ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX} ++ REALPATH) + + set(LLVM_MAIN_SRC_DIR "${LLVM_MAIN_SRC_DIR_DEFAULT}" CACHE PATH "Path to LLVM source tree") + message(STATUS "LLVM_MAIN_SRC_DIR: \"${LLVM_MAIN_SRC_DIR}\"") diff --git a/nixpkgs/pkgs/development/compilers/llvm/18/default.nix b/nixpkgs/pkgs/development/compilers/llvm/18/default.nix new file mode 100644 index 000000000000..dd3000c04259 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/18/default.nix @@ -0,0 +1,329 @@ +{ lowPrio, newScope, pkgs, lib, stdenv, cmake, ninja +, preLibcCrossHeaders +, libxml2, python3, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith +, buildLlvmTools # tools, but from the previous stage, for cross +, targetLlvmLibraries # libraries, but from the next stage, for cross +, targetLlvm +# This is the default binutils, but with *this* version of LLD rather +# than the default LLVM verion's, if LLD is the choice. We use these for +# the `useLLVM` bootstrapping below. +, bootBintoolsNoLibc ? + if stdenv.targetPlatform.linker == "lld" + then null + else pkgs.bintoolsNoLibc +, bootBintools ? + if stdenv.targetPlatform.linker == "lld" + then null + else pkgs.bintools +, darwin +# LLVM release information; specify one of these but not both: +, gitRelease ? null + # i.e.: + # { + # version = /* i.e. "15.0.0" */; + # rev = /* commit SHA */; + # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; + # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; + # } +, officialRelease ? { version = "18.1.1"; sha256 = "sha256-qAPNvEpztJjPz+kr5KcZz4iUTErsD8iXLURKl3yZoC8="; } + # i.e.: + # { + # version = /* i.e. "15.0.0" */; + # candidate = /* optional; if specified, should be: "rcN" */ + # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; + # } +# By default, we'll try to fetch a release from `github:llvm/llvm-project` +# corresponding to the `gitRelease` or `officialRelease` specified. +# +# You can provide your own LLVM source by specifying this arg but then it's up +# to you to make sure that the LLVM repo given matches the release configuration +# specified. +, monorepoSrc ? null +}: + +assert let + int = a: if a then 1 else 0; + xor = a: b: ((builtins.bitXor (int a) (int b)) == 1); +in + lib.assertMsg + (xor + (gitRelease != null) + (officialRelease != null)) + ("must specify `gitRelease` or `officialRelease`" + + (lib.optionalString (gitRelease != null) " — not both")); +let + monorepoSrc' = monorepoSrc; +in let + inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; + + inherit (releaseInfo) release_version version; + + inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; + + tools = lib.makeExtensible (tools: let + callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; }); + major = lib.versions.major release_version; + mkExtraBuildCommands0 = cc: '' + rsrc="$out/resource-root" + mkdir "$rsrc" + ln -s "${cc.lib}/lib/clang/${major}/include" "$rsrc" + echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags + ''; + mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' + ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" + ''; + + bintoolsNoLibc' = + if bootBintoolsNoLibc == null + then tools.bintoolsNoLibc + else bootBintoolsNoLibc; + bintools' = + if bootBintools == null + then tools.bintools + else bootBintools; + + in { + + libllvm = callPackage ./llvm { + inherit llvm_meta; + }; + + # `llvm` historically had the binaries. When choosing an output explicitly, + # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* + llvm = tools.libllvm; + + libclang = callPackage ./clang { + inherit llvm_meta; + }; + + clang-unwrapped = tools.libclang; + + llvm-manpages = lowPrio (tools.libllvm.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + }); + + clang-manpages = lowPrio (tools.libclang.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + }); + + lldb-manpages = lowPrio (tools.lldb.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + }); + + # pick clang appropriate for package set we are targeting + clang = + /**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM + else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang + else tools.libcxxClang; + + libstdcxxClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. + libcxx = null; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + }; + + libcxxClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + }; + + lld = callPackage ./lld { + inherit llvm_meta; + }; + + mlir = callPackage ../common/mlir { + inherit llvm_meta; + }; + + lldb = callPackage ../common/lldb.nix { + src = callPackage ({ runCommand }: runCommand "lldb-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/lldb "$out" + '') { }; + patches = + [ + # FIXME: do we need this? ./procfs.patch + ../common/lldb/gnu-install-dirs.patch + ] + # This is a stopgap solution if/until the macOS SDK used for x86_64 is + # updated. + # + # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` + # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use + # of this preprocessor symbol in `lldb` with its expansion. + # + # See here for some context: + # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 + ++ lib.optional ( + stdenv.targetPlatform.isDarwin + && !stdenv.targetPlatform.isAarch64 + && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") + ) ./lldb/cpu_subtype_arm64e_replacement.patch; + inherit llvm_meta; + }; + + # Below, is the LLVM bootstrapping logic. It handles building a + # fully LLVM toolchain from scratch. No GCC toolchain should be + # pulled in. As a consequence, it is very quick to build different + # targets provided by LLVM and we can also build for what GCC + # doesn’t support like LLVM. Probably we should move to some other + # file. + + bintools-unwrapped = callPackage ../common/bintools.nix { }; + + bintoolsNoLibc = wrapBintoolsWith { + bintools = tools.bintools-unwrapped; + libc = preLibcCrossHeaders; + }; + + bintools = wrapBintoolsWith { + bintools = tools.bintools-unwrapped; + }; + + clangUseLLVM = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; + bintools = bintools'; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ + targetLlvmLibraries.libunwind + ]; + extraBuildCommands = mkExtraBuildCommands cc; + nixSupport.cc-cflags = + [ "-rtlib=compiler-rt" + "-Wno-unused-command-line-argument" + "-B${targetLlvmLibraries.compiler-rt}/lib" + ] + ++ lib.optional (!stdenv.targetPlatform.isWasm) "--unwindlib=libunwind" + ++ lib.optional + (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) + "-lunwind" + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; + nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm) [ "-L${targetLlvmLibraries.libunwind}/lib" ]; + }; + + clangNoLibcxx = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintools'; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + "-nostdlib++" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; + }; + + clangNoLibc = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintoolsNoLibc'; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; + }; + + clangNoCompilerRt = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintoolsNoLibc'; + extraPackages = [ ]; + extraBuildCommands = mkExtraBuildCommands0 cc; + nixSupport.cc-cflags = + [ + "-nostartfiles" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; + }; + + clangNoCompilerRtWithLibc = wrapCCWith (rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintools'; + extraPackages = [ ]; + extraBuildCommands = mkExtraBuildCommands0 cc; + } // lib.optionalAttrs stdenv.targetPlatform.isWasm { + nixSupport.cc-cflags = [ "-fno-exceptions" ]; + }); + + # Has to be in tools despite mostly being a library, + # because we use a native helper executable from a + # non-cross build in cross builds. + libclc = callPackage ../common/libclc.nix { + inherit buildLlvmTools; + }; + }); + + libraries = lib.makeExtensible (libraries: let + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc; }); + in { + + compiler-rt-libc = callPackage ./compiler-rt { + inherit llvm_meta; + stdenv = if stdenv.hostPlatform.useLLVM or false || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic) + then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc + else stdenv; + }; + + compiler-rt-no-libc = callPackage ./compiler-rt { + inherit llvm_meta; + stdenv = if stdenv.hostPlatform.useLLVM or false + then overrideCC stdenv buildLlvmTools.clangNoCompilerRt + else stdenv; + }; + + # N.B. condition is safe because without useLLVM both are the same. + compiler-rt = if stdenv.hostPlatform.isAndroid || stdenv.hostPlatform.isDarwin + then libraries.compiler-rt-libc + else libraries.compiler-rt-no-libc; + + stdenv = overrideCC stdenv buildLlvmTools.clang; + + libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; + + # `libcxx` requires a fairly modern C++ compiler, + # so: we use the clang from this LLVM package set instead of the regular + # stdenv's compiler. + libcxx = callPackage ./libcxx { + inherit llvm_meta; + stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; + }; + + libunwind = callPackage ./libunwind { + inherit llvm_meta; + stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; + }; + + openmp = callPackage ./openmp { + inherit llvm_meta targetLlvm; + }; + }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; + +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/nixpkgs/pkgs/development/compilers/llvm/18/libcxx/0001-darwin-10.12-mbstate_t-fix.patch b/nixpkgs/pkgs/development/compilers/llvm/18/libcxx/0001-darwin-10.12-mbstate_t-fix.patch new file mode 100644 index 000000000000..29942f8ed03d --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/18/libcxx/0001-darwin-10.12-mbstate_t-fix.patch @@ -0,0 +1,31 @@ +From 9c1cb26c1dd3f92d1c1177e548107d2cd3c5e616 Mon Sep 17 00:00:00 2001 +From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> +Date: Fri, 23 Feb 2024 22:58:58 +0000 +Subject: [PATCH] darwin 10.12 mbstate_t fix + +https://github.com/llvm/llvm-project/issues/64226 + +removes space from +https://github.com/macports/macports-ports/raw/acd8acb171f1658596ed1cf25da48d5b932e2d19/lang/llvm-17/files/0042-mbstate_t-not-defined.patch +so it applies cleanly +--- + libcxx/include/__mbstate_t.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libcxx/include/__mbstate_t.h b/libcxx/include/__mbstate_t.h +index bfa6d61..5f51112 100644 +--- a/libcxx/include/__mbstate_t.h ++++ b/libcxx/include/__mbstate_t.h +@@ -42,6 +42,9 @@ + #elif __has_include(<bits/types/mbstate_t.h>) + # include <bits/types/mbstate_t.h> // works on most Unixes + #elif __has_include(<sys/_types/_mbstate_t.h>) ++# if __has_include(<machine/_types.h>) ++# include <machine/_types.h> ++# endif + # include <sys/_types/_mbstate_t.h> // works on Darwin + #elif !defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS) && __has_include_next(<wchar.h>) + # include_next <wchar.h> // fall back to the C standard provider of mbstate_t +-- +2.43.0 + diff --git a/nixpkgs/pkgs/development/compilers/llvm/18/libcxx/default.nix b/nixpkgs/pkgs/development/compilers/llvm/18/libcxx/default.nix new file mode 100644 index 000000000000..d6c304c0b476 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/18/libcxx/default.nix @@ -0,0 +1,130 @@ +{ lib, stdenv, llvm_meta +, monorepoSrc, runCommand +, cmake, lndir, ninja, python3, fixDarwinDylibNames, version +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else null +, libcxxrt, libunwind +, enableShared ? !stdenv.hostPlatform.isStatic +}: + +# external cxxabi is not supported on Darwin as the build will not link libcxx +# properly and not re-export the cxxabi symbols into libcxx +# https://github.com/NixOS/nixpkgs/issues/166205 +# https://github.com/NixOS/nixpkgs/issues/269548 +assert cxxabi == null || !stdenv.hostPlatform.isDarwin; +let + basename = "libcxx"; + cxxabiName = "lib${if cxxabi == null then "cxxabi" else cxxabi.libName}"; + runtimes = [ "libcxx" ] ++ lib.optional (cxxabi == null) "libcxxabi"; + + # Note: useLLVM is likely false for Darwin but true under pkgsLLVM + useLLVM = stdenv.hostPlatform.useLLVM or false; + + cxxabiCMakeFlags = [ + "-DLIBCXXABI_USE_LLVM_UNWINDER=OFF" + ] ++ lib.optionals (useLLVM && !stdenv.hostPlatform.isWasm) [ + "-DLIBCXXABI_ADDITIONAL_LIBRARIES=unwind" + "-DLIBCXXABI_USE_COMPILER_RT=ON" + ] ++ lib.optionals stdenv.hostPlatform.isWasm [ + "-DLIBCXXABI_ENABLE_THREADS=OFF" + "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" + ] ++ lib.optionals (!enableShared) [ + "-DLIBCXXABI_ENABLE_SHARED=OFF" + ]; + + cxxCMakeFlags = [ + "-DLIBCXX_CXX_ABI=${cxxabiName}" + ] ++ lib.optionals (cxxabi != null) [ + "-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${lib.getDev cxxabi}/include" + ] ++ lib.optionals (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) [ + "-DLIBCXX_HAS_MUSL_LIBC=1" + ] ++ lib.optionals (lib.versionAtLeast version "18" && !useLLVM && stdenv.hostPlatform.libc == "glibc" && !stdenv.hostPlatform.isStatic) [ + "-DLIBCXX_ADDITIONAL_LIBRARIES=gcc_s" + ] ++ lib.optionals useLLVM [ + "-DLIBCXX_USE_COMPILER_RT=ON" + # There's precedent for this in llvm-project/libcxx/cmake/caches. + # In a monorepo build you might do the following in the libcxxabi build: + # -DLLVM_ENABLE_PROJECTS=libcxxabi;libunwinder + # -DLIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY=On + # libcxx appears to require unwind and doesn't pull it in via other means. + "-DLIBCXX_ADDITIONAL_LIBRARIES=unwind" + ] ++ lib.optionals stdenv.hostPlatform.isWasm [ + "-DLIBCXX_ENABLE_THREADS=OFF" + "-DLIBCXX_ENABLE_FILESYSTEM=OFF" + "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" + ] ++ lib.optionals (!enableShared) [ + "-DLIBCXX_ENABLE_SHARED=OFF" + ]; + + cmakeFlags = [ + "-DLLVM_ENABLE_RUNTIMES=${lib.concatStringsSep ";" runtimes}" + ] ++ lib.optionals stdenv.hostPlatform.isWasm [ + "-DCMAKE_C_COMPILER_WORKS=ON" + "-DCMAKE_CXX_COMPILER_WORKS=ON" + "-DUNIX=ON" # Required otherwise libc++ fails to detect the correct linker + ] ++ cxxCMakeFlags + ++ lib.optionals (cxxabi == null) cxxabiCMakeFlags; + +in + +stdenv.mkDerivation rec { + pname = basename; + inherit version cmakeFlags; + + src = runCommand "${pname}-src-${version}" {} ('' + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/libcxx "$out" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + cp -r ${monorepoSrc}/llvm/utils "$out/llvm" + cp -r ${monorepoSrc}/third-party "$out" + cp -r ${monorepoSrc}/runtimes "$out" + '' + lib.optionalString (cxxabi == null) '' + cp -r ${monorepoSrc}/libcxxabi "$out" + ''); + + outputs = [ "out" "dev" ]; + + patches = lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ + # https://github.com/llvm/llvm-project/issues/64226 + ./0001-darwin-10.12-mbstate_t-fix.patch + ]; + + postPatch = '' + cd runtimes + ''; + + preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' + patchShebangs utils/cat_files.py + ''; + + nativeBuildInputs = [ cmake ninja python3 ] + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames + ++ lib.optional (cxxabi != null) lndir; + + buildInputs = [ cxxabi ] + ++ lib.optionals (useLLVM && !stdenv.hostPlatform.isWasm) [ libunwind ]; + + # libc++.so is a linker script which expands to multiple libraries, + # libc++.so.1 and libc++abi.so or the external cxxabi. ld-wrapper doesn't + # support linker scripts so the external cxxabi needs to be symlinked in + postInstall = lib.optionalString (cxxabi != null) '' + lndir ${lib.getDev cxxabi}/include ''${!outputDev}/include/c++/v1 + lndir ${lib.getLib cxxabi}/lib ''${!outputLib}/lib + ''; + + passthru = { + isLLVM = true; + }; + + meta = llvm_meta // { + homepage = "https://libcxx.llvm.org/"; + description = "C++ standard library"; + longDescription = '' + libc++ is an implementation of the C++ standard library, targeting C++11, + C++14 and above. + ''; + # "All of the code in libc++ is dual licensed under the MIT license and the + # UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/llvm/18/libunwind/default.nix b/nixpkgs/pkgs/development/compilers/llvm/18/libunwind/default.nix new file mode 100644 index 000000000000..e67823ffb85c --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/18/libunwind/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv, llvm_meta, version +, monorepoSrc, runCommand +, cmake +, ninja +, python3 +, enableShared ? !stdenv.hostPlatform.isStatic +}: + +stdenv.mkDerivation rec { + pname = "libunwind"; + inherit version; + + # I am not so comfortable giving libc++ and friends the whole monorepo as + # requested, so I filter it to what is needed. + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/utils "$out/libcxx" + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + cp -r ${monorepoSrc}/llvm/utils "$out/llvm" + cp -r ${monorepoSrc}/runtimes "$out" + ''; + + sourceRoot = "${src.name}/runtimes"; + + postInstall = lib.optionalString (enableShared && !stdenv.hostPlatform.isDarwin) '' + # libcxxabi wants to link to libunwind_shared.so (?). + ln -s $out/lib/libunwind.so $out/lib/libunwind_shared.so + ''; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake ninja python3 ]; + + cmakeFlags = [ + "-DLLVM_ENABLE_RUNTIMES=libunwind" + ] ++ lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; + + meta = llvm_meta // { + # Details: https://github.com/llvm/llvm-project/blob/main/libunwind/docs/index.rst + homepage = "https://clang.llvm.org/docs/Toolchain.html#unwind-library"; + description = "LLVM's unwinder library"; + longDescription = '' + The unwind library provides a family of _Unwind_* functions implementing + the language-neutral stack unwinding portion of the Itanium C++ ABI (Level + I). It is a dependency of the C++ ABI library, and sometimes is a + dependency of other runtimes. + ''; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/llvm/18/lld/default.nix b/nixpkgs/pkgs/development/compilers/llvm/18/lld/default.nix new file mode 100644 index 000000000000..24ff0933dd1d --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/18/lld/default.nix @@ -0,0 +1,57 @@ +{ lib, stdenv, llvm_meta +, buildLlvmTools +, monorepoSrc, runCommand +, cmake +, ninja +, libxml2 +, libllvm +, version +}: + +stdenv.mkDerivation rec { + pname = "lld"; + inherit version; + + # Blank llvm dir just so relative path works + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libunwind" + cp -r ${monorepoSrc}/libunwind/include "$out/libunwind" + mkdir -p "$out/llvm" + ''; + + sourceRoot = "${src.name}/${pname}"; + + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ libllvm libxml2 ]; + + patches = [ + ./gnu-install-dirs.patch + ]; + + cmakeFlags = [ + "-DLLD_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/cmake/lld" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ]; + + # Musl's default stack size is too small for lld to be able to link Firefox. + LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152"; + + outputs = [ "out" "lib" "dev" ]; + + meta = llvm_meta // { + homepage = "https://lld.llvm.org/"; + description = "The LLVM linker (unwrapped)"; + longDescription = '' + LLD is a linker from the LLVM project that is a drop-in replacement for + system linkers and runs much faster than them. It also provides features + that are useful for toolchain developers. + The linker supports ELF (Unix), PE/COFF (Windows), Mach-O (macOS), and + WebAssembly in descending order of completeness. Internally, LLD consists + of several different linkers. + ''; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/llvm/18/lld/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/18/lld/gnu-install-dirs.patch new file mode 100644 index 000000000000..6c73a240ab6d --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/18/lld/gnu-install-dirs.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake +index d3924f7243d4..42a7cd62281c 100644 +--- a/cmake/modules/AddLLD.cmake ++++ b/cmake/modules/AddLLD.cmake +@@ -18,8 +18,8 @@ macro(add_lld_library name) + install(TARGETS ${name} + COMPONENT ${name} + ${export_to_lldtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + + if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) diff --git a/nixpkgs/pkgs/development/compilers/llvm/18/lldb/cpu_subtype_arm64e_replacement.patch b/nixpkgs/pkgs/development/compilers/llvm/18/lldb/cpu_subtype_arm64e_replacement.patch new file mode 100644 index 000000000000..20d35c9f3ea9 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/18/lldb/cpu_subtype_arm64e_replacement.patch @@ -0,0 +1,12 @@ +diff --git a/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/source/Host/macosx/objcxx/HostInfoMacOSX.mm +--- a/source/Host/macosx/objcxx/HostInfoMacOSX.mm ++++ b/source/Host/macosx/objcxx/HostInfoMacOSX.mm +@@ -233,7 +233,7 @@ void HostInfoMacOSX::ComputeHostArchitectureSupport(ArchSpec &arch_32, + len = sizeof(is_64_bit_capable); + ::sysctlbyname("hw.cpu64bit_capable", &is_64_bit_capable, &len, NULL, 0); + +- if (cputype == CPU_TYPE_ARM64 && cpusubtype == CPU_SUBTYPE_ARM64E) { ++ if (cputype == CPU_TYPE_ARM64 && cpusubtype == ((cpu_subtype_t) 2)) { // CPU_SUBTYPE_ARM64E is not available in the macOS 10.12 headers + // The arm64e architecture is a preview. Pretend the host architecture + // is arm64. + cpusubtype = CPU_SUBTYPE_ARM64_ALL; diff --git a/nixpkgs/pkgs/development/compilers/llvm/18/lldb/procfs.patch b/nixpkgs/pkgs/development/compilers/llvm/18/lldb/procfs.patch new file mode 100644 index 000000000000..7b200e86505c --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/18/lldb/procfs.patch @@ -0,0 +1,46 @@ +--- a/source/Plugins/Process/Linux/Procfs.h ++++ b/source/Plugins/Process/Linux/Procfs.h +@@ -10,6 +10,13 @@ + // sys/procfs.h on Android/Linux for all supported architectures. + + #include <sys/ptrace.h> ++#include <asm/ptrace.h> ++ ++// on i686 preprocessor symbols with these register names are defined as ++// numeric constants; these symbols clash with identifier names used in ++// `llvm/Support/VirtualFileSystem.h` and `llvm/ADT/SmallVector.h` ++#undef FS ++#undef CS + + #include "lldb/lldb-types.h" + +@@ -17,23 +24,13 @@ + + #include <vector> + +-#ifdef __ANDROID__ +-#if defined(__arm64__) || defined(__aarch64__) +-typedef unsigned long elf_greg_t; +-typedef elf_greg_t +- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))]; +-typedef struct user_fpsimd_state elf_fpregset_t; +-#ifndef NT_FPREGSET +-#define NT_FPREGSET NT_PRFPREG +-#endif // NT_FPREGSET +-#elif defined(__mips__) +-#ifndef NT_FPREGSET +-#define NT_FPREGSET NT_PRFPREG +-#endif // NT_FPREGSET +-#endif +-#else // __ANDROID__ ++#if !defined(__GLIBC__) && defined(__powerpc__) ++#define pt_regs musl_pt_regs ++#include <sys/procfs.h> ++#undef pt_regs ++#else + #include <sys/procfs.h> +-#endif // __ANDROID__ ++#endif + + namespace lldb_private { + namespace process_linux { diff --git a/nixpkgs/pkgs/development/compilers/llvm/18/llvm/default.nix b/nixpkgs/pkgs/development/compilers/llvm/18/llvm/default.nix new file mode 100644 index 000000000000..670171a707f9 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/18/llvm/default.nix @@ -0,0 +1,439 @@ +{ lib, stdenv, llvm_meta +, pkgsBuildBuild +, monorepoSrc +, runCommand +, cmake +, darwin +, ninja +, python3 +, python3Packages +, libffi +, enableGoldPlugin ? true +, libbfd +, libpfm +, libxml2 +, ncurses +, version +, release_version +, zlib +, which +, sysctl +, buildLlvmTools +, debugVersion ? false +, doCheck ? (!stdenv.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) + && (stdenv.hostPlatform == stdenv.buildPlatform) +, enableManpages ? false +, enableSharedLibraries ? !stdenv.hostPlatform.isStatic +, enablePFM ? stdenv.isLinux /* PFM only supports Linux */ + # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 + # broken for the armv7l builder + && !stdenv.hostPlatform.isAarch +, enablePolly ? true +}: + +let + inherit (lib) optional optionals optionalString; + + # Used when creating a version-suffixed symlink of libLLVM.dylib + shortVersion = with lib; + concatStringsSep "." (take 1 (splitString "." release_version)); + + # Ordinarily we would just the `doCheck` and `checkDeps` functionality + # `mkDerivation` gives us to manage our test dependencies (instead of breaking + # out `doCheck` as a package level attribute). + # + # Unfortunately `lit` does not forward `$PYTHONPATH` to children processes, in + # particular the children it uses to do feature detection. + # + # This means that python deps we add to `checkDeps` (which the python + # interpreter is made aware of via `$PYTHONPATH` – populated by the python + # setup hook) are not picked up by `lit` which causes it to skip tests. + # + # Adding `python3.withPackages (ps: [ ... ])` to `checkDeps` also doesn't work + # because this package is shadowed in `$PATH` by the regular `python3` + # package. + # + # So, we "manually" assemble one python derivation for the package to depend + # on, taking into account whether checks are enabled or not: + python = if doCheck then + # Note that we _explicitly_ ask for a python interpreter for our host + # platform here; the splicing that would ordinarily take care of this for + # us does not seem to work once we use `withPackages`. + let + checkDeps = ps: with ps; [ psutil ]; + in pkgsBuildBuild.targetPackages.python3.withPackages checkDeps + else python3; + +in + +stdenv.mkDerivation (rec { + pname = "llvm"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} ('' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + cp -r ${monorepoSrc}/third-party "$out" + '' + lib.optionalString enablePolly '' + chmod u+w "$out/${pname}/tools" + cp -r ${monorepoSrc}/polly "$out/${pname}/tools" + ''); + + sourceRoot = "${src.name}/${pname}"; + + outputs = [ "out" "lib" "dev" "python" ]; + + nativeBuildInputs = [ cmake ninja python ] + ++ optionals enableManpages [ + # Note: we intentionally use `python3Packages` instead of `python3.pkgs`; + # splicing does *not* work with the latter. (TODO: fix) + python3Packages.sphinx + ] ++ optionals (lib.versionOlder version "18" && enableManpages) [ + python3Packages.recommonmark + ] ++ optionals (lib.versionAtLeast version "18" && enableManpages) [ + python3Packages.myst-parser + ]; + + buildInputs = [ libxml2 libffi ] + ++ optional enablePFM libpfm; # exegesis + + propagatedBuildInputs = [ ncurses zlib ]; + + nativeCheckInputs = [ + which + ] ++ lib.optional stdenv.isDarwin sysctl; + + patches = [ + ./gnu-install-dirs.patch + + # Running the tests involves invoking binaries (like `opt`) that depend on + # the LLVM dylibs and reference them by absolute install path (i.e. their + # nix store path). + # + # Because we have not yet run the install phase (we're running these tests + # as part of `checkPhase` instead of `installCheckPhase`) these absolute + # paths do not exist yet; to work around this we point the loader (`ld` on + # unix, `dyld` on macOS) at the `lib` directory which will later become this + # package's `lib` output. + # + # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` + # dir but: + # - this doesn't generalize well to other platforms; `lit` doesn't forward + # `DYLD_LIBRARY_PATH` (macOS): + # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 + # - even if `lit` forwarded this env var, we actually cannot set + # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because + # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for + # "protected processes" (i.e. the python interpreter that runs `lit`): + # https://stackoverflow.com/a/35570229 + # - other LLVM subprojects deal with this issue by having their `lit` + # configuration set these env vars for us; it makes sense to do the same + # for LLVM: + # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 + # + # !!! TODO: look into upstreaming this patch + ./llvm-lit-cfg-add-libs-to-dylib-path.patch + + # `lit` has a mode where it executes run lines as a shell script which is + # constructs; this is problematic for macOS because it means that there's + # another process in between `lit` and the binaries being tested. As noted + # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our + # tests fail with dyld errors. + # + # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when + # present in the test configuration. + # + # It's not clear to me why this isn't an issue for LLVM developers running + # on macOS (nothing about this _seems_ nix specific).. + ./lit-shell-script-runner-set-dyld-library-path.patch + ] ++ lib.optionals enablePolly [ + ./gnu-install-dirs-polly.patch + + # Just like the `llvm-lit-cfg` patch, but for `polly`. + ./polly-lit-cfg-add-libs-to-dylib-path.patch + ]; + + postPatch = optionalString stdenv.isDarwin '' + substituteInPlace cmake/modules/AddLLVM.cmake \ + --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ + --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" + + # As of LLVM 15, marked as XFAIL on arm64 macOS but lit doesn't seem to pick + # this up: https://github.com/llvm/llvm-project/blob/c344d97a125b18f8fed0a64aace73c49a870e079/llvm/test/MC/ELF/cfi-version.ll#L7 + rm test/MC/ELF/cfi-version.ll + + # This test tries to call `sw_vers` by absolute path (`/usr/bin/sw_vers`) + # and thus fails under the sandbox: + substituteInPlace unittests/TargetParser/Host.cpp \ + --replace '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }" + + # This test tries to call the intrinsics `@llvm.roundeven.f32` and + # `@llvm.roundeven.f64` which seem to (incorrectly?) lower to `roundevenf` + # and `roundeven` on macOS. + # + # However these functions are glibc specific so the test fails: + # - https://www.gnu.org/software/gnulib/manual/html_node/roundevenf.html + # - https://www.gnu.org/software/gnulib/manual/html_node/roundeven.html + # + substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \ + --replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ + --replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" + + # fails when run in sandbox + substituteInPlace unittests/Support/VirtualFileSystemTest.cpp \ + --replace "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure" + '' + optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86) '' + # This test fails on darwin x86_64 because `sw_vers` reports a different + # macOS version than what LLVM finds by reading + # `/System/Library/CoreServices/SystemVersion.plist` (which is passed into + # the sandbox on macOS). + # + # The `sw_vers` provided by nixpkgs reports the macOS version associated + # with the `CoreFoundation` framework with which it was built. Because + # nixpkgs pins the SDK for `aarch64-darwin` and `x86_64-darwin` what + # `sw_vers` reports is not guaranteed to match the macOS version of the host + # that's building this derivation. + # + # Astute readers will note that we only _patch_ this test on aarch64-darwin + # (to use the nixpkgs provided `sw_vers`) instead of disabling it outright. + # So why does this test pass on aarch64? + # + # Well, it seems that `sw_vers` on aarch64 actually links against the _host_ + # CoreFoundation framework instead of the nixpkgs provided one. + # + # Not entirely sure what the right fix is here. I'm assuming aarch64 + # `sw_vers` doesn't intentionally link against the host `CoreFoundation` + # (still digging into how this ends up happening, will follow up) but that + # aside I think the more pertinent question is: should we be patching LLVM's + # macOS version detection logic to use `sw_vers` instead of reading host + # paths? This *is* a way in which details about builder machines can creep + # into the artifacts that are produced, affecting reproducibility, but it's + # not clear to me when/where/for what this even gets used in LLVM. + # + # TODO(@rrbutani): fix/follow-up + substituteInPlace unittests/TargetParser/Host.cpp \ + --replace "getMacOSHostVersion" "DISABLED_getMacOSHostVersion" + + # This test fails with a `dysmutil` crash; have not yet dug into what's + # going on here (TODO(@rrbutani)). + rm test/tools/dsymutil/ARM/obfuscated.test + '' + '' + # FileSystem permissions tests fail with various special bits + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "Path.cpp" "" + rm unittests/Support/Path.cpp + substituteInPlace unittests/IR/CMakeLists.txt \ + --replace "PassBuilderCallbacksTest.cpp" "" + rm unittests/IR/PassBuilderCallbacksTest.cpp + rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test + + # Fails in the presence of anti-virus software or other intrusion-detection software that + # modifies the atime when run. See #284056. + rm test/tools/llvm-objcopy/ELF/strip-preserve-atime.test + '' + optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -i ${../../common/llvm/TLI-musl.patch} + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "add_subdirectory(DynamicLibrary)" "" + rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp + # valgrind unhappy with musl or glibc, but fails w/musl only + rm test/CodeGen/AArch64/wineh4.mir + '' + optionalString stdenv.hostPlatform.isAarch32 '' + # skip failing X86 test cases on 32-bit ARM + rm test/DebugInfo/X86/convert-debugloc.ll + rm test/DebugInfo/X86/convert-inlined.ll + rm test/DebugInfo/X86/convert-linked.ll + rm test/tools/dsymutil/X86/op-convert.test + rm test/tools/gold/X86/split-dwarf.ll + rm test/tools/llvm-dwarfdump/X86/prettyprint_types.s + rm test/tools/llvm-dwarfdump/X86/simplified-template-names.s + rm test/CodeGen/RISCV/attributes.ll + rm test/CodeGen/RISCV/xtheadmempair.ll + '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' + # Seems to require certain floating point hardware (NEON?) + rm test/ExecutionEngine/frem.ll + '' + '' + patchShebangs test/BugPoint/compile-custom.ll.py + ''; + + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS="-svj''${NIX_BUILD_CORES} --no-progress-bar" + ) + ''; + + # Defensive check: some paths (that we make symlinks to) depend on the release + # version, for example: + # - https://github.com/llvm/llvm-project/blob/406bde9a15136254f2b10d9ef3a42033b3cb1b16/clang/lib/Headers/CMakeLists.txt#L185 + # + # So we want to sure that the version in the source matches the release + # version we were given. + # + # We do this check here, in the LLVM build, because it happens early. + postConfigure = let + v = lib.versions; + major = v.major release_version; + minor = v.minor release_version; + patch = v.patch release_version; + in '' + # $1: part, $2: expected + check_version() { + part="''${1^^}" + part="$(cat include/llvm/Config/llvm-config.h | grep "#define LLVM_VERSION_''${part} " | cut -d' ' -f3)" + + if [[ "$part" != "$2" ]]; then + echo >&2 \ + "mismatch in the $1 version! we have version ${release_version}" \ + "and expected the $1 version to be '$2'; the source has '$part' instead" + exit 3 + fi + } + + check_version major ${major} + check_version minor ${minor} + check_version patch ${patch} + ''; + + # E.g. mesa.drivers use the build-id as a cache key (see #93946): + LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; + + hardeningDisable = [ "trivialautovarinit" ]; + + cmakeBuildType = if debugVersion then "Debug" else "Release"; + + cmakeFlags = with stdenv; let + # These flags influence llvm-config's BuildVariables.inc in addition to the + # general build. We need to make sure these are also passed via + # CROSS_TOOLCHAIN_FLAGS_NATIVE when cross-compiling or llvm-config-native + # will return different results from the cross llvm-config. + # + # Some flags don't need to be repassed because LLVM already does so (like + # CMAKE_BUILD_TYPE), others are irrelevant to the result. + flagsForLlvmConfig = [ + "-DLLVM_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/cmake/llvm" + "-DLLVM_ENABLE_RTTI=ON" + ] ++ optionals enableSharedLibraries [ + "-DLLVM_LINK_LLVM_DYLIB=ON" + ]; + in flagsForLlvmConfig ++ [ + "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc + "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" + "-DLLVM_ENABLE_FFI=ON" + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_ENABLE_DUMP=ON" + ] ++ optionals stdenv.hostPlatform.isStatic [ + # Disables building of shared libs, -fPIC is still injected by cc-wrapper + "-DLLVM_ENABLE_PIC=OFF" + "-DLLVM_BUILD_STATIC=ON" + "-DLLVM_LINK_LLVM_DYLIB=off" + # libxml2 needs to be disabled because the LLVM build system ignores its .la + # file and doesn't link zlib as well. + # https://github.com/ClangBuiltLinux/tc-build/issues/150#issuecomment-845418812 + "-DLLVM_ENABLE_LIBXML2=OFF" + ] ++ optionals enableManpages [ + "-DLLVM_BUILD_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ optionals enableGoldPlugin [ + "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" + ] ++ optionals isDarwin [ + "-DLLVM_ENABLE_LIBCXX=ON" + "-DCAN_TARGET_i386=false" + ] ++ optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ + "-DCMAKE_CROSSCOMPILING=True" + "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ( + let + nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; + nativeBintools = nativeCC.bintools.bintools; + nativeToolchainFlags = [ + "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" + "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" + "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" + "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" + "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" + ]; + # We need to repass the custom GNUInstallDirs values, otherwise CMake + # will choose them for us, leading to wrong results in llvm-config-native + nativeInstallFlags = [ + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" + "-DCMAKE_INSTALL_BINDIR=${placeholder "out"}/bin" + "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include" + "-DCMAKE_INSTALL_LIBDIR=${placeholder "lib"}/lib" + "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "lib"}/libexec" + ]; + in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=" + + lib.concatStringsSep ";" (lib.concatLists [ + flagsForLlvmConfig + nativeToolchainFlags + nativeInstallFlags + ]) + ) + ]; + + postInstall = '' + mkdir -p $python/share + mv $out/share/opt-viewer $python/share/opt-viewer + moveToOutput "bin/llvm-config*" "$dev" + substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ + --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" + substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ + --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "'"$lib"'")' + '' + + optionalString (stdenv.isDarwin && enableSharedLibraries) '' + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib + '' + + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native + ''; + + inherit doCheck; + + checkTarget = "check-all"; + + # For the update script: + passthru.monorepoSrc = monorepoSrc; + + requiredSystemFeatures = [ "big-parallel" ]; + meta = llvm_meta // { + homepage = "https://llvm.org/"; + description = "A collection of modular and reusable compiler and toolchain technologies"; + longDescription = '' + The LLVM Project is a collection of modular and reusable compiler and + toolchain technologies. Despite its name, LLVM has little to do with + traditional virtual machines. The name "LLVM" itself is not an acronym; it + is the full name of the project. + LLVM began as a research project at the University of Illinois, with the + goal of providing a modern, SSA-based compilation strategy capable of + supporting both static and dynamic compilation of arbitrary programming + languages. Since then, LLVM has grown to be an umbrella project consisting + of a number of subprojects, many of which are being used in production by + a wide variety of commercial and open source projects as well as being + widely used in academic research. Code in the LLVM project is licensed + under the "Apache 2.0 License with LLVM exceptions". + ''; + }; +} // lib.optionalAttrs enableManpages { + pname = "llvm-manpages"; + + propagatedBuildInputs = []; + + ninjaFlags = [ "docs-llvm-man" ]; + installTargets = [ "install-docs-llvm-man" ]; + + postPatch = null; + postInstall = null; + + outputs = [ "out" ]; + + doCheck = false; + + meta = llvm_meta // { + description = "man pages for LLVM ${version}"; + }; +}) diff --git a/nixpkgs/pkgs/development/compilers/llvm/18/llvm/gnu-install-dirs-polly.patch b/nixpkgs/pkgs/development/compilers/llvm/18/llvm/gnu-install-dirs-polly.patch new file mode 100644 index 000000000000..6a359bdbefde --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/18/llvm/gnu-install-dirs-polly.patch @@ -0,0 +1,13 @@ +--- a/tools/polly/cmake/polly_macros.cmake 2024-03-15 17:36:20.550893344 -0700 ++++ b/tools/polly/cmake/polly_macros.cmake 2024-03-15 17:37:06.277332960 -0700 +@@ -45,8 +45,8 @@ + install(TARGETS ${name} + COMPONENT ${name} + EXPORT LLVMExports +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + add_llvm_install_targets(install-${name} + COMPONENT ${name}) + endif() diff --git a/nixpkgs/pkgs/development/compilers/llvm/18/llvm/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/18/llvm/gnu-install-dirs.patch new file mode 100644 index 000000000000..8b89839490ba --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/18/llvm/gnu-install-dirs.patch @@ -0,0 +1,137 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 471817d68286..c51463304159 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1010,7 +1010,7 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "") + add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src + ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime) + install(TARGETS tf_xla_runtime EXPORT LLVMExports +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime) ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime) + set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS tf_xla_runtime) + # Once we add more modules, we should handle this more automatically. + if (DEFINED LLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL) +diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake +index 230620c37027..dd16cab1835e 100644 +--- a/cmake/modules/AddLLVM.cmake ++++ b/cmake/modules/AddLLVM.cmake +@@ -876,8 +876,8 @@ macro(add_llvm_library name) + get_target_export_arg(${name} LLVM export_to_llvmexports ${umbrella}) + install(TARGETS ${name} + ${export_to_llvmexports} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name} ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name} + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name}) + + if (NOT LLVM_ENABLE_IDE) +@@ -2069,7 +2069,7 @@ function(llvm_install_library_symlink name dest type) + set(LLVM_LINK_OR_COPY copy) + endif() + +- set(output_dir lib${LLVM_LIBDIR_SUFFIX}) ++ set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 AND "${type}" STREQUAL "SHARED") + set(output_dir "${CMAKE_INSTALL_BINDIR}") + endif() +@@ -2344,16 +2344,37 @@ function(llvm_setup_rpath name) + + if (APPLE) + set(_install_name_dir INSTALL_NAME_DIR "@rpath") +- set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath ${extra_libdir}) + elseif(${CMAKE_SYSTEM_NAME} MATCHES "AIX" AND BUILD_SHARED_LIBS) + # $ORIGIN is not interpreted at link time by aix ld. + # Since BUILD_SHARED_LIBS is only recommended for use by developers, + # hardcode the rpath to build/install lib dir first in this mode. + # FIXME: update this when there is better solution. +- set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + elseif(UNIX) +- set(_build_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) +- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}") ++ # Note that we add `extra_libdir` (aka `LLVM_LIBRARY_DIR` in our case) back ++ # to `_install_rpath` here. ++ # ++ # In nixpkgs we do not build and install LLVM alongside rdeps of LLVM (i.e. ++ # clang); instead LLVM is its own package and thus lands at its own nix ++ # store path. This makes it so that the default relative rpath (`../lib/`) ++ # does not point at the LLVM shared objects. ++ # ++ # More discussion here: ++ # - https://github.com/NixOS/nixpkgs/pull/235624#discussion_r1220150329 ++ # - https://reviews.llvm.org/D146918 (16.0.5+) ++ # ++ # Note that we leave `extra_libdir` in `_build_rpath`: without FHS there is ++ # no potential that this will result in us pulling in the "wrong" LLVM. ++ # Adding this to the build rpath means we aren't forced to use ++ # `installCheckPhase` instead of `checkPhase` (i.e. binaries in the build ++ # dir, pre-install, will have the right rpath for LLVM). ++ # ++ # As noted in the differential above, an alternative solution is to have ++ # all rdeps of nixpkgs' LLVM (that use the AddLLVM.cmake machinery) set ++ # `CMAKE_INSTALL_RPATH`. ++ set(_build_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath ${extra_libdir}) + if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") + set_property(TARGET ${name} APPEND_STRING PROPERTY + LINK_FLAGS " -Wl,-z,origin ") +diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake +index 891c9e6d618c..8d963f3b0069 100644 +--- a/cmake/modules/AddOCaml.cmake ++++ b/cmake/modules/AddOCaml.cmake +@@ -147,9 +147,9 @@ function(add_ocaml_library name) + endforeach() + + if( APPLE ) +- set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath ${LLVM_LIBRARY_DIR}) + elseif( UNIX ) +- set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath ${LLVM_LIBRARY_DIR}) + endif() + list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") + +diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt +index d99af79aa38e..21e794224b99 100644 +--- a/cmake/modules/CMakeLists.txt ++++ b/cmake/modules/CMakeLists.txt +@@ -127,7 +127,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS + ) + list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS) + +-extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "lib\${LLVM_LIBDIR_SUFFIX}") ++extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") + set(LLVM_CONFIG_LIBRARY_DIRS + "${LLVM_CONFIG_LIBRARY_DIR}" + # FIXME: Should there be other entries here? +diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in +index 370005cd8d7d..7e790bc52111 100644 +--- a/tools/llvm-config/BuildVariables.inc.in ++++ b/tools/llvm-config/BuildVariables.inc.in +@@ -23,6 +23,7 @@ + #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" + #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" + #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" ++#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" + #define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" + #define LLVM_INSTALL_PACKAGE_DIR "@LLVM_INSTALL_PACKAGE_DIR@" + #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index e86eb2b44b10..f63e207e792e 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -366,7 +366,11 @@ int main(int argc, char **argv) { + sys::fs::make_absolute(ActivePrefix, Path); + ActiveBinDir = std::string(Path.str()); + } +- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; ++ { ++ SmallString<256> Path(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX); ++ sys::fs::make_absolute(ActivePrefix, Path); ++ ActiveLibDir = std::string(Path.str()); ++ } + { + SmallString<256> Path(LLVM_INSTALL_PACKAGE_DIR); + sys::fs::make_absolute(ActivePrefix, Path); diff --git a/nixpkgs/pkgs/development/compilers/llvm/18/llvm/lit-shell-script-runner-set-dyld-library-path.patch b/nixpkgs/pkgs/development/compilers/llvm/18/llvm/lit-shell-script-runner-set-dyld-library-path.patch new file mode 100644 index 000000000000..e4f049f4b177 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/18/llvm/lit-shell-script-runner-set-dyld-library-path.patch @@ -0,0 +1,12 @@ +--- a/utils/lit/lit/TestRunner.py 2024-03-15 17:27:53.170780798 -0700 ++++ b/utils/lit/lit/TestRunner.py 2024-03-15 17:28:43.277447791 -0700 +@@ -1183,6 +1183,9 @@ + f.write("@echo on\n") + f.write("\n@if %ERRORLEVEL% NEQ 0 EXIT\n".join(commands)) + else: ++ if "DYLD_LIBRARY_PATH" in test.config.environment: ++ f.write(f'export DYLD_LIBRARY_PATH="{test.config.environment["DYLD_LIBRARY_PATH"]}"\n') ++ + for i, ln in enumerate(commands): + match = re.fullmatch(kPdbgRegex, ln) + if match: diff --git a/nixpkgs/pkgs/development/compilers/llvm/18/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch b/nixpkgs/pkgs/development/compilers/llvm/18/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch new file mode 100644 index 000000000000..d4ccb2ae9822 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/18/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch @@ -0,0 +1,80 @@ +diff --git a/test/Unit/lit.cfg.py b/test/Unit/lit.cfg.py +index 81e8dc04acea..479ff95681e2 100644 +--- a/test/Unit/lit.cfg.py ++++ b/test/Unit/lit.cfg.py +@@ -3,6 +3,7 @@ + # Configuration file for the 'lit' test runner. + + import os ++import platform + import subprocess + + import lit.formats +@@ -55,3 +56,26 @@ if sys.platform in ["win32", "cygwin"] and os.path.isdir(config.shlibdir): + # Win32 may use %SYSTEMDRIVE% during file system shell operations, so propogate. + if sys.platform == "win32" and "SYSTEMDRIVE" in os.environ: + config.environment["SYSTEMDRIVE"] = os.environ["SYSTEMDRIVE"] ++ ++# Add the LLVM dynamic libs to the platform-specific loader search path env var: ++# ++# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify.. ++def find_shlibpath_var(): ++ if platform.system() in ["Linux", "FreeBSD", "NetBSD", "OpenBSD", "SunOS"]: ++ yield "LD_LIBRARY_PATH" ++ elif platform.system() == "Darwin": ++ yield "DYLD_LIBRARY_PATH" ++ elif platform.system() == "Windows": ++ yield "PATH" ++ elif platform.system() == "AIX": ++ yield "LIBPATH" ++ ++for shlibpath_var in find_shlibpath_var(): ++ shlibpath = os.path.pathsep.join( ++ (config.shlibdir, ++ config.environment.get(shlibpath_var, ''))) ++ config.environment[shlibpath_var] = shlibpath ++ break ++else: ++ lit_config.warning("unable to inject shared library path on '{}'" ++ .format(platform.system())) +diff --git a/test/lit.cfg.py b/test/lit.cfg.py +index 75a38b4c5dad..856fc75c9d74 100644 +--- a/test/lit.cfg.py ++++ b/test/lit.cfg.py +@@ -42,6 +42,26 @@ llvm_config.with_environment("PATH", config.llvm_tools_dir, append_path=True) + llvm_config.with_system_environment( + ["HOME", "INCLUDE", "LIB", "TMP", "TEMP"]) + ++# Add the LLVM dynamic libs to the platform-specific loader search path env var: ++# ++# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify.. ++def find_shlibpath_var(): ++ if platform.system() in ["Linux", "FreeBSD", "NetBSD", "OpenBSD", "SunOS"]: ++ yield "LD_LIBRARY_PATH" ++ elif platform.system() == "Darwin": ++ yield "DYLD_LIBRARY_PATH" ++ elif platform.system() == "Windows": ++ yield "PATH" ++ elif platform.system() == "AIX": ++ yield "LIBPATH" ++ ++for shlibpath_var in find_shlibpath_var(): ++ shlibpath = config.llvm_shlib_dir ++ llvm_config.with_environment(shlibpath_var, shlibpath, append_path = True) ++ break ++else: ++ lit_config.warning("unable to inject shared library path on '{}'" ++ .format(platform.system())) + + # Set up OCAMLPATH to include newly built OCaml libraries. + top_ocaml_lib = os.path.join(config.llvm_lib_dir, "ocaml") +@@ -318,7 +338,7 @@ def have_cxx_shared_library(): + + try: + readobj_cmd = subprocess.Popen( +- [readobj_exe, "--needed-libs", readobj_exe], stdout=subprocess.PIPE ++ [readobj_exe, "--needed-libs", readobj_exe], stdout=subprocess.PIPE, env=config.environment + ) + except OSError: + print("could not exec llvm-readobj") + diff --git a/nixpkgs/pkgs/development/compilers/llvm/18/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch b/nixpkgs/pkgs/development/compilers/llvm/18/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch new file mode 100644 index 000000000000..1354ad267314 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/18/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch @@ -0,0 +1,24 @@ +diff --git a/tools/polly/test/lit.cfg b/tools/polly/test/lit.cfg +index 41e3a589c61e..09f3b17498b0 100644 +--- a/tools/polly/test/lit.cfg ++++ b/tools/polly/test/lit.cfg +@@ -36,9 +36,17 @@ base_paths = [config.llvm_tools_dir, config.environment['PATH']] + path = os.path.pathsep.join(base_paths + config.extra_paths) + config.environment['PATH'] = path + ++# (Copied from polly/test/Unit/lit.cfg) ++if platform.system() == 'Darwin': ++ shlibpath_var = 'DYLD_LIBRARY_PATH' ++elif platform.system() == 'Windows': ++ shlibpath_var = 'PATH' ++else: ++ shlibpath_var = 'LD_LIBRARY_PATH' ++ + path = os.path.pathsep.join((config.llvm_libs_dir, +- config.environment.get('LD_LIBRARY_PATH',''))) +-config.environment['LD_LIBRARY_PATH'] = path ++ config.environment.get(shlibpath_var,''))) ++config.environment[shlibpath_var] = path + + llvm_config.use_default_substitutions() + diff --git a/nixpkgs/pkgs/development/compilers/llvm/18/openmp/default.nix b/nixpkgs/pkgs/development/compilers/llvm/18/openmp/default.nix new file mode 100644 index 000000000000..e1c3c2379af2 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/18/openmp/default.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, llvm_meta +, monorepoSrc +, runCommand +, cmake +, ninja +, llvm +, targetLlvm +, lit +, clang-unwrapped +, perl +, pkg-config +, xcbuild +, version +}: + +stdenv.mkDerivation rec { + pname = "openmp"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; + + patches = [ + ./fix-find-tool.patch + ./run-lit-directly.patch + ]; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake ninja perl pkg-config lit ]; + buildInputs = [ + (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) + ]; + + nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin xcbuild.xcrun; + + # Unsup:Pass:XFail:Fail + # 26:267:16:8 + doCheck = false; + checkTarget = "check-openmp"; + + preCheck = '' + patchShebangs ../tools/archer/tests/deflake.bash + ''; + + cmakeFlags = [ + "-DCLANG_TOOL=${clang-unwrapped}/bin/clang" + "-DOPT_TOOL=${llvm}/bin/opt" + "-DLINK_TOOL=${llvm}/bin/llvm-link" + ]; + + meta = llvm_meta // { + homepage = "https://openmp.llvm.org/"; + description = "Support for the OpenMP language"; + longDescription = '' + The OpenMP subproject of LLVM contains the components required to build an + executable OpenMP program that are outside the compiler itself. + Contains the code for the runtime library against which code compiled by + "clang -fopenmp" must be linked before it can run and the library that + supports offload to target devices. + ''; + # "All of the code is dual licensed under the MIT license and the UIUC + # License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/llvm/18/openmp/fix-find-tool.patch b/nixpkgs/pkgs/development/compilers/llvm/18/openmp/fix-find-tool.patch new file mode 100644 index 000000000000..b7f51196f7ba --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/18/openmp/fix-find-tool.patch @@ -0,0 +1,17 @@ +diff --git a/libomptarget/DeviceRTL/CMakeLists.txt b/libomptarget/DeviceRTL/CMakeLists.txt +index 630947abec7e..9f032dc7bd3f 100644 +--- a/libomptarget/DeviceRTL/CMakeLists.txt ++++ b/libomptarget/DeviceRTL/CMakeLists.txt +@@ -27,10 +27,10 @@ endif() + if (LLVM_DIR) + # Builds that use pre-installed LLVM have LLVM_DIR set. + # A standalone or LLVM_ENABLE_RUNTIMES=openmp build takes this route +- find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR}) + find_program(PACKAGER_TOOL clang-offload-packager PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) + find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) +- find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR}) + if ((NOT CLANG_TOOL) OR (NOT LINK_TOOL) OR (NOT OPT_TOOL) OR (NOT PACKAGER_TOOL)) + libomptarget_say("Not building DeviceRTL. Missing clang: ${CLANG_TOOL}, llvm-link: ${LINK_TOOL}, opt: ${OPT_TOOL}, or clang-offload-packager: ${PACKAGER_TOOL}") + return() diff --git a/nixpkgs/pkgs/development/compilers/llvm/18/openmp/run-lit-directly.patch b/nixpkgs/pkgs/development/compilers/llvm/18/openmp/run-lit-directly.patch new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/llvm/18/openmp/run-lit-directly.patch diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/clang/default.nix index 01b33c540ca2..1e777c6132e4 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/clang/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/clang/default.nix @@ -70,9 +70,6 @@ let postInstall = '' ln -sv $out/bin/clang $out/bin/cpp - mkdir -p $lib/lib/clang - mv $lib/lib/${lib.versions.major version} $lib/lib/clang/${lib.versions.major version} - # Move libclang to 'lib' output moveToOutput "lib/libclang.*" "$lib" moveToOutput "lib/libclang-cpp.*" "$lib" diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch index cc8737f35343..9517df973ad0 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch +++ b/nixpkgs/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch @@ -1,30 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f7936d72e088..a362fa49b534 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -31,7 +31,21 @@ if(CLANG_BUILT_STANDALONE) - find_package(LLVM REQUIRED HINTS "${LLVM_CMAKE_DIR}") - list(APPEND CMAKE_MODULE_PATH "${LLVM_DIR}") - -- # Turn into CACHE PATHs for overwritting -+ # We can't check LLVM_CONFIG here, because find_package(LLVM ...) also sets -+ # LLVM_CONFIG. -+ if (NOT LLVM_CONFIG_FOUND) -+ # Pull values from LLVMConfig.cmake. We can drop this once the llvm-config -+ # path is removed. -+ set(INCLUDE_DIRS ${LLVM_INCLUDE_DIRS}) -+ set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}") -+ # N.B. this is just a default value, the CACHE PATHs below can be overriden. -+ set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm") -+ set(TOOLS_BINARY_DIR "${LLVM_TOOLS_BINARY_DIR}") -+ set(LIBRARY_DIR "${LLVM_LIBRARY_DIR}") -+ else() -+ set(INCLUDE_DIRS "${LLVM_BINARY_DIR}/include" "${MAIN_INCLUDE_DIR}") -+ endif() -+ - set(LLVM_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed") - set(LLVM_BINARY_DIR "${LLVM_BINARY_DIR}" CACHE PATH "Path to LLVM build tree") - set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree") diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake index 75b0080f6715..c895b884cd27 100644 --- a/cmake/modules/AddClang.cmake @@ -48,7 +21,7 @@ index f2b0c5cddcbb..52f37fc368ce 100644 add_header_target("utility-resource-headers" ${utility_files}) get_clang_resource_dir(header_install_dir SUBDIR include) -+set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${CLANG_VERSION_MAJOR}/include) ++set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION_MAJOR}/include) ############################################################# # Install rules for the catch-all clang-resource-headers target diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix index 51f4e95ef2b5..f51316beb570 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix @@ -87,12 +87,9 @@ stdenv.mkDerivation { patches = [ ./X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config - ./gnu-install-dirs.patch # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the # extra `/`. ./normalize-var.patch - # Prevent a compilation error on darwin - ./darwin-targetconditionals.patch # See: https://github.com/NixOS/nixpkgs/pull/186575 ../../common/compiler-rt/darwin-plistbuddy-workaround.patch # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 @@ -111,6 +108,8 @@ stdenv.mkDerivation { substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' '' + lib.optionalString (useLLVM && !haveLibc) '' + substituteInPlace lib/builtins/aarch64/sme-libc-routines.c \ + --replace "<stdlib.h>" "<stddef.h>" substituteInPlace lib/builtins/int_util.c \ --replace "#include <stdlib.h>" "" substituteInPlace lib/builtins/clear_cache.c \ diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/gnu-install-dirs.patch deleted file mode 100644 index f3b1f63a7d71..000000000000 --- a/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/gnu-install-dirs.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake -index 8a6219568b3f..30ee68a47ccf 100644 ---- a/cmake/base-config-ix.cmake -+++ b/cmake/base-config-ix.cmake -@@ -100,13 +100,13 @@ endif() - if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) - set(COMPILER_RT_OUTPUT_LIBRARY_DIR - ${COMPILER_RT_OUTPUT_DIR}/lib) -- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" lib) -+ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}") - set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH - "Path where built compiler-rt libraries should be installed.") - else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) - set(COMPILER_RT_OUTPUT_LIBRARY_DIR - ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) -- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "lib/${COMPILER_RT_OS_DIR}") -+ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}/${COMPILER_RT_OS_DIR}") - set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH - "Path where built compiler-rt libraries should be installed.") - endif() diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/default.nix index 6ebb2ea9fcc2..80cff85372d0 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/default.nix @@ -17,15 +17,20 @@ else pkgs.bintools , darwin # LLVM release information; specify one of these but not both: -, gitRelease ? null +, gitRelease ? { + version = "19.0.0-git"; + rev = "65058a8d732c3c41664a4dad1a1ae2a504d5c98e"; + rev-version = "19.0.0-unstable-2024-03-16"; + sha256 = "sha256-xV33kx/8OZ2KLtaz25RmudDrlIX7nScauTykf87jyTE="; +} # i.e.: # { # version = /* i.e. "15.0.0" */; # rev = /* commit SHA */; - # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; + # rev-version = /* human readable version; i.e. "15.0.0-unstable-2022-07-26" */; # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; # } -, officialRelease ? { version = "18.1.0-rc4"; sha256 = "sha256-fVpwewbjoPMPslIEZ+WAtaQ+YKc0XWGl8EbP/TbQb8o="; } +, officialRelease ? null # i.e.: # { # version = /* i.e. "15.0.0" */; diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/default.nix index 4e3404dbe194..d6c304c0b476 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, llvm_meta -, monorepoSrc, runCommand, fetchpatch +, monorepoSrc, runCommand , cmake, lndir, ninja, python3, fixDarwinDylibNames, version , cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else null , libcxxrt, libunwind @@ -19,11 +19,11 @@ let # Note: useLLVM is likely false for Darwin but true under pkgsLLVM useLLVM = stdenv.hostPlatform.useLLVM or false; - cxxabiCMakeFlags = lib.optionals (useLLVM && !stdenv.hostPlatform.isWasm) [ - "-DLIBCXXABI_USE_COMPILER_RT=ON" - "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - ] ++ lib.optionals (lib.versionAtLeast version "18" && !(useLLVM && !stdenv.hostPlatform.isWasm)) [ + cxxabiCMakeFlags = [ "-DLIBCXXABI_USE_LLVM_UNWINDER=OFF" + ] ++ lib.optionals (useLLVM && !stdenv.hostPlatform.isWasm) [ + "-DLIBCXXABI_ADDITIONAL_LIBRARIES=unwind" + "-DLIBCXXABI_USE_COMPILER_RT=ON" ] ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXXABI_ENABLE_THREADS=OFF" "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" @@ -87,18 +87,6 @@ stdenv.mkDerivation rec { patches = lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ # https://github.com/llvm/llvm-project/issues/64226 ./0001-darwin-10.12-mbstate_t-fix.patch - ] ++ lib.optionals (cxxabi == null && lib.versionAtLeast version "18") [ - # Allow building libcxxabi alone when using LLVM unwinder - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/77610dd10454e87bb387040d2b51100a17ac5755.patch"; - revert = true; - hash = "sha256-jFbC3vBY3nKfjknJ7UzaPyoy0iSYdD3+jUmOFeOaVcA="; - }) - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/48e5b5ea92674ded69b998cf35724d9012c0f57d.patch"; - revert = true; - hash = "sha256-WN63L4T3GxVozPZb6kx21AgNe4rwwSUOeeryIGsvQYY="; - }) ]; postPatch = '' diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/libunwind/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/libunwind/default.nix index a3c8e2594f5a..e67823ffb85c 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/libunwind/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/libunwind/default.nix @@ -27,15 +27,6 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/runtimes"; - prePatch = '' - cd ../${pname} - chmod -R u+w . - ''; - - postPatch = '' - cd ../runtimes - ''; - postInstall = lib.optionalString (enableShared && !stdenv.hostPlatform.isDarwin) '' # libcxxabi wants to link to libunwind_shared.so (?). ln -s $out/lib/libunwind.so $out/lib/libunwind_shared.so diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/lld/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/lld/default.nix index cc18aee76a44..24ff0933dd1d 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/lld/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/lld/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/${pname}"; + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ libllvm libxml2 ]; + patches = [ ./gnu-install-dirs.patch ]; - nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ libllvm libxml2 ]; - cmakeFlags = [ "-DLLD_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/cmake/lld" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/lld/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/git/lld/gnu-install-dirs.patch index 86e76f4a16d8..6c73a240ab6d 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/lld/gnu-install-dirs.patch +++ b/nixpkgs/pkgs/development/compilers/llvm/git/lld/gnu-install-dirs.patch @@ -1,34 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3d6225646fe6..9b5d0b15af13 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -33,10 +33,22 @@ if(LLD_BUILT_STANDALONE) - find_package(LLVM REQUIRED HINTS "${LLVM_CMAKE_DIR}") - list(APPEND CMAKE_MODULE_PATH "${LLVM_DIR}") - -- # Turn into CACHE PATHs for overwriting -- set(LLVM_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed") -- set(LLVM_BINARY_DIR "${LLVM_BINARY_DIR}" CACHE PATH "Path to LLVM build tree") -- set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree") -+ # We can't check LLVM_CONFIG here, because find_package(LLVM ...) also sets -+ # LLVM_CONFIG. -+ if (NOT LLVM_CONFIG_FOUND) -+ # Pull values from LLVMConfig.cmake. We can drop this once the llvm-config -+ # path is removed. -+ set(INCLUDE_DIRS ${LLVM_INCLUDE_DIRS}) -+ set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}") -+ # N.B. this is just a default value, the CACHE PATHs below can be overridden. -+ set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm") -+ else() -+ set(INCLUDE_DIRS "${LLVM_BINARY_DIR}/include" "${MAIN_INCLUDE_DIR}") -+ endif() -+ -+ set(LLVM_INCLUDE_DIRS ${INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed") -+ set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree") -+ set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree") - - find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR} - NO_DEFAULT_PATH) diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake index d3924f7243d4..42a7cd62281c 100644 --- a/cmake/modules/AddLLD.cmake diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix index b8715228ab1c..670171a707f9 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -179,6 +179,10 @@ stdenv.mkDerivation (rec { substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \ --replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ --replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" + + # fails when run in sandbox + substituteInPlace unittests/Support/VirtualFileSystemTest.cpp \ + --replace "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure" '' + optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86) '' # This test fails on darwin x86_64 because `sw_vers` reports a different # macOS version than what LLVM finds by reading @@ -382,7 +386,6 @@ stdenv.mkDerivation (rec { --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "'"$lib"'")' '' + optionalString (stdenv.isDarwin && enableSharedLibraries) '' - ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs-polly.patch b/nixpkgs/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs-polly.patch index 442ebddad3f6..6a359bdbefde 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs-polly.patch +++ b/nixpkgs/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs-polly.patch @@ -1,12 +1,6 @@ -This is the one remaining Polly install dirs related change that hasn't made it -into upstream yet; previously this patch file also included: -https://reviews.llvm.org/D117541 - -diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake -index 518a09b45a42..bd9d6f5542ad 100644 ---- a/tools/polly/cmake/polly_macros.cmake -+++ b/tools/polly/cmake/polly_macros.cmake -@@ -45,8 +45,8 @@ macro(add_polly_library name) +--- a/tools/polly/cmake/polly_macros.cmake 2024-03-15 17:36:20.550893344 -0700 ++++ b/tools/polly/cmake/polly_macros.cmake 2024-03-15 17:37:06.277332960 -0700 +@@ -45,8 +45,8 @@ install(TARGETS ${name} COMPONENT ${name} EXPORT LLVMExports diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch index e2122ebf603d..8b89839490ba 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch +++ b/nixpkgs/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch @@ -40,7 +40,7 @@ index 230620c37027..dd16cab1835e 100644 if (APPLE) set(_install_name_dir INSTALL_NAME_DIR "@rpath") - set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) -+ set(_install_rpath "@loader_path/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath ${extra_libdir}) elseif(${CMAKE_SYSTEM_NAME} MATCHES "AIX" AND BUILD_SHARED_LIBS) # $ORIGIN is not interpreted at link time by aix ld. # Since BUILD_SHARED_LIBS is only recommended for use by developers, @@ -72,8 +72,8 @@ index 230620c37027..dd16cab1835e 100644 + # As noted in the differential above, an alternative solution is to have + # all rdeps of nixpkgs' LLVM (that use the AddLLVM.cmake machinery) set + # `CMAKE_INSTALL_RPATH`. -+ set(_build_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) -+ set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_build_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath ${extra_libdir}) if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") set_property(TARGET ${name} APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-z,origin ") @@ -86,10 +86,10 @@ index 891c9e6d618c..8d963f3b0069 100644 if( APPLE ) - set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}") -+ set(ocaml_rpath "@executable_path/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath ${LLVM_LIBRARY_DIR}) elseif( UNIX ) - set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}") -+ set(ocaml_rpath "\\$ORIGIN/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath ${LLVM_LIBRARY_DIR}) endif() list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/llvm/lit-shell-script-runner-set-dyld-library-path.patch b/nixpkgs/pkgs/development/compilers/llvm/git/llvm/lit-shell-script-runner-set-dyld-library-path.patch index 82b7b21c55fb..e4f049f4b177 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/llvm/lit-shell-script-runner-set-dyld-library-path.patch +++ b/nixpkgs/pkgs/development/compilers/llvm/git/llvm/lit-shell-script-runner-set-dyld-library-path.patch @@ -1,17 +1,12 @@ -diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py -index 0242e0b75af3..d732011306f7 100644 ---- a/utils/lit/lit/TestRunner.py -+++ b/utils/lit/lit/TestRunner.py -@@ -1029,6 +1029,12 @@ def executeScript(test, litConfig, tmpBase, commands, cwd): - f.write('@echo off\n') - f.write('\n@if %ERRORLEVEL% NEQ 0 EXIT\n'.join(commands)) +--- a/utils/lit/lit/TestRunner.py 2024-03-15 17:27:53.170780798 -0700 ++++ b/utils/lit/lit/TestRunner.py 2024-03-15 17:28:43.277447791 -0700 +@@ -1183,6 +1183,9 @@ + f.write("@echo on\n") + f.write("\n@if %ERRORLEVEL% NEQ 0 EXIT\n".join(commands)) else: -+ # This env var is *purged* when invoking subprocesses so we have to -+ # manually set it from within the bash script in order for the commands -+ # in run lines to see this var: + if "DYLD_LIBRARY_PATH" in test.config.environment: + f.write(f'export DYLD_LIBRARY_PATH="{test.config.environment["DYLD_LIBRARY_PATH"]}"\n') + for i, ln in enumerate(commands): - match = re.match(kPdbgRegex, ln) + match = re.fullmatch(kPdbgRegex, ln) if match: diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/openmp/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/openmp/default.nix index d51335436ad2..e1c3c2379af2 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/openmp/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/openmp/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { patches = [ ./fix-find-tool.patch - ./gnu-install-dirs.patch ./run-lit-directly.patch ]; diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/openmp/gnu-install-dirs.patch b/nixpkgs/pkgs/development/compilers/llvm/git/openmp/gnu-install-dirs.patch deleted file mode 100644 index 0d0d4130c761..000000000000 --- a/nixpkgs/pkgs/development/compilers/llvm/git/openmp/gnu-install-dirs.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b6ddbe90516d..311ab1d50e7f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -29,7 +29,7 @@ if (OPENMP_STANDALONE_BUILD) - set(OPENMP_LIBDIR_SUFFIX "" CACHE STRING - "Suffix of lib installation directory, e.g. 64 => lib64") - # Do not use OPENMP_LIBDIR_SUFFIX directly, use OPENMP_INSTALL_LIBDIR. -- set(OPENMP_INSTALL_LIBDIR "lib${OPENMP_LIBDIR_SUFFIX}" CACHE STRING -+ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}" CACHE STRING - "Path where built OpenMP libraries should be installed.") - - # Group test settings. -@@ -47,7 +47,7 @@ if (OPENMP_STANDALONE_BUILD) - else() - set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR}) - # If building in tree, we honor the same install suffix LLVM uses. -- set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}" CACHE STRING -+ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" CACHE STRING - "Path where built OpenMP libraries should be installed.") - - if (NOT MSVC) diff --git a/nixpkgs/pkgs/development/compilers/llvm/update-git.py b/nixpkgs/pkgs/development/compilers/llvm/update-git.py index b5e900df502b..9be43e8e1afb 100755 --- a/nixpkgs/pkgs/development/compilers/llvm/update-git.py +++ b/nixpkgs/pkgs/development/compilers/llvm/update-git.py @@ -43,7 +43,7 @@ def get_current_revision(): """Get the current revision of llvmPackages_git.""" with open(DEFAULT_NIX) as f: for line in f: - rev = re.search(r'^ rev = "(.*)";', line) + rev = re.search(r'^ rev = "(.*)";', line) if rev: return rev.group(1) sys.exit(1) @@ -75,11 +75,11 @@ hash = nix_prefetch_url(f'https://github.com/llvm/llvm-project/archive/{commit[" print('Updating default.nix...') with fileinput.FileInput(DEFAULT_NIX, inplace=True) as f: for line in f: - if match := re.search(r'^ rev-version = "unstable-(.+)";', line): + if match := re.search(r'^ rev-version = "unstable-(.+)";', line): old_date = match.group(1) - result = re.sub(r'^ release_version = ".+";', f' release_version = "{release_version}";', line) - result = re.sub(r'^ rev = ".*";', f' rev = "{commit["sha"]}";', result) - result = re.sub(r'^ rev-version = ".+";', f' rev-version = "{version}";', result) + result = re.sub(r'^ version = ".+";', f' version = "{release_version}";', line) + result = re.sub(r'^ rev = ".*";', f' rev = "{commit["sha"]}";', result) + result = re.sub(r'^ rev-version = ".+";', f' rev-version = "{version}";', result) result = re.sub(r'^ sha256 = ".+";', f' sha256 = "{hash}";', result) print(result, end='') # Commit the result: diff --git a/nixpkgs/pkgs/development/compilers/ocaml/5.2.nix b/nixpkgs/pkgs/development/compilers/ocaml/5.2.nix new file mode 100644 index 000000000000..26d77f63044d --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/ocaml/5.2.nix @@ -0,0 +1,9 @@ +import ./generic.nix { + major_version = "5"; + minor_version = "2"; + patch_version = "0-beta1"; + src = fetchTarball { + url = "https://caml.inria.fr/pub/distrib/ocaml-5.2/ocaml-5.2.0~beta1.tar.xz"; + sha256 = "sha256:0prf87a41k2y1znnh2pjkggrvhh5cihj68sxqrjn162889rf7wam"; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/openjdk/22.nix b/nixpkgs/pkgs/development/compilers/openjdk/22.nix new file mode 100644 index 000000000000..bef62b6755a2 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/openjdk/22.nix @@ -0,0 +1,260 @@ +{ stdenv +, lib +, fetchurl +, fetchpatch +, fetchFromGitHub +, bash +, pkg-config +, autoconf +, cpio +, file +, which +, unzip +, zip +, perl +, cups +, freetype +, alsa-lib +, libjpeg +, giflib +, libpng +, zlib +, lcms2 +, libX11 +, libICE +, libXrender +, libXext +, libXt +, libXtst +, libXi +, libXinerama +, libXcursor +, libXrandr +, fontconfig +, openjdk22-bootstrap +, ensureNewerSourcesForZipFilesHook +, setJavaClassPath + # TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages + # which should be fixable, this is a no-rebuild workaround for GHC. +, headless ? stdenv.targetPlatform.isGhcjs +, enableJavaFX ? false +, openjfx +, enableGnome2 ? true +, gtk3 +, gnome_vfs +, glib +, GConf +}: + +let + version = { + feature = "22"; + interim = ""; + build = "36"; + }; + + # when building a headless jdk, also bootstrap it with a headless jdk + openjdk-bootstrap = openjdk22-bootstrap.override { gtkSupport = !headless; }; + + openjdk = stdenv.mkDerivation { + pname = "openjdk" + lib.optionalString headless "-headless"; + version = "${version.feature}${version.interim}+${version.build}"; + + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jdk${version.feature}u"; + rev = "jdk-${version.feature}${version.interim}+${version.build}"; + hash = "sha256-itjvIedPwJl/l3a2gIVpNMs1zkbrjioVqbCj1Z1nCJE="; + }; + + nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; + buildInputs = [ + cpio + file + which + zip + perl + zlib + cups + freetype + alsa-lib + libjpeg + giflib + libpng + zlib + lcms2 + libX11 + libICE + libXrender + libXext + libXtst + libXt + libXtst + libXi + libXinerama + libXcursor + libXrandr + fontconfig + openjdk-bootstrap + ] ++ lib.optionals (!headless && enableGnome2) [ + gtk3 + gnome_vfs + GConf + glib + ]; + + patches = [ + ./fix-java-home-jdk21.patch + ./read-truststore-from-env-jdk10.patch + ./currency-date-range-jdk10.patch + ./increase-javadoc-heap-jdk13.patch + ./ignore-LegalNoticeFilePlugin-jdk18.patch + + # -Wformat etc. are stricter in newer gccs, per + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 + # so grab the work-around from + # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 + (fetchurl { + url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; + sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; + }) + + # Fix build for gnumake-4.4.1: + # https://github.com/openjdk/jdk/pull/12992 + (fetchpatch { + name = "gnumake-4.4.1"; + url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch"; + hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; + }) + ] ++ lib.optionals (!headless && enableGnome2) [ + ./swing-use-gtk-jdk13.patch + ]; + + postPatch = '' + chmod +x configure + patchShebangs --build configure + ''; + + # JDK's build system attempts to specifically detect + # and special-case WSL, and we don't want it to do that, + # so pass the correct platform names explicitly + configurePlatforms = [ "build" "host" ]; + + + # https://openjdk.org/groups/build/doc/building.html + configureFlags = [ + "--with-boot-jdk=${openjdk-bootstrap.home}" + "--with-version-build=${version.build}" + "--with-version-opt=nixos" + "--with-version-pre=" + "--enable-unlimited-crypto" + "--with-native-debug-symbols=internal" + "--with-libjpeg=system" + "--with-giflib=system" + "--with-libpng=system" + "--with-zlib=system" + "--with-lcms=system" + "--with-stdc++lib=dynamic" + ] + ++ lib.optional headless "--enable-headless-only" + ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; + + separateDebugInfo = true; + + env.NIX_CFLAGS_COMPILE = "-Wno-error"; + + NIX_LDFLAGS = toString (lib.optionals (!headless) [ + "-lfontconfig" + "-lcups" + "-lXinerama" + "-lXrandr" + "-lmagic" + ] ++ lib.optionals (!headless && enableGnome2) [ + "-lgtk-3" + "-lgio-2.0" + "-lgnomevfs-2" + "-lgconf-2" + ]); + + # -j flag is explicitly rejected by the build system: + # Error: 'make -jN' is not supported, use 'make JOBS=N' + # Note: it does not make build sequential. Build system + # still runs in parallel. + enableParallelBuilding = false; + + buildFlags = [ "images" ]; + + installPhase = '' + mkdir -p $out/lib + + mv build/*/images/jdk $out/lib/openjdk + + # Remove some broken manpages. + rm -rf $out/lib/openjdk/man/ja* + + # Mirror some stuff in top-level. + mkdir -p $out/share + ln -s $out/lib/openjdk/include $out/include + ln -s $out/lib/openjdk/man $out/share/man + + # IDEs use the provided src.zip to navigate the Java codebase (https://github.com/NixOS/nixpkgs/pull/95081) + ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + + # Remove crap from the installation. + rm -rf $out/lib/openjdk/demo + ${lib.optionalString headless '' + rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so + ''} + + ln -s $out/lib/openjdk/bin $out/bin + ''; + + preFixup = '' + # Propagate the setJavaClassPath setup hook so that any package + # that depends on the JDK has $CLASSPATH set up properly. + mkdir -p $out/nix-support + #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 + echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat <<EOF > $out/nix-support/setup-hook + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi + EOF + ''; + + postFixup = '' + # Build the set of output library directories to rpath against + LIBDIRS="" + for output in $(getAllOutputNames); do + if [ "$output" = debug ]; then continue; fi + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS" + done + # Add the local library paths to remove dependencies on the bootstrap + for output in $(getAllOutputNames); do + if [ "$output" = debug ]; then continue; fi + OUTPUTDIR=$(eval echo \$$output) + BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true + done + done + ''; + + disallowedReferences = [ openjdk-bootstrap ]; + + pos = builtins.unsafeGetAttrPos "feature" version; + meta = import ./meta.nix lib version.feature; + + passthru = { + architecture = ""; + home = "${openjdk}/lib/openjdk"; + inherit gtk3; + }; + }; +in +openjdk diff --git a/nixpkgs/pkgs/development/compilers/openjdk/openjfx/22.nix b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/22.nix new file mode 100644 index 000000000000..89908779c909 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/22.nix @@ -0,0 +1,126 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, writeText +, openjdk21_headless +, gradle +, pkg-config +, perl +, cmake +, gperf +, gtk2 +, gtk3 +, libXtst +, libXxf86vm +, glib +, alsa-lib +, ffmpeg_4 +, python3 +, ruby +, icu68 +, withMedia ? true +, withWebKit ? false +}: + +let + major = "22"; + update = ""; + build = "+30"; + repover = "${major}${update}${build}"; + + makePackage = args: stdenv.mkDerivation ({ + version = "${major}${update}${build}"; + + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx"; + rev = repover; + hash = "sha256-sZF7ZPC0kgTTxWgtkxmGtOlfroGPGVZcMw0/wSTJUxQ="; + }; + + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ]; + nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; + + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" ('' + CONF = Release + JDK_HOME = ${openjdk21_headless.home} + '' + args.gradleProperties or ""); + + buildPhase = '' + runHook preBuild + + export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES + export GRADLE_USER_HOME=$(mktemp -d) + ln -s $config gradle.properties + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + gradle --no-daemon $gradleFlags sdk + + runHook postBuild + ''; + } // args); + + # Fake build to pre-download deps into fixed-output derivation. + # We run nearly full build because I see no other way to download everything that's needed. + # Anyone who knows a better way? + deps = makePackage { + pname = "openjfx-deps"; + + # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) + installPhase = '' + find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + rm -rf $out/tmp + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "sha256-2I7LvYcudlB4DKJ/wEiTjY6nICUxUY52euosUqOA+Bs="; + }; + +in +makePackage { + pname = "openjfx-modular-sdk"; + + gradleProperties = '' + COMPILE_MEDIA = ${lib.boolToString withMedia} + COMPILE_WEBKIT = ${lib.boolToString withWebKit} + ''; + + preBuild = '' + swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" + substituteInPlace build.gradle \ + --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ + --replace 'name: SWT_FILE_NAME' "files('$swtJar')" + ''; + + installPhase = '' + cp -r build/modular-sdk $out + ''; + + stripDebugList = [ "." ]; + + postFixup = '' + # Remove references to bootstrap. + export openjdkOutPath='${openjdk21_headless.outPath}' + find "$out" -name \*.so | while read lib; do + new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" + patchelf --set-rpath "$new_refs" "$lib" + done + ''; + + disallowedReferences = [ openjdk21_headless openjdk21_headless ]; + + passthru.deps = deps; + + meta = with lib; { + homepage = "https://openjdk.org/projects/openjfx/"; + license = licenses.gpl2Classpath; + description = "The next-generation Java client toolkit"; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/zulu/22.nix b/nixpkgs/pkgs/development/compilers/zulu/22.nix new file mode 100644 index 000000000000..96b0e6805a5a --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/zulu/22.nix @@ -0,0 +1,42 @@ +{ callPackage +, enableJavaFX ? false +, ... +}@args: + +callPackage ./common.nix ({ + # Details from https://www.azul.com/downloads/?version=java-22-lts&package=jdk + # Note that the latest build may differ by platform + dists = { + x86_64-linux = { + zuluVersion = "22.28.91"; + jdkVersion = "22.0.0"; + hash = + if enableJavaFX then "sha256-HvMiODsz+puu1xtxG2RRXH/PWCk91PGNZ7UcOd9orqQ=" + else "sha256-HvMiODsz+puu1xtxG2RRXH/PWCk91PGNZ7UcOd9orqQ="; + }; + + aarch64-linux = { + zuluVersion = "22.28.91"; + jdkVersion = "22.0.0"; + hash = + if enableJavaFX then throw "JavaFX is not available for aarch64-linux" + else "sha256-3RLNNEbMk5wAZsQmbQj/jpx9iTL/yr9N3wL4t7m6c+s="; + }; + + x86_64-darwin = { + zuluVersion = "22.28.91"; + jdkVersion = "22.0.0"; + hash = + if enableJavaFX then "sha256-Y6PSNQjHRXukwux2sVbvpTIqT+Cg+KeG1C0iSEwyKZw=" + else "sha256-Y6PSNQjHRXukwux2sVbvpTIqT+Cg+KeG1C0iSEwyKZw="; + }; + + aarch64-darwin = { + zuluVersion = "22.28.91"; + jdkVersion = "22.0.0"; + hash = + if enableJavaFX then "sha256-o0VkWB4+PzBmNNWy+FZlyjTgukBTe6owfydb3YNfEE0=" + else "sha256-o0VkWB4+PzBmNNWy+FZlyjTgukBTe6owfydb3YNfEE0="; + }; + }; +} // builtins.removeAttrs args [ "callPackage" ]) diff --git a/nixpkgs/pkgs/development/coq-modules/HoTT/default.nix b/nixpkgs/pkgs/development/coq-modules/HoTT/default.nix index 970591264d73..426880940070 100644 --- a/nixpkgs/pkgs/development/coq-modules/HoTT/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/HoTT/default.nix @@ -6,7 +6,7 @@ mkCoqDerivation { owner = "HoTT"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.14" "8.18"; out = coq.coq-version; } + { case = range "8.14" "8.19"; out = coq.coq-version; } ] null; releaseRev = v: "V${v}"; release."8.14".sha256 = "sha256-7kXk2pmYsTNodHA+Qts3BoMsewvzmCbYvxw9Sgwyvq0="; @@ -14,6 +14,7 @@ mkCoqDerivation { release."8.16".sha256 = "sha256-xcEbz4ZQ+U7mb0SEJopaczfoRc2GSgF2BGzUSWI0/HY="; release."8.17".sha256 = "sha256-GjTUpzL9UzJm4C2ilCaYEufLG3hcj7rJPc5Op+OMal8="; release."8.18".sha256 = "sha256-URoUoQOsG0432wg9i6pTRomWQZ+ewutq2+V29TBrVzc="; + release."8.19".sha256 = "sha256-igG3mhR6uPXV+SCtPH9PBw/eAtTFFry6HPT5ypWj3tQ="; # versions of HoTT for Coq 8.17 and onwards will use dune # opam-name = if lib.versions.isLe "8.17" coq.coq-version then "coq-hott" else null; diff --git a/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix b/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix index dac3fb2b74df..905dbf1377b6 100644 --- a/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix @@ -8,6 +8,7 @@ mkCoqDerivation { repo = "coq-dpdgraph"; inherit version; defaultVersion = lib.switch coq.coq-version [ + { case = "8.19"; out = "1.0+8.19"; } { case = "8.18"; out = "1.0+8.18"; } { case = "8.17"; out = "1.0+8.17"; } { case = "8.16"; out = "1.0+8.16"; } @@ -22,6 +23,7 @@ mkCoqDerivation { { case = "8.7"; out = "0.6.2"; } ] null; + release."1.0+8.19".sha256 = "sha256-L1vjEydYiwDFTXES3sgfdaO/D50AbTJKBXUKUCgbpto="; release."1.0+8.18".sha256 = "sha256-z14MI1VSYzPqmF1PqDXzymXWRMYoTlQAfR/P3Pdf7fI="; release."1.0+8.17".sha256 = "sha256-gcvL3vseLKEF9xinT0579jXBBaA5E3rJ5KaU8RfKtm4="; release."1.0+8.16".sha256 = "sha256-xy4xcVHaD1OHBdGUzUy3SeZnHtOf1+UIh6YjUYFINm0="; diff --git a/nixpkgs/pkgs/development/cuda-modules/nccl/default.nix b/nixpkgs/pkgs/development/cuda-modules/nccl/default.nix index b8bdc69bba4f..e3d10b79386f 100644 --- a/nixpkgs/pkgs/development/cuda-modules/nccl/default.nix +++ b/nixpkgs/pkgs/development/cuda-modules/nccl/default.nix @@ -25,13 +25,13 @@ in backendStdenv.mkDerivation ( finalAttrs: { pname = "nccl"; - version = "2.20.3-1"; + version = "2.20.5-1"; src = fetchFromGitHub { owner = "NVIDIA"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-7gI1q6uN3saz/twwLjWl7XmMucYjvClDPDdbVpVM0vU="; + hash = "sha256-ModIjD6RaRD/57a/PA1oTgYhZsAQPrrvhl5sNVXnO6c="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/embedded/fpga/openfpgaloader/default.nix b/nixpkgs/pkgs/development/embedded/fpga/openfpgaloader/default.nix index 3ddfd9748645..15465d4a43c0 100644 --- a/nixpkgs/pkgs/development/embedded/fpga/openfpgaloader/default.nix +++ b/nixpkgs/pkgs/development/embedded/fpga/openfpgaloader/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openfpgaloader"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "trabucayre"; repo = "openFPGALoader"; rev = "v${finalAttrs.version}"; - hash = "sha256-fe0g8+q/4r7h++7/Bk7pbOJn1CsAc+2IzXN6lqtY2vY="; + hash = "sha256-iJSTiOcW15q3mWmMhe5wmO11cu2xfAI9zCsoB33ujWQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/embedded/nmrpflash/default.nix b/nixpkgs/pkgs/development/embedded/nmrpflash/default.nix index 08748c325023..67e45ebcae5a 100644 --- a/nixpkgs/pkgs/development/embedded/nmrpflash/default.nix +++ b/nixpkgs/pkgs/development/embedded/nmrpflash/default.nix @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { version = "0.9.22"; src = fetchFromGitHub { - owner = "jclehner"; - repo = "nmrpflash"; - rev = "v${version}"; - sha256 = "sha256-gr/7tZYnuXFvfIUh2MmtgSbFoELTomQ4h05y/WFDhjo="; + owner = "jclehner"; + repo = "nmrpflash"; + rev = "v${version}"; + hash = "sha256-gr/7tZYnuXFvfIUh2MmtgSbFoELTomQ4h05y/WFDhjo="; }; nativeBuildInputs = [ pkg-config ]; @@ -29,10 +29,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Netgear Unbrick Utility"; - mainProgram = "nmrpflash"; homepage = "https://github.com/jclehner/nmrpflash"; license = licenses.gpl3; maintainers = with maintainers; [ dadada ]; + mainProgram = "nmrpflash"; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/gnuradio-modules/osmosdr/default.nix b/nixpkgs/pkgs/development/gnuradio-modules/osmosdr/default.nix index 8e46ac561493..053d0a8e99f1 100644 --- a/nixpkgs/pkgs/development/gnuradio-modules/osmosdr/default.nix +++ b/nixpkgs/pkgs/development/gnuradio-modules/osmosdr/default.nix @@ -33,7 +33,7 @@ let "3.10" = "0.2.4"; }.${gnuradio.versionAttr.major}; src = fetchgit { - url = "git://git.osmocom.org/gr-osmosdr"; + url = "https://gitea.osmocom.org/sdr/gr-osmosdr"; rev = "v${version}"; sha256 = { "3.7" = "0bf9bnc1c3c4yqqqgmg3nhygj6rcfmyk6pybi27f7461d2cw1drv"; diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 9897a6f2be0c..4d83fac79a5e 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -305,7 +305,13 @@ self: super: builtins.intersectAttrs super { ghc-debug-brick = enableSeparateBinOutput super.ghc-debug-brick; nixfmt = enableSeparateBinOutput super.nixfmt; calligraphy = enableSeparateBinOutput super.calligraphy; - niv = enableSeparateBinOutput (self.generateOptparseApplicativeCompletions [ "niv" ] super.niv); + niv = overrideCabal (drv: { + buildTools = (drv.buildTools or []) ++ [ pkgs.buildPackages.makeWrapper ]; + postInstall = '' + wrapProgram ''${!outputBin}/bin/niv --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.nix ]} + ''; + }) + (enableSeparateBinOutput (self.generateOptparseApplicativeCompletions [ "niv" ] super.niv)); ghcid = enableSeparateBinOutput super.ghcid; ormolu = self.generateOptparseApplicativeCompletions [ "ormolu" ] (enableSeparateBinOutput super.ormolu); hnix = self.generateOptparseApplicativeCompletions [ "hnix" ] super.hnix; diff --git a/nixpkgs/pkgs/development/interpreters/eff/default.nix b/nixpkgs/pkgs/development/interpreters/eff/default.nix index 3ef2831a72e8..db815c281609 100644 --- a/nixpkgs/pkgs/development/interpreters/eff/default.nix +++ b/nixpkgs/pkgs/development/interpreters/eff/default.nix @@ -1,6 +1,10 @@ { lib, fetchFromGitHub, ocamlPackages }: -with ocamlPackages; buildDunePackage rec { +let + inherit (ocamlPackages) buildDunePackage js_of_ocaml menhir; +in + +buildDunePackage rec { pname = "eff"; version = "5.1"; diff --git a/nixpkgs/pkgs/development/interpreters/expr/default.nix b/nixpkgs/pkgs/development/interpreters/expr/default.nix index 4a1dfd8d4f47..20ec87bb53fd 100644 --- a/nixpkgs/pkgs/development/interpreters/expr/default.nix +++ b/nixpkgs/pkgs/development/interpreters/expr/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "expr"; - version = "1.16.2"; + version = "1.16.3"; src = fetchFromGitHub { owner = "antonmedv"; repo = "expr"; rev = "v${version}"; - hash = "sha256-U9DlgC3iuYry99A1O5E737680mq1TCf2M4ZYTytm56k="; + hash = "sha256-XTI4TPViNQUPrIPZRWcaxFpkqMUOdGN162f+deFNRR0="; }; sourceRoot = "${src.name}/repl"; - vendorHash = "sha256-olTmfSKLbkH95ArMHJWac7aw+DNKRyw4z+oGvW9j4tw="; + vendorHash = "sha256-ZIF0uCGrzs1nn06ouF/eJY1adOw8diAjMIhygZhrXuM="; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/development/interpreters/python/default.nix b/nixpkgs/pkgs/development/interpreters/python/default.nix index 5d4ae2117146..a88f5ff0a4e7 100644 --- a/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/nixpkgs/pkgs/development/interpreters/python/default.nix @@ -47,10 +47,10 @@ in { sourceVersion = { major = "3"; minor = "9"; - patch = "18"; + patch = "19"; suffix = ""; }; - hash = "sha256-AVl9sBMsHPezMe/2iuCbWiNaPDyqnJRMKcrH0cTEwAo="; + hash = "sha256-1Iks0WGPZFjLhRIIwDDfFIJ3lgnQ85OZkb04GE+MZ54="; inherit (darwin) configd; inherit passthruFun; }; @@ -60,10 +60,10 @@ in { sourceVersion = { major = "3"; minor = "10"; - patch = "13"; + patch = "14"; suffix = ""; }; - hash = "sha256-XIiEhmhkDT4VKzW0U27xwjsspL0slX7x7LsFP1cd0/Y="; + hash = "sha256-nFBIH6qMKDIym6D8iGjQpgamgPxPYOxI0mzo4HZ1H9o="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/nixpkgs/pkgs/development/interpreters/risor/default.nix b/nixpkgs/pkgs/development/interpreters/risor/default.nix index 86c55107a44b..9cd56ba22e92 100644 --- a/nixpkgs/pkgs/development/interpreters/risor/default.nix +++ b/nixpkgs/pkgs/development/interpreters/risor/default.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "risor"; - version = "1.3.2"; + version = "1.5.1"; src = fetchFromGitHub { owner = "risor-io"; repo = "risor"; rev = "v${version}"; - hash = "sha256-E4Huto3jvPziWEZqHwVBchZYDX/Tuq/TCBvoviin5UY="; + hash = "sha256-bGlJe61B5jMb1u81NvNMJDW+dNem6bNFT7DJYno5jCk="; }; proxyVendor = true; - vendorHash = "sha256-0NYvZhVkDX6WlKN4QFXyrNnEy0sjUQ1Us+iNEPIgNX0="; + vendorHash = "sha256-eW6eSZp5Msg/u50i1+S2KSzDws0Rq8JBY1Yxzq7/hVo="; subPackages = [ "cmd/risor" diff --git a/nixpkgs/pkgs/development/interpreters/spidermonkey/102.nix b/nixpkgs/pkgs/development/interpreters/spidermonkey/102.nix index 742e74e512c8..ae60e0206789 100644 --- a/nixpkgs/pkgs/development/interpreters/spidermonkey/102.nix +++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/102.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "102.13.0"; - hash = "sha512-dF9Kd+TImDE/ERGCdNJ1E/S6oWu0LVtx2b0NvolX2/OaX3roRCzXEayptZe8kJwEtEy42QlMV6o04oXmT4NP3g=="; + version = "102.15.1"; + hash = "sha512-vbZrT7ViKvPmBYCjvNRk2Y7xPLONasbJ5fwEblZ6ADzwgBJdd0iVDJHEQv3l6AJMUMQYDS9VGqNSgWCjwFrhhw=="; } diff --git a/nixpkgs/pkgs/development/libraries/assimp/default.nix b/nixpkgs/pkgs/development/libraries/assimp/default.nix index 654935391602..8019c6cc943f 100644 --- a/nixpkgs/pkgs/development/libraries/assimp/default.nix +++ b/nixpkgs/pkgs/development/libraries/assimp/default.nix @@ -26,8 +26,6 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = toString ([ # Needed with GCC 12 "-Wno-error=array-bounds" - ] ++ lib.optionals stdenv.hostPlatform.isRiscV [ - "-Wno-error=free-nonheap-object" ]); meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix b/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix index c7876a98bd54..029e1cc8d3eb 100644 --- a/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix +++ b/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "ctranslate2"; - version = "4.0.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "OpenNMT"; repo = "CTranslate2"; rev = "v${version}"; - hash = "sha256-pySnkDnV41rqr4OcNonPtSgv4AJYcF5vtkBg6Ad/IvU="; + hash = "sha256-vA1KnHRxIX0lYUfwXTbxjnrrBjFmqp2kwpxBNorVf0Y="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/libraries/drumstick/default.nix b/nixpkgs/pkgs/development/libraries/drumstick/default.nix index 486d1ff997d3..4b797031696a 100644 --- a/nixpkgs/pkgs/development/libraries/drumstick/default.nix +++ b/nixpkgs/pkgs/development/libraries/drumstick/default.nix @@ -1,15 +1,18 @@ { lib, stdenv, fetchurl , cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, graphviz-nox, pkg-config, qttools, wrapQtAppsHook -, alsa-lib, fluidsynth, libpulseaudio, qtbase, qtsvg, sonivox +, alsa-lib, fluidsynth, libpulseaudio, qtbase, qtsvg, sonivox, qt5compat ? null }: +let + isQt6 = lib.versions.major qtbase.version == "6"; +in stdenv.mkDerivation rec { pname = "drumstick"; - version = "2.7.2"; + version = "2.9.0"; src = fetchurl { url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-5XxG5ur584fgW4oCONgMiWzV48Q02HEdmpb9+YhBFe0="; + hash = "sha256-p0N8EeCtVEPCGzPwiRxPdI1XT5XQ5pcKYEDJXbYYTrM="; }; patches = [ @@ -28,17 +31,18 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib fluidsynth libpulseaudio qtbase qtsvg sonivox - ]; + ] ++ lib.optionals isQt6 [ qt5compat ]; cmakeFlags = [ - "-DUSE_DBUS=ON" + (lib.cmakeBool "USE_DBUS" true) + (lib.cmakeBool "USE_QT5" (!isQt6)) ]; meta = with lib; { - maintainers = []; - description = "MIDI libraries for Qt5/C++"; + description = "MIDI libraries for Qt/C++"; homepage = "https://drumstick.sourceforge.io/"; license = licenses.gpl2Plus; + maintainers = with maintainers; [ wegank ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix b/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix index 25bab6645e07..65c29f9319ce 100644 --- a/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix @@ -50,7 +50,6 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - broken = stdenv.isDarwin; description = "Finite Field Linear Algebra Subroutines"; mainProgram = "fflas-ffpack-config"; license = licenses.lgpl21Plus; diff --git a/nixpkgs/pkgs/development/libraries/flatpak/default.nix b/nixpkgs/pkgs/development/libraries/flatpak/default.nix index 005890a3d4a6..1786d84e7a4b 100644 --- a/nixpkgs/pkgs/development/libraries/flatpak/default.nix +++ b/nixpkgs/pkgs/development/libraries/flatpak/default.nix @@ -97,6 +97,10 @@ stdenv.mkDerivation (finalAttrs: { # The icon validator needs to access the gdk-pixbuf loaders in the Nix store # and cannot bind FHS paths since those are not available on NixOS. finalAttrs.passthru.icon-validator-patch + + # Try mounting fonts and icons from NixOS locations if FHS locations don't exist. + # https://github.com/NixOS/nixpkgs/issues/119433 + ./fix-fonts-icons.patch ]; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/flatpak/fix-fonts-icons.patch b/nixpkgs/pkgs/development/libraries/flatpak/fix-fonts-icons.patch new file mode 100644 index 000000000000..31a96d88b7dd --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/flatpak/fix-fonts-icons.patch @@ -0,0 +1,87 @@ +diff --git a/common/flatpak-run.c b/common/flatpak-run.c +index 94ad013..5c9f55e 100644 +--- a/common/flatpak-run.c ++++ b/common/flatpak-run.c +@@ -871,6 +871,49 @@ out: + return res; + } + ++static void ++get_nix_closure (GHashTable *closure, const gchar *source_path) ++{ ++ if (g_file_test (source_path, G_FILE_TEST_IS_SYMLINK)) ++ { ++ g_autofree gchar *path = g_malloc(PATH_MAX); ++ realpath(source_path, path); ++ if (g_str_has_prefix(path, "/nix/store/")) ++ { ++ *strchr(path + strlen("/nix/store/"), '/') = 0; ++ g_hash_table_add(closure, g_steal_pointer (&path)); ++ } ++ } ++ else if (g_file_test (source_path, G_FILE_TEST_IS_DIR)) ++ { ++ g_autoptr(GDir) dir = g_dir_open(source_path, 0, NULL); ++ const gchar *file_name; ++ while ((file_name = g_dir_read_name(dir))) ++ { ++ g_autofree gchar *path = g_build_filename (source_path, file_name, NULL); ++ get_nix_closure (closure, path); ++ } ++ } ++} ++ ++static void ++add_nix_store_symlink_targets (FlatpakBwrap *bwrap, const gchar *source_path) ++{ ++ GHashTable *closure = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); ++ ++ get_nix_closure(closure, source_path); ++ ++ GHashTableIter iter; ++ gpointer path; ++ g_hash_table_iter_init(&iter, closure); ++ while (g_hash_table_iter_next(&iter, &path, NULL)) ++ { ++ flatpak_bwrap_add_args (bwrap, "--ro-bind", path, path, NULL); ++ } ++ ++ g_hash_table_destroy(closure); ++} ++ + static void + add_font_path_args (FlatpakBwrap *bwrap) + { +@@ -898,6 +946,18 @@ add_font_path_args (FlatpakBwrap *bwrap) + "\t<remap-dir as-path=\"%s\">/run/host/fonts</remap-dir>\n", + SYSTEM_FONTS_DIR); + } ++ else if (g_file_test ("/run/current-system/sw/share/X11/fonts", G_FILE_TEST_EXISTS)) ++ { ++ add_nix_store_symlink_targets (bwrap, "/run/current-system/sw/share/X11/fonts"); ++ flatpak_bwrap_add_args (bwrap, ++ "--ro-bind", ++ "/run/current-system/sw/share/X11/fonts", ++ "/run/host/fonts", ++ NULL); ++ g_string_append_printf (xml_snippet, ++ "\t<remap-dir as-path=\"%s\">/run/host/fonts</remap-dir>\n", ++ "/run/current-system/sw/share/X11/fonts"); ++ } + + if (g_file_test ("/usr/local/share/fonts", G_FILE_TEST_EXISTS)) + { +@@ -998,6 +1058,13 @@ add_icon_path_args (FlatpakBwrap *bwrap) + "--ro-bind", "/usr/share/icons", "/run/host/share/icons", + NULL); + } ++ else if (g_file_test ("/run/current-system/sw/share/icons", G_FILE_TEST_IS_DIR)) ++ { ++ add_nix_store_symlink_targets (bwrap, "/run/current-system/sw/share/icons"); ++ flatpak_bwrap_add_args (bwrap, ++ "--ro-bind", "/run/current-system/sw/share/icons", "/run/host/share/icons", ++ NULL); ++ } + + user_icons_path = g_build_filename (g_get_user_data_dir (), "icons", NULL); + user_icons = g_file_new_for_path (user_icons_path); diff --git a/nixpkgs/pkgs/development/libraries/flint/3.nix b/nixpkgs/pkgs/development/libraries/flint/3.nix index b8b8c2d8ec7d..60321984d316 100644 --- a/nixpkgs/pkgs/development/libraries/flint/3.nix +++ b/nixpkgs/pkgs/development/libraries/flint/3.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchpatch , fetchurl , gmp , mpfr @@ -24,6 +25,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-ezEaAFA6hjiB64F32+uEMi8pOZ89fXLzsaTJuh1XlLQ="; }; + patches = [ + (fetchpatch { + url = "https://github.com/flintlib/flint/commit/e7d005c369754243cba32bd782ea2a5fc874fde5.diff"; + hash = "sha256-IqEtYEpNVXfoTeerh/0ig+eDqUpAlGdBB3uO8ShYh3o="; + }) + ]; + nativeBuildInputs = [ autoconf automake diff --git a/nixpkgs/pkgs/development/libraries/fplll/default.nix b/nixpkgs/pkgs/development/libraries/fplll/default.nix index ab74a09d0795..5e2268199496 100644 --- a/nixpkgs/pkgs/development/libraries/fplll/default.nix +++ b/nixpkgs/pkgs/development/libraries/fplll/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , pkg-config , gettext , autoreconfHook @@ -18,6 +19,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-taSS7jpVyjVfNe6kSuUDXMD2PgKmtG64V5MjZyQzorI="; }; + patches = [ + (fetchpatch { + url = "https://github.com/fplll/fplll/commit/317cf70893eebfb2625da12e5377189908c36240.diff"; + sha256 = "sha256-GbYSolBgv/he4QzjuRFdg93wHJABVHvA9x3PjpJTSRE="; + }) + ]; + nativeBuildInputs = [ pkg-config gettext diff --git a/nixpkgs/pkgs/development/libraries/gfxstream/default.nix b/nixpkgs/pkgs/development/libraries/gfxstream/default.nix index 196bca7cdc5f..e3164c95a4c6 100644 --- a/nixpkgs/pkgs/development/libraries/gfxstream/default.nix +++ b/nixpkgs/pkgs/development/libraries/gfxstream/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitiles, meson, ninja, pkg-config, python3 -, aemu, libdrm, libglvnd, vulkan-headers, vulkan-loader, xorg +{ lib, stdenv, fetchFromGitiles, fetchpatch, meson, ninja, pkg-config, python3 +, aemu, darwin, libdrm, libglvnd, vulkan-headers, vulkan-loader, xorg }: stdenv.mkDerivation { @@ -12,14 +12,45 @@ stdenv.mkDerivation { hash = "sha256-IYXkaHZPEYIE9KW731GN6x6yRS+FYtP1zyHcaSofhIM="; }; + patches = [ + # Make libdrm an optional dependency, which is required to build on Darwin. + (fetchpatch { + url = "https://android.googlesource.com/platform/hardware/google/gfxstream/+/a8df2a3eb099b419a7b3638e68ea30b4cffb751b%5E%21/?format=TEXT"; + decode = "base64 -d"; + hash = "sha256-shjeNuxtQokscCGBKEUbOPKOWRELBAnHFNj3Y5w87Nw="; + }) + ]; + + # Ensure that meson can find an Objective-C compiler on Darwin. + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace meson.build \ + --replace-fail "project('gfxstream_backend', 'cpp', 'c'" "project('gfxstream_backend', 'cpp', 'c', 'objc'" + ''; + nativeBuildInputs = [ meson ninja pkg-config python3 ]; buildInputs = [ aemu libglvnd vulkan-headers vulkan-loader xorg.libX11 ] - ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform libdrm) libdrm; + ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libdrm) [ libdrm ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.CoreGraphics + darwin.apple_sdk.frameworks.IOKit + darwin.apple_sdk.frameworks.IOSurface + darwin.apple_sdk.frameworks.OpenGL + darwin.apple_sdk.frameworks.QuartzCore + ]; + + env = lib.optionalAttrs stdenv.isDarwin { + NIX_LDFLAGS = toString [ + "-framework Cocoa" + "-framework IOKit" + "-framework IOSurface" + "-framework OpenGL" + "-framework QuartzCore" + "-needed-lvulkan" + ]; + }; # dlopens libvulkan. - # - # XXX: Unsure if this is required on Darwin. If it is, it probably - # needs to be done using install_name_tool. preConfigure = lib.optionalString (!stdenv.isDarwin) '' mesonFlagsArray=(-Dcpp_link_args="-Wl,--push-state -Wl,--no-as-needed -lvulkan -Wl,--pop-state") ''; diff --git a/nixpkgs/pkgs/development/libraries/givaro/default.nix b/nixpkgs/pkgs/development/libraries/givaro/default.nix index a7b1eaa43831..aca83ec4b8d6 100644 --- a/nixpkgs/pkgs/development/libraries/givaro/default.nix +++ b/nixpkgs/pkgs/development/libraries/givaro/default.nix @@ -25,6 +25,11 @@ stdenv.mkDerivation rec { url = "https://github.com/linbox-team/givaro/commit/c7744bb133496cd7ac04688f345646d505e1bf52.patch"; hash = "sha256-aAA5o8Va10v0Pqgcpx7qM0TAZiNQgXoR6N9xecj7tDA="; }) + (fetchpatch { + name = "clang-16.patch"; + url = "https://github.com/linbox-team/givaro/commit/a81d44b3b57c275bcb04ab00db79be02561deaa2.patch"; + hash = "sha256-sSk+VWffoEjZRTJcHRISLHPyW6yuvI1u8knBOfxNUIE="; + }) ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/gtk-sharp/2.0.nix b/nixpkgs/pkgs/development/libraries/gtk-sharp/2.0.nix index b083ca02cf2c..219028d4ab90 100644 --- a/nixpkgs/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/nixpkgs/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Graphical User Interface Toolkit for mono and .Net"; homepage = "https://www.mono-project.com/docs/gui/gtksharp"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.gpl2; }; } diff --git a/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix b/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix index 1d3f15ba9871..c09f05b43772 100644 --- a/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "3.24.8"; + version = "3.24.9"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0pQMZJIuW5WFVLI9TEHRg56p5D4NLls4Gc+0aCSgmMQ="; + sha256 = "MNW/5ARXHOVmqOk4yLrBdXZCDrUI8eJXg32mPxStRM4="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/java/jffi/default.nix b/nixpkgs/pkgs/development/libraries/java/jffi/default.nix index 3ba336aa18e9..46f270163549 100644 --- a/nixpkgs/pkgs/development/libraries/java/jffi/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/jffi/default.nix @@ -1,40 +1,66 @@ -{ lib, stdenv, fetchFromGitHub, jdk, jre, ant, libffi, texinfo, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, ant +, jdk +, libffi +, pkg-config +, texinfo +, stripJavaArchivesHook +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jffi"; version = "1.3.13"; src = fetchFromGitHub { owner = "jnr"; repo = "jffi"; - rev = "jffi-${version}"; - sha256 = "sha256-aBQkkZyXZkaJc4sr/jHnIRaJYP116u4Jqsr9XXzfOBA="; + rev = "jffi-${finalAttrs.version}"; + hash = "sha256-aBQkkZyXZkaJc4sr/jHnIRaJYP116u4Jqsr9XXzfOBA="; }; - nativeBuildInputs = [ jdk ant texinfo pkg-config ]; - buildInputs = [ libffi ] ; + nativeBuildInputs = [ + ant + jdk + pkg-config + texinfo + stripJavaArchivesHook + ]; - buildPhase = '' - # The pkg-config script in the build.xml doesn't work propery - # set the lib path manually to work around this. - export LIBFFI_LIBS="${libffi}/lib/libffi.so" + buildInputs = [ libffi ]; - ant -Duse.system.libffi=1 jar - ant -Duse.system.libffi=1 archive-platform-jar - ''; + # The pkg-config script in the build.xml doesn't work propery + # set the lib path manually to work around this. + env.LIBFFI_LIBS = "${libffi}/lib/libffi${stdenv.hostPlatform.extensions.sharedLibrary}"; + env.ANT_ARGS = "-Duse.system.libffi=1"; - installPhase = '' - mkdir -p $out/share/java - cp -r dist/* $out/share/java + buildPhase = '' + runHook preBuild + ant jar + ant archive-platform-jar + runHook postBuild ''; doCheck = true; + checkPhase = '' - # The pkg-config script in the build.xml doesn't work propery - # set the lib path manually to work around this. - export LIBFFI_LIBS="${libffi}/lib/libffi.so" + runHook preCheck + ant test + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + install -Dm644 dist/*.jar -t $out/share/java + runHook postInstall + ''; - ant -Duse.system.libffi=1 test + # nix can't detect libffi as a dependency inside the jar file, so we create + # a dummy file with the path to libffi, to make sure that nix knows about it + postFixup = '' + mkdir -p $out/nix-support + echo ${libffi} > $out/nix-support/depends ''; meta = with lib; { @@ -45,4 +71,4 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ bachp ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/jbig2enc/default.nix b/nixpkgs/pkgs/development/libraries/jbig2enc/default.nix index 7c847918c9f9..36b100b1603c 100644 --- a/nixpkgs/pkgs/development/libraries/jbig2enc/default.nix +++ b/nixpkgs/pkgs/development/libraries/jbig2enc/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , fetchpatch -, python3 , leptonica , zlib , libwebp @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - propagatedBuildInputs = [ + buildInputs = [ leptonica zlib libwebp diff --git a/nixpkgs/pkgs/development/libraries/libaec/default.nix b/nixpkgs/pkgs/development/libraries/libaec/default.nix index 5bc6ad6c5f2e..cd816329a51a 100644 --- a/nixpkgs/pkgs/development/libraries/libaec/default.nix +++ b/nixpkgs/pkgs/development/libraries/libaec/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "libaec"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitLab { domain = "gitlab.dkrz.de"; owner = "k202009"; repo = "libaec"; rev = "v${version}"; - sha256 = "sha256-mmiPpfUZE7W6Hzalr/tcJUFQe5kF4dYM1uZShjBsoVA="; + sha256 = "sha256-4WS3l79v9CTFBLuJmNMMK7RRNPLSa5KYID3W4aGMTuE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libck/default.nix b/nixpkgs/pkgs/development/libraries/libck/default.nix index cc53d4957eb4..71937b2a658e 100644 --- a/nixpkgs/pkgs/development/libraries/libck/default.nix +++ b/nixpkgs/pkgs/development/libraries/libck/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ck"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "concurrencykit"; repo = pname; rev = version; - sha256 = "sha256-HUC+8Vd0koAmumRZ8gS5u6LVa7fUfkIYRaxVv6/7Hgg="; + sha256 = "sha256-lxJ8WsZ3pBGf4sFYj5+tR37EYDZqpksaoohiIKA4pRI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/libdwarf/20210528.nix b/nixpkgs/pkgs/development/libraries/libdwarf/20210528.nix deleted file mode 100644 index 25d14de99ae2..000000000000 --- a/nixpkgs/pkgs/development/libraries/libdwarf/20210528.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ callPackage, zlib, libelf }: -callPackage ./common.nix rec { - version = "20210528"; - url = "https://www.prevanders.net/libdwarf-${version}.tar.gz"; - hash = "sha512-4PnIhVQFPubBsTM5YIkRieeCDEpN3DArfmN1Skzc/CrLG0tgg6ci0SBKdemU//NAHswlG4w7JAkPjLQEbZD4cA=="; - buildInputs = [ zlib libelf ]; - knownVulnerabilities = [ "CVE-2022-32200" "CVE-2022-39170" ]; -} diff --git a/nixpkgs/pkgs/development/libraries/libressl/default.nix b/nixpkgs/pkgs/development/libraries/libressl/default.nix index 740d84072d1e..eda75bf0b25f 100644 --- a/nixpkgs/pkgs/development/libraries/libressl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libressl/default.nix @@ -111,7 +111,15 @@ in { }; libressl_3_8 = generic { - version = "3.8.2"; - hash = "sha256-bUuNW7slofgzZjnlbsUIgFLUOpUlZpeoXEzpEyPCWVQ="; + version = "3.8.3"; + hash = "sha256-pl9A4+9uPJRRyDGObyxFTDZ+Z/CcDN4YSXMaTW7McnI="; + + patches = [ + (fetchpatch { + name = "libtls-pkg-config-static.patch"; + url = "https://github.com/libressl/portable/commit/f7a0f40d52b994d0bca0eacd88b39f71e447c5d9.patch"; + hash = "sha256-2ly6lsIdoV/riVqDViFXDP7nkZ/RUatEdiaSudQKtz0="; + }) + ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/linbox/default.nix b/nixpkgs/pkgs/development/libraries/linbox/default.nix index 0997513f5a51..4d0158dbcbe3 100644 --- a/nixpkgs/pkgs/development/libraries/linbox/default.nix +++ b/nixpkgs/pkgs/development/libraries/linbox/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , givaro , pkg-config @@ -23,6 +24,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-mW84a98KPLqcHMjX3LIYTmVe0ngUdz6RJLpoDaAqKU8="; }; + patches = [ + (fetchpatch { + url = "https://github.com/linbox-team/linbox/commit/4be26e9ef0eaf36a9909e5008940e8bf7dc625b6.patch"; + sha256 = "PX0Tik7blXOV2vHUq92xMxaADkNoNGiax4qrjQyGK6U="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config diff --git a/nixpkgs/pkgs/development/libraries/nco/default.nix b/nixpkgs/pkgs/development/libraries/nco/default.nix index 74f6c21d86e9..a14a7267a187 100644 --- a/nixpkgs/pkgs/development/libraries/nco/default.nix +++ b/nixpkgs/pkgs/development/libraries/nco/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nco"; - version = "5.2.1"; + version = "5.2.2"; src = fetchFromGitHub { owner = "nco"; repo = "nco"; rev = finalAttrs.version; - hash = "sha256-6j9gBvhNTww9nOKMcCvOxoLJwU/3RtS6OvofjrpZhmk="; + hash = "sha256-d90088MKliM90KSbL0TNEafhfvLQlD/stO5V83fTXO0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/octomap/default.nix b/nixpkgs/pkgs/development/libraries/octomap/default.nix index 6b1816d8addc..8321028508a6 100644 --- a/nixpkgs/pkgs/development/libraries/octomap/default.nix +++ b/nixpkgs/pkgs/development/libraries/octomap/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "octomap"; - version = "1.9.8"; + version = "1.10.0"; src = fetchFromGitHub { owner = "OctoMap"; repo = pname; rev = "v${version}"; - hash = "sha256-qE5i4dGugm7tR5tgDCpbla/R7hYR/PI8BzrZQ4y6Yz8="; + hash = "sha256-QxQHxxFciR6cvB/b8i0mr1hqGxOXhXmB4zgdsD977Mw="; }; sourceRoot = "${src.name}/octomap"; diff --git a/nixpkgs/pkgs/development/libraries/opencsg/default.nix b/nixpkgs/pkgs/development/libraries/opencsg/default.nix index 4adebaf72b16..a2675b2d79dc 100644 --- a/nixpkgs/pkgs/development/libraries/opencsg/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencsg/default.nix @@ -2,11 +2,11 @@ , qmake, GLUT, fixDarwinDylibNames }: stdenv.mkDerivation rec { - version = "1.4.2"; + version = "1.6.0"; pname = "opencsg"; src = fetchurl { url = "http://www.opencsg.org/OpenCSG-${version}.tar.gz"; - sha256 = "1ysazynm759gnw1rdhn9xw9nixnzrlzrc462340a6iif79fyqlnr"; + hash = "sha256-v4+4Dj4M4R2H3XjdFaDehy27iXLYf1+Jz/xGHvrUe+g="; }; nativeBuildInputs = [ qmake ] @@ -18,15 +18,13 @@ stdenv.mkDerivation rec { doCheck = false; - patches = [ ./fix-pro-files.patch ]; - preConfigure = '' rm example/Makefile src/Makefile qmakeFlags=("''${qmakeFlags[@]}" "INSTALLDIR=$out") ''; postInstall = '' - install -D license.txt "$out/share/doc/opencsg/license.txt" + install -D copying.txt "$out/share/doc/opencsg/copying.txt" '' + lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv $out/bin/*.app $out/Applications @@ -49,7 +47,7 @@ stdenv.mkDerivation rec { homepage = "http://www.opencsg.org/"; platforms = platforms.unix; maintainers = [ maintainers.raskin ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/nixpkgs/pkgs/development/libraries/opencsg/fix-pro-files.patch b/nixpkgs/pkgs/development/libraries/opencsg/fix-pro-files.patch deleted file mode 100644 index 462b44c8f40c..000000000000 --- a/nixpkgs/pkgs/development/libraries/opencsg/fix-pro-files.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur OpenCSG-1.4.2-pristine/example/example.pro OpenCSG-1.4.2/example/example.pro ---- OpenCSG-1.4.2-pristine/example/example.pro 2016-09-27 06:11:16.000000000 +0900 -+++ OpenCSG-1.4.2/example/example.pro 2019-05-07 10:45:18.785251737 +0900 -@@ -6,7 +6,9 @@ - INCLUDEPATH += ../include - LIBS += -L../lib -lopencsg -lGLEW - --INSTALLDIR = /usr/local -+isEmpty(INSTALLDIR) { -+ INSTALLDIR = /usr/local -+} - INSTALLS += target - target.path = $$INSTALLDIR/bin - -diff -ur OpenCSG-1.4.2-pristine/opencsg.pro OpenCSG-1.4.2/opencsg.pro ---- OpenCSG-1.4.2-pristine/opencsg.pro 2016-09-27 06:11:16.000000000 +0900 -+++ OpenCSG-1.4.2/opencsg.pro 2019-05-07 10:44:50.578698165 +0900 -@@ -1,2 +1,3 @@ - TEMPLATE = subdirs - SUBDIRS = src example -+CONFIG += ordered diff --git a/nixpkgs/pkgs/development/libraries/openimagedenoise/cuda.patch b/nixpkgs/pkgs/development/libraries/openimagedenoise/cuda.patch new file mode 100644 index 000000000000..4bc5172d8830 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/openimagedenoise/cuda.patch @@ -0,0 +1,32 @@ +Remove upstream workarounds for CMake "limitations" that do not appear to exist +in nixpkgs build environment, but rather break the build, presumably because +CMAKE_INSTALL_{BIN,LIB}DIR is an absolute path in our build so +CMAKE_INSTALL_PREFIX has no effect. + +diff --git a/devices/CMakeLists.txt b/devices/CMakeLists.txt +index d5111cd..43986ad 100644 +--- a/devices/CMakeLists.txt ++++ b/devices/CMakeLists.txt +@@ -53,7 +53,6 @@ if(OIDN_DEVICE_CUDA) + -DCMAKE_CXX_COMPILER:FILEPATH=${_host_compiler} + -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${CMAKE_TOOLCHAIN_FILE} + -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} +- -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/cuda/preinstall + -DCMAKE_INSTALL_BINDIR:PATH=${CMAKE_INSTALL_BINDIR} + -DCMAKE_INSTALL_LIBDIR:PATH=${CMAKE_INSTALL_LIBDIR} + -DCUDAToolkit_ROOT:PATH=${CUDAToolkit_ROOT} +@@ -69,14 +68,6 @@ if(OIDN_DEVICE_CUDA) + DEPENDS + OpenImageDenoise_core + ) +- +- # Due to limitations of CMake, the module is pre-installed at build time to a temporary location, +- # and then copied to the real install location at install time. +- install(DIRECTORY +- ${CMAKE_CURRENT_BINARY_DIR}/cuda/preinstall/ +- DESTINATION "." +- USE_SOURCE_PERMISSIONS +- ) + endif() + + if(OIDN_DEVICE_HIP) diff --git a/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix b/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix index 532ee7a09571..e2d9b66004ed 100644 --- a/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix +++ b/nixpkgs/pkgs/development/libraries/openimagedenoise/default.nix @@ -1,21 +1,45 @@ -{ lib, stdenv, fetchzip, cmake, tbb, python3, ispc }: +{ + cmake, + config, + cudaPackages, + cudaSupport ? config.cudaSupport, + fetchzip, + ispc, + lib, + python3, + stdenv, + tbb, +}: stdenv.mkDerivation rec { pname = "openimagedenoise"; - version = "1.4.3"; + version = "2.2.2"; # The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs src = fetchzip { url = "https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"; - sha256 = "sha256-i73w/Vkr5TPLB1ulPbPU4OVGwdNlky1brfarueD7akE="; + sha256 = "sha256-ZIrs4oEb+PzdMh2x2BUFXKyu/HBlFb3CJX24ciEHy3Q="; }; - nativeBuildInputs = [ cmake python3 ispc ]; - buildInputs = [ tbb ]; + patches = lib.optional cudaSupport ./cuda.patch; + + nativeBuildInputs = [ + cmake + python3 + ispc + ] ++ lib.optional cudaSupport cudaPackages.cuda_nvcc; + + buildInputs = + [ tbb ] + ++ lib.optionals cudaSupport [ + cudaPackages.cuda_cudart + cudaPackages.cuda_cccl + ]; cmakeFlags = [ - "-DTBB_ROOT=${tbb}" - "-DTBB_INCLUDE_DIR=${tbb.dev}/include" + (lib.cmakeBool "OIDN_DEVICE_CUDA" cudaSupport) + (lib.cmakeFeature "TBB_INCLUDE_DIR" "${tbb.dev}/include") + (lib.cmakeFeature "TBB_ROOT" "${tbb}") ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix b/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix index 17b7c286229b..3ed10ef270f9 100644 --- a/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix +++ b/nixpkgs/pkgs/development/libraries/opensubdiv/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "opensubdiv"; - version = "3.5.1"; + version = "3.6.0"; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenSubdiv"; rev = "v${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-uDKCT0Uoa5WQekMUFm2iZmzm+oWAZ6IWMwfpchkUZY0="; + sha256 = "sha256-liy6pQyWMk7rw0usrCoLGzZLO7RAg0z2pV/GF2NnOkE="; }; outputs = [ "out" "dev" "static" ]; diff --git a/nixpkgs/pkgs/development/libraries/openvino/default.nix b/nixpkgs/pkgs/development/libraries/openvino/default.nix index 186e1048823a..a4ce0fe60c1e 100644 --- a/nixpkgs/pkgs/development/libraries/openvino/default.nix +++ b/nixpkgs/pkgs/development/libraries/openvino/default.nix @@ -1,7 +1,6 @@ { lib , gcc12Stdenv , fetchFromGitHub -, fetchpatch2 , fetchurl , cudaSupport ? opencv.cudaSupport or false @@ -11,10 +10,10 @@ , cmake , git , libarchive +, patchelf , pkg-config -, python +, python3Packages , shellcheck -, sphinx # runtime , flatbuffers @@ -36,40 +35,34 @@ let stdenv = gcc12Stdenv; - # See GNA_VERSION in cmake/dependencies.cmake - gna_version = "03.05.00.2116"; - gna = fetchurl { - url = "https://storage.openvinotoolkit.org/dependencies/gna/gna_${gna_version}.zip"; - hash = "sha256-lgNQVncCvaFydqxMBg11JPt8587XhQBL2GHIH/K/4sU="; - }; - tbbbind_version = "2_5"; tbbbind = fetchurl { url = "https://storage.openvinotoolkit.org/dependencies/thirdparty/linux/tbbbind_${tbbbind_version}_static_lin_v4.tgz"; hash = "sha256-Tr8wJGUweV8Gb7lhbmcHxrF756ZdKdNRi1eKdp3VTuo="; }; + + python = python3Packages.python.withPackages (ps: with ps; [ + cython + pybind11 + setuptools + sphinx + wheel + ]); + in stdenv.mkDerivation rec { pname = "openvino"; - version = "2023.3.0"; + version = "2024.0.0"; src = fetchFromGitHub { owner = "openvinotoolkit"; repo = "openvino"; rev = "refs/tags/${version}"; fetchSubmodules = true; - hash = "sha256-dXlQhar5gz+1iLmDYXUY0jZKh4rJ+khRpoZQphJXfcU="; + hash = "sha256-Xsrmc1EynkjgPgiQ+ESyVJRJT9Afqyob0/uH+Is4TYA="; }; - patches = [ - (fetchpatch2 { - name = "enable-js-toggle.patch"; - url = "https://github.com/openvinotoolkit/openvino/commit/0a8f1383826d949c497fe3d05fef9ad2b662fa7e.patch"; - hash = "sha256-mQYunouPo3tRlD5Yp4EUth324ccNnVX8zmjPHvJBYKw="; - }) - ]; - outputs = [ "out" "python" @@ -81,26 +74,15 @@ stdenv.mkDerivation rec { cmake git libarchive + patchelf pkg-config - (python.withPackages (ps: with ps; [ - cython - pybind11 - setuptools - ])) + python shellcheck - sphinx ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; postPatch = '' - mkdir -p temp/gna_${gna_version} - pushd temp/ - bsdtar -xf ${gna} - autoPatchelf gna_${gna_version} - echo "${gna.url}" > gna_${gna_version}/ie_dependency.info - popd - mkdir -p temp/tbbbind_${tbbbind_version} pushd temp/tbbbind_${tbbbind_version} bsdtar -xf ${tbbbind} @@ -116,6 +98,7 @@ stdenv.mkDerivation rec { "-DCMAKE_PREFIX_PATH:PATH=${placeholder "out"}" "-DOpenCV_DIR=${opencv}/lib/cmake/opencv4/" "-DProtobuf_LIBRARIES=${protobuf}/lib/libprotobuf${stdenv.hostPlatform.extensions.sharedLibrary}" + "-DPython_EXECUTABLE=${python.interpreter}" (cmakeBool "CMAKE_VERBOSE_MAKEFILE" true) (cmakeBool "NCC_SYLE" false) @@ -126,7 +109,6 @@ stdenv.mkDerivation rec { # features (cmakeBool "ENABLE_INTEL_CPU" true) - (cmakeBool "ENABLE_INTEL_GNA" true) (cmakeBool "ENABLE_JS" false) (cmakeBool "ENABLE_LTO" true) (cmakeBool "ENABLE_ONEDNN_FOR_GPU" false) diff --git a/nixpkgs/pkgs/development/libraries/pdal/default.nix b/nixpkgs/pkgs/development/libraries/pdal/default.nix index 6f362967a2a2..86d976531cb3 100644 --- a/nixpkgs/pkgs/development/libraries/pdal/default.nix +++ b/nixpkgs/pkgs/development/libraries/pdal/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdal"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "PDAL"; repo = "PDAL"; rev = finalAttrs.version; - sha256 = "sha256-knyDVUZH+X563UzKkvDpi08EcXU5s4+Jvya3Xprpt1A="; + sha256 = "sha256-JoHBxJ0hCWH7ZhmeJk4huT2k0AK5CzIV58NWCjWj5T0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix b/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix index a0daa91a1b54..52138a8d50ea 100644 --- a/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/pythia/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pythia"; - version = "8.310"; + version = "8.311"; src = fetchurl { url = "https://pythia.org/download/pythia83/pythia${builtins.replaceStrings ["."] [""] version}.tgz"; - sha256 = "sha256-kMgRq+ej0v/b+bSuq1HPbgpai++04++oBvPVucMR4ic="; + sha256 = "sha256-J4LV5CnBVDxnN1r+VH/UxMoHIDCd6wCPfbeGJtx9FGQ="; }; nativeBuildInputs = [ rsync ] diff --git a/nixpkgs/pkgs/development/libraries/protobuf/26.nix b/nixpkgs/pkgs/development/libraries/protobuf/26.nix new file mode 100644 index 000000000000..7f7c3625699f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/protobuf/26.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix ({ + version = "26.1"; + hash = "sha256-9sA+MYeDqRZl1v6HV4mpy60vqTbVTtinp9er6zkg/Ng="; +} // args) diff --git a/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh b/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh index d7ef146a1957..52c6fb5f1b2e 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh +++ b/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.qt.io/official_releases/qt/6.6/6.6.2/submodules/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.qt.io/official_releases/qt/6.6/6.6.3/submodules/ -A '*.tar.xz' ) diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix index c223a2236353..a14028e1259a 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -211,10 +211,7 @@ stdenv.mkDerivation rec { inherit patches; - # https://bugreports.qt.io/browse/QTBUG-97568 - postPatch = '' - substituteInPlace src/corelib/CMakeLists.txt --replace-fail "/bin/ls" "${buildPackages.coreutils}/bin/ls" - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace cmake/QtPublicAppleHelpers.cmake --replace-fail "/usr/bin/xcrun" "${xcbuild}/bin/xcrun" ''; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/qt-env.nix b/nixpkgs/pkgs/development/libraries/qt-6/qt-env.nix index f0bf8721074f..c754c75cc276 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/qt-env.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/qt-env.nix @@ -4,7 +4,7 @@ buildEnv { inherit name; paths = [ qtbase ] ++ paths; - pathsToLink = [ "/bin" "/mkspecs" "/include" "/lib" "/share" "/libexec" ]; + pathsToLink = [ "/metatypes" "/bin" "/mkspecs" "/include" "/lib" "/share" "/libexec" ]; extraOutputsToInstall = [ "out" "dev" ]; postBuild = '' diff --git a/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix b/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix index 5fef072f3990..5edd42d3004e 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix @@ -1,318 +1,318 @@ # DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6/fetch.sh +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6/ { fetchurl, mirror }: { qt3d = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qt3d-everywhere-src-6.6.2.tar.xz"; - sha256 = "10l5ldw8g8m1ig3hh78pwg749xqf2gw9vsi8p67gbkanmipfqx4i"; - name = "qt3d-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qt3d-everywhere-src-6.6.3.tar.xz"; + sha256 = "0v6zprw9r4z4inj7mg364n959c6japklm7ji2952nm3i01zp8jd5"; + name = "qt3d-everywhere-src-6.6.3.tar.xz"; }; }; qt5compat = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qt5compat-everywhere-src-6.6.2.tar.xz"; - sha256 = "0rqr34lqf4mjdgjj09wzlvkxfknz8arjl9p30xpqbr2qfsmhhyz0"; - name = "qt5compat-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qt5compat-everywhere-src-6.6.3.tar.xz"; + sha256 = "02zcrrh6rq5p6bqix5nk2h22rfqdrf4d0h7y4rva5zmbbr7czhk8"; + name = "qt5compat-everywhere-src-6.6.3.tar.xz"; }; }; qtactiveqt = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtactiveqt-everywhere-src-6.6.2.tar.xz"; - sha256 = "16vqb33s0dwxq1rrha81606fdwq1dz7az6mybgx18n7f081h3yl7"; - name = "qtactiveqt-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtactiveqt-everywhere-src-6.6.3.tar.xz"; + sha256 = "0balhrmzmjrqn6h2r3rr00776vxhdpqzwhk9knrlvix8i1kr86x1"; + name = "qtactiveqt-everywhere-src-6.6.3.tar.xz"; }; }; qtbase = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtbase-everywhere-src-6.6.2.tar.xz"; - sha256 = "0yv78bwqzy975854h53rbiilsms62f3v02i3jqz7v8ajk1ml56xq"; - name = "qtbase-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtbase-everywhere-src-6.6.3.tar.xz"; + sha256 = "0qklvzg242ilxw29jd2vsz6s8ni4dpraf4ghfa4dykhc705zv4q4"; + name = "qtbase-everywhere-src-6.6.3.tar.xz"; }; }; qtcharts = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtcharts-everywhere-src-6.6.2.tar.xz"; - sha256 = "1x7m87lxbza4ynf6dq7yshann6003302a5fxih5l5d07xri64j5i"; - name = "qtcharts-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtcharts-everywhere-src-6.6.3.tar.xz"; + sha256 = "1rbz2nm8wrdf060cssvs69b5kqv0ybxjqw1clm5mdllg2j38i5jh"; + name = "qtcharts-everywhere-src-6.6.3.tar.xz"; }; }; qtconnectivity = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtconnectivity-everywhere-src-6.6.2.tar.xz"; - sha256 = "1dzsvs0hngrz6b66r9zb4al5a4r6xxfd29i8g3jqmvw3b0452vx3"; - name = "qtconnectivity-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtconnectivity-everywhere-src-6.6.3.tar.xz"; + sha256 = "066mf4d6a81ywviwr8bvm1mpm2ykjzysvcc0v2x82h5bl28vl6h9"; + name = "qtconnectivity-everywhere-src-6.6.3.tar.xz"; }; }; qtdatavis3d = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtdatavis3d-everywhere-src-6.6.2.tar.xz"; - sha256 = "0iqw5afx8y29kjprn1hlz0zr0qwc9j0m7my75qf1av800hlnnjii"; - name = "qtdatavis3d-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtdatavis3d-everywhere-src-6.6.3.tar.xz"; + sha256 = "1gyz83hkmjin3fr3brg00qchbb0awprwx99idysrc6chckj825wv"; + name = "qtdatavis3d-everywhere-src-6.6.3.tar.xz"; }; }; qtdeclarative = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtdeclarative-everywhere-src-6.6.2.tar.xz"; - sha256 = "0k6qndjvkkx3g8lr7f64xx86b3cwxzkgpl6fr6cp73s6qjkyk763"; - name = "qtdeclarative-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtdeclarative-everywhere-src-6.6.3.tar.xz"; + sha256 = "1wwjlwjb3hnlpai4rrrdsm096a6ahb1izs3524r79jpjzhn7n805"; + name = "qtdeclarative-everywhere-src-6.6.3.tar.xz"; }; }; qtdoc = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtdoc-everywhere-src-6.6.2.tar.xz"; - sha256 = "0hvv40y2h7xa7wj2cqz2rrsvy1xf2l95199vmgx4q27wgmn1xixg"; - name = "qtdoc-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtdoc-everywhere-src-6.6.3.tar.xz"; + sha256 = "1j7awdbg7c0slbyhld8cdbx4dic7hhqv3g1qka809bjcxa2hb188"; + name = "qtdoc-everywhere-src-6.6.3.tar.xz"; }; }; qtgraphs = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtgraphs-everywhere-src-6.6.2.tar.xz"; - sha256 = "19j9hdpxrclsdwqqblp4bk94zd2a5rvxnf548hm7r03npznjvb26"; - name = "qtgraphs-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtgraphs-everywhere-src-6.6.3.tar.xz"; + sha256 = "1ppdas6bl22z69w8wdy7xl0f1kyqja2gwjd4cn6kjmsslws5rhi2"; + name = "qtgraphs-everywhere-src-6.6.3.tar.xz"; }; }; qtgrpc = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtgrpc-everywhere-src-6.6.2.tar.xz"; - sha256 = "1flfm8j5vw2j6xzms1b470mbqyab1nrnj4z9s4mgwnbsp4m5p85w"; - name = "qtgrpc-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtgrpc-everywhere-src-6.6.3.tar.xz"; + sha256 = "11q9cqqk8bs3k6n5pxys2r4fisbs3xvv8d8lsi7wm25rqh5qv1kj"; + name = "qtgrpc-everywhere-src-6.6.3.tar.xz"; }; }; qthttpserver = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qthttpserver-everywhere-src-6.6.2.tar.xz"; - sha256 = "1qzw96y20qr1kc9wmys61wm568jsknvlgvh09bbqjcmm6dm3lhd2"; - name = "qthttpserver-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qthttpserver-everywhere-src-6.6.3.tar.xz"; + sha256 = "0dbqx36ywfmqi4nxfi4dl17scj9nkl8sbpb670ffy3nh8pbpib21"; + name = "qthttpserver-everywhere-src-6.6.3.tar.xz"; }; }; qtimageformats = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtimageformats-everywhere-src-6.6.2.tar.xz"; - sha256 = "1cvwm0hnspglydms6qhcp5g0ayz5pamigl52kz8km66l6s8lqn3i"; - name = "qtimageformats-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtimageformats-everywhere-src-6.6.3.tar.xz"; + sha256 = "0z328i6fix1qdklfbs1w4dsr64zavjj5kzqvzipww0v62xhfm99w"; + name = "qtimageformats-everywhere-src-6.6.3.tar.xz"; }; }; qtlanguageserver = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtlanguageserver-everywhere-src-6.6.2.tar.xz"; - sha256 = "1bgazi44mwac20biybhp21icgwa8k7jd295j8jsfgzxbw12lq7y3"; - name = "qtlanguageserver-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtlanguageserver-everywhere-src-6.6.3.tar.xz"; + sha256 = "136gyvkzm6skdv5yhyy4nqhbczfc2mn4nbr9hvpkpljb0awv888h"; + name = "qtlanguageserver-everywhere-src-6.6.3.tar.xz"; }; }; qtlocation = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtlocation-everywhere-src-6.6.2.tar.xz"; - sha256 = "05glwmasg0rlhybzpb640iibcs6gyrqbs7h1ws4b5vgcmzzdq9cy"; - name = "qtlocation-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtlocation-everywhere-src-6.6.3.tar.xz"; + sha256 = "1l81z3zq1zg015l6qxx4yzssdspw689m9bpzxp23yshaych2kd6p"; + name = "qtlocation-everywhere-src-6.6.3.tar.xz"; }; }; qtlottie = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtlottie-everywhere-src-6.6.2.tar.xz"; - sha256 = "1hqhp55jfasavk7p8xb0srbc6lnk70w2q0x4iwn28z5s5kd1cvi7"; - name = "qtlottie-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtlottie-everywhere-src-6.6.3.tar.xz"; + sha256 = "1d0fjb0080wnd71f50zwal1b504iimln9mpnb3sc5yznmv8gm4cq"; + name = "qtlottie-everywhere-src-6.6.3.tar.xz"; }; }; qtmultimedia = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtmultimedia-everywhere-src-6.6.2.tar.xz"; - sha256 = "1v0430jnv97ws6cizn9mi8zr9hcg7rixd0jg7smhdq8apacjb572"; - name = "qtmultimedia-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtmultimedia-everywhere-src-6.6.3.tar.xz"; + sha256 = "1ciswpv8p71j9hwwdhfr5pmsrnizlaijp0dnyc99lk5is8qgh05y"; + name = "qtmultimedia-everywhere-src-6.6.3.tar.xz"; }; }; qtnetworkauth = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtnetworkauth-everywhere-src-6.6.2.tar.xz"; - sha256 = "1lijsdwbj8gscfllmp358n5ysa8pvhx2msh7gpxvb4x81daxbg9j"; - name = "qtnetworkauth-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtnetworkauth-everywhere-src-6.6.3.tar.xz"; + sha256 = "153mpg4hv3nclcdrkbzkalg4xf5k6r64fj003b725zyp885s7fax"; + name = "qtnetworkauth-everywhere-src-6.6.3.tar.xz"; }; }; qtpositioning = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtpositioning-everywhere-src-6.6.2.tar.xz"; - sha256 = "1qn31vps9dj4g8m7d195qlsyj3p4dfqqszdc6yqq097dq5y5d9sd"; - name = "qtpositioning-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtpositioning-everywhere-src-6.6.3.tar.xz"; + sha256 = "1frzzndsscb6iqschklks2l17ppnjpnx1lq1cypnq3x0598bcdws"; + name = "qtpositioning-everywhere-src-6.6.3.tar.xz"; }; }; qtquick3d = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtquick3d-everywhere-src-6.6.2.tar.xz"; - sha256 = "0f1sp7d1jzdzaxqs2l2yjprp0axcqbg2w82dza7wl4paan4rzp7w"; - name = "qtquick3d-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtquick3d-everywhere-src-6.6.3.tar.xz"; + sha256 = "1qls5cydhm7p1g3gqzvnism8k0h6wjzi8x12gn51dapvnzq2cxlr"; + name = "qtquick3d-everywhere-src-6.6.3.tar.xz"; }; }; qtquick3dphysics = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtquick3dphysics-everywhere-src-6.6.2.tar.xz"; - sha256 = "10209x9hbr5bc4vlhhcvvfsmsn2h3dyb4rlg0f0gpllx68mr58ac"; - name = "qtquick3dphysics-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtquick3dphysics-everywhere-src-6.6.3.tar.xz"; + sha256 = "0ipma4qdmzyyajs5inp7d3znh2hfx42gia7x9ahqpb515r49pqb7"; + name = "qtquick3dphysics-everywhere-src-6.6.3.tar.xz"; }; }; qtquickeffectmaker = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtquickeffectmaker-everywhere-src-6.6.2.tar.xz"; - sha256 = "0lywm71wp943dk3w8zkklyxfk97w48v670zs6pc4pj4ja0ns37q7"; - name = "qtquickeffectmaker-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtquickeffectmaker-everywhere-src-6.6.3.tar.xz"; + sha256 = "0mr350c9kj74g48lavq5z5c604cdgcyycfdpwv5z8bmbr49jl95w"; + name = "qtquickeffectmaker-everywhere-src-6.6.3.tar.xz"; }; }; qtquicktimeline = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtquicktimeline-everywhere-src-6.6.2.tar.xz"; - sha256 = "06cr9p0hrq77ckqslxh0h3lpyw31fblyap1plcyyj8ssr1rm4klc"; - name = "qtquicktimeline-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtquicktimeline-everywhere-src-6.6.3.tar.xz"; + sha256 = "0b266w7al90fbbp16w506klba50d4izf6nfcmmp5fpr6h5pxvcyk"; + name = "qtquicktimeline-everywhere-src-6.6.3.tar.xz"; }; }; qtremoteobjects = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtremoteobjects-everywhere-src-6.6.2.tar.xz"; - sha256 = "0fbkjzykxpkz8myr6dy588gcmhyy3lar17v78zfam8kyxq7s5qxa"; - name = "qtremoteobjects-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtremoteobjects-everywhere-src-6.6.3.tar.xz"; + sha256 = "16bd4zd3yfzlzk087qphphsh8hv38q3a57n1yknvkc5fchzmfzjz"; + name = "qtremoteobjects-everywhere-src-6.6.3.tar.xz"; }; }; qtscxml = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtscxml-everywhere-src-6.6.2.tar.xz"; - sha256 = "0gm4805570ds3jmkbwrjigbg93zc561bd5rc52r71042zzq84j89"; - name = "qtscxml-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtscxml-everywhere-src-6.6.3.tar.xz"; + sha256 = "1dbcw4qnss5rif97gdcimyzl3jqa508yph611dvvhc1xn16nl6qg"; + name = "qtscxml-everywhere-src-6.6.3.tar.xz"; }; }; qtsensors = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtsensors-everywhere-src-6.6.2.tar.xz"; - sha256 = "0a3w50bfnmxndyxnn9lsy1wxffhm2am0yjxqx3vx0gfjwv79yvsa"; - name = "qtsensors-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtsensors-everywhere-src-6.6.3.tar.xz"; + sha256 = "0r9p3lm159pji29vq9kii42jkz4rg15hqh6zlq9442i58a0ayddj"; + name = "qtsensors-everywhere-src-6.6.3.tar.xz"; }; }; qtserialbus = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtserialbus-everywhere-src-6.6.2.tar.xz"; - sha256 = "0g7sx81lrb5r2ipinnghq4iss6clkwbzjb0ck4ay6hmpw54smzww"; - name = "qtserialbus-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtserialbus-everywhere-src-6.6.3.tar.xz"; + sha256 = "1yyh1bh5pjlilcq84fgfw6wd0jak55wndwf0sn92lbhsp3y5lghl"; + name = "qtserialbus-everywhere-src-6.6.3.tar.xz"; }; }; qtserialport = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtserialport-everywhere-src-6.6.2.tar.xz"; - sha256 = "16j5fprmdzzc1snnj5184ihq5avg1s0jrqqcjk70dvmimsf0q7ms"; - name = "qtserialport-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtserialport-everywhere-src-6.6.3.tar.xz"; + sha256 = "0dywalgafvxi2jgdv9dk22hwwd8qsgk5xfybh75n3njmwmwnarg1"; + name = "qtserialport-everywhere-src-6.6.3.tar.xz"; }; }; qtshadertools = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtshadertools-everywhere-src-6.6.2.tar.xz"; - sha256 = "0bxrczs9nw6az2p4n8x0f660vsmxxynx4iqgj75l4zsfzzbym2v2"; - name = "qtshadertools-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtshadertools-everywhere-src-6.6.3.tar.xz"; + sha256 = "1rm17hyhq244zskq3ar3h22qjd5dshy84nnyq1ivhg5k7gb0j2cc"; + name = "qtshadertools-everywhere-src-6.6.3.tar.xz"; }; }; qtspeech = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtspeech-everywhere-src-6.6.2.tar.xz"; - sha256 = "1qvf3p2p1pc5fw40d8zq0iawaaqkc0dp5yx85b1dnw1j809bn8y0"; - name = "qtspeech-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtspeech-everywhere-src-6.6.3.tar.xz"; + sha256 = "1yh3r5zbhgwkjgs7yk6iv2w23766n1i4z8vjkkw5awdixx3gfa76"; + name = "qtspeech-everywhere-src-6.6.3.tar.xz"; }; }; qtsvg = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtsvg-everywhere-src-6.6.2.tar.xz"; - sha256 = "10c1dmbv5d39n1q4m67gf2h4n6wfkzrlyk8plnxbyhhvxxcis8ss"; - name = "qtsvg-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtsvg-everywhere-src-6.6.3.tar.xz"; + sha256 = "1ir57bis27whq7bwqykk1qlxy0522k4ia39brxayjmfadrbixjsa"; + name = "qtsvg-everywhere-src-6.6.3.tar.xz"; }; }; qttools = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qttools-everywhere-src-6.6.2.tar.xz"; - sha256 = "0ij7djy06xi4v5v29fh31gqq5rnc12vviv3qg3vqf4hiaagrxm76"; - name = "qttools-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qttools-everywhere-src-6.6.3.tar.xz"; + sha256 = "1h0vz46mpvzbm5w6sgpk0b3mqkn278l45arhxxk41dwc5n14qvda"; + name = "qttools-everywhere-src-6.6.3.tar.xz"; }; }; qttranslations = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qttranslations-everywhere-src-6.6.2.tar.xz"; - sha256 = "0xqcad8aa9lp6wzh1rs46id6r60zdw82qj3bq9k2b89sxy8c0fna"; - name = "qttranslations-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qttranslations-everywhere-src-6.6.3.tar.xz"; + sha256 = "1kvkrwbgby4i69dpxbxxcv0qbsz69n6icpyr4wcf8qm2r4m5zqqj"; + name = "qttranslations-everywhere-src-6.6.3.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtvirtualkeyboard-everywhere-src-6.6.2.tar.xz"; - sha256 = "07nqds49g2x748jsk17cnd2ph81165xnzn70jwxd0gpbi3dzshk1"; - name = "qtvirtualkeyboard-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtvirtualkeyboard-everywhere-src-6.6.3.tar.xz"; + sha256 = "0d517x60birlf8xb3sphchvgm235f8q1868q98kg76plzfhq57wq"; + name = "qtvirtualkeyboard-everywhere-src-6.6.3.tar.xz"; }; }; qtwayland = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtwayland-everywhere-src-6.6.2.tar.xz"; - sha256 = "0y6x84ckcc53ddclnrlzs08b1kvw6saw9nim0hz4wc5fyz7dbkcv"; - name = "qtwayland-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtwayland-everywhere-src-6.6.3.tar.xz"; + sha256 = "0gamcqpl302wlznfnlcg9vlnnhfpxgjnz05prwc9wpy0xh7wqvm9"; + name = "qtwayland-everywhere-src-6.6.3.tar.xz"; }; }; qtwebchannel = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtwebchannel-everywhere-src-6.6.2.tar.xz"; - sha256 = "1incvisc3j758b4k82vnwci8j1bba8zf6xgmgcrsm553k4wpsz1x"; - name = "qtwebchannel-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtwebchannel-everywhere-src-6.6.3.tar.xz"; + sha256 = "0cwcf4pri901piyj0lvqmks9l84di9rcafnfgrmgg5mls7jjlyvw"; + name = "qtwebchannel-everywhere-src-6.6.3.tar.xz"; }; }; qtwebengine = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtwebengine-everywhere-src-6.6.2.tar.xz"; - sha256 = "15h3hniszfkxv2vnn3fnbgbar8wb41ypgn4b4iz4iy6csar8f7fn"; - name = "qtwebengine-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtwebengine-everywhere-src-6.6.3.tar.xz"; + sha256 = "016qvbmdja2abajvsznnjdvblrmzgvs8s2dzlxws30hvna1xqavw"; + name = "qtwebengine-everywhere-src-6.6.3.tar.xz"; }; }; qtwebsockets = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtwebsockets-everywhere-src-6.6.2.tar.xz"; - sha256 = "1y9q8jmspxbfxf07jdcg4n8zwmchccyzp0z68fxr0hnvr2dymrn0"; - name = "qtwebsockets-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtwebsockets-everywhere-src-6.6.3.tar.xz"; + sha256 = "0dm066lv3n97ril9iyd5xn8j13m6r7xp844aagj6dpclaxv83x0n"; + name = "qtwebsockets-everywhere-src-6.6.3.tar.xz"; }; }; qtwebview = { - version = "6.6.2"; + version = "6.6.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtwebview-everywhere-src-6.6.2.tar.xz"; - sha256 = "0z3p1g26yg3dr3hhavwd5wz9b8yi838xj4s57068wykd80v145wb"; - name = "qtwebview-everywhere-src-6.6.2.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtwebview-everywhere-src-6.6.3.tar.xz"; + sha256 = "00jcxzi9wcbviscn5y0h0mkbac88lpjammg3zvfvjih7avgn6r10"; + name = "qtwebview-everywhere-src-6.6.3.tar.xz"; }; }; } diff --git a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 64f3b81edde9..63e02e98ff74 100644 --- a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , fetchpatch +, cmake , qmake , qtbase , qtsvg @@ -14,23 +15,24 @@ , wrapQtAppsHook , gitUpdater -, qt5Kvantum ? null +, qt6Kvantum ? null }: let - isQt6 = lib.versionAtLeast qtbase.version "6"; + isQt5 = lib.versionOlder qtbase.version "6"; in -stdenv.mkDerivation rec { - pname = "qtstyleplugin-kvantum${lib.optionalString isQt6 "6"}"; - version = "1.0.10"; +stdenv.mkDerivation (finalAttrs: { + pname = "qtstyleplugin-kvantum${lib.optionalString isQt5 "5"}"; + version = "1.1.0"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; - rev = "V${version}"; - sha256 = "48Blio8qHLmXSKG0c1tphXSfiwQXs0Xqwxe187nM3Ro="; + rev = "V${finalAttrs.version}"; + hash = "sha256-i+QjVPSzWNPVQmQkB+u/3Wrvqqoz5OIjRdyZKXzxZh4="; }; nativeBuildInputs = [ + cmake qmake qttools wrapQtAppsHook @@ -41,10 +43,11 @@ stdenv.mkDerivation rec { qtsvg libX11 libXext - ] ++ lib.optionals (!isQt6) [ qtx11extras kwindowsystem ] - ++ lib.optional isQt6 qtwayland; + kwindowsystem + ] ++ lib.optionals isQt5 [ qtx11extras ] + ++ lib.optionals (!isQt5) [ qtwayland ]; - sourceRoot = "${src.name}/Kvantum"; + sourceRoot = "${finalAttrs.src.name}/Kvantum"; patches = [ (fetchpatch { @@ -56,15 +59,19 @@ stdenv.mkDerivation rec { ]; postPatch = '' - # Fix plugin dir - substituteInPlace style/style.pro \ - --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" + substituteInPlace style/CMakeLists.txt \ + --replace-fail '"''${_Qt6_PLUGIN_INSTALL_DIR}/' "\"$out/$qtPluginPrefix/" \ + --replace-fail '"''${_Qt5_PLUGIN_INSTALL_DIR}/' "\"$out/$qtPluginPrefix/" ''; - postInstall = lib.optionalString isQt6 '' - # make default Kvantum themes available for Qt 6 apps + cmakeFlags = [ + (lib.cmakeBool "ENABLE_QT5" isQt5) + ]; + + postInstall = lib.optionalString isQt5 '' + # make default Kvantum themes available for Qt 5 apps mkdir -p "$out/share" - ln -s "${qt5Kvantum}/share/Kvantum" "$out/share/Kvantum" + ln -s "${qt6Kvantum}/share/Kvantum" "$out/share/Kvantum" ''; passthru.updateScript = gitUpdater { @@ -78,4 +85,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ romildo Scrumplex ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/quarto/default.nix b/nixpkgs/pkgs/development/libraries/quarto/default.nix index 09a44adbe561..99b9ebf79ae8 100644 --- a/nixpkgs/pkgs/development/libraries/quarto/default.nix +++ b/nixpkgs/pkgs/development/libraries/quarto/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation (final: { pname = "quarto"; - version = "1.4.551"; + version = "1.4.552"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz"; - sha256 = "sha256-RUnlLjJOf8hSj7aRCrmDSXFeNHCXnMY/bdbE3fbbThQ="; + sha256 = "sha256-I6uRqKgwb+VnbghA20BXEGrrLKOERc/IfF1TIDoymBw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/raylib/default.nix b/nixpkgs/pkgs/development/libraries/raylib/default.nix index e655645cd866..bb59eb9d654c 100644 --- a/nixpkgs/pkgs/development/libraries/raylib/default.nix +++ b/nixpkgs/pkgs/development/libraries/raylib/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "raylib"; - version = "4.5.0"; + version = "5.0"; src = fetchFromGitHub { owner = "raysan5"; repo = "raylib"; rev = finalAttrs.version; - hash = "sha256-Uqqzq5shDp0AgSBT5waHBNUkEu0LRj70SNOlR5R2yAM="; + hash = "sha256-gEstNs3huQ1uikVXOW4uoYnIDr5l8O9jgZRTX1mkRww="; }; nativeBuildInputs = [ cmake ]; @@ -56,20 +56,17 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = [ raylib-games ]; patches = [ - # Patch version in CMakeList to 4.5.0 - # Remove this when updating to a new revision + # Patch version in CMakeLists.txt to 5.0.0 + # The library author doesn't use cmake, so when updating this package please + # check that the resulting library extension matches the version + # and remove/update this patch (resulting library name should match + # libraylib.so.${finalAttrs.version} (fetchpatch { - url = "https://github.com/raysan5/raylib/commit/0d4db7ad7f6fd442ed165ebf8ab8b3f4033b04e7.patch"; - hash = "sha256-RGokbQAwJAZm2FU2VNwraE3xko8E+RLLFjUfDRXeKhA="; + url = "https://github.com/raysan5/raylib/commit/032cc497ca5aaca862dc926a93c2a45ed8017737.patch"; + hash = "sha256-qsX5AwyQaGoRsbdszOO7tUF9dR+AkEFi4ebNkBVHNEY="; }) ]; - # fix libasound.so/libpulse.so not being found - preFixup = '' - ${lib.optionalString alsaSupport "patchelf --add-needed ${alsa-lib}/lib/libasound.so $out/lib/libraylib.so.${finalAttrs.version}"} - ${lib.optionalString pulseSupport "patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/libraylib.so.${finalAttrs.version}"} - ''; - meta = with lib; { description = "A simple and easy-to-use library to enjoy videogames programming"; homepage = "https://www.raylib.com/"; diff --git a/nixpkgs/pkgs/development/libraries/rutabaga_gfx/darwin-install.patch b/nixpkgs/pkgs/development/libraries/rutabaga_gfx/darwin-install.patch new file mode 100644 index 000000000000..0b68ec2beb85 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/rutabaga_gfx/darwin-install.patch @@ -0,0 +1,31 @@ +diff --git a/rutabaga_gfx/ffi/Makefile b/rutabaga_gfx/ffi/Makefile +index f8c7820bf..e88a6c308 100644 +--- a/rutabaga_gfx/ffi/Makefile ++++ b/rutabaga_gfx/ffi/Makefile +@@ -47,24 +47,16 @@ build: + cargo build $(gfxstream_feature) $(release) + + install: build +-ifeq ($(UNAME), Linux) + install -D -m 755 $(OUT)/$(LIB_NAME) $(DESTDIR)$(libdir)/$(LIB_NAME).$(RUTABAGA_VERSION) +-endif + ifeq ($(UNAME), Darwin) +- install_name_tool -id $(DESTDIR)$(libdir)/$(LIB_NAME).$(RUTABAGA_VERSION) $(DESTDIR)$(libdir)/$(LIB_NAME) ++ install_name_tool -id $(DESTDIR)$(libdir)/$(LIB_NAME).$(RUTABAGA_VERSION) $(DESTDIR)$(libdir)/$(LIB_NAME).$(RUTABAGA_VERSION) + endif + + ln -sf $(LIB_NAME).$(RUTABAGA_VERSION) $(DESTDIR)$(libdir)/$(LIB_NAME).$(RUTABAGA_VERSION_MAJOR) + ln -sf $(LIB_NAME).$(RUTABAGA_VERSION) $(DESTDIR)$(libdir)/$(LIB_NAME) + +-ifeq ($(UNAME), Linux) + install -D -m 0644 $(SRC)/share/rutabaga_gfx_ffi.pc $(DESTDIR)$(libdir)/pkgconfig/rutabaga_gfx_ffi.pc + install -D -m 0644 $(SRC)/include/rutabaga_gfx_ffi.h $(DESTDIR)$(includedir)/rutabaga_gfx_ffi.h +-endif +-ifeq ($(UNAME), Darwin) +- install -m 0644 $(SRC)/share/rutabaga_gfx_ffi.pc $(DESTDIR)$(libdir)/pkgconfig/rutabaga_gfx_ffi.pc +- install -m 0644 $(SRC)/include/rutabaga_gfx_ffi.h $(DESTDIR)$(includedir)/rutabaga_gfx_ffi.h +-endif + + clean: + cargo clean $(release) + diff --git a/nixpkgs/pkgs/development/libraries/rutabaga_gfx/default.nix b/nixpkgs/pkgs/development/libraries/rutabaga_gfx/default.nix index 63f1ed88ae6c..687500272735 100644 --- a/nixpkgs/pkgs/development/libraries/rutabaga_gfx/default.nix +++ b/nixpkgs/pkgs/development/libraries/rutabaga_gfx/default.nix @@ -8,6 +8,7 @@ , aemu , gfxstream , libdrm +, libiconv }: stdenv.mkDerivation (finalAttrs: { @@ -29,10 +30,19 @@ stdenv.mkDerivation (finalAttrs: { decode = "base64 -d"; hash = "sha256-Ji1bK7jnRlg0OpDfCLcTHfPSiz3zYcdgsWL4n3EoIYI="; }) + # Fix error in Makefile where it uses eight spaces instead of a tab + # https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4863380 + (fetchpatch { + url = "https://chromium.googlesource.com/crosvm/crosvm/+/fc415bccc43d36f63a2fd4c28878591bb1053450%5E%21/?format=TEXT"; + decode = "base64 -d"; + hash = "sha256-SLzlZ4o1+R2bGTPvA0a5emq97hOIIIHrubFhcQjqYwg="; + }) + # Install the dylib on Darwin. + ./darwin-install.patch ]; nativeBuildInputs = [ cargo pkg-config rustPlatform.cargoSetupHook ]; - buildInputs = lib.optionals (lib.meta.availableOn stdenv.hostPlatform gfxstream) ([ + buildInputs = [ libiconv ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform gfxstream) ([ aemu gfxstream ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libdrm) [ diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/libxisf/default.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/libxisf/default.nix index 19fb83ca78be..d19dd2788745 100644 --- a/nixpkgs/pkgs/development/libraries/science/astronomy/libxisf/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/libxisf/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxisf"; - version = "0.2.11"; + version = "0.2.12"; src = fetchFromGitea { domain = "gitea.nouspiro.space"; owner = "nou"; repo = "libXISF"; rev = "v${finalAttrs.version}"; - hash = "sha256-wXIbU9/xUyECluL6k1oKS3NBpoC/qjQdW9e485qmlgo="; + hash = "sha256-QhshgKyf9s5U5JMa5TZelIo1tpJGlsOQePPG1kEfbq8="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/dftd4/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/dftd4/default.nix index 087c6e7d01de..ea7aafd156ae 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/dftd4/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/dftd4/default.nix @@ -1,8 +1,11 @@ { stdenv , lib , fetchFromGitHub -, cmake , gfortran +, meson +, ninja +, pkg-config +, python3 , blas , lapack , mctc-lib @@ -23,23 +26,20 @@ stdenv.mkDerivation rec { hash = "sha256-VIV9953hx0MZupOARdH+P1h7JtZeJmTlqtO8si+lwdU="; }; - nativeBuildInputs = [ cmake gfortran ]; + nativeBuildInputs = [ gfortran meson ninja pkg-config python3 ]; buildInputs = [ blas lapack mctc-lib mstore multicharge ]; outputs = [ "out" "dev" ]; - # Fix the Pkg-Config files for doubled store paths + doCheck = true; + postPatch = '' - substituteInPlace config/template.pc \ - --replace "\''${prefix}/" "" + patchShebangs --build \ + config/install-mod.py \ + app/tester.py ''; - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - ]; - - doCheck = true; preCheck = '' export OMP_NUM_THREADS=2 ''; diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix index a8c27b3eec56..58c1fdaf04e2 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix @@ -2,9 +2,11 @@ , lib , fetchFromGitHub , gfortran +, meson +, ninja , pkg-config +, python3 , json-fortran -, cmake }: stdenv.mkDerivation rec { @@ -18,24 +20,18 @@ stdenv.mkDerivation rec { hash = "sha256-AXjg/ZsitdDf9fNoGVmVal1iZ4/sxjJb7A9W4yye/rg="; }; - nativeBuildInputs = [ gfortran pkg-config cmake ]; + nativeBuildInputs = [ gfortran meson ninja pkg-config python3 ]; buildInputs = [ json-fortran ]; outputs = [ "out" "dev" ]; - # Fix the Pkg-Config files for doubled store paths + doCheck = true; + postPatch = '' - substituteInPlace config/template.pc \ - --replace "\''${prefix}/" "" + patchShebangs --build config/install-mod.py ''; - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - ]; - - doCheck = true; - meta = with lib; { description = "Modular computation tool chain library"; mainProgram = "mctc-convert"; diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/mstore/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/mstore/default.nix index 948d11435461..e187a9a9833f 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/mstore/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/mstore/default.nix @@ -1,8 +1,11 @@ { stdenv , lib , fetchFromGitHub -, cmake , gfortran +, meson +, ninja +, pkg-config +, python3 , mctc-lib }: @@ -17,22 +20,16 @@ stdenv.mkDerivation rec { hash = "sha256-dN2BulLS/ENRFVdJIrZRxgBV8S4d5+7BjTCGnhBbf4I="; }; - nativeBuildInputs = [ cmake gfortran ]; + nativeBuildInputs = [ gfortran meson ninja pkg-config python3 ]; buildInputs = [ mctc-lib ]; outputs = [ "out" "dev" ]; - # Fix the Pkg-Config files for doubled store paths postPatch = '' - substituteInPlace config/template.pc \ - --replace "\''${prefix}/" "" + patchShebangs --build config/install-mod.py ''; - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - ]; - meta = with lib; { description = "Molecular structure store for testing"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/multicharge/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/multicharge/default.nix index 020390737139..3660705242f6 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/multicharge/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/multicharge/default.nix @@ -1,8 +1,12 @@ { stdenv , lib , fetchFromGitHub -, cmake +, fetchpatch2 , gfortran +, meson +, ninja +, pkg-config +, python3 , blas , lapack , mctc-lib @@ -22,23 +26,28 @@ stdenv.mkDerivation rec { hash = "sha256-oUI5x5/Gd0EZBb1w+0jlJUF9X51FnkHFu8H7KctqXl0="; }; - nativeBuildInputs = [ cmake gfortran ]; + patches = [ + # Fix finding of MKL for Intel 2021 and newer + # Also fix finding mstore + # https://github.com/grimme-lab/multicharge/pull/20 + (fetchpatch2 { + url = "https://github.com/grimme-lab/multicharge/commit/98a11ac524cd2a1bd9e2aeb8f4429adb2d76ee8.patch"; + hash = "sha256-zZ2pcbyaHjN2ZxpMhlqUtIXImrVsLk/8WIcb9IYPgBw="; + }) + ]; + + nativeBuildInputs = [ gfortran meson ninja pkg-config python3 ]; buildInputs = [ blas lapack mctc-lib mstore ]; outputs = [ "out" "dev" ]; - # Fix the Pkg-Config files for doubled store paths + doCheck = true; + postPatch = '' - substituteInPlace config/template.pc \ - --replace "\''${prefix}/" "" + patchShebangs --build config/install-mod.py ''; - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - ]; - - doCheck = true; preCheck = '' export OMP_NUM_THREADS=2 ''; diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix index d4f81e3a24cb..eb8fa56455e4 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix @@ -2,7 +2,9 @@ , lib , fetchFromGitHub , gfortran -, cmake +, meson +, ninja +, pkg-config , mctc-lib , mstore , toml-f @@ -22,21 +24,12 @@ stdenv.mkDerivation rec { hash = "sha256-dfXiKKCGJ69aExSKpVC3Bp//COy256R9PDyxCNmDsfo="; }; - nativeBuildInputs = [ cmake gfortran ]; + nativeBuildInputs = [ gfortran meson ninja pkg-config ]; buildInputs = [ mctc-lib mstore toml-f blas ]; outputs = [ "out" "dev" ]; - # Fix the Pkg-Config files for doubled store paths - postPatch = '' - substituteInPlace config/template.pc \ - --replace "\''${prefix}/" "" - ''; - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - ]; - doCheck = true; preCheck = '' export OMP_NUM_THREADS=2 @@ -47,7 +40,7 @@ stdenv.mkDerivation rec { mainProgram = "s-dftd3"; license = with licenses; [ lgpl3Only gpl3Only ]; homepage = "https://github.com/dftd3/simple-dftd3"; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; maintainers = [ maintainers.sheepforce ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/default.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/default.nix index 64374972c295..4f8c43a08e49 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/default.nix @@ -2,8 +2,10 @@ , lib , fetchFromGitHub , fetchpatch -, cmake , gfortran +, meson +, ninja +, pkg-config , blas , lapack , mctc-lib @@ -35,13 +37,12 @@ stdenv.mkDerivation rec { }) ]; - # Fix the Pkg-Config files for doubled store paths - postPatch = '' - substituteInPlace config/template.pc \ - --replace "\''${prefix}/" "" - ''; - - nativeBuildInputs = [ cmake gfortran ]; + nativeBuildInputs = [ + gfortran + meson + ninja + pkg-config + ]; buildInputs = [ blas @@ -56,10 +57,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - ]; - doCheck = true; preCheck = '' export OMP_NUM_THREADS=2 diff --git a/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/python.nix b/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/python.nix index 3a72cfaaa6a3..cfe8668204e2 100644 --- a/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/python.nix +++ b/nixpkgs/pkgs/development/libraries/science/chemistry/tblite/python.nix @@ -1,4 +1,6 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage +, pythonAtLeast , fetchpatch , meson , ninja @@ -15,6 +17,7 @@ , toml-f , multicharge , dftd4 +, setuptools }: buildPythonPackage { @@ -27,6 +30,8 @@ buildPythonPackage { pkg-config gfortran mctc-lib + ] ++ lib.optionals (pythonAtLeast "3.12") [ + setuptools ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix b/nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix deleted file mode 100644 index c5426ed67fc7..000000000000 --- a/nixpkgs/pkgs/development/libraries/science/math/flintqs/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, autoreconfHook -, gmp -}: - -stdenv.mkDerivation rec { - version = "1.0"; - pname = "flintqs"; - - src = fetchFromGitHub { - owner = "sagemath"; - repo = "FlintQS"; - rev = "v${version}"; - sha256 = "1f0lnayz6j6qgasx8pbq61d2fqam0wwhsmh6h15l4vq58l1vvbwj"; - }; - - preAutoreconf = '' - touch ChangeLog - ''; - - buildInputs = [ - gmp - ]; - - nativeBuildInputs = [ - autoreconfHook - ]; - - doCheck = true; - - meta = with lib; { - description = "Highly optimized multi-polynomial quadratic sieve for integer factorization"; - homepage = "https://github.com/sagemath/FlintQS"; - license = with licenses; [ gpl2 ]; - maintainers = teams.sage.members; - mainProgram = "QuadraticSieve"; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix b/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix index 214f27046527..ac513297f159 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/m4rie/default.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation rec { m4ri ]; + # does not compile correctly with -O2 on LLVM clang; see + # https://bitbucket.org/malb/m4rie/issues/23/trying-to-compile-on-apple-m1 + makeFlags = [] ++ lib.optionals stdenv.isDarwin [ "CFLAGS=-O0" ]; nativeBuildInputs = [ autoreconfHook ]; @@ -35,7 +38,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = teams.sage.members; platforms = platforms.unix; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix b/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix index 505457edd64f..8f3fbe345126 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix @@ -2,6 +2,7 @@ , fetchurl , fetchpatch , coreutils +, dos2unix }: stdenv.mkDerivation rec { @@ -24,24 +25,54 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" ]; + nativeBuildInputs = [ dos2unix ]; + + prePatch = '' + find ./dietz/ -type f -exec dos2unix {} \; + ''; + patches = [ # Fix makefiles which use all the variables in all the wrong ways and # hardcode values for some variables. (fetchpatch { - url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/rubiks/patches/dietz-cu2-Makefile.patch"; - sha256 = "1ry3w1mk9q4jqd91zlaa1bdiiplld4hpfjaldbhlmzlgrrc99qmq"; + url = "https://raw.githubusercontent.com/sagemath/sage/2a9a4267f93588cf33119cbacc032ed9acc433e5/build/pkgs/rubiks/patches/dietz-cu2-Makefile.patch"; + sha256 = "bRU7MJ/6BgCp2PUqZOragJhm38Q3E8ShStXQIYwIjvw="; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/sagemath/sage/2a9a4267f93588cf33119cbacc032ed9acc433e5/build/pkgs/rubiks/patches/dietz-mcube-Makefile.patch"; + sha256 = "f53z4DogXKax1vUNkraOTt3TQ4bvT7CdQK/hOaaBS38="; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/sagemath/sage/2a9a4267f93588cf33119cbacc032ed9acc433e5/build/pkgs/rubiks/patches/dietz-solver-Makefile.patch"; + sha256 = "7gMC8y9elyIy2KvXYcp7YjPBNqn9PVhUle+/GrYAAdE="; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/sagemath/sage/2a9a4267f93588cf33119cbacc032ed9acc433e5/build/pkgs/rubiks/patches/reid-Makefile.patch"; + sha256 = "rp3SYtx02vVBtSlg1vJpdIoXNcdBNKDLCLqLAKwOYeQ="; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/sagemath/sage/2a9a4267f93588cf33119cbacc032ed9acc433e5/build/pkgs/rubiks/patches/fedora-1-rubiks-includes.patch"; + sha256 = "QYJ1KQ73HTEGY/beMVbcU215g/B8rHDjYD1YM2WZ7sk="; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/sagemath/sage/2a9a4267f93588cf33119cbacc032ed9acc433e5/build/pkgs/rubiks/patches/fedora-2-rubiks-ansi-c.patch"; + sha256 = "Rnu7uphE9URxnbg2K8mkymnB61magweH+WxVWR9JC4s="; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/sagemath/sage/2a9a4267f93588cf33119cbacc032ed9acc433e5/build/pkgs/rubiks/patches/fedora-3-rubiks-prototypes.patch"; + sha256 = "Wi038g+y7No1TNMiITtAdipjRi0+g6h0Sspslm5rZGU="; }) (fetchpatch { - url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/rubiks/patches/dietz-mcube-Makefile.patch"; - sha256 = "0zsbh6k3kqdg82fv0kzghr1x7pafisv943gmssqscp107bhg77bz"; + url = "https://raw.githubusercontent.com/sagemath/sage/2a9a4267f93588cf33119cbacc032ed9acc433e5/build/pkgs/rubiks/patches/fedora-4-rubiks-longtype.patch"; + sha256 = "6pNuxFM69CZ/TQGZfHXLlCN5g5lf3RiYYZKzMvLJwkw="; }) (fetchpatch { - url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/rubiks/patches/dietz-solver-Makefile.patch"; - sha256 = "0vhw70ylnmydgjhwx8jjlb2slccj4pfqn6vzirkyz1wp8apsmfhp"; + url = "https://raw.githubusercontent.com/sagemath/sage/2a9a4267f93588cf33119cbacc032ed9acc433e5/build/pkgs/rubiks/patches/fedora-5-rubiks-signed.patch"; + sha256 = "CCGXBMYvSjTm4YKQZAQMi6pWGjyHDYYQzdMZDSW2vFE="; }) (fetchpatch { - url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/rubiks/patches/reid-Makefile.patch"; - sha256 = "1r311sn012xs135s0d21qwsig2kld7rdcq19nm0zbnklviid57df"; + url = "https://raw.githubusercontent.com/sagemath/sage/2a9a4267f93588cf33119cbacc032ed9acc433e5/build/pkgs/rubiks/patches/fedora-6-rubiks-attributes.patch"; + sha256 = "RhlzMb33iaLfeBoF7Y0LIgEzOB/EC+AoWMSkRPCICaU="; }) ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index ac08cb876253..84949e0a5344 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "9.0.3"; + version = "9.1.0"; outputs = [ "out" "dev" ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - hash = "sha256-qRRrxMshLLEltCzXFv/j6NgRi6x1SHlAuKG5NfLiBFs="; + hash = "sha256-YK0REOqoNa55tQt6NH/0QQ07pzAImDR5kC00sbFILH8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/sentry-native/default.nix b/nixpkgs/pkgs/development/libraries/sentry-native/default.nix index c08e0f2112c9..63f8792d0a34 100644 --- a/nixpkgs/pkgs/development/libraries/sentry-native/default.nix +++ b/nixpkgs/pkgs/development/libraries/sentry-native/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - hash = "sha256-e2VjQ3U72X+bwRAi/6StLDWT8tf/MjatnmC/+jCgzTo="; + hash = "sha256-t1lk0gW72uQrLbeLdvlFzYEvOarbW2ya7sK6Ru3FW+o="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/smarty3/default.nix b/nixpkgs/pkgs/development/libraries/smarty3/default.nix index 3bf22261f219..6059bed339e6 100644 --- a/nixpkgs/pkgs/development/libraries/smarty3/default.nix +++ b/nixpkgs/pkgs/development/libraries/smarty3/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "smarty3"; - version = "3.1.44"; + version = "3.1.48"; src = fetchFromGitHub { owner = "smarty-php"; repo = "smarty"; rev = "v${version}"; - sha256 = "sha256-9a9OC18jyFpmFXffYOYHZ0j01j4NCF5zwrSYr1fZwqo="; + hash = "sha256-QGhccIJ7BZTWGF+n8rmB1RCVyJKID95NW6Yb2VvqqGQ="; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/tachyon/default.nix b/nixpkgs/pkgs/development/libraries/tachyon/default.nix index 02fb1fbc1324..2efee140a7e3 100644 --- a/nixpkgs/pkgs/development/libraries/tachyon/default.nix +++ b/nixpkgs/pkgs/development/libraries/tachyon/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { # see https://github.com/NixOS/nixpkgs/pull/117465 if stdenv.hostPlatform.system == "aarch64-linux" then "linux-arm" else if stdenv.hostPlatform.system == "armv7l-linux" then "linux-arm" else + if stdenv.hostPlatform.system == "aarch64-darwin" then "macosx" else if stdenv.hostPlatform.system == "x86_64-darwin" then "macosx-thr" else if stdenv.hostPlatform.system == "i686-darwin" then "macosx-64-thr" else if stdenv.hostPlatform.system == "i686-cygwin" then "win32" else diff --git a/nixpkgs/pkgs/development/libraries/test-drive/default.nix b/nixpkgs/pkgs/development/libraries/test-drive/default.nix index b858f39498c2..639582c3b8ae 100644 --- a/nixpkgs/pkgs/development/libraries/test-drive/default.nix +++ b/nixpkgs/pkgs/development/libraries/test-drive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, gfortran, cmake }: +{ stdenv, lib, fetchFromGitHub, gfortran, meson, ninja, mesonEmulatorHook }: stdenv.mkDerivation rec { pname = "test-drive"; @@ -11,21 +11,18 @@ stdenv.mkDerivation rec { hash = "sha256-ObAnHFP1Hp0knf/jtGHynVF0CCqK47eqetePx4NLmlM="; }; - postPatch = '' - substituteInPlace config/template.pc \ - --replace 'libdir=''${prefix}/@CMAKE_INSTALL_LIBDIR@' "libdir=@CMAKE_INSTALL_LIBDIR@" \ - --replace 'includedir=''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@' "includedir=@CMAKE_INSTALL_INCLUDEDIR@" - ''; - nativeBuildInputs = [ gfortran - cmake + meson + ninja + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; meta = with lib; { description = "Procedural Fortran testing framework"; homepage = "https://github.com/fortran-lang/test-drive"; - license = with licenses; [ asl20 mit ] ; + license = with licenses; [ asl20 mit ]; platforms = platforms.linux; maintainers = [ maintainers.sheepforce ]; }; diff --git a/nixpkgs/pkgs/development/libraries/toml-f/default.nix b/nixpkgs/pkgs/development/libraries/toml-f/default.nix index 28fb3dadce48..e24ceec58c07 100644 --- a/nixpkgs/pkgs/development/libraries/toml-f/default.nix +++ b/nixpkgs/pkgs/development/libraries/toml-f/default.nix @@ -2,7 +2,9 @@ , lib , fetchFromGitHub , gfortran -, cmake +, meson +, ninja +, pkg-config , test-drive }: @@ -17,29 +19,19 @@ stdenv.mkDerivation rec { hash = "sha256-+cac4rUNpd2w3yBdH1XoCKdJ9IgOHZioZg8AhzGY0FE="; }; - nativeBuildInputs = [ gfortran cmake ]; + nativeBuildInputs = [ gfortran meson ninja pkg-config ]; buildInputs = [ test-drive ]; outputs = [ "out" "dev" ]; - # Fix the Pkg-Config files for doubled store paths - postPatch = '' - substituteInPlace config/template.pc \ - --replace "\''${prefix}/" "" - ''; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - ]; - doCheck = true; meta = with lib; { description = "TOML parser implementation for data serialization and deserialization in Fortran"; license = with licenses; [ asl20 mit ]; homepage = "https://github.com/toml-f/toml-f"; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; maintainers = [ maintainers.sheepforce ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index 7ca5ffc19020..07fc616efacc 100644 --- a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -20,8 +20,6 @@ , wayland , wayland-protocols , libwebp -, libwpe -, libwpe-fdo , enchant2 , xorg , libxkbcommon @@ -48,7 +46,6 @@ , libintl , lcms2 , libmanette -, openjpeg , geoclue2 , sqlite , gst-plugins-base @@ -56,6 +53,7 @@ , woff2 , bubblewrap , libseccomp +, libbacktrace , systemd , xdg-dbus-proxy , substituteAll @@ -70,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.42.5"; + version = "2.44.0"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -81,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-tkJ4wfILjP2/tf9XPDfYcaunSh2ybZs5906JU/5h50k="; + hash = "sha256-xmUw5Bulmx7bpO6J7yCyGI4nO+0El+lQhHKePPvjDIc="; }; patches = lib.optionals stdenv.isLinux [ @@ -90,13 +88,6 @@ stdenv.mkDerivation (finalAttrs: { inherit (builtins) storeDir; inherit (addOpenGLRunpath) driverLink; }) - - # Hardcode path to WPE backend - # https://github.com/NixOS/nixpkgs/issues/110468 - (substituteAll { - src = ./fdo-backend-path.patch; - wpebackend_fdo = libwpe-fdo; - }) ]; preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' @@ -150,17 +141,12 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon libxml2 libxslt + libbacktrace nettle - openjpeg p11-kit sqlite woff2 - ] ++ (with xorg; [ - libXdamage - libXdmcp - libXt - libXtst - ]) ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ libedit readline ] ++ lib.optional (stdenv.isDarwin && !stdenv.isAarch64) ( @@ -175,8 +161,7 @@ stdenv.mkDerivation (finalAttrs: { libseccomp libmanette wayland - libwpe - libwpe-fdo + xorg.libX11 ] ++ lib.optionals systemdSupport [ systemd ] ++ lib.optionals enableGeoLocation [ @@ -184,7 +169,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals withLibsecret [ libsecret ] ++ lib.optionals (lib.versionAtLeast gtk3.version "4.0") [ - xorg.libXcomposite wayland-protocols ]; @@ -214,8 +198,8 @@ stdenv.mkDerivation (finalAttrs: { "-DENABLE_X11_TARGET=OFF" "-DUSE_APPLE_ICU=OFF" "-DUSE_OPENGL_OR_ES=OFF" - ] ++ lib.optionals (lib.versionAtLeast gtk3.version "4.0") [ - "-DUSE_GTK4=ON" + ] ++ lib.optionals (lib.versionOlder gtk3.version "4.0") [ + "-DUSE_GTK4=OFF" ] ++ lib.optionals (!systemdSupport) [ "-DENABLE_JOURNALD_LOG=OFF" ]; diff --git a/nixpkgs/pkgs/development/libraries/webkitgtk/fdo-backend-path.patch b/nixpkgs/pkgs/development/libraries/webkitgtk/fdo-backend-path.patch deleted file mode 100644 index 48e7d9cca745..000000000000 --- a/nixpkgs/pkgs/development/libraries/webkitgtk/fdo-backend-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp -+++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp -@@ -84,7 +84,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process - - #if PLATFORM(WAYLAND) - if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::Wayland && parameters.dmaBufRendererBufferMode.isEmpty()) { -- wpe_loader_init("libWPEBackend-fdo-1.0.so.1"); -+ wpe_loader_init("@wpebackend_fdo@/lib/libWPEBackend-fdo-1.0.so.1"); - if (AcceleratedBackingStoreWayland::checkRequirements()) { - parameters.hostClientFileDescriptor = UnixFileDescriptor { wpe_renderer_host_create_client(), UnixFileDescriptor::Adopt }; - parameters.implementationLibraryName = FileSystem::fileSystemRepresentation(String::fromLatin1(wpe_loader_get_loaded_implementation_library_name())); diff --git a/nixpkgs/pkgs/development/lisp-modules/packages.nix b/nixpkgs/pkgs/development/lisp-modules/packages.nix index 73cc1f35c657..55c4c5abf7f8 100644 --- a/nixpkgs/pkgs/development/lisp-modules/packages.nix +++ b/nixpkgs/pkgs/development/lisp-modules/packages.nix @@ -201,6 +201,14 @@ let ''; }; + cephes = build-with-compile-into-pwd { + inherit (super.cephes) pname version src lispLibs; + patches = [ ./patches/cephes-make.patch ]; + postConfigure = '' + substituteAllInPlace cephes.asd + ''; + }; + clx-truetype = build-asdf-system { pname = "clx-truetype"; version = "20160825-git"; diff --git a/nixpkgs/pkgs/development/lisp-modules/patches/cephes-make.patch b/nixpkgs/pkgs/development/lisp-modules/patches/cephes-make.patch new file mode 100644 index 000000000000..b67b5f70ad3c --- /dev/null +++ b/nixpkgs/pkgs/development/lisp-modules/patches/cephes-make.patch @@ -0,0 +1,22 @@ +--- a/cephes.asd ++++ b/cephes.asd +@@ -5,7 +5,7 @@ + (defclass makefile (source-file) ((type :initform "m"))) + (defmethod perform ((o load-op) (c makefile)) t) + (defmethod perform ((o compile-op) (c makefile)) +- (let* ((lib-dir (system-relative-pathname "cephes" "scipy-cephes")) ++ (let* ((lib-dir #P"@out@/scipy-cephes") + (lib (make-pathname :directory `(:relative ,(namestring lib-dir)) + :name "libmd" + :type #+darwin "dylib" #+(and unix (not darwin)) "so" #+(or windows win32) "dll")) +@@ -14,7 +14,7 @@ + (format *error-output* "Library ~S exists, skipping build" lib) + (format *error-output* "Building ~S~%" lib)) + (unless built +- (chdir (native-namestring lib-dir)) ++ (chdir "scipy-cephes") + (run-program "make" :output t)))) + + (defsystem "cephes" + +Diff finished. Thu Mar 28 08:13:30 2024 diff --git a/nixpkgs/pkgs/development/misc/juce/default.nix b/nixpkgs/pkgs/development/misc/juce/default.nix index 7625c7df27bd..4eeae4e36673 100644 --- a/nixpkgs/pkgs/development/misc/juce/default.nix +++ b/nixpkgs/pkgs/development/misc/juce/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "juce"; - version = "7.0.9"; + version = "7.0.10"; src = fetchFromGitHub { owner = "juce-framework"; repo = "juce"; rev = finalAttrs.version; - hash = "sha256-k8cNTPH9OgOav4dsSLqrd5PlJ1rqO0PLt6Lwmumc2Gg="; + hash = "sha256-CAHhHPTUvIyDOh2CdvNmw26HfoWWtbqRRiR+3Ky4GYA="; }; patches = [ diff --git a/nixpkgs/pkgs/development/misc/resholve/README.md b/nixpkgs/pkgs/development/misc/resholve/README.md index 439e4ea8188d..0e875a765658 100644 --- a/nixpkgs/pkgs/development/misc/resholve/README.md +++ b/nixpkgs/pkgs/development/misc/resholve/README.md @@ -99,20 +99,22 @@ trivial, so I'll also link to some real-world examples: - [shell.nix from abathur/tdverpy](https://github.com/abathur/tdverpy/blob/e1f956df3ed1c7097a5164e0c85b178772e277f5/shell.nix#L6-L13) ```nix -resholvedScript = resholve.writeScript "name" { - inputs = [ file ]; - interpreter = "${bash}/bin/bash"; - } '' - echo "Hello" - file . - ''; -resholvedScriptBin = resholve.writeScriptBin "name" { - inputs = [ file ]; - interpreter = "${bash}/bin/bash"; - } '' - echo "Hello" - file . - ''; +{ + resholvedScript = resholve.writeScript "name" { + inputs = [ file ]; + interpreter = "${bash}/bin/bash"; + } '' + echo "Hello" + file . + ''; + resholvedScriptBin = resholve.writeScriptBin "name" { + inputs = [ file ]; + interpreter = "${bash}/bin/bash"; + } '' + echo "Hello" + file . + ''; +} ``` @@ -212,29 +214,31 @@ This will hopefully make more sense when you see it. Here are CLI examples from the manpage, and the Nix equivalents: ```nix -# --fake 'f:setUp;tearDown builtin:setopt source:/etc/bashrc' -fake = { - # fake accepts the initial of valid identifier types as a CLI convenience. - # Use full names in the Nix API. - function = [ "setUp" "tearDown" ]; - builtin = [ "setopt" ]; - source = [ "/etc/bashrc" ]; -}; - -# --fix 'aliases $GIT:gix /bin/bash' -fix = { - # all single-word directives use `true` as value - aliases = true; - "$GIT" = [ "gix" ]; - "/bin/bash"; -}; - -# --keep 'source:$HOME /etc/bashrc ~/.bashrc' -keep = { - source = [ "$HOME" ]; - "/etc/bashrc" = true; - "~/.bashrc" = true; -}; +{ + # --fake 'f:setUp;tearDown builtin:setopt source:/etc/bashrc' + fake = { + # fake accepts the initial of valid identifier types as a CLI convenience. + # Use full names in the Nix API. + function = [ "setUp" "tearDown" ]; + builtin = [ "setopt" ]; + source = [ "/etc/bashrc" ]; + }; + + # --fix 'aliases $GIT:gix /bin/bash' + fix = { + # all single-word directives use `true` as value + aliases = true; + "$GIT" = [ "gix" ]; + interpreter = "/bin/bash"; + }; + + # --keep 'source:$HOME /etc/bashrc ~/.bashrc' + keep = { + source = [ "$HOME" ]; + "/etc/bashrc" = true; + "~/.bashrc" = true; + }; +} ``` @@ -283,27 +287,29 @@ the main lever is the ability to substitute your own lore. This is how you'd do it piecemeal: ```nix -# --execer 'cannot:${openssl.bin}/bin/openssl can:${openssl.bin}/bin/c_rehash' -execer = [ - /* - This is the same verdict binlore will - come up with. It's a no-op just to demo - how to fiddle lore via the Nix API. - */ - "cannot:${openssl.bin}/bin/openssl" - # different verdict, but not used - "can:${openssl.bin}/bin/c_rehash" -]; - -# --wrapper '${gnugrep}/bin/egrep:${gnugrep}/bin/grep' -wrapper = [ - /* - This is the same verdict binlore will - come up with. It's a no-op just to demo - how to fiddle lore via the Nix API. - */ - "${gnugrep}/bin/egrep:${gnugrep}/bin/grep" -]; +{ + # --execer 'cannot:${openssl.bin}/bin/openssl can:${openssl.bin}/bin/c_rehash' + execer = [ + /* + This is the same verdict binlore will + come up with. It's a no-op just to demo + how to fiddle lore via the Nix API. + */ + "cannot:${openssl.bin}/bin/openssl" + # different verdict, but not used + "can:${openssl.bin}/bin/c_rehash" + ]; + + # --wrapper '${gnugrep}/bin/egrep:${gnugrep}/bin/grep' + wrapper = [ + /* + This is the same verdict binlore will + come up with. It's a no-op just to demo + how to fiddle lore via the Nix API. + */ + "${gnugrep}/bin/egrep:${gnugrep}/bin/grep" + ]; +} ``` diff --git a/nixpkgs/pkgs/development/ocaml-modules/cry/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cry/default.nix index e4339ef7563b..83a1d269060e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cry/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cry/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "cry"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-cry"; rev = "v${version}"; - hash = "sha256-wtilYOUOHElW8ZVxolMNomvT//ho2tACmoubEvU2bpQ="; + hash = "sha256-ea6f2xTVmYekPmzAKasA9mNG4Voxw2MCkfZ9LB9gwbo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/ocaml-modules/irmin/chunk.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/chunk.nix index 61a0d6021ab6..59bd81544945 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/irmin/chunk.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/chunk.nix @@ -4,7 +4,6 @@ buildDunePackage rec { pname = "irmin-chunk"; inherit (irmin) version src strictDeps; - duneVersion = "3"; propagatedBuildInputs = [ irmin fmt logs lwt ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/irmin/containers.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/containers.nix index aa003f39b3f4..73cd25f3170d 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/irmin/containers.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/containers.nix @@ -7,7 +7,6 @@ buildDunePackage { pname = "irmin-containers"; inherit (ppx_irmin) src version strictDeps; - duneVersion = "3"; nativeBuildInputs = [ ppx_irmin diff --git a/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix index 485547ddcad6..d273d19553c1 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix @@ -10,7 +10,6 @@ buildDunePackage { inherit (ppx_irmin) src version strictDeps; minimalOCamlVersion = "4.10"; - duneVersion = "3"; propagatedBuildInputs = [ astring diff --git a/nixpkgs/pkgs/development/ocaml-modules/irmin/fs.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/fs.nix index 4b8d7c4b97aa..1788cf1eda23 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/irmin/fs.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/fs.nix @@ -7,7 +7,6 @@ buildDunePackage rec { pname = "irmin-fs"; inherit (irmin) version src strictDeps; - duneVersion = "3"; propagatedBuildInputs = [ irmin astring logs lwt ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix index c48928159130..387fc60a0aa9 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix @@ -10,7 +10,6 @@ buildDunePackage { pname = "irmin-git"; inherit (irmin) version src strictDeps; - duneVersion = "3"; propagatedBuildInputs = [ git diff --git a/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix index 005bf25eb2d9..1b5ecb51396f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix @@ -7,7 +7,6 @@ buildDunePackage rec { pname = "irmin-graphql"; inherit (irmin) version src; - duneVersion = "3"; propagatedBuildInputs = [ cohttp-lwt cohttp-lwt-unix graphql-cohttp graphql-lwt irmin git-unix ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix index 9a466928c64a..1b376425bdce 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix @@ -9,8 +9,6 @@ buildDunePackage rec { pname = "irmin-http"; inherit (irmin) version src strictDeps; - duneVersion = "3"; - propagatedBuildInputs = [ astring cohttp-lwt cohttp-lwt-unix fmt jsonm logs lwt uri irmin webmachine ]; @@ -25,5 +23,3 @@ buildDunePackage rec { }; } - - diff --git a/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage-git.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage-git.nix index 1491439f7656..09c1820d6094 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage-git.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage-git.nix @@ -7,7 +7,6 @@ buildDunePackage { pname = "irmin-mirage-git"; inherit (irmin-mirage) version src strictDeps; - duneVersion = "3"; propagatedBuildInputs = [ irmin-mirage diff --git a/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage-graphql.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage-graphql.nix index 75d3c567a04d..bfbe45b39019 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage-graphql.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage-graphql.nix @@ -6,7 +6,6 @@ buildDunePackage { pname = "irmin-mirage-graphql"; inherit (irmin-mirage) version src strictDeps; - duneVersion = "3"; propagatedBuildInputs = [ irmin-mirage diff --git a/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage.nix index 2d7d0a891249..9e4bd9330799 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/mirage.nix @@ -4,7 +4,6 @@ buildDunePackage { pname = "irmin-mirage"; inherit (irmin) version src strictDeps; - duneVersion = "3"; propagatedBuildInputs = [ irmin fmt ptime mirage-clock diff --git a/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix index 8c0c7b2a3b00..9afb40c20766 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix @@ -4,8 +4,7 @@ }: buildDunePackage rec { - minimalOCamlVersion = "4.10"; - duneVersion = "3"; + minimalOCamlVersion = "4.12"; pname = "irmin-pack"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix index 4ff7f4a8bdd8..78207bf009e8 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -2,15 +2,14 @@ buildDunePackage rec { pname = "ppx_irmin"; - version = "3.5.1"; + version = "3.7.2"; src = fetchurl { url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; - hash = "sha256-zXiKjT9KPdGNwWChU9SuyR6vaw+0GtQUZNJsecMEqY4="; + hash = "sha256-aqW6TGoCM3R9S9OrOW8rOjO7gPnY7UoXjIOgNQM8DlI="; }; minimalOCamlVersion = "4.10"; - duneVersion = "3"; propagatedBuildInputs = [ ppx_repr diff --git a/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix index 4e2ccce71663..942200bf429a 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix @@ -8,7 +8,6 @@ buildDunePackage { pname = "irmin-test"; inherit (irmin) version src strictDeps; - duneVersion = "3"; nativeBuildInputs = [ ppx_irmin ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/irmin/tezos.nix b/nixpkgs/pkgs/development/ocaml-modules/irmin/tezos.nix index ddfc0d073205..82a89daec359 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/irmin/tezos.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/irmin/tezos.nix @@ -7,7 +7,6 @@ buildDunePackage rec { pname = "irmin-tezos"; inherit (irmin) version src strictDeps; - duneVersion = "3"; propagatedBuildInputs = [ irmin diff --git a/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix b/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix index a62cd9152ae6..0baa38c806ef 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix @@ -10,8 +10,8 @@ build system is required, the attribute `run` can be used. let param = if lib.versionAtLeast ocaml.version "4.05" then { - version = "1.0.5"; - sha256 = "sha256-RSCCYm5lGsSxYzwrSuTK16vrH7ahMEbmmfle7Fi10cc="; + version = "1.0.7"; + sha256 = "sha256-X8Iq0/OtbRJ8sSRdGFgIgUeNotbeULIxXm3UWGxSvhk="; } else if lib.versionAtLeast ocaml.version "4.03" then { version = "1.0.3"; sha256 = "0b77gsz9bqby8v77kfi4lans47x9p2lmzanzwins5r29maphb8y6"; diff --git a/nixpkgs/pkgs/development/php-packages/mongodb/default.nix b/nixpkgs/pkgs/development/php-packages/mongodb/default.nix index e3f79cee61f1..7e83041da136 100644 --- a/nixpkgs/pkgs/development/php-packages/mongodb/default.nix +++ b/nixpkgs/pkgs/development/php-packages/mongodb/default.nix @@ -15,13 +15,13 @@ buildPecl rec { pname = "mongodb"; - version = "1.17.3"; + version = "1.18.0"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-php-driver"; rev = version; - hash = "sha256-5luaCrrnL7l9zhbxYUMSlID7Sx0MQhgFKgl8F6GkGsE="; + hash = "sha256-KrRWogmGMGaMRhU5D5xF5LTvJ6g9XSoDA5KfJxftvws="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/php-packages/phpinsights/composer.lock b/nixpkgs/pkgs/development/php-packages/phpinsights/composer.lock new file mode 100644 index 000000000000..8fe99422b57f --- /dev/null +++ b/nixpkgs/pkgs/development/php-packages/phpinsights/composer.lock @@ -0,0 +1,5856 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], + "content-hash": "bb5b748039828c517cd4b7af903f281c", + "packages": [ + { + "name": "cmgmyr/phploc", + "version": "8.0.3", + "source": { + "type": "git", + "url": "https://github.com/cmgmyr/phploc.git", + "reference": "e61d4729df46c5920ab61973bfa3f70f81a70b5f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cmgmyr/phploc/zipball/e61d4729df46c5920ab61973bfa3f70f81a70b5f", + "reference": "e61d4729df46c5920ab61973bfa3f70f81a70b5f", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-json": "*", + "php": "^7.4 || ^8.0", + "phpunit/php-file-iterator": "^3.0|^4.0", + "sebastian/cli-parser": "^1.0|^2.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^3.2", + "phpunit/phpunit": "^9.0|^10.0", + "vimeo/psalm": "^5.7" + }, + "bin": [ + "phploc" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "8.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Chris Gmyr", + "email": "cmgmyr@gmail.com", + "role": "lead" + } + ], + "description": "A tool for quickly measuring the size of a PHP project.", + "homepage": "https://github.com/cmgmyr/phploc", + "support": { + "issues": "https://github.com/cmgmyr/phploc/issues", + "source": "https://github.com/cmgmyr/phploc/tree/8.0.3" + }, + "funding": [ + { + "url": "https://github.com/cmgmyr", + "type": "github" + } + ], + "time": "2023-08-05T16:49:39+00:00" + }, + { + "name": "composer/pcre", + "version": "3.1.2", + "source": { + "type": "git", + "url": "https://github.com/composer/pcre.git", + "reference": "4775f35b2d70865807c89d32c8e7385b86eb0ace" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/pcre/zipball/4775f35b2d70865807c89d32c8e7385b86eb0ace", + "reference": "4775f35b2d70865807c89d32c8e7385b86eb0ace", + "shasum": "" + }, + "require": { + "php": "^7.4 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.3", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Pcre\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "PCRE wrapping library that offers type-safe preg_* replacements.", + "keywords": [ + "PCRE", + "preg", + "regex", + "regular expression" + ], + "support": { + "issues": "https://github.com/composer/pcre/issues", + "source": "https://github.com/composer/pcre/tree/3.1.2" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2024-03-07T15:38:35+00:00" + }, + { + "name": "composer/semver", + "version": "3.4.0", + "source": { + "type": "git", + "url": "https://github.com/composer/semver.git", + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.4", + "symfony/phpunit-bridge": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Semver\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" + } + ], + "description": "Semver library that offers utilities, version constraint parsing and validation.", + "keywords": [ + "semantic", + "semver", + "validation", + "versioning" + ], + "support": { + "irc": "ircs://irc.libera.chat:6697/composer", + "issues": "https://github.com/composer/semver/issues", + "source": "https://github.com/composer/semver/tree/3.4.0" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2023-08-31T09:50:34+00:00" + }, + { + "name": "composer/xdebug-handler", + "version": "3.0.3", + "source": { + "type": "git", + "url": "https://github.com/composer/xdebug-handler.git", + "reference": "ced299686f41dce890debac69273b47ffe98a40c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c", + "reference": "ced299686f41dce890debac69273b47ffe98a40c", + "shasum": "" + }, + "require": { + "composer/pcre": "^1 || ^2 || ^3", + "php": "^7.2.5 || ^8.0", + "psr/log": "^1 || ^2 || ^3" + }, + "require-dev": { + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Composer\\XdebugHandler\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "John Stevenson", + "email": "john-stevenson@blueyonder.co.uk" + } + ], + "description": "Restarts a process without Xdebug.", + "keywords": [ + "Xdebug", + "performance" + ], + "support": { + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/xdebug-handler/issues", + "source": "https://github.com/composer/xdebug-handler/tree/3.0.3" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2022-02-25T21:32:43+00:00" + }, + { + "name": "dealerdirect/phpcodesniffer-composer-installer", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/PHPCSStandards/composer-installer.git", + "reference": "4be43904336affa5c2f70744a348312336afd0da" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/4be43904336affa5c2f70744a348312336afd0da", + "reference": "4be43904336affa5c2f70744a348312336afd0da", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0 || ^2.0", + "php": ">=5.4", + "squizlabs/php_codesniffer": "^2.0 || ^3.1.0 || ^4.0" + }, + "require-dev": { + "composer/composer": "*", + "ext-json": "*", + "ext-zip": "*", + "php-parallel-lint/php-parallel-lint": "^1.3.1", + "phpcompatibility/php-compatibility": "^9.0", + "yoast/phpunit-polyfills": "^1.0" + }, + "type": "composer-plugin", + "extra": { + "class": "PHPCSStandards\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin" + }, + "autoload": { + "psr-4": { + "PHPCSStandards\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Franck Nijhof", + "email": "franck.nijhof@dealerdirect.com", + "homepage": "http://www.frenck.nl", + "role": "Developer / IT Manager" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/composer-installer/graphs/contributors" + } + ], + "description": "PHP_CodeSniffer Standards Composer Installer Plugin", + "homepage": "http://www.dealerdirect.com", + "keywords": [ + "PHPCodeSniffer", + "PHP_CodeSniffer", + "code quality", + "codesniffer", + "composer", + "installer", + "phpcbf", + "phpcs", + "plugin", + "qa", + "quality", + "standard", + "standards", + "style guide", + "stylecheck", + "tests" + ], + "support": { + "issues": "https://github.com/PHPCSStandards/composer-installer/issues", + "source": "https://github.com/PHPCSStandards/composer-installer" + }, + "time": "2023-01-05T11:28:13+00:00" + }, + { + "name": "friendsofphp/php-cs-fixer", + "version": "v3.51.0", + "source": { + "type": "git", + "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", + "reference": "127fa74f010da99053e3f5b62672615b72dd6efd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/127fa74f010da99053e3f5b62672615b72dd6efd", + "reference": "127fa74f010da99053e3f5b62672615b72dd6efd", + "shasum": "" + }, + "require": { + "composer/semver": "^3.4", + "composer/xdebug-handler": "^3.0.3", + "ext-filter": "*", + "ext-json": "*", + "ext-tokenizer": "*", + "php": "^7.4 || ^8.0", + "sebastian/diff": "^4.0 || ^5.0 || ^6.0", + "symfony/console": "^5.4 || ^6.0 || ^7.0", + "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0", + "symfony/filesystem": "^5.4 || ^6.0 || ^7.0", + "symfony/finder": "^5.4 || ^6.0 || ^7.0", + "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0", + "symfony/polyfill-mbstring": "^1.28", + "symfony/polyfill-php80": "^1.28", + "symfony/polyfill-php81": "^1.28", + "symfony/process": "^5.4 || ^6.0 || ^7.0", + "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0" + }, + "require-dev": { + "facile-it/paraunit": "^1.3 || ^2.0", + "justinrainbow/json-schema": "^5.2", + "keradus/cli-executor": "^2.1", + "mikey179/vfsstream": "^1.6.11", + "php-coveralls/php-coveralls": "^2.7", + "php-cs-fixer/accessible-object": "^1.1", + "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.4", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.4", + "phpunit/phpunit": "^9.6 || ^10.5.5 || ^11.0.2", + "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0", + "symfony/yaml": "^5.4 || ^6.0 || ^7.0" + }, + "suggest": { + "ext-dom": "For handling output formats in XML", + "ext-mbstring": "For handling non-UTF8 characters." + }, + "bin": [ + "php-cs-fixer" + ], + "type": "application", + "autoload": { + "psr-4": { + "PhpCsFixer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Dariusz Rumiński", + "email": "dariusz.ruminski@gmail.com" + } + ], + "description": "A tool to automatically fix PHP code style", + "keywords": [ + "Static code analysis", + "fixer", + "standards", + "static analysis" + ], + "support": { + "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.51.0" + }, + "funding": [ + { + "url": "https://github.com/keradus", + "type": "github" + } + ], + "time": "2024-02-28T19:50:06+00:00" + }, + { + "name": "justinrainbow/json-schema", + "version": "v5.2.13", + "source": { + "type": "git", + "url": "https://github.com/justinrainbow/json-schema.git", + "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", + "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1", + "json-schema/json-schema-test-suite": "1.2.0", + "phpunit/phpunit": "^4.8.35" + }, + "bin": [ + "bin/validate-json" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "JsonSchema\\": "src/JsonSchema/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bruno Prieto Reis", + "email": "bruno.p.reis@gmail.com" + }, + { + "name": "Justin Rainbow", + "email": "justin.rainbow@gmail.com" + }, + { + "name": "Igor Wiedler", + "email": "igor@wiedler.ch" + }, + { + "name": "Robert Schönthal", + "email": "seroscho@googlemail.com" + } + ], + "description": "A library to validate a json schema.", + "homepage": "https://github.com/justinrainbow/json-schema", + "keywords": [ + "json", + "schema" + ], + "support": { + "issues": "https://github.com/justinrainbow/json-schema/issues", + "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13" + }, + "time": "2023-09-26T02:20:38+00:00" + }, + { + "name": "league/container", + "version": "4.2.2", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/container.git", + "reference": "ff346319ca1ff0e78277dc2311a42107cc1aab88" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/container/zipball/ff346319ca1ff0e78277dc2311a42107cc1aab88", + "reference": "ff346319ca1ff0e78277dc2311a42107cc1aab88", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0", + "psr/container": "^1.1 || ^2.0" + }, + "provide": { + "psr/container-implementation": "^1.0" + }, + "replace": { + "orno/di": "~2.0" + }, + "require-dev": { + "nette/php-generator": "^3.4", + "nikic/php-parser": "^4.10", + "phpstan/phpstan": "^0.12.47", + "phpunit/phpunit": "^8.5.17", + "roave/security-advisories": "dev-latest", + "scrutinizer/ocular": "^1.8", + "squizlabs/php_codesniffer": "^3.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev", + "dev-4.x": "4.x-dev", + "dev-3.x": "3.x-dev", + "dev-2.x": "2.x-dev", + "dev-1.x": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "League\\Container\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Phil Bennett", + "email": "mail@philbennett.co.uk", + "role": "Developer" + } + ], + "description": "A fast and intuitive dependency injection container.", + "homepage": "https://github.com/thephpleague/container", + "keywords": [ + "container", + "dependency", + "di", + "injection", + "league", + "provider", + "service" + ], + "support": { + "issues": "https://github.com/thephpleague/container/issues", + "source": "https://github.com/thephpleague/container/tree/4.2.2" + }, + "funding": [ + { + "url": "https://github.com/philipobenito", + "type": "github" + } + ], + "time": "2024-03-13T13:12:53+00:00" + }, + { + "name": "php-parallel-lint/php-parallel-lint", + "version": "v1.3.2", + "source": { + "type": "git", + "url": "https://github.com/php-parallel-lint/PHP-Parallel-Lint.git", + "reference": "6483c9832e71973ed29cf71bd6b3f4fde438a9de" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/6483c9832e71973ed29cf71bd6b3f4fde438a9de", + "reference": "6483c9832e71973ed29cf71bd6b3f4fde438a9de", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": ">=5.3.0" + }, + "replace": { + "grogy/php-parallel-lint": "*", + "jakub-onderka/php-parallel-lint": "*" + }, + "require-dev": { + "nette/tester": "^1.3 || ^2.0", + "php-parallel-lint/php-console-highlighter": "0.* || ^1.0", + "squizlabs/php_codesniffer": "^3.6" + }, + "suggest": { + "php-parallel-lint/php-console-highlighter": "Highlight syntax in code snippet" + }, + "bin": [ + "parallel-lint" + ], + "type": "library", + "autoload": { + "classmap": [ + "./src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Jakub Onderka", + "email": "ahoj@jakubonderka.cz" + } + ], + "description": "This tool check syntax of PHP files about 20x faster than serial check.", + "homepage": "https://github.com/php-parallel-lint/PHP-Parallel-Lint", + "support": { + "issues": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/issues", + "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/v1.3.2" + }, + "time": "2022-02-21T12:50:22+00:00" + }, + { + "name": "phpstan/phpdoc-parser", + "version": "1.26.0", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpdoc-parser.git", + "reference": "231e3186624c03d7e7c890ec662b81e6b0405227" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/231e3186624c03d7e7c890ec662b81e6b0405227", + "reference": "231e3186624c03d7e7c890ec662b81e6b0405227", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "doctrine/annotations": "^2.0", + "nikic/php-parser": "^4.15", + "php-parallel-lint/php-parallel-lint": "^1.2", + "phpstan/extension-installer": "^1.0", + "phpstan/phpstan": "^1.5", + "phpstan/phpstan-phpunit": "^1.1", + "phpstan/phpstan-strict-rules": "^1.0", + "phpunit/phpunit": "^9.5", + "symfony/process": "^5.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "PHPStan\\PhpDocParser\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPDoc parser with support for nullable, intersection and generic types", + "support": { + "issues": "https://github.com/phpstan/phpdoc-parser/issues", + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.26.0" + }, + "time": "2024-02-23T16:05:55+00:00" + }, + { + "name": "phpunit/php-file-iterator", + "version": "4.1.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a95037b6d9e608ba092da1b23931e537cadc3c3c", + "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "keywords": [ + "filesystem", + "iterator" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", + "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy", + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.1.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-08-31T06:24:48+00:00" + }, + { + "name": "psr/cache", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/cache.git", + "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", + "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", + "shasum": "" + }, + "require": { + "php": ">=8.0.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Cache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for caching libraries", + "keywords": [ + "cache", + "psr", + "psr-6" + ], + "support": { + "source": "https://github.com/php-fig/cache/tree/3.0.0" + }, + "time": "2021-02-03T23:26:27+00:00" + }, + { + "name": "psr/container", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "shasum": "" + }, + "require": { + "php": ">=7.4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/2.0.2" + }, + "time": "2021-11-05T16:47:00+00:00" + }, + { + "name": "psr/event-dispatcher", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/event-dispatcher.git", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", + "shasum": "" + }, + "require": { + "php": ">=7.2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\EventDispatcher\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Standard interfaces for event handling.", + "keywords": [ + "events", + "psr", + "psr-14" + ], + "support": { + "issues": "https://github.com/php-fig/event-dispatcher/issues", + "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" + }, + "time": "2019-01-08T18:20:26+00:00" + }, + { + "name": "psr/log", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log.git", + "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", + "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", + "shasum": "" + }, + "require": { + "php": ">=8.0.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Log\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", + "keywords": [ + "log", + "psr", + "psr-3" + ], + "support": { + "source": "https://github.com/php-fig/log/tree/3.0.0" + }, + "time": "2021-07-14T16:46:02+00:00" + }, + { + "name": "psr/simple-cache", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/simple-cache.git", + "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/764e0b3939f5ca87cb904f570ef9be2d78a07865", + "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865", + "shasum": "" + }, + "require": { + "php": ">=8.0.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\SimpleCache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interfaces for simple caching", + "keywords": [ + "cache", + "caching", + "psr", + "psr-16", + "simple-cache" + ], + "support": { + "source": "https://github.com/php-fig/simple-cache/tree/3.0.0" + }, + "time": "2021-10-29T13:26:27+00:00" + }, + { + "name": "sebastian/cli-parser", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/cli-parser.git", + "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/c34583b87e7b7a8055bf6c450c2c77ce32a24084", + "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for parsing CLI options", + "homepage": "https://github.com/sebastianbergmann/cli-parser", + "support": { + "issues": "https://github.com/sebastianbergmann/cli-parser/issues", + "security": "https://github.com/sebastianbergmann/cli-parser/security/policy", + "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-03-02T07:12:49+00:00" + }, + { + "name": "sebastian/diff", + "version": "5.1.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/c41e007b4b62af48218231d6c2275e4c9b975b2e", + "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0", + "symfony/process": "^6.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "5.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + } + ], + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", + "keywords": [ + "diff", + "udiff", + "unidiff", + "unified diff" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/diff/issues", + "security": "https://github.com/sebastianbergmann/diff/security/policy", + "source": "https://github.com/sebastianbergmann/diff/tree/5.1.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-03-02T07:15:17+00:00" + }, + { + "name": "slevomat/coding-standard", + "version": "8.15.0", + "source": { + "type": "git", + "url": "https://github.com/slevomat/coding-standard.git", + "reference": "7d1d957421618a3803b593ec31ace470177d7817" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/7d1d957421618a3803b593ec31ace470177d7817", + "reference": "7d1d957421618a3803b593ec31ace470177d7817", + "shasum": "" + }, + "require": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.0", + "php": "^7.2 || ^8.0", + "phpstan/phpdoc-parser": "^1.23.1", + "squizlabs/php_codesniffer": "^3.9.0" + }, + "require-dev": { + "phing/phing": "2.17.4", + "php-parallel-lint/php-parallel-lint": "1.3.2", + "phpstan/phpstan": "1.10.60", + "phpstan/phpstan-deprecation-rules": "1.1.4", + "phpstan/phpstan-phpunit": "1.3.16", + "phpstan/phpstan-strict-rules": "1.5.2", + "phpunit/phpunit": "8.5.21|9.6.8|10.5.11" + }, + "type": "phpcodesniffer-standard", + "extra": { + "branch-alias": { + "dev-master": "8.x-dev" + } + }, + "autoload": { + "psr-4": { + "SlevomatCodingStandard\\": "SlevomatCodingStandard/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.", + "keywords": [ + "dev", + "phpcs" + ], + "support": { + "issues": "https://github.com/slevomat/coding-standard/issues", + "source": "https://github.com/slevomat/coding-standard/tree/8.15.0" + }, + "funding": [ + { + "url": "https://github.com/kukulich", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/slevomat/coding-standard", + "type": "tidelift" + } + ], + "time": "2024-03-09T15:20:58+00:00" + }, + { + "name": "squizlabs/php_codesniffer", + "version": "3.9.0", + "source": { + "type": "git", + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", + "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b", + "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b", + "shasum": "" + }, + "require": { + "ext-simplexml": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" + }, + "bin": [ + "bin/phpcbf", + "bin/phpcs" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Greg Sherwood", + "role": "Former lead" + }, + { + "name": "Juliette Reinders Folmer", + "role": "Current lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors" + } + ], + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "keywords": [ + "phpcs", + "standards", + "static analysis" + ], + "support": { + "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues", + "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy", + "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki" + }, + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-02-16T15:06:51+00:00" + }, + { + "name": "symfony/cache", + "version": "v7.0.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/cache.git", + "reference": "fc822951dd360a593224bb2cef90a087d0dff60f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/cache/zipball/fc822951dd360a593224bb2cef90a087d0dff60f", + "reference": "fc822951dd360a593224bb2cef90a087d0dff60f", + "shasum": "" + }, + "require": { + "php": ">=8.2", + "psr/cache": "^2.0|^3.0", + "psr/log": "^1.1|^2|^3", + "symfony/cache-contracts": "^2.5|^3", + "symfony/service-contracts": "^2.5|^3", + "symfony/var-exporter": "^6.4|^7.0" + }, + "conflict": { + "doctrine/dbal": "<3.6", + "symfony/dependency-injection": "<6.4", + "symfony/http-kernel": "<6.4", + "symfony/var-dumper": "<6.4" + }, + "provide": { + "psr/cache-implementation": "2.0|3.0", + "psr/simple-cache-implementation": "1.0|2.0|3.0", + "symfony/cache-implementation": "1.1|2.0|3.0" + }, + "require-dev": { + "cache/integration-tests": "dev-master", + "doctrine/dbal": "^3.6|^4", + "predis/predis": "^1.1|^2.0", + "psr/simple-cache": "^1.0|^2.0|^3.0", + "symfony/config": "^6.4|^7.0", + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/filesystem": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/messenger": "^6.4|^7.0", + "symfony/var-dumper": "^6.4|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Cache\\": "" + }, + "classmap": [ + "Traits/ValueWrapper.php" + ], + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides extended PSR-6, PSR-16 (and tags) implementations", + "homepage": "https://symfony.com", + "keywords": [ + "caching", + "psr6" + ], + "support": { + "source": "https://github.com/symfony/cache/tree/v7.0.4" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-02-22T20:27:20+00:00" + }, + { + "name": "symfony/cache-contracts", + "version": "v3.4.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/cache-contracts.git", + "reference": "1d74b127da04ffa87aa940abe15446fa89653778" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/1d74b127da04ffa87aa940abe15446fa89653778", + "reference": "1d74b127da04ffa87aa940abe15446fa89653778", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "psr/cache": "^3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.4-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Cache\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to caching", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/cache-contracts/tree/v3.4.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-09-25T12:52:38+00:00" + }, + { + "name": "symfony/console", + "version": "v6.4.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/console.git", + "reference": "0d9e4eb5ad413075624378f474c4167ea202de78" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/console/zipball/0d9e4eb5ad413075624378f474c4167ea202de78", + "reference": "0d9e4eb5ad413075624378f474c4167ea202de78", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/string": "^5.4|^6.0|^7.0" + }, + "conflict": { + "symfony/dependency-injection": "<5.4", + "symfony/dotenv": "<5.4", + "symfony/event-dispatcher": "<5.4", + "symfony/lock": "<5.4", + "symfony/process": "<5.4" + }, + "provide": { + "psr/log-implementation": "1.0|2.0|3.0" + }, + "require-dev": { + "psr/log": "^1|^2|^3", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/lock": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Console\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Eases the creation of beautiful and testable command line interfaces", + "homepage": "https://symfony.com", + "keywords": [ + "cli", + "command-line", + "console", + "terminal" + ], + "support": { + "source": "https://github.com/symfony/console/tree/v6.4.4" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-02-22T20:27:10+00:00" + }, + { + "name": "symfony/deprecation-contracts", + "version": "v3.4.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf", + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.4-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-05-23T14:45:45+00:00" + }, + { + "name": "symfony/event-dispatcher", + "version": "v7.0.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "834c28d533dd0636f910909d01b9ff45cc094b5e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/834c28d533dd0636f910909d01b9ff45cc094b5e", + "reference": "834c28d533dd0636f910909d01b9ff45cc094b5e", + "shasum": "" + }, + "require": { + "php": ">=8.2", + "symfony/event-dispatcher-contracts": "^2.5|^3" + }, + "conflict": { + "symfony/dependency-injection": "<6.4", + "symfony/service-contracts": "<2.5" + }, + "provide": { + "psr/event-dispatcher-implementation": "1.0", + "symfony/event-dispatcher-implementation": "2.0|3.0" + }, + "require-dev": { + "psr/log": "^1|^2|^3", + "symfony/config": "^6.4|^7.0", + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/error-handler": "^6.4|^7.0", + "symfony/expression-language": "^6.4|^7.0", + "symfony/http-foundation": "^6.4|^7.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/stopwatch": "^6.4|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/event-dispatcher/tree/v7.0.3" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-23T15:02:46+00:00" + }, + { + "name": "symfony/event-dispatcher-contracts", + "version": "v3.4.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher-contracts.git", + "reference": "a76aed96a42d2b521153fb382d418e30d18b59df" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df", + "reference": "a76aed96a42d2b521153fb382d418e30d18b59df", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "psr/event-dispatcher": "^1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.4-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\EventDispatcher\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to dispatching event", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-05-23T14:45:45+00:00" + }, + { + "name": "symfony/filesystem", + "version": "v7.0.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/filesystem.git", + "reference": "2890e3a825bc0c0558526c04499c13f83e1b6b12" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/2890e3a825bc0c0558526c04499c13f83e1b6b12", + "reference": "2890e3a825bc0c0558526c04499c13f83e1b6b12", + "shasum": "" + }, + "require": { + "php": ">=8.2", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.8" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides basic utilities for the filesystem", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/filesystem/tree/v7.0.3" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-23T15:02:46+00:00" + }, + { + "name": "symfony/finder", + "version": "v7.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/finder.git", + "reference": "6e5688d69f7cfc4ed4a511e96007e06c2d34ce56" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/finder/zipball/6e5688d69f7cfc4ed4a511e96007e06c2d34ce56", + "reference": "6e5688d69f7cfc4ed4a511e96007e06c2d34ce56", + "shasum": "" + }, + "require": { + "php": ">=8.2" + }, + "require-dev": { + "symfony/filesystem": "^6.4|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Finder\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Finds files and directories via an intuitive fluent interface", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/finder/tree/v7.0.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-10-31T17:59:56+00:00" + }, + { + "name": "symfony/http-client", + "version": "v7.0.5", + "source": { + "type": "git", + "url": "https://github.com/symfony/http-client.git", + "reference": "425f462a59d8030703ee04a9e1c666575ed5db3b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/http-client/zipball/425f462a59d8030703ee04a9e1c666575ed5db3b", + "reference": "425f462a59d8030703ee04a9e1c666575ed5db3b", + "shasum": "" + }, + "require": { + "php": ">=8.2", + "psr/log": "^1|^2|^3", + "symfony/http-client-contracts": "^3", + "symfony/service-contracts": "^2.5|^3" + }, + "conflict": { + "php-http/discovery": "<1.15", + "symfony/http-foundation": "<6.4" + }, + "provide": { + "php-http/async-client-implementation": "*", + "php-http/client-implementation": "*", + "psr/http-client-implementation": "1.0", + "symfony/http-client-implementation": "3.0" + }, + "require-dev": { + "amphp/amp": "^2.5", + "amphp/http-client": "^4.2.1", + "amphp/http-tunnel": "^1.0", + "amphp/socket": "^1.1", + "guzzlehttp/promises": "^1.4", + "nyholm/psr7": "^1.0", + "php-http/httplug": "^1.0|^2.0", + "psr/http-client": "^1.0", + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/messenger": "^6.4|^7.0", + "symfony/process": "^6.4|^7.0", + "symfony/stopwatch": "^6.4|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\HttpClient\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously", + "homepage": "https://symfony.com", + "keywords": [ + "http" + ], + "support": { + "source": "https://github.com/symfony/http-client/tree/v7.0.5" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-03-02T12:46:12+00:00" + }, + { + "name": "symfony/http-client-contracts", + "version": "v3.4.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/http-client-contracts.git", + "reference": "1ee70e699b41909c209a0c930f11034b93578654" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/1ee70e699b41909c209a0c930f11034b93578654", + "reference": "1ee70e699b41909c209a0c930f11034b93578654", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.4-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\HttpClient\\": "" + }, + "exclude-from-classmap": [ + "/Test/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to HTTP clients", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/http-client-contracts/tree/v3.4.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-07-30T20:28:31+00:00" + }, + { + "name": "symfony/options-resolver", + "version": "v7.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/options-resolver.git", + "reference": "700ff4096e346f54cb628ea650767c8130f1001f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/700ff4096e346f54cb628ea650767c8130f1001f", + "reference": "700ff4096e346f54cb628ea650767c8130f1001f", + "shasum": "" + }, + "require": { + "php": ">=8.2", + "symfony/deprecation-contracts": "^2.5|^3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\OptionsResolver\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an improved replacement for the array_replace PHP function", + "homepage": "https://symfony.com", + "keywords": [ + "config", + "configuration", + "options" + ], + "support": { + "source": "https://github.com/symfony/options-resolver/tree/v7.0.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-08-08T10:20:21+00:00" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.29.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "provide": { + "ext-ctype": "*" + }, + "suggest": { + "ext-ctype": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "support": { + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:11:03+00:00" + }, + { + "name": "symfony/polyfill-intl-grapheme", + "version": "v1.29.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-grapheme.git", + "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f", + "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's grapheme_* functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "grapheme", + "intl", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:11:03+00:00" + }, + { + "name": "symfony/polyfill-intl-normalizer", + "version": "v1.29.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-normalizer.git", + "reference": "bc45c394692b948b4d383a08d7753968bed9a83d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d", + "reference": "bc45c394692b948b4d383a08d7753968bed9a83d", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's Normalizer class and related functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "intl", + "normalizer", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:11:03+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.29.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "provide": { + "ext-mbstring": "*" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:11:03+00:00" + }, + { + "name": "symfony/polyfill-php80", + "version": "v1.29.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:11:03+00:00" + }, + { + "name": "symfony/polyfill-php81", + "version": "v1.29.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php81.git", + "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d", + "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php81\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:11:03+00:00" + }, + { + "name": "symfony/process", + "version": "v6.4.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "710e27879e9be3395de2b98da3f52a946039f297" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/710e27879e9be3395de2b98da3f52a946039f297", + "reference": "710e27879e9be3395de2b98da3f52a946039f297", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Process\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Executes commands in sub-processes", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/process/tree/v6.4.4" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-02-20T12:31:00+00:00" + }, + { + "name": "symfony/service-contracts", + "version": "v3.4.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/service-contracts.git", + "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0", + "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "psr/container": "^1.1|^2.0" + }, + "conflict": { + "ext-psr": "<1.1|>=2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.4-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Service\\": "" + }, + "exclude-from-classmap": [ + "/Test/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to writing services", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/service-contracts/tree/v3.4.1" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-12-26T14:02:43+00:00" + }, + { + "name": "symfony/stopwatch", + "version": "v7.0.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/stopwatch.git", + "reference": "983900d6fddf2b0cbaacacbbad07610854bd8112" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/983900d6fddf2b0cbaacacbbad07610854bd8112", + "reference": "983900d6fddf2b0cbaacacbbad07610854bd8112", + "shasum": "" + }, + "require": { + "php": ">=8.2", + "symfony/service-contracts": "^2.5|^3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Stopwatch\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides a way to profile code", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/stopwatch/tree/v7.0.3" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-23T15:02:46+00:00" + }, + { + "name": "symfony/string", + "version": "v7.0.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/string.git", + "reference": "f5832521b998b0bec40bee688ad5de98d4cf111b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/string/zipball/f5832521b998b0bec40bee688ad5de98d4cf111b", + "reference": "f5832521b998b0bec40bee688ad5de98d4cf111b", + "shasum": "" + }, + "require": { + "php": ">=8.2", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-intl-grapheme": "~1.0", + "symfony/polyfill-intl-normalizer": "~1.0", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/translation-contracts": "<2.5" + }, + "require-dev": { + "symfony/error-handler": "^6.4|^7.0", + "symfony/http-client": "^6.4|^7.0", + "symfony/intl": "^6.4|^7.0", + "symfony/translation-contracts": "^2.5|^3.0", + "symfony/var-exporter": "^6.4|^7.0" + }, + "type": "library", + "autoload": { + "files": [ + "Resources/functions.php" + ], + "psr-4": { + "Symfony\\Component\\String\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way", + "homepage": "https://symfony.com", + "keywords": [ + "grapheme", + "i18n", + "string", + "unicode", + "utf-8", + "utf8" + ], + "support": { + "source": "https://github.com/symfony/string/tree/v7.0.4" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-02-01T13:17:36+00:00" + }, + { + "name": "symfony/var-exporter", + "version": "v7.0.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/var-exporter.git", + "reference": "dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41", + "reference": "dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41", + "shasum": "" + }, + "require": { + "php": ">=8.2" + }, + "require-dev": { + "symfony/var-dumper": "^6.4|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\VarExporter\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Allows exporting any serializable PHP data structure to plain PHP code", + "homepage": "https://symfony.com", + "keywords": [ + "clone", + "construct", + "export", + "hydrate", + "instantiate", + "lazy-loading", + "proxy", + "serialize" + ], + "support": { + "source": "https://github.com/symfony/var-exporter/tree/v7.0.4" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-02-26T10:35:24+00:00" + } + ], + "packages-dev": [ + { + "name": "carbonphp/carbon-doctrine-types", + "version": "3.2.0", + "source": { + "type": "git", + "url": "https://github.com/CarbonPHP/carbon-doctrine-types.git", + "reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/18ba5ddfec8976260ead6e866180bd5d2f71aa1d", + "reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d", + "shasum": "" + }, + "require": { + "php": "^8.1" + }, + "conflict": { + "doctrine/dbal": "<4.0.0 || >=5.0.0" + }, + "require-dev": { + "doctrine/dbal": "^4.0.0", + "nesbot/carbon": "^2.71.0 || ^3.0.0", + "phpunit/phpunit": "^10.3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Carbon\\Doctrine\\": "src/Carbon/Doctrine/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "KyleKatarn", + "email": "kylekatarnls@gmail.com" + } + ], + "description": "Types to use Carbon in Doctrine", + "keywords": [ + "carbon", + "date", + "datetime", + "doctrine", + "time" + ], + "support": { + "issues": "https://github.com/CarbonPHP/carbon-doctrine-types/issues", + "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/3.2.0" + }, + "funding": [ + { + "url": "https://github.com/kylekatarnls", + "type": "github" + }, + { + "url": "https://opencollective.com/Carbon", + "type": "open_collective" + }, + { + "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon", + "type": "tidelift" + } + ], + "time": "2024-02-09T16:56:22+00:00" + }, + { + "name": "doctrine/inflector", + "version": "2.0.10", + "source": { + "type": "git", + "url": "https://github.com/doctrine/inflector.git", + "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc", + "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "doctrine/coding-standard": "^11.0", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.1", + "phpstan/phpstan-strict-rules": "^1.3", + "phpunit/phpunit": "^8.5 || ^9.5", + "vimeo/psalm": "^4.25 || ^5.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Inflector\\": "lib/Doctrine/Inflector" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "PHP Doctrine Inflector is a small library that can perform string manipulations with regard to upper/lowercase and singular/plural forms of words.", + "homepage": "https://www.doctrine-project.org/projects/inflector.html", + "keywords": [ + "inflection", + "inflector", + "lowercase", + "manipulation", + "php", + "plural", + "singular", + "strings", + "uppercase", + "words" + ], + "support": { + "issues": "https://github.com/doctrine/inflector/issues", + "source": "https://github.com/doctrine/inflector/tree/2.0.10" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector", + "type": "tidelift" + } + ], + "time": "2024-02-18T20:23:39+00:00" + }, + { + "name": "ergebnis/phpstan-rules", + "version": "0.15.3", + "source": { + "type": "git", + "url": "https://github.com/ergebnis/phpstan-rules.git", + "reference": "78a3dd88893cf3250ba339843503dcea7e9bee64" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ergebnis/phpstan-rules/zipball/78a3dd88893cf3250ba339843503dcea7e9bee64", + "reference": "78a3dd88893cf3250ba339843503dcea7e9bee64", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "nikic/php-parser": "^4.2.3", + "php": "^7.2 || ^8.0", + "phpstan/phpstan": "~0.11.15 || ~0.12.0" + }, + "require-dev": { + "ergebnis/composer-normalize": "^2.9.0", + "ergebnis/license": "^1.1.0", + "ergebnis/php-cs-fixer-config": "^2.5.1", + "ergebnis/test-util": "^1.3.0", + "infection/infection": "~0.15.3", + "nette/di": "^3.0.1", + "phpstan/phpstan-deprecation-rules": "~0.11.2", + "phpstan/phpstan-strict-rules": "~0.11.1", + "phpunit/phpunit": "^8.5.8", + "psalm/plugin-phpunit": "~0.12.2", + "psr/container": "^1.0.0", + "vimeo/psalm": "^3.18", + "zendframework/zend-servicemanager": "^2.0.0" + }, + "type": "phpstan-extension", + "extra": { + "phpstan": { + "includes": [ + "rules.neon" + ] + } + }, + "autoload": { + "psr-4": { + "Ergebnis\\PHPStan\\Rules\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Andreas Möller", + "email": "am@localheinz.com" + } + ], + "description": "Provides additional rules for phpstan/phpstan.", + "homepage": "https://github.com/ergebnis/phpstan-rules", + "keywords": [ + "PHPStan", + "phpstan-extreme-rules", + "phpstan-rules" + ], + "support": { + "issues": "https://github.com/ergebnis/phpstan-rules/issues", + "source": "https://github.com/ergebnis/phpstan-rules" + }, + "funding": [ + { + "url": "https://github.com/localheinz", + "type": "github" + } + ], + "time": "2020-10-30T09:50:34+00:00" + }, + { + "name": "hamcrest/hamcrest-php", + "version": "v2.0.1", + "source": { + "type": "git", + "url": "https://github.com/hamcrest/hamcrest-php.git", + "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/8c3d0a3f6af734494ad8f6fbbee0ba92422859f3", + "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3", + "shasum": "" + }, + "require": { + "php": "^5.3|^7.0|^8.0" + }, + "replace": { + "cordoval/hamcrest-php": "*", + "davedevelopment/hamcrest-php": "*", + "kodova/hamcrest-php": "*" + }, + "require-dev": { + "phpunit/php-file-iterator": "^1.4 || ^2.0", + "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "autoload": { + "classmap": [ + "hamcrest" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "This is the PHP port of Hamcrest Matchers", + "keywords": [ + "test" + ], + "support": { + "issues": "https://github.com/hamcrest/hamcrest-php/issues", + "source": "https://github.com/hamcrest/hamcrest-php/tree/v2.0.1" + }, + "time": "2020-07-09T08:09:16+00:00" + }, + { + "name": "illuminate/collections", + "version": "v9.52.16", + "source": { + "type": "git", + "url": "https://github.com/illuminate/collections.git", + "reference": "d3710b0b244bfc62c288c1a87eaa62dd28352d1f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/collections/zipball/d3710b0b244bfc62c288c1a87eaa62dd28352d1f", + "reference": "d3710b0b244bfc62c288c1a87eaa62dd28352d1f", + "shasum": "" + }, + "require": { + "illuminate/conditionable": "^9.0", + "illuminate/contracts": "^9.0", + "illuminate/macroable": "^9.0", + "php": "^8.0.2" + }, + "suggest": { + "symfony/var-dumper": "Required to use the dump method (^6.0)." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "9.x-dev" + } + }, + "autoload": { + "files": [ + "helpers.php" + ], + "psr-4": { + "Illuminate\\Support\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Collections package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2023-06-11T21:17:10+00:00" + }, + { + "name": "illuminate/conditionable", + "version": "v9.52.16", + "source": { + "type": "git", + "url": "https://github.com/illuminate/conditionable.git", + "reference": "bea24daa0fa84b7e7b0d5b84f62c71b7e2dc3364" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/conditionable/zipball/bea24daa0fa84b7e7b0d5b84f62c71b7e2dc3364", + "reference": "bea24daa0fa84b7e7b0d5b84f62c71b7e2dc3364", + "shasum": "" + }, + "require": { + "php": "^8.0.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "9.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Support\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Conditionable package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2023-02-01T21:42:32+00:00" + }, + { + "name": "illuminate/console", + "version": "v9.20.0", + "source": { + "type": "git", + "url": "https://github.com/illuminate/console.git", + "reference": "5eeadc4fecb6a23c31b705eddf0e7d65d2a8fa38" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/console/zipball/5eeadc4fecb6a23c31b705eddf0e7d65d2a8fa38", + "reference": "5eeadc4fecb6a23c31b705eddf0e7d65d2a8fa38", + "shasum": "" + }, + "require": { + "illuminate/collections": "^9.0", + "illuminate/contracts": "^9.0", + "illuminate/macroable": "^9.0", + "illuminate/support": "^9.0", + "php": "^8.0.2", + "symfony/console": "^6.0", + "symfony/process": "^6.0" + }, + "suggest": { + "dragonmantank/cron-expression": "Required to use scheduler (^3.1).", + "guzzlehttp/guzzle": "Required to use the ping methods on schedules (^7.2).", + "illuminate/bus": "Required to use the scheduled job dispatcher (^9.0).", + "illuminate/container": "Required to use the scheduler (^9.0).", + "illuminate/filesystem": "Required to use the generator command (^9.0).", + "illuminate/queue": "Required to use closures for scheduled jobs (^9.0)." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "9.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Console\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Console package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2022-07-12T13:39:25+00:00" + }, + { + "name": "illuminate/contracts", + "version": "v9.52.16", + "source": { + "type": "git", + "url": "https://github.com/illuminate/contracts.git", + "reference": "44f65d723b13823baa02ff69751a5948bde60c22" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/contracts/zipball/44f65d723b13823baa02ff69751a5948bde60c22", + "reference": "44f65d723b13823baa02ff69751a5948bde60c22", + "shasum": "" + }, + "require": { + "php": "^8.0.2", + "psr/container": "^1.1.1|^2.0.1", + "psr/simple-cache": "^1.0|^2.0|^3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "9.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Contracts\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Contracts package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2023-02-08T14:36:30+00:00" + }, + { + "name": "illuminate/macroable", + "version": "v9.52.16", + "source": { + "type": "git", + "url": "https://github.com/illuminate/macroable.git", + "reference": "e3bfaf6401742a9c6abca61b9b10e998e5b6449a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/macroable/zipball/e3bfaf6401742a9c6abca61b9b10e998e5b6449a", + "reference": "e3bfaf6401742a9c6abca61b9b10e998e5b6449a", + "shasum": "" + }, + "require": { + "php": "^8.0.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "9.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Support\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Macroable package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2022-08-09T13:29:29+00:00" + }, + { + "name": "illuminate/support", + "version": "v9.52.16", + "source": { + "type": "git", + "url": "https://github.com/illuminate/support.git", + "reference": "223c608dbca27232df6213f776bfe7bdeec24874" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/support/zipball/223c608dbca27232df6213f776bfe7bdeec24874", + "reference": "223c608dbca27232df6213f776bfe7bdeec24874", + "shasum": "" + }, + "require": { + "doctrine/inflector": "^2.0", + "ext-ctype": "*", + "ext-filter": "*", + "ext-mbstring": "*", + "illuminate/collections": "^9.0", + "illuminate/conditionable": "^9.0", + "illuminate/contracts": "^9.0", + "illuminate/macroable": "^9.0", + "nesbot/carbon": "^2.62.1", + "php": "^8.0.2", + "voku/portable-ascii": "^2.0" + }, + "conflict": { + "tightenco/collect": "<5.5.33" + }, + "suggest": { + "illuminate/filesystem": "Required to use the composer class (^9.0).", + "league/commonmark": "Required to use Str::markdown() and Stringable::markdown() (^2.0.2).", + "ramsey/uuid": "Required to use Str::uuid() (^4.7).", + "symfony/process": "Required to use the composer class (^6.0).", + "symfony/uid": "Required to use Str::ulid() (^6.0).", + "symfony/var-dumper": "Required to use the dd function (^6.0).", + "vlucas/phpdotenv": "Required to use the Env class and env helper (^5.4.1)." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "9.x-dev" + } + }, + "autoload": { + "files": [ + "helpers.php" + ], + "psr-4": { + "Illuminate\\Support\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Support package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2023-06-11T21:11:53+00:00" + }, + { + "name": "mockery/mockery", + "version": "1.6.9", + "source": { + "type": "git", + "url": "https://github.com/mockery/mockery.git", + "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mockery/mockery/zipball/0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06", + "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06", + "shasum": "" + }, + "require": { + "hamcrest/hamcrest-php": "^2.0.1", + "lib-pcre": ">=7.0", + "php": ">=7.3" + }, + "conflict": { + "phpunit/phpunit": "<8.0" + }, + "require-dev": { + "phpunit/phpunit": "^8.5 || ^9.6.10", + "symplify/easy-coding-standard": "^12.0.8" + }, + "type": "library", + "autoload": { + "files": [ + "library/helpers.php", + "library/Mockery.php" + ], + "psr-4": { + "Mockery\\": "library/Mockery" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Pádraic Brady", + "email": "padraic.brady@gmail.com", + "homepage": "https://github.com/padraic", + "role": "Author" + }, + { + "name": "Dave Marshall", + "email": "dave.marshall@atstsolutions.co.uk", + "homepage": "https://davedevelopment.co.uk", + "role": "Developer" + }, + { + "name": "Nathanael Esayeas", + "email": "nathanael.esayeas@protonmail.com", + "homepage": "https://github.com/ghostwriter", + "role": "Lead Developer" + } + ], + "description": "Mockery is a simple yet flexible PHP mock object framework", + "homepage": "https://github.com/mockery/mockery", + "keywords": [ + "BDD", + "TDD", + "library", + "mock", + "mock objects", + "mockery", + "stub", + "test", + "test double", + "testing" + ], + "support": { + "docs": "https://docs.mockery.io/", + "issues": "https://github.com/mockery/mockery/issues", + "rss": "https://github.com/mockery/mockery/releases.atom", + "security": "https://github.com/mockery/mockery/security/advisories", + "source": "https://github.com/mockery/mockery" + }, + "time": "2023-12-10T02:24:34+00:00" + }, + { + "name": "myclabs/deep-copy", + "version": "1.11.1", + "source": { + "type": "git", + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "conflict": { + "doctrine/collections": "<1.6.8", + "doctrine/common": "<2.13.3 || >=3,<3.2.2" + }, + "require-dev": { + "doctrine/collections": "^1.6.8", + "doctrine/common": "^2.13.3 || ^3.2.2", + "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" + }, + "type": "library", + "autoload": { + "files": [ + "src/DeepCopy/deep_copy.php" + ], + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Create deep copies (clones) of your objects", + "keywords": [ + "clone", + "copy", + "duplicate", + "object", + "object graph" + ], + "support": { + "issues": "https://github.com/myclabs/DeepCopy/issues", + "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" + }, + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", + "type": "tidelift" + } + ], + "time": "2023-03-08T13:26:56+00:00" + }, + { + "name": "nesbot/carbon", + "version": "2.72.3", + "source": { + "type": "git", + "url": "https://github.com/briannesbitt/Carbon.git", + "reference": "0c6fd108360c562f6e4fd1dedb8233b423e91c83" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/0c6fd108360c562f6e4fd1dedb8233b423e91c83", + "reference": "0c6fd108360c562f6e4fd1dedb8233b423e91c83", + "shasum": "" + }, + "require": { + "carbonphp/carbon-doctrine-types": "*", + "ext-json": "*", + "php": "^7.1.8 || ^8.0", + "psr/clock": "^1.0", + "symfony/polyfill-mbstring": "^1.0", + "symfony/polyfill-php80": "^1.16", + "symfony/translation": "^3.4 || ^4.0 || ^5.0 || ^6.0" + }, + "provide": { + "psr/clock-implementation": "1.0" + }, + "require-dev": { + "doctrine/dbal": "^2.0 || ^3.1.4 || ^4.0", + "doctrine/orm": "^2.7 || ^3.0", + "friendsofphp/php-cs-fixer": "^3.0", + "kylekatarnls/multi-tester": "^2.0", + "ondrejmirtes/better-reflection": "*", + "phpmd/phpmd": "^2.9", + "phpstan/extension-installer": "^1.0", + "phpstan/phpstan": "^0.12.99 || ^1.7.14", + "phpunit/php-file-iterator": "^2.0.5 || ^3.0.6", + "phpunit/phpunit": "^7.5.20 || ^8.5.26 || ^9.5.20", + "squizlabs/php_codesniffer": "^3.4" + }, + "bin": [ + "bin/carbon" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-3.x": "3.x-dev", + "dev-master": "2.x-dev" + }, + "laravel": { + "providers": [ + "Carbon\\Laravel\\ServiceProvider" + ] + }, + "phpstan": { + "includes": [ + "extension.neon" + ] + } + }, + "autoload": { + "psr-4": { + "Carbon\\": "src/Carbon/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Brian Nesbitt", + "email": "brian@nesbot.com", + "homepage": "https://markido.com" + }, + { + "name": "kylekatarnls", + "homepage": "https://github.com/kylekatarnls" + } + ], + "description": "An API extension for DateTime that supports 281 different languages.", + "homepage": "https://carbon.nesbot.com", + "keywords": [ + "date", + "datetime", + "time" + ], + "support": { + "docs": "https://carbon.nesbot.com/docs", + "issues": "https://github.com/briannesbitt/Carbon/issues", + "source": "https://github.com/briannesbitt/Carbon" + }, + "funding": [ + { + "url": "https://github.com/sponsors/kylekatarnls", + "type": "github" + }, + { + "url": "https://opencollective.com/Carbon#sponsor", + "type": "opencollective" + }, + { + "url": "https://tidelift.com/subscription/pkg/packagist-nesbot-carbon?utm_source=packagist-nesbot-carbon&utm_medium=referral&utm_campaign=readme", + "type": "tidelift" + } + ], + "time": "2024-01-25T10:35:09+00:00" + }, + { + "name": "nikic/php-parser", + "version": "v4.19.1", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4e1b88d21c69391150ace211e9eaf05810858d0b", + "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=7.1" + }, + "require-dev": { + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + }, + "bin": [ + "bin/php-parse" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.9-dev" + } + }, + "autoload": { + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "support": { + "issues": "https://github.com/nikic/PHP-Parser/issues", + "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.1" + }, + "time": "2024-03-17T08:10:35+00:00" + }, + { + "name": "phar-io/manifest", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/phar-io/manifest.git", + "reference": "54750ef60c58e43759730615a392c31c80e23176" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176", + "reference": "54750ef60c58e43759730615a392c31c80e23176", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-libxml": "*", + "ext-phar": "*", + "ext-xmlwriter": "*", + "phar-io/version": "^3.0.1", + "php": "^7.2 || ^8.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "support": { + "issues": "https://github.com/phar-io/manifest/issues", + "source": "https://github.com/phar-io/manifest/tree/2.0.4" + }, + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2024-03-03T12:33:53+00:00" + }, + { + "name": "phar-io/version", + "version": "3.2.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/version.git", + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74", + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Library for handling version information and constraints", + "support": { + "issues": "https://github.com/phar-io/version/issues", + "source": "https://github.com/phar-io/version/tree/3.2.1" + }, + "time": "2022-02-21T01:04:05+00:00" + }, + { + "name": "phpstan/phpstan", + "version": "0.12.99", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan.git", + "reference": "b4d40f1d759942f523be267a1bab6884f46ca3f7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b4d40f1d759942f523be267a1bab6884f46ca3f7", + "reference": "b4d40f1d759942f523be267a1bab6884f46ca3f7", + "shasum": "" + }, + "require": { + "php": "^7.1|^8.0" + }, + "conflict": { + "phpstan/phpstan-shim": "*" + }, + "bin": [ + "phpstan", + "phpstan.phar" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.12-dev" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPStan - PHP Static Analysis Tool", + "support": { + "issues": "https://github.com/phpstan/phpstan/issues", + "source": "https://github.com/phpstan/phpstan/tree/0.12.99" + }, + "funding": [ + { + "url": "https://github.com/ondrejmirtes", + "type": "github" + }, + { + "url": "https://github.com/phpstan", + "type": "github" + }, + { + "url": "https://www.patreon.com/phpstan", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", + "type": "tidelift" + } + ], + "time": "2021-09-12T20:09:55+00:00" + }, + { + "name": "phpstan/phpstan-strict-rules", + "version": "0.12.11", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan-strict-rules.git", + "reference": "2b72e8e17d2034145f239126e876e5fb659675e2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/2b72e8e17d2034145f239126e876e5fb659675e2", + "reference": "2b72e8e17d2034145f239126e876e5fb659675e2", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0", + "phpstan/phpstan": "^0.12.96" + }, + "require-dev": { + "php-parallel-lint/php-parallel-lint": "^1.2", + "phpstan/phpstan-phpunit": "^0.12.16", + "phpunit/phpunit": "^9.5" + }, + "type": "phpstan-extension", + "extra": { + "branch-alias": { + "dev-master": "0.12-dev" + }, + "phpstan": { + "includes": [ + "rules.neon" + ] + } + }, + "autoload": { + "psr-4": { + "PHPStan\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Extra strict and opinionated rules for PHPStan", + "support": { + "issues": "https://github.com/phpstan/phpstan-strict-rules/issues", + "source": "https://github.com/phpstan/phpstan-strict-rules/tree/0.12.11" + }, + "time": "2021-08-21T11:36:27+00:00" + }, + { + "name": "phpunit/php-code-coverage", + "version": "10.1.14", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e3f51450ebffe8e0efdf7346ae966a656f7d5e5b", + "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-libxml": "*", + "ext-xmlwriter": "*", + "nikic/php-parser": "^4.18 || ^5.0", + "php": ">=8.1", + "phpunit/php-file-iterator": "^4.0", + "phpunit/php-text-template": "^3.0", + "sebastian/code-unit-reverse-lookup": "^3.0", + "sebastian/complexity": "^3.0", + "sebastian/environment": "^6.0", + "sebastian/lines-of-code": "^2.0", + "sebastian/version": "^4.0", + "theseer/tokenizer": "^1.2.0" + }, + "require-dev": { + "phpunit/phpunit": "^10.1" + }, + "suggest": { + "ext-pcov": "PHP extension that provides line coverage", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "10.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.14" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-03-12T15:33:41+00:00" + }, + { + "name": "phpunit/php-invoker", + "version": "4.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-invoker.git", + "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7", + "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "ext-pcntl": "*", + "phpunit/phpunit": "^10.0" + }, + "suggest": { + "ext-pcntl": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Invoke callables with a timeout", + "homepage": "https://github.com/sebastianbergmann/php-invoker/", + "keywords": [ + "process" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-invoker/issues", + "source": "https://github.com/sebastianbergmann/php-invoker/tree/4.0.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T06:56:09+00:00" + }, + { + "name": "phpunit/php-text-template", + "version": "3.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c7b06ff49e3d5072f057eb1fa59258bf287a748", + "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-text-template/issues", + "security": "https://github.com/sebastianbergmann/php-text-template/security/policy", + "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-08-31T14:07:24+00:00" + }, + { + "name": "phpunit/php-timer", + "version": "6.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/e2a2d67966e740530f4a3343fe2e030ffdc1161d", + "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "6.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-timer/issues", + "source": "https://github.com/sebastianbergmann/php-timer/tree/6.0.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T06:57:52+00:00" + }, + { + "name": "phpunit/phpunit", + "version": "10.5.13", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "20a63fc1c6db29b15da3bd02d4b6cf59900088a7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/20a63fc1c6db29b15da3bd02d4b6cf59900088a7", + "reference": "20a63fc1c6db29b15da3bd02d4b6cf59900088a7", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-xml": "*", + "ext-xmlwriter": "*", + "myclabs/deep-copy": "^1.10.1", + "phar-io/manifest": "^2.0.3", + "phar-io/version": "^3.0.2", + "php": ">=8.1", + "phpunit/php-code-coverage": "^10.1.5", + "phpunit/php-file-iterator": "^4.0", + "phpunit/php-invoker": "^4.0", + "phpunit/php-text-template": "^3.0", + "phpunit/php-timer": "^6.0", + "sebastian/cli-parser": "^2.0", + "sebastian/code-unit": "^2.0", + "sebastian/comparator": "^5.0", + "sebastian/diff": "^5.0", + "sebastian/environment": "^6.0", + "sebastian/exporter": "^5.1", + "sebastian/global-state": "^6.0.1", + "sebastian/object-enumerator": "^5.0", + "sebastian/recursion-context": "^5.0", + "sebastian/type": "^4.0", + "sebastian/version": "^4.0" + }, + "suggest": { + "ext-soap": "To be able to generate mocks based on WSDL files" + }, + "bin": [ + "phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "10.5-dev" + } + }, + "autoload": { + "files": [ + "src/Framework/Assert/Functions.php" + ], + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/phpunit/issues", + "security": "https://github.com/sebastianbergmann/phpunit/security/policy", + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.13" + }, + "funding": [ + { + "url": "https://phpunit.de/sponsors.html", + "type": "custom" + }, + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" + } + ], + "time": "2024-03-12T15:37:41+00:00" + }, + { + "name": "psr/clock", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/clock.git", + "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/clock/zipball/e41a24703d4560fd0acb709162f73b8adfc3aa0d", + "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Psr\\Clock\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for reading the clock.", + "homepage": "https://github.com/php-fig/clock", + "keywords": [ + "clock", + "now", + "psr", + "psr-20", + "time" + ], + "support": { + "issues": "https://github.com/php-fig/clock/issues", + "source": "https://github.com/php-fig/clock/tree/1.0.0" + }, + "time": "2022-11-25T14:36:26+00:00" + }, + { + "name": "rector/rector", + "version": "0.11.56", + "source": { + "type": "git", + "url": "https://github.com/rectorphp/rector.git", + "reference": "9f601b77550dbfa6e096028f8aaecf7021c1bc46" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/rectorphp/rector/zipball/9f601b77550dbfa6e096028f8aaecf7021c1bc46", + "reference": "9f601b77550dbfa6e096028f8aaecf7021c1bc46", + "shasum": "" + }, + "require": { + "php": "^7.1|^8.0", + "phpstan/phpstan": "0.12.99" + }, + "conflict": { + "phpstan/phpdoc-parser": "<=0.5.3", + "phpstan/phpstan": "<=0.12.82", + "rector/rector-cakephp": "*", + "rector/rector-doctrine": "*", + "rector/rector-nette": "*", + "rector/rector-phpunit": "*", + "rector/rector-prefixed": "*", + "rector/rector-symfony": "*" + }, + "bin": [ + "bin/rector" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "0.11-dev" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Prefixed and PHP 7.1 downgraded version of rector/rector", + "support": { + "issues": "https://github.com/rectorphp/rector/issues", + "source": "https://github.com/rectorphp/rector/tree/0.11.56" + }, + "funding": [ + { + "url": "https://github.com/tomasvotruba", + "type": "github" + } + ], + "time": "2021-09-28T19:06:03+00:00" + }, + { + "name": "sebastian/code-unit", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit.git", + "reference": "a81fee9eef0b7a76af11d121767abc44c104e503" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/a81fee9eef0b7a76af11d121767abc44c104e503", + "reference": "a81fee9eef0b7a76af11d121767abc44c104e503", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the PHP code units", + "homepage": "https://github.com/sebastianbergmann/code-unit", + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit/issues", + "source": "https://github.com/sebastianbergmann/code-unit/tree/2.0.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T06:58:43+00:00" + }, + { + "name": "sebastian/code-unit-reverse-lookup", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/5e3a687f7d8ae33fb362c5c0743794bbb2420a1d", + "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Looks up which function or method a line of code belongs to", + "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", + "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/3.0.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T06:59:15+00:00" + }, + { + "name": "sebastian/comparator", + "version": "5.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "2db5010a484d53ebf536087a70b4a5423c102372" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2db5010a484d53ebf536087a70b4a5423c102372", + "reference": "2db5010a484d53ebf536087a70b4a5423c102372", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-mbstring": "*", + "php": ">=8.1", + "sebastian/diff": "^5.0", + "sebastian/exporter": "^5.0" + }, + "require-dev": { + "phpunit/phpunit": "^10.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "5.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + } + ], + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "https://github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/comparator/issues", + "security": "https://github.com/sebastianbergmann/comparator/security/policy", + "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-08-14T13:18:12+00:00" + }, + { + "name": "sebastian/complexity", + "version": "3.2.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/complexity.git", + "reference": "68ff824baeae169ec9f2137158ee529584553799" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68ff824baeae169ec9f2137158ee529584553799", + "reference": "68ff824baeae169ec9f2137158ee529584553799", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^4.18 || ^5.0", + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.2-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for calculating the complexity of PHP code units", + "homepage": "https://github.com/sebastianbergmann/complexity", + "support": { + "issues": "https://github.com/sebastianbergmann/complexity/issues", + "security": "https://github.com/sebastianbergmann/complexity/security/policy", + "source": "https://github.com/sebastianbergmann/complexity/tree/3.2.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-12-21T08:37:17+00:00" + }, + { + "name": "sebastian/environment", + "version": "6.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/43c751b41d74f96cbbd4e07b7aec9675651e2951", + "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "suggest": { + "ext-posix": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "6.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "https://github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/environment/issues", + "security": "https://github.com/sebastianbergmann/environment/security/policy", + "source": "https://github.com/sebastianbergmann/environment/tree/6.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-04-11T05:39:26+00:00" + }, + { + "name": "sebastian/exporter", + "version": "5.1.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "955288482d97c19a372d3f31006ab3f37da47adf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/955288482d97c19a372d3f31006ab3f37da47adf", + "reference": "955288482d97c19a372d3f31006ab3f37da47adf", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": ">=8.1", + "sebastian/recursion-context": "^5.0" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "5.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "https://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/exporter/issues", + "security": "https://github.com/sebastianbergmann/exporter/security/policy", + "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-03-02T07:17:12+00:00" + }, + { + "name": "sebastian/global-state", + "version": "6.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/987bafff24ecc4c9ac418cab1145b96dd6e9cbd9", + "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "sebastian/object-reflector": "^3.0", + "sebastian/recursion-context": "^5.0" + }, + "require-dev": { + "ext-dom": "*", + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "6.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Snapshotting of global state", + "homepage": "https://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/global-state/issues", + "security": "https://github.com/sebastianbergmann/global-state/security/policy", + "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-03-02T07:19:19+00:00" + }, + { + "name": "sebastian/lines-of-code", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/lines-of-code.git", + "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/856e7f6a75a84e339195d48c556f23be2ebf75d0", + "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^4.18 || ^5.0", + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for counting the lines of code in PHP source code", + "homepage": "https://github.com/sebastianbergmann/lines-of-code", + "support": { + "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", + "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy", + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-12-21T08:38:20+00:00" + }, + { + "name": "sebastian/object-enumerator", + "version": "5.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/202d0e344a580d7f7d04b3fafce6933e59dae906", + "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "sebastian/object-reflector": "^3.0", + "sebastian/recursion-context": "^5.0" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "5.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Traverses array structures and object graphs to enumerate all referenced objects", + "homepage": "https://github.com/sebastianbergmann/object-enumerator/", + "support": { + "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/5.0.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T07:08:32+00:00" + }, + { + "name": "sebastian/object-reflector", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-reflector.git", + "reference": "24ed13d98130f0e7122df55d06c5c4942a577957" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/24ed13d98130f0e7122df55d06c5c4942a577957", + "reference": "24ed13d98130f0e7122df55d06c5c4942a577957", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Allows reflection of object attributes, including inherited and non-public ones", + "homepage": "https://github.com/sebastianbergmann/object-reflector/", + "support": { + "issues": "https://github.com/sebastianbergmann/object-reflector/issues", + "source": "https://github.com/sebastianbergmann/object-reflector/tree/3.0.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T07:06:18+00:00" + }, + { + "name": "sebastian/recursion-context", + "version": "5.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "05909fb5bc7df4c52992396d0116aed689f93712" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/05909fb5bc7df4c52992396d0116aed689f93712", + "reference": "05909fb5bc7df4c52992396d0116aed689f93712", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "5.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides functionality to recursively process PHP variables", + "homepage": "https://github.com/sebastianbergmann/recursion-context", + "support": { + "issues": "https://github.com/sebastianbergmann/recursion-context/issues", + "source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T07:05:40+00:00" + }, + { + "name": "sebastian/type", + "version": "4.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/type.git", + "reference": "462699a16464c3944eefc02ebdd77882bd3925bf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/462699a16464c3944eefc02ebdd77882bd3925bf", + "reference": "462699a16464c3944eefc02ebdd77882bd3925bf", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the types of the PHP type system", + "homepage": "https://github.com/sebastianbergmann/type", + "support": { + "issues": "https://github.com/sebastianbergmann/type/issues", + "source": "https://github.com/sebastianbergmann/type/tree/4.0.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T07:10:45+00:00" + }, + { + "name": "sebastian/version", + "version": "4.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c51fa83a5d8f43f1402e3f32a005e6262244ef17", + "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "support": { + "issues": "https://github.com/sebastianbergmann/version/issues", + "source": "https://github.com/sebastianbergmann/version/tree/4.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-07T11:34:05+00:00" + }, + { + "name": "symfony/translation", + "version": "v6.4.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/translation.git", + "reference": "bce6a5a78e94566641b2594d17e48b0da3184a8e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/translation/zipball/bce6a5a78e94566641b2594d17e48b0da3184a8e", + "reference": "bce6a5a78e94566641b2594d17e48b0da3184a8e", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/translation-contracts": "^2.5|^3.0" + }, + "conflict": { + "symfony/config": "<5.4", + "symfony/console": "<5.4", + "symfony/dependency-injection": "<5.4", + "symfony/http-client-contracts": "<2.5", + "symfony/http-kernel": "<5.4", + "symfony/service-contracts": "<2.5", + "symfony/twig-bundle": "<5.4", + "symfony/yaml": "<5.4" + }, + "provide": { + "symfony/translation-implementation": "2.3|3.0" + }, + "require-dev": { + "nikic/php-parser": "^4.18|^5.0", + "psr/log": "^1|^2|^3", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/finder": "^5.4|^6.0|^7.0", + "symfony/http-client-contracts": "^2.5|^3.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/intl": "^5.4|^6.0|^7.0", + "symfony/polyfill-intl-icu": "^1.21", + "symfony/routing": "^5.4|^6.0|^7.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/yaml": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "files": [ + "Resources/functions.php" + ], + "psr-4": { + "Symfony\\Component\\Translation\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides tools to internationalize your application", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/translation/tree/v6.4.4" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-02-20T13:16:58+00:00" + }, + { + "name": "symfony/translation-contracts", + "version": "v3.4.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/translation-contracts.git", + "reference": "06450585bf65e978026bda220cdebca3f867fde7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/06450585bf65e978026bda220cdebca3f867fde7", + "reference": "06450585bf65e978026bda220cdebca3f867fde7", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.4-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Translation\\": "" + }, + "exclude-from-classmap": [ + "/Test/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to translation", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/translation-contracts/tree/v3.4.1" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-12-26T14:02:43+00:00" + }, + { + "name": "symfony/var-dumper", + "version": "v7.0.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/var-dumper.git", + "reference": "e03ad7c1535e623edbb94c22cc42353e488c6670" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e03ad7c1535e623edbb94c22cc42353e488c6670", + "reference": "e03ad7c1535e623edbb94c22cc42353e488c6670", + "shasum": "" + }, + "require": { + "php": ">=8.2", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/console": "<6.4" + }, + "require-dev": { + "ext-iconv": "*", + "symfony/console": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/process": "^6.4|^7.0", + "symfony/uid": "^6.4|^7.0", + "twig/twig": "^3.0.4" + }, + "bin": [ + "Resources/bin/var-dump-server" + ], + "type": "library", + "autoload": { + "files": [ + "Resources/functions/dump.php" + ], + "psr-4": { + "Symfony\\Component\\VarDumper\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides mechanisms for walking through any arbitrary PHP variable", + "homepage": "https://symfony.com", + "keywords": [ + "debug", + "dump" + ], + "support": { + "source": "https://github.com/symfony/var-dumper/tree/v7.0.4" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-02-15T11:33:06+00:00" + }, + { + "name": "thecodingmachine/phpstan-strict-rules", + "version": "v0.12.2", + "source": { + "type": "git", + "url": "https://github.com/thecodingmachine/phpstan-strict-rules.git", + "reference": "ed65c3cf33e3b668c5a072d49741965114c881b5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thecodingmachine/phpstan-strict-rules/zipball/ed65c3cf33e3b668c5a072d49741965114c881b5", + "reference": "ed65c3cf33e3b668c5a072d49741965114c881b5", + "shasum": "" + }, + "require": { + "php": "^7.1|^8.0", + "phpstan/phpstan": "^0.12" + }, + "require-dev": { + "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpunit": "^7.1" + }, + "type": "phpstan-extension", + "extra": { + "branch-alias": { + "dev-master": "0.12-dev" + }, + "phpstan": { + "includes": [ + "phpstan-strict-rules.neon" + ] + } + }, + "autoload": { + "psr-4": { + "TheCodingMachine\\PHPStan\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "David Négrier", + "email": "d.negrier@thecodingmachine.com" + } + ], + "description": "A set of additional rules for PHPStan based on best practices followed at TheCodingMachine", + "support": { + "issues": "https://github.com/thecodingmachine/phpstan-strict-rules/issues", + "source": "https://github.com/thecodingmachine/phpstan-strict-rules/tree/v0.12.2" + }, + "time": "2021-11-08T09:01:22+00:00" + }, + { + "name": "theseer/tokenizer", + "version": "1.2.3", + "source": { + "type": "git", + "url": "https://github.com/theseer/tokenizer.git", + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": "^7.2 || ^8.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + } + ], + "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "support": { + "issues": "https://github.com/theseer/tokenizer/issues", + "source": "https://github.com/theseer/tokenizer/tree/1.2.3" + }, + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2024-03-03T12:36:25+00:00" + }, + { + "name": "voku/portable-ascii", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/voku/portable-ascii.git", + "reference": "b56450eed252f6801410d810c8e1727224ae0743" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b56450eed252f6801410d810c8e1727224ae0743", + "reference": "b56450eed252f6801410d810c8e1727224ae0743", + "shasum": "" + }, + "require": { + "php": ">=7.0.0" + }, + "require-dev": { + "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0" + }, + "suggest": { + "ext-intl": "Use Intl for transliterator_transliterate() support" + }, + "type": "library", + "autoload": { + "psr-4": { + "voku\\": "src/voku/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Lars Moelleken", + "homepage": "http://www.moelleken.org/" + } + ], + "description": "Portable ASCII library - performance optimized (ascii) string functions for php.", + "homepage": "https://github.com/voku/portable-ascii", + "keywords": [ + "ascii", + "clean", + "php" + ], + "support": { + "issues": "https://github.com/voku/portable-ascii/issues", + "source": "https://github.com/voku/portable-ascii/tree/2.0.1" + }, + "funding": [ + { + "url": "https://www.paypal.me/moelleken", + "type": "custom" + }, + { + "url": "https://github.com/voku", + "type": "github" + }, + { + "url": "https://opencollective.com/portable-ascii", + "type": "open_collective" + }, + { + "url": "https://www.patreon.com/voku", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/voku/portable-ascii", + "type": "tidelift" + } + ], + "time": "2022-03-08T17:03:00+00:00" + } + ], + "aliases": [], + "minimum-stability": "dev", + "stability-flags": [], + "prefer-stable": true, + "prefer-lowest": false, + "platform": { + "php": "^7.4|^8.0", + "ext-iconv": "*", + "ext-json": "*", + "ext-mbstring": "*", + "ext-tokenizer": "*" + }, + "platform-dev": [], + "plugin-api-version": "2.6.0" +} diff --git a/nixpkgs/pkgs/development/php-packages/phpinsights/default.nix b/nixpkgs/pkgs/development/php-packages/phpinsights/default.nix new file mode 100644 index 000000000000..64e3fc59b58a --- /dev/null +++ b/nixpkgs/pkgs/development/php-packages/phpinsights/default.nix @@ -0,0 +1,29 @@ +{ lib +, fetchFromGitHub +, php +}: + +php.buildComposerProject (finalAttrs: { + pname = "phpinsights"; + version = "2.11.0"; + + src = fetchFromGitHub { + owner = "nunomaduro"; + repo = "phpinsights"; + rev = "v${finalAttrs.version}"; + hash = "sha256-7ATlfAlCFv78JSKg5cD/VcYoq/EAM/6/GjH3lkfVCJ8="; + }; + + vendorHash = "sha256-ykAv7laYMvzd+uD6raMRQiZmCEa0ELQj1hJPb8UvjCk="; + + composerLock = ./composer.lock; + + meta = { + changelog = "https://github.com/nunomaduro/phpinsights/releases/tag/v${finalAttrs.version}"; + description = "Instant PHP quality checks from your console"; + homepage = "https://phpinsights.com/"; + license = lib.licenses.mit; + mainProgram = "phpinsights"; + maintainers = with lib.maintainers; [ patka ]; + }; +}) diff --git a/nixpkgs/pkgs/development/php-packages/phpstan/default.nix b/nixpkgs/pkgs/development/php-packages/phpstan/default.nix index 071ea154f7a6..d2e28b0a1b2c 100644 --- a/nixpkgs/pkgs/development/php-packages/phpstan/default.nix +++ b/nixpkgs/pkgs/development/php-packages/phpstan/default.nix @@ -2,16 +2,16 @@ php.buildComposerProject (finalAttrs: { pname = "phpstan"; - version = "1.10.62"; + version = "1.10.65"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan-src"; rev = finalAttrs.version; - hash = "sha256-G/8h5xS2DyGuavVaqkO1Q+M/FoSH7qgTfVddoxIsyqU="; + hash = "sha256-mKNix5TEnr0aUHxn9cYvFafU7yLhTe8AVkHZcu0/a1M="; }; - vendorHash = "sha256-QEsslE+5KcUNLmk2vlrd+j/dFgEHXqsoESGoQ34IAnM="; + vendorHash = "sha256-NezEoraSomeeMbY7qz2pH2EwLr/VXO1tmWJ5/2fS/qU="; composerStrictValidation = false; meta = { diff --git a/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/nixpkgs/pkgs/development/python-modules/ailment/default.nix index 1131a4b9c93f..348d4e8e6237 100644 --- a/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -8,23 +8,23 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.84"; + version = "9.2.96"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "angr"; - repo = pname; + repo = "ailment"; rev = "refs/tags/v${version}"; - hash = "sha256-I4lZrp4coJOBB8gREmeQsCiNhMC0MqhYxd5BmYXq9BA="; + hash = "sha256-xc9/J360ftynKT5HYNcjR/0WX04DUDmszaAHb8h3Iao="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pyvex ]; diff --git a/nixpkgs/pkgs/development/python-modules/aioambient/default.nix b/nixpkgs/pkgs/development/python-modules/aioambient/default.nix index 9619b26a0b97..5646bf02b8a2 100644 --- a/nixpkgs/pkgs/development/python-modules/aioambient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioambient/default.nix @@ -2,6 +2,7 @@ , aiohttp , aresponses , buildPythonPackage +, certifi , fetchFromGitHub , poetry-core , pytest-aiohttp @@ -27,12 +28,13 @@ buildPythonPackage rec { hash = "sha256-eqZVY0L+2BWF7cCXW/VLQYYXNPtUF6tJHQmeZNW1W5o="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp + certifi python-engineio python-socketio websockets diff --git a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix index c17f2df97fa2..81459f8f32ae 100644 --- a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -25,24 +25,24 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "23.1.0"; + version = "23.2.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "esphome"; - repo = pname; + repo = "aioesphomeapi"; rev = "refs/tags/v${version}"; - hash = "sha256-1Y2hcgvn0Msx17t1sH5N8cg2wmYo6YqFWPUqUNTNN5M="; + hash = "sha256-GFQ87Ic0xHXs8ZgmzH7kOFbDSNmtj0hx+YHKnrz/sG0="; }; - nativeBuildInputs = [ + build-system = [ setuptools cython_3 ]; - propagatedBuildInputs = [ + dependencies = [ aiohappyeyeballs async-interrupt chacha20poly1305-reuseable diff --git a/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix b/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix index 853d01257740..19baf29f55c5 100644 --- a/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiopvpc"; - version = "4.3.0"; + version = "4.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "azogue"; repo = "aiopvpc"; rev = "refs/tags/v${version}"; - hash = "sha256-8CNmrE3EMFg/bCrdI+K/8f0MRzKtGI74ILFMuSg1Ivo="; + hash = "sha256-1xeXfhoXRfJ7vrpRPeYmwcAGjL09iNCOm/f4pPvuZLU="; }; postPatch = '' @@ -31,11 +31,11 @@ buildPythonPackage rec { --replace-fail " --cov --cov-report term --cov-report html" "" ''; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp async-timeout ] ++ lib.optionals (pythonOlder "3.9") [ diff --git a/nixpkgs/pkgs/development/python-modules/aioraven/default.nix b/nixpkgs/pkgs/development/python-modules/aioraven/default.nix index 227e0b62becf..ca64f111e35e 100644 --- a/nixpkgs/pkgs/development/python-modules/aioraven/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioraven/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioraven"; - version = "0.5.2"; + version = "0.5.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,14 +21,14 @@ buildPythonPackage rec { owner = "cottsay"; repo = "aioraven"; rev = "refs/tags/${version}"; - hash = "sha256-ysmIxWy+gufX5oUfQ7Zw5xv0t/yxihFB+eAdYAWAmXs="; + hash = "sha256-kGCFwpMaLWxLUp8k5H5AnL21KrwohbUYLswLcLqmc3M="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ iso4217 pyserial pyserial-asyncio diff --git a/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix b/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix index 01879192a82d..ebb61463bf88 100644 --- a/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "72"; + version = "73"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,22 +24,22 @@ buildPythonPackage rec { owner = "Kane610"; repo = "aiounifi"; rev = "refs/tags/v${version}"; - hash = "sha256-PrFI5ncHW4r2Re1BIqRZlz8ns6d5p6y6PASCleSmyNc="; + hash = "sha256-xs3+2f/CNabdXm8g2V+sEIR5kQguxi3nMeJLb8TVrck="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "setuptools==" "setuptools>=" \ - --replace "wheel==" "wheel>=" + --replace-fail "setuptools==" "setuptools>=" \ + --replace-fail "wheel==" "wheel>=" sed -i '/--cov=/d' pyproject.toml ''; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp orjson segno @@ -63,10 +63,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for communicating with Unifi Controller API"; - mainProgram = "aiounifi"; homepage = "https://github.com/Kane610/aiounifi"; changelog = "https://github.com/Kane610/aiounifi/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; + mainProgram = "aiounifi"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/angr/default.nix b/nixpkgs/pkgs/development/python-modules/angr/default.nix index 3fee462c620b..06a884aaa0b3 100644 --- a/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -20,19 +20,23 @@ , protobuf , psutil , pycparser +, pyformlang , pythonOlder +, pythonRelaxDepsHook , pyvex , rich , rpyc +, setuptools , sortedcontainers , sqlalchemy , sympy , unicorn +, unique-log-filter }: buildPythonPackage rec { pname = "angr"; - version = "9.2.84"; + version = "9.2.96"; pyproject = true; disabled = pythonOlder "3.11"; @@ -41,10 +45,19 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-qav9SUvQtcEad9lvgyrMhOcFhPAhzU/9s7ekTfohqRc="; + hash = "sha256-eyXjmU/K8zv5nxrt+oKkyxS00tHOYrkbTc2X9esTSSA="; }; - propagatedBuildInputs = [ + pythonRelaxDeps = [ + "capstone" + ]; + + build-system = [ + pythonRelaxDepsHook + setuptools + ]; + + dependencies = [ ailment archinfo cachetools @@ -63,6 +76,7 @@ buildPythonPackage rec { protobuf psutil pycparser + pyformlang pyvex rich rpyc @@ -70,6 +84,7 @@ buildPythonPackage rec { sqlalchemy sympy unicorn + unique-log-filter ]; setupPyBuildFlags = lib.optionals stdenv.isLinux [ diff --git a/nixpkgs/pkgs/development/python-modules/angrcli/default.nix b/nixpkgs/pkgs/development/python-modules/angrcli/default.nix index 368ea4c9a27e..cd2bf2f5508f 100644 --- a/nixpkgs/pkgs/development/python-modules/angrcli/default.nix +++ b/nixpkgs/pkgs/development/python-modules/angrcli/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , angr , buildPythonPackage , cmd2 @@ -8,28 +7,34 @@ , pygments , pytestCheckHook , pythonOlder +, setuptools +, stdenv }: buildPythonPackage rec { pname = "angrcli"; version = "1.2.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "fmagin"; repo = "angr-cli"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-a5ajUBQwt3xUNkeSOeGOAFf47wd4UVk+LcuAHGqbq4s="; }; postPatch = '' substituteInPlace tests/test_derefs.py \ - --replace "/bin/ls" "${coreutils}/bin/ls" + --replace-fail "/bin/ls" "${coreutils}/bin/ls" ''; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ angr cmd2 pygments diff --git a/nixpkgs/pkgs/development/python-modules/angrop/default.nix b/nixpkgs/pkgs/development/python-modules/angrop/default.nix index 69b06e58784d..1d26565b1b96 100644 --- a/nixpkgs/pkgs/development/python-modules/angrop/default.nix +++ b/nixpkgs/pkgs/development/python-modules/angrop/default.nix @@ -11,22 +11,22 @@ buildPythonPackage rec { pname = "angrop"; version = "9.2.8"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; - repo = pname; + repo = "angrop"; rev = "refs/tags/v${version}"; hash = "sha256-zmWdGbFzwLDP7MUqEprZcIgA7lAdCrafWYohAehJyh0="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ angr progressbar tqdm diff --git a/nixpkgs/pkgs/development/python-modules/app-model/default.nix b/nixpkgs/pkgs/development/python-modules/app-model/default.nix index a3af5ba33b86..7dc1c65349ea 100644 --- a/nixpkgs/pkgs/development/python-modules/app-model/default.nix +++ b/nixpkgs/pkgs/development/python-modules/app-model/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "app-model"; - version = "0.2.5"; + version = "0.2.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = "app-model"; rev = "refs/tags/v${version}"; - hash = "sha256-lnsaplJJk+c0hdHyQPH98ssppxBXqj/O0K6xlRfk+Oc="; + hash = "sha256-EMlxY9Xna9e3kWJ7X8oRuLHEmivwVFcEXRDvZfN2rNY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index 35fc62a91b76..3bee9cd94282 100644 --- a/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -9,23 +9,23 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.84"; + version = "9.2.96"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "angr"; - repo = pname; + repo = "archinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-drZuQRQ2XukCimH/SG6CRCL4avyMEcKxuj+Rinp7lJQ="; + hash = "sha256-g/fxj/6dMVLoW4hFtVDEjHjdJiB3KE2XB3c0ihclqeM="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ + dependencies = lib.optionals (pythonOlder "3.11") [ backports-strenum ]; diff --git a/nixpkgs/pkgs/development/python-modules/asgi-lifespan/default.nix b/nixpkgs/pkgs/development/python-modules/asgi-lifespan/default.nix new file mode 100644 index 000000000000..05e21d84585f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/asgi-lifespan/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, setuptools-scm +, sniffio +}: + +buildPythonPackage rec { + pname = "asgi-lifespan"; + version = "2.1.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "florimondmanca"; + repo = "asgi-lifespan"; + rev = "refs/tags/${version}"; + hash = "sha256-Jgmd/4c1lxHM/qi3MJNN1aSSUJrI7CRNwwHrFwwcCkc="; + }; + + postPatch = '' + sed -i "/--cov/d" setup.cfg + ''; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + sniffio + ]; + + # Circular dependencies, starlette + doCheck = false; + + pythonImportsCheck = [ + "asgi_lifespan" + ]; + + meta = with lib; { + description = "Programmatic startup/shutdown of ASGI apps"; + homepage = "https://github.com/florimondmanca/asgi-lifespan"; + changelog = "https://github.com/florimondmanca/asgi-lifespan/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix b/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix index 57306bd01a4d..c31beceb1496 100644 --- a/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asyncstdlib"; - version = "3.12.1"; + version = "3.12.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,10 +17,10 @@ buildPythonPackage rec { owner = "maxfischer2781"; repo = "asyncstdlib"; rev = "refs/tags/v${version}"; - hash = "sha256-F7jS2EHiq+gK4a6+wJ8CA2YvwR37PP3yvbsLp3uE8R8="; + hash = "sha256-5DQM8m3aeCZAXOi+Rm+iM409juBBYdZDNqBAbhyTm/M="; }; - nativeBuildInputs = [ + build-system = [ flit-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix b/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix index 7cd356214d56..674b127fcae1 100644 --- a/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix @@ -25,8 +25,8 @@ buildPythonPackage rec { pname = "awswrangler"; - version = "3.7.1"; - format = "pyproject"; + version = "3.7.2"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -34,14 +34,14 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-sdk-pandas"; rev = "refs/tags/${version}"; - hash = "sha256-6HocnnPG/Id+49NN3WqnSYEnsijA2r13WM2NJIxVwFs="; + hash = "sha256-1eb2oTiRNxA2XTpkScA5WJutN5P6FX96jC4Ra9VdonI="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ boto3 gremlinpython jsonpath-ng diff --git a/nixpkgs/pkgs/development/python-modules/azure-cosmos/default.nix b/nixpkgs/pkgs/development/python-modules/azure-cosmos/default.nix index b8810f06f465..535a4664514f 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-cosmos/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-cosmos/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "4.5.1"; + version = "4.6.0"; format = "setuptools"; pname = "azure-cosmos"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xK2oOBMG7sQTwBvFCneOJk3D9Pr6nWlvnfhDYUjSrqg="; + sha256 = "sha256-2uxqwgHGRzsJK2Ku5x44G+62w6jcNhJJgytwSMTwYeI="; }; propagatedBuildInputs = [ six requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/bases/default.nix b/nixpkgs/pkgs/development/python-modules/bases/default.nix new file mode 100644 index 000000000000..9c25ffaa63f8 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/bases/default.nix @@ -0,0 +1,73 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +, pytestCheckHook + +, pythonOlder + +, setuptools +, wheel +, setuptools-scm + + # for tests +, base58 + +, typing-extensions +, typing-validation +}: + +buildPythonPackage rec { + pname = "bases"; + version = "0.3.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "hashberg-io"; + repo = "bases"; + rev = "refs/tags/v${version}"; + hash = "sha256-CRXVxT9uYud1CKRcdRAD0OX5sTAttrUO9E4BaavTe6A="; + }; + + build-system = [ + setuptools + wheel + setuptools-scm + ]; + + dependencies = [ + typing-extensions + typing-validation + ]; + + nativeCheckInputs = [ + pytestCheckHook + base58 + ]; + + pythonImportsCheck = [ + "bases" + "bases.alphabet" + "bases.alphabet.abstract" + "bases.alphabet.range_alphabet" + "bases.alphabet.string_alphabet" + "bases.encoding" + "bases.encoding.base" + "bases.encoding.block" + "bases.encoding.errors" + "bases.encoding.fixchar" + "bases.encoding.simple" + "bases.encoding.zeropad" + "bases.random" + ]; + + meta = { + description = "Python library for general Base-N encodings"; + homepage = "https://github.com/hashberg-io/bases"; + changelog = "https://github.com/hashberg-io/bases/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vizid ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/bc-detect-secrets/default.nix b/nixpkgs/pkgs/development/python-modules/bc-detect-secrets/default.nix index e15cae256240..df19afca09d5 100644 --- a/nixpkgs/pkgs/development/python-modules/bc-detect-secrets/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bc-detect-secrets/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "bc-detect-secrets"; - version = "1.5.4"; + version = "1.5.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,14 +25,14 @@ buildPythonPackage rec { owner = "bridgecrewio"; repo = "detect-secrets"; rev = "refs/tags/${version}"; - hash = "sha256-Gm8PYN9vqYkGaGKpLZkx0Ehd1P3G2d5LkSjWXxpPerI="; + hash = "sha256-05hxc34ecSoAp0GBVf9yq2BC928wxZOLZJHAbJ7cdtk="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pyyaml requests unidiff diff --git a/nixpkgs/pkgs/development/python-modules/bidict/default.nix b/nixpkgs/pkgs/development/python-modules/bidict/default.nix index f2c2ce7958f1..871e896dbd95 100644 --- a/nixpkgs/pkgs/development/python-modules/bidict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bidict/default.nix @@ -2,16 +2,12 @@ , buildPythonPackage , fetchFromGitHub , setuptools -, sphinx , hypothesis -, py , pytest-xdist , pytestCheckHook -, pytest-benchmark -, sortedcollections -, sortedcontainers , typing-extensions , pythonOlder +, wheel }: buildPythonPackage rec { @@ -19,7 +15,7 @@ buildPythonPackage rec { version = "0.23.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jab"; @@ -28,32 +24,32 @@ buildPythonPackage rec { hash = "sha256-WE0YaRT4a/byvU2pzcByuf1DfMlOpYA9i0PPrKXsS+M="; }; - nativeBuildInputs = [ + build-system = [ setuptools - ]; - - propagatedBuildInputs = [ - sphinx + wheel ]; nativeCheckInputs = [ hypothesis - py pytest-xdist pytestCheckHook - pytest-benchmark - sortedcollections - sortedcontainers typing-extensions ]; + pytestFlagsArray = [ + # Pass -c /dev/null so that pytest does not use the bundled pytest.ini, which adds + # options to run additional integration tests that are overkill for our purposes. + "-c" + "/dev/null" + ]; + pythonImportsCheck = [ "bidict" ]; meta = with lib; { - homepage = "https://github.com/jab/bidict"; - changelog = "https://github.com/jab/bidict/blob/v${version}/CHANGELOG.rst"; - description = "Efficient, Pythonic bidirectional map data structures and related functionality"; + homepage = "https://bidict.readthedocs.io"; + changelog = "https://bidict.readthedocs.io/changelog.html"; + description = "The bidirectional mapping library for Python."; license = licenses.mpl20; - maintainers = with maintainers; [ jakewaksbaum ]; + maintainers = with maintainers; [ jab jakewaksbaum ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/booleanoperations/default.nix b/nixpkgs/pkgs/development/python-modules/booleanoperations/default.nix index af718d99aca7..4d96bb7612ed 100644 --- a/nixpkgs/pkgs/development/python-modules/booleanoperations/default.nix +++ b/nixpkgs/pkgs/development/python-modules/booleanoperations/default.nix @@ -4,11 +4,12 @@ }: buildPythonPackage rec { - pname = "booleanOperations"; + pname = "booleanoperations"; version = "0.9.0"; src = fetchPypi { - inherit pname version; + pname = "booleanOperations"; + inherit version; sha256 = "1f41lb19m8azchl1aqz6j5ycbspb8jsf1cnn42hlydxd68f85ylc"; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/boto3-stubs/default.nix b/nixpkgs/pkgs/development/python-modules/boto3-stubs/default.nix index a3d2f9a99e62..a5e202469480 100644 --- a/nixpkgs/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/boto3-stubs/default.nix @@ -365,14 +365,14 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.69"; + version = "1.34.72"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-k/tPhkDNAacOnTyUOVxn+2GX9eZiPS858YNXtbmtvfw="; + hash = "sha256-eQPciiA763TWI3smauBk/1qbJ2B0r3UAt9tIVEZJWWo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix b/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix index 8987a9695d50..998174d6ccbb 100644 --- a/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "5.19.0"; + version = "5.20.0"; pyproject = true; # chart-studio was split from plotly @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "plotly"; repo = "plotly.py"; rev = "refs/tags/v${version}"; - hash = "sha256-Xi1Sf07TLPv6TsmsR2WDfY9NYdglpwiu22RjMiktTdw="; + hash = "sha256-LSZGaefxQC6h9VAJ2wgZyaQPR6vs0wrp2oxd51I3pL8="; }; sourceRoot = "${src.name}/packages/python/chart-studio"; diff --git a/nixpkgs/pkgs/development/python-modules/cjkwrap/default.nix b/nixpkgs/pkgs/development/python-modules/cjkwrap/default.nix index 43e5909ec47b..83f487a2af14 100644 --- a/nixpkgs/pkgs/development/python-modules/cjkwrap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cjkwrap/default.nix @@ -1,10 +1,11 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - pname = "CJKwrap"; + pname = "cjkwrap"; version = "2.2"; src = fetchPypi { - inherit pname version; + pname = "CJKwrap"; + inherit version; sha256 = "1b603sg6c2gv9vmlxwr6r1qvhadqk3qp6vifmijris504zjx5ix2"; }; diff --git a/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix b/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix index 2503df540047..172392f4567f 100644 --- a/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "10.2.1"; + version = "10.2.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; rev = "refs/tags/${version}"; - hash = "sha256-8U1e4NOvi2+8GFMXwKiAiCyMYTsfKGW728v0tk6WlgQ="; + hash = "sha256-beBUluOTu90H2pinBWhb0Q1KmQ0vq23k+ZyCJVoc7ls="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/clarifai/default.nix b/nixpkgs/pkgs/development/python-modules/clarifai/default.nix index a6a28221ce66..54faa5fd47c8 100644 --- a/nixpkgs/pkgs/development/python-modules/clarifai/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clarifai/default.nix @@ -17,13 +17,14 @@ , rich , schema , setuptools +, tabulate , tqdm , tritonclient }: buildPythonPackage rec { pname = "clarifai"; - version = "10.1.1"; + version = "10.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +33,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python"; rev = "refs/tags/${version}"; - hash = "sha256-36XceC40cL0SywY0Mus/s8OCO0ujWqxEIKZW+fvd7lw="; + hash = "sha256-jI85xMApeEd0Hl6h4Am5qxWoSSTWHsmb7FxUjJPmBQM="; }; pythonRelaxDeps = [ @@ -43,12 +44,12 @@ buildPythonPackage rec { "opencv-python" ]; - nativeBuildInputs = [ + build-system = [ pythonRelaxDepsHook setuptools ]; - propagatedBuildInputs = [ + dependencies = [ clarifai-grpc inquirerpy llama-index-core @@ -60,6 +61,7 @@ buildPythonPackage rec { pyyaml rich schema + tabulate tqdm tritonclient ]; @@ -87,6 +89,7 @@ buildPythonPackage rec { # Tests require network access and API key "tests/test_app.py" "tests/test_data_upload.py" + "tests/test_eval.py" "tests/test_model_predict.py" "tests/test_model_train.py" "tests/test_search.py" @@ -102,10 +105,10 @@ buildPythonPackage rec { meta = with lib; { description = "Clarifai Python Utilities"; - mainProgram = "clarifai"; homepage = "https://github.com/Clarifai/clarifai-python"; changelog = "https://github.com/Clarifai/clarifai-python/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ natsukium ]; + mainProgram = "clarifai"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/nixpkgs/pkgs/development/python-modules/claripy/default.nix index b5c0dcd06150..b9526b9faa7c 100644 --- a/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -1,19 +1,19 @@ { lib , buildPythonPackage -, setuptools , cachetools , decorator , fetchFromGitHub -, future , pysmt -, pythonOlder , pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +, setuptools , z3-solver }: buildPythonPackage rec { pname = "claripy"; - version = "9.2.84"; + version = "9.2.96"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,20 +22,25 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-wgCWMngda0gB+AEDFpRxQ2ots5YXE4bkBSxMtYJqLEo="; + hash = "sha256-rXJzJCyhsScFW1L/mVARciGDlOOBCFT69VBivjV6oig="; }; - nativeBuildInputs = [ + # z3 does not provide a dist-info, so python-runtime-deps-check will fail + pythonRemoveDeps = [ + "z3-solver" + ]; + + build-system = [ + pythonRelaxDepsHook setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cachetools decorator - future pysmt z3-solver - ]; + ] ++ z3-solver.requiredPythonModules; nativeCheckInputs = [ pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/cle/default.nix b/nixpkgs/pkgs/development/python-modules/cle/default.nix index 20ac0c60435d..df4594f76170 100644 --- a/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -1,4 +1,5 @@ { lib +, archinfo , buildPythonPackage , cffi , fetchFromGitHub @@ -16,14 +17,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.84"; + version = "9.2.96"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-sU9Rv2kTLYMpaalrkcOv6HlHt1u4oG482M+d7OSjJ3Y="; + hash = "sha256-eC9qQCrms4pSXYTrKJlfdejhl/kzUmmyfYhjlEPpgzA="; }; in @@ -38,14 +39,15 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-N0z5wgaeWkoPuhIUj7bj1kDKgZ7pWChm1uEU4MjXjqI="; + hash = "sha256-osClaoAzjf3mOng38disxxSFncbc/V7Uuc1HCTdX4SQ="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ + archinfo cffi minidump pefile diff --git a/nixpkgs/pkgs/development/python-modules/clickhouse-connect/default.nix b/nixpkgs/pkgs/development/python-modules/clickhouse-connect/default.nix index 5be944efdb1d..277216a3f968 100644 --- a/nixpkgs/pkgs/development/python-modules/clickhouse-connect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clickhouse-connect/default.nix @@ -23,7 +23,7 @@ }: buildPythonPackage rec { pname = "clickhouse-connect"; - version = "0.7.3"; + version = "0.7.4"; format = "setuptools"; @@ -33,7 +33,7 @@ buildPythonPackage rec { repo = "clickhouse-connect"; owner = "ClickHouse"; rev = "refs/tags/v${version}"; - hash = "sha256-MA902Dyx3a8GTZ52LYY0UrWqNEFmibqIsdz6PFZIkIY="; + hash = "sha256-YEtcM9+GO8mYv2pyaBYmXdmWLXVuteKtQIJR4H+Xsd4="; }; nativeBuildInputs = [ cython_3 ]; diff --git a/nixpkgs/pkgs/development/python-modules/cocotb/0002-Patch-remove-test_unicode_handle_assignment_deprecated-test.patch b/nixpkgs/pkgs/development/python-modules/cocotb/0002-Patch-remove-test_unicode_handle_assignment_deprecated-test.patch new file mode 100644 index 000000000000..f1a6c7f975fa --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/cocotb/0002-Patch-remove-test_unicode_handle_assignment_deprecated-test.patch @@ -0,0 +1,25 @@ +diff --git a/tests/test_cases/test_cocotb/test_deprecated.py b/tests/test_cases/test_cocotb/test_deprecated.py +index 523b93ba..b4f1701e 100644 +--- a/tests/test_cases/test_cocotb/test_deprecated.py ++++ b/tests/test_cases/test_cocotb/test_deprecated.py +@@ -26,20 +26,6 @@ async def test_returnvalue_deprecated(dut): + assert val == 42 + + +-# strings are not supported on Icarus (gh-2585) or GHDL (gh-2584) +-@cocotb.test( +- expect_error=AttributeError +- if cocotb.SIM_NAME.lower().startswith("icarus") +- else TypeError +- if cocotb.SIM_NAME.lower().startswith("ghdl") +- else () +-) +-async def test_unicode_handle_assignment_deprecated(dut): +- with pytest.warns(DeprecationWarning, match=".*bytes.*"): +- dut.stream_in_string.value = "Bad idea" +- await cocotb.triggers.ReadWrite() +- +- + @cocotb.test() + async def test_convert_handle_to_string_deprecated(dut): + dut.stream_in_data.value = 0 diff --git a/nixpkgs/pkgs/development/python-modules/cocotb/default.nix b/nixpkgs/pkgs/development/python-modules/cocotb/default.nix index 0e758490b803..8d996a4ebb04 100644 --- a/nixpkgs/pkgs/development/python-modules/cocotb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cocotb/default.nix @@ -52,6 +52,10 @@ buildPythonPackage rec { patches = [ # Fix "can't link with bundle (MH_BUNDLE) only dylibs (MH_DYLIB) file" error ./0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch + + # For the 1.8.1 release only: remove the test_unicode_handle_assignment_deprecated test + # It's more thoroughly removed upstream master with 425e1edb8e7133f4a891f2f87552aa2748cd8d2c + ./0002-Patch-remove-test_unicode_handle_assignment_deprecated-test.patch ]; nativeCheckInputs = [ cocotb-bus pytestCheckHook swig verilog ghdl ]; diff --git a/nixpkgs/pkgs/development/python-modules/comm/default.nix b/nixpkgs/pkgs/development/python-modules/comm/default.nix index 3c2fa837a8cd..9ab4eb2c5008 100644 --- a/nixpkgs/pkgs/development/python-modules/comm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/comm/default.nix @@ -8,7 +8,7 @@ let pname = "comm"; - version = "0.2.1"; + version = "0.2.2"; in buildPythonPackage { inherit pname version; @@ -18,7 +18,7 @@ buildPythonPackage { owner = "ipython"; repo = "comm"; rev = "refs/tags/v${version}"; - hash = "sha256-iyO3q9E2lYU1rMYTnsa+ZJYh+Hq72LEvE9ynebFIBUk="; + hash = "sha256-51HSSULhbKb1NdLJ//b3Vh6sOLWp0B4KW469htpduqM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cppheaderparser/default.nix b/nixpkgs/pkgs/development/python-modules/cppheaderparser/default.nix index bf2c696f2841..cb834b1d48a1 100644 --- a/nixpkgs/pkgs/development/python-modules/cppheaderparser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cppheaderparser/default.nix @@ -5,11 +5,12 @@ }: buildPythonPackage rec { - pname = "CppHeaderParser"; + pname = "cppheaderparser"; version = "2.7.4"; src = fetchPypi { - inherit pname version; + pname = "CppHeaderParser"; + inherit version; hash = "sha256-OCswQW2VsKXoUCshSBDcrCpWQykX4mUUR9Or4lPjzEI="; }; diff --git a/nixpkgs/pkgs/development/python-modules/cypari2/default.nix b/nixpkgs/pkgs/development/python-modules/cypari2/default.nix index cf808fe263a4..f93e04629728 100644 --- a/nixpkgs/pkgs/development/python-modules/cypari2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cypari2/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "cypari2"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.1.4"; + version = "2.1.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-76SkTZb2k8sRVtof1vzMEw2vz5wZr0GFz3cL9E0A2/w="; + sha256 = "sha256-GiWGXDTyCx3JWDB5jjSrZDbieLjgyA3HvwqzTF2wOrg="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/dbglib/default.nix b/nixpkgs/pkgs/development/python-modules/dbglib/default.nix new file mode 100644 index 000000000000..c928e5bb71e0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dbglib/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "dbglib"; + version = "0.3.0"; + format = "pyproject"; + disabled = pythonOlder "3.9"; + src = fetchPypi { + inherit pname version; + sha256 = "7b4fd5c4949af435a7ab558f87b406acd5ddf9dc7f01fc3b3e99ebcec9a4674c"; + }; + propagatedBuildInputs = [ + poetry-core + ]; + pythonImportsCheck = [ + "dbglib" + ]; + meta = with lib; { + homepage = "https://github.com/savioxavier/dbglib/"; + license = licenses.mit; + maintainers = [ maintainers.jetpackjackson ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/dbt-bigquery/default.nix b/nixpkgs/pkgs/development/python-modules/dbt-bigquery/default.nix index cb1d12bca703..d6401c6502a0 100644 --- a/nixpkgs/pkgs/development/python-modules/dbt-bigquery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dbt-bigquery/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dbt-bigquery"; - version = "1.7.6"; + version = "1.7.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,19 +24,19 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-bigquery"; rev = "refs/tags/v${version}"; - hash = "sha256-bF2++Bs4pvqA3GW2xJkRNa1HkqnHBbMnKHHjo1TWboM="; + hash = "sha256-+UF49ReSxKQ8ouutOv1b9JcU/6CNk7Yw8f1/tlRvwnU="; }; - nativeBuildInputs = [ - pythonRelaxDepsHook - setuptools - ]; - pythonRelaxDeps = [ "agate" ]; - propagatedBuildInputs = [ + build-system = [ + pythonRelaxDepsHook + setuptools + ]; + + dependencies = [ agate dbt-core google-cloud-bigquery diff --git a/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix b/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix index b537da2a3055..9a165b4925ca 100644 --- a/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "dbt-core"; - version = "1.7.10"; + version = "1.7.11"; pyproject = true; disabled = pythonOlder "3.8"; @@ -42,26 +42,27 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-core"; rev = "refs/tags/v${version}"; - hash = "sha256-0cKzQjAnj0JMrHyA/gOgYceM6g1URJFgQtp90m09Nkw="; + hash = "sha256-r51aki1fuHfp6gWkzOMA92xFeM0MXFPrNq77aKTYYWA="; }; sourceRoot = "${src.name}/core"; - nativeBuildInputs = [ - pythonRelaxDepsHook - setuptools - ]; - pythonRelaxDeps = [ "agate" "click" "mashumaro" "networkx" "logbook" + "pathspec" "urllib3" ]; - propagatedBuildInputs = [ + build-system = [ + pythonRelaxDepsHook + setuptools + ]; + + dependencies = [ agate cffi click diff --git a/nixpkgs/pkgs/development/python-modules/dbt-postgres/default.nix b/nixpkgs/pkgs/development/python-modules/dbt-postgres/default.nix index b2852ce6d214..d2669cb2357e 100644 --- a/nixpkgs/pkgs/development/python-modules/dbt-postgres/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dbt-postgres/default.nix @@ -19,11 +19,11 @@ buildPythonPackage { env.DBT_PSYCOPG2_NAME = "psycopg2"; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ agate dbt-core psycopg2 diff --git a/nixpkgs/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix b/nixpkgs/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix index 894dbed29f26..d63a0cee0447 100644 --- a/nixpkgs/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix @@ -36,12 +36,12 @@ buildPythonPackage rec { "importlib-metadata" ]; - nativeBuildInputs = [ + build-system = [ hatchling pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ click dateutils importlib-metadata @@ -63,9 +63,9 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/dbt-labs/dbt-semantic-interfaces/releases/tag/v${version}"; - description = "shared interfaces used by dbt-core and MetricFlow projects"; + description = "Shared interfaces used by dbt-core and MetricFlow projects"; homepage = "https://github.com/dbt-labs/dbt-semantic-interfaces"; + changelog = "https://github.com/dbt-labs/dbt-semantic-interfaces/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ pbsds ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/dbt-snowflake/default.nix b/nixpkgs/pkgs/development/python-modules/dbt-snowflake/default.nix index ef3cb866c2b2..a25ffaba5581 100644 --- a/nixpkgs/pkgs/development/python-modules/dbt-snowflake/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dbt-snowflake/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dbt-snowflake"; - version = "1.7.2"; + version = "1.7.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,14 +19,14 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-snowflake"; rev = "refs/tags/v${version}"; - hash = "sha256-OyUBqSNHMedCDsY280O8VAmxeyeF5J0snk5o6XhE2V4="; + hash = "sha256-ksnLQdoXR8KVtYTFdlaWT8UYjAsLNyEVVap/QHtm+j8="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ dbt-core snowflake-connector-python ] ++ snowflake-connector-python.optional-dependencies.secure-local-storage; diff --git a/nixpkgs/pkgs/development/python-modules/deal/default.nix b/nixpkgs/pkgs/development/python-modules/deal/default.nix index b24d8be44826..41d966c8f1e8 100644 --- a/nixpkgs/pkgs/development/python-modules/deal/default.nix +++ b/nixpkgs/pkgs/development/python-modules/deal/default.nix @@ -1,49 +1,49 @@ { lib +, astroid , buildPythonPackage -, pythonOlder +, deal-solver +, docstring-parser , fetchFromGitHub , flit-core -, astroid -, pytestCheckHook -, docstring-parser -, marshmallow -, sphinx , hypothesis -, vaa -, deal-solver +, marshmallow , pygments +, pytestCheckHook +, pythonOlder +, sphinx , typeguard , urllib3 -, flake8 +, vaa }: buildPythonPackage rec { pname = "deal"; - version = "4.24.3"; - format = "pyproject"; + version = "4.24.4"; + pyproject = true; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "life4"; - repo = pname; + repo = "deal"; rev = "refs/tags/${version}"; - hash = "sha256-QlM3d/jmg6v3L3D45+cgcCej71U1dl4uZ6sAYGGm3tU="; + hash = "sha256-4orpoYfPGSvquhg9w63uUe8QbBa2RUpxaEJ9uy28+fU="; }; postPatch = '' # don't do coverage substituteInPlace pyproject.toml \ - --replace "\"--cov-fail-under=100\"," "" \ - --replace "\"--cov=deal\"," "" \ - --replace "\"--cov-report=html\"," "" \ - --replace "\"--cov-report=term-missing:skip-covered\"," "" + --replace-fail '"--cov-fail-under=100",' "" \ + --replace-fail '"--cov=deal",' "" \ + --replace-fail '"--cov-report=html",' "" \ + --replace-fail '"--cov-report=term-missing:skip-covered",' "" ''; - nativeBuildInputs = [ + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ astroid deal-solver pygments @@ -51,15 +51,13 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook - docstring-parser + hypothesis marshmallow + pytestCheckHook sphinx - hypothesis - vaa urllib3 - flake8 + vaa ]; pytestFlagsArray = [ @@ -67,7 +65,7 @@ buildPythonPackage rec { ]; disabledTests = [ - # needs internet access + # Tests need internet access "test_smoke_has" "test_pure_offline" "test_raises_doesnt_override_another_contract" @@ -84,25 +82,30 @@ buildPythonPackage rec { # assert errors "test_doctest" "test_no_violations" + "test_source_get_lambda_multiline_splitted_dec" ]; disabledTestPaths = [ - # needs internet access + # Test needs internet access "tests/test_runtime/test_offline.py" # depends on typeguard <4.0.0 for tests, but >=4.0.0 seems fine for runtime # https://github.com/life4/deal/blob/9be70fa1c5a0635880619b2cea83a9f6631eb236/pyproject.toml#L40 "tests/test_testing.py" ]; - pythonImportsCheck = [ "deal" ]; + pythonImportsCheck = [ + "deal" + ]; meta = with lib; { description = "Library for design by contract (DbC) and checking values, exceptions, and side-effects"; longDescription = '' In a nutshell, deal empowers you to write bug-free code. - By adding a few decorators to your code, you get for free tests, static analysis, formal verification, and much more + By adding a few decorators to your code, you get for free tests, static analysis, formal verification, + and much more. ''; homepage = "https://github.com/life4/deal"; + changelog = "https://github.com/life4/deal/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ gador ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/delorean/default.nix b/nixpkgs/pkgs/development/python-modules/delorean/default.nix index 8573dc7095f5..81f1a1e44469 100644 --- a/nixpkgs/pkgs/development/python-modules/delorean/default.nix +++ b/nixpkgs/pkgs/development/python-modules/delorean/default.nix @@ -9,12 +9,13 @@ }: buildPythonPackage rec { - pname = "Delorean"; + pname = "delorean"; version = "1.0.0"; format = "setuptools"; src = fetchPypi { - inherit pname version; + pname = "Delorean"; + inherit version; hash = "sha256-/md4bhIzhSOEi+xViKZYxNQl4S1T61HP74cL7I9XYTQ="; }; diff --git a/nixpkgs/pkgs/development/python-modules/deprecat/default.nix b/nixpkgs/pkgs/development/python-modules/deprecat/default.nix index 194859ad531a..a87394dea289 100644 --- a/nixpkgs/pkgs/development/python-modules/deprecat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/deprecat/default.nix @@ -10,22 +10,22 @@ buildPythonPackage rec { pname = "deprecat"; version = "2.1.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mjhajharia"; - repo = pname; + repo = "deprecat"; rev = "refs/tags/v${version}"; hash = "sha256-uAabZAtZDhcX6TfiM0LnrAzxxS64ys+vdodmxO//0x8="; }; - nativeBuildInputs = [ + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ wrapt ]; @@ -37,6 +37,11 @@ buildPythonPackage rec { "deprecat" ]; + disabledTestPaths = [ + # https://github.com/mjhajharia/deprecat/issues/13 + "tests/test_sphinx.py" + ]; + meta = with lib; { description = "Decorator to deprecate old python classes, functions or methods"; homepage = "https://github.com/mjhajharia/deprecat"; diff --git a/nixpkgs/pkgs/development/python-modules/dirigera/default.nix b/nixpkgs/pkgs/development/python-modules/dirigera/default.nix index a2856ba209ea..96c62ee20089 100644 --- a/nixpkgs/pkgs/development/python-modules/dirigera/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dirigera/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dirigera"; - version = "1.0.11"; + version = "1.0.12"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,14 +20,14 @@ buildPythonPackage rec { owner = "Leggin"; repo = "dirigera"; rev = "refs/tags/v${version}"; - hash = "sha256-kZlmfoGbvSv13+UqCE73ToLfrzzQ9AOxefRTxUvxMCg="; + hash = "sha256-e8kbMP5ih7MBozFbylLEBR9DrS894X4xZh62OLLSgFw="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pydantic requests websocket-client @@ -43,10 +43,10 @@ buildPythonPackage rec { meta = with lib; { description = "Module for controlling the IKEA Dirigera Smart Home Hub"; - mainProgram = "generate-token"; homepage = "https://github.com/Leggin/dirigera"; changelog = "https://github.com/Leggin/dirigera/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "generate-token"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix b/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix index 3fa84658b6d0..3983cf3f3661 100644 --- a/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "django-auth-ldap"; - version = "4.6.0"; + version = "4.7.0"; format = "pyproject"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-muK/h/m2Nnts/ZSgRRiWy8co5UAO2By/vVjOdDwJCaI="; + hash = "sha256-jeplN2uLL6G+7lI0h2DjCC5kKTmlA4y+iBpeY4G2W4o="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django/5.nix b/nixpkgs/pkgs/development/python-modules/django/5.nix index 7bbc36f27af8..2fe896e3bd3d 100644 --- a/nixpkgs/pkgs/development/python-modules/django/5.nix +++ b/nixpkgs/pkgs/development/python-modules/django/5.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchPypi -, fetchpatch2 , pythonOlder , substituteAll @@ -64,11 +63,6 @@ buildPythonPackage rec { # disable test that excpects timezone issues ./django_5_disable_failing_tests.patch - (fetchpatch2 { - # fix test on 3.12; https://github.com/django/django/pull/17843 - url = "https://github.com/django/django/commit/bc8471f0aac8f0c215b9471b594d159783bac19b.patch"; - hash = "sha256-g1T9b73rmQ0uk1lB+iQy1XwK3Qin3mf5wpRsyYISJaw="; - }) ] ++ lib.optionals withGdal [ (substituteAll { src = ./django_5_set_geos_gdal_lib.patch; diff --git a/nixpkgs/pkgs/development/python-modules/dnf-plugins-core/default.nix b/nixpkgs/pkgs/development/python-modules/dnf-plugins-core/default.nix index 81404145e8b8..70259804158b 100644 --- a/nixpkgs/pkgs/development/python-modules/dnf-plugins-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dnf-plugins-core/default.nix @@ -22,7 +22,7 @@ in buildPythonPackage rec { pname = "dnf-plugins-core"; - version = "4.5.0"; + version = "4.6.0"; format = "other"; outputs = [ "out" "man" ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "rpm-software-management"; repo = "dnf-plugins-core"; rev = "refs/tags/${version}"; - hash = "sha256-og20X2AUzoOphwF+508EobGEp/VYLtxWY7N4k327o8o="; + hash = "sha256-7LaI5EungJrOPgxDzK/pi4X+D3PPsrbIjYdCknKIiHA="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/dnfile/default.nix b/nixpkgs/pkgs/development/python-modules/dnfile/default.nix index 232927aace70..40b97b6b6d8a 100644 --- a/nixpkgs/pkgs/development/python-modules/dnfile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dnfile/default.nix @@ -9,8 +9,8 @@ buildPythonPackage rec { pname = "dnfile"; - version = "0.14.1"; - format = "pyproject"; + version = "0.15.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -18,15 +18,15 @@ buildPythonPackage rec { owner = "malwarefrank"; repo = "dnfile"; rev = "refs/tags/v${version}"; - hash = "sha256-5xkoG7c9Piwrv+9qour7MZ+rabdngtd05b0T+AU8tSo="; + hash = "sha256-HzlMJ4utBHyLLhO+u0uiTfqtk8jX80pEyO75QvpJ3yg="; fetchSubmodules = true; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pefile ]; diff --git a/nixpkgs/pkgs/development/python-modules/duo-client/default.nix b/nixpkgs/pkgs/development/python-modules/duo-client/default.nix index 4339f6918304..38b83c7b131f 100644 --- a/nixpkgs/pkgs/development/python-modules/duo-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/duo-client/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "duo-client"; - version = "5.2.0"; + version = "5.3.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,20 +21,20 @@ buildPythonPackage rec { owner = "duosecurity"; repo = "duo_client_python"; rev = "refs/tags/${version}"; - hash = "sha256-MnSAFxKgExq+e8TOwgsPAoO4GEfsc3sjPNGLxzch5f0="; + hash = "sha256-7cifxNSBHbX7QZ52Sy1hm5xzZYcLZOkloT6q9P7TO6A="; }; postPatch = '' substituteInPlace requirements-dev.txt \ - --replace "dlint" "" \ - --replace "flake8" "" + --replace-fail "dlint" "" \ + --replace-fail "flake8" "" ''; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ six ]; diff --git a/nixpkgs/pkgs/development/python-modules/dvc/default.nix b/nixpkgs/pkgs/development/python-modules/dvc/default.nix index 885e4915d1af..72cb75d784c0 100644 --- a/nixpkgs/pkgs/development/python-modules/dvc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvc/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.48.4"; + version = "3.49.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -66,7 +66,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc"; rev = "refs/tags/${version}"; - hash = "sha256-vO+i0BU8mQuLfgb1rcGRmlb8gpHsRxgdwuJHRERA4Pw="; + hash = "sha256-Qu2+zTcTIPxLRZn1GB3Q6465kSEAuN+wessBVgxEdFU="; }; pythonRelaxDeps = [ @@ -76,17 +76,17 @@ buildPythonPackage rec { postPatch = '' substituteInPlace dvc/analytics.py \ - --replace 'enabled = not os.getenv(DVC_NO_ANALYTICS)' 'enabled = False' + --replace-fail 'enabled = not os.getenv(DVC_NO_ANALYTICS)' 'enabled = False' substituteInPlace dvc/daemon.py \ --subst-var-by dvc "$out/bin/dcv" ''; - nativeBuildInputs = [ + build-system = [ pythonRelaxDepsHook setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ appdirs colorama configobj @@ -166,10 +166,10 @@ buildPythonPackage rec { meta = with lib; { description = "Version Control System for Machine Learning Projects"; - mainProgram = "dvc"; homepage = "https://dvc.org"; changelog = "https://github.com/iterative/dvc/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ cmcdragonkai fab ]; + mainProgram = "dvc"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/ecpy/default.nix b/nixpkgs/pkgs/development/python-modules/ecpy/default.nix index 37bbb183ff40..5f18e814cfe7 100644 --- a/nixpkgs/pkgs/development/python-modules/ecpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ecpy/default.nix @@ -1,11 +1,12 @@ { lib, fetchPypi, buildPythonPackage, isPy3k, future }: buildPythonPackage rec { - pname = "ECPy"; + pname = "ecpy"; version = "1.2.5"; src = fetchPypi { - inherit pname version; + pname = "ECPy"; + inherit version; sha256 = "9635cffb9b6ecf7fd7f72aea1665829ac74a1d272006d0057d45a621aae20228"; }; diff --git a/nixpkgs/pkgs/development/python-modules/enterpriseattack/default.nix b/nixpkgs/pkgs/development/python-modules/enterpriseattack/default.nix new file mode 100644 index 000000000000..745cc331c604 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/enterpriseattack/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +, setuptools +, ujson +}: + +buildPythonPackage rec { + pname = "enterpriseattack"; + version = "0.1.8"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "xakepnz"; + repo = "enterpriseattack"; + rev = "refs/tags/v.${version}"; + hash = "sha256-cxbGc9iQe94Th6MSUldI17oVCclFhUM78h1w+6KXzm4="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + requests + ujson + ]; + + # Tests require network access + doCheck = false; + + pythonImportsCheck = [ + "enterpriseattack" + ]; + + meta = with lib; { + description = "Module to interact with the Mitre Att&ck Enterprise dataset"; + homepage = "https://github.com/xakepnz/enterpriseattack"; + changelog = "https://github.com/xakepnz/enterpriseattack/releases/tag/v.${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/es-client/default.nix b/nixpkgs/pkgs/development/python-modules/es-client/default.nix index f5b16097c26f..0a1b0bad5ad6 100644 --- a/nixpkgs/pkgs/development/python-modules/es-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/es-client/default.nix @@ -20,16 +20,16 @@ buildPythonPackage rec { pname = "es-client"; - version = "8.12.5"; + version = "8.12.8"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "untergeek"; repo = "es_client"; rev = "refs/tags/v${version}"; - hash = "sha256-gaeNIxHnNulUOGhYHf9dIgBSh2rJIdsYdpPT8OTyEdg="; + hash = "sha256-qv06zb3hIK/TeOZwtMXrV+n8mYSA/UKiyHvRyKEvZkQ="; }; pythonRelaxDeps = true; diff --git a/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix b/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix index 9b4078ba47f6..20e3cc1433a4 100644 --- a/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix @@ -5,7 +5,6 @@ , defusedxml , dnspython , fetchFromGitHub -, fetchpatch , flake8 , isodate , lxml @@ -18,37 +17,34 @@ , pyyaml , requests , requests-ntlm +, requests-gssapi , requests-oauthlib , requests-kerberos , requests-mock +, setuptools , tzdata , tzlocal }: buildPythonPackage rec { pname = "exchangelib"; - version = "5.1.0"; - format = "setuptools"; + version = "5.2.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ecederstrand"; - repo = pname; + repo = "exchangelib"; rev = "refs/tags/v${version}"; - hash = "sha256-WKQgfmEbil55WO3tWVq4n9wiJNw0Op/jbI7xt5vtKpA="; + hash = "sha256-q45aYVyp75PUiqYSMSvSFMy3vaclv93QVkjKWVrxWc4="; }; - patches = [ - (fetchpatch { - name = "tests-timezones-2.patch"; - url = "https://github.com/ecederstrand/exchangelib/commit/419eafcd9261bfd0617823ee437204d5556a8271.diff"; - excludes = [ "tests/test_ewsdatetime.py" ]; - hash = "sha256-dSp6NkNT5dHOg8XgDi8sR3t3hq46sNtPjUXva2YfFSU="; - }) + build-system = [ + setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cached-property defusedxml dnspython @@ -66,6 +62,19 @@ buildPythonPackage rec { backports-zoneinfo ]; + passthru.optional-dependencies = { + complete = [ + requests-gssapi + # requests-negotiate-sspi + ]; + kerberos = [ + requests-gssapi + ]; + # sspi = [ + # requests-negotiate-sspi + # ]; + }; + nativeCheckInputs = [ flake8 psutil diff --git a/nixpkgs/pkgs/development/python-modules/extract-msg/default.nix b/nixpkgs/pkgs/development/python-modules/extract-msg/default.nix index 592172fc3d25..6c6e23370261 100644 --- a/nixpkgs/pkgs/development/python-modules/extract-msg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/extract-msg/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "extract-msg"; - version = "0.48.3"; + version = "0.48.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "TeamMsgExtractor"; repo = "msg-extractor"; rev = "refs/tags/v${version}"; - hash = "sha256-oN5blYU8LR2O1LEb6naL33UXjBk9xpINl4h6HSaN7PQ="; + hash = "sha256-xX25RVtkUFn+j9rALOHQOTRzqJXiEMn7i9pxCJ8so4U="; }; pythonRelaxDeps = [ @@ -33,12 +33,12 @@ buildPythonPackage rec { "red-black-tree-mod" ]; - nativeBuildInputs = [ + build-system = [ pythonRelaxDepsHook setuptools ]; - propagatedBuildInputs = [ + dependencies = [ beautifulsoup4 compressed-rtf ebcdic diff --git a/nixpkgs/pkgs/development/python-modules/fido2/default.nix b/nixpkgs/pkgs/development/python-modules/fido2/default.nix index 7cd11eefcbcc..82d635d8d0f6 100644 --- a/nixpkgs/pkgs/development/python-modules/fido2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fido2/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "fido2"; - version = "1.1.2"; + version = "1.1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-YRDZExBvdhmSAbMtJisoV1YsxGuh0LnFH7zjDck2xXM="; + hash = "sha256-JhAPIm0SztYhymGYUozhft9nt430KHruEoX+481aqfw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/findpython/default.nix b/nixpkgs/pkgs/development/python-modules/findpython/default.nix index a405ab3d6ec0..78875b6db2c8 100644 --- a/nixpkgs/pkgs/development/python-modules/findpython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/findpython/default.nix @@ -15,7 +15,7 @@ let pname = "findpython"; - version = "0.4.1"; + version = "0.5.1"; in buildPythonPackage { inherit pname version; @@ -25,7 +25,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-19AUVYaBs3YdV6WyNCpxOovzAvbB/J2Z+Budi9FoGwQ="; + hash = "sha256-UGSjA5PFLvyMajV5DDdbiwAF1vdPFykDW0tCZHNH4T0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/fjaraskupan/default.nix b/nixpkgs/pkgs/development/python-modules/fjaraskupan/default.nix index 3068d6542ed7..533847786c89 100644 --- a/nixpkgs/pkgs/development/python-modules/fjaraskupan/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fjaraskupan/default.nix @@ -5,23 +5,28 @@ , pytest-mock , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "fjaraskupan"; - version = "2.2.0"; - format = "setuptools"; + version = "2.3.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "elupus"; - repo = pname; + repo = "fjaraskupan"; rev = "refs/tags/${version}"; - hash = "sha256-0tNLwYckWF9GjhniEkiO+A+xDsUriUsMFZxG/FmUfps="; + hash = "sha256-3jw42lsCwNkFptMNpnhtbrPIkZP/8lUCcMigzq8Hbc4="; }; - propagatedBuildInputs = [ + nativeBuildInputs = [ + setuptools + ]; + + dependencies = [ bleak ]; @@ -37,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for controlling Fjäråskupan kitchen fans"; homepage = "https://github.com/elupus/fjaraskupan"; + changelog = "https://github.com/elupus/fjaraskupan/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/flask-bootstrap/default.nix b/nixpkgs/pkgs/development/python-modules/flask-bootstrap/default.nix index 797be78bc563..3088e7392a48 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-bootstrap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-bootstrap/default.nix @@ -1,11 +1,12 @@ { lib, buildPythonPackage, fetchPypi, flask, visitor, dominate }: buildPythonPackage rec { - pname = "Flask-Bootstrap"; + pname = "flask-bootstrap"; version = "3.3.7.1"; src = fetchPypi { - inherit pname version; + pname = "Flask-Bootstrap"; + inherit version; sha256 = "1j1s2bplaifsnmr8vfxa3czca4rz78xyhrg4chx39xl306afs26b"; }; diff --git a/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix b/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix index e9b1e3643bdb..7ac2830bcf18 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix @@ -12,13 +12,14 @@ }: buildPythonPackage rec { - pname = "Flask-Caching"; + pname = "flask-caching"; version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "Flask-Caching"; + inherit version; hash = "sha256-t1AMFFE1g2qVLj3jqAiB2WVOMnopyFLJJlYH9cRJI1w="; }; diff --git a/nixpkgs/pkgs/development/python-modules/flask-common/default.nix b/nixpkgs/pkgs/development/python-modules/flask-common/default.nix index cba8e9e8efd4..54c8ef95e5a0 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-common/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-common/default.nix @@ -2,11 +2,12 @@ , crayons, flask, flask-caching, gunicorn, maya, meinheld, whitenoise }: buildPythonPackage rec { - pname = "Flask-Common"; + pname = "flask-common"; version = "0.3.0"; src = fetchPypi { - inherit pname version; + pname = "Flask-Common"; + inherit version; sha256 = "13d99f2dbc0a332b8bc4b2cc394d3e48f89672c266868e372cd9d7b433d921a9"; }; diff --git a/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix b/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix index 106f6cc82165..1a9a27dc0315 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -16,24 +17,29 @@ , pytest-mock , pytest-benchmark , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "flask-restx"; version = "1.3.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; # Tests not included in PyPI tarball src = fetchFromGitHub { owner = "python-restx"; - repo = pname; + repo = "flask-restx"; rev = "refs/tags/${version}"; hash = "sha256-CBReP/u96fsr28lMV1BfLjjdBMXEvsD03wvsxkIcteI="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ aniso8601 flask importlib-resources @@ -58,6 +64,8 @@ buildPythonPackage rec { "--deselect=tests/test_inputs.py::URLTest::test_check" "--deselect=tests/test_inputs.py::EmailTest::test_valid_value_check" "--deselect=tests/test_logging.py::LoggingTest::test_override_app_level" + ] ++ lib.optionals stdenv.isDarwin [ + "--deselect=tests/test_inputs.py::EmailTest::test_invalid_values_check" ]; disabledTests = [ diff --git a/nixpkgs/pkgs/development/python-modules/flask-seasurf/default.nix b/nixpkgs/pkgs/development/python-modules/flask-seasurf/default.nix index 26dd2d7f5e08..1764e2762059 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-seasurf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-seasurf/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, fetchpatch, buildPythonPackage, isPy3k, flask, mock, unittestCheckHook }: buildPythonPackage rec { - pname = "Flask-SeaSurf"; + pname = "flask-seasurf"; version = "1.1.1"; disabled = !isPy3k; diff --git a/nixpkgs/pkgs/development/python-modules/flask-session/default.nix b/nixpkgs/pkgs/development/python-modules/flask-session/default.nix index a777bf0920ab..e3c4abf8da8a 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-session/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-session/default.nix @@ -8,7 +8,7 @@ }: buildPythonPackage rec { - pname = "Flask-Session"; + pname = "flask-session"; version = "0.5.0"; format = "pyproject"; diff --git a/nixpkgs/pkgs/development/python-modules/flask-silk/default.nix b/nixpkgs/pkgs/development/python-modules/flask-silk/default.nix index 8a40b6d4b56f..ddee5077970d 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-silk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-silk/default.nix @@ -5,7 +5,7 @@ }: buildPythonPackage { - pname = "Flask-Silk"; + pname = "flask-silk"; version = "unstable-2018-06-28"; # master fixes flask import syntax and has no major changes diff --git a/nixpkgs/pkgs/development/python-modules/flask-socketio/default.nix b/nixpkgs/pkgs/development/python-modules/flask-socketio/default.nix index 53a793c75f5a..7460bf2309d4 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-socketio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-socketio/default.nix @@ -10,7 +10,7 @@ }: buildPythonPackage rec { - pname = "Flask-SocketIO"; + pname = "flask-socketio"; version = "5.3.6"; format = "pyproject"; diff --git a/nixpkgs/pkgs/development/python-modules/flask-sslify/default.nix b/nixpkgs/pkgs/development/python-modules/flask-sslify/default.nix index ad4bc4dc0523..bb3ef6c8cd1a 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-sslify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-sslify/default.nix @@ -1,11 +1,12 @@ { lib, fetchPypi, buildPythonPackage, flask }: buildPythonPackage rec { - pname = "Flask-SSLify"; + pname = "flask-sslify"; version = "0.1.5"; src = fetchPypi { - inherit pname version; + pname = "Flask-SSLify"; + inherit version; sha256 = "0gjl1m828z5dm3c5dpc2qjgi4llf84cp72mafr0ib5fd14y1sgnk"; }; diff --git a/nixpkgs/pkgs/development/python-modules/flask-versioned/default.nix b/nixpkgs/pkgs/development/python-modules/flask-versioned/default.nix index fd915fdc18f3..1d54e49e417d 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-versioned/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-versioned/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, flask }: buildPythonPackage rec { - pname = "Flask-Versioned"; + pname = "flask-versioned"; version = "0.9.4-20101221"; src = fetchFromGitHub { @@ -20,4 +20,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ ]; }; } - diff --git a/nixpkgs/pkgs/development/python-modules/flet-runtime/default.nix b/nixpkgs/pkgs/development/python-modules/flet-runtime/default.nix index e2cae32ad418..585fba6795c1 100644 --- a/nixpkgs/pkgs/development/python-modules/flet-runtime/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flet-runtime/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { description = "A base package for Flet desktop and Flet mobile"; homepage = "https://flet.dev/"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ lucasew wegank ]; + maintainers = with lib.maintainers; [ lucasew ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/fontpens/default.nix b/nixpkgs/pkgs/development/python-modules/fontpens/default.nix index 02adb3b06426..aaa1d119111c 100644 --- a/nixpkgs/pkgs/development/python-modules/fontpens/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fontpens/default.nix @@ -1,11 +1,12 @@ { lib, buildPythonPackage, fetchPypi, fonttools }: buildPythonPackage rec { - pname = "fontPens"; + pname = "fontpens"; version = "0.2.4"; src = fetchPypi { - inherit pname version; + pname = "fontPens"; + inherit version; sha256 = "1za15dzsnymq6d9x7xdfqwgw4a3003wj75fn2crhyidkfd2s3nd6"; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/foxdot/default.nix b/nixpkgs/pkgs/development/python-modules/foxdot/default.nix index 7b989e3e3608..faa6bedd4799 100644 --- a/nixpkgs/pkgs/development/python-modules/foxdot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/foxdot/default.nix @@ -7,11 +7,12 @@ }: buildPythonPackage rec { - pname = "FoxDot"; + pname = "foxdot"; version = "0.8.12"; src = fetchPypi { - inherit pname version; + pname = "FoxDot"; + inherit version; sha256 = "528999da55ad630e540a39c0eaeacd19c58c36f49d65d24ea9704d0781e18c90"; }; diff --git a/nixpkgs/pkgs/development/python-modules/fpylll/default.nix b/nixpkgs/pkgs/development/python-modules/fpylll/default.nix index 54d3d8f34f79..97885a443ff0 100644 --- a/nixpkgs/pkgs/development/python-modules/fpylll/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fpylll/default.nix @@ -36,6 +36,10 @@ buildPythonPackage rec { url = "https://github.com/fplll/fpylll/commit/fc432b21fa7e4b9891f5b761b3539989eb958f2b.diff"; hash = "sha256-+UidQ5xnlmjeVeVvR4J2zDzAuXP5LUPXCh4RP4o9oGA="; }) + (fetchpatch { + url = "https://github.com/fplll/fpylll/commit/cece9c9b182dc3ac2c9121549cb427ccf4c4a9fe.diff"; + hash = "sha256-epJb8gorQ7gEEylZ2yZFdM9+EZ4ys9mUUUPiJ2D0VOM="; + }) ]; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/gcal-sync/default.nix b/nixpkgs/pkgs/development/python-modules/gcal-sync/default.nix index 22426d8e97b6..7a2ce7e51197 100644 --- a/nixpkgs/pkgs/development/python-modules/gcal-sync/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gcal-sync/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "gcal-sync"; - version = "6.0.3"; + version = "6.0.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "gcal_sync"; rev = "refs/tags/${version}"; - hash = "sha256-i5K4kJcieugPkXIuDje8tk5TEX6EwDywUB6MByLmukA="; + hash = "sha256-ufoe9+4zhlixcSGMAhuhJx2Y2vrN036N8UvyP3xuTRQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/genshi/default.nix b/nixpkgs/pkgs/development/python-modules/genshi/default.nix index 090807f2495a..67c66eea9070 100644 --- a/nixpkgs/pkgs/development/python-modules/genshi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/genshi/default.nix @@ -6,11 +6,12 @@ }: buildPythonPackage rec { - pname = "Genshi"; + pname = "genshi"; version = "0.7.7"; src = fetchPypi { - inherit pname version; + pname = "Genshi"; + inherit version; hash = "sha256-wQBSCGLNaQhdEO4ah+kSief1n2s9m9Yiv1iygE5rmqs="; }; diff --git a/nixpkgs/pkgs/development/python-modules/githubkit/default.nix b/nixpkgs/pkgs/development/python-modules/githubkit/default.nix index ad737eb7b3bc..ac9ed0be67d5 100644 --- a/nixpkgs/pkgs/development/python-modules/githubkit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/githubkit/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { --replace-fail "--cov=githubkit --cov-append --cov-report=term-missing" "" ''; - build-systems = [ + build-system = [ poetry-core pythonRelaxDepsHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix b/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix index 7f0dfe2d5e87..86a4c6248f5d 100644 --- a/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "glean-parser"; - version = "13.0.0"; + version = "13.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "glean_parser"; inherit version; - hash = "sha256-gzeAyrfgVwNLNSeGIDr5TyGvywCUy+1gEEcfXcIaX5E="; + hash = "sha256-/urUy+xpMO04pI31uunrTuSGu0Am3fLzIGuF+AJ50ec="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/nixpkgs/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index 7b58f851acdc..a6b0f352acc9 100644 --- a/nixpkgs/pkgs/development/python-modules/google-ai-generativelanguage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-ai-generativelanguage/default.nix @@ -11,21 +11,26 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-ai-generativelanguage"; - version = "0.5.4"; - format = "setuptools"; + version = "0.6.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XBhXXrzbIiKoFPew/UdUD673AUPb96rm9LudyVcY3H8="; + hash = "sha256-vA/JVTaj3+NuA91LJo+Utn1hxogihr/OaBV4ujOFm7o="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ google-api-core grpcio grpcio-status diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix index c4517465a55c..f69f56fb510d 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.20.3"; + version = "2.21.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dq8PF5UJ5DHSu+P1H0JiVng9yVm49FjBNwyxnW974LE="; + hash = "sha256-lAF/C8moX6P02RPzEukwoP4hd1vWjd5cZm4vGxrd+BE="; }; build-system = [ diff --git a/nixpkgs/pkgs/development/python-modules/gradio/client.nix b/nixpkgs/pkgs/development/python-modules/gradio/client.nix index 8ad76a907581..2c3abd4c0e78 100644 --- a/nixpkgs/pkgs/development/python-modules/gradio/client.nix +++ b/nixpkgs/pkgs/development/python-modules/gradio/client.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, gitUpdater , pythonOlder , pythonRelaxDepsHook # pyproject @@ -27,7 +28,7 @@ buildPythonPackage rec { pname = "gradio-client"; - version = "0.10.1"; + version = "0.14.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -36,9 +37,9 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gradio-app"; repo = "gradio"; - rev = "refs/tags/gradio_client@${version}"; + rev = "refs/tags/@gradio/client@${version}"; sparseCheckout = [ "client/python" ]; - hash = "sha256-cRsYqNMmzuybJI823lpUOmNcTdcTO8dJkp3cpjATZQU="; + hash = "sha256-7oC/Z3YUiOFZdv/60q7PkfluV77broRkHgWiY9Vim9Y="; }; prePatch = '' cd client/python @@ -95,6 +96,8 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; + passthru.updateScript = gitUpdater { rev-prefix = "@gradio/client@"; }; + meta = with lib; { homepage = "https://www.gradio.app/"; description = "Lightweight library to use any Gradio app as an API"; diff --git a/nixpkgs/pkgs/development/python-modules/gradio/default.nix b/nixpkgs/pkgs/development/python-modules/gradio/default.nix index bfcf10a2ea1c..69e57b821a69 100644 --- a/nixpkgs/pkgs/development/python-modules/gradio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gradio/default.nix @@ -16,6 +16,7 @@ , setuptools , aiofiles , altair +, diffusers , fastapi , ffmpy , gradio-client @@ -40,6 +41,10 @@ , typer , tomlkit +# oauth +, authlib +, itsdangerous + # check , pytestCheckHook , boto3 @@ -57,7 +62,7 @@ buildPythonPackage rec { pname = "gradio"; - version = "4.20.1"; + version = "4.22.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -66,7 +71,7 @@ buildPythonPackage rec { # and upstream has stopped tagging releases since 3.41.0 src = fetchPypi { inherit pname version; - hash = "sha256-nvuIpOFib09FJGfkX0TDfb2LV/eDn3EybsFp5A3lzas="; + hash = "sha256-nhrT509xB3+R+HF6TF5AQGnfufT6iNmzjxZgcVL7fBo="; }; # fix packaging.ParserSyntaxError, which can't handle comments @@ -98,6 +103,7 @@ buildPythonPackage rec { setuptools # needed for 'pkg_resources' aiofiles altair + diffusers fastapi ffmpy gradio-client @@ -123,6 +129,11 @@ buildPythonPackage rec { tomlkit ] ++ typer.passthru.optional-dependencies.all; + passthru.optional-dependencies.oauth = [ + authlib + itsdangerous + ]; + nativeCheckInputs = [ pytestCheckHook boto3 @@ -138,9 +149,11 @@ buildPythonPackage rec { transformers vega-datasets - # mock npm to make `shutil.which("npm")` pass + # mock calls to `shutil.which(...)` (writeShellScriptBin "npm" "false") - ] ++ pydantic.passthru.optional-dependencies.email; + ] + ++ passthru.optional-dependencies.oauth + ++ pydantic.passthru.optional-dependencies.email; # Add a pytest hook skipping tests that access network, marking them as "Expected fail" (xfail). # We additionally xfail FileNotFoundError, since the gradio devs often fail to upload test assets to pypi. @@ -173,6 +186,9 @@ buildPythonPackage rec { # fails without network "test_download_if_url_correct_parse" + + # tests if pip and other tools are installed + "test_get_executable_path" ]; disabledTestPaths = [ # 100% touches network @@ -196,19 +212,17 @@ buildPythonPackage rec { # Cyclic dependencies are fun! # This is gradio without gradio-client and gradio-pdf - passthru = { - sans-reverse-dependencies = (gradio.override (old: { + passthru.sans-reverse-dependencies = (gradio.override (old: { gradio-client = null; gradio-pdf = null; })).overridePythonAttrs (old: { - pname = old.pname + "-sans-client"; + pname = old.pname + "-sans-reverse-dependencies"; pythonRemoveDeps = (old.pythonRemoveDeps or []) ++ [ "gradio-client" ]; doInstallCheck = false; doCheck = false; pythonImportsCheck = null; dontCheckRuntimeDeps = true; }); - }; meta = with lib; { homepage = "https://www.gradio.app/"; diff --git a/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix b/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix index dae2aae43bf2..1ff20bf48873 100644 --- a/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix @@ -66,6 +66,6 @@ buildPythonPackage rec { homepage = "https://github.com/danielperna84/hahomematic"; changelog = "https://github.com/danielperna84/hahomematic/releases/tag/${version}"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ dotlambda fab ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/hatch-jupyter-builder/default.nix b/nixpkgs/pkgs/development/python-modules/hatch-jupyter-builder/default.nix index cc9b2c18fd14..0c827ac42cd3 100644 --- a/nixpkgs/pkgs/development/python-modules/hatch-jupyter-builder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hatch-jupyter-builder/default.nix @@ -6,29 +6,35 @@ , pytestCheckHook , tomli , twine +, pythonOlder }: buildPythonPackage rec { pname = "hatch-jupyter-builder"; - version = "0.8.3"; - format = "pyproject"; + version = "0.9.1"; + pyproject = true; src = fetchFromGitHub { owner = "jupyterlab"; repo = "hatch-jupyter-builder"; rev = "refs/tags/v${version}"; - hash = "sha256-UywhFJ8d1+lSFOF5ECsknDeQuO7ppckdy5IqAT14ius="; + hash = "sha256-QDWHVdjtexUNGRL+dVehdBwahSW2HmNkZKkQyuOghyI="; }; - nativeBuildInputs = [ + build-system = [ + hatchling + ]; + + dependencies = [ hatchling ]; nativeCheckInputs = [ pytest-mock pytestCheckHook - tomli twine + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; disabledTests = [ diff --git a/nixpkgs/pkgs/development/python-modules/hcloud/default.nix b/nixpkgs/pkgs/development/python-modules/hcloud/default.nix index 86f3537a732e..6212c4f0cc5a 100644 --- a/nixpkgs/pkgs/development/python-modules/hcloud/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hcloud/default.nix @@ -7,21 +7,26 @@ , python-dateutil , pythonOlder , requests +, setuptools }: buildPythonPackage rec { pname = "hcloud"; - version = "1.33.2"; - format = "setuptools"; + version = "1.34.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GCiw+HbN/0na2fiAS16On72nj09VR0Naw6wwCIQ4zl8="; + hash = "sha256-8hwr0K+6nLgAVMhXb/08CS7HrlLYQ/SV0K8MWH/PQk0="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ future requests python-dateutil diff --git a/nixpkgs/pkgs/development/python-modules/heapdict/default.nix b/nixpkgs/pkgs/development/python-modules/heapdict/default.nix index 61cbe39a256a..44852a3bf4bd 100644 --- a/nixpkgs/pkgs/development/python-modules/heapdict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/heapdict/default.nix @@ -1,11 +1,12 @@ { lib, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { - pname = "HeapDict"; + pname = "heapdict"; version = "1.0.1"; src = fetchPypi { - inherit pname version; + pname = "HeapDict"; + inherit version; sha256 = "8495f57b3e03d8e46d5f1b2cc62ca881aca392fd5cc048dc0aa2e1a6d23ecdb6"; }; diff --git a/nixpkgs/pkgs/development/python-modules/hishel/default.nix b/nixpkgs/pkgs/development/python-modules/hishel/default.nix index 2deba68019e5..112d8759c62c 100644 --- a/nixpkgs/pkgs/development/python-modules/hishel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hishel/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hishel"; - version = "0.0.24"; + version = "0.0.25"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,15 +26,15 @@ buildPythonPackage rec { owner = "karpetrosyan"; repo = "hishel"; rev = "refs/tags/${version}"; - hash = "sha256-wup1rQ5MHjsBaTdfueP9y7QhutoO0xYeexZPDQpUEJk="; + hash = "sha256-vDzXrAGJUqG9+wOUWXeKLYraUrILJFAQXf60iCAHRPo="; }; - nativeBuildInputs = [ + build-system = [ hatch-fancy-pypi-readme hatchling ]; - propagatedBuildInputs = [ + dependencies = [ httpx ]; diff --git a/nixpkgs/pkgs/development/python-modules/hsh/default.nix b/nixpkgs/pkgs/development/python-modules/hsh/default.nix new file mode 100644 index 000000000000..2bc68d3aac9d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/hsh/default.nix @@ -0,0 +1,42 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, commandlines +, unittestCheckHook +, pexpect +, naked +, nix-update-script +, setuptools +, wheel +}: + +buildPythonPackage rec { + pname = "hsh"; + version = "1.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "chrissimpkins"; + repo = "hsh"; + rev = "v${version}"; + hash = "sha256-bAAytoidFHH2dSXqN9aqBd2H4p/rwTWXIZa1t5Djdz0="; + }; + + propagatedBuildInputs = [ commandlines ]; + + nativeBuildInputs = [ setuptools wheel ]; + + nativeCheckInputs = [ unittestCheckHook pexpect naked ]; + + preCheck = "cd tests"; + + pythonImportsCheck = [ "hsh" ]; + + meta = with lib; { + description = "Cross-platform command line application that generates file hash digests and performs file integrity checks via file hash digest comparisons"; + homepage = "https://github.com/chrissimpkins/hsh"; + downloadPage = "https://github.com/chrissimpkins/hsh/releases"; + license = licenses.mit; + maintainers = [ maintainers.lucasew ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix b/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix index 29786a67e187..1593e7c9d84b 100644 --- a/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.21.4"; + version = "0.22.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-SN0FDOuXvgDqxpK4RRRXQDTPG5/BV3DJsiEq2q5WvsY="; + hash = "sha256-jq7oCQlLXwr859mhHYolKp/N63Z0SIksMTwNL0JjfNQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/icontract/default.nix b/nixpkgs/pkgs/development/python-modules/icontract/default.nix index e525cf89cca2..f8b9fd589f18 100644 --- a/nixpkgs/pkgs/development/python-modules/icontract/default.nix +++ b/nixpkgs/pkgs/development/python-modules/icontract/default.nix @@ -1,26 +1,28 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub , astor , asttokens , asyncstdlib +, buildPythonPackage , deal , dpcontracts +, fetchFromGitHub , numpy , pytestCheckHook +, pythonOlder +, setuptools , typing-extensions }: buildPythonPackage rec { pname = "icontract"; version = "2.6.6"; - format = "setuptools"; + pyproject = true; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Parquery"; - repo = pname; + repo = "icontract"; rev = "refs/tags/v${version}"; hash = "sha256-R5/FBfuTvXItfTlNZMSnO18Q+etnHbQyXFWpaOpOLes="; }; @@ -32,7 +34,11 @@ buildPythonPackage rec { export ICONTRACT_SLOW=1 ''; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ asttokens typing-extensions ]; @@ -46,11 +52,16 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # AssertionError + "test_abstract_method_not_implemented" + ]; + disabledTestPaths = [ # mypy decorator checks don't pass. For some reason mypy # doesn't check the python file provided in the test. "tests/test_mypy_decorators.py" - # those tests seems to simply re-run some typeguard tests + # Those tests seems to simply re-run some typeguard tests "tests/test_typeguard.py" ]; @@ -59,7 +70,9 @@ buildPythonPackage rec { "-W" "ignore::RuntimeWarning" ]; - pythonImportsCheck = [ "icontract" ]; + pythonImportsCheck = [ + "icontract" + ]; meta = with lib; { description = "Provide design-by-contract with informative violation messages"; diff --git a/nixpkgs/pkgs/development/python-modules/ipyvuetify/default.nix b/nixpkgs/pkgs/development/python-modules/ipyvuetify/default.nix index 0a55f0bb4a93..8c3bbf654c2b 100644 --- a/nixpkgs/pkgs/development/python-modules/ipyvuetify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipyvuetify/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "ipyvuetify"; - version = "1.9.1"; + version = "1.9.2"; pyproject = true; # GitHub version tries to run npm (Node JS) src = fetchPypi { inherit pname version; - hash = "sha256-MAqO6wREtnaVCgG88UXYsKlLpkizbtPqmeQ9u3UVnU0="; + hash = "sha256-kAcL/PR3jThbmfDKMBQRPbcDyZ7GrRwuzDLWE8bC1M4="; }; # drop pynpm which tries to install node_modules diff --git a/nixpkgs/pkgs/development/python-modules/jax/default.nix b/nixpkgs/pkgs/development/python-modules/jax/default.nix index 22e4c5aa838d..e160eec612cf 100644 --- a/nixpkgs/pkgs/development/python-modules/jax/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jax/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "google"; repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jax tags! - rev = "refs/tags/jaxlib-v${version}"; + rev = "refs/tags/jax-v${version}"; hash = "sha256-poQQo2ZgEhPYzK3aCs+BjaHTNZbezJAECd+HOdY1Yok="; }; @@ -144,6 +144,9 @@ buildPythonPackage rec { }; }; + # updater fails to pick the correct branch + passthru.skipBulkUpdate = true; + meta = with lib; { description = "Differentiate, compile, and transform Numpy code"; homepage = "https://github.com/google/jax"; diff --git a/nixpkgs/pkgs/development/python-modules/jc/default.nix b/nixpkgs/pkgs/development/python-modules/jc/default.nix index deb56a2a3e9f..0b29b126af6f 100644 --- a/nixpkgs/pkgs/development/python-modules/jc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jc/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "jc"; - version = "1.25.1"; + version = "1.25.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "kellyjonbrazil"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-A9bmnamoRwDG/HFDjdBvnfGB+XqpAdLVnHeHtSf07zg="; + hash = "sha256-SDZ92m4TVH5/ldGkVZspzIrR0G1vHOv1OvAOSaWYkZ0="; }; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; diff --git a/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix b/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix index 86f89015a001..47734c8a8973 100644 --- a/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "6.0.0"; + version = "6.1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-queP6RBpw32PXbpz6StIE6Pb7RNsm2O4tNarrDwb2cU="; + hash = "sha256-9IXhzdXVEk0M2O01eHysiDziZWmEy6Ehb7nHC6OHCwc="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-client/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-client/default.nix index ad428c1c8a95..5dd708f014ad 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter-client/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "jupyter-client"; - version = "8.6.0"; + version = "8.6.1"; pyproject = true; src = fetchPypi { pname = "jupyter_client"; inherit version; - hash = "sha256-BkIkS7g7R2SuYNB+AQ4V8OLSdexOkYqPe4D7vvPKYMc="; + hash = "sha256-6EJRXiurjhkYbYn9/qer0V453VgflOOZ8A4q9aFlLT8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-collaboration/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-collaboration/default.nix index 3f20ac8b4da0..084cf965859b 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter-collaboration/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter-collaboration/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "jupyter-collaboration"; - version = "2.0.4"; + version = "2.0.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,21 +27,21 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyter_collaboration"; inherit version; - hash = "sha256-3N3w6JJ0SHa1EYBED/aU1g0IX9nDHf4iseGPwEK1zpw="; + hash = "sha256-aQYZGiya7E3blwVkWx6w2Hb2M0v/z9dOMU72EGW4aCg="; }; postPatch = '' sed -i "/^timeout/d" pyproject.toml ''; - nativeBuildInputs = [ + build-system = [ hatch-jupyter-builder hatch-nodejs-version hatchling jupyterlab ]; - propagatedBuildInputs = [ + dependencies = [ jsonschema jupyter-events jupyter-server @@ -60,14 +60,15 @@ buildPythonPackage rec { "jupyter_collaboration" ]; - pytestFlagsArray = [ - "-W" "ignore::DeprecationWarning" - ]; - preCheck = '' export HOME=$TEMP ''; + disabledTests = [ + # ExceptionGroup: unhandled errors in a TaskGroup (1 sub-exception) + "test_dirty" + ]; + __darwinAllowLocalNetworking = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-core/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-core/default.nix index ece119e7b529..799e098920a8 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter-core/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "jupyter-core"; - version = "5.7.1"; + version = "5.7.2"; disabled = pythonOlder "3.7"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jupyter"; repo = "jupyter_core"; rev = "refs/tags/v${version}"; - hash = "sha256-Uh7slD8mQg2R++wltXrYiPSJnmM5w9tej8GN/0GMBmA="; + hash = "sha256-qu25ryZreRPHoubFJTFusGdkTPHbl/yl94g+XU5A5Mc="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-events/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-events/default.nix index c4ea9f7b704e..855034ca4b2a 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter-events/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter-events/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "jupyter-events"; - version = "0.9.0"; + version = "0.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "jupyter"; repo = "jupyter_events"; rev = "refs/tags/v${version}"; - hash = "sha256-LDj6dTtq3npJxLKBQEEwGQFeDPvWF2adHeJhOai2MRU="; + hash = "sha256-8aps8aNgXw+XbDgtCvWw+Ij1Cm1N0G+wcL35ySkofOk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-server-terminals/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-server-terminals/default.nix index 5dbb04fda092..192d5c6f3711 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter-server-terminals/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter-server-terminals/default.nix @@ -16,14 +16,14 @@ let self = buildPythonPackage rec { pname = "jupyter-server-terminals"; - version = "0.5.2"; + version = "0.5.3"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "jupyter_server_terminals"; rev = "refs/tags/v${version}"; - hash = "sha256-e4PtrK2DCJAK+LYmGguwU5hmxdqP5Dws1dPoPOv/WrM="; + hash = "sha256-af7jBscGkbekXgfDxwAfrJSY1uEuIGfzzSsjaPdlYcY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix index 6b0160202d87..fbde4773c80e 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix @@ -70,6 +70,9 @@ buildPythonPackage rec { overrides ]; + # https://github.com/NixOS/nixpkgs/issues/299427 + stripExclude = lib.optionals stdenv.isDarwin [ "favicon.ico" ]; + nativeCheckInputs = [ ipykernel pytestCheckHook diff --git a/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix index ac8fc028f25e..676a08f96fe8 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix @@ -72,14 +72,14 @@ in buildPythonPackage rec { pname = "jupyterhub"; - version = "4.0.2"; + version = "4.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1ORQ7tjZDfvPDsoI8A8gk6C8503FH3z8C3BX9gI0Gh0="; + hash = "sha256-sKpNnbmpg5gWgLyoZ+15FSV4/oPJqDJ3TuE5Bbe3V0w="; }; # Most of this only applies when building from source (e.g. js/css assets are diff --git a/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix index 4be3dc7b1487..768fd085b74b 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.1.4"; + version = "4.1.5"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-4DyCwSStigiS5Ji53eecUIaLLCZ4Gayj9VzkfFfr6x0="; + hash = "sha256-ya11KQyxC/r/NiS/P7uFIxm0zOTEVmE/jruqmNA1JNs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/karton-core/default.nix b/nixpkgs/pkgs/development/python-modules/karton-core/default.nix index 6746fd6eb710..e9c0b9cb07c4 100644 --- a/nixpkgs/pkgs/development/python-modules/karton-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/karton-core/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "karton-core"; - version = "5.3.3"; + version = "5.3.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,14 +20,14 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = "karton"; rev = "refs/tags/v${version}"; - hash = "sha256-RVHhMKoQAqsddziK/vWGynSL9mxMuccNEGzoJTx8KAA="; + hash = "sha256-q12S80GZFyh7zU6iMeCkyIesMK8qXtZ1B69w8H5LpOU="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ boto3 orjson redis diff --git a/nixpkgs/pkgs/development/python-modules/keras-applications/default.nix b/nixpkgs/pkgs/development/python-modules/keras-applications/default.nix index 82ee6803d4bf..fdfbdba89cb8 100644 --- a/nixpkgs/pkgs/development/python-modules/keras-applications/default.nix +++ b/nixpkgs/pkgs/development/python-modules/keras-applications/default.nix @@ -1,11 +1,12 @@ { lib, buildPythonPackage, fetchPypi, numpy, h5py }: buildPythonPackage rec { - pname = "Keras_Applications"; + pname = "keras-applications"; version = "1.0.8"; src = fetchPypi { - inherit pname version; + pname = "Keras_Applications"; + inherit version; sha256 = "5579f9a12bcde9748f4a12233925a59b93b73ae6947409ff34aa2ba258189fe5"; }; diff --git a/nixpkgs/pkgs/development/python-modules/keras-preprocessing/default.nix b/nixpkgs/pkgs/development/python-modules/keras-preprocessing/default.nix index 49bc63a5db08..833a01c0f254 100644 --- a/nixpkgs/pkgs/development/python-modules/keras-preprocessing/default.nix +++ b/nixpkgs/pkgs/development/python-modules/keras-preprocessing/default.nix @@ -1,11 +1,12 @@ { lib, buildPythonPackage, fetchPypi, numpy, six, scipy, pillow, pytest, keras }: buildPythonPackage rec { - pname = "Keras_Preprocessing"; + pname = "keras-preprocessing"; version = "1.1.2"; src = fetchPypi { - inherit pname version; + pname = "Keras_Preprocessing"; + inherit version; sha256 = "add82567c50c8bc648c14195bf544a5ce7c1f76761536956c3d2978970179ef3"; }; diff --git a/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix b/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix index bb3bd33e469e..7818871db1b7 100644 --- a/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix @@ -1,14 +1,15 @@ { lib , stdenv -, buildPythonPackage -, fetchFromGitHub -, pythonOlder - -# propgatedBuildInputs , adal +, buildPythonPackage , certifi +, fetchFromGitHub , google-auth +, mock +, pytestCheckHook , python-dateutil +, pythonOlder +, pythonRelaxDepsHook , pyyaml , requests , requests-oauthlib @@ -16,16 +17,12 @@ , six , urllib3 , websocket-client - -# tests -, pytestCheckHook -, mock }: buildPythonPackage rec { pname = "kubernetes"; version = "28.1.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -36,20 +33,38 @@ buildPythonPackage rec { hash = "sha256-NKrxv5a5gkgpNG7yViTKYBYnU249taWl6fkPJa7/Rzo="; }; - propagatedBuildInputs = [ - adal + postPatch = '' + substituteInPlace kubernetes/base/config/kube_config_test.py \ + --replace-fail "assertEquals" "assertEqual" + ''; + + pythonRelaxDeps = [ + "urllib3" + ]; + + build-system = [ + pythonRelaxDepsHook + setuptools + ]; + + dependencies = [ certifi google-auth python-dateutil pyyaml requests requests-oauthlib - setuptools six urllib3 websocket-client ]; + passthru.optional-dependencies = { + adal = [ + adal + ]; + }; + pythonImportsCheck = [ "kubernetes" ]; @@ -57,7 +72,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); disabledTests = lib.optionals stdenv.isDarwin [ # AssertionError: <class 'urllib3.poolmanager.ProxyManager'> != <class 'urllib3.poolmanager.Poolmanager'> @@ -67,6 +82,7 @@ buildPythonPackage rec { meta = with lib; { description = "Kubernetes Python client"; homepage = "https://github.com/kubernetes-client/python"; + changelog = "https://github.com/kubernetes-client/python/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ lsix ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/langchain-community/default.nix b/nixpkgs/pkgs/development/python-modules/langchain-community/default.nix index 0f0492c1c4b4..95786643d458 100644 --- a/nixpkgs/pkgs/development/python-modules/langchain-community/default.nix +++ b/nixpkgs/pkgs/development/python-modules/langchain-community/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "langchain-community"; - version = "0.0.27"; + version = "0.0.29"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "langchain_community"; inherit version; - hash = "sha256-Jm3/vUwWZtsYicrZU/pRAtTev/eCM1NTtteGNqdhd40="; + hash = "sha256-2IEH+vqf4sVzPaljDGjZ7lHNM7HIiklQ56LZo49+eqM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/langchain-core/default.nix b/nixpkgs/pkgs/development/python-modules/langchain-core/default.nix index 350e9a903690..d1a48870d255 100644 --- a/nixpkgs/pkgs/development/python-modules/langchain-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/langchain-core/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.1.32"; + version = "0.1.36"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "langchain_core"; inherit version; - hash = "sha256-1iaDvsvyD1HxKHV5GgQjIPReqgyHomfTC8A7waB/XsI="; + hash = "sha256-qiQyNwyj0qXW3RSoEKpkiL8vYi/3oKPcMPbg7Z1/X6g="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/langchain/default.nix b/nixpkgs/pkgs/development/python-modules/langchain/default.nix index f9352c5f9876..1fc9cd416ecd 100644 --- a/nixpkgs/pkgs/development/python-modules/langchain/default.nix +++ b/nixpkgs/pkgs/development/python-modules/langchain/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.1.11"; + version = "0.1.13"; pyproject = true; disabled = pythonOlder "3.8"; @@ -61,7 +61,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/v${version}"; - hash = "sha256-I7H8W85WJCt8Dkep5UvFRVuhJS8uAeg0xF9mNPZwm2g="; + hash = "sha256-tBEO0GOY1cqO5FOYnBXAOSupSRhcoI9u4Nu4FieId74="; }; sourceRoot = "${src.name}/libs/langchain"; diff --git a/nixpkgs/pkgs/development/python-modules/langsmith/default.nix b/nixpkgs/pkgs/development/python-modules/langsmith/default.nix index 33fcdcad63f0..79fbbb1ed893 100644 --- a/nixpkgs/pkgs/development/python-modules/langsmith/default.nix +++ b/nixpkgs/pkgs/development/python-modules/langsmith/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.1.31"; + version = "0.1.36"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-eQ2oP1I7uc9s9vrDqKCIqMGuh1+MjUpLFukp3Fg0RM0="; + hash = "sha256-YHYzC4c7VOPBiBgtJcN/hPccZMJBL5E8VsIAwErhWjg="; }; sourceRoot = "${src.name}/python"; @@ -33,12 +33,12 @@ buildPythonPackage rec { "orjson" ]; - nativeBuildInputs = [ + build-system = [ poetry-core pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ orjson pydantic requests diff --git a/nixpkgs/pkgs/development/python-modules/latexify-py/default.nix b/nixpkgs/pkgs/development/python-modules/latexify-py/default.nix index ccda72eb03d7..0c00ffdacadd 100644 --- a/nixpkgs/pkgs/development/python-modules/latexify-py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/latexify-py/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "latexify-py"; - version = "0.4.2"; + version = "0.4.3-post1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,14 +18,14 @@ buildPythonPackage rec { owner = "google"; repo = "latexify_py"; rev = "refs/tags/v${version}"; - hash = "sha256-bBtAtBJfpStNYWhOJoypDI9hhE4g1ZFHBU8p6S1yCgU="; + hash = "sha256-4924pqgc+C8VDTTK5Dac6UJV0tcicVBdnkWvE1ynyvY="; }; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ dill ]; diff --git a/nixpkgs/pkgs/development/python-modules/libretranslate/default.nix b/nixpkgs/pkgs/development/python-modules/libretranslate/default.nix index 8afdbf97e184..042fd5d404d1 100644 --- a/nixpkgs/pkgs/development/python-modules/libretranslate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libretranslate/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonRelaxDepsHook , pytestCheckHook +, hatchling , argostranslate , flask , flask-swagger @@ -11,6 +13,8 @@ , flask-session , waitress , expiringdict +, langdetect +, lexilang , ltpycld2 , morfessor , appdirs @@ -27,8 +31,7 @@ buildPythonPackage rec { pname = "libretranslate"; version = "1.5.6"; - - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "LibreTranslate"; @@ -37,7 +40,14 @@ buildPythonPackage rec { hash = "sha256-43VnxgtapMRKyXxqsvBgSMUxvpbLI+iOfW3FA0/POpE="; }; - propagatedBuildInputs = [ + build-system = [ + hatchling + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = true; + + dependencies = [ argostranslate flask flask-swagger @@ -47,6 +57,8 @@ buildPythonPackage rec { flask-session waitress expiringdict + langdetect + lexilang ltpycld2 morfessor appdirs @@ -59,14 +71,6 @@ buildPythonPackage rec { polib ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "==" ">=" - - substituteInPlace setup.py \ - --replace "'pytest-runner'" "" - ''; - postInstall = '' # expose static files to be able to serve them via web-server mkdir -p $out/share/libretranslate diff --git a/nixpkgs/pkgs/development/python-modules/libtmux/default.nix b/nixpkgs/pkgs/development/python-modules/libtmux/default.nix index 7204e502d8ec..1d26117e5ba1 100644 --- a/nixpkgs/pkgs/development/python-modules/libtmux/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libtmux/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.35.0"; + version = "0.36.0"; pyproject = true; src = fetchFromGitHub { owner = "tmux-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1Xt2sl4L56TnveufD2j9k6eQQ+HllDxagv1APrErQYc="; + hash = "sha256-oJ2IGaPFMKA/amUEPZi1UO9vZtjPNQg3SIFjQWzUeSE="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/litellm/default.nix b/nixpkgs/pkgs/development/python-modules/litellm/default.nix index c65bf018ed04..71ec2af82885 100644 --- a/nixpkgs/pkgs/development/python-modules/litellm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/litellm/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "litellm"; - version = "1.33.7"; + version = "1.34.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -42,18 +42,18 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-o2MqZ9d2YDe0eQtao9OO9Ysl3cKTGiHqaYknOvcyCT4="; + hash = "sha256-FRAT7wQZEO60Hf3sJv+jLIHif8ium0j2Mr1mU/XKlCM="; }; postPatch = '' rm -rf dist ''; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp click importlib-metadata diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-agent-openai/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-agent-openai/default.nix index 5663e9f11828..550b08375559 100644 --- a/nixpkgs/pkgs/development/python-modules/llama-index-agent-openai/default.nix +++ b/nixpkgs/pkgs/development/python-modules/llama-index-agent-openai/default.nix @@ -1,25 +1,36 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , llama-index-core , llama-index-llms-openai , poetry-core +, pythonOlder +, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "llama-index-agent-openai"; + version = "0.2.0"; + pyproject = true; - inherit (llama-index-core) version src meta; + disabled = pythonOlder "3.8"; - pyproject = true; + src = fetchPypi { + pname = "llama_index_agent_openai"; + inherit version; + hash = "sha256-iDHuNk1TeBNAG6LK38JnAdPRrVODhQ9+fdytL1aNlO8="; + }; - sourceRoot = "${src.name}/llama-index-integrations/agent/${pname}"; + pythonRelaxDeps = [ + "llama-index-llms-openai" + ]; - nativeBuildInputs = [ + build-system = [ poetry-core + pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ llama-index-core llama-index-llms-openai ]; @@ -27,4 +38,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "llama_index.agent.openai" ]; + + meta = with lib; { + description = "LlamaIndex Agent Integration for OpenAI"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/agent/llama-index-agent-openai"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-cli/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-cli/default.nix index de4aacdd5adc..a82dc25e1cd0 100644 --- a/nixpkgs/pkgs/development/python-modules/llama-index-cli/default.nix +++ b/nixpkgs/pkgs/development/python-modules/llama-index-cli/default.nix @@ -1,34 +1,50 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , llama-index-core , llama-index-embeddings-openai , llama-index-llms-openai , llama-index-vector-stores-chroma , poetry-core +, pythonOlder }: buildPythonPackage rec { pname = "llama-index-cli"; - - inherit (llama-index-core) version src meta; - + version = "0.1.11"; pyproject = true; - sourceRoot = "${src.name}/${pname}"; + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_cli"; + inherit version; + hash = "sha256-XecH4SWqh31wxh2nDMRP6nKp9623f0E7Ufc7He/911A="; + }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ llama-index-core llama-index-embeddings-openai llama-index-llms-openai llama-index-vector-stores-chroma ]; + # Tests are only available in the mono repo + doCheck = false; + pythonImportsCheck = [ "llama_index.cli" ]; + + meta = with lib; { + description = "LlamaIndex CLI"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-cli"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; + } diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-core/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-core/default.nix index df6e3b92e289..5146eca9d4d6 100644 --- a/nixpkgs/pkgs/development/python-modules/llama-index-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/llama-index-core/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "llama-index-core"; - version = "0.10.20"; + version = "0.10.25"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; rev = "refs/tags/v${version}"; - hash = "sha256-F7k5gtmhFdn369Ws5PSJ/xTid6ONstoWPotk+DmDtLw="; + hash = "sha256-E06Fxj6dD0BVYpme107IdgGg0Y7vhNR9zFvyKL0Yqws="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix index 6b371c816983..21b9f3bc3f02 100644 --- a/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix +++ b/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix @@ -1,36 +1,52 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , google-generativeai , llama-index-core , poetry-core , pytestCheckHook +, pythonRelaxDepsHook +, pythonOlder }: buildPythonPackage rec { pname = "llama-index-embeddings-gemini"; - version = "0.1.3"; + version = "0.1.5"; + pyproject = true; - inherit (llama-index-core) src meta; + disabled = pythonOlder "3.9"; - pyproject = true; + src = fetchPypi { + pname = "llama_index_embeddings_gemini"; + inherit version; + hash = "sha256-FQzZ+MjuAApOImpxQhuaCFDIKdojzD5zqDOepo8fCNo="; + }; - sourceRoot = "${src.name}/llama-index-integrations/embeddings/${pname}"; + pythonRelaxDeps = [ + "google-generativeai" + ]; - nativeBuildInputs = [ + build-system = [ poetry-core + pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ google-generativeai llama-index-core ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + # Tests are only available in the mono repo + doCheck = false; pythonImportsCheck = [ "llama_index.embeddings.gemini" ]; + + meta = with lib; { + description = "LlamaIndex Llms Integration for Gemini"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/embeddings/llama-index-embeddings-gemini"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-google/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-google/default.nix index 6cf2d1772163..eb378f7ca3af 100644 --- a/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-google/default.nix +++ b/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-google/default.nix @@ -1,30 +1,51 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , google-generativeai , llama-index-core , poetry-core +, pythonOlder +, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "llama-index-embeddings-google"; + version = "0.1.4"; + pyproject = true; - inherit (llama-index-core) version src meta; + disabled = pythonOlder "3.8"; - pyproject = true; + src = fetchPypi { + pname = "llama_index_embeddings_google"; + inherit version; + hash = "sha256-jQYN/5XPCrMjvwXBARdRDLC+3JhqgZjlcVajmcRlVJw="; + }; - sourceRoot = "${src.name}/llama-index-integrations/embeddings/${pname}"; + pythonRelaxDeps = [ + "google-generativeai" + ]; - nativeBuildInputs = [ + build-system = [ poetry-core + pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ google-generativeai llama-index-core ]; + # Tests are only available in the mono repo + doCheck = false; + pythonImportsCheck = [ "llama_index.embeddings.google" ]; + + meta = with lib; { + description = "LlamaIndex Embeddings Integration for Google"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/embeddings/llama-index-embeddings-google"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix new file mode 100644 index 000000000000..c30cb3e72e2a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, llama-index-core +, poetry-core +, pythonOlder +, sentence-transformers +}: + +buildPythonPackage rec { + pname = "llama-index-embeddings-huggingface"; + version = "0.2.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_embeddings_huggingface"; + inherit version; + hash = "sha256-3PCplFXzfE4aL91c1lyd0aRRu4aMP4DDNcTQybadAHE="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + llama-index-core + sentence-transformers + ]; + + # Tests are only available in the mono repo + doCheck = false; + + pythonImportsCheck = [ + "llama_index.embeddings.huggingface" + ]; + + meta = with lib; { + description = "LlamaIndex Embeddings Integration for Huggingface"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/embeddings/llama-index-embeddings-huggingface"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix new file mode 100644 index 000000000000..509bf54d2872 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-generativeai +, llama-index-core +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "llama-index-embeddings-ollama"; + version = "0.1.2"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + pname = "llama_index_embeddings_ollama"; + inherit version; + hash = "sha256-qeCAm93S5K2IjySVGe3H49M5x05OA/xaQMMGDcQdR6k="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + llama-index-core + ]; + + # Tests are only available in the mono repo + doCheck = false; + + pythonImportsCheck = [ + "llama_index.embeddings.ollama" + ]; + + meta = with lib; { + description = "LlamaIndex Llms Integration for Ollama"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/embeddings/llama-index-embeddings-ollama"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix index 41e3843220f5..00572d723d8f 100644 --- a/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix +++ b/nixpkgs/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix @@ -1,28 +1,43 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , llama-index-core , poetry-core +, pythonOlder }: buildPythonPackage rec { pname = "llama-index-embeddings-openai"; - - inherit (llama-index-core) version src meta; - + version = "0.1.7"; pyproject = true; - sourceRoot = "${src.name}/llama-index-integrations/embeddings/${pname}"; + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_embeddings_openai"; + inherit version; + hash = "sha256-xxzJggaAxM7fyYRdyHuU9oUdHMzh5Ib8kSmPj6jZ8n0="; + }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ llama-index-core ]; + # Tests are only available in the mono repo + doCheck = false; + pythonImportsCheck = [ "llama_index.embeddings.openai" ]; + + meta = with lib; { + description = "LlamaIndex Embeddings Integration for OpenAI"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-s3"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix new file mode 100644 index 000000000000..783ace83f656 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, llama-index-core +, nebula3-python +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "llama-index-graph-stores-nebula"; + version = "0.1.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_graph_stores_nebula"; + inherit version; + hash = "sha256-Xb/0ogj2NlGV4MGC9Be54d/JfalT40jtAe6LOPO1u/8="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + llama-index-core + nebula3-python + ]; + + pythonImportsCheck = [ + "llama_index.graph_stores.nebula" + ]; + + meta = with lib; { + description = "LlamaIndex Graph Store Integration for Nebula"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/graph_stores/llama-index-graph-stores-nebula"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix new file mode 100644 index 000000000000..8561c2299ebe --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, neo4j +, llama-index-core +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "llama-index-graph-stores-neo4j"; + version = "0.1.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_graph_stores_neo4j"; + inherit version; + hash = "sha256-AUWezvdONxz5H42VpTjh7NrBkTdWjtBJyMvA8kSh5w4="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + neo4j + llama-index-core + ]; + + pythonImportsCheck = [ + "llama_index.graph_stores.neo4j" + ]; + + meta = with lib; { + description = "LlamaIndex Graph Store Integration for Neo4j"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/graph_stores/llama-index-graph-stores-neo4j"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix new file mode 100644 index 000000000000..869116b58c6b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, boto3 +, llama-index-core +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "llama-index-graph-stores-neptune"; + version = "0.1.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_graph_stores_neptune"; + inherit version; + hash = "sha256-ZveFCJJT7Qal82cuVTs+3AmSuvdc7GsHqqqNvcDb3CY="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + boto3 + llama-index-core + ]; + + pythonImportsCheck = [ + "llama_index.graph_stores.neptune" + ]; + + meta = with lib; { + description = "LlamaIndex Graph Store Integration for Neptune"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/graph_stores/llama-index-graph-stores-neptune"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix index c778fb0e0512..b0bc2e6f2d9e 100644 --- a/nixpkgs/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix +++ b/nixpkgs/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix @@ -1,28 +1,43 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , poetry-core , llama-index-core +, pythonOlder }: buildPythonPackage rec { pname = "llama-index-indices-managed-llama-cloud"; - - inherit (llama-index-core) version src meta; - + version = "0.1.5"; pyproject = true; - sourceRoot = "${src.name}/llama-index-integrations/indices/${pname}"; + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_indices_managed_llama_cloud"; + inherit version; + hash = "sha256-R83enwa73dUI8O/PQd5CXoUXGsLI/ail+yqJZz4cjHE="; + }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ llama-index-core ]; + # Tests are only available in the mono repo + doCheck = false; + pythonImportsCheck = [ "llama_index.indices.managed.llama_cloud" ]; + + meta = with lib; { + description = "LlamaCloud Index and Retriever"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/indices/llama-index-indices-managed-llama-cloud"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-legacy/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-legacy/default.nix index e490c3db7e88..120a210d8eeb 100644 --- a/nixpkgs/pkgs/development/python-modules/llama-index-legacy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/llama-index-legacy/default.nix @@ -1,24 +1,39 @@ { lib , buildPythonPackage -, fetchFromGitHub -, poetry-core +, fetchPypi , llama-index-core +, poetry-core +, pythonOlder }: buildPythonPackage rec { pname = "llama-index-legacy"; - - inherit (llama-index-core) version src meta; - + version = "0.9.48"; pyproject = true; - sourceRoot = "${src.name}/${pname}"; + disabled = pythonOlder "3.8"; - nativeBuildInputs = [ + src = fetchPypi { + pname = "llama_index_legacy"; + inherit version; + hash = "sha256-gt3EaR7b9JUz1lWCwkm6IsA/6W+9PpL3dY3M7yjkODQ="; + }; + + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ llama-index-core ]; + + # Tests are only available in the mono repo + doCheck = false; + + meta = with lib; { + description = "LlamaIndex Readers Integration for files"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-legacy"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-llms-ollama/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-llms-ollama/default.nix new file mode 100644 index 000000000000..dd1ccf563b77 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-llms-ollama/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, llama-index-core +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "llama-index-llms-ollama"; + version = "0.1.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_llms_ollama"; + inherit version; + hash = "sha256-GexyfQSMhzkV1bA32aL+lWUgwBmxHXq4w8QG3RHzTks="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + llama-index-core + ]; + + # Tests are only available in the mono repo + doCheck = false; + + pythonImportsCheck = [ + "llama_index.llms.ollama" + ]; + + meta = with lib; { + description = "LlamaIndex LLMS Integration for ollama"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/llms/llama-index-llms-ollama"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix new file mode 100644 index 000000000000..ccb32689f530 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, llama-index-core +, llama-index-llms-openai +, poetry-core +, pythonOlder +, transformers +}: + +buildPythonPackage rec { + pname = "llama-index-llms-openai-like"; + version = "0.1.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_llms_openai_like"; + inherit version; + hash = "sha256-w0EjJQd8dSY+N9YNUBMUub3HcPEtiisW51bn2ayPnj8="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + llama-index-core + llama-index-llms-openai + transformers + ]; + + # Tests are only available in the mono repo + doCheck = false; + + pythonImportsCheck = [ + "llama_index.llms.openai_like" + ]; + + meta = with lib; { + description = "LlamaIndex LLMS Integration for OpenAI like"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/llms/llama-index-llms-openai-like"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-llms-openai/default.nix index c0b10abd0251..24085ab77603 100644 --- a/nixpkgs/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/nixpkgs/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -1,28 +1,43 @@ { lib , buildPythonPackage -, fetchFromGitHub -, poetry-core +, fetchPypi , llama-index-core +, poetry-core +, pythonOlder }: buildPythonPackage rec { pname = "llama-index-llms-openai"; - - inherit (llama-index-core) version src meta; - + version = "0.1.13"; pyproject = true; - sourceRoot = "${src.name}/llama-index-integrations/llms/${pname}"; + disabled = pythonOlder "3.8"; - nativeBuildInputs = [ + src = fetchPypi { + pname = "llama_index_llms_openai"; + inherit version; + hash = "sha256-wP2TIlWsm/crawLDgR7rvzQxqnYDrqqzHIEVR/REsco="; + }; + + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ llama-index-core ]; + # Tests are only available in the mono repo + doCheck = false; + pythonImportsCheck = [ "llama_index.llms.openai" ]; + + meta = with lib; { + description = "LlamaIndex LLMS Integration for OpenAI"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/llms/llama-index-llms-openai"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix index 825b001f5c61..3df214e8bffd 100644 --- a/nixpkgs/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix +++ b/nixpkgs/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix @@ -1,30 +1,45 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , llama-index-core , llama-index-llms-openai , poetry-core +, pythonOlder }: buildPythonPackage rec { pname = "llama-index-multi-modal-llms-openai"; - - inherit (llama-index-core) version src meta; - + version = "0.1.4"; pyproject = true; - sourceRoot = "${src.name}/llama-index-integrations/multi_modal_llms/${pname}"; + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_multi_modal_llms_openai"; + inherit version; + hash = "sha256-al1lhMM6nRsGz1yHTGOvJgP8k7ZgveSBqMVH6HbG4sM="; + }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ llama-index-core llama-index-llms-openai ]; + # Tests are only available in the mono repo + doCheck = false; + pythonImportsCheck = [ "llama_index.multi_modal_llms.openai" ]; + + meta = with lib; { + description = "LlamaIndex Multi-Modal-Llms Integration for OpenAI"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/multi_modal_llms/llama-index-multi-modal-llms-openai"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-program-openai/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-program-openai/default.nix index d30bb7fb709c..70640d4a4bbe 100644 --- a/nixpkgs/pkgs/development/python-modules/llama-index-program-openai/default.nix +++ b/nixpkgs/pkgs/development/python-modules/llama-index-program-openai/default.nix @@ -1,26 +1,37 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , llama-index-agent-openai , llama-index-core , llama-index-llms-openai , poetry-core +, pythonOlder +, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "llama-index-program-openai"; + version = "0.1.5"; + pyproject = true; - inherit (llama-index-core) version src meta; + disabled = pythonOlder "3.8"; - pyproject = true; + src = fetchPypi { + pname = "llama_index_program_openai"; + inherit version; + hash = "sha256-wzqi0odq0P8fmip1XU59SRckCEfQF057LQuEdEmbtwA="; + }; - sourceRoot = "${src.name}/llama-index-integrations/program/${pname}"; + pythonRelaxDeps = [ + "llama-index-agent-openai" + ]; - nativeBuildInputs = [ + build-system = [ poetry-core + pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ llama-index-agent-openai llama-index-core llama-index-llms-openai @@ -29,4 +40,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "llama_index.program.openai" ]; + + meta = with lib; { + description = "LlamaIndex Program Integration for OpenAI"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/program/llama-index-program-openai"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix index a1dadcd941f8..aa302019772a 100644 --- a/nixpkgs/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix +++ b/nixpkgs/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix @@ -1,32 +1,47 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , llama-index-core , llama-index-llms-openai , llama-index-program-openai , poetry-core +, pythonOlder }: buildPythonPackage rec { pname = "llama-index-question-gen-openai"; - - inherit (llama-index-core) version src meta; - + version = "0.1.3"; pyproject = true; - sourceRoot = "${src.name}/llama-index-integrations/question_gen/${pname}"; + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_question_gen_openai"; + inherit version; + hash = "sha256-RIYZgRekVFfS4DauYLk69YBSiTzH14+ptvR91HuB4uE="; + }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ llama-index-core llama-index-llms-openai llama-index-program-openai ]; + # Tests are only available in the mono repo + doCheck = false; + pythonImportsCheck = [ "llama_index.question_gen.openai" ]; + + meta = with lib; { + description = "LlamaIndex Question Gen Integration for Openai Generator"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/question_gen/llama-index-question-gen-openai"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-readers-database/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-readers-database/default.nix new file mode 100644 index 000000000000..7b01a5738bbb --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-readers-database/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchPypi +, llama-index-core +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "llama-index-readers-database"; + version = "0.1.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_readers_database"; + inherit version; + hash = "sha256-1J6FE6iID4U9cEcPPUK5CvCTmbgVWxI4AFLrx+gPGWg="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + llama-index-core + ]; + + # Tests are only available in the mono repo + doCheck = false; + + pythonImportsCheck = [ + "llama_index.readers.database" + ]; + + meta = with lib; { + description = "LlamaIndex Readers Integration for Databases"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-database"; + changelog = "https://github.com/run-llama/llama_index/blob/main/llama-index-integrations/readers/llama-index-readers-database/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-readers-file/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-readers-file/default.nix index 4c5503c66071..f4b441142bfb 100644 --- a/nixpkgs/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/nixpkgs/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -1,27 +1,30 @@ { lib , beautifulsoup4 , buildPythonPackage -, fetchFromGitHub +, fetchPypi , llama-index-core , poetry-core , pymupdf , pypdf -, pytestCheckHook +, pythonOlder , pythonRelaxDepsHook +, striprtf }: buildPythonPackage rec { pname = "llama-index-readers-file"; - version = "0.1.7"; - - inherit (llama-index-core) src meta; - + version = "0.1.12"; pyproject = true; - sourceRoot = "${src.name}/llama-index-integrations/readers/${pname}"; + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_readers_file"; + inherit version; + hash = "sha256-YGXL+AsPtdGJVYuLkK273JKsuGFH/KGS2I/MJwStKvM="; + }; pythonRelaxDeps = [ - "beautifulsoup4" "pymupdf" "pypdf" ]; @@ -30,23 +33,30 @@ buildPythonPackage rec { "bs4" ]; - nativeBuildInputs = [ + build-system = [ poetry-core pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ beautifulsoup4 llama-index-core pymupdf pypdf + striprtf ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + # Tests are only available in the mono repo + doCheck = false; pythonImportsCheck = [ "llama_index.readers.file" ]; + + meta = with lib; { + description = "LlamaIndex Readers Integration for files"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-file"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-readers-json/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-readers-json/default.nix index c29dcd78c433..4b1d670818b6 100644 --- a/nixpkgs/pkgs/development/python-modules/llama-index-readers-json/default.nix +++ b/nixpkgs/pkgs/development/python-modules/llama-index-readers-json/default.nix @@ -1,34 +1,43 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , llama-index-core , poetry-core -, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "llama-index-readers-json"; - version = "0.1.2"; - - inherit (llama-index-core) src meta; - + version = "0.1.5"; pyproject = true; - sourceRoot = "${src.name}/llama-index-integrations/readers/${pname}"; + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_readers_json"; + inherit version; + hash = "sha256-H+CG+2FtoOF/DUG6EuAWzY2xe1upLX0pakVutJTZFE0="; + }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ llama-index-core ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + # Tests are only available in the mono repo + doCheck = false; pythonImportsCheck = [ "llama_index.readers.json" ]; + + meta = with lib; { + description = "LlamaIndex Readers Integration for Json"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-json"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix index b9dfde0273e2..e24f0d850a9d 100644 --- a/nixpkgs/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix @@ -1,22 +1,33 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , llama-index-core , llama-parse , poetry-core +, pythonOlder +, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "llama-index-readers-llama-parse"; + version = "0.1.4"; + pyproject = true; - inherit (llama-index-core) version src meta; + disabled = pythonOlder "3.8"; - pyproject = true; + src = fetchPypi { + pname = "llama_index_readers_llama_parse"; + inherit version; + hash = "sha256-eGCLGTyBiJSu/u4KowPwK3+A8uTK8Thmwv07CxAj4sA="; + }; - sourceRoot = "${src.name}/llama-index-integrations/readers/${pname}"; + pythonRelaxDeps = [ + "llama-parse" + ]; nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -24,7 +35,17 @@ buildPythonPackage rec { llama-index-core ]; + # Tests are only available in the mono repo + doCheck = false; + pythonImportsCheck = [ "llama_index.readers.llama_parse" ]; + + meta = with lib; { + description = "LlamaIndex Readers Integration for files"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-llama-parse"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-readers-s3/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-readers-s3/default.nix new file mode 100644 index 000000000000..0cc7c10661e2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-readers-s3/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, llama-index-core +, llama-index-readers-file +, poetry-core +, pythonOlder +, s3fs +}: + +buildPythonPackage rec { + pname = "llama-index-readers-s3"; + version = "0.1.4"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_readers_s3"; + inherit version; + hash = "sha256-FjRIo0sJGJikX4T4Esew3pBxEp7E3kK7Ds2uXDJqMzQ="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + llama-index-core + llama-index-readers-file + s3fs + ]; + + # Tests are only available in the mono repo + doCheck = false; + + pythonImportsCheck = [ + "llama_index.readers.s3" + ]; + + meta = with lib; { + description = "LlamaIndex Readers Integration for S3"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-s3"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-readers-twitter/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-readers-twitter/default.nix new file mode 100644 index 000000000000..88ffcd410bf9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-readers-twitter/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchPypi +, llama-index-core +, poetry-core +, pythonOlder +, tweepy +}: + +buildPythonPackage rec { + pname = "llama-index-readers-twitter"; + version = "0.1.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_readers_twitter"; + inherit version; + hash = "sha256-ZPwluiPdSkwMZ3JQy/HHhR7erYhUE9BWtplkfHk+TK8="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + llama-index-core + tweepy + ]; + + # Tests are only available in the mono repo + doCheck = false; + + pythonImportsCheck = [ + "llama_index.readers.twitter" + ]; + + meta = with lib; { + description = "LlamaIndex Readers Integration for Twitter"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-twitter"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-readers-txtai/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-readers-txtai/default.nix new file mode 100644 index 000000000000..787026f8fc4b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-readers-txtai/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, llama-index-core +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "llama-index-readers-txtai"; + version = "0.1.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_readers_txtai"; + inherit version; + hash = "sha256-F1P3/ZICFDTqowpqu0AF2RIKfLTH9Phuw0O+VsHpI4U="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + llama-index-core + ]; + + # Tests are only available in the mono repo + doCheck = false; + + pythonImportsCheck = [ + "llama_index.readers.txtai" + ]; + + meta = with lib; { + description = "LlamaIndex Readers Integration for txtai"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-txtai"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-readers-weather/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-readers-weather/default.nix index 773c737f342d..1778322d63b4 100644 --- a/nixpkgs/pkgs/development/python-modules/llama-index-readers-weather/default.nix +++ b/nixpkgs/pkgs/development/python-modules/llama-index-readers-weather/default.nix @@ -1,27 +1,31 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , llama-index-core , poetry-core , pyowm +, pythonOlder , pytestCheckHook }: buildPythonPackage rec { pname = "llama-index-readers-weather"; - version = "0.1.4"; - - inherit (llama-index-core) src meta; - + version = "0.1.3"; pyproject = true; - sourceRoot = "${src.name}/llama-index-integrations/readers/${pname}"; + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_readers_weather"; + inherit version; + hash = "sha256-LJy2nU9f+yZZQm9stNn9mIqOkT5lOHaMIIm1Ezf2D0Q="; + }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ llama-index-core pyowm ]; @@ -30,7 +34,17 @@ buildPythonPackage rec { pytestCheckHook ]; + # Tests are only available in the mono repo + doCheck = false; + pythonImportsCheck = [ "llama_index.readers.weather" ]; + + meta = with lib; { + description = "LlamaIndex Readers Integration for Weather"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-weather"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix index 62e89093066d..8c546307434a 100644 --- a/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix +++ b/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix @@ -1,41 +1,42 @@ { lib , buildPythonPackage , chromadb -, fetchFromGitHub +, fetchPypi , llama-index-core -, onnxruntime +, pythonOlder , poetry-core -, pythonRelaxDepsHook -, tokenizers }: buildPythonPackage rec { pname = "llama-index-vector-stores-chroma"; - - inherit (llama-index-core) version src meta; - + version = "0.1.6"; pyproject = true; - sourceRoot = "${src.name}/llama-index-integrations/vector_stores/${pname}"; + disabled = pythonOlder "3.8"; - pythonRelaxDeps = [ - "onnxruntime" - "tokenizers" - ]; + src = fetchPypi { + pname = "llama_index_vector_stores_chroma"; + inherit version; + hash = "sha256-bf89ydecQDn6Rs1Sjl5Lbe1kc+XvYyQkE0SRAH2k69s="; + }; - nativeBuildInputs = [ + build-system = [ poetry-core - pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ chromadb llama-index-core - onnxruntime - tokenizers ]; pythonImportsCheck = [ "llama_index.vector_stores.chroma" ]; + + meta = with lib; { + description = "LlamaIndex Vector Store Integration for Chroma"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/vector_stores/llama-index-vector-stores-chroma"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix new file mode 100644 index 000000000000..9d5a33ebc7d9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-generativeai +, llama-index-core +, poetry-core +, pythonOlder +, pythonRelaxDepsHook +}: + +buildPythonPackage rec { + pname = "llama-index-vector-stores-google"; + version = "0.1.4"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_vector_stores_google"; + inherit version; + hash = "sha256-5HjbymV7wdcu/C+ndWCxj3j10QIgVqUaSaZ4cRMJ46U="; + }; + + pythonRelaxDeps = [ + "google-generativeai" + ]; + + build-system = [ + poetry-core + pythonRelaxDepsHook + ]; + + dependencies = [ + google-generativeai + llama-index-core + ]; + + pythonImportsCheck = [ + "llama_index.vector_stores.google" + ]; + + meta = with lib; { + description = "LlamaIndex Vector Store Integration for Google"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/vector_stores/llama-index-vector-stores-google"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix new file mode 100644 index 000000000000..4751a0fce866 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix @@ -0,0 +1,52 @@ +{ lib +, asyncpg +, buildPythonPackage +, fetchPypi +, llama-index-core +, pgvector +, poetry-core +, psycopg2 +, pythonRelaxDepsHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "llama-index-vector-stores-postgres"; + version = "0.1.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_vector_stores_postgres"; + inherit version; + hash = "sha256-vWqCcda9dDPLceoOEgMivpBmkLbKs/poEjzCk/q4HwI="; + }; + + pythonRemoveDeps = [ + "psycopg2-binary" + ]; + + build-system = [ + poetry-core + pythonRelaxDepsHook + ]; + + dependencies = [ + asyncpg + llama-index-core + pgvector + psycopg2 + ]; + + pythonImportsCheck = [ + "llama_index.vector_stores.postgres" + ]; + + meta = with lib; { + description = "LlamaIndex Vector Store Integration for Postgres"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/vector_stores/llama-index-vector-stores-postgres"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix b/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix new file mode 100644 index 000000000000..e0c34a935c76 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, llama-index-core +, qdrant-client +, poetry-core +, grpcio +, pythonOlder +}: + +buildPythonPackage rec { + pname = "llama-index-vector-stores-qdrant"; + version = "0.1.4"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_index_vector_stores_qdrant"; + inherit version; + hash = "sha256-UIiEL7ZUcGQusyhs9cFsPOZ8qxH7ouoCnQMemlho0lA="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + grpcio + llama-index-core + qdrant-client + ]; + + pythonImportsCheck = [ + "llama_index.vector_stores.qdrant" + ]; + + meta = with lib; { + description = "LlamaIndex Vector Store Integration for Qdrant"; + homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/vector_stores/llama-index-vector-stores-qdrant"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/llama-parse/default.nix b/nixpkgs/pkgs/development/python-modules/llama-parse/default.nix index 284f03f67a59..5d63c234fa07 100644 --- a/nixpkgs/pkgs/development/python-modules/llama-parse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/llama-parse/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "llama-parse"; - version = "0.3.9"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,14 +16,14 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_parse"; inherit version; - hash = "sha256-vra6Tbt6V3CKtvEPfVMUFZjjneGgQKYeb1pxw6XVaxM="; + hash = "sha256-7lIelCLbSNvfADA8tukPEGYTGWC1yk4U9bWm22t5F+I="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ llama-index-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/llamaindex-py-client/default.nix b/nixpkgs/pkgs/development/python-modules/llamaindex-py-client/default.nix index d46e070c9517..fb0cb4ad58ad 100644 --- a/nixpkgs/pkgs/development/python-modules/llamaindex-py-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/llamaindex-py-client/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llamaindex-py-client"; - version = "0.1.13"; + version = "0.1.15"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llamaindex_py_client"; inherit version; - hash = "sha256-O9m0Ne4KeBceukEt6lZ02BPrW/NuV308fH6Q7cVJANk="; + hash = "sha256-x84mhVupdhU7tAFXw8GUIjxrdReZNbmI3UvWo/6Dqss="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/lmcloud/default.nix b/nixpkgs/pkgs/development/python-modules/lmcloud/default.nix index 9712527f86a7..d4326aa9392c 100644 --- a/nixpkgs/pkgs/development/python-modules/lmcloud/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lmcloud/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "lmcloud"; - version = "1.1.4"; + version = "1.1.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "zweckj"; repo = "lmcloud"; rev = "refs/tags/v${version}"; - hash = "sha256-uiyZGFfSJrTjw0CvHrCor4Ef5hdkMbEHGHQH3+NxYWE="; + hash = "sha256-7w/7A66JDMu2Qn0V8GeUuBhDApTN/9SAriEUGJdKVEM="; }; build-system = [ diff --git a/nixpkgs/pkgs/development/python-modules/lupa/default.nix b/nixpkgs/pkgs/development/python-modules/lupa/default.nix index b2123b92eb1f..c79f0de9dd89 100644 --- a/nixpkgs/pkgs/development/python-modules/lupa/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lupa/default.nix @@ -1,24 +1,26 @@ { lib , buildPythonPackage -, cython +, cython_3 , fetchPypi , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "lupa"; - version = "2.0"; - format = "setuptools"; + version = "2.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rT/vSGvnrd3TSf6anDk3iQYTEs+Y68UztIm+NPSEy3k="; + hash = "sha256-dgAwcS1SczlvXpY92HMa77WsZdku/4v4/UEkwWMP6VA="; }; - nativeBuildInputs = [ - cython + build-system = [ + cython_3 + setuptools ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/lxmf/default.nix b/nixpkgs/pkgs/development/python-modules/lxmf/default.nix index 6a3f45b414b7..6682b2b09f64 100644 --- a/nixpkgs/pkgs/development/python-modules/lxmf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lxmf/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.4.2"; + version = "0.4.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,14 +17,14 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-JDD1X0/5xuqGN/Qw67tTFqfoWUd7Ah80/mimK01tG6Y="; + hash = "sha256-8Usu2fecSnyVfGrEJED4qMBO5RwJjTq5c7svCTu445Q="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ rns ]; @@ -37,10 +37,10 @@ buildPythonPackage rec { meta = with lib; { description = "Lightweight Extensible Message Format for Reticulum"; - mainProgram = "lxmd"; homepage = "https://github.com/markqvist/lxmf"; changelog = "https://github.com/markqvist/LXMF/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "lxmd"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/manifest-ml/default.nix b/nixpkgs/pkgs/development/python-modules/manifest-ml/default.nix index 0d3e02ed732c..4465066682c9 100644 --- a/nixpkgs/pkgs/development/python-modules/manifest-ml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/manifest-ml/default.nix @@ -1,34 +1,35 @@ { lib +, accelerate +, aiohttp , buildPythonPackage +, fastapi , fetchFromGitHub -, pythonOlder +, flask , numpy +, pg8000 +, pillow , pydantic +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook , redis , requests -, aiohttp +, sentence-transformers +, setuptools +, sqlalchemy , sqlitedict , tenacity , tiktoken -, xxhash -, # optional dependencies - accelerate -, flask -, sentence-transformers , torch , transformers -, fastapi , uvicorn -, pillow -, pg8000 -, sqlalchemy -, pytestCheckHook +, xxhash }: buildPythonPackage rec { pname = "manifest-ml"; version = "0.1.9"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +42,16 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - propagatedBuildInputs = [ + pythonRelaxDeps = [ + "pydantic" + ]; + + build-system = [ + pythonRelaxDepsHook + setuptools + ]; + + dependencies = [ numpy pydantic redis @@ -51,7 +61,7 @@ buildPythonPackage rec { tenacity tiktoken xxhash - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ]; passthru.optional-dependencies = { api = [ @@ -79,7 +89,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ]; + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); preCheck = '' export HOME=$TMPDIR @@ -91,12 +101,17 @@ buildPythonPackage rec { ]; disabledTests = [ - # these tests have db access + # Tests require DB access "test_init" "test_key_get_and_set" "test_get" - # this test has network access + # Tests require network access + "test_abatch_run" + "test_batch_run" "test_retry_handling" + "test_run_chat" + "test_run" + "test_score_run" # Test is time-senstive "test_timing" ]; diff --git a/nixpkgs/pkgs/development/python-modules/marimo/default.nix b/nixpkgs/pkgs/development/python-modules/marimo/default.nix index 8873ac724c68..55b3e6c68172 100644 --- a/nixpkgs/pkgs/development/python-modules/marimo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/marimo/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.3.4"; + version = "0.3.5"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-nCH8JmeU81aJHHGJ1DOOCL9iarBXTBGauQKyHpU66Rk="; + hash = "sha256-XBOffkPJaGeyuK/mesN1nXXARRpoZpmiu5WVYS1tFvI="; }; build-system = [ @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "A reactive Python notebook that's reproducible, git-friendly, and deployable as scripts or apps"; homepage = "https://github.com/marimo-team/marimo"; + changelog = "https://github.com/marimo-team/marimo/releases/tag/${version}"; license = licenses.asl20; mainProgram = "marimo"; maintainers = with maintainers; [ akshayka dmadisetti ]; diff --git a/nixpkgs/pkgs/development/python-modules/markdownify/default.nix b/nixpkgs/pkgs/development/python-modules/markdownify/default.nix index 19f842938007..e6b09592073a 100644 --- a/nixpkgs/pkgs/development/python-modules/markdownify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/markdownify/default.nix @@ -1,29 +1,48 @@ { lib +, beautifulsoup4 , buildPythonPackage , fetchPypi , pytestCheckHook -, beautifulsoup4 +, pythonOlder +, setuptools , six }: buildPythonPackage rec { pname = "markdownify"; - version = "0.11.6"; - format = "setuptools"; + version = "0.12.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AJskDgyfTI6vHQhWJdzUAR4S8PjOxV3t+epvdlXkm/4="; + hash = "sha256-H7CMYYsw4O56MaObmY9EoY+yirJU9V9K8GttNaIXnic="; }; - propagatedBuildInputs = [ beautifulsoup4 six ]; - nativeCheckInputs = [ pytestCheckHook ]; + build-system = [ + setuptools + ]; + + dependencies = [ + beautifulsoup4 + six + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "markdownify" + ]; meta = with lib; { description = "HTML to Markdown converter"; - mainProgram = "markdownify"; homepage = "https://github.com/matthewwithanm/python-markdownify"; + changelog = "https://github.com/matthewwithanm/python-markdownify/releases/tag/${version}"; license = licenses.mit; - maintainers = [ maintainers.McSinyx ]; + maintainers = with maintainers; [ McSinyx ]; + mainProgram = "markdownify"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/metakernel/default.nix b/nixpkgs/pkgs/development/python-modules/metakernel/default.nix index 3c8396bef797..e888ccfe98f8 100644 --- a/nixpkgs/pkgs/development/python-modules/metakernel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/metakernel/default.nix @@ -11,21 +11,21 @@ buildPythonPackage rec { pname = "metakernel"; - version = "0.30.1"; - format = "pyproject"; + version = "0.30.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TKBvuGh8DnPDLaOpwOvLZHdj1kBOTE/JLda1nQ6J//U="; + hash = "sha256-Siff2FO4SfASgkLFUgTuWXpajYZClPJghLry+8gU1aQ="; }; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ ipykernel jedi jupyter-core diff --git a/nixpkgs/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix b/nixpkgs/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix index 1ffc27845241..61b8d7804f51 100644 --- a/nixpkgs/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix +++ b/nixpkgs/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "microsoft-kiota-abstractions"; - version = "1.3.1"; + version = "1.3.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,14 +22,14 @@ buildPythonPackage rec { owner = "microsoft"; repo = "kiota-abstractions-python"; rev = "refs/tags/v${version}"; - hash = "sha256-AsJHKoA50JZBDQ7vob4lI0gEmfhRUELKtgq17tHegUY="; + hash = "sha256-n9Erm21slKm+zDblhSHA5Cwxkyrcyx0w09ua3bUc5XI="; }; - nativeBuildInputs = [ + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ opentelemetry-api opentelemetry-sdk std-uritemplate diff --git a/nixpkgs/pkgs/development/python-modules/mkdocs-autolinks-plugin/default.nix b/nixpkgs/pkgs/development/python-modules/mkdocs-autolinks-plugin/default.nix new file mode 100644 index 000000000000..35d3e5c9cc16 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mkdocs-autolinks-plugin/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mkdocs +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "mkdocs-autolinks-plugin"; + version = "0.7.1"; + pyproject = true; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "zachhannum"; + repo = "mkdocs-autolinks-plugin"; + # The commit messages mention version 0.7.1, but the tag is v_071. + rev = "e2b649eb4db23459bcec121838f27c92c81f9ce1"; + hash = "sha256-mEbuB9VwK7po1TqtJfBSkItOVlI3/W3nD2LYRHgPpTA="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ mkdocs ]; + + # Module has no tests. + doCheck = false; + + pythonImportsCheck = [ "mkdocs_autolinks_plugin" ]; + + meta = with lib; { + description = "An MkDocs plugin that simplifies relative linking between documents"; + homepage = "https://github.com/zachhannum/mkdocs-autolinks-plugin"; + license = licenses.mit; + maintainers = with maintainers; [ lucas-deangelis ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix b/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix index 021c9645e321..5a609b8b3306 100644 --- a/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.5.14"; + version = "9.5.15"; pyproject = true; disabled = pythonOlder "3.7"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "squidfunk"; repo = "mkdocs-material"; rev = "refs/tags/${version}"; - hash = "sha256-VqfjqsTEi5C33MSb83ku37i0hgDyujrdaZbeqpMOvko="; + hash = "sha256-u5XRLAh1X/Y6p6HcKMeCEeDe98tCieGdF9oxqh69ris="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix index 60fe20c468af..62f5286747f0 100644 --- a/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocs-swagger-ui-tag"; - version = "0.6.8"; + version = "0.6.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Blueswen"; repo = "mkdocs-swagger-ui-tag"; rev = "refs/tags/v${version}"; - hash = "sha256-TV7V1PttzyLeVQ/Ag/tMV2aqtCys1mlYpj6i0x+ko/w="; + hash = "sha256-4cRElwF8AOvTLZJq1NF9Yqa7g44uiT96giyhqKZKp5M="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/modestmaps/default.nix b/nixpkgs/pkgs/development/python-modules/modestmaps/default.nix index 202589b7435c..180baaefce77 100644 --- a/nixpkgs/pkgs/development/python-modules/modestmaps/default.nix +++ b/nixpkgs/pkgs/development/python-modules/modestmaps/default.nix @@ -6,12 +6,13 @@ }: buildPythonPackage rec { - pname = "ModestMaps"; + pname = "modestmaps"; version = "1.4.7"; disabled = !isPy27; src = fetchPypi { - inherit pname version; + pname = "ModestMaps"; + inherit version; sha256 = "698442a170f02923f8ea55f18526b56c17178162e44304f896a8a5fd65ab4457"; }; diff --git a/nixpkgs/pkgs/development/python-modules/mscerts/default.nix b/nixpkgs/pkgs/development/python-modules/mscerts/default.nix index 9dc16828c869..6d7642c89470 100644 --- a/nixpkgs/pkgs/development/python-modules/mscerts/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mscerts/default.nix @@ -2,12 +2,13 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "mscerts"; - version = "2024.2.28"; - format = "setuptools"; + version = "2024.3.27"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -15,9 +16,13 @@ buildPythonPackage rec { owner = "ralphje"; repo = "mscerts"; rev = "refs/tags/${version}"; - hash = "sha256-ReUDpax4tvw4ZCH8zOipelIPtHi7BdgLHI/r3FNpo1c="; + hash = "sha256-Hucf3tToYm3P6ebKNlUs5V+X1B95u9P2UC1yOItZOhc="; }; + build-system = [ + setuptools + ]; + # extras_require contains signify -> circular dependency # Module has no tests diff --git a/nixpkgs/pkgs/development/python-modules/mutatormath/default.nix b/nixpkgs/pkgs/development/python-modules/mutatormath/default.nix index 1fdb937e33ea..27e92103c5a9 100644 --- a/nixpkgs/pkgs/development/python-modules/mutatormath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mutatormath/default.nix @@ -4,11 +4,12 @@ }: buildPythonPackage rec { - pname = "MutatorMath"; + pname = "mutatormath"; version = "3.0.1"; src = fetchPypi { - inherit pname version; + pname = "MutatorMath"; + inherit version; sha256 = "0r1qq45np49x14zz1zwkaayqrn7m8dn2jlipjldg2ihnmpzw29w1"; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/myjwt/default.nix b/nixpkgs/pkgs/development/python-modules/myjwt/default.nix index c310c7efe1a1..d0d39dc9d087 100644 --- a/nixpkgs/pkgs/development/python-modules/myjwt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/myjwt/default.nix @@ -34,20 +34,21 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-warn "1.6.0" "${version}" + --replace-fail "1.6.0" "${version}" ''; pythonRelaxDeps = [ "cryptography" + "pyopenssl" "questionary" ]; - nativeBuildInputs = [ + build-system = [ poetry-core pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ click colorama cryptography diff --git a/nixpkgs/pkgs/development/python-modules/mypy-boto3/default.nix b/nixpkgs/pkgs/development/python-modules/mypy-boto3/default.nix index fa22b57526a1..8a8d53bc1c49 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mypy-boto3/default.nix @@ -21,11 +21,11 @@ let inherit pname version hash; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ boto3 ] ++ lib.optionals (pythonOlder "3.12") [ typing-extensions @@ -111,7 +111,7 @@ rec { mypy-boto3-backupstorage = buildMypyBoto3Package "backupstorage" "1.34.0" "sha256-Y8kjZ+ov8OsiJ8Sm1LlvP8YbgVc+AkLkbZIhOh4y7ZY="; - mypy-boto3-batch = buildMypyBoto3Package "batch" "1.34.59" "sha256-rsXdh8f3KRAROftePejdLxChRqtiaDFsJyhctX7jRUQ="; + mypy-boto3-batch = buildMypyBoto3Package "batch" "1.34.72" "sha256-ha5OZVVcO/+slxQOPIrd+D1Ehaw6YpGqCWofSgFj5JI="; mypy-boto3-billingconductor = buildMypyBoto3Package "billingconductor" "1.34.1" "sha256-uXxQkoe2u3idcYta9YFbjxoK8HsvUiRQSyYrYhVi1kU="; @@ -119,7 +119,7 @@ rec { mypy-boto3-budgets = buildMypyBoto3Package "budgets" "1.34.0" "sha256-gs8JYnpFNOMWppBO2R3DO+c6RecQC0vzaox5DqXCKOA="; - mypy-boto3-ce = buildMypyBoto3Package "ce" "1.34.52" "sha256-KHimN6KC8V6nyp6ZQbv0XAuWMjGZkg/bPrQ6do5QQE0="; + mypy-boto3-ce = buildMypyBoto3Package "ce" "1.34.71" "sha256-VfB823/q+ie97Bv5GXhsBaGxAuXSDbfFq2rO6TjThXY="; mypy-boto3-chime = buildMypyBoto3Package "chime" "1.34.0" "sha256-/IBkHJf4t1K/Ubdf/hUw5XToNBTCziMfTSdksxMwA2Q="; @@ -159,9 +159,9 @@ rec { mypy-boto3-cloudwatch = buildMypyBoto3Package "cloudwatch" "1.34.40" "sha256-M/C3Rzie5dcv6TGVl7ilI5WiT1uYFrCGL+7Fga+xSLw="; - mypy-boto3-codeartifact = buildMypyBoto3Package "codeartifact" "1.34.0" "sha256-iUgoanqMSyxRopVctyFLiu+otFSgRvdgQPw4mKX3QIk="; + mypy-boto3-codeartifact = buildMypyBoto3Package "codeartifact" "1.34.68" "sha256-Ey0cmx0OxN1/VXIyvn0EOBP9qYIuc/XyFVZniHLaNEY="; - mypy-boto3-codebuild = buildMypyBoto3Package "codebuild" "1.34.67" "sha256-Kvd8zAHfepA4dulpiQCaT2pfKCH567d6CYd5QlweXIY="; + mypy-boto3-codebuild = buildMypyBoto3Package "codebuild" "1.34.70" "sha256-lv69lhMKJHRnooVrmGinfDEi7eVEe7O12GNNo5uZQQc="; mypy-boto3-codecatalyst = buildMypyBoto3Package "codecatalyst" "1.34.0" "sha256-TsXVy8bx6kaj84PJiNNU+075Tx3WW0mrtZFOyLx9yT4="; @@ -251,7 +251,7 @@ rec { mypy-boto3-ebs = buildMypyBoto3Package "ebs" "1.34.0" "sha256-xIrrXOayZed+Jcn4CFXXNgKz/G+RdiuwA04wq+Ry/fs="; - mypy-boto3-ec2 = buildMypyBoto3Package "ec2" "1.34.66" "sha256-Io0ExXqdar+5A4H66ryaApWIQnEcspQysfBsOit4WyY="; + mypy-boto3-ec2 = buildMypyBoto3Package "ec2" "1.34.71" "sha256-hjEJNB8/m1yE9f0yxoKZeVySRfCun1NGmL8UeqP8AXs="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.34.63" "sha256-kExmGXEJ5jrvOewmWx7AjVb3boD5GU0cEUp/2PQhzlw="; @@ -259,7 +259,7 @@ rec { mypy-boto3-ecr-public = buildMypyBoto3Package "ecr-public" "1.34.0" "sha256-38ZiRVPr9L+KUF6oL23xsIiKMW0pT/nIngFkhSS3z2Y="; - mypy-boto3-ecs = buildMypyBoto3Package "ecs" "1.34.39" "sha256-s3YTAoZSgDHenHa54DwSNRRAnfCNMcdmZP1FX0hTygE="; + mypy-boto3-ecs = buildMypyBoto3Package "ecs" "1.34.71" "sha256-Ka2nMhArorYcIx+MoLN7bIbKl4ptNER6uC9FdLWZBfI="; mypy-boto3-efs = buildMypyBoto3Package "efs" "1.34.0" "sha256-VAK7mfnPBPDC8Azm6Bxl86E8CkeArTmfgqYkIcSblYA="; @@ -267,7 +267,7 @@ rec { mypy-boto3-elastic-inference = buildMypyBoto3Package "elastic-inference" "1.34.0" "sha256-gbWKw0zDQf3qBlp1KeO7MX1j/GqRUpFAxLG0BKFrHBk="; - mypy-boto3-elasticache = buildMypyBoto3Package "elasticache" "1.34.60" "sha256-D3WLH1FS8dddD6WKUmQApvtehGMmjWYzdaMwTHzvzYk="; + mypy-boto3-elasticache = buildMypyBoto3Package "elasticache" "1.34.72" "sha256-yZd2KB7wIw23PybblyIlCo/5IEFYxAUfbLD2J91eOzw="; mypy-boto3-elasticbeanstalk = buildMypyBoto3Package "elasticbeanstalk" "1.34.0" "sha256-ftVFUwY81mg/9zJ4xxVjhXF1HgKpzj1koIS32cMKRLw="; @@ -279,7 +279,7 @@ rec { mypy-boto3-emr = buildMypyBoto3Package "emr" "1.34.44" "sha256-zM1VpAaBSxqdZiSrNiaAKfvliNRXMLEmvFvXcFmkZO0="; - mypy-boto3-emr-containers = buildMypyBoto3Package "emr-containers" "1.34.0" "sha256-tGHWoMVrfH35hLgzDGMSJs5kRTWQqjM/e0IAPe4EfiU="; + mypy-boto3-emr-containers = buildMypyBoto3Package "emr-containers" "1.34.70" "sha256-uZADsQWfrkoVrQZosfqogcKERWsykIqdk+tJpgmcai4="; mypy-boto3-emr-serverless = buildMypyBoto3Package "emr-serverless" "1.34.0" "sha256-YgccYi2+XhKiPGCMimrCooYPRV+iRuA1h120UdqJKUc="; @@ -291,11 +291,11 @@ rec { mypy-boto3-evidently = buildMypyBoto3Package "evidently" "1.34.0" "sha256-MkBB5iTYJYg2cWFYHR3Qu7TcsDglLPEw0MnoHqij6+A="; - mypy-boto3-finspace = buildMypyBoto3Package "finspace" "1.34.66" "sha256-G5FMKm9HymvRPtkjvYZt6NVhPUVuBwCR4kQq8/naUFs="; + mypy-boto3-finspace = buildMypyBoto3Package "finspace" "1.34.71" "sha256-bgPwDXqu73DjQCADmjTig6kLNOWvQ39flwhyYAbTai4="; mypy-boto3-finspace-data = buildMypyBoto3Package "finspace-data" "1.34.0" "sha256-8mND5BbdKY5srFwdpxSyfCUTIP4fa9hztP4daUJOB8k="; - mypy-boto3-firehose = buildMypyBoto3Package "firehose" "1.34.46" "sha256-Fgs7wrwKPK79cYduCR/RYQ2FEZvghDuWI1hXKzFLfJo="; + mypy-boto3-firehose = buildMypyBoto3Package "firehose" "1.34.69" "sha256-GCMH/XA9ETSuo39OnlvyhfHDKylsTeLO1R1+7tl2S/E="; mypy-boto3-fis = buildMypyBoto3Package "fis" "1.34.63" "sha256-TJnzgQGDcybpVqg+p7Tuvw/RoY79cQPPChyHWlMxhiY="; @@ -315,7 +315,7 @@ rec { mypy-boto3-glacier = buildMypyBoto3Package "glacier" "1.34.0" "sha256-j8LUD8EjjRL1av7UEXBqNPEARaSFgstaioGJtbel4oM="; - mypy-boto3-globalaccelerator = buildMypyBoto3Package "globalaccelerator" "1.34.0" "sha256-hvQeuu1TuLO9aB1+lWTGPgpGqoZlC8d3Ru5S4OVLgys="; + mypy-boto3-globalaccelerator = buildMypyBoto3Package "globalaccelerator" "1.34.70" "sha256-7Su+rgV6KD9I4j630Qybufwn39rp/8tYQ2ldEe2Untc="; mypy-boto3-glue = buildMypyBoto3Package "glue" "1.34.35" "sha256-+Kvk8uB9KZp7mw3sMAM6mHdBTnkO5J8nSVClttndMDY="; @@ -393,7 +393,7 @@ rec { mypy-boto3-kafkaconnect = buildMypyBoto3Package "kafkaconnect" "1.34.50" "sha256-frPPAQeFyO92uMqqzBcSC3MVK4V4hbdO9tx4awAKAUU="; - mypy-boto3-kendra = buildMypyBoto3Package "kendra" "1.34.0" "sha256-j1fph9WwqBns2BpZjoKTpXC9gUJ4lu+poPBV6LIOusM="; + mypy-boto3-kendra = buildMypyBoto3Package "kendra" "1.34.69" "sha256-OKUSsCfv2X9ad5XUSwm0KRwW++qb+AVtvCOurlRM/bo="; mypy-boto3-kendra-ranking = buildMypyBoto3Package "kendra-ranking" "1.34.0" "sha256-hbemz5ECtfP3oi645lZT7CCx31yg8MNqbAD32Am6l1U="; @@ -469,7 +469,7 @@ rec { mypy-boto3-mediaconvert = buildMypyBoto3Package "mediaconvert" "1.34.33" "sha256-7OwfjcWDE1AHvpyOu3fE5YBwjQscpa+VnE7eylk1unA="; - mypy-boto3-medialive = buildMypyBoto3Package "medialive" "1.34.47" "sha256-kE93r3oDtz+uwUDeWBJA2yQBx4HFAL49FdpIexVMbrc="; + mypy-boto3-medialive = buildMypyBoto3Package "medialive" "1.34.70" "sha256-WMBmgEckAoWpwe/YMJsVRZnbkT8dbr8F1S3AW1PRF+4="; mypy-boto3-mediapackage = buildMypyBoto3Package "mediapackage" "1.34.0" "sha256-4DJ2zVk0satmVn+TZdDExx/+ClJpc1bdmbvl72Joe5U="; @@ -565,7 +565,7 @@ rec { mypy-boto3-polly = buildMypyBoto3Package "polly" "1.34.43" "sha256-rx5sW32N6H47fpy5yGvwlKKVKS/uIKOtLfsjoGoNPJg="; - mypy-boto3-pricing = buildMypyBoto3Package "pricing" "1.34.39" "sha256-SdIK9pWjyY6rcK9Kak5r66hP6tc/OVp+gQ9wo7HKVms="; + mypy-boto3-pricing = buildMypyBoto3Package "pricing" "1.34.69" "sha256-0+bak3+4FQK0vAjI1r7uKvhwspZxt/zLCJRVMvH41qs="; mypy-boto3-privatenetworks = buildMypyBoto3Package "privatenetworks" "1.34.0" "sha256-WFX0KaJRo0LCPKEAq8LES0P3WJkt6ywLXqTlOFZyZ1w="; @@ -603,7 +603,7 @@ rec { mypy-boto3-robomaker = buildMypyBoto3Package "robomaker" "1.34.0" "sha256-dAL2P2bxhSc5oLZXhhekrt9y4bWXg7kIr+/FVbkFTww="; - mypy-boto3-rolesanywhere = buildMypyBoto3Package "rolesanywhere" "1.34.0" "sha256-U/j/u6pqoHpfNP3GbQ8SZb+qIL842ZcwwdBr1QQhlj0="; + mypy-boto3-rolesanywhere = buildMypyBoto3Package "rolesanywhere" "1.34.69" "sha256-wuPEIXHDNvPOWIKLRx5ZR/SgQaWEYqA+IHNR3NZDhIs="; mypy-boto3-route53 = buildMypyBoto3Package "route53" "1.34.31" "sha256-MtmEtt57vhFRG1O+VnFXFUhSWAQ7JrnV3hBZx4TpOh8="; @@ -625,7 +625,7 @@ rec { mypy-boto3-s3outposts = buildMypyBoto3Package "s3outposts" "1.34.0" "sha256-xLuGP9Fe0S7zRimt1AKd9KOrytmNd/GTRg5OVi5Xpos="; - mypy-boto3-sagemaker = buildMypyBoto3Package "sagemaker" "1.34.64" "sha256-Sf1T1aqRMIEZmuA2KH5tzuhTDN8yfFID/+h0DCWxws0="; + mypy-boto3-sagemaker = buildMypyBoto3Package "sagemaker" "1.34.70" "sha256-WON2j0ZQ9x3qq1mOOzMvT8jJSuJipDHDp4IxsB88GCg="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.34.0" "sha256-jMZ3aWKQPhNec4A/02S1waQi6Mx9JVdENc3kblhsKjA="; @@ -647,9 +647,9 @@ rec { mypy-boto3-sdb = buildMypyBoto3Package "sdb" "1.34.0" "sha256-13BuAQD8uDwwDhCw+8O3V882H6/oor5Z8mBmjb7HHAU="; - mypy-boto3-secretsmanager = buildMypyBoto3Package "secretsmanager" "1.34.63" "sha256-oZM3PXGPdH1Th4tcx/7y6bj944kuR4isaQ/SsWo1Vkw="; + mypy-boto3-secretsmanager = buildMypyBoto3Package "secretsmanager" "1.34.72" "sha256-0HM8W1Potee9oA9LQu2ErxLjaiDISJF+ScFzoEIu8Dw="; - mypy-boto3-securityhub = buildMypyBoto3Package "securityhub" "1.34.20" "sha256-EcLY5SXSN2kJEuo8s2sYJJfq/X78BM1msyI9TfYD7Xw="; + mypy-boto3-securityhub = buildMypyBoto3Package "securityhub" "1.34.69" "sha256-2fJx1VaOhYSjTXAEboBhHhMdTH697zcGHmrJsGknDTI="; mypy-boto3-securitylake = buildMypyBoto3Package "securitylake" "1.34.53" "sha256-O/RHRoeUYT5DerEXIQ1NL288bcgA6bGdI29sN7WoQac="; diff --git a/nixpkgs/pkgs/development/python-modules/mypy-boto3/update.sh b/nixpkgs/pkgs/development/python-modules/mypy-boto3/update.sh index f45789baecb2..f45789baecb2 100644..100755 --- a/nixpkgs/pkgs/development/python-modules/mypy-boto3/update.sh +++ b/nixpkgs/pkgs/development/python-modules/mypy-boto3/update.sh diff --git a/nixpkgs/pkgs/development/python-modules/naked/default.nix b/nixpkgs/pkgs/development/python-modules/naked/default.nix new file mode 100644 index 000000000000..7a37d66861aa --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/naked/default.nix @@ -0,0 +1,103 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, requests +, pyyaml +, setuptools +, wheel +, nodejs +, ruby +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "naked"; + version = "0.1.32"; + pyproject = true; + + src = fetchFromGitHub { + owner = "chrissimpkins"; + repo = "naked"; + rev = "v${version}"; + hash = "sha256-KhygnURFggvUTR9wwWtORtfQES8ANd5sIaCONvIhfRM="; + }; + + postPatch = '' + # fix hardcoded absolute paths + substituteInPlace **/*.* \ + --replace /Users/ces/Desktop/code/naked /build/source + ''; + + nativeBuildInputs = [ wheel setuptools ]; + + propagatedBuildInputs = [ + requests + pyyaml + ]; + + nativeCheckInputs = [ pytestCheckHook nodejs ruby ]; + + preCheck ='' + cd tests + + PATH=$PATH:$out/bin + ''; + + disabledTestPaths = [ "testfiles" ]; + + disabledTests = [ + # test_NETWORK.py + "test_http_get" + "test_http_get_binary_file_absent" + "test_http_get_binary_file_exists" + "test_http_get_bin_type" + "test_http_get_follow_redirects" + "test_http_get_follow_redirects_false_content" + "test_http_get_follow_redirects_false_on_nofollow_arg" + "test_http_get_response_check_200" + "test_http_get_response_check_301" + "test_http_get_response_check_404" + "test_http_get_response_obj_present" + "test_http_get_ssl" + "test_http_get_status_check_true" + "test_http_get_status_ssl" + "test_http_get_status_ssl_redirect" + "test_http_get_text_absent" + "test_http_get_text_exists_request_overwrite" + "test_http_get_type" + "test_http_post" + "test_http_post_binary_file_absent" + "test_http_post_binary_file_present" + "test_http_post_binary_file_present_request_overwrite" + "test_http_post_reponse_status_200" + "test_http_post_response_status_200_ssl" + "test_http_post_ssl" + "test_http_post_status_check_true" + "test_http_post_text_file_absent" + "test_http_post_text_file_present_request_overwrite" + "test_http_post_type" + # test_SHELL.py + "test_muterun_missing_option_exitcode" + # test_SYSTEM.py + "test_sys_list_all_files" + "test_sys_list_all_files_cwd" + "test_sys_list_all_files_emptydir" + "test_sys_list_filter_files" + "test_sys_match_files" + "test_sys_match_files_fullpath" + "test_sys_meta_file_mod" + # test_TYPES.py + "test_xdict_key_random" + "test_xdict_key_random_sample" + ]; + + pythonImportsCheck = [ "Naked" ]; + + meta = with lib; { + description = "A Python command line application framework"; + homepage = "https://github.com/chrissimpkins/naked"; + downloadPage = "https://github.com/chrissimpkins/naked/tags"; + license = licenses.mit; + maintainers = [ maintainers.lucasew ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/nampa/default.nix b/nixpkgs/pkgs/development/python-modules/nampa/default.nix index d5d411728315..abeedb716ad5 100644 --- a/nixpkgs/pkgs/development/python-modules/nampa/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nampa/default.nix @@ -2,41 +2,49 @@ , buildPythonPackage , fetchFromGitHub , future -, pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "nampa"; version = "1.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "thebabush"; - repo = pname; - rev = version; - sha256 = "14b6xjm497wrfw4kv24zhsvz2l6zknvx36w8i754hfwz3s3fsl6a"; + repo = "nampa"; + rev = "refs/tags/${version}"; + hash = "sha256-ylDthh6fO0jKiYib0bed31Dxt4afiD0Jd5mfRKrsZpE="; }; - propagatedBuildInputs = [ - future - ]; - - nativeCheckInputs = [ - pytestCheckHook - ]; - postPatch = '' # https://github.com/thebabush/nampa/pull/13 substituteInPlace setup.py \ --replace "0.1.1" "${version}" ''; - pythonImportsCheck = [ "nampa" ]; + build-system = [ + setuptools + ]; + + dependencies = [ + future + ]; + + # Not used for binaryninja as plugin + doCheck = false; + + pythonImportsCheck = [ + "nampa" + ]; meta = with lib; { description = "Python implementation of the FLIRT technology"; - mainProgram = "dumpsig.py"; homepage = "https://github.com/thebabush/nampa"; + changelog = "https://github.com/thebabush/nampa/releases/tag/${version}"; license = licenses.lgpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/nbclient/default.nix b/nixpkgs/pkgs/development/python-modules/nbclient/default.nix index d25509f0184e..7935d99a527e 100644 --- a/nixpkgs/pkgs/development/python-modules/nbclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbclient/default.nix @@ -19,7 +19,7 @@ let nbclient = buildPythonPackage rec { pname = "nbclient"; - version = "0.9.0"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ let nbclient = buildPythonPackage rec { owner = "jupyter"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-m0Tke/JlTeKE3PJZ1rBejra/HPEXCSS0ur/cPiSBJZw="; + hash = "sha256-8OLkpwX4Gpam9VSFUtNS41Ypxe4+2yN3ng6iVY9DSqY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/nbdime/749.patch b/nixpkgs/pkgs/development/python-modules/nbdime/749.patch new file mode 100644 index 000000000000..b88aec0f67e3 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/nbdime/749.patch @@ -0,0 +1,10 @@ +--- a/nbdime/webapp/nbdimeserver.py ++++ b/nbdime/webapp/nbdimeserver.py +@@ -388,6 +388,7 @@ + 'jinja2_env': env, + 'local_hostnames': ['localhost', '127.0.0.1'], + 'cookie_secret': base64.encodebytes(os.urandom(32)), # Needed even for an unsecured server. ++ 'allow_unauthenticated_access': True, + } + + try: diff --git a/nixpkgs/pkgs/development/python-modules/nbdime/default.nix b/nixpkgs/pkgs/development/python-modules/nbdime/default.nix index 3f58201e2c92..855192fa5ec5 100644 --- a/nixpkgs/pkgs/development/python-modules/nbdime/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbdime/default.nix @@ -31,6 +31,12 @@ buildPythonPackage rec { hash = "sha256-8adgwLAMG6m0lFwWzpJXfzk/tR0YTzUbdoW6boUCCY4="; }; + patches = [ + # this fixes the webserver (nbdiff-web) when jupyter-server >=2.13 is used + # see https://github.com/jupyter/nbdime/issues/749 + ./749.patch + ]; + nativeBuildInputs = [ hatch-jupyter-builder hatchling diff --git a/nixpkgs/pkgs/development/python-modules/nbformat/default.nix b/nixpkgs/pkgs/development/python-modules/nbformat/default.nix index f1ef3cd81521..8207fd2eaef8 100644 --- a/nixpkgs/pkgs/development/python-modules/nbformat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbformat/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "nbformat"; - version = "5.9.2"; + version = "5.10.3"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-X5i1uhmX3/F1534MF9XBCpbq7Sy9HeNTPR/DXV4REZI="; + hash = "sha256-YO1ekQ73xiZLh9ZE8naxtJ4kARkw3u9UYFGI3eshFoU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/nebula3-python/default.nix b/nixpkgs/pkgs/development/python-modules/nebula3-python/default.nix new file mode 100644 index 000000000000..c352f732ef20 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/nebula3-python/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pdm-backend +, future +, httplib2 +, pythonOlder +, pytz +, pytestCheckHook +, six +}: + +buildPythonPackage rec { + pname = "nebula3-python"; + version = "3.5.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "vesoft-inc"; + repo = "nebula-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-T9lZVYov6tQ8QRM2QtOGyolHk3O5FSb3xq70nS2Rr6c="; + }; + + build-system = [ + pdm-backend + ]; + + dependencies = [ + future + httplib2 + pytz + six + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "nebula3" + ]; + + disabledTestPaths = [ + # Tests require a running thrift instance + "tests/test_connection.py" + "tests/test_data_from_server.py" + "tests/test_graph_storage_client.py" + "tests/test_meta_cache.py" + "tests/test_parameter.py" + "tests/test_pool.py" + "tests/test_session.py" + "tests/test_session_pool.py" + "tests/test_ssl_connection.py" + "tests/test_ssl_pool.py" + ]; + + meta = with lib; { + description = "Client API of Nebula Graph in Python"; + homepage = "https://github.com/vesoft-inc/nebula-python"; + changelog = "https://github.com/vesoft-inc/nebula-python/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix b/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix index f181a7d4c4fe..39994519db17 100644 --- a/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix +++ b/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix @@ -18,14 +18,15 @@ }: buildPythonPackage rec { - pname = "netCDF4"; + pname = "netcdf4"; version = "1.6.2"; format = "pyproject"; disabled = isPyPy; src = fetchPypi { - inherit pname version; + pname = "netCDF4"; + inherit version; hash = "sha256-A4KwL/aiiEGfb/7IXexA9FH0G4dVVHFUxXXd2fD0rlM="; }; diff --git a/nixpkgs/pkgs/development/python-modules/niaclass/default.nix b/nixpkgs/pkgs/development/python-modules/niaclass/default.nix index eca766c67a0f..796bb17063f9 100644 --- a/nixpkgs/pkgs/development/python-modules/niaclass/default.nix +++ b/nixpkgs/pkgs/development/python-modules/niaclass/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "niaclass"; - version = "0.1.4"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "lukapecnik"; repo = "NiaClass"; rev = "refs/tags/${version}"; - hash = "sha256-md1e/cOIOQKoB760E5hjzjCsC5tS1CzgqAPTeVtrmuo="; + hash = "sha256-C3EF18lzheE+dXHJA6WJNFECAH4HfPiCDo7QxtHvOLI="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/notebook/default.nix b/nixpkgs/pkgs/development/python-modules/notebook/default.nix index 2ef7bcec3440..21346a999637 100644 --- a/nixpkgs/pkgs/development/python-modules/notebook/default.nix +++ b/nixpkgs/pkgs/development/python-modules/notebook/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "notebook"; - version = "7.1.1"; + version = "7.1.2"; disabled = pythonOlder "3.8"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-gY50IPoh9ALnJq+58C3388EPKUwC44PtGYUoZsMWEIs="; + hash = "sha256-78LIAEOQng+qF/zp6bN8BZwDrw7Jmk1NuEyyHZ0uk2o="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix b/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix index dc4ba155bedb..04b2c8c17f1a 100644 --- a/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "ntc-templates"; - version = "4.3.0"; + version = "4.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zTJNatg5s5Y9uJ/42uhBltvP69qDsdTRIOCt5OuLwQc="; + hash = "sha256-8Lzh6ku2TUQFatqbOb5JIc/WkRPegx/gNnT53DErMuk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix b/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix index 45914454052e..1e5bd396cd8b 100644 --- a/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix @@ -36,12 +36,10 @@ buildPythonPackage rec { dependencies = [ jupyterhub + pyjwt ]; passthru.optional-dependencies = { - azuread = [ - pyjwt - ]; googlegroups = [ google-api-python-client google-auth-oauthlib diff --git a/nixpkgs/pkgs/development/python-modules/oci/default.nix b/nixpkgs/pkgs/development/python-modules/oci/default.nix index c57a77771098..b4ad1c942d45 100644 --- a/nixpkgs/pkgs/development/python-modules/oci/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oci/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.124.2"; + version = "2.125.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-IYINga1qCCmdu1j6ix2GcZtx6twPwfHCxU8fPOqF4eE="; + hash = "sha256-H4LGMl2SuXAGD2cdaDQYkWkYqhjp+EDFOnrku6cG6jk="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/ollama/default.nix b/nixpkgs/pkgs/development/python-modules/ollama/default.nix index 5e46474e1129..8bc0639b016d 100644 --- a/nixpkgs/pkgs/development/python-modules/ollama/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ollama/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "ollama"; - version = "0.1.7"; + version = "0.1.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ollama"; repo = "ollama-python"; rev = "refs/tags/v${version}"; - hash = "sha256-xNH9kAjSdVXrCI7zkyR7tYxJ/NG8/08ykkDZQJI8Za4="; + hash = "sha256-hMNoWalUL+5FzmV5ICj7Zl6cTWzE6xGWfTf5++c36+E="; }; postPatch = '' @@ -34,12 +34,12 @@ buildPythonPackage rec { "httpx" ]; - nativeBuildInputs = [ + build-system = [ poetry-core pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ httpx ]; diff --git a/nixpkgs/pkgs/development/python-modules/openvino/default.nix b/nixpkgs/pkgs/development/python-modules/openvino/default.nix index 20f47eb666ef..660e6c41c014 100644 --- a/nixpkgs/pkgs/development/python-modules/openvino/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openvino/default.nix @@ -26,7 +26,6 @@ buildPythonPackage { ''; pythonImportsCheck = [ - "ngraph" "openvino" "openvino.runtime" ]; diff --git a/nixpkgs/pkgs/development/python-modules/optimum/default.nix b/nixpkgs/pkgs/development/python-modules/optimum/default.nix index d30873b91537..2b8a9415fc2c 100644 --- a/nixpkgs/pkgs/development/python-modules/optimum/default.nix +++ b/nixpkgs/pkgs/development/python-modules/optimum/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.17.1"; + version = "1.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-21y7pFRCZqwNaZR+TcXH2KIK5IZuLVq0wgIQqByyEf8="; + hash = "sha256-svNavPO/3ARqcBDpvaAdbbSqFpzgUY72vy2J1d4Bt90="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/oracledb/default.nix b/nixpkgs/pkgs/development/python-modules/oracledb/default.nix index 2fe7db175ff8..da45e616b42c 100644 --- a/nixpkgs/pkgs/development/python-modules/oracledb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oracledb/default.nix @@ -10,23 +10,23 @@ buildPythonPackage rec { pname = "oracledb"; - version = "2.1.0"; + version = "2.1.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HJpEjJhD2zPxC3d9aSD7k5XqsLD9wX8WIPrHw+7NtXo="; + hash = "sha256-4ugXz6bf82xxMXNvNOKq7HXXJv040ZENgxgGGieCKPo="; }; - nativeBuildInputs = [ + build-system = [ cython_3 setuptools wheel ]; - propagatedBuildInputs = [ + dependencies = [ cryptography ]; diff --git a/nixpkgs/pkgs/development/python-modules/papis/default.nix b/nixpkgs/pkgs/development/python-modules/papis/default.nix index 8617c4ac7365..91f9bf73a8b2 100644 --- a/nixpkgs/pkgs/development/python-modules/papis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/papis/default.nix @@ -99,6 +99,7 @@ buildPythonPackage rec { "test_downloader_getter" "test_general" "test_get_config_dirs" + "test_get_configuration" "test_get_data" "test_valid_dblp_key" "test_validate_arxivid" diff --git a/nixpkgs/pkgs/development/python-modules/pathtools/default.nix b/nixpkgs/pkgs/development/python-modules/pathtools/default.nix index 754669eb42fe..453dc9df36ef 100644 --- a/nixpkgs/pkgs/development/python-modules/pathtools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pathtools/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonAtLeast }: buildPythonPackage rec { @@ -8,6 +9,9 @@ buildPythonPackage rec { version = "0.1.2"; format = "setuptools"; + # imp and distuils usage, last commit in 2016 + disabled = pythonAtLeast "3.12"; + src = fetchPypi { inherit pname version; sha256 = "1h7iam33vwxk8bvslfj4qlsdprdnwf8bvzhqh3jq5frr391cadbw"; diff --git a/nixpkgs/pkgs/development/python-modules/pcbnew-transition/default.nix b/nixpkgs/pkgs/development/python-modules/pcbnewtransition/default.nix index bf9c6ae6430f..956be1966b66 100644 --- a/nixpkgs/pkgs/development/python-modules/pcbnew-transition/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pcbnewtransition/default.nix @@ -6,14 +6,15 @@ , versioneer }: buildPythonPackage rec { - pname = "pcbnewTransition"; + pname = "pcbnewtransition"; version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "pcbnewTransition"; + inherit version; hash = "sha256-+mRExuDuEYxSSlrkEjSyPK+RRJZo+YJH7WnUVfjblRQ="; }; diff --git a/nixpkgs/pkgs/development/python-modules/peft/default.nix b/nixpkgs/pkgs/development/python-modules/peft/default.nix index d1936afe375f..3b65f6c68e92 100644 --- a/nixpkgs/pkgs/development/python-modules/peft/default.nix +++ b/nixpkgs/pkgs/development/python-modules/peft/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "peft"; - version = "0.9.0"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RdWCIR28OqmpA92/5OWA5sCCPQCAWpUzCZpkHvNMj6M="; + hash = "sha256-Aln5WyDgNnxOUwyhOz9NGsnV1zXt/Rs57ULxR5ZJXNM="; }; nativeBuildInputs = [ setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/pinecone-client/default.nix b/nixpkgs/pkgs/development/python-modules/pinecone-client/default.nix index 86edb6e597cb..c846603e8ca5 100644 --- a/nixpkgs/pkgs/development/python-modules/pinecone-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pinecone-client/default.nix @@ -16,13 +16,13 @@ }: buildPythonPackage rec { pname = "pinecone-client"; - version = "3.1.0"; + version = "3.2.1"; pyproject = true; src = fetchPypi { pname = "pinecone_client"; inherit version; - hash = "sha256-RbggYBP5GpgrmU8fuqOefoyZ0w7zd4qfMZxDuMmS/EI="; + hash = "sha256-hWD/r7E7nEWpLrnrd6LbMtWh+nkDodsX969Y7hBYu2A="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix b/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix index d4d289e07888..a7b132c23088 100644 --- a/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix @@ -14,8 +14,8 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.16.1"; - format = "pyproject"; + version = "2.16.2"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -23,15 +23,15 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-aOAFM8b0kOZT5/afZigZjJDvS2CyqghY6GATzeyySB4="; + hash = "sha256-g0O0ndHd2ehBUmHwb0HoWgCGSsqbjmlPFOd6KrkUv2Y="; }; - nativeBuildInputs = [ + build-system = [ hatchling hatch-vcs ]; - propagatedBuildInputs = [ + dependencies = [ pip ]; diff --git a/nixpkgs/pkgs/development/python-modules/pipx/default.nix b/nixpkgs/pkgs/development/python-modules/pipx/default.nix index 8d11aa835422..7a60c22fcf25 100644 --- a/nixpkgs/pkgs/development/python-modules/pipx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pipx/default.nix @@ -4,12 +4,11 @@ , fetchFromGitHub , hatchling , hatch-vcs -, importlib-metadata , packaging -, pip , platformdirs , pytestCheckHook , pythonOlder +, tomli , userpath , git }: @@ -17,29 +16,29 @@ buildPythonPackage rec { pname = "pipx"; version = "1.4.3"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = "pipxproject"; - repo = pname; + owner = "pypa"; + repo = "pipx"; rev = "refs/tags/${version}"; hash = "sha256-NxXOeVXwBhGqi4DUABV8UV+cDER0ROBFdgiyYTzdvuo="; }; - nativeBuildInputs = [ + build-system = [ hatchling hatch-vcs ]; - propagatedBuildInputs = [ + dependencies = [ argcomplete packaging platformdirs userpath - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; nativeCheckInputs = [ @@ -77,12 +76,13 @@ buildPythonPackage rec { "determination" "json" "test_list_short" + "test_skip_maintenance" ]; meta = with lib; { description = "Install and run Python applications in isolated environments"; mainProgram = "pipx"; - homepage = "https://github.com/pipxproject/pipx"; + homepage = "https://github.com/pypa/pipx"; changelog = "https://github.com/pypa/pipx/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ yshym ]; diff --git a/nixpkgs/pkgs/development/python-modules/plantuml-markdown/default.nix b/nixpkgs/pkgs/development/python-modules/plantuml-markdown/default.nix index 600131e2f5ec..50e6bb2cf941 100644 --- a/nixpkgs/pkgs/development/python-modules/plantuml-markdown/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plantuml-markdown/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "plantuml-markdown"; - version = "3.9.3"; + version = "3.9.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mikitex70"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2nZV/bYRN1SKI6OmpOhK7KUuBwmwhTt/ErTYqVQ9Dps="; + hash = "sha256-DSR4/PEs1uzGHgtw5p3HMlquOIYHPWbTHrw6QGx7t4o="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/playwrightcapture/default.nix b/nixpkgs/pkgs/development/python-modules/playwrightcapture/default.nix index 40fb7397c70a..cf424e9af822 100644 --- a/nixpkgs/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/nixpkgs/pkgs/development/python-modules/playwrightcapture/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.23.13"; + version = "1.23.14"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-jNTVdGrUQaYHgTxz6zYTdxNQoXEfy/zshherC/gGmng="; + hash = "sha256-ZOElXI2JSo+/wPw58WjCO7hiOUutfC2TvBFAP2DpT7I="; }; pythonRelaxDeps = [ @@ -39,12 +39,12 @@ buildPythonPackage rec { "tzdata" ]; - nativeBuildInputs = [ + build-system = [ poetry-core pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ beautifulsoup4 dateparser playwright diff --git a/nixpkgs/pkgs/development/python-modules/plotnine/default.nix b/nixpkgs/pkgs/development/python-modules/plotnine/default.nix index cc446f300bf1..bb39cae86c25 100644 --- a/nixpkgs/pkgs/development/python-modules/plotnine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plotnine/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "plotnine"; - version = "0.13.2"; + version = "0.13.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "has2k1"; repo = "plotnine"; rev = "refs/tags/v${version}"; - hash = "sha256-GgkaFiRRVpr0TreAetpaiOjpsyLV2wfGQWvUdHJN2mg="; + hash = "sha256-dbfbXYYmVdufTtrrllrqwe87LL1nYRar4RMLef7ajTQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/plugwise/default.nix b/nixpkgs/pkgs/development/python-modules/plugwise/default.nix index 7d8b5f666515..0e53ee17e04a 100644 --- a/nixpkgs/pkgs/development/python-modules/plugwise/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plugwise/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.37.1"; + version = "0.37.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -30,21 +30,22 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-6o0g3il4GV6E8avp9V2YrkaVPf2z37asdJOxf6Phbmc="; + hash = "sha256-zPh4yko35aMhiTTIDbaBgVruRDyolhtvTzTIhF5fo+Y="; }; postPatch = '' - substituteInPlace pyproject.toml \ - --replace "setuptools~=68.0" "setuptools" \ - --replace "wheel~=0.40.0" "wheel" + # setuptools + sed -i -e "s/~=[0-9.]*//" pyproject.toml + # wheel + sed -i -e "s/~=[0-9.]*//" pyproject.toml ''; - nativeBuildInputs = [ + build-system = [ setuptools wheel ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp async-timeout crcmod diff --git a/nixpkgs/pkgs/development/python-modules/preshed/default.nix b/nixpkgs/pkgs/development/python-modules/preshed/default.nix index 557045649425..2314555fcb58 100644 --- a/nixpkgs/pkgs/development/python-modules/preshed/default.nix +++ b/nixpkgs/pkgs/development/python-modules/preshed/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "preshed"; - version = "4.0.0"; + version = "3.0.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XisLKgfdGo3uqtZhIBmEXGAu4kkH9pNuqvF6q9VuVEw="; + hash = "sha256-chhjxSRP/NJlGtCSiVGix8d7EC9OEaJRrYXTfudiFmA="; }; nativeBuildInputs = [ @@ -41,6 +41,9 @@ buildPythonPackage rec { "preshed" ]; + # don't update to 4.0.0, version was yanked + passthru.skipBulkUpdate = true; + meta = with lib; { description = "Cython hash tables that assume keys are pre-hashed"; homepage = "https://github.com/explosion/preshed"; diff --git a/nixpkgs/pkgs/development/python-modules/prisma/default.nix b/nixpkgs/pkgs/development/python-modules/prisma/default.nix index ac0b85d0ad54..6f7c79715618 100644 --- a/nixpkgs/pkgs/development/python-modules/prisma/default.nix +++ b/nixpkgs/pkgs/development/python-modules/prisma/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "prisma"; - version = "0.13.0"; + version = "0.13.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "RobertCraigie"; repo = "prisma-client-py"; rev = "refs/tags/v${version}"; - hash = "sha256-j9HJZTt4VTq29Q+nynYmRWKx02GVdyA+iZzxZwspXn8="; + hash = "sha256-7pibexiFsyrwC6rVv0CGHRbQU4G3rOXVhQW/7c/vKJA="; }; build-system = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyahocorasick/default.nix b/nixpkgs/pkgs/development/python-modules/pyahocorasick/default.nix index b490f883d4cb..26bdb55d5d44 100644 --- a/nixpkgs/pkgs/development/python-modules/pyahocorasick/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyahocorasick/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyahocorasick"; - version = "2.0.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "WojciechMula"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Ugl7gHyubXpxe4aots2e9stLuQAZEWsrlDuAHdSC0SA="; + hash = "sha256-SCIgu0uEjiSUiIP0WesJG+y+3ZqFBfI5PdgUzviOVrs="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyathena/default.nix b/nixpkgs/pkgs/development/python-modules/pyathena/default.nix index 369131a06433..f2139b00327e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyathena/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyathena/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyathena"; - version = "3.3.0"; - format = "pyproject"; + version = "3.5.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-3S5iQembhaQ1McxAJyZEgG0z60S5UhEWGv7BtJbkPTc="; + hash = "sha256-9T5qm3Vmg6eZQtdxaLnj4+d5SAglJo2wKo+8y25gQik="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyaudio/default.nix b/nixpkgs/pkgs/development/python-modules/pyaudio/default.nix index 2cab06e7c786..d9d4aa7b70e7 100644 --- a/nixpkgs/pkgs/development/python-modules/pyaudio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyaudio/default.nix @@ -6,12 +6,13 @@ }: buildPythonPackage rec { - pname = "PyAudio"; + pname = "pyaudio"; version = "0.2.14"; disabled = isPyPy; src = fetchPypi { - inherit pname version; + pname = "PyAudio"; + inherit version; hash = "sha256-eN//OHm0mU0fT8ZIVkald1XG7jwZZHpJH3kKCJW9L4c="; }; diff --git a/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix b/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix index 23906cbd2e4e..1a4cd7c43058 100644 --- a/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix @@ -2,11 +2,12 @@ , requests, mock }: buildPythonPackage rec { - pname = "PyBrowserID"; + pname = "pybrowserid"; version = "0.14.0"; src = fetchPypi { - inherit pname version; + pname = "PyBrowserID"; + inherit version; sha256 = "1qvi79kfb8x9kxkm5lw2mp42hm82cpps1xknmsb5ghkwx1lpc8kc"; }; @@ -21,4 +22,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ ]; }; } - diff --git a/nixpkgs/pkgs/development/python-modules/pyecoforest/default.nix b/nixpkgs/pkgs/development/python-modules/pyecoforest/default.nix index 2021b4e414b9..a116a3542089 100644 --- a/nixpkgs/pkgs/development/python-modules/pyecoforest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyecoforest/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "--cov=pyecoforest --cov-report=term-missing:skip-covered" "" + --replace-fail "--cov=pyecoforest --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ httpx ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix b/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix index 549d0b8e8263..b3e4863f2472 100644 --- a/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyenphase"; - version = "1.20.0"; + version = "1.20.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; rev = "refs/tags/v${version}"; - hash = "sha256-/TyQ6oSA361at1VSr6dLefOOmbZP4otBgb/JDA2sNWo="; + hash = "sha256-Bxwd8qHsvq9BuBMSu5JI/Yk/KC5aQ7b7lnXuIoNQ6EI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pyformlang/default.nix b/nixpkgs/pkgs/development/python-modules/pyformlang/default.nix index ce3923e0f8a6..f5cc07c29e74 100644 --- a/nixpkgs/pkgs/development/python-modules/pyformlang/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyformlang/default.nix @@ -1,12 +1,13 @@ { lib , buildPythonPackage , fetchPypi -, setuptools -, wheel , networkx , numpy , pydot , pytestCheckHook +, pythonOlder +, setuptools +, wheel }: buildPythonPackage rec { @@ -14,17 +15,19 @@ buildPythonPackage rec { version = "1.0.9"; pyproject = true; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; hash = "sha256-oCwYM4yQ1KYZpC7vVpeHSIDH2Q930JAuTDq9mds9zoc="; }; - nativeBuildInputs = [ + build-system = [ setuptools wheel ]; - propagatedBuildInputs = [ + dependencies = [ networkx numpy pydot @@ -39,7 +42,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A python framework for formal grammars"; + description = "Framework for formal grammars"; homepage = "https://github.com/Aunsiels/pyformlang"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; diff --git a/nixpkgs/pkgs/development/python-modules/pygithub/default.nix b/nixpkgs/pkgs/development/python-modules/pygithub/default.nix index c207ef8b12a1..926f16c46af3 100644 --- a/nixpkgs/pkgs/development/python-modules/pygithub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygithub/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pygithub"; - version = "2.2.0"; + version = "2.3.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "PyGithub"; repo = "PyGithub"; rev = "refs/tags/v${version}"; - hash = "sha256-RNv/6Rs7NapP/XOdBFIWPg+/BmaK1+OY0+bP/i2YKaA="; + hash = "sha256-ccAbn9x1r+wBIAK66ur8+2Op9ij09rQvHumq5Wh7TUU="; }; build-system = [ diff --git a/nixpkgs/pkgs/development/python-modules/pygls/default.nix b/nixpkgs/pkgs/development/python-modules/pygls/default.nix index 9c4d50843e22..e85c985b6c5a 100644 --- a/nixpkgs/pkgs/development/python-modules/pygls/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygls/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pygls"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "openlawlibrary"; repo = "pygls"; rev = "refs/tags/v${version}"; - hash = "sha256-6+SMlBTi+jw+bAUYqbaxXT5QygZFj4FeeEp6bch8M1s="; + hash = "sha256-AvrGoQ0Be1xKZhFn9XXYJpt5w+ITbDbj6NFZpaDPKao="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix b/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix index e2e25aa18dcd..22242ee62bf4 100644 --- a/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix @@ -1,6 +1,7 @@ { lib , aiofiles , aiohttp +, async-timeout , async-generator , buildPythonPackage , fetchFromGitHub @@ -12,31 +13,30 @@ , pythonOlder , setuptools , voluptuous -, wheel }: buildPythonPackage rec { pname = "pyinsteon"; version = "1.5.3"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "pyinsteon"; + repo = "pyinsteon"; rev = "refs/tags/${version}"; hash = "sha256-9d6QbekUv63sjKdK+ZogYOkGfFXVW+JB6ITHnehLwtM="; }; - nativeBuildInputs = [ + build-system = [ setuptools - wheel ]; - propagatedBuildInputs = [ + dependencies = [ aiofiles aiohttp + async-timeout pypubsub pyserial pyserial-asyncio @@ -48,20 +48,9 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals (pythonAtLeast "3.12") [ - # AssertionError: Failed test 'read_eeprom_response' with argument 'group' value X vs expected value Z - "test_async_send" - "test_nak_response" - "test_no_direct_ack" - "test_on_level" - "test_on_level_group" - "test_on_level_nak" - # AssertionError: Failed test 'read_eeprom_response' with argument 'target' value X vs expected value Y - "test_other_status" - "test_status_command" - "test_status_request_hub" - # stuck in epoll - "test_read_all_peek" + disabledTestPaths = lib.optionals (pythonAtLeast "3.12") [ + # Tests are blocking or failing + "tests/test_handlers/" ]; pythonImportsCheck = [ @@ -70,7 +59,6 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to support Insteon home automation projects"; - mainProgram = "insteon_tools"; longDescription = '' This is a Python package to interface with an Insteon Modem. It has been tested to work with most USB or RS-232 serial based devices such as the @@ -80,5 +68,6 @@ buildPythonPackage rec { changelog = "https://github.com/pyinsteon/pyinsteon/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "insteon_tools"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyleri/default.nix b/nixpkgs/pkgs/development/python-modules/pyleri/default.nix index 98c71d06f55a..2ff3abf5978d 100644 --- a/nixpkgs/pkgs/development/python-modules/pyleri/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyleri/default.nix @@ -3,12 +3,13 @@ , fetchFromGitHub , pythonOlder , unittestCheckHook +, setuptools }: buildPythonPackage rec { pname = "pyleri"; - version = "1.4.2"; - format = "setuptools"; + version = "1.4.3"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -16,9 +17,13 @@ buildPythonPackage rec { owner = "cesbit"; repo = "pyleri"; rev = "refs/tags/${version}"; - hash = "sha256-52Q2iTrXFNbDzXL0FM+Gypipvo5ciNqAtZa5sKOwQRc="; + hash = "sha256-4t+6wtYzJbmL0TB/OXr89uZ2s8DeGlUdWwHd4YPsCW0="; }; + build-system = [ + setuptools + ]; + nativeCheckInputs = [ unittestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/pymaven-patch/default.nix b/nixpkgs/pkgs/development/python-modules/pymaven-patch/default.nix index 8218ccddcc61..4d98ded89637 100644 --- a/nixpkgs/pkgs/development/python-modules/pymaven-patch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymaven-patch/default.nix @@ -11,12 +11,12 @@ }: buildPythonPackage rec { pname = "pymaven-patch"; - version = "0.3.0"; + version = "0.3.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "d55b29bd4aeef3510904a12885eb6856b5bd48f3e29925a123461429f9ad85c0"; + sha256 = "sha256-DPfJPonwHwQI62Vu7FjLSiKMleA7PUfLc9MfiZBVzVA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pymeeus/default.nix b/nixpkgs/pkgs/development/python-modules/pymeeus/default.nix index 92451d351a91..821ad49e8206 100644 --- a/nixpkgs/pkgs/development/python-modules/pymeeus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymeeus/default.nix @@ -1,11 +1,12 @@ { lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { - pname = "PyMeeus"; + pname = "pymeeus"; version = "0.5.12"; src = fetchPypi { - inherit pname version; + pname = "PyMeeus"; + inherit version; hash = "sha256-VI9xhr2LlsvAac9kmo6ON33OSax0SGcJhJ/mOpnK1oQ="; }; diff --git a/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix b/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix index bf40f44732d3..f225524e7e18 100644 --- a/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix @@ -30,7 +30,12 @@ let # PyMuPDF needs the C++ bindings generated - mupdf-cxx = mupdf.override { enableOcr = true; enableCxx = true; enablePython = true; python3 = python; }; + mupdf-cxx = mupdf.override { + enableOcr = true; + enableCxx = true; + enablePython = true; + python3 = python; + }; in buildPythonPackage rec { pname = "pymupdf"; version = "1.23.26"; @@ -45,12 +50,12 @@ in buildPythonPackage rec { hash = "sha256-m2zq04+PDnlzFuqeSt27UhdHXTHxpHdMPIg5RQl/5bQ="; }; - # swig is not wrapped as python package + # swig is not wrapped as Python package # libclang calls itself just clang in wheel metadata postPatch = '' substituteInPlace pyproject.toml \ - --replace '"swig",' "" \ - --replace "libclang" "clang" + --replace-fail '"swig",' "" \ + --replace-fail "libclang" "clang" ''; nativeBuildInputs = [ @@ -95,16 +100,79 @@ in buildPythonPackage rec { fonttools ]; + preCheck = '' + export PATH="$PATH:$out/bin"; + ''; + disabledTests = [ # fails for indeterminate reasons - "test_color_count" - "test_2753" "test_2548" + "test_2753" + "test_3020" + "test_3050" + "test_3058" + "test_3177" + "test_3186" + "test_color_count" + "test_pilsave" + "test_fz_write_pixmap_as_jpeg" + # NotImplementedError + "test_1824" + "test_2093" + "test_2093" + "test_2108" + "test_2182" + "test_2182" + "test_2246" + "test_2270" + "test_2270" + "test_2391" + "test_2788" + "test_2861" + "test_2871" + "test_2886" + "test_2904" + "test_2922" + "test_2934" + "test_2957" + "test_2969" + "test_3070" + "test_3131" + "test_3140" + "test_3209" + "test_3209" + "test_caret" + "test_deletion" + "test_file_info" + "test_line" + "test_page_links_generator" + "test_polyline" + "test_redact" + "test_techwriter_append" + "test_text2" + # Issue with FzArchive + "test_htmlbox" + "test_2246" + "test_3140" + "test_fit_springer" + "test_write_stabilized_with_links" + "test_textbox" + "test_delete_image" + # Fonts not available + "test_fontarchive" + "test_subset_fonts" + # Exclude lint tests + "test_flake8" ] ++ lib.optionals stdenv.isDarwin [ # darwin does not support OCR right now "test_tesseract" ]; + disabledTestPaths = [ + # Issue with FzArchive + "tests/test_docs_samples.py" + ]; + pythonImportsCheck = [ "fitz" "fitz_old" diff --git a/nixpkgs/pkgs/development/python-modules/pynamecheap/default.nix b/nixpkgs/pkgs/development/python-modules/pynamecheap/default.nix index 84c13b9d1caa..3c05dd30eb1e 100644 --- a/nixpkgs/pkgs/development/python-modules/pynamecheap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pynamecheap/default.nix @@ -5,7 +5,7 @@ }: buildPythonPackage rec { - pname = "PyNamecheap"; + pname = "pynamecheap"; version = "0.0.3"; propagatedBuildInputs = [ requests ]; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bemmu"; - repo = pname; + repo = "PyNamecheap"; rev = "v${version}"; sha256 = "1g1cd2yc6rpdsc5ax7s93y5nfkf91gcvbgcaqyl9ida6srd9hr97"; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyngrok/default.nix b/nixpkgs/pkgs/development/python-modules/pyngrok/default.nix index 7837e99cf424..0646d6ac8b4b 100644 --- a/nixpkgs/pkgs/development/python-modules/pyngrok/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyngrok/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyngrok"; - version = "7.1.5"; + version = "7.1.6"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-9oS/iBuAWQ3COlnhgeN0e7CFj6VNbkfpPe35tO0BSpo="; + hash = "sha256-BcD8pjQJE2WKvdxiOgpTknrO2T4n/++AHSSBS8sYDqo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pynobo/default.nix b/nixpkgs/pkgs/development/python-modules/pynobo/default.nix index 783415a2c2fb..c4da63a0e333 100644 --- a/nixpkgs/pkgs/development/python-modules/pynobo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pynobo/default.nix @@ -2,22 +2,27 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pynobo"; - version = "1.7.0"; - format = "setuptools"; + version = "1.8.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "echoromeo"; - repo = pname; + repo = "pynobo"; rev = "refs/tags/v${version}"; - hash = "sha256-LJS4NJM+f+j53YzH8LradBDzHAsOprd4F7nH1cfC3B0="; + hash = "sha256-Hfyf7XGleDWTKKWNlItcBFuiS3UEwsYed7v5FPRdC0w="; }; + build-system = [ + setuptools + ]; + # Project has no tests doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/pyogg/default.nix b/nixpkgs/pkgs/development/python-modules/pyogg/default.nix index 3edf3768956f..22a602df273a 100644 --- a/nixpkgs/pkgs/development/python-modules/pyogg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyogg/default.nix @@ -1,11 +1,12 @@ { stdenv, lib, fetchPypi, buildPythonPackage, libvorbis, flac, libogg, libopus, opusfile, substituteAll }: buildPythonPackage rec { - pname = "PyOgg"; + pname = "pyogg"; version = "0.6.9a1"; src = fetchPypi { - inherit pname version; + pname = "PyOgg"; + inherit version; sha256 = "0xabqwyknpvfc53s7il5pq6b07fcaqvz5bi5vbs3pbaw8602qvim"; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix b/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix index bf1efac9de74..0b22058a8463 100644 --- a/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.13.8"; + version = "1.13.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-tvS7aPfBTs75Rq1WGslWDMv1pOTVt7MtwpXPRJtqbuk="; + hash = "sha256-J1nsRB9KYg3yUuxQV79/Udjjkux+BE4YcawpRJcSYHI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix b/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix index 9708ee4c6925..34087d582667 100644 --- a/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix @@ -8,13 +8,14 @@ }: buildPythonPackage rec { - pname = "PyPDF2"; + pname = "pypdf2"; version = "3.0.1"; format = "pyproject"; src = fetchPypi { - inherit pname version; + pname = "PyPDF2"; + inherit version; hash = "sha256-p0QI9pumJx9xuTUu9O0D3FOjGqQE0ptdMfU7/s/uFEA="; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyplatec/default.nix b/nixpkgs/pkgs/development/python-modules/pyplatec/default.nix index 209c0d587eb5..6a4e46f5c1c6 100644 --- a/nixpkgs/pkgs/development/python-modules/pyplatec/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyplatec/default.nix @@ -5,11 +5,12 @@ }: buildPythonPackage rec { - pname = "PyPlatec"; + pname = "pyplatec"; version = "1.4.0"; src = fetchPypi { - inherit pname version; + pname = "PyPlatec"; + inherit version; sha256 = "0kqx33flcrrlipccmqs78d14pj5749bp85b6k5fgaq2c7yzz02jg"; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyprind/default.nix b/nixpkgs/pkgs/development/python-modules/pyprind/default.nix index 4dc25322863d..58a508adf795 100644 --- a/nixpkgs/pkgs/development/python-modules/pyprind/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyprind/default.nix @@ -3,11 +3,12 @@ , pytest }: buildPythonPackage rec { - pname = "PyPrind"; + pname = "pyprind"; version = "2.11.3"; src = fetchPypi { - inherit pname version; + pname = "PyPrind"; + inherit version; sha256 = "e37dcab6e1a9c8e0a7f0fce65fde7a79e2deda1c75aa015910a49e2137b54cbf"; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyreaderwriterlock/default.nix b/nixpkgs/pkgs/development/python-modules/pyreaderwriterlock/default.nix index 378be471aef0..a9771f669871 100644 --- a/nixpkgs/pkgs/development/python-modules/pyreaderwriterlock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyreaderwriterlock/default.nix @@ -11,7 +11,7 @@ }: buildPythonPackage rec { - pname = "pyReaderWriterLock"; + pname = "pyreaderwriterlock"; version = "1.0.9"; format = "setuptools"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "elarivie"; - repo = pname; + repo = "pyReaderWriterLock"; rev = "refs/tags/v${version}"; hash = "sha256-8FC+4aDgGpF1BmOdlkFtMy7OfWdSmvn9fjKXSmmeJlg="; }; diff --git a/nixpkgs/pkgs/development/python-modules/pysc2/default.nix b/nixpkgs/pkgs/development/python-modules/pysc2/default.nix index 10040928ad24..b45c95541609 100644 --- a/nixpkgs/pkgs/development/python-modules/pysc2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysc2/default.nix @@ -17,7 +17,7 @@ }: buildPythonPackage { - pname = "PySC2"; + pname = "pysc2"; version = "1.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/python-modules/pyscf/default.nix b/nixpkgs/pkgs/development/python-modules/pyscf/default.nix index 7b60a47c44c3..a8c0911276b4 100644 --- a/nixpkgs/pkgs/development/python-modules/pyscf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyscf/default.nix @@ -84,6 +84,7 @@ buildPythonPackage rec { "test_n3_cis_ewald" "test_veff" "test_collinear_kgks_gga" + "test_libxc_gga_deriv4" ]; pytestFlagsArray = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyscss/default.nix b/nixpkgs/pkgs/development/python-modules/pyscss/default.nix index 21b0f169cd79..912b4acc14e9 100644 --- a/nixpkgs/pkgs/development/python-modules/pyscss/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyscss/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { - pname = "pyScss"; + pname = "pyscss"; version = "1.4.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/python-modules/pysigma/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma/default.nix index b883c5ea147f..bf7a00dd8fe1 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.11.3"; + version = "0.11.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-G3/ksQXAN981i8iZC8/Ho0r/iHQqqtBPg/VdDTWxC9Y="; + hash = "sha256-tlFrUAwOTK+O/YJjfA6nwsVAcZrMNXFmCYoxHc2ykVY="; }; pythonRelaxDeps = [ @@ -32,12 +32,12 @@ buildPythonPackage rec { "packaging" ]; - nativeBuildInputs = [ + build-system = [ poetry-core pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ jinja2 packaging pyparsing diff --git a/nixpkgs/pkgs/development/python-modules/pyspice/default.nix b/nixpkgs/pkgs/development/python-modules/pyspice/default.nix index 0119c38099cc..94fa032085c9 100644 --- a/nixpkgs/pkgs/development/python-modules/pyspice/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyspice/default.nix @@ -14,12 +14,13 @@ }: buildPythonPackage rec { - pname = "PySpice"; + pname = "pyspice"; version = "1.5"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; + pname = "PySpice"; + inherit version; sha256 = "d28448accad98959e0f5932af8736e90a1f3f9ff965121c6881d24cdfca23d22"; }; diff --git a/nixpkgs/pkgs/development/python-modules/pysychonaut/default.nix b/nixpkgs/pkgs/development/python-modules/pysychonaut/default.nix index ae05070e76d7..0962ee9b9db1 100644 --- a/nixpkgs/pkgs/development/python-modules/pysychonaut/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysychonaut/default.nix @@ -1,11 +1,12 @@ { lib, buildPythonPackage, fetchPypi, requests, requests-cache, beautifulsoup4 }: buildPythonPackage rec { - pname = "PySychonaut"; + pname = "pysychonaut"; version = "0.6.0"; src = fetchPypi { - inherit pname version; + pname = "PySychonaut"; + inherit version; sha256 = "1wgk445gmi0x7xmd8qvnyxy1ka0n72fr6nrhzdm29q6687dqyi7h"; }; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-jupyter/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-jupyter/default.nix index 2246c5826725..c2da6b2e3043 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-jupyter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-jupyter/default.nix @@ -22,14 +22,14 @@ let self = buildPythonPackage rec { pname = "pytest-jupyter"; - version = "0.9.0"; + version = "0.9.1"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pytest-jupyter"; rev = "refs/tags/v${version}"; - hash = "sha256-8pQNtzMylW9b3vk0kp7NcJnXAJKYeoFsHy/lyQFCNzc="; + hash = "sha256-+NtLyTpMpJ+asbiQZNLFs1qLr00UlEOlbxortQ1B4so="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix b/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix index 4a455fa79800..efe048a33d1f 100644 --- a/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix @@ -9,11 +9,12 @@ , pontos , pytestCheckHook , pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "python-gvm"; - version = "24.1.0"; + version = "24.3.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,17 +23,18 @@ buildPythonPackage rec { owner = "greenbone"; repo = "python-gvm"; rev = "refs/tags/v${version}"; - hash = "sha256-1MJajawm/QdioZM+/efnXOAFcuDOk/xJ1acPrxKp700="; + hash = "sha256-GIEsP8+RJMIehsBbZWpIRXCdqxm042lPbYTHY7/fknM="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ defusedxml lxml paramiko + typing-extensions ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix b/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix index 9cf0773b0cb5..5356fd2e4ac0 100644 --- a/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -13,6 +13,7 @@ , orjson , packaging , pillow +, platformdirs , poetry-core , py , pydantic @@ -32,7 +33,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "5.0.2"; + version = "5.1.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -41,22 +42,22 @@ buildPythonPackage rec { owner = "briis"; repo = "pyunifiprotect"; rev = "refs/tags/v${version}"; - hash = "sha256-bZjfpatw4lcOgMCqung/DMfRijxwtuIht6QusIYaCQ0="; + hash = "sha256-7D6/mIU3M4dfIa+lCgcc3APKVPCsZei+4Er+sxIxcHo="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; postPatch = '' substituteInPlace pyproject.toml \ - --replace "--strict-markers -ra -Wd --ignore=.* --no-cov-on-fail --cov=pyunifiprotect --cov-append --maxfail=10 -n=auto" "" + --replace-fail "--strict-markers -ra -Wd --ignore=.* --no-cov-on-fail --cov=pyunifiprotect --cov-append --maxfail=10 -n=auto" "" ''; - nativeBuildInputs = [ + build-system = [ hatch-vcs hatchling ]; - propagatedBuildInputs = [ + dependencies = [ aiofiles aiohttp aioshutil @@ -64,6 +65,7 @@ buildPythonPackage rec { orjson packaging pillow + platformdirs pydantic pyjwt pytz diff --git a/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index 3259d3133d87..9a3f6d00dc6e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -1,11 +1,9 @@ { lib , stdenv -, archinfo , bitstring , buildPythonPackage , cffi , fetchPypi -, future , pycparser , pythonOlder , setuptools @@ -13,31 +11,29 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.93"; + version = "9.2.96"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-44F1EE8TRsmYRnMNQakxIaFdAuZKpHIDsq+M1cK/pQk="; + hash = "sha256-60aOAm7eUlYHTCqIILz4l0oF1jvttDZUs4jSrF5+IJI="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ - archinfo + dependencies = [ bitstring cffi - future pycparser ]; postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace vex/Makefile-gcc \ - --replace '/usr/bin/ar' 'ar' + --replace-fail '/usr/bin/ar' 'ar' ''; setupPyBuildFlags = lib.optionals stdenv.isLinux [ diff --git a/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix b/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix index 60900c8ce178..5a1a6296b48d 100644 --- a/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.6.2"; + version = "3.7.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-rezyw0v1VijMe78ip3U+Jd+NQExW+gQXjs8qkcPNcUk="; + hash = "sha256-BwU9Ti35Dsaa+kT78h3lsjw4sI1RQdhukTPTeJDyBw0="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/redis-om/default.nix b/nixpkgs/pkgs/development/python-modules/redis-om/default.nix index 551a251bc174..1549b891636f 100644 --- a/nixpkgs/pkgs/development/python-modules/redis-om/default.nix +++ b/nixpkgs/pkgs/development/python-modules/redis-om/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "redis-om"; - version = "0.2.1"; + version = "0.2.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,10 +30,10 @@ buildPythonPackage rec { owner = "redis"; repo = "redis-om-python"; rev = "refs/tags/v${version}"; - hash = "sha256-jQS0VTYZeAj3+OVFy+JP4mUFBPo+a5D/kdJKagFraaA="; + hash = "sha256-E11wpTrE+HIT+jgn1zMC8L7RGas83DAJd1R0WWHp7Jc="; }; - nativeBuildInputs = [ + build-system = [ pythonRelaxDepsHook unasync poetry-core @@ -44,7 +44,7 @@ buildPythonPackage rec { # https://github.com/redis/redis-om-python/pull/577 pythonRelaxDeps = true; - propagatedBuildInputs = [ + dependencies = [ click hiredis more-itertools diff --git a/nixpkgs/pkgs/development/python-modules/reptor/default.nix b/nixpkgs/pkgs/development/python-modules/reptor/default.nix index d31cbc667510..013008581a53 100644 --- a/nixpkgs/pkgs/development/python-modules/reptor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/reptor/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "reptor"; - version = "0.13"; + version = "0.14"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,17 +41,17 @@ buildPythonPackage rec { owner = "Syslifters"; repo = "reptor"; rev = "refs/tags/${version}"; - hash = "sha256-7jFS3GCaPeGBBxB++XTtIYh+m0uXTm5NHuLeIen0KYc="; + hash = "sha256-XZiFVIUyLVVr3ZraOAuXs+shl4vk3S8OJHNHV4p10YY="; }; pythonRelaxDeps = true; - nativeBuildInputs = [ + build-system = [ pythonRelaxDepsHook setuptools ]; - propagatedBuildInputs = [ + dependencies = [ asgiref certifi charset-normalizer diff --git a/nixpkgs/pkgs/development/python-modules/requests-gssapi/default.nix b/nixpkgs/pkgs/development/python-modules/requests-gssapi/default.nix index ac762c7c20b3..68cd61761854 100644 --- a/nixpkgs/pkgs/development/python-modules/requests-gssapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/requests-gssapi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "requests-gssapi"; - version = "1.2.3"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-IHhFCJgUAfcVPJM+7QlTOJM6QIGNplolnb8tgNzLFQ4="; + hash = "sha256-TVK/jCqiqCkTDvzKhcFJQ/3QqnVFWquYWyuHJhWcIMo="; }; build-system = [ diff --git a/nixpkgs/pkgs/development/python-modules/requirements-parser/default.nix b/nixpkgs/pkgs/development/python-modules/requirements-parser/default.nix index 11fe8edf6a10..b2b7697a464a 100644 --- a/nixpkgs/pkgs/development/python-modules/requirements-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/requirements-parser/default.nix @@ -10,23 +10,23 @@ buildPythonPackage rec { pname = "requirements-parser"; - version = "0.5.0"; - format = "pyproject"; + version = "0.6.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "madpah"; - repo = pname; - rev = "v${version}"; - hash = "sha256-e2dfVBMh1uGRMDw7OdPefO4/eRxc3BGwvy/D7u5ipkk="; + repo = "requirements-parser"; + rev = "refs/tags/v${version}"; + hash = "sha256-fUx6NBD6qxAyArGgCiB2J1Ak7pudx/LI0+rCHjLnc1M="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ setuptools types-setuptools ]; @@ -42,7 +42,8 @@ buildPythonPackage rec { meta = with lib; { description = "Pip requirements file parser"; homepage = "https://github.com/davidfischer/requirements-parser"; + changelog = "https://github.com/madpah/requirements-parser/blob/v${version}/CHANGELOG.md"; license = licenses.bsd2; - maintainers = [ ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix b/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix index 7cd0399dafcd..2f7af9d47422 100644 --- a/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix +++ b/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "riscv-config"; - version = "3.17.0"; + version = "3.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "riscv-software-src"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-dMs900w5sXggqxU+2W8qKrKjGpyrXhA2QEbXQeaKZTs="; + hash = "sha256-M36xS9rBnCPHWmHvAA6qC9J21K/zIjgsqEyhApJDKrE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/rope/default.nix b/nixpkgs/pkgs/development/python-modules/rope/default.nix index ad5cad2dd8cb..e027b1922ec9 100644 --- a/nixpkgs/pkgs/development/python-modules/rope/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rope/default.nix @@ -10,23 +10,23 @@ buildPythonPackage rec { pname = "rope"; - version = "1.12.0"; + version = "1.13.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "python-rope"; - repo = pname; + repo = "rope"; rev = "refs/tags/${version}"; - hash = "sha256-j/9q2S2B3DzmEqMOBLG9iHwnLqZipcPxLaKppysJffA="; + hash = "sha256-g/fta5gW/xPs3VaVuLtikfLhqCKyy1AKRnOcOXjQ8bA="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pytoolconfig ] ++ pytoolconfig.optional-dependencies.global; diff --git a/nixpkgs/pkgs/development/python-modules/rpyc/default.nix b/nixpkgs/pkgs/development/python-modules/rpyc/default.nix index 7c9a13fc4d17..9d3d66b46f25 100644 --- a/nixpkgs/pkgs/development/python-modules/rpyc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rpyc/default.nix @@ -11,22 +11,22 @@ buildPythonPackage rec { pname = "rpyc"; version = "6.0.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tomerfiliba"; - repo = pname; + repo = "rpyc"; rev = "refs/tags/${version}"; hash = "sha256-BvXEXZlVbOmKBwnSBCDksUkbT7JPcMX48KZe/Gd5Y8Q="; }; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ plumbum ]; @@ -42,11 +42,22 @@ buildPythonPackage rec { "test_listing" "test_pruning" "test_rpyc" + "test_instancecheck_across_connections" + # Internal import error + "test_modules" # Test is outdated # ssl.SSLError: [SSL: NO_CIPHERS_AVAILABLE] no ciphers available (_ssl.c:997) "test_ssl_conenction" ]; + disabledTestPaths = [ + # Internal import issue + "tests/test_attributes.py" + "tests/test_service_pickle.py" + "tests/test_affinity.py" + "tests/test_magic.py" + ]; + pythonImportsCheck = [ "rpyc" ]; diff --git a/nixpkgs/pkgs/development/python-modules/rpyc4/default.nix b/nixpkgs/pkgs/development/python-modules/rpyc4/default.nix index 1c543166d38a..c883ebef4dc6 100644 --- a/nixpkgs/pkgs/development/python-modules/rpyc4/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rpyc4/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "rpyc4"; # Pinned version for linien, see also: # https://github.com/linien-org/pyrp3/pull/10#discussion_r1302816237 - version = "6.0.0"; + version = "4.1.5"; format = "pyproject"; # Since this is an outdated version, upstream might have fixed the @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tomerfiliba"; repo = "rpyc"; - rev = "refs/tags/${version}"; - hash = "sha256-BvXEXZlVbOmKBwnSBCDksUkbT7JPcMX48KZe/Gd5Y8Q="; + rev = version; + hash = "sha256-8NOcXZDR3w0TNj1+LZ7lzQAt7yDgspjOp2zk1bsbVls="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/rtfde/default.nix b/nixpkgs/pkgs/development/python-modules/rtfde/default.nix index c986d7b0c5e3..3b11adc34a1a 100644 --- a/nixpkgs/pkgs/development/python-modules/rtfde/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rtfde/default.nix @@ -23,11 +23,17 @@ buildPythonPackage rec { hash = "sha256-ai9JQ3gphY/IievBNdHiblIpc0IPS9wp7CVvBIRzG/4="; }; - nativeBuildInputs = [ + postPatch = '' + # https://github.com/seamustuohy/RTFDE/issues/31 + substituteInPlace setup.py \ + --replace-fail "==" ">=" + ''; + + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ lark oletools ]; diff --git a/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix b/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix index 13bee07a1859..47f7eb93a349 100644 --- a/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -60,23 +60,23 @@ buildPythonPackage rec { pname = "scancode-toolkit"; - version = "32.0.8"; + version = "32.1.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-W6Ev1MV8cZU4bauAfmuZsBzMJKz7xpw8siO3Afn5mc8="; + hash = "sha256-WjVtE+3KtFdtBLqNUzFwDrWAUQLblE+DNGjABH+5zWc="; }; dontConfigure = true; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ attrs beautifulsoup4 bitarray diff --git a/nixpkgs/pkgs/development/python-modules/scapy/default.nix b/nixpkgs/pkgs/development/python-modules/scapy/default.nix index 970d355fff06..dede907418e3 100644 --- a/nixpkgs/pkgs/development/python-modules/scapy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scapy/default.nix @@ -44,10 +44,11 @@ buildPythonPackage rec { substituteInPlace scapy/data.py --replace "/opt/wireshark" "${wireshark}" ''; + buildInputs = lib.optional withVoipSupport sox; + propagatedBuildInputs = [ pycrypto ecdsa ] ++ lib.optionals withOptionalDeps [ tcpdump ipython ] ++ lib.optional withCryptography cryptography - ++ lib.optional withVoipSupport sox ++ lib.optional withPlottingSupport matplotlib ++ lib.optionals withGraphicsSupport [ pyx texliveBasic graphviz imagemagick ]; diff --git a/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix index 58e8ceadd0d4..b7571c828ab0 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.42"; + version = "0.4.43"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2zUo/uGIQl0wSFWWxoTmttzUNq9rFGJRYr95PQJH/I8="; + hash = "sha256-+CJyo6motrS89eDJct1zh6zOOrrw+yfAODA/BaVm00A="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sentence-transformers/default.nix b/nixpkgs/pkgs/development/python-modules/sentence-transformers/default.nix index 3803dc4d29c6..d0174236cebd 100644 --- a/nixpkgs/pkgs/development/python-modules/sentence-transformers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sentence-transformers/default.nix @@ -4,9 +4,12 @@ , huggingface-hub , nltk , numpy +, pytestCheckHook +, pythonOlder , scikit-learn , scipy , sentencepiece +, setuptools , tokenizers , torch , torchvision @@ -16,17 +19,23 @@ buildPythonPackage rec { pname = "sentence-transformers"; - version = "2.5.1"; - format = "setuptools"; + version = "2.6.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "UKPLab"; repo = "sentence-transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-HIOizBf8YnPAj95cG1HopO9B/bhAmT0u3q5CM6POEjQ="; + hash = "sha256-09AAuv/yXTbBvjA4gu5ueZrQkVja0BTIGNLZ2tLSyh8="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ huggingface-hub nltk numpy @@ -40,14 +49,37 @@ buildPythonPackage rec { transformers ]; - pythonImportsCheck = [ "sentence_transformers" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - doCheck = false; # tests fail at build_ext + pythonImportsCheck = [ + "sentence_transformers" + ]; + + disabledTests = [ + # Tests require network access + "test_simple_encode" + "test_paraphrase_mining" + "test_cmnrl_same_grad" + "test_LabelAccuracyEvaluator" + "test_ParaphraseMiningEvaluator" + ]; + + disabledTestPaths = [ + # Tests require network access + "tests/test_pretrained_stsb.py" + "tests/test_sentence_transformer.py" + "tests/test_compute_embeddings.py" + "tests/test_multi_process.py" + "tests/test_cross_encoder.py" + "tests/test_train_stsb.py" + ]; meta = with lib; { description = "Multilingual Sentence & Image Embeddings with BERT"; homepage = "https://github.com/UKPLab/sentence-transformers"; - changelog = "https://github.com/UKPLab/sentence-transformers/releases/tag/${src.rev}"; + changelog = "https://github.com/UKPLab/sentence-transformers/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ dit7ya ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/setuptools_dso/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools-dso/default.nix index 30fc6f7393b4..c33a89deabf6 100644 --- a/nixpkgs/pkgs/development/python-modules/setuptools_dso/default.nix +++ b/nixpkgs/pkgs/development/python-modules/setuptools-dso/default.nix @@ -2,28 +2,24 @@ , buildPythonPackage , fetchPypi , nose2 +, pytestCheckHook , setuptools }: buildPythonPackage rec { - pname = "setuptools_dso"; + pname = "setuptools-dso"; version = "2.10"; - format = "pyproject"; + pyproject = true; src = fetchPypi { - inherit pname version; + pname = "setuptools_dso"; + inherit version; hash = "sha256-sjAZ9enOw3vF3zqXNbhu45SM5/sv2kIwfKC6SWJdG0Q="; }; - propagatedBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ nose2 ]; - - checkPhase = '' - runHook preCheck - nose2 -v - runHook postCheck - ''; + nativeCheckInputs = [ nose2 pytestCheckHook ]; meta = with lib; { description = "setuptools extension for building non-Python Dynamic Shared Objects"; diff --git a/nixpkgs/pkgs/development/python-modules/shap/default.nix b/nixpkgs/pkgs/development/python-modules/shap/default.nix index 049074cbc18d..2bc1a8f5c2ec 100644 --- a/nixpkgs/pkgs/development/python-modules/shap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shap/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "shap"; - version = "0.44.1"; + version = "0.45.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "slundberg"; repo = "shap"; rev = "refs/tags/v${version}"; - hash = "sha256-pC201Q/i3UAuJPZw0H+giebhJKVTmmKfxhFdonmkxtI="; + hash = "sha256-x8845saPoLsWu3Z8Thkhqo3HeLmfAZANj3KE0ftVqZc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/shapely/1.8.nix b/nixpkgs/pkgs/development/python-modules/shapely/1.8.nix index 28a248af0bed..0e1c3135ab99 100644 --- a/nixpkgs/pkgs/development/python-modules/shapely/1.8.nix +++ b/nixpkgs/pkgs/development/python-modules/shapely/1.8.nix @@ -15,14 +15,15 @@ }: buildPythonPackage rec { - pname = "Shapely"; + pname = "shapely"; version = "1.8.5"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "Shapely"; + inherit version; hash = "sha256-6CttYOz7EkEgyI/hBqR4WWu+qxQhFtfn9ko2TayQKpI="; }; diff --git a/nixpkgs/pkgs/development/python-modules/spacy/default.nix b/nixpkgs/pkgs/development/python-modules/spacy/default.nix index 1055f45f55b7..fa1c101ecb38 100644 --- a/nixpkgs/pkgs/development/python-modules/spacy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spacy/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { }; pythonRelaxDeps = [ + "smart-open" "typer" ]; diff --git a/nixpkgs/pkgs/development/python-modules/sqlmodel/default.nix b/nixpkgs/pkgs/development/python-modules/sqlmodel/default.nix index fb5f6fd185a9..b371cd23e248 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlmodel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlmodel/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { hash = "sha256-hDJcekn0ExYUCs8kBZkJzsWqXsB/cI6RbW3EhRCCioM="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ pydantic sqlalchemy ]; @@ -45,6 +45,11 @@ buildPythonPackage rec { "sqlmodel" ]; + disabledTests = [ + # AssertionError: assert 'enum_field VARCHAR(1) + "test_sqlite_ddl_sql" + ]; + disabledTestPaths = [ # Coverage "docs_src/tutorial/" diff --git a/nixpkgs/pkgs/development/python-modules/sse-starlette/default.nix b/nixpkgs/pkgs/development/python-modules/sse-starlette/default.nix new file mode 100644 index 000000000000..149a37886ca0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/sse-starlette/default.nix @@ -0,0 +1,67 @@ +{ lib +, anyio +, asgi-lifespan +, buildPythonPackage +, fastapi +, fetchFromGitHub +, httpx +, pdm-backend +, psutil +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, starlette +, uvicorn +}: + +buildPythonPackage rec { + pname = "sse-starlette"; + version = "2.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "sysid"; + repo = "sse-starlette"; + rev = "refs/tags/v${version}"; + hash = "sha256-kDcSG/3foP7fMZKYrkKx6FHvT9c9rSzxyv2EHjQ2WSA="; + }; + + build-system = [ + pdm-backend + ]; + + dependencies = [ + anyio + starlette + uvicorn + ]; + + nativeCheckInputs = [ + asgi-lifespan + fastapi + httpx + psutil + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sse_starlette" + ]; + + disabledTests = [ + # AssertionError + "test_stop_server_with_many_consumers" + "test_stop_server_conditional" + ]; + + meta = with lib; { + description = "Server Sent Events for Starlette and FastAPI"; + homepage = "https://github.com/sysid/sse-starlette"; + changelog = "https://github.com/sysid/sse-starlette/blob/${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/starlette-context/default.nix b/nixpkgs/pkgs/development/python-modules/starlette-context/default.nix new file mode 100644 index 000000000000..2657e9740a60 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/starlette-context/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, httpx +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, starlette +}: + +buildPythonPackage rec { + pname = "starlette-context"; + version = "0.3.6"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "tomwojcik"; + repo = "starlette-context"; + rev = "refs/tags/v${version}"; + hash = "sha256-ZKwE2M86clYKdptd0o/j8VYUOj/Y/72uUnpxFbJ65vw="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + starlette + ]; + + nativeCheckInputs = [ + httpx + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "starlette_context" + ]; + + meta = with lib; { + description = "Middleware for Starlette that allows you to store and access the context data of a request"; + homepage = "https://github.com/tomwojcik/starlette-context"; + changelog = "https://github.com/tomwojcik/starlette-context/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/stim/default.nix b/nixpkgs/pkgs/development/python-modules/stim/default.nix index 46aba99fb178..3e95b74ef9ef 100644 --- a/nixpkgs/pkgs/development/python-modules/stim/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stim/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "stim"; - version = "1.12.1"; + version = "1.13.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "quantumlib"; repo = "Stim"; rev = "refs/tags/v${version}"; - hash = "sha256-vDpW8cn1JPARDIXpLyK9uenhHmva0FwnWIDV7dSHbIY="; + hash = "sha256-anJvDHLZ470iNw0U7hq9xGBacDgqYO9ZcmmdCt9pefg="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/swift/default.nix b/nixpkgs/pkgs/development/python-modules/swift/default.nix index 464b044ad15a..ec4f1b7a3963 100644 --- a/nixpkgs/pkgs/development/python-modules/swift/default.nix +++ b/nixpkgs/pkgs/development/python-modules/swift/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "swift"; - version = "2.32.0"; + version = "2.33.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-JeDmZx667rG1ARfRBUDTcOWe7u3ZiytZzGQSRp8bpes="; + hash = "sha256-4TlJcquK8MC9zQfLKmb88B5xHje1kbPD2jSLiR+N8hs="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 34ce22a46136..e12d4e6b8abb 100644 --- a/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1114"; + version = "3.0.1116"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,14 +18,14 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-OqkXHnXoQE2BF2Lon9+3pPVvqXK9YQnoDewoQ13Aa1Q="; + hash = "sha256-TeS5ymvVbebzGdCbQL7HEtB4J4VgnzfEsB31zwjs6aE="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/tendo/default.nix b/nixpkgs/pkgs/development/python-modules/tendo/default.nix new file mode 100644 index 000000000000..fe02bc0aed29 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/tendo/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, setuptools +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "tendo"; + version = "0.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pycontribs"; + repo = "tendo"; + rev = "refs/tags/v${version}"; + hash = "sha256-ZOozMGxAKcEtmUEzHCFSojKc+9Ha+T2MOTmMvdMqNuQ="; + }; + + postPatch = '' + # marken broken and not required + sed -i '/setuptools_scm_git_archive/d' pyproject.toml + # unused + substituteInPlace setup.cfg \ + --replace-fail "six" "" + ''; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "tendo" + ]; + + meta = with lib; { + description = "Adds basic functionality that is not provided by Python"; + homepage = "https://github.com/pycontribs/tendo"; + changelog = "https://github.com/pycontribs/tendo/releases/tag/v${version}"; + license = licenses.psfl; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/tesla-fleet-api/default.nix b/nixpkgs/pkgs/development/python-modules/tesla-fleet-api/default.nix index e82fddf4c424..0377b13b244b 100644 --- a/nixpkgs/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,14 +18,14 @@ buildPythonPackage rec { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; rev = "refs/tags/v${version}"; - hash = "sha256-IRUH3qWRJoCEvzkkR8/qH5i735B030CLKKRRWO9DVuI="; + hash = "sha256-PbtOokzpJ58SpQOfpSyoDnUb8qcRvy0XPDR5cGMMbKU="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp aiolimiter ]; diff --git a/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix b/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix index 0dbcd6bddc49..ab2315c1d9c8 100644 --- a/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix @@ -17,23 +17,23 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.10.1"; - format = "pyproject"; + version = "3.10.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "zabuldon"; - repo = pname; + repo = "teslajsonpy"; rev = "refs/tags/v${version}"; - hash = "sha256-Eez8ktPhbWauFNsIuwoxMkGpI7hnYsBwStmU80IDFw4="; + hash = "sha256-M3/1J73C3gUqyZYsu10O6FnACKYVbGuMH+8Ns0s2Rwc="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ authcaptureproxy aiohttp backoff diff --git a/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix b/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix index 8450fcde1126..f4529499c97d 100644 --- a/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix @@ -1,27 +1,35 @@ { lib -, fetchFromGitHub , buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core , deprecation , docker -, wrapt }: +, wrapt +}: buildPythonPackage rec { pname = "testcontainers"; - version = "4.0.0"; + version = "4.2.0"; + disabled = pythonOlder "3.9"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "testcontainers"; repo = "testcontainers-python"; rev = "refs/tags/testcontainers-v${version}"; - hash = "sha256-cVVP9nGRTLC09KHalQDz7KOszjuFVVpMlee4btPNgd4="; + hash = "sha256-vHCrfeL3fPLZQgH7nlugIlADQaBbUQKsTBFhhq7kYWQ="; }; postPatch = '' echo "${version}" > VERSION ''; + nativeBuildInputs = [ + poetry-core + ]; + buildInputs = [ deprecation docker diff --git a/nixpkgs/pkgs/development/python-modules/textual/default.nix b/nixpkgs/pkgs/development/python-modules/textual/default.nix index 52a7715e2400..c9303d198b62 100644 --- a/nixpkgs/pkgs/development/python-modules/textual/default.nix +++ b/nixpkgs/pkgs/development/python-modules/textual/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "textual"; - version = "0.52.1"; + version = "0.53.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = "textual"; rev = "refs/tags/v${version}"; - hash = "sha256-a5v8HS6ZswQOl/jIypFJTk+MuMsu89H2pAAlWMPkLjI="; + hash = "sha256-73qEogHe69B66r4EJOj2RAP95O5z7v/UYARTIEPxrcA="; }; build-system = [ diff --git a/nixpkgs/pkgs/development/python-modules/tilequant/default.nix b/nixpkgs/pkgs/development/python-modules/tilequant/default.nix index 294a34d81177..c25c9ff2659c 100644 --- a/nixpkgs/pkgs/development/python-modules/tilequant/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tilequant/default.nix @@ -1,13 +1,14 @@ { lib , buildPythonPackage -, fetchPypi , click +, fetchPypi , ordered-set +, pillow , pythonOlder , pythonRelaxDepsHook -, pillow +, setuptools +, setuptools-dso , sortedcollections -, setuptools_dso }: buildPythonPackage rec { @@ -22,20 +23,21 @@ buildPythonPackage rec { hash = "sha256-uW1g3nlT6Y+1beifo/MOlGxsGL7on/jcAROxSddySHk="; }; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; - pythonRelaxDeps = [ "pillow" ]; - propagatedBuildInputs = [ + build-system = [ + pythonRelaxDepsHook + setuptools + ]; + + dependencies = [ click ordered-set pillow sortedcollections - setuptools_dso + setuptools-dso ]; doCheck = false; # there are no tests @@ -46,9 +48,10 @@ buildPythonPackage rec { meta = with lib; { description = "Tool for quantizing image colors using tile-based palette restrictions"; - mainProgram = "tilequant"; homepage = "https://github.com/SkyTemple/tilequant"; + changelog = "https://github.com/SkyTemple/tilequant/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ marius851000 xfix ]; + mainProgram = "tilequant"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/transformers/default.nix b/nixpkgs/pkgs/development/python-modules/transformers/default.nix index ac2af381ff02..86f39fff7938 100644 --- a/nixpkgs/pkgs/development/python-modules/transformers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/transformers/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.39.1"; + version = "4.39.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -62,7 +62,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-OzuiKzhgI9eRTPq3l7x4aw3fxvCe4080pK1RKzcC1RQ="; + hash = "sha256-eOtXHKTGVV3hYdSK+p2mTgCaG4akivnuMnB/lSh8Lxc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index 79540ea997ee..8bdcf2e47ce9 100644 --- a/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.2.0"; + version = "4.2.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uS6oVNS+JBN61SEVDwLQDoCf60SwqXV7831E2J+hb7I="; + hash = "sha256-lyscb7YYnT4A7juT1+9CBlb4DoeE1MT46ZPhRJgCa64="; }; nativeBuildInputs = [ setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/ttn-client/default.nix b/nixpkgs/pkgs/development/python-modules/ttn-client/default.nix index ada7cc390b69..515f616dbe24 100644 --- a/nixpkgs/pkgs/development/python-modules/ttn-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ttn-client/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ttn-client"; - version = "0.0.3"; + version = "0.0.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angelnu"; repo = "thethingsnetwork_python_client"; rev = "refs/tags/v${version}"; - hash = "sha256-oHGv9huk400nPl4ytV8uxzK7eENpoBHt8uFjD2Ck67w="; + hash = "sha256-ZLSMxFyzfPtz51fsY2wgucHzcAnSrL7VPOuW7DXTNbQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/twiggy/default.nix b/nixpkgs/pkgs/development/python-modules/twiggy/default.nix index 748d45176613..d25fd36a0d91 100644 --- a/nixpkgs/pkgs/development/python-modules/twiggy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twiggy/default.nix @@ -5,11 +5,12 @@ }: buildPythonPackage rec { - pname = "Twiggy"; + pname = "twiggy"; version = "0.5.1"; src = fetchPypi { - inherit pname version; + pname = "Twiggy"; + inherit version; sha256 = "7938840275972f6ce89994a5bdfb0b84f0386301a043a960af6364952e78ffe4"; }; diff --git a/nixpkgs/pkgs/development/python-modules/txamqp/default.nix b/nixpkgs/pkgs/development/python-modules/txamqp/default.nix index cc66e041ae38..935ef043f22f 100644 --- a/nixpkgs/pkgs/development/python-modules/txamqp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/txamqp/default.nix @@ -5,11 +5,12 @@ }: buildPythonPackage rec { - pname = "txAMQP"; + pname = "txamqp"; version = "0.8.2"; src = fetchPypi { - inherit pname version; + pname = "txAMQP"; + inherit version; sha256 = "0jd9864k3csc06kipiwzjlk9mq4054s8kzk5q1cfnxj8572s4iv4"; }; diff --git a/nixpkgs/pkgs/development/python-modules/typing-validation/default.nix b/nixpkgs/pkgs/development/python-modules/typing-validation/default.nix new file mode 100644 index 000000000000..975119b3be1b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/typing-validation/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +, pytestCheckHook + +, pythonOlder + +, setuptools +, setuptools-scm +, wheel + +, numpy + +, typing-extensions +}: + +buildPythonPackage rec { + pname = "typing-validation"; + version = "1.2.11"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "hashberg-io"; + repo = "typing-validation"; + rev = "refs/tags/v${version}"; + hash = "sha256-0scXoAPkx/VBIbNRMtFoRRbmGpC2RzNRmQG4mRXSxrs="; + }; + + build-system = [ + setuptools + setuptools-scm + wheel + ]; + + dependencies = [ + typing-extensions + ]; + + nativeCheckInputs = [ + pytestCheckHook + numpy + ]; + + pythonImportsCheck = [ + "typing_validation" + ]; + + meta = with lib; { + description = "A simple library for runtime type-checking"; + homepage = "https://github.com/hashberg-io/typing-validation"; + changelog = "https://github.com/hashberg-io/typing-validation/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ vizid ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/ubelt/default.nix b/nixpkgs/pkgs/development/python-modules/ubelt/default.nix index a85be00ddf79..b964c7d4de42 100644 --- a/nixpkgs/pkgs/development/python-modules/ubelt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ubelt/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "ubelt"; - version = "1.3.4"; + version = "1.3.5"; pyproject = true; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Erotemic"; repo = "ubelt"; rev = "refs/tags/v${version}"; - hash = "sha256-pvCmmdPRLupMUCiOvfa+JTX8NPFZ/UcXSPEaaDG3eTk="; + hash = "sha256-pwqqt5Syag4cO6a93+7ZE3eI61yTZGc+NEu/Y0i1U0k="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/unique-log-filter/default.nix b/nixpkgs/pkgs/development/python-modules/unique-log-filter/default.nix index 07b2a9a305e0..2b91ab437adf 100644 --- a/nixpkgs/pkgs/development/python-modules/unique-log-filter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/unique-log-filter/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-av1pVPDsO2dto5fhBK74jKfVsVY2ChyUE5NNja2B1Qw="; }; - nativeBuildInputs = [ + build-system = [ flit-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/uproot/default.nix b/nixpkgs/pkgs/development/python-modules/uproot/default.nix index 9e8436bd662c..4fd55870b0f4 100644 --- a/nixpkgs/pkgs/development/python-modules/uproot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uproot/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "uproot"; - version = "5.3.1"; + version = "5.3.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "uproot5"; rev = "refs/tags/v${version}"; - hash = "sha256-cZVdsemaA3ni6xFfrkyLJA+12B7vyURj9OYVuOhqTXU="; + hash = "sha256-dq362pevqgLx5KwZ19zQ6aOn5NCyiqynPCF7YdI6tkw="; }; nativeBuildInputs = [ @@ -59,13 +59,16 @@ buildPythonPackage rec { disabledTests = [ # Tests that try to download files + "test_descend_into_path_classname_of" "test_fallback" "test_file" "test_fsspec_cache_http" "test_fsspec_cache_http_directory" "test_fsspec_chunks" "test_fsspec_globbing_http" + "test_fsspec_writing_http" "test_fsspec_writing_memory" + "test_fsspec_writing_ssh" "test_http" "test_http_fallback" "test_http_multipart" @@ -74,9 +77,11 @@ buildPythonPackage rec { "test_http_size_port" "test_issue_1054_filename_colons" "test_no_multipart" - "test_open_fsspec_http" "test_open_fsspec_github" + "test_open_fsspec_http" + "test_open_fsspec_ss" "test_pickle_roundtrip_http" + "test_split_ranges_if_large_file_in_http" # Cyclic dependency with dask-awkward "test_decompression_executor_for_dask" ]; diff --git a/nixpkgs/pkgs/development/python-modules/wandb/default.nix b/nixpkgs/pkgs/development/python-modules/wandb/default.nix index b2f22092638b..61f32785757d 100644 --- a/nixpkgs/pkgs/development/python-modules/wandb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wandb/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.16.4"; + version = "0.16.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -64,7 +64,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Q4NHUHay1/xb+V494n96jxE1VyAP7uVyQbIbS0/E85c="; + hash = "sha256-XXs9KjiAPzZ932r4UJ87RpM+qhg/bNDWEYsq2Ua6SRw="; }; patches = [ @@ -302,6 +302,9 @@ buildPythonPackage rec { "wandb" ]; + # unmaintainable list of disabled tests + passthru.skipBulkUpdate = true; + meta = with lib; { description = "A CLI and library for interacting with the Weights and Biases API"; homepage = "https://github.com/wandb/wandb"; diff --git a/nixpkgs/pkgs/development/python-modules/webhelpers/default.nix b/nixpkgs/pkgs/development/python-modules/webhelpers/default.nix index dcb2bd3817d7..c9dc7159f2f8 100644 --- a/nixpkgs/pkgs/development/python-modules/webhelpers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/webhelpers/default.nix @@ -8,11 +8,12 @@ }: buildPythonPackage rec { - pname = "WebHelpers"; + pname = "webhelpers"; version = "1.3"; src = fetchPypi { - inherit pname version; + pname = "WebHelpers"; + inherit version; sha256 = "ea86f284e929366b77424ba9a89341f43ae8dee3cbeb8702f73bcf86058aa583"; }; diff --git a/nixpkgs/pkgs/development/python-modules/wsgidav/default.nix b/nixpkgs/pkgs/development/python-modules/wsgidav/default.nix index e9f65687a3ee..132af924c3d2 100644 --- a/nixpkgs/pkgs/development/python-modules/wsgidav/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wsgidav/default.nix @@ -16,23 +16,23 @@ buildPythonPackage rec { pname = "wsgidav"; - version = "4.3.0"; - format = "pyproject"; + version = "4.3.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mar10"; - repo = pname; + repo = "wsgidav"; rev = "refs/tags/v${version}"; - hash = "sha256-DEUoKoFELIOg5KX6hL1VgR18dtsery4ZzKksrxl0D7Q="; + hash = "sha256-jgn4bculVIXfMx3Or3pKF478UOzCL8nhEeNvOeGyjPI="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ defusedxml jinja2 json5 @@ -55,10 +55,10 @@ buildPythonPackage rec { meta = with lib; { description = "Generic and extendable WebDAV server based on WSGI"; - mainProgram = "wsgidav"; homepage = "https://wsgidav.readthedocs.io/"; changelog = "https://github.com/mar10/wsgidav/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "wsgidav"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix b/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix index 548609caaaa2..221346d2c76a 100644 --- a/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.27.1"; + version = "0.28.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "xiaomi-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-/LOq35YrGacXXP1Izl9xoF5rrCQGONPGj/u2zGOqbt0="; + hash = "sha256-Va/fzGDjBR/h1lUN47AixZnDYzEPNXQKTVXILKayhBc="; }; postPatch = '' @@ -34,7 +34,7 @@ buildPythonPackage rec { --replace-fail " --cov=xiaomi_ble --cov-report=term-missing:skip-covered" "" ''; - nativeBuildInputs = [ + build-system = [ poetry-core pythonRelaxDepsHook ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { "pycryptodomex" ]; - propagatedBuildInputs = [ + dependencies = [ bleak bleak-retry-connector bluetooth-data-tools diff --git a/nixpkgs/pkgs/development/python-modules/zodb/default.nix b/nixpkgs/pkgs/development/python-modules/zodb/default.nix index 4e2975639564..c90cc42a3383 100644 --- a/nixpkgs/pkgs/development/python-modules/zodb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zodb/default.nix @@ -15,11 +15,12 @@ }: buildPythonPackage rec { - pname = "ZODB"; + pname = "zodb"; version = "5.8.1"; src = fetchPypi { - inherit pname version; + pname = "ZODB"; + inherit version; hash = "sha256-xsc6vTZg1gb/wfIfl97xS1K0b0pwLsnm7kSabiviZN8="; }; diff --git a/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix b/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix index 6aca502550b6..cd2f6f379efc 100644 --- a/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix @@ -28,9 +28,18 @@ assert name == null -> pname != null; -with import ./functions.nix { inherit lib gemConfig; }; - let + functions = import ./functions.nix { inherit lib gemConfig; }; + + inherit (functions) + applyGemConfigs + bundlerFiles + composeGemAttrs + filterGemset + genStubsScript + pathDerivation + ; + gemFiles = bundlerFiles args; importedGemset = if builtins.typeOf gemFiles.gemset != "set" diff --git a/nixpkgs/pkgs/development/skaware-packages/build-skaware-package.nix b/nixpkgs/pkgs/development/skaware-packages/build-skaware-package.nix index 24a1465e690a..56bbe6bec51b 100644 --- a/nixpkgs/pkgs/development/skaware-packages/build-skaware-package.nix +++ b/nixpkgs/pkgs/development/skaware-packages/build-skaware-package.nix @@ -6,6 +6,8 @@ , version # : string , sha256 ? lib.fakeSha256 + # : drv | null +, manpages ? null # : string , description # : list Platform @@ -63,7 +65,15 @@ stdenv.mkDerivation { inherit sha256; }; - inherit outputs; + outputs = + if manpages == null + then outputs + else + assert (lib.assertMsg (!lib.elem "man" outputs) "If you pass `manpages` to `skawarePackages.buildPackage`, you cannot have a `man` output already!"); + # insert as early as posible, but keep the first element + if lib.length outputs > 0 + then [(lib.head outputs) "man"] ++ lib.tail outputs + else ["man"]; dontDisableStatic = true; enableParallelBuilding = true; @@ -97,6 +107,13 @@ stdenv.mkDerivation { docFiles = commonMetaFiles; }} $doc/share/doc/${pname} + ${if manpages == null + then ''echo "no manpages for this package"'' + else '' + echo "copying manpages" + cp -vr ${manpages} $man + ''} + ${postInstall} ''; @@ -104,6 +121,8 @@ stdenv.mkDerivation { ${cleanPackaging.checkForRemainingFiles} ''; + passthru = passthru // (if manpages == null then {} else { inherit manpages; }); + meta = { homepage = "https://skarnet.org/software/${pname}/"; inherit description platforms; @@ -112,6 +131,4 @@ stdenv.mkDerivation { [ pmahoney Profpatsch qyliss ] ++ maintainers; }; - inherit passthru; - } diff --git a/nixpkgs/pkgs/development/skaware-packages/default.nix b/nixpkgs/pkgs/development/skaware-packages/default.nix index 798ae11df5cb..4800b6e6a854 100644 --- a/nixpkgs/pkgs/development/skaware-packages/default.nix +++ b/nixpkgs/pkgs/development/skaware-packages/default.nix @@ -10,7 +10,6 @@ lib.makeScope pkgs.newScope (self: # execline execline = callPackage ./execline { }; - execline-man-pages = callPackage ./execline-man-pages { }; # servers & tools mdevd = callPackage ./mdevd { }; @@ -32,8 +31,10 @@ lib.makeScope pkgs.newScope (self: s6-portable-utils = callPackage ./s6-portable-utils { }; s6-rc = callPackage ./s6-rc { }; - s6-man-pages = callPackage ./s6-man-pages { }; - s6-networking-man-pages = callPackage ./s6-networking-man-pages { }; - s6-portable-utils-man-pages = callPackage ./s6-portable-utils-man-pages { }; - s6-rc-man-pages = callPackage ./s6-rc-man-pages { }; + # manpages (DEPRECATED, they are added directly to the packages now) + execline-man-pages = self.execline.passthru.manpages; + s6-man-pages = self.s6.passthru.manpages; + s6-networking-man-pages = self.s6-networking.passthru.manpages; + s6-portable-utils-man-pages = self.s6-portable-utils.passthru.manpages; + s6-rc-man-pages = self.s6-rc.passthru.manpages; }) diff --git a/nixpkgs/pkgs/development/skaware-packages/execline-man-pages/default.nix b/nixpkgs/pkgs/development/skaware-packages/execline-man-pages/default.nix deleted file mode 100644 index 6cb4ff659bac..000000000000 --- a/nixpkgs/pkgs/development/skaware-packages/execline-man-pages/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib, buildManPages }: - -buildManPages { - pname = "execline-man-pages"; - version = "2.9.3.0.5"; - sha256 = "0fcjrj4xp7y7n1c55k45rxr5m7zpv6cbhrkxlxymd4j603i9jh6d"; - description = "Port of the documentation for the execline suite to mdoc"; - maintainers = [ lib.maintainers.sternenseemann ]; -} diff --git a/nixpkgs/pkgs/development/skaware-packages/execline/default.nix b/nixpkgs/pkgs/development/skaware-packages/execline/default.nix index caa9a8030a94..80bef5feb512 100644 --- a/nixpkgs/pkgs/development/skaware-packages/execline/default.nix +++ b/nixpkgs/pkgs/development/skaware-packages/execline/default.nix @@ -1,29 +1,30 @@ -{ fetchFromGitHub, skawarePackages }: +{ lib, fetchFromGitHub, skawarePackages, skalibs }: -with skawarePackages; let version = "2.9.4.0"; +in skawarePackages.buildPackage { + inherit version; + + pname = "execline"; + # ATTN: also check whether there is a new manpages version + sha256 = "mrVdVhU536dv9Kl5BvqZX8SiiOPeUiXLGp2PqenrxJs="; + # Maintainer of manpages uses following versioning scheme: for every # upstream $version he tags manpages release as ${version}.1, and, # in case of extra fixes to manpages, new tags in form ${version}.2, # ${version}.3 and so on are created. - manpages = fetchFromGitHub { - owner = "flexibeast"; - repo = "execline-man-pages"; - rev = "v2.9.1.0.1"; - sha256 = "nZzzQFMUPmIgPS3aAIgcORr/TSpaLf8UtzBUFD7blt8="; + manpages = skawarePackages.buildManPages { + pname = "execline-man-pages"; + version = "2.9.3.0.5"; + sha256 = "0fcjrj4xp7y7n1c55k45rxr5m7zpv6cbhrkxlxymd4j603i9jh6d"; + description = "Port of the documentation for the execline suite to mdoc"; + maintainers = [ lib.maintainers.sternenseemann ]; }; -in buildPackage { - inherit version; - - pname = "execline"; - sha256 = "mrVdVhU536dv9Kl5BvqZX8SiiOPeUiXLGp2PqenrxJs="; - description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; - outputs = [ "bin" "man" "lib" "dev" "doc" "out" ]; + outputs = [ "bin" "lib" "dev" "doc" "out" ]; # TODO: nsss support configureFlags = [ @@ -62,7 +63,5 @@ in buildPackage { -o "$bin/bin/execlineb" \ ${./execlineb-wrapper.c} \ -lskarnet - mkdir -p $man/share/ - cp -vr ${manpages}/man* $man/share ''; } diff --git a/nixpkgs/pkgs/development/skaware-packages/mdevd/default.nix b/nixpkgs/pkgs/development/skaware-packages/mdevd/default.nix index 9f4caa4ed025..0e78d112c8bb 100644 --- a/nixpkgs/pkgs/development/skaware-packages/mdevd/default.nix +++ b/nixpkgs/pkgs/development/skaware-packages/mdevd/default.nix @@ -1,8 +1,6 @@ -{ lib, skawarePackages }: +{ lib, skawarePackages, skalibs }: -with skawarePackages; - -buildPackage { +skawarePackages.buildPackage { pname = "mdevd"; version = "0.1.6.3"; sha256 = "9uzw73zUjQTvx1rLLa2WfYULyIFb2wCY8cnvBDOU1DA="; diff --git a/nixpkgs/pkgs/development/skaware-packages/nsss/default.nix b/nixpkgs/pkgs/development/skaware-packages/nsss/default.nix index 3f81c0e66b3f..6171a36f1147 100644 --- a/nixpkgs/pkgs/development/skaware-packages/nsss/default.nix +++ b/nixpkgs/pkgs/development/skaware-packages/nsss/default.nix @@ -1,8 +1,6 @@ -{ skawarePackages }: +{ skawarePackages, skalibs }: -with skawarePackages; - -buildPackage { +skawarePackages.buildPackage { pname = "nsss"; version = "0.2.0.4"; sha256 = "ObUE+FvY9rUj0zTlz6YsAqOV2zWZG3XyBt8Ku9Z2Gq0="; diff --git a/nixpkgs/pkgs/development/skaware-packages/s6-dns/default.nix b/nixpkgs/pkgs/development/skaware-packages/s6-dns/default.nix index b4229d2c216f..1393a2c15634 100644 --- a/nixpkgs/pkgs/development/skaware-packages/s6-dns/default.nix +++ b/nixpkgs/pkgs/development/skaware-packages/s6-dns/default.nix @@ -1,8 +1,6 @@ -{ skawarePackages }: +{ skawarePackages, skalibs }: -with skawarePackages; - -buildPackage { +skawarePackages.buildPackage { pname = "s6-dns"; version = "2.3.7.1"; sha256 = "zwJYV07H1itlTgwq14r0x9Z6xMnLN/eBSA9ZflSzD20="; diff --git a/nixpkgs/pkgs/development/skaware-packages/s6-linux-init/default.nix b/nixpkgs/pkgs/development/skaware-packages/s6-linux-init/default.nix index a60216559286..fdb92aa3e2c6 100644 --- a/nixpkgs/pkgs/development/skaware-packages/s6-linux-init/default.nix +++ b/nixpkgs/pkgs/development/skaware-packages/s6-linux-init/default.nix @@ -1,8 +1,6 @@ -{ lib, skawarePackages }: +{ lib, skawarePackages, skalibs, execline, s6 }: -with skawarePackages; - -buildPackage { +skawarePackages.buildPackage { pname = "s6-linux-init"; version = "1.1.2.0"; sha256 = "sha256-Ea4I0KZiELXla2uu4Pa5sbafvtsF/aEoWxFaMcpGx38="; diff --git a/nixpkgs/pkgs/development/skaware-packages/s6-linux-utils/default.nix b/nixpkgs/pkgs/development/skaware-packages/s6-linux-utils/default.nix index 9a6871b9f487..b3c52edc7e73 100644 --- a/nixpkgs/pkgs/development/skaware-packages/s6-linux-utils/default.nix +++ b/nixpkgs/pkgs/development/skaware-packages/s6-linux-utils/default.nix @@ -1,8 +1,6 @@ -{ lib, skawarePackages }: +{ lib, skawarePackages, skalibs }: -with skawarePackages; - -buildPackage { +skawarePackages.buildPackage { pname = "s6-linux-utils"; version = "2.6.2.0"; sha256 = "j5RGM8qH09I+DwPJw4PRUC1QjJusFtOMP79yOl6rK7c="; diff --git a/nixpkgs/pkgs/development/skaware-packages/s6-man-pages/default.nix b/nixpkgs/pkgs/development/skaware-packages/s6-man-pages/default.nix deleted file mode 100644 index c21da0e17ae2..000000000000 --- a/nixpkgs/pkgs/development/skaware-packages/s6-man-pages/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib, buildManPages }: - -buildManPages { - pname = "s6-man-pages"; - version = "2.12.0.2.1"; - sha256 = "sha256-fFU+cRwXb4SwHsI/r0ghuzCf6hEK/muPPp2XMvD8VtQ="; - description = "Port of the documentation for the s6 supervision suite to mdoc"; - maintainers = [ lib.maintainers.sternenseemann ]; -} diff --git a/nixpkgs/pkgs/development/skaware-packages/s6-networking-man-pages/default.nix b/nixpkgs/pkgs/development/skaware-packages/s6-networking-man-pages/default.nix deleted file mode 100644 index fb63030e62df..000000000000 --- a/nixpkgs/pkgs/development/skaware-packages/s6-networking-man-pages/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib, buildManPages }: - -buildManPages { - pname = "s6-networking-man-pages"; - version = "2.5.1.3.3"; - sha256 = "02ba5jyfpbib402mfl42pbbdxyjy2vhpiz1b2qdg4ax58yr4jzqk"; - description = "Port of the documentation for the s6-networking suite to mdoc"; - maintainers = [ lib.maintainers.sternenseemann ]; -} diff --git a/nixpkgs/pkgs/development/skaware-packages/s6-networking/default.nix b/nixpkgs/pkgs/development/skaware-packages/s6-networking/default.nix index 1b8cd4e88fea..f9078351fdcd 100644 --- a/nixpkgs/pkgs/development/skaware-packages/s6-networking/default.nix +++ b/nixpkgs/pkgs/development/skaware-packages/s6-networking/default.nix @@ -1,11 +1,10 @@ -{ lib, skawarePackages +{ lib, skawarePackages, skalibs, execline, s6, s6-dns # Whether to build the TLS/SSL tools and what library to use # acceptable values: "bearssl", "libressl", false , sslSupport ? "bearssl" , libressl, bearssl }: -with skawarePackages; let sslSupportEnabled = sslSupport != false; sslLibs = { @@ -17,11 +16,19 @@ in assert sslSupportEnabled -> sslLibs ? ${sslSupport}; -buildPackage { +skawarePackages.buildPackage { pname = "s6-networking"; version = "2.7.0.2"; sha256 = "wzxvGyvhb4miGvlGz9BiQqEvmBhMiYt1XdskM4ZxzrE="; + manpages = skawarePackages.buildManPages { + pname = "s6-networking-man-pages"; + version = "2.5.1.3.3"; + sha256 = "02ba5jyfpbib402mfl42pbbdxyjy2vhpiz1b2qdg4ax58yr4jzqk"; + description = "Port of the documentation for the s6-networking suite to mdoc"; + maintainers = [ lib.maintainers.sternenseemann ]; + }; + description = "A suite of small networking utilities for Unix systems"; outputs = [ "bin" "lib" "dev" "doc" "out" ]; diff --git a/nixpkgs/pkgs/development/skaware-packages/s6-portable-utils-man-pages/default.nix b/nixpkgs/pkgs/development/skaware-packages/s6-portable-utils-man-pages/default.nix deleted file mode 100644 index 0a537ea2f9b3..000000000000 --- a/nixpkgs/pkgs/development/skaware-packages/s6-portable-utils-man-pages/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib, buildManPages }: - -buildManPages { - pname = "s6-portable-utils-man-pages"; - version = "2.3.0.2.2"; - sha256 = "0zbxr6jqrx53z1gzfr31nm78wjfmyjvjx7216l527nxl9zn8nnv1"; - description = "Port of the documentation for the s6-portable-utils suite to mdoc"; - maintainers = [ lib.maintainers.somasis ]; -} diff --git a/nixpkgs/pkgs/development/skaware-packages/s6-portable-utils/default.nix b/nixpkgs/pkgs/development/skaware-packages/s6-portable-utils/default.nix index b02628ad806e..816b5cd3cdf7 100644 --- a/nixpkgs/pkgs/development/skaware-packages/s6-portable-utils/default.nix +++ b/nixpkgs/pkgs/development/skaware-packages/s6-portable-utils/default.nix @@ -1,12 +1,18 @@ -{ skawarePackages }: +{ lib, skawarePackages, skalibs }: -with skawarePackages; - -buildPackage { +skawarePackages.buildPackage { pname = "s6-portable-utils"; version = "2.3.0.3"; sha256 = "PkSSBV0WDCX7kBU/DvwnfX1Sv5gbvj6i6d/lHEk1Yf8="; + manpages = skawarePackages.buildManPages { + pname = "s6-portable-utils-man-pages"; + version = "2.3.0.2.2"; + sha256 = "0zbxr6jqrx53z1gzfr31nm78wjfmyjvjx7216l527nxl9zn8nnv1"; + description = "Port of the documentation for the s6-portable-utils suite to mdoc"; + maintainers = [ lib.maintainers.somasis ]; + }; + description = "A set of tiny general Unix utilities optimized for simplicity and small size"; outputs = [ "bin" "dev" "doc" "out" ]; diff --git a/nixpkgs/pkgs/development/skaware-packages/s6-rc-man-pages/default.nix b/nixpkgs/pkgs/development/skaware-packages/s6-rc-man-pages/default.nix deleted file mode 100644 index e919746fccdb..000000000000 --- a/nixpkgs/pkgs/development/skaware-packages/s6-rc-man-pages/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib, buildManPages }: - -buildManPages { - pname = "s6-rc-man-pages"; - version = "0.5.4.2.1"; - sha256 = "Ywke3FG/xhhUd934auDB+iFRDCvy8IJs6IkirP6O/As="; - description = "mdoc(7) versions of the documentation for the s6-rc service manager"; - maintainers = [ lib.maintainers.qyliss ]; -} diff --git a/nixpkgs/pkgs/development/skaware-packages/s6-rc/default.nix b/nixpkgs/pkgs/development/skaware-packages/s6-rc/default.nix index 586f04ddff94..edfc12f23271 100644 --- a/nixpkgs/pkgs/development/skaware-packages/s6-rc/default.nix +++ b/nixpkgs/pkgs/development/skaware-packages/s6-rc/default.nix @@ -1,12 +1,18 @@ -{ lib, stdenv, skawarePackages, targetPackages }: +{ lib, stdenv, skawarePackages, targetPackages, skalibs, execline, s6 }: -with skawarePackages; - -buildPackage { +skawarePackages.buildPackage { pname = "s6-rc"; version = "0.5.4.2"; sha256 = "AL36WW+nFhUS6XLskoKiq9j9DjHwkXe616K8PY8oOYI="; + manpages = skawarePackages.buildManPages { + pname = "s6-rc-man-pages"; + version = "0.5.4.2.1"; + sha256 = "Ywke3FG/xhhUd934auDB+iFRDCvy8IJs6IkirP6O/As="; + description = "mdoc(7) versions of the documentation for the s6-rc service manager"; + maintainers = [ lib.maintainers.qyliss ]; + }; + description = "A service manager for s6-based systems"; platforms = lib.platforms.unix; diff --git a/nixpkgs/pkgs/development/skaware-packages/s6/default.nix b/nixpkgs/pkgs/development/skaware-packages/s6/default.nix index f16e3dacc10a..b60659593648 100644 --- a/nixpkgs/pkgs/development/skaware-packages/s6/default.nix +++ b/nixpkgs/pkgs/development/skaware-packages/s6/default.nix @@ -1,12 +1,18 @@ -{ skawarePackages }: +{ lib, skawarePackages, skalibs, execline }: -with skawarePackages; - -buildPackage { +skawarePackages.buildPackage { pname = "s6"; version = "2.12.0.3"; sha256 = "gA0xIm9sJc3T7AtlJA+AtWzl7BNzQdCo0VTndjjlgQM="; + manpages = skawarePackages.buildManPages { + pname = "s6-man-pages"; + version = "2.12.0.2.1"; + sha256 = "sha256-fFU+cRwXb4SwHsI/r0ghuzCf6hEK/muPPp2XMvD8VtQ="; + description = "Port of the documentation for the s6 supervision suite to mdoc"; + maintainers = [ lib.maintainers.sternenseemann ]; + }; + description = "skarnet.org's small & secure supervision software suite"; # NOTE lib: cannot split lib from bin at the moment, diff --git a/nixpkgs/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix b/nixpkgs/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix index e86f6ab12679..e28e77989939 100644 --- a/nixpkgs/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix +++ b/nixpkgs/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix @@ -1,6 +1,4 @@ -{ stdenv, lib, runCommandCC, skawarePackages }: - -with skawarePackages; +{ stdenv, lib, runCommandCC, skawarePackages, skalibs }: let # From https://skarnet.org/software/misc/sdnotify-wrapper.c, diff --git a/nixpkgs/pkgs/development/skaware-packages/skalibs/default.nix b/nixpkgs/pkgs/development/skaware-packages/skalibs/default.nix index aecbceda7506..49d0363e8582 100644 --- a/nixpkgs/pkgs/development/skaware-packages/skalibs/default.nix +++ b/nixpkgs/pkgs/development/skaware-packages/skalibs/default.nix @@ -4,9 +4,7 @@ , pkgs }: -with skawarePackages; - -buildPackage { +skawarePackages.buildPackage { pname = "skalibs"; version = "2.14.1.1"; sha256 = "trebgW9LoLaAFnaw7UF5tZyMeAnu/+JttnLkBGNr78M="; diff --git a/nixpkgs/pkgs/development/skaware-packages/tipidee/default.nix b/nixpkgs/pkgs/development/skaware-packages/tipidee/default.nix index 942d37e525f9..342fe2749843 100644 --- a/nixpkgs/pkgs/development/skaware-packages/tipidee/default.nix +++ b/nixpkgs/pkgs/development/skaware-packages/tipidee/default.nix @@ -1,8 +1,6 @@ -{ skawarePackages }: +{ skawarePackages, skalibs }: -with skawarePackages; - -buildPackage { +skawarePackages.buildPackage { pname = "tipidee"; version = "0.0.3.0"; sha256 = "0dk6k86UKgJ2ioX5H2Xoga9S+SwMy9NFrK2KEKoNxCA="; diff --git a/nixpkgs/pkgs/development/skaware-packages/utmps/default.nix b/nixpkgs/pkgs/development/skaware-packages/utmps/default.nix index 406635e06168..97ea0f7ed7ce 100644 --- a/nixpkgs/pkgs/development/skaware-packages/utmps/default.nix +++ b/nixpkgs/pkgs/development/skaware-packages/utmps/default.nix @@ -1,8 +1,6 @@ -{ skawarePackages }: +{ skawarePackages, skalibs }: -with skawarePackages; - -buildPackage { +skawarePackages.buildPackage { pname = "utmps"; version = "0.1.2.2"; sha256 = "sha256-9/+jcUxllzu5X7zxUBwG/AR42TpRzqGzc+xoEcJCX1I="; diff --git a/nixpkgs/pkgs/development/tools/air/default.nix b/nixpkgs/pkgs/development/tools/air/default.nix index bb2c13a2e11c..2ce9e3d06b2f 100644 --- a/nixpkgs/pkgs/development/tools/air/default.nix +++ b/nixpkgs/pkgs/development/tools/air/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "air"; - version = "1.49.0"; + version = "1.51.0"; src = fetchFromGitHub { owner = "cosmtrek"; repo = "air"; rev = "v${version}"; - hash = "sha256-6XQakQXGFMepX29KeiLlGM6EI8tiIfmKQuqZQXYNoto="; + hash = "sha256-Vkg3QPUvhJphmZ7Ek3tuFnSEjfSy6LfctGMA07IufUU="; }; - vendorHash = "sha256-vyuXmQEjy5kPk9cKosHx0JZSZxstYtCNyfLIlRt2bnk="; + vendorHash = "sha256-dSu00NAq6hEOdJxXp+12UaUq32z53Wzla3/u+2nxqPw="; ldflags = [ "-s" "-w" "-X=main.airVersion=${version}" ]; diff --git a/nixpkgs/pkgs/development/tools/algolia-cli/default.nix b/nixpkgs/pkgs/development/tools/algolia-cli/default.nix index a7216cbfbe31..c00a01ac02f1 100644 --- a/nixpkgs/pkgs/development/tools/algolia-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/algolia-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "algolia-cli"; - version = "1.6.3"; + version = "1.6.5"; src = fetchFromGitHub { owner = "algolia"; repo = "cli"; rev = "v${version}"; - hash = "sha256-xRGWPJx4AVdUT9f7L2B5SHEOneuIlscFTHIk7XtPzS8="; + hash = "sha256-bS/xSrb1vCeYuDZj8NwEyclbYMXlejAxIoItEX8YnOs="; }; vendorHash = "sha256-cNuBTH7L2K4TgD0H9FZ9CjhE5AGXADaniGLD9Lhrtrk="; diff --git a/nixpkgs/pkgs/development/tools/ameba/default.nix b/nixpkgs/pkgs/development/tools/ameba/default.nix index adf392669635..f98ec6183f99 100644 --- a/nixpkgs/pkgs/development/tools/ameba/default.nix +++ b/nixpkgs/pkgs/development/tools/ameba/default.nix @@ -1,14 +1,14 @@ -{ lib, fetchFromGitHub, fetchpatch, crystal }: +{ lib, fetchFromGitHub, crystal }: crystal.buildCrystalPackage rec { pname = "ameba"; - version = "1.5.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "crystal-ameba"; repo = "ameba"; rev = "refs/tags/v${version}"; - hash = "sha256-TdyEnTloaciSpkPmnm+OM75sz9jaCaQ3VoDEepfescU="; + hash = "sha256-NwmsNz9YfHDk0hVwVb5zczuzvErrwPhd3rs75t/Fj+I="; }; format = "make"; diff --git a/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix b/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix index c1732d180d5a..555c7ddf4307 100644 --- a/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.43"; + version = "3.2.48"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-XzkMhI/+dOU0NJs9XW+jwbI6fZfC6cHFq0xFNw57kc8="; + hash = "sha256-B0wvUd94J+Q+ZuWitYMKYgOTSNGC4njPrUAhs1QPCuQ="; }; patches = [ @@ -39,12 +39,12 @@ python3.pkgs.buildPythonApplication rec { "pycep-parser" ]; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ pythonRelaxDepsHook setuptools-scm ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ aiodns aiohttp aiomultiprocess diff --git a/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix index a82b19a9d299..b1a4f042d5bf 100644 --- a/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.16.4"; + version = "2.16.5"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - hash = "sha256-wpiySSAs4x0KfzBLHzP4YC2GB1NpeEHQlbfAWCUaV90="; + hash = "sha256-p6jTGf8A1ENKxZryfHpdPxisQ4GuuYOP2tThj1MAEn4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index 44b8a095ef69..571a91c78131 100644 --- a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.231.0"; + version = "0.232.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - hash = "sha256-xZ6hyAnfWMwNZfkDIPV+0Cjs/HBMwBME6tZwQW38Cmk="; + hash = "sha256-hYFVfkkJFAg5Ij7kwLiMeIHYjPLElHhzDPET6kBQCSg="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/tools/analysis/snyk/default.nix b/nixpkgs/pkgs/development/tools/analysis/snyk/default.nix index 67f8516c49b9..11ee2297e61d 100644 --- a/nixpkgs/pkgs/development/tools/analysis/snyk/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/snyk/default.nix @@ -1,20 +1,27 @@ -{ buildNpmPackage, fetchFromGitHub, lib, stdenv, testers, snyk }: +{ lib +, buildNpmPackage +, fetchFromGitHub +, stdenv +, testers +, snyk +}: buildNpmPackage rec { pname = "snyk"; - version = "1.1284.0"; + version = "1.1286.0"; src = fetchFromGitHub { owner = "snyk"; repo = "cli"; - rev = "v${version}"; - hash = "sha256-CM9172gSeWf+12e6tsro6O1NtiZqUAT0EsA6LAhZ+8s="; + rev = "refs/tags/v${version}"; + hash = "sha256-tckifLV+HC7NqTeBtZI+VjZveeVbRS5+63vL8k8qE4s="; }; - npmDepsHash = "sha256-aode80HyGSyZoEiCdsnEPrVo8KSqTW0GxxsGdRyNdiQ="; + npmDepsHash = "sha256-deBtINc+P0NnCIb0jI0Mvn2zbWS6qLqCXL6nKSFGqOI="; postPatch = '' - substituteInPlace package.json --replace '"version": "1.0.0-monorepo"' '"version": "${version}"' + substituteInPlace package.json \ + --replace-fail '"version": "1.0.0-monorepo"' '"version": "${version}"' ''; env.NIX_CFLAGS_COMPILE = @@ -29,9 +36,10 @@ buildNpmPackage rec { meta = with lib; { description = "Scans and monitors projects for security vulnerabilities"; - mainProgram = "snyk"; homepage = "https://snyk.io"; + changelog = "https://github.com/snyk/cli/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; + mainProgram = "snyk"; }; } diff --git a/nixpkgs/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix b/nixpkgs/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix index 646cb81d102d..a1382df1c4f0 100644 --- a/nixpkgs/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix +++ b/nixpkgs/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-google.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tflint-ruleset-google"; - version = "0.26.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - hash = "sha256-VQm7pvZCfkZR54UeaPuKogEqhQOy5BAV7WkfwCW3C7c="; + hash = "sha256-APdAm7gBEA6LHYV3u7j3HtFmzkUqeABqOj5q3rwPO40="; }; - vendorHash = "sha256-C52b11cJE2Bu785SNlTsbgNR6Wt/YeY8l1U/9anXrMo="; + vendorHash = "sha256-n+nnftyNvCGVgEkYQIfVL7TS2QP8WpKb7l9jfeutJxw="; # upstream Makefile also does a go test $(go list ./... | grep -v integration) preCheck = '' diff --git a/nixpkgs/pkgs/development/tools/azcopy/default.nix b/nixpkgs/pkgs/development/tools/azcopy/default.nix index ed7db536bd83..b6074198be3c 100644 --- a/nixpkgs/pkgs/development/tools/azcopy/default.nix +++ b/nixpkgs/pkgs/development/tools/azcopy/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.23.0"; + version = "10.24.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "refs/tags/v${version}"; - hash = "sha256-Df45DHGA7EM4hx3iAmYNNUHjrUrkW6QniJkHaN7wNZM="; + hash = "sha256-K/Q0vlcMX6YKjvdWNzsJe1uUSS9WY8pN6SD5yiVF1Sg="; }; subPackages = [ "." ]; - vendorHash = "sha256-afqDnrmbTR6yZHT7NysysORci4b0Oh0sjpftgAXJ5Uk="; + vendorHash = "sha256-VWSr7K2WrBY4jzFv8B9ocp7GdBxTBSePMX8mLeSbKow="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix b/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix index 76301b5f4820..3ed49c05bec9 100644 --- a/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix +++ b/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix @@ -46,7 +46,9 @@ python3Packages.buildPythonApplication rec { backoff more-itertools pexpect - pytestCheckHook + + # backblaze-b2 requires pytest 7 to complete tests. + (pytestCheckHook.override { pytest = pytest_7; }) ]; preCheck = '' diff --git a/nixpkgs/pkgs/development/tools/benthos/default.nix b/nixpkgs/pkgs/development/tools/benthos/default.nix index 12d132a38e08..59e475fba209 100644 --- a/nixpkgs/pkgs/development/tools/benthos/default.nix +++ b/nixpkgs/pkgs/development/tools/benthos/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "benthos"; - version = "4.25.1"; + version = "4.26.0"; src = fetchFromGitHub { owner = "benthosdev"; repo = "benthos"; rev = "refs/tags/v${version}"; - hash = "sha256-s81svVIu/6VsZCKyDtP0TMBN6ZLxToTLGpMxRAzZLXs="; + hash = "sha256-xFh0dmiLkU/o14OCefARtvkdN4Z1hzMfamyyB/mhf9s="; }; proxyVendor = true; diff --git a/nixpkgs/pkgs/development/tools/build-managers/alire/default.nix b/nixpkgs/pkgs/development/tools/build-managers/alire/default.nix index 2eb837442ac4..b7613fe6e045 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/alire/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/alire/default.nix @@ -8,25 +8,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "alire"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "alire-project"; repo = "alire"; rev = "v${finalAttrs.version}"; - hash = "sha256-WF7spXwQR04zIGWazUrbCdeLYOzsk8C6G+cfSS6bwdE="; + hash = "sha256-fJXt3mM/v87hWumML6L3MH1O/uKkzmpE58B9nDRohzM="; fetchSubmodules = true; }; nativeBuildInputs = [ gprbuild gnat ]; - patches = [(fetchpatch { - name = "control-build-jobs.patch"; - url = "https://github.com/alire-project/alire/pull/1651.patch"; - hash = "sha256-CBQm8Doydze/KouLWuYm+WYlvnDguR/OuX8A4y4F6fo="; - })]; - postPatch = '' patchShebangs ./dev/build.sh ''; diff --git a/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix index dbed4115ebd1..89cf92aaa569 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix @@ -26,17 +26,26 @@ rec { ] }: - { lib, stdenv, fetchurl, makeWrapper, unzip, ncurses5, ncurses6, - - # The JDK/JRE used for running Gradle. - java ? defaultJava, - - # Additional JDK/JREs to be registered as toolchains. - # See https://docs.gradle.org/current/userguide/toolchains.html - javaToolchains ? [ ] + { lib + , stdenv + , fetchurl + , makeWrapper + , unzip + , ncurses5 + , ncurses6 + , testers + , runCommand + , writeText + + # The JDK/JRE used for running Gradle. + , java ? defaultJava + + # Additional JDK/JREs to be registered as toolchains. + # See https://docs.gradle.org/current/userguide/toolchains.html + , javaToolchains ? [ ] }: - stdenv.mkDerivation rec { + stdenv.mkDerivation (finalAttrs: { pname = "gradle"; inherit version; @@ -99,6 +108,29 @@ rec { echo ${ncurses6} >> $out/nix-support/manual-runtime-dependencies ''; + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = '' + env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \ + gradle --version + ''; + }; + + java-application = testers.testEqualContents { + assertion = "can build and run a trivial Java application"; + expected = writeText "expected" "hello\n"; + actual = runCommand "actual" { + nativeBuildInputs = [ finalAttrs.finalPackage ]; + src = ./tests/java-application; + } '' + cp -a $src/* . + env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \ + gradle run --no-daemon --quiet --console plain > $out + ''; + }; + }; + meta = with lib; { inherit platforms; description = "Enterprise-grade build system"; @@ -121,7 +153,7 @@ rec { maintainers = with maintainers; [ lorenzleutgeb liff ]; mainProgram = "gradle"; }; - }; + }); # NOTE: Default JDKs that are hardcoded below must be LTS versions # and respect the compatibility matrix at diff --git a/nixpkgs/pkgs/development/tools/build-managers/gradle/tests/java-application/build.gradle b/nixpkgs/pkgs/development/tools/build-managers/gradle/tests/java-application/build.gradle new file mode 100644 index 000000000000..adfea7d6a2d2 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/build-managers/gradle/tests/java-application/build.gradle @@ -0,0 +1,7 @@ +plugins { + id('application') +} + +application { + mainClass = 'Main' +} diff --git a/nixpkgs/pkgs/development/tools/build-managers/gradle/tests/java-application/src/main/java/Main.java b/nixpkgs/pkgs/development/tools/build-managers/gradle/tests/java-application/src/main/java/Main.java new file mode 100644 index 000000000000..b8e3fe91ff2b --- /dev/null +++ b/nixpkgs/pkgs/development/tools/build-managers/gradle/tests/java-application/src/main/java/Main.java @@ -0,0 +1,5 @@ +public class Main { + public static void main(String[] args) { + System.out.println("hello"); + } +} diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 997eff21adf6..e6ae2f2f8ba6 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.113.0"; + version = "0.113.1"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ws1OFcAz41uBgRIjLVU19nRdIIgdGnnBs6xthztyDmE="; + sha256 = "sha256-RAka5uYNsTq/zBT9sjdrZFY1CmJ5Vzdj1gfWvMERcPA="; }; vendorHash = "sha256-NPtQM4nm8QiHY2wSd7VHx6T5LRb7EB39x+xFzHOUcNs="; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix index fced7e79a689..e9aace248d86 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -23,13 +23,13 @@ assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes; buildDotnetModule rec { pname = "github-runner"; - version = "2.314.1"; + version = "2.315.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-PHcCXWA6LcxpqdbTGbOUqnS4fIJLbHOhEPdagGF71q0="; + hash = "sha256-kKfwLZYV4uEkHt82YWNtDehbspgnH8heckVU5aA/YiY="; leaveDotGit = true; postFetch = '' git -C $out rev-parse --short HEAD > $out/.git-revision diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix index 77ab1a8b090d..baa412d3702c 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.440.1"; + version = "2.440.2"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-Ck3uMnaGcyl0W8nSU9rYVl+rALTC8G4aItSS1tRkSV0="; + hash = "sha256-gSZijp4vjuL4B9SJ7ApuN/yfXWuoT6jzcY5/PionMS4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/cue/default.nix b/nixpkgs/pkgs/development/tools/cue/default.nix index 9ff5cc631b1f..ee9af03bb888 100644 --- a/nixpkgs/pkgs/development/tools/cue/default.nix +++ b/nixpkgs/pkgs/development/tools/cue/default.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "cue"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "cue-lang"; repo = "cue"; rev = "v${version}"; - hash = "sha256-x8DXAKrkqrZE6mxkIfjMhxZBnFbQnqWhmrvjrFjnQuc="; + hash = "sha256-7gn8/35rpbyzSP4ZM21ig6Wsq5Tp18x1Ex/IVb2iE7k="; }; - vendorHash = "sha256-Eq51sydt2eu3pSCRjepvxpU01T0vr0axx9XEk34db28="; + vendorHash = "sha256-0OZtKIDdEnQLnSj109EpGvaZvMIy7gPAZ+weHzYKGSg="; - subPackages = [ "cmd/cue" ]; + subPackages = [ "cmd/*" ]; nativeBuildInputs = [ installShellFiles ]; @@ -45,9 +45,9 @@ buildGoModule rec { meta = with lib; { description = "A data constraint language which aims to simplify tasks involving defining and using data"; - mainProgram = "cue"; homepage = "https://cuelang.org/"; license = lib.licenses.asl20; maintainers = with maintainers; [ aaronjheng ]; + mainProgram = "cue"; }; } diff --git a/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix b/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix index 18e12b613041..79b4f6ea9dc5 100644 --- a/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.4.33"; + version = "2.4.34"; src = fetchFromGitHub { owner = "AlexAkulov"; repo = "clickhouse-backup"; rev = "v${version}"; - hash = "sha256-IiREE9nzApX+SI5gWOXU8aaQyJrGZcVJarHcKhcHmyo="; + hash = "sha256-aRNPkgkWmVCzHaOHzIAPdZyofqIWX5w5U+bsO1MrKow="; }; - vendorHash = "sha256-kI2n7vNY7LQC2dLJL7b46X6Sk9ek3E66dSvEdYsxwI8="; + vendorHash = "sha256-5da3Tt4rKbzFPwYVhkkxCY/YpJePdE7WLDlTtPI8w1Q="; ldflags = [ "-X main.version=${version}" diff --git a/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix b/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix index 8db953a8dca5..dcea75d51071 100644 --- a/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix +++ b/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,21 +5,21 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "3.0.2"; + version = "3.0.3"; pyproject = true; src = fetchFromGitHub { owner = "sqlfluff"; repo = "sqlfluff"; rev = "refs/tags/${version}"; - hash = "sha256-GJpSBDxgI0UpIIVeF9dl9XzKJ2TuwWf/IOCzoTGJNRQ="; + hash = "sha256-/Zp/iAX6Y6MaXMjpk3dRYgZNhjJtl3cr/FiCyhGK9X4="; }; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ appdirs cached-property chardet diff --git a/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix b/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix index 444e947cdf4b..b0737ce85684 100644 --- a/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "timescaledb-tune"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YgG8yuHnJrhrqJHNUkMjJvKNzEQ3ClY9OQzt+ET4LEk="; + sha256 = "sha256-rOAXCru3m31lVFUyxywkuyKWUOJneA7ECMPyvAfw4mg="; }; vendorHash = "sha256-8Q+KMYu1yiHEYS035NmCvxSgIS/+oRhhcZa6SwmvGgk="; diff --git a/nixpkgs/pkgs/development/tools/detekt/default.nix b/nixpkgs/pkgs/development/tools/detekt/default.nix index 5881997e6dbe..9b51881e5c2b 100644 --- a/nixpkgs/pkgs/development/tools/detekt/default.nix +++ b/nixpkgs/pkgs/development/tools/detekt/default.nix @@ -1,13 +1,13 @@ { detekt, lib, stdenv, fetchurl, makeWrapper, jre_headless, testers }: stdenv.mkDerivation rec { pname = "detekt"; - version = "1.23.5"; + version = "1.23.6"; jarfilename = "${pname}-${version}-executable.jar"; src = fetchurl { url = "https://github.com/detekt/detekt/releases/download/v${version}/detekt-cli-${version}-all.jar"; - sha256 = "sha256-Pz+MaZimJMCjtGPy7coi6SSE7IdAQhtp2u8YV4s7KLY="; + sha256 = "sha256-iY3PgQ6JH0SeTj+fSk4tx1rs+OEInfQaQqaa2yy7z/o="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/development/tools/electron-fiddle/default.nix b/nixpkgs/pkgs/development/tools/electron-fiddle/default.nix index 5fe0a88f2528..e88d5e0fc682 100644 --- a/nixpkgs/pkgs/development/tools/electron-fiddle/default.nix +++ b/nixpkgs/pkgs/development/tools/electron-fiddle/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fetchYarnDeps , fetchurl -, fixup_yarn_lock +, prefetch-yarn-deps , git , lib , makeDesktopItem @@ -51,11 +51,11 @@ let pname = "${pname}-unwrapped"; inherit version src; - nativeBuildInputs = [ fixup_yarn_lock git nodejs util-linux yarn zip ]; + nativeBuildInputs = [ prefetch-yarn-deps git nodejs util-linux yarn zip ]; configurePhase = '' export HOME=$TMPDIR - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn config --offline set yarn-offline-mirror ${offlineCache} yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive patchShebangs node_modules diff --git a/nixpkgs/pkgs/development/tools/eslint_d/default.nix b/nixpkgs/pkgs/development/tools/eslint_d/default.nix index 1a59a96b08bf..33155c58557c 100644 --- a/nixpkgs/pkgs/development/tools/eslint_d/default.nix +++ b/nixpkgs/pkgs/development/tools/eslint_d/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "eslint_d"; - version = "13.0.0"; + version = "13.1.2"; src = fetchFromGitHub { owner = "mantoni"; repo = "eslint_d.js"; rev = "v${version}"; - hash = "sha256-tlpuJ/p+U7DuzEmy5ulY3advKN+1ID9LDjUl8fDANVs="; + hash = "sha256-2G6I6Tx6LqgZ5EpVw4ux/JXv+Iky6Coenbh51JoFg7Q="; }; - npmDepsHash = "sha256-MiuCupnzMUjwWh47SLnMRmtHBMbXdyjEZwgvaZz4JN0="; + npmDepsHash = "sha256-L6abWbSnxY6gGMXBjxobEg8cpl0p3lMST9T42QGk4yM="; dontNpmBuild = true; diff --git a/nixpkgs/pkgs/development/tools/fdroidserver/default.nix b/nixpkgs/pkgs/development/tools/fdroidserver/default.nix index 88fc8f6e4f0b..4bf70a004d3e 100644 --- a/nixpkgs/pkgs/development/tools/fdroidserver/default.nix +++ b/nixpkgs/pkgs/development/tools/fdroidserver/default.nix @@ -107,10 +107,11 @@ buildPythonApplication rec { ]; meta = with lib; { - homepage = "https://github.com/f-droid/fdroidserver"; - changelog = "https://github.com/f-droid/fdroidserver/blob/${version}/CHANGELOG.md"; + homepage = "https://gitlab.com/fdroid/fdroidserver"; + changelog = "https://gitlab.com/fdroid/fdroidserver/-/blob/${version}/CHANGELOG.md"; description = "Server and tools for F-Droid, the Free Software repository system for Android"; license = licenses.agpl3Plus; maintainers = with maintainers; [ linsui jugendhacker ]; + mainProgram = "fdroid"; }; } diff --git a/nixpkgs/pkgs/development/tools/firebase-tools/default.nix b/nixpkgs/pkgs/development/tools/firebase-tools/default.nix index 68968222bd3e..ebcf8abf0fea 100644 --- a/nixpkgs/pkgs/development/tools/firebase-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/firebase-tools/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "13.5.2"; + version = "13.6.0"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; rev = "v${version}"; - hash = "sha256-uHh9schpVs9PNivZkIp8geG60MrEDwrlo58WN3499OM="; + hash = "sha256-69fIejqLs/27nISW7b7+kPRoUiEGQF0DSGz5nkus6Us="; }; - npmDepsHash = "sha256-O3+9qqXbNLVqMP6Grh7p5rHWjOc3stG1e6zBxZSt/5M="; + npmDepsHash = "sha256-m9mAuR0lqC83uHY+b1rOLuv6bRSl9eVnYVE7pvLi9+s="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/nixpkgs/pkgs/development/tools/ginkgo/default.nix b/nixpkgs/pkgs/development/tools/ginkgo/default.nix index b5472d796e7a..549b0f14c392 100644 --- a/nixpkgs/pkgs/development/tools/ginkgo/default.nix +++ b/nixpkgs/pkgs/development/tools/ginkgo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.17.0"; + version = "2.17.1"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-g34kXd2Xcw7+iyS5F6fiMbyUbKLTUxFUrpxl+ueyl1U="; + sha256 = "sha256-fxP4+YqhYPeGVpW6VkSm3+FGnmgbKx77anSYUv41PSE="; }; vendorHash = "sha256-XtO7HiaE/xCT3tjVZzzMcO9y8Yk8Wyy1S3S1qioMaQU="; diff --git a/nixpkgs/pkgs/development/tools/go-jet/default.nix b/nixpkgs/pkgs/development/tools/go-jet/default.nix index 0f8fa8337b9e..34b8c5ef1d3c 100644 --- a/nixpkgs/pkgs/development/tools/go-jet/default.nix +++ b/nixpkgs/pkgs/development/tools/go-jet/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-jet"; - version = "2.11.0"; + version = "2.11.1"; src = fetchFromGitHub { owner = pname; repo = "jet"; rev = "v${version}"; - sha256 = "sha256-xtWDfBryNQp3MSp5EjsbyIdEx4+KoqBe3Q6MukuYVRE="; + sha256 = "sha256-1ntvvbSIqeANZhz/FKXP9cD8UVs9luMHa8pgvc6RsqE="; }; - vendorHash = "sha256-z0NMG+fvbGe3KGxO9+3NLoptZ4wfWi0ls7SK+9miCWg="; + vendorHash = "sha256-7jcUSzz/EI30PUK41u4FUUAzzl/PUKvE46A/nYwx134="; subPackages = [ "cmd/jet" ]; diff --git a/nixpkgs/pkgs/development/tools/go-mockery/default.nix b/nixpkgs/pkgs/development/tools/go-mockery/default.nix index 148e814b5568..7176bf7e3bd3 100644 --- a/nixpkgs/pkgs/development/tools/go-mockery/default.nix +++ b/nixpkgs/pkgs/development/tools/go-mockery/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.38.0"; + version = "2.42.1"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-fWS4oF/CWlOX6XgeLxsmEfPDDgp1WBSDC4fx2Aid9p0="; + sha256 = "sha256-+D91qWXv+OAZKKXllCv6cpGppzmIlwUTweN2NR/nTqU="; }; preCheck = '' - substituteInPlace ./pkg/generator_test.go --replace 0.0.0-dev ${version} - substituteInPlace ./pkg/logging/logging_test.go --replace v0.0 v${lib.versions.majorMinor version} + substituteInPlace ./pkg/generator_test.go --replace-fail 0.0.0-dev ${version} + substituteInPlace ./pkg/logging/logging_test.go --replace-fail v0.0 v${lib.versions.majorMinor version} ''; ldflags = [ @@ -24,7 +24,9 @@ buildGoModule rec { CGO_ENABLED = false; proxyVendor = true; - vendorHash = "sha256-iAZjWRW2TWKqcs94lepkcIXUPyPl9qlGhxlX84rN3ok="; + vendorHash = "sha256-FCl17nywcMoXEA3l0rOzY66Pj51rEEGdK6Zo6Y3/n34="; + + subPackages = [ "." ]; passthru.tests = { generateMock = runCommand "${pname}-test" { diff --git a/nixpkgs/pkgs/development/tools/goresym/default.nix b/nixpkgs/pkgs/development/tools/goresym/default.nix index feec2b1aecb1..7eb473ad7791 100644 --- a/nixpkgs/pkgs/development/tools/goresym/default.nix +++ b/nixpkgs/pkgs/development/tools/goresym/default.nix @@ -1,19 +1,31 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule }: +{ lib +, fetchFromGitHub +, buildGoModule +, unzip +}: buildGoModule rec { pname = "goresym"; - version = "2.3"; + version = "2.7.2"; src = fetchFromGitHub { owner = "mandiant"; repo = pname; rev = "v${version}"; - sha256 = "sha256-o2t542q6UGjWdhJkcAm34kGhPUGNsvZKf940T+vydoE="; + sha256 = "sha256-bZOq3GvGRyeIyN/CEuMA6mQjjrRvoVU9fUEUptd6NH0="; }; subPackages = [ "." ]; - vendorHash = "sha256-ElV5edbe1LQWbA1NKv52/rLZJeOLBahE4YBKg9OA7YY="; + vendorHash = "sha256-pjkBrHhIqLmSzwi1dKS5+aJrrAAIzNATOt3LgLsMtx0="; + + nativeCheckInputs = [ unzip ]; + + preCheck = '' + cd test + unzip weirdbins.zip + cd .. + ''; doCheck = true; @@ -21,6 +33,7 @@ buildGoModule rec { description = "Go symbol recovery tool"; mainProgram = "GoReSym"; homepage = "https://github.com/mandiant/GoReSym"; + changelog = "https://github.com/mandiant/GoReSym/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ thehedgeh0g ]; }; diff --git a/nixpkgs/pkgs/development/tools/hclfmt/default.nix b/nixpkgs/pkgs/development/tools/hclfmt/default.nix index 76b3ecd5b52b..07c4979ada51 100644 --- a/nixpkgs/pkgs/development/tools/hclfmt/default.nix +++ b/nixpkgs/pkgs/development/tools/hclfmt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hclfmt"; - version = "2.20.0"; + version = "2.20.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "hcl"; rev = "v${version}"; - hash = "sha256-gXipXBi/IFB4F+vr1BBp91kcIRpWvxkSttb62Cl3h0g="; + hash = "sha256-+4K6k32azx/66eag9c6lUN8TUJ1ICx4Q8zpnTJWqgQ0="; }; - vendorHash = "sha256-MXiLfCbXXw2PMlj/3eAvbReH11IzS/G/4ajV37B5lOs="; + vendorHash = "sha256-L5OabeDUXbrwFOgWRhi9FPTWK+xbL54ZM7cYhS15Jis="; # The code repository includes other tools which are not useful. Only build # hclfmt. diff --git a/nixpkgs/pkgs/development/tools/headache/default.nix b/nixpkgs/pkgs/development/tools/headache/default.nix index 52e7da939b22..5781a8a54c18 100644 --- a/nixpkgs/pkgs/development/tools/headache/default.nix +++ b/nixpkgs/pkgs/development/tools/headache/default.nix @@ -1,6 +1,8 @@ { lib, fetchFromGitHub, nix-update-script, ocamlPackages }: -with ocamlPackages; +let + inherit (ocamlPackages) buildDunePackage camomile; +in buildDunePackage rec { pname = "headache"; diff --git a/nixpkgs/pkgs/development/tools/iferr/default.nix b/nixpkgs/pkgs/development/tools/iferr/default.nix index 9a7b25a4cb40..bf970ce1e9de 100644 --- a/nixpkgs/pkgs/development/tools/iferr/default.nix +++ b/nixpkgs/pkgs/development/tools/iferr/default.nix @@ -1,29 +1,28 @@ -{ buildGoPackage +{ buildGoModule , lib , fetchFromGitHub }: -buildGoPackage rec { - pname = "iferr-unstable"; - version = "2018-06-15"; - rev = "bb332a3b1d9129b6486c7ddcb7030c11b05cfc88"; - - goPackagePath = "github.com/koron/iferr"; +buildGoModule { + pname = "iferr"; + version = "0-unstable-2024-01-22"; src = fetchFromGitHub { - inherit rev; - owner = "koron"; repo = "iferr"; - sha256 = "1nyqy1sgq2afiama4wy7wap8s03c0hiwwa0f6kwq3y59097rfc0c"; + rev = "9c3e2fbe4bd19a7f0338e42bb483562ed4cf4d50"; + hash = "sha256-qGuSsdQorb407rDl2o7w7kPCLng3W7YQsqo5JpoZFW8="; }; + vendorHash = null; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = ''Generate "if err != nil {" block''; - mainProgram = "iferr"; homepage = "https://github.com/koron/iferr"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; + mainProgram = "iferr"; }; } diff --git a/nixpkgs/pkgs/development/tools/impl/default.nix b/nixpkgs/pkgs/development/tools/impl/default.nix index c4f5ec41c4ad..c33389af05e5 100644 --- a/nixpkgs/pkgs/development/tools/impl/default.nix +++ b/nixpkgs/pkgs/development/tools/impl/default.nix @@ -2,20 +2,16 @@ buildGoModule rec { pname = "impl"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "josharian"; repo = "impl"; rev = "v${version}"; - hash = "sha256-BqRoLh0MpNQgY9OHHRBbegWGsq3Y4wOqg94rWvex76I="; + hash = "sha256-a9jAoZp/wVnTyaE4l2yWSf5aSxXEtqN6SoxU68XhRhk="; }; - vendorHash = "sha256-+5+CM5iGV54zRa7rJoQDBWrO98icNxlAv8JwATynanY="; - - preCheck = '' - export GOROOT="$(go env GOROOT)" - ''; + vendorHash = "sha256-vTqDoM/LK5SHkayLKYig+tCrXLelOoILmQGCxlTWHog="; meta = with lib; { description = "Generate method stubs for implementing an interface"; diff --git a/nixpkgs/pkgs/development/tools/infisical/default.nix b/nixpkgs/pkgs/development/tools/infisical/default.nix index e7321f826417..8fe736554352 100644 --- a/nixpkgs/pkgs/development/tools/infisical/default.nix +++ b/nixpkgs/pkgs/development/tools/infisical/default.nix @@ -15,7 +15,7 @@ let buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json); # the version of infisical - version = "0.19.0"; + version = "0.19.1"; # the platform-specific, statically linked binary src = diff --git a/nixpkgs/pkgs/development/tools/infisical/hashes.json b/nixpkgs/pkgs/development/tools/infisical/hashes.json index c6b10ee1d2fb..29c6455c399d 100644 --- a/nixpkgs/pkgs/development/tools/infisical/hashes.json +++ b/nixpkgs/pkgs/development/tools/infisical/hashes.json @@ -1,6 +1,6 @@ { "_comment": "@generated by pkgs/development/tools/infisical/update.sh" -, "x86_64-linux": "sha256-c01Nu6Avdh2nAu5HG0YVIvhpCnSmOsVSmdqw27+1CD8=" -, "x86_64-darwin": "sha256-yTjBoG6/6OXpUnG757ZNHt7brLGqnGaV1Y/XexLmAkA=" -, "aarch64-linux": "sha256-iEHP6BNCnZUhRh+dh70Hl/j8GpiQowEstJTS7gqW6ps=" -, "aarch64-darwin": "sha256-WhmHoOA3diHWmt7z+KETJ3GPX0EwrxkXQP4G6ykyLfY=" +, "x86_64-linux": "sha256-wkVYyS3VxD6WEvLhKbt21xwmbVixMthssrkkM8J7Q7Y=" +, "x86_64-darwin": "sha256-+L7k5ux49cQAUdpdBOrTdvXYDrewNb357CCb8jFNlKE=" +, "aarch64-linux": "sha256-iD8L9ICsw4Xt9UA4GdS1KICI/nU4P+qdE89RNKD81B8=" +, "aarch64-darwin": "sha256-iDdH/toB39HjBPSrFslTDNhbc4xCu7lmC7jgsOWvVJI=" } diff --git a/nixpkgs/pkgs/development/tools/java/jextract/default.nix b/nixpkgs/pkgs/development/tools/java/jextract/default.nix deleted file mode 100644 index 45879c8c64cc..000000000000 --- a/nixpkgs/pkgs/development/tools/java/jextract/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, emptyDirectory -, writeText -, makeWrapper -, gradle -, jdk21 -, llvmPackages -}: - -let - gradleInit = writeText "init.gradle" '' - logger.lifecycle 'Replacing Maven repositories with empty directory...' - gradle.projectsLoaded { - rootProject.allprojects { - buildscript { - repositories { - clear() - maven { url '${emptyDirectory}' } - } - } - repositories { - clear() - maven { url '${emptyDirectory}' } - } - } - } - settingsEvaluated { settings -> - settings.pluginManagement { - repositories { - maven { url '${emptyDirectory}' } - } - } - } - ''; -in - -stdenv.mkDerivation { - pname = "jextract"; - version = "unstable-2023-11-27"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jextract"; - rev = "8730fcf05c229d035b0db52ee6bd82622e9d03e9"; # Update jextract 21 with latest fixes - hash = "sha256-Wct/yx5C0EjDtDyXNYDH5LRmrfq7islXbPVIGBR6x5Y="; - }; - - nativeBuildInputs = [ - gradle - makeWrapper - ]; - - env = { - ORG_GRADLE_PROJECT_llvm_home = llvmPackages.libclang.lib; - ORG_GRADLE_PROJECT_jdk21_home = jdk21; - }; - - buildPhase = '' - runHook preBuild - - export GRADLE_USER_HOME=$(mktemp -d) - gradle --console plain --init-script "${gradleInit}" assemble - - runHook postBuild - ''; - - doCheck = true; - - checkPhase = '' - runHook preCheck - gradle --console plain --init-script "${gradleInit}" verify - runHook postCheck - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/opt/ - cp -r ./build/jextract $out/opt/jextract - - runHook postInstall - ''; - - postFixup = '' - makeWrapper "$out/opt/jextract/bin/jextract" "$out/bin/jextract" - ''; - - meta = with lib; { - description = "A tool which mechanically generates Java bindings from a native library headers"; - mainProgram = "jextract"; - homepage = "https://github.com/openjdk/jextract"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ sharzy ]; - }; -} diff --git a/nixpkgs/pkgs/development/tools/java/visualvm/default.nix b/nixpkgs/pkgs/development/tools/java/visualvm/default.nix index 6b5a53e92105..5346e82095d1 100644 --- a/nixpkgs/pkgs/development/tools/java/visualvm/default.nix +++ b/nixpkgs/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: stdenv.mkDerivation rec { - version = "2.1.7"; + version = "2.1.8"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "sha256-k9DnbLfpCQimRueHquDSuBDhn/w8ZyUKZzZ5o35YCNA="; + sha256 = "sha256-yWSB8mqcOG7xd4/8YjPXzGvl7BgyOLdIoyAs69+/kv4="; }; desktopItem = makeDesktopItem { diff --git a/nixpkgs/pkgs/development/tools/k6/default.nix b/nixpkgs/pkgs/development/tools/k6/default.nix index 407a7c79760e..3d1dfbd2d0b9 100644 --- a/nixpkgs/pkgs/development/tools/k6/default.nix +++ b/nixpkgs/pkgs/development/tools/k6/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k6"; - version = "0.49.0"; + version = "0.50.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - hash = "sha256-zlsHEAGsey+qe0s7sle9Kt/V0hTp6uzelJmRlATznUY="; + hash = "sha256-lR16M8TAP0ilvcrA9YjVoZMrsi+kwEFKx5Fd3birHHM="; }; subPackages = [ "./" ]; diff --git a/nixpkgs/pkgs/development/tools/language-servers/crystalline/default.nix b/nixpkgs/pkgs/development/tools/language-servers/crystalline/default.nix index 7e0bc27faceb..779bb27f9976 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/crystalline/default.nix +++ b/nixpkgs/pkgs/development/tools/language-servers/crystalline/default.nix @@ -7,7 +7,7 @@ }: let - version = "0.10.0"; + version = "0.12.1"; in crystal.buildCrystalPackage { pname = "crystalline"; @@ -17,7 +17,7 @@ crystal.buildCrystalPackage { owner = "elbywan"; repo = "crystalline"; rev = "v${version}"; - hash = "sha256-g4k/vP7yYbTAy2bTAfr6HQhkskWfI6Zv2lxP+AZf6yw="; + hash = "sha256-b/j1V5JlT+rjWYAA8nrE0PWHrzQq4rUZxZlADMmtpBk="; }; format = "crystal"; diff --git a/nixpkgs/pkgs/development/tools/language-servers/gopls/default.nix b/nixpkgs/pkgs/development/tools/language-servers/gopls/default.nix index 63937dbfe865..509eb290c2e8 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/gopls/default.nix +++ b/nixpkgs/pkgs/development/tools/language-servers/gopls/default.nix @@ -14,6 +14,9 @@ buildGoModule rec { modRoot = "gopls"; vendorHash = "sha256-q7vWiXJAX4u8B4RyFc7kg1BvMCPaTBFOVkWXeE78Emo="; + # https://github.com/golang/tools/blob/9ed98faa/gopls/main.go#L27-L30 + ldflags = [ "-X main.version=v${version}" ]; + doCheck = false; # Only build gopls, and not the integration tests or documentation generator. diff --git a/nixpkgs/pkgs/development/tools/language-servers/jq-lsp/default.nix b/nixpkgs/pkgs/development/tools/language-servers/jq-lsp/default.nix index 13f852790662..6952bea00d63 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/jq-lsp/default.nix +++ b/nixpkgs/pkgs/development/tools/language-servers/jq-lsp/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { # based on https://github.com/wader/jq-lsp/blob/master/.goreleaser.yml CGO_ENABLED = 0; - GOFLAGS = [ "-trimpath" ]; + ldflags = [ "-s" "-w" diff --git a/nixpkgs/pkgs/development/tools/language-servers/postgres-lsp/default.nix b/nixpkgs/pkgs/development/tools/language-servers/postgres-lsp/default.nix index 6f9e41cb3c86..33855391ea5a 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/postgres-lsp/default.nix +++ b/nixpkgs/pkgs/development/tools/language-servers/postgres-lsp/default.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "postgres-lsp"; - version = "unstable-2024-01-11"; + version = "0-unstable-2024-03-24"; src = fetchFromGitHub { owner = "supabase"; repo = "postgres_lsp"; - rev = "bbc24cc541cd1619997193ed81ad887252c7e467"; - hash = "sha256-llVsHSEUDRsqjSTGr3hGUK6jYlKPX60rpjngBk1TG2Y="; + rev = "43ca9b675cb152ca7f38cfa6aff6dd2131dfa9a2"; + hash = "sha256-n7Qbt9fGzC0CcleAtTWDInPz4oaPjI+pvIPrR5EYJ9U="; fetchSubmodules = true; }; - cargoHash = "sha256-Npx/sSbMr4PKnNPslvjpOyKH0bpQLzW6cLNW+7H/TQ0="; + cargoHash = "sha256-UEcHlkbYMA6xETMryWXsDHyAZYtLncRJn2jA6tvw7gQ="; nativeBuildInputs = [ protobuf diff --git a/nixpkgs/pkgs/development/tools/manifest-tool/default.nix b/nixpkgs/pkgs/development/tools/manifest-tool/default.nix index 8bf6ed9804c6..e4688cb60d8b 100644 --- a/nixpkgs/pkgs/development/tools/manifest-tool/default.nix +++ b/nixpkgs/pkgs/development/tools/manifest-tool/default.nix @@ -9,14 +9,14 @@ buildGoModule rec { pname = "manifest-tool"; - version = "2.1.5"; + version = "2.1.6"; modRoot = "v2"; src = fetchFromGitHub { owner = "estesp"; repo = "manifest-tool"; rev = "v${version}"; - hash = "sha256-TCR8A35oETAZszrZFtNZulzCsh9UwGueTyHyYe+JQeI="; + hash = "sha256-/u60hi/KnPVWlNh6nxjXpH0ct5PLVE44deGxhzbayD0="; leaveDotGit = true; postFetch = '' git -C $out rev-parse HEAD > $out/.git-revision diff --git a/nixpkgs/pkgs/development/tools/misc/fzf-make/default.nix b/nixpkgs/pkgs/development/tools/misc/fzf-make/default.nix index c51e14bc3cd6..c27b79d699ce 100644 --- a/nixpkgs/pkgs/development/tools/misc/fzf-make/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/fzf-make/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "fzf-make"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "kyu08"; repo = "fzf-make"; rev = "v${version}"; - hash = "sha256-jElKCOCTG33ysePz4SfrbN9xWdTB83G+/9DUqNKI6x8="; + hash = "sha256-rmQR1XnNJQnTz9vS+UWPpfFakgkVwNZasjRlNwk4p68="; }; - cargoHash = "sha256-kXp/2F32aJFQ5z0TeggZWv1S2rDpnTPEYyHNZCtEjtg="; + cargoHash = "sha256-QXyibZHqhK6Jhh6Qu73o2o6hABpNWPIxS4tR5IXLNkc="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/misc/go-md2man/default.nix b/nixpkgs/pkgs/development/tools/misc/go-md2man/default.nix index 86d27a587b73..ee8b8d38b565 100644 --- a/nixpkgs/pkgs/development/tools/misc/go-md2man/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/go-md2man/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "go-md2man"; - version = "2.0.3"; + version = "2.0.4"; - vendorHash = null; + vendorHash = "sha256-aMLL/tmRLyGze3RSB9dKnoTv5ZK1eRtgV8fkajWEbU0="; src = fetchFromGitHub { rev = "v${version}"; owner = "cpuguy83"; repo = "go-md2man"; - sha256 = "sha256-bgAuN+pF9JekCQ/Eg4ph3WDv3RP8MB/10GDp1JMp9Kg="; + sha256 = "sha256-pQ+H8Psh92KWTang8hK0cHFLomH+4X0rMMilIJUQ4Qc="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/misc/grpc-client-cli/default.nix b/nixpkgs/pkgs/development/tools/misc/grpc-client-cli/default.nix index 5a337aafb9e9..aac07b56e2d5 100644 --- a/nixpkgs/pkgs/development/tools/misc/grpc-client-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/grpc-client-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpc-client-cli"; - version = "1.20.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "vadimi"; repo = "grpc-client-cli"; rev = "v${version}"; - sha256 = "sha256-MqzuVPY/IuJWfdzHvC/keTe5yi0aMhvq8SoKDlRAI0w="; + sha256 = "sha256-r3gbQntlWZ8Y2KiJOVkpzdakKnQUX2NIhk3eAyjnIV4="; }; - vendorHash = "sha256-eRT1xMy9lsvF5sUF9jyDUWfNyLThIDTksaXff7xqyic="; + vendorHash = "sha256-23DdG/lLwzpgSRk9S6p1aNMh+AFzhO2qX2EE1EUovz8="; meta = with lib; { description = "generic gRPC command line client"; diff --git a/nixpkgs/pkgs/development/tools/misc/terser/default.nix b/nixpkgs/pkgs/development/tools/misc/terser/default.nix index 2b9052ad79e6..ba30c6a4ffcd 100644 --- a/nixpkgs/pkgs/development/tools/misc/terser/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/terser/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "terser"; - version = "5.29.2"; + version = "5.30.0"; src = fetchFromGitHub { owner = "terser"; repo = "terser"; rev = "v${version}"; - hash = "sha256-VGQ/mgMeeNA0koYgmb6PAZqBdVljgqY3MwuG0RLllCU="; + hash = "sha256-d3vnCEb9HzydpxsuoX66KqUtgYYt/+L2AcpZNFDleoY="; }; - npmDepsHash = "sha256-8wKvV3vSzF6WdHzox1LXVi2FmeZf7qSo2rg93uCN3fI="; + npmDepsHash = "sha256-wrxa6/TKYb/pqT4zjTVbfONSYqko12pVzBQ9Ojm7H2o="; meta = with lib; { description = "JavaScript parser, mangler and compressor toolkit for ES6+"; diff --git a/nixpkgs/pkgs/development/tools/misc/texlab/default.nix b/nixpkgs/pkgs/development/tools/misc/texlab/default.nix index 9a6a1ad33139..6c3b1707a405 100644 --- a/nixpkgs/pkgs/development/tools/misc/texlab/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/texlab/default.nix @@ -15,16 +15,16 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.13.1"; + version = "5.14.1"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - hash = "sha256-fmtNalpOOPEiMO5zDD6m01cDfFuaLQsYPk6cc7yvjog="; + hash = "sha256-OqnV0ZpriiH69cTlmqPxorCgeO3x5h15e5Crn7DPwBM="; }; - cargoHash = "sha256-5ojXplzkBwchnSZLkwR5jz8WgyEA14Y1iVQ+Q19U8Tg="; + cargoHash = "sha256-V5FP24Cz1umffFD1Am4/IG3c7zKpT7MdghLpKvDxZwA="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { # generate the man page postInstall = lib.optionalString (!isCross) '' # TexLab builds man page separately in CI: - # https://github.com/latex-lsp/texlab/blob/v5.13.1/.github/workflows/publish.yml#L117-L121 + # https://github.com/latex-lsp/texlab/blob/v5.14.1/.github/workflows/publish.yml#L117-L121 help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 ''; @@ -50,11 +50,11 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "An implementation of the Language Server Protocol for LaTeX"; - mainProgram = "texlab"; homepage = "https://github.com/latex-lsp/texlab"; changelog = "https://github.com/latex-lsp/texlab/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ doronbehar kira-bruneau ]; platforms = platforms.all; + mainProgram = "texlab"; }; } diff --git a/nixpkgs/pkgs/development/tools/mongosh/package-lock.json b/nixpkgs/pkgs/development/tools/mongosh/package-lock.json index f0fae4c8e245..13dcac0bb514 100644 --- a/nixpkgs/pkgs/development/tools/mongosh/package-lock.json +++ b/nixpkgs/pkgs/development/tools/mongosh/package-lock.json @@ -1,15 +1,15 @@ { "name": "mongosh", - "version": "2.2.1", + "version": "2.2.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mongosh", - "version": "2.2.1", + "version": "2.2.2", "license": "Apache-2.0", "dependencies": { - "@mongosh/cli-repl": "2.2.1" + "@mongosh/cli-repl": "2.2.2" }, "bin": { "mongosh": "bin/mongosh.js" @@ -122,22 +122,22 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/@aws-sdk/client-cognito-identity": { - "version": "3.535.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.535.0.tgz", - "integrity": "sha512-7n9WAXAQzDgdaNkZlgdX+dmCW30tCrq3NpPs/f1WFWcF6g+s06ULkuWywTU+usG6ZTuRtajFKy2oMkMv9Wor0g==", + "version": "3.540.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.540.0.tgz", + "integrity": "sha512-03vUaIKjvdcOmjDi8Fv9JgY+VQrt9QBpRkI8A1lrdPNgWqTEZXZi/zBsFRsxTe6hgsrZtxVnxLu6krSRILuqtw==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.535.0", + "@aws-sdk/client-sts": "3.540.0", "@aws-sdk/core": "3.535.0", - "@aws-sdk/credential-provider-node": "3.535.0", + "@aws-sdk/credential-provider-node": "3.540.0", "@aws-sdk/middleware-host-header": "3.535.0", "@aws-sdk/middleware-logger": "3.535.0", "@aws-sdk/middleware-recursion-detection": "3.535.0", - "@aws-sdk/middleware-user-agent": "3.535.0", + "@aws-sdk/middleware-user-agent": "3.540.0", "@aws-sdk/region-config-resolver": "3.535.0", "@aws-sdk/types": "3.535.0", - "@aws-sdk/util-endpoints": "3.535.0", + "@aws-sdk/util-endpoints": "3.540.0", "@aws-sdk/util-user-agent-browser": "3.535.0", "@aws-sdk/util-user-agent-node": "3.535.0", "@smithy/config-resolver": "^2.2.0", @@ -172,9 +172,9 @@ } }, "node_modules/@aws-sdk/client-sso": { - "version": "3.535.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso/-/client-sso-3.535.0.tgz", - "integrity": "sha512-h9eQRdFnjDRVBnPJIKXuX7D+isSAioIfZPC4PQwsL5BscTRlk4c90DX0R0uk64YUtp7LZu8TNtrosFZ/1HtTrQ==", + "version": "3.540.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso/-/client-sso-3.540.0.tgz", + "integrity": "sha512-rrQZMuw4sxIo3eyAUUzPQRA336mPRnrAeSlSdVHBKZD8Fjvoy0lYry2vNhkPLpFZLso1J66KRyuIv4LzRR3v1Q==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", @@ -182,10 +182,10 @@ "@aws-sdk/middleware-host-header": "3.535.0", "@aws-sdk/middleware-logger": "3.535.0", "@aws-sdk/middleware-recursion-detection": "3.535.0", - "@aws-sdk/middleware-user-agent": "3.535.0", + "@aws-sdk/middleware-user-agent": "3.540.0", "@aws-sdk/region-config-resolver": "3.535.0", "@aws-sdk/types": "3.535.0", - "@aws-sdk/util-endpoints": "3.535.0", + "@aws-sdk/util-endpoints": "3.540.0", "@aws-sdk/util-user-agent-browser": "3.535.0", "@aws-sdk/util-user-agent-node": "3.535.0", "@smithy/config-resolver": "^2.2.0", @@ -220,21 +220,21 @@ } }, "node_modules/@aws-sdk/client-sso-oidc": { - "version": "3.535.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.535.0.tgz", - "integrity": "sha512-M2cG4EQXDpAJQyq33ORIr6abmdX9p9zX0ssVy8XwFNB7lrgoIKxuVoGL+fX+XMgecl24x7ELz6b4QlILOevbCw==", + "version": "3.540.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.540.0.tgz", + "integrity": "sha512-LZYK0lBRQK8D8M3Sqc96XiXkAV2v70zhTtF6weyzEpgwxZMfSuFJjs0jFyhaeZBZbZv7BBghIdhJ5TPavNxGMQ==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.535.0", + "@aws-sdk/client-sts": "3.540.0", "@aws-sdk/core": "3.535.0", "@aws-sdk/middleware-host-header": "3.535.0", "@aws-sdk/middleware-logger": "3.535.0", "@aws-sdk/middleware-recursion-detection": "3.535.0", - "@aws-sdk/middleware-user-agent": "3.535.0", + "@aws-sdk/middleware-user-agent": "3.540.0", "@aws-sdk/region-config-resolver": "3.535.0", "@aws-sdk/types": "3.535.0", - "@aws-sdk/util-endpoints": "3.535.0", + "@aws-sdk/util-endpoints": "3.540.0", "@aws-sdk/util-user-agent-browser": "3.535.0", "@aws-sdk/util-user-agent-node": "3.535.0", "@smithy/config-resolver": "^2.2.0", @@ -268,13 +268,13 @@ "node": ">=14.0.0" }, "peerDependencies": { - "@aws-sdk/credential-provider-node": "^3.535.0" + "@aws-sdk/credential-provider-node": "^3.540.0" } }, "node_modules/@aws-sdk/client-sts": { - "version": "3.535.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sts/-/client-sts-3.535.0.tgz", - "integrity": "sha512-ii9OOm3TJwP3JmO1IVJXKWIShVKPl0VtdlgROc/SkDglO/kuAw9eDdlROgc+qbFl+gm6bBTguOVTUXt3tS3flw==", + "version": "3.540.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sts/-/client-sts-3.540.0.tgz", + "integrity": "sha512-ITHUQxvpqfQX6obfpIi3KYGzZYfe/I5Ixjfxoi5lB7ISCtmxqObKB1fzD93wonkMJytJ7LUO8panZl/ojiJ1uw==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", @@ -282,10 +282,10 @@ "@aws-sdk/middleware-host-header": "3.535.0", "@aws-sdk/middleware-logger": "3.535.0", "@aws-sdk/middleware-recursion-detection": "3.535.0", - "@aws-sdk/middleware-user-agent": "3.535.0", + "@aws-sdk/middleware-user-agent": "3.540.0", "@aws-sdk/region-config-resolver": "3.535.0", "@aws-sdk/types": "3.535.0", - "@aws-sdk/util-endpoints": "3.535.0", + "@aws-sdk/util-endpoints": "3.540.0", "@aws-sdk/util-user-agent-browser": "3.535.0", "@aws-sdk/util-user-agent-node": "3.535.0", "@smithy/config-resolver": "^2.2.0", @@ -319,7 +319,7 @@ "node": ">=14.0.0" }, "peerDependencies": { - "@aws-sdk/credential-provider-node": "^3.535.0" + "@aws-sdk/credential-provider-node": "^3.540.0" } }, "node_modules/@aws-sdk/core": { @@ -340,11 +340,11 @@ } }, "node_modules/@aws-sdk/credential-provider-cognito-identity": { - "version": "3.535.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.535.0.tgz", - "integrity": "sha512-Lc+RJTNzp22H31W/O7iSmCZUP+KYZMuzK8hKU4/RXo7D8t/cFLb4VpvvcCCa4UOZqdmxVqEhwc1oXyMkoszITQ==", + "version": "3.540.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.540.0.tgz", + "integrity": "sha512-XOTAIuVgticX+43GMpRbi5OHmJAhHfoHYsVGu0eRLhri1yFqUHXJgHUd51QQtlA8cFQN7JnFFM6sF5EDCPF49g==", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.535.0", + "@aws-sdk/client-cognito-identity": "3.540.0", "@aws-sdk/types": "3.535.0", "@smithy/property-provider": "^2.2.0", "@smithy/types": "^2.12.0", @@ -388,15 +388,15 @@ } }, "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.535.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.535.0.tgz", - "integrity": "sha512-bm3XOYlyCjtAb8eeHXLrxqRxYVRw2Iqv9IufdJb4gM13TbNSYniUT1WKaHxGIZ5p+FuNlXVhvk1OpHFM13+gXA==", + "version": "3.540.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.540.0.tgz", + "integrity": "sha512-igN/RbsnulIBwqXbwsWmR3srqmtbPF1dm+JteGvUY31FW65fTVvWvSr945Y/cf1UbhPmIQXntlsqESqpkhTHwg==", "dependencies": { - "@aws-sdk/client-sts": "3.535.0", + "@aws-sdk/client-sts": "3.540.0", "@aws-sdk/credential-provider-env": "3.535.0", "@aws-sdk/credential-provider-process": "3.535.0", - "@aws-sdk/credential-provider-sso": "3.535.0", - "@aws-sdk/credential-provider-web-identity": "3.535.0", + "@aws-sdk/credential-provider-sso": "3.540.0", + "@aws-sdk/credential-provider-web-identity": "3.540.0", "@aws-sdk/types": "3.535.0", "@smithy/credential-provider-imds": "^2.3.0", "@smithy/property-provider": "^2.2.0", @@ -409,16 +409,16 @@ } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.535.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.535.0.tgz", - "integrity": "sha512-6JXp/EuL6euUkH5k4d+lQFF6gBwukrcCOWfNHCmq14mNJf/cqT3HAX1VMtWFRSK20am0IxfYQGccb0/nZykdKg==", + "version": "3.540.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.540.0.tgz", + "integrity": "sha512-HKQZJbLHlrHX9A0B1poiYNXIIQfy8whTjuosTCYKPDBhhUyVAQfxy/KG726j0v43IhaNPLgTGZCJve4hAsazSw==", "dependencies": { "@aws-sdk/credential-provider-env": "3.535.0", "@aws-sdk/credential-provider-http": "3.535.0", - "@aws-sdk/credential-provider-ini": "3.535.0", + "@aws-sdk/credential-provider-ini": "3.540.0", "@aws-sdk/credential-provider-process": "3.535.0", - "@aws-sdk/credential-provider-sso": "3.535.0", - "@aws-sdk/credential-provider-web-identity": "3.535.0", + "@aws-sdk/credential-provider-sso": "3.540.0", + "@aws-sdk/credential-provider-web-identity": "3.540.0", "@aws-sdk/types": "3.535.0", "@smithy/credential-provider-imds": "^2.3.0", "@smithy/property-provider": "^2.2.0", @@ -446,12 +446,12 @@ } }, "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.535.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.535.0.tgz", - "integrity": "sha512-2Dw0YIr8ETdFpq65CC4zK8ZIEbX78rXoNRZXUGNQW3oSKfL0tj8O8ErY6kg1IdEnYbGnEQ35q6luZ5GGNKLgDg==", + "version": "3.540.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.540.0.tgz", + "integrity": "sha512-tKkFqK227LF5ajc5EL6asXS32p3nkofpP8G7NRpU7zOEOQCg01KUc4JRX+ItI0T007CiN1J19yNoFqHLT/SqHg==", "dependencies": { - "@aws-sdk/client-sso": "3.535.0", - "@aws-sdk/token-providers": "3.535.0", + "@aws-sdk/client-sso": "3.540.0", + "@aws-sdk/token-providers": "3.540.0", "@aws-sdk/types": "3.535.0", "@smithy/property-provider": "^2.2.0", "@smithy/shared-ini-file-loader": "^2.4.0", @@ -463,11 +463,11 @@ } }, "node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.535.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.535.0.tgz", - "integrity": "sha512-t2/JWrKY0H66A7JW7CqX06/DG2YkJddikt5ymdQvx/Q7dRMJ3d+o/vgjoKr7RvEx/pNruCeyM1599HCvwrVMrg==", + "version": "3.540.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.540.0.tgz", + "integrity": "sha512-OpDm9w3A168B44hSjpnvECP4rvnFzD86rN4VYdGADuCvEa5uEcdA/JuT5WclFPDqdWEmFBqS1pxBIJBf0g2Q9Q==", "dependencies": { - "@aws-sdk/client-sts": "3.535.0", + "@aws-sdk/client-sts": "3.540.0", "@aws-sdk/types": "3.535.0", "@smithy/property-provider": "^2.2.0", "@smithy/types": "^2.12.0", @@ -478,21 +478,21 @@ } }, "node_modules/@aws-sdk/credential-providers": { - "version": "3.535.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-providers/-/credential-providers-3.535.0.tgz", - "integrity": "sha512-rC3TguTFbeua3EyTwGm84xeARKE1RO0oIWdtuTmSS5ZCPwllcePGkOVg7gQiPRc01Ebj816S/6P2QbvAfSUxqA==", - "dependencies": { - "@aws-sdk/client-cognito-identity": "3.535.0", - "@aws-sdk/client-sso": "3.535.0", - "@aws-sdk/client-sts": "3.535.0", - "@aws-sdk/credential-provider-cognito-identity": "3.535.0", + "version": "3.540.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-providers/-/credential-providers-3.540.0.tgz", + "integrity": "sha512-tAmvqdZngCrER5/AAwTmDSjO05LGIshKL+lwcJr2OUV5jtQVzfbFrorf+b5dnI+3i8+zGcEAV9omra4XGrO9Kg==", + "dependencies": { + "@aws-sdk/client-cognito-identity": "3.540.0", + "@aws-sdk/client-sso": "3.540.0", + "@aws-sdk/client-sts": "3.540.0", + "@aws-sdk/credential-provider-cognito-identity": "3.540.0", "@aws-sdk/credential-provider-env": "3.535.0", "@aws-sdk/credential-provider-http": "3.535.0", - "@aws-sdk/credential-provider-ini": "3.535.0", - "@aws-sdk/credential-provider-node": "3.535.0", + "@aws-sdk/credential-provider-ini": "3.540.0", + "@aws-sdk/credential-provider-node": "3.540.0", "@aws-sdk/credential-provider-process": "3.535.0", - "@aws-sdk/credential-provider-sso": "3.535.0", - "@aws-sdk/credential-provider-web-identity": "3.535.0", + "@aws-sdk/credential-provider-sso": "3.540.0", + "@aws-sdk/credential-provider-web-identity": "3.540.0", "@aws-sdk/types": "3.535.0", "@smithy/credential-provider-imds": "^2.3.0", "@smithy/property-provider": "^2.2.0", @@ -545,12 +545,12 @@ } }, "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.535.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.535.0.tgz", - "integrity": "sha512-Uvb2WJ+zdHdCOtsWVPI/M0BcfNrjOYsicDZWtaljucRJKLclY5gNWwD+RwIC+8b5TvfnVOlH+N5jhvpi5Impog==", + "version": "3.540.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.540.0.tgz", + "integrity": "sha512-8Rd6wPeXDnOYzWj1XCmOKcx/Q87L0K1/EHqOBocGjLVbN3gmRxBvpmR1pRTjf7IsWfnnzN5btqtcAkfDPYQUMQ==", "dependencies": { "@aws-sdk/types": "3.535.0", - "@aws-sdk/util-endpoints": "3.535.0", + "@aws-sdk/util-endpoints": "3.540.0", "@smithy/protocol-http": "^3.3.0", "@smithy/types": "^2.12.0", "tslib": "^2.6.2" @@ -576,11 +576,11 @@ } }, "node_modules/@aws-sdk/token-providers": { - "version": "3.535.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/token-providers/-/token-providers-3.535.0.tgz", - "integrity": "sha512-4g+l/B9h1H/SiDtFRosW3pMwc+3PTXljZit+5NUBcET2XqcdUyHmgj3lBdu+CJ9CHdIMggRalYMAFXnRFe3Psg==", + "version": "3.540.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/token-providers/-/token-providers-3.540.0.tgz", + "integrity": "sha512-9BvtiVEZe5Ev88Wa4ZIUbtT6BVcPwhxmVInQ6c12MYNb0WNL54BN6wLy/eknAfF05gpX2/NDU2pUDOyMPdm/+g==", "dependencies": { - "@aws-sdk/client-sso-oidc": "3.535.0", + "@aws-sdk/client-sso-oidc": "3.540.0", "@aws-sdk/types": "3.535.0", "@smithy/property-provider": "^2.2.0", "@smithy/shared-ini-file-loader": "^2.4.0", @@ -604,9 +604,9 @@ } }, "node_modules/@aws-sdk/util-endpoints": { - "version": "3.535.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/util-endpoints/-/util-endpoints-3.535.0.tgz", - "integrity": "sha512-c8TlaQsiPchOOmTTR6qvHCO2O7L7NJwlKWAoQJ2GqWDZuC5es/fyuF2rp1h+ZRrUVraUomS0YdGkAmaDC7hJQg==", + "version": "3.540.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/util-endpoints/-/util-endpoints-3.540.0.tgz", + "integrity": "sha512-1kMyQFAWx6f8alaI6UT65/5YW/7pDWAKAdNwL6vuJLea03KrZRX3PMoONOSJpAS5m3Ot7HlWZvf3wZDNTLELZw==", "dependencies": { "@aws-sdk/types": "3.535.0", "@smithy/types": "^2.12.0", @@ -690,12 +690,12 @@ } }, "node_modules/@babel/core": { - "version": "7.24.1", - "resolved": "https://registry.npmmirror.com/@babel/core/-/core-7.24.1.tgz", - "integrity": "sha512-F82udohVyIgGAY2VVj/g34TpFUG606rumIHjTfVbssPg2zTR7PuuEpZcX8JA6sgBfIYmJrFtWgPvHQuJamVqZQ==", + "version": "7.24.3", + "resolved": "https://registry.npmmirror.com/@babel/core/-/core-7.24.3.tgz", + "integrity": "sha512-5FcvN1JHw2sHJChotgx8Ek0lyuh4kCKelgMTTqhYJJtloNvUfpAFMeNQUtdlIaktwrSV9LtCdqwk48wL2wBacQ==", "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.24.1", + "@babel/code-frame": "^7.24.2", "@babel/generator": "^7.24.1", "@babel/helper-compilation-targets": "^7.23.6", "@babel/helper-module-transforms": "^7.23.3", @@ -791,9 +791,9 @@ } }, "node_modules/@babel/helper-module-imports": { - "version": "7.24.1", - "resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.24.1.tgz", - "integrity": "sha512-HfEWzysMyOa7xI5uQHc/OcZf67/jc+xe/RZlznWQHhbb8Pg1SkRdbK4yEi61aY8wxQA7PkSfoojtLQP/Kpe3og==", + "version": "7.24.3", + "resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz", + "integrity": "sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==", "dependencies": { "@babel/types": "^7.24.0" }, @@ -1168,12 +1168,12 @@ } }, "node_modules/@mongosh/arg-parser": { - "version": "2.2.1", - "resolved": "https://registry.npmmirror.com/@mongosh/arg-parser/-/arg-parser-2.2.1.tgz", - "integrity": "sha512-qz/RDf0go1irs/c/B5ZjN1OwPNplm8cQJU8eB037NVg0jCuDn/V+ERw3cSkinYdN1iZgLDtE/l3rgmEvkxz9Yg==", + "version": "2.2.2", + "resolved": "https://registry.npmmirror.com/@mongosh/arg-parser/-/arg-parser-2.2.2.tgz", + "integrity": "sha512-jonJbUjRBmMTgd1y3loyG09GJoYRZW/heWCbRGq5K9Gc4QHYDKwWPS8yaGTaw168UaBkCoCsSySNRs9MI0wJWA==", "dependencies": { - "@mongosh/errors": "2.2.1", - "@mongosh/i18n": "2.2.1", + "@mongosh/errors": "2.2.2", + "@mongosh/i18n": "2.2.2", "mongodb-connection-string-url": "^3.0.0" }, "engines": { @@ -1181,9 +1181,9 @@ } }, "node_modules/@mongosh/async-rewriter2": { - "version": "2.2.1", - "resolved": "https://registry.npmmirror.com/@mongosh/async-rewriter2/-/async-rewriter2-2.2.1.tgz", - "integrity": "sha512-xlSoweQUlX5nwW2FTOssQPpoJGZX1gZhfkaZ8qoanUdUMGDN+FfwjhUxMf8vUlOP8s899PUqDktCfc4UYo31mQ==", + "version": "2.2.2", + "resolved": "https://registry.npmmirror.com/@mongosh/async-rewriter2/-/async-rewriter2-2.2.2.tgz", + "integrity": "sha512-9F/rVauIZlxMFtVzddW5fs2a8Sr5/54Bc4qoBbwUjkGkV/I62Zx2fwoUm/JUM8iwnJwmXbjA/z0aK7div1OOdg==", "dependencies": { "@babel/core": "^7.22.8", "@babel/plugin-transform-destructuring": "^7.22.5", @@ -1200,12 +1200,12 @@ } }, "node_modules/@mongosh/autocomplete": { - "version": "2.2.1", - "resolved": "https://registry.npmmirror.com/@mongosh/autocomplete/-/autocomplete-2.2.1.tgz", - "integrity": "sha512-M02TfYQvIXy7HWWXT36aEvZ/LfkurET4F1M7y4J9aVb5GL6j3pkSmubOjJNzwkt9vEIJlHFlJFQfPDgq5DWFUA==", + "version": "2.2.2", + "resolved": "https://registry.npmmirror.com/@mongosh/autocomplete/-/autocomplete-2.2.2.tgz", + "integrity": "sha512-S7awMS1OBQHXyjpU7QglzwuzcYbkb+emFA+ox7rAEGUFfjxnHT+TN69SiNO6Hm63ryq+2w/lXyuAnLzml8ZdTA==", "dependencies": { "@mongodb-js/mongodb-constants": "^0.8.10", - "@mongosh/shell-api": "2.2.1", + "@mongosh/shell-api": "2.2.2", "semver": "^7.5.4" }, "engines": { @@ -1213,25 +1213,25 @@ } }, "node_modules/@mongosh/cli-repl": { - "version": "2.2.1", - "resolved": "https://registry.npmmirror.com/@mongosh/cli-repl/-/cli-repl-2.2.1.tgz", - "integrity": "sha512-KrnRS5IzdIvWG46n274Ay2c9ZhiMJqJryExNjs00H56VjepGq2HY7hop3U9vY31eQ/s+xLjzChR9qNJ+2E9WwA==", - "dependencies": { - "@mongosh/arg-parser": "2.2.1", - "@mongosh/autocomplete": "2.2.1", - "@mongosh/editor": "2.2.1", - "@mongosh/errors": "2.2.1", - "@mongosh/history": "2.2.1", - "@mongosh/i18n": "2.2.1", - "@mongosh/import-node-fetch": "2.2.1", - "@mongosh/js-multiline-to-singleline": "2.2.1", - "@mongosh/logging": "2.2.1", - "@mongosh/service-provider-core": "2.2.1", - "@mongosh/service-provider-server": "2.2.1", - "@mongosh/shell-api": "2.2.1", - "@mongosh/shell-evaluator": "2.2.1", - "@mongosh/snippet-manager": "2.2.1", - "@mongosh/types": "2.2.1", + "version": "2.2.2", + "resolved": "https://registry.npmmirror.com/@mongosh/cli-repl/-/cli-repl-2.2.2.tgz", + "integrity": "sha512-dPzJ+PN+xFzJ+11iGSMwzeQRcm8i+gUicc+BH2Oj5Y6pw4/Zljuk7uycu6nf5MMqxgzVyozaHfEUocOox59+1g==", + "dependencies": { + "@mongosh/arg-parser": "2.2.2", + "@mongosh/autocomplete": "2.2.2", + "@mongosh/editor": "2.2.2", + "@mongosh/errors": "2.2.2", + "@mongosh/history": "2.2.2", + "@mongosh/i18n": "2.2.2", + "@mongosh/import-node-fetch": "2.2.2", + "@mongosh/js-multiline-to-singleline": "2.2.2", + "@mongosh/logging": "2.2.2", + "@mongosh/service-provider-core": "2.2.2", + "@mongosh/service-provider-server": "2.2.2", + "@mongosh/shell-api": "2.2.2", + "@mongosh/shell-evaluator": "2.2.2", + "@mongosh/snippet-manager": "2.2.2", + "@mongosh/types": "2.2.2", "@segment/analytics-node": "^1.3.0", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^1.0.0", @@ -1262,15 +1262,15 @@ } }, "node_modules/@mongosh/editor": { - "version": "2.2.1", - "resolved": "https://registry.npmmirror.com/@mongosh/editor/-/editor-2.2.1.tgz", - "integrity": "sha512-z0nxSIVvCiR+kG2md24diMNou/9NBQvhn5334OeGyNk6y3/EEp52VN9Grmk9HL70d1tfr0A8F7c3kUpwJ6Q3XQ==", - "dependencies": { - "@mongosh/js-multiline-to-singleline": "2.2.1", - "@mongosh/service-provider-core": "2.2.1", - "@mongosh/shell-api": "2.2.1", - "@mongosh/shell-evaluator": "2.2.1", - "@mongosh/types": "2.2.1", + "version": "2.2.2", + "resolved": "https://registry.npmmirror.com/@mongosh/editor/-/editor-2.2.2.tgz", + "integrity": "sha512-loUUjTtUnzWo/LTRUrEdvENVTHXNS+ohhuKd65mbT/n5XciVamozYhuLuTTsrGUMbVpHeaPXquryIKLEOqgi6w==", + "dependencies": { + "@mongosh/js-multiline-to-singleline": "2.2.2", + "@mongosh/service-provider-core": "2.2.2", + "@mongosh/shell-api": "2.2.2", + "@mongosh/shell-evaluator": "2.2.2", + "@mongosh/types": "2.2.2", "js-beautify": "^1.14.0" }, "engines": { @@ -1278,17 +1278,17 @@ } }, "node_modules/@mongosh/errors": { - "version": "2.2.1", - "resolved": "https://registry.npmmirror.com/@mongosh/errors/-/errors-2.2.1.tgz", - "integrity": "sha512-pwBI8Bv1KWYUSBoY2gh48dzvabCH8WlWYfo3Kzci7DPVK1vOccZpzr4PZony6ajvJ0KUswGGSaRFVdS54lO9QA==", + "version": "2.2.2", + "resolved": "https://registry.npmmirror.com/@mongosh/errors/-/errors-2.2.2.tgz", + "integrity": "sha512-FA4xuRZrYiYl9MxNzwl1adXZqQGXDHrVZyrL8Qrz28mGpvhfaQCENkE11C3DOpT2G/bHIFfiCxsmKs3ko7rwXw==", "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/history": { - "version": "2.2.1", - "resolved": "https://registry.npmmirror.com/@mongosh/history/-/history-2.2.1.tgz", - "integrity": "sha512-AfqtzjrfvJl0EwM3co4fTYGs12E76WUOfJbRejaBI1aLZZ7h36cjQjOG0bAckEuPYRw0sygkql5X0DLjZHDB/A==", + "version": "2.2.2", + "resolved": "https://registry.npmmirror.com/@mongosh/history/-/history-2.2.2.tgz", + "integrity": "sha512-llgGAt9ErtutDo5bQAYw+bpN0mOUHwh4rztIs0wT5vNplIkTxPOQMRXCYe1naXjyUV+2cFZN9aoNV1BuIH/9Gw==", "dependencies": { "mongodb-connection-string-url": "^3.0.0", "mongodb-redact": "^0.2.2" @@ -1298,21 +1298,20 @@ } }, "node_modules/@mongosh/i18n": { - "version": "2.2.1", - "resolved": "https://registry.npmmirror.com/@mongosh/i18n/-/i18n-2.2.1.tgz", - "integrity": "sha512-ZbWV4Sykz4WIsLLGq9MfKR5baNXo5caM2pdBFVF6fwJMOcR87meBFcQ3SkbI7ZKezrMaQi/o9l6o6amI0vr2Rg==", + "version": "2.2.2", + "resolved": "https://registry.npmmirror.com/@mongosh/i18n/-/i18n-2.2.2.tgz", + "integrity": "sha512-FHUbQ7W02uN0ZRM/5tW3v9H0khooJGoxh5i9RaKU1SD8MVeyVToWP5LMIRdD1VQqJhQrEo8lB9G6nOjkXBNrgw==", "dependencies": { - "@mongosh/errors": "2.2.1", - "mustache": "^4.0.0" + "@mongosh/errors": "2.2.2" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/import-node-fetch": { - "version": "2.2.1", - "resolved": "https://registry.npmmirror.com/@mongosh/import-node-fetch/-/import-node-fetch-2.2.1.tgz", - "integrity": "sha512-rN9BBe3Z/zhnNjTc4cBYpt4oDa+JS7Th5grg/rYurb6Bs8f68Rzn1BTDACix7jzzHM6pVtptuk+b2QXIb2sAlw==", + "version": "2.2.2", + "resolved": "https://registry.npmmirror.com/@mongosh/import-node-fetch/-/import-node-fetch-2.2.2.tgz", + "integrity": "sha512-jKLAj5uHGC0Znn/KYlkj18naeup0gJxAVz9wJ9qcw7Sjk+zFXix4FR7J4kFw4OvVRVli2+lrQJxqRNOWdSC9Pg==", "dependencies": { "node-fetch": "^3.3.2" }, @@ -1321,9 +1320,9 @@ } }, "node_modules/@mongosh/js-multiline-to-singleline": { - "version": "2.2.1", - "resolved": "https://registry.npmmirror.com/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.2.1.tgz", - "integrity": "sha512-e3F8ukzBfJibVaT22lqNdTKMW2UnOTGwEGmAgJC6MLElNjo+zR2z+OBWdLbuOdkY5nsXFDYB2IWgPYbKFiWu/A==", + "version": "2.2.2", + "resolved": "https://registry.npmmirror.com/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.2.2.tgz", + "integrity": "sha512-Bbjn2dkxuW1PETNZkPIE/vybNe1fiAAdY7Kp4zy+hExiPb0bxalJVhh91kX5tGllGtk4lhcXgNHVpQvn44+UCw==", "dependencies": { "@babel/core": "^7.16.12", "@babel/types": "^7.21.2" @@ -1333,14 +1332,14 @@ } }, "node_modules/@mongosh/logging": { - "version": "2.2.1", - "resolved": "https://registry.npmmirror.com/@mongosh/logging/-/logging-2.2.1.tgz", - "integrity": "sha512-2YYLnBvx5GI4zof0sQw8bqLULGf/hOsn8rNIhosfbHKNUPrCCyWlPnjeFD3npaAt7zffkI7Acpev6hWlEDuulA==", + "version": "2.2.2", + "resolved": "https://registry.npmmirror.com/@mongosh/logging/-/logging-2.2.2.tgz", + "integrity": "sha512-q7YtlypGHFxvrTXc62elQXoQjcpUzTcEpldAtB3LyJ/q4Tw09+Fu4ypgLwXQ+sdFodd0qpAsk/EXJL79mGVokA==", "dependencies": { "@mongodb-js/devtools-connect": "^2.6.0", - "@mongosh/errors": "2.2.1", - "@mongosh/history": "2.2.1", - "@mongosh/types": "2.2.1", + "@mongosh/errors": "2.2.2", + "@mongosh/history": "2.2.2", + "@mongosh/types": "2.2.2", "mongodb-log-writer": "^1.4.0", "mongodb-redact": "^0.2.2" }, @@ -1349,12 +1348,12 @@ } }, "node_modules/@mongosh/service-provider-core": { - "version": "2.2.1", - "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-core/-/service-provider-core-2.2.1.tgz", - "integrity": "sha512-D+sGmdKjeuTln5vTDqgg3Yx6DfidNuS/8keM14VGafRpVV8CEBD0My8F3kHpimV9w7xZnrAMKBqczcL1ZcJeww==", + "version": "2.2.2", + "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-core/-/service-provider-core-2.2.2.tgz", + "integrity": "sha512-6E8qCRmV0lmO/9rRF6/L9zWt4XWbZuQWrh+xo3aceGD4jaBat16yZ0bqO+HTId7CxdZnOD9MqAXoBqXAWi4o3A==", "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", - "@mongosh/errors": "2.2.1", + "@mongosh/errors": "2.2.2", "bson": "^6.5.0", "mongodb": "^6.5.0", "mongodb-build-info": "^1.7.1" @@ -1367,15 +1366,15 @@ } }, "node_modules/@mongosh/service-provider-server": { - "version": "2.2.1", - "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-server/-/service-provider-server-2.2.1.tgz", - "integrity": "sha512-dZ2YlTWANFnfwSjDNxpMbdbFDAqru2pMXoxIyPzEW3ISnathRfJjObiSO0+i56AoGPPG0lTFEdHAb0r9lPgxew==", + "version": "2.2.2", + "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-server/-/service-provider-server-2.2.2.tgz", + "integrity": "sha512-Gaps3+FosBcVNW36KcLa6iQV0Ynbnq4Xw/0Eddd6IF2UZTrqyZDhl9pOicP5d1G6xjS833dlWy6cRSYki+rQIQ==", "dependencies": { "@mongodb-js/devtools-connect": "^2.6.0", "@mongodb-js/oidc-plugin": "^0.4.0", - "@mongosh/errors": "2.2.1", - "@mongosh/service-provider-core": "2.2.1", - "@mongosh/types": "2.2.1", + "@mongosh/errors": "2.2.2", + "@mongosh/service-provider-core": "2.2.2", + "@mongosh/types": "2.2.2", "@types/sinon-chai": "^3.2.4", "aws4": "^1.12.0", "mongodb": "^6.5.0", @@ -1391,15 +1390,15 @@ } }, "node_modules/@mongosh/shell-api": { - "version": "2.2.1", - "resolved": "https://registry.npmmirror.com/@mongosh/shell-api/-/shell-api-2.2.1.tgz", - "integrity": "sha512-v7SNBBYms8SoHgDdDqN+jkG6V9GlpEJe5pY7tpLwlrQJ7ioBc8SOidsmHviStYP4oMzhkWQMXWETayWO92Fn+g==", - "dependencies": { - "@mongosh/arg-parser": "2.2.1", - "@mongosh/errors": "2.2.1", - "@mongosh/history": "2.2.1", - "@mongosh/i18n": "2.2.1", - "@mongosh/service-provider-core": "2.2.1", + "version": "2.2.2", + "resolved": "https://registry.npmmirror.com/@mongosh/shell-api/-/shell-api-2.2.2.tgz", + "integrity": "sha512-VzgYSzcA6uceo3moQXchgpnbiY/ZVCOKqiJxRufPP9ALWmxvii7qnmIL1NjLZzqqYdeJ5ZReRqX8WWMOSZvLSg==", + "dependencies": { + "@mongosh/arg-parser": "2.2.2", + "@mongosh/errors": "2.2.2", + "@mongosh/history": "2.2.2", + "@mongosh/i18n": "2.2.2", + "@mongosh/service-provider-core": "2.2.2", "mongodb-redact": "^0.2.2" }, "engines": { @@ -1407,27 +1406,27 @@ } }, "node_modules/@mongosh/shell-evaluator": { - "version": "2.2.1", - "resolved": "https://registry.npmmirror.com/@mongosh/shell-evaluator/-/shell-evaluator-2.2.1.tgz", - "integrity": "sha512-drs0wUGjMwsh5RCcTatuUE+xOcggASmMnRfJTrCF/qq/Zvt4Jdx2g0VYfU6QjwPU7X1xqRC+0efMo9ixEVIDVQ==", + "version": "2.2.2", + "resolved": "https://registry.npmmirror.com/@mongosh/shell-evaluator/-/shell-evaluator-2.2.2.tgz", + "integrity": "sha512-38AegwWGi/6U51JJQWW8y2yfs0Tbr75BZFF7HeLwqGnf4ASpNdB/bVAaRxz5x7v/GcIBmPNcyj7zjLrq2IP2Cg==", "dependencies": { - "@mongosh/async-rewriter2": "2.2.1", - "@mongosh/history": "2.2.1", - "@mongosh/shell-api": "2.2.1" + "@mongosh/async-rewriter2": "2.2.2", + "@mongosh/history": "2.2.2", + "@mongosh/shell-api": "2.2.2" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/snippet-manager": { - "version": "2.2.1", - "resolved": "https://registry.npmmirror.com/@mongosh/snippet-manager/-/snippet-manager-2.2.1.tgz", - "integrity": "sha512-jjDAjaPCdWQAmlbWhZ1Jso7D19oKaxuEl3avn6vkxMIQIMML4IWrNOHoqWkfx5Z3NPteyx4grVfPyzjvipi94g==", - "dependencies": { - "@mongosh/errors": "2.2.1", - "@mongosh/import-node-fetch": "2.2.1", - "@mongosh/shell-api": "2.2.1", - "@mongosh/types": "2.2.1", + "version": "2.2.2", + "resolved": "https://registry.npmmirror.com/@mongosh/snippet-manager/-/snippet-manager-2.2.2.tgz", + "integrity": "sha512-6ARX2s8XeieyLAh7ManT8e4f8CXj+copeMgNfgLR2KTsUVImHSaGk75rp1/haEed0NieHivPJnLjxdckhve3wA==", + "dependencies": { + "@mongosh/errors": "2.2.2", + "@mongosh/import-node-fetch": "2.2.2", + "@mongosh/shell-api": "2.2.2", + "@mongosh/types": "2.2.2", "bson": "^6.5.0", "cross-spawn": "^7.0.3", "escape-string-regexp": "^4.0.0", @@ -1439,9 +1438,9 @@ } }, "node_modules/@mongosh/types": { - "version": "2.2.1", - "resolved": "https://registry.npmmirror.com/@mongosh/types/-/types-2.2.1.tgz", - "integrity": "sha512-lV1khTdJ8s3ldithGRa06nl4wlmKZm6eDnILPqW3QrZa0j6a2GBBe0GSUFo8kZkq4x3Y6SkT05ZHe1mnhh1gJQ==", + "version": "2.2.2", + "resolved": "https://registry.npmmirror.com/@mongosh/types/-/types-2.2.2.tgz", + "integrity": "sha512-nFJlltmiDXryIrsJUvYvoU69P38j5u0plOtsxjhi4zlghQVt9qgjycdAD5F8E2tlV+dKUvQD4vulU7lASQcrBg==", "dependencies": { "@mongodb-js/devtools-connect": "^2.6.0" }, @@ -2115,9 +2114,9 @@ } }, "node_modules/@types/chai": { - "version": "4.3.13", - "resolved": "https://registry.npmmirror.com/@types/chai/-/chai-4.3.13.tgz", - "integrity": "sha512-+LxQEbg4BDUf88utmhpUpTyYn1zHao443aGnXIAQak9ZMt9Rtsic0Oig0OS1xyIqdDXc5uMekoC6NaiUlkT/qA==" + "version": "4.3.14", + "resolved": "https://registry.npmmirror.com/@types/chai/-/chai-4.3.14.tgz", + "integrity": "sha512-Wj71sXE4Q4AkGdG9Tvq1u/fquNz9EdG4LIJMwVVII7ashjD/8cf8fyIfJAjRr6YcsXnSE8cOGQPq1gqeR8z+3w==" }, "node_modules/@types/sinon": { "version": "17.0.3", @@ -2508,9 +2507,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001599", - "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001599.tgz", - "integrity": "sha512-LRAQHZ4yT1+f9LemSMeqdMpMxZcc4RMWdj4tiFe3G8tNkWK+E58g+/tzotb5cU6TbcVJLr4fySiAW7XmxQvZQA==" + "version": "1.0.30001600", + "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001600.tgz", + "integrity": "sha512-+2S9/2JFhYmYaDpZvo0lKkfvuKIglrx68MwOBqMGHhQsNkLjB5xtc/TGoEPs+MxjSyN/72qer2g97nzR641mOQ==" }, "node_modules/chalk": { "version": "2.4.2", @@ -2596,9 +2595,9 @@ "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==" }, "node_modules/cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmmirror.com/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "version": "0.6.0", + "resolved": "https://registry.npmmirror.com/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", "engines": { "node": ">= 0.6" } @@ -2775,9 +2774,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.4.711", - "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.711.tgz", - "integrity": "sha512-hRg81qzvUEibX2lDxnFlVCHACa+LtrCPIsWAxo161LDYIB3jauf57RGsMZV9mvGwE98yGH06icj3zBEoOkxd/w==" + "version": "1.4.717", + "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.717.tgz", + "integrity": "sha512-6Fmg8QkkumNOwuZ/5mIbMU9WI3H2fmn5ajcVya64I5Yr5CcNmO7vcLt0Y7c96DCiMO5/9G+4sI2r6eEvdg1F7A==" }, "node_modules/emoji-regex": { "version": "9.2.2", @@ -2959,16 +2958,16 @@ } }, "node_modules/express": { - "version": "4.18.3", - "resolved": "https://registry.npmmirror.com/express/-/express-4.18.3.tgz", - "integrity": "sha512-6VyCijWQ+9O7WuVMTRBTl+cjNNIzD5cY5mQ1WM8r/LEkI2u8EYpOotESNwzNlyCn3g+dmjKYI6BmNneSr/FSRw==", + "version": "4.19.2", + "resolved": "https://registry.npmmirror.com/express/-/express-4.19.2.tgz", + "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", "body-parser": "1.20.2", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.5.0", + "cookie": "0.6.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", @@ -3898,14 +3897,6 @@ "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "node_modules/mustache": { - "version": "4.2.0", - "resolved": "https://registry.npmmirror.com/mustache/-/mustache-4.2.0.tgz", - "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==", - "bin": { - "mustache": "bin/mustache" - } - }, "node_modules/napi-build-utils": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz", @@ -4805,9 +4796,9 @@ } }, "node_modules/tar": { - "version": "6.2.0", - "resolved": "https://registry.npmmirror.com/tar/-/tar-6.2.0.tgz", - "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==", + "version": "6.2.1", + "resolved": "https://registry.npmmirror.com/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", diff --git a/nixpkgs/pkgs/development/tools/mongosh/source.json b/nixpkgs/pkgs/development/tools/mongosh/source.json index 8f771e9917ee..3a9d6a9a0ab1 100644 --- a/nixpkgs/pkgs/development/tools/mongosh/source.json +++ b/nixpkgs/pkgs/development/tools/mongosh/source.json @@ -1,6 +1,6 @@ { - "version": "2.2.1", - "integrity": "sha512-jqgOlNl5ZE/jasl6LIDZ8lKP658I+XFZh1e16eYo+c9UfL+NqRXwVJCRWKaZ/tph9Hc3dzCd9dKCN7OC0T50iQ==", - "filename": "mongosh-2.2.1.tgz", - "deps": "sha256-sZ2zSFi2tuYhjLHHrewNHcmSxwIHggL+wbHvEScK38Y=" + "version": "2.2.2", + "integrity": "sha512-IfPcqu5xPfNKGmrk+zprDhHkKzAeiyI4QjHbbmrVFiXFg6J2Dk7i25NvndNxOALRqxnQ/bWnfl1qrEZJmWerWQ==", + "filename": "mongosh-2.2.2.tgz", + "deps": "sha256-96EVcBanbCyNg18T3jgryhP2hA7Gmcmf2EiGfzIju28=" } diff --git a/nixpkgs/pkgs/development/tools/nufmt/default.nix b/nixpkgs/pkgs/development/tools/nufmt/default.nix new file mode 100644 index 000000000000..e753c134d1ab --- /dev/null +++ b/nixpkgs/pkgs/development/tools/nufmt/default.nix @@ -0,0 +1,27 @@ + +{ + lib, + fetchFromGitHub, + rustPlatform, + ... +}: +rustPlatform.buildRustPackage rec { + pname = "nufmt"; + version = "unstable-2023-09-25"; + + src = fetchFromGitHub { + owner = "nushell"; + repo = "nufmt"; + rev = "796ee834c1e31ead4c5479bf2827a4339c5d61d1"; + hash = "sha256-BwKLl8eMCrqVt9PA5SHAXxu3ypP2ePcSuljKL+wSkvw="; + }; + + cargoSha256 = "sha256-16Z20opeZpoa7h258um+grL3ktPmY4P0M/tqMTr5hYc="; + + meta = with lib; { + description = "The nushell formatter"; + homepage = "https://github.com/nushell/nufmt"; + license = licenses.mit; + maintainers = with maintainers; [iogamaster]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 5af30cc25506..5e82fafd129c 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -5,12 +5,12 @@ buildDunePackage rec { pname = "js_of_ocaml-compiler"; - version = "5.6.0"; + version = "5.7.1"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; - hash = "sha256-hDXwJjOhfvbIoaMXGmU3/bIGwAxPt9TKVCUN9tr2wj8="; + hash = "sha256-DqSOKqiQTsVi8iX6CT/2dLVODnUU2uhie4/Y93IQOD0="; }; nativeBuildInputs = [ menhir ]; diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix index b5c506ad9b82..f96ad2248ee2 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -1,6 +1,10 @@ { lib, fetchFromGitHub, ocamlPackages }: -with ocamlPackages; buildDunePackage rec { +let + inherit (ocamlPackages) buildDunePackage lablgtk3-sourceview3 ocp-index; +in + +buildDunePackage rec { pname = "ocaml-top"; version = "1.2.0"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/opam-publish/default.nix b/nixpkgs/pkgs/development/tools/ocaml/opam-publish/default.nix index b18b3e6707be..9dc78266f9f3 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/opam-publish/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/opam-publish/default.nix @@ -1,6 +1,17 @@ { lib, fetchFromGitHub, ocamlPackages }: -with ocamlPackages; +let + inherit (ocamlPackages) + buildDunePackage + cmdliner + github + github-unix + lwt_ssl + opam-core + opam-format + opam-state + ; +in buildDunePackage rec { pname = "opam-publish"; diff --git a/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix b/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix index 13a8de6550b2..60e4c3a43c26 100644 --- a/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix +++ b/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "19.13.0"; + version = "19.18.1"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nQJs+Kj0sxEI15QPLVFyVQWcM6HU6KzsSpW0ogYMzpQ="; + hash = "sha256-Y20PsyXSNu6U1v1OhBX0vGtg9UkuTVqZ1KYUYkRMcWg="; }; - vendorHash = "sha256-LIxOlU9YRA3xdHoilOBpo7P68ThVDOdiqXt47du/20g="; + vendorHash = "sha256-WuPEoDmp/SSf3AqHtYTtMb56PnjZLWr3weZQXEF7pbg="; sourceRoot = "${src.name}/src"; diff --git a/nixpkgs/pkgs/development/tools/okteto/default.nix b/nixpkgs/pkgs/development/tools/okteto/default.nix index 67446277bf5d..07354161c1ab 100644 --- a/nixpkgs/pkgs/development/tools/okteto/default.nix +++ b/nixpkgs/pkgs/development/tools/okteto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.25.3"; + version = "2.25.4"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-jxt6YfYcpwOygzxMlqX+icwKFXrDljS1vmg+OpA3pWc="; + hash = "sha256-F3tvk3vC6h8fJ2hZMKo2eQ0uUj0UsK7MEujo//wXJi0="; }; vendorHash = "sha256-+Adnveutg8soqK2Zwn2SNq7SEHd/Z91diHbPYHrGVrA="; diff --git a/nixpkgs/pkgs/development/tools/omniorb/default.nix b/nixpkgs/pkgs/development/tools/omniorb/default.nix index d9bca7061c1a..acc1dd1403dd 100644 --- a/nixpkgs/pkgs/development/tools/omniorb/default.nix +++ b/nixpkgs/pkgs/development/tools/omniorb/default.nix @@ -21,6 +21,21 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; hardeningDisable = [ "format" ]; + # Transform omniidl_be into a PEP420 namespace to allow other projects to define + # their omniidl backends. Especially useful for omniorbpy, the python backend. + postInstall = '' + rm $out/${python3.sitePackages}/omniidl_be/__init__.py + rm $out/${python3.sitePackages}/omniidl_be/__pycache__/__init__.*.pyc + ''; + + # Ensure postInstall didn't break cxx backend + # Same as 'pythonImportsCheck = ["omniidl_be.cxx"];', but outside buildPythonPackage + doInstallCheck = true; + postInstallCheck = '' + export PYTHONPATH=$out/${python3.sitePackages}:$PYTHONPATH + ${lib.getExe python3} -c "import omniidl_be.cxx" + ''; + meta = with lib; { description = "A robust high performance CORBA ORB for C++ and Python"; longDescription = '' diff --git a/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix b/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix index 7346b9bea1d9..c175d788b355 100644 --- a/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix +++ b/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix @@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o buildGoModule rec { pname = "open-policy-agent"; - version = "0.62.1"; + version = "0.63.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - hash = "sha256-iR3/6tqB6jwjy87D6xkKu/N61oenWzU3tEPTYTeEv7c="; + hash = "sha256-yXYyRl0ZDgS6eB2pB0Iqi3DiBGcIO3Vdet9RLSOczkU="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/development/tools/pscale/default.nix b/nixpkgs/pkgs/development/tools/pscale/default.nix index ec8e0c644732..189d7eea042e 100644 --- a/nixpkgs/pkgs/development/tools/pscale/default.nix +++ b/nixpkgs/pkgs/development/tools/pscale/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.185.0"; + version = "0.186.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-UzNfNuOt6ZmzxVx/H8aEmQL6b4PPyNkQzxSqhBtoLT8="; + sha256 = "sha256-LXUvVctOFreDlIozA17pfDblZ6QugVA/dJ+IKE3fBeY="; }; - vendorHash = "sha256-oENe7OGAW/i5LJbqPn7PJDemdxfSsLwmpER28R6zza4="; + vendorHash = "sha256-ubMr2gm4t0731niC2Mx1Lcmdl48SUVjfoIWbtgt3X+I="; ldflags = [ "-s" "-w" diff --git a/nixpkgs/pkgs/development/tools/rain/default.nix b/nixpkgs/pkgs/development/tools/rain/default.nix index 878d9827a12a..3ad07c761b91 100644 --- a/nixpkgs/pkgs/development/tools/rain/default.nix +++ b/nixpkgs/pkgs/development/tools/rain/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "rain"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = pname; rev = "v${version}"; - sha256 = "sha256-II+SJkdlmtPuVEK+s9VLAwoe7+jYYXA+6uxAXD5NZHU="; + sha256 = "sha256-QJAcIk+XPQF5iLlcK62t2htOVjne3K/74Am0pvLS1r8="; }; - vendorHash = "sha256-Ea83gPSq7lReS2KXejY9JlDDEncqS1ouVyIEKbn+VAw="; + vendorHash = "sha256-+UJyPwb4/KPeXyrsGQvX2SfYWfTeoR93WGyTTBf3Ya8="; subPackages = [ "cmd/rain" ]; diff --git a/nixpkgs/pkgs/development/tools/regclient/default.nix b/nixpkgs/pkgs/development/tools/regclient/default.nix index bb8d79b6c44f..9016f4704bc5 100644 --- a/nixpkgs/pkgs/development/tools/regclient/default.nix +++ b/nixpkgs/pkgs/development/tools/regclient/default.nix @@ -1,4 +1,12 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub }: +{ stdenv +, lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, lndir +, testers +, regclient +}: let bins = [ "regbot" "regctl" "regsync" ]; in @@ -20,22 +28,48 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.VCSTag=${tag}" + "-X github.com/regclient/regclient/internal/version.vcsTag=${tag}" ]; - postInstall = - lib.concatStringsSep "\n" ( - map (bin: '' - mkdir -p ''$${bin}/bin && - mv $out/bin/${bin} ''$${bin}/bin/ && - ln -s ''$${bin}/bin/${bin} $out/bin/ - '') bins - ); + nativeBuildInputs = [ installShellFiles lndir ]; + + postInstall = lib.concatMapStringsSep "\n" + (bin: '' + export bin=''$${bin} + export outputBin=bin + + mkdir -p $bin/bin + mv $out/bin/${bin} $bin/bin + + installShellCompletion --cmd ${bin} \ + --bash <($bin/bin/${bin} completion bash) \ + --fish <($bin/bin/${bin} completion fish) \ + --zsh <($bin/bin/${bin} completion zsh) + + lndir -silent $bin $out + + unset bin outputBin + '') + bins; + + passthru.tests = lib.mergeAttrsList ( + map + (bin: { + "${bin}Version" = testers.testVersion { + package = regclient; + command = "${bin} version"; + version = tag; + }; + }) + bins + ); + + __darwinAllowLocalNetworking = true; meta = with lib; { description = "Docker and OCI Registry Client in Go and tooling using those libraries"; homepage = "https://github.com/regclient/regclient"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ maxbrunet ]; }; } diff --git a/nixpkgs/pkgs/development/tools/reshape/default.nix b/nixpkgs/pkgs/development/tools/reshape/default.nix index 82eeb6e7b0b6..d7c4701b9983 100644 --- a/nixpkgs/pkgs/development/tools/reshape/default.nix +++ b/nixpkgs/pkgs/development/tools/reshape/default.nix @@ -1,8 +1,10 @@ { lib , rustPlatform , fetchCrate +, darwin , postgresqlTestHook , postgresql +, stdenv }: rustPlatform.buildRustPackage rec { @@ -16,6 +18,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-VTJ3FNhVLgxo/VVBhk1yF9UUktLXcbrEkYwoyoWFhXA="; + buildInputs = + lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + nativeCheckInputs = [ postgresqlTestHook postgresql diff --git a/nixpkgs/pkgs/development/tools/rstfmt/default.nix b/nixpkgs/pkgs/development/tools/rstfmt/default.nix index e09b18a138d1..25b20365a309 100644 --- a/nixpkgs/pkgs/development/tools/rstfmt/default.nix +++ b/nixpkgs/pkgs/development/tools/rstfmt/default.nix @@ -5,17 +5,21 @@ python3.pkgs.buildPythonApplication rec { pname = "rstfmt"; - version = "0.0.13"; - format = "pyproject"; + version = "0.0.14"; + pyproject = true; src = fetchFromGitHub { owner = "dzhu"; repo = "rstfmt"; rev = "refs/tags/v${version}"; - hash = "sha256-SJRA14CfoT8XMt3hMB7cLdmuLwsJnBSwhKkD1pJvQCI="; + hash = "sha256-zvmKgNzfxyWYHoaD+q84I48r1Mpp4kU4oIGAwMSRRlA="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ + setuptools + ]; + + dependencies = with python3.pkgs; [ black docutils sphinx @@ -31,6 +35,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "A formatter for reStructuredText"; homepage = "https://github.com/dzhu/rstfmt"; + changelog = "https://github.com/dzhu/rstfmt/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/tools/ruff/default.nix b/nixpkgs/pkgs/development/tools/ruff/default.nix index 25ef6c14921d..bb804eae7d35 100644 --- a/nixpkgs/pkgs/development/tools/ruff/default.nix +++ b/nixpkgs/pkgs/development/tools/ruff/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.3.2"; + version = "0.3.4"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/v${version}"; - hash = "sha256-2Pt2HuDB9JLD9E1q0JH7jyVoc0II5uVL1l8pAod+9V4="; + hash = "sha256-P0k/0tWbhY2HaxI4QThxpHD48JUjtF/d3iU4MIFhdHI="; }; - cargoHash = "sha256-njHpqWXFNdwenV58+VGznnqbaNK1GoGtHSTfKU2MRbs="; + cargoHash = "sha256-LckX8/c3Yg9i/0C2d0XSxxNJSpaVxmj2s8tkEUDhbmA="; nativeBuildInputs = [ installShellFiles diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix index f4bdb252d400..cfeec591f672 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.14.18"; + version = "0.14.20"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-deny"; rev = version; - hash = "sha256-aVWr7YXGpRDItub4CaUg9LYxj9Nf0Pe1L0FUr9bJoG0="; + hash = "sha256-KThJynV/LrT1CYHIs/B3yS6ylNr9AezoHhVPe1m/eiU="; }; - cargoHash = "sha256-AD4WFM0yAIKgi9y8015qxukAa3YBJmPnkUhV7qp0quk="; + cargoHash = "sha256-S5aRucNq5vgUIsu4ToRqLVZZ8/IXkbniJXInhnybTNY="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix index 86c322f7116c..15c8706601f5 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.79"; + version = "1.0.80"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-P0pwQSKkQI/hIaCxU9a3BMdFaBtY4GtB38vqDOvdbaU="; + sha256 = "sha256-qK3ZpcY/kxOaRcmlD6AUkd4BVjX8ZcFz8NG60oHh5qo="; }; - cargoHash = "sha256-G0JNTZZMe4V1o/7KqhlubNczSemIPvrPeH5KQ1oNYWY="; + cargoHash = "sha256-c2h/ij2fWpJMoq8d60l2Ujw7Xnw8q39GmDlcPffpjMU="; meta = with lib; { description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix index 4cf34bbe6a3d..dd6630d8d309 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "cargo-generate"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "sha256-OT2cjNYcEKk6Thnlq7SZvK2RJ6M1Zn62GrqpKbtrUdM="; + sha256 = "sha256-k4bTuTRZMWx8mMi/hdAr4YPCWqe39fG8nkmHH2D80ew="; }; - cargoHash = "sha256-DAJsW3uKrSyIju7K13dMQFNOwE9WDuBuPx8imdPAxqk="; + cargoHash = "sha256-wi1Y1eU+v9Q/4nkLNCUluPlDGfz6ld8nuVWR9orkDV4="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-machete/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-machete/default.nix index 9bd05294bec7..a94272f95808 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-machete/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-machete/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-machete"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "bnjbvr"; repo = "cargo-machete"; rev = "v${version}"; - hash = "sha256-xLquursKMpV6ZELCRBrAEZ40Ypx2+vtpTVmVvOPdYS4="; + hash = "sha256-8ktiBnlcnC4QD3rIox8rfxhF0ZWOlbok8rK7fnqeZOM="; }; - cargoHash = "sha256-F0pNAZ5ZcpGrfYt1TqtBcC2WUwjOEYf/yHero250fl0="; + cargoHash = "sha256-emW/TDpeh/7hgqTgXAZeQwzkSIktDxk3Lp3JyhdTSRo="; # tests require internet access doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-mobile2/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-mobile2/default.nix index 55ac718795d6..1aecd6d91973 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-mobile2/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-mobile2/default.nix @@ -12,7 +12,7 @@ let inherit (darwin.apple_sdk.frameworks) CoreServices; pname = "cargo-mobile2"; - version = "0.11.0"; + version = "0.11.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -20,14 +20,14 @@ rustPlatform.buildRustPackage { owner = "tauri-apps"; repo = pname; rev = "cargo-mobile2-v${version}"; - hash = "sha256-1P9ImNyYU1dwGdwc1f6QSGm7H7D5uEozfSJqfEzla+A="; + hash = "sha256-HLDuWEKLij1hTKxf3lrAb4d2DIHzzkj4kuiZXgQwH4Q="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 # sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-DmZ7Bdx5EHFkN528EhhJnNOLXEcLglFHvdgywpE59uo="; + cargoHash = "sha256-jCsP5xhNkqnwz8HocUzzf17omU8WDNrL/WVj/lP+51w="; preBuild = '' mkdir -p $out/share/ diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-mutants/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-mutants/default.nix index ba54eeb56bd7..33204d80b9d2 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-mutants/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-mutants/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-mutants"; - version = "24.2.1"; + version = "24.3.0"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "cargo-mutants"; rev = "v${version}"; - hash = "sha256-sZI3Y4wsToDt1fF8ZT494V3q5LwHZ+7uU6of7LOWu3M="; + hash = "sha256-FlD2bSCNToyXLiMb4c2tJYJxHN4QORMJPeFPuFpjMEM="; }; - cargoHash = "sha256-zCuNvhZ2CvsdG1CiQJ9fXFBTQxybqz/lk85lX5WrpG4="; + cargoHash = "sha256-GJFUSOAY6F0ZmqF/9SHOGMNFssfHUdFIcsgz6JwZuqE="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix index da51224ccc65..cd8ccb0a9c2f 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.33.1"; + version = "0.34.0"; src = fetchCrate { inherit pname version; - hash = "sha256-poS8s4rfktNKQ0co8G4RLXUJAeUAGcS8YIvb4W0IFNo="; + hash = "sha256-xD+0eplrtrTlYYnfl1R6zIO259jP18OAp9p8eg1CqbI="; }; - cargoHash = "sha256-+tmLUxDxI/W2g7cdQD/Ph5wBpW3QbZzH2M/oRXLzsgU="; + cargoHash = "sha256-EjMzOilTnPSC7FYxrNBxX+sugYvPIxiCzlwQcl3VMog="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix index 8e1bd746857a..955e03247b76 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.41"; + version = "1.0.42"; src = fetchCrate { inherit pname version; - hash = "sha256-HUhFy+7BlFHmffmyQ4zJSPBI6kBxemWAHQlElfuTJn0="; + hash = "sha256-xtnWk5+08fc/NR0kGIhdpvMLAjXKUwH0tCtUIMMRb5s="; }; - cargoHash = "sha256-KtyzDx8xWjaepdt1bej3X/iofGV5UHBub3EzhO5cxBY="; + cargoHash = "sha256-fsKGd8W0Kdbjij8+44oxE6QiixUkwk0Mx3CefXMLSwg="; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-update/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-update/default.nix index 986f705455c6..c27c3e0e7572 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-update/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-update/default.nix @@ -16,14 +16,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-update"; - version = "13.3.0"; + version = "13.4.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-owiMVeH7m4LoM8c4qjLyFx3v/+Flzt+C+O8qEuXazvc="; + sha256 = "sha256-/9igT1/3ck8Roy2poq1urf+cLblentOB7S9Hh6uqIEw="; }; - cargoHash = "sha256-WtNH62DBo6WFOUcHnZxn0Jco4SUmhO0+1wXPRB2wxic="; + cargoHash = "sha256-pdWVp9+CLnNO7+U0a8WXWHZ+EeGNYx9J7WWAI1MTDvc="; nativeBuildInputs = [ cmake diff --git a/nixpkgs/pkgs/development/tools/rust/ravedude/default.nix b/nixpkgs/pkgs/development/tools/rust/ravedude/default.nix index ac5325336430..1e6997065359 100644 --- a/nixpkgs/pkgs/development/tools/rust/ravedude/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/ravedude/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "ravedude"; - version = "0.1.7"; + version = "0.1.8"; src = fetchCrate { inherit pname version; - hash = "sha256-p5pbxnoUBhdDf7acpLStgBvoWZyFYNHxTwzDhGSApRM="; + hash = "sha256-AvnojcWQ4dQKk6B1Tjhkb4jfL6BJDsbeEo4tlgbOp84="; }; - cargoHash = "sha256-L7eXSji+irjwuOZ5uxqWK9SesRZrqEeoenJgMzqpszo="; + cargoHash = "sha256-HeFmQsgr6uHrWi6s5sMQ6n63a44Msarb5p0+wUzKFkE="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index 04bb998ab551..006ae3b1c76e 100644 --- a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2024-03-18"; - cargoSha256 = "sha256-CZC90HtAuK66zXDCHam9YJet9C62psxkHeJ/+1vIjTg="; + version = "2024-03-25"; + cargoSha256 = "sha256-knvXvQ4e3Ab5zGcitfzlznad//0gAFSgWjOPiCjeFDM="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-Jd6pmXlwKk5uYcjyO/8BfbUVmx8g31Qfk7auI2IG66A="; + sha256 = "sha256-4na1ZTc6Iknu6V1Wo6jnt6d3H0JdZfpKF4GX/WNa/Zc="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; diff --git a/nixpkgs/pkgs/development/tools/semantic-release/default.nix b/nixpkgs/pkgs/development/tools/semantic-release/default.nix index 7f55da0e2ff7..9aa371c07e32 100644 --- a/nixpkgs/pkgs/development/tools/semantic-release/default.nix +++ b/nixpkgs/pkgs/development/tools/semantic-release/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "semantic-release"; - version = "23.0.5"; + version = "23.0.6"; src = fetchFromGitHub { owner = "semantic-release"; repo = "semantic-release"; rev = "v${version}"; - hash = "sha256-/VOa/V6kly92JjhW5a0b9xNdxVYCPYRJx5IiwmQ2d1U="; + hash = "sha256-saWKx7OnKRT1zonaSRaLXUoL7XI6YaeKogdTuxDN6eo="; }; - npmDepsHash = "sha256-CG2LcIAfX5dfJz0oSMwt83ra804U/qLpnNDilSEgRSI="; + npmDepsHash = "sha256-OvH568kJP0tdK6y2TmMRAyVZ4LgY9+Y4AF39jXk4dq4="; dontNpmBuild = true; diff --git a/nixpkgs/pkgs/development/tools/sentry-cli/default.nix b/nixpkgs/pkgs/development/tools/sentry-cli/default.nix index 06b77135d484..92711b2d72df 100644 --- a/nixpkgs/pkgs/development/tools/sentry-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/sentry-cli/default.nix @@ -11,13 +11,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.30.2"; + version = "2.30.4"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-ThZb6/Mprz9qgEGsJ+EbENvjmgehDsjVgFGBq4PZMRM="; + sha256 = "sha256-J+8/sCFSd2BYQgKOl8OZoxlFLB8scDY5Bl7GAQ54/RM="; }; doCheck = false; @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; nativeBuildInputs = [ installShellFiles pkg-config ]; - cargoHash = "sha256-yoBoPk5PvMLGvhU/kg+WwO5WgwEnfKQlnkCC6IctfAI="; + cargoHash = "sha256-622cEaHEMmVspabsIYgQ5ySbaDr9qB1FjxJ5NwbeGx8="; postInstall = '' installShellCompletion --cmd sentry-cli \ diff --git a/nixpkgs/pkgs/development/tools/shellharden/default.nix b/nixpkgs/pkgs/development/tools/shellharden/default.nix index dbf903e923bf..47498cca57c2 100644 --- a/nixpkgs/pkgs/development/tools/shellharden/default.nix +++ b/nixpkgs/pkgs/development/tools/shellharden/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shellharden"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "anordal"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yOfGMxNaaw5ub7woShDMCJNiz6FgV5IBJN87VmORLvg="; + sha256 = "sha256-aBX3RXfDhlXVMV8aPO0pu3527nDoYrUDUbH6crWO/W8="; }; - cargoSha256 = "sha256-o3CBnxEQNmvn+h/QArIkzi9xfZzIngvwHpkMT+PItY4="; + cargoHash = "sha256-/t5dsDOokuUC0ZG8hPzsUoAvteLHWby6eKZNtnL/XUw="; postPatch = "patchShebangs moduletests/run"; diff --git a/nixpkgs/pkgs/development/tools/sqldef/default.nix b/nixpkgs/pkgs/development/tools/sqldef/default.nix index 4141cd4f9176..aa93085f7c0b 100644 --- a/nixpkgs/pkgs/development/tools/sqldef/default.nix +++ b/nixpkgs/pkgs/development/tools/sqldef/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "sqldef"; - version = "0.16.15"; + version = "0.17.1"; src = fetchFromGitHub { owner = "k0kubun"; repo = "sqldef"; rev = "v${version}"; - hash = "sha256-srwCSALP+xtccMnIOpsErn4hk83grXyOMEA2Hwsvjv0="; + hash = "sha256-S2hXwIQU9iKSN9nYG6KacO+bZtgNtMnPQoQaS6DNH30="; }; proxyVendor = true; - vendorHash = "sha256-VM50tJxChGU1lGol4HUKB5Zp0c2F8D9+NhrW6XK7i+g="; + vendorHash = "sha256-8fKJxnjLIWzWsLx/p9tRb/un63/QgJJzMb4/Y4DSZdY="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/nixpkgs/pkgs/development/tools/supabase-cli/default.nix b/nixpkgs/pkgs/development/tools/supabase-cli/default.nix index 479bd5d76081..5eb875706e53 100644 --- a/nixpkgs/pkgs/development/tools/supabase-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/supabase-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.144.2"; + version = "1.151.1"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-gcQIdXQMcHRbtVEa5dQFAE2UGf2caf7FUlFF+4jNcFY="; + hash = "sha256-5dEjBjZvq0YfCGm+kb3Nyt2vcMTNlyReda8KQ8ghIuE="; }; - vendorHash = "sha256-9SKQkfrHNQbJAzrgI7fmkml6RvjqrfpuE9XppKrHBmk="; + vendorHash = "sha256-DSbnPR++62ha4WCiJPTo27Rxu9nZu901IMFE7yiRShs="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/development/tools/templ/default.nix b/nixpkgs/pkgs/development/tools/templ/default.nix index f3eda5a55975..6270ca3fb991 100644 --- a/nixpkgs/pkgs/development/tools/templ/default.nix +++ b/nixpkgs/pkgs/development/tools/templ/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { pname = "templ"; - version = "0.2.639"; + version = "0.2.646"; subPackages = [ "cmd/templ" ]; @@ -21,7 +21,7 @@ buildGoModule rec { owner = "a-h"; repo = "templ"; rev = "refs/tags/v${version}"; - hash = "sha256-W1efknPo45mmKYuiFakJ0AigmfQqlfQ/u+de0zTRwwY="; + hash = "sha256-ocuDWdIHL4Ub1ybWBScg4ysTRQdvCxlod0TNuJFDA4o="; }; vendorHash = "sha256-Upd5Wq4ajsyOMDiAWS2g2iNO1sm1XJc43AFQLIo5eDM="; diff --git a/nixpkgs/pkgs/development/tools/turso-cli/default.nix b/nixpkgs/pkgs/development/tools/turso-cli/default.nix index 9414d1114bcb..c68b1a3010a8 100644 --- a/nixpkgs/pkgs/development/tools/turso-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/turso-cli/default.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "turso-cli"; - version = "0.89.0"; + version = "0.90.3"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-BFL5D4GkcYdHkEc5448jgQflhhncePYfHMTprPynvmU="; + hash = "sha256-NkCkInQLwGwb8bFeRTSk2rpuPBOkMvWBgVx2IFFyRFQ="; }; vendorHash = "sha256-oxlIaSSLZ6JirvUPOIHirp43G5qrDFJhNd6HjA9UYKo="; diff --git a/nixpkgs/pkgs/development/tools/vagrant/default.nix b/nixpkgs/pkgs/development/tools/vagrant/default.nix index cfd8d91f10cf..d8a8777aa200 100644 --- a/nixpkgs/pkgs/development/tools/vagrant/default.nix +++ b/nixpkgs/pkgs/development/tools/vagrant/default.nix @@ -91,8 +91,12 @@ in buildRubyGem rec { mkdir -p "$out/vagrant-plugins/plugins.d" echo '{}' > "$out/vagrant-plugins/plugins.json" + # install bash completion mkdir -p $out/share/bash-completion/completions/ cp -av contrib/bash/completion.sh $out/share/bash-completion/completions/vagrant + # install zsh completion + mkdir -p $out/share/zsh/site-functions/ + cp -av contrib/zsh/_vagrant $out/share/zsh/site-functions/ '' + lib.optionalString withLibvirt '' substitute ${./vagrant-libvirt.json.in} $out/vagrant-plugins/plugins.d/vagrant-libvirt.json \ diff --git a/nixpkgs/pkgs/development/tools/yq-go/default.nix b/nixpkgs/pkgs/development/tools/yq-go/default.nix index d05b60457a63..f4d8137c33eb 100644 --- a/nixpkgs/pkgs/development/tools/yq-go/default.nix +++ b/nixpkgs/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.42.1"; + version = "4.43.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - hash = "sha256-IBEW+IiDymquBhc+nsaYHM59uhBR3o6nt62undeprdY="; + hash = "sha256-AQOHVuDREp6OpwlPFwpCUOQACOsDRH0uM6WwKyEK4JI="; }; - vendorHash = "sha256-Sdml4C6fTp7dnEy4a+GqwoJoGyO1TLCiJlNf5Yoy5cg="; + vendorHash = "sha256-9GCqZS0fguJo8GkVPMgbstEVzrjIS0kdbNQEaT1HSFI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/development/web/bun/default.nix b/nixpkgs/pkgs/development/web/bun/default.nix index faf6a4af7986..dc7003376813 100644 --- a/nixpkgs/pkgs/development/web/bun/default.nix +++ b/nixpkgs/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.0.33"; + version = "1.0.35"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-tAZi8AJswFe9iQy68Ul9mcr7OYQN4TeP2THSvYewPRU="; + hash = "sha256-QuCd2l5PNz2pJzKrzy5Zvd9MbAsTu9HzdBulyBvSUok="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-6cog3hl/SfAN+G63F4HIT4avlxy47COkv6FQPjhyr2k="; + hash = "sha256-rxXkCViPgJiSNhlaNQMGcurONhXXK7shrLD0Zk1pLmw="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-O13dENBJ9mBkKrsLjGgBCGDFvzp5jkF7+7m65Z7Rj8Q="; + hash = "sha256-eS9s6acf1AxzFkeb/RskuJ1pXdiv52WpP7cEKTEXPEo="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-nYohWMmsYv8SzdEoHSTPUveuwlhYdmLYFS7R2aqeou0="; + hash = "sha256-I7fqIhMs/2N9pcxJf5ED4p0kq+rQPnfYGOciAd+6mXU="; }; }; updateScript = writeShellScript "update-bun" '' @@ -92,6 +92,7 @@ stdenvNoCC.mkDerivation rec { mit # bun core lgpl21Only # javascriptcore and webkit ]; + mainProgram = "bun"; maintainers = with maintainers; [ DAlperin jk thilobillerbeck cdmistman coffeeispower ]; platforms = builtins.attrNames passthru.sources; # Broken for Musl at 2024-01-13, tracking issue: diff --git a/nixpkgs/pkgs/development/web/flyctl/default.nix b/nixpkgs/pkgs/development/web/flyctl/default.nix index 0d7f9f2c38f6..84caa116eea4 100644 --- a/nixpkgs/pkgs/development/web/flyctl/default.nix +++ b/nixpkgs/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGo122Module rec { pname = "flyctl"; - version = "0.2.17"; + version = "0.2.25"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-XE1kZdR9ZbWMqp0neouZBvNtIJbOdzp/aMe+uA85zL8="; + hash = "sha256-yMkTLUM/1P9VrsYaF4m9YyRLV6qz6uMiYlhUN5S58uU="; }; - vendorHash = "sha256-ZX7hcxQJdSLwY37DnV3vKcBW+K9F5RMPUeMtWzm48Dc="; + vendorHash = "sha256-TMlJbh9tMRNdeZlem27lgknuJ/YNFkVaWS9BNTTuXic="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/development/web/newman/default.nix b/nixpkgs/pkgs/development/web/newman/default.nix index d06331b6badb..9f652e2c5c81 100644 --- a/nixpkgs/pkgs/development/web/newman/default.nix +++ b/nixpkgs/pkgs/development/web/newman/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "newman"; - version = "6.1.1"; + version = "6.1.2"; src = fetchFromGitHub { owner = "postmanlabs"; repo = "newman"; rev = "refs/tags/v${version}"; - hash = "sha256-CHlch4FoaW42oWxlaAEuNBLTM1hSwLK+nvBfE17GNHU="; + hash = "sha256-BQVJNOTVtB1g6+PsHJ5nbN9X7b33d/3qkSUcHTMexB0="; }; - npmDepsHash = "sha256-ez6FXuu1gMBfJvgmOKs+zoUVMWwBPgJH33BbbLNL0Vk="; + npmDepsHash = "sha256-kr4LozGpmmU5g2LIKd+SaKbHsOM6hnlflM79c4tFII8="; dontNpmBuild = true; diff --git a/nixpkgs/pkgs/development/web/nodejs/v18.nix b/nixpkgs/pkgs/development/web/nodejs/v18.nix index bc86d6c89dbd..a4121b9575fd 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v18.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v18.nix @@ -19,6 +19,9 @@ let in buildNodejs { inherit enableNpm; + # The change to minor version 18.20.0 breaks compatibility with ffi-napi + # This breaks the compilation of some nix packages. + # While this is investigated and fixed, do not upgrade the minor version. version = "18.19.1"; sha256 = "sha256-CQ+WouzeCAtrOCxtZCvKXQvkcCp4y1Vb578CsgvRbe0="; patches = [ |