diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index b3f9f681da4c..2d4c2eefb5af 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -101,11 +101,11 @@ To build a `stdenv` package in a [`nix-shell`](https://nixos.org/manual/nix/unst ```bash nix-shell '' -A some_package -eval ${unpackPhase:-unpackPhase} +eval "${unpackPhase:-unpackPhase}" cd $sourceRoot -eval ${patchPhase:-patchPhase} -eval ${configurePhase:-configurePhase} -eval ${buildPhase:-buildPhase} +eval "${patchPhase:-patchPhase}" +eval "${configurePhase:-configurePhase}" +eval "${buildPhase:-buildPhase}" ``` To modify a [phase](#sec-stdenv-phases), first print it with diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cbf780aefe97..81aa91c2383e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16720,6 +16720,12 @@ githubId = 908716; name = "Zach Coyle"; }; + Zaechus = { + email = "zaechus@proton.me"; + github = "Zaechus"; + githubId = 19353212; + name = "Maxwell Anderson"; + }; zagy = { email = "cz@flyingcircus.io"; github = "zagy"; diff --git a/nixos/modules/security/doas.nix b/nixos/modules/security/doas.nix index be30a6b92e26..115ca33efb5c 100644 --- a/nixos/modules/security/doas.nix +++ b/nixos/modules/security/doas.nix @@ -75,7 +75,9 @@ in {file}`/etc/doas.conf` file. More specific rules should come after more general ones in order to yield the expected behavior. You can use `mkBefore` and/or `mkAfter` to ensure - this is the case when configuration options are merged. + this is the case when configuration options are merged. Be aware that + this option cannot be used to override the behaviour allowing + passwordless operation for root. ''; example = literalExpression '' [ @@ -224,7 +226,9 @@ in type = with types; lines; default = ""; description = lib.mdDoc '' - Extra configuration text appended to {file}`doas.conf`. + Extra configuration text appended to {file}`doas.conf`. Be aware that + this option cannot be used to override the behaviour allowing + passwordless operation for root. ''; }; }; @@ -266,14 +270,14 @@ in # completely replace the contents of this file, use # `environment.etc."doas.conf"`. - # "root" is allowed to do anything. - permit nopass keepenv root - # extraRules ${concatStringsSep "\n" (lists.flatten (map mkRule cfg.extraRules))} # extraConfig ${cfg.extraConfig} + + # "root" is allowed to do anything. + permit nopass keepenv root ''; preferLocalBuild = true; } diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index 103f73fdaa68..3a7519c7230b 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.avahi; - yesNo = yes : if yes then "yes" else "no"; + yesNo = yes: if yes then "yes" else "no"; avahiDaemonConf = with cfg; pkgs.writeText "avahi-daemon.conf" '' [server] @@ -17,7 +17,8 @@ let browse-domains=${concatStringsSep ", " browseDomains} use-ipv4=${yesNo ipv4} use-ipv6=${yesNo ipv6} - ${optionalString (interfaces!=null) "allow-interfaces=${concatStringsSep "," interfaces}"} + ${optionalString (allowInterfaces!=null) "allow-interfaces=${concatStringsSep "," allowInterfaces}"} + ${optionalString (denyInterfaces!=null) "deny-interfaces=${concatStringsSep "," denyInterfaces}"} ${optionalString (domainName!=null) "domain-name=${domainName}"} allow-point-to-point=${yesNo allowPointToPoint} ${optionalString (cacheEntriesMax!=null) "cache-entries-max=${toString cacheEntriesMax}"} @@ -39,6 +40,10 @@ let ''; in { + imports = [ + (lib.mkRenamedOptionModule [ "services" "avahi" "interfaces" ] [ "services" "avahi" "allowInterfaces" ]) + ]; + options.services.avahi = { enable = mkOption { type = types.bool; @@ -91,7 +96,7 @@ in description = lib.mdDoc "Whether to use IPv6."; }; - interfaces = mkOption { + allowInterfaces = mkOption { type = types.nullOr (types.listOf types.str); default = null; description = lib.mdDoc '' @@ -101,6 +106,17 @@ in ''; }; + denyInterfaces = mkOption { + type = types.nullOr (types.listOf types.str); + default = null; + description = lib.mdDoc '' + List of network interfaces that should be ignored by the + {command}`avahi-daemon`. Other unspecified interfaces will be used, + unless {option}`allowInterfaces` is set. This option takes precedence + over {option}`allowInterfaces`. + ''; + }; + openFirewall = mkOption { type = types.bool; default = true; @@ -134,7 +150,7 @@ in extraServiceFiles = mkOption { type = with types; attrsOf (either str path); - default = {}; + default = { }; example = literalExpression '' { ssh = "''${pkgs.avahi}/etc/avahi/services/ssh.service"; @@ -236,7 +252,7 @@ in isSystemUser = true; }; - users.groups.avahi = {}; + users.groups.avahi = { }; system.nssModules = optional cfg.nssmdns pkgs.nssmdns; system.nssDatabases.hosts = optionals cfg.nssmdns (mkMerge [ @@ -246,10 +262,12 @@ in environment.systemPackages = [ pkgs.avahi ]; - environment.etc = (mapAttrs' (n: v: nameValuePair - "avahi/services/${n}.service" - { ${if types.path.check v then "source" else "text"} = v; } - ) cfg.extraServiceFiles); + environment.etc = (mapAttrs' + (n: v: nameValuePair + "avahi/services/${n}.service" + { ${if types.path.check v then "source" else "text"} = v; } + ) + cfg.extraServiceFiles); systemd.sockets.avahi-daemon = { description = "Avahi mDNS/DNS-SD Stack Activation Socket"; diff --git a/nixos/modules/services/networking/jicofo.nix b/nixos/modules/services/networking/jicofo.nix index 5e9788960736..0886bbe004c4 100644 --- a/nixos/modules/services/networking/jicofo.nix +++ b/nixos/modules/services/networking/jicofo.nix @@ -4,6 +4,15 @@ with lib; let cfg = config.services.jicofo; + + # HOCON is a JSON superset that some jitsi-meet components use for configuration + toHOCON = x: if isAttrs x && x ? __hocon_envvar then ("\${" + x.__hocon_envvar + "}") + else if isAttrs x && x ? __hocon_unquoted_string then x.__hocon_unquoted_string + else if isAttrs x then "{${ concatStringsSep "," (mapAttrsToList (k: v: ''"${k}":${toHOCON v}'') x) }}" + else if isList x then "[${ concatMapStringsSep "," toHOCON x }]" + else builtins.toJSON x; + + configFile = pkgs.writeText "jicofo.conf" (toHOCON cfg.config); in { options.services.jicofo = with types; { @@ -68,22 +77,34 @@ in }; config = mkOption { - type = attrsOf str; + type = (pkgs.formats.json {}).type; default = { }; example = literalExpression '' { - "org.jitsi.jicofo.auth.URL" = "XMPP:jitsi-meet.example.com"; + jicofo.bridge.max-bridge-participants = 42; } ''; description = lib.mdDoc '' - Contents of the {file}`sip-communicator.properties` configuration file for jicofo. + Contents of the {file}`jicofo.conf` configuration file. ''; }; }; config = mkIf cfg.enable { - services.jicofo.config = mapAttrs (_: v: mkDefault v) { - "org.jitsi.jicofo.BRIDGE_MUC" = cfg.bridgeMuc; + services.jicofo.config = { + jicofo = { + bridge.brewery-jid = cfg.bridgeMuc; + xmpp = rec { + client = { + hostname = cfg.xmppHost; + username = cfg.userName; + domain = cfg.userDomain; + password = { __hocon_envvar = "JICOFO_AUTH_PASS"; }; + xmpp-domain = if cfg.xmppDomain == null then cfg.xmppHost else cfg.xmppDomain; + }; + service = client; + }; + }; }; users.groups.jitsi-meet = {}; @@ -93,6 +114,7 @@ in "-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION" = "/etc/jitsi"; "-Dnet.java.sip.communicator.SC_HOME_DIR_NAME" = "jicofo"; "-Djava.util.logging.config.file" = "/etc/jitsi/jicofo/logging.properties"; + "-Dconfig.file" = configFile; }; in { @@ -101,18 +123,13 @@ in after = [ "network.target" ]; restartTriggers = [ - config.environment.etc."jitsi/jicofo/sip-communicator.properties".source + configFile ]; environment.JAVA_SYS_PROPS = concatStringsSep " " (mapAttrsToList (k: v: "${k}=${toString v}") jicofoProps); script = '' - ${pkgs.jicofo}/bin/jicofo \ - --host=${cfg.xmppHost} \ - --domain=${if cfg.xmppDomain == null then cfg.xmppHost else cfg.xmppDomain} \ - --secret=$(cat ${cfg.componentPasswordFile}) \ - --user_name=${cfg.userName} \ - --user_domain=${cfg.userDomain} \ - --user_password=$(cat ${cfg.userPasswordFile}) + export JICOFO_AUTH_PASS="$(<${cfg.userPasswordFile})" + exec "${pkgs.jicofo}/bin/jicofo" ''; serviceConfig = { @@ -140,10 +157,7 @@ in }; }; - environment.etc."jitsi/jicofo/sip-communicator.properties".source = - pkgs.writeText "sip-communicator.properties" ( - generators.toKeyValue {} cfg.config - ); + environment.etc."jitsi/jicofo/sip-communicator.properties".text = ""; environment.etc."jitsi/jicofo/logging.properties".source = mkDefault "${pkgs.jicofo}/etc/jitsi/jicofo/logging.properties-journal"; }; diff --git a/nixos/modules/services/web-apps/jitsi-meet.nix b/nixos/modules/services/web-apps/jitsi-meet.nix index 28be3a3702eb..3825b03c2449 100644 --- a/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/nixos/modules/services/web-apps/jitsi-meet.nix @@ -411,11 +411,14 @@ in componentPasswordFile = "/var/lib/jitsi-meet/jicofo-component-secret"; bridgeMuc = "jvbbrewery@internal.${cfg.hostName}"; config = mkMerge [{ - "org.jitsi.jicofo.ALWAYS_TRUST_MODE_ENABLED" = "true"; + jicofo.xmpp.service.disable-certificate-verification = true; + jicofo.xmpp.client.disable-certificate-verification = true; #} (lib.mkIf cfg.jibri.enable { } (lib.mkIf (config.services.jibri.enable || cfg.jibri.enable) { - "org.jitsi.jicofo.jibri.BREWERY" = "JibriBrewery@internal.${cfg.hostName}"; - "org.jitsi.jicofo.jibri.PENDING_TIMEOUT" = "90"; + jicofo.jibri = { + brewery-jid = "JibriBrewery@internal.${cfg.hostName}"; + pending-timeout = "90"; + }; })]; }; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index f0c4b2172f9d..6e2fec599bc1 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -95,18 +95,6 @@ in description = lib.mdDoc "Phonon audio backend to install."; }; - supportDDC = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Support setting monitor brightness via DDC. - - This is not needed for controlling brightness of the internal monitor - of a laptop and as it is considered experimental by upstream, it is - disabled by default. - ''; - }; - useQtScaling = mkOption { type = types.bool; default = false; @@ -173,6 +161,7 @@ in imports = [ (mkRemovedOptionModule [ "services" "xserver" "desktopManager" "plasma5" "enableQt4Support" ] "Phonon no longer supports Qt 4.") + (mkRemovedOptionModule [ "services" "xserver" "desktopManager" "plasma5" "supportDDC" ] "DDC/CI is no longer supported upstream.") (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "kde5" ] [ "services" "xserver" "desktopManager" "plasma5" ]) ]; @@ -201,12 +190,6 @@ in }; }; - # DDC support - boot.kernelModules = lib.optional cfg.supportDDC "i2c_dev"; - services.udev.extraRules = lib.optionalString cfg.supportDDC '' - KERNEL=="i2c-[0-9]*", TAG+="uaccess" - ''; - environment.systemPackages = with libsForQt5; with plasma5; with kdeGear; with kdeFrameworks; diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix index 71fc1f103b9b..4100d166a25e 100644 --- a/pkgs/applications/audio/open-stage-control/default.nix +++ b/pkgs/applications/audio/open-stage-control/default.nix @@ -2,13 +2,13 @@ buildNpmPackage rec { pname = "open-stage-control"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "jean-emmanuel"; repo = "open-stage-control"; rev = "v${version}"; - hash = "sha256-tfWimJ9eEFBUxPRVNjgbu8tQNokPbXOxOXO64mFuMfM="; + hash = "sha256-P3aTGt/T59JE2oy8uRhD8h2NXX/ZXno6qY0frpcir7A="; }; # Remove some Electron stuff from package.json diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 5ff9dd593e57..1081ed1b10c0 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.187.0"; + version = "1.187.1"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-Ri/VTJF59GCJdhbMWRAYaQifj7FjVYSACywpq8gHKXg="; + hash = "sha256-OdeiJ+g2woNjjQI5z3TDSi9Tt8kOheUrd/Gak+fmXX0="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 85cefe144463..33ba30821cb8 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -16,13 +16,13 @@ }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2023.03.10", - "hash": "sha256-NdLg/cQNy5SaC/zPb3bLplUe6FiO7ePi1++WDIvQziI=" + "rev": "2023.03.14", + "hash": "sha256-mrjMG0t10lOd9hOEGBt9iGlpGdHcgbEVRcezyuUOqPQ=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2023.03.10", - "hash": "sha256-KfzTO0GMFkWRFxbRSdKAh4sr7cx7A2snj/UO1nsvacI=" + "rev": "2023.03.14", + "hash": "sha256-75ndPG3nSM7Y/jEZFPmKfQMnFrARe1DNva1HoDHxqAE=" }, "EControl": { "owner": "Alexey-T", diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 138c886e7639..9f51d41428c1 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "sigil"; - version = "1.9.20"; + version = "1.9.30"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; rev = version; - sha256 = "sha256-rpJ+HBYmGuhxnZbJn59mc+IokBc5834X2uyriIGnsqA="; + sha256 = "sha256-07JK3xHpNDs6CU8je8PNyTugNBi2mQ7G109R3JX4eyg="; }; pythonPath = with python3Packages; [ lxml ]; diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 03c6d19b80c4..47270dcce65d 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -19,13 +19,13 @@ in stdenv.mkDerivation rec { pname = "tiled"; - version = "1.9.2"; + version = "1.10.0"; src = fetchFromGitHub { - owner = "bjorn"; + owner = "mapeditor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-026OO7r8n1BUapUtKRHvqKdSZiClTQIiYfajiC2TAcQ="; + sha256 = "sha256-y79trmkRrkOOP6p9VMjo/11IE22J3YJtnerBsVP9134="; }; nativeBuildInputs = [ pkg-config qbs wrapQtAppsHook ]; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 49fc219c3422..11f66e8a5d53 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -171,6 +171,18 @@ final: prev: meta.homepage = "https://github.com/vigoux/LanguageTool.nvim/"; }; + LazyVim = buildVimPluginFrom2Nix { + pname = "LazyVim"; + version = "2023-03-17"; + src = fetchFromGitHub { + owner = "LazyVim"; + repo = "LazyVim"; + rev = "c10e550639caef68146d122d9bc4a66f2f38650a"; + sha256 = "04d062kxa0pz57liymim3i17hz51w0690c2y4q22h3kfarcmj0ws"; + }; + meta.homepage = "https://github.com/LazyVim/LazyVim/"; + }; + LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; version = "2023-03-02"; @@ -1169,6 +1181,18 @@ final: prev: meta.homepage = "https://github.com/bbchung/clighter8/"; }; + clipboard-image-nvim = buildVimPluginFrom2Nix { + pname = "clipboard-image.nvim"; + version = "2022-11-10"; + src = fetchFromGitHub { + owner = "ekickx"; + repo = "clipboard-image.nvim"; + rev = "d1550dc26729b7954f95269952e90471b838fa25"; + sha256 = "0lq13rscsnjglnbynisz4fmsh4xzn12lisgjk9cm61sjg9pw6yl9"; + }; + meta.homepage = "https://github.com/ekickx/clipboard-image.nvim/"; + }; + cmd-parser-nvim = buildVimPluginFrom2Nix { pname = "cmd-parser.nvim"; version = "2022-02-23"; @@ -6897,6 +6921,18 @@ final: prev: meta.homepage = "https://github.com/steelsojka/pears.nvim/"; }; + persistence-nvim = buildVimPluginFrom2Nix { + pname = "persistence.nvim"; + version = "2023-02-28"; + src = fetchFromGitHub { + owner = "folke"; + repo = "persistence.nvim"; + rev = "adcf6913693a0434665d162ee45a186230496f8a"; + sha256 = "1fx713swa6138mpmqgpc6lf7nvm4j7nm6fr8zwpgqn6dv71jdhxd"; + }; + meta.homepage = "https://github.com/folke/persistence.nvim/"; + }; + peskcolor-vim = buildVimPluginFrom2Nix { pname = "peskcolor.vim"; version = "2016-06-11"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 15184a29c6c4..d8eca1c8b07a 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -13,6 +13,7 @@ https://github.com/ionide/Ionide-vim/,HEAD, https://github.com/martinda/Jenkinsfile-vim-syntax/,, https://github.com/autozimu/LanguageClient-neovim/,, https://github.com/vigoux/LanguageTool.nvim/,, +https://github.com/LazyVim/LazyVim/,, https://github.com/Yggdroot/LeaderF/,, https://github.com/Valloric/MatchTagAlways/,, https://github.com/numToStr/Navigator.nvim/,, @@ -98,6 +99,7 @@ https://github.com/xavierd/clang_complete/,, https://github.com/p00f/clangd_extensions.nvim/,HEAD, https://github.com/rhysd/clever-f.vim/,, https://github.com/bbchung/clighter8/,, +https://github.com/ekickx/clipboard-image.nvim/,, https://github.com/winston0410/cmd-parser.nvim/,, https://github.com/hrsh7th/cmp-buffer/,, https://github.com/hrsh7th/cmp-calc/,, @@ -580,6 +582,7 @@ https://github.com/drewtempelmeyer/palenight.vim/,, https://github.com/NLKNguyen/papercolor-theme/,, https://github.com/tmsvg/pear-tree/,, https://github.com/steelsojka/pears.nvim/,, +https://github.com/folke/persistence.nvim/,, https://github.com/andsild/peskcolor.vim/,, https://github.com/pest-parser/pest.vim/,HEAD, https://github.com/lifepillar/pgsql.vim/,, diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 0153a4faa8c9..437008193b47 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -29,13 +29,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.651"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.665"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "f0562b9c75308c8cfcaa2458dfd37ac42751a374"; - sha256 = "1bkfncms8lagxhpnafyahrghzvpklsgxddqq7w1wzjzyxp6pxc51"; + rev = "da073fce6127243fcd93b736cde951c4e835e508"; + sha256 = "0zbww3mhmmakfaqh8q1bzn7liz4i85kmkz967jqbnlq90w0a7i3f"; }; dotnet-sdk = dotnetCorePackages.sdk_7_0; diff --git a/pkgs/applications/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix index 264b60dcf449..216a275249a7 100644 --- a/pkgs/applications/emulators/ryujinx/deps.nix +++ b/pkgs/applications/emulators/ryujinx/deps.nix @@ -18,7 +18,6 @@ (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.18"; sha256 = "0bzhbnz0dimxbpjxcrphnjn8nk37hqw0b83s2nsha4gzqvpc75b2"; }) (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; }) (fetchNuGet { pname = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; }) - (fetchNuGet { pname = "Crc32.NET"; version = "1.2.0"; sha256 = "0qaj3192k1vfji87zf50rhydn5mrzyzybrs2k4v7ap29k8i0vi5h"; }) (fetchNuGet { pname = "DiscordRichPresence"; version = "1.1.3.18"; sha256 = "0p4bhaggjjfd4gl06yiphqgncxgcq2bws4sjkrw0n2ldf3hgrps3"; }) (fetchNuGet { pname = "DynamicData"; version = "7.12.11"; sha256 = "159037gd4rn8z5wdkbnb296rw5csay8rjigi1h4n35mjfg4nhm8f"; }) (fetchNuGet { pname = "ExCSS"; version = "4.1.4"; sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; }) @@ -64,7 +63,6 @@ (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.5.0"; sha256 = "17g0k3r5n8grba8kg4nghjyhnq9w8v0w6c2nkyyygvfh8k8x9wh3"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; }) (fetchNuGet { pname = "MsgPack.Cli"; version = "1.0.1"; sha256 = "1dk2bs3g16lsxcjjm7gfx6jxa4667wccw94jlh2ql7y7smvh9z8r"; }) @@ -171,7 +169,6 @@ (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.0.0"; sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) (fetchNuGet { pname = "System.Drawing.Common"; version = "7.0.0"; sha256 = "0jwyv5zjxzr4bm4vhmz394gsxqa02q6pxdqd2hwy1f116f0l30dp"; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) @@ -185,7 +182,7 @@ (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.0.1"; sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { pname = "System.IO.Hashing"; version = "7.0.0"; sha256 = "0vilmb817wnw8w13kkps831p05zzc41dldigpbr3wqi0hsrf8ad9"; }) (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) @@ -197,7 +194,6 @@ (fetchNuGet { pname = "System.Net.Http"; version = "4.1.0"; sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; }) (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.0.11"; sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) (fetchNuGet { pname = "System.Net.Sockets"; version = "4.1.0"; sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.3.0"; sha256 = "05kji1mv4sl75iwmc613p873145nynm02xiajx8pn0h2kx53d23s"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) diff --git a/pkgs/applications/graphics/autotrace/autofig.nix b/pkgs/applications/graphics/autotrace/autofig.nix deleted file mode 100644 index 9555dd4c02ed..000000000000 --- a/pkgs/applications/graphics/autotrace/autofig.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - pname = "autofig"; - version = "0.1"; - - src = fetchurl { - url = "http://autotrace.sourceforge.net/tools/autofig.tar.gz"; - sha256 = "11cs9hdbgcl3aamcs3149i8kvyyldmnjf6yq81kbcf8fdmfk2zdq"; - }; -} diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix index 502aeddf8146..96a53b5efbac 100644 --- a/pkgs/applications/graphics/autotrace/default.nix +++ b/pkgs/applications/graphics/autotrace/default.nix @@ -1,125 +1,58 @@ -{ lib, stdenv, fetchurl, callPackage, libpng12, imagemagick -, autoreconfHook, glib, pstoedit, pkg-config, gettext, gd, darwin -, runtimeShell }: - -# TODO: Figure out why the resultant binary is somehow linked against -# libpng16.so.16 rather than libpng12. +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, gettext +, intltool +, pkg-config +, glib +, imagemagick +, libpng +, pstoedit +, darwin +}: stdenv.mkDerivation rec { pname = "autotrace"; - version = "0.31.1"; + version = "0.31.9"; - src = fetchurl { - url = "mirror://sourceforge/autotrace/AutoTrace/0.31.1/${pname}-${version}.tar.gz"; - sha256 = "1xmgja5fv48mdbsa51inf7ksz36nqd6bsaybrk5xgprm6cy946js"; + src = fetchFromGitHub { + owner = "autotrace"; + repo = "autotrace"; + rev = version; + hash = "sha256-8qqB6oKmbz95dNLtdLvb69cEj/P7TzdoKEyJ8+4ITzs="; }; - # The below commented out part is for an identically-named project - # on GitHub which appears to derive somehow from the Sourceforge - # version, but I have no idea what the lineage is of this project. - # It will build, but it segfaults when I attempt to run -centerline. - # Someone may need this for some reason, so I've left it here. - # - #src = fetchFromGitHub { - # owner = "autotrace"; - # repo = "autotrace"; - # rev = "b3ac8818d86943102cb4f13734e0b527c42dc45a"; - # sha256 = "0z5h2mvxwckk2msi361zk1nc9fdcvxyimyc2hlyqd6h8k3p7zdi4"; - #}; - #postConfigure = '' - # sed -i -e "s/at_string/gchar */g" *.c - # sed -i -e "s/at_address/gpointer/g" *.c - # sed -i -e "s/at_bitmap_type/struct _at_bitmap/g" *.c - # sed -i -e "s/AT_BITMAP_BITS(bitmap)/AT_BITMAP_BITS(\&bitmap)/g" input-magick.c - #''; + patches = [ + (fetchpatch { + name = "imagemagick7-support.patch"; + url = "https://github.com/autotrace/autotrace/pull/105.patch"; + hash = "sha256-Q82LRF/BsJ/Ii2s+7yaYHs9agMKYVYIMnbwqz8P92s0="; + }) + ]; - autofig = callPackage ./autofig.nix {}; - nativeBuildInputs = [ autoreconfHook glib autofig pkg-config gettext ]; - buildInputs = [ libpng12 imagemagick pstoedit ] - ++ lib.optionals stdenv.isDarwin - (with darwin.apple_sdk.frameworks; [ gd ApplicationServices ]); + nativeBuildInputs = [ + autoreconfHook + gettext + intltool + pkg-config + ]; - postUnpack = '' - pushd $sourceRoot - autofig autotrace-config.af - popd - ''; - - # This complains about various m4 files, but it appears to not be an - # actual error. - preConfigure = '' - glib-gettextize --copy --force - # pstoedit-config no longer exists, it was replaced with pkg-config - mkdir wrappers - cat >wrappers/pstoedit-config <<'EOF' - #!${runtimeShell} - # replace --version with --modversion for pkg-config - args=''${@/--version/--modversion} - exec pkg-config pstoedit "''${args[@]}" - EOF - chmod +x wrappers/pstoedit-config - export PATH="$PATH:$PWD/wrappers" - ''; + buildInputs = [ + glib + imagemagick + libpng + pstoedit + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + ]; meta = with lib; { - homepage = "https://autotrace.sourceforge.net/"; + homepage = "https://github.com/autotrace/autotrace"; description = "Utility for converting bitmap into vector graphics"; platforms = platforms.unix; maintainers = with maintainers; [ hodapp ]; license = licenses.gpl2; - knownVulnerabilities = [ - "CVE-2013-1953" - "CVE-2016-7392" - "CVE-2017-9151" - "CVE-2017-9152" - "CVE-2017-9153" - "CVE-2017-9154" - "CVE-2017-9155" - "CVE-2017-9156" - "CVE-2017-9157" - "CVE-2017-9158" - "CVE-2017-9159" - "CVE-2017-9160" - "CVE-2017-9161" - "CVE-2017-9162" - "CVE-2017-9163" - "CVE-2017-9164" - "CVE-2017-9165" - "CVE-2017-9166" - "CVE-2017-9167" - "CVE-2017-9168" - "CVE-2017-9169" - "CVE-2017-9170" - "CVE-2017-9171" - "CVE-2017-9172" - "CVE-2017-9173" - "CVE-2017-9174" - "CVE-2017-9175" - "CVE-2017-9176" - "CVE-2017-9177" - "CVE-2017-9178" - "CVE-2017-9179" - "CVE-2017-9180" - "CVE-2017-9181" - "CVE-2017-9182" - "CVE-2017-9183" - "CVE-2017-9184" - "CVE-2017-9185" - "CVE-2017-9186" - "CVE-2017-9187" - "CVE-2017-9188" - "CVE-2017-9189" - "CVE-2017-9190" - "CVE-2017-9191" - "CVE-2017-9192" - "CVE-2017-9193" - "CVE-2017-9194" - "CVE-2017-9195" - "CVE-2017-9196" - "CVE-2017-9197" - "CVE-2017-9198" - "CVE-2017-9199" - "CVE-2017-9200" - ]; }; } diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index def4bc2e1bb8..e7b257cea438 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -53,14 +53,14 @@ let python = python2.withPackages (pp: [ pp.pygtk ]); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "gimp"; version = "2.10.34"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor finalAttrs.version}/gimp-${finalAttrs.version}.tar.bz2"; sha256 = "hABGQtNRs5ikKTzX/TWSBEqUTwW7UoUO5gaPJHxleqM="; }; @@ -154,10 +154,12 @@ in stdenv.mkDerivation rec { doCheck = true; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DGDK_OSX_BIG_SUR=16"; + env = { + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DGDK_OSX_BIG_SUR=16"; - # Check if librsvg was built with --disable-pixbuf-loader. - PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}"; + # Check if librsvg was built with --disable-pixbuf-loader. + PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}"; + }; preConfigure = '' # The check runs before glib-networking is registered @@ -165,21 +167,23 @@ in stdenv.mkDerivation rec { ''; postFixup = '' - wrapProgram $out/bin/gimp-${lib.versions.majorMinor version} \ + wrapProgram $out/bin/gimp-${lib.versions.majorMinor finalAttrs.version} \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; - passthru = rec { + passthru = { # The declarations for `gimp-with-plugins` wrapper, # used for determining plug-in installation paths - majorVersion = "${lib.versions.major version}.0"; - targetLibDir = "lib/gimp/${majorVersion}"; - targetDataDir = "share/gimp/${majorVersion}"; - targetPluginDir = "${targetLibDir}/plug-ins"; - targetScriptDir = "${targetDataDir}/scripts"; + majorVersion = "${lib.versions.major finalAttrs.version}.0"; + targetLibDir = "lib/gimp/${finalAttrs.passthru.majorVersion}"; + targetDataDir = "share/gimp/${finalAttrs.passthru.majorVersion}"; + targetPluginDir = "${finalAttrs.passthru.targetLibDir}/plug-ins"; + targetScriptDir = "${finalAttrs.passthru.targetDataDir}/scripts"; # probably its a good idea to use the same gtk in plugins ? gtk = gtk2; + + python2Support = withPython; }; meta = with lib; { @@ -190,4 +194,4 @@ in stdenv.mkDerivation rec { platforms = platforms.unix; mainProgram = "gimp"; }; -} +}) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 2077fabc35df..4ef13e7ad312 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -31,26 +31,27 @@ let install -Dt "$pluginDir" "$@" } ''; - - # Override installation paths. - PKG_CONFIG_GIMP_2_0_GIMPLIBDIR = "${placeholder "out"}/${gimp.targetLibDir}"; - PKG_CONFIG_GIMP_2_0_GIMPDATADIR = "${placeholder "out"}/${gimp.targetDataDir}"; } // attrs // { - name = "${gimp.pname}-plugin-${name}"; - buildInputs = [ - gimp - gimp.gtk - glib - ] ++ (attrs.buildInputs or []); + name = "${gimp.pname}-plugin-${name}"; + buildInputs = [ + gimp + gimp.gtk + glib + ] ++ (attrs.buildInputs or []); - nativeBuildInputs = [ - pkg-config - intltool - ] ++ (attrs.nativeBuildInputs or []); - } - ); + nativeBuildInputs = [ + pkg-config + intltool + ] ++ (attrs.nativeBuildInputs or []); + + # Override installation paths. + env = { + PKG_CONFIG_GIMP_2_0_GIMPLIBDIR = "${placeholder "out"}/${gimp.targetLibDir}"; + PKG_CONFIG_GIMP_2_0_GIMPDATADIR = "${placeholder "out"}/${gimp.targetDataDir}"; + } // attrs.env or { }; + }); scriptDerivation = {src, ...}@attrs : pluginDerivation ({ prePhases = "extraLib"; @@ -116,8 +117,13 @@ in url = "https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2"; sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql"; }; - NIX_LDFLAGS = "-lm"; + hardeningDisable = [ "format" ]; + + env = { + NIX_LDFLAGS = "-lm"; + }; + meta = with lib; { description = "The GIMP Animation Package"; homepage = "https://www.gimp.org"; @@ -208,6 +214,10 @@ in rev = "v${version}"; sha256 = "1jwc8bhhm21xhrgw56nzbma6fwg59gc8anlmyns7jdiw83y0zx3j"; }; + + meta = { + broken = !gimp.python2Support; + }; }; texturize = pluginDerivation { @@ -233,15 +243,19 @@ in pname = "wavelet-sharpen"; version = "0.1.2"; - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: interface.o:(.bss+0xe0): multiple definition of `fimg'; plugin.o:(.bss+0x40): first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - NIX_LDFLAGS = "-lm"; src = fetchurl { url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz"; sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw"; }; + + env = { + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: interface.o:(.bss+0xe0): multiple definition of `fimg'; plugin.o:(.bss+0x40): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + NIX_LDFLAGS = "-lm"; + }; + installPhase = "installPlugin src/wavelet-sharpen"; # TODO translations are not copied .. How to do this on nix? }; diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix index 353990ca3a95..5b92093005e0 100644 --- a/pkgs/applications/graphics/gimp/wrapper.nix +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -1,8 +1,9 @@ -{ lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome, plugins ? null}: +{ lib, symlinkJoin, makeWrapper, gimpPlugins, gnome, plugins ? null}: let +inherit (gimpPlugins) gimp; allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues gimpPlugins); -selectedPlugins = lib.filter (pkg: pkg != gimpPlugins.gimp) (if plugins == null then allPlugins else plugins); +selectedPlugins = lib.filter (pkg: pkg != gimp) (if plugins == null then allPlugins else plugins); extraArgs = map (x: x.wrapArgs or "") selectedPlugins; versionBranch = lib.versions.majorMinor gimp.version; diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 611033c5906a..ed8f2bef9e35 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "519"; + version = "520"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-q5pPRMBuB6hqDGuOl0kMyXjMKze5dw+3kdmA2FPJTPU="; + hash = "sha256-y8KfPe3cBBq/iPCG7hNXrZDkOSNi+qSir6rO/65SHkI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix new file mode 100644 index 000000000000..c76e4458fc69 --- /dev/null +++ b/pkgs/applications/graphics/komikku/default.nix @@ -0,0 +1,94 @@ +{ lib +, fetchFromGitLab +, desktop-file-utils +, gettext +, glib +, gobject-introspection +, gtk4 +, libadwaita +, libnotify +, webkitgtk_5_0 +, meson +, ninja +, pkg-config +, python3 +, wrapGAppsHook4 +, nix-update-script +}: + +python3.pkgs.buildPythonApplication rec { + pname = "komikku"; + version = "1.15.0"; + + format = "other"; + + src = fetchFromGitLab { + owner = "valos"; + repo = "Komikku"; + rev = "v${version}"; + hash = "sha256-dmi8a9Gf4ixq5oW6ewDGZYRmxY2qmUrD42DfjskRpHk="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook4 + gettext + glib # for glib-compile-resources + desktop-file-utils + gobject-introspection + ]; + + buildInputs = [ + glib + gtk4 + libadwaita + libnotify + webkitgtk_5_0 + gobject-introspection + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + beautifulsoup4 + brotli + cloudscraper + dateparser + emoji + keyring + lxml + python-magic + natsort + piexif + pillow + pure-protobuf + rarfile + unidecode + ]; + + # Tests require network + doCheck = false; + + # Prevent double wrapping. + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + ) + ''; + + passthru = { + updateScript = nix-update-script { + attrPath = "komikku"; + }; + }; + + meta = with lib; { + description = "Manga reader for GNOME"; + homepage = "https://valos.gitlab.io/Komikku/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ chuangzhu ]; + }; +} diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index 706992e2961d..b283a6d4083f 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -15,8 +15,10 @@ mkDerivationWith python3Packages.buildPythonApplication rec { hash = "sha256-4VC1fwQh9L3c5tgLUaC36p9QHL4dR2vkWc2XlNl0Xzw="; }; - # Disable version check postPatch = '' + # Drop broken version specifier + sed -i '/python_requires/d' setup.py + # Disable version check substituteInPlace raphodo/constants.py \ --replace "disable_version_check = False" "disable_version_check = True" ''; diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index 1dcb3c5802a8..042879d8d518 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -1,9 +1,9 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , alsa-lib , appstream-glib -, clang , cmake , desktop-file-utils , glib @@ -19,34 +19,43 @@ , rustPlatform , shared-mime-info , wrapGAppsHook4 +, AudioUnit }: stdenv.mkDerivation rec { pname = "rnote"; - version = "0.5.16"; + version = "0.5.17"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; - hash = "sha256-blpANUfFam46Vyyc3vaB7vX07CRMtdMZR2n7FOLGgaU="; + hash = "sha256-/crqcp0oCq1f/5hnYfIcuSUzF5GmiAh2lLhQh+IzP4o="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-vVU/OVwtIPRw1Ohe5EIqovhyd4oYOR7CPISz8Zo74r0="; + hash = "sha256-sfsk67zTmVPPtohJcgQ/OoMPeoNTo/zGs3hdA1D9SwM="; }; + patches = [ + # https://github.com/flxzt/rnote/pull/569 + (fetchpatch { + url = "https://github.com/flxzt/rnote/commit/8585b446c08b246f3d55359026415cb3d242d44e.patch"; + hash = "sha256-ePpTQ/3mzZTNjU9P4vTu9CM0vX8+r8b6njuj7hDgFCg="; + }) + ]; + nativeBuildInputs = [ appstream-glib # For appstream-util - clang cmake desktop-file-utils # For update-desktop-database meson ninja pkg-config python3 # For the postinstall script + rustPlatform.bindgenHook rustPlatform.cargoSetupHook rustPlatform.rust.cargo rustPlatform.rust.rustc @@ -57,17 +66,18 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; buildInputs = [ - alsa-lib glib gstreamer gtk4 libadwaita libxml2 poppler + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + ] ++ lib.optionals stdenv.isDarwin [ + AudioUnit ]; - LIBCLANG_PATH = "${clang.cc.lib}/lib"; - postPatch = '' pushd build-aux chmod +x cargo_build.py meson_post_install.py @@ -80,8 +90,8 @@ stdenv.mkDerivation rec { homepage = "https://github.com/flxzt/rnote"; changelog = "https://github.com/flxzt/rnote/releases/tag/${src.rev}"; description = "Simple drawing application to create handwritten notes"; - license = licenses.gpl3Only; + license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda yrd ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix index a3a8c1dcf6cf..258c8b4ce7d6 100644 --- a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreaction"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XQ/GcSjGSe+3d0dJxjmmcBFoDzrmM6zsHMfbDdzmpPs="; + sha256 = "sha256-rJ4EFKk/zlvQqptbL81WdqqZQUR9hYADFkXuw11SzRc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix index 7549ef20b112..4403a2c08d1c 100644 --- a/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corearchiver"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EUcUivUuuUApIC9daS6BFA1YoE4yO3Kc8jG0VIks/Y0="; + sha256 = "sha256-rn0rasFWSjgBIOpKIb35xsEewOfAQOr4kEiA1GhShg0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corefm/default.nix b/pkgs/applications/misc/cubocore-packages/corefm/default.nix index a3314dface43..3d3edae1b179 100644 --- a/pkgs/applications/misc/cubocore-packages/corefm/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corefm/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corefm"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uScM6cVRwYopZ6NY3PSAAyxNNyX3hVnFs6hkAyF29PA="; + sha256 = "sha256-ue0OOBf0PAxYHTfo37RvxnsKxzAEGIiGltXBVZpI6lk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix index f416f21c419a..15cd71ec9e2b 100644 --- a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coregarage"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Jq0lIXfw/1Ixd+QIY7D1ErBCOSKmwkWBupcDxUUEliM="; + sha256 = "sha256-NsCJS+FyHWj2aLXlbzxcHEcdZ2cViZmJlh501/48xdI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix index 7da5ebe081fd..060a5bc4eb98 100644 --- a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corehunt"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zhJadrdOXpl0bXxEPWjQ59Pzjg4MfIZXtYzCnJbh+pI="; + sha256 = "sha256-txQ/uoSwseo0i4/CqdQm3wN9/3p3gioRG9IuJTsgSF4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix index 6078d04be7a7..07035867271b 100644 --- a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreimage"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uG9/8sQK0G3f7O59OHEHqNHP8cUC73hmjsfpOnj0kFM="; + sha256 = "sha256-8ILnZQIErLakiNfGZ91/vY+9XS/eOHcAnIFIuT1x9Mg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix index c5f7e49d4521..bb9e603f06c7 100644 --- a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreinfo"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KoX2U07giVF2xZR1diM6teiNfKYRiqjowTJgnsMlaN0="; + sha256 = "sha256-EWz2FQQzWVeP2qw1pz2Lg3COUo2y7/9a105R1Bj0Aqw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corekeyboard/0001-fix-installPhase.patch b/pkgs/applications/misc/cubocore-packages/corekeyboard/0001-fix-installPhase.patch deleted file mode 100644 index 084a650c610e..000000000000 --- a/pkgs/applications/misc/cubocore-packages/corekeyboard/0001-fix-installPhase.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/corekeyboard/CMakeLists.txt 2022-01-29 14:03:28.149607341 +0700 -+++ b/CMakeLists.txt 2022-01-29 14:04:00.178733700 +0700 -@@ -55,5 +55,4 @@ - - install( TARGETS corekeyboard DESTINATION bin ) - install( FILES org.cubocore.CoreKeyboard.desktop DESTINATION share/applications ) --install( FILES org.cubocore.CoreKeyboard-Tray.desktop DESTINATION /etc/xdg/autostart ) - install( FILES org.cubocore.CoreKeyboard.svg DESTINATION share/icons/hicolor/scalable/apps/ ) diff --git a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix index 5116f80f4cb2..bf065bc2a5c7 100644 --- a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix @@ -2,20 +2,15 @@ mkDerivation rec { pname = "corekeyboard"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yJOcuE6HknDhXCr1qW/NJkerjvBABYntXos0owDDwcw="; + sha256 = "sha256-zOH/w4QroMaVjWnFuWAJQ11RYlpXwIXRG9QYGDkfLVY="; }; - patches = [ - # Remove autostart - ./0001-fix-installPhase.patch - ]; - nativeBuildInputs = [ cmake ninja diff --git a/pkgs/applications/misc/cubocore-packages/corepad/default.nix b/pkgs/applications/misc/cubocore-packages/corepad/default.nix index bdded6e8f1fe..d1856445ab3c 100644 --- a/pkgs/applications/misc/cubocore-packages/corepad/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepad/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corepad"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-19qR08QhWeeXnJAQHe1SJjT0xnQLlbkXlzmd9uiMp14="; + sha256 = "sha256-MZdEdGfCaQp5DuDDYRNXi37O+O/aRS8XgAN0Jma/J3k="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix index 228b0175a7d2..745a9637643d 100644 --- a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corepaint"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uAFV3NKtgNri8GQLD+MRacl9WYMfkMVZcoVML+oSX78="; + sha256 = "sha256-wRF2Z2n9rEixmKYDRqKxQad2JDSxsgfGIWQWpjz/+yU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix index 42f8fd0dd0fd..8bf3a6f8cbbf 100644 --- a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corepdf"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VwJ3H/jNP3u5C+LATPUSftiWm89upx77fN3NqzTnU7Y="; + sha256 = "sha256-Dm3RDVHw1JXSC3HdS0k/IVTO/o5vaWiCr5vPDjr2uFk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corepins/default.nix b/pkgs/applications/misc/cubocore-packages/corepins/default.nix index 7b5ba0ad7a60..c71e64f1623a 100644 --- a/pkgs/applications/misc/cubocore-packages/corepins/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepins/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corepins"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CVToPF8/Tw+n31/A0bzyBbwF7xPBVirsqVOUsM8QtH0="; + sha256 = "sha256-wrP9Jm3T9gzEwEjNH2SXSqwP/+YRxVIyQRSPxdYgPCs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix index e13485619d9a..cdec45c745f6 100644 --- a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corerenamer"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WrMyz8Noq0EeBIxL4mSl6e+8wrivmwfoa1yKBrSgrRI="; + sha256 = "sha256-hjI7KK+/u7OcqyjrZkRtBTfo8obDNqdudlFYcJR0dl8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix index 18d773e904bf..808adcc3d3f0 100644 --- a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreshot"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wEpo/YINtKAYHqlGYytUPh9ndkvQBw3tRIlyjnKJaf8="; + sha256 = "sha256-K/K6630ctWG856igXF1fAukwu6FbsBzF8JxG8K3gICc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corestats/default.nix b/pkgs/applications/misc/cubocore-packages/corestats/default.nix index ac3f7280aa76..b08a7980fe63 100644 --- a/pkgs/applications/misc/cubocore-packages/corestats/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corestats/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corestats"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-154BZIKb6QDrTC4DXh4dbFtN/Lq0ok/qOrqTkXa+rAo="; + sha256 = "sha256-AhM7Rvxh8WZPrpDzhY6DYALVe4VlF9b77oX61AVntI0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix index 04c6d82d4b27..e482ece3d15e 100644 --- a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corestuff"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-snzW6cqxIyiXJLOD5MoEqmzen1aZN4IALESaIWIOMro="; + sha256 = "sha256-F0kddb622W44MDkZOh4YTyFQ+J/UGGbkcrWXCSDYcek="; }; patches = [ diff --git a/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix index 1203706a62e6..7710f2f753ec 100644 --- a/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "coreterminal"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0gxcbfDD43BnkxYWSdViK3hjzfgPGFruwzF4hCxFZ7c="; + sha256 = "sha256-sFNKyqzNrPAGitmR8YEtIf6vtnvAP7+jXk4GFnDeGJs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coretime/default.nix b/pkgs/applications/misc/cubocore-packages/coretime/default.nix index 41fe2698e4eb..844e18b26b7b 100644 --- a/pkgs/applications/misc/cubocore-packages/coretime/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coretime/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coretime"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MIcmgBfgyjEyJxXCq6IbQ/i6IdtL5cWVGpV2YZbzK58="; + sha256 = "sha256-XTX4oeUFwfZE0ey1NjXpAzw0x+4d8IGwU/sEojRwBBY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix index b72008cd43ad..9da76dfa4c00 100644 --- a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix @@ -30,13 +30,13 @@ mkDerivation rec { pname = "coretoppings"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Yq57dY1zIuQN2Gj9haxJMomafL32B+/9v3lWlY9fvcc="; + sha256 = "sha256-3wLDTN3SrbQNs43nQmSBrSB0bD6YineBQ8eNPDws1G8="; }; patches = [ diff --git a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix index 5e72458dad45..a29aa95fdcee 100644 --- a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreuniverse"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KNjXrsm4OfBxida8mcAlKgomcpg0xJg51ZxEdhaiL84="; + sha256 = "sha256-ThEzuwBrPUkXURcW9KiXJs8ExqYWZamlfeQ1IggMWdc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch b/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch index b454abb188bc..3d2238b57788 100644 --- a/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch +++ b/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch @@ -1,29 +1,31 @@ -From 8e6328e932ab2739f075e8e8d602c2370a2a8ce8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= -Date: Wed, 28 Jul 2021 02:26:39 +0300 +From a63a4b6de9ba730e10b54f4b5ce454edb10c7c39 Mon Sep 17 00:00:00 2001 +From: dyrnade +Date: Wed, 1 Feb 2023 22:28:02 +0100 Subject: [PATCH] fix application dirs --- - cprime/systemxdg.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) + cprime/systemxdg.cpp | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cprime/systemxdg.cpp b/cprime/systemxdg.cpp -index f9eee66..ea0553d 100644 +index 4c40d4c..5dbb6ff 100644 --- a/cprime/systemxdg.cpp +++ b/cprime/systemxdg.cpp -@@ -233,8 +233,10 @@ void SystemXdgMime::setApplicationAsDefault( QString appFileName, QString mimety - SystemXdgMime::SystemXdgMime() { +@@ -372,9 +372,10 @@ void SystemXdgMime::setApplicationAsDefault(QString appFileName, QString mimetyp - appsDirs << QDir::home().filePath( ".local/share/applications/" ); + SystemXdgMime::SystemXdgMime() + { +- appsDirs << QDir::home().filePath(".local/share/applications/"); - appsDirs << "/usr/local/share/applications/" << "/usr/share/applications/"; - appsDirs << "/usr/share/applications/kde4/" << "/usr/share/gnome/applications/"; -+ appsDirs << QDir::home().filePath( ".nix-profile/share/applications/" ); ++ appsDirs << QDir::home().filePath(".nix-profile/share/applications/"); + appsDirs << "/run/current-system/sw/share/applications/"; + appsDirs << "/run/current-system/sw/share/applications/kde4/"; + appsDirs << "/run/current-system/sw/share/gnome/applications/"; - }; + } + - DesktopFile SystemXdgMime::xdgDefaultApp( QMimeType mimeType ) { -- -2.32.0 +2.39.0 + diff --git a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix index f100a3a10403..37f95c4ad177 100644 --- a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix +++ b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "libcprime"; - version = "4.3.0"; + version = "4.4.1"; src = fetchFromGitLab { owner = "cubocore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+z5dXKaV2anN6OLMycEz87kDqQScgHHEKwGhDAdHSd4="; + sha256 = "sha256-6kkKmF9mARhSm93ZrWJiwRNmpkiCxyhSD3W7X3gYuu4="; }; patches = [ diff --git a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix index 395a40ddfc66..adba59b9da1e 100644 --- a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix +++ b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "libcsys"; - version = "4.3.0"; + version = "4.4.1"; src = fetchFromGitLab { owner = "cubocore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/iRFppe08+rMQNFjWSyxo3Noy0iNaelg0JAczg/BYBs="; + sha256 = "sha256-IWzgRwouI/0bQBuEd9CV0Ue6cF2HwRw3jMdLyGA1+TY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 970ddf7660be..c59a08c04d4a 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "heimer"; - version = "3.7.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - hash = "sha256-tcA7+3gp/CFpapCL4yt3xG12sm+LcnRIoB/caJlKF8A="; + hash = "sha256-sp3iy28Bc+gOvivHA8OPG8vf7otjeaPk6Iy4BhT/SaU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 3916e97a6962..4f3859e2e22b 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -4,9 +4,9 @@ , curl, writeShellScript, common-updater-scripts }: let - url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.7-5c6fee47/Hubstaff-1.6.7-5c6fee47.sh"; - version = "1.6.7-5c6fee47"; - sha256 = "0i0xlabdi4xhjkfwb6s4bwjnl4k3dj15k7aqjilmq5wb4rhhfpws"; + url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.12-da9418f3/Hubstaff-1.6.12-da9418f3.sh"; + version = "1.6.12-da9418f3"; + sha256 = "1iz81g0r20215z65mj6bfls7h0dp1k5kk8q10fjbdfj82rpwbfws"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 1ea5db2515f0..192b3dd7c73e 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "masterpdfeditor"; - version = "5.8.70"; + version = "5.9.35"; src = fetchurl { url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.x86_64.tar.gz"; - sha256 = "sha256-mheHvHU7Z1jUxFWEEfXv2kVO51t/edTK3xV82iteUXM="; + sha256 = "sha256-c5DYS0PQemZ8Sql2KjnuMspCLDJzU95rsbuIdoxWDM0="; }; nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 31adb54ac71f..45db4d479775 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { pname = "nut"; - version = "2.7.4"; + version = "2.8.0"; src = fetchurl { - url = "https://networkupstools.org/source/2.7/${pname}-${version}.tar.gz"; + url = "https://networkupstools.org/source/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; sha256 = "19r5dm07sfz495ckcgbfy0pasx0zy3faa0q7bih69lsjij8q43lq"; }; diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index bb1c725dff8b..b415d465bb8b 100644 --- a/pkgs/applications/misc/otpclient/default.nix +++ b/pkgs/applications/misc/otpclient/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "otpclient"; - version = "3.1.4"; + version = "3.1.5"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Cz3fxmtpSe7GMGmmSLDG9kDifmIMgCBlBRjX/qardXA="; + sha256 = "sha256-/1nycFh/slcfztfaZA6p9rZTWS4/vkb/Sovc94zlfCI="; }; buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar protobuf protobufc libsecret qrencode libuuid ]; @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/paolostivanin/OTPClient"; license = licenses.gpl3Only; maintainers = with maintainers; [ alexbakker ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix index 2c7aaa18eef7..cf7cec7a69e6 100644 --- a/pkgs/applications/misc/usql/default.nix +++ b/pkgs/applications/misc/usql/default.nix @@ -10,18 +10,18 @@ buildGoModule rec { pname = "usql"; - version = "0.13.10"; + version = "0.13.12"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-epfEw62OXWiJqqvxJ8U9tRy0ZrQkSqa8GL4TluO9Df4="; + hash = "sha256-GJFPKQNrdyrFhXsPsVC629t/rHXZ16A19e8EaSdUOls="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-mOe0rREiqOxwVwVo4S0889cbqVLknVRCW4bSiIh6IdQ="; + vendorHash = "sha256-X58rFQi4YA8nCP02zH1nRi0TFGkQJ7jyCK6p8bfe0fI="; proxyVendor = true; # Exclude broken impala & hive driver diff --git a/pkgs/applications/misc/watchmate/default.nix b/pkgs/applications/misc/watchmate/default.nix index d7d497174342..8053d8bd2a71 100644 --- a/pkgs/applications/misc/watchmate/default.nix +++ b/pkgs/applications/misc/watchmate/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "watchmate"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "azymohliad"; repo = "watchmate"; rev = "v${version}"; - hash = "sha256-UHlHfDFTQapQcETCvtch72DqelfBYMymMD/zODFtr1c="; + hash = "sha256-LwtlI6WCOO24w8seUzyhCp51pfEiCM+iL6lu/J6v4PQ="; }; - cargoHash = "sha256-QYw/am5cMVbRdx/XQ+lZv2Jo9Aiwd2ypUlo854sm7i4="; + cargoHash = "sha256-MD0eWZDpCevBY1Y3Gzgk13qCFtL7QOPDATv8MA+Q5go="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 246cd15af3f8..4cbd9971a1f9 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,1005 +1,1005 @@ { - version = "111.0b8"; + version = "112.0b2"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ach/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ach/firefox-112.0b2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "269dc39cbd876a480c7e5ffba2e2485b0d38bea9acb575a6de7597decf211ae0"; + sha256 = "55396746ee49a401ea7c82d909f800d7eba326e92dc28a910712ea7a35711718"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/af/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/af/firefox-112.0b2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "2d96546d48f3048b6a2ce46e1b4aaede84e6a303d70458983b05dffcd9c08e7b"; + sha256 = "b73bfa68625ec6e1a6d23077a580678dd0fdf319b8366f65c20185dafc1e978f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/an/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/an/firefox-112.0b2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "793a8d77b4addf0ced87d5f15d53c6c1e82ceb95d2c0056ce2c6a98d694751c3"; + sha256 = "f52aa9bd79c3501eff9662ec065f8e26531c5860fdc32a5228fd12f9a1d69917"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ar/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ar/firefox-112.0b2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "fb8624c6bc03bdcc0a30f10e9b81dbdb16cdcb35f89ad6c7485102ba8bdbf513"; + sha256 = "0fd26c0e7122bc2af38d9c812fb5deddd6f8ca85bda625781fd61de685dd9872"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ast/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ast/firefox-112.0b2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "d4509b771d11ea1c896f16d76762dc2c43585650aa1039adb8747095b444857c"; + sha256 = "634f8f5b63f4e5103238b0dff6a5de27b63fa0abce5959cab9f22723eb1e7763"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/az/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/az/firefox-112.0b2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "89444c573fe9854a6f8bfeb700b4e6867b0b4653ce77691b1625ef1a663bc570"; + sha256 = "2b1dea32824f6bf622e1551ef1501eb0fbc29eef1611d78cf0826bf71f75452a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/be/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/be/firefox-112.0b2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "2f66c9a6a4e32a229e18c0a25964b675f360b6f49237e6057a4c95fac345eb44"; + sha256 = "668735893d389b63613cdd6c35847d5e9842d7fd64f2bb79df98f119f0ae2619"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/bg/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/bg/firefox-112.0b2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "6e36ae61a32eeec05f629a996ca66d3b5149da42a1ba7814095f8e49ae368bc2"; + sha256 = "51e874da59d9309c40644ad3d480ad6f50db7c556f5d0873326e65f591e11543"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/bn/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/bn/firefox-112.0b2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "55f9b57bd28300368d346ea23eff96183909a4bf1c7dfca40fa826e82e092d8e"; + sha256 = "60cf87ed845a5b9ec9c25fd0c54422d5df1a220cffa040acdcbab6cac5f90cc9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/br/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/br/firefox-112.0b2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "0d080e978ecb9749d7584c523e09fbe5821a13021c2be0a86100e3b89bc0d020"; + sha256 = "78d9409a97934bdc7fea4f55f19830d02abf8212fb019d1d3b36a1dd6fa86e0f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/bs/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/bs/firefox-112.0b2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "be4f73c95edbef52d0758e4d7a1bd727ce761aa544a8893a25492330982554f8"; + sha256 = "5309007b0605b956cdeb2c4857a2bd475cbdfac1cb2998d081b1931c96415892"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ca-valencia/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ca-valencia/firefox-112.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "8c81f99a4f3c1b2a60e3ab13f16ae99fc86a60dbf866b1626401e84335fe9f75"; + sha256 = "c655f8b4a7cd9501df33aaa0f6dfee6ac0e3cddb91877701eb82b672c62ca70e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ca/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ca/firefox-112.0b2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "1aa57869adfcbfd93abf27dbefec6b804227f2154ab5892b827fd0d68fabe059"; + sha256 = "7ed53427e009b63002a9770fcefabaf16b695d1362587d5e85421285ac9bc128"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/cak/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/cak/firefox-112.0b2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "c657012c8907084eb4ce301e7833fe669e0be96a0f32ee270040c99358c63e62"; + sha256 = "f30f034d6604d0d5fa72f5d85a811316cf2812bcb79bee6022de9bec68506022"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/cs/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/cs/firefox-112.0b2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "a446f29ac2668f2cef6deb6330f193407e1ab250e08c1033fbb1ae775c2c12e4"; + sha256 = "ac00859c967995db0cc79760e248fa566f42c5301c173a0dabb64d719ce7577b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/cy/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/cy/firefox-112.0b2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "dc187d329fff2c6cd84ddb6cf47c047ff41d7ee7d795dc7c9a2523362c3d515e"; + sha256 = "45866ae73478e6e7516b93a23844214e89716542bdcc04e769f7b18d7d3defb6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/da/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/da/firefox-112.0b2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "311da7ac12ad5748f4f301374f6fe474053ed7448d76fd8d0eee0427274b4fc0"; + sha256 = "2f0416215cc403e81c326179a65ab9a2af0e836bfccab1877c00fa997228ffdb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/de/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/de/firefox-112.0b2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "6b1634343ad72f9f917fb2491f7593d7f59eed963c263abbe72cceeee44e01d1"; + sha256 = "4ad318d32e0e26dca381d10becd101afb544a6fadf281ccd3808e5f3ca061904"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/dsb/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/dsb/firefox-112.0b2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "608e1981096855d4b11e035fe2f0520574bf4d6126f0ca695c76ad7e71859fdd"; + sha256 = "0d18ef2b1d134b613dc9851798f5438f82e3a1ec6bdd751fa336a7053ddbc6cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/el/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/el/firefox-112.0b2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "e6e508da92c33e92cbb35c8faeaf0e97a42ea60496e1082b17471c5310f4fc48"; + sha256 = "de0c0315b8e67c608b285a33ea707fb8c86af1317d724dd8a9643ed3847aa726"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/en-CA/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/en-CA/firefox-112.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "74619673bbef29b09055a6ad7f9793f184a752ef08b97bb10872548cfad74385"; + sha256 = "1f5604d2baba29149341d358a49c9bef2a9975901d635bc111fbf3ccc4fb921a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/en-GB/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/en-GB/firefox-112.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "70bd112e0803b92789ef9bbc18dad26444c35788c7f8eb65f8677aa7a9690033"; + sha256 = "67b1eb3be91530e9da75d7a441b6af4a1f9686fafeaf6b7de92add80d2d1071a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/en-US/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/en-US/firefox-112.0b2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "69fd115da6f9262e0ff9c1ffc45575fdbcdfd54d377289d622d0266cbf390ae3"; + sha256 = "8bdf79d6a7acb3f85564ad97fcf5906357b90530e51e7eac09d209475ac56135"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/eo/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/eo/firefox-112.0b2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "d7e31eed1e72f2edfec79e8a10fc7d7f56fcb3c51f99b59ab075cbb06d7a8c67"; + sha256 = "8643d3b2eda5b93e61d2091d77c8abfad6089ed600846ead645ca49720214eb2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/es-AR/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/es-AR/firefox-112.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "1c2493d9aee6a9d82df2fabd29d8fc25032cf7d16480db772d7bae9b50d55267"; + sha256 = "48d60dd690e9e1cceaf8f515b8e51b4f26a213acffa55a8bc324e85740cbcde9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/es-CL/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/es-CL/firefox-112.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "75ec2c9d79fdd9af3a8cdaf2fd644a936cd8bf7338f0a66ec1e2e2812b2b3d69"; + sha256 = "1ed56eeafdc3a7a26004116773c497675fcc30b4f8c3c5e290aca07e66a82391"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/es-ES/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/es-ES/firefox-112.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "5b4d3cd852dbb075c78a0e05a55dcc5a072e6f17111343d4a444a93f738a343c"; + sha256 = "c927fcf15729383de1c40415e0948f4a7fbedccade5eb6583fdca89250c80931"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/es-MX/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/es-MX/firefox-112.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "f3eaf9e6a2288f52f08adaffaef18f3057dc78888da96138b5fca1ec1f82fcf1"; + sha256 = "c1f9be15acbf299f52a1c49712508f140e88134de72261b4c6f7014c5143fd15"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/et/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/et/firefox-112.0b2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "e74d817c9d8c9cfd0fb4b0e6ceb55a9825880323daeb283dff08ec10ac3d03a9"; + sha256 = "6fbd0755b7c32cfada83d6d94adb42a983e8b33bc4610b086256cd4abf913da8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/eu/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/eu/firefox-112.0b2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "58499484b222c68aea2386f62eafbeac6179dae1df5fb60a22d57f63f91e77ea"; + sha256 = "c6111ce30274a888a19a17a00bed3ea323c2d327544a4bf97fba671cf19d66ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/fa/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/fa/firefox-112.0b2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "4685a514ed0f627b58464ab7949e2570fe1f3eb903e21816e384d599728f294f"; + sha256 = "8598a16e1d48fbb6beb3e576741795b56c6cc1ebce5ce143d995607341e581c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ff/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ff/firefox-112.0b2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "ffab5a17ba7a8dc900a7727b380c5cda427c634acac6f5d856da09e6186b555d"; + sha256 = "5efbfc006a2e101a3c650963c9ff1cbd216f66c82c7460ce84f6dbf71745eeb5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/fi/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/fi/firefox-112.0b2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "1d89d921b2dd9644fbb2b600573b4aad3ac832f2da66a3bee44607a53e268008"; + sha256 = "729d21e2d57ab76035f06d0d66b29a387d697c5d0a7ce858c2773fc91a7d5338"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/fr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/fr/firefox-112.0b2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "054ad2f7a95fd0dac604d1e709c736cd6ada53adeae63b8468a2d1dd0e9f60c4"; + sha256 = "35d9f24f0e6d5c907752a08354a6f31eb41da4e3f7a2ca41c05d0ee39432fbf3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/fur/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/fur/firefox-112.0b2.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "a46fc891c9f658b6610d901aefb83f9bd7e5ae19a64b429c1077691bcbca045b"; + sha256 = "7a418568590169aac482da758b3aa36f66bde5bc7d66d92a9af9a90d9a498fda"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/fy-NL/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/fy-NL/firefox-112.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "4f7390dff95dbce0c5b0489602e0659b330c1868ed76c7901ddf5860a4df8ee8"; + sha256 = "66e84d4c9c3cccaa0571bcfa074179ffe2506b09435807e8dfca622cda809fa4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ga-IE/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ga-IE/firefox-112.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "7eb0fe2607754d2f6f2c7ce67b2e9d6a52b61695fd603ab2a9750cedb83be589"; + sha256 = "63ffe4004348fc89fcf9f7356db750c2188c6b70c59b1669f0f00976c8b7ac14"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/gd/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/gd/firefox-112.0b2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "e48ff3117f7b12a5e62431c49a26745ba556e674b09499803966163377f90597"; + sha256 = "7bb88fafdb04958ac90c3452581561ea1de3d628cdf0a5aac12d42e26193d240"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/gl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/gl/firefox-112.0b2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b2a7fa276e1e42a5b2d6f2e9f6b0cf8c4d5a06a11d5961ddf36e4e244e583593"; + sha256 = "3b8a1044208be74ae645f2d7ccb2e097310c1bc0ab9bc99a63ed962404bb3625"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/gn/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/gn/firefox-112.0b2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "4ba54e390d4ca56c5fa247453f5eedb9a76ca5765da53c1c4537eb10f9ed45a3"; + sha256 = "6849e381fd05fcf1a98f2477723165efc1261c3a86e937befd92faa553e618b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/gu-IN/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/gu-IN/firefox-112.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "0fc2f5c3fa0ffc29b290316f68021687e692495d858d66362bd09d7755ca61a0"; + sha256 = "cc60d45f0febacfc656df94c9fefe3bc90fccda3afb8255ec7192fb319a02402"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/he/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/he/firefox-112.0b2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "1d164328ff99d9f052ba9d3efd4cd9c14fd3a665c9e515e3666125363519e7a7"; + sha256 = "b74bd9ee031591edb59a6f19bdf4962dc69c6293c6fe5cc1283edfc017dbcb3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/hi-IN/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/hi-IN/firefox-112.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "ec7e4ca3529624db58e413c9e36bd367ab108f73aa09e20587d7b680e854a95b"; + sha256 = "e799b203ab879a93930d9a357d24a12f8cab342ab59bf84c0184302ce4fdc328"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/hr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/hr/firefox-112.0b2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "6c9f1ddee7ba12c6f075819dc86a36522cf1d58e88d41378d14b6c6fa2a923d2"; + sha256 = "931df65476467ef9f7ba2f93dfccef78abed33bc51959b1a6979377aeed50272"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/hsb/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/hsb/firefox-112.0b2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "007f641d8f3a4348fc53efe404aeeeb018bb8003048826e16bae2107f7f791a8"; + sha256 = "d8aec47e9bf5aedeee2cc377aa6a6aff37d8ab87c95944e0dc2858eac4690d92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/hu/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/hu/firefox-112.0b2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "26449a321dda6ee431207f0c412bd4e7bd65663f43979c1c294627f2cb97c4d1"; + sha256 = "806ffbdd6cdaf50d5bdf7667e94e3b7cc7d6380f9c85d297aa16c08a6a7e31a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/hy-AM/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/hy-AM/firefox-112.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "039254afb85950ab3aafd335328a0dfd0b4b2009aa58d78233853bbaf3156e25"; + sha256 = "d5899fa4fc5275c2768f32dddc24757567660e75d28bdeab98347048066dc76e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ia/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ia/firefox-112.0b2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "249f3b342d8f7399c74a2bfc613af09af0d5e7accc020bc6963e20d0cacd56b7"; + sha256 = "4af2425183d662c94597004d0e2806feb8c3bb6f2f47c0bff0c4af105a159569"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/id/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/id/firefox-112.0b2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "452c2bd007a2759d3bcead151de1da48a744958d60160d35786c04be90917dd7"; + sha256 = "1a6a234d8832c69256da8d779d33e61e1c5439a9b26224b47d7991b6ffac9388"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/is/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/is/firefox-112.0b2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "8e53044f6659e853a4df3f5213320343355548357d519221525a040e0a97dfb6"; + sha256 = "4d1877cf223bb4ff2e316076c8daa5d444e7d29d69792f67023fb3a1a648a4f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/it/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/it/firefox-112.0b2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "0c60fe915d8fee0adc05a432e2985209f2f86bf4972d434e2090249b8b1c8ea4"; + sha256 = "2a62b2dd7afaf0df7e204b407e4fd1aa3cf2b4eb5432b4dc711a5272714f80a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ja/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ja/firefox-112.0b2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "5221ae7ccd0793e4a752deda5363c390c6bd54e54700f7022f6b723f1196f835"; + sha256 = "61467c700234a05e93e8edeb206089b842aa3e4369a04fa0f598e100bd9241db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ka/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ka/firefox-112.0b2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "f762705b947ea334b4e15007c6123a75e28fa416d609955e3c35040737728e45"; + sha256 = "1f99776b2fd66dc0359835f3b6850cc309cef9b3a6e71a5ddc57bd1cd3cc21f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/kab/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/kab/firefox-112.0b2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "e39779eef6d953aa87b6ccd2ab5b71802b5201e9cd333de45388894359bc62de"; + sha256 = "039e07066d2f0d6daf645140d4e76547989ba2317dba1740f871e461513242b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/kk/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/kk/firefox-112.0b2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "eb3b95d9f579bd14e8d6eab765c14ecbfd6a93d4b222f5e4a16708f9bb169662"; + sha256 = "a987b5f450098524ed168ab2456eae80f44f9af62b11a66549ec09385d44db37"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/km/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/km/firefox-112.0b2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "6589fede696924d56ede3590d6af100dd558e7e7ca6f44a55fea37140915f095"; + sha256 = "88e29f0b43f2f4ce1436c0b7037a8f81181d22fc2bb51767af69467626cd8f04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/kn/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/kn/firefox-112.0b2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "6976e3c805dac1409cc6a541b81a057cdc312f15ef3387f1ff9a05d6b529c6e0"; + sha256 = "f3736b3bf2494265969e88c5b9aab181a4db849a5031cd069368619862f6a60d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ko/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ko/firefox-112.0b2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "773e04d3e9e4c818aab45fa5fbfc0baa1edf2e8d3cc0fcedb55ae2bc495b844d"; + sha256 = "dd2b1aec2ca81706b571f071321ebf5ed17406ace002541a1a83241997474e28"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/lij/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/lij/firefox-112.0b2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "a5b9e9eca192461672e1f29d951686c4f606566c6f024f2b8664aff85cc72a2a"; + sha256 = "f14eb0a22303fd690ccde2785a5d97416549def4e3f257ec76b0a2ac02ed52c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/lt/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/lt/firefox-112.0b2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "0b1f166f08d62949c0ba4f72225c8149befc9ba94913bcc54ff2dda687a01c1f"; + sha256 = "183cdf167e94c15904716dffc6eca228260ee0369327f30d500000468a8bf661"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/lv/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/lv/firefox-112.0b2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "82aac072c7299281c1d0133616c6e0c3f5c03df72e892e48731ac19b11f04e24"; + sha256 = "d44dee85e3872fbb693b493d27d7e3710a8a833abaa355f856a18ea66aacf815"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/mk/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/mk/firefox-112.0b2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "fd31c8f26fec85b85c09370b91e71e8ad577984d4e77d965f528388101a645c8"; + sha256 = "64e84176db80cba34e4e50762b4760184f4526dc82e2eba91335d95b6b7f3731"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/mr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/mr/firefox-112.0b2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "6fc6484f7163d9aa5b29b10fb1c9e4f5c865c38d481414383e62a688db0ab981"; + sha256 = "9f668f8005135354ae1c8f46d2d81e651ee3d7f4427af6837a1e18597d2e84c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ms/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ms/firefox-112.0b2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "e56aa4c8bbd75bfa303aeee791a7f54df47ca45a90c40828a11de28261fc12d5"; + sha256 = "3518682aa9aa1013a4148d465a39211c77d83deb95a33647e5f8421586f747df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/my/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/my/firefox-112.0b2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "e59ed8962cd267eacadd8c273c109b05b2c7d8abd89ebbf9c0505ac598330847"; + sha256 = "3a67b0b9c75f19057fb9a9b01e6fe82f95a9d2db6440ae8ef912ef8e7e340722"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/nb-NO/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/nb-NO/firefox-112.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "e07856e116d21f71221fe6d09baa9de7b39c393466ab397e83e05a6072ed53cd"; + sha256 = "e552c61e6b6989359ff9c3ccaf1356cb454f47ae37d93504d74b6638a5a0e93a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ne-NP/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ne-NP/firefox-112.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "5eb1a0b5aa86304bda9b135354798c4bf273a542bfafdae58493b861fe9bf1ba"; + sha256 = "511eca660eb81a5b588fd74f41a45087209ed46ca84889bdb2810f046a199218"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/nl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/nl/firefox-112.0b2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "827c5e383d8bcb6c8351e94b62d28d98837bf22e5c0ab7b20f0ee7c3fd7df7fd"; + sha256 = "8aac8ebde87b78016f6b387fcc89c13868cf6e22e2ce0019a9360ef39f869963"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/nn-NO/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/nn-NO/firefox-112.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "4e33cbedb9ec4294bc3c590d50f050f955a95973ac2a888bf7246482d8ef38c0"; + sha256 = "23a51c27dc4b3e445ab96248ec8d837a84f7bcec813f3c7152d3ca9a0aaefe1e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/oc/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/oc/firefox-112.0b2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "aaf09e1bc3021619edba3b86d0599360705cf8282202d19d68b3945772906f86"; + sha256 = "db42d7c58e2258af28eef21264775c01821f35502971ee1ae0a55a9e86ed3abe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/pa-IN/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/pa-IN/firefox-112.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "388ca99b77bad8b85256ef8c94f42d5e94eb1e541e696b5616e871dc0380c857"; + sha256 = "c8a33f5837b14f526583c490d69cfa2c22570ecf86707d2a4d8dccfedcfe2263"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/pl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/pl/firefox-112.0b2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "7f9254889e2e26295dfd878fc5a1296a535ad12bc97832c652c611289c1fdf94"; + sha256 = "27d144f7981c2f24ee8593ba7dd9d4e14148caa6b3c410f5330362b80e6b166c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/pt-BR/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/pt-BR/firefox-112.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "ea983344e14e43e57761de7ff86622c370353be8b9098cc65789f015ffa08302"; + sha256 = "39101266685e7d5189c14be4d8074556703da991aec3c54bd9706b7c40f8c0a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/pt-PT/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/pt-PT/firefox-112.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "1ceab92a1c89cf6c281da104736bdb07245c6b493640bbb0d289d3304b8f76f0"; + sha256 = "f5ef13f286e8576b9173dc01fde64661b3bdadc931649e0222e5823b13226330"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/rm/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/rm/firefox-112.0b2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "c01a0ffee6bd39435cc49856c112df51c3ef10c3aec1f916980bd09e2ac3ba28"; + sha256 = "c931759b0427b575f8bac8cf5b4b5885c6b87a12d4d352bb250c564e8dd8ac70"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ro/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ro/firefox-112.0b2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "64a0065aa656ff81b9d4354d325becbc46344a767eaace692ce6c662d591c26c"; + sha256 = "8ac650b0ff186988a0d6f4d57f25bd10f7c7bca64de51255ede8fda5650cf951"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ru/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ru/firefox-112.0b2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "143591dd532ea1250decb6d36296075e575746293f554498a51a86c82515e354"; + sha256 = "d87fee506fd1cddc271ebe57d6ffded155527bb8d0e13e5d1b09bc0b3f9a9934"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sc/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/sc/firefox-112.0b2.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "b77079edc573f00a2e1fd840a18a9d8a1b275f0adc9e2d56d35c8963b9433000"; + sha256 = "e3823b4d874db0db6d204d73221d808d4be165cc7123701f2070f835888121a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sco/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/sco/firefox-112.0b2.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "28f71392241f5f7871cf10e40d4eaf951615666e8780e79f560f7997748e7cc0"; + sha256 = "3c96b18a9cd9335ca260bdf63081c6045caadc832a299d446ce3e4c9650983ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/si/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/si/firefox-112.0b2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "9e968c177b199b5bb6dc196c591b64aef4b8c3f801f203cc3e41f77234d4e218"; + sha256 = "479b46f22f1cf1d23491a736f0fa4ff5912ccf06c369ad7d4d0bc07859aec05f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sk/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/sk/firefox-112.0b2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "0e58438f597a87218d9d50f44b60d397f807f11179b8f854ca9387705ec6ccc9"; + sha256 = "6c64b98d54474ec6baef932e9ecfcd3cb573e7d6c1392c6804dcc2f53e3afe38"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/sl/firefox-112.0b2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "b66743d01ef65d1fc3be41741c9458350062df8167dea418bb8e3d7ff3c9e510"; + sha256 = "10e1f08f4749baea435fd86757bab0803e91d06a6a861266edfa3cb31bf9d933"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/son/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/son/firefox-112.0b2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "106a68c050abf166fcbe6b0e8aa96b6c3f75c4165bb467fb628f0b9ed0284c96"; + sha256 = "36c7cbcd1484dfeaec8a705f88361907a20c445158d369f8d3cfcab7c62ce3f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sq/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/sq/firefox-112.0b2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "bd712df03192b43cd45202673f34dbfcc4a28d6299d0a0a5c7a4ceaab06eac27"; + sha256 = "8546e98da2258e93cec5f0e8644e9527ef350752f5b5c00bbe2c1cfd1714ea35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/sr/firefox-112.0b2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "32b4563a2a1a595d95299eee00731614e9ec117675b8a0063cd2fe37c5d3cc22"; + sha256 = "882a878e500fd9263beeaa798d39f961d9c5d2eeaa4d888e21ab1ee1af40d4c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sv-SE/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/sv-SE/firefox-112.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "17767bd33ca9f86236b909ec58116bfaa61b3440afa698e4fc9ae3fac89de0f1"; + sha256 = "e3abe18d5c611f9cbbd01d412548ce105e5adae46f1d91c07d0e0b2a9c0b5ea8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/szl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/szl/firefox-112.0b2.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "af69ccf3e497a9c3c5e36f9b808f21c7c6a81b2f8e5fdbb5187d53d2e880976f"; + sha256 = "8922c6f901b721b9a04a7e312f7ed2f5356b7d242f1eea46e56e451a6d857704"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ta/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ta/firefox-112.0b2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "ff8b14add93bc4395e8be6fa8f6630d8a7a2183a64a038a8e152ce30dea73ebf"; + sha256 = "ded7f0b62950c98976dbdf3aae278a9ce276c4af426348584d6ffc64ffb21af9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/te/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/te/firefox-112.0b2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "b9db822d4afc8d72cade1e03b396db1bfa96bc00caa66fc93be70f8509e0768c"; + sha256 = "3cfe5876e38f2e27116c7b6d967307075bf29785b62c8c654b82e10b20ff90b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/th/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/th/firefox-112.0b2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "67ce391735971500b8b6739282fefb781cb9a67140e8d508d65715d2e613d792"; + sha256 = "481bbc770777e74f89f9be8e9754ca09ffddf7d27b57fbb69f51a7abb961988e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/tl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/tl/firefox-112.0b2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "aea24e2cadbfd9cbae87a21b5ff8a24c8a8fdde1f79b2b44637a779eccd2ecfb"; + sha256 = "c6b8955e9e3dfab1df30dbeacaebe6996db8396233744066b097230bd25b255e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/tr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/tr/firefox-112.0b2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "d4960566c8b33b4c8fe2b7c50d6af9e5bba2cfc2e3ef6dd0c3e96b36a85d4a0e"; + sha256 = "5a9b5ac4883f21123e538b90ca46240e7049b431aa3600e7482258b6004e7860"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/trs/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/trs/firefox-112.0b2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "fcedca9235e77dd06a53afe0ffcec131a49fc99ca0fe5edefe9d31287cfcb5da"; + sha256 = "f3783058be21631d7171655374bab478e774a177933f303625680715abffd35d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/uk/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/uk/firefox-112.0b2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "b5b041aee3b4c4f205e8ef59d22f6284112b18a273fbc2432d2ba3f440b71b95"; + sha256 = "b299304e04b028725b9c9d5717f452bcc401704273afe52287e77e6174263de1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ur/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ur/firefox-112.0b2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "192ea167b65a86b9834982d017b9100865fab79cc0cbc174df137d7c1d4a213e"; + sha256 = "8133e3d5d0ee4bbc0bfc0a318888fae6550fc991f538c0840631862c5d813ea8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/uz/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/uz/firefox-112.0b2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "f6abb675ed43c2a6b346b8700603fea938482e2492d4241ec63620b19ad6f93e"; + sha256 = "a31eff2ff348d6912cfcdd61a8affcb6df273d0f8bf4d335a30a27f4831d9694"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/vi/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/vi/firefox-112.0b2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "17a48c248e13751476e83be211ab94643311d62051ca7b32cdff942623a9a301"; + sha256 = "4d8b37a549c8563237bb05858fc461ec37f51430502e66d0339d9c05b2e39829"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/xh/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/xh/firefox-112.0b2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "a60b7f5c90c043c9c2540527dcd689d08e693a8348d1c2c1241e1f63e66472fc"; + sha256 = "41d26832882ecf6d27b60179eade9d3dc8cfe1caf3d05f6d9b427e44e3483a7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/zh-CN/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/zh-CN/firefox-112.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "13684be7d69c332457e7c1f97072869ed87900744ccfa5dd9c9b198716c3b4b2"; + sha256 = "2d3e6f2e8a1c6ec8ba9e6d1b8533b5509abe57f00f191b4dfee4a794196a8057"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/zh-TW/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/zh-TW/firefox-112.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "eda9bc5547a095dbdfda0554a07970d75c5b8b4a421c5c79bf7ff06ce44245ed"; + sha256 = "9567f87bfe116e7d87a74a4cfb9a62ff9f7b5836660aabbae4b19b35ac501b32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ach/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ach/firefox-112.0b2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "cf0f925a584c5317b420d36bc79f8cde96d59f6996b65a200908f43990a12914"; + sha256 = "86fc72753eda740d36a7d266a40baf1478a7f2f44215ac3b8d933819bf833253"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/af/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/af/firefox-112.0b2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "18be90927891a5c05ceec6572004dd0a6f1a0859c6e01b476473908f91212f5e"; + sha256 = "d1e3d273ae8deb2c08cc063cc0b190419429b2c4d31f766d01f287f3687da194"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/an/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/an/firefox-112.0b2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "5f63450e0539fddcc1038610be1ba0cc6b2be4662fd9eb6719fdc5d4c31c6c68"; + sha256 = "0424e520e5a607486a0b0ca49b990a246885438db5792e5ae73bcc818814d271"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ar/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ar/firefox-112.0b2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "f636c78f6658e83adc5610b4c27c75bd3673a60ad107a9844a8618eb097766ad"; + sha256 = "426e28278444abedc3c89b9a9bd5f3e8bd780604c60fc6aa6d2e3f870f2455e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ast/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ast/firefox-112.0b2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "67f4263d9f41b46403ef98bf13b0be52b25b495cb3b65ea215e987178af717f5"; + sha256 = "2fc2fa7d00da97e396dd0131280bd5998bc602fac0d958b35e48ba6717140e9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/az/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/az/firefox-112.0b2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "0992a93710781628687b5869338b6cbe76a1c8341f76057bed213eed08c2eb5d"; + sha256 = "1a1920482d20fe5eb103f6196213ad1420af52abb06a936a56d63d42437b1be5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/be/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/be/firefox-112.0b2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "6e3b6835ad6d71af0f7b9945f26cb3bdeae35143297f56850bdae17ede9e87df"; + sha256 = "b468fa07d58a4df4084826567895b7686736e248021f01d0b81e73018c8f793c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/bg/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/bg/firefox-112.0b2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "acb71ef9be3016e639db77aaa0c7ad74e47797d88ad42bdaecdda7f63bca0b42"; + sha256 = "3a69a522c7984a774e58560188b78530f50cec56510d3f3bddc07e76d17d4116"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/bn/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/bn/firefox-112.0b2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "184dba37d13b8b59c9398644ecd674af2284054803f1d576e0949a6b865a0f30"; + sha256 = "2ec4fad1bab1ca7141c4a77d30ff0295be3862fbab5d601e57204e01787f9d0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/br/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/br/firefox-112.0b2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "1c08acbea74425df40948691c2212631fdfe6e0c2eae32db0c695623ab0cb88d"; + sha256 = "7f0952a7c568e2729846f9adc7efd5a68f589dd5a5ca33e085048572b16e0862"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/bs/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/bs/firefox-112.0b2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "52d15fa6ac4bcdbd7e2eaed2ca782ca35392ead5481f5b2388b3d6e7f98874b2"; + sha256 = "0fab3a39d619f1c618df1da23c7bf38402c14d27c2270a7bad355c2e4153dd62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ca-valencia/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ca-valencia/firefox-112.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "59ea849914caf82346401f0831add849c7db0812a8cc737fc3d927d82223ea96"; + sha256 = "b0ce82c7d514798fddce87c7b511636738618d849395797298d692e3c80f194a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ca/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ca/firefox-112.0b2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "79393e803a125b2026d8ac4a7ca39e4ea08792c4337046241578684960746665"; + sha256 = "3f65999a6d05aa92ca2e7c6ee0f2b5d998ca024b02de219330dfd8d55e3975ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/cak/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/cak/firefox-112.0b2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "ad08d645469f71030af139985de3c2fec86d98a2d212e31a24975e899cf5a9ff"; + sha256 = "34b9ea098d35a8b3e851ed21ff40883f9e4599401312a03b2340ed6c5b078c0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/cs/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/cs/firefox-112.0b2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "9096779a6ebfe0c3f95afce66e6dc8c27fe8a5380ae95d1f252a70f6571ece46"; + sha256 = "b1641da89fcc3228ed20ed498480c7fa038c8f71952379ccba06e8fb12909f6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/cy/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/cy/firefox-112.0b2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "f2c98d60f624a4bb19482516abb0734f6066600cd4883c0a5ba8fd2e05018bc3"; + sha256 = "504f7a2da4c55da4e8f23f3720957c4c4aef2c5928b828eb1d755add0e2ac662"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/da/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/da/firefox-112.0b2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "0e26278a6b4c7ba649842256cbebcc8130513f9dc76d5f878f9610ba59801df1"; + sha256 = "98d0809c79b84c38a0f3abb9f0f671b1ef9a39af98e81119cfddd57f5896a420"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/de/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/de/firefox-112.0b2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "33c184d7f74dcdc7004206bb4db1810c8d96b8b64adeb9f5b9d312922b3100ce"; + sha256 = "168f86a353e3c957d8f06456c0d812d77594650eee1f9ecb11abde4b3b233c40"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/dsb/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/dsb/firefox-112.0b2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "46833d7749b4eaa54c2cebee5d62a4ae473f55a136617c57db60c2c3da264e47"; + sha256 = "c8b55f26695561256477ba1cae2a96834b4ec5b4cd1335e15354d60bb87f50ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/el/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/el/firefox-112.0b2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "20754336bc44e34cb8619d77fb4843068ea2eb8c2c9516060af650a17ebec943"; + sha256 = "f421644ddd383dcd5ddeda769e089100e9fcd411fbd905de3586bc65aa6472e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/en-CA/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/en-CA/firefox-112.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a1843a6aee18f2b996a2cadf5a07994138b9a721e9bfe8790b168021bd77724f"; + sha256 = "43ce0669004841271ad56df70bb40737566528fdd76039cf068b9fb0fc5077ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/en-GB/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/en-GB/firefox-112.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "8db377519662f9d2cc9a55f493105ec184c157dbb2426fb86a1f3b109cca213c"; + sha256 = "5dadea5f50c87add40108d844dd3a9dca7848371e0d23e64a2a012339769b671"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/en-US/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/en-US/firefox-112.0b2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "7ff7a066239aea60634796291196b083bc2d5eb855bfb4e9d7beaa24f6f8d262"; + sha256 = "fd9070fca4f57b1fcd89bcbcd99af77baceb3a1cf9f6b913ba872b6a6bef7981"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/eo/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/eo/firefox-112.0b2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "3326717180afc0580b20f36a2a94e375baa72194f459f09c01f72266c51fb4fe"; + sha256 = "2a3fa752b56c66a1c263c895e67b7024dfe3a096faaf0d02d579340b85bb3997"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/es-AR/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/es-AR/firefox-112.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "f8fadc3a9a8406e4b408c80900ecfdf0e982217ec9f8c0347f0882698c5a11b7"; + sha256 = "09f714d25a3bbec50acbf1c034331c1d874708efe5a9e2b6d950e62190983bf8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/es-CL/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/es-CL/firefox-112.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "8ab2d5752ccc1e33620650f76bdde525f078fcb2b30769641a639de3fe90b6b0"; + sha256 = "b13ca7876f86848c299631e0748038beab882a79d3d73eccbbe12270ec2e168d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/es-ES/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/es-ES/firefox-112.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "547994faad72d930850d7fe824ad734f6ddebeaed9b27d9f60324ed472b8a11c"; + sha256 = "11c4e97e67a10d83d5449ff5997086e5f5841be8967e906165e3e0d73c3b4361"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/es-MX/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/es-MX/firefox-112.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "d23ad96f1a70355e4a710e751f7d1222b5abb630e8e28136cb455c4ffbef998c"; + sha256 = "5d816f8ae4d9bc9832cd504942c8149edd6c9b74c5c2e0badde60650405f0449"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/et/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/et/firefox-112.0b2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "f8d8bac8b2fc2f5267f53f2bf7b83b92bc64d58cbd53f718c49ed8da5c7318a4"; + sha256 = "552ab594c7bfeba7349be8e41893384270aefc1ecf2494211ea545de1cefa31b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/eu/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/eu/firefox-112.0b2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "587ad4225cfca77855961d170c1cee0680459b115793f4dd123ba38767abce92"; + sha256 = "f6ffda74095133401b9e46c106d576b7bed246496f36735832e8b61ed19e900e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/fa/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/fa/firefox-112.0b2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "6d54ea2900492a74f4de0720d8b6630b21708ccb0460654a7ed6fb0defd34cf1"; + sha256 = "e6e180e29d549c567258e92f8473058ff93c0f06387ca8e01110860d70533ed6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ff/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ff/firefox-112.0b2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "2309289fe4450928b37cdab4070aaf555b2f707018bdd0af1879763dc495fa02"; + sha256 = "68ceb489b4644c248318497e03ae30a6bb001c3b04acd0c6090fa5c254ffd210"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/fi/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/fi/firefox-112.0b2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "614c2710d7498d8527c467e344ff4475e1e6741376166ada64c320335f9db7ed"; + sha256 = "4ce32db7753ffa71a3fdf0f53f5e40dec079aa4ef853b0feb106ef61d77a542d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/fr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/fr/firefox-112.0b2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "3384f827b4d4abf8955a277706ce0de2a2f3307580d42534b7183e861b86310e"; + sha256 = "05bc65ed25e706c8986399e8b63de60bb0ffc083597076026c765f730a0eeca0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/fur/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/fur/firefox-112.0b2.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "f9c8c5b61f23182cad2f028903b921d7d0b106324278c9b9e7057ce35bd592f2"; + sha256 = "53f110d7eabae149501169be92f6440a4fb6eb78117c9f4af85706392d79e28b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/fy-NL/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/fy-NL/firefox-112.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "3a6ca2363b6eb2a240c53e13bef7a8feabce2e9450d15cbd99d0267406af4853"; + sha256 = "e000e7bcf9895be56486ad6b4c38add84a5040a03e521971ccecea26f3a3be96"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ga-IE/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ga-IE/firefox-112.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "5f8d2a9234dbff2c7c3b416bdaad877a945346d6ecd3faad98f25643cdb32e64"; + sha256 = "c8521aa00842e685ab031a73550515e78c270816c6c2c315b7262c8dc607f3e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/gd/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/gd/firefox-112.0b2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "7f30aec3a02c3f092810482e3d90ddf93aa7304988a75d8391eaebabaf474bee"; + sha256 = "19e8b5db0f621f278cfdf4c455b69ed3dd185f06a5e26a8221495288e39faa2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/gl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/gl/firefox-112.0b2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "df750038ae58b9ad47db756ed5e009c3d633e9444f48b9d1b2ba0e9de5784318"; + sha256 = "6b00b50cbdbac600bb052c26cf3c8f58f39ac9dab4c1a6216f30ab551593a825"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/gn/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/gn/firefox-112.0b2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "325d66bf2399ebc62c95f263b20a2c294b396ebac31de454d94d31f32ee6f6fe"; + sha256 = "954b4c072c73b536c6983ef255c714dd68faeaa024618ee50c8945185d290935"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/gu-IN/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/gu-IN/firefox-112.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "1f2b583782ceaa153cb52ce0a787c51541131f771682cca2753dfe3d96cb92a1"; + sha256 = "90c07f61193d579227d3a29d366ed1478a16c1896554fc987f43624fc5f09f36"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/he/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/he/firefox-112.0b2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "aa5f1242cdad391c66bd799977c4512e494333f20ca66db180089c5916fdac6d"; + sha256 = "a5dda773b34679a43984ce90c7cf09b21d7b6ce113fc77693f4620a4fc2d7caf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/hi-IN/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/hi-IN/firefox-112.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "9e3ec577fd89ed029a05170a707ad20b650282fc646a39ebff63f858a2f259b6"; + sha256 = "547b62ecc5fcea06bef7d9ae8289049c923a17a8f93d9ac13dbc44a1052a9ac2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/hr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/hr/firefox-112.0b2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "119e846be03a97aaaccd846b9dfcc4ffd9b74db6065ddb9e20c9755c455d3d10"; + sha256 = "49eb4f4f4adfdc140dc78e931c161cdcc81665105c65b42c8c42a35c80a30f24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/hsb/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/hsb/firefox-112.0b2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "efa3e76e979f1dbb01fb04254de7a307c78770acdeabdd8dcad3d042177ac72e"; + sha256 = "8c15c32c8ef5b44efd66948a8f0c9cfcaafecddea8ab0d5a1d3af7f7cdda60c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/hu/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/hu/firefox-112.0b2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "44b163479d1c4cd7aba090433dd212a71ef17502484f9476036f0feaff471fb8"; + sha256 = "a376b005b88e238d72862597462127dd8a1086c072ca133190ecd5ffa31cccf8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/hy-AM/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/hy-AM/firefox-112.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "a2ff925d483f13b08aadd94444dc01836b1efd66be4989ee643f347933cfec01"; + sha256 = "8b8959d88b066a29c0fbdce3674a613840d8b6ee691f7e7633e44a05ad0f455e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ia/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ia/firefox-112.0b2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "84a2b7f5ba2713cfb0d208c8727c52c51d55a9f3fac879a069c523b3529b67d8"; + sha256 = "ef61b675d573ae28886f99cf8dded130049b7211abaeedafd9ed1cd7b6caeefe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/id/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/id/firefox-112.0b2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "aef00fda24e748c845acf9357e84c2136c399cf6b859227dca8a4775ad8bed83"; + sha256 = "4cad3aadf08bde466e269538bb86126ba24bbc84434ea846148124dcf8aaedab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/is/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/is/firefox-112.0b2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "34dbed0bfd8dc823247746938b81d76f7679d99da8e133927c477ec62ab31b50"; + sha256 = "138d0488679d1404a9008726c14285f84b21923b55fbc0acb13bbaa5bbb4a07c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/it/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/it/firefox-112.0b2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "47a2e1c02cc85cac00c97342c8f4ef329c2925ca7b7427b20b426a440d4f3dd0"; + sha256 = "e9a48a0143ad94b8d896379d90e8cb6345eb9f83013c0a5af8a65a8a82785e26"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ja/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ja/firefox-112.0b2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "9dbc7e2a054d9d0a4579a52ec0755d5e9e18a80a5a8ab14f10ff799d2a0c9e8b"; + sha256 = "9308c18b92d0632044b08b8f379ddc844027c3164e3e7ec0a2334881ddc91bdb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ka/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ka/firefox-112.0b2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "5bd5aaa044b2a2873d6174ceabac557a8592f9b79e76afaab22e3f7a9bd03486"; + sha256 = "dff35b11c31c2b88408124ac9bb18dbfacd8ed995757fb1d029c6093cbb0f876"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/kab/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/kab/firefox-112.0b2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "b476b0141126a7bd877fede45f3e3b5d6cc3011b5fcdd4386ab7122a5d7b086c"; + sha256 = "8754269b4a19381c8d937549753bc28da50b2a983e50c30ee892d59a577b8466"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/kk/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/kk/firefox-112.0b2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "b66cdf440275d4799e71d34a07fef436dd12eff18f51448b4f2f02020dcc6ceb"; + sha256 = "ee6c23c675616aa7914eae572c459ac0d24414e2a8eeccb02c9e1beb7d723a8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/km/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/km/firefox-112.0b2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "fa7bdf3c2da92f7a6636bfa24658ab355edee1631f579f3ecfa9cf8cd8ce3de7"; + sha256 = "2b5e981a9e4f6c9bf35446c40c7089d050a26e667e1c09de663a1e42561fcb4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/kn/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/kn/firefox-112.0b2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "4dbbd458324f85b8a7eab2db3f14db21fbdcf13f6e1149e8c11b9101f6518ffb"; + sha256 = "329b868009d91299f6e6986480833088ae3772499760df05c593e09af7cd2372"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ko/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ko/firefox-112.0b2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "3f26be2ade71d4bae842918ab87db1603703aae22f868cdc0e803b6066644986"; + sha256 = "86e1b61b8ea6a684fedd564a7a77306f86a528a1063ecadacbcb6472969c73c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/lij/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/lij/firefox-112.0b2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "be1f40281f13d8381bd2d3c33f4cfff9d6a7e2bf7e759ed9a03b2928aa71b0ed"; + sha256 = "e26f1d2c2907b689e9c3b8e1eec263c6af0ec4a45b6e5a49c60bd9c4106043fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/lt/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/lt/firefox-112.0b2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "e09be22cd422296513b6139640e33e9288abd82361f0d7c4951eb40786f4dbf6"; + sha256 = "3611dd950e4e075fd6cfe93cf1971b58b2646338e496f0c1a6c5ce1fe53d75a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/lv/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/lv/firefox-112.0b2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "3233d65c85aa14f48e98fa013a96a65ec690e85518519dcef64e2af1700e708f"; + sha256 = "3d7297474479195d1f6f7b84bd10ab5e3d90d5f5f125428f90030e9d872ec13b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/mk/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/mk/firefox-112.0b2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "d5521848f261eafcba30c2b7270b2265cd6cecb2bc0a072c2cb4659f34e19bf3"; + sha256 = "abfc67f3309176423b9bc7940ea9051cfe8d9bc37f8479dfae6aa34973c35ed9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/mr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/mr/firefox-112.0b2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "a87019f3b1870f6d4a074c26505a271c5820e43bfb9741b63903fd8b1a33ef8b"; + sha256 = "7f6cf8f198258974f8eb7dfd8cca9863ce257ef45c9a8d9bc8e47a0a69ad29e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ms/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ms/firefox-112.0b2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "245f864d137c8ca72015f342c747d7e67c49de94893e58fb010d1bb3244993b5"; + sha256 = "a2ee5ace0a082f8044311d8f19be2c85e0a9240c0c0b0fb41de360cbfb089d6b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/my/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/my/firefox-112.0b2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "4b6a71cec55eb771e61f7e083954cc0423c38efc4e04f2352cd64ff7b208d0d2"; + sha256 = "594a0a72f9e73ae1e0e3457ffd5c0ca9a538cad5b449653ed01bc134a0d9f486"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/nb-NO/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/nb-NO/firefox-112.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "a92cfb32046d6f246e1ab1acbc7d4fc1ddca12c93638b11ffffeb7522cc4bebc"; + sha256 = "231b5da2221c1b7578c9207be5a66611e4b9a87997a6a9c2eec77ef335875176"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ne-NP/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ne-NP/firefox-112.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "b7cb0ee3f8dd4e1b8b5550444a9c3cee50a64c622febe9e545f6aec463286630"; + sha256 = "fde2520f5560db603f30283fc896a17f6aa60ea1e5b8f2254fb6cc9feb62d850"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/nl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/nl/firefox-112.0b2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "eaf0f00ba24966d15aaaedff25d572891e9c4762b046b8349cdf02aefe2e3a79"; + sha256 = "2ca2eb4aaccd6a79f4e777a68bf583103f22b97e9dc2dd6dcd8e566bceccfa05"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/nn-NO/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/nn-NO/firefox-112.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "fa744ec3cfff9346070094ef055641cf7704cea2cd1acb728ec940c9157fdb7d"; + sha256 = "a1385b042ec255f9891ffda4e0ebb99bfd44449a091d3aeaed1443004fee8df9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/oc/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/oc/firefox-112.0b2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "8097c48bec46e426b22e0bdce252b0ea67c173a6ab3612e66735a4d8392a997c"; + sha256 = "6cc029e84d57cedf5c605117ad1cb8fae390b725810707bcce58c4832f9f0712"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/pa-IN/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/pa-IN/firefox-112.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "911ecca7d29a5d6ad6371fc2785238a3ed4a99481b752924fc6b48e37779c0e7"; + sha256 = "6ee37768a1724bf68b4f4031f03c2a2307fb9c16d34094d476b1ff14ceac4b7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/pl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/pl/firefox-112.0b2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "541b825482e5446e020529a09d29c25b8742953315fc30f074c5ce2dc575a419"; + sha256 = "444ce2cdc080c1a61a4c2c4ad007b84dd803bd7f89e44b768af3a90d089dcdcb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/pt-BR/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/pt-BR/firefox-112.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "7d5a22eb6eb9317c278dedbc016d25a882462a094c0f3e4006594930925bb39a"; + sha256 = "c1aa3fa50b5283c5ce19f65e38c919fd98a6a75990ea04b4ac6efa2633e77c4a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/pt-PT/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/pt-PT/firefox-112.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "ccd5a185c8da07def1ed7fab0b4ed4279f8b8b73e9135073bfe6a7a928722410"; + sha256 = "a8e057612f8d1851afe3909f65a2c834ad14a3163c2378e75710ce31582fa4ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/rm/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/rm/firefox-112.0b2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "7cffec4453563a4eaf94f5f53422dabf1b4087470bd5cc5d25cca2781ef46f44"; + sha256 = "2fae5f8a4cfe624b0839bb5041f39f9069968e415fee2a2194a915b944e11223"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ro/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ro/firefox-112.0b2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "00cb10d57f563da7cf7272a4c169446e29f956d7dda8d877c7088d35c167e31d"; + sha256 = "4b613170a3804636921d98192be0274c4003862a9abe73db90b3af1f8aaaf119"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ru/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ru/firefox-112.0b2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "18fb8e71fe1b9d76ca51da60346c54c4c0b92b0e95b855871fbb5fcf89e1195d"; + sha256 = "4d98bf5c649863726a6aac51be8b6302ec488bf733182eeba68f613f262ac272"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sc/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/sc/firefox-112.0b2.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "488614b08b8850028e14dead6cbfd69bb680475e3ef08cc09954d201cf614c1d"; + sha256 = "dd681b2f31c328195041dd9fe317d24b1dbccff854c1216d4ca6da416dfbf666"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sco/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/sco/firefox-112.0b2.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "a4bd6d0bac1396ebc9f233468d4c258bd1700fb25c9af473a8b040d1ca3876f9"; + sha256 = "1f0ad138c378639fabbf8e743a17d185eca531642cb12581027274e5c9ca08b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/si/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/si/firefox-112.0b2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "7ef48eb84c4a667ae3faac898e112fa595c1db561a3dfe9116a843b07b8779fe"; + sha256 = "ab295cbd4d3ba4dd4dacf54410f343773f0b77d626b8f6fd60bbff037f6c990e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sk/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/sk/firefox-112.0b2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "08660dbb36d937a42a0f9d223db550dcb916cf538c9adf4fdea8e72b12b586dc"; + sha256 = "0d15d109730e3344042eaf2e8889af553b1d5b5c19bfcfd7a7792f445fc85d79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/sl/firefox-112.0b2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "d31009f1e1e506772db2b43b64ee66e91d6f069d9c423645847c5e67212b2798"; + sha256 = "9d76acd56e898fcd44345c5494b5e955cd45424d6decc2ed6760d0fb2e005b2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/son/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/son/firefox-112.0b2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "f6768a336fe0bb6a8ac92633238cde92fae73e58338379ad27be8f6ab07a93e5"; + sha256 = "c54714ea09a58a9a74f42bd790ecf132a9d47a616b9a8919dec637a1d44aac7f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sq/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/sq/firefox-112.0b2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "aa1a1fa5d64c611bc53bab303ca463949f1e0e2d5d8b3ff7ba9b33ac7b0d9c0d"; + sha256 = "63f9e4e802ed33dccf69776ec9943166ede4bc776544844d9ec2353b52a25cfc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/sr/firefox-112.0b2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "a185a54d5f29b4d6f2d34a530b498fd3a67636b068279a01427f6f0c29bd221b"; + sha256 = "619add5c2769b48ee10b3b41bd417526b2bf33917e9b5842c0505b76a63f2b04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sv-SE/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/sv-SE/firefox-112.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "401677189e0c0a2c17f433aa4574cf92075ff7e4f028eb6a1a9092e1dd30a5cc"; + sha256 = "7016af55f36b24571a40d220a4052dc452f1e5db95a3f6afbca59cdb06f0d6d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/szl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/szl/firefox-112.0b2.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "c0039e65a43f59f9495c7a2022d4982849a0ea6fc611b25d348c02ed3dd7d671"; + sha256 = "d1e04b8430fa4fd5539461526197615b29d3c5502acba6ab1cc73b608872e25e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ta/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ta/firefox-112.0b2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "bfce50f6e107d4a49d0349e1ef8234c4b7bb67d6f135f8dddb5512364464e6a7"; + sha256 = "de14f539f653a6b6591914e9a5c28ba2aa15a2c785a1523e245b45cb4538d958"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/te/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/te/firefox-112.0b2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "aacb23547b2a20b4ca5b548694ab3e265ea18ff5fe77d7d77dd00298e73fd801"; + sha256 = "ad76c68b3d42f153a3be66e9c7136144e80d8d9b5a708f038eed2c9e79012fce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/th/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/th/firefox-112.0b2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "f87db79ce94e8e964b3ff3a89efd0d53e4a5753854778845f9548aa7d41ffba1"; + sha256 = "afc74679a4459a83bdc4eef2233c10d7e73ebd224c82fc7a92e3091daa571fd8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/tl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/tl/firefox-112.0b2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "e7e786a25afb44e53c52b19ac545ee455ff505cef4393fe698057df6d5fbff3b"; + sha256 = "f934e3c405586e6bf7afa1e0f7c0eadb2d80934c1053042b6860776e1d6ddc99"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/tr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/tr/firefox-112.0b2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "426ee6932fca23e26a4cc6943adacd798c74406c47fd71a023c2f2ef503855fe"; + sha256 = "208757d985bc26286f5110e7f7f792eaeaae0c66e787549a20abbed223b46256"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/trs/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/trs/firefox-112.0b2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "47ed2f1510095a6a9120f3962f8ae817c5cc2e6431c6b80583fd64e7650593fd"; + sha256 = "6e905c7fbdc204acba757ac6e8edbb64b167dbb96983946281474c1a4b1860f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/uk/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/uk/firefox-112.0b2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "14dc9e8d8301d7ca3a5af0f61d4a2db35c29cad07d083e272aa947454fa47d4b"; + sha256 = "bd560a5e68b99505e4ed22f7dad5fa092d50fdeb6fcdae8cae79482f063a0717"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ur/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ur/firefox-112.0b2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "f02797ca77be238488ca7511d940307d8946b1ceeb31f3ed46e242e2a46fda2a"; + sha256 = "2fef7230abb9d3c8a7316d1845ddeb18448964e18dd3e2d42fbe97a0fd0b0914"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/uz/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/uz/firefox-112.0b2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "05f8d37542245f10bcd6cae6aaea5e171d6ead2c2ae3ee1dfdf663a47a127ee9"; + sha256 = "e41b97e5330293e90ac8144201c57f8c0790498974dcac76f6619fca2ecc894e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/vi/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/vi/firefox-112.0b2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "6f254c3ac71ec2eac74c907b89064f72840cabe1555a827a4941aec060edfbcb"; + sha256 = "96058e17e04669bc6be5bd2a51397a6507c724409f05165157b9f8d8a0624c15"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/xh/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/xh/firefox-112.0b2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "262b3d430b34a3da6020e1d1ae60414049347f0869e8cde4273601da0d55c258"; + sha256 = "819d77f589915cd2d8b93ef56c1925749cb9adb031ee79f1e9ba5d3bacd67645"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/zh-CN/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/zh-CN/firefox-112.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "2db8e3c9f6438576ed774b76b962650cb7f037c97b07f4d1e18f03ab02d1b017"; + sha256 = "92e05721680fcafa7fe089574af964876510d5263ef8dbfeebb608aa0b172002"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/zh-TW/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/zh-TW/firefox-112.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "4d0eff7854d49607316218489212f7a61bbf7b95118140fea8f44a72431f576c"; + sha256 = "008962e0e26fcbdce8306ae9e55a858539a09f653b284d9d3361ae44b6de4aeb"; } ]; } diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 601d80717921..fcc635f075b6 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.15.4"; + version = "1.15.5"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${finalAttrs.version}"; - hash = "sha256-l69h0+yMX4vzQ1GYB1AqhZc1ztMKF/7PthxEDarizek="; + hash = "sha256-TP9Q80QKSkpOOQ7mllnaE1dOnNPU7k3Ij6M3+n8Jv2E="; }; nativeBuildInputs = [ cmake pkg-config zip ]; diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index 474a27238f20..ec177fe85562 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.0.27"; + version = "0.0.28"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yC0J6uXL0W00o0BGIrrZ9WjThSgIu5fEgQdyH2vZESs="; + sha256 = "sha256-uIWlOVZIqwOSvFWRIWKTFEp0aToIBo1htUXb3F+njyI="; }; - vendorHash = "sha256-QGzaKtku7fm14ijmE68nqgqoX86IgmEsemlQltZECI0="; + vendorHash = "sha256-CVBpBb8yYkc6/yLPsCPbVhBHecqZ03WE0NcKiH8SGYs="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index 0fefba4f5d3d..19017383a5f1 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.19.5"; + version = "0.20.1"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-giCFea4uZNztWxQhsYSdh2KtFE0uU0hf/lhGnY9OsIE="; + sha256 = "sha256-y69pxIKGRLL+XUI6iJm+CP5WgMw5BZwWKBiBWAUQsw8="; }; - vendorHash = "sha256-i8MpQsqD1SBf+qPwYTFDTYDE4mvLdpKUoKML+u1027U="; + vendorHash = "sha256-376PGm8VQ9B7/YYYqJyRZoMwAmaHYqEerBW5PV9Z8nY="; subPackages = [ "cmd/kubeseal" ]; diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 2896c9e7b117..e9d948f61b19 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -53,7 +53,7 @@ buildGoModule rec { changelog = "https://github.com/containerd/nerdctl/releases/tag/v${version}"; description = "A Docker-compatible CLI for containerd"; license = licenses.asl20; - maintainers = with maintainers; [ jk ]; + maintainers = with maintainers; [ jk developer-guy ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 9fac7083b6fc..e3ce152f3dca 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -110,13 +110,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-dOcsD5yJrn+zpX5F0ImIqD9d+iC228Wem/668RtsQNY=", + "hash": "sha256-j+hKWMHnIE6nmRdGHaQxLybeljmheZ7t83NSXVWViZI=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v4.58.0", + "rev": "v4.59.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-nNQmiPBkIuQSBGDujMZI+dZMwv6xQcd8+nc1cMKrJws=" + "vendorHash": "sha256-TGzTElOmYW6XO4EtMD9MWvdvd1opnFSAVcEA2eYCQdk=" }, "azuread": { "hash": "sha256-MGCGfocs16qmJnvMRRD7TRHnPkS17h+oNUkMARAQhLs=", @@ -128,11 +128,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-XcqBkb+de+ikNtrDe33OZHhhv6ed2pXhbXXb7L661RI=", + "hash": "sha256-Sv9e48+2rV3t9dmg6COWfrxnfMaxS9xJAPN1sEPen60=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.47.0", + "rev": "v3.48.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -155,11 +155,11 @@ "vendorHash": null }, "bigip": { - "hash": "sha256-nlk3ckrLNtPQ9s8uQ2jvARinPVF+A2T0IUY2rBcUFDk=", + "hash": "sha256-XnCwJxMuLysle4+UioJ/1e+FFZ39PkaEkdGGOePMo5s=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.16.2", + "rev": "v1.17.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -182,14 +182,14 @@ "vendorHash": "sha256-IiP1LvAX8fknB56gJoI75kGGkRIIoSfpmPkoTxujVDU=" }, "buildkite": { - "hash": "sha256-BpQpMAecpknI8b1q6XuZPty8I/AUTAwQWm5Y28XJ+G4=", + "hash": "sha256-H9kVHGnIzOHViTAuJnLJqcxDjSRXVqyKBAFfOd8fkHo=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "proxyVendor": true, "repo": "terraform-provider-buildkite", - "rev": "v0.11.0", + "rev": "v0.11.1", "spdx": "MIT", - "vendorHash": "sha256-j56iEtoyKzB8oIMptJDbXCKXOC1L5v1+cpwWU1+uARE=" + "vendorHash": "sha256-C7bm9wDNEO7fJuqssUxQ4t9poVkPkKd8MU7S9MJTOW4=" }, "checkly": { "hash": "sha256-LhqdFNTc0RdKmivHI6CnBPmtMW8Sml+5MT8ZjNA4rLY=", @@ -382,11 +382,11 @@ "vendorHash": "sha256-E1gzdES/YVxQq2J47E2zosvud2C/ViBeQ8+RfNHMBAg=" }, "fastly": { - "hash": "sha256-XvDsL2N/S7DE+9ks8Y6ZY3hcogzUsiF7VymNK7NnmaI=", + "hash": "sha256-60WydEYr/U1oDVq2YI5W86ivbLw/MRztOOQbTqbDQSg=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v4.0.0", + "rev": "v4.1.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -765,13 +765,13 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-p+RsuBthW5ohY1PC7Z/PNyLjpif/blQuonCRm+R0uTc=", + "hash": "sha256-1COn48CDGvRnM4M7tWZd5XxEW0vdeFmpOMEhi3sI2to=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.16.1", + "rev": "v3.17.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-yF2yk85RLbvmULakODOV2V0Z9dzKfLClUSZTnECdO3o=" + "vendorHash": "sha256-QL9uEO89PwU8UFbLWCytXpzgrVeXKmaPmFm844ABAvI=" }, "nomad": { "hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=", @@ -1027,13 +1027,13 @@ "vendorHash": null }, "snowflake": { - "hash": "sha256-MMWObJRS7FKvOfor2j0QywRMRbGsE5QcyDGbY2CXjo4=", + "hash": "sha256-kkkpXIpioLHBbJCv7t6b17e3Coj4GoYORZaVp14K4nw=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.58.0", + "rev": "v0.58.2", "spdx": "MIT", - "vendorHash": "sha256-yFk5ap28JluaKkUPfePBuRUEg6/Ma5MrRkmWK6iAGNg=" + "vendorHash": "sha256-vxJGQkrbGITool/45JpBqdqrlSeP3xeWMkSLmFh4K+s=" }, "sops": { "hash": "sha256-D1Yzs8hDimMP9y8ZRbizEhic3vGtLcZjOVSuSMUAqPk=", diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 5350fadb3f64..215e3a781866 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -168,9 +168,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.4.1"; - hash = "sha256-Tj9j3WGfP851Q7RctW+8Xmz9NbQLE3/QKYHBGvLe1/s="; - vendorHash = "sha256-xAVgyn8MqwLvY85+neQ8jQYkl/j0RY4fG6qBbiMmIOc="; + version = "1.4.2"; + hash = "sha256-0CxB9VOrRoudJVK96mpuQ6etsI+F2dMh4NQTKQXec9c="; + vendorHash = "sha256-3ZQcWatJlQ6NVoPL/7cKQO6+YCSM3Ld77iLEQK3jBDE="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 4edf146b3332..2612aef79d1d 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -34,6 +34,7 @@ python3Packages.buildPythonApplication rec { beautifulsoup4 click colorama + commonmark feedparser guessit html5lib diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index b1c29d0b6180..92164bc068d4 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.24"; + "version" = "1.11.25"; "hashes" = { - "desktopSrcHash" = "eAcJwoifIg0yCcYyeueVOL6CeGVMwmHpbr58MOUpK9I="; - "desktopYarnHash" = "175ln40xp4djzc9wrx2vfg6did4rxy7nyxm6vs95pcbpv1i84g97"; - "webSrcHash" = "45xyfflTGA9LQxKi2WghYdDN0+R4ntjIPONnm+CJ5Dk="; - "webYarnHash" = "1rwlx73chgq7x4zki9w4y3br8ypvk37vi6agqhk2dvq6y4znr93y"; + "desktopSrcHash" = "Fd9I/tYp0ArXo73zfA85JZxZ0MvmVFkgEUi56e19zNA="; + "desktopYarnHash" = "0zlh75f2k1yd9mc9zq2lrm53n91npl771ds79n3m04nbihn23xzy"; + "webSrcHash" = "AYZJMGO53usAH2MiS5BeKt1en3XRncE/zUqkd3gWPx8="; + "webYarnHash" = "0kkyqgyc8k8rih024r72iagbj66f5x3h6b3c1cij474sk7ab2x1c"; }; } diff --git a/pkgs/applications/networking/instant-messengers/ferdium/default.nix b/pkgs/applications/networking/instant-messengers/ferdium/default.nix index 871cc33542f4..813e1973e551 100644 --- a/pkgs/applications/networking/instant-messengers/ferdium/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdium/default.nix @@ -3,10 +3,10 @@ mkFranzDerivation rec { pname = "ferdium"; name = "Ferdium"; - version = "6.2.0"; + version = "6.2.4"; src = fetchurl { url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-amd64.deb"; - sha256 = "sha256-lb3dvEaKgOnT5+YAJcYmro71soqkT/jpTjE0YMVMRUA="; + sha256 = "sha256-iat0d06IhupMVYfK8Ot14gBY+5rHO4e/lVYqbX9ucIo="; }; extraBuildInputs = [ xorg.libxshmfence ]; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 9fda9d0ec485..be06dbf386ba 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,12 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.9.0"; - hash = "sha256-VgEGFt8LvVpIWiqFyYiTXUavYY0YmnJ+CxrNhPP0hCg="; + version = "6.10.1"; + hash = "sha256-uWwRgP9iYirZU9x3QtS5lRGI7vLOOtX4B4fgVuYxkho="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.10.0-beta.1"; - hash = "sha256-A8jpYDWiCCBadRDzmNVxzucKPomgXlqdyeGiYp+1Byo="; + version = "6.11.0-beta.2"; + hash = "sha256-tw8VsPC0shKIN13ICD0PVKhKxA7rdj16r2lP2UEJGsY="; }; } diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index 51a127446d92..705f1ffe66b0 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -4,29 +4,30 @@ , makeWrapper , makeDesktopItem , copyDesktopItems -, fixup_yarn_lock , yarn , nodejs , fetchYarnDeps +, fixup_yarn_lock , electron , libpulseaudio , pipewire +, alsa-utils }: stdenv.mkDerivation rec { pname = "teams-for-linux"; - version = "1.0.45"; + version = "1.0.53"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Q6DFegFrLUW/YiRyYJI4ITVVyMC5IkazlzhdR8203cY="; + sha256 = "sha256-zigcOshtRQuQxJBXPWVmTjj5+4AorR5WW8lHVInUKFg="; }; offlineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; - sha256 = "sha256-jaAieO5q+tNfWN7Rp6ueasl45cfp9W1QxPdqIeCnVkE="; + yarnLock = "${src}/yarn.lock"; + sha256 = "sha256-3zjmVIPQ+F2jPQ2xkAv5hQUjr8k5jIHTsa73J+IMayw="; }; nativeBuildInputs = [ yarn fixup_yarn_lock nodejs copyDesktopItems makeWrapper ]; @@ -47,7 +48,7 @@ stdenv.mkDerivation rec { runHook preBuild yarn --offline electron-builder \ - --dir --linux ${if stdenv.hostPlatform.isAarch64 then "--arm64" else "--x64"} \ + --dir ${if stdenv.isDarwin then "--macos" else "--linux"} ${if stdenv.hostPlatform.isAarch64 then "--arm64" else "--x64"} \ -c.electronDist=${electron}/lib/electron \ -c.electronVersion=${electron.version} @@ -58,7 +59,7 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/share/{applications,teams-for-linux} - cp dist/linux-${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked/resources/app.asar $out/share/teams-for-linux/ + cp dist/${if stdenv.isDarwin then "darwin-" else "linux-"}${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked/resources/app.asar $out/share/teams-for-linux/ pushd build/icons for image in *png; do @@ -67,8 +68,12 @@ stdenv.mkDerivation rec { done popd + # Linux needs 'aplay' for notification sounds, 'libpulse' for meeting sound, and 'libpipewire' for screen sharing makeWrapper '${electron}/bin/electron' "$out/bin/teams-for-linux" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio pipewire ]} \ + ${lib.optionalString stdenv.isLinux '' + --prefix PATH : ${lib.makeBinPath [ alsa-utils ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio pipewire ]} \ + ''} \ --add-flags "$out/share/teams-for-linux/app.asar" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" @@ -88,7 +93,8 @@ stdenv.mkDerivation rec { description = "Unofficial Microsoft Teams client for Linux"; homepage = "https://github.com/IsmaelMartinez/teams-for-linux"; license = licenses.gpl3Only; - maintainers = with maintainers; [ muscaln ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + maintainers = with maintainers; [ muscaln lilyinstarlight ]; + platforms = platforms.unix; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/networking/instant-messengers/webcord/default.nix b/pkgs/applications/networking/instant-messengers/webcord/default.nix index d03205720312..188158e70b6d 100644 --- a/pkgs/applications/networking/instant-messengers/webcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/webcord/default.nix @@ -2,7 +2,7 @@ , python3, pipewire, libpulseaudio, xdg-utils, electron_22, makeDesktopItem }: buildNpmPackage rec { - name = "webcord"; + pname = "webcord"; version = "4.1.1"; src = fetchFromGitHub { @@ -24,10 +24,6 @@ buildNpmPackage rec { libpulseaudio ]; - binPath = lib.makeBinPath [ - xdg-utils - ]; - # npm install will error when electron tries to download its binary # we don't need it anyways since we wrap the program with our nixpkgs electron ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -49,9 +45,10 @@ buildNpmPackage rec { install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png + # Add xdg-utils to path via suffix, per PR #181171 makeWrapper '${electron_22}/bin/electron' $out/bin/webcord \ --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \ - --prefix PATH : "${binPath}" \ + --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" \ --add-flags $out/lib/node_modules/webcord/ diff --git a/pkgs/applications/networking/irc/irccloud/default.nix b/pkgs/applications/networking/irc/irccloud/default.nix index 93ab9f828f64..d6b7af7c0a86 100644 --- a/pkgs/applications/networking/irc/irccloud/default.nix +++ b/pkgs/applications/networking/irc/irccloud/default.nix @@ -2,12 +2,12 @@ let pname = "irccloud"; - version = "0.13.0"; + version = "0.16.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/irccloud/irccloud-desktop/releases/download/v${version}/IRCCloud-${version}-linux-x86_64.AppImage"; - sha256 = "0ff69m5jav2c90918avsr5wvik2gds3klij3dzhkb352fgrd1s0l"; + sha256 = "sha256-/hMPvYdnVB1XjKgU2v47HnVvW4+uC3rhRjbucqin4iI="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/pkgs/applications/networking/mailreaders/electron-mail/default.nix index 3cce58258a8a..20f3597b1517 100644 --- a/pkgs/applications/networking/mailreaders/electron-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/electron-mail/default.nix @@ -2,12 +2,12 @@ let pname = "electron-mail"; - version = "5.1.2"; + version = "5.1.6"; name = "ElectronMail-${version}"; src = fetchurl { url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; - sha256 = "sha256-PLDzAtH7T7QMrLavvcF3zOVTayCqEA1IghIUAAxkbEE="; + sha256 = "sha256-lsXVsx7U43czWFWxAgwTUYTnUXSL4KPFnXLzUklieAo="; }; appimageContents = appimageTools.extract { inherit name src; }; diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix deleted file mode 100644 index ed88546129fb..000000000000 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, glib, zlib, dbus, dbus-glib, gtk2, gdk-pixbuf, cairo, pango }: - -stdenv.mkDerivation rec { - pname = "tixati"; - version = "2.89"; - - src = fetchurl { - url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "sha256-fd7DMKoRxNmNjCxl2ViINjnCEXJrhJU4aaRT+NoB1vI="; - }; - - installPhase = '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${lib.makeLibraryPath [ glib zlib dbus dbus-glib gtk2 gdk-pixbuf cairo pango ]} \ - tixati - install -D tixati $out/bin/tixati - install -D tixati.desktop $out/share/applications/tixati.desktop - install -D tixati.png $out/share/icons/tixati.png - ''; - - dontStrip = true; - - meta = with lib; { - description = "Torrent client"; - homepage = "http://www.tixati.com"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/applications/office/kitsas/default.nix b/pkgs/applications/office/kitsas/default.nix index bcac1b916fa2..3fd6dd82db90 100644 --- a/pkgs/applications/office/kitsas/default.nix +++ b/pkgs/applications/office/kitsas/default.nix @@ -2,17 +2,19 @@ stdenv.mkDerivation rec { pname = "kitsas"; - version = "3.2.1"; + version = "4.0.3"; src = fetchFromGitHub { owner = "artoh"; repo = "kitupiikki"; rev = "v${version}"; - sha256 = "sha256-1gp6CMoDTAp6ORnuk5wos67zygmE9s2pXwvwcR+Hwgg="; + hash = "sha256-7s21++sA4enZFuDVUEAbn7InpyLx6BOwrFdsUzHWK0M="; }; - # QList::swapItemsAt was introduced in Qt 5.13 - patches = lib.optional (lib.versionOlder qtbase.version "5.13") ./qt-512.patch; + postPatch = '' + substituteInPlace kitsas/kitsas.pro \ + --replace "LIBS += -L/usr/local/opt/poppler-qt5/lib -lpoppler-qt6" "LIBS += -lpoppler-qt5" + ''; nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; @@ -26,10 +28,10 @@ stdenv.mkDerivation rec { qmakeFlags = [ "../kitsas/kitsas.pro" ]; - installPhase = if stdenv.isDarwin then '' + installPhase = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv kitsas.app $out/Applications - '' else '' + '' + lib.optionalString (!stdenv.isDarwin) '' install -Dm755 kitsas -t $out/bin install -Dm644 ../kitsas.svg -t $out/share/icons/hicolor/scalable/apps install -Dm644 ../kitsas.png -t $out/share/icons/hicolor/256x256/apps diff --git a/pkgs/applications/office/kitsas/qt-512.patch b/pkgs/applications/office/kitsas/qt-512.patch deleted file mode 100644 index b225b933104c..000000000000 --- a/pkgs/applications/office/kitsas/qt-512.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git i/kitsas/apuri/siirtoapuri.cpp w/kitsas/apuri/siirtoapuri.cpp -index 9a2c51f3..9565200f 100644 ---- i/kitsas/apuri/siirtoapuri.cpp -+++ w/kitsas/apuri/siirtoapuri.cpp -@@ -25,6 +25,7 @@ - #include "db/tositetyyppimodel.h" - #include "tiliote/tiliotekirjaaja.h" - -+#include - #include - - SiirtoApuri::SiirtoApuri(QWidget *parent, Tosite *tosite) : -@@ -361,8 +362,9 @@ void SiirtoApuri::laskunmaksu() - TositeVienti eka = lista.at(0).toMap(); - tosite()->asetaPvm(eka.pvm()); - tosite()->asetaOtsikko( eka.selite() ); -- if( eka.kreditEuro() ) -- lista.swapItemsAt(0,1); -+ if( eka.kreditEuro() ) { -+ qSwap(lista.begin()[0], lista.begin()[1]); -+ } - tosite()->viennit()->asetaViennit(lista); - reset(); - diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index e602e6e5af7f..54d28ba0d6f0 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.61.3"; + version = "0.61.4"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-OtFHTZQ+K3CQPEcuirvp8MmW9IC5lEpg42A6FSZVTTA="; + hash = "sha256-VXna2ofhh8Hcyfp9+ekXHs68xcXF7HdcJNagJlzPV6c="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index e038749f44ed..de6c807b385f 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -5,12 +5,12 @@ }: let - version = "4.8.0"; + version = "5.7.8"; pname = "timeular"; src = fetchurl { url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - sha256 = "sha256:0y2asw3jf2n4c7y0yr669jfqw4frp5nzzv3lffimfdr78gihma66"; + sha256 = "sha256-gIYo91ITpFtYdYGek4bXaOowMSILXZ4fJYNKeZDhk+Y="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/science/biology/subread/default.nix b/pkgs/applications/science/biology/subread/default.nix index 9206c4fbed7b..d083e202a9ff 100644 --- a/pkgs/applications/science/biology/subread/default.nix +++ b/pkgs/applications/science/biology/subread/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "subread"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "mirror://sourceforge/subread/subread-${version}/subread-${version}-source.tar.gz"; - sha256 = "sha256-Vs7zovkU1DJxMGnVwoL0iDHDoezIlDKtVYDKoyKl9Ws="; + sha256 = "sha256-xUs37YOzQxjY8Rm1wC+50KZcgRGVvMnhdF322vdMots="; }; buildInputs = [ diff --git a/pkgs/applications/science/chemistry/openmolcas/MKL-MPICH.patch b/pkgs/applications/science/chemistry/openmolcas/MKL-MPICH.patch deleted file mode 100644 index c1bc211a68e4..000000000000 --- a/pkgs/applications/science/chemistry/openmolcas/MKL-MPICH.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 276ae4e..5e56176 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1304,9 +1304,9 @@ if (LINALG STREQUAL "MKL") - endif () - else () - if (ADDRMODE EQUAL 64) -- set (libpath "${MKLROOT}/lib/intel64") -+ set (libpath "${MKLROOT}/lib") - elseif (ADDRMODE EQUAL 32) -- set (libpath "${MKLROOT}/lib/ia32") -+ set (libpath "${MKLROOT}/lib") - endif () - endif () - set (MKL_LIBRARY_PATH ${libpath} CACHE PATH "location of MKL libraries." FORCE) -@@ -1380,7 +1380,7 @@ if (LINALG STREQUAL "MKL") - find_library (LIBMKL_BLACS NAMES "mkl_blacs_intelmpi_ilp64" - PATHS ${MKL_LIBRARY_PATH} NO_DEFAULT_PATH) - elseif (MPI_IMPLEMENTATION STREQUAL "mpich") -- find_library (LIBMKL_BLACS NAMES "mkl_blacs_ilp64" -+ find_library (LIBMKL_BLACS NAMES "mkl_blacs_intelmpi_ilp64" - PATHS ${MKL_LIBRARY_PATH} NO_DEFAULT_PATH) - endif () diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index f1df2a486c42..9acb2019d1f2 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -15,21 +15,19 @@ let in stdenv.mkDerivation { pname = "openmolcas"; - version = "22.10"; + version = "23.02"; src = fetchFromGitLab { owner = "Molcas"; repo = "OpenMolcas"; # The tag keeps moving, fix a hash instead - rev = "aedb15be52d6dee285dd3e10e9d05f44e4ca969a"; # 2022-10-22 - sha256 = "sha256-7d2wBIEg/r5bPZXlngTIZxYdMN0UIop7TA+WFZmzCo8="; + rev = "03265f62cd98b985712b063aea88313f984a8857"; # 2023-02-11 + sha256 = "sha256-Kj2RDJq8PEvKclLrSYIOdl6g6lcRsTNZCjwxGOs3joY="; }; patches = [ # Required to handle openblas multiple outputs ./openblasPath.patch - # Required for MKL builds - ./MKL-MPICH.patch ]; postPatch = '' diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index e610297a9020..67c7f6fb4a61 100644 --- a/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -12,18 +12,25 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ qmake intltool pkg-config wrapQtAppsHook ]; - buildInputs = [ libqalculate qtbase qttools qtsvg qtwayland ]; + buildInputs = [ libqalculate qtbase qttools qtsvg ] + ++ lib.optionals stdenv.isLinux [ qtwayland ]; postPatch = '' substituteInPlace qalculate-qt.pro\ --replace "LRELEASE" "${qttools.dev}/bin/lrelease" ''; + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv $out/bin/qalculate-qt.app $out/Applications + makeWrapper $out/{Applications/qalculate-qt.app/Contents/MacOS,bin}/qalculate-qt + ''; + meta = with lib; { description = "The ultimate desktop calculator"; homepage = "http://qalculate.github.io"; maintainers = with maintainers; [ _4825764518 ]; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/networking/sumo/default.nix b/pkgs/applications/science/networking/sumo/default.nix index 92f64fbfb916..6fda53161dd3 100644 --- a/pkgs/applications/science/networking/sumo/default.nix +++ b/pkgs/applications/science/networking/sumo/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "sumo"; - version = "1.9.2"; + version = "1.15.0"; src = fetchFromGitHub { owner = "eclipse"; repo = "sumo"; rev = "v${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0zpd331vy1kfi4hfiszv3m8wl4m0wdfr3zzza200kkaakw5hjxhs"; + sha256 = "sha256-Mm8Kqb5W9h2jYvRGypI6v5IHDm4CnAeT+NcJybdU5K0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/version-management/git-dive/default.nix b/pkgs/applications/version-management/git-dive/default.nix index 3c3cb8be7014..78963ec05e95 100644 --- a/pkgs/applications/version-management/git-dive/default.nix +++ b/pkgs/applications/version-management/git-dive/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "git-dive"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "gitext-rs"; repo = "git-dive"; rev = "v${version}"; - hash = "sha256-zq594j/X74qzRSjbkd2lup/WqZXpTOecUYRVQGqpXug="; + hash = "sha256-nl6JEVOU5eDntPOItYCooBi3zx2ceyRLtelr97uYiOY="; }; - cargoHash = "sha256-f3hiAVno5BuPgqP1y9XtVQ/TJcnqwUnEOqaU/tTljTQ="; + cargoHash = "sha256-johUvl2hPlgn+2wgFJUR6/pR7lx1NzE4ralcjhVqkik="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 0fa8486e15b0..a8a552ec0b8e 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -2,6 +2,7 @@ , lib , stdenv , fetchFromGitHub +, fetchpatch , addOpenGLRunpath , docutils , meson @@ -93,6 +94,15 @@ in stdenv.mkDerivation (self: { sha256 = "sha256-CoYTX9hgxLo72YdMoa0sEywg4kybHbFsypHk1rCM6tM="; }; + patches = [ + (fetchpatch { + # fixes EDL error on youtube DASH streams https://github.com/mpv-player/mpv/issues/11392 + # to be removed on next release + url = "https://github.com/mpv-player/mpv/commit/94c189dae76ba280d9883b16346c3dfb9720687e.patch"; + sha256 = "sha256-GeAltLAwkOKk82YfXYSrkNEX08uPauh7+kVbBGPWeT8="; + }) + ]; + postPatch = '' patchShebangs version.* ./TOOLS/ ''; diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix index b7a5f2ce38c1..8a2094bbb553 100644 --- a/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/pkgs/applications/video/plex-mpv-shim/default.nix @@ -3,13 +3,13 @@ buildPythonApplication rec { pname = "plex-mpv-shim"; - version = "1.10.3"; + version = "1.11.0"; src = fetchFromGitHub { owner = "iwalton3"; repo = pname; - rev = "v${version}"; - sha256 = "0hgv9g17dkrh3zbsx27n80yvkgix9j2x0rgg6d3qsf7hp5j3xw4r"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-hUGKOJEDZMK5uhHoevFt1ay6QQEcoN4F8cPxln5uMRo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix new file mode 100644 index 000000000000..c12fd29f087e --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +}: +stdenv.mkDerivation rec { + pname = "hyprland-protocols"; + version = "unstable-2023-01-13"; + + src = fetchFromGitHub { + owner = "hyprwm"; + repo = pname; + rev = "eb7dcc0132ad25addc3e8d434c4bfae6bd3a8c90"; + hash = "sha256-gkLgUg9/fP04bKCJMj/rN0r6PV/cbLShDvKQyFvVap0="; + }; + + nativeBuildInputs = [ + meson + ninja + ]; + + meta = { + homepage = "https://github.com/hyprwm/hyprland-protocols"; + description = "Wayland protocol extensions for Hyprland"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fufexan ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix index ca9565d915a2..15e029950b48 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix @@ -1,94 +1,115 @@ { lib , stdenv , fetchFromGitHub -, fetchFromGitLab -, cmake +, pkg-config +, meson +, ninja +, cairo +, git +, hyprland-protocols +, jq , libdrm , libinput , libxcb , libxkbcommon , mesa -, pango -, pkg-config +, pciutils +, systemd +, udis86 , wayland , wayland-protocols , wayland-scanner , wlroots , xcbutilwm +, xwayland +, debug ? false +, enableXWayland ? true +, hidpiXWayland ? false +, legacyRenderer ? false +, nvidiaPatches ? false +, withSystemd ? true }: - -stdenv.mkDerivation (finalAttrs: { - pname = "hyprland"; - version = "0.6.1beta"; +let + assertXWayland = lib.assertMsg (hidpiXWayland -> enableXWayland) '' + Hyprland: cannot have hidpiXWayland when enableXWayland is false. + ''; +in +assert assertXWayland; +stdenv.mkDerivation rec { + pname = "hyprland" + lib.optionalString debug "-debug"; + version = "0.23.0beta"; src = fetchFromGitHub { owner = "hyprwm"; - repo = "Hyprland"; - rev = "v${finalAttrs.version}"; - hash = "sha256-0Msqe2ErAJvnO1zHoB2k6TkDhTYnHRGkvJrfSG12dTU="; + repo = "hyprland"; + rev = "v${version}"; + hash = "sha256-aPSmhgof4nIJquHmtxxirIMVv439wTYYCwf1ekS96gA="; }; + patches = [ + # make meson use the provided dependencies instead of the git submodules + "${src}/nix/meson-build.patch" + ]; + + postPatch = '' + # Fix hardcoded paths to /usr installation + sed -i "s#/usr#$out#" src/render/OpenGL.cpp + substituteInPlace meson.build \ + --replace "@GIT_COMMIT_HASH@" '${version}' \ + --replace "@GIT_DIRTY@" "" + ''; + nativeBuildInputs = [ - cmake + jq + meson + ninja pkg-config - wayland-scanner ]; - buildInputs = [ - libdrm - libinput - libxcb - libxkbcommon - mesa - pango - wayland - wayland-protocols - xcbutilwm - ] - ++ [ - # INFO: When updating src, remember to synchronize this wlroots with the - # exact commit used by upstream - (wlroots.overrideAttrs (_: { - version = "unstable-2022-06-07"; - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "wlroots"; - repo = "wlroots"; - rev = "b89ed9015c3fbe8d339e9d65cf70fdca6e5645bc"; - hash = "sha256-8y3u8CoigjoZOVbA2wCWBHlDNEakv0AVxU46/cOC00s="; - }; - })) + outputs = [ + "out" + "man" ]; - # build with system wlroots - postPatch = '' - sed -Ei 's|"\.\./wlroots/include/([a-zA-Z0-9./_-]+)"|<\1>|g' src/includes.hpp - ''; + buildInputs = + [ + cairo + git + hyprland-protocols + libdrm + libinput + libxkbcommon + mesa + udis86 + wayland + wayland-protocols + wayland-scanner + pciutils + (wlroots.override { inherit enableXWayland hidpiXWayland nvidiaPatches; }) + ] + ++ lib.optionals enableXWayland [ libxcb xcbutilwm xwayland ] + ++ lib.optionals withSystemd [ systemd ]; - preConfigure = '' - make protocols - ''; + mesonBuildType = + if debug + then "debug" + else "release"; - postBuild = '' - pushd ../hyprctl - ${stdenv.cc.targetPrefix}c++ -std=c++20 -w ./main.cpp -o ./hyprctl - popd - ''; + mesonFlags = builtins.concatLists [ + (lib.optional (!enableXWayland) "-Dxwayland=disabled") + (lib.optional legacyRenderer "-DLEGACY_RENDERER:STRING=true") + (lib.optional withSystemd "-Dsystemd=enabled") + ]; - installPhase = '' - runHook preInstall - install -Dm755 ../hyprctl/hyprctl ./Hyprland -t $out/bin - - runHook postInstall - ''; + passthru.providedSessions = [ "hyprland" ]; meta = with lib; { - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/vaxerski/Hyprland"; description = "A dynamic tiling Wayland compositor that doesn't sacrifice on its looks"; license = licenses.bsd3; - maintainers = with maintainers; [ wozeparrot ]; - inherit (wayland.meta) platforms; + maintainers = with maintainers; [ wozeparrot fufexan ]; mainProgram = "Hyprland"; + platforms = wlroots.meta.platforms; }; -}) +} diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/udis86.nix b/pkgs/applications/window-managers/hyprwm/hyprland/udis86.nix new file mode 100644 index 000000000000..b72083c4560a --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hyprland/udis86.nix @@ -0,0 +1,15 @@ +{ udis86 +, fetchFromGitHub +}: +udis86.overrideAttrs (old: { + version = "unstable-2022-10-13"; + + src = fetchFromGitHub { + owner = "canihavesomecoffee"; + repo = "udis86"; + rev = "5336633af70f3917760a6d441ff02d93477b0c86"; + hash = "sha256-HifdUQPGsKQKQprByeIznvRLONdOXeolOsU5nkwIv3g="; + }; + + patches = [ ]; +}) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix new file mode 100644 index 000000000000..826053e6c58e --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix @@ -0,0 +1,113 @@ +{ fetchFromGitLab +, hyprland +, wlroots +, xwayland +, fetchpatch +, lib +, libdisplay-info +, libliftoff +, hwdata +, hidpiXWayland ? true +, enableXWayland ? true +, nvidiaPatches ? false +}: +let + libdisplay-info-new = libdisplay-info.overrideAttrs (old: { + version = "0.1.1+date=2023-03-02"; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "emersion"; + repo = old.pname; + rev = "147d6611a64a6ab04611b923e30efacaca6fc678"; + sha256 = "sha256-/q79o13Zvu7x02SBGu0W5yQznQ+p7ltZ9L6cMW5t/o4="; + }; + }); + + libliftoff-new = libliftoff.overrideAttrs (old: { + version = "0.5.0-dev"; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "emersion"; + repo = old.pname; + rev = "d98ae243280074b0ba44bff92215ae8d785658c0"; + sha256 = "sha256-DjwlS8rXE7srs7A8+tHqXyUsFGtucYSeq6X0T/pVOc8="; + }; + + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=sign-conversion" + ]; + }); +in +assert (lib.assertMsg (hidpiXWayland -> enableXWayland) '' + wlroots-hyprland: cannot have hidpiXWayland when enableXWayland is false. +''); +(wlroots.overrideAttrs + (old: { + version = "0.17.0-dev"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "wlroots"; + repo = "wlroots"; + rev = "5ae17de23f5fd9bb252a698f3771c840280e2c05"; + hash = "sha256-dWrk+Q3bLdtFe5rkyaAKWCQJCeE/KFNllcu1DvBC38c="; + }; + + pname = + old.pname + + "-hyprland" + + ( + if hidpiXWayland + then "-hidpi" + else "" + ) + + ( + if nvidiaPatches + then "-nvidia" + else "" + ); + + patches = + (old.patches or [ ]) + ++ (lib.optionals (enableXWayland && hidpiXWayland) [ + "${hyprland.src}/nix/wlroots-hidpi.patch" + (fetchpatch { + url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/18595000f3a21502fd60bf213122859cc348f9af.diff"; + sha256 = "sha256-jvfkAMh3gzkfuoRhB4E9T5X1Hu62wgUjj4tZkJm0mrI="; + revert = true; + }) + ]) + ++ (lib.optionals nvidiaPatches [ + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/nvidia.patch?h=hyprland-nvidia-git&id=757614af7729352fda534abe9eb1a88fe77dfe04"; + sha256 = "A9f1p5EW++mGCaNq8w7ZJfeWmvTfUm4iO+1KDcnqYX8="; + }) + ]); + + postPatch = + (old.postPatch or "") + + ( + if nvidiaPatches + then '' + substituteInPlace render/gles2/renderer.c --replace "glFlush();" "glFinish();" + '' + else "" + ); + + buildInputs = + old.buildInputs + ++ [ + hwdata + libdisplay-info-new + libliftoff-new + ]; + })).override { + xwayland = xwayland.overrideAttrs (old: { + patches = + (old.patches or [ ]) + ++ (lib.optionals hidpiXWayland [ + "${hyprland.src}/nix/xwayland-vsync.patch" + "${hyprland.src}/nix/xwayland-hidpi.patch" + ]); + }); +} diff --git a/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix b/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix new file mode 100644 index 000000000000..176b0de54e0b --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix @@ -0,0 +1,95 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, cmake +, ninja +, cairo +, fribidi +, libdatrie +, libjpeg +, libselinux +, libsepol +, libthai +, pango +, pcre +, utillinux +, wayland +, wayland-protocols +, wayland-scanner +, wlroots +, libXdmcp +, debug ? false +}: +stdenv.mkDerivation { + pname = "hyprpicker" + lib.optionalString debug "-debug"; + version = "unstable-2023-03-09"; + + src = fetchFromGitHub { + owner = "hyprwm"; + repo = "hyprpicker"; + rev = "234c2da51a71941c0cd2ee380f42de365f90dd6f"; + hash = "sha256-wb1oXsaM0AkThPJGjn0Ytxt8vbBQG+mg2AGY0uxhUJ0="; + }; + + cmakeFlags = lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + ]; + + buildInputs = [ + cairo + fribidi + libdatrie + libjpeg + libselinux + libsepol + libthai + pango + pcre + wayland + wayland-protocols + wayland-scanner + wlroots + libXdmcp + utillinux + ]; + + configurePhase = '' + runHook preConfigure + + make protocols + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + make release + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/licenses} + + install -Dm755 build/hyprpicker -t $out/bin + install -Dm644 LICENSE -t $out/share/licenses/hyprpicker + + runHook postInstall + ''; + + meta = with lib; { + description = "A wlroots-compatible Wayland color picker that does not suck"; + homepage = "https://github.com/hyprwm/hyprpicker"; + license = licenses.bsd3; + maintainers = with maintainers; [ fufexan ]; + platforms = wayland.meta.platforms; + }; +} diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix new file mode 100644 index 000000000000..3d77b7a824e4 --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, meson +, ninja +, pkg-config +, hyprland-protocols +, hyprland-share-picker +, inih +, libdrm +, mesa +, pipewire +, systemd +, wayland +, wayland-protocols +, wayland-scanner +}: +let + source = import ./source.nix { inherit lib fetchFromGitHub wayland; }; +in +stdenv.mkDerivation { + pname = "xdg-desktop-portal-hyprland"; + inherit (source) src version meta; + + strictDeps = true; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ + makeWrapper + meson + ninja + pkg-config + wayland-scanner + ]; + buildInputs = [ + hyprland-protocols + inih + libdrm + mesa + pipewire + systemd + wayland + wayland-protocols + ]; + + mesonFlags = [ + "-Dsd-bus-provider=libsystemd" + ]; + + postInstall = '' + wrapProgram $out/libexec/xdg-desktop-portal-hyprland --prefix PATH ":" ${lib.makeBinPath [hyprland-share-picker]} + ''; +} diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/hyprland-share-picker.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/hyprland-share-picker.nix new file mode 100644 index 000000000000..4712d6d2d0a6 --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/hyprland-share-picker.nix @@ -0,0 +1,36 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, qtbase +, makeShellWrapper +, wrapQtAppsHook +, hyprland +, grim +, slurp +, wayland +}: +let + source = import ./source.nix { inherit lib fetchFromGitHub wayland; }; +in +stdenv.mkDerivation { + pname = "hyprland-share-picker"; + inherit (source) version; + + src = "${source.src}/hyprland-share-picker"; + + nativeBuildInputs = [ cmake wrapQtAppsHook makeShellWrapper ]; + buildInputs = [ qtbase ]; + + dontWrapQtApps = true; + + postInstall = '' + wrapProgramShell $out/bin/hyprland-share-picker \ + "''${qtWrapperArgs[@]}" \ + --prefix PATH ":" ${lib.makeBinPath [grim slurp hyprland]} + ''; + + meta = source.meta // { + description = "Helper program for xdg-desktp-portal-hyprland"; + }; +} diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/source.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/source.nix new file mode 100644 index 000000000000..fa752a54479e --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/source.nix @@ -0,0 +1,22 @@ +{ lib +, fetchFromGitHub +, wayland +}: +{ + version = "unstable-2023-03-16"; + + src = fetchFromGitHub { + owner = "hyprwm"; + repo = "xdg-desktop-portal-hyprland"; + rev = "85f49f4d6c9c398428117e9bdb588f53f09e52e0"; + hash = "sha256-qed+BV0NBt1egGCBEM7d5MiZJevQb8jd1WybfFM53Ak="; + }; + + meta = with lib; { + description = "xdg-desktop-portal backend for Hyprland"; + homepage = "https://github.com/hyprwm/xdg-desktop-portal-hyprland"; + license = licenses.mit; + maintainers = with maintainers; [ fufexan ]; + platforms = wayland.meta.platforms; + }; +} diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index 3bf675b5d208..c3c4a7b1e57b 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -34,6 +34,9 @@ let "dontUnpack" "LC_ALL" "meta" + "buildPhase" + "nativeBuildInputs" + "installPhase" ]; in stdenv.mkDerivation ({ diff --git a/pkgs/data/fonts/mononoki/default.nix b/pkgs/data/fonts/mononoki/default.nix index 1b9ce45a05ef..d943d42be7ac 100644 --- a/pkgs/data/fonts/mononoki/default.nix +++ b/pkgs/data/fonts/mononoki/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "mononoki"; - version = "1.5"; + version = "1.6"; src = fetchzip { url = "https://github.com/madmalik/mononoki/releases/download/${version}/mononoki.zip"; stripRoot = false; - hash = "sha256-H5Iu7nSrB5UGlCSjTM3SLu+IjaAffk9TCm5OoOleKvw="; + hash = "sha256-HQM9rzIJXLOScPEXZu0MzRlblLfbVVNJ+YvpONxXuwQ="; }; installPhase = '' diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index a49cbe11d362..37d936fc1861 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202303090050"; + version = "202303160048"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "e1cd759a93ff7e65cd8099ee628803a83ab8cae0"; - sha256 = "sha256-m6TYu6cT57MDOXXfI76ufGDWJYmxjtVZg5vSToM8btE="; + rev = "ca1a04c113293b00434d9d60e24aee17e660f4a6"; + sha256 = "sha256-YhFYrVN6ZQQeuM8ZCeFRmID/NTsI75oe4c51lOfb18s="; }; installPhase = '' diff --git a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix index 1a1d8661563a..272a7b9d8700 100644 --- a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix +++ b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix @@ -9,28 +9,26 @@ , mtdev , cairo , xorg -, waylandSupport ? false +, waylandSupport ? true +, wayland }: stdenv.mkDerivation rec { pname = "qt5platform-plugins"; - version = "5.6.3"; + version = "5.6.5"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-AySltMI9x5mfquy532h1QfGpfwSfI9+h6BtIHPyNWGk="; + sha256 = "sha256-DHgnfJTUw1hY53DmDfzVFM6Ff8q6pbNDPmPeSsV7MwY="; }; - ## https://github.com/linuxdeepin/qt5platform-plugins/pull/119 - postPatch = '' - rm -r xcb/libqt5xcbqpa-dev/ - mkdir -p xcb/libqt5xcbqpa-dev/${qtbase.version} - cp -r ${qtbase.src}/src/plugins/platforms/xcb/*.h xcb/libqt5xcbqpa-dev/${qtbase.version}/ - ''; - - nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; + nativeBuildInputs = [ + qmake + pkg-config + wrapQtAppsHook + ]; buildInputs = [ mtdev @@ -38,13 +36,20 @@ stdenv.mkDerivation rec { qtbase qtx11extras xorg.libSM + ] + ++ lib.optionals waylandSupport [ + wayland ]; qmakeFlags = [ "INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms" + "QT_XCB_PRIVATE_INCLUDE=${qtbase.src}/src/plugins/platforms/xcb" ] ++ lib.optionals (!waylandSupport) [ "CONFIG+=DISABLE_WAYLAND" ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString waylandSupport "-I${wayland.dev}/include"; + meta = with lib; { description = "Qt platform plugins for DDE"; homepage = "https://github.com/linuxdeepin/qt5platform-plugins"; diff --git a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix index 8aaf7929c5ab..d82d758adf3b 100644 --- a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix +++ b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix @@ -4,13 +4,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "deepin-desktop-base"; - version = "2022.03.07"; + version = "2022.11.15-deepin"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-joAduRI9jUtPA4lNsEhgOZlci8j/cvD8rJThqvj6a8A="; + sha256 = "sha256-GTgIHWz+x1Pl3F4zKA9V8o2oq6c53OK94q95WoMG+Qo="; }; makeFlags = [ "DESTDIR=${placeholder "out"}" ]; @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Base assets and definitions for Deepin Desktop Environment"; homepage = "https://github.com/linuxdeepin/deepin-desktop-base"; - license = licenses.gpl3Plus; + license = with licenses; [ gpl3Plus cc-by-40 ]; platforms = platforms.linux; maintainers = teams.deepin.members; }; diff --git a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix index 69318241c1a8..500cf3fa7749 100644 --- a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-dash-to-dock"; - version = "75"; + version = "79"; # Temporarily switched to commit hash because stable version is buggy. src = fetchFromGitHub { owner = "micheleg"; repo = "dash-to-dock"; rev = "extensions.gnome.org-v${version}"; - sha256 = "sha256-vHXNhJgty7x4Ef6jxUI29KYpadC3jtUqE1Nt1dWYr24="; + sha256 = "sha256-vqQ9nAa/avae2+0xJ5gApbAU07pawi+R6IEQ9O6DTjs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/ballerina/default.nix b/pkgs/development/compilers/ballerina/default.nix index f8dcc907f7ab..20c13c9f25dd 100644 --- a/pkgs/development/compilers/ballerina/default.nix +++ b/pkgs/development/compilers/ballerina/default.nix @@ -1,6 +1,6 @@ { ballerina, lib, writeText, runCommand, makeWrapper, fetchzip, stdenv, openjdk }: let - version = "2201.2.2"; + version = "2201.4.0"; codeName = "swan-lake"; in stdenv.mkDerivation { pname = "ballerina"; @@ -8,7 +8,7 @@ in stdenv.mkDerivation { src = fetchzip { url = "https://dist.ballerina.io/downloads/${version}/ballerina-${version}-${codeName}.zip"; - sha256 = "sha256-xBr7lsZJKk4VXuUDt7IRQN/ZDH4WrxYjd1mBIoyb9qs="; + sha256 = "sha256-720QKGOerRzXsnbUghk+HGOMl4lQxHDYya3+FHtU/Ys="; }; nativeBuildInputs = [ makeWrapper ]; @@ -19,7 +19,7 @@ in stdenv.mkDerivation { runHook postInstall ''; preFixup = '' - wrapProgram $out/bin/bal --set JAVA_HOME ${openjdk}/lib/openjdk + wrapProgram $out/bin/bal --set JAVA_HOME ${openjdk} ''; passthru.tests.smokeTest = let diff --git a/pkgs/development/guile-modules/guile-ssh/default.nix b/pkgs/development/guile-modules/guile-ssh/default.nix index be082c373a2d..a704ff74d031 100644 --- a/pkgs/development/guile-modules/guile-ssh/default.nix +++ b/pkgs/development/guile-modules/guile-ssh/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "guile-ssh"; - version = "0.16.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "artyom-poptsov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BDnLm5Q+69v8JbrfAn0+XMuWzRvCeUB/prfrKnvw5eY="; + sha256 = "sha256-P29U88QrCjoyl/wdTPZbiMoykd/v6ul6CW/IJn9UAyw="; }; configureFlags = [ "--with-guilesitedir=\${out}/share/guile/site" ]; diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index f8fb244d54c9..04c605f29236 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -1,20 +1,30 @@ -{ lib, buildGraalvmNativeImage, fetchurl, writeScript }: +{ lib +, buildGraalvmNativeImage +, graalvmCEPackages +, removeReferencesTo +, fetchurl +, writeScript }: buildGraalvmNativeImage rec { pname = "babashka"; - version = "1.1.173"; + version = "1.2.174"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-p/KGDCocTksvUwj6x5l1xUEM1OZ4pNHtXL4mTgg7JUI="; + sha256 = "sha256-5ZvqbOU69ZZNIT5Mh7+Cg5s+gLhOnFMSIO4ZI9t6D/8="; }; + graalvmDrv = graalvmCEPackages.graalvm19-ce; + executable = "bb"; + nativeBuildInputs = [ removeReferencesTo ]; + extraNativeImageBuildArgs = [ "-H:+ReportExceptionStackTraces" "--no-fallback" "--native-image-info" + "--enable-preview" ]; installCheckPhase = '' @@ -23,6 +33,13 @@ buildGraalvmNativeImage rec { $out/bin/bb '(vec (dedupe *input*))' <<< '[1 1 1 1 2]' | grep '[1 2]' ''; + # As of v1.2.174, this will remove references to ${graalvmDrv}/conf/chronology, + # not sure the implications of this but this file is not available in + # graalvm19-ce anyway. + postInstall = '' + remove-references-to -t ${graalvmDrv} $out/bin/${executable} + ''; + passthru.updateScript = writeScript "update-babashka" '' #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl common-updater-scripts jq diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 6632592a51b8..7376655d1267 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.11.1.1252"; + version = "1.11.1.1257"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "sha256-ZQFhN/vO1L1kKmEC6wKT74qimR6ctkdoXrCFujobX6A="; + sha256 = "sha256-bZcJFtDOo8S2LQebsdTkgzlBVuZaKJUlUQX4F/qSq9A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 0f85c0f3bc4b..d997d302fc32 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2023.Q1.2"; + version = "2023.Q1.3"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "sha256-QNjBLOnSfCTA+5qLqejAqJv9eIWAEVNc/VrhidGjmTc="; + sha256 = "JYGegQQCoKIpvBQYhNbG8j6CgtKb+c8MsK+cFtYUgtY="; }; buildInputs = [ diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index 3047cf539ceb..4e328fe2b2a9 100644 --- a/pkgs/development/libraries/bobcat/default.nix +++ b/pkgs/development/libraries/bobcat/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { pname = "bobcat"; - version = "5.10.01"; + version = "5.11.01"; src = fetchFromGitLab { - sha256 = "sha256-QhjUIaPSDAvOt0ZCzQWASpG+GJaTviosGDrzrckhuhs="; + sha256 = "sha256-JLJKaJmztputIon9JkKzpm3Ch60iwm4Imh9p42crYzA="; domain = "gitlab.com"; rev = version; repo = "bobcat"; diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 36a4c56bbaf7..6d7352e87742 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "drumstick"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-5O9yD3MexorJUm5tv6oghDb4J/b3SO10mDQR9dT2jlA="; + hash = "sha256-Yb5SrXJ5ZK0IJ8XbnxAGLlfqKGOrfv2VET9Ba8dKItU="; }; patches = [ diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index a473b708a279..29d7d178db2b 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.3.13"; + version = "1.3.17"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "sha256-1M+QCUFR/c3aEo7RjLCmv2WzCL41K1NEmUO1JJxbSPI="; + sha256 = "sha256-+AzAGg71u+M+fLs3Au2SSqteJaxuzNk8lJ6H3+98WYQ="; }; buildInputs = [ diff --git a/pkgs/development/libraries/json-fortran/default.nix b/pkgs/development/libraries/json-fortran/default.nix new file mode 100644 index 000000000000..422248520fc4 --- /dev/null +++ b/pkgs/development/libraries/json-fortran/default.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, fetchFromGitHub, gfortran, cmake }: + +stdenv.mkDerivation rec { + pname = "json-fortran"; + version = "8.3.0"; + + src = fetchFromGitHub { + owner = "jacobwilliams"; + repo = pname; + rev = version; + hash = "sha256-96W9bzWEZ3EN4wtnDT3G3pvLdcI4SIhGJWBVPU3rNZ4="; + }; + + nativeBuildInputs = [ + cmake + gfortran + ]; + + cmakeFlags = [ + "-DUSE_GNU_INSTALL_CONVENTION=ON" + ]; + + # Due to some misconfiguration in CMake the Fortran modules end up in $out/$out. + # Move them back to the desired location. + postInstall = '' + mv $out/$out/include $out/. + rm -r $out/nix + ''; + + meta = with lib; { + description = "Modern Fortran JSON API"; + homepage = "https://github.com/jacobwilliams/json-fortran"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/development/libraries/libcerf/default.nix b/pkgs/development/libraries/libcerf/default.nix index 7a3b96314189..38bb6de70e06 100644 --- a/pkgs/development/libraries/libcerf/default.nix +++ b/pkgs/development/libraries/libcerf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libcerf"; - version = "2.1"; + version = "2.3"; src = fetchurl { url = "https://jugit.fz-juelich.de/mlz/libcerf/-/archive/v${version}/libcerf-v${version}.tar.gz"; - sha256 = "sha256-ihzYt/rgS4KpUWglISm4wbrKCYooX/jT8leB3q0Ut1o="; + sha256 = "sha256-zO7+5G6EzojQdRAzkLT50Ew05Lw7ltczKSw2g21PcGU="; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix index 09f9d8b420b9..7163c312ea92 100644 --- a/pkgs/development/libraries/libcint/default.nix +++ b/pkgs/development/libraries/libcint/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "5.1.6"; + version = "5.2.1"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - hash = "sha256-vhi/VzT/WmkfWi+hliN60o7eT+XgDr7T/k8DG3N1moc="; + hash = "sha256-sFdigOlS5fAi2dV4dhcPg3roqFdvpnh580WDqTA6DGg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index 65d7a83a8384..d69daee07bd8 100644 --- a/pkgs/development/libraries/libqglviewer/default.nix +++ b/pkgs/development/libraries/libqglviewer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libqglviewer"; - version = "2.7.2"; + version = "2.8.0"; src = fetchurl { url = "http://www.libqglviewer.com/src/libQGLViewer-${version}.tar.gz"; - sha256 = "023w7da1fyn2z69nbkp2rndiv886zahmc5cmira79zswxjfpklp2"; + sha256 = "sha256-A9LTOUhmzcQZ9DcTrtgnJixxTMT6zd6nw7odk9rjxMw="; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/libraries/libusb-compat/0.1.nix b/pkgs/development/libraries/libusb-compat/0.1.nix index b9aa26c67a08..db80cfd81d06 100644 --- a/pkgs/development/libraries/libusb-compat/0.1.nix +++ b/pkgs/development/libraries/libusb-compat/0.1.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "libusb-compat"; - version = "0.1.7"; + version = "0.1.8"; outputs = [ "out" "dev" ]; # get rid of propagating systemd closure outputBin = "dev"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "libusb"; repo = "libusb-compat-0.1"; rev = "v${version}"; - sha256 = "1nybccgjs14b3phhaycq2jx1gym4nf6sghvnv9qdfmlqxacx0jz5"; + sha256 = "sha256-pAPERYSxoc47gwpPUoMkrbK8TOXyx03939vlFN0hHRg="; }; patches = lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch; diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 385288ffdcbc..fbc84ce8351d 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "pcl"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "PointCloudLibrary"; repo = "pcl"; rev = "${pname}-${version}"; - sha256 = "0jhvciaw43y6iqqk7hyxnfhn1b4bsw5fpy04s01r5pkcsjjbdbqc"; + sha256 = "sha256-JDiDAmdpwUR3Sff63ehyvetIFXAgGOrI+HEaZ5lURps="; }; # remove attempt to prevent (x86/x87-specific) extended precision use diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index d407c3137efc..a9d8f8a8c926 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "libupnp"; - version = "1.14.14"; + version = "1.14.15"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "pupnp"; repo = "pupnp"; rev = "release-${version}"; - sha256 = "sha256-LZFCfYz6MKMt0IDH22EbcmTRUXrrhQMaSjqAZH28nIQ="; + sha256 = "sha256-Yrd5sRvFsqBzVHODutK5JHCgoqzh26s/sGmsU2Db+bI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/chemistry/dftd4/default.nix b/pkgs/development/libraries/science/chemistry/dftd4/default.nix new file mode 100644 index 000000000000..a099a14a8e63 --- /dev/null +++ b/pkgs/development/libraries/science/chemistry/dftd4/default.nix @@ -0,0 +1,47 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, gfortran +, blas +, lapack +, mctc-lib +, mstore +, multicharge +}: + +assert !blas.isILP64 && !lapack.isILP64; + +stdenv.mkDerivation rec { + pname = "dftd4"; + version = "3.5.0"; + + src = fetchFromGitHub { + owner = "dftd4"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ZCoFbjTNQD7slq5sKwPRPkrHSHofsxU9C9h/bF5jmZI="; + }; + + nativeBuildInputs = [ cmake gfortran ]; + + buildInputs = [ blas lapack mctc-lib mstore multicharge ]; + + postInstall = '' + substituteInPlace $out/lib/pkgconfig/${pname}.pc \ + --replace "''${prefix}" "" + ''; + + doCheck = true; + preCheck = '' + export OMP_NUM_THREADS=2 + ''; + + meta = with lib; { + description = "Generally Applicable Atomic-Charge Dependent London Dispersion Correction"; + license = with licenses; [ lgpl3Plus gpl3Plus ]; + homepage = "https://github.com/grimme-lab/dftd4"; + platforms = platforms.linux; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix b/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix new file mode 100644 index 000000000000..e9be83970fbf --- /dev/null +++ b/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, lib +, fetchFromGitHub +, gfortran +, pkg-config +, json-fortran +, cmake +}: + +stdenv.mkDerivation rec { + pname = "mctc-lib"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "grimme-lab"; + repo = pname; + rev = "v${version}"; + hash = "sha256-AXjg/ZsitdDf9fNoGVmVal1iZ4/sxjJb7A9W4yye/rg="; + }; + + nativeBuildInputs = [ gfortran pkg-config cmake ]; + + buildInputs = [ json-fortran ]; + + postInstall = '' + substituteInPlace $out/lib/pkgconfig/${pname}.pc \ + --replace "''${prefix}" "" + ''; + + doCheck = true; + + meta = with lib; { + description = "Modular computation tool chain library"; + homepage = "https://github.com/grimme-lab/mctc-lib"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/development/libraries/science/chemistry/mstore/default.nix b/pkgs/development/libraries/science/chemistry/mstore/default.nix new file mode 100644 index 000000000000..7fcdfbdf5492 --- /dev/null +++ b/pkgs/development/libraries/science/chemistry/mstore/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, gfortran +, mctc-lib +}: + +stdenv.mkDerivation rec { + pname = "mstore"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "grimme-lab"; + repo = pname; + rev = "v${version}"; + hash = "sha256-dN2BulLS/ENRFVdJIrZRxgBV8S4d5+7BjTCGnhBbf4I="; + }; + + nativeBuildInputs = [ cmake gfortran ]; + + buildInputs = [ mctc-lib ]; + + postInstall = '' + substituteInPlace $out/lib/pkgconfig/${pname}.pc \ + --replace "''${prefix}" "" + ''; + + meta = with lib; { + description = "Molecular structure store for testing"; + license = licenses.asl20; + homepage = "https://github.com/grimme-lab/mstore"; + platforms = platforms.linux; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/development/libraries/science/chemistry/multicharge/default.nix b/pkgs/development/libraries/science/chemistry/multicharge/default.nix new file mode 100644 index 000000000000..5a5046cd2a54 --- /dev/null +++ b/pkgs/development/libraries/science/chemistry/multicharge/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, gfortran +, blas +, lapack +, mctc-lib +, mstore +}: + +assert !blas.isILP64 && !lapack.isILP64; + +stdenv.mkDerivation rec { + pname = "multicharge"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "grimme-lab"; + repo = pname; + rev = "v${version}"; + hash = "sha256-oUI5x5/Gd0EZBb1w+0jlJUF9X51FnkHFu8H7KctqXl0="; + }; + + nativeBuildInputs = [ cmake gfortran ]; + + buildInputs = [ blas lapack mctc-lib mstore ]; + + postInstall = '' + substituteInPlace $out/lib/pkgconfig/${pname}.pc \ + --replace "''${prefix}" "" + ''; + + doCheck = true; + preCheck = '' + export OMP_NUM_THREADS=2 + ''; + + meta = with lib; { + description = "Electronegativity equilibration model for atomic partial charges"; + license = licenses.asl20; + homepage = "https://github.com/grimme-lab/multicharge"; + platforms = platforms.linux; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix b/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix new file mode 100644 index 000000000000..a9bd2c8faa73 --- /dev/null +++ b/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, lib +, fetchFromGitHub +, gfortran +, cmake +, mctc-lib +, mstore +, toml-f +, blas +}: + +assert !blas.isILP64; + +stdenv.mkDerivation rec { + pname = "simple-dftd3"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "dftd3"; + repo = pname; + rev = "v${version}"; + hash = "sha256-5OvmMgjD8ujjKHkuw4NT8hEXKh5YPxuBl/Mu6g2/KIA="; + }; + + nativeBuildInputs = [ cmake gfortran ]; + + buildInputs = [ mctc-lib mstore toml-f blas ]; + + postInstall = '' + substituteInPlace $out/lib/pkgconfig/s-dftd3.pc \ + --replace "''${prefix}" "" + ''; + + doCheck = true; + preCheck = '' + export OMP_NUM_THREADS=2 + ''; + + meta = with lib; { + description = "Reimplementation of the DFT-D3 program"; + license = with licenses; [lgpl3Only gpl3Only]; + homepage = "https://github.com/dftd3/simple-dftd3"; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/development/libraries/science/chemistry/tblite/default.nix b/pkgs/development/libraries/science/chemistry/tblite/default.nix new file mode 100644 index 000000000000..0f05315b9d88 --- /dev/null +++ b/pkgs/development/libraries/science/chemistry/tblite/default.nix @@ -0,0 +1,59 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, gfortran +, blas +, lapack +, mctc-lib +, mstore +, toml-f +, multicharge +, dftd4 +, simple-dftd3 +}: + +assert !blas.isILP64 && !lapack.isILP64; + +stdenv.mkDerivation rec { + pname = "tblite"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "tblite"; + repo = pname; + rev = "v${version}"; + hash = "sha256-R7CAFG/x55k5Ieslxeq+DWq1wPip4cI+Yvn1cBbeVNs="; + }; + + nativeBuildInputs = [ cmake gfortran ]; + + buildInputs = [ + blas + lapack + mctc-lib + mstore + toml-f + multicharge + dftd4 + simple-dftd3 + ]; + + doCheck = true; + preCheck = '' + export OMP_NUM_THREADS=2 + ''; + + postInstall = '' + substituteInPlace $out/lib/pkgconfig/${pname}.pc \ + --replace "''${prefix}" "" + ''; + + meta = with lib; { + description = "Light-weight tight-binding framework"; + license = with licenses; [ gpl3Plus lgpl3Plus ]; + homepage = "https://github.com/tblite/tblite"; + platforms = platforms.linux; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/development/libraries/science/chemistry/tblite/python.nix b/pkgs/development/libraries/science/chemistry/tblite/python.nix new file mode 100644 index 000000000000..00301d957662 --- /dev/null +++ b/pkgs/development/libraries/science/chemistry/tblite/python.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage +, meson +, ninja +, pkg-config +, tblite +, cffi +}: + +buildPythonPackage rec { + inherit (tblite) pname version src meta; + + nativeBuildInputs = [ meson ninja pkg-config ]; + + buildInputs = [ tblite ]; + + propagatedBuildInputs = [ cffi ]; + + format = "other"; + + configurePhase = '' + runHook preConfigure + + meson setup build python --prefix=$out + cd build + + runHook postConfigure + ''; +} diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 0d5409c6817d..f6baae932ba2 100644 --- a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "7.2.0"; + version = "7.4.3"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - sha256 = "sha256-N3TBuKWQRisXE5DQ0c+N2cv0darQ8mz4g2oe7pKst9E="; + sha256 = "sha256-myUaSzBlt34L3UJDKB9VXetaPCc3SZCzpbsSn1j+MPw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index 774168847b94..4a0c8a6cad08 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "tdb"; - version = "1.4.7"; + version = "1.4.8"; src = fetchurl { url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; - sha256 = "sha256-pPsWje9TPzH/LAf32YRLsxMeZ5nwlOvnfQOArcmHwg4="; + sha256 = "sha256-hDTJyFfRPOP6hGb3VgHyXDaTZ2s2kZ8VngrWEhuvXOg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/test-drive/default.nix b/pkgs/development/libraries/test-drive/default.nix new file mode 100644 index 000000000000..b858f39498c2 --- /dev/null +++ b/pkgs/development/libraries/test-drive/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchFromGitHub, gfortran, cmake }: + +stdenv.mkDerivation rec { + pname = "test-drive"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "fortran-lang"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ObAnHFP1Hp0knf/jtGHynVF0CCqK47eqetePx4NLmlM="; + }; + + postPatch = '' + substituteInPlace config/template.pc \ + --replace 'libdir=''${prefix}/@CMAKE_INSTALL_LIBDIR@' "libdir=@CMAKE_INSTALL_LIBDIR@" \ + --replace 'includedir=''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@' "includedir=@CMAKE_INSTALL_INCLUDEDIR@" + ''; + + nativeBuildInputs = [ + gfortran + cmake + ]; + + meta = with lib; { + description = "Procedural Fortran testing framework"; + homepage = "https://github.com/fortran-lang/test-drive"; + license = with licenses; [ asl20 mit ] ; + platforms = platforms.linux; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 7b798d00b01e..bdb6eb21ed42 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "tevent"; - version = "0.13.0"; + version = "0.14.1"; src = fetchurl { url = "mirror://samba/tevent/${pname}-${version}.tar.gz"; - sha256 = "sha256-uUN6kX+lU0Q2G+tk7J4AQumcroh5iCpi3Tj2q+I3HQw="; + sha256 = "sha256-74X8qoD/0jUQNrpLNHYw/vKhrD2pZKfxggRmutA80A0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/the-foundation/default.nix b/pkgs/development/libraries/the-foundation/default.nix index 2970fb3c84a7..69d88f508dac 100644 --- a/pkgs/development/libraries/the-foundation/default.nix +++ b/pkgs/development/libraries/the-foundation/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "the-foundation"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitea { domain = "git.skyjake.fi"; owner = "skyjake"; repo = "the_Foundation"; rev = "v${finalAttrs.version}"; - hash = "sha256-+V2WJYEmIZWpioNvvZMiw7Vt9ogEnEcjq+vR7UiBTO0="; + hash = "sha256-GOvdnmutSQcsNT57tADLSkJAUX0JDVsualII+y21a+I="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/toml-f/default.nix b/pkgs/development/libraries/toml-f/default.nix new file mode 100644 index 000000000000..d28447c40046 --- /dev/null +++ b/pkgs/development/libraries/toml-f/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, lib +, fetchFromGitHub +, gfortran +, cmake +, test-drive +}: + +stdenv.mkDerivation rec { + pname = "toml-f"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + hash = "sha256-8FbnUkeJUP4fiuJCroAVDo6U2M7ZkFLpG2OYrapMYtU="; + }; + + nativeBuildInputs = [ gfortran cmake ]; + + buildInputs = [ test-drive ]; + + postInstall = '' + substituteInPlace $out/lib/pkgconfig/${pname}.pc \ + --replace "''${prefix}/" "" + ''; + + doCheck = true; + + meta = with lib; { + description = "TOML parser implementation for data serialization and deserialization in Fortran"; + license = with licenses; [ asl20 mit ]; + homepage = "https://github.com/toml-f/toml-f"; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/development/libraries/volk/default.nix b/pkgs/development/libraries/volk/default.nix index 5f7db0d66d7d..7271a700e92d 100644 --- a/pkgs/development/libraries/volk/default.nix +++ b/pkgs/development/libraries/volk/default.nix @@ -29,6 +29,11 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optionals (!enableModTool) [ "-DENABLE_MODTOOL=OFF" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + "-DVOLK_CPU_FEATURES=OFF" + # offset 17912 in1: -0.0366274 in2: -0.0366173 tolerance was: 1e-05 + # volk_32f_log2_32f: fail on arch neon + "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;qa_volk_32f_log2_32f" ]; postInstall = lib.optionalString (!stdenv.isDarwin) '' diff --git a/pkgs/development/libraries/xsimd/default.nix b/pkgs/development/libraries/xsimd/default.nix index db8cc787dee4..ec2d166ef580 100644 --- a/pkgs/development/libraries/xsimd/default.nix +++ b/pkgs/development/libraries/xsimd/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, cmake, gtest }: stdenv.mkDerivation rec { pname = "xsimd"; - version = "8.1.0"; + version = "9.0.1"; src = fetchFromGitHub { owner = "xtensor-stack"; repo = "xsimd"; rev = version; - sha256 = "sha256-Aqs6XJkGjAjGAp0PprabSM4m+32M/UXpSHppCHdzaZk="; + sha256 = "sha256-onALN6agtrHWigtFlCeefD9CiRZI4Y690XTzy2UDnrk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index d8413117a30b..065904695001 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "genymotion"; - version = "3.2.1"; + version = "3.3.3"; src = fetchurl { url = "https://dl.genymotion.com/releases/genymotion-${version}/genymotion-${version}-linux_x64.bin"; name = "genymotion-${version}-linux_x64.bin"; - sha256 = "sha256-yCczUfiMcuu9OauMDmMdtnheDBXiC9tOEu0cWAW95FM="; + sha256 = "sha256-8NJgYILOR63tWZc3tHDie79uM1hBnAwJNwGp/h2RHCo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/python-modules/aiocontextvars/default.nix b/pkgs/development/python-modules/aiocontextvars/default.nix index 256a69338e1b..09eb8b0dbcff 100644 --- a/pkgs/development/python-modules/aiocontextvars/default.nix +++ b/pkgs/development/python-modules/aiocontextvars/default.nix @@ -4,7 +4,6 @@ , pytest-runner , pytestCheckHook , pytest-asyncio -, sqlalchemy , isPy27 }: @@ -25,10 +24,6 @@ buildPythonPackage rec { pytest-runner ]; - propagatedBuildInputs = [ - sqlalchemy - ]; - nativeCheckInputs = [ pytestCheckHook pytest-asyncio diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix index 1d55a3381c4e..942881583d36 100644 --- a/pkgs/development/python-modules/aiortm/default.nix +++ b/pkgs/development/python-modules/aiortm/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiortm"; - version = "0.6.0"; + version = "0.6.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = pname; rev = "v${version}"; - hash = "sha256-OOmcJB1o0cmAFj1n2obr0lxZxT5fYs2awftHQ6VMLUs="; + hash = "sha256-pfBJ5LWsG3HUGQF2IPMbVKv99xg+dqt17B8unmuv/Ww="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix index 0635b941c939..1dc10a140cc1 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-dbfs"; - version = "2.0.6"; + version = "2.0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-R3ov7EssN9kcf8SA8juPu9+TEptzo9Vkb8YwzwFlMQ4="; + hash = "sha256-Kj6DfnXZq5ilE+vnZrAoZEhPDoNrMIs5p2OcBc24qXM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix index 8ad7dc1c23b7..77d81c87ec31 100644 --- a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-keyvault-certificates"; - version = "4.6.0"; + version = "4.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-5wkbBhGgOCxXxMb8enRYyZ8QqMoN1PnYNlgxjOxxOZ4="; + hash = "sha256-nkfZp0gl5QKxPVSByZwYIEDE9Ucj9DNx4AhZQ23888o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index f721742a15a6..379fa2b7d06b 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.10.0"; + version = "2.10.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-H1SeNlX/NqdewNY+rs5HLTK0dRnB1H+EQfzf2g/y1ek="; + hash = "sha256-5jtI7EemKi0w/ezr/jLFQFndvqOjVE0SUm1urluKusY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/glfw/default.nix b/pkgs/development/python-modules/glfw/default.nix index c695169deb42..cc97f2f49fae 100644 --- a/pkgs/development/python-modules/glfw/default.nix +++ b/pkgs/development/python-modules/glfw/default.nix @@ -1,30 +1,46 @@ -{ lib, buildPythonPackage, fetchFromGitHub, glfw3 }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, glfw3 +, pythonOlder +}: buildPythonPackage rec { pname = "glfw"; - version = "2.5.6"; + version = "2.5.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "FlorianRhiem"; repo = "pyGLFW"; rev = "refs/tags/v${version}"; - hash = "sha256-zusVOhZfJyUpftvrUSLZJl7mG5AEGMLGXMOojFnEsH0="; + hash = "sha256-tB9qoGIUb0KgD7SQIV7nP5/fWKY/LrP/lQbljfVqiXw="; }; # Patch path to GLFW shared object patches = [ ./search-path.patch ]; + postPatch = '' substituteInPlace glfw/library.py --replace "@GLFW@" '${glfw3}/lib' ''; - propagatedBuildInputs = [ glfw3 ]; + + propagatedBuildInputs = [ + glfw3 + ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "glfw" ]; + + pythonImportsCheck = [ + "glfw" + ]; meta = with lib; { description = "Python bindings for GLFW"; homepage = "https://github.com/FlorianRhiem/pyGLFW"; + changelog = "https://github.com/FlorianRhiem/pyGLFW/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = [ maintainers.McSinyx ]; }; diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index cd574b5323fa..078af6d95103 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.6.0"; + version = "3.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WIbBTykJcVjVmvp0pnMtvdWD5u8w3Jk0pWrVMpBt41Y="; + hash = "sha256-z59UP606r0hxxT9Wtxjh75Spp3ixfxaJABX2/CXDKOw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index cfc33392129b..97a2396467c5 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.20"; + version = "2.5.21"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - hash = "sha256-QBFA4vq58rlW9XR1jrn2VrrsZuW+hZJHrZzSoRVZUMQ="; + hash = "sha256-4e25m4RIeWKDXxbhIrfKqKgTxSqtDgwyShoRIbxGN0c="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/mesa/default.nix b/pkgs/development/python-modules/mesa/default.nix index 9310637b7c79..ddf46813746e 100644 --- a/pkgs/development/python-modules/mesa/default.nix +++ b/pkgs/development/python-modules/mesa/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mesa"; - version = "1.1.1"; + version = "1.2.0"; format = "setuptools"; # According to their docs, this library is for Python 3+. @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Mesa"; inherit version; - hash = "sha256-FPQLPClI8CKVsacZs4DLFnaikVSwrevU5TfUMevXgSY="; + hash = "sha256-Hb+iISf9Aug3JIf+3kcXwYPshAe2CkqbGPEuSY2Ij9s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/moderngl/default.nix b/pkgs/development/python-modules/moderngl/default.nix index 3f2185fac87d..8937c967912c 100644 --- a/pkgs/development/python-modules/moderngl/default.nix +++ b/pkgs/development/python-modules/moderngl/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "moderngl"; - version = "5.8.0"; + version = "5.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eudtjF6NanAFFDHqHOVLfcBBX02mpIIPW3gqvZV7Dds="; + hash = "sha256-li7QA9jXZL0z4C508bOxwMdaG5L1HwONKhMJwG9OXLg="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix index ee51cdd7cd50..7c29e3e2e7b9 100644 --- a/pkgs/development/python-modules/nibe/default.nix +++ b/pkgs/development/python-modules/nibe/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nibe"; - version = "2.0.0"; + version = "2.1.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-e5rKtVFSlB4sFBrBHKrZmHq/sJEL9VZejSpUgeCwCzw="; + hash = "sha256-gz5+vGjZAU+sBqtQJWi8MR5PL7ZpKQcdR6CmImxEi28="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pure-protobuf/default.nix b/pkgs/development/python-modules/pure-protobuf/default.nix new file mode 100644 index 000000000000..afd2835475cb --- /dev/null +++ b/pkgs/development/python-modules/pure-protobuf/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools-scm +, toml +, pytestCheckHook +, pytest-benchmark +, hatch-vcs +, hatchling +}: + +buildPythonPackage rec { + pname = "pure-protobuf"; + version = "2.2.3"; + + format = "pyproject"; + disabled = pythonOlder "3.7"; + + # PyPi lacks tests. + src = fetchFromGitHub { + owner = "eigenein"; + repo = "protobuf"; + rev = version; + hash = "sha256-FsVWlYPav4uusdEPXc5hScLeNJWfbSjGOLuZ7yZXyCw="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + checkInputs = [ + pytestCheckHook + pytest-benchmark + ]; + + pythonImportsCheck = [ + "pure_protobuf" + ]; + + meta = with lib; { + description = "Python implementation of Protocol Buffers with dataclass-based schemas"; + homepage = "https://github.com/eigenein/protobuf"; + license = licenses.mit; + maintainers = with maintainers; [ chuangzhu ]; + }; +} diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix index e984e5767383..55c11fe8f9ef 100644 --- a/pkgs/development/python-modules/pyscf/default.nix +++ b/pkgs/development/python-modules/pyscf/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage , lib , fetchFromGitHub -, fetchpatch , cmake , blas , libcint @@ -17,21 +16,15 @@ buildPythonPackage rec { pname = "pyscf"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "pyscf"; repo = pname; rev = "v${version}"; - hash = "sha256-KMxwyAK00Zc0i76zWTMznfXQCVCt+4HOH8SlwuOCORk="; + hash = "sha256-3ylFz5j176hBQLklLmVKltE8whynzojsoBEWjEL2M14="; }; - patches = [ (fetchpatch { - name = "libxc-6"; # https://github.com/pyscf/pyscf/pull/1467 - url = "https://github.com/pyscf/pyscf/commit/ebcfacc90e119cd7f9dcdbf0076a84660349fc79.patch"; - hash = "sha256-O+eDlUKJeThxQcHrMGqxjDfRCmCNP+OCgv/L72jAF/o="; - })]; - # setup.py calls Cmake and passes the arguments in CMAKE_CONFIGURE_ARGS to cmake. nativeBuildInputs = [ cmake ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index ece7a81de42c..8a1f70b2a1cd 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -38,7 +38,9 @@ buildPythonPackage rec { cryptography httpx pytz - ] ++ httpx.optional-dependencies.socks; + ] + ++ httpx.optional-dependencies.socks + ++ httpx.optional-dependencies.http2; nativeCheckInputs = [ beautifulsoup4 diff --git a/pkgs/development/python-modules/pyvirtualdisplay/default.nix b/pkgs/development/python-modules/pyvirtualdisplay/default.nix index 90b3e0b118b2..0ba6c4ba6c00 100644 --- a/pkgs/development/python-modules/pyvirtualdisplay/default.nix +++ b/pkgs/development/python-modules/pyvirtualdisplay/default.nix @@ -1,10 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, EasyProcess }: +{ lib, buildPythonPackage, fetchPypi, easyprocess }: buildPythonPackage rec { pname = "pyvirtualdisplay"; version = "3.0"; - propagatedBuildInputs = [ EasyProcess ]; + propagatedBuildInputs = [ easyprocess ]; src = fetchPypi { pname = "PyVirtualDisplay"; diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix index 90d179bffad4..7ed829df1679 100644 --- a/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/pkgs/development/python-modules/screenlogicpy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "screenlogicpy"; - version = "0.8.1"; + version = "0.8.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dieselrabbit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cnQ3YqVz0AfEVma/RfQuB5kOBxo59qJJBn7PwaEe8Ro="; + hash = "sha256-7w2cg+LfL3w2Xxf8s7lFxE/HkqZ6RBYp8LkZTOwgK+I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sexpdata/default.nix b/pkgs/development/python-modules/sexpdata/default.nix index 4502c6e38ae6..45c0224e30af 100644 --- a/pkgs/development/python-modules/sexpdata/default.nix +++ b/pkgs/development/python-modules/sexpdata/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sexpdata"; - version = "0.0.4"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - hash = "sha256-5Xb2Lq0y1QQeYw+UV9LBp1RNf+XdlqSbVRWSORFcN3M="; + hash = "sha256-6NX3XDeKB8bRzGH62WEbRRyTg8AlMFLhYZioUuFiBwU="; }; doCheck = false; diff --git a/pkgs/development/python-modules/social-auth-app-django/default.nix b/pkgs/development/python-modules/social-auth-app-django/default.nix index 960e01cfa219..e4400ec2d9c6 100644 --- a/pkgs/development/python-modules/social-auth-app-django/default.nix +++ b/pkgs/development/python-modules/social-auth-app-django/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "social-auth-app-django"; - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "python-social-auth"; repo = "social-app-django"; - rev = version; - hash = "sha256-ONhdXxclHRpVtijpKEZlmGDhjid/jnTaPq6LQtjxCC4="; + rev = "refs/tags/${version}"; + hash = "sha256-QZZSwPyQKtcKe1Dij4MjRnKGudg6A6cmS4FGb2F1goY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tlv8/default.nix b/pkgs/development/python-modules/tlv8/default.nix new file mode 100644 index 000000000000..05ece63e42e0 --- /dev/null +++ b/pkgs/development/python-modules/tlv8/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "tlv8"; + version = "0.10.0"; + format = "setuptools"; + + # pypi does not contain test files + src = fetchFromGitHub { + owner = "jlusiardi"; + repo = "tlv8_python"; + rev = "v${version}"; + sha256 = "sha256-G35xMFYasKD3LnGi9q8wBmmFvqgtg0HPdC+y82nxRWA="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "tlv8" + ]; + + meta = with lib; { + description = "Type-Length-Value8 (TLV8) for Python"; + longDescription = '' + Python module to handle type-length-value (TLV) encoded data 8-bit type, 8-bit length, and N-byte + value as described within the Apple HomeKit Accessory Protocol Specification Non-Commercial Version + Release R2. + ''; + homepage = "https://github.com/jlusiardi/tlv8_python"; + license = licenses.asl20; + maintainers = with maintainers; [ jojosch ]; + }; +} diff --git a/pkgs/development/python-modules/tplink-omada-client/default.nix b/pkgs/development/python-modules/tplink-omada-client/default.nix index 9622e67b41b9..a0188f907a60 100644 --- a/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tplink-omada-client"; - version = "1.1.3"; + version = "1.1.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tplink_omada_client"; inherit version; - hash = "sha256-Ppo/vv15fcwN7qTiLO8umF6ig3C8k0Z974znviWcY8c="; + hash = "sha256-fx954JstCdvJQY1xgoqcfJpB8fZSS4kST/f3yiJZ7lA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/transmission-rpc/default.nix b/pkgs/development/python-modules/transmission-rpc/default.nix index 05d5c28dbf08..20fc4c3b31c4 100644 --- a/pkgs/development/python-modules/transmission-rpc/default.nix +++ b/pkgs/development/python-modules/transmission-rpc/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "transmission-rpc"; - version = "4.1.0"; + version = "4.1.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Trim21"; repo = "transmission-rpc"; rev = "refs/tags/v${version}"; - hash = "sha256-LHxB3VkpUlDupqOybvnhW8ER1gvu4vex6dT3m9y0r4o="; + hash = "sha256-GF2dXvtYgXTjdcellyCPFFTjp4Y6PKb2ihQETfomgU4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 1f2c0fc39865..a8614aa5bba9 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.20.1"; + version = "3.20.2"; src = fetchPypi { inherit pname version; - hash = "sha256-UUkzHQoRCC7SmQgA4uz09J/KRxizr5LhwCYobINY1gc="; + hash = "sha256-6tSrWovgVTEccDelUFrw8E1ghyiPmUsEASW8kGPUBhM="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index dd075bd37023..97538aa78cfa 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "4.21.0.7"; + version = "4.22.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-bsrdzHrtLGNnRaF8FBGTLN73oDUwTVD/1BQCl7a4gug="; + hash = "sha256-vytBTYFdw4fAoEHZIH2wVMfNuUWRuyM9m3GoUkPgXvw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix index e58e29a97435..fd5b99448d48 100644 --- a/pkgs/development/python-modules/zfec/default.nix +++ b/pkgs/development/python-modules/zfec/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , pyutil -, setuptoolsTrial , twisted }: @@ -17,12 +16,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyutil ]; - nativeCheckInputs = [ setuptoolsTrial twisted ]; + nativeCheckInputs = [ twisted ]; - # argparse is in the stdlib but zfec doesn't know that. - postPatch = '' - sed -i -e '/argparse/d' setup.py - ''; + checkPhase = "trial zfec"; pythonImportsCheck = [ "zfec" ]; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 278098453f14..1602fcea018d 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -23,14 +23,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.3.95"; + version = "2.3.96"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-M7Qy7+yh1LZlMq3cN5HJ2IHea4qBlLr7ckT0v/PuunI="; + hash = "sha256-jQ5VaOvJkxhZ0fHrNmkuFK+qmRUNdzR5XCWqWv1iBs4="; }; patches = [ @@ -114,7 +114,7 @@ buildPythonApplication rec { # Tests are comparing console output "cli" "console" - # Starting to fail after 2.3.95 + # Starting to fail after 2.3.96 "test_runner_verify_secrets_skip" ]; diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index f49972839a09..ffbf1a33130e 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": "0.2.0", + "version": "0.2.1", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "0fv4ph1pf924wf3vmzri68s79i4kxgmp2fl9qy9v14ff71bbnyv5" + "sha256": "184ywxdqn729pjnhmy3y02j9zwvy89a4g95wng35j0wdlyrv7j1f" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "1h5kvd1wf6x3xis15bdrsvrivs8zmbvggcaspr9brsjw38q13c7q" + "sha256": "0g55svbzy7nlrs7hn6lfn428zndahcln34p2szf6yx180h56irns" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "1p4gkghbfs5cac4k7760nnsdf7m5i5d4f568m8xsyfx8nkhpyw1w" + "sha256": "1hm0gf4bq4hhnd54rlzpv6sbl1vyp6gzsswc8kyk7f31mzazqg14" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "0xk4n71lgg91kkjk0633sz04s2ypyjkig9vsxg60b16gzm7z4j22" + "sha256": "1v7hbr1wk89wzvdja2pdzridrdvw6vsb7qfsqx8fl6xi613wn66p" } } } diff --git a/pkgs/development/tools/changie/default.nix b/pkgs/development/tools/changie/default.nix index 79d105128ba9..f4593cbedbf0 100644 --- a/pkgs/development/tools/changie/default.nix +++ b/pkgs/development/tools/changie/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "changie"; - version = "1.11.1"; + version = "1.12.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "miniscruff"; repo = pname; - sha256 = "sha256-IZiGNmVEOJf7sqJHXCXxptfy79mSnyyyiqf+oS41MgI="; + sha256 = "sha256-lc9G5qZHjO2TxBKYP3fVr8Ui+hskhVon3xG7RznGhaw="; }; - vendorSha256 = "sha256-0/3Ou8z6yLWhc81hdN2gkaFLLlKQWUGcIdvRHVLTrjQ="; + vendorSha256 = "sha256-sak9MMqMXBO3j5uMouuiVnT8aCw04pyikgqzvdygB7U="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/continuous-integration/dagger/default.nix b/pkgs/development/tools/continuous-integration/dagger/default.nix index d43fd51cc30e..e99eba1d3522 100644 --- a/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dagger"; - version = "0.3.13"; + version = "0.4.0"; src = fetchFromGitHub { owner = "dagger"; repo = "dagger"; rev = "v${version}"; - hash = "sha256-J+3wihsZx8ZnanWfahtd9J659dUaQXbD0lz2uMHLb3E="; + hash = "sha256-xSEO1UD5piTFBBdse45yPAXKEwUm2tCxvwNTrlfgRNk="; }; - vendorHash = "sha256-r8XJrHU8ToqW7CqvpYoHcM0skqWOXZxFAyQQZ2yIBQ4="; + vendorHash = "sha256-nBlebDN1TsB+RFArl5fR3xyz5FWr4wOxL+9oWVvOpwI="; proxyVendor = true; subPackages = [ diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix index 77a206545150..b33d0647cad9 100644 --- a/pkgs/development/tools/diesel-cli/default.nix +++ b/pkgs/development/tools/diesel-cli/default.nix @@ -25,15 +25,15 @@ in rustPlatform.buildRustPackage rec { pname = "diesel-cli"; - version = "2.0.0"; + version = "2.0.1"; src = fetchCrate { inherit version; crateName = "diesel_cli"; - sha256 = "sha256-PBfVLqm9vEbf1tDTx4v8U1amYwC0hpYTAYcWyfHB84g="; + sha256 = "sha256-IHxK5hI0RYNFQQe/Kfao0Zw8L3bs1gdN1xwmO4kKi08="; }; - cargoSha256 = "sha256-8bvJwdZEdIChFUdTVL+EyjzqI+OAJaVMOOyspReSFzc="; + cargoSha256 = "sha256-KoTeDzUk/KbUx+4NLVifX3yehm4V13LJ/YUmzoUSuDM="; nativeBuildInputs = [ installShellFiles pkg-config ]; diff --git a/pkgs/development/tools/gci/default.nix b/pkgs/development/tools/gci/default.nix index 97b4d50a2328..09a6351ca7a9 100644 --- a/pkgs/development/tools/gci/default.nix +++ b/pkgs/development/tools/gci/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "gci"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "daixiang0"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zzhQxnFI1xCv+FyP/rrAMX7pCMkGWF/yyVll+zKNo8c="; + sha256 = "sha256-/YR61lovuYw+GEeXIgvyPbesz2epmQVmSLWjWwKT4Ag="; }; vendorHash = "sha256-g7htGfU6C2rzfu8hAn6SGr0ZRwB8ZzSf9CgHYmdupE8="; diff --git a/pkgs/development/tools/hatch/default.nix b/pkgs/development/tools/hatch/default.nix index 026aa6f2fc30..f6760d5938a6 100644 --- a/pkgs/development/tools/hatch/default.nix +++ b/pkgs/development/tools/hatch/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchFromGitHub +, fetchPypi , python3 , git }: @@ -10,11 +10,9 @@ python3.pkgs.buildPythonApplication rec { version = "1.6.3"; format = "pyproject"; - src = fetchFromGitHub { - owner = "pypa"; - repo = "hatch"; - rev = "hatch-v${version}"; - hash = "sha256-3nPh6F+TmLoogz9FgaZMub7hPJIzANCY4oWk9Mq22Pc="; + src = fetchPypi { + inherit pname version; + hash = "sha256-ZQ5nG6MAMY5Jjvk7vjuZsyzhSSB2T7h1P4mZP2Pu15o="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -73,7 +71,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Modern, extensible Python project manager"; homepage = "https://hatch.pypa.io/latest/"; - changelog = "https://github.com/pypa/hatch/blob/${src.rev}/docs/history.md#hatch"; + changelog = "https://github.com/pypa/hatch/blob/hatch-v${version}/docs/history.md#hatch"; license = licenses.mit; maintainers = with maintainers; [ onny ]; }; diff --git a/pkgs/development/tools/language-servers/svls/default.nix b/pkgs/development/tools/language-servers/svls/default.nix index 5b5b87b0392f..fef2306b1cd7 100644 --- a/pkgs/development/tools/language-servers/svls/default.nix +++ b/pkgs/development/tools/language-servers/svls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svls"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "dalance"; repo = "svls"; rev = "v${version}"; - sha256 = "sha256-1qYTYAXNMM3umRFpWoij8VU3rhBI4QWePa5Uaz2Y4Ik="; + sha256 = "sha256-+auy6LfvT7OCCSM/WNjnzFsBTAHS+kcghOaMpG3f9dA="; }; - cargoSha256 = "sha256-il7n8uxeXPKCBpRv3rqZZzqWjfpy558YNKBs9qOJ2oI="; + cargoHash = "sha256-ZNYYb0Ji4AmiXfhKMPK/4MPfFYSmnUeeeTmiq6rpBvg="; meta = with lib; { description = "SystemVerilog language server"; diff --git a/pkgs/development/tools/misc/nrfutil/default.nix b/pkgs/development/tools/misc/nrfutil/default.nix index 37197727974e..e0b65b4ccc75 100644 --- a/pkgs/development/tools/misc/nrfutil/default.nix +++ b/pkgs/development/tools/misc/nrfutil/default.nix @@ -8,13 +8,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "nrfutil"; - version = "6.1.6"; + version = "6.1.7"; src = fetchFromGitHub { owner = "NordicSemiconductor"; repo = "pc-nrfutil"; - rev = "v${version}"; - sha256 = "sha256-UiGNNJxNSpIzpeYMlzocLG2kuetl8xti5A3n6zz0lcY="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-WiXqeQObhXszDcLxJN8ABd2ZkxsOUvtZQSVP8cYlT2M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index e814d78aa679..66c14bd07e0e 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "patchelf"; - version = "unstable-2022-10-26"; + version = "unstable-2023-03-07"; src = fetchFromGitHub { owner = "NixOS"; repo = "patchelf"; - rev = "af77f12554be9cc4b9e8b639df26f2659dd30500"; - sha256 = "sha256-ajMOC1wyTVUOvP0rOt/uO6+1+S4bIAc1jWQ8Uwbzrn8="; + rev = "ea2fca765c440fff1ff74e1463444dea7b819db2"; + sha256 = "sha256-IH80NcLhwjGpIXEjHuV+NgaSC+Y/PXquxZ/C8Bl+CLk="; }; # Drop test that fails on musl (?) diff --git a/pkgs/development/tools/rain/default.nix b/pkgs/development/tools/rain/default.nix index 07db283bff70..7980f2783f2f 100644 --- a/pkgs/development/tools/rain/default.nix +++ b/pkgs/development/tools/rain/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "rain"; - version = "1.2.0"; + version = "1.3.3"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6YKZy6sdy1Yi2cDaLMA54GBTZ9uPhYi5Cq5QqCGbD5k="; + sha256 = "sha256-34BHWvXwwdiFotVlV8U6HSkRy9TvJ6DLIC0Mpz//C3w="; }; - vendorSha256 = "sha256-e3R8+xarofbx3Ky6JIfDbysTQETCUaQj/QmzAiU7fZk="; + vendorHash = "sha256-h/9a+o/jiNH2b1XIkbnKXSpCsBtyIhdOGyTNHU+Q/bA="; subPackages = [ "cmd/rain" ]; diff --git a/pkgs/development/tools/run/default.nix b/pkgs/development/tools/run/default.nix index c6ee65d79cd1..585da934955c 100644 --- a/pkgs/development/tools/run/default.nix +++ b/pkgs/development/tools/run/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "run"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "TekWizely"; repo = "run"; rev = "v${version}"; - sha256 = "sha256-EIzIkew1JXPeUN3guLEjAwR0kBDrMkQtSUiBJd+Ww7E="; + sha256 = "sha256-an5AuRJJEM18IssdLLZC/zzPpsVCCtawRQXK/AfzMN0="; }; vendorHash = "sha256-BAyhuE9hGGDfDGmXQ7dseUvHlK5vC87uLT78lHSvLeg="; diff --git a/pkgs/development/tools/rust/cargo-diet/default.nix b/pkgs/development/tools/rust/cargo-diet/default.nix index a809e02fe313..f3804f4d1706 100644 --- a/pkgs/development/tools/rust/cargo-diet/default.nix +++ b/pkgs/development/tools/rust/cargo-diet/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-diet"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "the-lean-crate"; repo = pname; rev = "v${version}"; - sha256 = "sha256-olF+F2y7F3ZpyluyslRDlfRKkWmE+zJ01bXyzy9x5EQ="; + sha256 = "sha256-JzhSTbEf2Yl5cEIb+88y+s8lUN6c1Mir4NYvzAWMZwY="; }; - cargoSha256 = "sha256-ayi7Px1A8XzswlGnm31YWF7+8+lBChBaVJFwozSAimw="; + cargoSha256 = "sha256-zW6ec8DHzP6AuNI6fcOQLH03ca+/yjdh56nltSM9pAA="; meta = with lib; { description = "Help computing optimal include directives for your Cargo.toml manifest"; diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix index 576c9eacd74d..90bcbffa37d7 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "regexident"; repo = pname; rev = version; - sha256 = "sha256-G9ResHOBEqnKsMXVbr8q1rvywFI8LJcb8gR7hMTI0p4="; + sha256 = "sha256-H0NC+rKRnHaLPHUSYMdkQHfIgQignrTlNCfDwYpro7I="; }; - cargoSha256 = "sha256-p6mq+P9ntlhjMPHpcwXV9XBlAX6R63Iqastl9ZHI8Vs="; + cargoSha256 = "sha256-C7YUAq0b8HyDZx++TT3Elr4hxgtyaRrVXCxOdRwpTFU="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 83626a6362fe..d0a6665dcbdf 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2023-03-06"; - cargoSha256 = "sha256-K4zaspweDhzkl0iFvW/6s2Qonj0Waepy0viX6U7x844="; + version = "2023-03-13"; + cargoSha256 = "sha256-dyQpgh+htNQDa8voj6NormTw2TmnlId6iS6cQ2LEB/U="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-Njlus+vY3N++qWE0JXrGjwcXY2QDFuOV/7NruBBMETY="; + sha256 = "sha256-3DHDfYCLn0clUXoUPqU5FjJFDkiqff7zMhIRHh3QU2M="; }; auditable = true; # TODO: remove when this is the default diff --git a/pkgs/development/tools/rust/typeshare/default.nix b/pkgs/development/tools/rust/typeshare/default.nix index afcdedd9bf88..7107ca197210 100644 --- a/pkgs/development/tools/rust/typeshare/default.nix +++ b/pkgs/development/tools/rust/typeshare/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "typeshare"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "1password"; repo = "typeshare"; rev = "v${version}"; - hash = "sha256-FQ9KL8X7zz3ew+H1lhh4bkZ01Te1TD+QXAMxS8dXAaI="; + hash = "sha256-zY1Z2TT1D3mgnnepRih88U+tpPQWWnAtxt5yAVuoBbk="; }; - cargoHash = "sha256-t6tGNHmPasmTRto2hobvJywrF/8tO79zkfWwa6lCPK8="; + cargoHash = "sha256-kMmjuPR5h2sVcnilUVt0SEZYcOEgXzM8fPC6Ljg6+d0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/sq/default.nix b/pkgs/development/tools/sq/default.nix index ca0f28625c2a..be5a71873982 100644 --- a/pkgs/development/tools/sq/default.nix +++ b/pkgs/development/tools/sq/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sq"; - version = "0.24.1"; + version = "0.24.4"; src = fetchFromGitHub { owner = "neilotoole"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7P29t90LbKM+ng8ac7HL5uA90rIvZIfue2bxZ6coQ9k="; + sha256 = "sha256-oUr0qNqy2rcSMSpNed2ynrArscOgdIu/u8DgiJxr080="; }; vendorHash = "sha256-AL4ghkeTIkXZXpGeBnWIx3hY6uO2bO7eVcH6DR/5jQc="; diff --git a/pkgs/development/tools/zed/default.nix b/pkgs/development/tools/zed/default.nix index 94c1cdaa01a9..4df6eaa4107e 100644 --- a/pkgs/development/tools/zed/default.nix +++ b/pkgs/development/tools/zed/default.nix @@ -7,23 +7,23 @@ buildGoModule rec { pname = "zed"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "brimdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-er3BPQ10ERCIBn0xx0jjyMBybnUBMyX76tqYEYe2WYQ="; + sha256 = "sha256-+GVcYkzcVNa62595c4tLRBLTGh+qvdyFtQtFlfMarLs="; }; - vendorHash = "sha256-3PyyR9d5m33ohbcstREvTOtWwMIrbFNvFyBY1F+6R+4="; + vendorHash = "sha256-pxe3l93fBBKuVPBSGCB7ORiwQ+YCNIN9BQDxBM7QCHQ="; subPackages = [ "cmd/zed" "cmd/zq" ]; ldflags = [ "-s" "-w" - "-X=github.com/brimdata/zed/cli.Version=${version}" + "-X=github.com/brimdata/zed/cli.version=${version}" ]; passthru.tests = { diff --git a/pkgs/development/web/bootstrap-studio/default.nix b/pkgs/development/web/bootstrap-studio/default.nix index 988c27981460..67b2af313a6a 100644 --- a/pkgs/development/web/bootstrap-studio/default.nix +++ b/pkgs/development/web/bootstrap-studio/default.nix @@ -2,10 +2,10 @@ let pname = "bootstrap-studio"; - version = "6.0.1"; + version = "6.2.1"; src = fetchurl { url = "https://bootstrapstudio.io/releases/desktop/${version}/Bootstrap%20Studio.AppImage"; - sha256 = "sha256-piRqIB/bCF0IBZfXdlXrc7gmPTIUDbk8xhP7X5ozyWg="; + sha256 = "sha256-1+3YCM1K2k1Gga7Y2ciMqmwzxYJQ7Ab5uDHP1iHXK7g="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/games/heroic/fhsenv.nix b/pkgs/games/heroic/fhsenv.nix index d3625ad129b6..172e1aeafacb 100644 --- a/pkgs/games/heroic/fhsenv.nix +++ b/pkgs/games/heroic/fhsenv.nix @@ -71,6 +71,7 @@ buildFHSUserEnv { libGLU libglvnd libgpg-error + libgudev libjpeg libkrb5 libmpeg2 @@ -81,22 +82,31 @@ buildFHSUserEnv { libselinux libsndfile libsndfile + libsoup libtheora libtiff libusb1 libv4l libva + libvdpau libvorbis + libvpx + libwebp libxkbcommon libxml2 mpg123 ncurses ocl-icd + openal openldap + openssl + openssl_1_1 + pango pipewire samba4 sane-backends SDL2 + speex sqlite udev udev diff --git a/pkgs/games/rbdoom-3-bfg/default.nix b/pkgs/games/rbdoom-3-bfg/default.nix new file mode 100644 index 000000000000..99264a19e3c3 --- /dev/null +++ b/pkgs/games/rbdoom-3-bfg/default.nix @@ -0,0 +1,82 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, directx-shader-compiler +, libGLU +, libpng +, libjpeg_turbo +, openal +, rapidjson +, SDL2 +, vulkan-headers +, vulkan-loader +, zlib +}: + +stdenv.mkDerivation rec { + pname = "rbdoom-3-bfg"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "RobertBeckebans"; + repo = pname; + rev = "v${version}"; + hash = "sha256-r/dvTirgFXdBJ+Gjl6zpHoGCTPoo0tRmOCV9oCdnltI="; + fetchSubmodules = true; + }; + + patches = [ + (fetchpatch { + name = "remove-jpeg_internals-define.patch"; + url = "https://github.com/RobertBeckebans/RBDOOM-3-BFG/commit/de6ab9d31ffcd6eba26df69f8c77da38a0ab4722.diff"; + hash = "sha256-3XbWmQtY/8a90IqDtN5TNT5EOa+i5mFOH+H9tuZqTmU="; + }) + ]; + + nativeBuildInputs = [ + cmake + directx-shader-compiler + ]; + + buildInputs = [ + libGLU + libpng + libjpeg_turbo + openal + rapidjson + SDL2 + vulkan-headers + vulkan-loader + zlib + ]; + + cmakeDir = "../neo"; + cmakeFlags = [ + "-DFFMPEG=OFF" + "-DBINKDEC=ON" + "-DUSE_SYSTEM_LIBGLEW=ON" + "-DUSE_SYSTEM_LIBPNG=ON" + "-DUSE_SYSTEM_LIBJPEG=ON" + "-DUSE_SYSTEM_RAPIDJSON=ON" + "-DUSE_SYSTEM_ZLIB=ON" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install RBDoom3BFG $out/bin/RBDoom3BFG + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/RobertBeckebans/RBDOOM-3-BFG"; + description = "Doom 3 BFG Edition with modern engine features"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ Zaechus ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/misc/jitsi-meet-prosody/default.nix b/pkgs/misc/jitsi-meet-prosody/default.nix index f8e57cf12a36..7d00c7586e09 100644 --- a/pkgs/misc/jitsi-meet-prosody/default.nix +++ b/pkgs/misc/jitsi-meet-prosody/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-prosody"; - version = "1.0.6644"; + version = "1.0.6943"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "41jlcsJpcFlNdBIOAdzTUF3wOUAOS9upF/uxFQaGULc="; + sha256 = "MrLRA0XdaDWD7frh4XDXLTcjsAYWal5qwT5C6cq4MKc="; }; dontBuild = true; diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index ec3d0f880f84..8e09d0825cf6 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "fwts"; - version = "22.09.00"; + version = "23.01.00"; src = fetchzip { url = "https://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "sha256-BaaUvRbon8V8RvAgw+AC9MCHC65Y/NFT1iFZ+B8P2Hk="; + sha256 = "sha256-HuAjT4RuWup+h7ZzAKH8ez81RtuNj/JT8ilL8Ps+P0c="; stripRoot = false; }; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index d017d1e1d8e9..32432898e69b 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,61 +2,61 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.307-hardened1.patch", - "sha256": "0fqif3brjhjfwdxjwm12allj5pdgdlfm83h6izlgxkn5iy05cviq", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.307-hardened1/linux-hardened-4.14.307-hardened1.patch" + "name": "linux-hardened-4.14.309-hardened1.patch", + "sha256": "0j9dnrxn75qigfv2jq8aa76jli80bi56hriy205qar99vgp59a8a", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.309-hardened1/linux-hardened-4.14.309-hardened1.patch" }, - "sha256": "00dp0vj9572ig4zsnmhl2a2v5vx40hnjibyifw24x1q6qdaia72f", - "version": "4.14.307" + "sha256": "1rwhz9w5x2x3idy2f0bpk945qam6xxswbn69wmz8y1ik9b1nns09", + "version": "4.14.309" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.275-hardened1.patch", - "sha256": "0ni0ig82zbmfngcm1la2frcihxjaaf0y1ki0vv6gqzxpsp5xz0nq", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.275-hardened1/linux-hardened-4.19.275-hardened1.patch" + "name": "linux-hardened-4.19.277-hardened1.patch", + "sha256": "16q0lc5nzzf372mlkjvg8vr67afnz0jxwv3zvvg6ip3k7gljphfz", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.277-hardened1/linux-hardened-4.19.277-hardened1.patch" }, - "sha256": "02l6f5y1cbjc9997lmcak5j8dllkzr8q47nqscqsyvz2c2hnzsdg", - "version": "4.19.275" + "sha256": "137mjk6hzpr120bb6ky3b8q4jnkbgqla0cpgnhzpcng00aidk0pn", + "version": "4.19.277" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.172-hardened1.patch", - "sha256": "1ik2l453bgqcpqrhdf4gy6qdlvqknz9i7s9s9pynvk4lpvva34zc", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.172-hardened1/linux-hardened-5.10.172-hardened1.patch" + "name": "linux-hardened-5.10.174-hardened1.patch", + "sha256": "0zgp7jl16227fjj9j5zwahxa5xbkp2gkznpvzh68sanwd04qzby3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.174-hardened1/linux-hardened-5.10.174-hardened1.patch" }, - "sha256": "1c9757gma0dksd1ch8pljbsmf586bq66gxqpsv53676z8kivl3gj", - "version": "5.10.172" + "sha256": "092ai8ggplsa933s3qlayyjkw9d3z6sg782byh7rz0ym0380r2ig", + "version": "5.10.174" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.98-hardened1.patch", - "sha256": "1d1jfx0m59j4b7kk476x11af5h5hy8f5n4d6h419qylnibm22573", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.98-hardened1/linux-hardened-5.15.98-hardened1.patch" + "name": "linux-hardened-5.15.102-hardened1.patch", + "sha256": "05cxqcwr6fh2v69n4s30gs0pdw5i8h8kvrp3kzz0n2zb2afg6c8z", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.102-hardened1/linux-hardened-5.15.102-hardened1.patch" }, - "sha256": "11vpngxqih2f3sn9v1h8ccjywsj0m5p8i98n0fvck5azlk9jrikx", - "version": "5.15.98" + "sha256": "1rh1kcvaz42brn5sxqq00mvy0b36fck196yvxfg7b5qbjzxxs724", + "version": "5.15.102" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.234-hardened1.patch", - "sha256": "06jc2060v259wblbl38dcsk5vi61lbf4y8aipppy5lqd25rpm12y", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.234-hardened1/linux-hardened-5.4.234-hardened1.patch" + "name": "linux-hardened-5.4.236-hardened1.patch", + "sha256": "07540gv79ah7n2vvmqa5nq0rjh6y0al78wmqwlzc2xdfmahk63mj", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.236-hardened1/linux-hardened-5.4.236-hardened1.patch" }, - "sha256": "1489jnp4vb8p879hq1nx3xgyzjdwj1zalk3x4vcbnc9f7yrrrixc", - "version": "5.4.234" + "sha256": "0la92nvqihg4284risb2ljsrdh8x4wy0dwc3wsyq09bgm7x95j6c", + "version": "5.4.236" }, "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.15-hardened1.patch", - "sha256": "14svc378i43jv9cbv97gibmmr8pwf39dcjvjaqlbwfmhiwikj975", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.15-hardened1/linux-hardened-6.1.15-hardened1.patch" + "name": "linux-hardened-6.1.19-hardened1.patch", + "sha256": "0ax948idfyzpd7x8cp89m9lrwy30d4clj8z7ih919iji5nggjmvh", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.19-hardened1/linux-hardened-6.1.19-hardened1.patch" }, - "sha256": "1zf48h34cz4chv0n12xlif0n7fdzbri2v8am1nn68bla2vidy5ic", - "version": "6.1.15" + "sha256": "0iw6b9gmhpk6r1asds5kfg6drqvaxy15xicqx9ga873cbxp1r6cy", + "version": "6.1.19" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index fbc5c4f365e2..199223931572 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.309"; + version = "4.14.310"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1rwhz9w5x2x3idy2f0bpk945qam6xxswbn69wmz8y1ik9b1nns09"; + sha256 = "0r91f3jj3y0cca4sfs0xa12lbrc62q2yzgval5ainwr74bk7dwlb"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 5d0bc148da55..71b933e9c4b3 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.277"; + version = "4.19.278"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "137mjk6hzpr120bb6ky3b8q4jnkbgqla0cpgnhzpcng00aidk0pn"; + sha256 = "0miyadgnd52cgw3bgpmx66kr1pgxh14b2f52fasy57b6wysv0lnv"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 94e55a5714a6..61cad1f4a564 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.174"; + version = "5.10.175"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "092ai8ggplsa933s3qlayyjkw9d3z6sg782byh7rz0ym0380r2ig"; + sha256 = "1kkv63v5lc0ahkl8sjmwhqxahmwmbxcbf4mfcmkf6d7j50p5cxz2"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index a2bd4e054c8c..07d686d21bff 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.102"; + version = "5.15.103"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1rh1kcvaz42brn5sxqq00mvy0b36fck196yvxfg7b5qbjzxxs724"; + sha256 = "01fpipy8skmp4dyxgk8fk9k6hc0w0gvk7mm8f8pm7jhwcf0vlxh8"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index e62fa1c41c43..abffbf2eddb5 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.236"; + version = "5.4.237"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0la92nvqihg4284risb2ljsrdh8x4wy0dwc3wsyq09bgm7x95j6c"; + sha256 = "09smq8jsbpqfh135snljack2wj41anx8f8i0lmjcqcq5zzhgw25p"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index ec276b05acff..45bbb81937a4 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.19"; + version = "6.1.20"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "0iw6b9gmhpk6r1asds5kfg6drqvaxy15xicqx9ga873cbxp1r6cy"; + sha256 = "1w1iy1i3bpzrs5rhvqbn2awxv5qqgng9n7jd5js66g0sq3l2sckn"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-6.2.nix b/pkgs/os-specific/linux/kernel/linux-6.2.nix index 790d9aae9f14..bdc0d119e49c 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.2.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.2.6"; + version = "6.2.7"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "179x1fqgi3drg1q1xy0648hvy7cpc79yzn2r248rq4mprvbz3qhz"; + sha256 = "138dpmj8qr5fcji99kmi3sj34ah21bgqgzsz2lbhn37v059100s3"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 59622c62702b..3bf3951f7605 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19102"; - sha256 = "1w9zl7grws1nzq4zp4mj1v5a6akqwkzy9lf0wwdar68jbxav3fvf"; + rev = "19109"; + sha256 = "1z8qbfrn489bsi4grpw5dzw8f5jzml0swngfflh8flb80zcq0s2p"; } , ... }: diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 1a6d077aa242..d92ccc346386 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -250,10 +250,10 @@ in { # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.1.10-staging-2023-03-02"; - rev = "9d2e5c14b2f94c91aa389799bd9e80e1098263e7"; + version = "2.1.10-staging-2023-03-15"; + rev = "a5c469c5f380b09705ad0bee15e2ca7a5f78213c"; - sha256 = "sha256-E+nLmmSSPtGDjqBQp2GXJsYR2zCEpcxU0/9BD5QHdnA="; + sha256 = "sha256-CdPuyZMXFzANEdnsr/rB5ckkT8X5uziniY5vmRCKl1U="; isUnstable = true; }; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 2281031a6449..0c8913646309 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "22.05.8.1"; + version = "23.02.0.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "sha256-hL/FnHl+Fj62xGH1FVkB9jVtvrVxbPU73DlMWC6CyJ0="; + sha256 = "sha256-MxlrDLdPKtYF2xpX2q0i0DHinEL6BIzIGAxqTwWX/k0="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 6c6fe319c5cb..c22782960c68 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.3.4"; + version = "2023.3.5"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 47dd5272212b..b8347dea399c 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -69,6 +69,15 @@ let ]; }); + bimmer-connected = super.bimmer-connected.overridePythonAttrs (oldAttrs: rec { + version = "0.12.1"; + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + rev = "refs/tags/${version}"; + hash = "sha256-wLQ2UkedLSwfbUqmb85QgsDYh0zcbgQOMnhbRHW5Bnw="; + }; + }); + dsmr-parser = super.dsmr-parser.overridePythonAttrs (oldAttrs: rec { version = "0.33"; src = fetchFromGitHub { @@ -79,6 +88,34 @@ let }; }); + geojson = super.geojson.overridePythonAttrs (oldAttrs: rec { + version = "2.5.0"; + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + rev = "refs/tags/${version}"; + hash = "sha256-AcImffYki1gnIaZp/1eacNjdDgjn6qinPJXq9jYtoRg="; + }; + doCheck = false; + }); + + gios = super.gios.overridePythonAttrs (oldAttrs: rec { + version = "2.3.0"; + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + rev = "refs/tags/${version}"; + hash = "sha256-/lAENP9wKZ+h2Iq2e9S7s7Naa0CTl/I2cwCxBEAwsrA="; + }; + }); + + jaraco-abode = super.jaraco-abode.overridePythonAttrs (oldAttrs: rec { + version = "3.3.0"; + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + rev = "refs/tags/v${version}"; + hash = "sha256-LnbWzIST+GMtdsHDKg67WWt9GmHUcSuGZ5Spei3nEio="; + }; + }); + # Pinned due to API changes in 10.0 mcstatus = super.mcstatus.overridePythonAttrs (oldAttrs: rec { version = "9.3.0"; @@ -111,6 +148,15 @@ let }; }); + p1monitor = super.p1monitor.overridePythonAttrs (oldAttrs: rec { + version = "2.1.1"; + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + rev = "refs/tags/v${version}"; + hash = "sha256-VHY5AWxt5BZd1NQKzsgubEZBLKAlDNm8toyEazPUnDU="; + }; + }); + # Pinned due to API changes >0.3.5.3 pyatag = super.pyatag.overridePythonAttrs (oldAttrs: rec { version = "0.3.5.3"; @@ -132,6 +178,15 @@ let }; }); + pykaleidescape = super.pykaleidescape.overridePythonAttrs (oldAttrs: rec { + version = "1.0.1"; + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + rev = "refs/tags/v${version}"; + hash = "sha256-KM/gtpsQ27QZz2uI1t/yVN5no0zp9LZag1duAJzK55g="; + }; + }); + python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { pname = "python-slugify"; version = "4.0.1"; @@ -196,6 +251,15 @@ let ]; }); + subarulink = super.subarulink.overridePythonAttrs (oldAttrs: rec { + version = "0.7.0"; + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + rev = "refs/tags/v${version}"; + hash = "sha256-BxnpdZwbnZF1oWcu3jRDeXvcaweOuVk1R79KpMLB02c="; + }; + }); + # Pinned due to API changes in 0.3.0 tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec { version = "0.2.0"; @@ -263,7 +327,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.3.4"; + hassVersion = "2023.3.5"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -279,7 +343,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-BJCik8TxNzOsehD1fBNQO8Kvmb6ZaqEy4oEVmtIhwp0="; + hash = "sha256-+n42LnfZ0R0ugUkse2EJ0wPUHn4YctrAb7hkBd8+ZjA="; }; # Secondary source is git for tests @@ -287,7 +351,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-iwRjyOgQNTs54mnL3mlL9O3wVD5SWZIl+Hhxir6F+3o="; + hash = "sha256-v+c0hnY1Owr2YCQX8TVzKzYCLBsyUKPOvnVOjOeI6Dk="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 76462fc851bf..2874d2958916 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20230309.0"; + version = "20230309.1"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-gHc93xKIm0LDQrkTtlMdLv/N2smfYz5lQ6uLV+Cqj+s="; + hash = "sha256-o9NIJHmjr3hQxCNl+DGyIfAfXugn8o9O30B46xqsSXo="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 83c1f7454796..dabfd812c20d 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.3.4"; + version = "2023.3.5"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-uNwh1IYn3rDwj+FB8h9SwbFaju7cnCWl7HjX0mdw/UA="; + hash = "sha256-nNTuBQs5yD1XA46oIFQIlYRxClgRw2CgPjyiD+6SmUw="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/jibri/default.nix b/pkgs/servers/jibri/default.nix index be312614af98..5bf50d01752f 100644 --- a/pkgs/servers/jibri/default.nix +++ b/pkgs/servers/jibri/default.nix @@ -13,10 +13,10 @@ let in stdenv.mkDerivation rec { pname = "jibri"; - version = "8.0-139-g7ab9aa2"; + version = "8.0-140-gccc7278"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "14V5khp6S9T3SWiNfKyxn2WCzwhcXDCRDtATa15p01M="; + sha256 = "TiKCK41ar3X1aOrGitnNBr/iWru1HOjjGkwLBB76M1M="; }; dontBuild = true; diff --git a/pkgs/servers/jicofo/default.nix b/pkgs/servers/jicofo/default.nix index 315d95e1f158..b8bcda29de06 100644 --- a/pkgs/servers/jicofo/default.nix +++ b/pkgs/servers/jicofo/default.nix @@ -2,10 +2,10 @@ let pname = "jicofo"; - version = "1.0-940"; + version = "1.0-987"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "vx7aUHfKxG+tZ0sM8eWr1tTKf//bMxdKVhE5I4P4mLo="; + sha256 = "VK4Ck+OU6xv/Lma4YpXduPThej2wopbs+OkBC2SOkJU="; }; in stdenv.mkDerivation { diff --git a/pkgs/servers/jitsi-videobridge/default.nix b/pkgs/servers/jitsi-videobridge/default.nix index d7a0ef8dd841..0a4cbb840b58 100644 --- a/pkgs/servers/jitsi-videobridge/default.nix +++ b/pkgs/servers/jitsi-videobridge/default.nix @@ -2,10 +2,10 @@ let pname = "jitsi-videobridge2"; - version = "2.2-45-ge8b20f06"; + version = "2.2-69-gad606ca2"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "fbSpjLdx9xbLdp7vzHTW9B/cDf3DahpwuI4IcqEqpas="; + sha256 = "+5fcxUiCMy45CdDuORU5Xo//f4iAAJEzt1gO+fKU43c="; }; in stdenv.mkDerivation { diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index b1d38c4adc3d..3be8eb51a7ef 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2023-02-03"; + version = "unstable-2023-02-20"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "5644481590a16ac5b3d8c20874f0477d5d51a963"; - sha256 = "sha256-OGFVcUPw0sqTbJyrMvCxp8nER9/42ZRN4zIrpm/qh4E="; + rev = "848a78d1a548cfe28af20d5d0ab021558368cfae"; + sha256 = "sha256-pSuGNBvLBJ64pm4hECign2FhtAPx6xnXlhCa2eFzrwE="; }; sourceRoot = "source/klippy"; diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 47db76b3ca38..8c4c41567de2 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -45,6 +45,7 @@ python.pkgs.buildPythonPackage rec { tulir-telethon asyncpg mako + setuptools # speedups cryptg aiodns diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 5e24e5e9a8eb..5c55cd67b2b5 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -2,7 +2,7 @@ let pname = "miniflux"; - version = "2.0.42"; + version = "2.0.43"; in buildGoModule { inherit pname version; @@ -11,10 +11,10 @@ in buildGoModule { owner = pname; repo = "v2"; rev = version; - sha256 = "sha256-2ywaQubE/DZCTIX6a3vh1VH+/lfoe9gRzkqih8ULU8Q="; + sha256 = "sha256-IVIAlDYOuAl51V/Q1hpkjIREHTXq8E5D/w4cyTZ8ebs="; }; - vendorSha256 = "sha256-KtYFjNqUIYgAwIkEhQwg5OdjIluyENeZ6Qo5TGKzA/s="; + vendorHash = "sha256-/BINHOlRmAfOIXY9x5VjnQwIc87Mt2TAvBE1tPq6W80="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/servers/nosql/ferretdb/default.nix index 2b7431ba9d28..b8711fa7a294 100644 --- a/pkgs/servers/nosql/ferretdb/default.nix +++ b/pkgs/servers/nosql/ferretdb/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ferretdb"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; rev = "v${version}"; - sha256 = "sha256-lJlj5GNgrllcaEednxVCmMPHG2aU4z3mKkm9t0cO5Tk="; + sha256 = "sha256-UVRrCzgQdr86cc3jG+FSI/y3dxkHxoydMncXMgPMcz4="; }; postPatch = '' @@ -19,7 +19,7 @@ buildGoModule rec { echo nixpkgs > build/version/package.txt ''; - vendorSha256 = "sha256-I5ucq3K0lRsokG9lahmBUH9mIYa5tgHnL+vxKSzW1hw="; + vendorSha256 = "sha256-pvRs+X8DbHeThJPZ3St+MzLrQBLHRtdkKSHjBax3V10="; CGO_ENABLED = 0; @@ -27,6 +27,15 @@ buildGoModule rec { tags = [ "ferretdb_tigris" ]; + # tests in cmd/ferretdb are not production relevant + doCheck = false; + + # the binary panics if something required wasn't set during compilation + doInstallCheck = true; + installCheckPhase = '' + $out/bin/ferretdb --version | grep ${version} + ''; + meta = with lib; { description = "A truly Open Source MongoDB alternative"; homepage = "https://www.ferretdb.io/"; diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index 2f60d525dc07..66c878d00e1b 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -15,7 +15,7 @@ , stdenv }: let - version = "2.0-1223"; + version = "2.0-1234"; urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version; in stdenv.mkDerivation { @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-1jHNHj1tB80/CdE7GPCgRsI0+2Gfx4kiE6a0EOI/K5U="; + hash = "sha256-644tLtNr3rl3sB3BF0QoiwuIF4tWS8PjehmPKwdpg2k="; }; dontConfigure = true; diff --git a/pkgs/servers/search/khoj/default.nix b/pkgs/servers/search/khoj/default.nix index 6859562d4f62..058fe91ab765 100644 --- a/pkgs/servers/search/khoj/default.nix +++ b/pkgs/servers/search/khoj/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchFromGitHub , python3 , qt6 @@ -43,8 +44,10 @@ python3.pkgs.buildPythonApplication rec { wrapQtAppsHook ]); - buildInputs = with qt6; [ - qtwayland + buildInputs = lib.optionals stdenv.isLinux [ + qt6.qtwayland + ] ++ lib.optionals stdenv.isDarwin [ + qt6.qtbase ]; propagatedBuildInputs = with python3.pkgs; [ @@ -106,5 +109,7 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/debanjum/khoj/releases/tag/${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ dit7ya ]; + # src/tcmalloc.cc:333] Attempt to free invalid pointer + broken = stdenv.isDarwin; }; } diff --git a/pkgs/servers/web-apps/jitsi-meet/default.nix b/pkgs/servers/web-apps/jitsi-meet/default.nix index 6ea75ee7a9c0..c67a639b9d8b 100644 --- a/pkgs/servers/web-apps/jitsi-meet/default.nix +++ b/pkgs/servers/web-apps/jitsi-meet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jitsi-meet"; - version = "1.0.6644"; + version = "1.0.6943"; src = fetchurl { url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2"; - sha256 = "y1oI3nxIu7breYNPhdX7PU5GfnCyxdEbAYlyZmif2Uo="; + sha256 = "4swWsCo6PmMzvSVY6vS5n2HH8o6pU+Ak37ng18BLqIk="; }; dontBuild = true; diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index 18c4eef48004..47dc4748c1f5 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { pname = "grml-zsh-config"; - version = "0.19.4"; + version = "0.19.5"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "sha256-2TAhs2/yAVAU35IeVfT/68xLt9QZ4fLxMQjxnbCfBKs="; + sha256 = "sha256-/phoIi8amqdO+OK26+CE2OXwHTE71PaV9NIXEnGl6Co="; }; strictDeps = true; diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix index db83bd5149ff..cbfa0c45e8fc 100644 --- a/pkgs/test/texlive/default.nix +++ b/pkgs/test/texlive/default.nix @@ -174,10 +174,10 @@ for fname in language.{dat,def,dat.lua} ; do diff --ignore-matching-lines='^\(%\|--\) Generated by ' -u \ - {"$hyphenBase","$schemeFull"/share/texmf}/tex/generic/config/"$fname" \ + {"$hyphenBase","$schemeFull"/share/texmf-var}/tex/generic/config/"$fname" \ | tee "$out/scheme-full/$fname.patch" diff --ignore-matching-lines='^\(%\|--\) Generated by ' -u \ - {,"$schemeInfraOnly"/share/texmf/tex/generic/config/}"$fname" \ + {,"$schemeInfraOnly"/share/texmf-var/tex/generic/config/}"$fname" \ | tee "$out/scheme-infraonly/$fname.patch" done ''; @@ -190,7 +190,7 @@ mkdir -p "$out" diff --ignore-matching-lines='^# Generated by ' -u \ - {"$kpathsea","$schemeFull"/share/texmf}/web2c/fmtutil.cnf \ + {"$kpathsea","$schemeFull"/share/texmf-var}/web2c/fmtutil.cnf \ | tee "$out/fmtutil.cnf.patch" ''; } diff --git a/pkgs/tools/X11/xmousepasteblock/default.nix b/pkgs/tools/X11/xmousepasteblock/default.nix index 984f6ac70a6b..ec6a5b0b8e11 100644 --- a/pkgs/tools/X11/xmousepasteblock/default.nix +++ b/pkgs/tools/X11/xmousepasteblock/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "xmousepasteblock"; - version = "1.0"; + version = "1.3"; src = fetchFromGitHub { owner = "milaq"; repo = "XMousePasteBlock"; - sha256 = "0vidckfp277cg2gsww8a8q5b18m10iy4ppyp2qipr89771nrcmns"; + hash = "sha256-0rpAbYUU0SoeQaVNStmIEuYyiWbRAdTN7Mvm0ySDnhU="; rev = version; }; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; buildInputs = with xorg; [ libX11 libXext libXi libev ]; nativeBuildInputs = [ pkg-config ]; meta = with lib; { diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index e51d5f386b1e..e182fe5e8c17 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -69,11 +69,11 @@ let ''; in buildPythonApplication rec { pname = "xpra"; - version = "4.4.3"; + version = "4.4.4"; src = fetchurl { url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - hash = "sha256-j7tHT486ylyWAmR34BBWw9+HbDPnYMvHU88HV+Cs1w8="; + hash = "sha256-oPa9ECqCE9+PrcZufsHWYR6EHxTZVFJOMUlK2b0mwLE="; }; patches = [ diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 0280bde01e88..eedc4756c8dd 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.52.0"; + version = "0.52.2"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "v${version}"; - hash = "sha256-AbgUxCZBnGkuzA8xmr6s4QxTtQFFkhjPmLmSX2AcQXE="; + hash = "sha256-vZBNoDh/QnrTQrDubocA3FL7Cn5M1n/w+hE99GF9QC4="; }; vendorHash = "sha256-V7yPXSN+3H8NkD384MkvKbymNQ/O2Q9HoMO4M8mzVto="; diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/darwin.patch b/pkgs/tools/cd-dvd/dvd+rw-tools/darwin.patch new file mode 100644 index 000000000000..7a7490c52673 --- /dev/null +++ b/pkgs/tools/cd-dvd/dvd+rw-tools/darwin.patch @@ -0,0 +1,17 @@ +diff --git a/Makefile.m4 b/Makefile.m4 +index a6a100b..bf7c041 100644 +--- a/Makefile.m4 ++++ b/Makefile.m4 +@@ -30,8 +32,10 @@ LINK.o =$(LINK.cc) + # to install set-root-uid, `make BIN_MODE=04755 install'... + BIN_MODE?=0755 + install: dvd+rw-tools +- install -o root -m $(BIN_MODE) $(CHAIN) /usr/bin +- install -o root -m 0644 growisofs.1 /usr/share/man/man1 ++ install -d $(prefix)/bin ++ install -d $(prefix)/share/man/man1 ++ install -m $(BIN_MODE) $(CHAIN) $(prefix)/bin ++ install -m 0644 growisofs.1 $(prefix)/share/man/man1 + ]) + + ifelse(OS,MINGW32,[ diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix b/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix index d396bf030ca6..a618d93214f6 100644 --- a/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix +++ b/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix @@ -1,5 +1,8 @@ -{ lib, stdenv, fetchurl, fetchpatch, cdrtools, m4 }: +{ lib, stdenv, fetchurl, fetchpatch, cdrtools, m4, darwin }: +let + inherit (darwin.apple_sdk.frameworks) IOKit; +in stdenv.mkDerivation rec { pname = "dvd+rw-tools"; version = "7.1"; @@ -9,8 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1jkjvvnjcyxpql97xjjx0kwvy70kxpiznr2zpjy2hhci5s10zmpq"; }; + patches = [ ./darwin.patch ] # Patches from Gentoo - patches = [ ] ++ builtins.map ({pfile, sha256}: fetchpatch { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-cdr/dvd+rw-tools/files/${pfile}?id=b510df361241e8f16314b1f14642305f0111dac6"; inherit sha256; @@ -28,14 +31,26 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ m4 ]; - buildInputs = [ cdrtools ]; + buildInputs = [ cdrtools ] + ++ lib.optionals stdenv.isDarwin [ IOKit ]; - makeFlags = [ "prefix=${placeholder "out"}" ]; + makeFlags = [ + "prefix=${placeholder "out"}" + "CC=${stdenv.cc.targetPrefix}cc" + "CXX=${stdenv.cc.targetPrefix}c++" + ]; + + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + # error: invalid suffix on literal; C++11 requires a space between literal and identifier + "-Wno-reserved-user-defined-literal" + # error: non-constant-expression cannot be narrowed from type 'size_t' (aka 'unsigned long') to 'IOByteCount' (aka 'unsigned int') in initializer list + "-Wno-c++11-narrowing" + ]); meta = with lib; { homepage = "http://fy.chalmers.se/~appro/linux/DVD+RW/tools"; description = "Tools for mastering Blu-ray and DVD+-RW/+-R media"; - platforms = platforms.linux; + platforms = platforms.unix; license = with licenses; [ gpl2 publicDomain ]; }; } diff --git a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix index 39492eefb830..96d48040e1d4 100644 --- a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix +++ b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , qmake , vulkan-loader +, wayland , wrapQtAppsHook , withX11 ? true , qtx11extras @@ -10,13 +11,13 @@ stdenv.mkDerivation rec { pname = "vulkan-caps-viewer"; - version = "3.28"; + version = "3.29"; src = fetchFromGitHub { owner = "SaschaWillems"; repo = "VulkanCapsViewer"; rev = version; - hash = "sha256-gy0gFbPZAwQJHqJvk7WrbZ5y2I+9BGv9VaCoOW1QPek="; + hash = "sha256-c7jvlwvz85cf8lUlBPyRYvDkSlvkzSW6Jc6wlyKnHBc="; # Note: this derivation strictly requires vulkan-header to be the same it was developed against. # To help us, they've put it in a git-submodule. # The result will work with any vulkan-loader version. @@ -30,6 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ vulkan-loader + wayland ] ++ lib.lists.optionals withX11 [ qtx11extras ]; patchPhase = '' @@ -38,9 +40,8 @@ stdenv.mkDerivation rec { ''; qmakeFlags = [ - "DEFINES+=wayland" "CONFIG+=release" - ] ++ lib.lists.optionals withX11 [ "DEFINES+=X11" ]; + ]; installFlags = [ "INSTALL_ROOT=$(out)" ]; diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index ea96b79fa34a..25a7e0647ef7 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { pname = "bandwidth"; - version = "1.11.2"; + version = "1.11.2d"; src = fetchurl { url = "https://zsmith.co/archives/${pname}-${version}.tar.gz"; - sha256 = "sha256-mjtvQAOH9rv12XszGdD5hIX197er7Uc74WfVaP32TpM="; + hash = "sha256-7IrNiCXKf1vyRGl73Ccu3aYMqPVc4PpEr6lnSqIa4Q8="; }; postPatch = '' @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { # Fix missing symbol exports for macOS clang echo global _VectorToVector128 >> routines-x86-64bit.asm echo global _VectorToVector256 >> routines-x86-64bit.asm + # Fix unexpected token on macOS + sed -i '/.section .note.GNU-stack/d' *-64bit.asm + sed -i '/.section code/d' *-arm-64bit.asm + sed -i 's#-Wl,-z,noexecstack##g' Makefile-arm64 ''; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix index b6a17a38b5bf..15c1915e66fc 100644 --- a/pkgs/tools/misc/dust/default.nix +++ b/pkgs/tools/misc/dust/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "du-dust"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - sha256 = "sha256-g1i003nBbTYIuKG4ZCQSoI8gINTVc8BKRoO3UOeHOGE="; + sha256 = "sha256-NP87I2D3+hKfyeK+QawVopSJOKYmGNH9XvNR9GTQcls="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-jtQ/nkD5XMD2rsq550XsRK416wOCR3OuhgGPeuC3jzc="; + cargoHash = "sha256-weg1etimlSenKP6UNuO8iM7gbH3+7XP98xYE4VlHhhs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 77e13b0b154c..9769402e8e9a 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -16,11 +16,11 @@ let in tcl.mkTclDerivation rec { pname = "remind"; - version = "04.02.01"; + version = "04.02.03"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "sha256-RknG1SyKKYSMLWihR2GM8MVROJx0E0E1gD+vSLv6uk0="; + sha256 = "sha256-0hY/ee3+ErqPNucD1ZcisK7WbzT7dmV/9vQKus/sOgA="; }; propagatedBuildInputs = tclLibraries; diff --git a/pkgs/tools/misc/tkman/default.nix b/pkgs/tools/misc/tkman/default.nix new file mode 100644 index 000000000000..e178e173108a --- /dev/null +++ b/pkgs/tools/misc/tkman/default.nix @@ -0,0 +1,87 @@ +{ lib +, stdenv +, fetchzip +, fetchpatch +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, tk +, groff +, rman +}: + +stdenv.mkDerivation rec { + pname = "tkman"; + version = "2.2"; + + src = fetchzip { + url = "mirror://sourceforge/tkman/tkman-${version}.tar.gz"; + hash = "sha256-S4ffz+7zmVy9+isz/8q+FV4wF5Rw2iL1ftY8RsJjRLs="; + }; + + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + ]; + + patches = [(fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-text/tkman/files/tkman-CVE-2008-5137.diff"; + hash = "sha256-l97SY2/YnMgzHYKnVYCVJKV7oGLN1hXNpeHFlLVzTMA="; + })]; + + makeFlags = [ + "BINDIR=$(out)/bin" + "WISH=${tk}/bin/wish" + "rman=${rman}/bin/rman" + # TODO package glimpse https://github.com/gvelez17/glimpse + "glimpse=\"\"" + ]; + + preBuild = '' + makeFlagsArray+=( + 'manformat="${groff}/bin/groff -te -Tlatin1 -mandoc $$manx(longtmp) -"' + ) + ''; + + preInstall = '' + mkdir -p $out/bin + ''; + + postInstall = '' + wrapProgram $out/bin/tkman \ + --run 'export MANPATH="$(manpath)"' + rm $out/bin/retkman # doesn't work + install -Dm644 contrib/TkMan.gif $out/share/icons/hicolor/64x64/apps/tkman.gif + ''; + + desktopItems = [(makeDesktopItem { + name = "tkman"; + desktopName = "TkMan"; + comment = "Graphical man page and info viewer"; + exec = "tkman %f"; + icon = "tkman"; + terminal = false; + type = "Application"; + categories = [ "Utility" ]; + })]; + + meta = with lib; { + description = "Graphical, hypertext manual page and Texinfo browser for UNIX"; + longDescription = '' + TkMan is a graphical, hypertext manual page and Texinfo browser for UNIX. + TkMan boasts hypertext links, unmatched online text formatting and display + quality, (optional) outline view of man pages, high quality display and + superior navigational interface to Texinfo documents, a novel information + visualization mechanism called Notemarks, full text search among man pages + and Texinfo, incremental and regular expression search within pages, + regular expression search within Texinfo that shows all matches (not just + the next), robustly attached yellow highlight annotations, a shortcut/hot + list, lists of all pages in user configurable volumes, a comprehensive + Preferences panel, and man page versioning support, among many other features. + ''; + homepage = "https://tkman.sourceforge.net/index.html"; + license = licenses.artistic1; + platforms = platforms.unix; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix index 04e955a78b18..71fbccdf2d50 100644 --- a/pkgs/tools/misc/units/default.nix +++ b/pkgs/tools/misc/units/default.nix @@ -11,11 +11,11 @@ assert enableCurrenciesUpdater -> pythonPackages != null; stdenv.mkDerivation rec { pname = "units"; - version = "2.21"; + version = "2.22"; src = fetchurl { url = "mirror://gnu/units/${pname}-${version}.tar.gz"; - sha256 = "sha256-bD6AqfmAWJ/ZYqWFKiZ0ZCJX2xxf1bJ8TZ5mTzSGy68="; + sha256 = "sha256-XRPhIHch/ncm2Qa6HZLcDt2qn8JnWe0i47jRp5MSWEg="; }; pythonEnv = pythonPackages.python.withPackages(ps: [ diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix index 8fdf8a38f317..c8168d22249d 100644 --- a/pkgs/tools/networking/zap/default.nix +++ b/pkgs/tools/networking/zap/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "zap"; - version = "2.11.1"; + version = "2.12.0"; src = fetchurl { url = "https://github.com/zaproxy/zaproxy/releases/download/v${version}/ZAP_${version}_Linux.tar.gz"; - sha256 = "0b1qqrjm4m76djy0az9hnz3rqpz1qkql4faqmi7gkx33b1p6d0sz"; + sha256 = "sha256-nESTyZHLk0cGOGTSQ2o3lc87aXYGJeez20Ac00LT/FU="; }; buildInputs = [ jre ]; # From https://github.com/zaproxy/zaproxy/blob/master/zap/src/main/java/org/parosproxy/paros/Constant.java - version_tag = "2010000"; + version_tag = "20012000"; # Copying config and adding version tag before first use to avoid permission # issues if zap tries to copy config on it's own. diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index d19b1f868c0c..1d43efe3f8af 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - version = "1.14.5"; + version = "1.15.1"; pname = "librepo"; outputs = [ "out" "dev" "py" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "rpm-software-management"; repo = "librepo"; rev = version; - sha256 = "sha256-4Y6ht/mKQmjBI9CZuQg4DmuyTM4KbqQcCb9jmUtapLY="; + sha256 = "sha256-XVjVu+UTIDbrKHmfJ2zZBLp/h0cLCZFxv/XZ0Iy8VPI="; }; nativeBuildInputs = [ @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { description = "Library providing C and Python (libcURL like) API for downloading linux repository metadata and packages"; homepage = "https://rpm-software-management.github.io/librepo/"; license = licenses.lgpl2Plus; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.linux; maintainers = with maintainers; [ copumpkin ]; }; } diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index d32e486eec7b..f6585e2d2022 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.2.8"; + version = "1.2.9"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-uZTYRsOAmuROA8ZrePruE+eDIx9TW98ljByDkstZC1Q="; + hash = "sha256-H9M4ZOQ/34GSDBYOqfzgJD/kz/PruLZn4NIKBdUJ370="; }; - vendorHash = "sha256-czW1bnQp5+Om5EfW1DvCkAaNaqfAupmSJJvS14xKQUg="; + vendorHash = "sha256-wQBLB5gASLOIDU7MMtex0TxYixfGBRnng5yCrr3TgjE="; # Tests require network access doCheck = false; diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 04e4dc89168a..02fab8ca7458 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.7" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.8" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index c8bed8f11adb..d56419cb063e 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: f6fdb097af15319fe1755e4e5fa5918edacbd5ca - ref: refs/tags/6.3.7 + revision: 06f7a29c0dca9ab33799c1a26f6e97207a111395 + ref: refs/tags/6.3.8 specs: - metasploit-framework (6.3.7) + metasploit-framework (6.3.8) actionpack (~> 7.0) activerecord (~> 7.0) activesupport (~> 7.0) @@ -129,16 +129,16 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.726.0) + aws-partitions (1.729.0) aws-sdk-core (3.170.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.369.0) + aws-sdk-ec2 (1.370.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.75.0) + aws-sdk-iam (1.76.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) aws-sdk-kms (1.63.0) @@ -296,7 +296,7 @@ GEM rack (2.2.6.4) rack-protection (3.0.5) rack - rack-test (2.0.2) + rack-test (2.1.0) rack (>= 1.3) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) @@ -357,7 +357,7 @@ GEM metasm rex-core rex-text - rex-socket (0.1.47) + rex-socket (0.1.48) rex-core rex-sslscan (0.1.9) rex-core diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 3ce5c47e0f9a..ffd6acd555e3 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.3.7"; + version = "6.3.8"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-UT6KPiNz3f+peLt1mGEgk2OHBZJMBrxIz6Te8qfdiik="; + sha256 = "sha256-k5bu3cFPp3qaEP12x4+O/6MLcpMfmIz7tnQSXXucweY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 1575abf8d859..a73c99f54089 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pn77j932x8p5z992arfjwdjpp5m6zl8llma6pk61hm8dh9wxfw5"; + sha256 = "19klif1mj36h4706gc3l1frl8xgdpzfxjxg88l2scskyaz307r6p"; type = "gem"; }; - version = "1.726.0"; + version = "1.729.0"; }; aws-sdk-core = { groups = ["default"]; @@ -124,20 +124,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kzlkvidm3hzh0168m0jz9w2c2r47dy8n97l2qyys77hl1cxa6kf"; + sha256 = "01p8cp7r3yn2i987m8bghxr3y8a8qmpfim6vys1lfbfhlhxvacyx"; type = "gem"; }; - version = "1.369.0"; + version = "1.370.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n6hg0sfnhm5yhfvs68fikfpkq9hydiw2081fdikpf0fwp5ny8zw"; + sha256 = "0simahi29npj078qbrk60vlf5qsdkpgm2y62qlnps7g8lbv2vj1w"; type = "gem"; }; - version = "1.75.0"; + version = "1.76.0"; }; aws-sdk-kms = { groups = ["default"]; @@ -614,12 +614,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "f6fdb097af15319fe1755e4e5fa5918edacbd5ca"; - sha256 = "0acavnkz5pm4rx4bq1jcj82qfqwk41hrhxdvg2lzzpbk4cz8lgji"; + rev = "06f7a29c0dca9ab33799c1a26f6e97207a111395"; + sha256 = "1rn1kixms4klnvxqr60zjdr0p8zzis7wfxpx22d7m9sgq7fyx5lk"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.7"; + version = "6.3.8"; }; metasploit-model = { groups = ["default"]; @@ -977,10 +977,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rjl709krgf499dhjdapg580l2qaj9d91pwzk8ck8fpnazlx1bdd"; + sha256 = "1ysx29gk9k14a14zsp5a8czys140wacvp91fja8xcja0j1hzqq8c"; type = "gem"; }; - version = "2.0.2"; + version = "2.1.0"; }; rails-dom-testing = { groups = ["default"]; @@ -1207,10 +1207,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02s5x8i0iz5x5y45xasdqx7iz6z9yyqycqmrn41q9rlys4689jwj"; + sha256 = "1raplxkkx2jl8zlpy02g3qn45dmfv1zgbac12f1r6w7rq7f264gf"; type = "gem"; }; - version = "0.1.47"; + version = "0.1.48"; }; rex-sslscan = { groups = ["default"]; diff --git a/pkgs/tools/security/pynitrokey/default.nix b/pkgs/tools/security/pynitrokey/default.nix index 1f36eda5ab3d..e18b849c343c 100644 --- a/pkgs/tools/security/pynitrokey/default.nix +++ b/pkgs/tools/security/pynitrokey/default.nix @@ -4,12 +4,12 @@ with python3Packages; buildPythonApplication rec { pname = "pynitrokey"; - version = "0.4.27"; + version = "0.4.31"; format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aWQhMvATcDtyBtj38mGnypkKIqKQgneBzWDh5o/5Wkc="; + sha256 = "sha256-nqw5wUzQxKCBzYBRhqB6v7WWrF1Ojf8z6Kf1YUA9+wU="; }; propagatedBuildInputs = [ @@ -29,13 +29,18 @@ buildPythonApplication rec { cffi cbor nkdfu + fido2 + tlv8 ]; - # spsdk is patched to allow for newer cryptography - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "cryptography >=3.4.4,<37" "cryptography" - ''; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "cryptography" + "spsdk" + ]; # no tests doCheck = false; diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix index 68b8399fc76c..0855c442deb9 100644 --- a/pkgs/tools/typesetting/fop/default.nix +++ b/pkgs/tools/typesetting/fop/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fop"; - version = "2.7"; + version = "2.8"; src = fetchurl { url = "mirror://apache/xmlgraphics/fop/source/${pname}-${version}-src.tar.gz"; - sha256 = "sha256-tPGlISmJzrx9F8cnX70j3nPMVyWdkojAFDZVYlSthtQ="; + sha256 = "sha256-b7Av17wu6Ar/npKOiwYqzlvBFSIuXTpqTacM1sxtBvc="; }; buildInputs = [ ant jdk ]; diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 5caebace7cbd..5681d2cd454e 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -38,16 +38,44 @@ let mkUniqueOutPaths = pkgs: lib.unique (map (p: p.outPath) (builtins.filter lib.isDerivation pkgs)); -in (buildEnv { name = "texlive-${extraName}-${bin.texliveYear}${extraVersion}"; - extraPrefix = "/share/texmf"; + texmf = (buildEnv { + name = "${name}-texmf"; + + paths = pkgList.nonbin; + + nativeBuildInputs = [ perl bin.core.out ]; + + postBuild = # generate ls-R database + '' + perl -I "${bin.core.out}/share/texmf-dist/scripts/texlive" \ + -- "$out/scripts/texlive/mktexlsr.pl" --sort "$out" + ''; + }).overrideAttrs (_: { allowSubstitutes = true; }); + + # expose info and man pages in usual /share/{info,man} location + doc = buildEnv { + name = "${name}-doc"; + + paths = [ (texmf.outPath + "/doc") ]; + extraPrefix = "/share"; + + pathsToLink = [ + "/info" + "/man" + ]; + }; + +in (buildEnv { + + inherit name; ignoreCollisions = false; - paths = pkgList.nonbin; + paths = pkgList.bin ++ [ doc ]; pathsToLink = [ "/" - "/tex/generic/config" # make it a real directory for scheme-infraonly + "/bin" # ensure these are writeable directories ]; nativeBuildInputs = [ makeWrapper libfaketime perl bin.texlinks ]; @@ -57,54 +85,40 @@ in (buildEnv { passthru.packages = pkgList.all; postBuild = '' - mkdir -p "$out"/bin - '' + - lib.concatMapStrings - (path: '' - for f in '${path}'/bin/*; do - if [[ -L "$f" ]]; then - cp -d "$f" "$out"/bin/ - else - ln -s "$f" "$out"/bin/ - fi - done - '') - pkgList.bin - + - '' - export PATH="$out/bin:$out/share/texmf/scripts/texlive:$PATH" - export TEXMFCNF="$out/share/texmf/web2c" + TEXMFDIST="${texmf}" + export PATH="$out/bin:$PATH" + export PERL5LIB="$TEXMFDIST/scripts/texlive:${bin.core.out}/share/texmf-dist/scripts/texlive" TEXMFSYSCONFIG="$out/share/texmf-config" TEXMFSYSVAR="$out/share/texmf-var" - export PERL5LIB="$out/share/texmf/scripts/texlive:${bin.core.out}/share/texmf-dist/scripts/texlive" + export TEXMFCNF="$TEXMFSYSVAR/web2c" '' + - # patch texmf-dist -> $out/share/texmf + # patch texmf-dist -> $TEXMFDIST # patch texmf-local -> $out/share/texmf-local + # patch texmf.cnf -> $TEXMFSYSVAR/web2c/texmf.cnf # TODO: perhaps do lua actions? # tried inspiration from install-tl, sub do_texmf_cnf '' - if [ -e "$TEXMFCNF/texmfcnf.lua" ]; then + mkdir -p "$TEXMFCNF" + if [ -e "$TEXMFDIST/web2c/texmfcnf.lua" ]; then sed \ - -e 's,texmf-dist,texmf,g' \ + -e "s,\(TEXMFDIST[ ]*=[ ]*\)[^\,]*,\1\"$TEXMFDIST\",g" \ -e "s,\(TEXMFLOCAL[ ]*=[ ]*\)[^\,]*,\1\"$out/share/texmf-local\",g" \ -e "s,\$SELFAUTOLOC,$out,g" \ -e "s,selfautodir:/,$out/share/,g" \ -e "s,selfautodir:,$out/share/,g" \ -e "s,selfautoparent:/,$out/share/,g" \ -e "s,selfautoparent:,$out/share/,g" \ - -i "$TEXMFCNF/texmfcnf.lua" + "$TEXMFDIST/web2c/texmfcnf.lua" > "$TEXMFCNF/texmfcnf.lua" fi sed \ - -e 's,texmf-dist,texmf,g' \ + -e "s,\(TEXMFDIST[ ]*=[ ]*\)[^\,]*,\1$TEXMFDIST,g" \ -e "s,\$SELFAUTOLOC,$out,g" \ -e "s,\$SELFAUTODIR,$out/share,g" \ -e "s,\$SELFAUTOPARENT,$out/share,g" \ -e "s,\$SELFAUTOGRANDPARENT,$out/share,g" \ -e "/^mpost,/d" `# CVE-2016-10243` \ - -i "$TEXMFCNF/texmf.cnf" - - mkdir "$out/share/texmf-local" + "$TEXMFDIST/web2c/texmf.cnf" > "$TEXMFCNF/texmf.cnf" '' + # now filter hyphenation patterns and formats (let @@ -132,18 +146,31 @@ in (buildEnv { + lib.concatMapStrings (pname: section "^-- from ${pname}:$" "^}$|^-- from") hyphenPNames + "$p;\n" ); + # formats not being installed must be disabled by prepending #! (see man fmtutil) + # sed expression that enables the formats in /start/,/end/ + enableFormats = pname: "/^# from ${pname}:$/,/^# from/{ s/^#! //; };\n"; fmtutilSed = writeText "fmtutil.sed" ( - "1{ s/^(# Generated by .*)$/\\1, modified by texlive.combine/; p; }\n" - + "2,/^# from/{ /^# from/!p; };\n" - + lib.concatMapStrings (pname: section "^# from ${pname}:$" "^# from") formatPNames + # document how file was generated + "1{ s/^(# Generated by .*)$/\\1, modified by texlive.combine/; }\n" + # disable all formats, even those already disabled + + "s/^([^#]|#! )/#! \\1/;\n" + # enable the formats from the packages being installed + + lib.concatMapStrings enableFormats formatPNames + # clean up formats that have been disabled twice + + "s/^#! #! /#! /;\n" ); in '' - for fname in "$out"/share/texmf/tex/generic/config/language.{dat,def}; do - [[ -e "$fname" ]] && sed -E -n -f '${script}' -i "$fname" + mkdir -p "$TEXMFSYSVAR/tex/generic/config" + for fname in tex/generic/config/language.{dat,def}; do + [[ -e "$TEXMFDIST/$fname" ]] && sed -E -n -f '${script}' "$TEXMFDIST/$fname" > "$TEXMFSYSVAR/$fname" done - [[ -e "$out"/share/texmf/tex/generic/config/language.dat.lua ]] && sed -E -n -f '${scriptLua}' -i "$out"/share/texmf/tex/generic/config/language.dat.lua - [[ -e "$TEXMFCNF"/fmtutil.cnf ]] && sed -E -n -f '${fmtutilSed}' -i "$TEXMFCNF"/fmtutil.cnf + [[ -e "$TEXMFDIST"/tex/generic/config/language.dat.lua ]] && sed -E -n -f '${scriptLua}' \ + "$TEXMFDIST"/tex/generic/config/language.dat.lua > "$TEXMFSYSVAR"/tex/generic/config/language.dat.lua + [[ -e "$TEXMFDIST"/web2c/fmtutil.cnf ]] && sed -E -f '${fmtutilSed}' "$TEXMFDIST"/web2c/fmtutil.cnf > "$TEXMFCNF"/fmtutil.cnf + + # make new files visible to kpathsea + perl "$TEXMFDIST"/scripts/texlive/mktexlsr.pl --sort "$TEXMFSYSVAR" '') + # function to wrap created executables with required env vars @@ -191,16 +218,15 @@ in (buildEnv { '' + # texlive post-install actions '' - ln -sf "$out"/share/texmf/scripts/texlive/updmap.pl "$out"/bin/updmap + ln -sf "$TEXMFDIST"/scripts/texlive/updmap.pl "$out"/bin/updmap '' + # now hack to preserve "$0" for mktexfmt '' - cp "$out"/share/texmf/scripts/texlive/fmtutil.pl "$out/bin/fmtutil" + cp "$TEXMFDIST"/scripts/texlive/fmtutil.pl "$out/bin/fmtutil" patchShebangs "$out/bin/fmtutil" - sed "1s|$| -I $out/share/texmf/scripts/texlive|" -i "$out/bin/fmtutil" + sed "1s|$| -I $TEXMFDIST/scripts/texlive|" -i "$out/bin/fmtutil" ln -sf fmtutil "$out/bin/mktexfmt" - perl "$out"/share/texmf/scripts/texlive/mktexlsr.pl --sort "$out"/share/texmf texlinks "$out/bin" && wrapBin FORCE_SOURCE_DATE=1 fmtutil --sys --all | grep '^fmtutil' # too verbose #texlinks "$out/bin" && wrapBin # do we need to regenerate format links? @@ -224,16 +250,16 @@ in (buildEnv { # sort entries to improve reproducibility [[ -f "$TEXMFSYSCONFIG"/web2c/updmap.cfg ]] && sort -o "$TEXMFSYSCONFIG"/web2c/updmap.cfg "$TEXMFSYSCONFIG"/web2c/updmap.cfg - perl "$out"/share/texmf/scripts/texlive/mktexlsr.pl --sort "$out"/share/texmf-* # to make sure + perl "$TEXMFDIST"/scripts/texlive/mktexlsr.pl --sort "$TEXMFSYSCONFIG" "$TEXMFSYSVAR" # to make sure '' + # install (wrappers for) scripts, based on a list from upstream texlive '' source '${bin.core.out}/share/texmf-dist/scripts/texlive/scripts.lst' for s in $texmf_scripts; do - [[ -x "$out/share/texmf/scripts/$s" ]] || continue + [[ -x "$TEXMFDIST/scripts/$s" ]] || continue tName="$(basename $s | sed 's/\.[a-z]\+$//')" # remove extension [[ ! -e "$out/bin/$tName" ]] || continue - ln -sv "$(realpath $out/share/texmf/scripts/$s)" "$out/bin/$tName" # wrapped below + ln -sv "$(realpath "$TEXMFDIST/scripts/$s")" "$out/bin/$tName" # wrapped below done '' + # A hacky way to provide repstopdf @@ -241,8 +267,9 @@ in (buildEnv { # * ./bin/repstopdf needs to be a symlink to be processed by wrapBin '' if [[ -e "$out"/bin/epstopdf ]]; then - cp "$out"/bin/epstopdf "$out"/share/texmf/scripts/repstopdf - ln -s "$out"/share/texmf/scripts/repstopdf "$out"/bin/repstopdf + mkdir -p "$TEXMFSYSVAR/scripts" + cp "$out"/bin/epstopdf "$TEXMFSYSVAR"/scripts/repstopdf + ln -s "$TEXMFSYSVAR"/scripts/repstopdf "$out"/bin/repstopdf fi '' + # finish up the wrappers @@ -262,16 +289,6 @@ in (buildEnv { # TODO: a context trigger https://www.preining.info/blog/2015/06/debian-tex-live-2015-the-new-layout/ # http://wiki.contextgarden.net/ConTeXt_Standalone#Unix-like_platforms_.28Linux.2FMacOS_X.2FFreeBSD.2FSolaris.29 - # I would just create links from "$out"/share/{man,info}, - # but buildenv has problems with merging symlinks with directories; - # note: it's possible we might need deepen the work-around to man/*. - '' - for d in {man,info}; do - [[ -e "$out/share/texmf/doc/$d" ]] || continue; - mkdir -p "$out/share/$d" - ln -s -t "$out/share/$d" "$out/share/texmf/doc/$d"/* - done - '' + # MkIV uses its own lookup mechanism and we need to initialize # caches for it. '' @@ -283,7 +300,7 @@ in (buildEnv { # Get rid of all log files. They are not needed, but take up space # and render the build unreproducible by their embedded timestamps. '' - find $TEXMFSYSVAR/web2c -name '*.log' -delete + find "$TEXMFSYSVAR"/web2c -name '*.log' -delete '' ; }).overrideAttrs (_: { allowSubstitutes = true; }) diff --git a/pkgs/tools/wayland/swayrbar/default.nix b/pkgs/tools/wayland/swayrbar/default.nix index 808d5c3c31de..76a49cad8a84 100644 --- a/pkgs/tools/wayland/swayrbar/default.nix +++ b/pkgs/tools/wayland/swayrbar/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "swayrbar"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromSourcehut { owner = "~tsdh"; repo = "swayr"; rev = "swayrbar-${version}"; - sha256 = "sha256-OQhq5ZUe2OrfRFxoaAbbewoHgQVPv9cQy0VCpYe1SNo="; + sha256 = "sha256-uYQGwccSwqHJ1w8CyxXimmENnGx7e3EMA1MKZuZDTIk="; }; - cargoHash = "sha256-vM4SoRbVylN90b378Qk18A8/2S2IB88lnGCM6sqrhs8="; + cargoHash = "sha256-PdPaUqJUycUhleaND6XwKkRvwO0MHbvw5lzz95bdfCQ="; # don't build swayr buildAndTestSubdir = pname; diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/tools/wayland/wl-mirror/default.nix index 1ab7071a46cb..8e19bdc1d9e4 100644 --- a/pkgs/tools/wayland/wl-mirror/default.nix +++ b/pkgs/tools/wayland/wl-mirror/default.nix @@ -28,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "wl-mirror"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "wl-mirror"; rev = "v${version}"; - hash = "sha256-jjOcEr/E7l3ykdLAfiDlRSI0u76byDmBwfispTbopk8="; + hash = "sha256-qYJmcsID5qbUs27ZCU2HkWVVnBmxWmyzSgruLPB4jI8="; }; strictDeps = true; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dd2c8c7735c1..2e5c198b99d1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1552,6 +1552,7 @@ mapAliases ({ timescale-prometheus = promscale; # Added 2020-09-29 timedoctor = throw "'timedoctor' has been removed from nixpkgs"; # Added 2022-10-09 timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # Added 2021-09-05 + tixati = throw "'tixati' has been removed from nixpkgs as it is unfree and unmaintained"; # Added 2023-03-17 tkcvs = tkrev; # Added 2022-03-07 togglesg-download = throw "togglesg-download was removed 2021-04-30 as it's unmaintained"; # Added 2021-04-30 tokodon = plasma5Packages.tokodon; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac2a36a257b2..7c5b98dbafdf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5000,12 +5000,23 @@ with pkgs; hunt = callPackage ../tools/misc/hunt { }; hypr = callPackage ../applications/window-managers/hyprwm/hypr { - cairo = cairo.override { xcbSupport = true; }; + cairo = cairo.override { xcbSupport = true; }; }; + + hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { + stdenv = gcc12Stdenv; + wlroots = pkgs.callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { }; + udis86 = pkgs.callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { }; }; - hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { }; + hyprland-protocols = callPackage ../applications/window-managers/hyprwm/hyprland-protocols { }; - hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { }; + hyprland-share-picker = libsForQt5.callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/hyprland-share-picker.nix { }; + + hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { + stdenv = gcc12Stdenv; + }; + + hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { }; hysteria = callPackage ../tools/networking/hysteria { }; @@ -11717,6 +11728,7 @@ with pkgs; rnote = callPackage ../applications/graphics/rnote { inherit (gst_all_1) gstreamer; + inherit (darwin.apple_sdk.frameworks) AudioUnit; }; rnp = callPackage ../tools/security/rnp { }; @@ -12772,6 +12784,8 @@ with pkgs; tiv = callPackage ../applications/misc/tiv { }; + tkman = callPackage ../tools/misc/tkman { }; + tldr = callPackage ../tools/misc/tldr { }; tldr-hs = haskellPackages.tldr; @@ -20831,6 +20845,8 @@ with pkgs; jsoncpp = callPackage ../development/libraries/jsoncpp { }; + json-fortran = callPackage ../development/libraries/json-fortran { }; + jsonnet = callPackage ../development/compilers/jsonnet { }; jsonnet-bundler = callPackage ../development/tools/jsonnet-bundler { }; @@ -22421,6 +22437,22 @@ with pkgs; mergerfs-tools = callPackage ../tools/filesystems/mergerfs/tools.nix { }; + mctc-lib = callPackage ../development/libraries/science/chemistry/mctc-lib { }; + + mstore = callPackage ../development/libraries/science/chemistry/mstore { }; + + multicharge = callPackage ../development/libraries/science/chemistry/multicharge { }; + + test-drive = callPackage ../development/libraries/test-drive { }; + + dftd4 = callPackage ../development/libraries/science/chemistry/dftd4 { }; + + simple-dftd3 = callPackage ../development/libraries/science/chemistry/simple-dftd3 { }; + + tblite = callPackage ../development/libraries/science/chemistry/tblite { }; + + toml-f = callPackage ../development/libraries/toml-f { }; + ## libGL/libGLU/Mesa stuff # Default libGL implementation, should provide headers and @@ -29613,6 +29645,8 @@ with pkgs; kerbrute = callPackage ../tools/security/kerbrute { }; + komikku = callPackage ../applications/graphics/komikku { }; + kvmtool = callPackage ../applications/virtualization/kvmtool { }; exrtools = callPackage ../applications/graphics/exrtools { }; @@ -33759,8 +33793,6 @@ with pkgs; tipp10 = qt5.callPackage ../applications/misc/tipp10 { }; - tixati = callPackage ../applications/networking/p2p/tixati { }; - tkrev = callPackage ../applications/version-management/tkrev { }; tla = callPackage ../applications/version-management/arch { }; @@ -34520,6 +34552,8 @@ with pkgs; xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { }; + xdg-desktop-portal-hyprland = callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland { }; + xdg-desktop-portal-wlr = callPackage ../development/libraries/xdg-desktop-portal-wlr { }; xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { }; @@ -35201,6 +35235,8 @@ with pkgs; keeperrl = callPackage ../games/keeperrl { }; + rbdoom-3-bfg = callPackage ../games/rbdoom-3-bfg { }; + ### GAMES/LGAMES barrage = callPackage ../games/lgames/barrage { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index de3f2ba61f0f..999f0e190472 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7779,6 +7779,8 @@ self: super: with self; { purepng = callPackage ../development/python-modules/purepng { }; + pure-protobuf = callPackage ../development/python-modules/pure-protobuf { }; + pure-python-adb = callPackage ../development/python-modules/pure-python-adb { }; pure-python-adb-homeassistant = callPackage ../development/python-modules/pure-python-adb-homeassistant { }; @@ -11443,6 +11445,11 @@ self: super: with self; { tblib = callPackage ../development/python-modules/tblib { }; + tblite = callPackage ../development/libraries/science/chemistry/tblite/python.nix { + tblite = pkgs.tblite; + meson = pkgs.meson; + }; + tbm-utils = callPackage ../development/python-modules/tbm-utils { }; tcolorpy = callPackage ../development/python-modules/tcolorpy { }; @@ -11716,6 +11723,8 @@ self: super: with self; { tls-parser = callPackage ../development/python-modules/tls-parser { }; + tlv8 = callPackage ../development/python-modules/tlv8 { }; + tmb = callPackage ../development/python-modules/tmb { }; todoist = callPackage ../development/python-modules/todoist { };