diff options
147 files changed, 4732 insertions, 2441 deletions
diff --git a/.github/workflows/check-cherry-picks.yml b/.github/workflows/check-cherry-picks.yml index 9e7f6e277e993..8dfc3f6c06062 100644 --- a/.github/workflows/check-cherry-picks.yml +++ b/.github/workflows/check-cherry-picks.yml @@ -2,8 +2,8 @@ name: "Check cherry-picks" on: pull_request_target: branches: - - 'release-*' - - 'staging-*' + - 'release-**' + - 'staging-**' permissions: {} diff --git a/lib/default.nix b/lib/default.nix index b442ddf5fa0f0..21e4bab2b942b 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -128,7 +128,7 @@ let canCleanSource pathIsGitRepo; inherit (self.modules) evalModules setDefaultModuleLocation unifyModuleSyntax applyModuleArgsIfFunction mergeModules - mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions + mergeModules' mergeOptionDecls mergeDefinitions pushDownProperties dischargeProperties filterOverrides sortProperties fixupOptionType mkIf mkAssert mkMerge mkOverride mkOptionDefault mkDefault mkImageMediaOverride mkForce mkVMOverride @@ -138,6 +138,7 @@ let mkMergedOptionModule mkChangedOptionModule mkAliasOptionModule mkDerivedConfig doRename mkAliasOptionModuleMD; + evalOptionValue = lib.warn "External use of `lib.evalOptionValue` is deprecated. If your use case isn't covered by non-deprecated functions, we'd like to know more and perhaps support your use case well, instead of providing access to these low level functions. In this case please open an issue in https://github.com/nixos/nixpkgs/issues/." self.modules.evalOptionValue; inherit (self.options) isOption mkEnableOption mkSinkUndeclaredOptions mergeDefaultOption mergeOneOption mergeEqualOption mergeUniqueOption getValues getFiles diff --git a/lib/modules.nix b/lib/modules.nix index 61964d4667811..17bc1f1d76647 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -1378,7 +1378,6 @@ let inherit applyModuleArgsIfFunction dischargeProperties - evalOptionValue mergeModules mergeModules' pushDownProperties @@ -1399,6 +1398,7 @@ private // defaultPriority doRename evalModules + evalOptionValue # for use by lib.types filterOverrides filterOverrides' fixMergeModules diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index b3bbdf9485ac0..750b1d025e026 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -103,6 +103,18 @@ checkConfigError 'The option .sub.wrong2. does not exist. Definition values:' co checkConfigError '.*This can happen if you e.g. declared your options in .types.submodule.' config.sub ./error-mkOption-in-submodule-config.nix checkConfigError '.*A definition for option .bad. is not of type .non-empty .list of .submodule...\.' config.bad ./error-nonEmptyListOf-submodule.nix +# types.attrTag +checkConfigOutput '^true$' config.okChecks ./types-attrTag.nix +checkConfigError 'A definition for option .intStrings\.syntaxError. is not of type .attribute-tagged union' config.intStrings.syntaxError ./types-attrTag.nix +checkConfigError 'A definition for option .intStrings\.syntaxError2. is not of type .attribute-tagged union' config.intStrings.syntaxError2 ./types-attrTag.nix +checkConfigError 'A definition for option .intStrings\.syntaxError3. is not of type .attribute-tagged union' config.intStrings.syntaxError3 ./types-attrTag.nix +checkConfigError 'A definition for option .intStrings\.syntaxError4. is not of type .attribute-tagged union' config.intStrings.syntaxError4 ./types-attrTag.nix +checkConfigError 'A definition for option .intStrings\.mergeError. is not of type .attribute-tagged union' config.intStrings.mergeError ./types-attrTag.nix +checkConfigError 'A definition for option .intStrings\.badTagError. is not of type .attribute-tagged union' config.intStrings.badTagError ./types-attrTag.nix +checkConfigError 'A definition for option .intStrings\.badTagTypeError\.left. is not of type .signed integer.' config.intStrings.badTagTypeError.left ./types-attrTag.nix +checkConfigError 'A definition for option .nested\.right\.left. is not of type .signed integer.' config.nested.right.left ./types-attrTag.nix +checkConfigError 'In attrTag, each tag value must be an option, but tag int was a bare type, not wrapped in mkOption.' config.opt.int ./types-attrTag-wrong-decl.nix + # types.pathInStore checkConfigOutput '".*/store/0lz9p8xhf89kb1c1kk6jxrzskaiygnlh-bash-5.2-p15.drv"' config.pathInStore.ok1 ./types.nix checkConfigOutput '".*/store/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15"' config.pathInStore.ok2 ./types.nix diff --git a/lib/tests/modules/docs.nix b/lib/tests/modules/docs.nix new file mode 100644 index 0000000000000..225aa7eac1de8 --- /dev/null +++ b/lib/tests/modules/docs.nix @@ -0,0 +1,41 @@ +/* + A basic documentation generating module. + Declares and defines a `docs` option, suitable for making assertions about + the extraction "phase" of documentation generation. + */ +{ lib, options, ... }: + +let + inherit (lib) + head + length + mkOption + types + ; + + traceListSeq = l: v: lib.foldl' (a: b: lib.traceSeq b a) v l; + +in + +{ + options.docs = mkOption { + type = types.lazyAttrsOf types.raw; + description = '' + All options to be rendered, without any visibility filtering applied. + ''; + }; + config.docs = + lib.zipAttrsWith + (name: values: + if length values > 1 then + traceListSeq values + abort "Multiple options with the same name: ${name}" + else + assert length values == 1; + head values + ) + (map + (opt: { ${opt.name} = opt; }) + (lib.optionAttrSetToDocList options) + ); +} diff --git a/lib/tests/modules/types-attrTag-wrong-decl.nix b/lib/tests/modules/types-attrTag-wrong-decl.nix new file mode 100644 index 0000000000000..d03370bc10da4 --- /dev/null +++ b/lib/tests/modules/types-attrTag-wrong-decl.nix @@ -0,0 +1,14 @@ +{ lib, ... }: +let + inherit (lib) types mkOption; +in +{ + options = { + opt = mkOption { + type = types.attrTag { + int = types.int; + }; + default = { int = 1; }; + }; + }; +} diff --git a/lib/tests/modules/types-attrTag.nix b/lib/tests/modules/types-attrTag.nix new file mode 100644 index 0000000000000..b2e5158bb44b6 --- /dev/null +++ b/lib/tests/modules/types-attrTag.nix @@ -0,0 +1,135 @@ +{ lib, config, options, ... }: +let + inherit (lib) mkOption types; + forceDeep = x: builtins.deepSeq x x; + mergedSubOption = (options.merged.type.getSubOptions options.merged.loc).extensible."merged.<name>"; +in +{ + options = { + intStrings = mkOption { + type = types.attrsOf + (types.attrTag { + left = mkOption { + type = types.int; + }; + right = mkOption { + type = types.str; + }; + }); + }; + nested = mkOption { + type = types.attrTag { + left = mkOption { + type = types.int; + }; + right = mkOption { + type = types.attrTag { + left = mkOption { + type = types.int; + }; + right = mkOption { + type = types.str; + }; + }; + }; + }; + }; + merged = mkOption { + type = types.attrsOf ( + types.attrTag { + yay = mkOption { + type = types.int; + }; + extensible = mkOption { + type = types.enum [ "foo" ]; + }; + } + ); + }; + submodules = mkOption { + type = types.attrsOf ( + types.attrTag { + foo = mkOption { + type = types.submodule { + options = { + bar = mkOption { + type = types.int; + }; + }; + }; + }; + qux = mkOption { + type = types.str; + description = "A qux for when you don't want a foo"; + }; + } + ); + }; + okChecks = mkOption {}; + }; + imports = [ + ./docs.nix + { + options.merged = mkOption { + type = types.attrsOf ( + types.attrTag { + nay = mkOption { + type = types.bool; + }; + extensible = mkOption { + type = types.enum [ "bar" ]; + }; + } + ); + }; + } + ]; + config = { + intStrings.syntaxError = 1; + intStrings.syntaxError2 = {}; + intStrings.syntaxError3 = { a = true; b = true; }; + intStrings.syntaxError4 = lib.mkMerge [ { a = true; } { b = true; } ]; + intStrings.mergeError = lib.mkMerge [ { int = throw "do not eval"; } { string = throw "do not eval"; } ]; + intStrings.badTagError.rite = throw "do not eval"; + intStrings.badTagTypeError.left = "bad"; + intStrings.numberOne.left = 1; + intStrings.hello.right = "hello world"; + nested.right.left = "not a number"; + merged.negative.nay = false; + merged.positive.yay = 100; + merged.extensi-foo.extensible = "foo"; + merged.extensi-bar.extensible = "bar"; + okChecks = builtins.addErrorContext "while evaluating the assertions" ( + assert config.intStrings.hello == { right = "hello world"; }; + assert config.intStrings.numberOne == { left = 1; }; + assert config.merged.negative == { nay = false; }; + assert config.merged.positive == { yay = 100; }; + assert config.merged.extensi-foo == { extensible = "foo"; }; + assert config.merged.extensi-bar == { extensible = "bar"; }; + assert config.docs."submodules.<name>.foo.bar".type == "signed integer"; + assert config.docs."submodules.<name>.qux".type == "string"; + assert config.docs."submodules.<name>.qux".declarations == [ __curPos.file ]; + assert config.docs."submodules.<name>.qux".loc == [ "submodules" "<name>" "qux" ]; + assert config.docs."submodules.<name>.qux".name == "submodules.<name>.qux"; + assert config.docs."submodules.<name>.qux".description == "A qux for when you don't want a foo"; + assert config.docs."submodules.<name>.qux".readOnly == false; + assert config.docs."submodules.<name>.qux".visible == true; + # Not available (yet?) + # assert config.docs."submodules.<name>.qux".declarationsWithPositions == [ ... ]; + assert options.submodules.declarations == [ __curPos.file ]; + assert lib.length options.submodules.declarationPositions == 1; + assert (lib.head options.submodules.declarationPositions).file == __curPos.file; + assert options.merged.declarations == [ __curPos.file __curPos.file ]; + assert lib.length options.merged.declarationPositions == 2; + assert (lib.elemAt options.merged.declarationPositions 0).file == __curPos.file; + assert (lib.elemAt options.merged.declarationPositions 1).file == __curPos.file; + assert (lib.elemAt options.merged.declarationPositions 0).line != (lib.elemAt options.merged.declarationPositions 1).line; + assert mergedSubOption.declarations == [ __curPos.file __curPos.file ]; + assert lib.length mergedSubOption.declarationPositions == 2; + assert (lib.elemAt mergedSubOption.declarationPositions 0).file == __curPos.file; + assert (lib.elemAt mergedSubOption.declarationPositions 1).file == __curPos.file; + assert (lib.elemAt mergedSubOption.declarationPositions 0).line != (lib.elemAt mergedSubOption.declarationPositions 1).line; + assert lib.length config.docs."merged.<name>.extensible".declarations == 2; + true); + }; +} diff --git a/lib/types.nix b/lib/types.nix index e9bc939478c5f..518b987dcd92b 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -15,6 +15,7 @@ let isList isString isStorePath + throwIf toDerivation toList ; @@ -65,6 +66,11 @@ let fixupOptionType mergeOptionDecls ; + + inAttrPosSuffix = v: name: + let pos = builtins.unsafeGetAttrPos name v; in + if pos == null then "" else " at ${pos.file}:${toString pos.line}:${toString pos.column}"; + outer_types = rec { __attrsFailEvaluation = true; @@ -152,7 +158,7 @@ rec { # If it doesn't, this should be {} # This may be used when a value is required for `mkIf false`. This allows the extra laziness in e.g. `lazyAttrsOf`. emptyValue ? {} - , # Return a flat list of sub-options. Used to generate + , # Return a flat attrset of sub-options. Used to generate # documentation. getSubOptions ? prefix: {} , # List of modules if any, or null if none. @@ -623,6 +629,100 @@ rec { nestedTypes.elemType = elemType; }; + attrTag = tags: + let tags_ = tags; in + let + tags = + mapAttrs + (n: opt: + builtins.addErrorContext "while checking that attrTag tag ${lib.strings.escapeNixIdentifier n} is an option with a type${inAttrPosSuffix tags_ n}" ( + throwIf (opt._type or null != "option") + "In attrTag, each tag value must be an option, but tag ${lib.strings.escapeNixIdentifier n} ${ + if opt?_type then + if opt._type == "option-type" + then "was a bare type, not wrapped in mkOption." + else "was of type ${lib.strings.escapeNixString opt._type}." + else "was not."}" + opt // { + declarations = opt.declarations or ( + let pos = builtins.unsafeGetAttrPos n tags_; + in if pos == null then [] else [ pos.file ] + ); + declarationPositions = opt.declarationPositions or ( + let pos = builtins.unsafeGetAttrPos n tags_; + in if pos == null then [] else [ pos ] + ); + } + )) + tags_; + choicesStr = concatMapStringsSep ", " lib.strings.escapeNixIdentifier (attrNames tags); + in + mkOptionType { + name = "attrTag"; + description = "attribute-tagged union"; + descriptionClass = "noun"; + getSubOptions = prefix: + mapAttrs + (tagName: tagOption: { + "${lib.showOption prefix}" = + tagOption // { + loc = prefix ++ [ tagName ]; + }; + }) + tags; + check = v: isAttrs v && length (attrNames v) == 1 && tags?${head (attrNames v)}; + merge = loc: defs: + let + choice = head (attrNames (head defs).value); + checkedValueDefs = map + (def: + assert (length (attrNames def.value)) == 1; + if (head (attrNames def.value)) != choice + then throw "The option `${showOption loc}` is defined both as `${choice}` and `${head (attrNames def.value)}`, in ${showFiles (getFiles defs)}." + else { inherit (def) file; value = def.value.${choice}; }) + defs; + in + if tags?${choice} + then + { ${choice} = + (lib.modules.evalOptionValue + (loc ++ [choice]) + tags.${choice} + checkedValueDefs + ).value; + } + else throw "The option `${showOption loc}` is defined as ${lib.strings.escapeNixIdentifier choice}, but ${lib.strings.escapeNixIdentifier choice} is not among the valid choices (${choicesStr}). Value ${choice} was defined in ${showFiles (getFiles defs)}."; + nestedTypes = tags; + functor = defaultFunctor "attrTag" // { + type = { tags, ... }: types.attrTag tags; + payload = { inherit tags; }; + binOp = + let + # Add metadata in the format that submodules work with + wrapOptionDecl = + option: { options = option; _file = "<attrTag {...}>"; pos = null; }; + in + a: b: { + tags = a.tags // b.tags // + mapAttrs + (tagName: bOpt: + lib.mergeOptionDecls + # FIXME: loc is not accurate; should include prefix + # Fortunately, it's only used for error messages, where a "relative" location is kinda ok. + # It is also returned though, but use of the attribute seems rare? + [tagName] + [ (wrapOptionDecl a.tags.${tagName}) (wrapOptionDecl bOpt) ] + // { + # mergeOptionDecls is not idempotent in these attrs: + declarations = a.tags.${tagName}.declarations ++ bOpt.declarations; + declarationPositions = a.tags.${tagName}.declarationPositions ++ bOpt.declarationPositions; + } + ) + (builtins.intersectAttrs a.tags b.tags); + }; + }; + }; + uniq = unique { message = ""; }; unique = { message }: type: mkOptionType rec { diff --git a/nixos/doc/manual/development/option-types.section.md b/nixos/doc/manual/development/option-types.section.md index 243039b016737..b44a84553b37b 100644 --- a/nixos/doc/manual/development/option-types.section.md +++ b/nixos/doc/manual/development/option-types.section.md @@ -42,6 +42,9 @@ merging is handled. : One element of the list *`l`*, e.g. `types.enum [ "left" "right" ]`. Multiple definitions cannot be merged. + If you want to pair these values with more information, possibly of + distinct types, consider using a [sum type](#sec-option-types-sums). + `types.anything` : A type that accepts any value and recursively merges attribute sets @@ -279,6 +282,84 @@ Submodules are detailed in [Submodule](#section-option-types-submodule). more convenient and discoverable than expecting the module user to type-merge with the `attrsOf submodule` option. +## Union types {#sec-option-types-unions} + +A union of types is a type such that a value is valid when it is valid for at least one of those types. + +If some values are instances of more than one of the types, it is not possible to distinguish which type they are meant to be instances of. If that's needed, consider using a [sum type](#sec-option-types-sums). + +`types.either` *`t1 t2`* + +: Type *`t1`* or type *`t2`*, e.g. `with types; either int str`. + Multiple definitions cannot be merged. + +`types.oneOf` \[ *`t1 t2`* ... \] + +: Type *`t1`* or type *`t2`* and so forth, e.g. + `with types; oneOf [ int str bool ]`. Multiple definitions cannot be + merged. + +`types.nullOr` *`t`* + +: `null` or type *`t`*. Multiple definitions are merged according to + type *`t`*. + + +## Sum types {#sec-option-types-sums} + +A sum type can be thought of, conceptually, as a *`types.enum`* where each valid item is paired with at least a type, through some value syntax. +Nix does not have a built-in syntax for this pairing of a label and a type or value, so sum types may be represented in multiple ways. + +If the you're interested in can be distinguished without a label, you may simplify your value syntax with a [union type](#sec-option-types-unions) instead. + +`types.attrTag` *`{ attr1 = option1; attr2 = option2; ... }`* + +: An attribute set containing one attribute, whose name must be picked from + the attribute set (`attr1`, etc) and whose value consists of definitions that are valid for the corresponding option (`option1`, etc). + + This type appears in the documentation as _attribute-tagged union_. + + Example: + + ```nix + { lib, ... }: + let inherit (lib) type mkOption; + in { + options.toyRouter.rules = mkOption { + description = '' + Rules for a fictional packet routing service. + ''; + type = types.attrsOf ( + types.attrTag { + bounce = mkOption { + description = "Send back a packet explaining why it wasn't forwarded."; + type = types.submodule { + options.errorMessage = mkOption { … }; + }; + }; + forward = mkOption { + description = "Forward the packet."; + type = types.submodule { + options.destination = mkOption { … }; + }; + }; + ignore = types.mkOption { + description = "Drop the packet without sending anything back."; + type = types.submodule {}; + }; + }); + }; + config.toyRouter.rules = { + http = { + bounce = { + errorMessage = "Unencrypted HTTP is banned. You must always use https://."; + }; + }; + ssh = { drop = {}; }; + }; + } + ``` + ## Composed types {#sec-option-types-composed} Composed types are types that take a type as parameter. `listOf @@ -318,11 +399,6 @@ Composed types are types that take a type as parameter. `listOf returned instead for the same `mkIf false` definition. ::: -`types.nullOr` *`t`* - -: `null` or type *`t`*. Multiple definitions are merged according to - type *`t`*. - `types.uniq` *`t`* : Ensures that type *`t`* cannot be merged. It is used to ensure option @@ -334,17 +410,6 @@ Composed types are types that take a type as parameter. `listOf the line `The option <option path> is defined multiple times.` and before a list of definition locations. -`types.either` *`t1 t2`* - -: Type *`t1`* or type *`t2`*, e.g. `with types; either int str`. - Multiple definitions cannot be merged. - -`types.oneOf` \[ *`t1 t2`* ... \] - -: Type *`t1`* or type *`t2`* and so forth, e.g. - `with types; oneOf [ int str bool ]`. Multiple definitions cannot be - merged. - `types.coercedTo` *`from f to`* : Type *`to`* or type *`from`* which will be coerced to type *`to`* using diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index ad6194f8262ae..7d5714499f3a9 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -123,6 +123,7 @@ let }; # if remote-backup wait for network after = optional (cfg.persistentTimer && !isLocalPath cfg.repo) "network-online.target"; + wants = optional (cfg.persistentTimer && !isLocalPath cfg.repo) "network-online.target"; }; # utility function around makeWrapper diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index c1f3ea70cb6e9..bc64397d5d882 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -170,7 +170,17 @@ in { breeze.qt5 plasma-integration.qt5 pkgs.plasma5Packages.kwayland-integration - (pkgs.plasma5Packages.kio.override { withKcms = false; }) + ( + # Only symlink the KIO plugins, so we don't accidentally pull any services + # like KCMs or kcookiejar + let + kioPluginPath = "${pkgs.plasma5Packages.qtbase.qtPluginPrefix}/kf5/kio"; + inherit (pkgs.plasma5Packages) kio; + in pkgs.runCommand "kio5-plugins-only" {} '' + mkdir -p $out/${kioPluginPath} + ln -s ${kio}/${kioPluginPath}/* $out/${kioPluginPath} + '' + ) kio-extras-kf5 ] # Optional hardware support features diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix index ba1445f083975..49cca0cb8112a 100644 --- a/nixos/modules/services/logging/logrotate.nix +++ b/nixos/modules/services/logging/logrotate.nix @@ -104,9 +104,12 @@ in default = { }; description = lib.mdDoc '' logrotate freeform settings: each attribute here will define its own section, - ordered by priority, which can either define files to rotate with their settings + ordered by {option}`services.logrotate.settings.<name>.priority`, + which can either define files to rotate with their settings or settings common to all further files settings. - Refer to <https://linux.die.net/man/8/logrotate> for details. + All attribute names not explicitly defined as sub-options here are passed through + as logrotate config directives, + refer to <https://linux.die.net/man/8/logrotate> for details. ''; example = literalExpression '' { @@ -125,6 +128,14 @@ in "/var/log/second.log" ]; }; + # specify custom order of sections + "/var/log/myservice/*.log" = { + # ensure lower priority + priority = 110; + postrotate = ''' + systemctl reload myservice + '''; + }; }; ''; type = types.attrsOf (types.submodule ({ name, ... }: { diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix index aa96acb613067..22d1fb727477c 100644 --- a/nixos/modules/services/misc/autorandr.nix +++ b/nixos/modules/services/misc/autorandr.nix @@ -260,6 +260,12 @@ in { description = lib.mdDoc "Treat outputs as connected even if their lids are closed"; }; + matchEdid = mkOption { + default = false; + type = types.bool; + description = lib.mdDoc "Match displays based on edid instead of name"; + }; + hooks = mkOption { type = hooksModule; description = lib.mdDoc "Global hook scripts"; @@ -351,7 +357,8 @@ in { --batch \ --change \ --default ${cfg.defaultTarget} \ - ${optionalString cfg.ignoreLid "--ignore-lid"} + ${optionalString cfg.ignoreLid "--ignore-lid"} \ + ${optionalString cfg.matchEdid "--match-edid"} ''; Type = "oneshot"; RemainAfterExit = false; diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index eb769f53901cf..5e20c83652988 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -348,7 +348,7 @@ in (flip mapAttrsToList cfg.networks (network: data: flip mapAttrs' data.hosts (host: text: nameValuePair ("tinc/${network}/hosts/${host}") - ({ mode = "0644"; user = "tinc.${network}"; inherit text; }) + ({ mode = "0644"; user = "tinc-${network}"; inherit text; }) ) // { "tinc/${network}/tinc.conf" = { mode = "0444"; @@ -375,13 +375,13 @@ in Restart = "always"; RestartSec = "3"; ExecReload = mkIf (versionAtLeast version "1.1pre") "${data.package}/bin/tinc -n ${network} reload"; - ExecStart = "${data.package}/bin/tincd -D -U tinc.${network} -n ${network} ${optionalString (data.chroot) "-R"} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel}"; + ExecStart = "${data.package}/bin/tincd -D -U tinc-${network} -n ${network} ${optionalString (data.chroot) "-R"} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel}"; }; preStart = '' mkdir -p /etc/tinc/${network}/hosts - chown tinc.${network} /etc/tinc/${network}/hosts + chown tinc-${network} /etc/tinc/${network}/hosts mkdir -p /etc/tinc/${network}/invitations - chown tinc.${network} /etc/tinc/${network}/invitations + chown tinc-${network} /etc/tinc/${network}/invitations # Determine how we should generate our keys if type tinc >/dev/null 2>&1; then @@ -420,14 +420,14 @@ in in [ cli-wrappers ]; users.users = flip mapAttrs' cfg.networks (network: _: - nameValuePair ("tinc.${network}") ({ + nameValuePair ("tinc-${network}") ({ description = "Tinc daemon user for ${network}"; isSystemUser = true; - group = "tinc.${network}"; + group = "tinc-${network}"; }) ); users.groups = flip mapAttrs' cfg.networks (network: _: - nameValuePair "tinc.${network}" {} + nameValuePair "tinc-${network}" {} ); }); diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix index e6288270c8e24..689e0000fdd54 100644 --- a/nixos/modules/services/system/cloud-init.nix +++ b/nixos/modules/services/system/cloud-init.nix @@ -17,6 +17,7 @@ let ++ optional cfg.ext4.enable e2fsprogs ++ optional cfg.xfs.enable xfsprogs ; + hasFs = fsName: lib.any (fs: fs.fsType == fsName) (lib.attrValues config.fileSystems); settingsFormat = pkgs.formats.yaml { }; cfgfile = settingsFormat.generate "cloud.cfg" cfg.settings; in @@ -44,7 +45,8 @@ in btrfs.enable = mkOption { type = types.bool; - default = false; + default = hasFs "btrfs"; + defaultText = literalExpression ''hasFs "btrfs"''; description = mdDoc '' Allow the cloud-init service to operate `btrfs` filesystem. ''; @@ -52,7 +54,8 @@ in ext4.enable = mkOption { type = types.bool; - default = true; + default = hasFs "ext4"; + defaultText = literalExpression ''hasFs "ext4"''; description = mdDoc '' Allow the cloud-init service to operate `ext4` filesystem. ''; @@ -60,7 +63,8 @@ in xfs.enable = mkOption { type = types.bool; - default = false; + default = hasFs "xfs"; + defaultText = literalExpression ''hasFs "xfs"''; description = mdDoc '' Allow the cloud-init service to operate `xfs` filesystem. ''; diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh index 1a0da0050291d..f2b281d23292b 100644 --- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh +++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh @@ -141,7 +141,13 @@ if [ "$numGenerations" -gt 0 ]; then | sort -n -r \ | head -n $numGenerations); do link=/nix/var/nix/profiles/system-$generation-link - addEntry $link $generation + addEntry $link "${generation}-default" + for specialisation in $( + ls /nix/var/nix/profiles/system-$generation-link/specialisation \ + | sort -n -r); do + link=/nix/var/nix/profiles/system-$generation-link/specialisation/$specialisation + addEntry $link "${generation}-${specialisation}" + done done >> $tmpFile fi diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 0587fc8d4bbb9..5541950650f7b 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.79.2"; + version = "1.80"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - hash = "sha256-/RZXtSjJ0nRtlMreT4M/IYQpdv/UXjVJaHMld9wwaUw="; + hash = "sha256-Zm/HJasZ6iF1wWOzpViQVutFBjv/qbeWkUJOGAbbEYw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/blockchains/polkadot/Cargo.lock b/pkgs/applications/blockchains/polkadot/Cargo.lock index 439e4052adff8..ad5d007915020 100644 --- a/pkgs/applications/blockchains/polkadot/Cargo.lock +++ b/pkgs/applications/blockchains/polkadot/Cargo.lock @@ -191,7 +191,7 @@ checksum = "c0391754c09fab4eae3404d19d0d297aa1c670c1775ab51d8a5312afeca23157" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -202,11 +202,11 @@ checksum = "8a98ad1696a2e17f010ae8e43e9f2a1e930ed176a8e3ff77acfeff6dfb07b42c" dependencies = [ "const-hex", "dunce", - "heck", + "heck 0.4.1", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", "syn-solidity", "tiny-keccak", ] @@ -275,9 +275,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.2" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" @@ -309,9 +309,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "approx" @@ -347,7 +347,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -841,6 +841,7 @@ dependencies = [ "pallet-xcm", "parachains-common", "parity-scale-codec", + "penpal-runtime", "rococo-runtime", "rococo-system-emulated-network", "sp-runtime", @@ -866,6 +867,7 @@ dependencies = [ "cumulus-pallet-xcmp-queue", "cumulus-primitives-aura", "cumulus-primitives-core", + "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -962,6 +964,7 @@ dependencies = [ "pallet-xcm", "parachains-common", "parity-scale-codec", + "penpal-runtime", "polkadot-runtime-common", "sp-runtime", "staging-xcm", @@ -988,6 +991,7 @@ dependencies = [ "cumulus-pallet-xcmp-queue", "cumulus-primitives-aura", "cumulus-primitives-core", + "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -1226,7 +1230,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -1237,13 +1241,13 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -1391,7 +1395,7 @@ name = "binary-merkle-tree" version = "13.0.0" dependencies = [ "array-bytes 6.1.0", - "env_logger 0.9.3", + "env_logger 0.11.3", "hash-db", "log", "sp-core", @@ -1425,7 +1429,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -2008,6 +2012,7 @@ dependencies = [ "cumulus-pallet-xcmp-queue", "cumulus-primitives-aura", "cumulus-primitives-core", + "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -2146,6 +2151,7 @@ dependencies = [ "pallet-message-queue", "pallet-xcm", "parachains-common", + "parity-scale-codec", "rococo-westend-system-emulated-network", "sp-runtime", "staging-xcm", @@ -2178,6 +2184,7 @@ dependencies = [ "cumulus-pallet-xcmp-queue", "cumulus-primitives-aura", "cumulus-primitives-core", + "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -2611,28 +2618,28 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.1" +version = "4.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" +checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813" dependencies = [ "clap_builder", - "clap_derive 4.5.0", + "clap_derive 4.5.3", ] [[package]] name = "clap-num" -version = "1.1.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e063d263364859dc54fb064cedb7c122740cd4733644b14b176c097f51e8ab7" +checksum = "488557e97528174edaa2ee268b23a809e0c598213a4bbcb4f34575a46fda147e" dependencies = [ "num-traits", ] [[package]] name = "clap_builder" -version = "4.5.1" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", @@ -2647,7 +2654,7 @@ version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", ] [[package]] @@ -2656,7 +2663,7 @@ version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro-error", "proc-macro2", "quote", @@ -2665,14 +2672,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.0" +version = "4.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" +checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -2736,6 +2743,7 @@ dependencies = [ "cumulus-pallet-xcmp-queue", "cumulus-primitives-aura", "cumulus-primitives-core", + "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -2841,10 +2849,11 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "colored" -version = "2.1.0" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" dependencies = [ + "is-terminal", "lazy_static", "windows-sys 0.48.0", ] @@ -2990,6 +2999,7 @@ dependencies = [ "cumulus-pallet-xcmp-queue", "cumulus-primitives-aura", "cumulus-primitives-core", + "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -3084,6 +3094,7 @@ dependencies = [ "cumulus-pallet-xcmp-queue", "cumulus-primitives-aura", "cumulus-primitives-core", + "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -3148,6 +3159,7 @@ dependencies = [ "cumulus-pallet-xcmp-queue", "cumulus-primitives-aura", "cumulus-primitives-core", + "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -3381,7 +3393,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.5.1", + "clap 4.5.3", "criterion-plot", "futures", "is-terminal", @@ -3534,7 +3546,7 @@ dependencies = [ name = "cumulus-client-cli" version = "0.7.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "parity-scale-codec", "sc-chain-spec", "sc-cli", @@ -3800,6 +3812,7 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-core", + "sp-io", "sp-runtime", "sp-transaction-pool", ] @@ -3893,7 +3906,7 @@ dependencies = [ "proc-macro-crate 3.0.0", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -4045,7 +4058,7 @@ dependencies = [ "cumulus-primitives-core", "cumulus-primitives-proof-size-hostfunction", "cumulus-test-runtime", - "docify 0.2.7", + "docify", "frame-support", "frame-system", "log", @@ -4297,7 +4310,7 @@ name = "cumulus-test-service" version = "0.1.0" dependencies = [ "async-trait", - "clap 4.5.1", + "clap 4.5.3", "criterion 0.5.1", "cumulus-client-cli", "cumulus-client-consensus-common", @@ -4318,7 +4331,6 @@ dependencies = [ "frame-system-rpc-runtime-api", "futures", "jsonrpsee", - "pallet-im-online", "pallet-timestamp", "pallet-transaction-payment", "parachains-common", @@ -4408,7 +4420,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -4448,7 +4460,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -4465,7 +4477,7 @@ checksum = "50c49547d73ba8dcfd4ad7325d64c6d5391ff4224d498fc39a6f3f49825a530d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -4569,6 +4581,17 @@ dependencies = [ ] [[package]] +name = "derive-syn-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] name = "derive_more" version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4673,7 +4696,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -4715,52 +4738,26 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "docify" -version = "0.1.16" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1b04e6ef3d21119d3eb7b032bca17f99fe041e9c072f30f32cc0e1a2b1f3c4" +checksum = "43a2f138ad521dc4a2ced1a4576148a6a610b4c5923933b062a263130a6802ce" dependencies = [ - "docify_macros 0.1.16", -] - -[[package]] -name = "docify" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc4fd38aaa9fb98ac70794c82a00360d1e165a87fbf96a8a91f9dfc602aaee2" -dependencies = [ - "docify_macros 0.2.7", + "docify_macros", ] [[package]] name = "docify_macros" -version = "0.1.16" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b5610df7f2acf89a1bb5d1a66ae56b1c7fcdcfe3948856fb3ace3f644d70eb7" +checksum = "1a081e51fb188742f5a7a1164ad752121abcb22874b21e2c3b0dd040c515fdad" dependencies = [ "common-path", - "derive-syn-parse", - "lazy_static", - "proc-macro2", - "quote", - "regex", - "syn 2.0.50", - "termcolor", - "walkdir", -] - -[[package]] -name = "docify_macros" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63fa215f3a0d40fb2a221b3aa90d8e1fbb8379785a990cb60d62ac71ebdc6460" -dependencies = [ - "common-path", - "derive-syn-parse", + "derive-syn-parse 0.2.0", "once_cell", "proc-macro2", "quote", "regex", - "syn 2.0.50", + "syn 2.0.53", "termcolor", "toml 0.8.8", "walkdir", @@ -4931,6 +4928,7 @@ dependencies = [ "parachains-common", "parity-scale-codec", "paste", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-parachains", "sc-consensus-grandpa", @@ -4964,7 +4962,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 1.0.109", @@ -4987,7 +4985,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -4998,14 +4996,14 @@ checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] -name = "env_logger" -version = "0.8.4" +name = "env_filter" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" dependencies = [ "log", "regex", @@ -5013,15 +5011,12 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.9.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" dependencies = [ - "atty", - "humantime", "log", "regex", - "termcolor", ] [[package]] @@ -5038,6 +5033,19 @@ dependencies = [ ] [[package]] +name = "env_logger" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", +] + +[[package]] name = "environmental" version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5051,9 +5059,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erased-serde" -version = "0.3.30" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "837c0466252947ada828b975e12daf82e18bb5444e4df87be6038d4469e2a3d2" +checksum = "2b73807008a3c7f171cc40312f37d95ef0396e048b5848d775f54b1a4dd4a0d3" dependencies = [ "serde", ] @@ -5188,7 +5196,7 @@ dependencies = [ "fs-err", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -5450,7 +5458,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" name = "frame" version = "0.0.1-dev" dependencies = [ - "docify 0.2.7", + "docify", "frame-executive", "frame-support", "frame-system", @@ -5509,7 +5517,7 @@ dependencies = [ "Inflector", "array-bytes 6.1.0", "chrono", - "clap 4.5.1", + "clap 4.5.3", "comfy-table", "frame-benchmarking", "frame-support", @@ -5575,7 +5583,7 @@ dependencies = [ "quote", "scale-info", "sp-arithmetic", - "syn 2.0.50", + "syn 2.0.53", "trybuild", ] @@ -5601,7 +5609,7 @@ dependencies = [ name = "frame-election-solution-type-fuzzer" version = "2.0.0-alpha.5" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "frame-election-provider-solution-type", "frame-election-provider-support", "frame-support", @@ -5679,7 +5687,7 @@ dependencies = [ "array-bytes 6.1.0", "assert_matches", "bitflags 1.3.2", - "docify 0.2.7", + "docify", "environmental", "frame-metadata", "frame-support-procedural", @@ -5722,7 +5730,7 @@ version = "23.0.0" dependencies = [ "Inflector", "cfg-expr", - "derive-syn-parse", + "derive-syn-parse 0.2.0", "expander 2.0.0", "frame-support-procedural-tools", "itertools 0.10.5", @@ -5732,7 +5740,7 @@ dependencies = [ "quote", "regex", "sp-crypto-hashing", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -5743,7 +5751,7 @@ dependencies = [ "proc-macro-crate 3.0.0", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -5752,7 +5760,7 @@ version = "11.0.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -5823,7 +5831,7 @@ version = "28.0.0" dependencies = [ "cfg-if", "criterion 0.4.0", - "docify 0.2.7", + "docify", "frame-support", "log", "parity-scale-codec", @@ -5985,7 +5993,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -6340,6 +6348,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] name = "hermit-abi" version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6763,7 +6777,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.3", + "socket2 0.5.6", "widestring", "windows-sys 0.48.0", "winreg", @@ -6845,9 +6859,9 @@ checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" [[package]] name = "jsonrpsee" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a95f7cc23d5fab0cdeeaf6bad8c8f5e7a3aa7f0d211957ea78232b327ab27b0" +checksum = "87f3ae45a64cfc0882934f963be9431b2a165d667f53140358181f262aca0702" dependencies = [ "jsonrpsee-core", "jsonrpsee-http-client", @@ -6861,9 +6875,9 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1736cfa3845fd9f8f43751f2b8e0e83f7b6081e754502f7d63b6587692cc83" +checksum = "455fc882e56f58228df2aee36b88a1340eafd707c76af2fa68cf94b37d461131" dependencies = [ "futures-util", "http", @@ -6882,9 +6896,9 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82030d038658974732103e623ba2e0abec03bbbe175b39c0a2fafbada60c5868" +checksum = "b75568f4f9696e3a47426e1985b548e1a9fcb13372a5e320372acaf04aca30d1" dependencies = [ "anyhow", "async-lock 3.3.0", @@ -6908,9 +6922,9 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36a06ef0de060005fddf772d54597bb6a8b0413da47dcffd304b0306147b9678" +checksum = "9e7a95e346f55df84fb167b7e06470e196e7d5b9488a21d69c5d9732043ba7ba" dependencies = [ "async-trait", "hyper", @@ -6928,22 +6942,22 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69fc56131589f82e57805f7338b87023db4aafef813555708b159787e34ad6bc" +checksum = "30ca066e73dd70294aebc5c2675d8ffae43be944af027c857ce0d4c51785f014" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro-crate 3.0.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.53", ] [[package]] name = "jsonrpsee-server" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d85be77fe5b2a94589e3164fb780017f7aff7d646b49278c0d0346af16975c8e" +checksum = "0e29c1bd1f9bba83c864977c73404e505f74f730fa0db89dd490ec174e36d7f0" dependencies = [ "futures-util", "http", @@ -6965,9 +6979,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a48fdc1202eafc51c63e00406575e59493284ace8b8b61aa16f3a6db5d64f1a" +checksum = "3467fd35feeee179f71ab294516bdf3a81139e7aeebdd860e46897c12e1a3368" dependencies = [ "anyhow", "beef", @@ -6978,9 +6992,9 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5ce25d70a8e4d3cc574bbc3cad0137c326ad64b194793d5e7bbdd3fa4504181" +checksum = "68ca71e74983f624c0cb67828e480a981586074da8ad3a2f214c6a3f884edab9" dependencies = [ "http", "jsonrpsee-client-transport", @@ -7583,7 +7597,7 @@ version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fba456131824ab6acd4c7bf61e9c0f0a3014b5fc9868ccb8e10d344594cdc4f" dependencies = [ - "heck", + "heck 0.4.1", "quote", "syn 1.0.109", ] @@ -7836,9 +7850,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" dependencies = [ "serde", "value-bag", @@ -7924,7 +7938,7 @@ dependencies = [ "macro_magic_core", "macro_magic_macros", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -7934,11 +7948,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "468155613a44cfd825f1fb0ffa532b018253920d404e6fca1e8d43155198a46d" dependencies = [ "const-random", - "derive-syn-parse", + "derive-syn-parse 0.1.5", "macro_magic_core_macros", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -7949,7 +7963,7 @@ checksum = "9ea73aa640dc01d62a590d48c0c3521ed739d53b27f919b25c3551e233481654" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -7960,7 +7974,7 @@ checksum = "ef9d79ae96aaba821963320eb2b6e34d17df1e5a83d8a1985c29cc5be59577b3" dependencies = [ "macro_magic_core", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -8117,7 +8131,7 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" name = "minimal-template-node" version = "0.0.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "frame", "futures", "futures-timer", @@ -8586,7 +8600,7 @@ name = "node-bench" version = "0.9.0-dev" dependencies = [ "array-bytes 6.1.0", - "clap 4.5.1", + "clap 4.5.3", "derive_more", "fs_extra", "futures", @@ -8663,7 +8677,7 @@ dependencies = [ name = "node-runtime-generate-bags" version = "3.0.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "generate-bags", "kitchensink-runtime", ] @@ -8672,7 +8686,7 @@ dependencies = [ name = "node-template-release" version = "3.0.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "flate2", "fs_extra", "glob", @@ -9206,7 +9220,7 @@ name = "pallet-bags-list" version = "27.0.0" dependencies = [ "aquamarine 0.5.0", - "docify 0.2.7", + "docify", "frame-benchmarking", "frame-election-provider-support", "frame-support", @@ -9254,7 +9268,7 @@ dependencies = [ name = "pallet-balances" version = "28.0.0" dependencies = [ - "docify 0.2.7", + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -9525,7 +9539,7 @@ dependencies = [ "array-bytes 6.1.0", "assert_matches", "bitflags 1.3.2", - "env_logger 0.9.3", + "env_logger 0.11.3", "environmental", "frame-benchmarking", "frame-support", @@ -9543,6 +9557,7 @@ dependencies = [ "pallet-timestamp", "pallet-utility", "parity-scale-codec", + "paste", "pretty_assertions", "rand", "rand_pcg", @@ -9570,7 +9585,7 @@ dependencies = [ "anyhow", "frame-system", "parity-wasm", - "polkavm-linker 0.5.0", + "polkavm-linker", "sp-runtime", "tempfile", "toml 0.8.8", @@ -9621,7 +9636,7 @@ version = "18.0.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -9631,7 +9646,7 @@ dependencies = [ "bitflags 1.3.2", "parity-scale-codec", "paste", - "polkavm-derive 0.5.0", + "polkavm-derive", "scale-info", ] @@ -9771,7 +9786,7 @@ dependencies = [ "sp-runtime", "sp-std 14.0.0", "sp-tracing 16.0.0", - "strum 0.24.1", + "strum 0.26.2", ] [[package]] @@ -9872,7 +9887,7 @@ dependencies = [ name = "pallet-example-single-block-migrations" version = "0.0.1" dependencies = [ - "docify 0.2.7", + "docify", "frame-executive", "frame-support", "frame-system", @@ -9938,7 +9953,7 @@ dependencies = [ name = "pallet-fast-unstake" version = "27.0.0" dependencies = [ - "docify 0.2.7", + "docify", "frame-benchmarking", "frame-election-provider-support", "frame-support", @@ -10139,7 +10154,7 @@ dependencies = [ name = "pallet-migrations" version = "1.0.0" dependencies = [ - "docify 0.1.16", + "docify", "frame-benchmarking", "frame-executive", "frame-support", @@ -10192,7 +10207,7 @@ name = "pallet-mmr" version = "27.0.0" dependencies = [ "array-bytes 6.1.0", - "env_logger 0.9.3", + "env_logger 0.11.3", "frame-benchmarking", "frame-support", "frame-system", @@ -10443,7 +10458,7 @@ dependencies = [ name = "pallet-paged-list" version = "0.6.0" dependencies = [ - "docify 0.2.7", + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -10485,7 +10500,7 @@ dependencies = [ name = "pallet-parameters" version = "0.0.1" dependencies = [ - "docify 0.2.7", + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -10646,7 +10661,7 @@ dependencies = [ name = "pallet-safe-mode" version = "9.0.0" dependencies = [ - "docify 0.2.7", + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -10703,7 +10718,7 @@ dependencies = [ name = "pallet-scheduler" version = "29.0.0" dependencies = [ - "docify 0.2.7", + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -10849,7 +10864,7 @@ dependencies = [ "proc-macro2", "quote", "sp-runtime", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -10916,7 +10931,7 @@ dependencies = [ name = "pallet-sudo" version = "28.0.0" dependencies = [ - "docify 0.2.7", + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -10946,7 +10961,7 @@ dependencies = [ name = "pallet-timestamp" version = "27.0.0" dependencies = [ - "docify 0.2.7", + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -11050,7 +11065,7 @@ dependencies = [ name = "pallet-treasury" version = "27.0.0" dependencies = [ - "docify 0.2.7", + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -11070,7 +11085,7 @@ dependencies = [ name = "pallet-tx-pause" version = "9.0.0" dependencies = [ - "docify 0.2.7", + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -11179,6 +11194,7 @@ dependencies = [ "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -11254,7 +11270,7 @@ dependencies = [ name = "parachain-template-node" version = "0.0.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "color-print", "cumulus-client-cli", "cumulus-client-collator", @@ -11645,9 +11661,8 @@ dependencies = [ "frame-support", "parachains-common", "penpal-runtime", - "rococo-emulated-chain", "sp-core", - "westend-emulated-chain", + "staging-xcm", ] [[package]] @@ -11757,6 +11772,7 @@ dependencies = [ "cumulus-pallet-xcmp-queue", "cumulus-primitives-aura", "cumulus-primitives-core", + "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", "enumflags2", "frame-benchmarking", @@ -11856,6 +11872,7 @@ dependencies = [ "cumulus-pallet-xcmp-queue", "cumulus-primitives-aura", "cumulus-primitives-core", + "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", "enumflags2", "frame-benchmarking", @@ -11945,7 +11962,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -11986,7 +12003,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -12084,7 +12101,7 @@ version = "7.0.0" dependencies = [ "assert_matches", "bitvec", - "env_logger 0.9.3", + "env_logger 0.11.3", "futures", "futures-timer", "itertools 0.10.5", @@ -12114,7 +12131,7 @@ dependencies = [ "always-assert", "assert_matches", "bitvec", - "env_logger 0.9.3", + "env_logger 0.11.3", "futures", "futures-timer", "log", @@ -12170,7 +12187,7 @@ version = "7.0.0" dependencies = [ "assert_matches", "async-trait", - "env_logger 0.9.3", + "env_logger 0.11.3", "fatality", "futures", "futures-timer", @@ -12201,7 +12218,7 @@ name = "polkadot-cli" version = "7.0.0" dependencies = [ "cfg-if", - "clap 4.5.1", + "clap 4.5.3", "frame-benchmarking-cli", "futures", "log", @@ -12232,7 +12249,7 @@ version = "7.0.0" dependencies = [ "assert_matches", "bitvec", - "env_logger 0.9.3", + "env_logger 0.11.3", "fatality", "futures", "futures-timer", @@ -12388,6 +12405,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-primitives-test-helpers", + "rstest", "sp-core", "sp-keyring", "sp-maybe-compressed-blob", @@ -12403,7 +12421,7 @@ dependencies = [ "async-trait", "bitvec", "derive_more", - "env_logger 0.9.3", + "env_logger 0.11.3", "futures", "futures-timer", "itertools 0.10.5", @@ -12445,7 +12463,7 @@ version = "7.0.0" dependencies = [ "assert_matches", "bitvec", - "env_logger 0.9.3", + "env_logger 0.11.3", "futures", "futures-timer", "kvdb", @@ -12887,7 +12905,7 @@ dependencies = [ "rand_chacha 0.3.1", "sc-authority-discovery", "sc-network", - "strum 0.24.1", + "strum 0.26.2", "thiserror", "tracing-gum", ] @@ -12979,7 +12997,7 @@ dependencies = [ "assert_matches", "async-trait", "derive_more", - "env_logger 0.9.3", + "env_logger 0.11.3", "fatality", "futures", "futures-channel", @@ -13043,7 +13061,7 @@ dependencies = [ [[package]] name = "polkadot-parachain-bin" -version = "1.9.0" +version = "1.10.0" dependencies = [ "assert_cmd", "asset-hub-rococo-runtime", @@ -13051,7 +13069,7 @@ dependencies = [ "async-trait", "bridge-hub-rococo-runtime", "bridge-hub-westend-runtime", - "clap 4.5.1", + "clap 4.5.3", "collectives-westend-runtime", "color-print", "contracts-rococo-runtime", @@ -13358,7 +13376,7 @@ version = "0.0.1" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", - "docify 0.2.7", + "docify", "frame", "frame-executive", "frame-support", @@ -13367,7 +13385,9 @@ dependencies = [ "pallet-assets", "pallet-aura", "pallet-authorship", + "pallet-babe", "pallet-balances", + "pallet-broker", "pallet-collective", "pallet-default-config-example", "pallet-democracy", @@ -13375,10 +13395,14 @@ dependencies = [ "pallet-example-single-block-migrations", "pallet-examples", "pallet-multisig", + "pallet-nfts", + "pallet-preimage", "pallet-proxy", + "pallet-referenda", "pallet-scheduler", "pallet-timestamp", "pallet-transaction-payment", + "pallet-uniques", "pallet-utility", "parity-scale-codec", "sc-cli", @@ -13395,6 +13419,7 @@ dependencies = [ "scale-info", "simple-mermaid", "sp-api", + "sp-arithmetic", "sp-core", "sp-io", "sp-keyring", @@ -13416,7 +13441,7 @@ dependencies = [ "assert_matches", "async-trait", "bitvec", - "env_logger 0.9.3", + "env_logger 0.11.3", "frame-benchmarking", "frame-benchmarking-cli", "frame-support", @@ -13430,7 +13455,6 @@ dependencies = [ "log", "mmr-gadget", "pallet-babe", - "pallet-im-online", "pallet-staking", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", @@ -13527,12 +13551,14 @@ dependencies = [ "sp-transaction-pool", "sp-version", "sp-weights", + "staging-xcm", "substrate-prometheus-endpoint", "tempfile", "thiserror", "tracing-gum", "westend-runtime", "westend-runtime-constants", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -13587,11 +13613,11 @@ dependencies = [ "async-trait", "bincode", "bitvec", - "clap 4.5.1", + "clap 4.5.3", "clap-num", "color-eyre", "colored", - "env_logger 0.9.3", + "env_logger 0.11.3", "futures", "futures-timer", "hex", @@ -13631,6 +13657,7 @@ dependencies = [ "sc-service", "schnorrkel 0.11.4", "serde", + "serde_json", "serde_yaml", "sha1", "sp-application-crypto", @@ -13681,7 +13708,7 @@ version = "1.0.0" dependencies = [ "assert_matches", "async-trait", - "clap 4.5.1", + "clap 4.5.3", "color-eyre", "futures", "futures-timer", @@ -13828,7 +13855,7 @@ dependencies = [ name = "polkadot-voter-bags" version = "7.0.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "generate-bags", "sp-io", "westend-runtime", @@ -13843,7 +13870,7 @@ dependencies = [ "libc", "log", "polkavm-assembler", - "polkavm-common 0.9.0", + "polkavm-common", "polkavm-linux-raw", ] @@ -13858,12 +13885,6 @@ dependencies = [ [[package]] name = "polkavm-common" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b4e215c80fe876147f3d58158d5dfeae7dabdd6047e175af77095b78d0035c" - -[[package]] -name = "polkavm-common" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d9428a5cfcc85c5d7b9fc4b6a18c4b802d0173d768182a51cc7751640f08b92" @@ -13873,16 +13894,6 @@ dependencies = [ [[package]] name = "polkavm-derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6380dbe1fb03ecc74ad55d841cfc75480222d153ba69ddcb00977866cbdabdb8" -dependencies = [ - "polkavm-derive-impl 0.5.0", - "syn 2.0.50", -] - -[[package]] -name = "polkavm-derive" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae8c4bea6f3e11cd89bb18bcdddac10bd9a24015399bd1c485ad68a985a19606" @@ -13892,26 +13903,14 @@ dependencies = [ [[package]] name = "polkavm-derive-impl" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc8211b3365bbafb2fb32057d68b0e1ca55d079f5cf6f9da9b98079b94b3987d" -dependencies = [ - "polkavm-common 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.50", -] - -[[package]] -name = "polkavm-derive-impl" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c4fdfc49717fb9a196e74a5d28e0bc764eb394a2c803eb11133a31ac996c60c" dependencies = [ - "polkavm-common 0.9.0", + "polkavm-common", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -13920,23 +13919,8 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ba81f7b5faac81e528eb6158a6f3c9e0bb1008e0ffa19653bc8dea925ecb429" dependencies = [ - "polkavm-derive-impl 0.9.0", - "syn 2.0.50", -] - -[[package]] -name = "polkavm-linker" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5a668bb33c7f0b5f4ca91adb1e1e71cf4930fef5e6909f46c2180d65cce37d0" -dependencies = [ - "gimli 0.28.0", - "hashbrown 0.14.3", - "log", - "object 0.32.2", - "polkavm-common 0.5.0", - "regalloc2 0.9.3", - "rustc-demangle", + "polkavm-derive-impl", + "syn 2.0.53", ] [[package]] @@ -13949,7 +13933,7 @@ dependencies = [ "hashbrown 0.14.3", "log", "object 0.32.2", - "polkavm-common 0.9.0", + "polkavm-common", "regalloc2 0.9.3", "rustc-demangle", ] @@ -14132,7 +14116,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" dependencies = [ "proc-macro2", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -14223,7 +14207,7 @@ checksum = "9b698b0b09d40e9b7c1a47b132d66a8b54bcd20583d9b6d06e4535e383b4405c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -14295,7 +14279,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -14357,7 +14341,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", - "heck", + "heck 0.4.1", "itertools 0.10.5", "lazy_static", "log", @@ -14395,7 +14379,7 @@ dependencies = [ "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -14738,7 +14722,7 @@ checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -14826,7 +14810,7 @@ checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" name = "remote-ext-tests-bags-list" version = "1.0.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "frame-system", "log", "pallet-bags-list-remote-tests", @@ -15003,6 +14987,7 @@ dependencies = [ "cumulus-ping", "cumulus-primitives-aura", "cumulus-primitives-core", + "cumulus-primitives-storage-weight-reclaim", "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", @@ -15073,7 +15058,6 @@ dependencies = [ "pallet-elections-phragmen", "pallet-grandpa", "pallet-identity", - "pallet-im-online", "pallet-indices", "pallet-membership", "pallet-message-queue", @@ -15144,6 +15128,7 @@ dependencies = [ "substrate-wasm-builder", "tiny-keccak", "tokio", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -15229,7 +15214,7 @@ dependencies = [ "regex", "relative-path", "rustc_version 0.4.0", - "syn 2.0.50", + "syn 2.0.53", "unicode-ident", ] @@ -15584,6 +15569,7 @@ dependencies = [ "futures-timer", "ip_network", "libp2p", + "linked_hash_set", "log", "multihash 0.18.1", "multihash-codetable", @@ -15652,7 +15638,7 @@ name = "sc-chain-spec" version = "27.0.0" dependencies = [ "array-bytes 6.1.0", - "docify 0.2.7", + "docify", "log", "memmap2 0.9.3", "parity-scale-codec", @@ -15683,7 +15669,7 @@ dependencies = [ "proc-macro-crate 3.0.0", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -15692,7 +15678,7 @@ version = "0.36.0" dependencies = [ "array-bytes 6.1.0", "chrono", - "clap 4.5.1", + "clap 4.5.3", "fdlimit", "futures", "futures-timer", @@ -16165,7 +16151,7 @@ dependencies = [ "array-bytes 6.1.0", "assert_matches", "criterion 0.4.0", - "env_logger 0.9.3", + "env_logger 0.11.3", "num_cpus", "parity-scale-codec", "parking_lot 0.12.1", @@ -16601,7 +16587,7 @@ name = "sc-rpc" version = "29.0.0" dependencies = [ "assert_matches", - "env_logger 0.9.3", + "env_logger 0.11.3", "futures", "jsonrpsee", "log", @@ -16843,7 +16829,7 @@ dependencies = [ name = "sc-statement-store" version = "10.0.0" dependencies = [ - "env_logger 0.9.3", + "env_logger 0.11.3", "log", "parity-db", "parking_lot 0.12.1", @@ -16863,7 +16849,7 @@ dependencies = [ name = "sc-storage-monitor" version = "0.16.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "fs4", "log", "sp-core", @@ -16965,7 +16951,7 @@ dependencies = [ "proc-macro-crate 3.0.0", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -17035,9 +17021,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60" +checksum = "788745a868b0e751750388f4e6546eb921ef714a4317fa6954f7cde114eb2eb7" dependencies = [ "bitvec", "cfg-if", @@ -17049,9 +17035,9 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19" +checksum = "7dc2f4e8bc344b9fc3d5f74f72c2e55bfc38d28dc2ebc69c194a3df424e4d9ac" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", @@ -17367,7 +17353,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -17424,9 +17410,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.32" +version = "0.9.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f" +checksum = "a0623d197252096520c6f2a5e1171ee436e5af99a5d7caa2891e55e61950e6d9" dependencies = [ "indexmap 2.2.3", "itoa", @@ -17467,7 +17453,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -17926,7 +17912,7 @@ name = "snowbridge-outbound-queue-merkle-tree" version = "0.3.0" dependencies = [ "array-bytes 4.2.0", - "env_logger 0.9.3", + "env_logger 0.11.3", "hex", "hex-literal", "parity-scale-codec", @@ -18236,12 +18222,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -18265,7 +18251,7 @@ dependencies = [ name = "solochain-template-node" version = "0.0.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "frame-benchmarking-cli", "frame-system", "futures", @@ -18375,7 +18361,7 @@ dependencies = [ "proc-macro-crate 3.0.0", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -18429,6 +18415,7 @@ name = "sp-arithmetic" version = "23.0.0" dependencies = [ "criterion 0.4.0", + "docify", "integer-sqrt", "num-traits", "parity-scale-codec", @@ -18479,7 +18466,6 @@ dependencies = [ "sp-api", "sp-application-crypto", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -18489,7 +18475,6 @@ dependencies = [ "sp-api", "sp-inherents", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -18536,7 +18521,6 @@ dependencies = [ "sp-consensus-slots", "sp-inherents", "sp-runtime", - "sp-std 14.0.0", "sp-timestamp", ] @@ -18554,7 +18538,6 @@ dependencies = [ "sp-core", "sp-inherents", "sp-runtime", - "sp-std 14.0.0", "sp-timestamp", ] @@ -18575,8 +18558,7 @@ dependencies = [ "sp-keystore", "sp-mmr-primitives", "sp-runtime", - "sp-std 14.0.0", - "strum 0.24.1", + "strum 0.26.2", "w3f-bls", ] @@ -18594,7 +18576,6 @@ dependencies = [ "sp-core", "sp-keystore", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -18605,7 +18586,6 @@ dependencies = [ "sp-api", "sp-core", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -18620,7 +18600,6 @@ dependencies = [ "sp-consensus-slots", "sp-core", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -18630,7 +18609,6 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-std 14.0.0", "sp-timestamp", ] @@ -18746,7 +18724,6 @@ dependencies = [ "ark-ed-on-bls12-381-bandersnatch-ext", "ark-scale 0.0.12", "sp-runtime-interface 24.0.0", - "sp-std 14.0.0", ] [[package]] @@ -18769,7 +18746,7 @@ version = "0.0.0" dependencies = [ "quote", "sp-crypto-hashing", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -18787,7 +18764,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf5 dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -18796,7 +18773,7 @@ version = "14.0.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -18816,7 +18793,6 @@ version = "0.25.0" dependencies = [ "environmental", "parity-scale-codec", - "sp-std 14.0.0", "sp-storage 19.0.0", ] @@ -18827,7 +18803,6 @@ dependencies = [ "serde_json", "sp-api", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -18840,7 +18815,6 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std 14.0.0", "thiserror", ] @@ -18853,7 +18827,7 @@ dependencies = [ "libsecp256k1", "log", "parity-scale-codec", - "polkavm-derive 0.9.1", + "polkavm-derive", "rustversion", "secp256k1", "sp-core", @@ -18875,7 +18849,7 @@ version = "31.0.0" dependencies = [ "sp-core", "sp-runtime", - "strum 0.24.1", + "strum 0.26.2", ] [[package]] @@ -18905,7 +18879,6 @@ dependencies = [ "frame-metadata", "parity-scale-codec", "scale-info", - "sp-std 14.0.0", ] [[package]] @@ -18916,7 +18889,6 @@ dependencies = [ "scale-info", "sp-api", "sp-application-crypto", - "sp-std 14.0.0", ] [[package]] @@ -18933,7 +18905,6 @@ dependencies = [ "sp-core", "sp-debug-derive 14.0.0", "sp-runtime", - "sp-std 14.0.0", "thiserror", ] @@ -18948,7 +18919,6 @@ dependencies = [ "sp-arithmetic", "sp-core", "sp-runtime", - "sp-std 14.0.0", "substrate-test-utils", ] @@ -18956,7 +18926,7 @@ dependencies = [ name = "sp-npos-elections-fuzzer" version = "2.0.0-alpha.5" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "honggfuzz", "rand", "sp-npos-elections", @@ -18995,7 +18965,7 @@ dependencies = [ name = "sp-runtime" version = "31.0.1" dependencies = [ - "docify 0.2.7", + "docify", "either", "hash256-std-hasher", "impl-trait-for-tuples", @@ -19045,7 +19015,7 @@ dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", - "polkavm-derive 0.9.1", + "polkavm-derive", "primitive-types", "rustversion", "sp-core", @@ -19071,7 +19041,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -19083,7 +19053,7 @@ dependencies = [ "proc-macro-crate 3.0.0", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -19135,7 +19105,6 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-staking", - "sp-std 14.0.0", ] [[package]] @@ -19148,7 +19117,6 @@ dependencies = [ "serde", "sp-core", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -19168,7 +19136,6 @@ dependencies = [ "sp-externalities 0.25.0", "sp-panic-handler", "sp-runtime", - "sp-std 14.0.0", "sp-trie", "thiserror", "tracing", @@ -19194,7 +19161,6 @@ dependencies = [ "sp-externalities 0.25.0", "sp-runtime", "sp-runtime-interface 24.0.0", - "sp-std 14.0.0", "thiserror", "x25519-dalek 2.0.0", ] @@ -19230,7 +19196,6 @@ dependencies = [ "ref-cast", "serde", "sp-debug-derive 14.0.0", - "sp-std 14.0.0", ] [[package]] @@ -19243,7 +19208,6 @@ dependencies = [ "sp-application-crypto", "sp-core", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -19254,7 +19218,6 @@ dependencies = [ "parity-scale-codec", "sp-inherents", "sp-runtime", - "sp-std 14.0.0", "thiserror", ] @@ -19275,7 +19238,6 @@ name = "sp-tracing" version = "16.0.0" dependencies = [ "parity-scale-codec", - "sp-std 14.0.0", "tracing", "tracing-core", "tracing-subscriber 0.2.25", @@ -19299,7 +19261,6 @@ dependencies = [ "sp-core", "sp-inherents", "sp-runtime", - "sp-std 14.0.0", "sp-trie", ] @@ -19322,7 +19283,6 @@ dependencies = [ "sp-core", "sp-externalities 0.25.0", "sp-runtime", - "sp-std 14.0.0", "thiserror", "tracing", "trie-bench", @@ -19355,7 +19315,7 @@ dependencies = [ "proc-macro2", "quote", "sp-version", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -19379,7 +19339,6 @@ dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std 14.0.0", "wasmtime", ] @@ -19395,7 +19354,6 @@ dependencies = [ "smallvec", "sp-arithmetic", "sp-debug-derive 14.0.0", - "sp-std 14.0.0", ] [[package]] @@ -19479,7 +19437,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" name = "staging-chain-spec-builder" version = "2.0.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "log", "sc-chain-spec", "serde_json", @@ -19492,7 +19450,7 @@ version = "3.0.0-dev" dependencies = [ "array-bytes 6.1.0", "assert_cmd", - "clap 4.5.1", + "clap 4.5.3", "clap_complete", "criterion 0.4.0", "frame-benchmarking", @@ -19602,7 +19560,7 @@ dependencies = [ name = "staging-node-inspect" version = "0.12.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "parity-scale-codec", "sc-cli", "sc-client-api", @@ -19778,12 +19736,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" [[package]] +name = "strum" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +dependencies = [ + "strum_macros 0.26.2", +] + +[[package]] name = "strum_macros" version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", @@ -19796,18 +19763,31 @@ version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ - "heck", + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.53", +] + +[[package]] +name = "strum_macros" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +dependencies = [ + "heck 0.4.1", "proc-macro2", "quote", "rustversion", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] name = "subkey" version = "9.0.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "sc-cli", ] @@ -19849,7 +19829,7 @@ dependencies = [ name = "substrate-frame-cli" version = "32.0.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "frame-support", "frame-system", "sc-cli", @@ -20006,7 +19986,6 @@ dependencies = [ "sp-runtime", "sp-session", "sp-state-machine", - "sp-std 14.0.0", "sp-tracing 16.0.0", "sp-transaction-pool", "sp-trie", @@ -20067,9 +20046,9 @@ dependencies = [ "console", "filetime", "parity-wasm", - "polkavm-linker 0.9.2", + "polkavm-linker", "sp-maybe-compressed-blob", - "strum 0.24.1", + "strum 0.26.2", "tempfile", "toml 0.8.8", "walkdir", @@ -20198,9 +20177,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.50" +version = "2.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb" +checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" dependencies = [ "proc-macro2", "quote", @@ -20216,7 +20195,7 @@ dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -20330,7 +20309,7 @@ dependencies = [ name = "test-parachain-adder-collator" version = "1.0.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "futures", "futures-timer", "log", @@ -20378,7 +20357,7 @@ dependencies = [ name = "test-parachain-undying-collator" version = "1.0.0" dependencies = [ - "clap 4.5.1", + "clap 4.5.3", "futures", "futures-timer", "log", @@ -20481,7 +20460,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -20617,9 +20596,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.33.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -20629,20 +20608,20 @@ dependencies = [ "parking_lot 0.12.1", "pin-project-lite 0.2.12", "signal-hook-registry", - "socket2 0.5.3", + "socket2 0.5.6", "tokio-macros", "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -20849,7 +20828,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -20891,7 +20870,7 @@ dependencies = [ "proc-macro-crate 3.0.0", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -21073,7 +21052,7 @@ version = "0.38.0" dependencies = [ "assert_cmd", "async-trait", - "clap 4.5.1", + "clap 4.5.3", "frame-remote-externalities", "frame-try-runtime", "hex", @@ -21246,9 +21225,9 @@ dependencies = [ [[package]] name = "unsafe-libyaml" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "unsigned-varint" @@ -21311,9 +21290,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.4.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" +checksum = "8fec26a25bd6fca441cdd0f769fd7f891bae119f996de31f86a5eddccef54c1d" dependencies = [ "value-bag-serde1", "value-bag-sval2", @@ -21321,9 +21300,9 @@ dependencies = [ [[package]] name = "value-bag-serde1" -version = "1.4.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0b9f3feef403a50d4d67e9741a6d8fc688bcbb4e4f31bd4aab72cc690284394" +checksum = "ead5b693d906686203f19a49e88c477fb8c15798b68cf72f60b4b5521b4ad891" dependencies = [ "erased-serde", "serde", @@ -21332,9 +21311,9 @@ dependencies = [ [[package]] name = "value-bag-sval2" -version = "1.4.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b24f4146b6f3361e91cbf527d1fb35e9376c3c0cef72ca5ec5af6d640fad7d" +checksum = "3b9d0f4a816370c3a0d7d82d603b62198af17675b12fe5e91de6b47ceb505882" dependencies = [ "sval", "sval_buffer", @@ -21456,7 +21435,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", "wasm-bindgen-shared", ] @@ -21490,7 +21469,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -21951,7 +21930,6 @@ dependencies = [ "pallet-fast-unstake", "pallet-grandpa", "pallet-identity", - "pallet-im-online", "pallet-indices", "pallet-membership", "pallet-message-queue", @@ -22026,6 +22004,7 @@ dependencies = [ "tiny-keccak", "tokio", "westend-runtime-constants", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -22500,6 +22479,20 @@ dependencies = [ ] [[package]] +name = "xcm-fee-payment-runtime-api" +version = "0.1.0" +dependencies = [ + "frame-support", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-runtime", + "sp-std 14.0.0", + "sp-weights", + "staging-xcm", +] + +[[package]] name = "xcm-procedural" version = "7.0.0" dependencies = [ @@ -22507,7 +22500,7 @@ dependencies = [ "proc-macro2", "quote", "staging-xcm", - "syn 2.0.50", + "syn 2.0.53", "trybuild", ] @@ -22629,7 +22622,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] @@ -22649,7 +22642,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.50", + "syn 2.0.53", ] [[package]] diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 8f545fa8a1666..770b4a29543e9 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -11,13 +11,13 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot-sdk"; rev = "polkadot-v${version}"; - hash = "sha256-YLd1XKluL8QBbZPTb1FCvBDVD0YWjZfZTvl4p9jx28Y="; + hash = "sha256-xRuV/1+OZeoth/lb5OXwVzHl2IWK1G0GgIN0E8EZlYg="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. diff --git a/pkgs/applications/editors/jetbrains/bin/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json index 2169406eab8b6..c0893d1cac127 100644 --- a/pkgs/applications/editors/jetbrains/bin/versions.json +++ b/pkgs/applications/editors/jetbrains/bin/versions.json @@ -11,50 +11,50 @@ "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2023.3.4", - "sha256": "7b653e07c6d2008fbc85955041490b77551e277ef20f8518f6e6a8cbd326339c", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.3.4.tar.gz", - "build_number": "233.14015.137" + "version": "2024.1", + "sha256": "cc77892adcbf28b1a2205908466cca9c80217162cdac020d25d258a84cbb88d3", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.tar.gz", + "build_number": "241.14494.251" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", - "version": "2023.3.5", - "sha256": "ae964f1cc71072629baae84fb32e0d822c6cb9405fe4f724078b0decefe88e41", - "url": "https://download.jetbrains.com/python/dataspell-2023.3.5.tar.gz", - "build_number": "233.15026.16" + "version": "2024.1", + "sha256": "4f73d514dcbf5dce769e7ee4e0a81a1d8dc970f6553c246e3016963b9f077dca", + "url": "https://download.jetbrains.com/python/dataspell-2024.1.tar.gz", + "build_number": "241.14494.247" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2023.3.4", - "sha256": "a6235d4706d594c95c34fed6f32d5ded97eae6af5b8803c47ebd0ec6ccf77a06", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.3.4.tar.gz", - "build_number": "233.14475.30" + "version": "2024.1", + "sha256": "d777e88a3098790e19a93cb14fe4a21c740553958514e2b55fa2ba588f5c2c78", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.tar.gz", + "build_number": "241.14494.255" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2023.3.6", - "sha256": "96fb4117d4aedd32ace976f48b6618fe30480b3fbfa81adfef963eb720a442e1", - "url": "https://download.jetbrains.com/go/goland-2023.3.6.tar.gz", - "build_number": "233.15026.17" + "version": "2024.1", + "sha256": "783539f254e4d62f4fae153a9e737f1d69db1e44676c4d1513775571a68950e4", + "url": "https://download.jetbrains.com/go/goland-2024.1.tar.gz", + "build_number": "241.14494.238" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2023.3.6", - "sha256": "5e376677d4b9810f4171700ce9d9d3ece58f245ce8d9f2011b05966df5dd7ddd", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.3.6.tar.gz", - "build_number": "233.15026.9" + "version": "2024.1", + "sha256": "01d1b224c5e88592f954b17796a76fa8391cdcafef27264e703c7ffe47bb4065", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.tar.gz", + "build_number": "241.14494.240" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2023.3.6", - "sha256": "2bf74ab0eeb8d8d998e7b59581b576786f72c6b70821eb50a2c96dcc0aa44954", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.3.6.tar.gz", - "build_number": "233.15026.9" + "version": "2024.1", + "sha256": "b9083da939eacbcdf24b84cb9c45a1291bb33715f05fc7e10f2cff065d7c3fea", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.tar.gz", + "build_number": "241.14494.240" }, "mps": { "update-channel": "MPS RELEASE", @@ -67,27 +67,27 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2023.3.6", - "sha256": "abf03a945460a92cfed41cc1f5cbaab0eb80799cdfbadaac15594a8ddeec1b7e", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.3.6.tar.gz", - "build_number": "233.15026.12", + "version": "2024.1", + "sha256": "11c6862954f87b89d081cc0382e54b105d8b0c933dae78fd952cd2a3604889b2", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.tar.gz", + "build_number": "241.14494.237", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2023.3.5", - "sha256": "d8ffc4a20b692d506b0e4c4439b77fabca7f3a0fdb7eaddeb6c9edd7cb3febaf", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.3.5.tar.gz", - "build_number": "233.15026.15" + "version": "2024.1", + "sha256": "96048ea55ef45f1af0ebe12ad0e38e2763c9e5d654b9e174b33aaa12665d836b", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.tar.gz", + "build_number": "241.14494.241" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2023.3.5", - "sha256": "7e77390d7bba42843e950b1544da718913e6bae8543ce499c01484550df39004", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.3.5.tar.gz", - "build_number": "233.15026.15" + "version": "2024.1", + "sha256": "2451d3ef7642151306354418c5237b326271e2653a09b869e5883a262a2916ad", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.tar.gz", + "build_number": "241.14494.241" }, "rider": { "update-channel": "Rider RELEASE", @@ -100,26 +100,26 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2023.3.6", - "sha256": "d431626f1207d872e708e144056bebd001e25da198e785904b0cc08112daebe8", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.3.6.tar.gz", - "build_number": "233.15026.14" + "version": "2024.1", + "sha256": "4fd9dcf83a1d1f6b7513c18383938bd65b2479fdb39c0421e2237a1e340c3912", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.tar.gz", + "build_number": "241.14494.234" }, "rust-rover": { "update-channel": "RustRover EAP", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", "version": "2023.3 EAP", - "sha256": "489ea17a55e39ddb11e2ba5d98d69dd8353e228ff4ba618a969f0fd2ff55d730", - "url": "https://download.jetbrains.com/rustrover/RustRover-233.14475.74.tar.gz", - "build_number": "233.14475.74" + "sha256": "a7176fb06c18ce50f8f901ecde9fa75e968ddf27e3366e70bffd7ad1208fdde9", + "url": "https://download.jetbrains.com/rustrover/RustRover-233.15026.24.tar.gz", + "build_number": "233.15026.24" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2023.3.6", - "sha256": "deb38fe0f83a616cd07a2ec1243945ec15539c3d3a2e2f27294c5922737f0b5f", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.3.6.tar.gz", - "build_number": "233.15026.13" + "version": "2024.1", + "sha256": "d4c7cb7f1462c2b2bd9042b4714ab9de66c455ab9752c87698dc3902f0d49a2a", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.tar.gz", + "build_number": "241.14494.235" } }, "aarch64-linux": { @@ -134,50 +134,50 @@ "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz", - "version": "2023.3.4", - "sha256": "aaa39f525d680dc8a8b874cd66bd071da86e85c5c903e6cc8fa3d9952fd7c209", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.3.4-aarch64.tar.gz", - "build_number": "233.14015.137" + "version": "2024.1", + "sha256": "b293ed99d29510422090736c4e30a0ccd3974fc01ecce7a9f5f497c34b8ea077", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1-aarch64.tar.gz", + "build_number": "241.14494.251" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz", - "version": "2023.3.5", - "sha256": "966b2a9f8b7fc69738388a44b8ebd59b1cd1a5cf8f76b516bfce830500723732", - "url": "https://download.jetbrains.com/python/dataspell-2023.3.5-aarch64.tar.gz", - "build_number": "233.15026.16" + "version": "2024.1", + "sha256": "f1adfe94bd6482a4f15db02611afc7487d59c47f8ee120e925feeb23c980cd9f", + "url": "https://download.jetbrains.com/python/dataspell-2024.1-aarch64.tar.gz", + "build_number": "241.14494.247" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz", - "version": "2023.3.4", - "sha256": "e429fe93c87687555eeb618d0cc11bcbf6809a1cfaf3763a260543ea5b639235", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.3.4-aarch64.tar.gz", - "build_number": "233.14475.30" + "version": "2024.1", + "sha256": "3b6ffb21148d3327e9a5558c5657c22f7076c6208e8a10836f155d8f0200fb36", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1-aarch64.tar.gz", + "build_number": "241.14494.255" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz", - "version": "2023.3.6", - "sha256": "b4d9159d61aafe431f83f42a7ab5d9e2748e3f3efa1ce915ff2bcf5674d02c80", - "url": "https://download.jetbrains.com/go/goland-2023.3.6-aarch64.tar.gz", - "build_number": "233.15026.17" + "version": "2024.1", + "sha256": "f3cae5c83ca99d3b0e0ef20282f2434879ef89a59ca2c770c31b855e45b8f6f3", + "url": "https://download.jetbrains.com/go/goland-2024.1-aarch64.tar.gz", + "build_number": "241.14494.238" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz", - "version": "2023.3.6", - "sha256": "cfc98c4a09f6740ef47a3dbc8f2e71a66a8aab2eae3fb1b901c2db5dcce5f060", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.3.6-aarch64.tar.gz", - "build_number": "233.15026.9" + "version": "2024.1", + "sha256": "a13e7a53b5c8a512fbcb72957f24e5515618a5533f17d72914da5445b736dac1", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.1-aarch64.tar.gz", + "build_number": "241.14494.240" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", - "version": "2023.3.6", - "sha256": "4427884e3c9f63bad3c8b71c73f268dfc0df5963f87de915b632d14a415a6b9c", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.3.6-aarch64.tar.gz", - "build_number": "233.15026.9" + "version": "2024.1", + "sha256": "e73756a96a2e958441facb2b9be7ba30b463a63235f37a757866800162f293bd", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.1-aarch64.tar.gz", + "build_number": "241.14494.240" }, "mps": { "update-channel": "MPS RELEASE", @@ -190,27 +190,27 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz", - "version": "2023.3.6", - "sha256": "697ffef0d76788fa35d4911a7d96f76261feec42df3a537773d29c4714b32635", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.3.6-aarch64.tar.gz", - "build_number": "233.15026.12", + "version": "2024.1", + "sha256": "0c5debd888359b37c9c95176c09a16e94f2412fb88f98b928e64ed2466f88ec1", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1-aarch64.tar.gz", + "build_number": "241.14494.237", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz", - "version": "2023.3.5", - "sha256": "99522aa803eb6fc1570f99286e5d710d5000378e0c116d9a62caea5c7a5ff95e", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.3.5-aarch64.tar.gz", - "build_number": "233.15026.15" + "version": "2024.1", + "sha256": "de8259a4cea264a2263bf771d74949ca25a2b9a8ffc5bbbc7c42d2faace6bd09", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.1-aarch64.tar.gz", + "build_number": "241.14494.241" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz", - "version": "2023.3.5", - "sha256": "4a5aef97f10d19b3b4f9e34f244a84592bde730171e0596abcfde1baffb65be4", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.3.5-aarch64.tar.gz", - "build_number": "233.15026.15" + "version": "2024.1", + "sha256": "a1f43b2392b7fc6b0c062524593c19fb0721b4ec1a1a59a06e39a61da2dce258", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1-aarch64.tar.gz", + "build_number": "241.14494.241" }, "rider": { "update-channel": "Rider RELEASE", @@ -223,26 +223,26 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz", - "version": "2023.3.6", - "sha256": "038023de9fe12771043998cada293db8d1f869374cc48d276ac19c440cb25233", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.3.6-aarch64.tar.gz", - "build_number": "233.15026.14" + "version": "2024.1", + "sha256": "690f90bd8a974585414e499aa2cb46d68dbc8145906e98d7f3b4ad1f3bf49040", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1-aarch64.tar.gz", + "build_number": "241.14494.234" }, "rust-rover": { "update-channel": "RustRover EAP", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz", "version": "2023.3 EAP", - "sha256": "e58fc90e714dd98483f10ed48588e2ce95bad049f4967193a8b0c294259ae2ab", - "url": "https://download.jetbrains.com/rustrover/RustRover-233.14475.74-aarch64.tar.gz", - "build_number": "233.14475.74" + "sha256": "4e03720aae12b32f91d4ddf4e01cfb454311b8a0b901dcee733d62579aa4cc0c", + "url": "https://download.jetbrains.com/rustrover/RustRover-233.15026.24-aarch64.tar.gz", + "build_number": "233.15026.24" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz", - "version": "2023.3.6", - "sha256": "826ff930268394c1ffc649586c115f35a1630246ea23b3df4ba446a10b791cec", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.3.6-aarch64.tar.gz", - "build_number": "233.15026.13" + "version": "2024.1", + "sha256": "6691e4855fd4ecf3da9b63b78a11afc3441fb2139cdc7e7aaa5d78aa92a88c12", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1-aarch64.tar.gz", + "build_number": "241.14494.235" } }, "x86_64-darwin": { @@ -257,50 +257,50 @@ "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2023.3.4", - "sha256": "730a1f17882432ad01b936a6d621c4c3acbfce0bd693b3ca4ee488182ab04d99", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.3.4.dmg", - "build_number": "233.14015.137" + "version": "2024.1", + "sha256": "8a76d76466b62da1a68d08a066a56319b81e3cab09b57ab11822bf4373def6ce", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.dmg", + "build_number": "241.14494.251" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg", - "version": "2023.3.5", - "sha256": "596ffeebc9620f5fe94ed104f601157810cc36fa20887a5a12fecb385402c304", - "url": "https://download.jetbrains.com/python/dataspell-2023.3.5.dmg", - "build_number": "233.15026.16" + "version": "2024.1", + "sha256": "a48036f55ef8301d6f77f726c68d7415c0056ddb4143ca3eed2698306f2c021f", + "url": "https://download.jetbrains.com/python/dataspell-2024.1.dmg", + "build_number": "241.14494.247" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2023.3.4", - "sha256": "5cf8720e0259c2bfd2474a5fd1db329cb48c10a8823ba0c29b0f3bde3ddbdf8a", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.3.4.dmg", - "build_number": "233.14475.30" + "version": "2024.1", + "sha256": "fb37fe7ba94f151f9613134b232b79f44524c126152f70eeb31421cee89b514d", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.dmg", + "build_number": "241.14494.255" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2023.3.6", - "sha256": "f83484fc068791733d1411a1ec74a6cbaf5b2ecb4ca2cce462eff6b16b7718a4", - "url": "https://download.jetbrains.com/go/goland-2023.3.6.dmg", - "build_number": "233.15026.17" + "version": "2024.1", + "sha256": "4684665fa5d33e3b97a445ffdb29238b995408537be0f706ce05ef1505ffb632", + "url": "https://download.jetbrains.com/go/goland-2024.1.dmg", + "build_number": "241.14494.238" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2023.3.6", - "sha256": "c26c884842e8a315430dcf1351255aac4385ab1abd16ccb8a8b1c407a1851355", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.3.6.dmg", - "build_number": "233.15026.9" + "version": "2024.1", + "sha256": "a0ed1fbb4f7c69a046869b3e1cd61faee193518374ac5d4dde4256f846c3b4e2", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.dmg", + "build_number": "241.14494.240" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2023.3.6", - "sha256": "d54bf2088981678bf4026da4927d39ad686ee25e20dcf374785306076ec98f74", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.3.6.dmg", - "build_number": "233.15026.9" + "version": "2024.1", + "sha256": "aaecd61f3258d555cb5b2993d04a56955f6dd4cb7a393b58928e4548817750e1", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.dmg", + "build_number": "241.14494.240" }, "mps": { "update-channel": "MPS RELEASE", @@ -313,27 +313,27 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2023.3.6", - "sha256": "1972219f45224fd3769fd78ba313ef6379c75d8b4980e049b438a2b2ebb5a977", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.3.6.dmg", - "build_number": "233.15026.12", + "version": "2024.1", + "sha256": "75699ce909f07de35a6e89745c652f08afba5096b7930fdc51683989967fcc62", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.dmg", + "build_number": "241.14494.237", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2023.3.5", - "sha256": "413b5d5975aef0cc4e8aef3a93719b2c2c3150082944841538c284f525d015e3", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.3.5.dmg", - "build_number": "233.15026.15" + "version": "2024.1", + "sha256": "86162e01cba91d7fac7f06442ba4f2b969191cef3bba7c11fced30ac4aa87b34", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.dmg", + "build_number": "241.14494.241" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2023.3.5", - "sha256": "315081d461086495ab07483c5ac3858f6354b1f7bc684114c0d3c511e7ab6932", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.3.5.dmg", - "build_number": "233.15026.15" + "version": "2024.1", + "sha256": "32882869eb3dbe44ed74ff5c916222cf7f60af23775c58430e2967b0cbe90846", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.dmg", + "build_number": "241.14494.241" }, "rider": { "update-channel": "Rider RELEASE", @@ -346,26 +346,26 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2023.3.6", - "sha256": "50b9988942ead060eaf01b54aa8aebedf132df3a92b98018f1b78e922bff08f8", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.3.6.dmg", - "build_number": "233.15026.14" + "version": "2024.1", + "sha256": "47ff2d04362beb2acb3421780f9c5f3dd5ef02aa2cdd9cef2c64a10c6ce2c062", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.dmg", + "build_number": "241.14494.234" }, "rust-rover": { "update-channel": "RustRover EAP", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", "version": "2023.3 EAP", - "sha256": "7d32ac16748977a70830eafeae983138d2f18724ed8255aa6967ce7a329206ec", - "url": "https://download.jetbrains.com/rustrover/RustRover-233.14475.74.dmg", - "build_number": "233.14475.74" + "sha256": "b59ff55e4ba22df41acc9870f88b7f957f31af179e482ccaa4320b1f1ffff346", + "url": "https://download.jetbrains.com/rustrover/RustRover-233.15026.24.dmg", + "build_number": "233.15026.24" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2023.3.6", - "sha256": "03220e45e5308664d2c413eb1b928daf6f5b3600305526d0dd230b084bdfbb9c", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.3.6.dmg", - "build_number": "233.15026.13" + "version": "2024.1", + "sha256": "b3b41e5e8559e36e0bd4121dee61d39a8ba5b5ce8193e7b026c5bc261e973df5", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.dmg", + "build_number": "241.14494.235" } }, "aarch64-darwin": { @@ -380,50 +380,50 @@ "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2023.3.4", - "sha256": "2dc136c60d6c4c2cc13dc2d426c564dd34e56625dfbfb84d1900b175ea5d6273", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.3.4-aarch64.dmg", - "build_number": "233.14015.137" + "version": "2024.1", + "sha256": "a5e92addc3f098670814c4d5660f275f997eaa958e9eb24007f862cfb74b8118", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1-aarch64.dmg", + "build_number": "241.14494.251" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg", - "version": "2023.3.5", - "sha256": "b7a73513f9d463025ccd48c0c04a1621f1cda6f21eea4f9aa96a36d03032d957", - "url": "https://download.jetbrains.com/python/dataspell-2023.3.5-aarch64.dmg", - "build_number": "233.15026.16" + "version": "2024.1", + "sha256": "4a8abf8cf816f98502cf58cd3de07c28d496d4fe20d338cee0ac714196b8a612", + "url": "https://download.jetbrains.com/python/dataspell-2024.1-aarch64.dmg", + "build_number": "241.14494.247" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2023.3.4", - "sha256": "2e769fd9c28b33d34845d1b92cb12a13578f2d4c2f255c88a42fcb79a7cf848f", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.3.4-aarch64.dmg", - "build_number": "233.14475.30" + "version": "2024.1", + "sha256": "c82392faec283b2a6ab25dd0cbd8c3733ea046799d9d95ba4b5d6086767f7715", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1-aarch64.dmg", + "build_number": "241.14494.255" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2023.3.6", - "sha256": "dbf0131ac203ad5bf69a3fb50ded3a5088d207ba6b994d6c5b26b462708f980e", - "url": "https://download.jetbrains.com/go/goland-2023.3.6-aarch64.dmg", - "build_number": "233.15026.17" + "version": "2024.1", + "sha256": "92b8567751ceb8aaa95535cbe76d495035be9602fa84cccb18e6e25bbd2bcff5", + "url": "https://download.jetbrains.com/go/goland-2024.1-aarch64.dmg", + "build_number": "241.14494.238" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2023.3.6", - "sha256": "501dc51bc9ac39722f3885bc6116cc426d17cd1ab9afc97e4f3f295049e2e0b3", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.3.6-aarch64.dmg", - "build_number": "233.15026.9" + "version": "2024.1", + "sha256": "e49f9a3dc01bd28aa4065642352f358d8b17680ff7207145c918d1f52b046447", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.1-aarch64.dmg", + "build_number": "241.14494.240" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2023.3.6", - "sha256": "e3a606e04c86d7cfeacde69d00b974a8ad6b175a30d3ea6039afd226a740db25", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.3.6-aarch64.dmg", - "build_number": "233.15026.9" + "version": "2024.1", + "sha256": "fd09f791834713e02c7cd28e4bf35b89e6f55e09970db3a720a4c59044874973", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.1-aarch64.dmg", + "build_number": "241.14494.240" }, "mps": { "update-channel": "MPS RELEASE", @@ -436,27 +436,27 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2023.3.6", - "sha256": "892404f4e835b3248094ebf64a7de2c1311b3446e0334ddf90033dc0f226d54b", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.3.6-aarch64.dmg", - "build_number": "233.15026.12", + "version": "2024.1", + "sha256": "02bcb551de99cf070e90b2131b41f0b3e93aa776615bcfba1508e4c4d1bb9378", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1-aarch64.dmg", + "build_number": "241.14494.237", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2023.3.5", - "sha256": "a70dfac39bcd9a049094e1f168d35bb24d37a2b44135178996c50e460ab996fe", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.3.5-aarch64.dmg", - "build_number": "233.15026.15" + "version": "2024.1", + "sha256": "0cd62c5640d455e576a502fb23d5e6f3b71a2507e838bdec1a1be6a3fd6804e8", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.1-aarch64.dmg", + "build_number": "241.14494.241" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2023.3.5", - "sha256": "6fe15528a5b0badead7f807384ffd138d648fe76f5c684c905a584e204a51138", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.3.5-aarch64.dmg", - "build_number": "233.15026.15" + "version": "2024.1", + "sha256": "9c1d71668eb5de90f1f498477630a5d474a10ec90ee6ca61a8039f42505f5ca7", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1-aarch64.dmg", + "build_number": "241.14494.241" }, "rider": { "update-channel": "Rider RELEASE", @@ -469,26 +469,26 @@ "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2023.3.6", - "sha256": "3baa33194fe9f826c88f868d76ff0eea3b2fbb7d73a65a910e83daa18ccff78e", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.3.6-aarch64.dmg", - "build_number": "233.15026.14" + "version": "2024.1", + "sha256": "7e085580ebc8aadb9342e7362e3078b988e38fe8b5bfe8c4825a1744ad53c33f", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1-aarch64.dmg", + "build_number": "241.14494.234" }, "rust-rover": { "update-channel": "RustRover EAP", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg", "version": "2023.3 EAP", - "sha256": "f1a11b0d241671b5afe811a76a7e43777d04a4819a3e83432508d53f319deb8f", - "url": "https://download.jetbrains.com/rustrover/RustRover-233.14475.74-aarch64.dmg", - "build_number": "233.14475.74" + "sha256": "03e7c1e3c029cd72ddc9422cc1dc54ed581356b278127dc8d2b2f9e53d357054", + "url": "https://download.jetbrains.com/rustrover/RustRover-233.15026.24-aarch64.dmg", + "build_number": "233.15026.24" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2023.3.6", - "sha256": "ea8262e07318b894f0019003b2df1038d647db0335904d8996827ddaf633c39a", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.3.6-aarch64.dmg", - "build_number": "233.15026.13" + "version": "2024.1", + "sha256": "95dd3a397fe063583c5e3ba4fefafdfcad740c18447c1a70c0f03cb004436496", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1-aarch64.dmg", + "build_number": "241.14494.235" } } } diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index c77f06d65c290..fa055bd830501 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -141,7 +141,10 @@ rec { extraBuildInputs = [ libgcc libr stdenv.cc.cc ]; }; - gateway = mkJetBrainsProduct { pname = "gateway"; }; + gateway = mkJetBrainsProduct { + pname = "gateway"; + extraBuildInputs = [ libgcc ]; + }; goland = (mkJetBrainsProduct { pname = "goland"; diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json index 1876001edcc49..115abc8470593 100644 --- a/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -17,17 +17,17 @@ "webstorm" ], "builds": { - "233.13135.979": "https://plugins.jetbrains.com/files/164/507552/IdeaVim-2.10.1-signed.zip", - "233.14015.137": "https://plugins.jetbrains.com/files/164/507552/IdeaVim-2.10.1-signed.zip", - "233.14475.31": "https://plugins.jetbrains.com/files/164/507552/IdeaVim-2.10.1-signed.zip", - "233.14475.66": "https://plugins.jetbrains.com/files/164/507552/IdeaVim-2.10.1-signed.zip", - "233.14475.74": "https://plugins.jetbrains.com/files/164/507552/IdeaVim-2.10.1-signed.zip", - "233.15026.12": "https://plugins.jetbrains.com/files/164/507552/IdeaVim-2.10.1-signed.zip", - "233.15026.13": "https://plugins.jetbrains.com/files/164/507552/IdeaVim-2.10.1-signed.zip", - "233.15026.14": "https://plugins.jetbrains.com/files/164/507552/IdeaVim-2.10.1-signed.zip", - "233.15026.15": "https://plugins.jetbrains.com/files/164/507552/IdeaVim-2.10.1-signed.zip", - "233.15026.17": "https://plugins.jetbrains.com/files/164/507552/IdeaVim-2.10.1-signed.zip", - "233.15026.9": "https://plugins.jetbrains.com/files/164/507552/IdeaVim-2.10.1-signed.zip" + "233.13135.979": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "233.14475.31": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "233.14475.66": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "233.15026.24": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "241.14494.234": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "241.14494.235": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "241.14494.237": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "241.14494.238": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "241.14494.241": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip", + "241.14494.251": "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip" }, "name": "ideavim" }, @@ -36,7 +36,7 @@ "idea-ultimate" ], "builds": { - "233.15026.9": "https://plugins.jetbrains.com/files/631/509008/python-233.15026.9.zip" + "241.14494.240": "https://plugins.jetbrains.com/files/631/513581/python-241.14494.240.zip" }, "name": "python" }, @@ -48,7 +48,7 @@ ], "builds": { "233.13135.979": null, - "233.15026.9": null + "241.14494.240": null }, "name": "kotlin" }, @@ -70,16 +70,16 @@ ], "builds": { "233.13135.979": null, - "233.14015.137": null, "233.14475.31": null, "233.14475.66": null, - "233.14475.74": null, - "233.15026.12": "https://plugins.jetbrains.com/files/6981/509027/ini-233.15026.15.zip", - "233.15026.13": "https://plugins.jetbrains.com/files/6981/509027/ini-233.15026.15.zip", - "233.15026.14": "https://plugins.jetbrains.com/files/6981/509027/ini-233.15026.15.zip", - "233.15026.15": "https://plugins.jetbrains.com/files/6981/509027/ini-233.15026.15.zip", - "233.15026.17": "https://plugins.jetbrains.com/files/6981/509027/ini-233.15026.15.zip", - "233.15026.9": "https://plugins.jetbrains.com/files/6981/509027/ini-233.15026.15.zip" + "233.15026.24": "https://plugins.jetbrains.com/files/6981/509027/ini-233.15026.15.zip", + "241.14494.234": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip", + "241.14494.235": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip", + "241.14494.237": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip", + "241.14494.238": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip", + "241.14494.241": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip", + "241.14494.251": "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip" }, "name": "ini" }, @@ -89,8 +89,8 @@ "phpstorm" ], "builds": { - "233.15026.12": "https://plugins.jetbrains.com/files/7219/509039/Symfony_Plugin-2023.1.266.zip", - "233.15026.9": "https://plugins.jetbrains.com/files/7219/509039/Symfony_Plugin-2023.1.266.zip" + "241.14494.237": "https://plugins.jetbrains.com/files/7219/514919/Symfony_Plugin-2023.1.267.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/7219/514919/Symfony_Plugin-2023.1.267.zip" }, "name": "symfony-support" }, @@ -100,8 +100,8 @@ "phpstorm" ], "builds": { - "233.15026.12": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip", - "233.15026.9": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip" + "241.14494.237": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip" }, "name": "php-annotations" }, @@ -114,11 +114,11 @@ "rust-rover" ], "builds": { - "233.14015.137": "https://plugins.jetbrains.com/files/7322/474341/python-ce-233.14015.106.zip", "233.14475.66": "https://plugins.jetbrains.com/files/7322/484110/python-ce-233.14475.9.zip", - "233.14475.74": "https://plugins.jetbrains.com/files/7322/484110/python-ce-233.14475.9.zip", - "233.15026.17": "https://plugins.jetbrains.com/files/7322/502153/python-ce-233.14808.12.zip", - "233.15026.9": "https://plugins.jetbrains.com/files/7322/502153/python-ce-233.14808.12.zip" + "233.15026.24": "https://plugins.jetbrains.com/files/7322/502153/python-ce-233.14808.12.zip", + "241.14494.238": "https://plugins.jetbrains.com/files/7322/513587/python-ce-241.14494.240.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/7322/513587/python-ce-241.14494.240.zip", + "241.14494.251": "https://plugins.jetbrains.com/files/7322/513587/python-ce-241.14494.240.zip" }, "name": "python-community-edition" }, @@ -139,15 +139,15 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", - "233.14015.137": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", "233.14475.31": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", "233.14475.66": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", - "233.15026.12": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", - "233.15026.13": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", - "233.15026.14": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", - "233.15026.15": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", - "233.15026.17": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", - "233.15026.9": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip" + "241.14494.234": null, + "241.14494.235": null, + "241.14494.237": null, + "241.14494.238": null, + "241.14494.240": null, + "241.14494.241": null, + "241.14494.251": null }, "name": "-deprecated-rust" }, @@ -168,15 +168,15 @@ ], "builds": { "233.13135.979": null, - "233.14015.137": null, "233.14475.31": null, "233.14475.66": null, - "233.15026.12": null, - "233.15026.13": null, - "233.15026.14": null, - "233.15026.15": null, - "233.15026.17": null, - "233.15026.9": null + "241.14494.234": null, + "241.14494.235": null, + "241.14494.237": null, + "241.14494.238": null, + "241.14494.240": null, + "241.14494.241": null, + "241.14494.251": null }, "name": "-deprecated-rust-beta" }, @@ -190,10 +190,10 @@ "ruby-mine" ], "builds": { - "233.15026.14": "https://plugins.jetbrains.com/files/8554/469535/featuresTrainer-233.14015.29.zip", - "233.15026.15": "https://plugins.jetbrains.com/files/8554/469535/featuresTrainer-233.14015.29.zip", - "233.15026.17": "https://plugins.jetbrains.com/files/8554/469535/featuresTrainer-233.14015.29.zip", - "233.15026.9": "https://plugins.jetbrains.com/files/8554/469535/featuresTrainer-233.14015.29.zip" + "241.14494.234": "https://plugins.jetbrains.com/files/8554/508289/featuresTrainer-241.14494.150.zip", + "241.14494.238": "https://plugins.jetbrains.com/files/8554/508289/featuresTrainer-241.14494.150.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/8554/508289/featuresTrainer-241.14494.150.zip", + "241.14494.241": "https://plugins.jetbrains.com/files/8554/508289/featuresTrainer-241.14494.150.zip" }, "name": "ide-features-trainer" }, @@ -215,16 +215,16 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", - "233.14015.137": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", "233.14475.31": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", "233.14475.66": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", - "233.14475.74": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", - "233.15026.12": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", - "233.15026.13": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", - "233.15026.14": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", - "233.15026.15": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", - "233.15026.17": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", - "233.15026.9": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip" + "233.15026.24": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", + "241.14494.234": null, + "241.14494.235": null, + "241.14494.237": null, + "241.14494.238": null, + "241.14494.240": null, + "241.14494.241": null, + "241.14494.251": null }, "name": "nixidea" }, @@ -234,8 +234,8 @@ "idea-ultimate" ], "builds": { - "233.15026.17": "https://plugins.jetbrains.com/files/9568/508998/go-plugin-233.15026.9.zip", - "233.15026.9": "https://plugins.jetbrains.com/files/9568/508998/go-plugin-233.15026.9.zip" + "241.14494.238": "https://plugins.jetbrains.com/files/9568/513582/go-plugin-241.14494.240.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/9568/513582/go-plugin-241.14494.240.zip" }, "name": "go" }, @@ -257,16 +257,16 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip", - "233.14015.137": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip", "233.14475.31": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip", "233.14475.66": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip", - "233.14475.74": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip", - "233.15026.12": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip", - "233.15026.13": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip", - "233.15026.14": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip", - "233.15026.15": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip", - "233.15026.17": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip", - "233.15026.9": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip" + "233.15026.24": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip", + "241.14494.234": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.14494.235": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.14494.237": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.14494.238": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.14494.241": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", + "241.14494.251": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip" }, "name": "csv-editor" }, @@ -288,16 +288,16 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", - "233.14015.137": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", "233.14475.31": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", "233.14475.66": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", - "233.14475.74": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", - "233.15026.12": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", - "233.15026.13": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", - "233.15026.14": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", - "233.15026.15": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", - "233.15026.17": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", - "233.15026.9": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip" + "233.15026.24": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", + "241.14494.234": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.14494.235": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.14494.237": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.14494.238": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.14494.241": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "241.14494.251": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip" }, "name": "vscode-keymap" }, @@ -319,16 +319,16 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", - "233.14015.137": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", "233.14475.31": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", "233.14475.66": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", - "233.14475.74": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", - "233.15026.12": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", - "233.15026.13": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", - "233.15026.14": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", - "233.15026.15": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", - "233.15026.17": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", - "233.15026.9": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip" + "233.15026.24": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", + "241.14494.234": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.14494.235": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.14494.237": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.14494.238": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.14494.241": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "241.14494.251": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip" }, "name": "eclipse-keymap" }, @@ -350,16 +350,16 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", - "233.14015.137": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", "233.14475.31": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", "233.14475.66": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", - "233.14475.74": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", - "233.15026.12": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", - "233.15026.13": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", - "233.15026.14": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", - "233.15026.15": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", - "233.15026.17": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", - "233.15026.9": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip" + "233.15026.24": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", + "241.14494.234": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.14494.235": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.14494.237": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.14494.238": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.14494.241": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "241.14494.251": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip" }, "name": "visual-studio-keymap" }, @@ -381,16 +381,16 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "233.14015.137": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "233.14475.31": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "233.14475.66": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "233.14475.74": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "233.15026.12": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "233.15026.13": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "233.15026.14": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "233.15026.15": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "233.15026.17": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "233.15026.9": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" + "233.15026.24": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.14494.234": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.14494.235": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.14494.237": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.14494.238": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.14494.240": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.14494.241": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "241.14494.251": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" }, @@ -412,16 +412,16 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/17718/512366/github-copilot-intellij-1.5.1.5285.zip", - "233.14015.137": "https://plugins.jetbrains.com/files/17718/512366/github-copilot-intellij-1.5.1.5285.zip", "233.14475.31": "https://plugins.jetbrains.com/files/17718/512366/github-copilot-intellij-1.5.1.5285.zip", "233.14475.66": "https://plugins.jetbrains.com/files/17718/512366/github-copilot-intellij-1.5.1.5285.zip", - "233.14475.74": "https://plugins.jetbrains.com/files/17718/512366/github-copilot-intellij-1.5.1.5285.zip", - "233.15026.12": "https://plugins.jetbrains.com/files/17718/512366/github-copilot-intellij-1.5.1.5285.zip", - "233.15026.13": "https://plugins.jetbrains.com/files/17718/512366/github-copilot-intellij-1.5.1.5285.zip", - "233.15026.14": "https://plugins.jetbrains.com/files/17718/512366/github-copilot-intellij-1.5.1.5285.zip", - "233.15026.15": "https://plugins.jetbrains.com/files/17718/512366/github-copilot-intellij-1.5.1.5285.zip", - "233.15026.17": "https://plugins.jetbrains.com/files/17718/512366/github-copilot-intellij-1.5.1.5285.zip", - "233.15026.9": "https://plugins.jetbrains.com/files/17718/512366/github-copilot-intellij-1.5.1.5285.zip" + "233.15026.24": "https://plugins.jetbrains.com/files/17718/512366/github-copilot-intellij-1.5.1.5285.zip", + "241.14494.234": "https://plugins.jetbrains.com/files/17718/512366/github-copilot-intellij-1.5.1.5285.zip", + "241.14494.235": "https://plugins.jetbrains.com/files/17718/512366/github-copilot-intellij-1.5.1.5285.zip", + "241.14494.237": "https://plugins.jetbrains.com/files/17718/512366/github-copilot-intellij-1.5.1.5285.zip", + "241.14494.238": "https://plugins.jetbrains.com/files/17718/512366/github-copilot-intellij-1.5.1.5285.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/17718/512366/github-copilot-intellij-1.5.1.5285.zip", + "241.14494.241": "https://plugins.jetbrains.com/files/17718/512366/github-copilot-intellij-1.5.1.5285.zip", + "241.14494.251": "https://plugins.jetbrains.com/files/17718/512366/github-copilot-intellij-1.5.1.5285.zip" }, "name": "github-copilot" }, @@ -443,16 +443,16 @@ ], "builds": { "233.13135.979": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "233.14015.137": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "233.14475.31": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "233.14475.66": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "233.14475.74": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "233.15026.12": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "233.15026.13": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "233.15026.14": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "233.15026.15": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "233.15026.17": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "233.15026.9": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" + "233.15026.24": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.14494.234": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.14494.235": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.14494.237": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.14494.238": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.14494.241": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "241.14494.251": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" }, @@ -463,33 +463,39 @@ "rust-rover" ], "builds": { - "233.14475.31": "https://plugins.jetbrains.com/files/22407/507547/intellij-rust-233.24475.74.zip", - "233.14475.74": "https://plugins.jetbrains.com/files/22407/507547/intellij-rust-233.24475.74.zip", - "233.15026.9": "https://plugins.jetbrains.com/files/22407/507547/intellij-rust-233.24475.74.zip" + "233.14475.31": "https://plugins.jetbrains.com/files/22407/515371/intellij-rust-233.25026.24.zip", + "233.15026.24": "https://plugins.jetbrains.com/files/22407/515371/intellij-rust-233.25026.24.zip", + "241.14494.240": "https://plugins.jetbrains.com/files/22407/515370/intellij-rust-241.25026.24.zip" }, "name": "rust" } }, "files": { + "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip": "sha256-P8AFMVp/rFi7zTh9f/i45q/QalvI37itnK57Dz/W/z4=", "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip": "sha256-C3l3Z9a7maCrMjc2Fk/wf3AoExRbvN+fn2mAtXigt0A=", "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip": "sha256-9keDJ73bSHkzAEq8nT96I5sp05BgMZ08/4BzarOjO5g=", + "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip": "sha256-LeQ5vi9PCJYmWNmT/sutWjSlwZaAYYuEljVJBYG2VpY=", "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip": "sha256-IsmoWuUroAp1LLuphp4F1dun4tQOOitZxoG+Nxs5pYk=", + "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip": "sha256-/hEx0gIFvUXD799tRmMHAt9Z5ziFgaQs1RX0zQwTJIA=", "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip": "sha256-Nb2tSxL+mAY1qJ3waipgV8ep+0R/BaYnzz7zfwtLHmk=", + "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip": "sha256-tNgt0vIkdCB/LcaSj58mT6cNlw4lytRo0cZSt7sIERU=", "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=", - "https://plugins.jetbrains.com/files/164/507552/IdeaVim-2.10.1-signed.zip": "sha256-mztZWmQhGIuebUzj+FUOgYMMYMNRaiOi5TooNMInSdA=", + "https://plugins.jetbrains.com/files/164/515255/IdeaVim-2.10.2-signed.zip": "sha256-FP6th8J3ymfTrwvJ3Ms7fsNPh3f9ab5ZVg5yPpKV/rY=", "https://plugins.jetbrains.com/files/17718/512366/github-copilot-intellij-1.5.1.5285.zip": "sha256-lep8ZUOjbV0tsfO/yEWJiHWtwm639zxpc/7L9rCKSsU=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", - "https://plugins.jetbrains.com/files/22407/507547/intellij-rust-233.24475.74.zip": "sha256-Ftyamb+ToQNrBxWrxC68e4nyCrX9cQ8ozcauJkmenmE=", - "https://plugins.jetbrains.com/files/631/509008/python-233.15026.9.zip": "sha256-Lb0TzM7vr8IZmahGMzdS9GXaxzrCKwG3NFspInRlOG0=", + "https://plugins.jetbrains.com/files/22407/515370/intellij-rust-241.25026.24.zip": "sha256-tBPoO2EkPaWFZ/Gu3UAkZPy4opssWJQEVlz9GZUkNtQ=", + "https://plugins.jetbrains.com/files/22407/515371/intellij-rust-233.25026.24.zip": "sha256-j4b4To8jY4orP87GpphHPtLKeAPDNXcLNSUlIXDDy2Q=", + "https://plugins.jetbrains.com/files/631/513581/python-241.14494.240.zip": "sha256-pQP1LF/6uImQpBOpxUGE8KmmFh26kiC4YaYLAHnEc3o=", "https://plugins.jetbrains.com/files/6981/509027/ini-233.15026.15.zip": "sha256-6sTD+OFO/yA7m5o0XqoJKLcQ4zAFro7Iy7WNPfA49xM=", - "https://plugins.jetbrains.com/files/7219/509039/Symfony_Plugin-2023.1.266.zip": "sha256-p0ixoyTuZ2N5LCkraLpG2JDRQsKc1JcJaj6CElkZvOY=", + "https://plugins.jetbrains.com/files/6981/513562/ini-241.14494.240.zip": "sha256-QC42nC7mEE3X1cmKj8jkwzpDJzX7ZoOPEd9y6i8IuvM=", + "https://plugins.jetbrains.com/files/7219/514919/Symfony_Plugin-2023.1.267.zip": "sha256-zhnoxJgJJDgSnLdaNRrqS767YuvAzm8sXzhz9e2G0+8=", "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip": "sha256-JIZ6Iq3sOcAm8fBXnjRrG9dqCZuD/WajyVmn1JjYMBA=", - "https://plugins.jetbrains.com/files/7322/474341/python-ce-233.14015.106.zip": "sha256-yd70cSA/Icn5YlH4Q79cIWGFJ6huYUBDKk6vCIYa3DU=", "https://plugins.jetbrains.com/files/7322/484110/python-ce-233.14475.9.zip": "sha256-YMB/ewCKE1F/JXI8iau9pKkv9D5D9a8OiTVukkzTocA=", "https://plugins.jetbrains.com/files/7322/502153/python-ce-233.14808.12.zip": "sha256-PUBR9krJ26QrL2jTus0b+uhzkEkT+lGnBKy1f4i/U+w=", + "https://plugins.jetbrains.com/files/7322/513587/python-ce-241.14494.240.zip": "sha256-6YC/aoiTRLAh87C2v3k24BLBH/tsdTWuDK/CBv8y1QI=", "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip": "sha256-+Lc/avYBLpyIV63DlbhAJtieHDv4HdggqdGFDw9iqN0=", - "https://plugins.jetbrains.com/files/8554/469535/featuresTrainer-233.14015.29.zip": "sha256-Hj/CsaQb1U3FN1x2+00Rq2NjC6AWrfuTJL1NiEssfJ4=", + "https://plugins.jetbrains.com/files/8554/508289/featuresTrainer-241.14494.150.zip": "sha256-D2gF9bLAEFd1+6vZskiM2Eyl5e8hmyh/VHrmW2NociE=", "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip": "sha256-Dwitpu5yLPWx+IUilpN5iqnN8FkKgaxUNjroBEx5lkM=", - "https://plugins.jetbrains.com/files/9568/508998/go-plugin-233.15026.9.zip": "sha256-K/qqFSrUIf0n4Wh2JGNRuT7SuGlPlQD/pjUI/EVTtxQ=" + "https://plugins.jetbrains.com/files/9568/513582/go-plugin-241.14494.240.zip": "sha256-66Gx4XFn5DEZ/wCkN7IFQKtp+P0R9PoEAXmwOB97Q3A=" } } diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 64d2efe8aac63..1938639ec05b4 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4701,6 +4701,18 @@ final: prev: meta.homepage = "https://github.com/idris-hackers/idris-vim/"; }; + idris2-nvim = buildVimPlugin { + pname = "idris2-nvim"; + version = "2023-09-05"; + src = fetchFromGitHub { + owner = "ShinKage"; + repo = "idris2-nvim"; + rev = "8bff02984a33264437e70fd9fff4359679d910da"; + sha256 = "sha256-guEmds98XEBKuJVdB+rQB01G+RmnQaG+RTjM6smccAI="; + }; + meta.homepage = "https://github.com/ShinKage/idris2-nvim/"; + }; + idris2-vim = buildVimPlugin { pname = "idris2-vim"; version = "2020-11-26"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 17d0214df96af..381c9e4a80d82 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -723,6 +723,13 @@ src = "${hurl.src}/contrib/vim"; }; + idris2-nvim = super.idris2-nvim.overrideAttrs { + dependencies = with self; [ nui-nvim nvim-lspconfig ]; + + doInstallCheck = true; + nvimRequireCheck = "idris2"; + }; + image-nvim = super.image-nvim.overrideAttrs { dependencies = with self; [ nvim-treesitter diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 1b9b60f35e49c..3789a13147761 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -393,6 +393,7 @@ https://github.com/anuvyklack/hydra.nvim/,HEAD, https://github.com/mboughaba/i3config.vim/,, https://github.com/cocopon/iceberg.vim/,, https://github.com/idris-hackers/idris-vim/,, +https://github.com/ShinKage/idris2-nvim/,, https://github.com/edwinb/idris2-vim/,, https://github.com/3rd/image.nvim/,HEAD, https://github.com/samodostal/image.nvim/,HEAD,samodostal-image-nvim diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix index d236662f47ac7..25091b95efc4b 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix @@ -72,7 +72,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { tmp=$(mktemp) curl -sLo $tmp $(echo ${(import ../mktplcExtRefToFetchArgs.nix mktplcRef).url} | sed "s|${mktplcRef.version}|$version|") hash=$(nix hash file --type sha256 --base32 --sri $tmp) - sed -i -e "s|${mktplcRef.hash}|$hash|" -e "s|${mktplcRef.version}|$version|" pkgs/applications/editors/vscode/extensions/python/default.nix + sed -i -e "s|${mktplcRef.hash}|$hash|" -e "s|${mktplcRef.version}|$version|" pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix fi ''; diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix index 801af789d47d8..c16b97f4a7e9d 100644 --- a/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -15,12 +15,12 @@ let in stdenv.mkDerivation rec { pname = "splitter"; - version = "653"; + version = "654"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/splitter/trunk"; rev = version; - sha256 = "sha256-iw414ecnOfeG3FdlIaoVOPv9BXZ95uUHuPzCQGH4G+A="; + sha256 = "sha256-y/pl8kIQ6fiF541ho72LMgJFWJdkUBqPToQGCGmmcfg="; }; patches = [ diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index cfa6c8a1e52b1..2ae43e1efd360 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -15,17 +15,17 @@ buildGoModule rec { inherit pname; - version = "2.6.4"; + version = "2.6.5"; tags = lib.optionals enableGateway [ "gateway" ]; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; rev = version; - hash = "sha256-SkZXrYw6Svd9RAu8CI+p+6qm2OHhEjpNiD/Xvse9jVU="; + hash = "sha256-gZxlbapEYrp02YSvEYBtlbRT/F0ijoF76CfZFzBbsAI="; }; - vendorHash = "sha256-otrm8avM35/8WqjSO8V8hMAzsh51unyrMVDv4321xoY="; + vendorHash = "sha256-kqC6CUezPt3Uj9zuHnQYbbEP564Ki4UYmqfZedUBO38="; # no test files doCheck = false; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 80b62753f9a2e..70c395066107d 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -13,16 +13,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.27.5"; + version = "1.27.6"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-Fcsa6xE0i1iXFZ76L57OKKxDJ9stw6WnJL3PQOTr/QQ="; + hash = "sha256-BZAje6dA3wmJ6feHWIYPPYTA3sp1WGwl4MjUJS7iZCo="; }; - vendorHash = "sha256-CSI2Mnu3Da99cNE2s6HadTyxFVIbhXLOy3aykij1GLo="; + vendorHash = "sha256-xVSSFFTqU7jww8YTeXKfa3096c2FmEgkcXvuqFHb12E="; nativeBuildInputs = lib.optionals stdenv.isDarwin [ # Recent versions of macOS seem to require binaries to be signed when diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 3de19b4d605f5..e1a236e5db8bc 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -21,13 +21,13 @@ with lib; python3Packages.buildPythonApplication rec { pname = "tryton"; - version = "7.0.7"; + version = "7.0.8"; disabled = !python3Packages.isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-NODeDEgmf/nSKrM+RxAUsUwsbVQT7OSDrTOGVBwOzpw="; + sha256 = "sha256-e3WNDB6P7kapAfzlvbJ1/6LcyH7Fl6GKCK/hri460pQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 1027590d0de84..d355412e54f0a 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "8.10.4"; + version = "8.10.6"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SZf//Z1rLHyvW/f0U6kEBzV1NjDEDG1OcFl9/JR+i/g="; + hash = "sha256-THp8sqAFZVA5V2k0ruv9qwmPNjSVi2uVx8tla0Y3awE="; # https://github.com/python-versioneer/python-versioneer/issues/217 postFetch = '' sed -i "$out"/snakemake/_version.py -e 's#git_refnames = ".*"#git_refnames = " (tag: v${version})"#' diff --git a/pkgs/applications/version-management/git-credential-oauth/default.nix b/pkgs/applications/version-management/git-credential-oauth/default.nix index 66d2439a00edd..c818874392af4 100644 --- a/pkgs/applications/version-management/git-credential-oauth/default.nix +++ b/pkgs/applications/version-management/git-credential-oauth/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "git-credential-oauth"; @@ -11,6 +11,8 @@ buildGoModule rec { hash = "sha256-bqyoAAqli0L6Kf+W1sTh2vmmfaIj2OdpQyvQZnYOWWA="; }; + nativeBuildInputs = [ installShellFiles ]; + ldflags = [ "-s" "-w" @@ -19,6 +21,10 @@ buildGoModule rec { vendorHash = "sha256-cCqbEv4kBnF6FWvfaXCOxadPVXR/AxXS3nXHf6WmsSs="; + postInstall = '' + installManPage $src/git-credential-oauth.1 + ''; + meta = { description = "Git credential helper that securely authenticates to GitHub, GitLab and BitBucket using OAuth"; homepage = "https://github.com/hickford/git-credential-oauth"; diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index d8be3e9023cc8..bb6e7aeb91147 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-beta.8"; + version = "1.0.0-beta.9"; src = fetchCrate { inherit version pname; - hash = "sha256-BQic+E+SOfZYHJcYMaUmfjlIfop0YcVcASSjtnRtwD4="; + hash = "sha256-jy0mzgLw9iWuoWe2ictMTL3cHnjJ5kzs6TAK+pdm28g="; }; - cargoHash = "sha256-D5P9pizerJiZK4UhCKEY1DXvaBMiWBXGu6Azlv6AjQA="; + cargoHash = "sha256-iXGvb4qmZK7Sjbf/Jkyzj+nhpZFV3ngjtJfz6x/8z2s="; doCheck = false; nativeBuildInputs = [ installShellFiles pkg-config ]; diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index d44193ea4c96b..72d69678fb75c 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -16,28 +16,28 @@ , setuptools }: let - version = "0.89.13"; + version = "0.89.15"; gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.39"; }; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "builds.sr.ht"; rev = version; - hash = "sha256-JpRVRzuHB6cgk/qW1j4zF8/K1xwz3J4nZhijmz5kVWU="; + hash = "sha256-rmNaBnTPDDQO/ImkGkMwW8fyjQyBUBchTEnbtAK24pw="; }; buildsrht-api = buildGoModule ({ inherit src version; pname = "buildsrht-api"; modRoot = "api"; - vendorHash = "sha256-kTqoUfFEoNdDDzVNJ7XIbH7tbsl5MdBL+/UDHFv7D+A="; + vendorHash = "sha256-dwpuB+aYqzhGSdGVq/F9FTdHWMBkGMtVuZ7I3hB3b+Q="; } // gqlgen); buildsrht-worker = buildGoModule ({ inherit src version; pname = "buildsrht-worker"; modRoot = "worker"; - vendorHash = "sha256-kTqoUfFEoNdDDzVNJ7XIbH7tbsl5MdBL+/UDHFv7D+A="; + vendorHash = "sha256-dwpuB+aYqzhGSdGVq/F9FTdHWMBkGMtVuZ7I3hB3b+Q="; } // gqlgen); in buildPythonPackage rec { diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index 33c5d4eab0c59..c0180cf805fac 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "srht"; - version = "0.71.5"; + version = "0.71.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "~sircmpwn"; repo = "core.sr.ht"; rev = version; - hash = "sha256-YIoKOiTi/9X4bSiG+GvnwzvKYhbfywrv/dTjxaJOOTQ="; + hash = "sha256-rDpm2HJOWScvIxOmHcat6y4CWdBE9T2gE/jZskYAFB0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix b/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix index ee598c5ed9144..42ec1589a643c 100644 --- a/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix +++ b/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix @@ -1,13 +1,13 @@ { unzip -, gqlgenVersion ? "0.17.42" +, gqlgenVersion }: { overrideModAttrs = (_: { # No need to workaround -trimpath: it's not used in goModules, # but do download `go generate`'s dependencies nonetheless. preBuild = '' - go generate ./loaders - go generate ./graph + if [ -d ./loaders ]; then go generate ./loaders; fi + if [ -d ./graph ]; then go generate ./graph; fi ''; }); @@ -25,8 +25,8 @@ # If it fails, the gqlgenVersion may have to be updated. preBuild = '' unzip ''${GOPROXY#"file://"}/github.com/99designs/gqlgen/@v/v${gqlgenVersion}.zip - go generate ./loaders - go generate ./graph + if [ -d ./loaders ]; then go generate ./loaders; fi + if [ -d ./graph ]; then go generate ./graph; fi rm -rf github.com ''; } diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index aeda66fc51e97..d7ffc0e2cf83d 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -13,28 +13,28 @@ , setuptools }: let - version = "0.85.7"; - gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; }; + version = "0.85.9"; + gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.42"; }; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "git.sr.ht"; rev = version; - hash = "sha256-jkESrrVE+0O2g64zzPOpqhl8DpvmosQvuF0s6Xd+lbM="; + hash = "sha256-tmbBw6x3nqN9nRIR3xOXQ+L5EACXLQYLXQYK3lsOsAI="; }; gitApi = buildGoModule ({ inherit src version; pname = "gitsrht-api"; modRoot = "api"; - vendorHash = "sha256-yWVpldqwpEZmeI18tvdIgof8GgSFEP70c8T5XDkryn0="; + vendorHash = "sha256-4KwnUi6ILUagMDXzuBG9CRT2N8uyjvRM74TwJqIzicc="; } // gqlgen); gitDispatch = buildGoModule ({ inherit src version; pname = "gitsrht-dispatch"; modRoot = "gitsrht-dispatch"; - vendorHash = "sha256-yWVpldqwpEZmeI18tvdIgof8GgSFEP70c8T5XDkryn0="; + vendorHash = "sha256-4KwnUi6ILUagMDXzuBG9CRT2N8uyjvRM74TwJqIzicc="; postPatch = '' substituteInPlace gitsrht-dispatch/main.go \ @@ -46,7 +46,7 @@ let inherit src version; pname = "gitsrht-keys"; modRoot = "gitsrht-keys"; - vendorHash = "sha256-yWVpldqwpEZmeI18tvdIgof8GgSFEP70c8T5XDkryn0="; + vendorHash = "sha256-4KwnUi6ILUagMDXzuBG9CRT2N8uyjvRM74TwJqIzicc="; postPatch = '' substituteInPlace gitsrht-keys/main.go \ @@ -58,7 +58,7 @@ let inherit src version; pname = "gitsrht-shell"; modRoot = "gitsrht-shell"; - vendorHash = "sha256-yWVpldqwpEZmeI18tvdIgof8GgSFEP70c8T5XDkryn0="; + vendorHash = "sha256-4KwnUi6ILUagMDXzuBG9CRT2N8uyjvRM74TwJqIzicc="; postPatch = '' substituteInPlace gitsrht-shell/main.go \ @@ -70,7 +70,7 @@ let inherit src version; pname = "gitsrht-update-hook"; modRoot = "gitsrht-update-hook"; - vendorHash = "sha256-yWVpldqwpEZmeI18tvdIgof8GgSFEP70c8T5XDkryn0="; + vendorHash = "sha256-4KwnUi6ILUagMDXzuBG9CRT2N8uyjvRM74TwJqIzicc="; postPatch = '' substituteInPlace gitsrht-update-hook/main.go \ diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index b4219b0a8396d..3e7e1f55c65a9 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -14,8 +14,8 @@ }: let - version = "0.32.4"; - gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.20"; }; + version = "0.33.0"; + gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.45"; }; pyproject = true; @@ -25,7 +25,7 @@ let owner = "~sircmpwn"; repo = "hg.sr.ht"; rev = version; - hash = "sha256-mYkA44c9wy/Iy1h1lXkVpc9gN7rQXFm4T3YBlQ1Dj60="; + hash = "sha256-+BYeE+8dXY/MLLYyBBLD+eKqmrPiKyyCGIZLkCPzNYM="; vc = "hg"; }; @@ -33,7 +33,7 @@ let inherit src version; pname = "hgsrht-api"; modRoot = "api"; - vendorHash = "sha256-vuOYpnF3WjA6kOe9MVSuVMhJBQqCmIex+QUBJrP+VDs="; + vendorHash = "sha256-K+KMhcvkG/qeQTnlHS4xhLCcvBQNNp2DcScJPm8Dbic="; } // gqlgen); hgsrht-keys = buildGoModule { diff --git a/pkgs/applications/version-management/sourcehut/hub.nix b/pkgs/applications/version-management/sourcehut/hub.nix index b46e1c3508d7a..4a0d2cda89312 100644 --- a/pkgs/applications/version-management/sourcehut/hub.nix +++ b/pkgs/applications/version-management/sourcehut/hub.nix @@ -12,21 +12,21 @@ }: let - version = "0.17.5"; - gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.41"; }; + version = "0.17.7"; + gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.43"; }; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "hub.sr.ht"; rev = version; - hash = "sha256-GbBxK3XE+Y6Jiap0Nxa8vk4Kv6IbcdSi4NN59AeKwjA="; + hash = "sha256-IyY7Niy/vZSAXjYZMlxY6uuQ8nH/4yT4+MaRjHtl6G4="; }; hubsrht-api = buildGoModule ({ inherit src version; pname = "hubsrht-api"; modRoot = "api"; - vendorHash = "sha256-wmuM0SxQbohTDaU8zmkw1TQTmqhOy1yAl1jRWk6TKL8="; + vendorHash = "sha256-GVN11nEJqIHh8MtKvIXe4zcUwJph9eTSkJ2R+ufD+ic="; } // gqlgen); in buildPythonPackage rec { diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index 09431389ccc18..77d499f695e46 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -15,21 +15,21 @@ }: let - version = "0.57.14"; - gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.36"; }; + version = "0.57.18"; + gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.45"; }; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "lists.sr.ht"; rev = version; - hash = "sha256-rzOxlat7Lbgt0Wl6vvnAC+fS3MynFVKFvVdIdxgA5e0="; + hash = "sha256-l+QPocnwHTjrU+M0wnm4tBrbz8KmSb6DovC+skuAnLc="; }; listssrht-api = buildGoModule ({ inherit src version; pname = "listssrht-api"; modRoot = "api"; - vendorHash = "sha256-OWgrPvXVlvJPcoABP0ZxKzoYFhU44j/I44sBBRbd6KY="; + vendorHash = "sha256-UeVs/+uZNtv296bzXIBio2wcg3Uzu3fBM4APzF9O0hY="; } // gqlgen); in buildPythonPackage rec { diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix index e6d208ab04676..f5cd6be139acd 100644 --- a/pkgs/applications/version-management/sourcehut/man.nix +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -12,21 +12,21 @@ }: let - version = "0.16.3"; - gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.36"; }; + version = "0.16.5"; + gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.43"; }; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "man.sr.ht"; rev = version; - hash = "sha256-o1A3LmwH6WgpFqjKyL3UTru9q7TgKdOdbKZfJHR6fCA="; + hash = "sha256-JFMtif2kIE/fs5PNcQtkJikAFNszgZTU7BG/8fTncTI="; }; mansrht-api = buildGoModule ({ inherit src version; pname = "mansrht-api"; modRoot = "api"; - vendorHash = "sha256-6AzKWytdyuofCFaDEdeO24mv1mtpnQEJydrjVWGY2eU="; + vendorHash = "sha256-GVN11nEJqIHh8MtKvIXe4zcUwJph9eTSkJ2R+ufD+ic="; } // gqlgen); in buildPythonPackage rec { diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index c2b835c2d53d5..8ae078bea5f1e 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -18,21 +18,21 @@ , setuptools }: let - version = "0.68.5"; - gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.36"; }; + version = "0.69.8"; + gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.43"; }; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "meta.sr.ht"; rev = version; - hash = "sha256-mwUqBzi7nMTZL7uwv7hBjGkO8U3krXXpvfUCaYHgHBU="; + hash = "sha256-K7p6cytkPYgUuYr7BVfU/+sVbSr2YEmreIDnTatUMyk="; }; metasrht-api = buildGoModule ({ inherit src version; pname = "metasrht-api"; modRoot = "api"; - vendorHash = "sha256-4T1xnHDjxsIyddA51exNwwz6ZWeuT7N8LBsCJ7c8sRI="; + vendorHash = "sha256-vIkUK1pigVU8vZL5xpHLeinOga5eXXHTuDkHxwUz6uM="; } // gqlgen); in buildPythonPackage rec { diff --git a/pkgs/applications/version-management/sourcehut/pages.nix b/pkgs/applications/version-management/sourcehut/pages.nix index 54b2027563092..5fc140548dc7a 100644 --- a/pkgs/applications/version-management/sourcehut/pages.nix +++ b/pkgs/applications/version-management/sourcehut/pages.nix @@ -6,21 +6,25 @@ buildGoModule (rec { pname = "pagessrht"; - version = "0.15.4"; + version = "0.15.7"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "pages.sr.ht"; rev = version; - hash = "sha256-3kdQVIL7xaIPu2elxj1k+4/y75bd+OKP5+VPSniF7w8="; + hash = "sha256-Lobuf12ybSO7Y4ztOLMFW0dmPFaBSEPCy4Nmh89tylI="; }; postPatch = '' substituteInPlace Makefile \ --replace "all: server" "" + + # fix build failure due to unused import + substituteInPlace server.go \ + --replace-warn ' "fmt"' "" ''; - vendorHash = "sha256-DP+6rxjiXzs0RbSuMD20XwO/+v7QXCNgXj2LxZ96lWE="; + vendorHash = "sha256-9hpOkP6AYSZe7MW1mrwFEKq7TvVt6OcF6eHWY4jARuU="; postInstall = '' mkdir -p $out/share/sql/ @@ -36,4 +40,4 @@ buildGoModule (rec { }; # There is no ./loaders but this does not cause troubles # to go generate -} // import ./fix-gqlgen-trimpath.nix { inherit unzip; }) +} // import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.42"; }) diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index f8d4f27a7ddcc..b7e6624928966 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -12,21 +12,21 @@ }: let - version = "0.15.2"; - gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.20"; }; + version = "0.15.4"; + gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.45"; }; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "paste.sr.ht"; rev = version; - hash = "sha256-ZZzcd14Jbo1MfET7B56X/fl9xWXpCJ8TuKrGVgJwZfQ="; + hash = "sha256-M38hAMRdMzcqxJv7j7foOIYEImr/ZYz/lbYOF9R9g2M="; }; pastesrht-api = buildGoModule ({ inherit src version; pname = "pastesrht-api"; modRoot = "api"; - vendorHash = "sha256-jiE73PUPSHxtWp7XBdH4mJw95pXmZjCl4tk2wQUf2M4="; + vendorHash = "sha256-vt5nSPcx+Y/SaWcqjV38DTL3ZtzmdjbkJYMv5Fhhnq4="; } // gqlgen); in buildPythonPackage rec { diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix index a5bbc43b3f45c..a60eb4b747885 100644 --- a/pkgs/applications/version-management/sourcehut/scm.nix +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "scmsrht"; - version = "0.22.23"; + version = "0.22.24"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "~sircmpwn"; repo = "scm.sr.ht"; rev = version; - hash = "sha256-058dOEYJDY3jtxH1VkV1CFq5CZTkauSnTWg57DCnNtw="; + hash = "sha256-9IgMmYzInfrten7z8bznlSFJlUjHf3k3z76lkP6tP50="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index 11c762592bb77..1f81727283911 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -13,21 +13,21 @@ }: let - version = "0.75.6"; - gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.36"; }; + version = "0.75.10"; + gqlgen = import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.45"; }; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "todo.sr.ht"; rev = version; - hash = "sha256-BPJ1M9dX+xNIw++VZ0Si/rjnfI9BY95TE2o+u7JRVAU="; + hash = "sha256-3dVZdupsygM7/6T1Mn7yRc776aa9pKgwF0hgZX6uVQ0="; }; todosrht-api = buildGoModule ({ inherit src version; pname = "todosrht-api"; modRoot = "api"; - vendorHash = "sha256-vTKIJFE8AFR2eZFwG9ba6FWPW02og3ZVcrsqUnOkJIQ="; + vendorHash = "sha256-fImOQLnQLHTrg5ikuYRZ+u+78exAiYA19DGQoUjQBOM="; } // gqlgen); in buildPythonPackage rec { diff --git a/pkgs/applications/version-management/sourcehut/update.sh b/pkgs/applications/version-management/sourcehut/update.sh index e9efc0816eb13..e5dd0b5baed04 100755 --- a/pkgs/applications/version-management/sourcehut/update.sh +++ b/pkgs/applications/version-management/sourcehut/update.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p git mercurial common-updater-scripts +#! nix-shell -i bash -p gnused git mercurial common-updater-scripts set -eux -o pipefail cd "$(dirname "${BASH_SOURCE[0]}")" || exit 1 @@ -34,21 +34,29 @@ get_latest_version() { rm -rf "$tmp" if [ "$1" = "hgsrht" ]; then hg clone "$src" "$tmp" >/dev/null - printf "%s" "$(cd "$tmp" && hg log --limit 1 --template '{latesttag}')" + printf "%s %s\n" \ + "$(cd "$tmp" && hg log --limit 1 --template '{latesttag}')" \ + "$(cd "$tmp" && sed -ne 's/^\s*github\.com\/99designs\/gqlgen v\(.*\)$/\1/p' go.mod)" else git clone "$src" "$tmp" >/dev/null - printf "%s" "$(cd "$tmp" && git describe "$(git rev-list --tags --max-count=1)")" + printf "%s %s\n" \ + "$(cd "$tmp" && git describe "$(git rev-list --tags --max-count=1)")" \ + "$(cd "$tmp" && sed -ne 's/^\s*github\.com\/99designs\/gqlgen v\(.*\)$/\1/p' go.mod)" fi } update_version() { default_nix="$(default "$1")" oldVersion="$(version "$1")" - version="$(get_latest_version "$1")" + read -r version gqlgen_ver < <(get_latest_version "$1") local p="$(attr_path "$1")" (cd "$root" && update-source-version "$p" "$version") + # update `gqlgenVersion` if necessary + old_gqlgen_ver="$(sed -ne 's/^.*gqlgenVersion = "\(.*\)".*$/\1/p' "$default_nix")" + sed -ri "s|gqlgenVersion = \"$old_gqlgen_ver\";|gqlgenVersion = \"$gqlgen_ver\";|w /dev/stdout" "$default_nix" + # Update vendorHash of Go modules retry=true while "$retry"; do @@ -63,7 +71,7 @@ update_version() { done done - if [ "$oldVersion" != "$version" ]; then + if [ "$oldVersion" != "$version" ] || [ "$old_gqlgen_ver" != "$gqlgen_ver" ]; then git add "$default_nix" git commit -m "sourcehut.$1: $oldVersion -> $version" fi diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix index 423f8cf8eb9cb..57186eec19f8c 100644 --- a/pkgs/applications/video/manim/default.nix +++ b/pkgs/applications/video/manim/default.nix @@ -47,14 +47,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "manim"; pyproject = true; - version = "0.18.0"; + version = "0.18.0.post0"; disabled = python3.pythonOlder "3.8"; src = fetchFromGitHub { owner = "ManimCommunity"; repo = "manim"; rev = "refs/tags/v${version}"; - hash = "sha256-TI7O0b1JvUZAxTj6XfpAJKhbGqrGnhcrE9eRJUVx4GM="; + hash = "sha256-4HwQ74oHloK+1KOD6SzXCzGIDD+Dc0jDabw6/+cqmos="; }; nativeBuildInputs = with python.pkgs; [ diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index ed9aa2116b518..1dbfaa298e345 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -5,18 +5,20 @@ rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "122.1"; + version = "123.0"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "562d81eb28a49ed6e0d771a430c21a458cdd33f9"; - sha256 = "l5sIUInOhhkn3ernQLIEwEpRCyICDH/1k4C/aidy1/I="; + # This is actually one commit before release 123, because the final + # commit breaks the build and gets reverted in future releases. + rev = "7c75ad6185893b4cc26676b6a0eb9fbdf9ed5b72"; + hash = "sha256-1Jj8TAgYxIGLJeTtiZBcXw0n/mTbh/uC8EFM0IYD5VY="; fetchSubmodules = true; }; separateDebugInfo = true; - cargoHash = "sha256-2MaRfQCAjW560sdAPqdWymClwY1U5QjIMzknHry+9zs="; + cargoHash = "sha256-f3w+msG7m6valf/I1puMrpiVgk0J1bdyp+rw3KQ/7ys="; nativeBuildInputs = [ pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner diff --git a/pkgs/applications/window-managers/sommelier/default.nix b/pkgs/applications/window-managers/sommelier/default.nix index 12c2e5da1b984..f0b9407761283 100644 --- a/pkgs/applications/window-managers/sommelier/default.nix +++ b/pkgs/applications/window-managers/sommelier/default.nix @@ -1,21 +1,28 @@ -{ lib, stdenv, fetchzip, meson, ninja, pkg-config, wayland-scanner +{ lib, stdenv, fetchzip +, meson, ninja, pkg-config, python3, python3Packages, wayland-scanner , libxkbcommon, mesa, pixman, xorg, wayland, gtest }: stdenv.mkDerivation { pname = "sommelier"; - version = "104.0"; + version = "123.0"; src = fetchzip rec { url = "https://chromium.googlesource.com/chromiumos/platform2/+archive/${passthru.rev}/vm_tools/sommelier.tar.gz"; - passthru.rev = "af5434fd9903936a534e1316cbd22361e67949ec"; + passthru.rev = "1abc91204f35cde76db37853ff3643c5cdb607e6"; stripRoot = false; - sha256 = "LungQqHQorHIKpye2SDBLuMHPt45C1cPYcs9o5Hc3cw="; + sha256 = "Wa30MU7iK1Y7pKNeC+FPFXDwDxFLWOZPG4jkm8cnWeg="; }; - nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; + nativeBuildInputs = [ + meson ninja pkg-config python3 python3Packages.jinja2 wayland-scanner + ]; buildInputs = [ libxkbcommon mesa pixman wayland xorg.libxcb ]; + preConfigure = '' + patchShebangs gen-shim.py + ''; + doCheck = true; nativeCheckInputs = [ gtest ]; diff --git a/pkgs/by-name/aa/aaaaxy/package.nix b/pkgs/by-name/aa/aaaaxy/package.nix index 3145758f50d68..386b8d62388a8 100644 --- a/pkgs/by-name/aa/aaaaxy/package.nix +++ b/pkgs/by-name/aa/aaaaxy/package.nix @@ -20,17 +20,17 @@ buildGoModule rec { pname = "aaaaxy"; - version = "1.5.42"; + version = "1.5.54"; src = fetchFromGitHub { owner = "divVerent"; repo = pname; rev = "v${version}"; - hash = "sha256-RfjEr0oOtLcrHKQj1dYbykRbHoGoi0o7D3hjVG3siIQ="; + hash = "sha256-FBla+KvUoUdCG0nM4falMJBq8NI75zqo/YSZy0bPFrE="; fetchSubmodules = true; }; - vendorHash = "sha256-q/nDfh+A2eJDAaSWN4Xsgxp76AKsYIX7PNn/psBPmg0="; + vendorHash = "sha256-rE1YXDpiGnAUdmAaOHehyM38SPBqNvSRHhtXIUwRYVs="; buildInputs = [ alsa-lib diff --git a/pkgs/by-name/ch/charm-freeze/package.nix b/pkgs/by-name/ch/charm-freeze/package.nix index eae18fc54f17f..f3efac03eb98b 100644 --- a/pkgs/by-name/ch/charm-freeze/package.nix +++ b/pkgs/by-name/ch/charm-freeze/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "charm-freeze"; - version = "0.1.4"; + version = "0.1.6"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "freeze"; rev = "v${version}"; - hash = "sha256-ItcdgQUPrz2hpWS6nDYfnZaCdfocR3QgJTQ4TXzPQOw="; + hash = "sha256-HLlMUOLDvNLVl4dvtyRwuLhp3pOlpm/naUXK2NiIAg8="; }; - vendorHash = "sha256-01tTr5NSyg52KGspYh9Rw98uQld6U+31Fy7jnyBoPx8="; + vendorHash = "sha256-AUFzxmQOb/h0UgcprY09IVI7Auitn3JTDU/ptKicIAU="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; diff --git a/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/pkgs/by-name/et/etlegacy-unwrapped/package.nix index 8bacd93e1a2b0..84526ae11ada5 100644 --- a/pkgs/by-name/et/etlegacy-unwrapped/package.nix +++ b/pkgs/by-name/et/etlegacy-unwrapped/package.nix @@ -92,11 +92,6 @@ stdenv.mkDerivation { "-DINSTALL_DEFAULT_BINDIR=${placeholder "out"}/bin" ]; - postInstall = '' - makeWrapper $out/bin/etl.* $out/bin/etl - makeWrapper $out/bin/etlded.* $out/bin/etlded - ''; - hardeningDisable = [ "fortify" ]; meta = { diff --git a/pkgs/by-name/et/etlegacy/package.nix b/pkgs/by-name/et/etlegacy/package.nix index e98b63c7a3527..446659c0148fb 100644 --- a/pkgs/by-name/et/etlegacy/package.nix +++ b/pkgs/by-name/et/etlegacy/package.nix @@ -18,10 +18,12 @@ symlinkJoin { ]; postBuild = '' - makeWrapper $out/bin/etl.* $out/bin/etl \ + wrapProgram $out/bin/etl.* \ --add-flags "+set fs_basepath ${placeholder "out"}/lib/etlegacy" - makeWrapper $out/bin/etlded.* $out/bin/etlded \ + wrapProgram $out/bin/etlded.* \ --add-flags "+set fs_basepath ${placeholder "out"}/lib/etlegacy" + makeWrapper $out/bin/etl.* $out/bin/etl + makeWrapper $out/bin/etlded.* $out/bin/etlded ''; meta = { diff --git a/pkgs/by-name/fe/fernglas/package.nix b/pkgs/by-name/fe/fernglas/package.nix new file mode 100644 index 0000000000000..3de9736128572 --- /dev/null +++ b/pkgs/by-name/fe/fernglas/package.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, fetchYarnDeps +, prefetch-yarn-deps +, python3 +, jq +, yarn +, nodejs-slim +}: + +rustPlatform.buildRustPackage rec { + pname = "fernglas"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "wobcom"; + repo = "fernglas"; + rev = "fernglas-${version}"; + hash = "sha256-0wj5AS8RLVr+S/QWWxCsMvmVjmXUWGfR9kPaZimJEss="; + }; + + nativeBuildInputs = [ yarn nodejs-slim prefetch-yarn-deps python3 jq ]; + + nlnog_communities = fetchFromGitHub { + owner = "NLNOG"; + repo = "lg.ring.nlnog.net"; + rev = "20f9a9f3da8b1bc9d7046e88c62df4b41b4efb99"; + hash = "sha256-FlbOBX/+/LLmoqMJLvu59XuHYmiohIhDc1VjkZu4Wzo="; + }; + + cargoHash = "sha256-ls9HvwtbpOwzQbi/+9IbgXurZp0LjQKGZcDuLZlX+Vk="; + + offlineCache = fetchYarnDeps { + yarnLock = src + "/frontend/yarn.lock"; + hash = "sha256-/ubCAs4C5nG8xNC77jTH+cJVNgddSxqGGPEVLDH/Cdo="; + }; + + cargoBuildFlags = lib.optionals (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isStatic) [ + "--features" "mimalloc" + ] ++ [ + "--features" "embed-static" + ]; + + preBuild = '' + python3 contrib/print_communities.py $nlnog_communities/communities | jq . > src/communities.json + + pushd frontend + + export HOME=$TMPDIR + yarn config --offline set yarn-offline-mirror $offlineCache + fixup-yarn-lock yarn.lock + yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules/ + + FERNGLAS_VERSION=${version} FERNGLAS_COMMIT=${src.rev} node_modules/.bin/webpack + cp -r dist/ ../static + + popd + ''; + + meta = with lib; { + description = "Looking glass for your network using BGP and BMP as data source"; + homepage = "https://wobcom.github.io/fernglas/"; + changelog = "https://github.com/wobcom/fernglas/releases/tag/fernglas-${version}"; + license = licenses.eupl12; + platforms = platforms.linux; + maintainers = teams.wdz.members; + mainProgram = "fernglas"; + }; +} diff --git a/pkgs/by-name/fr/francis/package.nix b/pkgs/by-name/fr/francis/package.nix new file mode 100644 index 0000000000000..95a25ea95a293 --- /dev/null +++ b/pkgs/by-name/fr/francis/package.nix @@ -0,0 +1,52 @@ +{ cmake +, fetchFromGitLab +, kdePackages +, lib +, pkg-config +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "francis"; + version = "1.1.0"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + repo = "francis"; + owner = "utilities"; + rev = "v${version}"; + hash = "sha256-TvLFzGWb3RROGywhNzCvnFG00PpKC2k+/w1bgwTCESg="; + }; + + nativeBuildInputs = [ + cmake + kdePackages.kirigami + kdePackages.kirigami-addons + kdePackages.plasma5support + kdePackages.qqc2-desktop-style + kdePackages.qtsvg + kdePackages.qtwayland + kdePackages.wrapQtAppsHook + pkg-config + ]; + + buildInputs = [ + kdePackages.kiconthemes + # otherwise buttons are blank on non-kde + kdePackages.breeze-icons + ]; + + cmakeFlags = [ + # fix can't find Qt6QmlCompilerPlusPrivate + "-DQT_NO_FIND_QMLSC=TRUE" + ]; + + meta = with lib; { + description = "Using the well-known pomodoro technique to help you get more productive"; + homepage = "https://apps.kde.org/francis/"; + license = with licenses; [ bsd2 bsd3 cc0 lgpl2Plus lgpl21Plus gpl3Plus ]; + mainProgram = "francis"; + maintainers = with maintainers; [ cimm ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/go/go-critic/package.nix b/pkgs/by-name/go/go-critic/package.nix index ea59125410635..aee7e0da791f8 100644 --- a/pkgs/by-name/go/go-critic/package.nix +++ b/pkgs/by-name/go/go-critic/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "go-critic"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "go-critic"; repo = "go-critic"; rev = "v${version}"; - hash = "sha256-xej9ROsJYrjvlitxnAjUKPsp0kb8INvFnkdNfYiycz8="; + hash = "sha256-GEwUz6iH9y+d2UoKY68VHOKomn4EUkzoUgNHTqluW8I="; }; - vendorHash = "sha256-pYdnZjCGx+skF/kqA1QO3NuVqOfsMJNVhFBpwtdZhIA="; + vendorHash = "sha256-rfqX76SQnLQFwheHlS3GZD+jeaVd38qfSnQCH7OH6+I="; subPackages = [ "cmd/gocritic" diff --git a/pkgs/by-name/hy/hyprland-monitor-attached/package.nix b/pkgs/by-name/hy/hyprland-monitor-attached/package.nix new file mode 100644 index 0000000000000..6f505aa7981ef --- /dev/null +++ b/pkgs/by-name/hy/hyprland-monitor-attached/package.nix @@ -0,0 +1,24 @@ +{ rustPlatform, fetchFromGitHub, lib }: + +rustPlatform.buildRustPackage rec { + pname = "hyprland-monitor-attached"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "coffebar"; + repo = "hyprland-monitor-attached"; + rev = version; + hash = "sha256-McenpaoEjQIB709VlLkyVGoUwVoMe7TJPb8Lrh1efw8="; + }; + + cargoHash = "sha256-QH32NYZJcSxTMgHZKqksy2+DLw62G+knJgoj6OGRfQE="; + + meta = with lib; { + description = "Automatically run a script when a monitor connects (or disconnects) in Hyprland"; + homepage = "https://github.com/coffebar/hyprland-monitor-attached"; + license = licenses.mit; + maintainers = with maintainers; [ bddvlpr ]; + mainProgram = "hyprland-monitor-attached"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/lu/lubelogger/package.nix b/pkgs/by-name/lu/lubelogger/package.nix index 72bef4a340af8..e7526a74b6714 100644 --- a/pkgs/by-name/lu/lubelogger/package.nix +++ b/pkgs/by-name/lu/lubelogger/package.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "lubelogger"; - version = "1.2.9"; + version = "1.3.0"; src = fetchFromGitHub { owner = "hargata"; repo = "lubelog"; rev = "v${version}"; - hash = "sha256-bzCPoWgI7JA5dEYKl2m1ZzNPXxNRAzZz1lFa7fVCkNw="; + hash = "sha256-L2iimh1weZ2f1mh42ahJVZLnemY3kFGK19jLyhcktjI="; }; projectFile = "CarCareTracker.sln"; diff --git a/pkgs/by-name/mc/mcumgr-client/Cargo.lock b/pkgs/by-name/mc/mcumgr-client/Cargo.lock new file mode 100644 index 0000000000000..2f9a6fd2a7bb3 --- /dev/null +++ b/pkgs/by-name/mc/mcumgr-client/Cargo.lock @@ -0,0 +1,965 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "anstream" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys", +] + +[[package]] +name = "anyhow" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" + +[[package]] +name = "autocfg" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "4.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "clap_lex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc16" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "338089f42c427b86394a5ee60ff321da23a5c89c9d89514c829687b26359fcff" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "half" +version = "1.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "indicatif" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-kit-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617ee6cf8e3f66f3b4ea67a4058564628cde41901316e19f559e14c7c72c5e7b" +dependencies = [ + "core-foundation-sys", + "mach2", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.153" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "libudev" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b324152da65df7bb95acfcaab55e3097ceaab02fb19b228a9eb74d55f135e0" +dependencies = [ + "libc", + "libudev-sys", +] + +[[package]] +name = "libudev-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "mach2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +dependencies = [ + "libc", +] + +[[package]] +name = "mcumgr-client" +version = "0.0.4" +dependencies = [ + "anyhow", + "base64", + "bincode", + "byteorder", + "clap", + "crc16", + "hex", + "humantime", + "indicatif", + "lazy_static", + "log", + "num", + "num-derive", + "num-traits", + "rand", + "serde", + "serde_bytes", + "serde_cbor", + "serde_json", + "serde_repr", + "serialport", + "sha2", + "simplelog", +] + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", +] + +[[package]] +name = "num" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro2" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "ryu" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "serde" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_bytes" +version = "0.11.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_cbor" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +dependencies = [ + "half", + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "serde_json" +version = "1.0.115" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "serialport" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f5a15d0be940df84846264b09b51b10b931fb2f275becb80934e3568a016828" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "core-foundation-sys", + "io-kit-sys", + "libudev", + "mach2", + "nix", + "regex", + "scopeguard", + "unescaper", + "winapi", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "simplelog" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0" +dependencies = [ + "log", + "termcolor", + "time", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "time" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +dependencies = [ + "deranged", + "itoa", + "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unescaper" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0adf6ad32eb5b3cadff915f7b770faaac8f7ff0476633aa29eb0d9584d889d34" +dependencies = [ + "thiserror", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" diff --git a/pkgs/by-name/mc/mcumgr-client/package.nix b/pkgs/by-name/mc/mcumgr-client/package.nix new file mode 100644 index 0000000000000..d80bb6231ec14 --- /dev/null +++ b/pkgs/by-name/mc/mcumgr-client/package.nix @@ -0,0 +1,46 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, + pkg-config, + udev, + stdenv, + darwin, +}: + +rustPlatform.buildRustPackage rec { + pname = "mcumgr-client"; + version = "0.0.4"; + + src = fetchFromGitHub { + owner = "vouch-opensource"; + repo = "mcumgr-client"; + rev = "v${version}"; + hash = "sha256-MTNMnA5/CzwVrhNhDrfaXOatT4BFmc4nOPhIxTyc248="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + }; + + passthru.updateScript = nix-update-script { }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = + lib.optionals stdenv.isLinux [ udev ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; + + meta = with lib; { + description = "Client for mcumgr commands"; + homepage = "https://github.com/vouch-opensource/mcumgr-client"; + license = licenses.asl20; + maintainers = with maintainers; [ otavio ]; + mainProgram = "mcumgr-client"; + }; +} diff --git a/pkgs/by-name/ne/nekoray/nekobox-core.nix b/pkgs/by-name/ne/nekoray/nekobox-core.nix new file mode 100644 index 0000000000000..43663ac9797ec --- /dev/null +++ b/pkgs/by-name/ne/nekoray/nekobox-core.nix @@ -0,0 +1,36 @@ +{ + buildGoModule, + version, + src, + extraSources, +}: + +buildGoModule rec { + pname = "nekobox-core"; + inherit version src; + sourceRoot = "${src.name}/go/cmd/nekobox_core"; + + postPatch = '' + cp -r --no-preserve=all ${extraSources.libneko} ../../../../libneko + cp -r --no-preserve=all ${extraSources.sing-box-extra} ../../../../sing-box-extra + cp -r --no-preserve=all ${extraSources.sing-box} ../../../../sing-box + cp -r --no-preserve=all ${extraSources.sing-quic} ../../../../sing-quic + ''; + + vendorHash = "sha256-q/Co67AwJVElJnEY2O0SLLUzwlGiqazKu+fD/nnbrTk="; + + ldflags = [ + "-w" + "-s" + "-X github.com/matsuridayo/libneko/neko_common.Version_neko=${version}" + ]; + + tags = [ + "with_clash_api" + "with_gvisor" + "with_quic" + "with_wireguard" + "with_utls" + "with_ech" + ]; +} diff --git a/pkgs/by-name/ne/nekoray/nekoray-core.nix b/pkgs/by-name/ne/nekoray/nekoray-core.nix new file mode 100644 index 0000000000000..0488bc713e574 --- /dev/null +++ b/pkgs/by-name/ne/nekoray/nekoray-core.nix @@ -0,0 +1,26 @@ +{ + buildGoModule, + version, + src, + extraSources, +}: + +buildGoModule rec { + pname = "nekoray-core"; + inherit version src; + sourceRoot = "${src.name}/go/cmd/nekoray_core"; + + postPatch = '' + cp -r --no-preserve=all ${extraSources.libneko} ../../../../libneko + cp -r --no-preserve=all ${extraSources.Xray-core} ../../../../Xray-core + ''; + + vendorHash = "sha256-gxp5oI7qO+bdSe8Yrb9I4Wkl5TqqZeIhzcQDg1OpRkc="; + + ldflags = [ + "-w" + "-s" + "-X github.com/matsuridayo/libneko/neko_common.Version_neko=${version}" + "-X github.com/matsuridayo/libneko/neko_common.Version_v2ray=${extraSources.Xray-core.rev}" + ]; +} diff --git a/pkgs/by-name/ne/nekoray/package.nix b/pkgs/by-name/ne/nekoray/package.nix new file mode 100644 index 0000000000000..4a1ce8f046620 --- /dev/null +++ b/pkgs/by-name/ne/nekoray/package.nix @@ -0,0 +1,159 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libsForQt5, + cmake, + ninja, + protobuf, + yaml-cpp, + zxing-cpp, + callPackage, + makeDesktopItem, + copyDesktopItems, + + v2ray-geoip, + v2ray-domain-list-community, + sing-geoip, + sing-geosite, +}: + +let + fetchSource = + args: + fetchFromGitHub ( + args + // { + owner = "MatsuriDayo"; + repo = args.name; + } + ); + + extraSources = { + # revs found in https://github.com/MatsuriDayo/nekoray/blob/<version>/libs/get_source_env.sh + Xray-core = fetchSource { + name = "Xray-core"; + rev = "01208225ee7e508044cca8eb6776a117bcecd997"; + hash = "sha256-R66i9MITdE9JlhD4wV0EitKPxyahQqDNpunUxVTmupA="; + }; + sing-box-extra = fetchSource { + name = "sing-box-extra"; + rev = "d31d6da26a51a929349e0d75fd89dccbe20d1268"; + hash = "sha256-YlzMAff8VOZGyCP7ksjcmoBDHT5llTYwwXIrs+qO5P4="; + }; + + # revs found in https://github.com/MatsuriDayo/sing-box-extra/blob/<sing-box-extra.rev>/libs/get_source_env.sh + sing-box = fetchSource { + name = "sing-box"; + rev = "64f4eed2c667d9ff1e52a84233dee0e2ca32c17e"; + hash = "sha256-jIg/+fvTn46h6tE6YXtov+ZaBD/ywApTZbzHlT5v4lM="; + }; + sing-quic = fetchSource { + name = "sing-quic"; + rev = "e396733db4de15266f0cfdb43c392aca0759324a"; + hash = "sha256-un5NtZPRx1QAjwNhXkR9OVGldtfM1jQoNRUzt9oilUE="; + }; + libneko = fetchSource { + name = "libneko"; + rev = "5277a5bfc889ee7a89462695b0e678c1bd4909b1"; + hash = "sha256-6dlWDzI9ox4PQzEtJNgwA0pXmPC7fGrGId88Zl+1gpw="; + }; + }; + + geodata = { + "geoip.dat" = "${v2ray-geoip}/share/v2ray/geoip.dat"; + "geosite.dat" = "${v2ray-domain-list-community}/share/v2ray/geosite.dat"; + "geoip.db" = "${sing-geoip}/share/sing-box/geoip.db"; + "geosite.db" = "${sing-geosite}/share/sing-box/geosite.db"; + }; + + installGeodata = lib.concatStringsSep "\n" ( + lib.mapAttrsToList (filename: file: '' + install -Dm644 ${file} "$out/share/nekoray/${filename}" + '') geodata + ); +in +stdenv.mkDerivation (finalAttrs: { + pname = "nekoray"; + version = "3.26"; + + src = fetchSource { + name = "nekoray"; + rev = finalAttrs.version; + hash = "sha256-fDm6fCI6XA4DHKCN3zm9B7Qbdh3LTHYGK8fPmeEnhjI="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + libsForQt5.wrapQtAppsHook + cmake + ninja + protobuf + copyDesktopItems + ]; + + buildInputs = [ + libsForQt5.qtbase + libsForQt5.qttools + libsForQt5.qtx11extras + zxing-cpp + yaml-cpp + ]; + + # NKR_PACKAGE makes sure the app uses the user's config directory to store it's non-static content + # it's essentially the same as always setting the -appdata flag when running the program + cmakeFlags = [ (lib.cmakeBool "NKR_PACKAGE" true) ]; + + installPhase = '' + runHook preInstall + + install -Dm755 nekoray "$out/share/nekoray/nekoray" + mkdir -p "$out/bin" + ln -s "$out/share/nekoray/nekoray" "$out/bin" + + # nekoray looks for other files and cores in the same directory it's located at + ln -s ${finalAttrs.passthru.nekoray-core}/bin/nekoray_core "$out/share/nekoray/nekoray_core" + ln -s ${finalAttrs.passthru.nekobox-core}/bin/nekobox_core "$out/share/nekoray/nekobox_core" + + ${installGeodata} + + install -Dm644 "$src/res/public/nekoray.png" "$out/share/icons/hicolor/256x256/apps/nekoray.png" + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "nekoray"; + desktopName = "nekoray"; + exec = "nekoray"; + icon = "nekoray"; + comment = finalAttrs.meta.description; + terminal = false; + categories = [ + "Network" + "Application" + ]; + }) + ]; + + passthru = { + nekobox-core = callPackage ./nekobox-core.nix { + inherit (finalAttrs) src version; + inherit extraSources; + }; + nekoray-core = callPackage ./nekoray-core.nix { + inherit (finalAttrs) src version; + inherit extraSources; + }; + }; + + meta = { + description = "Qt based cross-platform GUI proxy configuration manager"; + homepage = "https://github.com/MatsuriDayo/nekoray"; + license = lib.licenses.gpl3Plus; + mainProgram = "nekoray"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix index 83cc94ae2ff4d..780e3b2a0693e 100644 --- a/pkgs/by-name/nh/nh/package.nix +++ b/pkgs/by-name/nh/nh/package.nix @@ -10,7 +10,7 @@ , nix-output-monitor }: let - version = "3.5.7"; + version = "3.5.10"; runtimeDeps = [ nvd nix-output-monitor ]; in rustPlatform.buildRustPackage { @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { owner = "viperML"; repo = "nh"; rev = "refs/tags/v${version}"; - hash = "sha256-gpvOzL+7PP22juK6yI01EiGUEVVo4lHGXCs5OmCAX+s="; + hash = "sha256-uEVd15WsX+Wti9PXW724puFcsFO72VTiJyBwW2WXT9M="; }; strictDeps = true; @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage { --prefix PATH : ${lib.makeBinPath runtimeDeps} ''; - cargoHash = "sha256-DcYvovD2Qx4ybpV7YckwYvy8hsoq50YGZI8fl2BXFLI="; + cargoHash = "sha256-/aqs/l+Qi2b8zxHXqxdHLBpSr5+vVsd6pY/QnHbkmb0="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/of/offat/package.nix b/pkgs/by-name/of/offat/package.nix index e9942dbeb0c4e..145ab32a1bbfa 100644 --- a/pkgs/by-name/of/offat/package.nix +++ b/pkgs/by-name/of/offat/package.nix @@ -1,25 +1,24 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "offat"; - version = "0.16.0"; + version = "0.17.0"; pyproject = true; src = fetchFromGitHub { owner = "OWASP"; repo = "OFFAT"; rev = "refs/tags/v${version}"; - hash = "sha256-ald+hanICvY0jTgL7GtIMiArLWazykaJAJSfzPKE4/I="; + hash = "sha256-tSLlMgvKIDlzHL71gH1OznKI5jEyUoJUy9d9Z8tNXjk="; }; sourceRoot = "${src.name}/src"; - build-system = with python3.pkgs; [ - poetry-core - ]; + build-system = with python3.pkgs; [ poetry-core ]; dependencies = with python3.pkgs; [ aiohttp @@ -45,9 +44,7 @@ python3.pkgs.buildPythonApplication rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ - "offat" - ]; + pythonImportsCheck = [ "offat" ]; meta = with lib; { description = "Tool to test APIs for prevalent vulnerabilities"; diff --git a/pkgs/by-name/pi/piv-agent/package.nix b/pkgs/by-name/pi/piv-agent/package.nix new file mode 100644 index 0000000000000..283edba536780 --- /dev/null +++ b/pkgs/by-name/pi/piv-agent/package.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, buildGoModule +, darwin +, fetchFromGitHub +, pcsclite +, pkg-config +}: + +buildGoModule rec { + pname = "piv-agent"; + version = "0.21.0"; + + src = fetchFromGitHub { + owner = "smlx"; + repo = "piv-agent"; + rev = "v${version}"; + hash = "sha256-aukcnubhB8kbAl22eeFKzLPvVcYdgcEQ1gy3n6KWG00="; + }; + + vendorHash = "sha256-1d6EKEvo4XNDXRtbdnKkqyF9y0LPPHWKu9X/wYnbmas="; + + subPackages = [ "cmd/piv-agent" ]; + + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.shortCommit=${src.rev}" ]; + + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + + buildInputs = + if stdenv.isDarwin + then [ darwin.apple_sdk.frameworks.PCSC ] + else [ pcsclite ]; + + meta = with lib; { + description = "An SSH and GPG agent which you can use with your PIV hardware security device (e.g. a Yubikey)"; + homepage = "https://github.com/smlx/piv-agent"; + license = licenses.asl20; + maintainers = [ maintainers.marsam ]; + mainProgram = "piv-agent"; + }; +} diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix index 7c5cc114f7678..c5681e11db548 100644 --- a/pkgs/by-name/py/pyprland/package.nix +++ b/pkgs/by-name/py/pyprland/package.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "pyprland"; - version = "2.1.4"; + version = "2.2.3"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.10"; @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { owner = "hyprland-community"; repo = "pyprland"; rev = "refs/tags/${version}"; - hash = "sha256-vko8SY5d537bKnpVeJWM3D4WeYCXAvF6tCzlFjKIZRU="; + hash = "sha256-WGLcrmKHti5Hu2Ed4/G1UgYGXPyGYHmkPK/yo4gdMNM="; }; nativeBuildInputs = with python3Packages; [ poetry-core ]; diff --git a/pkgs/by-name/ty/typstyle/Cargo.lock b/pkgs/by-name/ty/typstyle/Cargo.lock index 9d8cabdebf586..93a854da23e79 100644 --- a/pkgs/by-name/ty/typstyle/Cargo.lock +++ b/pkgs/by-name/ty/typstyle/Cargo.lock @@ -3649,7 +3649,7 @@ dependencies = [ [[package]] name = "typstyle" -version = "0.11.11" +version = "0.11.12" dependencies = [ "anyhow", "clap", diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index 7f4b60fd6364e..437100646c82c 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "typstyle"; - version = "0.11.11"; + version = "0.11.12"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typstyle"; rev = "v${version}"; - hash = "sha256-Ov+kgKTOSD3KjHV6Rcn65+7wvh3FKRs4mqVFTmJYEp0="; + hash = "sha256-fAby71wgySMeZ1rDQdaKMn53nxMc9RszmzCWKBdHkZg="; }; cargoLock = { diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 79bf56085f7b9..d5c6c8d064750 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,10 +1,10 @@ { "darwin": { - "hash": "sha256-4eeu1JlChD9QvFSpuq5Wh8y+cUqpHYKgi3+SBTJqIwA=", - "version": "0.2024.03.26.08.02.stable_02" + "hash": "sha256-tNNT8FqMvrjGFuyhizbyd2gAimbd5SLyCMVt6bFcbyQ=", + "version": "0.2024.04.02.08.02.stable_01" }, "linux": { - "hash": "sha256-hBwLfxhdy4cru2xH3hY+mGbJpR47Qf3SqEIijIRDstU=", - "version": "0.2024.03.26.08.02.stable_02" + "hash": "sha256-xnXRg23AdfCk2TKBr+PZ3wDYqTN4+8wLSodWpmh3D/Y=", + "version": "0.2024.04.02.08.02.stable_01" } } diff --git a/pkgs/data/icons/phinger-cursors/default.nix b/pkgs/data/icons/phinger-cursors/default.nix index 82742723806f5..26b729b268c93 100644 --- a/pkgs/data/icons/phinger-cursors/default.nix +++ b/pkgs/data/icons/phinger-cursors/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "phinger-cursors"; - version = "1.1"; + version = "2.0"; src = fetchurl { url = "https://github.com/phisch/phinger-cursors/releases/download/v${version}/phinger-cursors-variants.tar.bz2"; - sha256 = "sha256-II+1x+rcjGRRVB8GYkVwkKVHNHcNaBKRb6C613901oc="; + sha256 = "sha256-A12BGtc0+wDqeSGN4lbUe5G3Pv4IsQB4TkvWHnDU6bE="; }; sourceRoot = "."; diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index e4e3d08ddc7b2..6b1eafaee7e00 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "8fd329148e6583ab472717f5cac4e8132dac2c1e", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/8fd329148e6583ab472717f5cac4e8132dac2c1e.tar.gz", - "sha256": "0acf86rjvkh8vgbkzm1gjavm8xr508hd19ncwa19zqrf8gpp051x", - "msg": "Update from Hackage at 2024-03-16T22:28:08Z" + "commit": "a3f1357d6561e38afbb7545f733063f9ad7465c4", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a3f1357d6561e38afbb7545f733063f9ad7465c4.tar.gz", + "sha256": "0nvrqbaf483af1abxqcms8f60nbxyqghf5k1jb4m3xah0206kdwf", + "msg": "Update from Hackage at 2024-03-31T04:36:22Z" } diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/development/compilers/carp/default.nix index 5abb9b3fe641e..69ca47571ecc7 100644 --- a/pkgs/development/compilers/carp/default.nix +++ b/pkgs/development/compilers/carp/default.nix @@ -56,6 +56,8 @@ haskellPackages.mkDerivation rec { homepage = "https://github.com/carp-lang/Carp"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ jluttine ]; + # Not actively maintained at the moment + broken = true; # Windows not (yet) supported. platforms = with lib.platforms; unix ++ darwin; diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 465db3a252964..b201379668b1b 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -350,10 +350,10 @@ stdenv.mkDerivation ({ '*-android*|*-gnueabi*|*-musleabi*)' done '' - # Need to make writable EM_CACHE for emscripten + # Need to make writable EM_CACHE for emscripten. The path in EM_CACHE must be absolute. # https://gitlab.haskell.org/ghc/ghc/-/wikis/javascript-backend#configure-fails-with-sub-word-sized-atomic-operations-not-available + lib.optionalString targetPlatform.isGhcjs '' - export EM_CACHE="$(mktemp -d emcache.XXXXXXXXXX)" + export EM_CACHE="$(realpath $(mktemp -d emcache.XXXXXXXXXX))" cp -Lr ${targetCC /* == emscripten */}/share/emscripten/cache/* "$EM_CACHE/" chmod u+rwX -R "$EM_CACHE" '' diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e9c0303afb55d..585cfd2a7049b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -20,8 +20,8 @@ with haskellLib; self: super: { # Make sure that Cabal 3.10.* can be built as-is - Cabal_3_10_2_1 = doDistribute (super.Cabal_3_10_2_1.override ({ - Cabal-syntax = self.Cabal-syntax_3_10_2_0; + Cabal_3_10_3_0 = doDistribute (super.Cabal_3_10_3_0.override ({ + Cabal-syntax = self.Cabal-syntax_3_10_3_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { # Use process core package when possible process = self.process_1_6_18_0; @@ -36,9 +36,9 @@ self: super: { { # Needs to be downgraded compared to Stackage LTS 21 resolv = cself.resolv_0_1_2_0; - } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.6") { - Cabal = cself.Cabal_3_10_2_1; - Cabal-syntax = cself.Cabal-syntax_3_10_2_0; + } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.10") { + Cabal = cself.Cabal_3_10_3_0; + Cabal-syntax = cself.Cabal-syntax_3_10_3_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.4") { # We need at least directory >= 1.3.7.0. Using the latest version # 1.3.8.* is not an option since it causes very annoying dependencies @@ -81,7 +81,7 @@ self: super: { extensions = doJailbreak (super.extensions.override { Cabal = if versionOlder self.ghc.version "9.6" - then self.Cabal_3_10_2_1 + then self.Cabal_3_10_3_0 else null; # use GHC bundled version }); @@ -185,6 +185,7 @@ self: super: { # https://github.com/mpickering/eventlog2html/pull/187 eventlog2html = lib.pipe super.eventlog2html [ + doJailbreak (appendPatch (fetchpatch { name = "blaze-html-compat.patch"; url = "https://github.com/mpickering/eventlog2html/commit/666aee9ee44c571173a73036b36ad4154c188481.patch"; @@ -1512,7 +1513,7 @@ self: super: { # 2022-08-31: Jailbreak is done to allow aeson 2.0.*: # https://github.com/haskell-CI/haskell-ci/commit/6ad0d5d701cbe101013335d597acaf5feadd3ab9#r82681900 cabal-install-parsers = doJailbreak (dontCheck (super.cabal-install-parsers.override { - Cabal-syntax = self.Cabal-syntax_3_10_2_0; + Cabal-syntax = self.Cabal-syntax_3_10_3_0; })); # Test suite requires database @@ -2297,7 +2298,7 @@ self: super: { # 2023-07-03: allow lattices-2.2, waiting on https://github.com/haskell-CI/haskell-ci/pull/664 # 2024-03-21: pins specific version of ShellCheck haskell-ci = doJailbreak (super.haskell-ci.overrideScope (self: super: { - Cabal-syntax = self.Cabal-syntax_3_10_2_0; + Cabal-syntax = self.Cabal-syntax_3_10_3_0; ShellCheck = self.ShellCheck_0_9_0; })); @@ -2564,7 +2565,7 @@ self: super: { cabal-fmt = doJailbreak (super.cabal-fmt.override { # Needs newer Cabal-syntax version. - Cabal-syntax = self.Cabal-syntax_3_10_2_0; + Cabal-syntax = self.Cabal-syntax_3_10_3_0; }); # 2023-07-18: https://github.com/srid/ema/issues/156 @@ -3036,13 +3037,6 @@ self: super: { # repa-query, repa-scalar, repa-store, repa-stream ; - # https://github.com/jhickner/smtp-mail/pull/41 Use crypton-connection instead of connection - smtp-mail = appendPatch (pkgs.fetchpatch { - name = "smtp-mail-crypton-connection.patch"; - url = "https://github.com/jhickner/smtp-mail/commit/4c724c80814ab1da7c37256a6c10e04c88b9af95.patch"; - hash = "sha256-rCyY4rB/wLspeAbLw1jji5BykYFLnmTjLiUyNkiEXmw"; - }) (super.smtp-mail.override { connection = self.crypton-connection; }); - # Use recent git version as the hackage version is outdated and not building on recent GHC versions haskell-to-elm = overrideSrc { version = "unstable-2023-12-02"; @@ -3068,4 +3062,7 @@ self: super: { tasty = super.tasty_1_5; tasty-quickcheck = super.tasty-quickcheck_0_10_3; }); + + # Too strict bounds on text. Can be removed after https://github.com/alx741/currencies/pull/3 is merged + currencies = doJailbreak super.currencies; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 3c8b742254a84..480059de14c0e 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -303,6 +303,8 @@ self: super: ({ stripLen = 1; }) super.inline-c-cpp; + # Tests fail on macOS https://github.com/mrkkrp/zip/issues/112 + zip = dontCheck super.zip; } // lib.optionalAttrs pkgs.stdenv.isAarch64 { # aarch64-darwin # https://github.com/fpco/unliftio/issues/87 diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index de5f883e5f4be..94cf15df5dff6 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -106,7 +106,7 @@ in { ( let hls_overlay = lself: lsuper: { - Cabal-syntax = lself.Cabal-syntax_3_10_2_0; + Cabal-syntax = lself.Cabal-syntax_3_10_3_0; }; in lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) { diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 71835751d24eb..cf197f9fb3f5a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -52,12 +52,14 @@ self: super: { # # Version upgrades # - th-abstraction = doDistribute self.th-abstraction_0_6_0_0; + th-abstraction = doDistribute self.th-abstraction_0_7_0_0; ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_2_20240223; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2; ghc-lib = doDistribute self.ghc-lib_9_8_1_20231121; megaparsec = doDistribute self.megaparsec_9_6_1; - aeson = doDistribute self.aeson_2_2_1_0; + # TODO: remove when aeson updates or launches a revision + # see https://github.com/haskell/aeson/issues/1089 and https://github.com/haskell/aeson/pulls/1088 + aeson = doJailbreak (doDistribute self.aeson_2_2_1_0); attoparsec-aeson = doDistribute self.attoparsec-aeson_2_2_0_1; xmonad = doDistribute self.xmonad_0_18_0; apply-refact = self.apply-refact_0_14_0_0; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index ced72a5d30be6..f8d16ce0c3405 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -693,7 +693,6 @@ broken-packages: - cassava-records # failure in job https://hydra.nixos.org/build/233259049 at 2023-09-02 - cassava-streams # failure in job https://hydra.nixos.org/build/233222669 at 2023-09-02 - cassette # failure in job https://hydra.nixos.org/build/233201251 at 2023-09-02 - - castagnoli # failure in job https://hydra.nixos.org/build/233213036 at 2023-09-02 - castle # failure in job https://hydra.nixos.org/build/233204027 at 2023-09-02 - catamorphism # failure in job https://hydra.nixos.org/build/233208488 at 2023-09-02 - Catana # failure in job https://hydra.nixos.org/build/233196550 at 2023-09-02 @@ -1083,7 +1082,6 @@ broken-packages: - curl-aeson # failure in job https://hydra.nixos.org/build/233210106 at 2023-09-02 - curl-runnings # failure in job https://hydra.nixos.org/build/233258680 at 2023-09-02 - curly-expander # failure in job https://hydra.nixos.org/build/233250838 at 2023-09-02 - - currencies # failure in job https://hydra.nixos.org/build/233216717 at 2023-09-02 - currency-convert # failure in job https://hydra.nixos.org/build/233224509 at 2023-09-02 - curry-base # failure in job https://hydra.nixos.org/build/233246647 at 2023-09-02 - CurryDB # failure in job https://hydra.nixos.org/build/233238995 at 2023-09-02 @@ -3300,7 +3298,6 @@ broken-packages: - kind-integer # failure in job https://hydra.nixos.org/build/233250066 at 2023-09-02 - kleene-list # failure in job https://hydra.nixos.org/build/233237651 at 2023-09-02 - kmn-programming # failure in job https://hydra.nixos.org/build/233258328 at 2023-09-02 - - kmonad # failure in job https://hydra.nixos.org/build/252717089 at 2024-03-16 - kmp-dfa # failure in job https://hydra.nixos.org/build/233237266 at 2023-09-02 - knots # failure in job https://hydra.nixos.org/build/233209153 at 2023-09-02 - koellner-phonetic # failure in job https://hydra.nixos.org/build/233217750 at 2023-09-02 @@ -4233,7 +4230,6 @@ broken-packages: - optimization # failure in job https://hydra.nixos.org/build/233191078 at 2023-09-02 - optional # failure in job https://hydra.nixos.org/build/233241818 at 2023-09-02 - options-time # failure in job https://hydra.nixos.org/build/233194289 at 2023-09-02 - - optparse-applicative-cmdline-util # failure in job https://hydra.nixos.org/build/252739738 at 2024-03-16 - optparse-applicative-simple # failure in job https://hydra.nixos.org/build/233236802 at 2023-09-02 - optparse-declarative # failure in job https://hydra.nixos.org/build/252718969 at 2024-03-16 - optparse-helper # failure in job https://hydra.nixos.org/build/233248522 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 51eb135398b4c..221062282a988 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -365,6 +365,7 @@ package-maintainers: - X11 - X11-xft - html-parse-util + - kmonad - optparse-applicative-cmdline-util - xmonad - xmonad-contrib diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 19a1f753c222f..c4bdc86e5333c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 22.13 +# Stackage LTS 22.14 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -352,7 +352,7 @@ default-package-overrides: - ansi-wl-pprint ==1.0.2 - ANum ==0.2.0.2 - aos-signature ==0.1.1 - - apecs ==0.9.5 + - apecs ==0.9.6 - apecs-gloss ==0.2.4 - apecs-physics ==0.4.6 - api-field-json-th ==0.1.0.2 @@ -402,7 +402,7 @@ default-package-overrides: - attoparsec-binary ==0.2 - attoparsec-data ==1.0.5.4 - attoparsec-expr ==0.1.1.2 - - attoparsec-framer ==0.1.0.2 + - attoparsec-framer ==0.1.0.3 - attoparsec-iso8601 ==1.1.0.1 - attoparsec-path ==0.0.0.1 - attoparsec-run ==0.0.2.0 @@ -461,7 +461,7 @@ default-package-overrides: - between ==0.11.0.0 - bibtex ==0.1.0.7 - bifunctor-classes-compat ==0.1 - - bifunctors ==5.6.1 + - bifunctors ==5.6.2 - bimap ==0.5.0 - bimaps ==0.1.0.2 - bin ==0.1.3 @@ -564,12 +564,13 @@ default-package-overrides: - bytestring-to-vector ==0.3.0.1 - bytestring-tree-builder ==0.2.7.12 - bytestring-trie ==0.2.7.2 - - bz2 ==1.0.1.0 - - bzlib ==0.5.1.0 - - bzlib-conduit ==0.3.0.2 + - bz2 ==1.0.1.1 + - bzip2-clib ==1.0.8 + - bzlib ==0.5.2.0 + - bzlib-conduit ==0.3.0.3 - c14n ==0.1.0.3 - c2hs ==0.28.8 - - cabal2spec ==2.7.0 + - cabal2spec ==2.7.1 - cabal-appimage ==0.4.0.2 - cabal-clean ==0.2.20230609 - cabal-debian ==5.2.3 @@ -679,8 +680,8 @@ default-package-overrides: - comfort-fftw ==0.0.0.1 - comfort-glpk ==0.1 - comfort-graph ==0.0.4 - - commonmark ==0.2.5.1 - - commonmark-extensions ==0.2.5.3 + - commonmark ==0.2.6 + - commonmark-extensions ==0.2.5.4 - commonmark-pandoc ==0.2.2.1 - commutative ==0.0.2 - commutative-semigroups ==0.1.0.2 @@ -728,7 +729,7 @@ default-package-overrides: - constraints-extras ==0.4.0.0 - constraint-tuples ==0.1.2 - construct ==0.3.1.2 - - context ==0.2.0.3 + - context ==0.2.1.0 - context-http-client ==0.2.0.2 - context-resource ==0.2.0.2 - context-wai-middleware ==0.2.0.2 @@ -869,7 +870,7 @@ default-package-overrides: - derive-storable ==0.3.1.0 - derive-topdown ==0.0.3.0 - deriving-aeson ==0.2.9 - - deriving-compat ==0.6.5 + - deriving-compat ==0.6.6 - deriving-trans ==0.9.1.0 - detour-via-sci ==1.0.0 - df1 ==0.4.2 @@ -909,7 +910,7 @@ default-package-overrides: - discrimination ==0.5 - disk-free-space ==0.1.0.1 - distributed-closure ==0.5.0.0 - - distributed-static ==0.3.9 + - distributed-static ==0.3.10 - distribution-opensuse ==1.1.4 - distributive ==0.6.2.1 - diversity ==0.8.1.0 @@ -1096,7 +1097,7 @@ default-package-overrides: - flac-picture ==0.1.3 - flags-applicative ==0.1.0.3 - flat ==0.6 - - flatparse ==0.5.0.2 + - flatparse ==0.5.1.0 - flay ==0.4 - flexible-defaults ==0.0.3 - FloatingHex ==0.5 @@ -1146,7 +1147,7 @@ default-package-overrides: - fuzzcheck ==0.1.1 - fuzzy ==0.1.1.0 - fuzzy-dates ==0.1.1.2 - - fuzzyset ==0.3.1 + - fuzzyset ==0.3.2 - fuzzy-time ==0.2.0.3 - gauge ==0.2.5 - gd ==3000.7.3 @@ -1344,13 +1345,13 @@ default-package-overrides: - haskoin-node ==1.0.1 - haskoin-store-data ==1.2.5 - hasktags ==0.73.0 - - hasql ==1.6.4.1 - - hasql-dynamic-statements ==0.3.1.4 + - hasql ==1.6.4.3 + - hasql-dynamic-statements ==0.3.1.5 - hasql-implicits ==0.1.1.2 - hasql-interpolate ==0.2.1.0 - hasql-listen-notify ==0.1.0.1 - hasql-migration ==0.3.0 - - hasql-notifications ==0.2.0.6 + - hasql-notifications ==0.2.1.0 - hasql-optparse-applicative ==0.7.1.3 - hasql-pool ==0.10.1 - hasql-th ==0.4.0.19 @@ -1520,7 +1521,7 @@ default-package-overrides: - HTTP ==4000.4.1 - http-api-data ==0.5.1 - http-api-data-qq ==0.1.0.0 - - http-client ==0.7.16 + - http-client ==0.7.17 - http-client-openssl ==0.3.3 - http-client-overrides ==0.1.1.0 - http-client-restricted ==0.1.0 @@ -1530,7 +1531,7 @@ default-package-overrides: - http-date ==0.0.11 - http-directory ==0.1.10 - http-download ==0.2.1.0 - - httpd-shed ==0.4.1.1 + - httpd-shed ==0.4.1.2 - http-io-streams ==0.1.7.0 - http-link-header ==1.2.1 - http-media ==0.8.1.1 @@ -1604,7 +1605,7 @@ default-package-overrides: - infer-license ==0.2.0 - infinite-list ==0.1.1 - inflections ==0.4.0.7 - - influxdb ==1.9.3 + - influxdb ==1.9.3.1 - ini ==0.4.2 - inj ==1.0 - inline-c ==0.9.1.10 @@ -1628,7 +1629,7 @@ default-package-overrides: - intervals ==0.9.2 - intset-imperative ==0.1.0.0 - int-supply ==1.0.0 - - invariant ==0.6.2 + - invariant ==0.6.3 - invert ==1.0.0.4 - invertible ==0.2.0.8 - invertible-grammar ==0.1.3.5 @@ -1748,8 +1749,8 @@ default-package-overrides: - lens-action ==0.2.6 - lens-aeson ==1.2.3 - lens-csv ==0.1.1.0 - - lens-family ==2.1.2 - - lens-family-core ==2.1.2 + - lens-family ==2.1.3 + - lens-family-core ==2.1.3 - lens-misc ==0.0.2.0 - lens-properties ==4.11.1 - lens-regex ==0.1.3 @@ -1761,7 +1762,8 @@ default-package-overrides: - libBF ==0.6.7 - libffi ==0.2.1 - liboath-hs ==0.0.1.2 - - libyaml ==0.1.2 + - libyaml ==0.1.4 + - libyaml-clib ==0.2.5 - lifted-async ==0.10.2.5 - lifted-base ==0.2.3.12 - lift-generics ==0.2.1 @@ -1823,7 +1825,7 @@ default-package-overrides: - machines ==0.7.3 - magic ==1.1 - magico ==0.0.2.3 - - mailtrap ==0.1.2.0 + - mailtrap ==0.1.2.1 - mainland-pretty ==0.7.1 - main-tester ==0.2.0.1 - managed ==1.0.10 @@ -1928,7 +1930,7 @@ default-package-overrides: - monad-interleave ==0.2.0.1 - monadlist ==0.0.2 - monad-logger ==0.3.40 - - monad-logger-aeson ==0.4.1.2 + - monad-logger-aeson ==0.4.1.3 - monad-logger-json ==0.1.0.0 - monad-logger-logstash ==0.2.0.2 - monad-loops ==0.4.3 @@ -1992,7 +1994,7 @@ default-package-overrides: - mysql ==0.2.1 - mysql-haskell ==1.1.4 - mysql-haskell-nem ==0.1.0.0 - - mysql-json-table ==0.1.3.0 + - mysql-json-table ==0.1.4.0 - mysql-simple ==0.4.9 - n2o ==0.11.1 - n2o-nitro ==0.11.2 @@ -2029,9 +2031,9 @@ default-package-overrides: - network-messagepack-rpc ==0.1.2.0 - network-messagepack-rpc-websocket ==0.1.1.1 - network-multicast ==0.3.2 - - network-run ==0.2.6 + - network-run ==0.2.7 - network-simple ==0.4.5 - - network-transport ==0.5.6 + - network-transport ==0.5.7 - network-uri ==2.6.4.2 - network-wait ==0.2.0.0 - newtype ==0.2.2.0 @@ -2481,7 +2483,7 @@ default-package-overrides: - rp-tree ==0.7.1 - rrb-vector ==0.2.1.0 - RSA ==2.4.1 - - rss ==3000.2.0.7 + - rss ==3000.2.0.8 - rss-conduit ==0.6.0.1 - run-haskell-module ==0.0.2 - runmemo ==1.0.0.1 @@ -2490,7 +2492,7 @@ default-package-overrides: - rzk ==0.7.3 - s3-signer ==0.5.0.0 - safe ==0.3.21 - - safe-coloured-text ==0.2.0.1 + - safe-coloured-text ==0.2.0.2 - safe-coloured-text-gen ==0.0.0.2 - safe-coloured-text-layout ==0.0.0.0 - safe-coloured-text-layout-gen ==0.0.0.0 @@ -2516,7 +2518,7 @@ default-package-overrides: - sandwich-slack ==0.1.2.0 - sandwich-webdriver ==0.2.3.1 - say ==0.1.0.1 - - sbp ==5.0.5 + - sbp ==5.0.7 - sbv ==10.2 - scalpel ==0.6.2.2 - scalpel-core ==0.6.2.2 @@ -2651,8 +2653,8 @@ default-package-overrides: - skein ==1.0.9.4 - skews ==0.1.0.3 - skip-var ==0.1.1.0 - - skylighting ==0.14.1 - - skylighting-core ==0.14.1 + - skylighting ==0.14.1.1 + - skylighting-core ==0.14.1.1 - skylighting-format-ansi ==0.1 - skylighting-format-blaze-html ==0.1.1.2 - skylighting-format-context ==0.1.0.2 @@ -2691,7 +2693,7 @@ default-package-overrides: - Spock-api ==0.14.0.0 - spoon ==0.3.1 - spreadsheet ==0.1.3.10 - - sqids ==0.2.1.0 + - sqids ==0.2.2.0 - sqlite-simple ==0.4.19.0 - sql-words ==0.1.6.5 - squeal-postgresql ==0.9.1.3 @@ -2882,7 +2884,7 @@ default-package-overrides: - test-fun ==0.1.0.0 - testing-feat ==1.1.1.1 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.12.8.6 + - texmath ==0.12.8.7 - text-ansi ==0.3.0.1 - text-binary ==0.2.1.1 - text-builder ==0.6.7.2 @@ -2909,7 +2911,7 @@ default-package-overrides: - tf-random ==0.5 - th-abstraction ==0.5.0.0 - th-bang-compat ==0.0.1.0 - - th-compat ==0.1.4 + - th-compat ==0.1.5 - th-constraint-compat ==0.0.1.0 - th-data-compat ==0.1.3.1 - th-desugar ==1.15 @@ -3064,7 +3066,7 @@ default-package-overrides: - universe-instances-extended ==1.1.3 - universe-reverse-instances ==1.1.1 - universe-some ==1.2.1 - - universum ==1.8.2 + - universum ==1.8.2.1 - unix-bytestring ==0.4.0.1 - unix-compat ==0.7.1 - unix-time ==0.4.12 @@ -3131,7 +3133,7 @@ default-package-overrides: - vector-th-unbox ==0.2.2 - verbosity ==0.4.0.0 - verset ==0.0.1.9 - - versions ==6.0.5 + - versions ==6.0.6 - vformat ==0.14.1.0 - vformat-time ==0.1.0.0 - ViennaRNAParser ==1.3.3 @@ -3161,7 +3163,7 @@ default-package-overrides: - wai-middleware-caching-lru ==0.1.0.0 - wai-middleware-caching-redis ==0.2.0.0 - wai-middleware-clacks ==0.1.0.1 - - wai-middleware-delegate ==0.1.4.0 + - wai-middleware-delegate ==0.1.4.1 - wai-middleware-metrics ==0.2.4 - wai-middleware-prometheus ==1.0.0.1 - wai-middleware-static ==0.9.2 @@ -3193,7 +3195,7 @@ default-package-overrides: - wide-word ==0.1.6.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - witch ==1.2.0.4 + - witch ==1.2.1.0 - withdependencies ==0.3.0 - witherable ==0.4.2 - within ==0.2.0.1 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 062b1767a7e48..8bec59f4da599 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1331,4 +1331,6 @@ self: super: builtins.intersectAttrs super { # Test failure is related to a GHC implementation detail of primitives and doesn't # cause actual problems in dependent packages, see https://github.com/lehins/pvar/issues/4 pvar = dontCheck super.pvar; + + kmonad = enableSeparateBinOutput super.kmonad; } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index db12ebd8c773b..c80f544d34e96 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -244,10 +244,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "AC-Vector"; - version = "2.3.2"; - sha256 = "04ahf6ldfhvzbml9xd6yplygn8ih7b8zz7cw03hkr053g5kzylay"; - revision = "1"; - editedCabalFile = "05l4sk0lz9iml7282zh9pxqr538s6kjhhl6zrbdwlry21sn14pc0"; + version = "2.4.0"; + sha256 = "03703bj73vwnwhhdgny5ca3fz4kamvhahw6b1vm6ymjc0dd0dmn6"; libraryHaskellDepends = [ base ]; description = "Efficient geometric vectors and transformations"; license = lib.licenses.bsd3; @@ -2611,6 +2609,8 @@ self: { pname = "COrdering"; version = "2.3"; sha256 = "1lkav4wkyrraq1f6kyqfyjrxasgkayg4hmyv8a1gkr4h484b1cx8"; + revision = "1"; + editedCabalFile = "00byh0a7j7gnv8aq67fiairzvwz9csg49s2zqqj9f5pwgpmccn1v"; libraryHaskellDepends = [ base ]; description = "An algebraic data type similar to Prelude Ordering"; license = lib.licenses.bsd3; @@ -2858,17 +2858,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal_3_10_2_1" = callPackage + "Cabal_3_10_3_0" = callPackage ({ mkDerivation, array, base, bytestring, Cabal-syntax, containers , deepseq, directory, filepath, mtl, parsec, pretty, process, text , time, transformers, unix }: mkDerivation { pname = "Cabal"; - version = "3.10.2.1"; - sha256 = "0jgm3q9dl6lrczwcc0mzqfqwxwdnk2m2lr6zkhygn2w982c651w8"; - revision = "1"; - editedCabalFile = "0ckflq94cjh8dqxxf9m9j1k7k38qlmkp5ja9w964c60cghycfz0g"; + version = "3.10.3.0"; + sha256 = "1imjq2zqm967j0lk3kzi4gyp9a35vlym31p7k7vmaxbdc9k7qzyb"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base bytestring Cabal-syntax containers deepseq directory @@ -2939,17 +2937,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal-syntax_3_10_2_0" = callPackage + "Cabal-syntax_3_10_3_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, filepath, mtl, parsec, pretty, text, time , transformers, unix }: mkDerivation { pname = "Cabal-syntax"; - version = "3.10.2.0"; - sha256 = "0j2j4r93rjidrgfjgwfm25l369yq3zklcqvgq4891k9ik98irkvs"; - revision = "1"; - editedCabalFile = "05kwy3nvl9g628bvrihghl3gx248afilp8q5k0jjda332zb5n8xj"; + version = "3.10.3.0"; + sha256 = "04p2ywjw1wfpmp445gm15ya6qkwmqr8aq83pdq6hm680kjma1mkm"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath mtl parsec pretty text time transformers unix @@ -3389,6 +3385,20 @@ self: { broken = true; }) {}; + "ClasshSS" = callPackage + ({ mkDerivation, base, data-default, lens, template-haskell, text + }: + mkDerivation { + pname = "ClasshSS"; + version = "0.1.0.0"; + sha256 = "141wqmfwp3rgf9h1whwzznz0bq82ph5lcxax0f85qfnxbvbsqnyn"; + libraryHaskellDepends = [ + base data-default lens template-haskell text + ]; + description = "Typified Tailwind for Rapid Development"; + license = lib.licenses.mit; + }) {}; + "ClassyPrelude" = callPackage ({ mkDerivation, base, strict }: mkDerivation { @@ -14217,14 +14227,28 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "MicroCabal" = callPackage + ({ mkDerivation, base, directory, process }: + mkDerivation { + pname = "MicroCabal"; + version = "0.1.0.0"; + sha256 = "0bqwk7hy3p6ql14v7c0zw308haaaq6qyr4cajfy7yn8k9s2xql16"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base directory process ]; + description = "A Cabal replacement"; + license = lib.licenses.asl20; + mainProgram = "mcabal"; + }) {}; + "MicroHs" = callPackage ({ mkDerivation, base, containers, deepseq, directory, ghc-prim , haskeline, mtl, pretty, process, time }: mkDerivation { pname = "MicroHs"; - version = "0.9.5.0"; - sha256 = "08pkxmvx0dkcgsy1b8n0lrc0dcjgxfx789wqiiy2cmhnnhqr0vip"; + version = "0.9.8.0"; + sha256 = "1k96nngfn57fb81wxpkksnmvq2nr7davn8wdwix2w2pk5v67m3fw"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -14232,7 +14256,7 @@ self: { base containers deepseq directory ghc-prim haskeline mtl pretty process time ]; - description = "A compiler for a subset of Haskell"; + description = "A compiler for Haskell"; license = lib.licenses.asl20; mainProgram = "mhs"; }) {}; @@ -15296,8 +15320,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit, net-snmp, process }: mkDerivation { pname = "NetSNMP"; - version = "0.3.2.5"; - sha256 = "0gslhzalip3q4shhfnp09p0c004z30a1xphw96kbi441ns8s0dp0"; + version = "0.4.0.0"; + sha256 = "13gbji2rwf6yn00lyi32b6wqbyy5j823fdmv96zpym5508m5cj7h"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ net-snmp ]; testHaskellDepends = [ base bytestring HUnit process ]; @@ -16155,12 +16179,12 @@ self: { }) {}; "OptDir" = callPackage - ({ mkDerivation, base, hashable, syb }: + ({ mkDerivation, base, deepseq, hashable, syb }: mkDerivation { pname = "OptDir"; - version = "0.0.4"; - sha256 = "07l2fagp60ykhsr3dxclkfgg1pxawj2xf0wxrn3dksjdlx0hg5j5"; - libraryHaskellDepends = [ base hashable syb ]; + version = "0.1.0"; + sha256 = "1fbmykdyb6p7qbvf2lzs9wh01zcw7qj8jldcyk7k6z7vaw8sri20"; + libraryHaskellDepends = [ base deepseq hashable syb ]; description = "The OptDir type for representing optimization directions"; license = lib.licenses.bsd3; }) {}; @@ -20148,8 +20172,8 @@ self: { ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }: mkDerivation { pname = "Spintax"; - version = "0.3.6"; - sha256 = "000yprzvq72ia6wfk3hjarb8anx3wfm54rzpv8x7d2zf09pzxk6k"; + version = "0.3.6.1"; + sha256 = "066pks24c4501i86hgll3bygqkgyag7n2src19k0x9gc05p130wr"; libraryHaskellDepends = [ attoparsec base extra mtl mwc-random text ]; @@ -35860,6 +35884,44 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "anitomata" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, QuickCheck, vector }: + mkDerivation { + pname = "anitomata"; + version = "0.1.0.0"; + sha256 = "1gswhhwrjkhy90x23r0lnlyii07vjc85h99b265pm8fzqqgcdyqf"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ base hspec QuickCheck vector ]; + testToolDepends = [ hspec-discover ]; + description = "Composable sprite animation"; + license = lib.licenses.mit; + }) {}; + + "anitomata-aseprite" = callPackage + ({ mkDerivation, aeson, base, directory, file-embed, filepath + , hspec, hspec-discover, hspec-golden, module-munging + , optparse-applicative, template-haskell, temporary, text + }: + mkDerivation { + pname = "anitomata-aseprite"; + version = "0.1.1.0"; + sha256 = "0qskdfj595gwppaj34krsdfmk8vjwzmrig8ajaddni7znag89gl4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base directory filepath module-munging optparse-applicative + text + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base file-embed hspec hspec-golden template-haskell temporary + ]; + testToolDepends = [ hspec-discover ]; + description = "Code gen for Aseprite animations"; + license = lib.licenses.mit; + mainProgram = "aseprite2haskell"; + }) {}; + "anki-tools" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, directory , exceptions, filepath, mtl, scientific, sqlite-simple, text, time @@ -36807,16 +36869,15 @@ self: { "apecs" = callPackage ({ mkDerivation, array, base, containers, criterion, exceptions - , linear, mtl, QuickCheck, template-haskell, vector + , linear, mtl, QuickCheck, template-haskell, unliftio-core, vector }: mkDerivation { pname = "apecs"; - version = "0.9.5"; - sha256 = "1n01kbyxgfk1jyc9adpmb4cglwz6i20i8wp9mg4nxsjpy93hbp1z"; - revision = "1"; - editedCabalFile = "1vpjwmyir3ivqzcalazzp4mczln5s2b23lb3rmaag0p1lrlxjxz0"; + version = "0.9.6"; + sha256 = "1dppc03ck68mhkc95435bgmm0lfz8q3d20yw0nhywrx1x7y83z6d"; libraryHaskellDepends = [ - array base containers exceptions mtl template-haskell vector + array base containers exceptions mtl template-haskell unliftio-core + vector ]; testHaskellDepends = [ base containers linear QuickCheck vector ]; benchmarkHaskellDepends = [ base criterion linear ]; @@ -41572,8 +41633,8 @@ self: { }: mkDerivation { pname = "attoparsec-framer"; - version = "0.1.0.2"; - sha256 = "1vyfm42xvlr86jjjswb7w2xg3rl49nmbm2f644s1chgbxg5121i7"; + version = "0.1.0.3"; + sha256 = "0lwrnka25f5a27ym3w48qdrkv3q62q9rs5r6kpgbr7nckcmb9b03"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44518,8 +44579,8 @@ self: { }: mkDerivation { pname = "bank-holiday-germany"; - version = "1.0.0.1"; - sha256 = "0pxsfk51pqxgd74l46k0sfagkxjmkm4lv1zj37k8kq8a6i01m4rd"; + version = "1.2.0.0"; + sha256 = "17xqwa51rv64k7szvlpix4gm9g65rwjjlcmkn9khpyjis396zx4f"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base doctest hedgehog hspec hspec-hedgehog time @@ -47331,10 +47392,8 @@ self: { }: mkDerivation { pname = "bifunctors"; - version = "5.6.1"; - sha256 = "1z2p9l2c0i6irbhfib5z7089jg8s22jj2jrc3dm525mynmqi8f06"; - revision = "2"; - editedCabalFile = "0ma7m6as59vdmk1ysip0gslrc2sc84van5z1blvzl2wzyvc7xyl2"; + version = "5.6.2"; + sha256 = "0yk9v71xpwnxd6xia1bdr8pxbvrx4am6bjykqp1d1vk1a0lak1hh"; libraryHaskellDepends = [ assoc base comonad containers tagged template-haskell th-abstraction transformers @@ -51757,8 +51816,8 @@ self: { ({ mkDerivation, bluefin-internal }: mkDerivation { pname = "bluefin"; - version = "0.0.1.0"; - sha256 = "0q0i6slarwp6d1ndmyajh3qya7xrslr1z8pds2vxsmz46zsdl3am"; + version = "0.0.3.0"; + sha256 = "1b1050pbxqi0hyz4xkm56v54rp5c0z9sr36swwg07xmkv52g7hil"; libraryHaskellDepends = [ bluefin-internal ]; description = "The Bluefin effect system"; license = lib.licenses.mit; @@ -51770,8 +51829,8 @@ self: { }: mkDerivation { pname = "bluefin-internal"; - version = "0.0.1.0"; - sha256 = "017b9wbxd2m1jc6m0lgfy1j8mmm6n3xgps3ri0z0jxni738qfb4n"; + version = "0.0.3.0"; + sha256 = "1xsb5qxmfaw2bb0jslz2hr04lihxc7r51x8rsqnvdly05a8vxglv"; libraryHaskellDepends = [ base monad-control transformers transformers-base unliftio-core ]; @@ -52946,6 +53005,8 @@ self: { pname = "bound"; version = "2.0.7"; sha256 = "1wqvanfp826s89qr4a1rc9f0ldsj45j1rwy9x6a894vndgrxm8dj"; + revision = "1"; + editedCabalFile = "1f2mb3xwv17daff653fjrwpdc72la5nn55qlzgjcw0a1lnkmgyb2"; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq hashable mmorph profunctors template-haskell th-abstraction transformers @@ -56357,31 +56418,18 @@ self: { license = lib.licenses.bsd3; }) {}; - "bz2" = callPackage - ({ mkDerivation, base, bytestring, bzlib, c2hs, cpphs, criterion - , deepseq, directory, filepath, tasty, tasty-golden, tasty-hunit - , temporary - }: + "bytezap" = callPackage + ({ mkDerivation, base, bytestring, primitive, text }: mkDerivation { - pname = "bz2"; - version = "1.0.1.0"; - sha256 = "1kskfgdfjpg2nn807298m605lc7jafnsi1phz3bp6jds48zwrfhq"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base bytestring ]; - libraryToolDepends = [ c2hs ]; - testHaskellDepends = [ - base bytestring deepseq directory filepath tasty tasty-golden - tasty-hunit - ]; - benchmarkHaskellDepends = [ - base bytestring bzlib criterion filepath temporary - ]; - benchmarkToolDepends = [ cpphs ]; - description = "Bindings to libbz2"; - license = lib.licenses.bsd3; + pname = "bytezap"; + version = "1.0.0"; + sha256 = "198nvi6dk8s6mb24z31xaz6yqfaiyrgwm1bhmjak4sbgpp3jika5"; + libraryHaskellDepends = [ base bytestring primitive text ]; + description = "Bytestring builder with zero intermediate allocation"; + license = lib.licenses.mit; }) {}; - "bz2_1_0_1_1" = callPackage + "bz2" = callPackage ({ mkDerivation, base, bytestring, bzip2-clib, bzlib, c2hs, cpphs , criterion, deepseq, directory, filepath, tasty, tasty-golden , tasty-hunit, temporary @@ -56403,7 +56451,6 @@ self: { benchmarkToolDepends = [ cpphs ]; description = "Bindings to libbz2"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bzip-signature" = callPackage @@ -56431,20 +56478,6 @@ self: { }) {}; "bzlib" = callPackage - ({ mkDerivation, base, bytestring, bzip2 }: - mkDerivation { - pname = "bzlib"; - version = "0.5.1.0"; - sha256 = "1n599xwyxghf52kam30k1l2qh8cg91h55c2bgchnqyj103hb7nfy"; - revision = "2"; - editedCabalFile = "0v2ffgv20xq8q85z96qic13pqq13ipjxl0bn9wkzxlcd0axa0zhr"; - libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ bzip2 ]; - description = "Compression and decompression in the bzip2 format"; - license = lib.licenses.bsd3; - }) {inherit (pkgs) bzip2;}; - - "bzlib_0_5_2_0" = callPackage ({ mkDerivation, base, bytestring, bzip2, QuickCheck, tasty , tasty-hunit, tasty-quickcheck }: @@ -56459,7 +56492,6 @@ self: { ]; description = "Compression and decompression in the bzip2 format"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) bzip2;}; "bzlib-conduit" = callPackage @@ -56468,32 +56500,6 @@ self: { }: mkDerivation { pname = "bzlib-conduit"; - version = "0.3.0.2"; - sha256 = "0a21zin5plsl37hkxh2jv8cxwyjrbs2fy7n5cyrzgdaa7lmp6b7b"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bindings-DSL bytestring conduit data-default-class mtl - resourcet - ]; - librarySystemDepends = [ bzip2 ]; - testHaskellDepends = [ - base bindings-DSL bytestring conduit data-default-class hspec mtl - random resourcet - ]; - benchmarkHaskellDepends = [ - base bindings-DSL bytestring conduit data-default-class mtl - resourcet - ]; - description = "Streaming compression/decompression via conduits"; - license = lib.licenses.bsd3; - }) {inherit (pkgs) bzip2;}; - - "bzlib-conduit_0_3_0_3" = callPackage - ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit - , data-default-class, hspec, mtl, random, resourcet - }: - mkDerivation { - pname = "bzlib-conduit"; version = "0.3.0.3"; sha256 = "0v7dvdwh9f7sic7b2m6lzz1brpa7r1k8ab7pml20fqq6vkmfm5l1"; enableSeparateDataOutput = true; @@ -56512,7 +56518,6 @@ self: { ]; description = "Streaming compression/decompression via conduits"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) bzip2;}; "bzlib-conduit-jappie" = callPackage @@ -57520,32 +57525,31 @@ self: { }) {}; "cabal-install" = callPackage - ({ mkDerivation, array, async, base, base16-bytestring - , base64-bytestring, binary, bytestring, Cabal, Cabal-described - , cabal-install-solver, Cabal-QuickCheck, Cabal-syntax - , Cabal-tree-diff, containers, cryptohash-sha256, directory, echo - , edit-distance, exceptions, filepath, hackage-security, hashable - , HTTP, lukko, mtl, network-uri, parsec, pretty, pretty-show - , process, QuickCheck, random, regex-base, regex-posix, resolv - , safe-exceptions, stm, tagged, tar, tasty, tasty-expected-failure - , tasty-golden, tasty-hunit, tasty-quickcheck, text, time - , tree-diff, unix, zlib + ({ mkDerivation, array, async, base, base16-bytestring, binary + , bytestring, Cabal, Cabal-described, cabal-install-solver + , Cabal-QuickCheck, Cabal-syntax, Cabal-tree-diff, containers + , cryptohash-sha256, directory, echo, edit-distance, exceptions + , filepath, hackage-security, hashable, HTTP, lukko, mtl + , network-uri, parsec, pretty, pretty-show, process, QuickCheck + , random, regex-base, regex-posix, resolv, safe-exceptions, stm + , tagged, tar, tasty, tasty-expected-failure, tasty-golden + , tasty-hunit, tasty-quickcheck, text, time, tree-diff, unix, zlib }: mkDerivation { pname = "cabal-install"; - version = "3.10.2.1"; - sha256 = "0i42ky2p12cnrsx9fljfbcgdri3xbpzgj0xg4prdfh1dyz2j0dnm"; + version = "3.10.3.0"; + sha256 = "17nslfzhp9nplk5x0i3g6j1mkxpcg89ki2xf0vh93k9hrzq0drx8"; revision = "1"; - editedCabalFile = "0aqwymsgsa02m71zi98wsn771l8fixhpn6akicvnygplzqdg065i"; + editedCabalFile = "1w3i7rss9q7kyiy0rhxn88w7blx1v19mqkfm0pbdwg9bv0qbv96k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array async base base16-bytestring base64-bytestring binary - bytestring Cabal cabal-install-solver Cabal-syntax containers - cryptohash-sha256 directory echo edit-distance exceptions filepath - hackage-security hashable HTTP lukko mtl network-uri parsec pretty - process random regex-base regex-posix resolv safe-exceptions stm - tar text time unix zlib + array async base base16-bytestring binary bytestring Cabal + cabal-install-solver Cabal-syntax containers cryptohash-sha256 + directory echo edit-distance exceptions filepath hackage-security + hashable HTTP lukko mtl network-uri parsec pretty process random + regex-base regex-posix resolv safe-exceptions stm tar text time + unix zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -57684,6 +57688,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "cabal-install-solver_3_10_3_0" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal, Cabal-syntax + , containers, edit-distance, filepath, mtl, pretty, tasty + , tasty-hunit, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "cabal-install-solver"; + version = "3.10.3.0"; + sha256 = "0zi3pygxiwmzv4h5vfshnbak4r3hz4fragc961xcaq0s8qz4kr71"; + revision = "1"; + editedCabalFile = "1kdh9l8cwvpllsxm1jwzabsg78nsk3r9s2d2g4vn7rxmbffzmbbm"; + libraryHaskellDepends = [ + array base bytestring Cabal Cabal-syntax containers edit-distance + filepath mtl pretty text transformers + ]; + testHaskellDepends = [ + base Cabal Cabal-syntax tasty tasty-hunit tasty-quickcheck + ]; + description = "The command-line interface for Cabal and Hackage"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "cabal-lenses" = callPackage ({ mkDerivation, base, Cabal, lens, strict, system-fileio , system-filepath, text, transformers, unordered-containers @@ -57911,6 +57938,30 @@ self: { mainProgram = "cabal-rpm"; }) {}; + "cabal-rpm_2_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, cached-json-file + , directory, extra, filepath, http-client, http-client-tls + , http-conduit, http-query, optparse-applicative, process + , simple-cabal, simple-cmd, simple-cmd-args, text, time, unix + }: + mkDerivation { + pname = "cabal-rpm"; + version = "2.2.0"; + sha256 = "1lrcqgbl3l6if9sa5qylm87yssl5gsinnidzx19q6z2nm5wbnyh7"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring Cabal cached-json-file directory extra + filepath http-client http-client-tls http-conduit http-query + optparse-applicative process simple-cabal simple-cmd + simple-cmd-args text time unix + ]; + description = "RPM packaging tool for Haskell Cabal-based packages"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "cabal-rpm"; + }) {}; + "cabal-scripts" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -58264,8 +58315,8 @@ self: { }: mkDerivation { pname = "cabal2spec"; - version = "2.7.0"; - sha256 = "0m84jffwqk8sav5rj8s17p72ddp5y0nnw2x2365ds7p5qbyyni43"; + version = "2.7.1"; + sha256 = "0w1f7ga7nz4112x9k4g75nxpcwvcdfif0bfzk3fg8bghzijf12bd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal filepath time ]; @@ -58984,8 +59035,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.10.0.0"; - sha256 = "1g4wf788xhqqsyg69ish0za5jzfvjmy86npaj59pbpf37y6k4zkh"; + version = "0.11.0.0"; + sha256 = "18q9an47zk5j9ank36fws908iqdm9k1v44sy0348qpsaviyw2wlw"; libraryHaskellDepends = [ aeson aeson-optics async base bytestring calamity-commands colour concurrent-extra containers crypton-connection crypton-x509-system @@ -59008,8 +59059,8 @@ self: { }: mkDerivation { pname = "calamity-commands"; - version = "0.4.0.0"; - sha256 = "10zfq0dnf5yy1dbi0s08c67svm8rln43wnas6mxid9kcql2cmgfb"; + version = "0.4.1.0"; + sha256 = "1wmhzk0d1p99saj9nsc23ns2n126nn8zhfrqhmbwzgymz3x2k4g6"; libraryHaskellDepends = [ base megaparsec optics polysemy polysemy-plugin text text-show unordered-containers @@ -60933,8 +60984,6 @@ self: { testHaskellDepends = [ base bytestring primitive text ]; description = "Portable CRC-32C"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "caster" = callPackage @@ -61158,8 +61207,8 @@ self: { }: mkDerivation { pname = "cattrap"; - version = "0.5.0.0"; - sha256 = "07nkmqq977afj4xjmvij6pcickqfiqrjicmrmdqy1v1x1pjn1ry3"; + version = "0.6.0.0"; + sha256 = "190867anzps2yrdiyxzx96n43zz0ww6a2wlvncgnwcg7khfzap1a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64856,6 +64905,8 @@ self: { pname = "clash-ghc"; version = "1.8.1"; sha256 = "1xjf3z043sn7r35pkbpyxl4agyl2hz3mj7iikridxsddjqrmr5y4"; + revision = "1"; + editedCabalFile = "19pknfpjzp8bazxqdrdbbrz4dcrzrryps063x0ga7zfiw25xrjg0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64892,6 +64943,8 @@ self: { pname = "clash-lib"; version = "1.8.1"; sha256 = "1s31d0pdzm5zk62gz4g1xp2yalyal2gk3n46y2rwpxl440mchyy5"; + revision = "1"; + editedCabalFile = "02iy7jxsixgzl8kpjvpz2zc5aiy9ran9lgmslyadw8wvw9x9l7ri"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -64977,6 +65030,8 @@ self: { pname = "clash-prelude"; version = "1.8.1"; sha256 = "13y43lsw55jpmr04x6yrrppma9qdqzlvrwbs4jkvc3g7jmydnb3y"; + revision = "1"; + editedCabalFile = "0jxlb59ln47gzwmrwl777rr0mcrlhg964l2q454qvbhfvv15iny0"; libraryHaskellDepends = [ array arrows base binary bytestring constraints containers data-binary-ieee754 data-default-class deepseq extra ghc-bignum @@ -69248,28 +69303,6 @@ self: { }: mkDerivation { pname = "commonmark"; - version = "0.2.5.1"; - sha256 = "0j6534by7k7qy5bz89zwh718n4v1rb5b9593mslip1my0z7jkmnd"; - libraryHaskellDepends = [ - base bytestring containers parsec text transformers unicode-data - unicode-transforms - ]; - testHaskellDepends = [ - base parsec tasty tasty-hunit tasty-quickcheck text - unicode-transforms - ]; - benchmarkHaskellDepends = [ base tasty-bench text ]; - description = "Pure Haskell commonmark parser"; - license = lib.licenses.bsd3; - }) {}; - - "commonmark_0_2_6" = callPackage - ({ mkDerivation, base, bytestring, containers, parsec, tasty - , tasty-bench, tasty-hunit, tasty-quickcheck, text, transformers - , unicode-data, unicode-transforms - }: - mkDerivation { - pname = "commonmark"; version = "0.2.6"; sha256 = "0k0wkvlqbcv7iml9pa56pic4z417qydck22r4kbw51zixkj6rrp7"; libraryHaskellDepends = [ @@ -69283,7 +69316,6 @@ self: { benchmarkHaskellDepends = [ base tasty-bench text ]; description = "Pure Haskell commonmark parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "commonmark-cli" = callPackage @@ -69314,27 +69346,6 @@ self: { }: mkDerivation { pname = "commonmark-extensions"; - version = "0.2.5.3"; - sha256 = "1xsd2v0d87xq4w76smbsixkjavg8ykrkmisjm4xiklbpc3l9nb54"; - libraryHaskellDepends = [ - base commonmark containers emojis filepath network-uri parsec text - transformers - ]; - testHaskellDepends = [ - base commonmark parsec tasty tasty-hunit text - ]; - benchmarkHaskellDepends = [ base commonmark tasty-bench text ]; - description = "Pure Haskell commonmark parser"; - license = lib.licenses.bsd3; - }) {}; - - "commonmark-extensions_0_2_5_4" = callPackage - ({ mkDerivation, base, commonmark, containers, emojis, filepath - , network-uri, parsec, tasty, tasty-bench, tasty-hunit, text - , transformers - }: - mkDerivation { - pname = "commonmark-extensions"; version = "0.2.5.4"; sha256 = "0249j6yn4y6w2n81ph2ydpqqkbx8y7zba96j50a26jx9l62f1yim"; libraryHaskellDepends = [ @@ -69347,7 +69358,6 @@ self: { benchmarkHaskellDepends = [ base commonmark tasty-bench text ]; description = "Pure Haskell commonmark parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "commonmark-pandoc" = callPackage @@ -72363,6 +72373,8 @@ self: { pname = "config-ini"; version = "0.2.7.0"; sha256 = "00b9b590566hrxrjn31jkq70768dnrzzsjrasrnhdvd6p92iq5rs"; + revision = "1"; + editedCabalFile = "1cjpz7q0lsxac1r011ik34fcsi4lsy634ayxyblzyszigvks7r9a"; libraryHaskellDepends = [ base containers megaparsec text transformers unordered-containers ]; @@ -73517,21 +73529,6 @@ self: { }: mkDerivation { pname = "context"; - version = "0.2.0.3"; - sha256 = "0hgpnv3bbyhksb8klb5cxalgj8p52az7gk3zpim85x9fymsplwp0"; - libraryHaskellDepends = [ base containers exceptions ]; - testHaskellDepends = [ async base ghc-prim hspec ]; - testToolDepends = [ hspec-discover ]; - description = "Thread-indexed, nested contexts"; - license = lib.licenses.mit; - }) {}; - - "context_0_2_1_0" = callPackage - ({ mkDerivation, async, base, containers, exceptions, ghc-prim - , hspec, hspec-discover - }: - mkDerivation { - pname = "context"; version = "0.2.1.0"; sha256 = "1z10rhy9l2rssvh65bdb4bg4qfsgxa5mkjyhx86l8dksp8kd6cjm"; libraryHaskellDepends = [ base containers exceptions ]; @@ -73539,7 +73536,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Thread-indexed, nested contexts"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "context-free-art" = callPackage @@ -73876,13 +73872,13 @@ self: { }) {}; "control-block" = callPackage - ({ mkDerivation, base, containers, indexed-traversable }: + ({ mkDerivation, base, indexed-traversable, witherable }: mkDerivation { pname = "control-block"; - version = "0.0.0"; - sha256 = "01bqs1bbpizmyz8ma615whjxppf1804ar98kdm4k1mij6if5znh7"; - libraryHaskellDepends = [ base containers indexed-traversable ]; - description = "Higher-order functions with their function arguments at the end"; + version = "0.0.1"; + sha256 = "06l9s8inrdqp9z4zsd178rk3211zmhx4acwxq1py801lpb7vgn8v"; + libraryHaskellDepends = [ base indexed-traversable witherable ]; + description = "Higher-order functions with their function arguments at the end, for channeling the full power of BlockArguments and LambdaCase"; license = lib.licenses.bsd2; }) {}; @@ -78933,7 +78929,6 @@ self: { description = "Currencies representation, pretty printing and conversion"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "currency" = callPackage @@ -79944,7 +79939,7 @@ self: { , http-types, HUnit, leancheck, memory, mmap, monad-control, mtl , network, network-uri, old-time, parsec, process, QuickCheck , quickcheck-instances, regex-applicative, regex-base, regex-tdfa - , stm, strict-identity, system-fileio, system-filepath, tar + , safe, stm, strict-identity, system-fileio, system-filepath, tar , temporary, terminal-size, terminfo, test-framework , test-framework-hunit, test-framework-leancheck , test-framework-quickcheck2, text, time, tls, transformers @@ -79953,8 +79948,8 @@ self: { }: mkDerivation { pname = "darcs"; - version = "2.18.1"; - sha256 = "10f9yy8rkn1vnkyn9kpxs7hvb99lwa8l6skgph95x51zrmiymm62"; + version = "2.18.2"; + sha256 = "11ikl5fx7xkr0zb4kam1hr8kcziz9dg00hqj0ygcpv321a552rg6"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; @@ -79964,15 +79959,15 @@ self: { conduit constraints containers cryptonite data-ordlist directory exceptions fgl filepath hashable haskeline html http-conduit http-types memory mmap mtl network network-uri old-time parsec - process regex-applicative regex-base regex-tdfa stm strict-identity - tar temporary terminal-size terminfo text time tls transformers - unix unix-compat utf8-string vector zip-archive zlib + process regex-applicative regex-base regex-tdfa safe stm + strict-identity tar temporary terminal-size terminfo text time tls + transformers unix unix-compat utf8-string vector zip-archive zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ array async base bytestring cmdargs constraints containers directory exceptions filepath FindBin HUnit leancheck monad-control - mtl process QuickCheck quickcheck-instances system-fileio + mtl process QuickCheck quickcheck-instances safe system-fileio system-filepath test-framework test-framework-hunit test-framework-leancheck test-framework-quickcheck2 text time transformers transformers-base unix-compat vector zip-archive @@ -80360,6 +80355,8 @@ self: { pname = "data-accessor"; version = "0.2.3.1"; sha256 = "14ap1lxizxkgphl4kg8lr3ny9lblx1k6hm8i9nm7l43yla8cg8q6"; + revision = "1"; + editedCabalFile = "1v16s3d1kwlx9vzf6agacr2rfamnhyl7fgd81arznka51v3my2fs"; libraryHaskellDepends = [ array base containers transformers ]; description = "Utilities for accessing and manipulating fields of records"; license = lib.licenses.bsd3; @@ -82698,8 +82695,8 @@ self: { }: mkDerivation { pname = "dates"; - version = "0.2.3.2"; - sha256 = "15x7nyzdzqqknxff4v08hij1gp8p1prwpzpl6ayva548xq70jz39"; + version = "0.2.3.3"; + sha256 = "1qzvms0cvrdhwwhvcd0657qbfkbj28g4l77vwqlj7sy603anishf"; libraryHaskellDepends = [ base base-unicode-symbols parsec syb template-haskell time ]; @@ -83061,6 +83058,20 @@ self: { license = lib.licenses.asl20; }) {}; + "dbus-app-launcher" = callPackage + ({ mkDerivation, base, containers, dbus, extra, unix }: + mkDerivation { + pname = "dbus-app-launcher"; + version = "0.1.0.0"; + sha256 = "142l60kz6qx9k88jdg94icfq3aa8g160d4q9g8hrvpr0360gq2dv"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base containers dbus extra unix ]; + description = "Simple app launcher for D-Bus"; + license = lib.licenses.mit; + mainProgram = "dbus-app-launcher"; + }) {}; + "dbus-client" = callPackage ({ mkDerivation, base, containers, dbus-core, monads-tf, text , transformers @@ -85534,10 +85545,8 @@ self: { }: mkDerivation { pname = "deriving-compat"; - version = "0.6.5"; - sha256 = "1wrjapgp6sy2h8jql05ryyzmiadlkfy5qw1brka466j6ag7jwha7"; - revision = "1"; - editedCabalFile = "093kv76593jr1af12c5idqr97mbkf9vs93zbhrw7kcqwiydpsi91"; + version = "0.6.6"; + sha256 = "1fan8wfd54lkf40gjqwrcfrbigmhhdqlgsl5p93w8p2007yr7zk1"; libraryHaskellDepends = [ base containers ghc-boot-th ghc-prim template-haskell th-abstraction transformers transformers-compat @@ -88669,8 +88678,8 @@ self: { pname = "directory"; version = "1.3.7.1"; sha256 = "1z8frwbr0kdk47x3xasq7ifzcrwl7ryh1aqgf202xv4cakb8a9yw"; - revision = "1"; - editedCabalFile = "1ibdacpflpg4drd1vbrk15lzj5aqdhabncy4v5lvs0xkgw9by5kx"; + revision = "2"; + editedCabalFile = "142wr326wma17cjmdh8z02rwxc76712bky1f46vqr33g1wdsqyxj"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -88684,6 +88693,8 @@ self: { pname = "directory"; version = "1.3.8.3"; sha256 = "1hzn11nairaj1n20znhgnsg43cxl2l1cqb55gixq0bkkkj2ygl6b"; + revision = "1"; + editedCabalFile = "0jx9x76xg38ibfnhrrghnx2vqnrk3myl33ncrhml8jyn32dsqbx0"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -89535,10 +89546,8 @@ self: { }: mkDerivation { pname = "distributed-process"; - version = "0.7.4"; - sha256 = "01ck0vhy8rrilyph6ijpxdmh9jijfbx2ri7k2hmacbblwj4bzafq"; - revision = "1"; - editedCabalFile = "02b499kz94v9ls6l95q9wxh0f56nzfyq7rslq3jf6xp94ydcnhwy"; + version = "0.7.5"; + sha256 = "1si3s8540nyybsyzbh6qa96aanvd8qf70b9lgcg78jn4a1fww7c9"; libraryHaskellDepends = [ base binary bytestring containers data-accessor deepseq distributed-static exceptions hashable mtl network-transport random @@ -89562,8 +89571,8 @@ self: { }: mkDerivation { pname = "distributed-process-async"; - version = "0.2.6"; - sha256 = "0d10na24a7w1rd1qkq62xq01fkywm457421lp0frhs5p5c1kb7aw"; + version = "0.2.7"; + sha256 = "138gjlsw5r6nsm609kq25wg1nxad34ag9ysa4m0f5rbf8fb0mmm6"; libraryHaskellDepends = [ base binary containers data-accessor deepseq distributed-process exceptions fingertree hashable mtl stm time transformers @@ -89880,21 +89889,21 @@ self: { "distributed-process-simplelocalnet" = callPackage ({ mkDerivation, base, binary, bytestring, containers - , data-accessor, distributed-process, network, network-multicast - , network-transport, network-transport-tcp, transformers + , data-accessor, distributed-process, exceptions, network + , network-multicast, network-transport, network-transport-tcp + , tasty, tasty-hunit, transformers }: mkDerivation { pname = "distributed-process-simplelocalnet"; - version = "0.2.4"; - sha256 = "0ayz2l48ykbsb7wmyf5cl6anmrrr3bxspbadv7nwa1lg74rqpsif"; - revision = "2"; - editedCabalFile = "1msya8gyk48yngw5znyr68f5ygvmiz6yjyhwkgxzjj56h4zh0jh4"; - isLibrary = true; - isExecutable = true; + version = "0.3.0"; + sha256 = "1y9jxn1f56k5845dynac5hapfgsq66wibw2ypdzsp2lqh4ggs2jz"; libraryHaskellDepends = [ base binary bytestring containers data-accessor distributed-process - network network-multicast network-transport network-transport-tcp - transformers + exceptions network network-multicast network-transport + network-transport-tcp transformers + ]; + testHaskellDepends = [ + base distributed-process tasty tasty-hunit ]; description = "Simple zero-configuration backend for Cloud Haskell"; license = lib.licenses.bsd3; @@ -90049,10 +90058,8 @@ self: { }: mkDerivation { pname = "distributed-static"; - version = "0.3.9"; - sha256 = "1nch2k8dnlf6is2p4skh8vd0qbkgai4r6msfn6r5cr0cqaarb6pf"; - revision = "1"; - editedCabalFile = "09rs5g4y6ac5gnh46p94vavrdw739740b65knc66dv6xgs383rzm"; + version = "0.3.10"; + sha256 = "1nkgs2rw1wk2rfr8xnpgk0ir9dkqv8b4bw78rrn6pmy7mg26mi6r"; libraryHaskellDepends = [ base binary bytestring containers deepseq rank1dynamic ]; @@ -90322,8 +90329,8 @@ self: { }: mkDerivation { pname = "djot"; - version = "0.1.1.2"; - sha256 = "0cb15vaxgkgvz0wnb2hhslbgmvffppq5d5gh2s6qli2i8z8l4pvr"; + version = "0.1.1.3"; + sha256 = "086z91c6pmh1d6mwz6faddc4nb0h8pdynykhflnr6w3lip49bhbh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95563,8 +95570,8 @@ self: { pname = "effectful-th"; version = "1.0.0.1"; sha256 = "19xbvfsglm4gsji303zj4f1nhhl4gls78cdbl4yalxm8c4m8iqsf"; - revision = "4"; - editedCabalFile = "0dawn69x2zf1wm6zj3vkv1s0naq8820nfi191v1ix5z9ai7nq5kz"; + revision = "5"; + editedCabalFile = "0yszw0cczcbjfhq86i48bm9cbqmhq9gc6wajls15n8w9iraiyaaz"; libraryHaskellDepends = [ base containers effectful-core exceptions template-haskell th-abstraction @@ -96030,6 +96037,17 @@ self: { license = lib.licenses.asl20; }) {}; + "either-semigroup" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "either-semigroup"; + version = "0.0.0"; + sha256 = "0llfkcq1j7l09vhn38s1asin90ki2xzkpr9xxqpvx0jvpdppza7i"; + libraryHaskellDepends = [ base ]; + description = "Either with a stricter Semigroup instance"; + license = lib.licenses.bsd2; + }) {}; + "either-unwrap" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -96531,6 +96549,8 @@ self: { pname = "eliminators"; version = "0.9.4"; sha256 = "1qr02xlmb6nfd505z0iw7bj7kpha8wyvcr31rm92r1a78pwvysaf"; + revision = "1"; + editedCabalFile = "1rd0qixjgsm5dk9r8dmdk31i0dvsd57mg212k2c0pxh553lggq1q"; libraryHaskellDepends = [ base extra singleton-nats singletons-base template-haskell text th-abstraction th-desugar @@ -98548,6 +98568,27 @@ self: { maintainers = [ lib.maintainers.sternenseemann ]; }) {}; + "envy_2_1_3_0" = callPackage + ({ mkDerivation, base, bytestring, containers, hspec, mtl + , QuickCheck, quickcheck-instances, text, time, transformers + }: + mkDerivation { + pname = "envy"; + version = "2.1.3.0"; + sha256 = "088nha6hcd4knqxyqb2v7d3px7nqcqg2qm2gd1qrws21dcc6lkbl"; + libraryHaskellDepends = [ + base bytestring containers mtl text time transformers + ]; + testHaskellDepends = [ + base bytestring hspec mtl QuickCheck quickcheck-instances text time + transformers + ]; + description = "An environmentally friendly way to deal with environment variables"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sternenseemann ]; + }) {}; + "envy-extensible" = callPackage ({ mkDerivation, base, doctest, envy, extensible, hspec , hspec-discover, main-tester, QuickCheck @@ -98568,36 +98609,41 @@ self: { }) {}; "eo-phi-normalizer" = callPackage - ({ mkDerivation, aeson, alex, array, base, BNFC, Cabal, directory - , filepath, generic-lens, happy, hspec, hspec-discover, lens, mtl - , optparse-generic, process, string-interpolate, yaml + ({ mkDerivation, aeson, aeson-pretty, alex, array, base, blaze-html + , blaze-markup, BNFC, Cabal, directory, file-embed, filepath + , generic-lens, happy, hspec, hspec-discover, lens, mtl + , optparse-applicative, process, QuickCheck, scientific + , string-interpolate, template-haskell, text, yaml }: mkDerivation { pname = "eo-phi-normalizer"; - version = "0.2.0"; - sha256 = "1xm0hv28zf9c2izvljky2lc60m4yv74lz0mz6mqrf5rr9rql18s5"; + version = "0.3.0"; + sha256 = "00shchphrpr8gasd5vypwk512mdpk1ff4a10jlk63mc3lz7c553c"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal process ]; libraryHaskellDepends = [ - aeson array base directory filepath generic-lens lens mtl - string-interpolate yaml + aeson array base blaze-html blaze-markup directory file-embed + filepath generic-lens lens mtl scientific string-interpolate + template-haskell text yaml ]; libraryToolDepends = [ alex BNFC happy ]; executableHaskellDepends = [ - aeson array base directory filepath generic-lens lens mtl - optparse-generic string-interpolate yaml + aeson aeson-pretty array base blaze-html blaze-markup directory + file-embed filepath generic-lens lens mtl optparse-applicative + scientific string-interpolate template-haskell text yaml ]; executableToolDepends = [ alex BNFC happy ]; testHaskellDepends = [ - aeson array base directory filepath generic-lens hspec - hspec-discover lens mtl string-interpolate yaml + aeson array base blaze-html blaze-markup directory file-embed + filepath generic-lens hspec hspec-discover lens mtl QuickCheck + scientific string-interpolate template-haskell text yaml ]; testToolDepends = [ alex BNFC happy hspec-discover ]; description = "Command line normalizer of 𝜑-calculus expressions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - mainProgram = "normalize-phi"; + mainProgram = "normalizer"; broken = true; }) {}; @@ -100769,6 +100815,8 @@ self: { pname = "eventlog2html"; version = "0.11.0"; sha256 = "0yj50j9jijw8is19d2afpgc3dv45ji911rlhbjvcz7x441valqx8"; + revision = "1"; + editedCabalFile = "11zza33mqh34l9rsryzjpr04whx284wjvjbybaz1m83sc8c8blhx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107900,31 +107948,6 @@ self: { }: mkDerivation { pname = "flatparse"; - version = "0.5.0.2"; - sha256 = "06c31xqaq0v8hys7knxxsxmj0py3h0fwkp4kq9dwr88sk65v8ash"; - libraryHaskellDepends = [ - base bytestring containers integer-gmp template-haskell utf8-string - ]; - testHaskellDepends = [ - base bytestring hspec HUnit QuickCheck quickcheck-instances - utf8-string - ]; - benchmarkHaskellDepends = [ - attoparsec base bytestring gauge integer-gmp megaparsec parsec - primitive utf8-string - ]; - description = "High-performance parsing from strict bytestrings"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.raehik ]; - }) {}; - - "flatparse_0_5_1_0" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, gauge - , hspec, HUnit, integer-gmp, megaparsec, parsec, primitive - , QuickCheck, quickcheck-instances, template-haskell, utf8-string - }: - mkDerivation { - pname = "flatparse"; version = "0.5.1.0"; sha256 = "1hczq8x2qmvhxvdn6yb1dcq18ahm917dq0vjvhni6d5d9sa6r2fb"; libraryHaskellDepends = [ @@ -107940,7 +107963,6 @@ self: { ]; description = "High-performance parsing from strict bytestrings"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.raehik ]; }) {}; @@ -110722,38 +110744,39 @@ self: { , aws-xray-client-wai, base, bcp47, Blammo, bugsnag, bytestring , case-insensitive, cassava, conduit, conduit-extra, containers , cookie, datadog, directory, doctest, dotenv, ekg-core, envparse - , errors, exceptions, extra, filepath, Glob, hashable + , errors, exceptions, extra, faktory, filepath, Glob, hashable , hs-opentelemetry-api, hs-opentelemetry-instrumentation-persistent , hs-opentelemetry-instrumentation-wai , hs-opentelemetry-propagator-datadog, hs-opentelemetry-sdk, hspec - , hspec-core, hspec-expectations-lifted, hspec-junit-formatter - , http-client, http-conduit, http-link-header, http-types - , hw-kafka-client, immortal, lens, lens-aeson, memcache - , monad-control, monad-logger-aeson, monad-validate, MonadRandom - , mtl, network-uri, nonempty-containers, openapi3, path-pieces - , persistent, persistent-postgresql, postgresql-simple, primitive - , pureMD5, QuickCheck, resource-pool, resourcet, retry, safe - , scientist, semigroupoids, serialise, template-haskell, text, time + , hspec-core, hspec-expectations-json, hspec-expectations-lifted + , hspec-junit-formatter, http-client, http-conduit + , http-link-header, http-types, hw-kafka-client, immortal, lens + , lens-aeson, memcache, monad-control, monad-logger + , monad-logger-aeson, monad-validate, MonadRandom, mtl, network-uri + , nonempty-containers, openapi3, path-pieces, persistent + , persistent-postgresql, postgresql-simple, primitive, pureMD5 + , QuickCheck, resource-pool, resourcet, retry, safe, scientist + , semigroupoids, serialise, template-haskell, text, time , transformers, transformers-base, typed-process, unliftio , unliftio-core, unordered-containers, vector, wai, wai-extra, yaml - , yesod-core, yesod-test + , yesod-core, yesod-test, zlib }: mkDerivation { pname = "freckle-app"; - version = "1.15.0.1"; - sha256 = "0lgbliiikg25a0sggfj9rdd13pvda5304pkh5cddhqc8ypkr2936"; + version = "1.15.2.0"; + sha256 = "0vgc4awccws31a0dq8l76114l4xmyys03zqa6l56844hr3pcd755"; libraryHaskellDepends = [ aeson annotated-exception autodocodec autodocodec-openapi3 aws-xray-client-persistent aws-xray-client-wai base bcp47 Blammo bugsnag bytestring case-insensitive cassava conduit conduit-extra containers cookie datadog directory doctest dotenv ekg-core - envparse errors exceptions extra filepath Glob hashable + envparse errors exceptions extra faktory filepath Glob hashable hs-opentelemetry-api hs-opentelemetry-instrumentation-persistent hs-opentelemetry-instrumentation-wai hs-opentelemetry-propagator-datadog hs-opentelemetry-sdk hspec hspec-core hspec-expectations-lifted hspec-junit-formatter http-client http-conduit http-link-header http-types - hw-kafka-client immortal lens memcache monad-control + hw-kafka-client immortal lens memcache monad-control monad-logger monad-logger-aeson monad-validate MonadRandom mtl network-uri nonempty-containers openapi3 path-pieces persistent persistent-postgresql postgresql-simple primitive pureMD5 @@ -110765,9 +110788,10 @@ self: { ]; testHaskellDepends = [ aeson base Blammo bugsnag bytestring cassava conduit errors hspec - http-types lens lens-aeson memcache monad-validate - nonempty-containers postgresql-simple QuickCheck text vector wai - wai-extra + hspec-expectations-json hspec-expectations-lifted http-types lens + lens-aeson memcache monad-validate mtl nonempty-containers + postgresql-simple QuickCheck text time unordered-containers vector + wai wai-extra zlib ]; description = "Haskell application toolkit used at Freckle"; license = lib.licenses.mit; @@ -110804,8 +110828,8 @@ self: { pname = "free"; version = "5.2"; sha256 = "12agp68cwwixcwfwnvk2xamg34a2x6ax7s1naxv66chpi5y7z1kj"; - revision = "3"; - editedCabalFile = "0w5yl0kg77nxrizd1d0r3d2f1wqy1wsq4mmpwxk7h7gq34d6rmsd"; + revision = "4"; + editedCabalFile = "0vic3p2viip8gjww8fx19ax6ry7y34h7xclvhzkvmbspjh9d219x"; libraryHaskellDepends = [ base comonad containers distributive exceptions indexed-traversable mtl profunctors semigroupoids template-haskell th-abstraction @@ -110815,6 +110839,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "free-alacarte" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "free-alacarte"; + version = "0.1.0.3"; + sha256 = "1djx7v5n0fc29c4ix6fx51gg2khsy57fd89vknwzqzx3c22skgxm"; + libraryHaskellDepends = [ base ]; + description = "Free monads based on intuitions from the Data types à la Carte"; + license = lib.licenses.gpl3Only; + }) {}; + "free-algebras" = callPackage ({ mkDerivation, base, containers, data-fix, dlist, free, groups , hedgehog, kan-extensions, mtl, transformers @@ -113196,8 +113231,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.25.14"; - sha256 = "10aw0ms4l7ddzdhq2x2q0s7sw4hzpmlam811nrvb92q968bvhmnx"; + version = "0.25.15"; + sha256 = "0v95d883xhaa1ffn78p3p4fx0sbcjb0d2yl51h22n1wzlkqawdmj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113533,25 +113568,6 @@ self: { }: mkDerivation { pname = "fuzzyset"; - version = "0.3.1"; - sha256 = "07i0ygbikr5rdmwp00yrql6xjprzhkqb5jr12w1l56n1xssf71zx"; - libraryHaskellDepends = [ - base mtl text text-metrics transformers unordered-containers vector - ]; - testHaskellDepends = [ - base hspec ieee754 mtl text text-metrics transformers - unordered-containers vector - ]; - description = "Fuzzy set data structure for approximate string matching"; - license = lib.licenses.bsd3; - }) {}; - - "fuzzyset_0_3_2" = callPackage - ({ mkDerivation, base, hspec, ieee754, mtl, text, text-metrics - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "fuzzyset"; version = "0.3.2"; sha256 = "137z8r3i6x2z0nb9yi33ly83c2k1b0b9snm6dqmis4b15z1m4kdq"; libraryHaskellDepends = [ @@ -113563,7 +113579,6 @@ self: { ]; description = "Fuzzy set data structure for approximate string matching"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fuzzytime" = callPackage @@ -113692,32 +113707,35 @@ self: { }) {}; "g2" = callPackage - ({ mkDerivation, array, base, bytestring, Cabal, concurrent-extra - , containers, directory, extra, filepath, ghc, ghc-paths, hashable - , hpc, HTTP, liquid-fixpoint, liquidhaskell, MissingH, mtl, parsec - , process, reducers, regex-base, regex-compat, split, tagged, tasty - , tasty-hunit, template-haskell, temporary-rc, text, time - , unordered-containers + ({ mkDerivation, array, base, bimap, bytestring, Cabal, clock + , concurrent-extra, containers, deferred-folds, directory, extra + , filepath, ghc, ghc-paths, hashable, HTTP, language-sygus + , MissingH, mtl, optparse-applicative, parsec, pretty, process + , random, reducers, regex-base, regex-compat, split, tagged, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, temporary-rc + , text, text-builder, time, unordered-containers }: mkDerivation { pname = "g2"; - version = "0.1.0.1"; - sha256 = "0bknkpnyqmd2sxbbc9634rrd42ay3gp84g4wd6fb7h8zqww0icnq"; + version = "0.2.0.0"; + sha256 = "1d4vd357l7arxd0dwyy97c6cz6x3dqm4camfsp4dpdjry7bc8r9q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base bytestring Cabal concurrent-extra containers directory - extra filepath ghc ghc-paths hashable hpc HTTP liquid-fixpoint - liquidhaskell MissingH mtl parsec process reducers regex-base - regex-compat split template-haskell temporary-rc text time - unordered-containers + array base bimap bytestring Cabal clock concurrent-extra containers + deferred-folds directory extra filepath ghc ghc-paths hashable HTTP + language-sygus MissingH mtl optparse-applicative parsec pretty + process random reducers regex-base regex-compat split + tasty-quickcheck template-haskell temporary-rc text text-builder + time unordered-containers ]; executableHaskellDepends = [ - base containers filepath ghc hpc text time unordered-containers + base containers filepath ghc text unordered-containers ]; testHaskellDepends = [ - base containers filepath ghc ghc-paths hashable hpc tagged tasty - tasty-hunit text time unordered-containers + base containers directory filepath ghc ghc-paths hashable process + tagged tasty tasty-hunit tasty-quickcheck text time + unordered-containers ]; description = "Haskell symbolic execution engine"; license = lib.licenses.bsd3; @@ -113736,6 +113754,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "g3p-hash" = callPackage + ({ mkDerivation, aeson, base, base16, bytestring, containers + , network-byte-order, phkdf, Stream, tasty, tasty-hunit, text + , tuplehash-utils, vector + }: + mkDerivation { + pname = "g3p-hash"; + version = "1.0.0.2"; + sha256 = "09wrrm0pv089fmjq4mglhk03gymv3f61ix6mryq04nrgcn037qrx"; + libraryHaskellDepends = [ + base bytestring network-byte-order phkdf Stream tuplehash-utils + vector + ]; + testHaskellDepends = [ + aeson base base16 bytestring containers Stream tasty tasty-hunit + text vector + ]; + description = "Global Password Prehash Protocol"; + license = lib.licenses.asl20; + }) {}; + "g4ip" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -115156,8 +115195,8 @@ self: { pname = "generic-data"; version = "1.1.0.0"; sha256 = "1jxwkc475v0h1i5g5zyjq0x66fqvixdc99a7m8w3cpxkk56vqb5i"; - revision = "1"; - editedCabalFile = "1njfdpp8rckkibixp89rz8dh4qmz67404gbwq2l0qmfcglzf997p"; + revision = "2"; + editedCabalFile = "187qabhjmymg18i7424s90f7nwx17hlpcr5i53ximwyd9z6i9ify"; libraryHaskellDepends = [ ap-normalize base base-orphans contravariant ghc-boot-th show-combinators @@ -115219,8 +115258,8 @@ self: { pname = "generic-deriving"; version = "1.14.5"; sha256 = "0jcl6cdf3pdg57yhf90rhdscszna0znvwhlffdcq3bnzkc2797za"; - revision = "1"; - editedCabalFile = "1fv2fy6f0wmsxghyn1ywl3zqvdlcv6sd6hqw02pgvhjjzavsysc0"; + revision = "3"; + editedCabalFile = "1cgbxczwkgzm44pqd2i7cfa2ka88mz13l037xa0h74vvrgrpapk4"; libraryHaskellDepends = [ base containers ghc-prim template-haskell th-abstraction ]; @@ -115974,8 +116013,8 @@ self: { ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { pname = "geniplate-mirror"; - version = "0.7.9"; - sha256 = "0dkzma11nd7hc1xsriiq50nxr8h50sh1y562yjsqaganxh2sprsx"; + version = "0.7.10"; + sha256 = "0b0n8vbk3z4p58dvbpgqh9bapkr46nz7flm3z3i9940hwyvghwl2"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "Use Template Haskell to generate Uniplate-like functions"; license = lib.licenses.bsd3; @@ -116886,8 +116925,8 @@ self: { }: mkDerivation { pname = "geoip2"; - version = "0.4.1.1"; - sha256 = "1fnjqsc9pcgs8l9pg28cdm95pvxlyrnykxllwflzyvgzd1idk42z"; + version = "0.4.1.2"; + sha256 = "1gnwylivkxiiafda6yx7qggafknh2p0b4x8ci7lf412rifj0a4pr"; libraryHaskellDepends = [ base bytestring cereal containers iproute lens mmap reinterpret-cast text @@ -119408,8 +119447,8 @@ self: { }: mkDerivation { pname = "ghcitui"; - version = "0.2.0.0"; - sha256 = "17apm7hanm7zc3rr19am4ll5rmhj9ghdlrxzr7l1rkdla7l6x0a5"; + version = "0.3.0.0"; + sha256 = "1b214pl7d6hzw18zgard811lws63k421nq4mzl2qcyh9s67yljbp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119418,7 +119457,7 @@ self: { text-zipper transformers utf8-string vector vty word-wrap ]; executableHaskellDepends = [ base optparse-applicative text ]; - testHaskellDepends = [ base hspec ]; + testHaskellDepends = [ base hspec text ]; doHaddock = false; description = "A Terminal User Interface (TUI) for GHCi"; license = lib.licenses.bsd3; @@ -121370,6 +121409,43 @@ self: { broken = true; }) {}; + "gibberish" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , criterion, deepseq, directory, filepath, hedgehog, hspec + , hspec-discover, hspec-hedgehog, MonadRandom, mtl + , optparse-applicative, random, tasty, tasty-golden, tasty-hedgehog + , tasty-th, text, text-show, transformers + }: + mkDerivation { + pname = "gibberish"; + version = "3.0.0.0"; + sha256 = "1555ad7sijs90cskm95sfk1xwhszr0gc650kzbkmv6cj3586hrgq"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base containers deepseq directory filepath hedgehog + MonadRandom mtl random text text-show transformers + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring containers mtl + optparse-applicative random text text-show transformers + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring containers filepath hedgehog + hspec hspec-hedgehog MonadRandom mtl random tasty tasty-golden + tasty-hedgehog tasty-th text text-show transformers + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + aeson base containers criterion deepseq filepath mtl text text-show + transformers + ]; + doHaddock = false; + description = "Generate easy-to-remember, hard-to-guess passwords"; + license = lib.licenses.mit; + }) {}; + "gibbon" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -127968,8 +128044,8 @@ self: { }: mkDerivation { pname = "graph-rewriting-gl"; - version = "0.7.8"; - sha256 = "0fqfylas4y7993riw9vf2ppazk1wgpzxrd8a0avf5s63s0w29hm7"; + version = "0.7.9"; + sha256 = "1hcl4fm5ds5jcahcmr72qaczpyr0lp7fj8h032cyj2dkdm7h8zmb"; libraryHaskellDepends = [ AC-Vector base base-unicode-symbols containers GLUT graph-rewriting graph-rewriting-layout OpenGL @@ -127982,21 +128058,21 @@ self: { "graph-rewriting-lambdascope" = callPackage ({ mkDerivation, base, base-unicode-symbols, GLUT, graph-rewriting , graph-rewriting-gl, graph-rewriting-layout - , graph-rewriting-strategies, IndentParser, OpenGL, parsec + , graph-rewriting-strategies, indentparser, mtl, OpenGL, parsec }: mkDerivation { pname = "graph-rewriting-lambdascope"; - version = "0.5.10"; - sha256 = "0sz87nsn7ff0k63j54rdxp5v9xl926d47fkfa0jjnmdjg1xz2pn4"; + version = "0.5.11"; + sha256 = "0l11qg1g95crycx4bh91c3p1dsfqgmap5q05mvmzalyyjp7qgylq"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl - graph-rewriting-layout graph-rewriting-strategies IndentParser + graph-rewriting-layout graph-rewriting-strategies indentparser mtl OpenGL parsec ]; - description = "Lambdascope, an optimal evaluator of the lambda calculus, as an interactive graph-rewriting system"; + description = "Lambdascope, an optimal evaluator of the lambda calculus"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "lambdascope"; @@ -128008,8 +128084,8 @@ self: { }: mkDerivation { pname = "graph-rewriting-layout"; - version = "0.5.6"; - sha256 = "0h8inqg673kb6kwvsgl0hi44yil08775rw9l5bq9g8qzldz34z85"; + version = "0.5.8"; + sha256 = "0g3qhjpsi1wq8vfgvvfshm32h1jj1s7yp90nr4i8z72v54xs3x28"; libraryHaskellDepends = [ AC-Vector base base-unicode-symbols graph-rewriting ]; @@ -128024,8 +128100,8 @@ self: { }: mkDerivation { pname = "graph-rewriting-ski"; - version = "0.6.7"; - sha256 = "1ahwm3dlvy9aaara644m4y0s89xgjcgm2hpkc92z2wmdfydc05g6"; + version = "0.6.8"; + sha256 = "0wbibv7wyw217kgas1bx0c8198n96bjvc0j68z56xqrgvqb7yap8"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -128033,7 +128109,7 @@ self: { base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl graph-rewriting-layout OpenGL parsec ]; - description = "Two evalutors of the SKI combinator calculus as interactive graph rewrite systems"; + description = "Two interactive evalutors of the SKI combinator calculus"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -128044,8 +128120,8 @@ self: { }: mkDerivation { pname = "graph-rewriting-strategies"; - version = "0.2.6"; - sha256 = "0paacz014jvxixqscd2nlny7x4vd735qqw0zbxsyxr3qz9jxjll9"; + version = "0.2.9"; + sha256 = "1x0wbdjlr6rk37x7zvs8n6b9zh7gxny6agrflsgpxjpr195lsnp4"; libraryHaskellDepends = [ base base-unicode-symbols containers graph-rewriting ]; @@ -128061,8 +128137,8 @@ self: { }: mkDerivation { pname = "graph-rewriting-trs"; - version = "0.1.9"; - sha256 = "0wygasyj35sa05vvcmkk8ipdla3zms85pvq48jq1rl2gnk79f2jy"; + version = "0.1.10"; + sha256 = "1lyzsnaqv6s42qzs3l5360khx21s3wd1wbnggx62rdzgvqjvwq8h"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -128071,7 +128147,7 @@ self: { graph-rewriting graph-rewriting-gl graph-rewriting-layout OpenGL uu-parsinglib ]; - description = "Evaluate first-order applicative term rewrite systems interactively using graph reduction"; + description = "Interactive evaluation of first-order applicative term rewrite systems"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "trs"; @@ -128079,21 +128155,21 @@ self: { "graph-rewriting-ww" = callPackage ({ mkDerivation, base, base-unicode-symbols, GLUT, graph-rewriting - , graph-rewriting-gl, graph-rewriting-layout, IndentParser, OpenGL - , parsec + , graph-rewriting-gl, graph-rewriting-layout, indentparser, mtl + , OpenGL, parsec }: mkDerivation { pname = "graph-rewriting-ww"; - version = "0.3.7"; - sha256 = "07fjl05w1lidmwh7iz9km3590ggxncq43rmrhzssn49as7basah8"; + version = "0.3.8"; + sha256 = "1bck83282y00954k3kppbspdwrj5zx9r5f9wwfdcrksvzs7qwdi0"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl - graph-rewriting-layout IndentParser OpenGL parsec + graph-rewriting-layout indentparser mtl OpenGL parsec ]; - description = "Evaluator of the lambda-calculus in an interactive graph rewriting system with explicit sharing"; + description = "Interactive evaluator of the lambda-calculus with explicit sharing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "ww"; @@ -132037,6 +132113,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "hackage-security_0_6_2_5" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring + , bytestring, Cabal, Cabal-syntax, containers, cryptohash-sha256 + , directory, ed25519, filepath, ghc-prim, lukko, mtl, network + , network-uri, parsec, pretty, QuickCheck, tar, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, text, time + , transformers, unordered-containers, vector, zlib + }: + mkDerivation { + pname = "hackage-security"; + version = "0.6.2.5"; + sha256 = "1az2bziiw3dlz1bfz2nblklrszr45l7rdmnxkvj37pilchihkj45"; + libraryHaskellDepends = [ + base base16-bytestring base64-bytestring bytestring Cabal + Cabal-syntax containers cryptohash-sha256 directory ed25519 + filepath ghc-prim lukko mtl network network-uri parsec pretty tar + template-haskell time transformers zlib + ]; + testHaskellDepends = [ + aeson base bytestring Cabal Cabal-syntax containers network-uri + QuickCheck tar tasty tasty-hunit tasty-quickcheck temporary text + time unordered-containers vector zlib + ]; + description = "Hackage security library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hackage-security-HTTP" = callPackage ({ mkDerivation, base, bytestring, hackage-security, HTTP, mtl , network, network-uri, zlib @@ -133084,8 +133188,8 @@ self: { pname = "hakyll"; version = "4.16.2.0"; sha256 = "1p3x9f1ha6dkis71nzbxh1h7mzldsj4qvmfx3f0vng7y1ydlcw0z"; - revision = "4"; - editedCabalFile = "1sr6m8ip139vrcs6nn9vd43lbgdswlzdjkphn65xgkjpx5f726yi"; + revision = "5"; + editedCabalFile = "01ny9jsz0drdh497pvhlnwxn946db8a1qc1fxy96l3pjc6plvxcb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -133300,8 +133404,8 @@ self: { pname = "hakyll-convert"; version = "0.3.0.4"; sha256 = "09fqr05mvs0qs53psq97kn1s4axinwn1vr5d6af4sqj3zc5k6k39"; - revision = "7"; - editedCabalFile = "0wlrihvpjfl3krncavzgl6znb8lsarp2684r48vhy6wrjx4g1h5n"; + revision = "8"; + editedCabalFile = "1fwjxmdfq4wlwi77pmvvfydi0si8cbv4ygdrkbanl4d90scr2rn0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139465,6 +139569,8 @@ self: { pname = "haskey"; version = "0.3.1.0"; sha256 = "06q5gwjpgrgjq07iz7368yfghsfc2im1gbwqqixb1lqbiz7q6dbs"; + revision = "1"; + editedCabalFile = "06jf673gay6syb11gxbl8y4c0v9p3nmbn4cnr5982wjh47app5nd"; libraryHaskellDepends = [ base binary bytestring containers directory exceptions filepath focus hashable haskey-btree list-t lz4 mtl semigroups stm @@ -139491,6 +139597,8 @@ self: { pname = "haskey-btree"; version = "0.3.0.1"; sha256 = "11zkj4a5j2f7g9kann4f0ab27aq30v6yn8cyn9hn7mhc3gslrx9m"; + revision = "1"; + editedCabalFile = "01l8m3hx582ayv8riaxiqswv2dqnirdsxwg7i3mpcjlji56y8sgj"; libraryHaskellDepends = [ base binary bytestring containers hashable mtl semigroups text transformers vector @@ -139908,8 +140016,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "1.3.0"; - sha256 = "0dijl0an25174ia9pirl1i73ynv124cyz05ly8lyw77bzcb95l45"; + version = "1.4.0"; + sha256 = "0fvy3n2dc54vssrz1mm6acv1nsnmwbmx6kgi14pkqll3fx9i6m4g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139975,7 +140083,7 @@ self: { license = lib.licenses.mit; }) {}; - "haskoin-store-data_1_3_0" = callPackage + "haskoin-store-data_1_4_0" = callPackage ({ mkDerivation, aeson, base, binary, bytes, bytestring, cereal , containers, data-default, deepseq, hashable, haskoin-core, hspec , hspec-discover, http-client, http-types, lens, mtl, network @@ -139984,8 +140092,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "1.3.0"; - sha256 = "1bnkl58r96vf9fhxby5p15icp8g2yjv4jgds8s07sqv281f7vcmk"; + version = "1.4.0"; + sha256 = "00az0j07f9xj9af502i7b6zkmz43f9c45z80y1znhlvf66as25vi"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -140869,8 +140977,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "1.6.4.1"; - sha256 = "1qdgwwx6pm8r2mq30nagnap01aqdn5rr4p2jizbkz85nfrf46jxc"; + version = "1.6.4.3"; + sha256 = "1qy50xnpbikvqqv82wqy9491fgvnl8721xszvjyfhw4r7bf0gn3n"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-strict-builder contravariant dlist hashable hashtables mtl network-ip @@ -140973,8 +141081,8 @@ self: { }: mkDerivation { pname = "hasql-dynamic-statements"; - version = "0.3.1.4"; - sha256 = "06xpp8w35saf1krv4hxzln9xw23qpqb48f14qmhbanpcni2bqi8x"; + version = "0.3.1.5"; + sha256 = "1h7c3r5vw6hndw9pi64609px2gq23g2d4hz5cgdb5ip36d7dck6p"; libraryHaskellDepends = [ base bytestring containers hasql hasql-implicits ptr ]; @@ -141127,26 +141235,6 @@ self: { }: mkDerivation { pname = "hasql-notifications"; - version = "0.2.0.6"; - sha256 = "0ykwvmfhv3x4a6b58crxp1akndz9n7rkr4wbbl6dnikc7rzggh8j"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring hasql hasql-pool postgresql-libpq text - ]; - executableHaskellDepends = [ base hasql ]; - testHaskellDepends = [ base bytestring hasql hspec QuickCheck ]; - description = "LISTEN/NOTIFY support for Hasql"; - license = lib.licenses.bsd3; - mainProgram = "hasql-notifications"; - }) {}; - - "hasql-notifications_0_2_1_0" = callPackage - ({ mkDerivation, base, bytestring, hasql, hasql-pool, hspec - , postgresql-libpq, QuickCheck, text - }: - mkDerivation { - pname = "hasql-notifications"; version = "0.2.1.0"; sha256 = "0f415g6y13sndyn66ssj0hfrqm6l5p1r48v2lix0cvi1gkrv9wm2"; isLibrary = true; @@ -141158,7 +141246,6 @@ self: { testHaskellDepends = [ base bytestring hasql hspec QuickCheck ]; description = "LISTEN/NOTIFY support for Hasql"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hasql-notifications"; }) {}; @@ -141531,8 +141618,8 @@ self: { }: mkDerivation { pname = "hasql-transaction-io"; - version = "0.2.3.0"; - sha256 = "1wz4sjrnivq9jbgg9q6wgxmknvflnkdvrdrxdrxwmvmvi2g1qybp"; + version = "0.2.7.0"; + sha256 = "1z7xi1akm4cd2gzgmihv62mza253n4qxfbvcgd7117zb8mvyn6mz"; libraryHaskellDepends = [ base bytestring bytestring-tree-builder exceptions hasql mtl resourcet safe-exceptions transformers unliftio-core @@ -144587,18 +144674,18 @@ self: { }) {}; "helf" = callPackage - ({ mkDerivation, alex, array, base, containers, happy, mtl, pretty - , QuickCheck, transformers + ({ mkDerivation, alex, array, base, bytestring, containers, happy + , mtl, pretty, text, transformers }: mkDerivation { pname = "helf"; - version = "0.2022.5.30"; - sha256 = "18lskhwsagv5zz6l73qgp9z3k4llf8jfjlkig38z8d061a4rc8k2"; + version = "1.0.20240318"; + sha256 = "0rmjfbai6k6kzynzm5skz4ska0awb012m4ykqhh47sd28vs9spk1"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - array base containers mtl pretty QuickCheck transformers + array base bytestring containers mtl pretty text transformers ]; executableToolDepends = [ alex happy ]; description = "Typechecking terms of the Edinburgh Logical Framework (LF)"; @@ -153716,8 +153803,8 @@ self: { }: mkDerivation { pname = "hotel-california"; - version = "0.0.5.0"; - sha256 = "1b5qf7xg2pg4pi9x052bffglzlg2xgyyvsi3hmfhpwg45vlm6xm6"; + version = "0.0.6.0"; + sha256 = "1fhlzikap5yiw8h3hk0wag7l2f56bx23xz90l2bqy4nrik6mlxvd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154601,14 +154688,44 @@ self: { broken = true; }) {libpq = null;}; + "hpqtypes_1_12_0_0" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , exceptions, HUnit, libpq, lifted-base, monad-control, mtl + , QuickCheck, random, readline, resource-pool, scientific + , semigroups, stm, test-framework, test-framework-hunit, text + , text-show, time, transformers, transformers-base + , unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "hpqtypes"; + version = "1.12.0.0"; + sha256 = "14r6aj5dxia2dqjhnxkg8sv5irqg4m4591kc2rb7l4ylkahp70y7"; + libraryHaskellDepends = [ + aeson async base bytestring containers exceptions lifted-base + monad-control mtl resource-pool semigroups stm text text-show time + transformers transformers-base uuid-types vector + ]; + libraryPkgconfigDepends = [ libpq ]; + testHaskellDepends = [ + aeson base bytestring exceptions HUnit lifted-base monad-control + mtl QuickCheck random readline resource-pool scientific + test-framework test-framework-hunit text text-show time + transformers-base unordered-containers uuid-types vector + ]; + description = "Haskell bindings to libpqtypes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {libpq = null;}; + "hpqtypes-effectful" = callPackage ({ mkDerivation, base, effectful-core, exceptions, hpqtypes , resource-pool, tasty, tasty-hunit, text }: mkDerivation { pname = "hpqtypes-effectful"; - version = "1.0.1.0"; - sha256 = "1gqi9cf5k8radhsya1s8936wpqpawjis9qfvb62b5cqrc4hvy26f"; + version = "1.0.2.0"; + sha256 = "1jlnxijnny18krmw97zy53d074pvpfi14zgyxiclxbc1ix0jdg3k"; libraryHaskellDepends = [ base effectful-core exceptions hpqtypes ]; @@ -160210,17 +160327,20 @@ self: { }) {}; "hspray" = callPackage - ({ mkDerivation, base, containers, hashable, numeric-prelude, tasty - , tasty-hunit, text, unordered-containers + ({ mkDerivation, base, containers, hashable, matrix + , numeric-prelude, tasty, tasty-bench, tasty-hunit, text + , unordered-containers }: mkDerivation { pname = "hspray"; - version = "0.2.0.0"; - sha256 = "15mqv8mzic5jlm440s9srfrc91776mcq3jsjxdgpz6mj9xrfiww5"; + version = "0.2.4.0"; + sha256 = "0zc85y4wcalvf57gjr24v8w1x63wb388v0pdqa0n2awi950nf7dd"; libraryHaskellDepends = [ - base containers hashable numeric-prelude text unordered-containers + base containers hashable matrix numeric-prelude text + unordered-containers ]; testHaskellDepends = [ base tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base tasty-bench ]; description = "Multivariate polynomials"; license = lib.licenses.gpl3Only; }) {}; @@ -160600,15 +160720,14 @@ self: { }) {}; "hsshellscript" = callPackage - ({ mkDerivation, base, c2hs, directory, parsec, random, unix }: + ({ mkDerivation, base, directory, parsec, random, unix }: mkDerivation { pname = "hsshellscript"; - version = "3.5.0"; - sha256 = "1gdj6b3b0b71jcmxd5wc42gs9v5s37jqd1jwryif84qbiq8rskgr"; + version = "3.6.2"; + sha256 = "1p59graa3y2f7apv22qqmaw0l4lgawip6bxs4dpgf9nb5cgwk9iy"; libraryHaskellDepends = [ base directory parsec random unix ]; - libraryToolDepends = [ c2hs ]; - description = "Haskell for Unix shell scripting tasks"; - license = "LGPL"; + description = "Using Haskell for Unix shell scripting tasks"; + license = lib.licenses.lgpl3Plus; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161963,8 +162082,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.7.16"; - sha256 = "14b21i0dzl7q21ly3gkgc1ybpdhw4gdjhlgzyfp88q1hjj7wm11s"; + version = "0.7.17"; + sha256 = "1imd3yiqh9pq677ndvq2rsxr5agys6n15syfl25c8h8625k46qda"; libraryHaskellDepends = [ array async base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -163167,6 +163286,8 @@ self: { pname = "http2"; version = "5.1.2"; sha256 = "0gp8z7hldfvfwn20aq8lpcxjgzd733g949ypnv14k8x5ncb1kvcx"; + revision = "1"; + editedCabalFile = "10k46jg4rbs3nn5fjak9jh0ldri9514ix843180i3ha18z1dsl8r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163312,8 +163433,8 @@ self: { }: mkDerivation { pname = "http2-tls"; - version = "0.2.5"; - sha256 = "1gc0shjlacgvsxmhjsfzjqnr871lhqb9yn3lhab720gqkc5lqjcs"; + version = "0.2.7"; + sha256 = "00n62n13f4w42d3kyc34prycwb9mv7sy8qpc8kk53y8shdix6x5z"; libraryHaskellDepends = [ base bytestring crypton-x509-store crypton-x509-validation data-default-class http2 network network-control network-run recv @@ -163357,19 +163478,6 @@ self: { ({ mkDerivation, base, network, network-bsd, network-uri }: mkDerivation { pname = "httpd-shed"; - version = "0.4.1.1"; - sha256 = "19dgdimpzr7pxk7pqvyin6j87gmvnf0rm35gzhmna8qr835wy3sr"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base network network-bsd network-uri ]; - description = "A simple web-server with an interact style API"; - license = lib.licenses.bsd3; - }) {}; - - "httpd-shed_0_4_1_2" = callPackage - ({ mkDerivation, base, network, network-bsd, network-uri }: - mkDerivation { - pname = "httpd-shed"; version = "0.4.1.2"; sha256 = "0ls6aim2glhmn8ncskvgkjbh3cyq3a6r7a5623ciir57nwd5g85k"; isLibrary = true; @@ -163377,7 +163485,6 @@ self: { libraryHaskellDepends = [ base network network-bsd network-uri ]; description = "A simple web-server with an interact style API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "https-everywhere-rules" = callPackage @@ -166659,8 +166766,8 @@ self: { }: mkDerivation { pname = "hypergeomatrix"; - version = "1.1.0.1"; - sha256 = "02pmjjbdnl5g1zhzs1cb32k1z5g3xkdkpz1idx8xf5gnyxcssy38"; + version = "1.1.0.2"; + sha256 = "1cg3qpxd87wp2bzdk3iy90y8v5r65q1xzbvcc7a1854rk56hp9dk"; libraryHaskellDepends = [ array base containers cyclotomic ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Hypergeometric function of a matrix argument"; @@ -168808,6 +168915,22 @@ self: { broken = true; }) {}; + "imp" = callPackage + ({ mkDerivation, base, containers, exceptions, ghc, hspec + , transformers + }: + mkDerivation { + pname = "imp"; + version = "1.0.1.0"; + sha256 = "1isxa5wbr8v9v6amydvhlkwvwsamr0jrw9996n1fj6311vwwh831"; + libraryHaskellDepends = [ + base containers exceptions ghc transformers + ]; + testHaskellDepends = [ base exceptions ghc hspec ]; + description = "A GHC plugin for automatically importing modules"; + license = lib.licenses.mit; + }) {}; + "imparse" = callPackage ({ mkDerivation, ascetic, base, compilation, containers, directory , indents, MissingH, parsec, richreports, split, staticanalysis @@ -170187,33 +170310,6 @@ self: { }) {}; "influxdb" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal - , cabal-doctest, clock, containers, doctest, foldl, http-client - , http-types, lens, network, optional-args, raw-strings-qq - , scientific, tagged, tasty, tasty-hunit, template-haskell, text - , time, unordered-containers, vector - }: - mkDerivation { - pname = "influxdb"; - version = "1.9.3"; - sha256 = "04rqmzwgbnf9n6c06gki0f2yfz993am9p8dcpnk7yrcv63ryh74y"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson attoparsec base bytestring clock containers foldl http-client - http-types lens network optional-args scientific tagged text time - unordered-containers vector - ]; - testHaskellDepends = [ - base containers doctest lens raw-strings-qq tasty tasty-hunit - template-haskell time vector - ]; - description = "InfluxDB client library for Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "influxdb_1_9_3_1" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base , bytestring, Cabal, cabal-doctest, clock, containers, doctest , foldl, http-client, http-types, lens, network, optional-args @@ -170238,7 +170334,6 @@ self: { ]; description = "InfluxDB client library for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "informative" = callPackage @@ -171315,21 +171410,23 @@ self: { "intelli-monad" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , bytestring, containers, haskeline, http-client, http-client-tls - , JuicyPixels, megaparsec, openai-servant-gen, persistent - , persistent-sqlite, process, servant, servant-client, sixel, text - , time, transformers, vector + , http-conduit, JuicyPixels, megaparsec, openai-servant-gen + , optparse-applicative, persistent, persistent-sqlite, process + , servant, servant-client, sixel, temporary, text, time + , transformers, vector, xml-conduit, yaml }: mkDerivation { pname = "intelli-monad"; - version = "0.1.0.0"; - sha256 = "1jhh0dr3q4fn8pfkn9j7spdhivk48nf3liin7r5lvjf42s28bx7d"; + version = "0.1.0.2"; + sha256 = "1i6widwlw62cl63bc1lvx1961d4c2x4p4bjhlkyj3g98yhbspjq7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring containers - haskeline http-client http-client-tls JuicyPixels megaparsec - openai-servant-gen persistent persistent-sqlite process servant - servant-client sixel text time transformers vector + haskeline http-client http-client-tls http-conduit JuicyPixels + megaparsec openai-servant-gen optparse-applicative persistent + persistent-sqlite process servant servant-client sixel temporary + text time transformers vector xml-conduit yaml ]; executableHaskellDepends = [ aeson base openai-servant-gen persistent-sqlite process text @@ -172081,10 +172178,8 @@ self: { }: mkDerivation { pname = "invariant"; - version = "0.6.2"; - sha256 = "0271grdzgjfa86hvy50vrqh8k7n0l48i524k3bgyjmwa13l8ar63"; - revision = "1"; - editedCabalFile = "1zxvv6q03jsn343pdx53knmjq8l6p2fggvqyfkpgjgvcwf7iaf23"; + version = "0.6.3"; + sha256 = "1grgappaqgqnysnwa38gzygw01vb11mjbxadb7r8h2q6l7j1j84d"; libraryHaskellDepends = [ array base bifunctors comonad containers contravariant ghc-prim profunctors StateVar stm tagged template-haskell th-abstraction @@ -174622,8 +174717,8 @@ self: { }: mkDerivation { pname = "jackpolynomials"; - version = "1.1.0.1"; - sha256 = "0wss00638zsi9zsphmr7pw19rdcvqfmd6fcc0wwhpkz6mkzm4c9s"; + version = "1.1.1.0"; + sha256 = "00grr7r2f0jh8vmkv87vhl0h39rbakz8pgbh0s6mmj1k6fi3bkds"; libraryHaskellDepends = [ array base hspray ilist lens math-functions numeric-prelude ]; @@ -175144,10 +175239,8 @@ self: { }: mkDerivation { pname = "javelin-io"; - version = "0.1.1.0"; - sha256 = "1p69r6snk03s3bvhg54ddjjr6fwwnshgjrgyj2b78xhf77pck56m"; - revision = "1"; - editedCabalFile = "0p0c5wy31w42l1lyjvvrjrpalbmnvrb6qaalg1rk4rxill5pfcjr"; + version = "0.1.1.1"; + sha256 = "1c6w0p7yjbc3yw12f5bflgacvivzc1n0dxgmz2qn06yiraw6jyv6"; libraryHaskellDepends = [ base bytestring cassava containers javelin unordered-containers vector @@ -178387,6 +178480,33 @@ self: { mainProgram = "kafka-device-vrpn"; }) {}; + "kafka-interchange" = callPackage + ({ mkDerivation, aeson, base, base16, bytebuild, byteslice + , bytesmith, bytestring, castagnoli, chronos, containers + , contiguous, ip, mtl, natural-arithmetic, pretty-show, primitive + , primitive-unaligned, primitive-unlifted, stm, tasty, tasty-golden + , tasty-hunit, text, text-short, torsor, transformers, wide-word + , zigzag + }: + mkDerivation { + pname = "kafka-interchange"; + version = "0.2.0.0"; + sha256 = "16yjjwvwxycr1h2vqsjkixgzln9bym8mpanzwh0kr6h3qgr8h4jw"; + libraryHaskellDepends = [ + base bytebuild byteslice bytesmith bytestring castagnoli chronos + containers contiguous ip mtl natural-arithmetic primitive + primitive-unaligned stm text text-short torsor transformers + wide-word zigzag + ]; + testHaskellDepends = [ + aeson base base16 bytebuild byteslice bytesmith bytestring + containers pretty-show primitive primitive-unlifted tasty + tasty-golden tasty-hunit text wide-word + ]; + description = "Serialization for kafka wire protocol"; + license = lib.licenses.bsd3; + }) {}; + "kaleidoscope" = callPackage ({ mkDerivation, base, containers, haskeline, llvm-general , llvm-general-pure, mtl, parsec, transformers @@ -180715,6 +180835,8 @@ self: { pname = "kmonad"; version = "0.4.2"; sha256 = "1d9l16b9srxkkpj61fbz06gxz3y200yn146sdv7h2bbxnjdswia2"; + revision = "2"; + editedCabalFile = "1djchj9c64p0fy3ahzkx3z9wg9dg7pjya3mb6z3wmhjvym8iavvv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180726,9 +180848,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Advanced keyboard remapping utility"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "kmonad"; - broken = true; }) {}; "kmp-dfa" = callPackage @@ -184728,8 +184848,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "4.0.4"; - sha256 = "1z1lfl6gpa189m39ixwac47lxvhnd505avh36bnna69012gqzfwq"; + version = "4.1.0"; + sha256 = "072ppl47rdvcsliij7swdhzlskq30xdwvj5ag2a7060ax5pv23v2"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers cryptohash exceptions extra generic-lens hashtables http-client @@ -186074,8 +186194,8 @@ self: { pname = "lens"; version = "5.2.3"; sha256 = "0kcr1dqvnjmi05yd9m9ylipk5210jwd7d00c9scq9n49vnl8q7nz"; - revision = "2"; - editedCabalFile = "0pnhyw3v9dbirh461hcyhds1mpj06qhs81ij7c387wyzdb3qfwk3"; + revision = "3"; + editedCabalFile = "18mz3d7m8yb1fpxvkkwm1vwf2q67as5pz348i56c4xxfzhqhxdrj"; libraryHaskellDepends = [ array assoc base base-orphans bifunctors bytestring call-stack comonad containers contravariant distributive exceptions filepath @@ -186218,8 +186338,8 @@ self: { }: mkDerivation { pname = "lens-family"; - version = "2.1.2"; - sha256 = "0j1n51qx9sszpbksnz35cfsn62mv44g2jvn9iwr6wfy0mz1syq1b"; + version = "2.1.3"; + sha256 = "04r5xcypy3vzn3chs9xwmq5gdxk5z5z84qiggkkbz32k6g1b808q"; libraryHaskellDepends = [ base containers lens-family-core mtl transformers ]; @@ -186231,8 +186351,8 @@ self: { ({ mkDerivation, base, containers, transformers }: mkDerivation { pname = "lens-family-core"; - version = "2.1.2"; - sha256 = "1dkkd33wh2ykgis92dpshjxz6d2d41dvjj4zz6b7mdy8frr9jnhv"; + version = "2.1.3"; + sha256 = "0r8v42ybwvl1ayz2502mpjl2nc4815699k3f30qln5b9g6qk26lv"; libraryHaskellDepends = [ base containers transformers ]; description = "Haskell 2022 Lens Families"; license = lib.licenses.bsd3; @@ -188219,19 +188339,6 @@ self: { }) {xslt = null;}; "libyaml" = callPackage - ({ mkDerivation, base, bytestring, conduit, resourcet }: - mkDerivation { - pname = "libyaml"; - version = "0.1.2"; - sha256 = "1dcpbsjg6n305l07isxmavgp01lbv1qggy16acjyxjlz35pxchlg"; - revision = "1"; - editedCabalFile = "00f1rag6sd7c8kza2agw9089p9vf21iiga2aq41nbf6d3yqn7dkz"; - libraryHaskellDepends = [ base bytestring conduit resourcet ]; - description = "Low-level, streaming YAML interface"; - license = lib.licenses.bsd3; - }) {}; - - "libyaml_0_1_4" = callPackage ({ mkDerivation, base, bytestring, conduit, libyaml-clib, resourcet }: mkDerivation { @@ -188243,7 +188350,6 @@ self: { ]; description = "Low-level, streaming YAML interface"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "libyaml-clib" = callPackage @@ -189152,6 +189258,8 @@ self: { pname = "linear-generics"; version = "0.2.3"; sha256 = "0093ywl8s8k92b50li28gcmqc616f6l7jkv7vslkvqzn42yrvbq2"; + revision = "1"; + editedCabalFile = "1ky9dhc0bjymw12wpjcv12drbfz7955f1nchgcs3l0ghv8vyvy3x"; libraryHaskellDepends = [ base containers ghc-prim template-haskell th-abstraction ]; @@ -195776,8 +195884,8 @@ self: { }: mkDerivation { pname = "mailtrap"; - version = "0.1.2.0"; - sha256 = "0fglprc6ppq316w870p2gdbnn4kh71a0v2zjhsxrxjcbprwb537h"; + version = "0.1.2.1"; + sha256 = "1sqqwjvjcvbngx7y0ycvw06i7nfxgqigsb9cn478xk4ngn851aia"; libraryHaskellDepends = [ aeson base base64 blaze-html bytestring email-validate filepath http-conduit mime-types text time unordered-containers uuid-types @@ -197588,6 +197696,30 @@ self: { license = lib.licenses.bsd2; }) {}; + "math-functions_0_3_4_4" = callPackage + ({ mkDerivation, base, data-default-class, deepseq, erf, primitive + , QuickCheck, random, tasty, tasty-bench, tasty-hunit + , tasty-quickcheck, vector, vector-th-unbox + }: + mkDerivation { + pname = "math-functions"; + version = "0.3.4.4"; + sha256 = "1ypqza0v1qbm94yjj536ynh7njlcz36s1cj8c0slbx7ga3fxhh94"; + libraryHaskellDepends = [ + base data-default-class deepseq primitive vector + ]; + testHaskellDepends = [ + base data-default-class deepseq erf primitive QuickCheck tasty + tasty-hunit tasty-quickcheck vector vector-th-unbox + ]; + benchmarkHaskellDepends = [ + base data-default-class random tasty-bench vector + ]; + description = "Collection of tools for numeric computations"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "math-grads" = callPackage ({ mkDerivation, aeson, array, base, bimap, containers, hspec , ilist, lens, linear, matrix, mtl, random, vector @@ -199057,6 +199189,26 @@ self: { mainProgram = "mega-sdist"; }) {}; + "mega-sdist_0_4_3_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, optparse-simple, pantry + , path, path-io, rio, rio-orphans, yaml + }: + mkDerivation { + pname = "mega-sdist"; + version = "0.4.3.1"; + sha256 = "0rdwdig9wx5jwz5w0v5gg60fhcfgnhfzllcamfp63sfqkhz6awd6"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring optparse-simple pantry path path-io rio + rio-orphans yaml + ]; + description = "Handles uploading to Hackage from mega repos"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "mega-sdist"; + }) {}; + "megalisp" = callPackage ({ mkDerivation, base, megaparsec, mtl, text }: mkDerivation { @@ -199337,8 +199489,8 @@ self: { }: mkDerivation { pname = "mem-info"; - version = "0.2.0.0"; - sha256 = "0hmsdv33v2wixw0cizjp7fycq5haa9fzybb0c6z11d3jql485ghh"; + version = "0.3.0.0"; + sha256 = "0nfvhgc3d4p5jaaiwv3i363f4fpnd17awdx2halhcfd9a3gfr4j4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -199410,6 +199562,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "memcache_0_3_0_2" = callPackage + ({ mkDerivation, base, binary, blaze-builder, bytestring, criterion + , data-default-class, hashable, network, resource-pool, time + , vector + }: + mkDerivation { + pname = "memcache"; + version = "0.3.0.2"; + sha256 = "1gzjcl6hy2kj9rh97vasbfjc7j1vwrfhpr3r8p3wzbxd13rfbw46"; + libraryHaskellDepends = [ + base binary blaze-builder bytestring data-default-class hashable + network resource-pool time vector + ]; + testHaskellDepends = [ + base binary blaze-builder bytestring network + ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; + description = "A memcached client library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "memcache-conduit" = callPackage ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring , conduit, conduit-extra, memcache-haskell, mtl, network, resourcet @@ -201711,8 +201885,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "mini"; - version = "1.2.1.0"; - sha256 = "1ammw6s8snlfzqz8h7lm47vkinwypql35y27rdapa1q3j5ywgmsd"; + version = "1.3.0.0"; + sha256 = "0qahnq95nxqgl5lj51j06hpmzi3fypm7flywibzyb5xad5hqp4db"; libraryHaskellDepends = [ base ]; description = "Minimal essentials"; license = lib.licenses.mit; @@ -204461,8 +204635,8 @@ self: { }: mkDerivation { pname = "monad-logger-aeson"; - version = "0.4.1.2"; - sha256 = "0laajzbmzyf7717m0ikirkkxcsrhiwd7l3yn5cchk7rzb92z4yzx"; + version = "0.4.1.3"; + sha256 = "13w60v9kadvdcvwf5p376yvxsf7ifh86b94z0hyzvrq0l4d9p73v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206205,8 +206379,8 @@ self: { }: mkDerivation { pname = "monomer-flatpak-example"; - version = "0.0.15.2"; - sha256 = "0b1f96n4n9ajpslhh885v7gyx780n99qljdz62dlvqjlb88kn4h2"; + version = "0.0.15.4"; + sha256 = "0cmrmr562crwwp52ij1m1z9p0sdl5054kjknfxwxk93w5djlg5kd"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -210102,8 +210276,8 @@ self: { }: mkDerivation { pname = "musicScroll"; - version = "0.3.3"; - sha256 = "07c9yxazl8frl06s7jslg28716xi97azyx7i9pc06zmnag9p2k2z"; + version = "0.3.4"; + sha256 = "02jgv0m59j673wqqp623c4k9y1kxlkrk37hi3sm2x15q0w2q9x62"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -210112,6 +210286,7 @@ self: { deepseq directory gi-gtk gi-gtk-hs mtl pipes pipes-concurrency req sqlite-simple stm tagsoup text transformers xdg-basedir ]; + libraryPkgconfigDepends = [ gtk3 ]; executableHaskellDepends = [ base ]; executablePkgconfigDepends = [ gtk3 ]; description = "Supply your tunes info without leaving your music player"; @@ -210960,17 +211135,17 @@ self: { "mysql-json-table" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, exceptions - , http-api-data, mysql, mysql-simple + , hashable, http-api-data, mysql, mysql-simple }: mkDerivation { pname = "mysql-json-table"; - version = "0.1.3.0"; - sha256 = "1r572z2j2jrgaddb3rf254g1bfjc9khf1rklfcccx8vvavbbkpvb"; + version = "0.1.4.0"; + sha256 = "1kavib1ny3cg8cvbvg2n2xlisj1pwvsnv25wddv55kxgng227djr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring conduit exceptions http-api-data mysql - mysql-simple + aeson base bytestring conduit exceptions hashable http-api-data + mysql mysql-simple ]; executableHaskellDepends = [ base conduit mysql-simple ]; description = "Using MySQL to store id-to-json tables"; @@ -211986,8 +212161,8 @@ self: { }: mkDerivation { pname = "national-australia-bank"; - version = "0.0.2"; - sha256 = "1cpswfd21an4w2nmycyqk5sblaifm5rxqlh8lbhnqf55crmk0c3a"; + version = "0.0.3"; + sha256 = "11jh9lap1763qhpybylhsjvnqsiba1757rlcddqp391j4n2pmb51"; libraryHaskellDepends = [ base bytestring containers digit directory filepath lens mtl parsec sv time transformers utf8-string validation @@ -214205,8 +214380,8 @@ self: { ({ mkDerivation, base, bytestring, network, time-manager }: mkDerivation { pname = "network-run"; - version = "0.2.6"; - sha256 = "0q3wr8zkccdfi6bfawrajhir1s2cl1knpy6pqg78kd0pvjai2j6a"; + version = "0.2.7"; + sha256 = "14x55n79cg74xbjcii00nyi0y7zxh7lw03qdkl4inm1smfsm7zjl"; libraryHaskellDepends = [ base bytestring network time-manager ]; description = "Simple network runner library"; license = lib.licenses.bsd3; @@ -214388,10 +214563,8 @@ self: { }: mkDerivation { pname = "network-transport"; - version = "0.5.6"; - sha256 = "10ichr66j06w2sdx5523rjvwf17cxhl5iw6izw7l066lrbzkr270"; - revision = "1"; - editedCabalFile = "1fmlpfya9qakzyqwgiiw1gssz919yrm5fbbf6d9rzqdvmar5g2n8"; + version = "0.5.7"; + sha256 = "163n3dl56vrmw4pdq66lb80ybjh58lqr85j69hpqwr24c46gjqk7"; libraryHaskellDepends = [ base binary bytestring deepseq hashable transformers ]; @@ -214443,10 +214616,8 @@ self: { }: mkDerivation { pname = "network-transport-inmemory"; - version = "0.5.2"; - sha256 = "0kpgx6r60cczr178ras5ia9xiihrs5a9hnfyv45djmq16faxfic2"; - revision = "2"; - editedCabalFile = "024r9szxp5264ysfygi223nfc3mj1rmaw10xrb62f8b70yr1zbgf"; + version = "0.5.4"; + sha256 = "0557xhsswlypnxfvw5x3add29dai29ybi1g129mzkz0pi1wddxiq"; libraryHaskellDepends = [ base bytestring containers data-accessor network-transport stm ]; @@ -214464,8 +214635,8 @@ self: { }: mkDerivation { pname = "network-transport-tcp"; - version = "0.8.1"; - sha256 = "1ia7985pngbmg6cvgw9xkqdyrgbsg98hzzcjzg5ksfsh6jddrvgx"; + version = "0.8.3"; + sha256 = "06n6yxcd1alc3zgid29qmljg34mncax0yw6krxalq95pm8lia8j0"; libraryHaskellDepends = [ async base bytestring containers data-accessor network network-transport uuid @@ -214483,8 +214654,8 @@ self: { }: mkDerivation { pname = "network-transport-tests"; - version = "0.3.1"; - sha256 = "0md91zi8g4vfbj53w1ghbgw50mlgvpnd1pya9y98i8ab8flhk923"; + version = "0.3.2"; + sha256 = "1w3cxiap0p8kgxs4jghvhfzpa6bazpha4s6zgabd80cw3gcmf5lf"; libraryHaskellDepends = [ ansi-terminal base bytestring containers mtl network-transport random @@ -215257,23 +215428,23 @@ self: { "ngx-export-healthcheck" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers - , crypton-connection, crypton-x509, crypton-x509-system - , crypton-x509-validation, data-default-class, enclosed-exceptions - , http-client, http-client-brread-timeout, http-client-tls - , http-types, ngx-export, safe, snap-core, snap-server, text, time - , tls, unordered-containers, vector + , crypton-connection, crypton-x509, crypton-x509-store + , crypton-x509-system, crypton-x509-validation, data-default-class + , enclosed-exceptions, http-client, http-client-brread-timeout + , http-client-tls, http-types, ngx-export, safe, snap-core + , snap-server, text, time, tls, unordered-containers, vector }: mkDerivation { pname = "ngx-export-healthcheck"; - version = "1.6.2"; - sha256 = "1zmmgf0m99m4dcg6q5zxjkbikiwkgn39mdifdvxd0fy5p8ff851a"; + version = "1.6.3"; + sha256 = "1v58z19p4ma7k7g0hv2fz3j6vsw8y9pa5q7lspsw9d7z18rrfb8x"; libraryHaskellDepends = [ aeson async base bytestring containers crypton-connection - crypton-x509 crypton-x509-system crypton-x509-validation - data-default-class enclosed-exceptions http-client - http-client-brread-timeout http-client-tls http-types ngx-export - safe snap-core snap-server text time tls unordered-containers - vector + crypton-x509 crypton-x509-store crypton-x509-system + crypton-x509-validation data-default-class enclosed-exceptions + http-client http-client-brread-timeout http-client-tls http-types + ngx-export safe snap-core snap-server text time tls + unordered-containers vector ]; description = "Active health checks and monitoring of Nginx upstreams"; license = lib.licenses.bsd3; @@ -215304,8 +215475,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools"; - version = "1.2.3.2"; - sha256 = "0d39i91vbqbs5ibzwka102c5dzjcswkvnz85k57xnir6jr4blfv9"; + version = "1.2.4"; + sha256 = "12qryvxkz8mjbpyrvmp7k3jh0zdf6f92a09jdhca8c2x7qdi3xn8"; libraryHaskellDepends = [ aeson base binary bytestring ngx-export safe template-haskell ]; @@ -216847,6 +217018,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "nonnonempty" = callPackage + ({ mkDerivation, base, lens, semigroupoids }: + mkDerivation { + pname = "nonnonempty"; + version = "0.0.1"; + sha256 = "1z7yfp0qvgs1bgwzbskz6b5ksdn3zv9ndrm4rbpi7w5q1szr9zz3"; + libraryHaskellDepends = [ base lens semigroupoids ]; + description = "List with a minimum length of 2"; + license = lib.licenses.bsd3; + }) {}; + "noodle" = callPackage ({ mkDerivation, base, directory, filepath }: mkDerivation { @@ -219409,8 +219591,8 @@ self: { }: mkDerivation { pname = "ogma-cli"; - version = "1.2.0"; - sha256 = "14qipd24zq37xq7y88ap5gr0iwwjc1ksj21lk108hqa7p5f56b3n"; + version = "1.3.0"; + sha256 = "07a64p1b0yzx3wmxycifimjqvnfx9gpk6n3wl6rzgncl1fgf89h0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ogma-core optparse-applicative ]; @@ -219426,20 +219608,19 @@ self: { "ogma-core" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, HUnit, IfElse , mtl, ogma-extra, ogma-language-c, ogma-language-cocospec - , ogma-language-copilot, ogma-language-fret-reqs - , ogma-language-jsonspec, ogma-language-smv, ogma-spec, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 + , ogma-language-copilot, ogma-language-jsonspec, ogma-language-smv + , ogma-spec, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2 }: mkDerivation { pname = "ogma-core"; - version = "1.2.0"; - sha256 = "06x651mhq8i14zi7a3ldp6nly51rmfl68a1dv3smndy0xdqn04va"; + version = "1.3.0"; + sha256 = "0p3cwyrrjm56x3a8myfp1wlm7xy2j1d06y80arij8cl5cki95kwy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring filepath IfElse mtl ogma-extra ogma-language-c ogma-language-cocospec ogma-language-copilot - ogma-language-fret-reqs ogma-language-jsonspec ogma-language-smv - ogma-spec + ogma-language-jsonspec ogma-language-smv ogma-spec ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -219456,8 +219637,8 @@ self: { }: mkDerivation { pname = "ogma-extra"; - version = "1.2.0"; - sha256 = "0khvchp1l16zaaqm7x4n0hvf21d9jih9aqyjf4q9q86mixx0lzkn"; + version = "1.3.0"; + sha256 = "1pvnqcgi00v93jkzqxg770y2n0zbq53b0shi783apz9cjxm5a329"; libraryHaskellDepends = [ base bytestring Cabal directory filepath ]; @@ -219474,8 +219655,8 @@ self: { }: mkDerivation { pname = "ogma-language-c"; - version = "1.2.0"; - sha256 = "0vifm7xfr5yidr15ghfr281qkbh54ww0bjja2bx3y6xn9b2z8y3y"; + version = "1.3.0"; + sha256 = "0g1z3yh4x9p0iinc39ip1nm9s4d21nwc7gzss81vvc5f2m8hdqbg"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -219493,8 +219674,8 @@ self: { }: mkDerivation { pname = "ogma-language-cocospec"; - version = "1.2.0"; - sha256 = "11zdyc4r80mvpyg60cas9cwn7qabicxbg8d8wjpdn15yxcf9p48i"; + version = "1.3.0"; + sha256 = "18zv608mb3ifs14m3lmsc644cc2qhj9f0gjxgc85m2wq82blsxpb"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -219510,8 +219691,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ogma-language-copilot"; - version = "1.2.0"; - sha256 = "0svaf7my8av3vdj16kdw6wc058fygkbvl92fril5riyq5pvm57bs"; + version = "1.3.0"; + sha256 = "1d9grndx0774rz64x7g8hi9bz80ddayclzianyql0jzyw61ps70s"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: Copilot Language Endpoints"; license = "unknown"; @@ -219565,8 +219746,8 @@ self: { }: mkDerivation { pname = "ogma-language-jsonspec"; - version = "1.2.0"; - sha256 = "0zqgqvx70faz0bsk7qx5cxfrigsyvffklr9f47gfv82xxbsv61w1"; + version = "1.3.0"; + sha256 = "04w0fayj6hbqciw4fqn481gwlj34sq3r9i09zcqh2m455mybalyc"; libraryHaskellDepends = [ aeson base bytestring jsonpath megaparsec ogma-spec text ]; @@ -219580,8 +219761,8 @@ self: { }: mkDerivation { pname = "ogma-language-smv"; - version = "1.2.0"; - sha256 = "19lrb9xvz1vqdzijpsqp0b66psqd0appa1mq8vhvc0yddmpz7ib5"; + version = "1.3.0"; + sha256 = "06hb9gxqg81gw5sqzsi966fk9yxhv9q7pclnwhjlaaya3jav3xx2"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -219597,8 +219778,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ogma-spec"; - version = "1.2.0"; - sha256 = "1d1fk0r8df0hg7v4v046czlrwb1wjzwjyqffac7axzhxajl9igci"; + version = "1.3.0"; + sha256 = "01vph8dwqf0sw2bn3frik3s2jwnpap1nlkpl8jnk91q2xjc4zhfs"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: JSON Frontend"; license = "unknown"; @@ -220460,6 +220641,21 @@ self: { broken = true; }) {}; + "op2" = callPackage + ({ mkDerivation, base, contravariant, lens, mtl, profunctors + , semigroupoids + }: + mkDerivation { + pname = "op2"; + version = "0.0.3"; + sha256 = "1nnmfbjlvv4kr766484wcnl75qb18g4mwb91nrmy575m6b3g3hzq"; + libraryHaskellDepends = [ + base contravariant lens mtl profunctors semigroupoids + ]; + description = "Functions of the type `a -> a -> b`"; + license = lib.licenses.bsd3; + }) {}; + "opaleye" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec @@ -220489,6 +220685,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "opaleye_0_10_2_3" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , case-insensitive, containers, contravariant, dotenv, hspec + , hspec-discover, multiset, postgresql-simple, pretty + , product-profunctors, profunctors, QuickCheck, scientific + , semigroups, text, time, time-compat, time-locale-compat + , transformers, uuid, void + }: + mkDerivation { + pname = "opaleye"; + version = "0.10.2.3"; + sha256 = "1cbd6d5gp438bi3w2ml7lba6rjjykyxpc5dp5ph0n67pbvbzd66d"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors scientific semigroups text time-compat + time-locale-compat transformers uuid void + ]; + testHaskellDepends = [ + aeson base bytestring containers contravariant dotenv hspec + hspec-discover multiset postgresql-simple product-profunctors + profunctors QuickCheck semigroups text time time-compat + transformers uuid + ]; + testToolDepends = [ hspec-discover ]; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -220975,18 +221201,18 @@ self: { "opencascade-hs" = callPackage ({ mkDerivation, base, resourcet, TKBO, TKBRep, TKernel, TKFillet , TKG2d, TKG3d, TKGeomBase, TKLCAF, TKMath, TKMesh, TKOffset - , TKPrim, TKRWMesh, TKService, TKStd, TKSTEP, TKSTL, TKTopAlgo - , TKV3d, TKXCAF + , TKPrim, TKRWMesh, TKService, TKShHealing, TKStd, TKSTEP, TKSTL + , TKTopAlgo, TKV3d, TKXCAF, TKXSBase }: mkDerivation { pname = "opencascade-hs"; - version = "0.2.1.0"; - sha256 = "0dwlhaq7mknz58r5j1gacm1m400pcg7idg41g1wcq5wv5v0y5rbp"; + version = "0.2.2.0"; + sha256 = "0h50q77p60dpngm1bxwk8i5lvw05idcsl2jgsv6kq14jpsc65ajq"; libraryHaskellDepends = [ base resourcet ]; librarySystemDepends = [ TKBO TKBRep TKernel TKFillet TKG2d TKG3d TKGeomBase TKLCAF TKMath - TKMesh TKOffset TKPrim TKRWMesh TKService TKStd TKSTEP TKSTL - TKTopAlgo TKV3d TKXCAF + TKMesh TKOffset TKPrim TKRWMesh TKService TKShHealing TKStd TKSTEP + TKSTL TKTopAlgo TKV3d TKXCAF TKXSBase ]; description = "Thin Wrapper for the OpenCASCADE CAD Kernel"; license = lib.licenses.lgpl21Only; @@ -220995,8 +221221,9 @@ self: { }) {TKBO = null; TKBRep = null; TKFillet = null; TKG2d = null; TKG3d = null; TKGeomBase = null; TKLCAF = null; TKMath = null; TKMesh = null; TKOffset = null; TKPrim = null; TKRWMesh = null; - TKSTEP = null; TKSTL = null; TKService = null; TKStd = null; - TKTopAlgo = null; TKV3d = null; TKXCAF = null; TKernel = null;}; + TKSTEP = null; TKSTL = null; TKService = null; TKShHealing = null; + TKStd = null; TKTopAlgo = null; TKV3d = null; TKXCAF = null; + TKXSBase = null; TKernel = null;}; "opencc" = callPackage ({ mkDerivation, base, bytestring, mtl, opencc, text, transformers @@ -222263,8 +222490,8 @@ self: { pname = "optics-th"; version = "0.4.1"; sha256 = "05zxljfqmhr5if7l8gld5s864nql6kqjfizsf1z7r3ydknvmff6p"; - revision = "6"; - editedCabalFile = "03qm6q7gw97qlcgnqp097dyvqkqpq4ph95y5ra6k6da218rbl1nk"; + revision = "7"; + editedCabalFile = "1zlx9xs8dpr3xbxsbi7pgrqkl6avs4ss2bdq8f3p2dxibr8xi4bz"; libraryHaskellDepends = [ base containers mtl optics-core template-haskell th-abstraction transformers @@ -222497,18 +222724,14 @@ self: { ({ mkDerivation, attoparsec, base, optparse-applicative, text }: mkDerivation { pname = "optparse-applicative-cmdline-util"; - version = "0.2.0"; - sha256 = "13nr0biqhc2sd30xxn7sms4f0wl629bcahp3hmmcgf45nl38vpbh"; - revision = "2"; - editedCabalFile = "02z169my8711w5lxvmi9y124a2z4isks7333yylw14lwv8zw7csv"; + version = "0.2.1"; + sha256 = "0l6qmxncqacfm8abpf2j2f7pn7pbd09lpm20im6gpm27dmls001h"; libraryHaskellDepends = [ attoparsec base optparse-applicative text ]; description = "Utility functions for working with optparse-applicative"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.slotThe ]; - broken = true; }) {}; "optparse-applicative-simple" = callPackage @@ -224755,7 +224978,7 @@ self: { ]; }) {}; - "pandoc_3_1_12_2" = callPackage + "pandoc_3_1_12_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions @@ -224774,8 +224997,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "3.1.12.2"; - sha256 = "0liyv3pgn7fkjiazmln941vs5h58vipn6d4lmkchjqkdqd9j67ps"; + version = "3.1.12.3"; + sha256 = "0qfgfjvrk4y6yvh8yv4kl9w81xvrlcz4prz8vr17rasnli7k561r"; configureFlags = [ "-f-trypandoc" ]; enableSeparateDataOutput = true; libraryHaskellDepends = [ @@ -224897,14 +225120,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "pandoc-cli_3_1_12_2" = callPackage + "pandoc-cli_3_1_12_3" = callPackage ({ mkDerivation, base, hslua-cli, pandoc, pandoc-lua-engine , pandoc-server, safe, temporary, text, wai-extra, warp }: mkDerivation { pname = "pandoc-cli"; - version = "3.1.12.2"; - sha256 = "1xx381i5ak9sijdx89f5dvk5ccjbmzr1imkvndj1kgay2aixmqap"; + version = "3.1.12.3"; + sha256 = "19b0ybqmwffimyyx9amvcyv71myv09z4lja3g5qlna42bd6wfqfn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -225336,6 +225559,29 @@ self: { license = lib.licenses.mit; }) {}; + "pandoc-lua-marshal_0_2_6" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, exceptions + , hslua, hslua-list, hslua-marshalling, pandoc-types, QuickCheck + , safe, tasty, tasty-hunit, tasty-lua, tasty-quickcheck, text + }: + mkDerivation { + pname = "pandoc-lua-marshal"; + version = "0.2.6"; + sha256 = "029wqihgkcdfyy21pdc4gj8hh2av9c29nypcabxch8bfkz6lq0lw"; + libraryHaskellDepends = [ + aeson base bytestring containers exceptions hslua hslua-list + hslua-marshalling pandoc-types safe text + ]; + testHaskellDepends = [ + aeson base bytestring containers exceptions hslua hslua-list + hslua-marshalling pandoc-types QuickCheck safe tasty tasty-hunit + tasty-lua tasty-quickcheck text + ]; + description = "Use pandoc types in Lua"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "pandoc-markdown-ghci-filter" = callPackage ({ mkDerivation, aeson, base, containers, ghcid, pandoc , pandoc-types, QuickCheck, tasty, tasty-hunit, tasty-quickcheck @@ -225920,6 +226166,54 @@ self: { license = lib.licenses.bsd3; }) {}; + "pantry_0_10_0" = callPackage + ({ mkDerivation, aeson, aeson-warning-parser, ansi-terminal, base + , bytestring, Cabal, casa-client, casa-types, companion, conduit + , conduit-extra, containers, crypton, crypton-conduit, digest + , exceptions, filelock, generic-deriving, hackage-security + , hedgehog, hpack, hspec, hspec-discover, http-client + , http-client-tls, http-conduit, http-download, http-types, memory + , mtl, network-uri, path, path-io, persistent, persistent-sqlite + , persistent-template, primitive, QuickCheck, raw-strings-qq + , resourcet, rio, rio-orphans, rio-prettyprint, static-bytes + , tar-conduit, text, text-metrics, time, transformers, unix-compat + , unliftio, unordered-containers, vector, yaml, zip-archive + }: + mkDerivation { + pname = "pantry"; + version = "0.10.0"; + sha256 = "1f0ck7j82km4sy1ia2iqv9aqkdr3p2h8sarbksrsx2dq68552xym"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-warning-parser ansi-terminal base bytestring Cabal + casa-client casa-types companion conduit conduit-extra containers + crypton crypton-conduit digest filelock generic-deriving + hackage-security hpack http-client http-client-tls http-conduit + http-download http-types memory mtl network-uri path path-io + persistent persistent-sqlite persistent-template primitive + resourcet rio rio-orphans rio-prettyprint static-bytes tar-conduit + text text-metrics time transformers unix-compat unliftio + unordered-containers vector yaml zip-archive + ]; + testHaskellDepends = [ + aeson aeson-warning-parser ansi-terminal base bytestring Cabal + casa-client casa-types companion conduit conduit-extra containers + crypton crypton-conduit digest exceptions filelock generic-deriving + hackage-security hedgehog hpack hspec http-client http-client-tls + http-conduit http-download http-types memory mtl network-uri path + path-io persistent persistent-sqlite persistent-template primitive + QuickCheck raw-strings-qq resourcet rio rio-orphans rio-prettyprint + static-bytes tar-conduit text text-metrics time transformers + unix-compat unliftio unordered-containers vector yaml zip-archive + ]; + testToolDepends = [ hspec-discover ]; + doHaddock = false; + description = "Content addressable Haskell package management"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pantry-tmp" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans , base64-bytestring, bytestring, Cabal, conduit, conduit-extra @@ -231683,6 +231977,27 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "phkdf" = callPackage + ({ mkDerivation, aeson, base, base16, bytestring, containers + , cryptohash-sha256, network-byte-order, Stream, tasty, tasty-hunit + , text, tuplehash-utils, vector + }: + mkDerivation { + pname = "phkdf"; + version = "0.0.0.0"; + sha256 = "0ghkcwvgpasx3fl3bnqivpbz3y9wkgdszjk4b50d3rw9m23p4qc1"; + libraryHaskellDepends = [ + base bytestring cryptohash-sha256 network-byte-order Stream + tuplehash-utils vector + ]; + testHaskellDepends = [ + aeson base base16 bytestring containers Stream tasty tasty-hunit + text vector + ]; + description = "Toolkit for self-documenting password hash and key derivation functions"; + license = lib.licenses.asl20; + }) {}; + "phladiprelio-general-datatype" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -235141,6 +235456,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "plegg" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "plegg"; + version = "0.2.1.1"; + sha256 = "1j7jblcmnvg2f5pdsakr9afqyssaspffbr4rdrixzayywbbrgbic"; + libraryHaskellDepends = [ base ]; + description = "A semi-cross-platform interface for pledge(2) and unveil(2)"; + license = lib.licenses.unlicense; + }) {}; + "plex" = callPackage ({ mkDerivation, async, base, bytestring, deepseq, hspec , QuickCheck, unix @@ -235242,8 +235568,8 @@ self: { }: mkDerivation { pname = "plot"; - version = "0.2.3.11"; - sha256 = "0img30argzgxcgwam3iqc3xasgizbbcrghd2vkmqahmv7g3l36di"; + version = "0.2.3.12"; + sha256 = "1l5r6xfiypkda0xf10by2lpnr57qsa9ym2ga8sh3l3phg793v62s"; libraryHaskellDepends = [ array base cairo colour hmatrix mtl pango transformers ]; @@ -236509,6 +236835,8 @@ self: { pname = "polysemy"; version = "1.9.1.3"; sha256 = "0ms5d731by2rlwp3fxias8jfpdjih0k96rs8mqrycyyfsjxxilb8"; + revision = "1"; + editedCabalFile = "0a4m860wgk2wx55x93xia9dx29bj27f1dkvcz1q7b0jgjyvffc58"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ async base containers first-class-families mtl stm syb @@ -241443,16 +241771,16 @@ self: { }) {}; "primesieve" = callPackage - ({ mkDerivation, base, foundation, primesieve }: + ({ mkDerivation, base, basement, foundation, primesieve }: mkDerivation { pname = "primesieve"; - version = "0.1.0.1"; - sha256 = "17fmja87sr6lpq6qjmn31zx6y1cxhc65amfza22w07480wk7lhp2"; + version = "0.2.0"; + sha256 = "0bhh81479i1nz9n7013www1203yzr4dakw2jghpdmzrlj4r6m4iw"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base foundation ]; + libraryHaskellDepends = [ base basement foundation ]; + librarySystemDepends = [ primesieve ]; executableHaskellDepends = [ base foundation ]; - executableSystemDepends = [ primesieve ]; description = "FFI bindings for the primesieve library"; license = lib.licenses.mit; }) {inherit (pkgs) primesieve;}; @@ -241525,8 +241853,8 @@ self: { ({ mkDerivation, base, primitive, primitive-unlifted }: mkDerivation { pname = "primitive-atomic"; - version = "0.1.0.1"; - sha256 = "0q7lgirw0a75cd0157xq705wnns45d4nx2gfgmvvx0qi6rzvx45s"; + version = "0.1.0.2"; + sha256 = "15w7mkaww0szfrzxl9ryw1z0qmqyx1ws3hpwq7ja259vrc43rkbk"; libraryHaskellDepends = [ base primitive primitive-unlifted ]; testHaskellDepends = [ base primitive primitive-unlifted ]; description = "Wrappers for primops around atomic operations"; @@ -242618,8 +242946,8 @@ self: { pname = "product-profunctors"; version = "0.11.1.1"; sha256 = "1nhwpfjz4iz30h8q7d40hlibqqymvmcf6wmbl6h3212d54hqdgiz"; - revision = "3"; - editedCabalFile = "0a9i5gxa5ls17vj6blymfl63zndk887mylc4k7bzj014xl177hsg"; + revision = "4"; + editedCabalFile = "18jc284wsvv8kjxb36j7i1iashpizs5yrqjzq1i1r2yzzq9zplll"; libraryHaskellDepends = [ base bifunctors contravariant profunctors tagged template-haskell th-abstraction @@ -245218,6 +245546,38 @@ self: { license = lib.licenses.asl20; }) {}; + "pure-sum" = callPackage + ({ mkDerivation, base, hspec, hspec-core, hspec-discover, text + , text-manipulate + }: + mkDerivation { + pname = "pure-sum"; + version = "0.1.0.0"; + sha256 = "12yn8cj5vzwm4z2vnvclw6x6r17jzhzc29rv7m1mpvgmh174d9jx"; + libraryHaskellDepends = [ base text text-manipulate ]; + testHaskellDepends = [ base hspec hspec-core hspec-discover text ]; + testToolDepends = [ hspec-discover ]; + description = "Derive fromString/toString-like for pure sum types"; + license = lib.licenses.isc; + }) {}; + + "pure-sum-aeson" = callPackage + ({ mkDerivation, aeson, base, containers, hspec, hspec-core + , hspec-discover, pure-sum, text + }: + mkDerivation { + pname = "pure-sum-aeson"; + version = "0.1.0.0"; + sha256 = "08jcm06gm8a6x5b8m6j2l6xz8h8k1y6x3mclsl9lc86whmj3vvk2"; + libraryHaskellDepends = [ aeson base pure-sum text ]; + testHaskellDepends = [ + aeson base containers hspec hspec-core hspec-discover + ]; + testToolDepends = [ hspec-discover ]; + description = "Derive fromString/toString-like for pure sum types (aeson instances)"; + license = lib.licenses.isc; + }) {}; + "pure-zlib" = callPackage ({ mkDerivation, array, base, base-compat, bytestring , bytestring-builder, containers, criterion, filepath, ghc-prim @@ -247155,8 +247515,8 @@ self: { }: mkDerivation { pname = "quic"; - version = "0.1.17"; - sha256 = "0p4h0s1hyndhqmwfsm0wqk92bq1sw14wk1idc52khyh6rl1a7bdb"; + version = "0.1.18"; + sha256 = "18j2fn7qwzvbn4931bls78pwh1dn3gic8sk1vg44l5b2mhfgr43b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -247356,15 +247716,16 @@ self: { "quickcheck-dynamic" = callPackage ({ mkDerivation, base, containers, mtl, QuickCheck, random, stm - , tasty, tasty-quickcheck + , tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "quickcheck-dynamic"; - version = "3.4.0"; - sha256 = "0ibz99d7vplscc9dym151x28n7a44s3b0ingn5xg59kjl8ki86xx"; + version = "3.4.1"; + sha256 = "07nixdv2x5dpbsak1mgfd7wjyjlp9nxilghx9v23x8j09257vdj9"; libraryHaskellDepends = [ base containers mtl QuickCheck random ]; testHaskellDepends = [ - base containers mtl QuickCheck stm tasty tasty-quickcheck + base containers mtl QuickCheck stm tasty tasty-hunit + tasty-quickcheck ]; description = "A library for stateful property-based testing"; license = lib.licenses.asl20; @@ -247465,8 +247826,8 @@ self: { }: mkDerivation { pname = "quickcheck-lockstep"; - version = "0.4.0"; - sha256 = "06aifdyb256qxs6miwbr0jmp5840cwy33sy0ra66w1abwvimmwgf"; + version = "0.5.0"; + sha256 = "0ap8qgv33a6rwvvplmmf2hh68hk257l0maznkvlmi7cds6z90bk4"; libraryHaskellDepends = [ base constraints containers mtl QuickCheck quickcheck-dynamic ]; @@ -250515,8 +250876,8 @@ self: { }: mkDerivation { pname = "rdf4h"; - version = "5.0.1"; - sha256 = "0i6sza600fzrk92pp9qc4ji361js5adg7ijf30hb9fdl854hjgk9"; + version = "5.1.0"; + sha256 = "09avqww8aw3lqlcfji3j9yc8szll264mv2mzkm6pdq5bzw7z460w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -251871,6 +252232,8 @@ self: { pname = "recursion-schemes"; version = "5.2.2.5"; sha256 = "1v4p9ms35sszi5f9f2pnfxhfpypwqj9pmhycc7ghlnnxsvarpdsw"; + revision = "1"; + editedCabalFile = "0rz78i40nsk3jywkdssqhla8vpbyhrdd95js5ncxwc0p6s5xp4h9"; libraryHaskellDepends = [ base comonad containers data-fix free template-haskell th-abstraction transformers @@ -254844,26 +255207,29 @@ self: { }) {}; "rel8" = callPackage - ({ mkDerivation, aeson, base, bifunctors, bytestring - , case-insensitive, comonad, containers, contravariant, hasql - , hasql-transaction, hedgehog, mmorph, opaleye, pretty - , product-profunctors, profunctors, scientific, semialign + ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base + , base-compat, base16, bifunctors, bytestring, case-insensitive + , comonad, containers, contravariant, data-dword, data-textual + , hasql, hasql-transaction, hedgehog, mmorph, network-ip, opaleye + , pretty, product-profunctors, profunctors, scientific, semialign , semigroupoids, tasty, tasty-hedgehog, text, these, time - , tmp-postgres, transformers, uuid + , tmp-postgres, transformers, utf8-string, uuid, vector }: mkDerivation { pname = "rel8"; - version = "1.4.1.0"; - sha256 = "0590pjiphpknxnc3g4y3f3rf134q9z5nbwrrbq81r1gx4nxb8d6n"; + version = "1.5.0.0"; + sha256 = "01g1ras7byy05x99gzh3pj4xzsm1qxx3j6qiy1qnzhvrwjifbc5w"; libraryHaskellDepends = [ - aeson base bifunctors bytestring case-insensitive comonad - contravariant hasql opaleye pretty product-profunctors profunctors - scientific semialign semigroupoids text these time uuid + aeson attoparsec attoparsec-aeson base base-compat base16 + bifunctors bytestring case-insensitive comonad contravariant + data-textual hasql network-ip opaleye pretty product-profunctors + profunctors scientific semialign semigroupoids text these time + transformers utf8-string uuid vector ]; testHaskellDepends = [ - base bytestring case-insensitive containers hasql hasql-transaction - hedgehog mmorph scientific tasty tasty-hedgehog text time - tmp-postgres transformers uuid + base bytestring case-insensitive containers data-dword hasql + hasql-transaction hedgehog mmorph network-ip scientific tasty + tasty-hedgehog text time tmp-postgres transformers uuid ]; description = "Hey! Hey! Can u rel8?"; license = lib.licenses.bsd3; @@ -258651,26 +259017,29 @@ self: { }) {}; "risk-weaver" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, file-embed - , filepath, inline-c, JuicyPixels, optparse-applicative, random - , safe-exceptions, sixel, text, transformers, vector + ({ mkDerivation, aeson, async, base, bytestring, containers + , deepseq, file-embed, filepath, inline-c, JuicyPixels + , optparse-applicative, parallel, random, safe-exceptions, sixel + , text, transformers, vector }: mkDerivation { pname = "risk-weaver"; - version = "0.1.0.1"; - sha256 = "0hbr37lxawg5d5azgpdih2rqhl1jyfz803ds1vhg12d5vxwgfdz1"; + version = "0.1.0.2"; + sha256 = "11jzmh19bhx6w1qps5cqzm1cnfmj2w443zcnqlq8rjzfbrk69lms"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring containers file-embed filepath inline-c - JuicyPixels optparse-applicative random safe-exceptions sixel text - transformers vector + aeson async base bytestring containers deepseq file-embed filepath + inline-c JuicyPixels optparse-applicative parallel random + safe-exceptions sixel text transformers vector + ]; + executableHaskellDepends = [ + base containers filepath JuicyPixels parallel text transformers + vector ]; - executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A DSL for Risk-oriented Object Detection Requirements"; license = lib.licenses.mit; - mainProgram = "risk-weaver-exe"; }) {}; "rison" = callPackage @@ -260465,19 +260834,6 @@ self: { }) {}; "rss" = callPackage - ({ mkDerivation, base, HaXml, network, network-uri, time }: - mkDerivation { - pname = "rss"; - version = "3000.2.0.7"; - sha256 = "0z48xb610k1h29rg03q19y08fp78agxp2gr48innw5y3rz00s6ym"; - revision = "7"; - editedCabalFile = "0wkldbjhfyik5dv8rcgyb8w2q4nl4kbajdhrckc4a0d89dzmk3d0"; - libraryHaskellDepends = [ base HaXml network network-uri time ]; - description = "A library for generating RSS 2.0 feeds."; - license = lib.licenses.publicDomain; - }) {}; - - "rss_3000_2_0_8" = callPackage ({ mkDerivation, base, HaXml, network-uri, time }: mkDerivation { pname = "rss"; @@ -260486,7 +260842,6 @@ self: { libraryHaskellDepends = [ base HaXml network-uri time ]; description = "A library for generating RSS 2.0 feeds."; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "rss-conduit" = callPackage @@ -261260,8 +261615,8 @@ self: { }: mkDerivation { pname = "safe-coloured-text"; - version = "0.2.0.1"; - sha256 = "0n8pkdy7v1c3c14fpbwkrib5vmmviqv9ysl7bcm6g3p23qi4lq5i"; + version = "0.2.0.2"; + sha256 = "0bzg4czc2grv4bjc52q9gzy5crj2qwpv4yppkgzjwlv087594as8"; libraryHaskellDepends = [ base bytestring text validity validity-bytestring validity-text ]; @@ -261269,6 +261624,22 @@ self: { license = lib.licenses.mit; }) {}; + "safe-coloured-text_0_3_0_1" = callPackage + ({ mkDerivation, base, bytestring, text, validity + , validity-bytestring, validity-text + }: + mkDerivation { + pname = "safe-coloured-text"; + version = "0.3.0.1"; + sha256 = "1m0a8ffwbrj13bxzv6zsa5la6711xd94fxpbixwv1jb8r43zhbf6"; + libraryHaskellDepends = [ + base bytestring text validity validity-bytestring validity-text + ]; + description = "Safely output coloured text"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "safe-coloured-text-gen" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-bytestring , genvalidity-sydtest, genvalidity-text, safe-coloured-text @@ -261289,6 +261660,27 @@ self: { license = lib.licenses.mit; }) {}; + "safe-coloured-text-gen_0_0_0_3" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-bytestring + , genvalidity-sydtest, genvalidity-text, safe-coloured-text + , sydtest, sydtest-discover, text + }: + mkDerivation { + pname = "safe-coloured-text-gen"; + version = "0.0.0.3"; + sha256 = "14lyq7xlpi5dk4g8frv0s675d1hfjj2xfxxz6j7fxkci13qf7n1h"; + libraryHaskellDepends = [ + base genvalidity genvalidity-bytestring genvalidity-text + safe-coloured-text + ]; + testHaskellDepends = [ + base genvalidity-sydtest safe-coloured-text sydtest text + ]; + testToolDepends = [ sydtest-discover ]; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "safe-coloured-text-layout" = callPackage ({ mkDerivation, base, bytestring, safe-coloured-text, sydtest , sydtest-discover, text, validity @@ -261308,6 +261700,25 @@ self: { broken = true; }) {}; + "safe-coloured-text-layout_0_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, safe-coloured-text, sydtest + , sydtest-discover, text, validity + }: + mkDerivation { + pname = "safe-coloured-text-layout"; + version = "0.1.0.0"; + sha256 = "1d964dh6fa1b5ldrndl9pc0169fm4y5m1lxv28an3y13dd6z6mrc"; + libraryHaskellDepends = [ base safe-coloured-text text validity ]; + testHaskellDepends = [ + base bytestring safe-coloured-text sydtest text + ]; + testToolDepends = [ sydtest-discover ]; + description = "Safely layout output coloured text"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "safe-coloured-text-layout-gen" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-sydtest , safe-coloured-text, safe-coloured-text-gen @@ -261340,6 +261751,18 @@ self: { license = lib.licenses.mit; }) {}; + "safe-coloured-text-terminfo_0_2_0_0" = callPackage + ({ mkDerivation, base, safe-coloured-text, terminfo }: + mkDerivation { + pname = "safe-coloured-text-terminfo"; + version = "0.2.0.0"; + sha256 = "0lnqkhihkklyi1da2lvv41h9z5lg60b03zx1c856s07aghm2iwfj"; + libraryHaskellDepends = [ base safe-coloured-text terminfo ]; + description = "Safely output coloured text"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "safe-coupling" = callPackage ({ mkDerivation, HUnit, liquid-base, liquid-containers , liquid-prelude, liquidhaskell, probability, rest-rewrite, sort @@ -262998,8 +263421,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "5.0.5"; - sha256 = "172srcjmk6vqbnfl8l10a9a5bnpn5vvmccwj5cxpshaj387ap4j0"; + version = "5.0.7"; + sha256 = "1lj4zkpyarqhn3k9lnhlkhdmad2q4i4c189civ5ncs55lp6qhybp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -263101,7 +263524,7 @@ self: { broken = true; }) {inherit (pkgs) z3;}; - "sbv_10_6" = callPackage + "sbv_10_7" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , deepseq, directory, filepath, libBF, mtl, pretty, process , QuickCheck, random, syb, tasty, tasty-bench, tasty-golden @@ -263110,8 +263533,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "10.6"; - sha256 = "0in7cb59m4h547kq9wss9kqcjpcignai9ybgwj7ci1lnynjj4h2k"; + version = "10.7"; + sha256 = "02j3rsj0f5ggp5nzbxw3pq0jqmkw8ik8jgnwi6fgnkm2gjwjwm3l"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers deepseq directory filepath libBF mtl @@ -263155,8 +263578,8 @@ self: { }: mkDerivation { pname = "sbvPlugin"; - version = "9.8.1"; - sha256 = "12l23shwygvc7xs0scbd2w98brwcx52c13kgszm2xaabfa9vsnhq"; + version = "9.8.2"; + sha256 = "1i1v8jhb2ms41ij1hj5bx9bhn8ig9rl45jn493i61ykv7md3i2m5"; libraryHaskellDepends = [ base containers ghc ghc-prim mtl sbv template-haskell ]; @@ -266104,8 +266527,8 @@ self: { pname = "semaphore-compat"; version = "1.0.0"; sha256 = "1qnrdqayrdazmsflh37p1igd25nh1cfgn4k1v3jwwb0w0amnyvhw"; - revision = "1"; - editedCabalFile = "05rhz3y90xwlac86akgyil85s0vqq5d2f924cn61l3jvmcn29mlf"; + revision = "2"; + editedCabalFile = "17abqbz6swzwilbfiv6rr6p8j81w4x9hr5vmx5pa6284liv61xx8"; libraryHaskellDepends = [ base exceptions unix ]; description = "Cross-platform abstraction for system semaphores"; license = lib.licenses.bsd3; @@ -270828,8 +271251,8 @@ self: { pname = "set-cover"; version = "0.1.1"; sha256 = "04jjcmjll0azz24rx91p0dp5b8ya5jc0qacr21764ri1dbkfflgw"; - revision = "2"; - editedCabalFile = "05kisz47xka696fwszlxkvna2zv5qczaww8mpmn1g66sdppa5kzg"; + revision = "3"; + editedCabalFile = "1xx2ibsqqc8kiwh8b82lgj5xigrdk8cnvqz6l57bfwn9jlrh82yg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -276092,32 +276515,6 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.14.1"; - sha256 = "1fyi6hw7mhm12isl9005q16b50z3594f8vb9bdf7llgzszbxa2js"; - configureFlags = [ "-fexecutable" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary containers skylighting-core skylighting-format-ansi - skylighting-format-blaze-html skylighting-format-context - skylighting-format-latex - ]; - executableHaskellDepends = [ - base blaze-html bytestring containers pretty-show text - ]; - description = "syntax highlighting library"; - license = lib.licenses.gpl2Only; - mainProgram = "skylighting"; - }) {}; - - "skylighting_0_14_1_1" = callPackage - ({ mkDerivation, base, binary, blaze-html, bytestring, containers - , pretty-show, skylighting-core, skylighting-format-ansi - , skylighting-format-blaze-html, skylighting-format-context - , skylighting-format-latex, text - }: - mkDerivation { - pname = "skylighting"; version = "0.14.1.1"; sha256 = "0x1yq3891ssq7mfhcb4909a1553a2pj2rf3wr4y49q76p4r8jx3k"; configureFlags = [ "-fexecutable" ]; @@ -276133,7 +276530,6 @@ self: { ]; description = "syntax highlighting library"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; mainProgram = "skylighting"; }) {}; @@ -276146,36 +276542,6 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.14.1"; - sha256 = "1i63id4gjvrifzqfagz16h4j395amkd7rc57my48xxgsxs20ag4b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring binary bytestring - case-insensitive colour containers directory filepath mtl safe text - transformers utf8-string xml-conduit - ]; - testHaskellDepends = [ - aeson base bytestring containers Diff directory filepath - pretty-show QuickCheck tasty tasty-golden tasty-hunit - tasty-quickcheck text - ]; - benchmarkHaskellDepends = [ - base containers criterion filepath text - ]; - description = "syntax highlighting library"; - license = lib.licenses.bsd3; - }) {}; - - "skylighting-core_0_14_1_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary - , bytestring, case-insensitive, colour, containers, criterion, Diff - , directory, filepath, mtl, pretty-show, QuickCheck, safe, tasty - , tasty-golden, tasty-hunit, tasty-quickcheck, text, transformers - , utf8-string, xml-conduit - }: - mkDerivation { - pname = "skylighting-core"; version = "0.14.1.1"; sha256 = "112wmgyzs3x939rk1i7fs604ijs25zmbk85r98xnqf7d3hmdjxjq"; isLibrary = true; @@ -276195,7 +276561,6 @@ self: { ]; description = "syntax highlighting library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "skylighting-extensions" = callPackage @@ -276273,8 +276638,8 @@ self: { ({ mkDerivation, base, containers, lucid, skylighting-core, text }: mkDerivation { pname = "skylighting-lucid"; - version = "1.0.3"; - sha256 = "04a0qh451nwkrmgi9a6vda0zpyq8q0jhm80ppfcyrdgr0wh7mhi6"; + version = "1.0.4"; + sha256 = "136sszph2a7m5dj21vb0c8zf6bls9gy715vlvykk2f0lzrqg288q"; libraryHaskellDepends = [ base containers lucid skylighting-core text ]; @@ -277649,17 +278014,17 @@ self: { "smtp-mail" = callPackage ({ mkDerivation, array, base, base16-bytestring, base64-bytestring - , bytestring, connection, cryptonite, filepath, memory, mime-mail - , network, network-bsd, text + , bytestring, crypton-connection, cryptonite, filepath, memory + , mime-mail, network, network-bsd, text }: mkDerivation { pname = "smtp-mail"; - version = "0.3.0.0"; - sha256 = "0q81m4mi43cd0f1azm6984xw3qw2s6ygszdn86j5z3g5sjj5dax4"; + version = "0.4.0.0"; + sha256 = "0j95vvk2hh1vp4lv59gppfnpavy3mlz4bzlr6l29glz53lmc8bn5"; libraryHaskellDepends = [ array base base16-bytestring base64-bytestring bytestring - connection cryptonite filepath memory mime-mail network network-bsd - text + crypton-connection cryptonite filepath memory mime-mail network + network-bsd text ]; description = "Simple email sending via SMTP"; license = lib.licenses.bsd3; @@ -281405,15 +281770,15 @@ self: { "sphinx" = callPackage ({ mkDerivation, base, binary, bytestring, data-binary-ieee754 - , network, text, text-icu, xml + , exceptions, network-simple, text, text-icu, xml }: mkDerivation { pname = "sphinx"; - version = "0.6.0.2"; - sha256 = "1px6lxxy7a34jni83l68nnhw40751g6pmvazplhc4wbfrv37gabn"; + version = "0.6.1"; + sha256 = "1pywsign7rab90jklrkqq3xh2242j2vkpnyxajy9n2wm0h0v4045"; libraryHaskellDepends = [ - base binary bytestring data-binary-ieee754 network text text-icu - xml + base binary bytestring data-binary-ieee754 exceptions + network-simple text text-icu xml ]; description = "Haskell bindings to the Sphinx full-text searching daemon"; license = lib.licenses.bsd3; @@ -282211,26 +282576,6 @@ self: { }: mkDerivation { pname = "sqids"; - version = "0.2.1.0"; - sha256 = "16qw5mdvyhbp3m8z6wrw0qzpimnndp4qhwzqdbxzdi528wyi1b3s"; - libraryHaskellDepends = [ - base bytestring containers mtl text transformers - ]; - testHaskellDepends = [ - base bytestring containers hspec mtl split text transformers - ]; - description = "A small library that lets you generate YouTube-looking IDs from numbers"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "sqids_0_2_2_0" = callPackage - ({ mkDerivation, base, bytestring, containers, hspec, mtl, split - , text, transformers - }: - mkDerivation { - pname = "sqids"; version = "0.2.2.0"; sha256 = "137ai4fmvfygz0wv6nhzxc721va985mj35h62cda8l8925dx72iq"; libraryHaskellDepends = [ @@ -283220,8 +283565,8 @@ self: { }: mkDerivation { pname = "stack"; - version = "2.15.3"; - sha256 = "05w6azg9p8x0vy5zhnlbl8vmcvgm5gl2zjzln6x6sgzcaqzzf0bb"; + version = "2.15.5"; + sha256 = "0q4jyaj8gn74i5sm5dqnwz9ppbih33jd2axbz3yijvv8m1dbn1cd"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -283302,15 +283647,15 @@ self: { mainProgram = "stack-all"; }) {}; - "stack-all_0_5" = callPackage + "stack-all_0_5_1" = callPackage ({ mkDerivation, aeson, base, cached-json-file, config-ini , directory, extra, filepath, http-query, process, simple-cmd , simple-cmd-args, text }: mkDerivation { pname = "stack-all"; - version = "0.5"; - sha256 = "15mv7cgrhhpg2dmsvfkq8s54m8v2mby46jyk26kxl63spxmkynh6"; + version = "0.5.1"; + sha256 = "0s1kxilmzrdwf44gx7wrpxd443kyfwx435ps68hzv0qyz5q8k5nw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -288517,6 +288862,8 @@ self: { pname = "structs"; version = "0.1.9"; sha256 = "033vx729k9jn4w4hs3kp8nlnf0ylsqgg3q4cmb7zjfpgk4bk511w"; + revision = "1"; + editedCabalFile = "1kqpzh7grxz0any100sk42v54idmvh27zh8k9q0yq684frmwf4mh"; libraryHaskellDepends = [ base deepseq ghc-prim primitive template-haskell th-abstraction ]; @@ -293242,8 +293589,8 @@ self: { pname = "tagchup"; version = "0.4.1.2"; sha256 = "0zlrdlb0f6dhhx163i62ljh1spr0d5gcf0c96m5z7nzq529qq792"; - revision = "1"; - editedCabalFile = "12rbb1y40z1yln62pdd8698zmgxhmvs1sib9lzakqmbgj3ckpclq"; + revision = "2"; + editedCabalFile = "0b4mkrablv5gdhvf5l1ni3qyibh9hrrscbi04jf2hxalxnk9by4b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -297473,6 +297820,8 @@ self: { pname = "terminfo"; version = "0.4.1.6"; sha256 = "0kx0q2ihnhk461hnkvy9g2nmdskqhik9vwqji8z741zy0az4mmb3"; + revision = "1"; + editedCabalFile = "00zkc3d6lvxkajjr6ypz2amnixngwf0ni8d1q8njxhhvr5s00yk7"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ ncurses ]; description = "Haskell bindings to the terminfo library"; @@ -297700,6 +298049,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "test-certs" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, HsOpenSSL + , hspec, QuickCheck, temporary, text, time, tls + }: + mkDerivation { + pname = "test-certs"; + version = "0.1.0.2"; + sha256 = "09n7893q67wy266mpwp5nkywjxb1jz46cm996qvy62bdc6gi17a9"; + libraryHaskellDepends = [ + base bytestring filepath HsOpenSSL temporary text time + ]; + testHaskellDepends = [ base directory hspec QuickCheck tls ]; + description = "create temporary SSL certificates in tests"; + license = lib.licenses.bsd3; + }) {}; + "test-fixture" = callPackage ({ mkDerivation, base, data-default-class, exceptions , haskell-src-exts, haskell-src-meta, hspec, hspec-discover, mtl @@ -298458,29 +298823,6 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.12.8.6"; - sha256 = "17fs83q1wb2s8j8ia5c36108wibm8pvdqhz4zcflvdivml3pm8vv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers mtl pandoc-types parsec split syb text - typst-symbols xml - ]; - testHaskellDepends = [ - base bytestring directory filepath pretty-show tagged tasty - tasty-golden text xml - ]; - description = "Conversion between math formats"; - license = lib.licenses.gpl2Only; - }) {}; - - "texmath_0_12_8_7" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, pandoc-types, parsec, pretty-show, split, syb, tagged, tasty - , tasty-golden, text, typst-symbols, xml - }: - mkDerivation { - pname = "texmath"; version = "0.12.8.7"; sha256 = "0i3ngkq87y6lvgfd6ky4zya6qz5n70ypb9yjmxzp7d6844p36g6k"; isLibrary = true; @@ -298495,7 +298837,6 @@ self: { ]; description = "Conversion between math formats"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "texrunner" = callPackage @@ -299378,8 +299719,8 @@ self: { pname = "text-show"; version = "3.10.4"; sha256 = "0kjpl9wbvn5zcpwjyrvdnkcp260rizff598cmqh4py8225fl5bmz"; - revision = "2"; - editedCabalFile = "1wwpgl9y775604ypx86p8kya4xsin7h9bl21b6ris74k6lnabsrz"; + revision = "3"; + editedCabalFile = "0zsds6226kymk9a6jq9hc45knp3rjwc3rmiar0kccjzd6khf7s9c"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers generic-deriving ghc-boot-th ghc-prim @@ -299799,14 +300140,12 @@ self: { license = lib.licenses.isc; }) {}; - "th-abstraction_0_6_0_0" = callPackage + "th-abstraction_0_7_0_0" = callPackage ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { pname = "th-abstraction"; - version = "0.6.0.0"; - sha256 = "0c0sqn9bz2rgrqdfkricbs2p6vn7is89qcpqw7hvc00c3z56xsk9"; - revision = "1"; - editedCabalFile = "0z7cn1qcnkslajjqcma23sh0qglbpvb5y9bgbzfzqal1lak9z5fq"; + version = "0.7.0.0"; + sha256 = "0897na3f8nj59ax1gv0a46rrrz8i4ad0id6b3vxav91g5xhlr1dj"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -299878,10 +300217,8 @@ self: { }: mkDerivation { pname = "th-compat"; - version = "0.1.4"; - sha256 = "1f5ssi24mnhmmi91dl5ddg2jwci6akwlznqggf56nyxl9b0pmyfq"; - revision = "4"; - editedCabalFile = "0drd28785137wfwy2say899qviz5ck2nrnv85lyvihf1xiwwdwpm"; + version = "0.1.5"; + sha256 = "07ia72hl6c1rqx1gl3zpvig7d8sw2ssbgf4wq1ipgbdgqypmzxc1"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base base-compat hspec mtl template-haskell @@ -299937,6 +300274,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-deepstrict" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, mtl + , tasty, tasty-golden, template-haskell, th-abstraction, th-orphans + , unordered-containers + }: + mkDerivation { + pname = "th-deepstrict"; + version = "0.1.1.0"; + sha256 = "0y0wlgzsm44sbwbchg4pqyb0s398aqjmd1awgd019bp29gzkd1hp"; + libraryHaskellDepends = [ + base containers mtl template-haskell th-abstraction th-orphans + ]; + testHaskellDepends = [ + base bytestring containers directory tasty tasty-golden + template-haskell unordered-containers + ]; + description = "Check that datatypes are deep strict using Template Haskell"; + license = lib.licenses.bsd3; + }) {}; + "th-desugar" = callPackage ({ mkDerivation, base, containers, ghc-prim, hspec, HUnit, mtl , ordered-containers, syb, template-haskell, th-abstraction @@ -299969,6 +300326,8 @@ self: { pname = "th-desugar"; version = "1.16"; sha256 = "0442hqc2b0a1rqcwdlng63bfqa80b2sws414lr08q9v1sgh8gjsf"; + revision = "1"; + editedCabalFile = "18qjikbyjzbhickq11hrn5ill89jdfdzbdx3q2s3630k4g8g2qzi"; libraryHaskellDepends = [ base containers ghc-prim mtl ordered-containers syb template-haskell th-abstraction th-orphans transformers-compat @@ -300017,8 +300376,8 @@ self: { pname = "th-expand-syns"; version = "0.4.11.0"; sha256 = "1l7pkc16vnjgiam31745av14j7ngnr5mqmgp77xwd3h7fg75kkca"; - revision = "2"; - editedCabalFile = "08g28p57w0i61x2f2036aqxp4ilhchy7h3dbd0ncbq17ba6x9hfi"; + revision = "3"; + editedCabalFile = "1wgylchq9q30yf1f19rr6pvh7mkpwzdy4ij2r7174fjb1wkgnnx7"; libraryHaskellDepends = [ base containers syb template-haskell th-abstraction ]; @@ -300207,6 +300566,8 @@ self: { pname = "th-lift"; version = "0.8.4"; sha256 = "06x6njyn6p6shwj5n1znq017vwalr867ziwbwzimz9jbilipgigr"; + revision = "2"; + editedCabalFile = "1cwc4q408b9pina7069hi8v3m9nqa5c6sm8lamr5ssialiwchcig"; libraryHaskellDepends = [ base ghc-prim template-haskell th-abstraction ]; @@ -303305,7 +303666,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "tls_2_0_1" = callPackage + "tls_2_0_2" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base , base16-bytestring, bytestring, cereal, crypton, crypton-x509 , crypton-x509-store, crypton-x509-validation, data-default-class @@ -303314,10 +303675,8 @@ self: { }: mkDerivation { pname = "tls"; - version = "2.0.1"; - sha256 = "1176gdzhwbnp3i1dp555la9ch5kgr6k13zn5as6d172a76q8qrcq"; - revision = "1"; - editedCabalFile = "0nrzk8yjbnzw1d4cjw03hayny1jx99a6y131903i5jdfafrqsla0"; + version = "2.0.2"; + sha256 = "188m4p63h3wl0rjh8w99amyl6y0r3camk76f5ivnd56vxf3cx74g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -304221,6 +304580,8 @@ self: { pname = "toml-parser"; version = "2.0.0.0"; sha256 = "1nvrmlgmdvm7p16fywds4wnpyavyq7sk0p3zlqy9dci33qb3kzc7"; + revision = "1"; + editedCabalFile = "0dkwkz9mq6y3cs7c4knifxqcbgjd48ji0qh4062kql10gdm9glm8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -307720,6 +308081,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "tuplehash-utils" = callPackage + ({ mkDerivation, base, bytestring, integer-logarithms }: + mkDerivation { + pname = "tuplehash-utils"; + version = "0.0.0.0"; + sha256 = "0djr0hb2ssagv6i9fkgry0v1kd6lb19ha7x2nzwham7kmjgjs4gx"; + libraryHaskellDepends = [ base bytestring integer-logarithms ]; + description = "Left Encode and friends from SHA-3's TupleHash"; + license = lib.licenses.asl20; + }) {}; + "tupleinstances" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -310346,6 +310718,18 @@ self: { license = lib.licenses.mit; }) {}; + "typst-symbols_0_1_6" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "typst-symbols"; + version = "0.1.6"; + sha256 = "17a2grflk67vs68b2pxygvk7p50rj9fb3ri7fcwa19j9jnhg4zwl"; + libraryHaskellDepends = [ base text ]; + description = "Symbol and emoji lookup for typst language"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tyro" = callPackage ({ mkDerivation, aeson, base, bytestring, HUnit, protolude , reflection, singletons, test-framework, test-framework-hunit @@ -311166,8 +311550,8 @@ self: { }: mkDerivation { pname = "unbound-generics"; - version = "0.4.3"; - sha256 = "06mafwa6sp0b2vb1dlpjp9bsy6h8f01qrq58c3gwvcy5lrz4hwi4"; + version = "0.4.4"; + sha256 = "1iihh60m2zsl961khxcp82i2i47y35yhxh8835p4f82r487zpdlj"; libraryHaskellDepends = [ ansi-wl-pprint base containers contravariant deepseq exceptions mtl profunctors template-haskell transformers transformers-compat @@ -311616,6 +312000,8 @@ self: { pname = "unicode"; version = "0.0.1.1"; sha256 = "1hgqnplpgaw0pwz0lfr59vmljcf4l5b4ynrhdcic94g18lpsmnvg"; + revision = "1"; + editedCabalFile = "00r1lx5zph98p7mw70hh0ibc2ns49qm6a1wnmv6lddi4sqjg7d6i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers semigroups ]; @@ -312961,32 +313347,6 @@ self: { }: mkDerivation { pname = "universum"; - version = "1.8.2"; - sha256 = "1dhynivkbg59b5m2m90dwxz6wk00im3gihyvigrcqazpfhq4j845"; - libraryHaskellDepends = [ - base bytestring containers deepseq ghc-prim hashable microlens - microlens-mtl mtl safe-exceptions stm text transformers - unordered-containers utf8-string vector - ]; - testHaskellDepends = [ - base bytestring hedgehog tasty tasty-hedgehog text - ]; - testToolDepends = [ tasty-discover ]; - benchmarkHaskellDepends = [ - base containers gauge text unordered-containers - ]; - description = "Custom prelude used in Serokell"; - license = lib.licenses.mit; - }) {}; - - "universum_1_8_2_1" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, gauge - , ghc-prim, hashable, hedgehog, microlens, microlens-mtl, mtl - , safe-exceptions, stm, tasty, tasty-discover, tasty-hedgehog, text - , transformers, unordered-containers, utf8-string, vector - }: - mkDerivation { - pname = "universum"; version = "1.8.2.1"; sha256 = "06kv2p7792r4d7nsq1wx7vw5jy72fjacc2jwmkqfanaaapdr27q9"; libraryHaskellDepends = [ @@ -313003,7 +313363,6 @@ self: { ]; description = "Custom prelude used in Serokell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "unix_2_8_5_0" = callPackage @@ -315097,8 +315456,8 @@ self: { }: mkDerivation { pname = "utxorpc"; - version = "0.0.4.1"; - sha256 = "08xn1jlc3q466cz63j1klkr05shnb3hicrz5i8fpf05cwf88ajl2"; + version = "0.0.4.4"; + sha256 = "0is31qp6vbbbs4qnbbyh2wlcwrh2jkjq4ffml2nb4sbb47cl459z"; libraryHaskellDepends = [ base proto-lens proto-lens-protobuf-types proto-lens-runtime ]; @@ -317820,25 +318179,6 @@ self: { }: mkDerivation { pname = "versions"; - version = "6.0.5"; - sha256 = "0cigjr3jmh3gn02daxan54g57rrq8xirackcz7ri3ziv3fy4ffa1"; - libraryHaskellDepends = [ - base deepseq hashable megaparsec parser-combinators - template-haskell text - ]; - testHaskellDepends = [ - base megaparsec microlens tasty tasty-hunit template-haskell text - ]; - description = "Types and parsers for software version numbers"; - license = lib.licenses.bsd3; - }) {}; - - "versions_6_0_6" = callPackage - ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens - , parser-combinators, tasty, tasty-hunit, template-haskell, text - }: - mkDerivation { - pname = "versions"; version = "6.0.6"; sha256 = "0w73gcg2yyrx5b6msynmpa05q2q1n4qaa59n0l21glz28k7lzyma"; libraryHaskellDepends = [ @@ -317850,7 +318190,6 @@ self: { ]; description = "Types and parsers for software version numbers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "vertexenum" = callPackage @@ -320350,8 +320689,8 @@ self: { }: mkDerivation { pname = "wai-middleware-delegate"; - version = "0.1.4.0"; - sha256 = "0fx6mskb48gmnhhc35ldxl9sgd3hkcy3yb7nmqlfdgmhin9759pv"; + version = "0.1.4.1"; + sha256 = "0hc0x6w2j2incwn3nd253hyq27qi6f4m2h821vygg5n6h20rqnvz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ async base blaze-builder bytestring case-insensitive conduit @@ -321844,15 +322183,16 @@ self: { }) {}; "waterfall-cad" = callPackage - ({ mkDerivation, base, lattices, lens, linear, opencascade-hs - , primitive, resourcet + ({ mkDerivation, base, filepath, lattices, lens, linear + , opencascade-hs, primitive, resourcet }: mkDerivation { pname = "waterfall-cad"; - version = "0.2.1.0"; - sha256 = "044si8pxsjryl8j34haqmly0g4pan2j25b8p7699ywh2c07glwb2"; + version = "0.2.2.0"; + sha256 = "1il6s1mg9k9dhqcwj49a88p0z9zbwi65b2lvsg199rn6klv1jn36"; libraryHaskellDepends = [ - base lattices lens linear opencascade-hs primitive resourcet + base filepath lattices lens linear opencascade-hs primitive + resourcet ]; description = "Declarative CAD/Solid Modeling Library"; license = lib.licenses.lgpl21Only; @@ -321861,19 +322201,21 @@ self: { "waterfall-cad-examples" = callPackage ({ mkDerivation, base, lens, linear, opencascade-hs - , optparse-applicative, waterfall-cad + , optparse-applicative, parsec, parser-combinators, waterfall-cad }: mkDerivation { pname = "waterfall-cad-examples"; - version = "0.2.1.0"; - sha256 = "0b6kk1rj9yxylc1578m7ydal046mcxcvska6r4j7ksa3v8icjvga"; + version = "0.2.2.0"; + sha256 = "0gy9iza13l03h381sm4riccjpn3zbpgy60d6fqhbj5rw1qisad2x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base lens linear opencascade-hs optparse-applicative waterfall-cad + base lens linear opencascade-hs optparse-applicative parsec + parser-combinators waterfall-cad ]; executableHaskellDepends = [ - base lens linear opencascade-hs optparse-applicative waterfall-cad + base lens linear opencascade-hs optparse-applicative parsec + parser-combinators waterfall-cad ]; description = "Examples for Waterfall CAD, a Declarative CAD/Solid Modeling Library"; license = lib.licenses.lgpl21Only; @@ -323096,18 +323438,17 @@ self: { "webgear-core" = callPackage ({ mkDerivation, arrows, base, binary, bytestring, case-insensitive - , cookie, filepath, http-api-data, http-media, http-types, jose - , mime-types, network, tagged, template-haskell, text, wai - , wai-extra + , cookie, http-api-data, http-media, http-types, jose, network + , tagged, template-haskell, text, wai, wai-app-static, wai-extra }: mkDerivation { pname = "webgear-core"; - version = "1.1.1"; - sha256 = "1fndgzkfcn55b9kwx6l3hs2489q1zj6jdk34y3j4x5y8vgf42i7f"; + version = "1.2.0"; + sha256 = "03qp9x4f1hkv6swlrwp6kay104alapqqn5wvswykw6ji1wja0wj2"; libraryHaskellDepends = [ - arrows base binary bytestring case-insensitive cookie filepath - http-api-data http-media http-types jose mime-types network tagged - template-haskell text wai wai-extra + arrows base binary bytestring case-insensitive cookie http-api-data + http-media http-types jose network tagged template-haskell text wai + wai-app-static wai-extra ]; description = "Composable, type-safe library to build HTTP APIs"; license = lib.licenses.mpl20; @@ -323119,8 +323460,8 @@ self: { }: mkDerivation { pname = "webgear-openapi"; - version = "1.1.1"; - sha256 = "1dw4cy4r5fdg9lay7xgw8grpgxij98chi24ckjl3dszyyqk26hgr"; + version = "1.2.0"; + sha256 = "0ym3jvkww6qf5nkrhb7wqp8maw6d03yc6835wp8wva8cj5cf9hy1"; libraryHaskellDepends = [ arrows base http-media http-types insert-ordered-containers lens openapi3 text webgear-core @@ -323131,21 +323472,19 @@ self: { "webgear-server" = callPackage ({ mkDerivation, aeson, arrows, base, base64-bytestring, binary - , bytestring, bytestring-conversion, cookie, http-api-data - , http-media, http-types, jose, monad-time, mtl, QuickCheck - , quickcheck-instances, resourcet, tasty, tasty-hunit - , tasty-quickcheck, text, text-conversions, wai, wai-extra - , webgear-core + , bytestring, cookie, http-api-data, http-media, http-types, jose + , monad-time, mtl, QuickCheck, quickcheck-instances, resourcet + , tasty, tasty-hunit, tasty-quickcheck, text, text-conversions, wai + , wai-extra, webgear-core }: mkDerivation { pname = "webgear-server"; - version = "1.1.1"; - sha256 = "1j7w37ssikqb8jlsnwyg3q03c2krrlv7kj7y3zdykms4y727bw3q"; + version = "1.2.0"; + sha256 = "1pc46dcx3jndc1jaf1bbbhs1z20hvspkiq86y3b60i2vpcbdhwn0"; libraryHaskellDepends = [ - aeson arrows base base64-bytestring binary bytestring - bytestring-conversion cookie http-api-data http-media http-types - jose monad-time mtl resourcet text text-conversions wai wai-extra - webgear-core + aeson arrows base base64-bytestring binary bytestring cookie + http-api-data http-media http-types jose monad-time mtl resourcet + text text-conversions wai wai-extra webgear-core ]; testHaskellDepends = [ base base64-bytestring bytestring http-types QuickCheck @@ -323162,8 +323501,8 @@ self: { }: mkDerivation { pname = "webgear-swagger"; - version = "1.1.1"; - sha256 = "0s1hdw0inwc3a9r6y3jczhwc68akwri14x9kqi3zwbmxb5z0i8aw"; + version = "1.2.0"; + sha256 = "1l1cgixhh8b7myypbr9anv6zbckh9x4h3a5lrwv7znh616n9440a"; libraryHaskellDepends = [ arrows base http-types insert-ordered-containers lens swagger2 text webgear-core @@ -323173,15 +323512,16 @@ self: { }) {}; "webgear-swagger-ui" = callPackage - ({ mkDerivation, base, bytestring, file-embed, http-types - , mime-types, text, webgear-core + ({ mkDerivation, base, bytestring, file-embed, http-types, text + , wai-app-static, webgear-core }: mkDerivation { pname = "webgear-swagger-ui"; - version = "1.1.1"; - sha256 = "0x9clbhvh2ak4lb4kamww37x8pgkr0svad4272a47g1ka9jabw9c"; + version = "1.2.0"; + sha256 = "1a40blmnwx1xia8r6dhk710mabxnqf31cqh0rhjzjlwsv96rsk9a"; libraryHaskellDepends = [ - base bytestring file-embed http-types mime-types text webgear-core + base bytestring file-embed http-types text wai-app-static + webgear-core ]; description = "Host swagger UI based on WebGear API specifications"; license = lib.licenses.mpl20; @@ -324692,8 +325032,8 @@ self: { }: mkDerivation { pname = "witch"; - version = "1.2.0.4"; - sha256 = "0yif1i7i83y51ky7j085b1sq9cx3gjn4vdcb8zpjwrzicw9m2nvz"; + version = "1.2.1.0"; + sha256 = "0kwg2qdjl3hfg3y7qi8lqsnrvfc80w1mkkwi4ikay8mzkp61snb3"; libraryHaskellDepends = [ base bytestring containers tagged template-haskell text time ]; @@ -326914,8 +327254,8 @@ self: { }: mkDerivation { pname = "x509-ocsp"; - version = "0.1.1.0"; - sha256 = "09crd65swq1qw7wyn87xmfwdm3rqn4pcaz09hhdvv8v9vq9n734g"; + version = "0.2.0.0"; + sha256 = "0vfk58yyk08w1752addpp4s2bn4d9395k7ajd5jal6wab400qgk6"; enableSeparateDataOutput = true; libraryHaskellDepends = [ asn1-encoding asn1-types base bytestring cryptohash-sha1 @@ -327437,8 +327777,8 @@ self: { ({ mkDerivation, array, base, directory, mtl, old-time, process }: mkDerivation { pname = "xilinx-lava"; - version = "5.0.1.9"; - sha256 = "13g44483bcgbfi3366m7l49z40prvr2abml6h6vcjbjnc575cs37"; + version = "5.0.2.0"; + sha256 = "0dznx1l9xrw9pjcyj0mp7x7j11l5k1dm57mgppjn153lj9dag4kl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -327714,6 +328054,8 @@ self: { pname = "xml-basic"; version = "0.1.3.2"; sha256 = "0kj26v20rakmmxk0gf6dccmxkcv39mnpcj9dfx45yr27a53b8170"; + revision = "1"; + editedCabalFile = "1nb63asl2sp9cy4hgmlz6n4vaylsssxqk42507r5hq9jjqss7rc8"; libraryHaskellDepends = [ base containers data-accessor explicit-exception semigroups utility-ht @@ -329406,6 +329748,8 @@ self: { pname = "xxhash"; version = "0.0.2"; sha256 = "09rgxchqnaalpjbgy20y1g5p6g9asfwfj37px6qpl6ypchawfp2g"; + revision = "2"; + editedCabalFile = "0g5j3fb5l0zr9c3vbn63g2cdib33s90rani9yhgsr0c0p0jv7maz"; libraryHaskellDepends = [ base bytestring crypto-api tagged ]; testHaskellDepends = [ base bytestring hspec QuickCheck ]; benchmarkHaskellDepends = [ @@ -329435,6 +329779,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "xxhash-ffi_0_3" = callPackage + ({ mkDerivation, base, bytestring, deepseq, digest, hashable + , libxxhash, murmur-hash, QuickCheck, tasty, tasty-bench + , tasty-quickcheck, text + }: + mkDerivation { + pname = "xxhash-ffi"; + version = "0.3"; + sha256 = "0cqayny8g0lbafysbyzw43jnf3mijx6smlpzwsfdv3xc3wk42v4r"; + libraryHaskellDepends = [ base bytestring hashable text ]; + libraryPkgconfigDepends = [ libxxhash ]; + testHaskellDepends = [ + base bytestring hashable QuickCheck tasty tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq digest hashable murmur-hash tasty-bench + ]; + description = "Bindings and high-level helpers for xxHash"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {libxxhash = null;}; + "y0l0bot" = callPackage ({ mkDerivation, base, bytestring, containers, mtl, network , old-locale, old-time, safe, split, text, time @@ -330592,17 +330958,19 @@ self: { "yaya" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, comonad, doctest - , either, free, kan-extensions, lens, profunctors, strict - , template-haskell, th-abstraction, transformers + , either, foldable1-classes-compat, free, kan-extensions, lens + , profunctors, strict, template-haskell, th-abstraction + , transformers }: mkDerivation { pname = "yaya"; - version = "0.5.2.1"; - sha256 = "01j92jjcq44fhv723rsmhn5qizvdvq1xaa3p0qljzc34z1910i83"; + version = "0.6.0.0"; + sha256 = "0id4h41rpjm668fhwvv9dcw1733rrnqs0v00vg6m7h11r8nylzs1"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base comonad either free kan-extensions lens profunctors strict - template-haskell th-abstraction transformers + base comonad either foldable1-classes-compat free kan-extensions + lens profunctors strict template-haskell th-abstraction + transformers ]; testHaskellDepends = [ base doctest ]; description = "Total recursion schemes"; @@ -330615,8 +330983,8 @@ self: { }: mkDerivation { pname = "yaya-containers"; - version = "0.1.0.2"; - sha256 = "1ylg2n36jl96iq84ljj6pg7m454mhdf6ffql9jby2cpmz3291i3m"; + version = "0.1.1.0"; + sha256 = "14knwk5sk6h76iy97kxa3s95px3bv2ns9xmcwmhbcrsaf338dyrz"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers yaya ]; testHaskellDepends = [ base doctest ]; @@ -330630,8 +330998,8 @@ self: { }: mkDerivation { pname = "yaya-hedgehog"; - version = "0.2.1.3"; - sha256 = "1q52rf9ay3x8q0ynrg2vxkld7h2c9rg4laq60hylkibmvlxvwpww"; + version = "0.3.0.0"; + sha256 = "08gyij5hlgmcv77gzzcsjak8aw7c7vmnfkrl8f0m6isfdb0lq1gr"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base deriving-compat hedgehog yaya ]; testHaskellDepends = [ @@ -330643,14 +331011,14 @@ self: { "yaya-quickcheck" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, doctest, QuickCheck - , yaya + , splitmix, yaya }: mkDerivation { pname = "yaya-quickcheck"; - version = "0.1.0.2"; - sha256 = "065j2vwjh8gsbb7n650fl7gg1njmw32kgi499mxfp1gz3xbmcjcf"; + version = "0.2.0.0"; + sha256 = "0ihxrf8n2jyiz4v82pnjscii8vm8zsj3n9sbyjrdcn5kx66myaq3"; setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base QuickCheck yaya ]; + libraryHaskellDepends = [ base QuickCheck splitmix yaya ]; testHaskellDepends = [ base doctest ]; description = "QuickCheck testing support for the Yaya recursion scheme library"; license = lib.licenses.agpl3Plus; @@ -330681,8 +331049,8 @@ self: { }: mkDerivation { pname = "yaya-unsafe"; - version = "0.3.3.1"; - sha256 = "07qiyz66a5zq4ksn8j46m6p6r4kqn9p1l2b7cwgwjhhw52c4128s"; + version = "0.4.0.0"; + sha256 = "11g00zsjzrcm4g5b1q8xz5vhzakxqjgl1yz0z0cfnndqmh720s3n"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors comonad free lens yaya ]; testHaskellDepends = [ base doctest hedgehog yaya yaya-hedgehog ]; diff --git a/pkgs/development/libraries/jose/default.nix b/pkgs/development/libraries/jose/default.nix index 656b014b733d4..967886ae86c6d 100644 --- a/pkgs/development/libraries/jose/default.nix +++ b/pkgs/development/libraries/jose/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "jose"; - version = "12"; + version = "13"; src = fetchFromGitHub { owner = "latchset"; repo = pname; rev = "v${version}"; - hash = "sha256-MuYRgYskIT2rmd32gziCdiRwIWMKQ6iTx0Qm/jJI+Iw="; + hash = "sha256-XkYvBjPmwhwo2p8/jTXazHRAgSGkI7LTLUlqbxMxlys="; }; nativeBuildInputs = [ meson pkg-config ninja asciidoc ]; @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/latchset/jose"; maintainers = with lib.maintainers; [ ]; license = lib.licenses.asl20; + platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index 871b6a1f11cfe..522c27bf56ebc 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -6,7 +6,6 @@ kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, qtbase, qtscript, qtx11extras, solid, kcrash, kded, - withKcms ? true }: mkDerivation { @@ -31,10 +30,6 @@ mkDerivation { patches = [ ./0001-Remove-impure-smbd-search-path.patch ]; - postPatch = lib.optionalString (!withKcms) '' - substituteInPlace src/CMakeLists.txt \ - --replace-fail "add_subdirectory(kcms)" "" - ''; meta = { homepage = "https://api.kde.org/frameworks/kio/html/"; }; diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index a14a7267a1874..3ac017b22c14d 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nco"; - version = "5.2.2"; + version = "5.2.3"; src = fetchFromGitHub { owner = "nco"; repo = "nco"; rev = finalAttrs.version; - hash = "sha256-d90088MKliM90KSbL0TNEafhfvLQlD/stO5V83fTXO0="; + hash = "sha256-a1Q1oK546F1itCtugpbh9fc+asokuXGMS51OgZ59bnY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix index c073d06fd0dd3..0a2967d0fcb1f 100644 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rapidfuzz-cpp"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "rapidfuzz"; repo = "rapidfuzz-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-6Df0X/gkS0i1RWv1uh0Hcn/lrLlIHeRp/+vfUmQ2EmI="; + hash = "sha256-urMdK+6ORHRgisppb700jaQpxLXAvXVjd8WDN7Zky3A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix index 63f8792d0a340..ec95184707d02 100644 --- a/pkgs/development/libraries/sentry-native/default.nix +++ b/pkgs/development/libraries/sentry-native/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - hash = "sha256-t1lk0gW72uQrLbeLdvlFzYEvOarbW2ya7sK6Ru3FW+o="; + hash = "sha256-0yFRDQ/f0oVbpZ4wev28xCTVkbXr58Tt0Czda3ppRWk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index f379322c502c9..c01ea491bcd3b 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -1,14 +1,15 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, pyvex -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + pyvex, + setuptools, }: buildPythonPackage rec { pname = "ailment"; - version = "9.2.97"; + version = "9.2.98"; pyproject = true; disabled = pythonOlder "3.11"; @@ -17,23 +18,17 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; rev = "refs/tags/v${version}"; - hash = "sha256-R6OBc7qK4zP0t8m26V17he8Oy39eSK8/Dm84ScnBy3s="; + hash = "sha256-ue780bhPpxv7Bnx9PX+HdQt3gcDSvTvK0FLPMopXQRY="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - pyvex - ]; + dependencies = [ pyvex ]; # Tests depend on angr (possibly a circular dependency) doCheck = false; - pythonImportsCheck = [ - "ailment" - ]; + pythonImportsCheck = [ "ailment" ]; meta = with lib; { description = "The angr Intermediate Language"; diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 688c988fb2f18..5b2d7bd546841 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -1,42 +1,43 @@ -{ lib -, stdenv -, ailment -, archinfo -, buildPythonPackage -, cachetools -, capstone -, cffi -, claripy -, cle -, cppheaderparser -, dpkt -, fetchFromGitHub -, gitpython -, itanium-demangler -, mulpyplexer -, nampa -, networkx -, progressbar2 -, protobuf -, psutil -, pycparser -, pyformlang -, pythonOlder -, pythonRelaxDepsHook -, pyvex -, rich -, rpyc -, setuptools -, sortedcontainers -, sqlalchemy -, sympy -, unicorn -, unique-log-filter +{ + lib, + stdenv, + ailment, + archinfo, + buildPythonPackage, + cachetools, + capstone, + cffi, + claripy, + cle, + cppheaderparser, + dpkt, + fetchFromGitHub, + gitpython, + itanium-demangler, + mulpyplexer, + nampa, + networkx, + progressbar2, + protobuf, + psutil, + pycparser, + pyformlang, + pythonOlder, + pythonRelaxDepsHook, + pyvex, + rich, + rpyc, + setuptools, + sortedcontainers, + sqlalchemy, + sympy, + unicorn, + unique-log-filter, }: buildPythonPackage rec { pname = "angr"; - version = "9.2.97"; + version = "9.2.98"; pyproject = true; disabled = pythonOlder "3.11"; @@ -45,12 +46,10 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-eJkxflAQFI/sEL4JMlMe+kClnaVSxtoOrPg8HQpH78g="; + hash = "sha256-9NLQtwakM041yNY/mb9WbSGC1Q8AHHkiqqjf5bZUOlI="; }; - pythonRelaxDeps = [ - "capstone" - ]; + pythonRelaxDeps = [ "capstone" ]; build-system = [ pythonRelaxDepsHook @@ -88,9 +87,7 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - AngrDB = [ - sqlalchemy - ]; + AngrDB = [ sqlalchemy ]; }; setupPyBuildFlags = lib.optionals stdenv.isLinux [ diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index b491ef83fe5fb..939517887e401 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -1,11 +1,12 @@ -{ lib -, angr -, buildPythonPackage -, fetchFromGitHub -, progressbar -, pythonOlder -, setuptools -, tqdm +{ + lib, + angr, + buildPythonPackage, + fetchFromGitHub, + progressbar, + pythonOlder, + setuptools, + tqdm, }: buildPythonPackage rec { @@ -22,9 +23,7 @@ buildPythonPackage rec { hash = "sha256-T07Y23UDp9eL2DK5gakV8kPNGsXf+4EofZJDSW/JS1Q="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ angr @@ -36,9 +35,7 @@ buildPythonPackage rec { # cle is executing the tests with the angr binaries already and is a requirement of angr doCheck = false; - pythonImportsCheck = [ - "angrop" - ]; + pythonImportsCheck = [ "angrop" ]; meta = with lib; { description = "ROP gadget finder and chain builder"; diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 2b335fb37160c..391884310aff8 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -1,15 +1,16 @@ -{ lib -, backports-strenum -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + backports-strenum, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "archinfo"; - version = "9.2.97"; + version = "9.2.98"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,24 +19,16 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-X8rMTQvNolYjSPyXbP2i5MYTPEvQlwoUQmXeEW56wQs="; + hash = "sha256-EdVGm4453XxGrq2D1v5JzSZyroRNzluZ5/r74YAt5zU="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = lib.optionals (pythonOlder "3.11") [ - backports-strenum - ]; + dependencies = lib.optionals (pythonOlder "3.11") [ backports-strenum ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "archinfo" - ]; + pythonImportsCheck = [ "archinfo" ]; meta = with lib; { description = "Classes with architecture-specific information"; diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 5f0cec61b1edc..0da9d861642fe 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -1,19 +1,20 @@ -{ lib -, buildPythonPackage -, cachetools -, decorator -, fetchFromGitHub -, pysmt -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, setuptools -, z3-solver +{ + lib, + buildPythonPackage, + cachetools, + decorator, + fetchFromGitHub, + pysmt, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + setuptools, + z3-solver, }: buildPythonPackage rec { pname = "claripy"; - version = "9.2.97"; + version = "9.2.98"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,13 +23,11 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-ZSDG1KmVi0kZX4WmrYIyd5+zRR/rjrugm8UjFlI5pfU="; + hash = "sha256-qGkVGRDVX8YMWgvRAqKM9Pxjv9uqu4UNSDtvhzVVeSU="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail - pythonRemoveDeps = [ - "z3-solver" - ]; + pythonRemoveDeps = [ "z3-solver" ]; build-system = [ pythonRelaxDepsHook @@ -42,13 +41,9 @@ buildPythonPackage rec { z3-solver ] ++ z3-solver.requiredPythonModules; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "claripy" - ]; + pythonImportsCheck = [ "claripy" ]; meta = with lib; { description = "Python abstraction layer for constraint solvers"; diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 543c14407476d..a2dda712f417c 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -1,32 +1,32 @@ -{ lib -, archinfo -, buildPythonPackage -, cffi -, fetchFromGitHub -, minidump -, pefile -, pyelftools -, pynose -, pytestCheckHook -, pythonOlder -, pyvex -, pyxbe -, setuptools -, sortedcontainers +{ + lib, + archinfo, + buildPythonPackage, + cffi, + fetchFromGitHub, + minidump, + pefile, + pyelftools, + pynose, + pytestCheckHook, + pythonOlder, + pyvex, + pyxbe, + setuptools, + sortedcontainers, }: let # The binaries are following the argr projects release cycle - version = "9.2.97"; + version = "9.2.98"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-FiPEqfNaAXI+xSWE+So//Uwz9k3bANHQ++nRSPKkddM="; + hash = "sha256-hnYMAgEnDHXg1jUrzhLWuun+Gv+2xnd4Da6OC9IGa2Q="; }; - in buildPythonPackage rec { pname = "cle"; @@ -39,12 +39,10 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-tain1I7Td+0v7n+px3mQnz7reKZUbGYDWfKnDhvmU8I="; + hash = "sha256-6gJKhyjKBgtSwGk5lqkaQVxe0ZC5WHVIYQMeREfz9A0="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ archinfo @@ -82,9 +80,7 @@ buildPythonPackage rec { "test_remote_file_map" ]; - pythonImportsCheck = [ - "cle" - ]; + pythonImportsCheck = [ "cle" ]; meta = with lib; { description = "Python loader for many binary formats"; diff --git a/pkgs/development/python-modules/forecast-solar/default.nix b/pkgs/development/python-modules/forecast-solar/default.nix index 9f4b199c56718..4e329a100c8e4 100644 --- a/pkgs/development/python-modules/forecast-solar/default.nix +++ b/pkgs/development/python-modules/forecast-solar/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pythonOlder , aiodns , aiohttp @@ -10,20 +11,23 @@ buildPythonPackage rec { pname = "forecast-solar"; - version = "3.0.0"; - - format = "setuptools"; + version = "3.1.0"; + pyproject = true; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "forecast_solar"; - rev = "refs/tags/${version}"; - hash = "sha256-Go0DF2qyVyGVYEeoEEuxsSR9Ge8Pg4S77zM1HL83ELc="; + rev = "refs/tags/v${version}"; + hash = "sha256-iol0XtfPZI95o/uEyBcXgeQjcfl2kI+4mugtywa6BXI="; }; - PACKAGE_VERSION = version; + build-system = [ + setuptools + ]; + + env.PACKAGE_VERSION = version; - propagatedBuildInputs = [ + dependencies = [ aiodns aiohttp ] ++ lib.optionals (pythonOlder "3.9") [ @@ -37,6 +41,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/home-assistant-libs/forecast_solar/releases/tag/v${version}"; description = "Asynchronous Python client for getting forecast solar information"; homepage = "https://github.com/home-assistant-libs/forecast_solar"; license = licenses.mit; diff --git a/pkgs/development/python-modules/hikari/default.nix b/pkgs/development/python-modules/hikari/default.nix new file mode 100644 index 0000000000000..e76d7780c0bfa --- /dev/null +++ b/pkgs/development/python-modules/hikari/default.nix @@ -0,0 +1,80 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +, pytest-runner +, aiohttp +, attrs +, multidict +, colorlog +, pynacl +, pytest-cov +, pytest-randomly +, pytest-asyncio +, mock +}: +buildPythonPackage rec { + pname = "hikari"; + version = "2.0.0.dev124"; + + src = fetchFromGitHub { + owner = "hikari-py"; + repo = "hikari"; + rev = version; + hash = "sha256-zDgU3Ol/I3YNnwXm+aBh20KwonW746p5TObuwuWORog="; + # The git commit is part of the `hikari.__git_sha1__` original output; + # leave that output the same in nixpkgs. Use the `.git` directory + # to retrieve the commit SHA, and remove the directory afterwards, + # since it is not needed after that. + leaveDotGit = true; + postFetch = '' + cd "$out" + git rev-parse HEAD > $out/COMMIT + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + aiohttp + attrs + multidict + colorlog + ]; + + pythonRelaxDeps = true; + + passthru.optional-dependencies = { + server = [ pynacl ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + pytest-runner + pytest-asyncio + pytest-cov + pytest-randomly + mock + ]; + + pythonImportChecks = [ "hikari" ]; + + disabled = pythonOlder "3.7"; + + postPatch = '' + substituteInPlace hikari/_about.py --replace "__git_sha1__: typing.Final[str] = \"HEAD\"" "__git_sha1__: typing.Final[str] = \"$(cat $src/COMMIT)\"" + ''; + + meta = with lib; { + description = "Discord API wrapper for Python written with asyncio"; + homepage = "https://www.hikari-py.dev/"; + changelog = "https://github.com/hikari-py/hikari/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ tomodachi94 ]; + }; +} diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index bc00d859f6b83..7fab04572aa61 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -1,27 +1,28 @@ -{ lib -, bleak -, buildPythonPackage -, dotmap -, fetchFromGitHub -, pexpect -, protobuf -, pygatt -, pypubsub -, pyqrcode -, pyserial -, pytap2 -, pytestCheckHook -, pythonOlder -, pyyaml -, requests -, setuptools -, tabulate -, timeago +{ + lib, + bleak, + buildPythonPackage, + dotmap, + fetchFromGitHub, + pexpect, + protobuf, + pygatt, + pypubsub, + pyqrcode, + pyserial, + pytap2, + pytestCheckHook, + pythonOlder, + pyyaml, + requests, + setuptools, + tabulate, + timeago, }: buildPythonPackage rec { pname = "meshtastic"; - version = "2.3.3"; + version = "2.3.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,12 +31,10 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-kydZgOiQHDovQ5RwyLru2nyHoCEVZClq8wJit/mnbvU="; + hash = "sha256-WxiddF1n9lyxKkZk1MU40NzLh6goLVs81mbJZ3F33R8="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ bleak @@ -54,9 +53,7 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - tunnel = [ - pytap2 - ]; + tunnel = [ pytap2 ]; }; nativeCheckInputs = [ @@ -68,19 +65,21 @@ buildPythonPackage rec { export PATH="$PATH:$out/bin"; ''; - pythonImportsCheck = [ - "meshtastic" - ]; + pythonImportsCheck = [ "meshtastic" ]; disabledTests = [ # TypeError - "test_main_info" - "test_main_support" + "test_main_info_with_seriallog_output_txt" + "test_main_info_with_seriallog_stdout" "test_main_info_with_tcp_interfa" + "test_main_info" "test_main_no_proto" - "test_main_info_with_seriallog_stdout" - "test_main_info_with_seriallog_output_txt" + "test_main_support" + "test_MeshInterface" + "test_message_to_json_shows_all" + "test_SerialInterface_single_port" "test_support_info" + "test_TCPInterface" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mido/default.nix b/pkgs/development/python-modules/mido/default.nix index 90b5128e47479..fc2a97689806d 100644 --- a/pkgs/development/python-modules/mido/default.nix +++ b/pkgs/development/python-modules/mido/default.nix @@ -6,6 +6,7 @@ , portmidi , python-rtmidi , pytestCheckHook +, pythonRelaxDepsHook , pythonOlder , setuptools , setuptools-scm @@ -33,6 +34,11 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools setuptools-scm + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "packaging" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix index 309a3cdcfadfa..170d0bd2f7413 100644 --- a/pkgs/development/python-modules/molecule/default.nix +++ b/pkgs/development/python-modules/molecule/default.nix @@ -1,38 +1,41 @@ -{ lib -, buildPythonPackage -, fetchPypi -, testers -, ansible-compat -, ansible-core -, click-help-colors -, enrich -, jsonschema -, molecule -, withPlugins ? true, molecule-plugins -, packaging -, pluggy -, rich -, setuptools -, setuptools-scm -, yamllint -, wcmatch -, wheel +{ + lib, + ansible-compat, + ansible-core, + buildPythonPackage, + click-help-colors, + enrich, + fetchPypi, + jsonschema, + molecule, + packaging, + pluggy, + pythonOlder, + rich, + setuptools, + setuptools-scm, + testers, + wcmatch, + withPlugins ? true, + molecule-plugins, + yamllint, }: buildPythonPackage rec { pname = "molecule"; - version = "24.2.0"; - format = "pyproject"; + version = "24.2.1"; + pyproject = true; + + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-R8mCp9Bdt4Rtp3/nFZ3rlG8myvsuOI/HGBK+AImkF3Y="; + hash = "sha256-g1IrqpuRVg6phic8qxScORVpdunWEkVxciYyCTWtVuQ="; }; nativeBuildInputs = [ setuptools setuptools-scm - wheel ]; propagatedBuildInputs = [ @@ -53,19 +56,22 @@ buildPythonPackage rec { # tests can't be easily run without installing things from ansible-galaxy doCheck = false; - passthru.tests.version = (testers.testVersion { - package = molecule; - command = "PY_COLORS=0 ${pname} --version"; - }).overrideAttrs (old: { - # workaround the error: Permission denied: '/homeless-shelter' - HOME = "$(mktemp -d)"; - }); + passthru.tests.version = + (testers.testVersion { + package = molecule; + command = "PY_COLORS=0 ${pname} --version"; + }).overrideAttrs + (old: { + # workaround the error: Permission denied: '/homeless-shelter' + HOME = "$(mktemp -d)"; + }); meta = with lib; { description = "Molecule aids in the development and testing of Ansible roles"; - mainProgram = "molecule"; homepage = "https://github.com/ansible-community/molecule"; - maintainers = with maintainers; [ dawidd6 ]; + changelog = "https://github.com/ansible/molecule/releases/tag/v${version}"; license = licenses.mit; + maintainers = with maintainers; [ dawidd6 ]; + mainProgram = "molecule"; }; } diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix index 37ecfccc6d701..aa5a5572dec99 100644 --- a/pkgs/development/python-modules/orbax-checkpoint/default.nix +++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix @@ -1,28 +1,29 @@ -{ lib -, absl-py -, buildPythonPackage -, cached-property -, etils -, fetchPypi -, flit-core -, importlib-resources -, jax -, jaxlib -, msgpack -, nest-asyncio -, numpy -, protobuf -, pytest-xdist -, pytestCheckHook -, pythonOlder -, pyyaml -, tensorstore -, typing-extensions +{ + lib, + absl-py, + buildPythonPackage, + cached-property, + etils, + fetchPypi, + flit-core, + importlib-resources, + jax, + jaxlib, + msgpack, + nest-asyncio, + numpy, + protobuf, + pytest-xdist, + pytestCheckHook, + pythonOlder, + pyyaml, + tensorstore, + typing-extensions, }: buildPythonPackage rec { pname = "orbax-checkpoint"; - version = "0.5.7"; + version = "0.5.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -30,14 +31,12 @@ buildPythonPackage rec { src = fetchPypi { pname = "orbax_checkpoint"; inherit version; - hash = "sha256-3hRUm4mSIKT0RUU5Z8GsLXFluBUlM0JYd0YAXwOpgTs="; + hash = "sha256-H96IkUM3IxV79uddNBCU0dq+0dvPx8/Ps4HeCItGi2A="; }; - nativeBuildInputs = [ - flit-core - ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ absl-py cached-property etils diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index e619ebeb89d8a..e9b1e8398824c 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.24.1"; + version = "1.24.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-+2BxXgIC595FM3FDIbFjFpWIEkqQrDILWFjQkyN5nao="; + hash = "sha256-1VLdQFTB2YG8JUNA9+ys8p1kE/5a5qvzMtEtboejOpc="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 496ebc4e8fa7f..90b623c35ef49 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -1,25 +1,26 @@ -{ lib -, aiohttp -, aioredis -, buildPythonPackage -, coloredlogs -, fastapi -, fetchFromGitHub -, hatchling -, pillow -, psutil -, pytestCheckHook -, pythonOlder -, redis -, requests -, ujson -, uvicorn -, watchdog +{ + lib, + aiohttp, + aioredis, + buildPythonPackage, + coloredlogs, + fastapi, + fetchFromGitHub, + hatchling, + pillow, + psutil, + pytestCheckHook, + pythonOlder, + redis, + requests, + ujson, + uvicorn, + watchdog, }: buildPythonPackage rec { pname = "pytelegrambotapi"; - version = "4.16.0"; + version = "4.17.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,55 +29,30 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; rev = "refs/tags/${version}"; - hash = "sha256-w039aPK+PdOiiOj5ZZAUfyHQ6QDrKySVIijcOw+GIOk="; + hash = "sha256-Asw6wpZs0FgsUYLVQ4u4qQgIFdvShcsN3XvgHn48cbI="; }; - nativeBuildInputs = [ - hatchling - ]; + build-system = [ hatchling ]; passthru.optional-dependencies = { - json = [ - ujson - ]; - PIL = [ - pillow - ]; - redis = [ - redis - ]; - aioredis = [ - aioredis - ]; - aiohttp = [ - aiohttp - ]; - fastapi = [ - fastapi - ]; - uvicorn = [ - uvicorn - ]; - psutil = [ - psutil - ]; - coloredlogs = [ - coloredlogs - ]; - watchdog = [ - watchdog - ]; + json = [ ujson ]; + PIL = [ pillow ]; + redis = [ redis ]; + aioredis = [ aioredis ]; + aiohttp = [ aiohttp ]; + fastapi = [ fastapi ]; + uvicorn = [ uvicorn ]; + psutil = [ psutil ]; + coloredlogs = [ coloredlogs ]; + watchdog = [ watchdog ]; }; checkInputs = [ pytestCheckHook requests - ] ++ passthru.optional-dependencies.watchdog - ++ passthru.optional-dependencies.aiohttp; + ] ++ passthru.optional-dependencies.watchdog ++ passthru.optional-dependencies.aiohttp; - pythonImportsCheck = [ - "telebot" - ]; + pythonImportsCheck = [ "telebot" ]; meta = with lib; { description = "Python implementation for the Telegram Bot API"; diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix index 3384ad516b5fc..900f93bbea879 100644 --- a/pkgs/development/python-modules/pycaption/default.nix +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pycaption"; - version = "2.2.5"; + version = "2.2.6"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pbs"; repo = "pycaption"; rev = "refs/tags/${version}"; - hash = "sha256-zI5zRjvtsVgiIgWsQQgBQHhbYSGRBB6RLYgpbZWJQHs="; + hash = "sha256-XN83L6WsRyl9G0ia4uz3SCVcwwUNUyfNMB64RfZh+PA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 4229d30c022d5..f85b893c24bbd 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -1,34 +1,35 @@ -{ lib -, aiohttp -, buildPythonPackage -, click -, fetchFromGitHub -, prompt-toolkit -, pygments -, pyserial -, pytest-asyncio -, pytest-xdist -, pytestCheckHook -, pythonOlder -, redis -, setuptools -, sqlalchemy -, twisted -, typer +{ + lib, + aiohttp, + buildPythonPackage, + click, + fetchFromGitHub, + prompt-toolkit, + pygments, + pyserial, + pytest-asyncio, + pytest-xdist, + pytestCheckHook, + pythonOlder, + redis, + setuptools, + sqlalchemy, + twisted, + typer, }: buildPythonPackage rec { pname = "pymodbus"; - version = "3.6.6"; + version = "3.6.7"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "pymodbus-dev"; repo = "pymodbus"; rev = "refs/tags/v${version}"; - hash = "sha256-CnMCHFwzNyzTgVyFDSlE7ggI6eXXYbtGuERIomUa3uA="; + hash = "sha256-SbfvVaIpTz4Mzojx9y13lYei4dEz+1NQEE/7bwz29tQ="; }; postPatch = '' @@ -36,9 +37,7 @@ buildPythonPackage rec { --replace-fail "--cov-report html " "" ''; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; passthru.optional-dependencies = { repl = [ @@ -48,9 +47,7 @@ buildPythonPackage rec { pygments click ] ++ typer.optional-dependencies.all; - serial = [ - pyserial - ]; + serial = [ pyserial ]; }; nativeCheckInputs = [ @@ -70,22 +67,21 @@ buildPythonPackage rec { popd ''; - pythonImportsCheck = [ - "pymodbus" - ]; + pythonImportsCheck = [ "pymodbus" ]; - disabledTests = [ - # Tests often hang - "test_connected" - ] ++ lib.optionals (lib.versionAtLeast aiohttp.version "3.9.0") [ - "test_split_serial_packet" - "test_serial_poll" - "test_simulator" - ]; + disabledTests = + [ + # Tests often hang + "test_connected" + ] + ++ lib.optionals (lib.versionAtLeast aiohttp.version "3.9.0") [ + "test_split_serial_packet" + "test_serial_poll" + "test_simulator" + ]; meta = with lib; { description = "Python implementation of the Modbus protocol"; - mainProgram = "pymodbus.simulator"; longDescription = '' Pymodbus is a full Modbus protocol implementation using twisted, torndo or asyncio for its asynchronous communications core. It can @@ -96,5 +92,6 @@ buildPythonPackage rec { changelog = "https://github.com/pymodbus-dev/pymodbus/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "pymodbus.simulator"; }; } diff --git a/pkgs/development/python-modules/python-docs-theme/default.nix b/pkgs/development/python-modules/python-docs-theme/default.nix index 364f40f7ce26d..e464edc7cbc54 100644 --- a/pkgs/development/python-modules/python-docs-theme/default.nix +++ b/pkgs/development/python-modules/python-docs-theme/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-docs-theme"; - version = "2024.3"; + version = "2024.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "python"; repo = "python-docs-theme"; rev = "refs/tags/${version}"; - hash = "sha256-caQqoXKdKA0W5qLphYbTxrP8Qx5teJD5+MSyaifyf/A="; + hash = "sha256-x1r71/Urpqf0FtL2Bao5SgsRQfmwym34F7qYzxFkT5c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index d874ec9c2a7a8..0f82455c12669 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -1,25 +1,26 @@ -{ lib -, stdenv -, aiohttp -, async-timeout -, buildPythonPackage -, click -, construct -, dacite -, fetchFromGitHub -, paho-mqtt -, poetry-core -, pycryptodome -, pycryptodomex -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook +{ + lib, + stdenv, + aiohttp, + async-timeout, + buildPythonPackage, + click, + construct, + dacite, + fetchFromGitHub, + paho-mqtt, + poetry-core, + pycryptodome, + pycryptodomex, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, }: buildPythonPackage rec { pname = "python-roborock"; - version = "0.41.0"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +29,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-Kh7u1UWqmfmxY6yWaBaUpe20Xc/DTryoymKgIYg/kiM="; + hash = "sha256-izstUq7ICFNJ9v8+uB7JeMuzmOazP22As5VKDinXemU="; }; postPatch = '' @@ -36,14 +37,11 @@ buildPythonPackage rec { --replace "poetry-core==1.8.0" "poetry-core" ''; - pythonRelaxDeps = [ - "pycryptodome" - ]; + pythonRelaxDeps = [ "pycryptodome" ]; - nativeBuildInputs = [ - poetry-core - pythonRelaxDepsHook - ]; + build-system = [ poetry-core ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; propagatedBuildInputs = [ aiohttp @@ -53,25 +51,21 @@ buildPythonPackage rec { dacite paho-mqtt pycryptodome - ] ++ lib.optionals stdenv.isDarwin [ - pycryptodomex - ]; + ] ++ lib.optionals stdenv.isDarwin [ pycryptodomex ]; nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; - pythonImportsCheck = [ - "roborock" - ]; + pythonImportsCheck = [ "roborock" ]; meta = with lib; { description = "Python library & console tool for controlling Roborock vacuum"; - mainProgram = "roborock"; homepage = "https://github.com/humbertogontijo/python-roborock"; changelog = "https://github.com/humbertogontijo/python-roborock/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; + mainProgram = "roborock"; }; } diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 659db729aadd2..3a166921591b9 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.97"; + version = "9.2.98"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-GIBsWtj8nLuzGX/C6Ioe8mSfKg3QXtEJf3+d5h9M02c="; + hash = "sha256-+X4G5jLG7c75XIItNlQLF5YV0XUQwdA6JyF1IGBfiE0="; }; build-system = [ diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 5a1a6296b48d2..6caf19c721abf 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -18,16 +18,16 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.7.0"; + version = "3.8.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-BwU9Ti35Dsaa+kT78h3lsjw4sI1RQdhukTPTeJDyBw0="; + hash = "sha256-ljuqezL/Iu4VQelPi7KApBknDrWzikX7FD5iw5NcOL4="; }; postPatch = '' @@ -35,7 +35,7 @@ buildPythonPackage rec { --replace-fail "Cython >=3.0.9, <3.1.0" "Cython" ''; - nativeBuildInputs = [ + build-system = [ cmake cython_3 ninja diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 5efe78255f189..507652c5a78d9 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1125"; + version = "3.0.1126"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-4oof7FDgwTORGnaI+C5pTd1Fj5EgyBFfsVJPhRhu96o="; + hash = "sha256-o8MECOLzs8JUxUTgAzSM5MpY3pK39Pt3hF/IQQrGMrA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix index bc0e36ba553c2..d92767b87d4b2 100644 --- a/pkgs/development/python-modules/torch/bin.nix +++ b/pkgs/development/python-modules/torch/bin.nix @@ -25,7 +25,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "2.2.1"; + version = "2.2.2"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/torch/binary-hashes.nix b/pkgs/development/python-modules/torch/binary-hashes.nix index 0fd4a5b36e4d8..8cd3bccc121cd 100644 --- a/pkgs/development/python-modules/torch/binary-hashes.nix +++ b/pkgs/development/python-modules/torch/binary-hashes.nix @@ -6,86 +6,86 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "2.2.1" = { + "2.2.2" = { x86_64-linux-38 = { - name = "torch-2.2.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.2.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-OIDrgRsT+PGl/DKC5FVnS5qfpnOrJW8GOOK09JUlFsM="; + name = "torch-2.2.2-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.2.2%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-wXi+srsB93NgF3e8SBx2Ub5bHxic8YDwwKzqwHiaqaU="; }; x86_64-linux-39 = { - name = "torch-2.2.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.2.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-HLN5h0E455jAK0GWLdnU7AsGOoykWlEJfzJmFUd8m9A="; + name = "torch-2.2.2-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.2.2%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-EU6TlYZ+6GAWZWLYzB8oCSJfnil4PdXnIXXZqaeoUFw="; }; x86_64-linux-310 = { - name = "torch-2.2.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.2.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-Gt9DDwH/ZJyEisAheF4YAHsHFP3eaOTmW9DGQL8/uOE="; + name = "torch-2.2.2-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.2.2%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-yt5P1sjOfYJtvPq9ZfHVOw7goFjbjBgJ1lv9YFG1VTA="; }; x86_64-linux-311 = { - name = "torch-2.2.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.2.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-I7souoAPJanTPVF2i/X976AiDLxc2aF/ItKkJig1lGg="; + name = "torch-2.2.2-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.2.2%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-TJTk0aItcKu9/3Ft7Jm6Xv+UtDQP+nO0+2KflA27inU="; }; x86_64-darwin-38 = { - name = "torch-2.2.1-cp38-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp38-none-macosx_10_9_x86_64.whl"; - hash = "sha256-YXaFhegqmdxcQZM759ucoGf6451F/r1RA8yKBNUkSRg="; + name = "torch-2.2.2-cp38-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp38-none-macosx_10_9_x86_64.whl"; + hash = "sha256-gVF29iyPN8z7shCBwHaaiLG6pptxaRGapCtl7l8QTi0="; }; x86_64-darwin-39 = { - name = "torch-2.2.1-cp39-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp39-none-macosx_10_9_x86_64.whl"; - hash = "sha256-o6OqT5rSqLjnLBqElA2MWd1O7SkbyytgOta1hJgwYvU="; + name = "torch-2.2.2-cp39-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp39-none-macosx_10_9_x86_64.whl"; + hash = "sha256-8TdigY3CgP7KfjD2CZWhe6jR0asz/vttB/0sj/FXHqo="; }; x86_64-darwin-310 = { - name = "torch-2.2.1-cp310-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp310-none-macosx_10_9_x86_64.whl"; - hash = "sha256-531ee2Cn4cI0XGSC/4dvNqDwQ+a+Mu9Y2sQWxKoOOyg="; + name = "torch-2.2.2-cp310-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp310-none-macosx_10_9_x86_64.whl"; + hash = "sha256-5nfE102wz8KxCSPeG95XXZgculRQXdwIKwUI2WQRmFA="; }; x86_64-darwin-311 = { - name = "torch-2.2.1-cp311-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp311-none-macosx_10_9_x86_64.whl"; - hash = "sha256-lkeM9Oc3ADBZee0cp2tTVTbUYvMDAqNe3Rzu4MPYB9M="; + name = "torch-2.2.2-cp311-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp311-none-macosx_10_9_x86_64.whl"; + hash = "sha256-QwDLu00EKMUbXBlBkBaQGNW4GP2fb6/Ci76P2E3tF0A="; }; aarch64-darwin-38 = { - name = "torch-2.2.1-cp38-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp38-none-macosx_11_0_arm64.whl"; - hash = "sha256-fX1aq00JspIgKXkbacgDq6HAWcYP9lYj8ddFgMFHvUw="; + name = "torch-2.2.2-cp38-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp38-none-macosx_11_0_arm64.whl"; + hash = "sha256-7RTSpDZEIEkDg9JveQCj99XFDDLlzf3d3/+Dd22eD9Q="; }; aarch64-darwin-39 = { - name = "torch-2.2.1-cp39-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp39-none-macosx_11_0_arm64.whl"; - hash = "sha256-uQZpsWKYTjAvvQXJwnDveW5GeQOUTs76dFe6vpYRYH4="; + name = "torch-2.2.2-cp39-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp39-none-macosx_11_0_arm64.whl"; + hash = "sha256-/q2//ddjTP40Xqh9fuQDGzAPnHZFIFkOA0idZYtpMds="; }; aarch64-darwin-310 = { - name = "torch-2.2.1-cp310-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp310-none-macosx_11_0_arm64.whl"; - hash = "sha256-Ur3sHiLQg4L9mNttK/F6KU0P1TJgz9ZPuHRDSSy6xrQ="; + name = "torch-2.2.2-cp310-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp310-none-macosx_11_0_arm64.whl"; + hash = "sha256-tSDRTS8oEK1dp1i+oQyveXjvNkNWW8APkN6JLgDXeSU="; }; aarch64-darwin-311 = { - name = "torch-2.2.1-cp311-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp311-none-macosx_11_0_arm64.whl"; - hash = "sha256-zNmEmw3TcKmBPd3kenf0OciqzOAi5LoL+TZRc9WAgJY="; + name = "torch-2.2.2-cp311-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp311-none-macosx_11_0_arm64.whl"; + hash = "sha256-gipYlnXLqKzwRX1qTltspEGtO0w6RKHLyPizGueWRF4="; }; aarch64-linux-38 = { - name = "torch-2.2.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-y4ThL9QAXHh/zkDto96sBCmPWQY0iRBixM2yzywUIiE="; + name = "torch-2.2.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-mJTc3W71tbYDzYzqPjcR+eJ3CC/3sPFLFSb90ay4JSE="; }; aarch64-linux-39 = { - name = "torch-2.2.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-7g90adoiGNyHlIV1DaF6JF3DaRbi+cX8CDbkz1cq0H0="; + name = "torch-2.2.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-1dhev9E/fNA+UGMlP4R57RpXBSZBZtXdH8abS5YjGyA="; }; aarch64-linux-310 = { - name = "torch-2.2.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-8BgwAuGJeNWYw+6JGcLmSCAsf+u5CIFRVshmxSTEo1k="; + name = "torch-2.2.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-OiwHUhgIHvnHv4xVxwbyNtrrt1PaQd5JispxYyVzgL0="; }; aarch64-linux-311 = { - name = "torch-2.2.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-fyaXQWtneZbuHzCyZ2qKlN3b44ijXDYdyG6RW9pHt9o="; + name = "torch-2.2.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-WUgt9dxA2uEF5z9I3Sk/TMxndkCCLCzjQnOjh1SZA64="; }; }; } diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 620b8a3581e4f..3bd019375046c 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -130,7 +130,7 @@ let in buildPythonPackage rec { pname = "torch"; # Don't forget to update torch-bin to the same version. - version = "2.2.1"; + version = "2.2.2"; pyproject = true; disabled = pythonOlder "3.8.0"; @@ -148,7 +148,7 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-6z8G5nMbGHbpA+xfmOR726h9E4N9NoEtaFgcYE0DuUE="; + hash = "sha256-la9wL9pOlgrSfq5V8aRKXt3hjW+Er/6484m0oUujlzk="; }; patches = lib.optionals cudaSupport [ diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index 863fdc920a485..dc69195b693a3 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "2.2.1"; + version = "2.2.2"; format = "wheel"; src = diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix index eda82094c5111..a15dffc4856a9 100644 --- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -6,86 +6,86 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "2.2.1" = { + "2.2.2" = { x86_64-linux-38 = { - name = "torchaudio-2.2.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-XU/trqM3W8hQ+9kI6G1b+GAbp9eCPFId6+jY3lwiZYg="; + name = "torchaudio-2.2.2-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.2%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-KPwkn2+sVuS9GbZdk7f6lSJ956D1WLY2YS7k3qE3tog="; }; x86_64-linux-39 = { - name = "torchaudio-2.2.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-LQScsJsPn+EE0goKRwIW/Fzo+SW9SYVuZYDi2Vn1syg="; + name = "torchaudio-2.2.2-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.2%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-YzzBeuAiMH0HPyZhvK/z9Q2bPW99MukXMFRCAybiDRs="; }; x86_64-linux-310 = { - name = "torchaudio-2.2.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-I/YjZCniv2drgg6OciGh1YqvkIv/K6JmWqhS33GpeWE="; + name = "torchaudio-2.2.2-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.2%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-/eGFVNhP0AR1iPC87QPXcPZVPxeFGjtEE3kWShPJmwc="; }; x86_64-linux-311 = { - name = "torchaudio-2.2.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-YJACsObf9ED81qY9FcA8PTdOIU56iqYcLvSlKLpkTDk="; + name = "torchaudio-2.2.2-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.2%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-DgdNBcIlizAU3aAu7wB60Xq0TP0B2XgMmpFOXZcqwAs="; }; x86_64-darwin-38 = { - name = "torchaudio-2.2.1-cp38-cp38-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp38-cp38-macosx_10_13_x86_64.whl"; - hash = "sha256-ge+I12k+O5kAfR7nQv2Buakjmey/iOt+1plJRDAF/7o="; + name = "torchaudio-2.2.2-cp38-cp38-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp38-cp38-macosx_10_13_x86_64.whl"; + hash = "sha256-jOTfBlqUmRHStngqpME2h++t6iP/x8em8V9+euXIlSQ="; }; x86_64-darwin-39 = { - name = "torchaudio-2.2.1-cp39-cp39-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp39-cp39-macosx_10_13_x86_64.whl"; - hash = "sha256-Azn+eO2cKfcEKWdhsouwVbU1BiX/UDrXgXBDl5NOa1g="; + name = "torchaudio-2.2.2-cp39-cp39-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp39-cp39-macosx_10_13_x86_64.whl"; + hash = "sha256-23CxOocaSUh72QQr8EsS90rtd7GofS++to0J2bZLxSg="; }; x86_64-darwin-310 = { - name = "torchaudio-2.2.1-cp310-cp310-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp310-cp310-macosx_10_13_x86_64.whl"; - hash = "sha256-WA7v12SgGmTVtqomDAxHl0vmppZIktVAKac7F/RhH80="; + name = "torchaudio-2.2.2-cp310-cp310-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp310-cp310-macosx_10_13_x86_64.whl"; + hash = "sha256-sdWCAdEI6F2z41uEMZ8ziE9h8yfDjq2GkTIYyMGsw90="; }; x86_64-darwin-311 = { - name = "torchaudio-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp311-cp311-macosx_10_13_x86_64.whl"; - hash = "sha256-J0y4R0vB5Wt2jvNH0xiGYcWp1eaOLfVvwK/xHMc8kWo="; + name = "torchaudio-2.2.2-cp311-cp311-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp311-cp311-macosx_10_13_x86_64.whl"; + hash = "sha256-8agaUYo+hsAEEl64kfxDPOj7I0MpW11hLQ83sk4THv0="; }; aarch64-darwin-38 = { - name = "torchaudio-2.2.1-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-9Ien0xd65q8BZ1CFDuk3iOiAIYoaMQvGx2kB4hL5HNM="; + name = "torchaudio-2.2.2-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-s7ir4msGfpxKbj26FWuR16hSR+iN2nC3xDhZ9VuXjdw="; }; aarch64-darwin-39 = { - name = "torchaudio-2.2.1-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-aLHZ+P/psm7wToDYKuLcL3Sxoetkw+itIbUlgCs7x6w="; + name = "torchaudio-2.2.2-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-S3ioShib89pLlmN1zr3sxYSk3F9g4L3nIdc0Ae1crUU="; }; aarch64-darwin-310 = { - name = "torchaudio-2.2.1-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-itVcIGmye74Y4UeDogLj8/gIL+nlkoFDa6eX7bD8lNU="; + name = "torchaudio-2.2.2-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-pSDhTqC6idncJ5IutGCfnqxcAcJ5gw4PIWucngF9Q4s="; }; aarch64-darwin-311 = { - name = "torchaudio-2.2.1-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-HmLCexdnLMK92WY2geUzAA+cCYTmoPPUVfcFG8AFuwI="; + name = "torchaudio-2.2.2-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-AUgvyFEX+F7kT4qo6cEbHAIjJhc+B0h4ntQrIZECk38="; }; aarch64-linux-38 = { - name = "torchaudio-2.2.1-cp38-cp38-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp38-cp38-linux_aarch64.whl"; - hash = "sha256-pEYrPyFPYLa4944SpM8Skcm8NT3u1wmsPf3tvtUTp6M="; + name = "torchaudio-2.2.2-cp38-cp38-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp38-cp38-linux_aarch64.whl"; + hash = "sha256-T3VqbmZ92IQb8hoH6tPv7ap6J9VYUnecJm9vKhBkyZQ="; }; aarch64-linux-39 = { - name = "torchaudio-2.2.1-cp39-cp39-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp39-cp39-linux_aarch64.whl"; - hash = "sha256-yy2girt7aNx7AQV0ixpzbdMzKfhBN0AT7ALFTgS+3yk="; + name = "torchaudio-2.2.2-cp39-cp39-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp39-cp39-linux_aarch64.whl"; + hash = "sha256-cj9OV7XQwSA1fKYM1VtObPrIRbwOzMtLQXpEqk68Ums="; }; aarch64-linux-310 = { - name = "torchaudio-2.2.1-cp310-cp310-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp310-cp310-linux_aarch64.whl"; - hash = "sha256-uRa3dkaYupMZqjslUZE5iS3oZl2EQ4lpusXh2FeMahE="; + name = "torchaudio-2.2.2-cp310-cp310-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp310-cp310-linux_aarch64.whl"; + hash = "sha256-sPOOfTVIkU14qvwn/wD3cBsaUL/N3FiWX1RfySzNSmY="; }; aarch64-linux-311 = { - name = "torchaudio-2.2.1-cp311-cp311-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp311-cp311-linux_aarch64.whl"; - hash = "sha256-ILKWXbT4QwIWNvU9P6sQdcP4lZxFDGR2KRJNJMfmy7A="; + name = "torchaudio-2.2.2-cp311-cp311-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.2-cp311-cp311-linux_aarch64.whl"; + hash = "sha256-CgOki21V0X1I9Bmn8dDUAY1IoEx2WFwWqbXmkoH5L5Q="; }; }; } diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index e1bc7295cb2d4..70026bb363df8 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -16,7 +16,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.17.1"; + version = "0.17.2"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index d7cb16d01b61f..3a5654b18ca7e 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -6,66 +6,66 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "0.17.1" = { + "0.17.2" = { x86_64-linux-38 = { - name = "torchvision-0.17.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-oCRjQQZPPBdtqKpuMvATD2ACOAyQruqOMccY3ixUZOE="; + name = "torchvision-0.17.2-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.2%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-3450y7tN4KYPEc18KNggEWAnzTlJiT+XxVtvEjJr168="; }; x86_64-linux-39 = { - name = "torchvision-0.17.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-WsK2vDCcNDud6KklczHPcVtm+qm1kiep8HDZ4BJS5go="; + name = "torchvision-0.17.2-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.2%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-839ZLjEovz2ZloraWhKPEY+a7R2rYJ4nKscjEUb8aEM="; }; x86_64-linux-310 = { - name = "torchvision-0.17.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-J69HkV9udiwdROWOgIjSKsl0RWaPn3k1JAMrK69PNL0="; + name = "torchvision-0.17.2-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.2%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-wPMlY1+INPpV5pq2EHX7K7y7RTlamFu6HbN4sVYnEEs="; }; x86_64-linux-311 = { - name = "torchvision-0.17.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-bYKfOZSQQCWyiXHMxhvWbt2VKATyEipuEENQuOkXL08="; + name = "torchvision-0.17.2-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.2%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-BZ+GocjSsnayZshKj1qSzIQm1DwqLCSNxzwUCrOoIvM="; }; x86_64-darwin-38 = { - name = "torchvision-0.17.1-cp38-cp38-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp38-cp38-macosx_10_13_x86_64.whl"; - hash = "sha256-JiEJcGX6HIJ4heK1IQLoOaNUG5M7epDg+jxCw94bw88="; + name = "torchvision-0.17.2-cp38-cp38-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp38-cp38-macosx_10_13_x86_64.whl"; + hash = "sha256-uDqsjXj0iYEUbVghaNdbbJR8+wp2k/duIZ8ZJvbllaM="; }; x86_64-darwin-39 = { - name = "torchvision-0.17.1-cp39-cp39-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp39-cp39-macosx_10_13_x86_64.whl"; - hash = "sha256-WCmacks3uJPHzk0LMuoUgMMORnzBFBZ5ZLRfYBP2wtM="; + name = "torchvision-0.17.2-cp39-cp39-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp39-cp39-macosx_10_13_x86_64.whl"; + hash = "sha256-SGi7+lV1jIEH5poOfdXne4kFYDXNOLdnrVuYzbccDw0="; }; x86_64-darwin-310 = { - name = "torchvision-0.17.1-cp310-cp310-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp310-cp310-macosx_10_13_x86_64.whl"; - hash = "sha256-BkGIgCErZuRehV3Tn1Nuf9SLTmsDShHdn+niOEr7Uew="; + name = "torchvision-0.17.2-cp310-cp310-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp310-cp310-macosx_10_13_x86_64.whl"; + hash = "sha256-HykQ/jwhrWh1snINRvrYNbLkszbpVT0xyjZNJMkLHU8="; }; x86_64-darwin-311 = { - name = "torchvision-0.17.1-cp311-cp311-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp311-cp311-macosx_10_13_x86_64.whl"; - hash = "sha256-6izNv1l04L8n/WZEozsZywcAKXzzl7sEaediwRxsQQU="; + name = "torchvision-0.17.2-cp311-cp311-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp311-cp311-macosx_10_13_x86_64.whl"; + hash = "sha256-m4PlXufQoXBPUrnArIc4jnptHZimveews1+atU172lQ="; }; aarch64-darwin-38 = { - name = "torchvision-0.17.1-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-XOdkZq8rWjBXOTnK4ebmLikxbOs+50gJEALzEqsJEvY="; + name = "torchvision-0.17.2-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-Hs5AVX4SLXmXWGCgBap+Kp4ubDUKA+eKAOwUUAgzEv0="; }; aarch64-darwin-39 = { - name = "torchvision-0.17.1-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-ihsX+xWLK4gfLIeW/hg5piTknV/QeqYfba5gukgZQho="; + name = "torchvision-0.17.2-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-79bQ3QZo4V0Bos/63HQGhDOzLLz1aS4MSqFfxcslDOc="; }; aarch64-darwin-310 = { - name = "torchvision-0.17.1-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-M9ZdDH/cs/e8HdjtMOo81+BYe0rRsQS1Z3yBkai62fE="; + name = "torchvision-0.17.2-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-7MHFA/qKVPurd34Gp8IoAyuKt47+vzWyi8jyL1RPUfE="; }; aarch64-darwin-311 = { - name = "torchvision-0.17.1-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-kQbjLJ8ecK+oFyzxsGTPnCmY2N/wdp7GnVN7ICCe5D0="; + name = "torchvision-0.17.2-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.2-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-4DEAShvEMsmAp71kL2wYmj78MW5CP8MLVWmDcWak4o0="; }; }; } diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index a8e90f7211c42..496a8c08710b0 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -17,7 +17,7 @@ let inherit (cudaPackages) backendStdenv; pname = "torchvision"; - version = "0.17.1"; + version = "0.17.2"; in buildPythonPackage { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage { owner = "pytorch"; repo = "vision"; rev = "refs/tags/v${version}"; - hash = "sha256-K2irwwf6qgyfZqJH1NUasDmBSA4mH2Rclx7A7zP4kiQ="; + hash = "sha256-Y7TkdbdrdiXQO2pBkUePCLw1EYQjsAqkV2OTMzxbU78="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 0cbed38ff7352..3ac3baf1525a9 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.2.4"; + version = "4.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ausgFjhYe0b/hd+szti4GpMil3NF6/yuXSajy/1JZXY="; + hash = "sha256-kUXi26NhFGS3liGaGHfm0HTRWXlnaIa80lxgLQ/0FyM="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/xyzservices/default.nix b/pkgs/development/python-modules/xyzservices/default.nix index 8836d5195fc2a..6e49ec04eaf33 100644 --- a/pkgs/development/python-modules/xyzservices/default.nix +++ b/pkgs/development/python-modules/xyzservices/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "xyzservices"; - version = "2023.10.1"; + version = "2024.4.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-CRIpJpBDvIJYBC7b7a1Py0RoSwRz7eAntWcq1A3J+gI="; + hash = "sha256-agTxFIem+3fZKpiYTNEH+9kVf9XmX5Ka3Zw9bmBO6Iw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 7652eee0350c2..03413fc6f1fcf 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -1,17 +1,18 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchFromGitHub -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, setuptools -, zigpy +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + setuptools, + zigpy, }: buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.113"; + version = "0.0.114"; pyproject = true; disabled = pythonOlder "3.12"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-Th0JF7sauDhFIZH7BY4STgJZ2o+zqQmtUqNLNeaB6As="; + hash = "sha256-FipD4VCz2/FYlf17+q7LTej9ZtT72/R4ELkAQtw7RvE="; }; postPatch = '' @@ -29,9 +30,7 @@ buildPythonPackage rec { --replace-fail 'dynamic = ["version"]' 'version = "${version}"' ''; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ aiohttp @@ -50,9 +49,7 @@ buildPythonPackage rec { "test_smart_air_sensor" ]; - pythonImportsCheck = [ - "zhaquirks" - ]; + pythonImportsCheck = [ "zhaquirks" ]; meta = with lib; { description = "ZHA Device Handlers are custom quirks implementations for Zigpy"; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 096bfd6b1bdd8..09feaeb7e3402 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -546,6 +546,7 @@ let bayesWatch = [ pkgs.boost.dev ]; clustermq = [ pkgs.pkg-config ]; coga = [ pkgs.gsl.dev ]; + deepSNV = with pkgs; [ xz.dev bzip2.dev zlib.dev ]; gpg = [ pkgs.gpgme ]; webp = [ pkgs.libwebp ]; RMark = [ pkgs.which ]; @@ -606,6 +607,7 @@ let s2 = [ pkgs.openssl.dev ]; ArrayExpressHTS = with pkgs; [ zlib.dev curl.dev which ]; bbl = with pkgs; [ gsl ]; + diffHic = with pkgs; [ xz.dev bzip2.dev ]; writexl = with pkgs; [ zlib.dev ]; xslt = with pkgs; [ libxslt libxml2 ]; qpdf = with pkgs; [ libjpeg.dev zlib.dev ]; @@ -625,7 +627,9 @@ let HiCDCPlus = [ pkgs.zlib.dev ]; PopGenome = [ pkgs.zlib.dev ]; QuasR = with pkgs; [ zlib.dev xz.dev bzip2.dev ]; + Rarr = [ pkgs.zlib.dev ]; Rbowtie2 = [ pkgs.zlib.dev ]; + Rfastp = with pkgs; [ xz.dev bzip2.dev zlib.dev ]; maftools = with pkgs; [ zlib.dev bzip2 xz.dev ]; Rmmquant = [ pkgs.zlib.dev ]; SICtools = with pkgs; [ zlib.dev ncurses.dev ]; @@ -648,7 +652,7 @@ let rhdf5filters = with pkgs; [ zlib.dev bzip2.dev ]; symengine = with pkgs; [ mpfr symengine flint ]; rtk = [ pkgs.zlib.dev ]; - scPipe = [ pkgs.zlib.dev ]; + scPipe = with pkgs; [ bzip2.dev xz.dev zlib.dev ]; seqTools = [ pkgs.zlib.dev ]; seqbias = [ pkgs.zlib.dev ]; sparkwarc = [ pkgs.zlib.dev ]; @@ -950,6 +954,7 @@ let "ReactomeContentService4R" # tries to connect to Reactome "pbdMPI" # tries to run MPI processes "data_table" # fails to rename shared library before check + "multiMiR" # tries to connect to DB ]; # Packages which cannot be installed due to lack of dependencies or other reasons. diff --git a/pkgs/development/tools/allure/default.nix b/pkgs/development/tools/allure/default.nix index 82c05637c10a9..ddae95298e47d 100644 --- a/pkgs/development/tools/allure/default.nix +++ b/pkgs/development/tools/allure/default.nix @@ -2,7 +2,7 @@ let pname = "allure"; - version = "2.27.0"; + version = "2.28.0"; in stdenv.mkDerivation rec { inherit pname version; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${version}/allure-${version}.tgz"; - sha256 = "sha256-gasOVDCNxuZlyeDbloV6iL6DAInHPEXHAvnfUfoj+gA="; + sha256 = "sha256-n+wmmY2936PQkHuS9DS7f51n3Eko/OM7nHHFbi85+Lk="; }; dontConfigure = true; dontBuild = true; diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index 9881c26f659e4..a29de512404d1 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -127,7 +127,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { for patch in $(cat $patch_dir/.patches) do echo applying in $repo: $patch - git apply -p1 --directory=$repo --exclude='src/third_party/blink/web_tests/*' $patch_dir/$patch + git apply -p1 --directory=$repo --exclude='src/third_party/blink/web_tests/*' --exclude='src/content/test/data/*' $patch_dir/$patch done done ) diff --git a/pkgs/development/tools/firebase-tools/default.nix b/pkgs/development/tools/firebase-tools/default.nix index 72443844cd6f6..25110f322adbe 100644 --- a/pkgs/development/tools/firebase-tools/default.nix +++ b/pkgs/development/tools/firebase-tools/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "13.6.1"; + version = "13.7.1"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; rev = "v${version}"; - hash = "sha256-2L1bmv47H0VXviCXTIA72+QWNIRnC4BDwXlyTB4YHnM="; + hash = "sha256-NTO4DhRwdCeufkeec6kMw1CEj/cZqk3S+vy9R7TArXU="; }; - npmDepsHash = "sha256-Pp3AbodWh/oRfsylMs2iq6qKMIcKtXl9qFZCsCx8CZs="; + npmDepsHash = "sha256-MgICHHZBgD80vZLfS9WUwvotorc0OAHzGaw+S0tjyQo="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/pkgs/development/tools/rust/cargo-deps/default.nix b/pkgs/development/tools/rust/cargo-deps/default.nix deleted file mode 100644 index 4265873a71acc..0000000000000 --- a/pkgs/development/tools/rust/cargo-deps/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, fetchCrate, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "cargo-deps"; - version = "1.5.1"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-qnSHG4AhBrleYKZ4SJ4AwHdJyiidj8NTeSSphBRo7gg="; - }; - - cargoHash = "sha256-dpCbFA9AZmIFPx69tw0CqHF+lVw7uhUlwAeVX1+lIK8="; - - meta = with lib; { - description = "Cargo subcommand for building dependency graphs of Rust projects"; - mainProgram = "cargo-deps"; - homepage = "https://github.com/m-cat/cargo-deps"; - license = licenses.mit; - maintainers = with maintainers; [ arcnmx matthiasbeyer ]; - }; -} diff --git a/pkgs/games/ferium/default.nix b/pkgs/games/ferium/default.nix index 2f98970c70650..f5958fec86718 100644 --- a/pkgs/games/ferium/default.nix +++ b/pkgs/games/ferium/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, installShellFiles }: +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, Security +, SystemConfiguration +, installShellFiles +}: rustPlatform.buildRustPackage rec { pname = "ferium"; @@ -8,10 +15,10 @@ rustPlatform.buildRustPackage rec { owner = "gorilla-devs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tYRs6HfFTdUZqWal9pLZ0uUNCPr3+zQz5JV2ohOLIP8="; + hash = "sha256-tYRs6HfFTdUZqWal9pLZ0uUNCPr3+zQz5JV2ohOLIP8="; }; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; cargoHash = "sha256-5ClBS42hWw3ULEG1Qn+fiM6dvJ+xS4Dusy3BCj5Cvbg="; diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index b7bc24c8ef46f..150db493198fa 100644 --- a/pkgs/os-specific/darwin/yabai/default.nix +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "yabai"; - version = "7.0.4"; + version = "7.1.0"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -85,14 +85,14 @@ stdenv.mkDerivation (finalAttrs: { # See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information. "aarch64-darwin" = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz"; - hash = "sha256-eOgdCW3BEB9vn9lui7Ib6uWl5MSAnHh3ztqHCWshCv8="; + hash = "sha256-88Sh2nizAQ0a0cnlnrkhb5x3VjHa372HhjHlmNjGdQ4="; }; "x86_64-darwin" = fetchFromGitHub { owner = "koekeishiya"; repo = "yabai"; rev = "v${finalAttrs.version}"; - hash = "sha256-yj7ISrBzVIDGsDQ1D+vDm9PapsZmi5fk1m3cGuzBR7w="; + hash = "sha256-5iC1U6tyUYFLjOfnIxCrjCjj2deUZ/rvsJN4jlrr2Tc="; }; }; diff --git a/pkgs/os-specific/linux/kernel/htmldocs.nix b/pkgs/os-specific/linux/kernel/htmldocs.nix index ba641347c839e..dad377db06abb 100644 --- a/pkgs/os-specific/linux/kernel/htmldocs.nix +++ b/pkgs/os-specific/linux/kernel/htmldocs.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation { postPatch = '' patchShebangs \ Documentation/sphinx/parse-headers.pl \ - scripts/{get_abi.pl,get_feat.pl,kernel-doc,sphinx-pre-install} + scripts/{get_abi.pl,get_feat.pl,kernel-doc,sphinx-pre-install} \ + tools/net/ynl/ynl-gen-rst.py ''; FONTCONFIG_FILE = makeFontsConf { @@ -31,6 +32,7 @@ stdenv.mkDerivation { perl python3.pkgs.sphinx python3.pkgs.sphinx-rtd-theme + python3.pkgs.pyyaml which ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index d07150493fc37..edd11143ad609 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -225,7 +225,7 @@ stdenv.mkDerivation (finalAttrs: { ./0017-meson.build-do-not-create-systemdstatedir.patch ] ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) [ ./0018-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch - ] ++ lib.optional (stdenv.hostPlatform.isPower || stdenv.hostPlatform.isRiscV) [ + ] ++ lib.optional (stdenv.hostPlatform.isPower || stdenv.hostPlatform.isRiscV || stdenv.hostPlatform.isMips) [ # Fixed upstream and included in the main and stable branches. Can be dropped # when bumping to >= v255.5. # https://github.com/systemd/systemd/issues/30448 diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 125b6cb78b9b8..a34e1285e3071 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "xwayland"; - version = "23.2.5"; + version = "23.2.6"; src = fetchurl { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; - hash = "sha256-M+x/8mh6WfqqUrmwmqjK8Rjn7Lau2JU/UmpiX/n0vZA="; + hash = "sha256-HJo2a058ytug+b0xPFnq4S0jvXJUOyKibq+LIINc/G0="; }; depsBuildBuild = [ diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 93b9f596e395a..e5ac2d3ed5417 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -99,8 +99,7 @@ stdenv.mkDerivation rec { nixpkgs="$(git rev-parse --show-toplevel)" default_nix="$nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix" latestDate="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits/$latestSha | jq '.commit.committer.date' | sed 's|"\(.*\)T.*|\1|g')" - update-source-version oh-my-zsh "$latestSha" --version-key=rev - update-source-version oh-my-zsh "$latestDate" --ignore-same-hash + update-source-version oh-my-zsh "$latestDate" --rev="$latestSha" nixfmt "$default_nix" else echo "${pname} is already up-to-date" diff --git a/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix b/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix index 2bc331cc18741..f0d5aa5d39159 100644 --- a/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix +++ b/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix @@ -37,6 +37,7 @@ localPython.pkgs.buildPythonApplication rec { aws-encryption-sdk base64io urllib3 + setuptools # for pkg_resources ]; doCheck = true; @@ -52,6 +53,9 @@ localPython.pkgs.buildPythonApplication rec { "test/integration" ]; + # Upstream did not adapt to pytest 8 yet. + pytestFlagsArray = [ "-W" "ignore::pytest.PytestRemovedIn8Warning" ]; + passthru = { updateScript = nix-update-script { }; tests.version = testers.testVersion { diff --git a/pkgs/tools/admin/awslimitchecker/default.nix b/pkgs/tools/admin/awslimitchecker/default.nix index cc492ed065d30..548bf69e6f070 100644 --- a/pkgs/tools/admin/awslimitchecker/default.nix +++ b/pkgs/tools/admin/awslimitchecker/default.nix @@ -34,6 +34,10 @@ python3Packages.buildPythonApplication rec { pytestFlagsArray = [ "awslimitchecker/tests" + + # Upstream did not adapt to pytest 8 yet. + "-W" + "ignore::pytest.PytestRemovedIn8Warning" ]; disabledTestPaths = [ diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 3092eba0d37e9..2e5ee6d574f29 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -26,7 +26,18 @@ let # keep the scope, as it is used throughout the derivation and tests # this also makes potential future overrides easier - pythonPackages = python3.pkgs.overrideScope (final: prev: rec { }); + pythonPackages = python3.pkgs.overrideScope (final: prev: rec { + # Flask 5.4.3 introduces an CSRF error which makes it impossible to login + # So either we downgrade flask here or use "WTF_CSRF_ENABLED = false" in the + # module config to disable CSRF. + flask-security-too = prev.flask-security-too.overridePythonAttrs (oldAttrs: rec { + version = "5.4.1"; + src = oldAttrs.src.override { + inherit version; + hash = "sha256-Ay7+gk+zuUlXtw0LDdsnvSa22z+yE6VR1guu9QmiFvw="; + }; + }); + }); offlineCache = fetchYarnDeps { yarnLock = ./yarn.lock; diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix index 8303a1b4277b0..daeaec9de3b2c 100644 --- a/pkgs/tools/archivers/atool/default.nix +++ b/pkgs/tools/archivers/atool/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "Archive command line helper"; platforms = lib.platforms.unix; license = lib.licenses.gpl3; + mainProgram = "atool"; }; } diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index d761e4605190f..1d459e70c2e73 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -196,5 +196,6 @@ python.pkgs.buildPythonApplication rec { description = "Deep learning toolkit for Text-to-Speech, battle-tested in research and production"; license = licenses.mpl20; maintainers = teams.tts.members; + broken = true; # added 2024-04-08 }; } diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index b48e2696f09c8..baff7f0303874 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -68,5 +68,7 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; license = lib.licenses.gpl3Plus; + + mainProgram = "gzip"; }; } diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index 520a6951941ad..b0cf599ea4f1b 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -103,14 +103,14 @@ rec { garage_0_8 = garage_0_8_7; - garage_0_9_3 = generic { - version = "0.9.3"; - sha256 = "sha256-NN2HoheSW2+SAFX71K12KTe0wpaBEwkwxvZDi0Bdx+8="; - cargoSha256 = "sha256-OabgWVMkccFFAtBHEf3z+MRVcWaO+NCk/pumEqdNNRs="; + garage_0_9_4 = generic { + version = "0.9.4"; + sha256 = "sha256-2ZaxenwaVGYYUjUJaGgnGpZNQprQV9+Jns2sXM6cowk="; + cargoSha256 = "sha256-Cssls9csn6qribF+pAAagBydX9e9WTq4K/ehaLCWOOA="; broken = stdenv.isDarwin; }; - garage_0_9 = garage_0_9_3; + garage_0_9 = garage_0_9_4; garage = garage_0_9; } diff --git a/pkgs/tools/misc/cyberchef/default.nix b/pkgs/tools/misc/cyberchef/default.nix index ee4c695a43e65..224d3ead7f3d8 100644 --- a/pkgs/tools/misc/cyberchef/default.nix +++ b/pkgs/tools/misc/cyberchef/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "cyberchef"; - version = "10.15.0"; + version = "10.15.1"; src = fetchzip { url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip"; - sha256 = "sha256-QXVqFMG6NJeeTON7w+46MjWXs1bIRL2ji047IvHgvYI="; + sha256 = "sha256-IJ3Id/Pn6KVBQwRFBpECDkeEXQ9J2WRK4NgeSqZoP8w="; stripRoot = false; }; diff --git a/pkgs/tools/misc/pferd/default.nix b/pkgs/tools/misc/pferd/default.nix index af343a19d9697..5875035955ec7 100644 --- a/pkgs/tools/misc/pferd/default.nix +++ b/pkgs/tools/misc/pferd/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "pferd"; - version = "3.5.0"; + version = "3.5.1"; format = "pyproject"; src = fetchFromGitHub { owner = "Garmelon"; repo = "PFERD"; rev = "refs/tags/v${version}"; - sha256 = "sha256-iGMqKRM/8pnnew/U1r7Od9Giyn9z4BxVGO85nw3FI9Y="; + sha256 = "sha256-NNQ7yB0JPVDSWMNxkpvEK/meLa3Db78qxUDDTJa6YgM="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index 03998332eda24..9844e1399f1e6 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -25,20 +25,20 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2024.3.10"; + version = "2024.4.9"; pyproject = true; src = fetchPypi { inherit version; pname = "yt_dlp"; - hash = "sha256-bnTLFKadvrhyyO9OC4u+0u6EbsYzUTzzEkp0wfrtwHs="; + hash = "sha256-fukFcrTTE7WCuZyJ5OzPd5tX/1TtwzGHPGs/unf6qLA="; }; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ brotli certifi mutagen @@ -86,6 +86,7 @@ buildPythonPackage rec { youtube-dl is released to the public domain, which means you can modify it, redistribute it or use it however you like. ''; + changelog = "https://github.com/yt-dlp/yt-dlp/releases/tag/${version}"; license = licenses.unlicense; maintainers = with maintainers; [ mkg20001 SuperSandro2000 marsam ]; mainProgram = "yt-dlp"; diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix index a9ad770008c3e..f87596a0b3ff3 100644 --- a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix +++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix @@ -8,13 +8,13 @@ ocamlPackages.buildDunePackage rec { pname = "wayland-proxy-virtwl"; - version = "unstable-2024-04-05"; + version = "unstable-2024-04-08"; src = fetchFromGitHub { owner = "talex5"; repo = pname; - rev = "99d6b3fb8e5e226dd2f8bf01b788fd69e1e1ae62"; - sha256 = "sha256-BkQK5VGME/HA09brZ61jmjtCQG/s34MwdP0Nc80crkA="; + rev = "57dea8de065f5a155d97a32a929bbb2b1ba6b53a"; + sha256 = "sha256-mp/Y13MwdKo7f3E9S0Pnvb3Cb4d6szkIQOFteMrVxCk="; }; minimalOCamlVersion = "5.0"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 697d89085ee7e..8e9d506706d80 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -151,6 +151,7 @@ mapAliases ({ cadence = throw "cadence has been removed from nixpkgs, as it was archived upstream"; # Added 2023-10-28 cask = emacs.pkgs.cask; # Added 2022-11-12 canonicalize-jars-hook = stripJavaArchivesHook; # Added 2024-03-17 + cargo-deps = throw "cargo-deps has been removed as the repository is deleted"; # Added 2024-04-09 cargo-embed = throw "cargo-embed is now part of the probe-rs package"; # Added 2023-07-03 cargo-espflash = espflash; cargo-flash = throw "cargo-flash is now part of the probe-rs package"; # Added 2023-07-03 @@ -199,7 +200,7 @@ mapAliases ({ clang6Stdenv = throw "clang6Stdenv has been removed from nixpkgs"; # Added 2024-01-08 clang7Stdenv = throw "clang7Stdenv has been removed from nixpkgs"; # Added 2023-11-19 clang8Stdenv = throw "clang8Stdenv has been removed from nixpkgs"; # Added 2024-01-24 - clang9Stdenv = throw "clang9Stdenv has been remvoed from nixpkgs"; # Added 2024-04-08 + clang9Stdenv = throw "clang9Stdenv has been removed from nixpkgs"; # Added 2024-04-08 clang10Stdenv = throw "clang10Stdenv has been removed from nixpkgs"; # Added 2024-01-26 clang11Stdenv = throw "clang11Stdenv has been removed from nixpkgs"; # Added 2023-01-24 clang12Stdenv = lowPrio llvmPackages_12.stdenv; @@ -218,7 +219,7 @@ mapAliases ({ clang_6 = throw "clang_6 has been removed from nixpkgs"; # Added 2024-01-08 clang_7 = throw "clang_7 has been removed from nixpkgs"; # Added 2023-11-19 clang_8 = throw "clang_8 has been removed from nixpkgs"; # Added 2024-01-24 - clang_9 = throw "clang_9 has been removed from nixpkgs"; # Added 2024-01-08 + clang_9 = throw "clang_9 has been removed from nixpkgs"; # Added 2024-04-08 clang_10 = throw "clang_10 has been removed from nixpkgs"; # Added 2024-01-26 clang_11 = throw "clang_11 has been removed from nixpkgs"; # Added 2023-01-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09d76d93d07f2..db8d02340712c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8352,7 +8352,7 @@ with pkgs; }) garage garage_0_8 garage_0_9 - garage_0_8_7 garage_0_9_3; + garage_0_8_7 garage_0_9_4; garmintools = callPackage ../development/libraries/garmintools { }; @@ -16771,7 +16771,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; cargo-deb = callPackage ../development/tools/rust/cargo-deb { }; - cargo-deps = callPackage ../development/tools/rust/cargo-deps { }; cargo-docset = callPackage ../development/tools/rust/cargo-docset { }; cargo-duplicates = callPackage ../development/tools/rust/cargo-duplicates { }; cargo-edit = callPackage ../development/tools/rust/cargo-edit { @@ -37002,7 +37001,7 @@ with pkgs; fairymax = callPackage ../games/fairymax { }; ferium = callPackage ../games/ferium { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; fheroes2 = callPackage ../games/fheroes2 { }; @@ -39768,6 +39767,8 @@ with pkgs; kmon = callPackage ../tools/system/kmon { }; + kmonad = haskellPackages.kmonad.bin; + kompose = callPackage ../applications/networking/cluster/kompose { }; kompute = callPackage ../development/libraries/kompute { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 249c3a2c8b7ec..d9a6001945e97 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5335,6 +5335,8 @@ self: super: with self; { hijri-converter = callPackage ../development/python-modules/hijri-converter { }; + hikari = callPackage ../development/python-modules/hikari { }; + hikvision = callPackage ../development/python-modules/hikvision { }; hiredis = callPackage ../development/python-modules/hiredis { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 67e56fbbc7d7a..a4c523e9fe6f2 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -270,7 +270,7 @@ let cabal-install cabal2nix cachix - carp + # carp broken on 2024-04-09 cedille client-ip-echo darcs @@ -491,11 +491,11 @@ let compilerNames.ghc981 compilerNames.ghc982 ] released; - Cabal_3_10_2_1 = lib.subtractLists [ + Cabal_3_10_3_0 = lib.subtractLists [ compilerNames.ghc981 compilerNames.ghc982 ] released; - Cabal-syntax_3_10_1_0 = lib.subtractLists [ + Cabal-syntax_3_10_3_0 = lib.subtractLists [ compilerNames.ghc981 compilerNames.ghc982 ] released; |