diff --git a/nixos/modules/programs/firefox.nix b/nixos/modules/programs/firefox.nix index 7521708fa94f..ed874cad74e4 100644 --- a/nixos/modules/programs/firefox.nix +++ b/nixos/modules/programs/firefox.nix @@ -1,4 +1,9 @@ -{ pkgs, config, lib, ... }: +{ + pkgs, + config, + lib, + ... +}: let cfg = config.programs.firefox; @@ -78,7 +83,7 @@ in wrapperConfig = lib.mkOption { type = lib.types.attrs; - default = {}; + default = { }; description = "Arguments to pass to Firefox wrapper"; }; @@ -99,7 +104,13 @@ in }; preferences = lib.mkOption { - type = with lib.types; attrsOf (oneOf [ bool int str ]); + type = + with lib.types; + attrsOf (oneOf [ + bool + int + str + ]); default = { }; description = '' Preferences to set from `about:config`. @@ -112,7 +123,12 @@ in }; preferencesStatus = lib.mkOption { - type = lib.types.enum [ "default" "locked" "user" "clear" ]; + type = lib.types.enum [ + "default" + "locked" + "user" + "clear" + ]; default = "locked"; description = '' The status of `firefox.preferences`. @@ -127,111 +143,113 @@ in languagePacks = lib.mkOption { # Available languages can be found in https://releases.mozilla.org/pub/firefox/releases/${cfg.package.version}/linux-x86_64/xpi/ - type = lib.types.listOf (lib.types.enum ([ - "ach" - "af" - "an" - "ar" - "ast" - "az" - "be" - "bg" - "bn" - "br" - "bs" - "ca-valencia" - "ca" - "cak" - "cs" - "cy" - "da" - "de" - "dsb" - "el" - "en-CA" - "en-GB" - "en-US" - "eo" - "es-AR" - "es-CL" - "es-ES" - "es-MX" - "et" - "eu" - "fa" - "ff" - "fi" - "fr" - "fur" - "fy-NL" - "ga-IE" - "gd" - "gl" - "gn" - "gu-IN" - "he" - "hi-IN" - "hr" - "hsb" - "hu" - "hy-AM" - "ia" - "id" - "is" - "it" - "ja" - "ka" - "kab" - "kk" - "km" - "kn" - "ko" - "lij" - "lt" - "lv" - "mk" - "mr" - "ms" - "my" - "nb-NO" - "ne-NP" - "nl" - "nn-NO" - "oc" - "pa-IN" - "pl" - "pt-BR" - "pt-PT" - "rm" - "ro" - "ru" - "sat" - "sc" - "sco" - "si" - "sk" - "skr" - "sl" - "son" - "sq" - "sr" - "sv-SE" - "szl" - "ta" - "te" - "tg" - "th" - "tl" - "tr" - "trs" - "uk" - "ur" - "uz" - "vi" - "xh" - "zh-CN" - "zh-TW" - ])); + type = lib.types.listOf ( + lib.types.enum ([ + "ach" + "af" + "an" + "ar" + "ast" + "az" + "be" + "bg" + "bn" + "br" + "bs" + "ca-valencia" + "ca" + "cak" + "cs" + "cy" + "da" + "de" + "dsb" + "el" + "en-CA" + "en-GB" + "en-US" + "eo" + "es-AR" + "es-CL" + "es-ES" + "es-MX" + "et" + "eu" + "fa" + "ff" + "fi" + "fr" + "fur" + "fy-NL" + "ga-IE" + "gd" + "gl" + "gn" + "gu-IN" + "he" + "hi-IN" + "hr" + "hsb" + "hu" + "hy-AM" + "ia" + "id" + "is" + "it" + "ja" + "ka" + "kab" + "kk" + "km" + "kn" + "ko" + "lij" + "lt" + "lv" + "mk" + "mr" + "ms" + "my" + "nb-NO" + "ne-NP" + "nl" + "nn-NO" + "oc" + "pa-IN" + "pl" + "pt-BR" + "pt-PT" + "rm" + "ro" + "ru" + "sat" + "sc" + "sco" + "si" + "sk" + "skr" + "sl" + "son" + "sq" + "sr" + "sv-SE" + "szl" + "ta" + "te" + "tg" + "th" + "tl" + "tr" + "trs" + "uk" + "ur" + "uz" + "vi" + "xh" + "zh-CN" + "zh-TW" + ]) + ); default = [ ]; description = '' The language packs to install. @@ -249,10 +267,23 @@ in ''; }; + autoConfigFiles = lib.mkOption { + type = with lib.types; listOf path; + default = [ ]; + description = '' + AutoConfig files can be used to set and lock preferences that are not covered + by the policies.json for Mac and Linux. This method can be used to automatically + change user preferences or prevent the end user from modifiying specific + preferences by locking them. More info can be found in https://support.mozilla.org/en-US/kb/customizing-firefox-using-autoconfig. + + Files are concated and autoConfig is appended. + ''; + }; + nativeMessagingHosts = ({ packages = lib.mkOption { type = lib.types.listOf lib.types.package; - default = []; + default = [ ]; description = '' Additional packages containing native messaging hosts that should be made available to Firefox extensions. ''; @@ -260,48 +291,64 @@ in }) // (builtins.mapAttrs (k: v: lib.mkEnableOption "${v.name} support") nmhOptions); }; - config = let - forEachEnabledNmh = fn: lib.flatten (lib.mapAttrsToList (k: v: lib.optional cfg.nativeMessagingHosts.${k} (fn k v)) nmhOptions); - in lib.mkIf cfg.enable { - warnings = forEachEnabledNmh (k: v: - "The `programs.firefox.nativeMessagingHosts.${k}` option is deprecated, " + - "please add `${v.package.pname}` to `programs.firefox.nativeMessagingHosts.packages` instead." - ); - programs.firefox.nativeMessagingHosts.packages = forEachEnabledNmh (_: v: v.package); + config = + let + forEachEnabledNmh = + fn: + lib.flatten ( + lib.mapAttrsToList (k: v: lib.optional cfg.nativeMessagingHosts.${k} (fn k v)) nmhOptions + ); + in + lib.mkIf cfg.enable { + warnings = forEachEnabledNmh ( + k: v: + "The `programs.firefox.nativeMessagingHosts.${k}` option is deprecated, " + + "please add `${v.package.pname}` to `programs.firefox.nativeMessagingHosts.packages` instead." + ); + programs.firefox.nativeMessagingHosts.packages = forEachEnabledNmh (_: v: v.package); - environment.systemPackages = [ - (cfg.package.override (old: { - extraPrefsFiles = old.extraPrefsFiles or [] ++ [(pkgs.writeText "firefox-autoconfig.js" cfg.autoConfig)]; - nativeMessagingHosts = old.nativeMessagingHosts or [] ++ cfg.nativeMessagingHosts.packages; - cfg = (old.cfg or {}) // cfg.wrapperConfig; - })) - ]; + environment.systemPackages = [ + (cfg.package.override (old: { + extraPrefsFiles = + old.extraPrefsFiles or [ ] + ++ cfg.autoConfigFiles + ++ [ (pkgs.writeText "firefox-autoconfig.js" cfg.autoConfig) ]; + nativeMessagingHosts = old.nativeMessagingHosts or [ ] ++ cfg.nativeMessagingHosts.packages; + cfg = (old.cfg or { }) // cfg.wrapperConfig; + })) + ]; - environment.etc = - let - policiesJSON = policyFormat.generate "firefox-policies.json" { inherit (cfg) policies; }; - in - lib.mkIf (cfg.policies != { }) { - "firefox/policies/policies.json".source = "${policiesJSON}"; + environment.etc = + let + policiesJSON = policyFormat.generate "firefox-policies.json" { inherit (cfg) policies; }; + in + lib.mkIf (cfg.policies != { }) { + "firefox/policies/policies.json".source = "${policiesJSON}"; + }; + + # Preferences are converted into a policy + programs.firefox.policies = { + DisableAppUpdate = true; + Preferences = ( + builtins.mapAttrs (_: value: { + Value = value; + Status = cfg.preferencesStatus; + }) cfg.preferences + ); + ExtensionSettings = builtins.listToAttrs ( + builtins.map ( + lang: + lib.attrsets.nameValuePair "langpack-${lang}@firefox.mozilla.org" { + installation_mode = "normal_installed"; + install_url = "https://releases.mozilla.org/pub/firefox/releases/${cfg.package.version}/linux-x86_64/xpi/${lang}.xpi"; + } + ) cfg.languagePacks + ); }; - - # Preferences are converted into a policy - programs.firefox.policies = { - DisableAppUpdate = true; - Preferences = (builtins.mapAttrs - (_: value: { Value = value; Status = cfg.preferencesStatus; }) - cfg.preferences); - ExtensionSettings = builtins.listToAttrs (builtins.map - (lang: lib.attrsets.nameValuePair - "langpack-${lang}@firefox.mozilla.org" - { - installation_mode = "normal_installed"; - install_url = "https://releases.mozilla.org/pub/firefox/releases/${cfg.package.version}/linux-x86_64/xpi/${lang}.xpi"; - } - ) - cfg.languagePacks); }; - }; - meta.maintainers = with lib.maintainers; [ danth ]; + meta.maintainers = with lib.maintainers; [ + danth + linsui + ]; } diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index 15c6e4150d9e..aa19f56b6915 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -143,6 +143,7 @@ in { kate khelpcenter dolphin + baloo-widgets # baloo information in Dolphin dolphin-plugins spectacle ffmpegthumbs diff --git a/nixos/modules/services/misc/snapper.nix b/nixos/modules/services/misc/snapper.nix index 870c80bcc182..42f782bcd6e1 100644 --- a/nixos/modules/services/misc/snapper.nix +++ b/nixos/modules/services/misc/snapper.nix @@ -35,7 +35,13 @@ let descriptionClass = "conjunction"; }; - intOrSafeStr = lib.types.either lib.types.ints.unsigned safeStr; + intOrNumberOrRange = lib.types.either lib.types.ints.unsigned ( + lib.types.strMatching "[[:digit:]]+(\-[[:digit:]]+)?" + // { + description = "string containing either a number or a range"; + descriptionClass = "conjunction"; + } + ); configOptions = { SUBVOLUME = lib.mkOption { @@ -95,7 +101,7 @@ let }; TIMELINE_LIMIT_HOURLY = lib.mkOption { - type = intOrSafeStr; + type = intOrNumberOrRange; default = 10; description = '' Limits for timeline cleanup. @@ -103,7 +109,7 @@ let }; TIMELINE_LIMIT_DAILY = lib.mkOption { - type = intOrSafeStr; + type = intOrNumberOrRange; default = 10; description = '' Limits for timeline cleanup. @@ -111,7 +117,7 @@ let }; TIMELINE_LIMIT_WEEKLY = lib.mkOption { - type = intOrSafeStr; + type = intOrNumberOrRange; default = 0; description = '' Limits for timeline cleanup. @@ -119,7 +125,7 @@ let }; TIMELINE_LIMIT_MONTHLY = lib.mkOption { - type = intOrSafeStr; + type = intOrNumberOrRange; default = 10; description = '' Limits for timeline cleanup. @@ -127,7 +133,7 @@ let }; TIMELINE_LIMIT_QUARTERLY = lib.mkOption { - type = intOrSafeStr; + type = intOrNumberOrRange; default = 0; description = '' Limits for timeline cleanup. @@ -135,7 +141,7 @@ let }; TIMELINE_LIMIT_YEARLY = lib.mkOption { - type = intOrSafeStr; + type = intOrNumberOrRange; default = 10; description = '' Limits for timeline cleanup. diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index 1b65e77b1a5c..cd5331d00672 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -25,13 +25,13 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "openboard"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "OpenBoard-org"; repo = "OpenBoard"; rev = "v${finalAttrs.version}"; - hash = "sha256-OSAogtZoMisyRziv63ag9w8HQaaRdz0J28jQZR7cTMM="; + hash = "sha256-gXxxlAEuzMCvFu5oSQayNW191XAC/YKvldItYEFxvNM="; }; patches = [ @@ -52,9 +52,14 @@ in stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace OpenBoard.pro \ - --replace '/usr/include/quazip5' '${lib.getDev quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \ - --replace '-lquazip5' '-lquazip1-qt5' \ - --replace '/usr/include/poppler' '${lib.getDev poppler}/include/poppler' + --replace-fail '/usr/include/quazip5' '${lib.getDev quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \ + --replace-fail '-lquazip5' '-lquazip1-qt5' \ + --replace-fail '/usr/include/poppler' '${lib.getDev poppler}/include/poppler' + + substituteInPlace resources/etc/OpenBoard.config \ + --replace-fail 'EnableAutomaticSoftwareUpdates=true' 'EnableAutomaticSoftwareUpdates=false' \ + --replace-fail 'EnableSoftwareUpdates=true' 'EnableAutomaticSoftwareUpdates=false' \ + --replace-fail 'HideCheckForSoftwareUpdate=false' 'HideCheckForSoftwareUpdate=true' ''; nativeBuildInputs = [ qmake copyDesktopItems wrapQtAppsHook ]; diff --git a/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix b/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix index 934d1c9151dc..06c64497747a 100644 --- a/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix @@ -28,6 +28,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/kvaps/kubectl-node-shell"; license = licenses.asl20; maintainers = with maintainers; [ jocelynthode ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index c79fe32939dc..320fecc21574 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -87,9 +87,9 @@ rec { nomad_1_8 = generic { buildGoModule = buildGo122Module; - version = "1.8.3"; - sha256 = "sha256-u1R5lG9fpIbAePLlDy+kk2hQpFdT1VIY0sMskHJZ19w="; - vendorHash = "sha256-5Gn37hFVDkUlyv4MVZMH9PlpyWAyWE5RTFQyuMIA/Bc="; + version = "1.8.4"; + sha256 = "sha256-BzLvALD65VqWNB9gx4BgI/mYWLNeHzp6WSXD/1Xf0Wk="; + vendorHash = "sha256-0mnhZeiCLAWvwAoNBJtwss85vhYCrf/5I1AhyXTFnWk="; license = lib.licenses.bsl11; passthru.tests.nomad = nixosTests.nomad; preCheck = '' diff --git a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix index e699c761b695..0925bae8a695 100644 --- a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix @@ -74,6 +74,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "whatsapp-for-linux"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ bartuka ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; }) diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix deleted file mode 100644 index 5ccce0a2dc36..000000000000 --- a/pkgs/applications/radio/dablin/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config -, mpg123, SDL2, gtkmm3, faad2, pcre -} : - -stdenv.mkDerivation rec { - pname = "dablin"; - version = "1.16.0"; - - src = fetchFromGitHub { - owner = "Opendigitalradio"; - repo = "dablin"; - rev = version; - sha256 = "sha256-1rjL0dSEgF7FF72KiT6Tyj7/wbRc24LzyzmM1IGdglc="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ faad2 mpg123 SDL2 gtkmm3 pcre ]; - - meta = with lib; { - description = "Play DAB/DAB+ from ETI-NI aligned stream"; - homepage = "https://github.com/Opendigitalradio/dablin"; - license = with licenses; [ gpl3 lgpl21 ]; - platforms = platforms.linux; - maintainers = [ maintainers.markuskowa ]; - }; -} - diff --git a/pkgs/by-name/as/astro-language-server/package.nix b/pkgs/by-name/as/astro-language-server/package.nix index 9859765bf897..e2bdedc60f0d 100644 --- a/pkgs/by-name/as/astro-language-server/package.nix +++ b/pkgs/by-name/as/astro-language-server/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "astro-language-server"; - version = "2.10.0"; + version = "2.14.2"; src = fetchFromGitHub { owner = "withastro"; repo = "language-tools"; rev = "@astrojs/language-server@${finalAttrs.version}"; - hash = "sha256-WdeQQaC9AVHT+/pXLzaC6MZ6ddHsFSpxoDPHqWvqmiQ="; + hash = "sha256-4GaLyaRUN9qS2U7eSzASB6fSQY2+fWtgfb54uuHjuh4="; }; pnpmDeps = pnpm_8.fetchDeps { @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmWorkspace prePnpmInstall ; - hash = "sha256-n7HTd/rKxJdQKnty5TeOcyvBU9j/EClQ9IHqbBaEwQE="; + hash = "sha256-q9a4nFPRhR6W/PT1l/Q1799iDmI+WTsudUP8rb8e97g="; }; nativeBuildInputs = [ @@ -35,15 +35,21 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ nodejs_22 ]; - pnpmWorkspace = "@astrojs/language-server"; + # Must specify to download "@astrojs/yaml2ts" depencendies + # https://pnpm.io/filtering#--filter-package_name-1 + pnpmWorkspace = "@astrojs/language-server..."; prePnpmInstall = '' + # Warning section for "pnpm@v8" + # https://pnpm.io/cli/install#--filter-package_selector pnpm config set dedupe-peer-dependents false ''; buildPhase = '' runHook preBuild - pnpm --filter=@astrojs/language-server build + # Must build the "@astrojs/yaml2ts" package. Dependency is linked via workspace by "pnpm" + # (https://github.com/withastro/language-tools/blob/%40astrojs/language-server%402.14.2/pnpm-lock.yaml#L78-L80) + pnpm --filter "@astrojs/language-server..." build runHook postBuild ''; @@ -61,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "The Astro language server"; homepage = "https://github.com/withastro/language-tools"; + changelog = "https://github.com/withastro/language-tools/blob/@astrojs/language-server@${finalAttrs.version}/packages/language-server/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pyrox0 ]; mainProgram = "astro-ls"; diff --git a/pkgs/development/tools/avro-tools/default.nix b/pkgs/by-name/av/avro-tools/package.nix similarity index 59% rename from pkgs/development/tools/avro-tools/default.nix rename to pkgs/by-name/av/avro-tools/package.nix index 9615d4574cdb..730a05a259e8 100644 --- a/pkgs/development/tools/avro-tools/default.nix +++ b/pkgs/by-name/av/avro-tools/package.nix @@ -1,12 +1,19 @@ -{ stdenv, fetchurl, makeWrapper, jre, lib }: - -stdenv.mkDerivation rec { +{ + stdenv, + fetchurl, + makeWrapper, + jre, + lib, +}: +let pname = "avro-tools"; version = "1.11.3"; +in +stdenv.mkDerivation { + inherit pname version; src = fetchurl { - url = - "mirror://maven/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar"; + url = "mirror://maven/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar"; sha256 = "sha256-dPaV1rZxxE+G/gB7hEDyiMI7ZbzkTpNEtexp/Y6hrPI="; }; @@ -25,12 +32,12 @@ stdenv.mkDerivation rec { --add-flags "-jar $out/libexec/avro-tools/${pname}.jar" ''; - meta = with lib; { - homepage = "https://avro.apache.org/"; + meta = { + homepage = "https://avro.apache.org/"; description = "Avro command-line tools and utilities"; mainProgram = "avro-tools"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = lib.licenses.asl20; - maintainers = [ ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ momeemt ]; }; } diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index 9ef5ebab3be5..97cc7be20293 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -4,6 +4,7 @@ runCommand, buildNpmPackage, stdenvNoCC, + docify, testers, writeText, jq, @@ -61,32 +62,15 @@ let ''; }; - docify = python3.pkgs.buildPythonApplication { - pname = "docify"; - version = "unstable"; - format = "pyproject"; - src = fetchFromGitHub { - owner = "AThePeanut4"; - repo = "docify"; - rev = "7380a6faa6d1e8a3dc790a00254e6d77f84cbd91"; - hash = "sha256-BPR1rc/JzdBweiWmdHxgardDDrJZVWkUIF3ZEmEYf/A="; - }; - buildInputs = [ python3.pkgs.setuptools ]; - propagatedBuildInputs = [ - python3.pkgs.libcst - python3.pkgs.tqdm - ]; - }; - docstubs = stdenvNoCC.mkDerivation { name = "docstubs"; inherit src; - buildInputs = [ docify ]; + nativeBuildInputs = [ docify ]; installPhase = '' runHook preInstall cp -r packages/pyright-internal/typeshed-fallback docstubs - ${docify}/bin/docify docstubs/stdlib --builtins-only --in-place + docify docstubs/stdlib --builtins-only --in-place cp -rv docstubs "$out" runHook postInstall ''; diff --git a/pkgs/by-name/da/dablin/package.nix b/pkgs/by-name/da/dablin/package.nix new file mode 100644 index 000000000000..a86a6d505721 --- /dev/null +++ b/pkgs/by-name/da/dablin/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + mpg123, + SDL2, + gtkmm3, + faad2, + pcre, +}: + +stdenv.mkDerivation rec { + pname = "dablin"; + version = "1.16.0"; + + src = fetchFromGitHub { + owner = "Opendigitalradio"; + repo = "dablin"; + rev = version; + sha256 = "sha256-1rjL0dSEgF7FF72KiT6Tyj7/wbRc24LzyzmM1IGdglc="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + faad2 + mpg123 + SDL2 + gtkmm3 + pcre + ]; + + meta = { + description = "Play DAB/DAB+ from ETI-NI aligned stream"; + homepage = "https://github.com/Opendigitalradio/dablin"; + license = with lib.licenses; [ + gpl3Plus + lgpl21Only + ]; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.markuskowa ]; + }; +} diff --git a/pkgs/by-name/do/docify/package.nix b/pkgs/by-name/do/docify/package.nix new file mode 100644 index 000000000000..5d9991752c4c --- /dev/null +++ b/pkgs/by-name/do/docify/package.nix @@ -0,0 +1,41 @@ +{ + lib, + python3Packages, + fetchFromGitHub, +}: + +python3Packages.buildPythonApplication rec { + pname = "docify"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "AThePeanut4"; + repo = "docify"; + rev = "refs/tags/v${version}"; + hash = "sha256-pt35Kw0kaZsIGTutXPhjdp8czGtWrSUFWMV3NyFQ/NM="; + }; + + build-system = with python3Packages; [ + pdm-backend + ]; + + dependencies = with python3Packages; [ + libcst + tqdm + ]; + + pythonImportsCheck = [ "docify" ]; + + # upstream has no tests + doCheck = false; + + meta = { + changelog = "https://github.com/AThePeanut4/docify/releases/tag/v${version}"; + description = "Script to add docstrings to Python type stubs using reflection"; + homepage = "https://github.com/AThePeanut4/docify"; + license = lib.licenses.mit; + mainProgram = "docify"; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index 7d601aaae8b8..4122de8675c4 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.190.0"; + version = "0.191.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-IEe0NDl8Z1XBvfy/2cwL+O/RYGFS6VXd2ZUpyhEdaGs="; + hash = "sha256-ypHBvaCvQ1FZiQmKTkQ5h024pLBOpISZooSkIDa1OeQ="; }; vendorHash = "sha256-mdGkdiYjcmsmYnM6fbyUeTC4Zb/Q1+geZrqJELv5i+4="; diff --git a/pkgs/by-name/gp/gpt4all/embedding-local.patch b/pkgs/by-name/gp/gpt4all/embedding-local.patch index fee7702102ac..fb1563523223 100644 --- a/pkgs/by-name/gp/gpt4all/embedding-local.patch +++ b/pkgs/by-name/gp/gpt4all/embedding-local.patch @@ -1,13 +1,14 @@ -commit 1e8fdf3f90fd142c5ddd63e44ca1e5c172dbfb7f +commit 425b33877c819dd88f3692aae37452c767371f6b Author: Simon Gardling -Date: Tue Aug 27 12:45:14 2024 -0400 +Date: Thu Sep 19 10:00:39 2024 -0400 use locally downloaded embeddings -index 27f3f5d9..9e25528a 100644 ---- a/CMakeLists.txt +diff --git a/gpt4all-chat/CMakeLists.txt b/gpt4all-chat/CMakeLists.txt +index 900307ae..802fc31a 100644 +--- a//CMakeLists.txt +++ b/CMakeLists.txt -@@ -90,6 +90,7 @@ elseif (APPLE) +@@ -120,6 +120,7 @@ elseif (APPLE) endif() # Embedding model @@ -15,21 +16,21 @@ index 27f3f5d9..9e25528a 100644 set(LOCAL_EMBEDDING_MODEL "nomic-embed-text-v1.5.f16.gguf") set(LOCAL_EMBEDDING_MODEL_MD5 "a5401e7f7e46ed9fcaed5b60a281d547") set(LOCAL_EMBEDDING_MODEL_PATH "${CMAKE_BINARY_DIR}/resources/${LOCAL_EMBEDDING_MODEL}") -@@ -104,6 +105,7 @@ +@@ -134,6 +135,7 @@ message(STATUS "Embedding model downloaded to ${LOCAL_EMBEDDING_MODEL_PATH}") if (APPLE) list(APPEND CHAT_EXE_RESOURCES "${LOCAL_EMBEDDING_MODEL_PATH}") endif() +]] - qt_add_executable(chat - main.cpp -@@ -383,11 +385,13 @@ + set(QAPPLICATION_CLASS QGuiApplication) + add_subdirectory(deps/SingleApplication) +@@ -348,11 +350,13 @@ if (LLMODEL_CUDA) endif() endif() +#[[ if (NOT APPLE) - install(FILES "${CMAKE_BINARY_DIR}/resources/${LOCAL_EMBEDDING_MODEL}" + install(FILES "${LOCAL_EMBEDDING_MODEL_PATH}" DESTINATION resources COMPONENT ${COMPONENT_NAME_MAIN}) endif() @@ -37,8 +38,10 @@ index 27f3f5d9..9e25528a 100644 set(CPACK_GENERATOR "IFW") set(CPACK_VERBATIM_VARIABLES YES) ---- a/embllm.cpp -+++ b/embllm.cpp +diff --git a/gpt4all-chat/src/embllm.cpp b/gpt4all-chat/src/embllm.cpp +index 81b1e9e1..e3266cc7 100644 +--- a/src/embllm.cpp ++++ b/src/embllm.cpp @@ -84,7 +84,7 @@ bool EmbeddingLLMWorker::loadModel() QString filePath = embPathFmt.arg(QCoreApplication::applicationDirPath(), LOCAL_EMBEDDING_MODEL); @@ -47,4 +50,4 @@ index 27f3f5d9..9e25528a 100644 + qWarning() << "embllm WARNING: Local embedding model not found: " << filePath; return false; } - + diff --git a/pkgs/by-name/gp/gpt4all/package.nix b/pkgs/by-name/gp/gpt4all/package.nix index 7d4ecab1b7a2..938b9166897f 100644 --- a/pkgs/by-name/gp/gpt4all/package.nix +++ b/pkgs/by-name/gp/gpt4all/package.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gpt4all"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { fetchSubmodules = true; - hash = "sha256-h6hcqafTjQsqVlpnqVeohh38A67VSGrW3WrCErjaKIQ="; + hash = "sha256-aez/APsei30Tp1em/RDCuq+v8hOavHq4O9qZahrsF/g="; owner = "nomic-ai"; repo = "gpt4all"; rev = "v${finalAttrs.version}"; diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/by-name/le/leiningen/package.nix similarity index 83% rename from pkgs/development/tools/build-managers/leiningen/default.nix rename to pkgs/by-name/le/leiningen/package.nix index efbce0bcd339..04b81464ec0a 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/by-name/le/leiningen/package.nix @@ -1,9 +1,19 @@ -{ lib, stdenv, fetchurl, makeWrapper -, coreutils, jdk, rlwrap, gnupg }: - -stdenv.mkDerivation rec { +{ + lib, + stdenv, + fetchurl, + makeWrapper, + coreutils, + jdk, + rlwrap, + gnupg, +}: +let pname = "leiningen"; version = "2.11.2"; +in +stdenv.mkDerivation { + inherit pname version; src = fetchurl { url = "https://codeberg.org/leiningen/leiningen/raw/tag/${version}/bin/lein-pkg"; @@ -43,7 +53,12 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/lein \ --replace 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/$JARNAME" wrapProgram $out/bin/lein \ - --prefix PATH ":" "${lib.makeBinPath [ rlwrap coreutils ]}" \ + --prefix PATH ":" "${ + lib.makeBinPath [ + rlwrap + coreutils + ] + }" \ --set LEIN_GPG ${gnupg}/bin/gpg \ --set JAVA_CMD ${jdk}/bin/java @@ -56,7 +71,7 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.epl10; platforms = jdk.meta.platforms; - maintainers = [ ]; + maintainers = with lib.maintainers; [ momeemt ]; mainProgram = "lein"; }; } diff --git a/pkgs/by-name/mu/musicpod/package.nix b/pkgs/by-name/mu/musicpod/package.nix index 9809b51aa439..d8d1b59746a1 100644 --- a/pkgs/by-name/mu/musicpod/package.nix +++ b/pkgs/by-name/mu/musicpod/package.nix @@ -9,13 +9,13 @@ flutter324.buildFlutterApplication rec { pname = "musicpod"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "ubuntu-flutter-community"; repo = "musicpod"; - rev = "v${version}"; - hash = "sha256-Xs6qDSqd10mYjLNFiPV9Irthd/hK2kE4fC6i03QvOn0="; + rev = "refs/tags/v${version}"; + hash = "sha256-gsreA8ZTLcSvIAtODZ2gopZ78iyoN18gsSi9/IoY5/0="; }; postPatch = '' @@ -30,7 +30,6 @@ flutter324.buildFlutterApplication rec { media_kit_native_event_loop = "sha256-JBtFTYlztDQvN/qQcDxkK27mka2fSG+iiIIxk2mqEpY="; media_kit_video = "sha256-JBtFTYlztDQvN/qQcDxkK27mka2fSG+iiIIxk2mqEpY="; phoenix_theme = "sha256-5kgPAnK61vFi/sJ1jr3c5D2UZbxItW8YOk/IJEtHkZo="; - yaru = "sha256-3GexoQpwr7pazajAMyPl9rcYhmSgQeialZTvJsadP4k="; }; buildInputs = [ diff --git a/pkgs/by-name/mu/musicpod/pubspec.lock.json b/pkgs/by-name/mu/musicpod/pubspec.lock.json index 4e0bbb6ff3a2..d9864f8519b2 100644 --- a/pkgs/by-name/mu/musicpod/pubspec.lock.json +++ b/pkgs/by-name/mu/musicpod/pubspec.lock.json @@ -431,11 +431,11 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9", + "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.6" + "version": "2.3.7" }, "dbus": { "dependency": "transitive", @@ -481,11 +481,11 @@ "dependency": "direct main", "description": { "name": "dio", - "sha256": "0dfb6b6a1979dac1c1245e17cef824d7b452ea29bd33d3467269f9bef3715fb0", + "sha256": "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.6.0" + "version": "5.7.0" }, "dio_web_adapter": { "dependency": "transitive", @@ -723,11 +723,11 @@ "dependency": "direct main", "description": { "name": "flutter_tabler_icons", - "sha256": "4b74a899bf6d1ead67a3bc129f7f2be0213c72aa7bcbf4cd46dcaaa6196fd2c6", + "sha256": "8096ec5754fe9449723a093fdfce8f9c301999edaedb464c851466eaed3c6657", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.37.0" + "version": "1.41.0" }, "flutter_test": { "dependency": "direct dev", @@ -755,21 +755,21 @@ "dependency": "transitive", "description": { "name": "functional_listener", - "sha256": "026d1bd4f66367f11d9ec9f1f1ddb42b89e4484b356972c76d983266cf82f33f", + "sha256": "ee8ffc29b2448981d96addf44ac9b4af2ba4ca2627979e77d3e6fe59b967ca4f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.1" + "version": "3.0.0" }, "get_it": { "dependency": "transitive", "description": { "name": "get_it", - "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1", + "sha256": "ff97e5e7b2e82e63c82f5658c6ba2605ea831f0f7489b0d2fb255d817ec4eb5e", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.7.0" + "version": "8.0.0" }, "github": { "dependency": "direct main", @@ -801,6 +801,16 @@ "source": "hosted", "version": "2.3.2" }, + "gsettings": { + "dependency": "transitive", + "description": { + "name": "gsettings", + "sha256": "1b0ce661f5436d2db1e51f3c4295a49849f03d304003a7ba177d01e3a858249c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.8" + }, "gtk": { "dependency": "direct main", "description": { @@ -832,7 +842,7 @@ "version": "0.15.4" }, "http": { - "dependency": "direct main", + "dependency": "transitive", "description": { "name": "http", "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", @@ -1398,11 +1408,11 @@ "dependency": "direct main", "description": { "name": "podcast_search", - "sha256": "ab3a98d2bb7a593cee61351fae17900d3cc6e23e21638d7ae16963bb11cf9693", + "sha256": "c2ca2529a7f561827cc62db6c4fba6cade0249936455912a902688125c90bd5c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.2" + "version": "0.7.3" }, "pointycastle": { "dependency": "transitive", @@ -1448,11 +1458,11 @@ "dependency": "transitive", "description": { "name": "puppeteer", - "sha256": "a6752d4f09b510ae41911bfd0997f957e723d38facf320dd9ee0e5661108744a", + "sha256": "fc33b2a12731e0b9e16c40cd91ea2b6886bcc24037a435fceb59b786d4074f2b", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.13.0" + "version": "3.15.0" }, "radio_browser_api": { "dependency": "direct main", @@ -1478,11 +1488,11 @@ "dependency": "transitive", "description": { "name": "rss_dart", - "sha256": "199fa73ce1d25c929ea9004fff77cb96734c0b715353a2e3701e8f593a69a161", + "sha256": "81bbcc1a5205546f2a85ebadf8f29f5b090ccb5781f400f3713cf02f1cc992ee", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.9" + "version": "1.0.10" }, "rxdart": { "dependency": "transitive", @@ -1498,11 +1508,11 @@ "dependency": "direct main", "description": { "name": "safe_change_notifier", - "sha256": "8d0645ec2706f580912c38de488439ddb491be48247826927b7bc2e54ea8f7af", + "sha256": "e7cce266bfede647355866fa3bd054feda57c220d2383f4203f28d4dcdb3b82e", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.2" + "version": "0.4.0" }, "safe_local_storage": { "dependency": "transitive", @@ -1678,11 +1688,11 @@ "dependency": "transitive", "description": { "name": "shelf_static", - "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "1.1.3" }, "shelf_web_socket": { "dependency": "transitive", @@ -1764,11 +1774,11 @@ "dependency": "transitive", "description": { "name": "sqflite_common", - "sha256": "7b41b6c3507854a159e24ae90a8e3e9cc01eb26a477c118d6dca065b5f55453e", + "sha256": "4058172e418eb7e7f2058dcb7657d451a8fc264afa0dea4dbd0f304a57131611", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.4+2" + "version": "2.5.4+3" }, "stack_trace": { "dependency": "transitive", @@ -1824,51 +1834,51 @@ "dependency": "transitive", "description": { "name": "super_clipboard", - "sha256": "71d2a81e0e3a8c5d6339715a42f8dd42c6def02c0c805a23d45611010de39fbe", + "sha256": "cfeb142360fac67e0da1ca339accb892eb790c6528a218a008eef1709d96ed0f", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.20" + "version": "0.8.22" }, "super_drag_and_drop": { "dependency": "direct main", "description": { "name": "super_drag_and_drop", - "sha256": "334a4f1dd6cc9ed1d0279ed25d199e74beec9751be5fe1d80637bf298ca8a92c", + "sha256": "25158161d1b114ffba0d358c3508f5a4b88a18becacffcd785c17574670204d6", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.20" + "version": "0.8.22" }, "super_native_extensions": { "dependency": "transitive", "description": { "name": "super_native_extensions", - "sha256": "9d674b8c71e16f586b3967e67a6faa83c35e3d9ea4f64bca8551badfddf992cb", + "sha256": "6a7cfb7d212da7023b86fb99c736081e9c2cd982265d15dc5fe6381a32dbc875", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.20" + "version": "0.8.22" }, "synchronized": { "dependency": "transitive", "description": { "name": "synchronized", - "sha256": "a824e842b8a054f91a728b783c177c1e4731f6b124f9192468457a8913371255", + "sha256": "51b08572b9f091f8c3eb4d9d4be253f196ff0075d5ec9b10a884026d5b55d7bc", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.0" + "version": "3.3.0+2" }, "system_theme": { "dependency": "direct main", "description": { "name": "system_theme", - "sha256": "676f8e5bdbf17d5b1267592370810df8cdfaa01d3a2e121b22bd4ea30e63f17c", + "sha256": "9396b69e74cdd1524daf26c0c33f4968d5ada1ff948a31f031cf6398869b589f", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "3.1.1" }, "system_theme_web": { "dependency": "transitive", @@ -2054,11 +2064,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc", + "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.2.4" + "version": "14.2.5" }, "volume_controller": { "dependency": "transitive", @@ -2094,11 +2104,11 @@ "dependency": "direct main", "description": { "name": "watch_it", - "sha256": "a01a9e8292c040de82670f28f8a7d35315115a22f3674d2c4a8fd811fd1ac0ab", + "sha256": "a45ea7d5e841e96f904896f4783cc1820257c591f130d1513e89eaceaa528a28", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.2" + "version": "1.5.0" }, "watcher": { "dependency": "transitive", @@ -2144,21 +2154,21 @@ "dependency": "transitive", "description": { "name": "win32_registry", - "sha256": "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6", + "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.4" + "version": "1.1.5" }, "window_manager": { "dependency": "direct main", "description": { "name": "window_manager", - "sha256": "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf", + "sha256": "ab8b2a7f97543d3db2b506c9d875e637149d48ee0c6a5cb5f5fd6e0dac463792", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.9" + "version": "0.4.2" }, "xdg_directories": { "dependency": "direct main", @@ -2193,67 +2203,66 @@ "yaru": { "dependency": "direct main", "description": { - "path": ".", - "ref": "8a16a69d5f9ea7b0154035f34c0863c987a98497", - "resolved-ref": "8a16a69d5f9ea7b0154035f34c0863c987a98497", - "url": "https://github.com/ubuntu/yaru.dart" + "name": "yaru", + "sha256": "9e07131b9c3b9997d7784c3cb6ad24a218f8e0507d82f8fb07b7e160e111236d", + "url": "https://pub.dev" }, - "source": "git", - "version": "5.1.0" + "source": "hosted", + "version": "5.2.1" }, "yaru_window": { "dependency": "direct main", "description": { "name": "yaru_window", - "sha256": "c9d16f78962652ad71aa160ab0a1e2e5924359439303394f980fd00eefc905eb", + "sha256": "bc2a1df3c6f33477b47f84bf0a9325df411dbb7bd483ac88e5bc1c019d2f2560", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.1" + "version": "0.2.1+1" }, "yaru_window_linux": { "dependency": "direct main", "description": { "name": "yaru_window_linux", - "sha256": "3676355492eba0461f03acf1b7420f7885982d1bffe113fccdca9415fbe39f5d", + "sha256": "46a1a0743dfd45794cdaf8c5b3a48771ab73632b50a693f59c83b07988e96689", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.0" + "version": "0.2.1" }, "yaru_window_manager": { "dependency": "transitive", "description": { "name": "yaru_window_manager", - "sha256": "2d358263d19ae6598df21d6d8c0d25e75c79a82f459b63b0013a13e395c48b23", + "sha256": "b36c909fa082a7cb6e2f259d4357e16f08d3d8ab086685b81d1916e457100d1e", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.2" + "version": "0.1.2+1" }, "yaru_window_platform_interface": { "dependency": "transitive", "description": { "name": "yaru_window_platform_interface", - "sha256": "e9f8cd34e207d7f7b771ae70dee347ed974cee06b981819c4181b3e474e52254", + "sha256": "93493d7e17a9e887ffa94c518bc5a4b3eb5425c009446e3294c689cb1a87b7e1", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.2" + "version": "0.1.2+1" }, "yaru_window_web": { "dependency": "transitive", "description": { "name": "yaru_window_web", - "sha256": "3ff30758a330d7626d54643df0cca6c179782f401aba7752da9cc0d60c9a6f74", + "sha256": "31468aeb515f72d5eeddcd62773094a4f48fee96f7f0494f8ce53ad3b38054f1", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.0.3" + "version": "0.0.3+1" } }, "sdks": { "dart": ">=3.5.0 <4.0.0", - "flutter": ">=3.24.0" + "flutter": ">=3.24.3" } } diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index fd6807d7b025..58c4872b2c6a 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.389"; + version = "0.0.392"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-UtHUqintxcNSHDfrK2vWQxsHBXQ63vZZ5bm/RSA6DSc="; + hash = "sha256-o0/kAat8vEhVE9ut179yBpvLuMFw6bNha2qT1ddvs7E="; }; - vendorHash = "sha256-MQAEvJcu8cXPZbk7HTb7eD1yECvMcQXytvNQwG+4ky0="; + vendorHash = "sha256-XO/Fj66w17zLJIQHv6F6czReqtqyCORAgCRtjwRaTbo="; subPackages = ["cmd/nsc" "cmd/ns" "cmd/docker-credential-nsc"]; diff --git a/pkgs/by-name/pl/plex-desktop/package.nix b/pkgs/by-name/pl/plex-desktop/package.nix index 50080c0153c9..a52794e81eea 100644 --- a/pkgs/by-name/pl/plex-desktop/package.nix +++ b/pkgs/by-name/pl/plex-desktop/package.nix @@ -32,8 +32,8 @@ }: let pname = "plex-desktop"; - version = "1.96.0"; - rev = "69"; + version = "1.101.0"; + rev = "75"; meta = { homepage = "https://plex.tv/"; description = "Streaming media player for Plex"; @@ -64,7 +64,7 @@ let src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/qc6MFRM433ZhI1XjVzErdHivhSOhlpf0_${rev}.snap"; - hash = "sha512-rECc8rK1ENAL5mXdabO8ynudCaSzz0yygOyg4gMbCtddgqwSOanP24/oguzPLr3zdRMC3VSf9B3hr2BGQ54tzg=="; + hash = "sha512-3ofO4a8HDWeUfjsv+4A5bC0jlQwxIew1CnL39Oa0bjnqShwRQjMW1vSHOjsJ1AHMkbp3h5W/2tFRxPL2C/Heqg=="; }; nativeBuildInputs = [ squashfsTools ]; diff --git a/pkgs/by-name/ra/ratchet/package.nix b/pkgs/by-name/ra/ratchet/package.nix index 6d94200fcc9c..6f94432e5b07 100644 --- a/pkgs/by-name/ra/ratchet/package.nix +++ b/pkgs/by-name/ra/ratchet/package.nix @@ -6,7 +6,7 @@ }: buildGoModule rec { pname = "ratchet"; - version = "0.9.2"; + version = "0.10.0"; # ratchet uses the git sha-1 in the version string, e.g. # @@ -19,8 +19,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "sethvargo"; repo = "ratchet"; - rev = "d57cc1a53c022d3f87c4820bc6b64384a06c8a07"; - hash = "sha256-gQ98uD9oPUsECsduv/lqGdYNmtHetU49ETfWCE8ft8U="; + rev = "ebb7f24e0cbc288ab913b635480412934a2a5371"; + hash = "sha256-Wt1/ahKQ8DOquXU5u6p+an9FJ5kYRl7F2EXOv/2rHlA="; }; proxyVendor = true; diff --git a/pkgs/by-name/re/recyclarr/deps.nix b/pkgs/by-name/re/recyclarr/deps.nix index 6e75f8850c4d..d789f33c90b1 100644 --- a/pkgs/by-name/re/recyclarr/deps.nix +++ b/pkgs/by-name/re/recyclarr/deps.nix @@ -15,13 +15,13 @@ }) (fetchNuGet { pname = "Autofac"; - version = "8.0.0"; - hash = "sha256-7XhDXw8hatQFjQMTIorQ5XrfDCc7EVNVyi6bGbc5fnA="; + version = "8.1.0"; + hash = "sha256-eDULsT32tESiX89CZTwvL061LwmPjjsxMvU8sYvJYE4="; }) (fetchNuGet { pname = "Autofac.Extensions.DependencyInjection"; - version = "9.0.0"; - hash = "sha256-hEqvbTkJqcI4S4LpxVOMyc5m+KeN0nRLk7FqQHSLRd4="; + version = "10.0.0"; + hash = "sha256-ACQwFG8a5LMoqGyHI/YpwVyXZQYqM5+wnk0q2BbGVZ4="; }) (fetchNuGet { pname = "Autofac.Extras.AggregateService"; @@ -90,8 +90,8 @@ }) (fetchNuGet { pname = "dotnet-sonarscanner"; - version = "8.0.1"; - hash = "sha256-cdwdO7C79O0xZ5AovWq6A0g9H22bYTITmogcY0rKOtk="; + version = "8.0.2"; + hash = "sha256-XlfoSkhs3hvyGFH1afi3zPqMwfEN35LqWKCPEZGzTd8="; }) (fetchNuGet { pname = "DynamicData"; @@ -105,8 +105,8 @@ }) (fetchNuGet { pname = "FluentAssertions"; - version = "6.12.0"; - hash = "sha256-LGlPe+G7lBwj5u3ttQZiKX2+C195ddRAHPuDkY6x0BE="; + version = "6.12.1"; + hash = "sha256-R/Fi9eee6T8t8JECxL9+HFd8jAxRMkCg18j+fAQLNqM="; }) (fetchNuGet { pname = "FluentAssertions.Analyzers"; @@ -150,8 +150,8 @@ }) (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization"; - version = "8.0.6"; - hash = "sha256-RC0i30AziI9MTgICW6WdpUj73KyzfePd2PvRIC5WnKc="; + version = "8.0.8"; + hash = "sha256-jhb4iDyzVduz6IRPyUIilLnXEYlIGl9tf99WNEfby/A="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Components"; @@ -160,8 +160,8 @@ }) (fetchNuGet { pname = "Microsoft.AspNetCore.Components"; - version = "8.0.6"; - hash = "sha256-UnN6Mp/ZCpyem4IEGLPeit/CM6R9sIZ4t8byhuaBAD8="; + version = "8.0.8"; + hash = "sha256-EqVGGD1yXpKlFou3jR7QvniI1MSPV1bigZT7ZkfaBo0="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Components.Analyzers"; @@ -170,18 +170,18 @@ }) (fetchNuGet { pname = "Microsoft.AspNetCore.Components.Analyzers"; - version = "8.0.6"; - hash = "sha256-lw+MuNK8XenRtC2pNt43+1CQs0qFtuYlOlQZf8ZZvFM="; + version = "8.0.8"; + hash = "sha256-lJ5jGfnDNB56j47XHn16jrKKiI4SR0TRB1JTxNmybJY="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Components.Forms"; - version = "8.0.6"; - hash = "sha256-0pj0SSYltkS6LYizVbIixNxJm7mnOen/ZS2pc1qoDZ4="; + version = "8.0.8"; + hash = "sha256-QbDDKFnPD4TlCDAXZ5C9vsm/BPEKv6NZKkhG7xYKrQ0="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Components.Web"; - version = "8.0.6"; - hash = "sha256-p4HCxjja7i5ZBM65+p7QJ50/7xYnH+glDn92dWEzaPc="; + version = "8.0.8"; + hash = "sha256-EEO0FSj1HC888PSfTct1UmfapQ6XezwF2JNhlSd8aI0="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Metadata"; @@ -190,8 +190,8 @@ }) (fetchNuGet { pname = "Microsoft.AspNetCore.Metadata"; - version = "8.0.6"; - hash = "sha256-lsfqs4xc6OlB2vgjIsf3vL2OodM6bp5JDhUbOBjDfJ0="; + version = "8.0.8"; + hash = "sha256-eyxHj0o790VC4TuXDVbxjqMpKwQVRgRxDVUzBGPebZM="; }) (fetchNuGet { pname = "Microsoft.Bcl.HashCode"; @@ -200,8 +200,8 @@ }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; - version = "17.11.0"; - hash = "sha256-XglInnx5GePUYHG7n2NLX+WfK7kJnornsWOW/5FnOXE="; + version = "17.11.1"; + hash = "sha256-1dLlK3NGh88PuFYZiYpT+izA96etxhU3BSgixDgdtGA="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; @@ -255,13 +255,13 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Localization"; - version = "8.0.6"; - hash = "sha256-IUrCg2/pkAxFcf29GEh4/Q3P6QQdbeXh/PN2jHDmoAs="; + version = "8.0.8"; + hash = "sha256-dX8HUYxWuzQUJfMW3WyH6mPFlh5i+J9UdND1rhkjwMs="; }) (fetchNuGet { pname = "Microsoft.Extensions.Localization.Abstractions"; - version = "8.0.6"; - hash = "sha256-S6xL+ZG71Z/IpdWLOHtuR7aEFyO6CA0B2aFFq33u67I="; + version = "8.0.8"; + hash = "sha256-DfzIHT+S86FYQDtTKxrdwpiEgUFp+zQlIdlMytNksnQ="; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; @@ -305,13 +305,13 @@ }) (fetchNuGet { pname = "Microsoft.JSInterop"; - version = "8.0.6"; - hash = "sha256-lKOvph7MvyvGuuNZZGa0ZGcSH87n6vVxUgc9C/rsC3E="; + version = "8.0.8"; + hash = "sha256-Mexoz07Bb3SRp1Gjfuvb25ZgPUnpmOq3wjZZhnBP0X0="; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; - version = "17.11.0"; - hash = "sha256-WjyA78+PG9ZloWTt9Hf1ek3VVj2FfJ9fAjqklnN+fWw="; + version = "17.11.1"; + hash = "sha256-0JUEucQ2lzaPgkrjm/NFLBTbqU1dfhvhN3Tl3moE6mI="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; @@ -340,13 +340,13 @@ }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; - version = "17.11.0"; - hash = "sha256-mCI3MCV6nyrGLrBat5VvK5LrXTEKlsdp9NkpZyJYwVg="; + version = "17.11.1"; + hash = "sha256-5vX+vCzFY3S7xfMVIv8OlMMFtdedW9UIJzc0WEc+vm4="; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; - version = "17.11.0"; - hash = "sha256-gViDLobza22kuLvB4JdlGtbANqwBHRwf1wLmIHMw9Eo="; + version = "17.11.1"; + hash = "sha256-wSkY0H1fQAq0H3LcKT4u7Y5RzhAAPa6yueVN84g8HxU="; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; @@ -355,8 +355,8 @@ }) (fetchNuGet { pname = "MudBlazor"; - version = "7.6.0"; - hash = "sha256-hTeNrVykAm+YS/mNafM5HZ/3cfKBQb6rs8kEZ11h86M="; + version = "7.8.0"; + hash = "sha256-DZbe5vCKh2awrYdrs4YUtzKUQVyx3TymYDAD0asBNsA="; }) (fetchNuGet { pname = "NETStandard.Library"; @@ -380,8 +380,8 @@ }) (fetchNuGet { pname = "NUnit"; - version = "4.2.1"; - hash = "sha256-rR1Yk79bBH8pJaAoqBhkiDqnQfkcK1ggZqkuQF3s2mg="; + version = "4.2.2"; + hash = "sha256-+0OS67ITalmG9arYCgQF/+YbmPRnB3pIIykew0kvoCc="; }) (fetchNuGet { pname = "NUnit.Analyzers"; @@ -1220,7 +1220,7 @@ }) (fetchNuGet { pname = "YamlDotNet"; - version = "16.0.0"; - hash = "sha256-wCKzDkAuIpQ65MKe39Zn/K8iX8FKdkw49OHIi7m6GHU="; + version = "16.1.0"; + hash = "sha256-SUUiPnsuArPmD5GPD/eBS7p0ueRsh9Wb9ImcRHG6m58="; }) ] diff --git a/pkgs/by-name/re/recyclarr/package.nix b/pkgs/by-name/re/recyclarr/package.nix index 89d72680dc01..30afe7807b7e 100644 --- a/pkgs/by-name/re/recyclarr/package.nix +++ b/pkgs/by-name/re/recyclarr/package.nix @@ -19,13 +19,13 @@ let in buildDotnetModule (finalAttrs: { pname = "recyclarr"; - version = "7.2.3"; + version = "7.2.4"; src = fetchFromGitHub { owner = "recyclarr"; repo = "recyclarr"; rev = "v${finalAttrs.version}"; - hash = "sha256-1jNXqyGIcaO2FVcC8i/vq+XTDCGuTGD4y0dDWIqb0K8="; + hash = "sha256-FFaGyMOXivorXVqCcYskEibnHnzhJ/AlxR46AtWFkI4="; }; projectFile = "Recyclarr.sln"; diff --git a/pkgs/development/tools/build-managers/redo/default.nix b/pkgs/by-name/re/redo/package.nix similarity index 65% rename from pkgs/development/tools/build-managers/redo/default.nix rename to pkgs/by-name/re/redo/package.nix index e6a68c4215c3..8e3e138501e9 100644 --- a/pkgs/development/tools/build-managers/redo/default.nix +++ b/pkgs/by-name/re/redo/package.nix @@ -1,8 +1,14 @@ -{lib, stdenv, fetchFromGitHub, perl }: +{ + lib, + stdenv, + fetchFromGitHub, + perl, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "redo"; version = "1.4"; + src = fetchFromGitHub { owner = "jdebp"; repo = "redo"; @@ -10,20 +16,24 @@ stdenv.mkDerivation rec { hash = "sha256-cA8UN4aQnJ8VyMW3mDOIPna4Ucw1kp8CirZTDhSoCpU="; }; - nativeBuildInputs = [ perl /* for pod2man */ ]; + nativeBuildInputs = [ + perl # for pod2man + ]; buildPhase = '' package/compile ''; + installPhase = '' package/export $out/ ''; meta = { - homepage = "https://jdebp.eu./Softwares/redo/"; + homepage = "https://github.com/jdebp/redo"; description = "System for building target files from source files"; license = lib.licenses.bsd2; - maintainers = [ ]; + maintainers = with lib.maintainers; [ momeemt ]; + mainProgram = "redo"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/s0/s0ix-selftest-tool/package.nix b/pkgs/by-name/s0/s0ix-selftest-tool/package.nix index fb53e5247108..b607fcc861f6 100644 --- a/pkgs/by-name/s0/s0ix-selftest-tool/package.nix +++ b/pkgs/by-name/s0/s0ix-selftest-tool/package.nix @@ -36,13 +36,13 @@ let in stdenv.mkDerivation { pname = "s0ix-selftest-tool"; - version = "0-unstable-2024-08-20"; + version = "0-unstable-2024-09-22"; src = fetchFromGitHub { owner = "intel"; repo = "S0ixSelftestTool"; - rev = "73b540d0b15d874ebb462eb3296399d4556aff64"; - hash = "sha256-p0IxhG0P0G+DQ5UykC+uVlMZUZQwrWG/iiJprdmsLm0="; + rev = "3af4af2009cb01da43ddae906f671d435494a0dc"; + hash = "sha256-phQxlbQB3J08tPtcw4vqupVgAT9gsSJxgPT044SMMNk="; }; # don't use the bundled turbostat binary diff --git a/pkgs/by-name/so/soplex/package.nix b/pkgs/by-name/so/soplex/package.nix index d4672a0b8ba3..90d97c707738 100644 --- a/pkgs/by-name/so/soplex/package.nix +++ b/pkgs/by-name/so/soplex/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "soplex"; - version = "7.1.0"; + version = "7.1.1"; src = fetchFromGitHub { owner = "scipopt"; repo = "soplex"; rev = "release-${builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version}"; - hash = "sha256-yoXqfaSGYLHJbUcmBkxhmik553L/9XZtb7FjouaIGCg="; + hash = "sha256-f4PMJz/VHCx5Uk7M9JdE+4Qpf29X3S/umoiAo8NXYrU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index c1ecf1a4bb1e..547af6be14c3 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -15,16 +15,16 @@ buildNpmPackage rec { pname = "teams-for-linux"; - version = "1.10.2"; + version = "1.11.0"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; rev = "refs/tags/v${version}"; - hash = "sha256-AcKjh3DAUoIpsMr+K/T0FT5knbBx54pZmJKCK9HRZVQ="; + hash = "sha256-UNe4stYEOTcQc+ap1/v9EXjHTwKvLYd4t8EPuojDyqw="; }; - npmDepsHash = "sha256-vDRFFxkIQo5qU9gmkSwUhPz4FG2XbUNkTw6SCuvMqCc="; + npmDepsHash = "sha256-OpoPXcSiHnK4UYFimY+yOM6M3dAOcvZ82DdGc++oNLM="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/data/themes/sddm-astronaut/default.nix b/pkgs/data/themes/sddm-astronaut/default.nix index ef8071f1e858..39064b3c7a8e 100644 --- a/pkgs/data/themes/sddm-astronaut/default.nix +++ b/pkgs/data/themes/sddm-astronaut/default.nix @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation rec { meta = { description = "Modern looking qt6 sddm theme"; - homepage = "https://github.com/${src.owner}/${pname}"; + homepage = "https://github.com/${src.owner}/${src.repo}"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index 3540c29e78ad..382ce87a3eba 100644 --- a/pkgs/development/misc/brev-cli/default.nix +++ b/pkgs/development/misc/brev-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.287"; + version = "0.6.293"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5P0cZ7zbzEqWLQTi1kMGcC0R0BQa2gJrLzEcw17GATA="; + sha256 = "sha256-XRzwLPUNUSf88GqwdI8/WuodFVdoHuY8k6GYBgUco20="; }; - vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8="; + vendorHash = "sha256-oVs7CFnijmyaQAEoYuKf56n+i2q9YMjq4HatbpWympw="; CGO_ENABLED = 0; subPackages = [ "." ]; diff --git a/pkgs/development/python-modules/cleanlab/default.nix b/pkgs/development/python-modules/cleanlab/default.nix index e5f227f7545e..d2fad3fdd220 100644 --- a/pkgs/development/python-modules/cleanlab/default.nix +++ b/pkgs/development/python-modules/cleanlab/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -31,16 +30,14 @@ buildPythonPackage rec { pname = "cleanlab"; - version = "2.6.6"; + version = "2.7.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "cleanlab"; repo = "cleanlab"; rev = "refs/tags/v${version}"; - hash = "sha256-08ePFTCRuggr4hTCfr/gbzMhLozz4KCywhPFSKYDNng="; + hash = "sha256-0kCEIHNOXIkdwDH5zCVWnR/W79ppc/1PFsJ/a4goGzk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/gftools/default.nix b/pkgs/development/python-modules/gftools/default.nix index 9418d7c1acd4..2aec534c5353 100644 --- a/pkgs/development/python-modules/gftools/default.nix +++ b/pkgs/development/python-modules/gftools/default.nix @@ -61,14 +61,14 @@ let in buildPythonPackage rec { pname = "gftools"; - version = "0.9.68"; + version = "0.9.70"; pyproject = true; src = fetchFromGitHub { owner = "googlefonts"; repo = "gftools"; rev = "refs/tags/v${version}"; - hash = "sha256-xdpfRCtZDxRmrGodXUg8J0T5l5gd7Mvl290BXwNLzvY="; + hash = "sha256-mZGkcIODzc2nuhAWU83BkhjWg4+8vnmCA4eXgDsyFy8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/keyrings-cryptfile/default.nix b/pkgs/development/python-modules/keyrings-cryptfile/default.nix index 4db10bd0ed5a..528d4becda6b 100644 --- a/pkgs/development/python-modules/keyrings-cryptfile/default.nix +++ b/pkgs/development/python-modules/keyrings-cryptfile/default.nix @@ -2,7 +2,7 @@ lib, argon2-cffi, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, keyring, pycryptodome, @@ -13,15 +13,16 @@ buildPythonPackage rec { pname = "keyrings-cryptfile"; - version = "1.3.9"; + version = "1.4.1"; pyproject = true; disabled = pythonOlder "3.5"; - src = fetchPypi { - pname = "keyrings.cryptfile"; - inherit version; - hash = "sha256-fCpFPKuZhUJrjCH3rVSlfkn/joGboY4INAvYgBrPAJE="; + src = fetchFromGitHub { + owner = "frispete"; + repo = "keyrings.cryptfile"; + rev = "refs/tags/v${version}"; + hash = "sha256-cDXx0s3o8hNqgzX4oNkjGhNcaUX5vi1uN2d9sdbiZwk="; }; build-system = [ setuptools ]; @@ -40,8 +41,10 @@ buildPythonPackage rec { ]; disabledTests = [ - # FileNotFoundError: [Errno 2] No such file or directory: '/build/... - "test_versions" + # correct raise `ValueError`s which pytest fails to catch for some reason: + "test_empty_username" + # TestEncryptedFileKeyring::test_file raises 'ValueError: Incorrect Password' for some reason, maybe mock related: + "TestEncryptedFileKeyring" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 67e822faca91..91253909d565 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -58,14 +58,14 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.45.0"; + version = "4.45.1"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-MVgDNSeoqad9v5TEVuUoLYvThyjGyCuOg8Z/F7+URng="; + hash = "sha256-5fGEnw4YllQdZV/0vDGXYsCyTw0rtPRD/V7UWoBBZjQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/tools/build-managers/xmake/default.nix b/pkgs/development/tools/build-managers/xmake/default.nix index 184c038beae4..073ca4ac017f 100644 --- a/pkgs/development/tools/build-managers/xmake/default.nix +++ b/pkgs/development/tools/build-managers/xmake/default.nix @@ -1,48 +1,35 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, lua -, readline -, ncurses -, lz4 -, tbox -, xmake-core-sv +{ + lib, + stdenv, + fetchurl, + fetchpatch, + CoreServices, }: - stdenv.mkDerivation rec { pname = "xmake"; - version = "2.9.4"; - + version = "2.9.5"; src = fetchurl { url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz"; - hash = "sha256-deLd4r0qSKMymJuAGuZQd8RS1JH+xRep2yeoHIcTzcU="; + hash = "sha256-A/61eH4i+rjdQEGew9hKvTWrzZ+KGyTEiMfrVx1nJMg="; }; - nativeBuildInputs = [ - pkg-config + patches = [ + (fetchpatch { + name = "xmake-fix-configure-compatibility.patch"; + url = "https://github.com/xmake-io/xmake/commit/2a1220727a367e753b92131577ab0c2fd974bff8.patch"; + hash = "sha256-xknlyydHvdwqTl975VQogKozT8nAp5+gPZQuRl1yXKE="; + }) ]; - buildInputs = [ - lua - lua.pkgs.cjson - readline - ncurses - lz4 - tbox - xmake-core-sv - ]; - - strictDeps = true; - - configureFlags = [ "--external=y" ]; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin CoreServices; meta = with lib; { description = "Cross-platform build utility based on Lua"; homepage = "https://xmake.io"; license = licenses.asl20; - platforms = lua.meta.platforms; - maintainers = with maintainers; [ rewine ]; + maintainers = with maintainers; [ + rewine + rennsax + ]; }; } - diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index cf5d42b65a97..d9cd2d0cbbc5 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/pkgs/development/tools/faas-cli/default.nix @@ -18,13 +18,13 @@ let in buildGoModule rec { pname = "faas-cli"; - version = "0.16.34"; + version = "0.16.36"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-vz/RMwmZYCG76lZyloRz1CyLJuj+fK8oAaK1GqW6bvE="; + sha256 = "sha256-5wvVwUj4JqHHZ/Q7s65nlCYENgHENma3IuUsNwcNJ9M="; }; vendorHash = null; diff --git a/pkgs/os-specific/darwin/bartender/default.nix b/pkgs/os-specific/darwin/bartender/default.nix index e5e0cff6218d..56f049dc3612 100644 --- a/pkgs/os-specific/darwin/bartender/default.nix +++ b/pkgs/os-specific/darwin/bartender/default.nix @@ -6,12 +6,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "bartender"; - version = "5.1.2"; + version = "5.1.5"; src = fetchurl { name = "Bartender ${lib.versions.major finalAttrs.version}.dmg"; url = "https://www.macbartender.com/B2/updates/${builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version}/Bartender%20${lib.versions.major finalAttrs.version}.dmg"; - hash = "sha256-t3ygKL3CPebSK1JcVbabVHFpe7lvrMrFQxTh0DVyGmU="; + hash = "sha256-G1zbvCZtWCPsBonfRZSZat7s44ZxJAL7wod5460w+oM="; }; dontPatch = true; diff --git a/pkgs/servers/web-apps/livebook/default.nix b/pkgs/servers/web-apps/livebook/default.nix index b85e3d7420c2..214c21381ad2 100644 --- a/pkgs/servers/web-apps/livebook/default.nix +++ b/pkgs/servers/web-apps/livebook/default.nix @@ -1,7 +1,7 @@ { lib, beamPackages, makeWrapper, rebar3, elixir, erlang, fetchFromGitHub, nixosTests }: beamPackages.mixRelease rec { pname = "livebook"; - version = "0.14.0"; + version = "0.14.2"; inherit elixir; @@ -13,13 +13,13 @@ beamPackages.mixRelease rec { owner = "livebook-dev"; repo = "livebook"; rev = "v${version}"; - hash = "sha256-8z6t7AzOPS7zxNdS5+qGE1DpvhWNbHnDLCta7igA5vY="; + hash = "sha256-iD9FzIjm0OAnApgmMqw0bDTQH/pSC8Z2l4+3Y4y+ieQ="; }; mixFodDeps = beamPackages.fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version; - hash = "sha256-7avxuqbZtNWgUfalbq/OtggmUI/4QK+S792iqcCjRHM="; + hash = "sha256-knqjnySXwh7/vMkFNfDZzSjojWpWPNZyR/RIDb9hdgA="; }; postInstall = '' diff --git a/pkgs/tools/misc/netbootxyz-efi/default.nix b/pkgs/tools/misc/netbootxyz-efi/default.nix index f09a86fd76a3..7137f22e8998 100644 --- a/pkgs/tools/misc/netbootxyz-efi/default.nix +++ b/pkgs/tools/misc/netbootxyz-efi/default.nix @@ -4,12 +4,12 @@ let pname = "netboot.xyz-efi"; - version = "2.0.75"; + version = "2.0.82"; in fetchurl { name = "${pname}-${version}"; url = "https://github.com/netbootxyz/netboot.xyz/releases/download/${version}/netboot.xyz.efi"; - sha256 = "sha256-VaTUwX3S5Bj5eUZAspXNaVm8Y51hURL3xBb1tRdj6Zw="; + sha256 = "sha256-cO8MCkroQ0s/j8wnwwIWfnxEvChLeOZw+gD4wrYBAog="; meta = with lib; { homepage = "https://netboot.xyz/"; diff --git a/pkgs/tools/misc/wasm-tools/default.nix b/pkgs/tools/misc/wasm-tools/default.nix index 36e4337a7abb..ebfa6875a6f6 100644 --- a/pkgs/tools/misc/wasm-tools/default.nix +++ b/pkgs/tools/misc/wasm-tools/default.nix @@ -5,21 +5,23 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.216.0"; + version = "1.217.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-HgeiZo/wXLKYwTQv/gcKHNz3p9jfp/8OYSrum3TPI2Q="; + hash = "sha256-nxfYoR0ba0As00WbahSVFNItSlleMmITqs8eJabjD/U="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-KS/mg3OZHCyb6IKmbED18xPCblYk0euzdqz7fJl0plI="; + cargoHash = "sha256-mBSRJYSE3HmeWhnW4nFF8uFnUJaZ6wdqsq+GnL6SZWc="; cargoBuildFlags = [ "--package" "wasm-tools" ]; - cargoTestFlags = [ "--all" ]; + cargoTestFlags = [ "--all" ] ++ + # Due to https://github.com/bytecodealliance/wasm-tools/issues/1820 + [ "--" "--test-threads=1" ]; meta = with lib; { description = "Low level tooling for WebAssembly in Rust"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6657487c7c4e..67e93bd25eb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -307,8 +307,6 @@ with pkgs; atomic-swap = callPackage ../applications/blockchains/atomic-swap { }; - avro-tools = callPackage ../development/tools/avro-tools { }; - bacnet-stack = callPackage ../tools/networking/bacnet-stack { }; bada-bib = callPackage ../applications/science/misc/bada-bib { }; @@ -18078,8 +18076,6 @@ with pkgs; lcov = callPackage ../development/tools/analysis/lcov { }; - leiningen = callPackage ../development/tools/build-managers/leiningen { }; - lemon = callPackage ../development/tools/parsing/lemon { }; lenmus = callPackage ../applications/misc/lenmus { }; @@ -18434,8 +18430,6 @@ with pkgs; redisinsight = callPackage ../development/tools/redisinsight { }; - redo = callPackage ../development/tools/build-managers/redo { }; - redo-apenwarr = callPackage ../development/tools/build-managers/redo-apenwarr { }; redo-c = callPackage ../development/tools/build-managers/redo-c { }; @@ -18864,8 +18858,8 @@ with pkgs; webdis = callPackage ../development/tools/database/webdis { }; - xmake = callPackage ../development/tools/build-managers/xmake { - lua = lua5_4; + xmake = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/xmake { + inherit (darwin.apple_sdk_11_0.frameworks) CoreServices; }; xc3sprog = callPackage ../development/embedded/xc3sprog { }; @@ -28909,8 +28903,6 @@ with pkgs; cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; - dablin = callPackage ../applications/radio/dablin { }; - daktilo = callPackage ../tools/misc/daktilo { }; darcs = haskell.lib.compose.disableCabalFlag "library"