diff --git a/doc/build-helpers.md b/doc/build-helpers.md index 010665484cfd..a9df144bacbf 100644 --- a/doc/build-helpers.md +++ b/doc/build-helpers.md @@ -17,6 +17,7 @@ There is no uniform interface for build helpers. [Language- or framework-specific build helpers](#chap-language-support) usually follow the style of `stdenv.mkDerivation`, which accepts an attribute set or a fixed-point function taking an attribute set. ```{=include=} chapters +build-helpers/fixed-point-arguments.chapter.md build-helpers/fetchers.chapter.md build-helpers/trivial-build-helpers.chapter.md build-helpers/testers.chapter.md diff --git a/doc/build-helpers/fixed-point-arguments.chapter.md b/doc/build-helpers/fixed-point-arguments.chapter.md new file mode 100644 index 000000000000..948473acd48b --- /dev/null +++ b/doc/build-helpers/fixed-point-arguments.chapter.md @@ -0,0 +1,74 @@ +# Fixed-point arguments of build helpers {#chap-build-helpers-finalAttrs} + +As mentioned in the beginning of this part, `stdenv.mkDerivation` could alternatively accept a fixed-point function. The input of such function, typically named `finalAttrs`, is expected to be the final state of the attribute set. +A build helper like this is said to accept **fixed-point arguments**. + +Build helpers don't always support fixed-point arguments yet, as support in [`stdenv.mkDerivation`](#mkderivation-recursive-attributes) was first included in Nixpkgs 22.05. + +## Defining a build helper with `lib.extendMkDerivation` {#sec-build-helper-extendMkDerivation} + +Developers can use the Nixpkgs library function [`lib.customisation.extendMkDerivation`](#function-library-lib.customisation.extendMkDerivation) to define a build helper supporting fixed-point arguments from an existing one with such support, with an attribute overlay similar to the one taken by [`.overrideAttrs`](#sec-pkg-overrideAttrs). + +Beside overriding, `lib.extendMkDerivation` also supports `excludeDrvArgNames` to optionally exclude some arguments in the input fixed-point argumnts from passing down the base build helper (specified as `constructDrv`). + +:::{.example #ex-build-helpers-extendMkDerivation} + +# Example definition of `mkLocalDerivation` extended from `stdenv.mkDerivation` with `lib.extendMkDerivation` + +We want to define a build helper named `mkLocalDerivation` that builds locally without using substitutes by default. + +Instead of taking a plain attribute set, + +```nix +{ + preferLocalBuild ? true, + allowSubstitute ? false, + specialArg ? (_: false), + ... +}@args: + +stdenv.mkDerivation ( + removeAttrs [ + # Don't pass specialArg into mkDerivation. + "specialArg" + ] args + // { + # Arguments to pass + inherit preferLocalBuild allowSubstitute; + # Some expressions involving specialArg + greeting = if specialArg "hi" then "hi" else "hello"; + } +) +``` + +we could define with `lib.extendMkDerivation` an attribute overlay to make the result build helper also accepts the the attribute set's fixed point passing to the underlying `stdenv.mkDerivation`, named `finalAttrs` here: + +```nix +lib.extendMkDerivation { + constructDrv = stdenv.mkDerivation; + excludeDrvArgNames = [ + # Don't pass specialArg into mkDerivation. + "specialArg" + ]; + extendDrvArgs = + finalAttrs: + { + preferLocalBuild ? true, + allowSubstitute ? false, + specialArg ? (_: false), + ... + }@args: + { + # Arguments to pass + inherit + preferLocalBuild + allowSubstitute + ; + # Some expressions involving specialArg + greeting = if specialArg "hi" then "hi" else "hello"; + }; +} +``` +::: + +If one needs to apply extra changes to the result derivation, pass the derivation transformation function to `lib.extendMkDerivation` as `lib.customisation.extendMkDerivation { transformDrv = drv: ...; }`. diff --git a/doc/redirects.json b/doc/redirects.json index dfc5bc5a1eaa..4fada4e6cf2f 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -1,7 +1,13 @@ { + "chap-build-helpers-finalAttrs": [ + "index.html#chap-build-helpers-finalAttrs" + ], "chap-release-notes": [ "release-notes.html#chap-release-notes" ], + "ex-build-helpers-extendMkDerivation": [ + "index.html#ex-build-helpers-extendMkDerivation" + ], "neovim": [ "index.html#neovim" ], @@ -41,6 +47,9 @@ "sec-allow-insecure": [ "index.html#sec-allow-insecure" ], + "sec-build-helper-extendMkDerivation": [ + "index.html#sec-build-helper-extendMkDerivation" + ], "sec-modify-via-packageOverrides": [ "index.html#sec-modify-via-packageOverrides" ], diff --git a/lib/customisation.nix b/lib/customisation.nix index be6585d5fa6e..9c50e6a26c3d 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -31,6 +31,8 @@ let flatten deepSeq extends + toFunction + id ; inherit (lib.strings) levenshtein levenshteinAtMost; @@ -730,4 +732,126 @@ rec { in self; + /** + Define a `mkDerivation`-like function based on another `mkDerivation`-like function. + + [`stdenv.mkDerivation`](#part-stdenv) gives access to + its final set of derivation attributes when it is passed a function, + or when it is passed an overlay-style function in `overrideAttrs`. + + Instead of composing new `stdenv.mkDerivation`-like build helpers + using normal function composition, + `extendMkDerivation` makes sure that the returned build helper + supports such first class recursion like `mkDerivation` does. + + `extendMkDerivation` takes an extra attribute set to configure its behaviour. + One can optionally specify + `transformDrv` to specify a function to apply to the result derivation, + or `inheritFunctionArgs` to decide whether to inherit the `__functionArgs` + from the base build helper. + + # Inputs + + `extendMkDerivation`-specific configurations + : `constructDrv`: Base build helper, the `mkDerivation`-like build helper to extend. + : `excludeDrvArgNames`: Argument names not to pass from the input fixed-point arguments to `constructDrv`. Note: It doesn't apply to the updating arguments returned by `extendDrvArgs`. + : `extendDrvArgs` : An extension (overlay) of the argument set, like the one taken by [overrideAttrs](#sec-pkg-overrideAttrs) but applied before passing to `constructDrv`. + : `inheritFunctionArgs`: Whether to inherit `__functionArgs` from the base build helper (default to `true`). + : `transformDrv`: Function to apply to the result derivation (default to `lib.id`). + + # Type + + ``` + extendMkDerivation :: + { + constructDrv :: ((FixedPointArgs | AttrSet) -> a) + excludeDrvArgNames :: [ String ], + extendDrvArgs :: (AttrSet -> AttrSet -> AttrSet) + inheritFunctionArgs :: Bool, + transformDrv :: a -> a, + } + -> (FixedPointArgs | AttrSet) -> a + + FixedPointArgs = AttrSet -> AttrSet + a = Derivation when defining a build helper + ``` + + # Examples + + :::{.example} + ## `lib.customisation.extendMkDerivation` usage example + ```nix-repl + mkLocalDerivation = lib.extendMkDerivation { + constructDrv = pkgs.stdenv.mkDerivation; + excludeDrvArgNames = [ "specialArg" ]; + extendDrvArgs = + finalAttrs: args@{ preferLocalBuild ? true, allowSubstitute ? false, specialArg ? (_: false), ... }: + { inherit preferLocalBuild allowSubstitute; passthru = { inherit specialArg; } // args.passthru or { }; }; + } + + mkLocalDerivation.__functionArgs + => { allowSubstitute = true; preferLocalBuild = true; specialArg = true; } + + mkLocalDerivation { inherit (pkgs.hello) pname version src; specialArg = _: false; } + => «derivation /nix/store/xirl67m60ahg6jmzicx43a81g635g8z8-hello-2.12.1.drv» + + mkLocalDerivation (finalAttrs: { inherit (pkgs.hello) pname version src; specialArg = _: false; }) + => «derivation /nix/store/xirl67m60ahg6jmzicx43a81g635g8z8-hello-2.12.1.drv» + + (mkLocalDerivation (finalAttrs: { inherit (pkgs.hello) pname version src; passthru = { foo = "a"; bar = "${finalAttrs.passthru.foo}b"; }; })).bar + => "ab" + ``` + ::: + + :::{.note} + If `transformDrv` is specified, + it should take care of existing attributes that perform overriding + (e.g., [`overrideAttrs`](#sec-pkg-overrideAttrs)) + to ensure that the overriding functionality of the result derivation + work as expected. + Modifications that breaks the overriding include + direct [attribute set update](https://nixos.org/manual/nix/stable/language/operators#update) + and [`lib.extendDerivation`](#function-library-lib.customisation.extendDerivation). + ::: + */ + extendMkDerivation = + let + extendsWithExclusion = + excludedNames: g: f: final: + let + previous = f final; + in + removeAttrs previous excludedNames // g final previous; + in + { + constructDrv, + excludeDrvArgNames ? [ ], + extendDrvArgs, + inheritFunctionArgs ? true, + transformDrv ? id, + }: + setFunctionArgs + # Adds the fixed-point style support + ( + fpargs: + transformDrv ( + constructDrv (extendsWithExclusion excludeDrvArgNames extendDrvArgs (toFunction fpargs)) + ) + ) + # Add __functionArgs + ( + # Inherit the __functionArgs from the base build helper + optionalAttrs inheritFunctionArgs (removeAttrs (functionArgs constructDrv) excludeDrvArgNames) + # Recover the __functionArgs from the derived build helper + // functionArgs (extendDrvArgs { }) + ) + // { + inherit + # Expose to the result build helper. + constructDrv + excludeDrvArgNames + extendDrvArgs + transformDrv + ; + }; } diff --git a/lib/default.nix b/lib/default.nix index 849d6ce8f9d6..f931524002f2 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -121,7 +121,8 @@ let noDepEntry fullDepEntry packEntry stringAfter; inherit (self.customisation) overrideDerivation makeOverridable callPackageWith callPackagesWith extendDerivation hydraJob - makeScope makeScopeWithSplicing makeScopeWithSplicing'; + makeScope makeScopeWithSplicing makeScopeWithSplicing' + extendMkDerivation; inherit (self.derivations) lazyDerivation optionalDrvAttr warnOnInstantiate; inherit (self.meta) addMetaAttrs dontDistribute setName updateName appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8aea451f3a0a..28638237ad9a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8501,6 +8501,12 @@ githubId = 60962839; name = "Mazen Zahr"; }; + GKHWB = { + github = "GKHWB"; + githubId = 68881230; + name = "GKHWB"; + email = "kingdomg@tuta.com"; + }; gkleen = { name = "Gregor Kleen"; email = "xpnfr@bouncy.email"; diff --git a/nixos/modules/services/hardware/fancontrol.nix b/nixos/modules/services/hardware/fancontrol.nix index dd3cd54cc31c..882eea001b39 100644 --- a/nixos/modules/services/hardware/fancontrol.nix +++ b/nixos/modules/services/hardware/fancontrol.nix @@ -41,7 +41,7 @@ in serviceConfig = { Restart = "on-failure"; - ExecStart = "${pkgs.lm_sensors}/sbin/fancontrol ${configFile}"; + ExecStart = "${lib.getExe' pkgs.lm_sensors "fancontrol"} ${configFile}"; }; }; diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix index baf3f2faa495..d5450e48fdcd 100644 --- a/pkgs/applications/misc/tellico/default.nix +++ b/pkgs/applications/misc/tellico/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "tellico"; - version = "4.0.1"; + version = "4.1"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "office"; repo = pname; rev = "v${version}"; - hash = "sha256-5oP/uGUw1oYnrnOU83Pocr9YdwAU+DaUaGHg+6NzmRU="; + hash = "sha256-xzMPYze77oajMjS2fprjGu2FsZgI7MjnWVxIxYYN0TY="; }; nativeBuildInputs = [ diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 5575e1ea47ea..25c89af32a4c 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -261,8 +261,10 @@ rec { cat > ./run-vm <=3.5.0 <4.0.0" + "dart": ">=3.6.0 <4.0.0" } } diff --git a/pkgs/by-name/ds/dsda-doom/package.nix b/pkgs/by-name/ds/dsda-doom/package.nix index 1adb934969a2..96f619706a79 100644 --- a/pkgs/by-name/ds/dsda-doom/package.nix +++ b/pkgs/by-name/ds/dsda-doom/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "dsda-doom"; - version = "0.28.2"; + version = "0.28.3"; src = fetchFromGitHub { owner = "kraflab"; repo = "dsda-doom"; rev = "v${version}"; - hash = "sha256-TuDiClIq8GLY/3qGildlPpwUUHmpFNATRz5CNTLpfeM="; + hash = "sha256-66o/k5DvyKxwa0sZPCfSycVRxEhrRhUJXJVz2p817OE="; }; sourceRoot = "${src.name}/prboom2"; diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index 8c05f5d03340..9ff55b1cbd47 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.200.0"; + version = "0.201.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-FvWNK27bN5NKP/d3UXdDUtYgEOu62h7janQIZ/Ibk1Q="; + hash = "sha256-mvIidkr3fUs8TbD8voqE8NAA14XPPuXC9u/2pc2ShK4="; }; - vendorHash = "sha256-T8F+auAf07tTzh80fk7PcuVNv8Wx4ArmY2OxXL2FH+I="; + vendorHash = "sha256-qOV6mAKwLrF5+/q/PS2qVJcQx84CjNinv/e8KG+lxfI="; doCheck = false; diff --git a/pkgs/by-name/et/etlegacy-assets/package.nix b/pkgs/by-name/et/etlegacy-assets/package.nix index fbdb9fabd615..3fc776a80ee1 100644 --- a/pkgs/by-name/et/etlegacy-assets/package.nix +++ b/pkgs/by-name/et/etlegacy-assets/package.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "etlegacy-assets"; - version = "2.83.1"; + version = "2.83.2"; srcs = let diff --git a/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/pkgs/by-name/et/etlegacy-unwrapped/package.nix index 78e24187eddf..a9b1b93c2041 100644 --- a/pkgs/by-name/et/etlegacy-unwrapped/package.nix +++ b/pkgs/by-name/et/etlegacy-unwrapped/package.nix @@ -3,7 +3,6 @@ stdenv, writeShellApplication, fetchFromGitHub, - fetchpatch, cjson, cmake, git, @@ -24,7 +23,7 @@ zlib, }: let - version = "2.83.1"; + version = "2.83.2"; fakeGit = writeShellApplication { name = "git"; @@ -43,19 +42,9 @@ stdenv.mkDerivation { owner = "etlegacy"; repo = "etlegacy"; tag = "v${version}"; - hash = "sha256-k1H3irA9UVOICY3keKGVJMtBczW/b5ObyNvB7fGAcFA="; + hash = "sha256-hZwLYaYV0j3YwFi8KRr4DZV73L2yIwFJ3XqCyq6L7hE="; }; - patches = lib.optionals stdenv.hostPlatform.isDarwin [ - # Fix compilation on Darwin archs - # Reported upstream at https://github.com/etlegacy/etlegacy/pull/3005 - # Remove this patch when the PR is merged - (fetchpatch { - url = "https://github.com/etlegacy/etlegacy/commit/2767d15c67fe0680178d9cc85ed4cf2ad1d88ad0.patch?full_index=1"; - hash = "sha256-rGfNIWb9zohk1QJLrYg9nqw6sMvXM0IbIl9kvYXRBuk="; - }) - ]; - nativeBuildInputs = [ cjson cmake diff --git a/pkgs/by-name/et/etlegacy/package.nix b/pkgs/by-name/et/etlegacy/package.nix index e708de08c34c..c2f225a73471 100644 --- a/pkgs/by-name/et/etlegacy/package.nix +++ b/pkgs/by-name/et/etlegacy/package.nix @@ -8,7 +8,7 @@ symlinkJoin { name = "etlegacy"; - version = "2.83.1"; + version = "2.83.2"; paths = [ etlegacy-assets etlegacy-unwrapped diff --git a/pkgs/by-name/fe/feishu/package.nix b/pkgs/by-name/fe/feishu/package.nix index b5d2d836d824..9cc30fcf92c6 100644 --- a/pkgs/by-name/fe/feishu/package.nix +++ b/pkgs/by-name/fe/feishu/package.nix @@ -66,12 +66,12 @@ let sources = { x86_64-linux = fetchurl { - url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/018b8d40/Feishu-linux_x64-7.28.10.deb"; - sha256 = "sha256-rVi9bRHu1/nu153gAl6xF1IHt6uoABHXd8AN4JoCGo0="; + url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/18b9e5d0/Feishu-linux_x64-7.32.11.deb"; + sha256 = "sha256-gU+fNiUE2kCE3407vdjQqE7oLgR9vXynaBNuV3EZrqc="; }; aarch64-linux = fetchurl { - url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/8ce25ba1/Feishu-linux_arm64-7.28.10.deb"; - sha256 = "sha256-IsjGuyHvmDNjJYCBXR1NFShaVsWUYcF3OV5ihY9fJl0="; + url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/8946d4de/Feishu-linux_arm64-7.32.11.deb"; + sha256 = "sha256-gYIQysbII9Ud1a7eXqQRtOsBA2rI29+xnxntAumFUdk="; }; }; @@ -135,7 +135,7 @@ let ]; in stdenv.mkDerivation { - version = "7.28.10"; + version = "7.32.11"; pname = "feishu"; src = diff --git a/pkgs/by-name/ge/gersemi/package.nix b/pkgs/by-name/ge/gersemi/package.nix index f6dd7bceab47..35ac46983ebd 100644 --- a/pkgs/by-name/ge/gersemi/package.nix +++ b/pkgs/by-name/ge/gersemi/package.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "gersemi"; - version = "0.17.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "BlankSpruce"; repo = "gersemi"; tag = version; - hash = "sha256-AphKC50O9ohywLagyQMfk8A6w4Cm0ceHHWSRAWOnoyM="; + hash = "sha256-yd6KbMmk/zVYcaJkZqS+XatJoTX9UzAlMt2jljF91/4="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/gl/glamoroustoolkit/package.nix b/pkgs/by-name/gl/glamoroustoolkit/package.nix index 345ebe83d10e..a9018cb1fda3 100644 --- a/pkgs/by-name/gl/glamoroustoolkit/package.nix +++ b/pkgs/by-name/gl/glamoroustoolkit/package.nix @@ -29,12 +29,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; - version = "1.1.8"; + version = "1.1.9"; src = fetchzip { url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; stripRoot = false; - hash = "sha256-r7q8apszeiON3MPMSY7GHHTh+hSXlAl35pUTxFV78kk="; + hash = "sha256-dBUMn5KMSLTfmJnKTS6seEYDRy2JCiR+fi37UIUJ5aM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gm/gmetronome/package.nix b/pkgs/by-name/gm/gmetronome/package.nix index 97a310c1d912..ed9a6bc98205 100644 --- a/pkgs/by-name/gm/gmetronome/package.nix +++ b/pkgs/by-name/gm/gmetronome/package.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "gmetronome"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "dqpb"; repo = "gmetronome"; rev = version; - hash = "sha256-w7ziWfpaFU8KTJcCTJUsLghy4Q3cCL1Bi0TxrReiP7s="; + hash = "sha256-/UWOvVeZILDR29VjBK+mFJt1hzWcOljOr7J7+cMrKtM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix index c57b91dec6c0..ff6c2dbe14a1 100644 --- a/pkgs/by-name/go/goreleaser/package.nix +++ b/pkgs/by-name/go/goreleaser/package.nix @@ -10,13 +10,13 @@ }: buildGoModule rec { pname = "goreleaser"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = "goreleaser"; rev = "v${version}"; - hash = "sha256-CZ4t7i253froL2JTdAGN61BLcI5PvJEqWCwn2RgGhfM="; + hash = "sha256-MlI76xiHT+JZAaL7LnEqHOgt6UypVoBjZHTmQXrnNxs="; }; vendorHash = "sha256-fYYPpf/Hnci5DCvhbWkmenTL+95PvqPtn1RdoRby+jI="; diff --git a/pkgs/by-name/gu/gum/package.nix b/pkgs/by-name/gu/gum/package.nix index 0bb5894cb3ef..6fc7d68be6d5 100644 --- a/pkgs/by-name/gu/gum/package.nix +++ b/pkgs/by-name/gu/gum/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gum"; - version = "0.14.5"; + version = "0.15.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-moKirTXziVo6ESOsnTUmPkcdBYL/VHaG226+UfM0xAk="; + hash = "sha256-DHIFU+dfZpeQo9kN9Krc1dhTf2HlnC7PEwTfN6RYmSU="; }; - vendorHash = "sha256-wjM2ld4go7OQu6XqsSGurjN09Fd5t9FNLvIzgrZEZ1k="; + vendorHash = "sha256-BcHwFj4nGmKcbVnLEVd9rK54DAyVNc2Dlt085N+HtFA="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/gv/gvproxy/package.nix b/pkgs/by-name/gv/gvproxy/package.nix index c02926b9c8eb..2ff86c248170 100644 --- a/pkgs/by-name/gv/gvproxy/package.nix +++ b/pkgs/by-name/gv/gvproxy/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gvproxy"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "containers"; repo = "gvisor-tap-vsock"; rev = "v${version}"; - hash = "sha256-f48dcXzzmWZ3ELswENMTmnK98eUqOtGt5GGxDU9WYmM="; + hash = "sha256-D+iOnkQcd0MsnC2xSuWvBIQt0v8EosgyLDTvOJF/TI8="; }; vendorHash = null; diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix index aad4a57e50c2..7cf438d32983 100644 --- a/pkgs/by-name/ha/handheld-daemon/package.nix +++ b/pkgs/by-name/ha/handheld-daemon/package.nix @@ -16,14 +16,14 @@ }: python3Packages.buildPythonApplication rec { pname = "handheld-daemon"; - version = "3.10.2"; + version = "3.11.0"; pyproject = true; src = fetchFromGitHub { owner = "hhd-dev"; repo = "hhd"; tag = "v${version}"; - hash = "sha256-6BjXqqNe2u/rh1cnuJ13L/1KimprcyatIr53b0GOBSM="; + hash = "sha256-MeWNHqHV1LLjBSdeHYmM5594ltINPvt19q8UtWvjUMs="; }; # Handheld-daemon runs some selinux-related utils which are not in nixpkgs. diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix index 178476d485f4..6fa0ef616368 100644 --- a/pkgs/by-name/ha/haproxy/package.nix +++ b/pkgs/by-name/ha/haproxy/package.nix @@ -35,11 +35,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "haproxy"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; - hash = "sha256-jBtdQ5uksnjmAkRcV+IAZ63vIU3JxEwqHPFy+tX30nM="; + hash = "sha256-rzXci/MZOHC3InamOSCXS+8UBfxBA41UW4a2QapZ9AA="; }; buildInputs = diff --git a/pkgs/by-name/im/imsprog/package.nix b/pkgs/by-name/im/imsprog/package.nix index d87cb99e7dc8..ada32024498b 100644 --- a/pkgs/by-name/im/imsprog/package.nix +++ b/pkgs/by-name/im/imsprog/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "imsprog"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "bigbigmdm"; repo = "IMSProg"; tag = "v${finalAttrs.version}"; - hash = "sha256-dhBg0f7pIbBS8IiUXd1UlAxgGrv6HapzooXafkHIEK8="; + hash = "sha256-6UWCcHHHkZsbrhew1fI/1KaGdjRK/mlq9Q72WnU1lbU="; }; strictDeps = true; diff --git a/pkgs/by-name/je/jellyfin-tui/package.nix b/pkgs/by-name/je/jellyfin-tui/package.nix new file mode 100644 index 000000000000..ee29759af978 --- /dev/null +++ b/pkgs/by-name/je/jellyfin-tui/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + openssl, + mpv, + nix-update-script, + versionCheckHook, +}: + +rustPlatform.buildRustPackage rec { + pname = "jellyfin-tui"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "dhonus"; + repo = "jellyfin-tui"; + tag = "v${version}"; + hash = "sha256-dME3oM3k5TGjN8S/93Crt3vw8+KjZWivkVzg+eqwfe4="; + }; + + cargoHash = "sha256-DFwEcKPc5c+xYas/gI3dHGRW8r4B8GBRXiI9VjdMrpw="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + openssl + mpv + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Jellyfin music streaming client for the terminal"; + mainProgram = "jellyfin-tui"; + homepage = "https://github.com/dhonus/jellyfin-tui"; + changelog = "https://github.com/dhonus/jellyfin-tui/releases/tag/v${version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ GKHWB ]; + }; +} diff --git a/pkgs/by-name/jf/jfrog-cli/package.nix b/pkgs/by-name/jf/jfrog-cli/package.nix index 632b3dadd07b..7c62c3520986 100644 --- a/pkgs/by-name/jf/jfrog-cli/package.nix +++ b/pkgs/by-name/jf/jfrog-cli/package.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "jfrog-cli"; - version = "2.72.5"; + version = "2.73.0"; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; tag = "v${version}"; - hash = "sha256-owE3mWzVogESko4SeysobC3VmmH37ikk7llJv65ZTfU="; + hash = "sha256-GzxJAatMI7H4XaRgza8+nq4JtIlPN9H3WkdKr0PfXWM="; }; proxyVendor = true; - vendorHash = "sha256-cxuNlIXD4LIBWxbTdC/ygiF/ti4eHYQBR6kZRhhgJtY="; + vendorHash = "sha256-tblmLEYHZt8manxuu5OpHeuAW18+0/kSvZIJmhEfQYQ="; postPatch = '' # Patch out broken test cleanup. diff --git a/pkgs/by-name/li/libretrack/package.nix b/pkgs/by-name/li/libretrack/package.nix new file mode 100644 index 000000000000..0d238702d7ec --- /dev/null +++ b/pkgs/by-name/li/libretrack/package.nix @@ -0,0 +1,51 @@ +{ + lib, + fetchFromGitHub, + flutterPackages-source, + libappindicator, +}: + +flutterPackages-source.stable.buildFlutterApplication rec { + pname = "libretrack"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "proninyaroslav"; + repo = "libretrack"; + tag = version; + hash = "sha256-USZ243M/0SOvlYns66zkhDQCuq+kgEWYdBZN3iBF9SA="; + }; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + gitHashes = { + "receive_sharing_intent" = "sha256-YsvnLOZvYZMyKx3J596Q3/hY2Fn/AFT6nhLTTHdMFOE="; + }; + + postPatch = '' + substituteInPlace linux/CMakeLists.txt \ + --replace-fail 'find_library(APPINDICATOR_LIBRARY NAMES appindicator3)' 'find_library(${libappindicator} NAMES appindicator3)' \ + --replace-fail 'target_link_libraries(''${BINARY_NAME} PRIVATE ''${APPINDICATOR_LIBRARY})' 'target_link_libraries(''${BINARY_NAME} PRIVATE ${libappindicator}/lib/libappindicator3.so)' + ''; + + nativeBuildInputs = [ + libappindicator + ]; + + postInstall = '' + substituteInPlace snap/gui/org.proninyaroslav.libretrack.desktop \ + --replace-fail 'Icon=''${SNAP}/meta/gui/libretrack.png' 'Icon=libretrack' \ + + install -Dm644 snap/gui/org.proninyaroslav.libretrack.desktop -t $out/share/applications + install -Dm644 linux/icons/app-icon.svg $out/share/icons/hicolor/scalable/apps/libretrack.svg + ''; + + meta = { + description = "Private, cross-platform package tracking app"; + homepage = "https://github.com/proninyaroslav/libretrack"; + changelog = "https://github.com/proninyaroslav/libretrack/releases/tag/${version}"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ genga898 ]; + mainProgram = "libretrack"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/li/libretrack/pubspec.lock.json b/pkgs/by-name/li/libretrack/pubspec.lock.json new file mode 100644 index 000000000000..6def21db64c2 --- /dev/null +++ b/pkgs/by-name/li/libretrack/pubspec.lock.json @@ -0,0 +1,2025 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "76.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.3.3" + }, + "analyzer": { + "dependency": "direct dev", + "description": { + "name": "analyzer", + "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.11.0" + }, + "animate_icons": { + "dependency": "direct main", + "description": { + "name": "animate_icons", + "sha256": "3201c60f2051997cf3cbde4b2f07d269e01fa53a6a3a2986ef26f614419880fd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "archive": { + "dependency": "transitive", + "description": { + "name": "archive", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.1" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.0" + }, + "async": { + "dependency": "direct main", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "backdrop": { + "dependency": "direct main", + "description": { + "name": "backdrop", + "sha256": "cb7450b465b638835cf5908ee96785dd7d324029beb96fa7a7b6d81216610cda", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.1" + }, + "barcode": { + "dependency": "transitive", + "description": { + "name": "barcode", + "sha256": "ab180ce22c6555d77d45f0178a523669db67f95856e3378259ef2ffeb43e6003", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.8" + }, + "barcode_widget": { + "dependency": "direct main", + "description": { + "name": "barcode_widget", + "sha256": "6f2c5b08659b1a5f4d88d183e6007133ea2f96e50e7b8bb628f03266c3931427", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.4" + }, + "bloc": { + "dependency": "direct main", + "description": { + "name": "bloc", + "sha256": "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.1.4" + }, + "bloc_test": { + "dependency": "direct dev", + "description": { + "name": "bloc_test", + "sha256": "165a6ec950d9252ebe36dc5335f2e6eb13055f33d56db0eeb7642768849b43d2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.1.7" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "294a2edaf4814a378725bfe6358210196f5ea37af89ecd81bfa32960113d4948", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.3" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "99d3980049739a985cf9b21f30881f46db3ebc62c5b8d5e60e27440876b1ba1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.3" + }, + "build_runner": { + "dependency": "direct dev", + "description": { + "name": "build_runner", + "sha256": "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.14" + }, + "build_runner_core": { + "dependency": "transitive", + "description": { + "name": "build_runner_core", + "sha256": "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.0" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.9.3" + }, + "card_swiper": { + "dependency": "direct main", + "description": { + "name": "card_swiper", + "sha256": "21e52a144decbf0054e7cfed8bbe46fc89635e6c86b767eaccfe7d5aeba32528", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "charcode": { + "dependency": "transitive", + "description": { + "name": "charcode", + "sha256": "fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.10.1" + }, + "collection": { + "dependency": "direct main", + "description": { + "name": "collection", + "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.0" + }, + "connectivity_plus": { + "dependency": "direct main", + "description": { + "name": "connectivity_plus", + "sha256": "e0817759ec6d2d8e57eb234e6e57d2173931367a865850c7acea40d4b4f9c27d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.1" + }, + "connectivity_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "connectivity_plus_platform_interface", + "sha256": "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "coverage": { + "dependency": "transitive", + "description": { + "name": "coverage", + "sha256": "e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "cross_file": { + "dependency": "transitive", + "description": { + "name": "cross_file", + "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.4+2" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.6" + }, + "cupertino_icons": { + "dependency": "direct main", + "description": { + "name": "cupertino_icons", + "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.8" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.7" + }, + "dbus": { + "dependency": "transitive", + "description": { + "name": "dbus", + "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.10" + }, + "dev_build": { + "dependency": "transitive", + "description": { + "name": "dev_build", + "sha256": "cbaebf7ccd20a054a25c675dc86afe132bf0b72722cf9bfacea242264c381aaf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1+4" + }, + "device_frame": { + "dependency": "transitive", + "description": { + "name": "device_frame", + "sha256": "d031a06f5d6f4750009672db98a5aa1536aa4a231713852469ce394779a23d75", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "device_info_plus": { + "dependency": "direct main", + "description": { + "name": "device_info_plus", + "sha256": "4fa68e53e26ab17b70ca39f072c285562cfc1589df5bb1e9295db90f6645f431", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.2.0" + }, + "device_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "device_info_plus_platform_interface", + "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.2" + }, + "device_preview": { + "dependency": "direct main", + "description": { + "name": "device_preview", + "sha256": "a694acdd3894b4c7d600f4ee413afc4ff917f76026b97ab06575fe886429ef19", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "devicelocale": { + "dependency": "direct main", + "description": { + "name": "devicelocale", + "sha256": "9a19798709ac86b4922d6d5a5c64a0c3834a77512d463c4d4b776669a884b53f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.1" + }, + "diff_match_patch": { + "dependency": "transitive", + "description": { + "name": "diff_match_patch", + "sha256": "2efc9e6e8f449d0abe15be240e2c2a3bcd977c8d126cfd70598aee60af35c0a4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.1" + }, + "diffutil_dart": { + "dependency": "transitive", + "description": { + "name": "diffutil_dart", + "sha256": "e0297e4600b9797edff228ed60f4169a778ea357691ec98408fa3b72994c7d06", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "diffutil_sliverlist": { + "dependency": "direct main", + "description": { + "name": "diffutil_sliverlist", + "sha256": "d20d7d521506b24190846cdbb6007e1b86fc0c26f04419cf359e426890911593", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1" + }, + "enum_to_string": { + "dependency": "direct main", + "description": { + "name": "enum_to_string", + "sha256": "bd9e83a33b754cb43a75b36a9af2a0b92a757bfd9847d2621ca0b1bed45f8e7a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "equatable": { + "dependency": "direct main", + "description": { + "name": "equatable", + "sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.7" + }, + "expandable_page_view": { + "dependency": "direct main", + "description": { + "name": "expandable_page_view", + "sha256": "210dc6961cfc29f7ed42867824eb699c9a4b9b198a7c04b8bdc1c05844969dc6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.17" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "floor": { + "dependency": "direct main", + "description": { + "name": "floor", + "sha256": "c1b06023912b5b8e49deb6a9d867863c535ae1a232d991c3582bba3ee8687867", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "floor_annotation": { + "dependency": "transitive", + "description": { + "name": "floor_annotation", + "sha256": "a40949580a7ab0eee572686e2d3b1638fd6bd6a753e661d792ab4236b365b23b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "floor_common": { + "dependency": "transitive", + "description": { + "name": "floor_common", + "sha256": "41c9914862f83a821815e1b1ffd47a1e1ae2130c35ff882ba2d000a67713ba64", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "floor_generator": { + "dependency": "direct dev", + "description": { + "name": "floor_generator", + "sha256": "1499b3ab878a807e6fbe6f140dc014124845cd1df3090a113aae5fa7577a1e77", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_bloc": { + "dependency": "direct main", + "description": { + "name": "flutter_bloc", + "sha256": "b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.1.6" + }, + "flutter_linkify": { + "dependency": "direct main", + "description": { + "name": "flutter_linkify", + "sha256": "74669e06a8f358fee4512b4320c0b80e51cffc496607931de68d28f099254073", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "flutter_lints": { + "dependency": "direct dev", + "description": { + "name": "flutter_lints", + "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.0" + }, + "flutter_local_notifications": { + "dependency": "direct main", + "description": { + "name": "flutter_local_notifications", + "sha256": "ef41ae901e7529e52934feba19ed82827b11baa67336829564aeab3129460610", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "18.0.1" + }, + "flutter_local_notifications_linux": { + "dependency": "transitive", + "description": { + "name": "flutter_local_notifications_linux", + "sha256": "8f685642876742c941b29c32030f6f4f6dacd0e4eaecb3efbb187d6a3812ca01", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.0" + }, + "flutter_local_notifications_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_local_notifications_platform_interface", + "sha256": "6c5b83c86bf819cdb177a9247a3722067dd8cc6313827ce7c77a4b238a26fd52", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.0" + }, + "flutter_localizations": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_mailer": { + "dependency": "direct main", + "description": { + "name": "flutter_mailer", + "sha256": "4fffaa35e911ff5ec2e5a4ebbca62c372e99a154eb3bb2c0bf79f09adf6ecf4c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "flutter_secure_storage": { + "dependency": "direct main", + "description": { + "name": "flutter_secure_storage", + "sha256": "165164745e6afb5c0e3e3fcc72a012fb9e58496fb26ffb92cf22e16a821e85d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.2.2" + }, + "flutter_secure_storage_linux": { + "dependency": "transitive", + "description": { + "name": "flutter_secure_storage_linux", + "sha256": "4d91bfc23047422cbcd73ac684bc169859ee766482517c22172c86596bf1464b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "flutter_secure_storage_macos": { + "dependency": "transitive", + "description": { + "name": "flutter_secure_storage_macos", + "sha256": "1693ab11121a5f925bbea0be725abfcfbbcf36c1e29e571f84a0c0f436147a81", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "flutter_secure_storage_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_secure_storage_platform_interface", + "sha256": "cf91ad32ce5adef6fba4d736a542baca9daf3beac4db2d04be350b87f69ac4a8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "flutter_secure_storage_web": { + "dependency": "transitive", + "description": { + "name": "flutter_secure_storage_web", + "sha256": "f4ebff989b4f07b2656fb16b47852c0aab9fed9b4ec1c70103368337bc1886a9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "flutter_secure_storage_windows": { + "dependency": "transitive", + "description": { + "name": "flutter_secure_storage_windows", + "sha256": "b20b07cb5ed4ed74fc567b78a72936203f587eba460af1df11281c9326cd3709", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "flutter_staggered_animations": { + "dependency": "direct main", + "description": { + "name": "flutter_staggered_animations", + "sha256": "81d3c816c9bb0dca9e8a5d5454610e21ffb068aedb2bde49d2f8d04f75538351", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "fluttertoast": { + "dependency": "direct main", + "description": { + "name": "fluttertoast", + "sha256": "24467dc20bbe49fd63e57d8e190798c4d22cbbdac30e54209d153a15273721d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.2.10" + }, + "freezed": { + "dependency": "direct dev", + "description": { + "name": "freezed", + "sha256": "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.7" + }, + "freezed_annotation": { + "dependency": "direct main", + "description": { + "name": "freezed_annotation", + "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.4" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "get_it": { + "dependency": "direct main", + "description": { + "name": "get_it", + "sha256": "f126a3e286b7f5b578bf436d5592968706c4c1de28a228b870ce375d9f743103", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.3" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "graphs": { + "dependency": "transitive", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "http": { + "dependency": "direct main", + "description": { + "name": "http", + "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.1" + }, + "image": { + "dependency": "direct main", + "description": { + "name": "image", + "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.3.0" + }, + "injectable": { + "dependency": "direct main", + "description": { + "name": "injectable", + "sha256": "5e1556ea1d374fe44cbe846414d9bab346285d3d8a1da5877c01ad0774006068", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.0" + }, + "injectable_generator": { + "dependency": "direct dev", + "description": { + "name": "injectable_generator", + "sha256": "af403d76c7b18b4217335e0075e950cd0579fd7f8d7bd47ee7c85ada31680ba1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.2" + }, + "intl": { + "dependency": "direct main", + "description": { + "name": "intl", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.19.0" + }, + "intl_utils": { + "dependency": "direct dev", + "description": { + "name": "intl_utils", + "sha256": "c2b1f5c72c25512cbeef5ab015c008fc50fe7e04813ba5541c25272300484bf4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.8.7" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "jiffy": { + "dependency": "direct main", + "description": { + "name": "jiffy", + "sha256": "1c1b86459969ff9f32dc5b0ffe392f1e08181e66396cf9dd8fa7c90552a691af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.2" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.7" + }, + "json_annotation": { + "dependency": "direct main", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "json_serializable": { + "dependency": "direct main", + "description": { + "name": "json_serializable", + "sha256": "c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.9.0" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.7" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.8" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "linkify": { + "dependency": "transitive", + "description": { + "name": "linkify", + "sha256": "4139ea77f4651ab9c315b577da2dd108d9aa0bd84b5d03d33323f1970c645832", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.0" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "lists": { + "dependency": "transitive", + "description": { + "name": "lists", + "sha256": "4ca5c19ae4350de036a7e996cdd1ee39c93ac0a2b840f4915459b7d0a7d4ab27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "logger": { + "dependency": "direct main", + "description": { + "name": "logger", + "sha256": "be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.0" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3-main.0" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.1" + }, + "material_design_icons_flutter": { + "dependency": "direct main", + "description": { + "name": "material_design_icons_flutter", + "sha256": "6f986b7a51f3ad4c00e33c5c84e8de1bdd140489bbcdc8b66fc1283dad4dea5a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.7296" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "mocktail": { + "dependency": "direct dev", + "description": { + "name": "mocktail", + "sha256": "890df3f9688106f25755f26b1c60589a92b3ab91a22b8b224947ad041bf172d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "nested": { + "dependency": "transitive", + "description": { + "name": "nested", + "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "nm": { + "dependency": "transitive", + "description": { + "name": "nm", + "sha256": "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, + "node_preamble": { + "dependency": "transitive", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "package_info_plus": { + "dependency": "direct main", + "description": { + "name": "package_info_plus", + "sha256": "70c421fe9d9cc1a9a7f3b05ae56befd469fe4f8daa3b484823141a55442d858d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.1.2" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "path": { + "dependency": "transitive", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "path_provider": { + "dependency": "transitive", + "description": { + "name": "path_provider", + "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.5" + }, + "path_provider_android": { + "dependency": "transitive", + "description": { + "name": "path_provider_android", + "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.15" + }, + "path_provider_foundation": { + "dependency": "transitive", + "description": { + "name": "path_provider_foundation", + "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.6" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "pretty_http_logger": { + "dependency": "direct main", + "description": { + "name": "pretty_http_logger", + "sha256": "f5317ccccb2d1837f6d7ba029d69447bf03c3e9b7b9599f5409f71a267ae2ac0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "process_run": { + "dependency": "transitive", + "description": { + "name": "process_run", + "sha256": "a68fa9727392edad97a2a96a77ce8b0c17d28336ba1b284b1dfac9595a4299ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2+1" + }, + "provider": { + "dependency": "transitive", + "description": { + "name": "provider", + "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.2" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.5" + }, + "pubspec_parse": { + "dependency": "transitive", + "description": { + "name": "pubspec_parse", + "sha256": "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "qr": { + "dependency": "transitive", + "description": { + "name": "qr", + "sha256": "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "quiver": { + "dependency": "direct main", + "description": { + "name": "quiver", + "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "recase": { + "dependency": "transitive", + "description": { + "name": "recase", + "sha256": "e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "receive_sharing_intent": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "fix-uri-path", + "resolved-ref": "ade703987e0dc26749c4291ad66d790e7d9dfa44", + "url": "https://github.com/kreativityapps/receive_sharing_intent.git" + }, + "source": "git", + "version": "1.8.0" + }, + "responsive_builder": { + "dependency": "direct main", + "description": { + "name": "responsive_builder", + "sha256": "64a5ef3fbe3628e4588a0c2391c3186300e76f58621d8135cc77aac816255a3e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.1" + }, + "share_plus": { + "dependency": "direct main", + "description": { + "name": "share_plus", + "sha256": "6327c3f233729374d0abaafd61f6846115b2a481b4feddd8534211dc10659400", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.1.3" + }, + "share_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "share_plus_platform_interface", + "sha256": "cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.2" + }, + "shared_preferences": { + "dependency": "direct main", + "description": { + "name": "shared_preferences", + "sha256": "3c7e73920c694a436afaf65ab60ce3453d91f84208d761fbd83fc21182134d93", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.4" + }, + "shared_preferences_android": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_android", + "sha256": "02a7d8a9ef346c9af715811b01fbd8e27845ad2c41148eefd31321471b41863d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "shared_preferences_foundation": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_foundation", + "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "shared_preferences_linux": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_linux", + "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_platform_interface": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_platform_interface", + "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_web": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_web", + "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "shared_preferences_windows": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_windows", + "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "shelf_packages_handler": { + "dependency": "transitive", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_static": { + "dependency": "transitive", + "description": { + "name": "shelf_static", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "smooth_page_indicator": { + "dependency": "direct main", + "description": { + "name": "smooth_page_indicator", + "sha256": "3b28b0c545fa67ed9e5997d9f9720d486f54c0c607e056a1094544e36934dff3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0+3" + }, + "source_gen": { + "dependency": "transitive", + "description": { + "name": "source_gen", + "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "source_helper": { + "dependency": "transitive", + "description": { + "name": "source_helper", + "sha256": "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.5" + }, + "source_map_stack_trace": { + "dependency": "transitive", + "description": { + "name": "source_map_stack_trace", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "source_maps": { + "dependency": "transitive", + "description": { + "name": "source_maps", + "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.13" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "sprintf": { + "dependency": "transitive", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "sqflite": { + "dependency": "direct main", + "description": { + "name": "sqflite", + "sha256": "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "sqflite_android": { + "dependency": "transitive", + "description": { + "name": "sqflite_android", + "sha256": "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "sqflite_common": { + "dependency": "transitive", + "description": { + "name": "sqflite_common", + "sha256": "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4+6" + }, + "sqflite_common_ffi": { + "dependency": "transitive", + "description": { + "name": "sqflite_common_ffi", + "sha256": "883dd810b2b49e6e8c3b980df1829ef550a94e3f87deab5d864917d27ca6bf36", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.4+4" + }, + "sqflite_common_ffi_web": { + "dependency": "transitive", + "description": { + "name": "sqflite_common_ffi_web", + "sha256": "61ea702e7aba727f28be7ead00b84c19c745cd4a4934d0c41473303df11ac9ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.5+4" + }, + "sqflite_darwin": { + "dependency": "transitive", + "description": { + "name": "sqflite_darwin", + "sha256": "96a698e2bc82bd770a4d6aab00b42396a7c63d9e33513a56945cbccb594c2474", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "sqflite_platform_interface": { + "dependency": "transitive", + "description": { + "name": "sqflite_platform_interface", + "sha256": "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "sqlite3": { + "dependency": "transitive", + "description": { + "name": "sqlite3", + "sha256": "cb7f4e9dc1b52b1fa350f7b3d41c662e75fc3d399555fa4e5efcf267e9a4fbb5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.0" + }, + "sqlparser": { + "dependency": "transitive", + "description": { + "name": "sqlparser", + "sha256": "7b20045d1ccfb7bc1df7e8f9fee5ae58673fce6ff62cefbb0e0fd7214e90e5a0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.34.1" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.0" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "strings": { + "dependency": "transitive", + "description": { + "name": "strings", + "sha256": "052836499f03897d3860a603b330c1ea3c8a14177b21f34b15a1295f36024aae", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "superellipse_shape": { + "dependency": "direct main", + "description": { + "name": "superellipse_shape", + "sha256": "8475f974a35be6d299ddbbe5b6be26ff2bc5521752cc631ffa8349aeb420bb18", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "synchronized": { + "dependency": "transitive", + "description": { + "name": "synchronized", + "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.0+3" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test": { + "dependency": "transitive", + "description": { + "name": "test", + "sha256": "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.25.8" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.3" + }, + "test_core": { + "dependency": "transitive", + "description": { + "name": "test_core", + "sha256": "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.5" + }, + "timezone": { + "dependency": "transitive", + "description": { + "name": "timezone", + "sha256": "ffc9d5f4d1193534ef051f9254063fa53d588609418c84299956c3db9383587d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.0" + }, + "timing": { + "dependency": "transitive", + "description": { + "name": "timing", + "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "unicode": { + "dependency": "transitive", + "description": { + "name": "unicode", + "sha256": "0f69e46593d65245774d4f17125c6084d2c20b4e473a983f6e21b7d7762218f1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.1" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.14" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.2" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + }, + "uuid": { + "dependency": "direct main", + "description": { + "name": "uuid", + "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.1" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.3.0" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "webkit_inspection_protocol": { + "dependency": "transitive", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.9.0" + }, + "win32_registry": { + "dependency": "transitive", + "description": { + "name": "win32_registry", + "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.5" + }, + "workmanager": { + "dependency": "direct main", + "description": { + "name": "workmanager", + "sha256": "ed13530cccd28c5c9959ad42d657cd0666274ca74c56dea0ca183ddd527d3a00", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.2" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "xml": { + "dependency": "direct main", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + } + }, + "sdks": { + "dart": ">=3.6.0 <4.0.0", + "flutter": ">=3.24.0" + } +} diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index fbb4a4a17608..f01bdee6a8e5 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -81,13 +81,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "4450"; + version = "4525"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; tag = "b${finalAttrs.version}"; - hash = "sha256-YOfG0Bt59P9yOzbbKZ5UZng6W+XG+LBOcdieUONn/hQ="; + hash = "sha256-U+JkD61ThCJUSnG2MMR61BSijyoQNg1mPLSKgSgNBCk="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT diff --git a/pkgs/by-name/lu/ludusavi/package.nix b/pkgs/by-name/lu/ludusavi/package.nix index b65b7cb078e4..c99457baae23 100644 --- a/pkgs/by-name/lu/ludusavi/package.nix +++ b/pkgs/by-name/lu/ludusavi/package.nix @@ -30,16 +30,16 @@ rustPlatform.buildRustPackage rec { pname = "ludusavi"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "mtkennerly"; repo = "ludusavi"; rev = "v${version}"; - hash = "sha256-YMTM0UKDGUiFmwmQXVJe5hccu4A8dhm0OFxTKLUb1jo="; + hash = "sha256-N2dDi47Z2PifMNlYE6Lk1nHxfpvwoL6h2QkUPthlh4A="; }; - cargoHash = "sha256-1IqjoprKwupwJwXyGtMwB7guG3j98ayWmmigY0fY12s="; + cargoHash = "sha256-ERMCZikUWWt5QpArAzXjhuZKVVFMP/cPA+pkjNwCWiA="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/mm/mmseqs2/package.nix b/pkgs/by-name/mm/mmseqs2/package.nix index f54142213e11..dfbfc21be257 100644 --- a/pkgs/by-name/mm/mmseqs2/package.nix +++ b/pkgs/by-name/mm/mmseqs2/package.nix @@ -26,13 +26,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "mmseqs2"; - version = "16-747c6"; + version = "17-b804f"; src = fetchFromGitHub { owner = "soedinglab"; repo = "mmseqs2"; tag = finalAttrs.version; - hash = "sha256-O7tx+gdVAmZLihPnWSo9RWNVzfPjI61LGY/XeaGHrI0="; + hash = "sha256-nmvFoW+Ey18NcM2w14Ak/3D/Kic52Vka/RxvBd0YoKI="; }; nativeBuildInputs = @@ -89,6 +89,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Ultra fast and sensitive sequence search and clustering suite"; mainProgram = "mmseqs"; homepage = "https://mmseqs.com/"; + changelog = "https://github.com/soedinglab/MMseqs2/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; platforms = platforms.unix; diff --git a/pkgs/by-name/nb/nb/package.nix b/pkgs/by-name/nb/nb/package.nix index cde39aad99bc..7880a96faa4d 100644 --- a/pkgs/by-name/nb/nb/package.nix +++ b/pkgs/by-name/nb/nb/package.nix @@ -6,6 +6,7 @@ testers, nix-update-script, nb, + bashInteractive, }: stdenv.mkDerivation rec { @@ -21,6 +22,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ bashInteractive ]; + dontBuild = true; installPhase = '' diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix index f0013a14f1dd..0670d3333e6b 100644 --- a/pkgs/by-name/ne/netbird-dashboard/package.nix +++ b/pkgs/by-name/ne/netbird-dashboard/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "netbird-dashboard"; - version = "2.8.2"; + version = "2.9.0"; src = fetchFromGitHub { owner = "netbirdio"; repo = "dashboard"; rev = "v${version}"; - hash = "sha256-netq6VCZcGBj5jv+pekRTxd6s0Lr45yuqZThs0qoc64="; + hash = "sha256-PY/jK96FK6Y0++Ie4Yg/7GrGoLtLcgCSzXIkqySxe2M="; }; - npmDepsHash = "sha256-MbVBeZWX9e4eLz2ZRG0qYr9oTkBGhFPJ5m/rVEfGLuc="; + npmDepsHash = "sha256-TELyc62l/8IaX9eL2lxRFth0AAZ4LXsV2WNzXSHRnTw="; npmFlags = [ "--legacy-peer-deps" ]; installPhase = '' diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 89e8e1ee22bd..556e0c486c62 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -129,7 +129,10 @@ let wrapperArgs = builtins.concatStringsSep " " wrapperOptions; goBuild = - if enableCuda then buildGoModule.override { stdenv = overrideCC stdenv gcc12; } else buildGoModule; + if enableCuda then + buildGoModule.override { stdenv = cudaPackages.backendStdenv; } + else + buildGoModule; inherit (lib) licenses platforms maintainers; in goBuild { @@ -146,9 +149,7 @@ goBuild { CLBlast_DIR = "${clblast}/lib/cmake/CLBlast"; HIP_PATH = rocmPath; } - // lib.optionalAttrs enableCuda { - CUDA_PATH = cudaPath; - }; + // lib.optionalAttrs enableCuda { CUDA_PATH = cudaPath; }; nativeBuildInputs = [ @@ -225,9 +226,7 @@ goBuild { __darwinAllowLocalNetworking = true; - nativeInstallCheck = [ - versionCheckHook - ]; + nativeInstallCheck = [ versionCheckHook ]; versionCheckProgramArg = [ "--version" ]; doInstallCheck = true; diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 5e517c07bd74..1f91494028a5 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -26,13 +26,13 @@ xorg, }: let - version = "2.14.4"; + version = "2.14.5"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; tag = "v${version}"; - hash = "sha256-asjTRjEMnJcmyAZNZQ+VxXeyGc+j0j1JAAOrOaQ7ma4="; + hash = "sha256-ML38TErINQPjBGweCY673zFlGEjTjgJcYJTJUbTov+4="; }; # subpath installation is broken with uvicorn >= 0.26 @@ -86,7 +86,7 @@ let cd src-ui ''; - npmDepsHash = "sha256-JUmYSHHrNWpJNp01Er2zMgiVVIIOAC+QlKw1HAjD7/E="; + npmDepsHash = "sha256-hK7Soop9gBZP4m2UzbEIAsLkPKpbQkLmVruY2So4CSs="; nativeBuildInputs = [ diff --git a/pkgs/by-name/pf/pfetch-rs/package.nix b/pkgs/by-name/pf/pfetch-rs/package.nix index 17f656c910c7..ca6c07214773 100644 --- a/pkgs/by-name/pf/pfetch-rs/package.nix +++ b/pkgs/by-name/pf/pfetch-rs/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "pfetch-rs"; - version = "2.11.0"; + version = "2.11.1"; src = fetchFromGitHub { owner = "Gobidev"; repo = pname; rev = "v${version}"; - hash = "sha256-1Br/mO7hisTFxiPJs5vOC+idENYMqfzJEmPBXOFGc58="; + hash = "sha256-Kgoo8piv4pNqzw9zQSEj7POSK6l+0KMvaNbvMp+bpF8="; }; - cargoHash = "sha256-/gYL32kUA4gKTGogMrOghQ3XYFjw3GsDhzynUC/OyXY="; + cargoHash = "sha256-24t2T+YkhDfGrYbT1VWYxA20//q6ElbvVCPY7VsLXRA="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit diff --git a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix similarity index 61% rename from pkgs/development/python-modules/pipenv-poetry-migrate/default.nix rename to pkgs/by-name/pi/pipenv-poetry-migrate/package.nix index 3a18abb09845..968d056898b9 100644 --- a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix +++ b/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix @@ -1,21 +1,13 @@ { lib, - buildPythonPackage, fetchFromGitHub, - pytestCheckHook, - pythonOlder, - poetry-core, - tomlkit, - typer, - setuptools, + python3Packages, }: -buildPythonPackage rec { +python3Packages.buildPythonApplication rec { pname = "pipenv-poetry-migrate"; version = "0.6.0"; - format = "pyproject"; - - disabled = pythonOlder "3.8"; + pyproject = true; src = fetchFromGitHub { owner = "yhino"; @@ -24,22 +16,22 @@ buildPythonPackage rec { hash = "sha256-M31bOvKGUlkzfZRQAxTkxhX8m9cCzEvsNZdyIyipwGI="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ python3Packages.poetry-core ]; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ setuptools # for pkg_resources tomlkit typer ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ python3Packages.pytestCheckHook ]; - meta = with lib; { + meta = { description = "This is simple migration script, migrate pipenv to poetry"; mainProgram = "pipenv-poetry-migrate"; homepage = "https://github.com/yhino/pipenv-poetry-migrate"; changelog = "https://github.com/yhino/pipenv-poetry-migrate/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ gador ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ gador ]; }; } diff --git a/pkgs/by-name/rb/rbenv/package.nix b/pkgs/by-name/rb/rbenv/package.nix index 1e69e874f573..5d4f6928b373 100644 --- a/pkgs/by-name/rb/rbenv/package.nix +++ b/pkgs/by-name/rb/rbenv/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rbenv"; - version = "1.3.0"; + version = "1.3.2"; nativeBuildInputs = [ installShellFiles ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "rbenv"; repo = "rbenv"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-AO0z9QtCGHwUr2ji28sbvQmCBDIfjAqbiac+HTH3N7Q="; + sha256 = "sha256-vkwYl+cV5laDfevAHfju5G+STA3Y+wcMBtW1NWzJ4po="; }; postPatch = '' diff --git a/pkgs/by-name/sc/scala-next/package.nix b/pkgs/by-name/sc/scala-next/package.nix index edbe49945f1a..093bdac0b6e2 100644 --- a/pkgs/by-name/sc/scala-next/package.nix +++ b/pkgs/by-name/sc/scala-next/package.nix @@ -1,10 +1,10 @@ { scala, fetchurl }: scala.bare.overrideAttrs (oldAttrs: { - version = "3.5.1"; + version = "3.6.3"; pname = "scala-next"; src = fetchurl { inherit (oldAttrs.src) url; - hash = "sha256-pRfoCXFVnnEh3zyB9HbUZK3qrQ94Gq3iXX2fWGS/l9o="; + hash = "sha256-I+PYPSRLS8Q0SJ/BEAoFwB7EcFERZpN5pGcD5cGwlNU="; }; }) diff --git a/pkgs/by-name/te/termius/package.nix b/pkgs/by-name/te/termius/package.nix index 25fa1c1cf8b2..6810cffa375d 100644 --- a/pkgs/by-name/te/termius/package.nix +++ b/pkgs/by-name/te/termius/package.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { pname = "termius"; - version = "9.9.0"; - revision = "211"; + version = "9.12.0"; + revision = "212"; src = fetchurl { # find the latest version with @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # and the sha512 with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_${revision}.snap"; - hash = "sha512-7oaVWe0H4y3tiSD8Cgj14fEaJQj3ekoczJjv5JvrU5I9ylRoe8XHNqD0MwOYFIpICyyKfoj0UonyVgggGLUq5A=="; + hash = "sha512-w2dp/iwwYsR7LVk7O4FtktctX39lMNufrtTSaRjWq59bIalvPM2mC3DDs1zhsEq1EmKsY+uVsAgsDPMG7bCRUw=="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix index 4fde9ffef3c8..19e1cf1e0999 100644 --- a/pkgs/by-name/up/updatecli/package.nix +++ b/pkgs/by-name/up/updatecli/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "updatecli"; - version = "0.91.0"; + version = "0.92.0"; src = fetchFromGitHub { owner = "updatecli"; repo = "updatecli"; rev = "v${version}"; - hash = "sha256-r/8QPVJHrvHbDZZ7RFgKBB7isy/P5hTBe84xFcevEH4="; + hash = "sha256-cdutmuNcsrAq+b38/QhBjTS3e1f3s6Ffarvnxt3NX3k="; }; - vendorHash = "sha256-Y1klBZZvDtCootNXQOlScSgDpaw1/owzBX9ykCD6NCw="; + vendorHash = "sha256-J2vARkThxgu0bYLQv80AKIC4XmfWdnabZn0gOyhe43U="; # tests require network access doCheck = false; diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix index 4af4babdd2bc..cee890827557 100644 --- a/pkgs/by-name/wa/wasm-tools/package.nix +++ b/pkgs/by-name/wa/wasm-tools/package.nix @@ -6,19 +6,19 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.223.0"; + version = "1.224.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-Wy/a8U2VEpfNgKMA1lwKOlC5fezX5voW+U5HkL0cH4k="; + hash = "sha256-NU8j/qDMCeVFnUhU2P5ZrrpMgE6+IIV/+jmLpPEk3vA="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-P4jPSXvWXQZWQMvVllpAwq2svaBue6HD9KVhV6QTGMU="; + cargoHash = "sha256-UEQnlfXZgNprd9w/ZyeqQkN4psmKKhRf2PCBadDnYDo="; cargoBuildFlags = [ "--package" "wasm-tools" diff --git a/pkgs/by-name/wo/wootility/package.nix b/pkgs/by-name/wo/wootility/package.nix index 568a72abb47d..0fc6ee6a4076 100644 --- a/pkgs/by-name/wo/wootility/package.nix +++ b/pkgs/by-name/wo/wootility/package.nix @@ -7,10 +7,10 @@ let pname = "wootility"; - version = "4.7.2"; + version = "4.7.3"; src = fetchurl { url = "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-lekker-linux-latest/wootility-lekker-${version}.AppImage"; - sha256 = "sha256-2xIiSMFyJjmjBQ6GJYtc0VbZkTadV2Ov/mXQcJ8yq2U="; + sha256 = "sha256-5S4Yz2VymKfT1uBXYufb6MWx1aMbGn4ufT8RITJtuPc="; }; in diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix index 7afc78eda700..70604a2a5fea 100644 --- a/pkgs/by-name/xp/xpipe/package.nix +++ b/pkgs/by-name/xp/xpipe/package.nix @@ -39,7 +39,7 @@ let hash = { - x86_64-linux = "sha256-6h6Rtmo9XV9fk6G+ff5A1apwmJ7L5s+pTJDS759OOgk="; + x86_64-linux = "sha256-1/sGobiYtOS4GaZZHQHHvXBZlaCMr4EWpP5m/917h8g="; } .${system} or throwSystem; @@ -48,7 +48,7 @@ let in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "13.4.4"; + version = "14.0"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; diff --git a/pkgs/development/compilers/idris2/build-idris.nix b/pkgs/development/compilers/idris2/build-idris.nix index bc3e0f551705..5ca4e8461c56 100644 --- a/pkgs/development/compilers/idris2/build-idris.nix +++ b/pkgs/development/compilers/idris2/build-idris.nix @@ -11,13 +11,17 @@ # idrisLibraries = [ ]; # }; # in { -# lib = pkg.library { withSource = true; }; +# lib1 = pkg.library { withSource = true; }; +# +# # implicitly without source: +# lib2 = pkg.library'; +# # bin = pkg.executable; # } # { src, - ipkgName, + ipkgName, # ipkg filename without the extension version ? "unversioned", idrisLibraries, # Other libraries built with buildIdris ... @@ -44,78 +48,91 @@ let ipkgFileName = ipkgName + ".ipkg"; idrName = "idris2-${idris2.version}"; libSuffix = "lib/${idrName}"; - propagatedIdrisLibraries = propagate idrisLibraryLibs; - libDirs = (lib.makeSearchPath libSuffix propagatedIdrisLibraries) + ":${idris2}/${idrName}"; + libDirs = libs: (lib.makeSearchPath libSuffix libs) + ":${idris2}/${idrName}"; supportDir = "${idris2}/${idrName}/lib"; drvAttrs = builtins.removeAttrs attrs [ "ipkgName" "idrisLibraries" ]; - derivation = stdenv.mkDerivation ( - finalAttrs: - drvAttrs - // { - pname = ipkgName; - inherit version; - src = src; - nativeBuildInputs = [ - idris2 - makeBinaryWrapper - ] ++ attrs.nativeBuildInputs or [ ]; - buildInputs = propagatedIdrisLibraries ++ attrs.buildInputs or [ ]; + mkDerivation = + withSource: + let + applyWithSource = lib: if withSource then lib.withSource else lib; + propagatedIdrisLibraries = map applyWithSource (propagate idrisLibraryLibs); + in + stdenv.mkDerivation ( + finalAttrs: + drvAttrs + // { + pname = ipkgName; + inherit src version; + nativeBuildInputs = [ + idris2 + makeBinaryWrapper + ] ++ attrs.nativeBuildInputs or [ ]; + buildInputs = propagatedIdrisLibraries ++ attrs.buildInputs or [ ]; - env.IDRIS2_PACKAGE_PATH = libDirs; + env.IDRIS2_PACKAGE_PATH = libDirs propagatedIdrisLibraries; - buildPhase = '' - runHook preBuild - idris2 --build ${ipkgFileName} - runHook postBuild + buildPhase = '' + runHook preBuild + idris2 --build ${ipkgFileName} + runHook postBuild + ''; + + passthru = { + inherit propagatedIdrisLibraries; + } // (attrs.passthru or { }); + + shellHook = '' + export IDRIS2_PACKAGE_PATH="${finalAttrs.env.IDRIS2_PACKAGE_PATH}" + ''; + } + ); + + mkExecutable = + withSource: + let + derivation = mkDerivation withSource; + in + derivation.overrideAttrs { + installPhase = '' + runHook preInstall + mkdir -p $out/bin + scheme_app="$(find ./build/exec -name '*_app')" + if [ "$scheme_app" = ''' ]; then + mv -- build/exec/* $out/bin/ + chmod +x $out/bin/* + # ^ remove after Idris2 0.8.0 is released. will be superfluous: + # https://github.com/idris-lang/Idris2/pull/3189 + else + cd build/exec/*_app + rm -f ./libidris2_support.{so,dylib} + for file in *.so; do + bin_name="''${file%.so}" + mv -- "$file" "$out/bin/$bin_name" + + wrapProgram "$out/bin/$bin_name" \ + --prefix LD_LIBRARY_PATH : ${supportDir} \ + --prefix DYLD_LIBRARY_PATH : ${supportDir} + done + fi + runHook postInstall ''; - passthru = { - inherit propagatedIdrisLibraries; - } // (attrs.passthru or { }); + # allow an executable's dependencies to be built with source. this is convenient when + # building a development shell for the exectuable using `mkShell`'s `inputsFrom`. + passthru = derivation.passthru // { + withSource = mkExecutable true; + }; + }; - shellHook = '' - export IDRIS2_PACKAGE_PATH="${finalAttrs.env.IDRIS2_PACKAGE_PATH}" - ''; - } - ); - -in -{ - executable = derivation.overrideAttrs { - installPhase = '' - runHook preInstall - mkdir -p $out/bin - scheme_app="$(find ./build/exec -name '*_app')" - if [ "$scheme_app" = ''' ]; then - mv -- build/exec/* $out/bin/ - chmod +x $out/bin/* - # ^ remove after Idris2 0.8.0 is released. will be superfluous: - # https://github.com/idris-lang/Idris2/pull/3189 - else - cd build/exec/*_app - rm -f ./libidris2_support.so - for file in *.so; do - bin_name="''${file%.so}" - mv -- "$file" "$out/bin/$bin_name" - wrapProgram "$out/bin/$bin_name" \ - --prefix LD_LIBRARY_PATH : ${supportDir} \ - --prefix DYLD_LIBRARY_PATH : ${supportDir} - done - fi - runHook postInstall - ''; - }; - - library = - { - withSource ? false, - }: + mkLibrary = + withSource: let installCmd = if withSource then "--install-with-src" else "--install"; + derivation = mkDerivation withSource; in derivation.overrideAttrs { installPhase = '' @@ -125,5 +142,30 @@ in idris2 ${installCmd} ${ipkgFileName} runHook postInstall ''; + + # allow a library built without source to be changed to one with source + # via a passthru attribute; i.e. `my-pkg.library'.withSource`. + # this is convenient because a library derivation can be distributed as + # without-source by default but downstream projects can still build it + # with-source. We surface this regardless of whether the original library + # was built with source because that allows downstream to call this + # property unconditionally. + passthru = derivation.passthru // { + withSource = mkLibrary true; + }; }; + +in +{ + executable = mkExecutable false; + + library = + { + withSource ? false, + }: + mkLibrary withSource; + + # Make a library without source; you can still use the `withSource` attribute + # on the resulting derivation to build the library with source at a later time. + library' = mkLibrary false; } diff --git a/pkgs/development/compilers/idris2/tests.nix b/pkgs/development/compilers/idris2/tests.nix index b4193286d49c..b26227d7c4ed 100644 --- a/pkgs/development/compilers/idris2/tests.nix +++ b/pkgs/development/compilers/idris2/tests.nix @@ -55,12 +55,13 @@ let { testName, buildIdrisArgs, - makeExecutable, + # function that takes result of `buildIdris` and transforms it (commonly + # by calling `.executable` or `.library {}` upon it): + transformBuildIdrisOutput, expectedTree, }: let - final = pkg: if makeExecutable then pkg.executable else pkg.library { }; - idrisPkg = final (idris2Packages.buildIdris buildIdrisArgs); + idrisPkg = transformBuildIdrisOutput (idris2Packages.buildIdris buildIdrisArgs); in runCommand "${pname}-${testName}" { @@ -140,7 +141,7 @@ in EOF ''; }; - makeExecutable = false; + transformBuildIdrisOutput = pkg: pkg.library { withSource = false; }; expectedTree = '' `-- lib `-- idris2-0.7.0 @@ -153,6 +154,82 @@ in 5 directories, 3 files''; }; + buildLibraryWithSource = testBuildIdris { + testName = "library-with-source-package"; + buildIdrisArgs = { + ipkgName = "pkg"; + idrisLibraries = [ idris2Packages.idris2Api ]; + src = runCommand "library-package-src" { } '' + mkdir $out + + cat > $out/Main.idr < $out/pkg.ipkg < $out/Main.idr < $out/pkg.ipkg <=[^']*//" setup.py - ''; - - # No tests in PyPI tarball - doCheck = false; - - propagatedBuildInputs = [ - numpy - h5py - ]; - - meta = with lib; { - description = "Reference implementations of popular deep learning models"; - homepage = "https://github.com/keras-team/keras-applications"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/keras-preprocessing/default.nix b/pkgs/development/python-modules/keras-preprocessing/default.nix deleted file mode 100644 index 0e9b0bf5187f..000000000000 --- a/pkgs/development/python-modules/keras-preprocessing/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - numpy, - six, - scipy, - pillow, - pytest, - keras, -}: - -buildPythonPackage rec { - pname = "keras-preprocessing"; - version = "1.1.2"; - - src = fetchPypi { - pname = "Keras_Preprocessing"; - inherit version; - sha256 = "add82567c50c8bc648c14195bf544a5ce7c1f76761536956c3d2978970179ef3"; - }; - - propagatedBuildInputs = [ - # required - numpy - six - # optional - scipy - pillow - ]; - - nativeCheckInputs = [ - pytest - keras - ]; - - checkPhase = '' - py.test tests/ - ''; - - # Cyclic dependency: keras-preprocessing's tests require Keras, which requires keras-preprocessing - doCheck = false; - - meta = with lib; { - description = "Easy data preprocessing and data augmentation for deep learning models"; - homepage = "https://github.com/keras-team/keras-preprocessing"; - license = licenses.mit; - }; -} diff --git a/pkgs/development/python-modules/manim-slides/default.nix b/pkgs/development/python-modules/manim-slides/default.nix index c3b35754f432..e4f53f5553b2 100644 --- a/pkgs/development/python-modules/manim-slides/default.nix +++ b/pkgs/development/python-modules/manim-slides/default.nix @@ -10,12 +10,12 @@ ffmpeg, av, + beautifulsoup4, click, click-default-group, jinja2, lxml, numpy, - opencv-python, pillow, pydantic, pydantic-extra-types, @@ -35,7 +35,7 @@ }: buildPythonPackage rec { pname = "manim-slides"; - version = "5.1.9"; + version = "5.4.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "jeertmans"; repo = "manim-slides"; tag = "v${version}"; - hash = "sha256-M500u7x0jQqcqCd3RbS0CpI1nuwNs9URFlHPeGkiT7E="; + hash = "sha256-9BPBjTepb1CdCEk1j471NhndLG5Ai1P81VUV6msQPus="; }; build-system = [ @@ -60,12 +60,12 @@ buildPythonPackage rec { dependencies = [ av + beautifulsoup4 click click-default-group jinja2 lxml numpy - opencv-python pillow pydantic pydantic-extra-types @@ -89,12 +89,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "manim_slides" ]; - meta = with lib; { + meta = { changelog = "https://github.com/jeertmans/manim-slides/blob/${src.rev}/CHANGELOG.md"; description = "Tool for live presentations using manim"; homepage = "https://github.com/jeertmans/manim-slides"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "manim-slides"; - maintainers = with maintainers; [ soispha ]; + maintainers = with lib.maintainers; [ soispha ]; }; } diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix index 52c46d557cb3..b630185f9e2b 100644 --- a/pkgs/development/python-modules/molecule/default.nix +++ b/pkgs/development/python-modules/molecule/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "molecule"; - version = "24.12.0"; + version = "25.1.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-ckP/WOC4FZqiz0ZbqWBdZX8dYUYXJkMHvvWzJRhGev4="; + hash = "sha256-09M0ZGXj5M+GFNtrCD41K2XHa74F5RGvhfv0L1lQrd4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index cb709c98b720..2ca3c4c1dc61 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -29,8 +29,6 @@ cudaPackages, zlib, python, - keras-applications, - keras-preprocessing, addDriverRunpath, astunparse, flatbuffers, @@ -90,8 +88,6 @@ buildPythonPackage rec { wrapt tensorflow-estimator-bin tensorboard - keras-applications - keras-preprocessing h5py ] ++ lib.optional (!isPy3k) mock; diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index e3081deb2f92..96ed0b178f3d 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -22,7 +22,6 @@ packaging, setuptools, wheel, - keras-preprocessing, google-pasta, opt-einsum, astunparse, @@ -197,7 +196,6 @@ let google-pasta grpcio h5py - keras-preprocessing numpy opt-einsum packaging @@ -652,7 +650,6 @@ buildPythonPackage { google-pasta grpcio h5py - keras-preprocessing numpy opt-einsum packaging diff --git a/pkgs/development/python-modules/unstructured-inference/default.nix b/pkgs/development/python-modules/unstructured-inference/default.nix index cf13762cd56d..419128ca877d 100644 --- a/pkgs/development/python-modules/unstructured-inference/default.nix +++ b/pkgs/development/python-modules/unstructured-inference/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "unstructured-inference"; - version = "0.8.1"; + version = "0.8.5"; format = "setuptools"; src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-inference"; tag = version; - hash = "sha256-U4mB3A0a1el7lmzsqTzjDBxp6lA4RpsceUt0OVGYVG4="; + hash = "sha256-v5gYs6gXSDaGu7ygb4lCcg3kI96PHN6aPSYBMVVYtQk="; }; propagatedBuildInputs = diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index 9b02a2e59513..cf576bf4f850 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.5.4", + "version": "1.6.1", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "sha256-DnaNaBeNbCB5f2ul9YyJ5GCYmFX6588j04UTIeJFz6M=" + "sha256": "0qvd3899bw19d7mavx5n50n3w5qry9jmzdyfmkql2r5xb8sb071z" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "sha256-UZ7VTxfCatPsUdynohTGnxTOZiBJ07NXXULPBPT00YU=" + "sha256": "1xmz5lb1d3k5jya3kk6bdymrdl1856gl95c4h736pramlc275277" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "sha256-lLyfOWhrxGfUp3puwg01Cs4pIIfDCz+HGxvQ/MtnLYc=" + "sha256": "12hgknbxvj2d193rap01qjqh1scl7a359rx4mcy5mvjb5ah977i6" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "sha256-V8EqA60n7CxOlJ9FH27klfO8GCXwVw7oYtQ+Qg/zoMU=" + "sha256": "1k6ym1ak097q0biwll3jajq86mi7wyvzmhp4wkia63vmnimgkdzz" } } } diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 968825b79212..034c09f6c8a5 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.38.0"; + version = "1.38.1"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - hash = "sha256-avQdK7+kMrPc8rp/2nTiUC/ZTW8nUem9v3u0xsE0oGM="; + hash = "sha256-Pc+JHUkGeLRfzgQCrYzsdvLEYctqPCDweS2H/ky8ltA="; }; outputs = [ diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index bea8a611eb6a..b2122e397bd0 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -16,47 +16,47 @@ let phpMajor = lib.versions.majorMinor php.version; inherit (stdenv.hostPlatform) system; - version = "1.92.30"; + version = "1.92.32"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-jUMiUtmv+6uwo2t1qiKnCb0WUyelULd5E4Lbjcp1M0Y="; - "8.2" = "sha256-ZITGC0065QoFEwYEmKDyZmCBOmxhZnUoWbYSBuQnf0E="; - "8.3" = "sha256-3GlAYpY8KeOHzdv+WbE6VPIvKgEDmqQfCt1Txe160tI="; + "8.1" = "sha256-oRd6PbBLOboH9EVRfZl5u71ZoVMFO4K/uftxlL/vm18="; + "8.2" = "sha256-95qBidNHIGLGCb3QbUIzBMHsRi2GTPhwAjJg+JTteDk="; + "8.3" = "sha256-8TO28o4YYFK1r2tInjXKenki/izHzZL0Dblaippekl8="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-uRaaN2pFFRvMyTfWH4kmzoItvdsK2F/elH+24E9PJl4="; - "8.2" = "sha256-bhK42K4ud9gwTGcepgmOAnHuqdhnFl5BVAVhnBO/7gE="; - "8.3" = "sha256-8/CymHXqfcC5ewZjvNOIaZelcq4YfLX5M+EJZkWpJFA="; + "8.1" = "sha256-mXJ1hO8NcODG7Wj3lQ+5lkSjcbkKLN5OOzcobigScKI="; + "8.2" = "sha256-P5fQTVfE/DvLD4E3kUPE+eeOM9YVNNixgWVRq3Ca5M4="; + "8.3" = "sha256-rMUv2EUlepBahMaEvs60i7RFTmaBe4P4qB1hcARqP9Y="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-s/cLlOptINpFsiZxVdgupRhZC8qE+pASNLssJ0w032Q="; - "8.2" = "sha256-v+NBLaEMD22CX7DuhxqcWA0gaWsg51qhY8AorTzOV30="; - "8.3" = "sha256-9FZHvOuP5dgymgE1O12X7dH4Mk5TIm7nfK8+/lqET1k="; + "8.1" = "sha256-Tj7LHXS4m9hF9gY/9vfOQPJVP+vHM1h8XdBY9vyRhFo="; + "8.2" = "sha256-6kfotMptfVLPL414mr6LeJZ3ODnjepYQYnKvg4fHIAg="; + "8.3" = "sha256-M/GTdinOi3Em7GJOm1iUKkuDNg8La3iQpG+wGHp0ycE="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-oee6g+jpMT79xROeJngpSTk7jId4WMlrGpu4glCUu+I="; - "8.2" = "sha256-4oeYCScZK/x+GzcF3cqwuIxVJ/CZfVgD1RHdIlpB4B0="; - "8.3" = "sha256-BOQuR/uqiRtCVtq/OTiEWb1w7wJF1ikrjwEyOXnu6B0="; + "8.1" = "sha256-TZ6D8sTlLuM+8707ncECPNQlpySc7BYKIwSEth3MUT8="; + "8.2" = "sha256-4VJBo1TzEkstKo2ed9bxb/3g0JFjHlfTIfmDq2dCfUk="; + "8.3" = "sha256-gIIoRRNCed5cgbcFxvwXKgWZs4HgoOMCx6k0urVPxbs="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-tXfzioFSOlM65ZT5lxmr2xK/RipDjTR9pQdOZfDdgCU="; - "8.2" = "sha256-4iz9HQMjDoybwQJiDkdtt/MCQ3OeIz3x9rh9RZo1Zug="; - "8.3" = "sha256-ZLlRxfnDA9/AZmLH5kNofG/s3nlxj0rfh2oUgUG9Dyc="; + "8.1" = "sha256-tO52c8FKZXXgx7+0IGiwy5rPLEsU/5ji/c79wzb1S34="; + "8.2" = "sha256-eUkM5KzZLPK2hCnFqRN8eOwLiX54qXuLkdfxJdjuZTk="; + "8.3" = "sha256-CaRs3DI5TTHNSk91pqFaHt1OVQzGozATOUs7GNi8cqY="; }; }; }; diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 index a66f27892a1a..bd219998593c 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 @@ -500,7 +500,7 @@ Builder options: .Fl K Ns , .Fl -fallback Ns , .Fl I Ns , -.Fl -option Ns +.Fl -option Ns , .Fl -repair Ns , .Fl -builders Ns , .Fl -accept-flake-config Ns , diff --git a/pkgs/test/overriding.nix b/pkgs/test/overriding.nix index 9ccc84e03356..27f57ab1ab9d 100644 --- a/pkgs/test/overriding.nix +++ b/pkgs/test/overriding.nix @@ -5,7 +5,7 @@ }: let - tests = tests-stdenv // tests-go // tests-python; + tests = tests-stdenv // test-extendMkDerivation // tests-go // tests-python; tests-stdenv = let @@ -64,6 +64,73 @@ let }; }; + test-extendMkDerivation = + let + mkLocalDerivation = lib.extendMkDerivation { + constructDrv = pkgs.stdenv.mkDerivation; + excludeDrvArgNames = [ + "specialArg" + ]; + extendDrvArgs = + finalAttrs: + { + preferLocalBuild ? true, + allowSubstitute ? false, + specialArg ? (_: false), + ... + }@args: + { + inherit preferLocalBuild allowSubstitute; + passthru = args.passthru or { } // { + greeting = if specialArg "Hi!" then "Hi!" else "Hello!"; + }; + }; + }; + + helloLocalPlainAttrs = { + inherit (pkgs.hello) pname version src; + specialArg = throw "specialArg is broken."; + }; + + helloLocalPlain = mkLocalDerivation helloLocalPlainAttrs; + + helloLocal = mkLocalDerivation ( + finalAttrs: + helloLocalPlainAttrs + // { + passthru = pkgs.hello.passthru or { } // { + foo = "a"; + bar = "${finalAttrs.passthru.foo}b"; + }; + } + ); + + hiLocal = mkLocalDerivation ( + helloLocalPlainAttrs + // { + specialArg = s: lib.stringLength s == 3; + } + ); + in + { + extendMkDerivation-helloLocal-imp-arguments = { + expr = helloLocal.preferLocalBuild; + expected = true; + }; + extendMkDerivation-helloLocal-plain-equivalence = { + expr = helloLocal.drvPath == helloLocalPlain.drvPath; + expected = true; + }; + extendMkDerivation-helloLocal-finalAttrs = { + expr = helloLocal.bar == "ab"; + expected = true; + }; + extendMkDerivation-helloLocal-specialArg = { + expr = hiLocal.greeting == "Hi!"; + expected = true; + }; + }; + tests-go = let pet_0_3_4 = pkgs.buildGoModule rec { @@ -194,6 +261,7 @@ let expected = true; }; }; + in stdenvNoCC.mkDerivation { diff --git a/pkgs/tools/misc/opentelemetry-collector/builder.nix b/pkgs/tools/misc/opentelemetry-collector/builder.nix index fcaec3539ae9..50917c8f683a 100644 --- a/pkgs/tools/misc/opentelemetry-collector/builder.nix +++ b/pkgs/tools/misc/opentelemetry-collector/builder.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ocb"; # Also update `pkgs/tools/misc/opentelemetry-collector/releases.nix` # whenever that version changes. - version = "0.116.0"; + version = "0.118.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "cmd/builder/v${version}"; - hash = "sha256-1wFLeRbiNytPEe262TEhBrAOLUkbsdLzKYngN2S3O4E="; + hash = "sha256-dx60Ai+IBF0lzAj73LqMm1oeP0o5FI9B7n+dk5vBloc="; }; sourceRoot = "${src.name}/cmd/builder"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bae61c6a7e3..285c113312dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6746,8 +6746,6 @@ with pkgs; rustup-toolchain-install-master = callPackage ../development/tools/rust/rustup-toolchain-install-master { inherit (darwin.apple_sdk.frameworks) Security; }; - scala_2_10 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.10"; jre = jdk8; }; - scala_2_11 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.11"; jre = jdk8; }; scala_2_12 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.12"; }; scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; }; scala_3 = callPackage ../development/compilers/scala { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index d0e9f2f4017d..2284859f75c5 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -328,6 +328,8 @@ mapAliases ({ Kajiki = kajiki; # added 2023-02-19 keepkey_agent = keepkey-agent; # added 2024-01-06 Keras = keras; # added 2021-11-25 + keras-applications = throw "keras-applications has been removed because it's abandoned since 2022"; # added 2025-01-12 + keras-preprocessing = throw "keras-preprocessing has been removed because it's abandoned since 2024"; # added 2025-01-12 keyring_24 = throw "keyring_24 has been removed, use keyring instead"; # added 2025-01-01 ldap = python-ldap; # added 2022-09-16 lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 @@ -433,6 +435,7 @@ mapAliases ({ pdfx = throw "pdfx has been removed because the upstream repository was archived in 2023"; # Added 2024-10-04 pep257 = pydocstyle; # added 2022-04-12 pillow-simd = throw "pillow-simd has been removed for lagging behind pillow upstream, which exposes it to various security issues."; # Added 2024-10-24 + pipenv-poetry-migrate = throw "pipenv-poetry-migrate was promoted to a top-level attribute"; # added 2025-01-14 pixelmatch = "pixelmatch has been removed as it was unmaintained"; # Added 2024-08-18 pkutils = throw "pkutils was removed as it was unused and is not applicable to modern Python build tools"; # added 2024-07-28 poetry = throw "poetry was promoted to a top-level attribute, use poetry-core to build Python packages"; # added 2023-01-09 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c99fe01e0cd6..c5e348165cf5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6971,12 +6971,8 @@ self: super: with self; { keke = callPackage ../development/python-modules/keke { }; - keras-applications = callPackage ../development/python-modules/keras-applications { }; - keras = callPackage ../development/python-modules/keras { }; - keras-preprocessing = callPackage ../development/python-modules/keras-preprocessing { }; - kerberos = callPackage ../development/python-modules/kerberos { }; kestra = callPackage ../development/python-modules/kestra { }; @@ -10469,8 +10465,6 @@ self: super: with self; { pipe = callPackage ../development/python-modules/pipe { }; - pipenv-poetry-migrate = callPackage ../development/python-modules/pipenv-poetry-migrate { }; - piper-phonemize = callPackage ../development/python-modules/piper-phonemize { onnxruntime-native = pkgs.onnxruntime; piper-phonemize-native = pkgs.piper-phonemize;