diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-03-25 10:16:56 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-03-25 10:16:56 +0100 |
| commit | 0a8b4eddd25fd7231979eef300df0077f944ef68 (patch) | |
| tree | b4cb39a8d4293982878e6616e56982ae1dc47621 | |
| parent | 173de4efbf4a475175beb0ae9b93a760efcf264a (diff) | |
| parent | c65d0615019209f72feb2d81b77a0d0c5a3f0f1a (diff) | |
Merge branch 'master' into staging-next
403 files changed, 3250 insertions, 2052 deletions
diff --git a/doc/builders/fetchers.chapter.md b/doc/builders/fetchers.chapter.md index 28388ba685d8f..d9f22b062827c 100644 --- a/doc/builders/fetchers.chapter.md +++ b/doc/builders/fetchers.chapter.md @@ -72,6 +72,10 @@ Used with Mercurial. Expects `url`, `rev`, and `sha256`. A number of fetcher functions wrap part of `fetchurl` and `fetchzip`. They are mainly convenience functions intended for commonly used destinations of source code in Nixpkgs. These wrapper fetchers are listed below. +## `fetchFromGitea` {#fetchfromgitea} + +`fetchFromGitea` expects five arguments. `domain` is the gitea server name. `owner` is a string corresponding to the Gitea user or organization that controls this repository. `repo` corresponds to the name of the software repository. These are located at the top of every Gitea HTML page as `owner`/`repo`. `rev` corresponds to the Git commit hash or tag (e.g `v1.0`) that will be downloaded from Git. Finally, `sha256` corresponds to the hash of the extracted directory. Again, other hash algorithms are also available but `sha256` is currently preferred. + ## `fetchFromGitHub` {#fetchfromgithub} `fetchFromGitHub` expects four arguments. `owner` is a string corresponding to the GitHub user or organization that controls this repository. `repo` corresponds to the name of the software repository. These are located at the top of every GitHub HTML page as `owner`/`repo`. `rev` corresponds to the Git commit hash or tag (e.g `v1.0`) that will be downloaded from Git. Finally, `sha256` corresponds to the hash of the extracted directory. Again, other hash algorithms are also available but `sha256` is currently preferred. diff --git a/doc/languages-frameworks/texlive.section.md b/doc/languages-frameworks/texlive.section.md index 6b505cefcc95c..060f5c647c296 100644 --- a/doc/languages-frameworks/texlive.section.md +++ b/doc/languages-frameworks/texlive.section.md @@ -6,7 +6,7 @@ Since release 15.09 there is a new TeX Live packaging that lives entirely under - For basic usage just pull `texlive.combined.scheme-basic` for an environment with basic LaTeX support. -- It typically won't work to use separately installed packages together. Instead, you can build a custom set of packages like this: +- It typically won't work to use separately installed packages together. Instead, you can build a custom set of packages like this. Most CTAN packages should be available: ```nix texlive.combine { diff --git a/lib/default.nix b/lib/default.nix index 6f7930c53430d..0e94e821bea50 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -68,7 +68,8 @@ let bitNot boolToString mergeAttrs flip mapNullable inNixShell isFloat min max importJSON importTOML warn warnIf throwIfNot checkListOfEnum info showWarnings nixpkgsVersion version isInOldestRelease - mod compare splitByAndCompare functionArgs setFunctionArgs isFunction + mod compare splitByAndCompare + functionArgs setFunctionArgs isFunction toFunction toHexString toBaseDigits; inherit (self.fixedPoints) fix fix' converge extends composeExtensions composeManyExtensions makeExtensible makeExtensibleWithCustomName; @@ -113,7 +114,7 @@ let commitIdFromGitRepo cleanSourceWith pathHasContext canCleanSource pathIsRegularFile pathIsGitRepo; inherit (self.modules) evalModules setDefaultModuleLocation - unifyModuleSyntax applyIfFunction mergeModules + unifyModuleSyntax applyModuleArgsIfFunction mergeModules mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions pushDownProperties dischargeProperties filterOverrides sortProperties fixupOptionType mkIf mkAssert mkMerge mkOverride diff --git a/lib/modules.nix b/lib/modules.nix index 9bb8bfbbdf144..35c93d22baf90 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -282,11 +282,11 @@ rec { # Like unifyModuleSyntax, but also imports paths and calls functions if necessary loadModule = args: fallbackFile: fallbackKey: m: if isFunction m || isAttrs m then - unifyModuleSyntax fallbackFile fallbackKey (applyIfFunction fallbackKey m args) + unifyModuleSyntax fallbackFile fallbackKey (applyModuleArgsIfFunction fallbackKey m args) else if isList m then let defs = [{ file = fallbackFile; value = m; }]; in throw "Module imports can't be nested lists. Perhaps you meant to remove one level of lists? Definitions: ${showDefs defs}" - else unifyModuleSyntax (toString m) (toString m) (applyIfFunction (toString m) (import m) args); + else unifyModuleSyntax (toString m) (toString m) (applyModuleArgsIfFunction (toString m) (import m) args); /* Collects all modules recursively into the form @@ -383,7 +383,7 @@ rec { config = addFreeformType (addMeta (removeAttrs m ["_file" "key" "disabledModules" "require" "imports" "freeformType"])); }; - applyIfFunction = key: f: args@{ config, options, lib, ... }: if isFunction f then + applyModuleArgsIfFunction = key: f: args@{ config, options, lib, ... }: if isFunction f then let # Module arguments are resolved in a strict manner when attribute set # deconstruction is used. As the arguments are now defined with the diff --git a/lib/trivial.nix b/lib/trivial.nix index 543680a10801f..18616a189c269 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -441,6 +441,25 @@ rec { isFunction = f: builtins.isFunction f || (f ? __functor && isFunction (f.__functor f)); + /* + Turns any non-callable values into constant functions. + Returns callable values as is. + + Example: + + nix-repl> lib.toFunction 1 2 + 1 + + nix-repl> lib.toFunction (x: x + 1) 2 + 3 + */ + toFunction = + # Any value + v: + if isFunction v + then v + else k: v; + /* Convert the given positive integer to a string of its hexadecimal representation. For example: diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ef76a3043beff..4a66ffa1eafb8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4241,7 +4241,12 @@ githubId = 119691; name = "Michael Gough"; }; - + freax13 = { + email = "erbse.13@gmx.de"; + github = "freax13"; + githubId = 14952658; + name = "Tom Dohrmann"; + }; fredeb = { email = "im@fredeb.dev"; github = "fredeeb"; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index ada3834c3aa74..44a27c5f49d08 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -480,6 +480,15 @@ </listitem> <listitem> <para> + <literal>services.ipfs.extraFlags</literal> is now escaped + with <literal>utils.escapeSystemdExecArgs</literal>. If you + rely on systemd interpolating <literal>extraFlags</literal> in + the service <literal>ExecStart</literal>, this will no longer + work. + </para> + </listitem> + <listitem> + <para> The <literal>matrix-synapse</literal> service (<literal>services.matrix-synapse</literal>) has been converted to use the <literal>settings</literal> option diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 0262b3dcc3411..aadb6c4c23167 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -161,6 +161,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The `mailpile` email webclient (`services.mailpile`) has been removed due to its reliance on python2. +- `services.ipfs.extraFlags` is now escaped with `utils.escapeSystemdExecArgs`. If you rely on systemd interpolating `extraFlags` in the service `ExecStart`, this will no longer work. + - The `matrix-synapse` service (`services.matrix-synapse`) has been converted to use the `settings` option defined in RFC42. This means that options that are part of your `homeserver.yaml` configuration, and that were specified at the top-level of the module (`services.matrix-synapse`) now need to be moved into `services.matrix-synapse.settings`. And while not all options you diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 0d3c3a89e7836..facc7a253a759 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -146,26 +146,28 @@ rec { # Make a full-blown test makeTest = - { testScript + { machine ? null + , nodes ? {} + , testScript , enableOCR ? false , name ? "unnamed" # Skip linting (mainly intended for faster dev cycles) , skipLint ? false , passthru ? {} + , meta ? {} , # For meta.position pos ? # position used in error messages and for meta.position - (if t.meta.description or null != null - then builtins.unsafeGetAttrPos "description" t.meta + (if meta.description or null != null + then builtins.unsafeGetAttrPos "description" meta else builtins.unsafeGetAttrPos "testScript" t) - , ... } @ t: let - nodes = qemu_pkg: + mkNodes = qemu_pkg: let testScript' = # Call the test script with the computed nodes. if lib.isFunction testScript - then testScript { nodes = nodes qemu_pkg; } + then testScript { nodes = mkNodes qemu_pkg; } else testScript; build-vms = import ./build-vms.nix { @@ -205,33 +207,29 @@ rec { }; in build-vms.buildVirtualNetwork ( - t.nodes or (if t ? machine then { machine = t.machine; } else { }) + nodes // lib.optionalAttrs (machine != null) { inherit machine; } ); driver = setupDriverForTest { inherit testScript enableOCR skipLint passthru; testName = name; qemu_pkg = pkgs.qemu_test; - nodes = nodes pkgs.qemu_test; + nodes = mkNodes pkgs.qemu_test; }; driverInteractive = setupDriverForTest { inherit testScript enableOCR skipLint passthru; testName = name; qemu_pkg = pkgs.qemu; - nodes = nodes pkgs.qemu; + nodes = mkNodes pkgs.qemu; interactive = true; }; - test = - let - passMeta = drv: drv // lib.optionalAttrs (t ? meta) { - meta = (drv.meta or { }) // t.meta; - }; - in passMeta (runTests { inherit driver pos driverInteractive; }); + test = lib.addMetaAttrs meta (runTests { inherit driver pos driverInteractive; }); in test // { - inherit test driver driverInteractive nodes; + inherit test driver driverInteractive; + inherit (driver) nodes; }; abortForFunction = functionName: abort ''The ${functionName} function was diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 71aaf7f253d9b..2e088b9777102 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -117,7 +117,7 @@ in ''; }; - config = lib.mkIf (!config.system.disableInstallerTools) { + config = lib.mkIf (config.nix.enable && !config.system.disableInstallerTools) { system.nixos-generate-config.configuration = mkDefault '' # Edit this configuration file to define what should be installed on diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e80c6cf90f54c..93172aa082466 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -777,6 +777,7 @@ ./services/networking/headscale.nix ./services/networking/hostapd.nix ./services/networking/htpdate.nix + ./services/networking/https-dns-proxy.nix ./services/networking/hylafax/default.nix ./services/networking/i2pd.nix ./services/networking/i2p.nix diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix index e6a23233ba28d..28e2d18bf0311 100644 --- a/nixos/modules/services/logging/graylog.nix +++ b/nixos/modules/services/logging/graylog.nix @@ -132,7 +132,7 @@ in description = "Graylog server daemon user"; }; }; - users.groups = mkIf (cfg.user == "graylog") {}; + users.groups = mkIf (cfg.user == "graylog") { graylog = {}; }; systemd.tmpfiles.rules = [ "d '${cfg.messageJournalDir}' - ${cfg.user} - - -" diff --git a/nixos/modules/services/misc/moonraker.nix b/nixos/modules/services/misc/moonraker.nix index ae57aaa6d4795..b75227effa04f 100644 --- a/nixos/modules/services/misc/moonraker.nix +++ b/nixos/modules/services/misc/moonraker.nix @@ -79,6 +79,19 @@ in { for supported values. ''; }; + + allowSystemControl = mkOption { + type = types.bool; + default = false; + description = '' + Whether to allow Moonraker to perform system-level operations. + + Moonraker exposes APIs to perform system-level operations, such as + reboot, shutdown, and management of systemd units. See the + <link xlink:href="https://moonraker.readthedocs.io/en/latest/web_api/#machine-commands">documentation</link> + for details on what clients are able to do. + ''; + }; }; }; @@ -86,6 +99,13 @@ in { warnings = optional (cfg.settings ? update_manager) ''Enabling update_manager is not supported on NixOS and will lead to non-removable warnings in some clients.''; + assertions = [ + { + assertion = cfg.allowSystemControl -> config.security.polkit.enable; + message = "services.moonraker.allowSystemControl requires polkit to be enabled (security.polkit.enable)."; + } + ]; + users.users = optionalAttrs (cfg.user == "moonraker") { moonraker = { group = cfg.group; @@ -128,11 +148,31 @@ in { exec ${pkg}/bin/moonraker -c ${cfg.configDir}/moonraker-temp.cfg ''; + # Needs `ip` command + path = [ pkgs.iproute2 ]; + serviceConfig = { WorkingDirectory = cfg.stateDir; Group = cfg.group; User = cfg.user; }; }; + + security.polkit.extraConfig = lib.optionalString cfg.allowSystemControl '' + // nixos/moonraker: Allow Moonraker to perform system-level operations + // + // This was enabled via services.moonraker.allowSystemControl. + polkit.addRule(function(action, subject) { + if ((action.id == "org.freedesktop.systemd1.manage-units" || + action.id == "org.freedesktop.login1.power-off" || + action.id == "org.freedesktop.login1.power-off-multiple-sessions" || + action.id == "org.freedesktop.login1.reboot" || + action.id == "org.freedesktop.login1.reboot-multiple-sessions" || + action.id.startsWith("org.freedesktop.packagekit.")) && + subject.user == "${cfg.user}") { + return polkit.Result.YES; + } + }); + ''; }; } diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix index a7a6a3b59644e..b4b4b55a6c823 100644 --- a/nixos/modules/services/misc/nix-gc.nix +++ b/nixos/modules/services/misc/nix-gc.nix @@ -81,8 +81,14 @@ in ###### implementation config = { - - systemd.services.nix-gc = { + assertions = [ + { + assertion = cfg.automatic -> config.nix.enable; + message = ''nix.gc.automatic requires nix.enable''; + } + ]; + + systemd.services.nix-gc = lib.mkIf config.nix.enable { description = "Nix Garbage Collector"; script = "exec ${config.nix.package.out}/bin/nix-collect-garbage ${cfg.options}"; startAt = optional cfg.automatic cfg.dates; diff --git a/nixos/modules/services/misc/nix-optimise.nix b/nixos/modules/services/misc/nix-optimise.nix index e02026d5f76c7..acf8177b146ae 100644 --- a/nixos/modules/services/misc/nix-optimise.nix +++ b/nixos/modules/services/misc/nix-optimise.nix @@ -37,8 +37,14 @@ in ###### implementation config = { - - systemd.services.nix-optimise = + assertions = [ + { + assertion = cfg.automatic -> config.nix.enable; + message = ''nix.optimise.automatic requires nix.enable''; + } + ]; + + systemd.services.nix-optimise = lib.mkIf config.nix.enable { description = "Nix Store Optimiser"; # No point this if the nix daemon (and thus the nix store) is outside unitConfig.ConditionPathIsReadWrite = "/nix/var/nix/daemon-socket"; diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 655785b99d877..7e96179b3cabf 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -1,16 +1,17 @@ -{ config, lib, pkgs, options, ... }: +{ config, lib, pkgs, options, utils, ... }: with lib; let cfg = config.services.ipfs; opt = options.services.ipfs; - ipfsFlags = toString ([ - (optionalString cfg.autoMount "--mount") - (optionalString cfg.enableGC "--enable-gc") - (optionalString (cfg.serviceFdlimit != null) "--manage-fdlimit=false") - (optionalString (cfg.defaultMode == "offline") "--offline") - (optionalString (cfg.defaultMode == "norouting") "--routing=none") - ] ++ cfg.extraFlags); + ipfsFlags = utils.escapeSystemdExecArgs ( + optional cfg.autoMount "--mount" ++ + optional cfg.enableGC "--enable-gc" ++ + optional (cfg.serviceFdlimit != null) "--manage-fdlimit=false" ++ + optional (cfg.defaultMode == "offline") "--offline" ++ + optional (cfg.defaultMode == "norouting") "--routing=none" ++ + cfg.extraFlags + ); profile = if cfg.localDiscovery diff --git a/nixos/modules/services/networking/https-dns-proxy.nix b/nixos/modules/services/networking/https-dns-proxy.nix new file mode 100644 index 0000000000000..85d6c362b466b --- /dev/null +++ b/nixos/modules/services/networking/https-dns-proxy.nix @@ -0,0 +1,128 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) + concatStringsSep + mkEnableOption mkIf mkOption types; + + cfg = config.services.https-dns-proxy; + + providers = { + cloudflare = { + ips = [ "1.1.1.1" "1.0.0.1" ]; + url = "https://cloudflare-dns.com/dns-query"; + }; + google = { + ips = [ "8.8.8.8" "8.8.4.4" ]; + url = "https://dns.google/dns-query"; + }; + quad9 = { + ips = [ "9.9.9.9" "149.112.112.112" ]; + url = "https://dns.quad9.net/dns-query"; + }; + }; + + defaultProvider = "quad9"; + + providerCfg = + let + isCustom = cfg.provider.kind == "custom"; + in + lib.concatStringsSep " " [ + "-b" + (concatStringsSep "," (if isCustom then cfg.provider.ips else providers."${cfg.provider.kind}".ips)) + "-r" + (if isCustom then cfg.provider.url else providers."${cfg.provider.kind}".url) + ]; + +in +{ + meta.maintainers = with lib.maintainers; [ peterhoeg ]; + + ###### interface + + options.services.https-dns-proxy = { + enable = mkEnableOption "https-dns-proxy daemon"; + + address = mkOption { + description = "The address on which to listen"; + type = types.str; + default = "127.0.0.1"; + }; + + port = mkOption { + description = "The port on which to listen"; + type = types.port; + default = 5053; + }; + + provider = { + kind = mkOption { + description = '' + The upstream provider to use or custom in case you do not trust any of + the predefined providers or just want to use your own. + + The default is ${defaultProvider} and there are privacy and security trade-offs + when using any upstream provider. Please consider that before using any + of them. + + If you pick a custom provider, you will need to provide the bootstrap + IP addresses as well as the resolver https URL. + ''; + type = types.enum ((builtins.attrNames providers) ++ [ "custom" ]); + default = defaultProvider; + }; + + ips = mkOption { + description = "The custom provider IPs"; + type = types.listOf types.str; + }; + + url = mkOption { + description = "The custom provider URL"; + type = types.str; + }; + }; + + preferIPv4 = mkOption { + description = '' + https_dns_proxy will by default use IPv6 and fail if it is not available. + To play it safe, we choose IPv4. + ''; + type = types.bool; + default = true; + }; + + extraArgs = mkOption { + description = "Additional arguments to pass to the process."; + type = types.listOf types.str; + default = [ "-v" ]; + }; + }; + + ###### implementation + + config = lib.mkIf cfg.enable { + systemd.services.https-dns-proxy = { + description = "DNS to DNS over HTTPS (DoH) proxy"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = rec { + Type = "exec"; + DynamicUser = true; + ExecStart = lib.concatStringsSep " " ( + [ + "${pkgs.https-dns-proxy}/bin/https_dns_proxy" + "-a ${toString cfg.address}" + "-p ${toString cfg.port}" + "-l -" + providerCfg + ] + ++ lib.optional cfg.preferIPv4 "-4" + ++ cfg.extraArgs + ); + Restart = "on-failure"; + }; + }; + }; +} diff --git a/nixos/modules/services/system/earlyoom.nix b/nixos/modules/services/system/earlyoom.nix index ddd5bcebcdd5f..6293585598907 100644 --- a/nixos/modules/services/system/earlyoom.nix +++ b/nixos/modules/services/system/earlyoom.nix @@ -5,8 +5,8 @@ let inherit (lib) mkDefault mkEnableOption mkIf mkOption types - mkRemovedOptionModule - concatStringsSep optional; + mkRemovedOptionModule literalExpression + escapeShellArg concatStringsSep optional optionalString; in { @@ -17,10 +17,26 @@ in type = types.ints.between 1 100; default = 10; description = '' - Minimum of availabe memory (in percent). - If the free memory falls below this threshold and the analog is true for - <option>services.earlyoom.freeSwapThreshold</option> - the killing begins. + Minimum available memory (in percent). + + If the available memory falls below this threshold (and the analog is true for + <option>freeSwapThreshold</option>) the killing begins. + SIGTERM is sent first to the process that uses the most memory; then, if the available + memory falls below <option>freeMemKillThreshold</option> (and the analog is true for + <option>freeSwapKillThreshold</option>), SIGKILL is sent. + + See <link xlink:href="https://github.com/rfjakob/earlyoom#command-line-options">README</link> for details. + ''; + }; + + freeMemKillThreshold = mkOption { + type = types.nullOr (types.ints.between 1 100); + default = null; + description = '' + Minimum available memory (in percent) before sending SIGKILL. + If unset, this defaults to half of <option>freeMemThreshold</option>. + + See the description of <xref linkend="opt-services.earlyoom.freeMemThreshold"/>. ''; }; @@ -28,19 +44,20 @@ in type = types.ints.between 1 100; default = 10; description = '' - Minimum of availabe swap space (in percent). - If the available swap space falls below this threshold and the analog - is true for <option>services.earlyoom.freeMemThreshold</option> - the killing begins. + Minimum free swap space (in percent) before sending SIGTERM. + + See the description of <xref linkend="opt-services.earlyoom.freeMemThreshold"/>. ''; }; - # TODO: remove or warn after 1.7 (https://github.com/rfjakob/earlyoom/commit/7ebc4554) - ignoreOOMScoreAdjust = mkOption { - type = types.bool; - default = false; + freeSwapKillThreshold = mkOption { + type = types.nullOr (types.ints.between 1 100); + default = null; description = '' - Ignore oom_score_adjust values of processes. + Minimum free swap space (in percent) before sending SIGKILL. + If unset, this defaults to half of <option>freeSwapThreshold</option>. + + See the description of <xref linkend="opt-services.earlyoom.freeMemThreshold"/>. ''; }; @@ -63,12 +80,43 @@ in local user to DoS your session by spamming notifications. To actually see the notifications in your GUI session, you need to have - <literal>systembus-notify</literal> running as your user which this - option handles. + <literal>systembus-notify</literal> running as your user, which this + option handles by enabling <option>services.systembus-notify</option>. See <link xlink:href="https://github.com/rfjakob/earlyoom#notifications">README</link> for details. ''; }; + + killHook = mkOption { + type = types.nullOr types.path; + default = null; + example = literalExpression '' + pkgs.writeShellScript "earlyoom-kill-hook" ''' + echo "Process $EARLYOOM_NAME ($EARLYOOM_PID) was killed" >> /path/to/log + ''' + ''; + description = '' + An absolute path to an executable to be run for each process killed. + Some environment variables are available, see + <link xlink:href="https://github.com/rfjakob/earlyoom#notifications">README</link> and + <link xlink:href="https://github.com/rfjakob/earlyoom/blob/master/MANPAGE.md#-n-pathtoscript">the man page</link> + for details. + ''; + }; + + reportInterval = mkOption { + type = types.int; + default = 3600; + example = 0; + description = "Interval (in seconds) at which a memory report is printed (set to 0 to disable)."; + }; + + extraArgs = mkOption { + type = types.listOf types.str; + default = []; + example = [ "-g" "--prefer '(^|/)(java|chromium)$'" ]; + description = "Extra command-line arguments to be passed to earlyoom."; + }; }; imports = [ @@ -76,7 +124,11 @@ in This option is deprecated and ignored by earlyoom since 1.2. '') (mkRemovedOptionModule [ "services" "earlyoom" "notificationsCommand" ] '' - This option is deprecated and ignored by earlyoom since 1.6. + This option was removed in earlyoom 1.6, but was reimplemented in 1.7 + and is available as the new option `services.earlyoom.killHook`. + '') + (mkRemovedOptionModule [ "services" "earlyoom" "ignoreOOMScoreAdjust" ] '' + This option is deprecated and ignored by earlyoom since 1.7. '') ]; @@ -91,12 +143,16 @@ in StandardError = "journal"; ExecStart = concatStringsSep " " ([ "${pkgs.earlyoom}/bin/earlyoom" - "-m ${toString cfg.freeMemThreshold}" - "-s ${toString cfg.freeSwapThreshold}" + ("-m ${toString cfg.freeMemThreshold}" + + optionalString (cfg.freeMemKillThreshold != null) ",${toString cfg.freeMemKillThreshold}") + ("-s ${toString cfg.freeSwapThreshold}" + + optionalString (cfg.freeSwapKillThreshold != null) ",${toString cfg.freeSwapKillThreshold}") + "-r ${toString cfg.reportInterval}" ] - ++ optional cfg.ignoreOOMScoreAdjust "-i" ++ optional cfg.enableDebugInfo "-d" ++ optional cfg.enableNotifications "-n" + ++ optional (cfg.killHook != null) "-N ${escapeShellArg cfg.killHook}" + ++ cfg.extraArgs ); }; }; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index b7aa2eba81cff..3ca044ad5bc85 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -519,7 +519,7 @@ in with plasma5; with kdeApplications; with kdeFrameworks; [ # Basic packages without which Plasma Mobile fails to work properly. - plasma-phone-components + plasma-mobile plasma-nano pkgs.maliit-framework pkgs.maliit-keyboard @@ -573,7 +573,7 @@ in }; }; - services.xserver.displayManager.sessionPackages = [ pkgs.libsForQt5.plasma5.plasma-phone-components ]; + services.xserver.displayManager.sessionPackages = [ pkgs.libsForQt5.plasma5.plasma-mobile ]; }) ]; } diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 19f2be2c4a251..b0f160c1dbf95 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -535,6 +535,7 @@ let createGreDevice = n: v: nameValuePair "${n}-netdev" (let deps = deviceDependency v.dev; + ttlarg = if lib.hasPrefix "ip6" v.type then "hoplimit" else "ttl"; in { description = "GRE Tunnel Interface ${n}"; wantedBy = [ "network-setup.service" (subsystemDevice n) ]; @@ -551,6 +552,7 @@ let ip link add name "${n}" type ${v.type} \ ${optionalString (v.remote != null) "remote \"${v.remote}\""} \ ${optionalString (v.local != null) "local \"${v.local}\""} \ + ${optionalString (v.ttl != null) "${ttlarg} ${toString v.ttl}"} \ ${optionalString (v.dev != null) "dev \"${v.dev}\""} ip link set "${n}" up ''; diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 8a5e1b5af114c..8654539b6629c 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -318,6 +318,8 @@ in Remote = gre.remote; }) // (optionalAttrs (gre.local != null) { Local = gre.local; + }) // (optionalAttrs (gre.ttl != null) { + TTL = gre.ttl; }); }; networks = mkIf (gre.dev != null) { diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 01980b80f1cfd..60b5a48b2e62e 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1020,12 +1020,14 @@ in local = "10.0.0.22"; dev = "enp4s0f0"; type = "tap"; + ttl = 255; }; gre6Tunnel = { remote = "fd7a:5634::1"; local = "fd7a:5634::2"; dev = "enp4s0f0"; type = "tun6"; + ttl = 255; }; } ''; @@ -1063,6 +1065,15 @@ in ''; }; + ttl = mkOption { + type = types.nullOr types.int; + default = null; + example = 255; + description = '' + The time-to-live/hoplimit of the connection to the remote tunnel endpoint. + ''; + }; + type = mkOption { type = with types; enum [ "tun" "tap" "tun6" "tap6" ]; default = "tap"; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 5143893589470..dacbb64a2dacb 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -796,7 +796,7 @@ in # allow `system.build.toplevel' to be included. (If we had a direct # reference to ${regInfo} here, then we would get a cyclic # dependency.) - boot.postBootCommands = + boot.postBootCommands = lib.mkIf config.nix.enable '' if [[ "$(cat /proc/cmdline)" =~ regInfo=([^ ]*) ]]; then ${config.nix.package.out}/bin/nix-store --load-db < ''${BASH_REMATCH[1]} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b6311f856fa89..47587b1b30c0c 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -132,6 +132,7 @@ in domination = handleTest ./domination.nix {}; dovecot = handleTest ./dovecot.nix {}; drbd = handleTest ./drbd.nix {}; + earlyoom = handleTestOn ["x86_64-linux"] ./earlyoom.nix {}; ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {}; ec2-nixops = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-nixops or {}; ecryptfs = handleTest ./ecryptfs.nix {}; @@ -308,6 +309,7 @@ in molly-brown = handleTest ./molly-brown.nix {}; mongodb = handleTest ./mongodb.nix {}; moodle = handleTest ./moodle.nix {}; + moonraker = handleTest ./moonraker.nix {}; morty = handleTest ./morty.nix {}; mosquitto = handleTest ./mosquitto.nix {}; moosefs = handleTest ./moosefs.nix {}; diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix index cf55656671318..ec2a9f6527c93 100644 --- a/nixos/tests/boot.nix +++ b/nixos/tests/boot.nix @@ -38,7 +38,6 @@ let } // extraConfig); in makeTest { - inherit iso; name = "boot-" + name; nodes = { }; testScript = diff --git a/nixos/tests/caddy.nix b/nixos/tests/caddy.nix index 0902904b20860..16436ab52800e 100644 --- a/nixos/tests/caddy.nix +++ b/nixos/tests/caddy.nix @@ -7,7 +7,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { nodes = { webserver = { pkgs, lib, ... }: { services.caddy.enable = true; - services.caddy.config = '' + services.caddy.extraConfig = '' http://localhost { encode gzip @@ -22,7 +22,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { ''; specialisation.etag.configuration = { - services.caddy.config = lib.mkForce '' + services.caddy.extraConfig = lib.mkForce '' http://localhost { encode gzip @@ -38,7 +38,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { }; specialisation.config-reload.configuration = { - services.caddy.config = '' + services.caddy.extraConfig = '' http://localhost:8080 { } ''; diff --git a/nixos/tests/ceph-multi-node.nix b/nixos/tests/ceph-multi-node.nix index 29e7c279d69ac..556546beee764 100644 --- a/nixos/tests/ceph-multi-node.nix +++ b/nixos/tests/ceph-multi-node.nix @@ -48,7 +48,7 @@ let sudo ceph xfsprogs - netcat-openbsd + libressl.nc ]; boot.kernelModules = [ "xfs" ]; diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 8965646bc5dcf..3815dca762203 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -15,26 +15,9 @@ with import ../lib/testing-python.nix { inherit system pkgs; }; with pkgs.lib; -mapAttrs (channel: chromiumPkg: makeTest rec { - name = "chromium-${channel}"; - meta = { - maintainers = with maintainers; [ aszlig primeos ]; - # https://github.com/NixOS/hydra/issues/591#issuecomment-435125621 - inherit (chromiumPkg.meta) timeout; - }; - - enableOCR = true; - +let user = "alice"; - machine.imports = [ ./common/user-account.nix ./common/x11.nix ]; - machine.virtualisation.memorySize = 2047; - machine.test-support.displayManager.auto.user = user; - machine.environment = { - systemPackages = [ chromiumPkg ]; - variables."XAUTHORITY" = "/home/alice/.Xauthority"; - }; - startupHTML = pkgs.writeText "chromium-startup.html" '' <!DOCTYPE html> <html> @@ -50,6 +33,25 @@ mapAttrs (channel: chromiumPkg: makeTest rec { </body> </html> ''; +in + +mapAttrs (channel: chromiumPkg: makeTest { + name = "chromium-${channel}"; + meta = { + maintainers = with maintainers; [ aszlig primeos ]; + # https://github.com/NixOS/hydra/issues/591#issuecomment-435125621 + inherit (chromiumPkg.meta) timeout; + }; + + enableOCR = true; + + machine.imports = [ ./common/user-account.nix ./common/x11.nix ]; + machine.virtualisation.memorySize = 2047; + machine.test-support.displayManager.auto.user = user; + machine.environment = { + systemPackages = [ chromiumPkg ]; + variables."XAUTHORITY" = "/home/alice/.Xauthority"; + }; testScript = let xdo = name: text: let diff --git a/nixos/tests/cri-o.nix b/nixos/tests/cri-o.nix index 91d46657f2411..d3a8713d6a9b3 100644 --- a/nixos/tests/cri-o.nix +++ b/nixos/tests/cri-o.nix @@ -1,7 +1,7 @@ # This test runs CRI-O and verifies via critest import ./make-test-python.nix ({ pkgs, ... }: { name = "cri-o"; - maintainers = with pkgs.lib.maintainers; teams.podman.members; + meta.maintainers = with pkgs.lib.maintainers; teams.podman.members; nodes = { crio = { diff --git a/nixos/tests/earlyoom.nix b/nixos/tests/earlyoom.nix new file mode 100644 index 0000000000000..75bdf56899b30 --- /dev/null +++ b/nixos/tests/earlyoom.nix @@ -0,0 +1,16 @@ +import ./make-test-python.nix ({ lib, ... }: { + name = "earlyoom"; + meta = { + maintainers = with lib.maintainers; [ ncfavier ]; + }; + + machine = { + services.earlyoom = { + enable = true; + }; + }; + + testScript = '' + machine.wait_for_unit("earlyoom.service") + ''; +}) diff --git a/nixos/tests/gitolite-fcgiwrap.nix b/nixos/tests/gitolite-fcgiwrap.nix index 38f8d5c883fd5..abf1db37003a6 100644 --- a/nixos/tests/gitolite-fcgiwrap.nix +++ b/nixos/tests/gitolite-fcgiwrap.nix @@ -20,7 +20,7 @@ import ./make-test-python.nix ( nodes = { server = - { ... }: + { config, ... }: { networking.firewall.allowedTCPPorts = [ 80 ]; diff --git a/nixos/tests/jitsi-meet.nix b/nixos/tests/jitsi-meet.nix index d95f7c2ea9eaa..41d53bc73800e 100644 --- a/nixos/tests/jitsi-meet.nix +++ b/nixos/tests/jitsi-meet.nix @@ -21,9 +21,9 @@ import ./make-test-python.nix ({ pkgs, ... }: { forceSSL = true; }; - security.acme.email = "me@example.org"; security.acme.acceptTerms = true; - security.acme.server = "https://example.com"; # self-signed only + security.acme.defaults.email = "me@example.org"; + security.acme.defaults.server = "https://example.com"; # self-signed only }; }; diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index 0587912c9a226..02513c4726c1b 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -1,13 +1,13 @@ # Miscellaneous small tests that don't warrant their own VM run. -import ./make-test-python.nix ({ pkgs, ...} : rec { +import ./make-test-python.nix ({ pkgs, ...} : let + foo = pkgs.writeText "foo" "Hello World"; +in { name = "misc"; meta = with pkgs.lib.maintainers; { maintainers = [ eelco ]; }; - foo = pkgs.writeText "foo" "Hello World"; - machine = { lib, ... }: with lib; diff --git a/nixos/tests/moonraker.nix b/nixos/tests/moonraker.nix new file mode 100644 index 0000000000000..b0a93a4a608b4 --- /dev/null +++ b/nixos/tests/moonraker.nix @@ -0,0 +1,45 @@ +import ./make-test-python.nix ({ pkgs, ...} : { + name = "moonraker"; + meta = with pkgs.lib.maintainers; { + maintainers = [ zhaofengli ]; + }; + + nodes = { + printer = { config, pkgs, ... }: { + security.polkit.enable = true; + + services.moonraker = { + enable = true; + allowSystemControl = true; + + settings = { + authorization = { + trusted_clients = [ "127.0.0.0/8" "::1/128" ]; + }; + }; + }; + + services.klipper = { + enable = true; + + user = "moonraker"; + group = "moonraker"; + + # No mcu configured so won't even enter `ready` state + settings = {}; + }; + }; + }; + + testScript = '' + printer.start() + + printer.wait_for_unit("klipper.service") + printer.wait_for_unit("moonraker.service") + printer.wait_until_succeeds("curl http://localhost:7125/printer/info | grep -v 'Not Found' >&2", timeout=30) + + with subtest("Check that we can perform system-level operations"): + printer.succeed("curl -X POST http://localhost:7125/machine/services/stop?service=klipper | grep ok >&2") + printer.wait_until_succeeds("systemctl --no-pager show klipper.service | grep ActiveState=inactive", timeout=10) + ''; +}) diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index b763cbd46657d..dc7938a436aa7 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -514,12 +514,14 @@ let local = "192.168.2.1"; remote = "192.168.2.2"; dev = "eth2"; + ttl = 225; type = "tap"; }; gre6Tunnel = { local = "fd00:1234:5678:4::1"; remote = "fd00:1234:5678:4::2"; dev = "eth3"; + ttl = 255; type = "tun6"; }; }; @@ -548,12 +550,14 @@ let local = "192.168.2.2"; remote = "192.168.2.1"; dev = "eth1"; + ttl = 225; type = "tap"; }; gre6Tunnel = { local = "fd00:1234:5678:4::2"; remote = "fd00:1234:5678:4::1"; dev = "eth3"; + ttl = 255; type = "tun6"; }; }; @@ -573,6 +577,7 @@ let ]; testScript = { ... }: '' + import json start_all() with subtest("Wait for networking to be configured"): @@ -591,6 +596,13 @@ let client1.wait_until_succeeds("ping -c 1 fc00::2") client2.wait_until_succeeds("ping -c 1 fc00::1") + + with subtest("Test GRE tunnel TTL"): + links = json.loads(client1.succeed("ip -details -json link show greTunnel")) + assert links[0]['linkinfo']['info_data']['ttl'] == 225, "ttl not set for greTunnel" + + links = json.loads(client2.succeed("ip -details -json link show gre6Tunnel")) + assert links[0]['linkinfo']['info_data']['ttl'] == 255, "ttl not set for gre6Tunnel" ''; }; vlan = let diff --git a/nixos/tests/rstudio-server.nix b/nixos/tests/rstudio-server.nix index c7ac7670fbd42..dd5fe3e5b4400 100644 --- a/nixos/tests/rstudio-server.nix +++ b/nixos/tests/rstudio-server.nix @@ -14,12 +14,6 @@ import ./make-test-python.nix ({ pkgs, ... }: }; }; - users.testuser = { - uid = 1000; - group = "testgroup"; - }; - groups.testgroup.gid = 1000; - testScript = '' machine.wait_for_unit("rstudio-server.service") machine.succeed("curl -f -vvv -s http://127.0.0.1:8787") diff --git a/nixos/tests/step-ca.nix b/nixos/tests/step-ca.nix index b22bcb060f2bf..f21bd5366266a 100644 --- a/nixos/tests/step-ca.nix +++ b/nixos/tests/step-ca.nix @@ -42,8 +42,8 @@ import ./make-test-python.nix ({ pkgs, ... }: caclient = { config, pkgs, ... }: { - security.acme.server = "https://caserver:8443/acme/acme/directory"; - security.acme.email = "root@example.org"; + security.acme.defaults.server = "https://caserver:8443/acme/acme/directory"; + security.acme.defaults.email = "root@example.org"; security.acme.acceptTerms = true; security.pki.certificateFiles = [ "${test-certificates}/root_ca.crt" ]; diff --git a/nixos/tests/tor.nix b/nixos/tests/tor.nix index c061f59226cfb..71ec9df4641fa 100644 --- a/nixos/tests/tor.nix +++ b/nixos/tests/tor.nix @@ -1,24 +1,19 @@ import ./make-test-python.nix ({ lib, ... }: with lib; -rec { +{ name = "tor"; meta.maintainers = with maintainers; [ joachifm ]; - common = - { ... }: - { boot.kernelParams = [ "audit=0" "apparmor=0" "quiet" ]; - networking.firewall.enable = false; - networking.useDHCP = false; - }; + nodes.client = { pkgs, ... }: { + boot.kernelParams = [ "audit=0" "apparmor=0" "quiet" ]; + networking.firewall.enable = false; + networking.useDHCP = false; - nodes.client = - { pkgs, ... }: - { imports = [ common ]; - environment.systemPackages = with pkgs; [ netcat ]; - services.tor.enable = true; - services.tor.client.enable = true; - services.tor.settings.ControlPort = 9051; - }; + environment.systemPackages = with pkgs; [ netcat ]; + services.tor.enable = true; + services.tor.client.enable = true; + services.tor.settings.ControlPort = 9051; + }; testScript = '' client.wait_for_unit("tor.service") diff --git a/nixos/tests/without-nix.nix b/nixos/tests/without-nix.nix index 2fc00b04144f9..b21e9f2844f50 100644 --- a/nixos/tests/without-nix.nix +++ b/nixos/tests/without-nix.nix @@ -4,14 +4,23 @@ import ./make-test-python.nix ({ lib, ... }: { maintainers = [ ericson2314 ]; }; - nixpkgs.overlays = [ - (self: super: { - nix = throw "don't want to use this"; - }) - ]; - nodes.machine = { ... }: { nix.enable = false; + nixpkgs.overlays = [ + (self: super: { + nix = throw "don't want to use pkgs.nix"; + nixVersions = lib.mapAttrs (k: throw "don't want to use pkgs.nixVersions.${k}") super.nixVersions; + # aliases, some deprecated + nix_2_3 = throw "don't want to use pkgs.nix_2_3"; + nix_2_4 = throw "don't want to use pkgs.nix_2_4"; + nix_2_5 = throw "don't want to use pkgs.nix_2_5"; + nix_2_6 = throw "don't want to use pkgs.nix_2_6"; + nixFlakes = throw "don't want to use pkgs.nixFlakes"; + nixStable = throw "don't want to use pkgs.nixStable"; + nixUnstable = throw "don't want to use pkgs.nixUnstable"; + nixStatic = throw "don't want to use pkgs.nixStatic"; + }) + ]; }; testScript = '' diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index 438159201de81..6ed488d7d643f 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -3,7 +3,6 @@ }: let - version = "1.3.3"; airwave-src = fetchFromGitHub { @@ -38,7 +37,8 @@ let in multiStdenv.mkDerivation { - name = "airwave-${version}"; + pname = "airwave"; + inherit version; src = airwave-src; diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix index 00fde01859c8a..9143b5f5b08a7 100644 --- a/pkgs/applications/audio/aj-snapshot/default.nix +++ b/pkgs/applications/audio/aj-snapshot/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, alsa-lib, jack2, minixml, pkg-config }: stdenv.mkDerivation rec { - name = packageName + "-" + version ; - packageName = "aj-snapshot" ; + pname = "aj-snapshot" ; version = "0.9.9"; src = fetchurl { - url = "mirror://sourceforge/${packageName}/${name}.tar.bz2"; + url = "mirror://sourceforge/aj-snapshot/aj-snapshot-${version}.tar.bz2"; sha256 = "0z8wd5yvxdmw1h1rj6km9h01xd4xmp4d86gczlix7hsc7zrf0wil"; }; diff --git a/pkgs/applications/audio/ams/default.nix b/pkgs/applications/audio/ams/default.nix index 388d8b44dcf58..7b209994103ec 100644 --- a/pkgs/applications/audio/ams/default.nix +++ b/pkgs/applications/audio/ams/default.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation rec { - name = "ams"; + pname = "ams"; version = "unstable-2019-04-27"; src = fetchgit { diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix index 345750e9e2a9a..0d93284e29421 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix @@ -2,7 +2,7 @@ pulseaudio }: bitwig-studio1.overrideAttrs (oldAttrs: rec { - name = "bitwig-studio-${version}"; + pname = "bitwig-studio"; version = "2.5"; src = fetchurl { diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix index 9200a36f9f34d..1e77ade6cdb42 100644 --- a/pkgs/applications/audio/cardinal/default.nix +++ b/pkgs/applications/audio/cardinal/default.nix @@ -22,7 +22,7 @@ }: stdenv.mkDerivation rec { - name = "cardinal-${version}"; + pname = "cardinal"; version = "22.02"; src = fetchurl { diff --git a/pkgs/applications/audio/cmt/default.nix b/pkgs/applications/audio/cmt/default.nix index bb23f9b62bbdd..1062d897c6bde 100644 --- a/pkgs/applications/audio/cmt/default.nix +++ b/pkgs/applications/audio/cmt/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "cmt"; + pname = "cmt"; version = "1.17"; src = fetchurl { - url = "http://www.ladspa.org/download/${name}_${version}.tgz"; + url = "http://www.ladspa.org/download/cmt_${version}.tgz"; sha256 = "07xd0xmwpa0j12813jpf87fr9hwzihii5l35mp8ady7xxfmxfmpb"; }; diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index c1cecc13ec56c..e8b0ded4c00db 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -112,6 +112,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.abbradar ]; - repositories.git = "https://github.com/Alexey-Yakovenko/deadbeef"; }; } diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index 5a4876a98ddff..ec927bdc5b034 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -2,6 +2,7 @@ , lib , rustPlatform , fetchFromGitLab +, fetchpatch , meson , ninja , gettext @@ -31,6 +32,16 @@ stdenv.mkDerivation rec { sha256 = "00vy1qkkpn76jdpybsq9qp8s6fh1ih10j73p2x43sl97m5g8944h"; }; + patches = [ + # Fix build with meson 0.61, can be removed on next release. + # podcasts-gtk/resources/meson.build:5:0: ERROR: Function does not take positional arguments. + # podcasts-gtk/resources/meson.build:30:0: ERROR: Function does not take positional arguments. + (fetchpatch { + url = "https://gitlab.gnome.org/World/podcasts/-/commit/6614bb62ecbec7c3b18ea7fe44beb50fe7942b27.patch"; + sha256 = "3TVKFV9V6Ofdajgkdc+j+yxsU21C4JWSc6GjLExSM00="; + }) + ]; + cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix index 325d115b58168..2bd23b821f135 100644 --- a/pkgs/applications/audio/jamin/default.nix +++ b/pkgs/applications/audio/jamin/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.95.0"; - name = "jamin-${version}"; + pname = "jamin"; src = fetchurl { url = "mirror://sourceforge/jamin/jamin-${version}.tar.gz"; diff --git a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix index 7ea5fa753c811..fd55bae6fd61f 100644 --- a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { - name = "faustCompressors-v${version}"; + pname = "faustCompressors"; version = "1.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/mid2key/default.nix b/pkgs/applications/audio/mid2key/default.nix index 5db17b99d1c32..0a5aecfecb0f4 100644 --- a/pkgs/applications/audio/mid2key/default.nix +++ b/pkgs/applications/audio/mid2key/default.nix @@ -1,10 +1,13 @@ -{ lib, stdenv, fetchurl, alsa-lib, libX11, libXi, libXtst, xorgproto }: +{ lib, stdenv, fetchFromGitHub, alsa-lib, libX11, libXi, libXtst, xorgproto }: stdenv.mkDerivation rec { - name = "mid2key-r1"; + pname = "mid2key"; + version = "1"; - src = fetchurl { - url = "http://mid2key.googlecode.com/files/${name}.tar.gz"; + src = fetchFromGitHub { + owner = "dnschneid"; + repo = "mid2key"; + rev = "v${version}"; sha256 = "0j2vsjvdgx51nd1qmaa18mcy0yw9pwrhbv2mdwnf913bwsk4y904"; }; diff --git a/pkgs/applications/audio/midas/generic.nix b/pkgs/applications/audio/midas/generic.nix index 93a215e46b1b1..b58bd0b275726 100644 --- a/pkgs/applications/audio/midas/generic.nix +++ b/pkgs/applications/audio/midas/generic.nix @@ -1,8 +1,7 @@ { stdenv, fetchurl, lib, libX11, libXext, alsa-lib, freetype, brand, type, version, homepage, url, sha256, ... }: stdenv.mkDerivation rec { - inherit type; - baseName = "${type}-Edit"; - name = "${lib.toLower baseName}-${version}"; + pname = "${lib.toLower type}-edit"; + inherit version; src = fetchurl { inherit url; @@ -15,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp ${baseName} $out/bin + cp ${pname} $out/bin ''; preFixup = let # we prepare our library path in the let clause to avoid it become part of the input of mkDerivation @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libPath}" \ - $out/bin/${baseName} + $out/bin/${pname} ''; meta = with lib; { diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix index ecb8128032e58..386e372d79874 100644 --- a/pkgs/applications/audio/mopidy/youtube.nix +++ b/pkgs/applications/audio/mopidy/youtube.nix @@ -6,15 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "mopidy-youtube"; - version = "3.4"; - - disabled = python3.pythonOlder "3.7"; + version = "3.5"; + format = "setuptools"; src = fetchFromGitHub { owner = "natumbri"; repo = pname; rev = "v${version}"; - sha256 = "0lm6nn926qkrwzvj64yracdixfrnv5zk243msjskrnlzkhgk01rk"; + hash = "sha256-hlokysFFgZZYY7flghgRq6wVG824kpcLkXxk6nMhxn4="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -39,8 +38,10 @@ python3.pkgs.buildPythonApplication rec { ]; disabledTestPaths = [ - # Fails with an import error + # Disable tests which interact with Youtube + "tests/test_api.py" "tests/test_backend.py" + "tests/test_youtube.py" ]; pythonImportsCheck = [ diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix index 131417293207c..2cf1b9ff68de3 100644 --- a/pkgs/applications/audio/musescore/darwin.nix +++ b/pkgs/applications/audio/musescore/darwin.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.darwin; maintainers = []; - repositories.git = "https://github.com/musescore/MuseScore"; }; } diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 7662eadc4983e..caa799c88f615 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -51,6 +51,5 @@ mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ vandenoever turion doronbehar ]; platforms = platforms.linux; - repositories.git = "https://github.com/musescore/MuseScore"; }; } diff --git a/pkgs/applications/audio/qmidiarp/default.nix b/pkgs/applications/audio/qmidiarp/default.nix index 618062dc2f372..487f86cf660f6 100644 --- a/pkgs/applications/audio/qmidiarp/default.nix +++ b/pkgs/applications/audio/qmidiarp/default.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation rec { - name = "qmidiarp"; + pname = "qmidiarp"; version = "0.6.5"; src = fetchgit { url = "https://git.code.sf.net/p/qmidiarp/code"; sha256 = "1g2143gzfbihqr2zi3k2v1yn1x3mwfbb2khmcd4m4cq3hcwhhlx9"; - rev = "qmidiarp-0.6.5"; + rev = "qmidiarp-${version}"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 460b97479c6c9..bed02f77e7b24 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -58,6 +58,5 @@ mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; - repositories.svn = "https://svn.code.sf.net/p/qmmp-dev/code"; }; } diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix index 3ecd4665f2621..5aa407a15023c 100644 --- a/pkgs/applications/audio/sisco.lv2/default.nix +++ b/pkgs/applications/audio/sisco.lv2/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchFromGitHub, lv2, pkg-config, libGLU, libGL, cairo, pango, libjack2 }: let - name = "sisco.lv2-${version}"; version = "0.7.0"; robtkVersion = "80a2585253a861c81f0bfb7e4579c75f5c73af89"; @@ -22,7 +21,8 @@ let }; in stdenv.mkDerivation rec { - inherit name; + pname = "sisco.lv2"; + inherit version; srcs = [ src robtkSrc ]; sourceRoot = src.name; diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index c03b48c436bf6..f162dcd045d89 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -28,6 +29,15 @@ stdenv.mkDerivation rec { sha256 = "08d5d81rz9sj3m5paw8fwbgxmhlbr7bcjdzpmzj832qvg8smydxf"; }; + patches = [ + # Fix build with meson 0.61 + # data/meson.build:2:5: ERROR: Function does not take positional arguments. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/sound-juicer/-/commit/9f97ca1faca396099f52264a9729aa355f8d122e.patch"; + sha256 = "8JllVSQgI7KiBI5WP6QtXRiggYuD89NSJJp1hP4Dbao="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/pkgs/applications/audio/soundkonverter/default.nix index 1c1724fbce8bd..d853676264162 100644 --- a/pkgs/applications/audio/soundkonverter/default.nix +++ b/pkgs/applications/audio/soundkonverter/default.nix @@ -45,7 +45,7 @@ let runtimeDeps = [] in mkDerivation rec { - name = "soundkonverter"; + pname = "soundkonverter"; version = "3.0.1"; src = fetchFromGitHub { owner = "dfaust"; diff --git a/pkgs/applications/blockchains/bitcoin-unlimited/default.nix b/pkgs/applications/blockchains/bitcoin-unlimited/default.nix index 802a19167a977..fe7acb0bbe1de 100644 --- a/pkgs/applications/blockchains/bitcoin-unlimited/default.nix +++ b/pkgs/applications/blockchains/bitcoin-unlimited/default.nix @@ -6,7 +6,7 @@ with lib; stdenv.mkDerivation rec { - name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version; + pname = "bitcoin" + optionalString (!withGui) "d" + "-unlimited"; version = "1.9.2.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/blockchains/dogecoin/default.nix b/pkgs/applications/blockchains/dogecoin/default.nix index 35b9fb026e398..8094959a248d8 100644 --- a/pkgs/applications/blockchains/dogecoin/default.nix +++ b/pkgs/applications/blockchains/dogecoin/default.nix @@ -6,7 +6,7 @@ with lib; stdenv.mkDerivation rec { - name = "dogecoin" + (toString (optional (!withGui) "d")) + "-" + version; + pname = "dogecoin" + optionalString (!withGui) "d"; version = "1.14.5"; src = fetchFromGitHub { diff --git a/pkgs/applications/blockchains/litecoin/default.nix b/pkgs/applications/blockchains/litecoin/default.nix index c80ef342c752a..0a82ca0ce2c38 100644 --- a/pkgs/applications/blockchains/litecoin/default.nix +++ b/pkgs/applications/blockchains/litecoin/default.nix @@ -11,8 +11,7 @@ with lib; mkDerivation rec { - - name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version; + pname = "litecoin" + optionalString (!withGui) "d"; version = "0.18.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/blockchains/namecoin/default.nix b/pkgs/applications/blockchains/namecoin/default.nix index 1851c581c9ae6..d5c739e00f4a6 100644 --- a/pkgs/applications/blockchains/namecoin/default.nix +++ b/pkgs/applications/blockchains/namecoin/default.nix @@ -3,8 +3,8 @@ with lib; stdenv.mkDerivation rec { + pname = "namecoin" + optionalString (!withGui) "d"; version = "nc22.0"; - name = "namecoin" + toString (optional (!withGui) "d") + "-" + version; src = fetchFromGitHub { owner = "namecoin"; diff --git a/pkgs/applications/editors/hexdino/default.nix b/pkgs/applications/editors/hexdino/default.nix index 82119ae91d187..424295b12c985 100644 --- a/pkgs/applications/editors/hexdino/default.nix +++ b/pkgs/applications/editors/hexdino/default.nix @@ -1,17 +1,17 @@ { lib, fetchFromGitHub, rustPlatform, ncurses }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "hexdino"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "Luz"; - repo = "hexdino"; - rev = "de5b5d7042129f57e0ab36416a06476126bce389"; - sha256 = "11mz07735gxqfamjcjjmxya6swlvr1p77sgd377zjcmd6z54gwyf"; + repo = pname; + rev = version; + sha256 = "1n8gizawx8h58hpyyqivp7vwy7yhn6scipl5rrbvkpnav8qpmk1r"; }; - cargoSha256 = "1hpndmpk1zlfvb4r95m13yvnsbjkwgw4pb9ala2d5yzfp38225nm"; + cargoSha256 = "01869b1d7gbsprcxxj7h9z16pvnzb02j2hywh97gfq5x96gnmkz3"; buildInputs = [ ncurses ]; diff --git a/pkgs/applications/editors/jetbrains/darwin.nix b/pkgs/applications/editors/jetbrains/darwin.nix index b1002e235824c..f771894f533d7 100644 --- a/pkgs/applications/editors/jetbrains/darwin.nix +++ b/pkgs/applications/editors/jetbrains/darwin.nix @@ -5,7 +5,7 @@ }: { meta -, name +, pname , product , productShort ? product , src @@ -17,7 +17,7 @@ let loname = lib.toLower productShort; in stdenvNoCC.mkDerivation { - inherit meta src version; + inherit pname meta src version; desktopName = product; installPhase = '' runHook preInstall @@ -32,6 +32,5 @@ in runHook postInstall ''; nativeBuildInputs = [ undmg ]; - pname = lib.concatStringsSep "-" (lib.init (lib.splitString "-" name)); sourceRoot = "."; } diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index b47c127079045..f0ee51dde3c69 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -24,9 +24,9 @@ let # Sorted alphabetically - buildClion = { name, version, src, license, description, wmClass, ... }: + buildClion = { pname, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; + inherit pname version src wmClass jdk; product = "CLion"; meta = with lib; { homepage = "https://www.jetbrains.com/clion/"; @@ -62,9 +62,9 @@ let ''; }); - buildDataGrip = { name, version, src, license, description, wmClass, ... }: + buildDataGrip = { pname, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; + inherit pname version src wmClass jdk; product = "DataGrip"; meta = with lib; { homepage = "https://www.jetbrains.com/datagrip/"; @@ -78,9 +78,9 @@ let }; }); - buildGoland = { name, version, src, license, description, wmClass, ... }: + buildGoland = { pname, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; + inherit pname version src wmClass jdk; product = "Goland"; meta = with lib; { homepage = "https://www.jetbrains.com/go/"; @@ -106,9 +106,9 @@ let ''; }); - buildIdea = { name, version, src, license, description, wmClass, product, ... }: + buildIdea = { pname, version, src, license, description, wmClass, product, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk product; + inherit pname version src wmClass jdk product; productShort = "IDEA"; extraLdPath = [ zlib ]; extraWrapperArgs = [ @@ -129,9 +129,9 @@ let }; }); - buildMps = { name, version, src, license, description, wmClass, product, ... }: + buildMps = { pname, version, src, license, description, wmClass, product, ... }: (mkJetBrainsProduct rec { - inherit name version src wmClass jdk product; + inherit pname version src wmClass jdk product; productShort = "MPS"; meta = with lib; { homepage = "https://www.jetbrains.com/mps/"; @@ -146,9 +146,9 @@ let }; }); - buildPhpStorm = { name, version, src, license, description, wmClass, ... }: + buildPhpStorm = { pname, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; + inherit pname version src wmClass jdk; product = "PhpStorm"; meta = with lib; { homepage = "https://www.jetbrains.com/phpstorm/"; @@ -162,9 +162,9 @@ let }; }); - buildPycharm = { name, version, src, license, description, wmClass, product, ... }: + buildPycharm = { pname, version, src, license, description, wmClass, product, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk product; + inherit pname version src wmClass jdk product; productShort = "PyCharm"; meta = with lib; { homepage = "https://www.jetbrains.com/pycharm/"; @@ -186,9 +186,9 @@ let }; }); - buildRider = { name, version, src, license, description, wmClass, ... }: + buildRider = { pname, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; + inherit pname version src wmClass jdk; product = "Rider"; meta = with lib; { homepage = "https://www.jetbrains.com/rider/"; @@ -211,9 +211,9 @@ let ''); }); - buildRubyMine = { name, version, src, license, description, wmClass, ... }: + buildRubyMine = { pname, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; + inherit pname version src wmClass jdk; product = "RubyMine"; meta = with lib; { homepage = "https://www.jetbrains.com/ruby/"; @@ -223,9 +223,9 @@ let }; }); - buildWebStorm = { name, version, src, license, description, wmClass, ... }: + buildWebStorm = { pname, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; + inherit pname version src wmClass jdk; product = "WebStorm"; meta = with lib; { homepage = "https://www.jetbrains.com/webstorm/"; @@ -251,7 +251,7 @@ in # Sorted alphabetically clion = buildClion rec { - name = "clion-${version}"; + pname = "clion"; version = products.clion.version; description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = lib.licenses.unfree; @@ -264,7 +264,7 @@ in }; datagrip = buildDataGrip rec { - name = "datagrip-${version}"; + pname = "datagrip"; version = products.datagrip.version; description = "Your Swiss Army Knife for Databases and SQL"; license = lib.licenses.unfree; @@ -277,7 +277,7 @@ in }; goland = buildGoland rec { - name = "goland-${version}"; + pname = "goland"; version = products.goland.version; description = "Up and Coming Go IDE"; license = lib.licenses.unfree; @@ -290,7 +290,7 @@ in }; idea-community = buildIdea rec { - name = "idea-community-${version}"; + pname = "idea-community"; product = "IntelliJ IDEA CE"; version = products.idea-community.version; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; @@ -304,7 +304,7 @@ in }; idea-ultimate = buildIdea rec { - name = "idea-ultimate-${version}"; + pname = "idea-ultimate"; product = "IntelliJ IDEA"; version = products.idea-ultimate.version; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; @@ -318,7 +318,7 @@ in }; mps = buildMps rec { - name = "mps-${version}"; + pname = "mps"; product = "MPS ${products.mps.version-major-minor}"; version = products.mps.version; description = "Create your own domain-specific language"; @@ -332,7 +332,7 @@ in }; phpstorm = buildPhpStorm rec { - name = "phpstorm-${version}"; + pname = "phpstorm"; version = products.phpstorm.version; description = "Professional IDE for Web and PHP developers"; license = lib.licenses.unfree; @@ -345,7 +345,7 @@ in }; pycharm-community = buildPycharm rec { - name = "pycharm-community-${version}"; + pname = "pycharm-community"; product = "PyCharm CE"; version = products.pycharm-community.version; description = "PyCharm Community Edition"; @@ -359,7 +359,7 @@ in }; pycharm-professional = buildPycharm rec { - name = "pycharm-professional-${version}"; + pname = "pycharm-professional"; product = "PyCharm"; version = products.pycharm-professional.version; description = "PyCharm Professional Edition"; @@ -373,7 +373,7 @@ in }; rider = buildRider rec { - name = "rider-${version}"; + pname = "rider"; version = products.rider.version; description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = lib.licenses.unfree; @@ -386,7 +386,7 @@ in }; ruby-mine = buildRubyMine rec { - name = "ruby-mine-${version}"; + pname = "ruby-mine"; version = products.ruby-mine.version; description = "The Most Intelligent Ruby and Rails IDE"; license = lib.licenses.unfree; @@ -399,7 +399,7 @@ in }; webstorm = buildWebStorm rec { - name = "webstorm-${version}"; + pname = "webstorm"; version = products.webstorm.version; description = "Professional IDE for Web and JavaScript development"; license = lib.licenses.unfree; diff --git a/pkgs/applications/editors/jetbrains/linux.nix b/pkgs/applications/editors/jetbrains/linux.nix index d150368ca8202..55ed0e6829e5a 100644 --- a/pkgs/applications/editors/jetbrains/linux.nix +++ b/pkgs/applications/editors/jetbrains/linux.nix @@ -3,30 +3,29 @@ , vmopts ? null }: -{ name, product, productShort ? product, version, src, wmClass, jdk, meta, extraLdPath ? [], extraWrapperArgs ? [] }@args: +{ pname, product, productShort ? product, version, src, wmClass, jdk, meta, extraLdPath ? [], extraWrapperArgs ? [] }@args: with lib; let loName = toLower productShort; hiName = toUpper productShort; - mainProgram = concatStringsSep "-" (init (splitString "-" name)); vmoptsName = loName + lib.optionalString stdenv.hostPlatform.is64bit "64" + ".vmoptions"; in with stdenv; lib.makeOverridable mkDerivation (rec { - inherit name src; - meta = args.meta // { inherit mainProgram; }; + inherit pname version src; + meta = args.meta // { mainProgram = pname; }; desktopItem = makeDesktopItem { - name = mainProgram; - exec = mainProgram; + name = pname; + exec = pname; comment = lib.replaceChars ["\n"] [" "] meta.longDescription; desktopName = product; genericName = meta.description; categories = [ "Development" ]; - icon = mainProgram; + icon = pname; startupWMClass = wmClass; }; @@ -62,16 +61,16 @@ with stdenv; lib.makeOverridable mkDerivation (rec { installPhase = '' runHook preInstall - mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}} - cp -a . $out/$name - ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${mainProgram}.png - mv bin/fsnotifier* $out/libexec/${name}/. + mkdir -p $out/{bin,$pname,share/pixmaps,libexec/${pname}} + cp -a . $out/$pname + ln -s $out/$pname/bin/${loName}.png $out/share/pixmaps/${pname}.png + mv bin/fsnotifier* $out/libexec/${pname}/. jdk=${jdk.home} item=${desktopItem} - makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${mainProgram}" \ - --prefix PATH : "$out/libexec/${name}:${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ + makeWrapper "$out/$pname/bin/${loName}.sh" "$out/bin/${pname}" \ + --prefix PATH : "$out/libexec/${pname}:${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([ # Some internals want libstdc++.so.6 stdenv.cc.cc.lib libsecret e2fsprogs diff --git a/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/pkgs/applications/editors/jupyter-kernels/octave/default.nix index 9db38d1444897..7a1c997a7c53c 100644 --- a/pkgs/applications/editors/jupyter-kernels/octave/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/octave/default.nix @@ -32,7 +32,8 @@ rec { ''; sizedLogo = size: stdenv.mkDerivation { - name = ''octave-logo-${octave.version}-${size}x${size}.png''; + pname = "octave-logo-${size}x${size}.png"; + inherit (octave) version; src = octave.src; diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index c3c42ac24cbab..d9805cbb36a94 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, callPackage }: buildGoModule rec { pname = "micro"; @@ -24,6 +24,8 @@ buildGoModule rec { install -Dt $out/share/applications assets/packaging/micro.desktop ''; + passthru.tests.expect = callPackage ./test-with-expect.nix {}; + meta = with lib; { homepage = "https://micro-editor.github.io"; description = "Modern and intuitive terminal-based text editor"; diff --git a/pkgs/applications/editors/micro/test-with-expect.nix b/pkgs/applications/editors/micro/test-with-expect.nix new file mode 100644 index 0000000000000..d3e1d60e08748 --- /dev/null +++ b/pkgs/applications/editors/micro/test-with-expect.nix @@ -0,0 +1,30 @@ +{ micro, expect, runCommand, writeScript, runtimeShell }: + +let expect-script = writeScript "expect-script" '' + #!${expect}/bin/expect -f + + spawn micro file.txt + expect "file.txt" + + send "Hello world!" + expect "Hello world!" + + # Send ctrl-q (exit) + send "\021" + + expect "Save changes to file.txt before closing?" + send "y" + + expect eof +''; in +runCommand "micro-test-expect" +{ + nativeBuildInputs = [ micro expect ]; + passthru = { inherit expect-script; }; +} '' + # Micro really wants a writable $HOME for its config directory. + export HOME=$(pwd) + expect -f ${expect-script} + grep "Hello world!" file.txt + touch $out +'' diff --git a/pkgs/applications/editors/qxmledit/default.nix b/pkgs/applications/editors/qxmledit/default.nix index d2aea1344da84..35c5f644ffa43 100644 --- a/pkgs/applications/editors/qxmledit/default.nix +++ b/pkgs/applications/editors/qxmledit/default.nix @@ -2,7 +2,7 @@ qmake, qtbase, qtxmlpatterns, qtsvg, qtscxml, qtquick1, libGLU }: stdenv.mkDerivation rec { - name = "qxmledit-${version}" ; + pname = "qxmledit" ; version = "0.9.15" ; src = fetchFromGitHub ( lib.importJSON ./qxmledit.json ) ; nativeBuildInputs = [ qmake ] ; diff --git a/pkgs/applications/emulators/fceux/default.nix b/pkgs/applications/emulators/fceux/default.nix index 0247a10f0e54c..e48f1cf7d56c2 100644 --- a/pkgs/applications/emulators/fceux/default.nix +++ b/pkgs/applications/emulators/fceux/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fceux"; - version = "2.6.3"; + version = "2.6.4"; src = fetchFromGitHub { owner = "TASEmulators"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-jNR9AB8s2S9ehYsompkV2GOLsaXIQzldeQ1WRCxdDG0="; + sha256 = "sha256-Q6r/iBlmi0z40+U6OLZCahS0io4IBBGZMP1mJH7szRM="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index d2c2cf0368369..7a4f4351dc943 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.76"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.77"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "e2ffa5a125fcbe8a25c73d8e04c08c08ef378860"; - sha256 = "1rmiyjqwlsbzh9q7d12n72ka9adaby2rfcbn75sf47p5857yi3p9"; + rev = "df70442c46e7ee133b1fb79dc23ddd134e618085"; + sha256 = "1m9msp7kxsj7251l2yjcfzrb4k1lisk9sip7acm22pxmi1a7gw73"; }; dotnet-sdk = dotnetCorePackages.sdk_6_0; diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index f13e224627a9a..7788b13b4ecb5 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -1,5 +1,5 @@ { stdenv, lib, pkgArches, callPackage, makeSetupHook, - name, version, src, mingwGccs, monos, geckos, platforms, + pname, version, src, mingwGccs, monos, geckos, platforms, bison, flex, fontforge, makeWrapper, pkg-config, autoconf, hexdump, perl, nixosTests, supportFlags, @@ -13,7 +13,7 @@ with import ./util.nix { inherit lib; }; let patches' = patches; - prevName = name; + prevName = pname; prevPlatforms = platforms; prevConfigFlags = configureFlags; setupHookDarwin = makeSetupHook { @@ -42,9 +42,9 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { make loader/wine64-preloader NIX_LDFLAGS="" NIX_LDFLAGS_${stdenv.cc.suffixSalt}="" ''; }) // rec { - inherit src; + inherit version src; - name = if supportFlags.waylandSupport then "${prevName}-wayland" else prevName; + pname = prevName + lib.optionalString supportFlags.waylandSupport "wayland"; # Fixes "Compiler cannot create executables" building wineWow with mingwSupport strictDeps = true; diff --git a/pkgs/applications/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix index bf3f57aff0ff3..c119feb783d31 100644 --- a/pkgs/applications/emulators/wine/packages.nix +++ b/pkgs/applications/emulators/wine/packages.nix @@ -9,7 +9,7 @@ let vkd3d_i686 = pkgsi686Linux.callPackage ./vkd3d.nix { inherit moltenvk; }; in with src; { wine32 = pkgsi686Linux.callPackage ./base.nix { - name = "wine-${version}"; + pname = "wine"; inherit src version supportFlags patches moltenvk; pkgArches = [ pkgsi686Linux ]; vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d_i686 ]; @@ -19,7 +19,7 @@ in with src; { platforms = [ "i686-linux" "x86_64-linux" ]; }; wine64 = callPackage ./base.nix { - name = "wine64-${version}"; + pname = "wine64"; inherit src version supportFlags patches moltenvk; pkgArches = [ pkgs ]; vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d ]; @@ -30,7 +30,7 @@ in with src; { platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; wineWow = callPackage ./base.nix { - name = "wine-wow-${version}"; + pname = "wine-wow"; inherit src version supportFlags patches moltenvk; stdenv = stdenv_32bit; pkgArches = [ pkgs pkgsi686Linux ]; diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 5ca31cc040528..36664a2d49cd3 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "grass"; + pname = "grass"; version = "7.8.6"; src = with lib; fetchFromGitHub { diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 57439313bf248..d77d4ffda2a3e 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "16.5.1"; + version = "17.2.1"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "a8ebf2560820d2d05677b9b16fc863f555dde8235b3e34acd7916eee3544eaa9"; + sha256 = "28019774a18f6e74c0d126346ae3551b5eb9c73aae13fe87f6d49120c183697a"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix index edafa5612a2d2..ae1e64297bd57 100644 --- a/pkgs/applications/graphics/gpicview/default.nix +++ b/pkgs/applications/graphics/gpicview/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple and fast image viewer for X"; homepage = "http://lxde.sourceforge.net/gpicview/"; - repositories.git = "git://lxde.git.sourceforge.net/gitroot/lxde/gpicview"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/applications/graphics/inkscape/extensions.nix b/pkgs/applications/graphics/inkscape/extensions.nix index 63010a19f14db..08260c968cfb8 100644 --- a/pkgs/applications/graphics/inkscape/extensions.nix +++ b/pkgs/applications/graphics/inkscape/extensions.nix @@ -9,8 +9,8 @@ applytransforms = callPackage ./extensions/applytransforms { }; hexmap = stdenv.mkDerivation { - name = "hexmap"; - version = "2020-06-06"; + pname = "hexmap"; + version = "unstable-2020-06-06"; src = fetchFromGitHub { owner = "lifelike"; diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/applications/graphics/mtpaint/default.nix index 3565173285b4b..0acc873b39680 100644 --- a/pkgs/applications/graphics/mtpaint/default.nix +++ b/pkgs/applications/graphics/mtpaint/default.nix @@ -4,14 +4,12 @@ }: stdenv.mkDerivation rec { - p_name = "mtPaint"; - ver_maj = "3.50"; - ver_min = "01"; - name = "${p_name}-${ver_maj}.${ver_min}"; + pname = "mtPaint"; + version = "3.50.01"; src = fetchFromGitHub { owner = "wjaguar"; - repo = p_name; + repo = "mtPaint"; rev = "a4675ff5cd9fcd57d291444cb9f332b48f11243f"; sha256 = "04wqxz8i655gz5rnz90cksy8v6m2jhcn1j8rzhqpp5xhawlmq24y"; }; diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 9f3c1e453f8dc..29b049ac55be8 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -66,7 +66,6 @@ mkDerivation rec { description = "Qt-based image viewer"; maintainers = with lib.maintainers; [ mindavi ]; license = licenses.gpl3Plus; - repositories.git = "https://github.com/nomacs/nomacs.git"; inherit (qtbase.meta) platforms; }; } diff --git a/pkgs/applications/graphics/unigine-heaven/default.nix b/pkgs/applications/graphics/unigine-heaven/default.nix new file mode 100644 index 0000000000000..2ce05a52812ef --- /dev/null +++ b/pkgs/applications/graphics/unigine-heaven/default.nix @@ -0,0 +1,107 @@ +{ lib +, stdenv +, fetchurl +, makeWrapper +, libX11 +, libXext +, libXrandr +, freetype +, fontconfig +, libXrender +, libXinerama +, autoPatchelfHook +, libglvnd +, openal +, imagemagick +, makeDesktopItem +}: +let + version = "4.0"; + + arch = + if stdenv.hostPlatform.system == "x86_64-linux" then + "x64" + else if stdenv.hostPlatform.system == "i686-linux" then + "x86" + else + throw "Unsupported platform ${stdenv.hostPlatform.system}"; + + desktopItem = makeDesktopItem { + name = "Heaven"; + exec = "heaven"; + genericName = "A GPU Stress test tool from the UNIGINE"; + icon = "Heaven"; + desktopName = "Heaven Benchmark"; + }; +in +stdenv.mkDerivation +{ + pname = "unigine-heaven"; + inherit version; + + src = fetchurl { + url = "https://assets.unigine.com/d/Unigine_Heaven-${version}.run"; + sha256 = "19rndwwxnb9k2nw9h004hyrmr419471s0fp25yzvvc6rkd521c0v"; + }; + + installPhase = + '' + sh $src --target $name + + mkdir -p $out/lib/unigine/heaven/bin + mkdir -p $out/bin + mkdir -p $out/share/applications/ + mkdir -p $out/share/icons/hicolor + + install -m 0755 $name/bin/browser_${arch} $out/lib/unigine/heaven/bin + install -m 0755 $name/bin/libApp{Stereo,Surround,Wall}_${arch}.so $out/lib/unigine/heaven/bin + install -m 0755 $name/bin/libGPUMonitor_${arch}.so $out/lib/unigine/heaven/bin + install -m 0755 $name/bin/libQt{Core,Gui,Network,WebKit,Xml}Unigine_${arch}.so.4 $out/lib/unigine/heaven/bin + install -m 0755 $name/bin/libUnigine_${arch}.so $out/lib/unigine/heaven/bin + install -m 0755 $name/bin/heaven_${arch} $out/lib/unigine/heaven/bin + install -m 0755 $name/heaven $out/bin/heaven + + cp -R $name/data $name/documentation $out/lib/unigine/heaven + + wrapProgram $out/bin/heaven --prefix LD_LIBRARY_PATH : ${libglvnd}/lib:$out/bin:${openal}/lib --run "cd $out/lib/unigine/heaven/" + + convert $out/lib/unigine/heaven/data/launcher/icon.png -resize 128x128 $out/share/icons/Heaven.png + for RES in 16 24 32 48 64 128 256 + do + mkdir -p $out/share/icons/hicolor/"$RES"x"$RES"/apps + convert $out/lib/unigine/heaven/data/launcher/icon.png -resize "$RES"x"$RES" $out/share/icons/hicolor/"$RES"x"$RES"/apps/Heaven.png + done + + ln -s ${desktopItem}/share/applications/* $out/share/applications + ''; + + nativeBuildInputs = + [ + autoPatchelfHook + makeWrapper + imagemagick + ]; + + buildInputs = + [ + libX11 + stdenv.cc.cc + libXext + libXrandr + freetype + fontconfig + libXrender + libXinerama + ]; + + dontUnpack = true; + + meta = + { + description = "The Unigine Heaven GPU benchmarking tool"; + homepage = "https://benchmark.unigine.com/heaven"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.BarinovMaxim ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index f831272387560..47a47ae4f25d6 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -10,9 +10,9 @@ in stdenv.mkDerivation rec { version = "0.4.8.2016"; - name = "xournal-" + version; + pname = "xournal"; src = fetchurl { - url = "mirror://sourceforge/xournal/${name}.tar.gz"; + url = "mirror://sourceforge/xournal/xournal-${version}.tar.gz"; sha256 = "09i88v3wacmx7f96dmq0l3afpyv95lh6jrx16xzm0jd1szdrhn5j"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { + lib.optionalString (!isGdkQuartzBackend) " -lX11"; desktopItem = makeDesktopItem { - name = name; + name = "xournal-${version}"; exec = "xournal"; icon = "xournal"; desktopName = "Xournal"; diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index 0a42e6f5e2cda..56ee5fa528010 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "avrdudess"; - version = "2.2.20140102"; + version = "2.13"; src = fetchurl { - url = "http://blog.zakkemble.co.uk/download/avrdudess_20140102.zip"; - sha256 = "18llpvjsfhypzijrvfbzmcg3g141f307mzsrg11wcdxh9syxqak6"; + url = "https://github.com/ZakKemble/AVRDUDESS/releases/download/v2.13/AVRDUDESS-2.13-portable.zip"; + sha256 = "0fpvc19fb14ppqfb2yg821szmhyanxcp5chfldf8yh51f64zihv9"; }; nativeBuildInputs = [ unzip ]; @@ -36,7 +36,8 @@ stdenv.mkDerivation { meta = with lib; { description = "GUI for AVRDUDE (AVR microcontroller programmer)"; - homepage = "https://github.com/zkemble/AVRDUDESS"; + homepage = "https://blog.zakkemble.net/avrdudess-a-gui-for-avrdude/"; + changelog = "https://github.com/ZakKemble/AVRDUDESS/blob/v${version}/Changelog.txt"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index 854fec8642a8e..bd87e7b4aeb66 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchsvn, libxml2, gtk2, curl, pkg-config } : -let +stdenv.mkDerivation rec { + pname = "gosmore"; version = "31801"; -in -stdenv.mkDerivation { - name = "gosmore-r${version}"; # the gosmore svn repository does not lock revision numbers of its externals # so we explicitly disable them to avoid breaking the hash # especially as the externals appear to be unused diff --git a/pkgs/applications/misc/lighthouse/default.nix b/pkgs/applications/misc/lighthouse/default.nix index e9aa79dcdd83c..01ffb7a9ffe81 100644 --- a/pkgs/applications/misc/lighthouse/default.nix +++ b/pkgs/applications/misc/lighthouse/default.nix @@ -3,8 +3,8 @@ }: stdenv.mkDerivation rec { - name = "lighthouse-${date}"; - date = "2016-07-20"; + pname = "lighthouse"; + version = "unstable-2016-07-20"; src = fetchFromGitHub { owner = "emgram769"; diff --git a/pkgs/applications/misc/mucommander/default.nix b/pkgs/applications/misc/mucommander/default.nix index 648b4951504f9..681e2d3eb4e69 100644 --- a/pkgs/applications/misc/mucommander/default.nix +++ b/pkgs/applications/misc/mucommander/default.nix @@ -2,7 +2,6 @@ let version = "0.9.3-3"; - name = "mucommander-${version}"; src = fetchFromGitHub { owner = "mucommander"; @@ -34,8 +33,8 @@ let # fake build to pre-download deps into fixed-output derivation deps = stdenv.mkDerivation { - name = "${name}-deps"; - inherit src postPatch; + pname = "mucommander-deps"; + inherit version src postPatch; nativeBuildInputs = [ gradle_6 perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) @@ -53,7 +52,8 @@ let }; in stdenv.mkDerivation { - inherit name src postPatch; + pname = "mucommander"; + inherit version src postPatch; nativeBuildInputs = [ gradle_6 perl makeWrapper ]; buildPhase = '' diff --git a/pkgs/applications/misc/mupdf/1.17.nix b/pkgs/applications/misc/mupdf/1.17.nix index 95e9c7c3307ac..ec978b9fc3a2b 100644 --- a/pkgs/applications/misc/mupdf/1.17.nix +++ b/pkgs/applications/misc/mupdf/1.17.nix @@ -82,7 +82,6 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "https://mupdf.com"; - repositories.git = "git://git.ghostscript.com/mupdf.git"; description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; license = licenses.agpl3Plus; maintainers = with maintainers; [ vrthra fpletz ]; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 4877051fd9824..102c80f6d1263 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -111,7 +111,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://mupdf.com"; - repositories.git = "git://git.ghostscript.com/mupdf.git"; description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; license = licenses.agpl3Plus; maintainers = with maintainers; [ vrthra fpletz ]; diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 4694c243b3915..41f46ff1c003d 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation rec { It uses a layered approach to connect all of the parts. ''; homepage = "https://networkupstools.org/"; - repositories.git = "https://github.com/networkupstools/nut.git"; platforms = platforms.linux; maintainers = [ maintainers.pierron ]; license = with licenses; [ gpl1Plus gpl2Plus gpl3Plus ]; diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 67a0939ddab97..813ef5a857779 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -49,8 +49,9 @@ let desktopName = "Obsidian"; comment = "Knowledge base"; icon = "obsidian"; - exec = "obsidian"; + exec = "obsidian %u"; categories = [ "Office" ]; + mimeTypes = [ "x-scheme-handler/obsidian" ]; }; inherit pname version src; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index eda78c54a10ee..4dc6f87631894 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -34,6 +34,47 @@ let (mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a") (mkOverride "markupsafe" "1.1.1" "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b") + # black uses hash, not sha256 identifier. Newer black version requires newer click version + ( + self: super: { + black = super.black.overridePythonAttrs (oldAttrs: rec { + version = "21.12b0"; + src = oldAttrs.src.override { + inherit version; + hash = "sha256-d7gPaTpWni5SeVhFljTxjfmwuiYluk4MLV2lvkLm8rM="; + }; + doCheck = false; + }); + } + ) + + # tests need network + ( + self: super: { + curio = super.curio.overridePythonAttrs (oldAttrs: rec { + disabledTests = [ + "test_timeout" + "test_ssl_outgoing" + ]; + }); + } + ) + + # tests need network + ( + self: super: { + trio = super.trio.overridePythonAttrs (oldAttrs: rec { + disabledTests = [ + "test_local_address_real" + ]; + disabledTestPaths = [ + "trio/tests/test_exports.py" + "trio/tests/test_socket.py" + ]; + }); + } + ) + # Requires flask<2, cannot mkOverride because tests need to be disabled ( self: super: { @@ -400,7 +441,7 @@ let homepage = "https://octoprint.org/"; description = "The snappy web interface for your 3D printer"; license = licenses.agpl3Only; - maintainers = with maintainers; [ abbradar gebner WhittlesJr ]; + maintainers = with maintainers; [ abbradar gebner WhittlesJr gador ]; }; }; } diff --git a/pkgs/applications/misc/pdfdiff/default.nix b/pkgs/applications/misc/pdfdiff/default.nix index 20a9533849719..e21b06bf25cac 100644 --- a/pkgs/applications/misc/pdfdiff/default.nix +++ b/pkgs/applications/misc/pdfdiff/default.nix @@ -1,9 +1,7 @@ { lib, python2Packages, fetchurl, xpdf }: -let - py = python2Packages; -in -py.buildPythonApplication rec { - name = "pdfdiff-${version}"; + +python2Packages.buildPythonApplication rec { + pname = "pdfdiff"; version = "0.92"; src = fetchurl { diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index ec78c43dbe041..9bf5907a23be1 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -3,13 +3,12 @@ , webkitgtk, discount, json-glib }: stdenv.mkDerivation rec { - name = "${product}-${version}"; - product = "pdfpc"; + pname = "pdfpc"; version = "4.5.0"; src = fetchFromGitHub { - repo = product; - owner = product; + repo = "pdfpc"; + owner = "pdfpc"; rev = "v${version}"; sha256 = "0bmy51w6ypz927hxwp5g7wapqvzqmsi3w32rch6i3f94kg1152ck"; }; diff --git a/pkgs/applications/misc/qmetro/default.nix b/pkgs/applications/misc/qmetro/default.nix index 70c41ff3142f6..2678f744f8ed5 100644 --- a/pkgs/applications/misc/qmetro/default.nix +++ b/pkgs/applications/misc/qmetro/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, qmake4Hook, unzip, qt4 }: stdenv.mkDerivation rec { - name = "${project}-${version}"; - project = "qmetro"; + pname = "qmetro"; version = "0.7.1"; src = fetchurl { - url = "mirror://sourceforge/${project}/${name}.zip"; + url = "mirror://sourceforge/qmetro/qmetro-${version}.zip"; sha256 = "1zdj87lzcr43gr2h05g17z31pd22n5kxdwbvx7rx656rmhv0sjq5"; }; diff --git a/pkgs/applications/misc/sleepyhead/default.nix b/pkgs/applications/misc/sleepyhead/default.nix index 94c47c23afef5..63a45758d932d 100644 --- a/pkgs/applications/misc/sleepyhead/default.nix +++ b/pkgs/applications/misc/sleepyhead/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, mkDerivation, fetchgit, zlib, libGLU, libX11, qtbase, qtwebkit, qtserialport, wrapQtAppsHook }: -let - name = "sleepyhead-${version}"; +mkDerivation { + pname = "sleepyhead"; version = "1.0.0-beta-git"; -in mkDerivation { - inherit name; src = fetchgit { url = "https://gitlab.com/sleepyhead/sleepyhead-code.git"; diff --git a/pkgs/applications/misc/slmenu/default.nix b/pkgs/applications/misc/slmenu/default.nix index 16145a915feb1..80aedd5741876 100644 --- a/pkgs/applications/misc/slmenu/default.nix +++ b/pkgs/applications/misc/slmenu/default.nix @@ -1,30 +1,19 @@ {lib, stdenv, fetchhg}: -let - s = - rec { - baseName = "slmenu"; - version = "hg-${date}"; - date = "2012-02-01"; - name = "${baseName}-${version}"; + +stdenv.mkDerivation { + pname = "slmenu"; + version = "hg-2012-02-01"; + + src = fetchhg { url = "https://bitbucket.org/rafaelgg/slmenu/"; rev = "7e74fa5db73e8b018da48d50dbbaf11cb5c62d13"; sha256 = "0zb7mm8344d3xmvrl62psazcabfk75pp083jqkmywdsrikgjagv6"; }; - buildInputs = [ - ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchhg { - inherit (s) url sha256; - }; makeFlags = [ "PREFIX=$(out)" ]; - meta = { - inherit (s) version; + meta = with lib; { description = "A console dmenu-like tool"; - license = lib.licenses.mit; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/tuhi/default.nix b/pkgs/applications/misc/tuhi/default.nix index 4bd0c914d3a13..bf939cfa1758e 100644 --- a/pkgs/applications/misc/tuhi/default.nix +++ b/pkgs/applications/misc/tuhi/default.nix @@ -13,15 +13,15 @@ }: python3Packages.buildPythonApplication rec { - name = "tuhi"; + pname = "tuhi"; version = "0.5"; format = "other"; src = fetchFromGitHub { owner = "tuhiproject"; - repo = name; - rev = "${version}"; + repo = "tuhi"; + rev = version; sha256 = "17kggm9c423vj7irxx248fjc8sxvkp9w1mgawlx1snrii817p3db"; }; diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix index 0374fb91844d9..2eca4cfccb31f 100644 --- a/pkgs/applications/misc/urlview/default.nix +++ b/pkgs/applications/misc/urlview/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchurl, ncurses, autoreconfHook }: stdenv.mkDerivation rec { - version = "0.9"; + pname = "urlview"; + _version = "0.9"; patchLevel = "19"; - - name = "urlview-${version}-${patchLevel}"; + version = "${_version}-${patchLevel}"; urlBase = "mirror://debian/pool/main/u/urlview/"; src = fetchurl { - url = urlBase + "urlview_${version}.orig.tar.gz"; + url = urlBase + "urlview_${_version}.orig.tar.gz"; sha256 = "746ff540ccf601645f500ee7743f443caf987d6380e61e5249fc15f7a455ed42"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; debianPatches = fetchurl { - url = urlBase + "urlview_${version}-${patchLevel}.diff.gz"; + url = urlBase + "urlview_${_version}-${patchLevel}.diff.gz"; sha256 = "056883c17756f849fb9235596d274fbc5bc0d944fcc072bdbb13d1e828301585"; }; diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index cb4233be8ec34..91c8c69fe9308 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -11,7 +11,7 @@ let in stdenv'.mkDerivation rec { - name = "xmr-stak-${version}"; + pname = "xmr-stak"; version = "2.10.8"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/applications/misc/zscroll/default.nix index 3acac8b3c68da..d3424938dd9b1 100644 --- a/pkgs/applications/misc/zscroll/default.nix +++ b/pkgs/applications/misc/zscroll/default.nix @@ -1,9 +1,9 @@ { lib, python3, python3Packages, fetchFromGitHub }: -let version = "1.0"; in +python3Packages.buildPythonApplication rec { + pname = "zscroll"; + version = "1.0"; -python3Packages.buildPythonApplication { - name = "zscroll-${version}"; # don't prefix with python version namePrefix = ""; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 9b18590817f84..96a4dac173f29 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -114,7 +114,7 @@ let }; base = rec { - name = "${packageName}-unwrapped-${version}"; + pname = "${packageName}-unwrapped"; inherit (upstream-info) version; inherit packageName buildType buildPath; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 0202ead460521..e8d9a13f9ac74 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -157,8 +157,8 @@ let else browser; in stdenv.mkDerivation { - name = lib.optionalString ungoogled "ungoogled-" - + "chromium${suffix}-${version}"; + pname = lib.optionalString ungoogled "ungoogled-" + + "chromium${suffix}"; inherit version; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 09efd6a2df667..9a72334d67c07 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "100.0.4896.46", - "sha256": "1qx22vadv9yd3n52pjn2sr153w70k3sxi2i8f99fdpil0kin8jkx", - "sha256bin64": "1g4xygj3946322aill7lk1qf0hi07bjn3awa17pkn1sgbl3gm8nr", + "version": "100.0.4896.56", + "sha256": "0vdyddxhmkw9bqwx5j19h69swx9ysiipsmcc1sjl0qv8bn8f790z", + "sha256bin64": "09h4fxsx0q5b0gn258xnmk11qz7ql8flpn4mq5x201abmv29y856", "deps": { "gn": { "version": "2022-01-21", @@ -32,9 +32,9 @@ } }, "dev": { - "version": "101.0.4947.0", - "sha256": "176bby8xis0j3ifvxxxjgklvs7yd7v71c5lc18qdjkgzv5qdx0sy", - "sha256bin64": "1rkpc25ff8vf1p7znpmaljj8gwcym34qg28b4anv8x9zvwn7w21s", + "version": "101.0.4951.7", + "sha256": "0xnvbiqi50hgky35qaivcyzfp05nnwfwqrd50dksqkzycl8avb4z", + "sha256bin64": "19my3zr9d3w2ypl9cm1xa15vhyv9add1f283alb9fmh2qwhl4scg", "deps": { "gn": { "version": "2022-03-14", diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 50cc571829032..a71cb84a05c36 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -188,7 +188,7 @@ stdenv.mkDerivation { ln -s ${policiesJson} "$out/lib/firefox-bin-${version}/distribution/policies.json"; ''; - passthru.applicationName = "firefox"; + passthru.binaryName = "firefox"; passthru.libName = "firefox-bin-${version}"; passthru.execdir = "/bin"; passthru.ffmpegSupport = true; diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 019c623e100a6..64cba1b52a60e 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -1,37 +1,91 @@ -{ pname, version, meta, updateScript ? null -, binaryName ? "firefox", application ? "browser" -, src, unpackPhase ? null, patches ? [] -, extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [], tests ? [] -, extraPostPatch ? "", extraPassthru ? {} }: - -{ lib, stdenv, pkg-config, pango, perl, python3, zip -, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg -, freetype, fontconfig, file, nspr, nss -, yasm, libGLU, libGL, sqlite, unzip, makeWrapper -, hunspell, libevent, libstartup_notification -, libvpx -, icu70, libpng, glib, pciutils -, autoconf213, which, gnused, rustPackages, rustPlatform -, rust-cbindgen, nodejs, nasm, fetchpatch +{ pname +, version +, meta +, updateScript ? null +, binaryName ? "firefox" +, application ? "browser" +, src +, unpackPhase ? null +, extraPatches ? [] +, extraPostPatch ? "" +, extraNativeBuildInputs ? [] +, extraConfigureFlags ? [] +, extraBuildInputs ? [] +, extraMakeFlags ? [] +, extraPassthru ? {} +, tests ? [] +}: + + +{ lib +, stdenv +, fetchpatch + +# build time +, autoconf +, cargo +, gnused +, makeWrapper +, nodejs +, perl +, pkg-config +, pkgsCross # wasm32 rlbox +, python3 +, runCommand +, rustc +, rust-cbindgen +, rustPlatform +, unzip +, which +, wrapGAppsHook + +# runtime +, bzip2 +, dbus +, dbus-glib +, file +, fontconfig +, freetype +, glib , gnum4 -, gtk3, wrapGAppsHook -, pkgsCross +, gtk3 +, icu +, libGL +, libGLU +, libevent +, libffi +, libjpeg +, libpng +, libstartup_notification +, libvpx +, libwebp +, nasm +, nspr +, nss +, pango +, xorg +, zip +, zlib + +# optionals + +## debugging + , debugBuild ? false -, runCommand -### optionals +# On 32bit platforms, we disable adding "-g" for easier linking. +, enableDebugSymbols ? !stdenv.is32bit ## optional libraries , alsaSupport ? stdenv.isLinux, alsa-lib -, pulseaudioSupport ? stdenv.isLinux, libpulseaudio , ffmpegSupport ? true -, waylandSupport ? true, libxkbcommon, libdrm -, ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages , gssSupport ? true, libkrb5 -, pipewireSupport ? waylandSupport && webrtcSupport, pipewire -# Jemalloc could reduce memory consumption. , jemallocSupport ? true, jemalloc +, ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages +, pipewireSupport ? waylandSupport && webrtcSupport +, pulseaudioSupport ? stdenv.isLinux, libpulseaudio +, waylandSupport ? true, libxkbcommon, libdrm ## privacy-related options @@ -40,22 +94,16 @@ # WARNING: NEVER set any of the options below to `true` by default. # Set to `!privacySupport` or `false`. -# webrtcSupport breaks the aarch64 build on version >= 60, fixed in 63. -# https://bugzilla.mozilla.org/show_bug.cgi?id=1434589 -, webrtcSupport ? !privacySupport , geolocationSupport ? !privacySupport , googleAPISupport ? geolocationSupport -, crashreporterSupport ? false - -, safeBrowsingSupport ? false -, drmSupport ? false - -# macOS dependencies -, xcbuild, CoreMedia, ExceptionHandling, Kerberos, AVFoundation, MediaToolbox -, CoreLocation, Foundation, AddressBook, libobjc, cups, rsync +, webrtcSupport ? !privacySupport ## other +, crashreporterSupport ? false +, drmSupport ? false +, safeBrowsingSupport ? false + # As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at # https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we # have permission to use the official firefox branding. @@ -75,38 +123,16 @@ # > the experience of Firefox users, you won't have any issues using the # > official branding. , enableOfficialBranding ? true - -# On 32bit platforms, we disable adding "-g" for easier linking. -, enableDebugSymbols ? !stdenv.is32bit }: assert stdenv.cc.libc or null != null; assert pipewireSupport -> !waylandSupport || !webrtcSupport -> throw "pipewireSupport requires both wayland and webrtc support."; -assert ltoSupport -> stdenv.isDarwin -> throw "LTO is broken on Darwin (see PR#19312)."; let flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")]; - default-toolkit = if stdenv.isDarwin then "cairo-cocoa" - else "cairo-gtk3${lib.optionalString waylandSupport "-wayland"}"; - - binaryNameCapitalized = lib.toUpper (lib.substring 0 1 binaryName) + lib.substring 1 (-1) binaryName; - - applicationName = if stdenv.isDarwin then binaryNameCapitalized else binaryName; - - execdir = if stdenv.isDarwin - then "/Applications/${binaryNameCapitalized}.app/Contents/MacOS" - else "/bin"; - - inherit (rustPackages) rustc cargo; - - # Darwin's stdenv provides the default llvmPackages version, match that since - # clang LTO on Darwin is broken so the stdenv is not being changed. - # Target the LLVM version that rustc -Vv reports it is built with for LTO. - llvmPackages0 = - if stdenv.isDarwin - then buildPackages.llvmPackages - else rustc.llvmPackages; + # Target the LLVM version that rustc is built with for LTO. + llvmPackages0 = rustc.llvmPackages; # Force the use of lld and other llvm tools for LTO llvmPackages = llvmPackages0.override { @@ -114,14 +140,12 @@ let bootBintools = null; }; - # When LTO for Darwin is fixed, the following will need updating as lld - # doesn't work on it. For now it is fine since ltoSupport implies no Darwin. buildStdenv = if ltoSupport - # LTO requires LLVM bintools including ld.lld and llvm-ar. - then overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override { - inherit (llvmPackages) bintools; - }) - else stdenv; + # LTO requires LLVM bintools including ld.lld and llvm-ar. + then overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override { + inherit (llvmPackages) bintools; + }) + else stdenv; # Compile the wasm32 sysroot to build the RLBox Sandbox # https://hacks.mozilla.org/2021/12/webassembly-and-back-again-fine-grained-sandboxing-in-firefox-95/ @@ -141,97 +165,70 @@ buildStdenv.mkDerivation ({ inherit src unpackPhase meta; patches = [ - ] ++ - lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch ++ - lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch ++ - lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch ++ + ] + ++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch + ++ lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch + ++ lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch + ++ extraPatches; - patches; + postPatch = '' + rm -rf obj-x86_64-pc-linux-gnu + patchShebangs mach + '' + + extraPostPatch; # Ignore trivial whitespace changes in patches, this fixes compatibility of # ./env_var_for_system_dir.patch with Firefox >=65 without having to track # two patches. patchFlags = [ "-p1" "-l" ]; - buildInputs = [ - gnum4 gtk3 perl zip libjpeg zlib bzip2 - dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor - xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file - xorg.pixman yasm libGLU libGL - xorg.xorgproto - xorg.libXdamage - xorg.libXext - xorg.libXtst - libevent libstartup_notification /* cairo */ - libpng glib - nasm icu70 libvpx - # >= 66 requires nasm for the AV1 lib dav1d - # yasm can potentially be removed in future versions - # https://bugzilla.mozilla.org/show_bug.cgi?id=1501796 - # https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ - nspr nss + nativeBuildInputs = [ + autoconf + cargo + gnused + llvmPackages.llvm # llvm-objdump + makeWrapper + nodejs + perl + pkg-config + python3 + rust-cbindgen + rustPlatform.bindgenHook + rustc + unzip + which + wrapGAppsHook ] - ++ lib.optional alsaSupport alsa-lib - ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed - ++ lib.optional gssSupport libkrb5 - ++ lib.optionals waylandSupport [ libxkbcommon libdrm ] - ++ lib.optional pipewireSupport pipewire - ++ lib.optional jemallocSupport jemalloc - ++ lib.optionals buildStdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos - AVFoundation MediaToolbox CoreLocation - Foundation libobjc AddressBook cups ]; - - MACH_USE_SYSTEM_PYTHON = "1"; - - postPatch = '' - rm -rf obj-x86_64-pc-linux-gnu - substituteInPlace toolkit/xre/glxtest.cpp \ - --replace 'dlopen("libpci.so' 'dlopen("${pciutils}/lib/libpci.so' - - patchShebangs mach - '' + extraPostPatch; - - nativeBuildInputs = - [ - autoconf213 - cargo - gnused - llvmPackages.llvm # llvm-objdump - makeWrapper - nodejs - perl - pkg-config - python3 - rust-cbindgen - rustc - which - unzip - wrapGAppsHook - rustPlatform.bindgenHook - ] - ++ lib.optionals buildStdenv.isDarwin [ xcbuild rsync ] - ++ extraNativeBuildInputs; + ++ extraNativeBuildInputs; - separateDebugInfo = enableDebugSymbols; setOutputFlags = false; # `./mach configure` doesn't understand `--*dir=` flags. preConfigure = '' # remove distributed configuration files - rm -f configure - rm -f js/src/configure - rm -f .mozconfig* - # this will run autoconf213 + rm -f configure js/src/configure .mozconfig* + + # Runs autoconf through ./mach configure in configurePhase configureScript="$(realpath ./mach) configure" + + # Set predictable directories for build and state + export MOZ_OBJDIR=$(pwd)/mozobj export MOZBUILD_STATE_PATH=$(pwd)/mozbuild # Set consistent remoting name to ensure wmclass matches with desktop file export MOZ_APP_REMOTINGNAME="${binaryName}" - '' + (lib.optionalString (lib.versionAtLeast version "95.0") '' + # Use our own python + export MACH_USE_SYSTEM_PYTHON=1 + + # AS=as in the environment causes build failure + # https://bugzilla.mozilla.org/show_bug.cgi?id=1497286 + unset AS + + '' + lib.optionalString (lib.versionAtLeast version "95.0") '' # RBox WASM Sandboxing export WASM_CC=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}cc export WASM_CXX=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}c++ - '') + (lib.optionalString googleAPISupport '' + '' + lib.optionalString googleAPISupport '' # Google API key used by Chromium and Firefox. # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, # please get your own set of keys. @@ -239,49 +236,44 @@ buildStdenv.mkDerivation ({ # 60.5+ & 66+ did split the google API key arguments: https://bugzilla.mozilla.org/show_bug.cgi?id=1531176 configureFlagsArray+=("--with-google-location-service-api-keyfile=$TMPDIR/ga") configureFlagsArray+=("--with-google-safebrowsing-api-keyfile=$TMPDIR/ga") - '') + '' - # AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286 - unset AS - '' + (lib.optionalString enableOfficialBranding '' + '' + lib.optionalString enableOfficialBranding '' export MOZILLA_OFFICIAL=1 - export BUILD_OFFICIAL=1 - ''); + ''; configureFlags = [ + "--disable-tests" + "--disable-updater" "--enable-application=${application}" + "--enable-default-toolkit=cairo-gtk3${lib.optionalString waylandSupport "-wayland"}" + "--enable-system-pixman" + "--with-libclang-path=${llvmPackages.libclang.lib}/lib" + "--with-system-ffi" + "--with-system-icu" "--with-system-jpeg" - "--with-system-zlib" "--with-system-libevent" "--with-system-libvpx" - "--with-system-png" # needs APNG support - "--with-system-icu" - "--enable-system-ffi" - "--enable-system-pixman" - #"--enable-system-cairo" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-updater" - "--enable-default-toolkit=${default-toolkit}" - "--with-libclang-path=${llvmPackages.libclang.lib}/lib" "--with-system-nspr" "--with-system-nss" + "--with-system-png" # needs APNG support + "--with-system-webp" + "--with-system-zlib" ] - ++ lib.optional (buildStdenv.isDarwin) "--disable-xcode-checks" ++ lib.optional (!ltoSupport) "--with-clang-path=${llvmPackages.clang}/bin/clang" # LTO is done using clang and lld on Linux. - # Darwin needs to use the default linker as lld is not supported (yet?): - # https://bugzilla.mozilla.org/show_bug.cgi?id=1538724 + ++ lib.optionals ltoSupport [ + "--enable-lto=cross" # Cross-Language LTO + "--enable-linker=lld" + ] # elf-hack is broken when using clang+lld: - # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 - ++ lib.optional ltoSupport "--enable-lto=cross" # Cross-language LTO. + # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 ++ lib.optional (ltoSupport && (buildStdenv.isAarch32 || buildStdenv.isi686 || buildStdenv.isx86_64)) "--disable-elf-hack" - ++ lib.optional (ltoSupport && !buildStdenv.isDarwin) "--enable-linker=lld" ++ lib.optional (lib.versionAtLeast version "95") "--with-wasi-sysroot=${wasiSysRoot}" ++ flag alsaSupport "alsa" ++ flag pulseaudioSupport "pulseaudio" ++ flag ffmpegSupport "ffmpeg" ++ flag jemallocSupport "jemalloc" + ++ flag geolocationSupport "necko-wifi" ++ flag gssSupport "negotiateauth" ++ flag webrtcSupport "webrtc" ++ flag crashreporterSupport "crashreporter" @@ -298,19 +290,62 @@ buildStdenv.mkDerivation ({ ++ lib.optional enableOfficialBranding "--enable-official-branding" ++ extraConfigureFlags; - postConfigure = '' - cd obj-* + buildInputs = [ + bzip2 + dbus + dbus-glib + file + fontconfig + freetype + glib + gnum4 + gtk3 + icu + libffi + libGL + libGLU + libevent + libjpeg + libpng + libstartup_notification + libvpx + libwebp + nasm + nspr + nss + pango + perl + xorg.libX11 + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXft + xorg.libXi + xorg.libXrender + xorg.libXt + xorg.libXtst + xorg.pixman + xorg.xorgproto + zip + zlib + ] + ++ lib.optional alsaSupport alsa-lib + ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed + ++ lib.optional gssSupport libkrb5 + ++ lib.optionals waylandSupport [ libxkbcommon libdrm ] + ++ lib.optional jemallocSupport jemalloc + ++ extraBuildInputs; + + preBuild = '' + cd mozobj ''; makeFlags = extraMakeFlags; - + separateDebugInfo = enableDebugSymbols; enableParallelBuilding = true; - doCheck = false; # "--disable-tests" above - installPhase = if buildStdenv.isDarwin then '' - mkdir -p $out/Applications - cp -LR dist/${binaryNameCapitalized}.app $out/Applications - '' else null; + # tests were disabled in configureFlags + doCheck = false; postInstall = lib.optionalString buildStdenv.isLinux '' # Remove SDK cruft. FIXME: move to a separate output? @@ -322,7 +357,7 @@ buildStdenv.mkDerivation ({ # Workaround: The separateDebugInfo hook skips artifacts whose build ID's length is not 40. # But we got 16-length build ID here. The function body is mainly copied from pkgs/build-support/setup-hooks/separate-debug-info.sh - # Remove it when PR #146275 is merged. + # Remove it when https://github.com/NixOS/nixpkgs/pull/146275 is merged. preFixup = lib.optionalString enableDebugSymbols '' _separateDebugInfo() { [ -e "$prefix" ] || return 0 @@ -359,19 +394,18 @@ buildStdenv.mkDerivation ({ doInstallCheck = true; installCheckPhase = '' # Some basic testing - "$out${execdir}/${applicationName}" --version + "$out/bin/${binaryName}" --version ''; passthru = { inherit updateScript; inherit version; inherit alsaSupport; + inherit binaryName; inherit pipewireSupport; inherit nspr; inherit ffmpegSupport; inherit gssSupport; - inherit execdir; - inherit applicationName; inherit tests; inherit gtk3; inherit wasiSysRoot; diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/default.nix b/pkgs/applications/networking/browsers/firefox/librewolf/default.nix index 4d8fe708e75a0..10b65e8825c20 100644 --- a/pkgs/applications/networking/browsers/firefox/librewolf/default.nix +++ b/pkgs/applications/networking/browsers/firefox/librewolf/default.nix @@ -6,7 +6,7 @@ rec { inherit (src) packageVersion firefox source; - patches = [ ./verify-telemetry-macros.patch ]; + extraPatches = [ ./verify-telemetry-macros.patch ]; extraConfigureFlags = [ "--with-app-name=librewolf" @@ -34,7 +34,7 @@ rec { extraPoliciesFiles = [ "${source}/submodules/settings/distribution/policies.json" ]; extraPassthru = { - librewolf = { inherit src patches; }; + librewolf = { inherit src extraPatches; }; inherit extraPrefsFiles extraPoliciesFiles; }; } diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/src.json b/pkgs/applications/networking/browsers/firefox/librewolf/src.json index 9e40e459d3294..f24353089488a 100644 --- a/pkgs/applications/networking/browsers/firefox/librewolf/src.json +++ b/pkgs/applications/networking/browsers/firefox/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "98.0-1", + "packageVersion": "98.0.2-1", "source": { - "rev": "98.0-1", - "sha256": "1z42a42d6z0gyc5i0pamcqq5bak6pgg1ldvlrjdyjnpvda74s0fn" + "rev": "98.0.2-1", + "sha256": "033l6mjmhfhf7b8p652s7ziw8zz725082hhzzvr3ahi498wshkx6" }, "firefox": { - "version": "98.0", - "sha512": "5b9186dd2a5dee5f2d2a2ce156fc06e2073cf71a70891a294cf3358218592f19ec3413d33b68d6f38e3cc5f940213e590a188e2b6efc39f416e90a55f89bfd9b" + "version": "98.0.2", + "sha512": "b567b53fcdc08491063d535545f558ea56ec5be02ca540661de116986245b79f509e0103cea5661faf9f4b3d30b67758ebdb4b30401e260ee27cbb300203f36e" } } diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 4713320e06855..d5055f04ed82e 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -12,6 +12,7 @@ , libva , mesa # firefox wants gbm for drm+dmabuf , cups +, pciutils }: ## configurability of the wrapper itself @@ -20,7 +21,7 @@ browser: let wrapper = - { applicationName ? browser.applicationName or (lib.getName browser) + { applicationName ? browser.binaryName or (lib.getName browser) , pname ? applicationName , version ? lib.getVersion browser , desktopName ? # applicationName with first letter capitalized @@ -66,8 +67,8 @@ let ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge ++ extraNativeMessagingHosts ); - libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups ] - ++ lib.optional (pipewireSupport && lib.versionAtLeast version "83") pipewire + libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ] + ++ lib.optional pipewireSupport pipewire ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport libkrb5 ++ lib.optional useGlvnd libglvnd @@ -179,14 +180,10 @@ let buildInputs = [ browser.gtk3 ]; - buildCommand = lib.optionalString stdenv.isDarwin '' - mkdir -p $out/Applications - cp -R --no-preserve=mode,ownership ${browser}/Applications/${applicationName}.app $out/Applications - rm -f $out${browser.execdir or "/bin"}/${applicationName} - '' + '' - if [ ! -x "${browser}${browser.execdir or "/bin"}/${applicationName}" ] + buildCommand = '' + if [ ! -x "${browser}/bin/${applicationName}" ] then - echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${applicationName}'" + echo "cannot find executable file \`${browser}/bin/${applicationName}'" exit 1 fi @@ -223,12 +220,12 @@ let # create the wrapper - executablePrefix="$out${browser.execdir or "/bin"}" + executablePrefix="$out/bin" executablePath="$executablePrefix/${applicationName}" if [ ! -x "$executablePath" ] then - echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${applicationName}'" + echo "cannot find executable file \`${browser}/bin/${applicationName}'" exit 1 fi @@ -243,18 +240,18 @@ let oldExe="$(readlink -v --canonicalize-existing "$executablePath")" fi - if [ ! -x "${browser}${browser.execdir or "/bin"}/${applicationName}" ] + if [ ! -x "${browser}/bin/${applicationName}" ] then - echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${applicationName}'" + echo "cannot find executable file \`${browser}/bin/${applicationName}'" exit 1 fi makeWrapper "$oldExe" \ - "$out${browser.execdir or "/bin"}/${applicationName}${nameSuffix}" \ + "$out/bin/${applicationName}${nameSuffix}" \ --prefix LD_LIBRARY_PATH ':' "$libs" \ --suffix-each GTK_PATH ':' "$gtk_modules" \ --prefix PATH ':' "${xdg-utils}/bin" \ - --suffix PATH ':' "$out${browser.execdir or "/bin"}" \ + --suffix PATH ':' "$out/bin" \ --set MOZ_APP_LAUNCHER "${applicationName}${nameSuffix}" \ --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ --set MOZ_LEGACY_PROFILES 1 \ @@ -278,7 +275,7 @@ let mkdir -p "$out/share/icons/hicolor/''${res}x''${res}/apps" icon=$( find "${browser}/lib/" -name "default''${res}.png" ) if [ -e "$icon" ]; then ln -s "$icon" \ - "$out/share/icons/hicolor/''${res}x''${res}/apps/${applicationName}.png" + "$out/share/icons/hicolor/''${res}x''${res}/apps/${icon}.png" fi done fi diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix index 64a8ebd4a99b7..df34db0e14766 100644 --- a/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/pkgs/applications/networking/cluster/cmctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cmctl"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "cert-manager"; repo = "cert-manager"; rev = "v${version}"; - sha256 = "sha256-RO7YcGEfAQ9kTxfqgekYf6M5b6Fg64hCPLA/vt6IWp8="; + sha256 = "sha256-Hx6MG5GCZyOX0tfpg1bfUT0BOI3p7Mws1VCz2PuUuw8="; }; vendorSha256 = "sha256-4zhdpedOmLl/i1G0QCto4ACxguWRZLzOm5HfMBMtvPY="; diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix index 36940d7441dca..b5250a3bd7faf 100644 --- a/pkgs/applications/networking/cluster/flink/default.nix +++ b/pkgs/applications/networking/cluster/flink/default.nix @@ -34,6 +34,5 @@ stdenv.mkDerivation rec { license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ mbode ]; - repositories.git = "git://git.apache.org/flink.git"; }; } diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 2140134d846cb..b4c4fde53ed59 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.143.1"; + version = "0.143.3"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-eV2+lQVLv+bU/CmFFYM7CLjomXblT0XVZH5HVq0S+WM="; + sha256 = "sha256-A0xpXsMWUaJYTzo9O4KkdyjonSGZ+FylTK140pqnJX8="; }; - vendorSha256 = "sha256-JHXSEOR/+ON5x0iQgaFsnb9hEDFf5/8TTh4T54qE/HE="; + vendorSha256 = "sha256-qolmWat7An4HFm4O5vSCYZe+w79nsRIrnBLJacUCeA4="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix index 87ae71f6a48dc..10c161f45d05e 100644 --- a/pkgs/applications/networking/cluster/kontemplate/default.nix +++ b/pkgs/applications/networking/cluster/kontemplate/default.nix @@ -20,7 +20,6 @@ buildGoPackage rec { license = licenses.gpl3; maintainers = with maintainers; [ mbode tazjin ]; platforms = platforms.unix; - repositories.git = "git://github.com/tazjin/kontemplate.git"; longDescription = '' Kontemplate is a simple CLI tool that can take sets of diff --git a/pkgs/applications/networking/cluster/kubent/default.nix b/pkgs/applications/networking/cluster/kubent/default.nix new file mode 100644 index 0000000000000..79c0fdf2186a0 --- /dev/null +++ b/pkgs/applications/networking/cluster/kubent/default.nix @@ -0,0 +1,29 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubent"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "doitintl"; + repo = "kube-no-trouble"; + rev = "${version}"; + sha256 = "0pwb9g1hhfqn3rl87fg6sf07m7aviadljb05bbnd241hhlcyslv6"; + }; + + vendorSha256 = "1z4cvk936l7011fbimsgpw89yqzyikw9jb4184l37mnj9hl5wpcp"; + + ldflags = [ + "-w" "-s" + "-X main.version=v${version}" + ]; + + subPackages = [ "cmd/kubent" ]; + + meta = with lib; { + homepage = "https://github.com/doitintl/kube-no-trouble"; + description = "Easily check your cluster for use of deprecated APIs"; + license = licenses.mit; + maintainers = with maintainers; [ peterromfeldhk ]; + }; +} diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix index e70856ef9d904..25fa2c4adc551 100644 --- a/pkgs/applications/networking/cluster/popeye/default.nix +++ b/pkgs/applications/networking/cluster/popeye/default.nix @@ -32,6 +32,5 @@ buildGoModule rec { changelog = "https://github.com/derailed/popeye/releases/tag/v${version}"; license = licenses.asl20; maintainers = [ maintainers.bryanasdev000 ]; - platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 7770f98afe519..69cdcc8d1316b 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -63,7 +63,6 @@ let license = lib.licenses.asl20; platforms = lib.platforms.all; maintainers = with maintainers; [ thoughtpolice offline kamilchm illustris ]; - repositories.git = "git://git.apache.org/spark.git"; }; }; in diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index c55ccfa02fa25..9a9f454ac0039 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -11,15 +11,15 @@ buildGoModule rec { pname = "werf"; - version = "1.2.77"; + version = "1.2.78"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-JmadwNERjexnJN+fBUjgMkvPtAaTbb7GITPsZlx2vik="; + sha256 = "sha256-ehrzb7WvkYL8oj2RSzKc1KDagV0zg6vMzgpT2sPyhcI="; }; - vendorSha256 = "sha256-IPQiS1GgNP+k/INv3f3VitoHActC3MrRys905nTSXyI="; + vendorSha256 = "sha256-w8ZeAQbZIVOBoRa9fJhXgTeYRCYpkh/U4pwb5u6A9mQ="; proxyVendor = true; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index d957daced26dc..3b5349d65ffe7 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitLab +, fetchpatch , nix-update-script , meson , ninja @@ -33,6 +35,15 @@ stdenv.mkDerivation rec { sha256 = "DSNVd9YvI7Dd3s3+M0+wE594tmL1yPNMnD1W9wLhSuw="; }; + patches = [ + # Fix build with meson 0.61 + # fractal-gtk/res/meson.build:5:0: ERROR: Function does not take positional arguments. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/fractal/-/commit/6fa1a23596d65d94aa889efe725174e6cd2903f0.patch"; + sha256 = "3OzU9XL2V1VNOkvL1j677K3HNoBqPMQudQDmiDxYfAc="; + }) + ]; + cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 99ee871c917e1..e3fa08e3df3a7 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.35.0"; # Please backport all updates to the stable channel. + version = "5.36.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-2KF2OLq6/vHElgloxn+kgQisJC+HAkpOBfsKfEPW35c="; + sha256 = "sha256-x1PUEDq/0B1T14mBs2FuKtcGpJHWOIvHAs8hptpzhZk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index d218f114143f1..4bc930b12d0af 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -88,7 +88,6 @@ in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { ''; license = licenses.gpl3; maintainers = with maintainers; [ ttuegel ]; - repositories.git = "https://github.com/quassel/quassel.git"; inherit (qtbase.meta) platforms; }; } diff --git a/pkgs/applications/networking/lieer/default.nix b/pkgs/applications/networking/lieer/default.nix index 420b9b28ccfc2..a9bf177128d5a 100644 --- a/pkgs/applications/networking/lieer/default.nix +++ b/pkgs/applications/networking/lieer/default.nix @@ -33,7 +33,6 @@ python3Packages.buildPythonApplication rec { GMail account. ''; homepage = "https://lieer.gaute.vetsj.com/"; - repositories.git = "https://github.com/gauteh/lieer.git"; license = licenses.gpl3Plus; maintainers = with maintainers; [ flokli kaiha ]; }; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 3ab0c58ecc5e4..d559976d80034 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -17,7 +17,7 @@ rec { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = "2afaee16f155edcb0bdb46ebe282a733cf041ec6f562aebd06f8b675e46917f6f500fcc532fc54d74f3f4b0b489a88934a2c6c304f849873de4bc2690b9056a0"; }; - patches = [ + extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. ./no-buildconfig.patch ]; diff --git a/pkgs/applications/networking/n8n/default.nix b/pkgs/applications/networking/n8n/default.nix index e7e1be095a204..72b4c7720480d 100644 --- a/pkgs/applications/networking/n8n/default.nix +++ b/pkgs/applications/networking/n8n/default.nix @@ -17,6 +17,12 @@ nodePackages.n8n.override { meta = with lib; { description = "Free and open fair-code licensed node based Workflow Automation Tool"; maintainers = with maintainers; [ freezeboy k900 ]; - license = licenses.asl20; + license = { + fullName = "Sustainable Use License"; + url = "https://github.com/n8n-io/n8n/blob/master/LICENSE.md"; + free = false; + # only free to redistribute "for non-commercial purposes" + redistributable = false; + }; }; } diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index a86ac412c1483..9f806be2e2c6c 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -112,13 +112,13 @@ let sha512 = "ank38FdCLfJ+EoeMzCz3hkYJuZAd63ARvDKkxZYRDb+beBYf+/+gx8jNTqkq/hfyUl4dJQ/a7tECU0Y0F98CHg=="; }; }; - "@babel/runtime-7.17.7" = { + "@babel/runtime-7.17.8" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.17.7"; + version = "7.17.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.7.tgz"; - sha512 = "L6rvG9GDxaLgFjg41K+5Yv9OMrU98sWe+Ykmc6FDJW/+vYZMhdOMKkISgzptMaERHvS2Y2lw9MDRm2gHhlQQoA=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.8.tgz"; + sha512 = "dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA=="; }; }; "@colors/colors-1.5.0" = { @@ -670,15 +670,6 @@ let sha512 = "f5nltvjl+PRUh6YNfUstRaXwJxtfnKEWhAWWlmKvh+Y3J2+98a0KKVYDEhz6NdKGqswLhjNGznxfSsZGOvOd9g=="; }; }; - "agent-base-4.3.0" = { - name = "agent-base"; - packageName = "agent-base"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz"; - sha512 = "salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg=="; - }; - }; "agent-base-6.0.2" = { name = "agent-base"; packageName = "agent-base"; @@ -976,13 +967,13 @@ let sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A=="; }; }; - "aws-sdk-2.1093.0" = { + "aws-sdk-2.1096.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1093.0"; + version = "2.1096.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1093.0.tgz"; - sha512 = "YD6VNemoKkzDMHsUiGP/MwpM0T20ukp3KTSxPY34Xw3Ww0zP19C54CfjaXhn//R27f2c57BtVez+he2RZ5GwyQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1096.0.tgz"; + sha512 = "q+hotU57U8bGpz1pf5CkO4z630ay0xGJ9HedahKPZ0Xk3/X0GH+QFYPBWJ5IMTtO30bjfPH0zTaL2vJmMXLBrQ=="; }; }; "aws-sign2-0.7.0" = { @@ -1975,13 +1966,13 @@ let sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; }; }; - "debug-4.3.3" = { + "debug-4.3.4" = { name = "debug"; packageName = "debug"; - version = "4.3.3"; + version = "4.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz"; - sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"; + sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; }; }; "debuglog-1.0.1" = { @@ -2146,13 +2137,13 @@ let sha512 = "DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="; }; }; - "domhandler-4.3.0" = { + "domhandler-4.3.1" = { name = "domhandler"; packageName = "domhandler"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz"; - sha512 = "fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g=="; + url = "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz"; + sha512 = "GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ=="; }; }; "domutils-2.8.0" = { @@ -2335,24 +2326,6 @@ let sha1 = "aba8d9e1943a895ac96837a62a39b3f55ecd94ab"; }; }; - "es6-promise-4.2.8" = { - name = "es6-promise"; - packageName = "es6-promise"; - version = "4.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz"; - sha512 = "HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="; - }; - }; - "es6-promisify-5.0.0" = { - name = "es6-promisify"; - packageName = "es6-promisify"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz"; - sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; - }; - }; "escalade-3.1.1" = { name = "escalade"; packageName = "escalade"; @@ -3118,15 +3091,6 @@ let sha512 = "3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw=="; }; }; - "https-proxy-agent-3.0.1" = { - name = "https-proxy-agent"; - packageName = "https-proxy-agent"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz"; - sha512 = "+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg=="; - }; - }; "https-proxy-agent-5.0.0" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; @@ -3874,13 +3838,13 @@ let sha512 = "2Bm96d5ktnE217Ib1FldvUaPAaOst6GtZrsxJCwnJgi9lnsoAKIHyU0sae8rNx6DNYbjdqqh8lv5/b9poD8qOg=="; }; }; - "libphonenumber-js-1.9.49" = { + "libphonenumber-js-1.9.50" = { name = "libphonenumber-js"; packageName = "libphonenumber-js"; - version = "1.9.49"; + version = "1.9.50"; src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.49.tgz"; - sha512 = "/wEOIONcVboFky+lWlCaF7glm1FhBz11M5PHeCApA+xDdVfmhKjHktHS8KjyGxouV5CSXIr4f3GvLSpJa4qMSg=="; + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.50.tgz"; + sha512 = "cCzQPChw2XbordcO2LKiw5Htx5leHVfFk/EXkxNHqJfFo7Fndcb1kF5wPJpc316vCJhhikedYnVysMh3Sc7Ocw=="; }; }; "libqp-1.1.0" = { @@ -4225,13 +4189,13 @@ let sha512 = "etgt+n4LlOkGSJbBTV9VROHA5R7ekIPS4vfh+bCAoJgRrJWdqJCBbpS3osRJ/HrT7R68MzMiY3L3sDJ/Fd8aBg=="; }; }; - "mappersmith-2.38.0" = { + "mappersmith-2.38.1" = { name = "mappersmith"; packageName = "mappersmith"; - version = "2.38.0"; + version = "2.38.1"; src = fetchurl { - url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.38.0.tgz"; - sha512 = "D2+ICkvNGnGCz01MADdQQilcHGffwLd1ell4b4uXS9QYvLfrX0r5nl5zb9V+2YDy3142u6VUl1b154pxJAxw3g=="; + url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.38.1.tgz"; + sha512 = "ecZ+YyzBK7r3tC8MTaGo5tySHPhB6f9jdxN706Tux6dMlcE2fgwiBM/bf/+Sz5m2yKlTq5ntiahz7xSPgurD6w=="; }; }; "material-colors-1.2.6" = { @@ -4540,49 +4504,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.109.0" = { + "n8n-core-0.110.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.109.0"; + version = "0.110.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.109.0.tgz"; - sha512 = "hzimsUZbWHfG9RofSX7czg0DgB7YAIcLi7JRFUVB90HVdasFf1HQFVM2AwFZC/lLVckktuadWSpq2MOKW+lE3Q=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.110.0.tgz"; + sha512 = "E+BrrAxO1TZbu19NDO66rubih6DNSoUdceM6S9pjtAEQukya9J2BAqnPsrZJ7Trs97W2q8G4wSKP4G6lzKobhQ=="; }; }; - "n8n-design-system-0.14.0" = { + "n8n-design-system-0.15.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.14.0"; + version = "0.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.14.0.tgz"; - sha512 = "E9Tvnjd9hktVPsqBcX579Fr4Nn/QEVAHQaYZlPGrqxXLVD76mF0WQWJpU6XTZEs/9pKfEftk/TmDihtENLVTxg=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.15.0.tgz"; + sha512 = "ZHlJJdaZ8ug9OV/SbqdF4FSEqTAoGBO+jqPECcUiYmHbL3BHcY8ZgWcnzmTnIPYTRGtIdc8snv3ti1USgASE5Q=="; }; }; - "n8n-editor-ui-0.135.0" = { + "n8n-editor-ui-0.136.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.135.0"; + version = "0.136.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.135.0.tgz"; - sha512 = "oM+Pnh4ZaUnDy5lj6u71EyXUPGNlbEIn3lpi4+xyO8tYtFyaN1kifS/q/a1sYrgZlwbWaksgUvTqufZ3Te6Yqw=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.136.0.tgz"; + sha512 = "582dHNfp4upne8IhcaYznSPq26wsruAK5ZmOSfjcQMJqVBOm26IKFXCwn7ZL3KxNznmlHLHTfbAsrjE+ZTKPTA=="; }; }; - "n8n-nodes-base-0.166.0" = { + "n8n-nodes-base-0.167.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.166.0"; + version = "0.167.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.166.0.tgz"; - sha512 = "Iet76bGJrS3rTal5KbuBsJvYzAw3o9xfcLHERpDJyXOxgvrPfZ62A7RpmLMLA3KJLfKevY+VLGLWW5odTSvtEg=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.167.0.tgz"; + sha512 = "9+pCjtPDptMO3nBqfizwsQ7+C+QUYPbW4YGT/X0+CaF+2wMkGEbKGADH6V0eWHHWKtzcyoLXqldSnilboXXxmw=="; }; }; - "n8n-workflow-0.91.0" = { + "n8n-workflow-0.92.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.91.0"; + version = "0.92.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.91.0.tgz"; - sha512 = "a4yqSvcalQs2MEDkOeadQc9cwK/3f6t+EKr/e8rEN5D9djnmuvoRJC+V9v6KPuHy66q1pv6w7fpmnrLRO+2WrA=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.92.0.tgz"; + sha512 = "d16p4co9I6v+AxVOxXyeWAgUY/7PwwlgJFaKH8XTA/fRARah3/DzLdb9Kmq5I1fqtr1VoZ+a1uTQCJi11bnRzA=="; }; }; "named-placeholders-1.1.2" = { @@ -4702,13 +4666,13 @@ let sha512 = "TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q=="; }; }; - "node-ssh-12.0.3" = { + "node-ssh-12.0.4" = { name = "node-ssh"; packageName = "node-ssh"; - version = "12.0.3"; + version = "12.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/node-ssh/-/node-ssh-12.0.3.tgz"; - sha512 = "+TrX99Fvu50ZwBu/1Z9oWV1xC+vjADCJACSmvdgYUeUH/PKIX6Y5ltPvrh30WFXcxaP1wHN09BBVdQ3jfZlfoA=="; + url = "https://registry.npmjs.org/node-ssh/-/node-ssh-12.0.4.tgz"; + sha512 = "5M3FBeAWjEpAQvVakQde6CeviEoEiYb6IjJL9mrMen9at63GAv0Q5vOFHFP+SM1Y7pTN3EBvJ/I+oxn2Lpydbw=="; }; }; "nodeify-1.0.1" = { @@ -5935,13 +5899,13 @@ let sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g=="; }; }; - "requestretry-6.0.0" = { + "requestretry-7.0.2" = { name = "requestretry"; packageName = "requestretry"; - version = "6.0.0"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/requestretry/-/requestretry-6.0.0.tgz"; - sha512 = "X7O+BMlfHgzetfSDtgQIMinLn1BuT+95W12iffDzyOS+HLoBEIQqCZv++UTChUWVjOu+pudbocD76+4j+jK9ww=="; + url = "https://registry.npmjs.org/requestretry/-/requestretry-7.0.2.tgz"; + sha512 = "Zz8z7G2OuVs4F0wR0shKMEMm7lNvPNHM0UIHNns9qfyuBDKSExoTsZGtSjKst6nPEwlMrbA9G+m/yC0AbGj+8w=="; }; }; "require-at-1.0.6" = { @@ -6367,13 +6331,13 @@ let sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg=="; }; }; - "snowflake-sdk-1.6.7" = { + "snowflake-sdk-1.6.8" = { name = "snowflake-sdk"; packageName = "snowflake-sdk"; - version = "1.6.7"; + version = "1.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.7.tgz"; - sha512 = "pisHqO5ALTggbNhE7LGEG5bnD6NKebcqyirOl4IsoKsD7g6d+vC3gHgRR/cm8kAH1GhLHY/WwhDq2fr7lundpA=="; + url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.8.tgz"; + sha512 = "ZmzeR2W4mQVri546mUxUW+jBxTn0JRKm06EtndO7MUFLcS8YChf60tXTa+s7A0hO8FxQkSQAFonCmtz4nzPoSA=="; }; }; "source-map-0.6.1" = { @@ -7615,10 +7579,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.168.1"; + version = "0.169.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.168.1.tgz"; - sha512 = "bghyOcF+KZmRsmyC9p2ARb+RIlUBDwTKCMLd5eUFW1SKMBCWgQZwG8KCLCRApWjXjP1SYekeyDo1PSl5fa7Hxw=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.169.0.tgz"; + sha512 = "mqZJUnulA/xNelNxebJeYioQeLtzNSFD8vzEsoxzoVbeaRkXQeC6CVBCldSGUMMSPcw2QchnzAKp9YauRE5cAA=="; }; dependencies = [ (sources."@azure/abort-controller-1.0.5" // { @@ -7670,7 +7634,7 @@ in sources."tslib-2.3.1" ]; }) - sources."@babel/runtime-7.17.7" + sources."@babel/runtime-7.17.8" sources."@colors/colors-1.5.0" (sources."@dabh/diagnostics-2.0.3" // { dependencies = [ @@ -7799,7 +7763,7 @@ in ]; }) sources."avsc-5.7.3" - (sources."aws-sdk-2.1093.0" // { + (sources."aws-sdk-2.1096.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -7997,7 +7961,7 @@ in sources."cssfilter-0.0.10" sources."dashdash-1.14.1" sources."date-utils-1.2.21" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."debuglog-1.0.1" sources."deep-extend-0.6.0" sources."deepmerge-4.2.2" @@ -8014,7 +7978,7 @@ in sources."discontinuous-range-1.0.0" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.3.0" + sources."domhandler-4.3.1" sources."domutils-2.8.0" (sources."dot-case-3.0.4" // { dependencies = [ @@ -8045,8 +8009,6 @@ in sources."es-abstract-1.19.1" sources."es-to-primitive-1.2.1" sources."es5-ext-0.8.2" - sources."es6-promise-4.2.8" - sources."es6-promisify-5.0.0" sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-4.0.0" @@ -8249,7 +8211,7 @@ in sources."iconv-lite-0.6.2" ]; }) - sources."libphonenumber-js-1.9.49" + sources."libphonenumber-js-1.9.50" sources."libqp-1.1.0" sources."limiter-1.1.5" sources."linkify-it-3.0.3" @@ -8308,7 +8270,7 @@ in }) sources."make-error-1.3.6" sources."make-error-cause-2.3.0" - sources."mappersmith-2.38.0" + sources."mappersmith-2.38.1" sources."material-colors-1.2.6" sources."md5-2.3.0" sources."media-typer-0.3.0" @@ -8365,19 +8327,19 @@ in ]; }) sources."mz-2.7.0" - (sources."n8n-core-0.109.0" // { + (sources."n8n-core-0.110.0" // { dependencies = [ sources."qs-6.10.3" ]; }) - sources."n8n-design-system-0.14.0" - sources."n8n-editor-ui-0.135.0" - (sources."n8n-nodes-base-0.166.0" // { + sources."n8n-design-system-0.15.0" + sources."n8n-editor-ui-0.136.0" + (sources."n8n-nodes-base-0.167.0" // { dependencies = [ sources."iconv-lite-0.6.3" ]; }) - sources."n8n-workflow-0.91.0" + sources."n8n-workflow-0.92.0" (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" @@ -8414,7 +8376,7 @@ in sources."semver-5.7.1" ]; }) - sources."node-ssh-12.0.3" + sources."node-ssh-12.0.4" sources."nodeify-1.0.1" sources."nodemailer-6.7.2" sources."nopt-4.0.3" @@ -8596,7 +8558,7 @@ in sources."tough-cookie-2.5.0" ]; }) - sources."requestretry-6.0.0" + sources."requestretry-7.0.2" sources."require-at-1.0.6" sources."require-directory-2.1.1" sources."requires-port-1.0.0" @@ -8659,12 +8621,10 @@ in sources."tslib-2.3.1" ]; }) - (sources."snowflake-sdk-1.6.7" // { + (sources."snowflake-sdk-1.6.8" // { dependencies = [ - sources."agent-base-4.3.0" sources."debug-3.2.7" sources."http-signature-1.3.6" - sources."https-proxy-agent-3.0.1" sources."jsprim-2.0.2" sources."tmp-0.2.1" sources."uuid-3.4.0" diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix index e4c1c8f5b7ba3..cd6ae563aa0b6 100644 --- a/pkgs/applications/networking/p2p/frostwire/default.nix +++ b/pkgs/applications/networking/p2p/frostwire/default.nix @@ -2,12 +2,11 @@ let version = "6.6.7-build-529"; - name = "frostwire-desktop-${version}"; src = fetchFromGitHub { owner = "frostwire"; repo = "frostwire"; - rev = name; + rev = "frostwire-desktop-${version}"; sha256 = "03wdj2kr8akzx8m1scvg98132zbaxh81qjdsxn2645b3gahjwz0m"; }; @@ -23,8 +22,8 @@ let # fake build to pre-download deps into fixed-output derivation deps = stdenv.mkDerivation { - name = "${name}-deps"; - inherit src; + pname = "frostwire-desktop-deps"; + inherit version src; buildInputs = [ gradle_6 perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) @@ -40,11 +39,12 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "11zd98g0d0fdgls4lsskkagwfxyh26spfd6c6g9cahl89czvlg3c"; + outputHash = "sha256-r6YSrbSJbM3063JrX4tCVKFrJxTaLN4Trc+33jzpwcE="; }; in stdenv.mkDerivation { - inherit name src; + pname = "frostwire-desktop"; + inherit version src; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ gradle_6 ]; diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix index be0832a075f84..f114f8a3091b5 100644 --- a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix +++ b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix @@ -115,7 +115,8 @@ let in stdenv.mkDerivation { - name = "vmware-horizon-client"; + pname = "vmware-horizon-client"; + inherit version; dontUnpack = true; diff --git a/pkgs/applications/office/autokey/remove-requires-dbus-python.patch b/pkgs/applications/office/autokey/remove-requires-dbus-python.patch deleted file mode 100644 index 73372e435291f..0000000000000 --- a/pkgs/applications/office/autokey/remove-requires-dbus-python.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -71,7 +71,7 @@ - 'console_scripts': ['autokey-gtk=autokey.gtkui.__main__:main'] - }, - scripts=['autokey-qt', 'autokey-run', 'autokey-shell'], -- install_requires=['dbus-python', 'pyinotify', 'python3-xlib'], -+ install_requires=['pyinotify', 'python-xlib'], - classifiers=[ - 'Development Status :: 4 - Beta', - 'Intended Audience :: Developers', diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index 767a4202ae86e..d5c4dcb65011c 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -4,7 +4,6 @@ let _version = "2.10.1"; _build = "482"; version = "${_version}-${_build}"; - name = "jameica-${version}"; swtSystem = if stdenv.hostPlatform.system == "i686-linux" then "linux" else if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" @@ -22,7 +21,8 @@ let }; in stdenv.mkDerivation rec { - inherit name version; + pname = "jameica"; + inherit version; nativeBuildInputs = [ ant jdk makeWrapper ]; buildInputs = lib.optionals stdenv.isLinux [ gtk2 glib xorg.libXtst ] @@ -42,12 +42,12 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/libexec $out/lib $out/bin $out/share/{applications,${name},java}/ + mkdir -p $out/libexec $out/lib $out/bin $out/share/{applications,jameica-${version},java}/ # copy libraries except SWT - cp $(find lib -type f -iname '*.jar' | grep -ve 'swt/.*/swt.jar') $out/share/${name}/ + cp $(find lib -type f -iname '*.jar' | grep -ve 'swt/.*/swt.jar') $out/share/jameica-${version}/ # copy platform-specific SWT - cp lib/swt/${swtSystem}/swt.jar $out/share/${name}/ + cp lib/swt/${swtSystem}/swt.jar $out/share/jameica-${version}/ install -Dm644 releases/${_version}-*/jameica/jameica.jar $out/share/java/ install -Dm644 plugin.xml $out/share/java/ @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { cp ${desktopItem}/share/applications/* $out/share/applications/ makeWrapper ${jre}/bin/java $out/bin/jameica \ - --add-flags "-cp $out/share/java/jameica.jar:$out/share/${name}/* ${ + --add-flags "-cp $out/share/java/jameica.jar:$out/share/jameica-${version}/* ${ lib.optionalString stdenv.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread'' } de.willuhn.jameica.Main" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs} \ diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index 4cbccbd51819c..6765c877437b2 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -50,7 +50,8 @@ let ; pythonEnv = unwrapped.python.withPackages(ps: pythonPkgs); - name = (lib.appendToName "wrapped" unwrapped).name; + pname = unwrapped.pname + "-wrapped"; + inherit (unwrapped) version; makeWrapperArgs = builtins.concatStringsSep " " ([ ] # Emulating wrapGAppsHook & wrapQtAppsHook working together @@ -59,7 +60,7 @@ let || (unwrapped.hasFeature "gr-qtgui") ) [ "--prefix" "XDG_DATA_DIRS" ":" "$out/share" - "--prefix" "XDG_DATA_DIRS" ":" "$out/share/gsettings-schemas/${name}" + "--prefix" "XDG_DATA_DIRS" ":" "$out/share/gsettings-schemas/${pname}" "--prefix" "XDG_DATA_DIRS" ":" "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" "--prefix" "XDG_DATA_DIRS" ":" "${hicolor-icon-theme}/share" # Needs to run `gsettings` on startup, see: @@ -135,7 +136,7 @@ let }; self = if doWrap then stdenv.mkDerivation { - inherit name passthru; + inherit pname version passthru; buildInputs = [ makeWrapper xorg.lndir diff --git a/pkgs/applications/radio/rtl-ais/default.nix b/pkgs/applications/radio/rtl-ais/default.nix index 7fd37d21fe16d..243d3126b5f4b 100644 --- a/pkgs/applications/radio/rtl-ais/default.nix +++ b/pkgs/applications/radio/rtl-ais/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, pkg-config, libusb1, rtl-sdr }: stdenv.mkDerivation { - name = "rtl-ais"; + pname = "rtl-ais"; version = "0.8.1"; buildInputs = [ pkg-config rtl-sdr libusb1 ]; diff --git a/pkgs/applications/radio/sdrplay/default.nix b/pkgs/applications/radio/sdrplay/default.nix index d12b12ecc13cc..441ff1cf0f3d3 100644 --- a/pkgs/applications/radio/sdrplay/default.nix +++ b/pkgs/applications/radio/sdrplay/default.nix @@ -4,7 +4,7 @@ let else if stdenv.isi686 then "i686" else throw "unsupported architecture"; in stdenv.mkDerivation rec { - name = "sdrplay"; + pname = "sdrplay"; version = "3.07.1"; src = fetchurl { diff --git a/pkgs/applications/radio/soapysdrplay/default.nix b/pkgs/applications/radio/soapysdrplay/default.nix index dbee593bd0d63..d205462fb6049 100644 --- a/pkgs/applications/radio/soapysdrplay/default.nix +++ b/pkgs/applications/radio/soapysdrplay/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config, soapysdr, sdrplay }: stdenv.mkDerivation { - name = "soapysdr-sdrplay3"; - version = "20210425"; + pname = "soapysdr-sdrplay3"; + version = "unstable-2021-04-25"; src = fetchFromGitHub { owner = "pothosware"; diff --git a/pkgs/applications/radio/soundmodem/default.nix b/pkgs/applications/radio/soundmodem/default.nix index bedcc8b02c4e1..01a8006822f69 100644 --- a/pkgs/applications/radio/soundmodem/default.nix +++ b/pkgs/applications/radio/soundmodem/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, alsa-lib, audiofile, gtk2, libxml2 }: stdenv.mkDerivation rec { - name = "soundmodem"; + pname = "soundmodem"; version = "0.20"; src = fetchurl { - url = "https://archive.org/download/${name}-${version}/${name}-${version}.tar.gz"; + url = "https://archive.org/download/soundmodem-${version}/soundmodem-${version}.tar.gz"; sha256 = "156l3wjnh5rcisxb42kcmlf74swf679v4xnj09zy5j74rd4h721z"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; #homepage = "http://gna.org/projects/soundmodem"; # official, but "Connection refused" homepage = "http://soundmodem.vk4msl.id.au/"; - downloadPage = "https://archive.org/download/${name}-${version}/${name}-${version}.tar.gz"; + downloadPage = "https://archive.org/download/${pname}-${version}/${pname}-${version}.tar.gz"; license = licenses.gpl2Only; maintainers = with maintainers; [ ymarkus ]; platforms = platforms.all; diff --git a/pkgs/applications/science/astronomy/gnuastro/default.nix b/pkgs/applications/science/astronomy/gnuastro/default.nix new file mode 100644 index 0000000000000..aed029f9d3677 --- /dev/null +++ b/pkgs/applications/science/astronomy/gnuastro/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchurl, libtool +, cfitsio, curl, ghostscript, gsl, libgit2, libjpeg, libtiff, lzlib, wcslib }: + +stdenv.mkDerivation rec { + pname = "gnuastro"; + version = "0.17"; + + src = fetchurl { + url = "mirror://gnu/gnuastro/gnuastro-${version}.tar.gz"; + sha256 = "sha256-xBvtM8wkDOqXg/Q2dNfPR0R0ZgRm4QiPJZoLDKivaPU="; + }; + + nativeBuildInputs = [ libtool ]; + + buildInputs = [ + cfitsio + curl + ghostscript + gsl + libgit2 + libjpeg + libtiff + lzlib + wcslib + ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "GNU astronomy utilities and library"; + homepage = "https://www.gnu.org/software/gnuastro/"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/applications/science/biology/ncbi-tools/default.nix b/pkgs/applications/science/biology/ncbi-tools/default.nix index 0e273dbefaaca..dff041971ea7c 100644 --- a/pkgs/applications/science/biology/ncbi-tools/default.nix +++ b/pkgs/applications/science/biology/ncbi-tools/default.nix @@ -8,10 +8,10 @@ # Another note: you may want the older and deprecated C-libs at ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools++/2008/Mar_17_2008/NCBI_C_Toolkit/ncbi_c--Mar_17_2008.tar.gz stdenv.mkDerivation rec { - name = "ncbi_tools"; - ncbi_version = "Dec_31_2008"; + pname = "ncbi_tools"; + version = "Dec_31_2008"; src = fetchurl { - url = "ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools++/2008/${ncbi_version}/ncbi_cxx--${ncbi_version}.tar.gz"; + url = "ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools++/2008/${version}/ncbi_cxx--${version}.tar.gz"; sha256 = "1b2v0dcdqn3bysgdkj57sxmd6s0hc9wpnxssviz399g6plhxggbr"; }; diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index 698095715cc53..2b5a1b9695096 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "22.7.0"; + version = "22.8.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "sha256-xK4C+0/Qpc2vXPmsI8KuHuDJLmJ5LXdAfRIREE+gkWA="; + sha256 = "sha256-dmG2p4KqzjLuuVw+wPWaxVoqOqba8Tx5l44PauWpqv4="; }; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/science/electronics/xcircuit/default.nix b/pkgs/applications/science/electronics/xcircuit/default.nix index 68322a191787c..eb2a29382e60f 100644 --- a/pkgs/applications/science/electronics/xcircuit/default.nix +++ b/pkgs/applications/science/electronics/xcircuit/default.nix @@ -1,16 +1,12 @@ { lib, stdenv, fetchurl, autoreconfHook, automake, pkg-config , cairo, ghostscript, ngspice, tcl, tk, xorg, zlib }: -let +stdenv.mkDerivation rec { version = "3.10.12"; - name = "xcircuit-${version}"; - inherit (lib) getBin; - -in stdenv.mkDerivation { - inherit name version; + pname = "xcircuit"; src = fetchurl { - url = "http://opencircuitdesign.com/xcircuit/archive/${name}.tgz"; + url = "http://opencircuitdesign.com/xcircuit/archive/xcircuit-${version}.tgz"; sha256 = "1h1ywc3mr7plvwnhdii2zgnnv5ih2nhyl4qbdjpi83dq0aq1s2mn"; }; @@ -20,7 +16,7 @@ in stdenv.mkDerivation { configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" - "--with-ngspice=${getBin ngspice}/bin/ngspice" + "--with-ngspice=${lib.getBin ngspice}/bin/ngspice" ]; buildInputs = with xorg; [ cairo ghostscript libSM libXt libICE libX11 libXpm tcl tk zlib ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 29959be2fa97a..a9fb21681586b 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -47,6 +47,7 @@ let "8.14.0".sha256 = "04y2z0qyvag66zanfyc3f9agvmzbn4lsr0p1l7ck6yjhqx7vbm17"; "8.14.1".sha256 = "0sx78pgx0qw8v7v2r32zzy3l161zipzq95iacda628girim7psnl"; "8.15.0".sha256 = "sha256:1ma76wfrpfsl72yh10w1ys2a0vi0mdc2jc79kdc8nrmxkhpw1nxx"; + "8.15.1".sha256 = "sha256:1dsa04jzkx5pw69pmxn0l55q4w88lg6fvz7clbga0bazzsfnsgd6"; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix diff --git a/pkgs/applications/science/logic/why3/with-provers.nix b/pkgs/applications/science/logic/why3/with-provers.nix index 826473b38e9f6..ae0acb1e525c8 100644 --- a/pkgs/applications/science/logic/why3/with-provers.nix +++ b/pkgs/applications/science/logic/why3/with-provers.nix @@ -12,7 +12,7 @@ let configAwkScript = runCommand "why3-conf.awk" { inherit provers; } ''; in stdenv.mkDerivation { - name = "${why3.name}-with-provers"; + pname = "${why3.pname}-with-provers"; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ why3 ] ++ provers; diff --git a/pkgs/applications/science/logic/z3/4.4.0.nix b/pkgs/applications/science/logic/z3/4.4.0.nix index 2fbaa0a28caf7..a3d6c16fb7df2 100644 --- a/pkgs/applications/science/logic/z3/4.4.0.nix +++ b/pkgs/applications/science/logic/z3/4.4.0.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, python }: stdenv.mkDerivation rec { - name = "z3-${version}"; + pname = "z3"; version = "4.4.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix index 79d5664426bea..8c2541fe41299 100644 --- a/pkgs/applications/science/math/fricas/default.nix +++ b/pkgs/applications/science/math/fricas/default.nix @@ -1,14 +1,11 @@ { lib, stdenv, fetchurl, sbcl, libX11, libXpm, libICE, libSM, libXt, libXau, libXdmcp }: -let +stdenv.mkDerivation rec { + pname = "fricas"; version = "1.3.7"; - name = "fricas-" + version; -in -stdenv.mkDerivation { - inherit name; src = fetchurl { - url = "mirror://sourceforge/fricas/fricas/${version}/${name}-full.tar.bz2"; + url = "mirror://sourceforge/fricas/fricas/${version}/fricas-${version}-full.tar.bz2"; sha256 = "sha256-cOqMvSe3ef/ZeVy5cj/VU/aTRtxgfxZfRbE4lWE5TU4="; }; diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix index 18dba2952cade..65d8c145bef6f 100644 --- a/pkgs/applications/science/math/scilab-bin/default.nix +++ b/pkgs/applications/science/math/scilab-bin/default.nix @@ -1,11 +1,7 @@ { stdenv, fetchurl, lib, xorg }: let - name = "scilab-bin-${ver}"; - - ver = "6.1.1"; - - badArch = throw "${name} requires i686-linux or x86_64-linux"; + badArch = throw "scilab-bin requires i686-linux or x86_64-linux"; architecture = if stdenv.hostPlatform.system == "i686-linux" then @@ -15,11 +11,12 @@ let else badArch; in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + pname = "scilab-bin"; + version = "6.1.1"; src = fetchurl { - url = "https://www.scilab.org/download/${ver}/scilab-${ver}.bin.linux-${architecture}.tar.gz"; + url = "https://www.scilab.org/download/${version}/scilab-${version}.bin.linux-${architecture}.tar.gz"; sha256 = if stdenv.hostPlatform.system == "i686-linux" then "0fgjc2ak3b2qi6yin3fy50qwk2bcj0zbz1h4lyyic9n1n1qcliib" @@ -43,7 +40,7 @@ stdenv.mkDerivation { sed -i 's|\$(/bin/|$(|g' bin/scilab sed -i 's|/usr/bin/||g' bin/scilab - sci="$out/opt/scilab-${ver}" + sci="$out/opt/scilab-${version}" fullLibPath="$sci/lib/scilab:$sci/lib/thirdparty:$libPath" fullLibPath="$fullLibPath:$sci/lib/thirdparty/redist" @@ -55,31 +52,31 @@ stdenv.mkDerivation { ''; installPhase = '' - mkdir -p "$out/opt/scilab-${ver}" - cp -r . "$out/opt/scilab-${ver}/" + mkdir -p "$out/opt/scilab-${version}" + cp -r . "$out/opt/scilab-${version}/" # Create bin/ dir mkdir "$out/bin" # Creating executable symlinks - ln -s "$out/opt/scilab-${ver}/bin/scilab" "$out/bin/scilab" - ln -s "$out/opt/scilab-${ver}/bin/scilab-cli" "$out/bin/scilab-cli" - ln -s "$out/opt/scilab-${ver}/bin/scilab-adv-cli" "$out/bin/scilab-adv-cli" + ln -s "$out/opt/scilab-${version}/bin/scilab" "$out/bin/scilab" + ln -s "$out/opt/scilab-${version}/bin/scilab-cli" "$out/bin/scilab-cli" + ln -s "$out/opt/scilab-${version}/bin/scilab-adv-cli" "$out/bin/scilab-adv-cli" # Creating desktop config dir mkdir -p "$out/share/applications" # Moving desktop config files - mv $out/opt/scilab-${ver}/share/applications/*.desktop $out/share/applications + mv $out/opt/scilab-${version}/share/applications/*.desktop $out/share/applications # Fixing Exec paths and launching each app with a terminal - sed -i -e "s|Exec=|Exec=$out/opt/scilab-${ver}/bin/|g" \ + sed -i -e "s|Exec=|Exec=$out/opt/scilab-${version}/bin/|g" \ -e "s|Terminal=.*$|Terminal=true|g" $out/share/applications/*.desktop # Moving icons to the appropriate locations - for path in $out/opt/scilab-${ver}/share/icons/hicolor/*/*/* + for path in $out/opt/scilab-${version}/share/icons/hicolor/*/*/* do - newpath=$(echo $path | sed 's|/opt/scilab-${ver}||g') + newpath=$(echo $path | sed 's|/opt/scilab-${version}||g') filename=$(echo $path | sed 's|.*/||g') dir=$(echo $newpath | sed "s|$filename||g") mkdir -p $dir @@ -87,10 +84,10 @@ stdenv.mkDerivation { done # Removing emptied folders - rm -rf $out/opt/scilab-${ver}/share/{applications,icons} + rm -rf $out/opt/scilab-${version}/share/{applications,icons} # Moving other share/ folders - mv $out/opt/scilab-${ver}/share/{appdata,locale,mime} $out/share + mv $out/opt/scilab-${version}/share/{appdata,locale,mime} $out/share ''; meta = { diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index 974fd3ece45c5..a3d6e1564666e 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -1,12 +1,9 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, boost, lua, zlib, bzip2 , xylib, readline, gnuplot, swig3 }: -let - name = "fityk"; +stdenv.mkDerivation rec { + pname = "fityk"; version = "1.3.1"; -in -stdenv.mkDerivation { - name = "${name}-${version}"; src = fetchFromGitHub { owner = "wojdyr"; diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix index 88dae0a34ff57..7824fa2a814b8 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, xrdb, xlsfonts }: stdenv.mkDerivation rec { - name = "urxvt-font-size"; + pname = "urxvt-font-size"; version = "1.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/terminal-emulators/termonad/default.nix b/pkgs/applications/terminal-emulators/termonad/default.nix index 111d790c6955c..efddfa4546680 100644 --- a/pkgs/applications/terminal-emulators/termonad/default.nix +++ b/pkgs/applications/terminal-emulators/termonad/default.nix @@ -3,7 +3,8 @@ let termonadEnv = haskellPackages.ghcWithPackages (self: [ self.termonad ] ++ packages self); in stdenv.mkDerivation { - name = "termonad-with-packages-${termonadEnv.version}"; + pname = "termonad-with-packages"; + inherit (termonadEnv) version; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix index 42ac2ed4508f4..7de53c7c541f1 100644 --- a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix @@ -1,50 +1,46 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: -let +stdenv.mkDerivation rec { + pname = "bfg-repo-cleaner"; version = "1.13.0"; - jarName = "bfg-${version}.jar"; - mavenUrl = "mirror://maven/com/madgag/bfg/${version}/${jarName}"; -in - stdenv.mkDerivation { - inherit version jarName; - - name = "bfg-repo-cleaner-${version}"; - - src = fetchurl { - url = mavenUrl; - sha256 = "1kn84rsvms1v5l1j2xgrk7dc7mnsmxkc6sqd94mnim22vnwvl8mz"; - }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre ]; - - dontUnpack = true; + jarName = "bfg-${version}.jar"; - installPhase = '' - mkdir -p $out/share/java - mkdir -p $out/bin - cp $src $out/share/java/$jarName - makeWrapper "${jre}/bin/java" $out/bin/bfg --add-flags "-cp $out/share/java/$jarName com.madgag.git.bfg.cli.Main" + src = fetchurl { + url = "mirror://maven/com/madgag/bfg/${version}/${jarName}"; + sha256 = "1kn84rsvms1v5l1j2xgrk7dc7mnsmxkc6sqd94mnim22vnwvl8mz"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; + + dontUnpack = true; + + installPhase = '' + mkdir -p $out/share/java + mkdir -p $out/bin + cp $src $out/share/java/$jarName + makeWrapper "${jre}/bin/java" $out/bin/bfg --add-flags "-cp $out/share/java/$jarName com.madgag.git.bfg.cli.Main" + ''; + + meta = with lib; { + homepage = "https://rtyley.github.io/bfg-repo-cleaner/"; + # Descriptions taken with minor modification from the homepage of bfg-repo-cleaner + description = "Removes large or troublesome blobs in a git repository like git-filter-branch does, but faster"; + longDescription = '' + The BFG is a simpler, faster alternative to git-filter-branch for + cleansing bad data out of your Git repository history, in particular removing + crazy big files and removing passwords, credentials, and other private data. + + The git-filter-branch command is enormously powerful and can do things + that the BFG can't - but the BFG is much better for the tasks above, because + it's faster (10-720x), simpler (dedicated to just removing things), and + beautiful (can use Scala instead of bash to script customizations). ''; + license = licenses.gpl3; + maintainers = [ maintainers.changlinli ]; + platforms = platforms.unix; + downloadPage = "https://mvnrepository.com/artifact/com.madgag/bfg/${version}"; + }; - meta = with lib; { - homepage = "https://rtyley.github.io/bfg-repo-cleaner/"; - # Descriptions taken with minor modification from the homepage of bfg-repo-cleaner - description = "Removes large or troublesome blobs in a git repository like git-filter-branch does, but faster"; - longDescription = '' - The BFG is a simpler, faster alternative to git-filter-branch for - cleansing bad data out of your Git repository history, in particular removing - crazy big files and removing passwords, credentials, and other private data. - - The git-filter-branch command is enormously powerful and can do things - that the BFG can't - but the BFG is much better for the tasks above, because - it's faster (10-720x), simpler (dedicated to just removing things), and - beautiful (can use Scala instead of bash to script customizations). - ''; - license = licenses.gpl3; - maintainers = [ maintainers.changlinli ]; - platforms = platforms.unix; - downloadPage = "https://mvnrepository.com/artifact/com.madgag/bfg/${version}"; - }; - - } +} diff --git a/pkgs/applications/version-management/git-and-tools/cgit/common.nix b/pkgs/applications/version-management/git-and-tools/cgit/common.nix new file mode 100644 index 0000000000000..d6b787315b8de --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/cgit/common.nix @@ -0,0 +1,77 @@ +{ pname, version, src, gitSrc, buildInputs ? [] +, homepage, description, maintainers +}: + +{ lib, stdenv, openssl, zlib, asciidoc, libxml2, libxslt +, docbook_xsl, pkg-config +, coreutils, gnused, groff, docutils +, gzip, bzip2, lzip, xz, zstd +, python3Packages +}: + +stdenv.mkDerivation { + inherit pname version src gitSrc; + + nativeBuildInputs = [ + pkg-config asciidoc + ] ++ (with python3Packages; [ python wrapPython ]); + buildInputs = buildInputs ++ [ + openssl zlib libxml2 libxslt docbook_xsl + ]; + pythonPath = with python3Packages; [ pygments markdown ]; + + postPatch = '' + sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \ + -e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \ + -e 's|"lzip"|"${lzip}/bin/lzip"|' \ + -e 's|"xz"|"${xz.bin}/bin/xz"|' \ + -e 's|"zstd"|"${zstd}/bin/zstd"|' \ + -i ui-snapshot.c + + substituteInPlace filters/html-converters/man2html \ + --replace 'groff' '${groff}/bin/groff' + + substituteInPlace filters/html-converters/rst2html \ + --replace 'rst2html.py' '${docutils}/bin/rst2html.py' + ''; + + # Give cgit a git source tree and pass configuration parameters (as make + # variables). + preBuild = '' + mkdir -p git + tar --strip-components=1 -xf "$gitSrc" -C git + ''; + + makeFlags = [ + "prefix=$(out)" + "CGIT_SCRIPT_PATH=$(out)/cgit/" + "CC=${stdenv.cc.targetPrefix}cc" + "AR=${stdenv.cc.targetPrefix}ar" + ]; + + # Install manpage. + postInstall = '' + # xmllint fails: + #make install-man + + # bypassing xmllint works: + a2x --no-xmllint -f manpage cgitrc.5.txt + mkdir -p "$out/share/man/man5" + cp cgitrc.5 "$out/share/man/man5" + + wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath" + + for script in $out/lib/cgit/filters/*.sh $out/lib/cgit/filters/html-converters/txt2html; do + wrapProgram $script --prefix PATH : '${lib.makeBinPath [ coreutils gnused ]}' + done + ''; + + stripDebugList = [ "cgit" ]; + + meta = { + inherit homepage description; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = maintainers ++ (with lib.maintainers; [ qyliss ]); + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index b8f7cee7358c9..f6a0af102303b 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,11 +1,6 @@ -{ lib, stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt -, docbook_xsl, pkg-config, luajit -, coreutils, gnused, groff, docutils -, gzip, bzip2, lzip, xz, zstd -, python, wrapPython, pygments, markdown -}: +{ lib, fetchurl, callPackage, luajit }: -stdenv.mkDerivation rec { +callPackage (import ./common.nix rec { pname = "cgit"; version = "1.2.3"; @@ -22,66 +17,9 @@ stdenv.mkDerivation rec { sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2"; }; - nativeBuildInputs = [ pkg-config asciidoc ] ++ [ python wrapPython ]; - buildInputs = [ - openssl zlib libxml2 libxslt docbook_xsl luajit - ]; - pythonPath = [ pygments markdown ]; + buildInputs = [ luajit ]; - postPatch = '' - sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \ - -e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \ - -e 's|"lzip"|"${lzip}/bin/lzip"|' \ - -e 's|"xz"|"${xz.bin}/bin/xz"|' \ - -e 's|"zstd"|"${zstd}/bin/zstd"|' \ - -i ui-snapshot.c - - substituteInPlace filters/html-converters/man2html \ - --replace 'groff' '${groff}/bin/groff' - - substituteInPlace filters/html-converters/rst2html \ - --replace 'rst2html.py' '${docutils}/bin/rst2html.py' - ''; - - # Give cgit a git source tree and pass configuration parameters (as make - # variables). - preBuild = '' - mkdir -p git - tar --strip-components=1 -xf "$gitSrc" -C git - ''; - - makeFlags = [ - "prefix=$(out)" - "CGIT_SCRIPT_PATH=$(out)/cgit/" - "CC=${stdenv.cc.targetPrefix}cc" - "AR=${stdenv.cc.targetPrefix}ar" - ]; - - # Install manpage. - postInstall = '' - # xmllint fails: - #make install-man - - # bypassing xmllint works: - a2x --no-xmllint -f manpage cgitrc.5.txt - mkdir -p "$out/share/man/man5" - cp cgitrc.5 "$out/share/man/man5" - - wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath" - - for script in $out/lib/cgit/filters/*.sh $out/lib/cgit/filters/html-converters/txt2html; do - wrapProgram $script --prefix PATH : '${lib.makeBinPath [ coreutils gnused ]}' - done - ''; - - stripDebugList = [ "cgit" ]; - - meta = { - homepage = "https://git.zx2c4.com/cgit/about/"; - repositories.git = "git://git.zx2c4.com/cgit"; - description = "Web frontend for git repositories"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ bjornfor ]; - }; -} + homepage = "https://git.zx2c4.com/cgit/about/"; + description = "Web frontend for git repositories"; + maintainers = with lib.maintainers; [ bjornfor ]; +}) {} diff --git a/pkgs/applications/version-management/git-and-tools/cgit/pink.nix b/pkgs/applications/version-management/git-and-tools/cgit/pink.nix new file mode 100644 index 0000000000000..75e99a06b1d82 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/cgit/pink.nix @@ -0,0 +1,23 @@ +{ lib, fetchurl, callPackage }: + +callPackage (import ./common.nix rec { + pname = "cgit-pink"; + version = "1.3.0"; + + src = fetchurl { + url = "https://git.causal.agency/cgit-pink/snapshot/cgit-pink-${version}.tar.gz"; + sha256 = "sha256-oL46NWgqi1VqKNEt0QGBWNXbi2l7nOQDZy1aMivcWuM="; + }; + + # cgit-pink is tightly coupled with git and needs a git source tree to build. + # IMPORTANT: Remember to check which git version cgit-pink needs on every + # version bump (look for "GIT_VER" in the top-level Makefile). + gitSrc = fetchurl { + url = "mirror://kernel/software/scm/git/git-2.35.1.tar.xz"; + sha256 = "sha256-12hSjmRD9logMDYmbxylD50Se6iXUeMurTcRftkZEIA="; + }; + + homepage = "https://git.causal.agency/cgit-pink/about/"; + description = "cgit fork aiming for better maintenance"; + maintainers = with lib.maintainers; [ qyliss sternenseemann ]; +}) {} diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix index e3845af8926da..4c50836cfdb27 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix @@ -1,14 +1,11 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg, gawk }: -let +stdenv.mkDerivation rec { + pname = "git-secret"; version = "0.4.0"; - repo = "git-secret"; - -in stdenv.mkDerivation { - name = "${repo}-${version}"; src = fetchFromGitHub { - inherit repo; + repo = "git-secret"; owner = "sobolevn"; rev = "v${version}"; sha256 = "sha256-Mtuj+e/yCDr4XkmYkWUFJB3cqOT5yOMOq9P/QJV1S80="; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index f08c88ab2fa55..840937c190f00 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.16.4"; + version = "1.16.5"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-7zlreX05pkhn381FMgQ8Nj3OP+BUr6o3u5f4ouo/Khg="; + sha256 = "sha256-2aqy6DV8oaIur/syg1bk41Wo+FGk3m+05+tUyoDwGHs="; }; unpackPhase = '' diff --git a/pkgs/applications/video/corrscope/default.nix b/pkgs/applications/video/corrscope/default.nix index 0e1d377be28e7..1c7855c7c0735 100644 --- a/pkgs/applications/video/corrscope/default.nix +++ b/pkgs/applications/video/corrscope/default.nix @@ -2,7 +2,6 @@ , mkDerivationWith , python3Packages , fetchFromGitHub -, fetchpatch , wrapQtAppsHook , ffmpeg , qtbase @@ -10,25 +9,16 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pname = "corrscope"; - version = "0.7.1"; + version = "0.8.0"; format = "pyproject"; src = fetchFromGitHub { owner = "corrscope"; repo = "corrscope"; rev = version; - sha256 = "0c9kmrw6pcda68li04b5j2kmsgdw1q463qlc32wn96zn9hl82v6m"; + sha256 = "1wdla4ryif1ss37aqi61lcvzddvf568wyh5s3xv1lrryh4al9vpd"; }; - patches = [ - # Remove when bumping past 0.7.1 - (fetchpatch { - name = "0001-Use-poetry-core.patch"; - url = "https://github.com/corrscope/corrscope/commit/d40d1846dd54b8bccd7b8055d6aece48aacbb943.patch"; - sha256 = "0xxsbmxdbh3agfm6ww3rpa7ab0ysppan490w0gaqwmwzrxmmdljv"; - }) - ]; - nativeBuildInputs = [ wrapQtAppsHook ] ++ (with python3Packages; [ @@ -48,8 +38,10 @@ mkDerivationWith python3Packages.buildPythonApplication rec { matplotlib numpy packaging + qtpy pyqt5 ruamel-yaml + colorspacious ]; dontWrapQtApps = true; diff --git a/pkgs/applications/video/p2pvc/default.nix b/pkgs/applications/video/p2pvc/default.nix index 35dceddf224e5..f64af16709f62 100644 --- a/pkgs/applications/video/p2pvc/default.nix +++ b/pkgs/applications/video/p2pvc/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, pkg-config, fetchFromGitHub, opencv2, ncurses, portaudio }: stdenv.mkDerivation { - name = "p2pvc"; + pname = "p2pvc"; + version = "unstable-2015-02-12"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ opencv2 ncurses portaudio ]; diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 7adcd328add7d..843cebe7d6ba6 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -22,7 +22,8 @@ let in edk2.mkDerivation projectDscPath { - name = "OVMF-${version}"; + pname = "OVMF"; + inherit version; outputs = [ "out" "fd" ]; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 281f1f246126b..367f43deb8093 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-NOFDUOypq/1ePM8rdK2cDnH1LsSZJ7eQOzDc5h4/PvY="; + sha256 = "sha256-l/9jOvZ4nn/wy+XPRoT1lojfGvPEXhPz2FJjLpZ/EE8="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 07e0cb6c533d3..5855eee63792e 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-5q8HirGOPsbaJ7JoLa4DRYkZX3kucWOZ633nzx4zVhg="; + sha256 = "sha256-ITUj905ZSdCH0mcw8tubyVKqI6p/oNcC4OW7/NbkR5o="; fetchSubmodules = true; }; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 87bb16ab83397..ef9050f47d969 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -243,19 +243,19 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.13"; + version = "20.10.14"; rev = "v${version}"; sha256 = "sha256-eDwgqFx4io++SMOjhxMxVzqzcOgOnv6Xe/qmmPCvZts="; moby-src = fetchFromGitHub { owner = "moby"; repo = "moby"; rev = "v${version}"; - sha256 = "sha256-ajceIdMM8yAa+bvTjRwZ/zF7yTLF2LhGmbrweWni7hM="; + sha256 = "sha256-I5oxpFLH789I2Sb29OXDaM4fCbQT/KvPq0DYcAVp0aI="; }; runcRev = "v1.0.3"; runcSha256 = "sha256-Tl/JKbIpao+FCjngPzaVkxse50zo3XQ9Mg/AdkblMcI="; - containerdRev = "v1.5.10"; - containerdSha256 = "sha256-ee0dwWSGedo08omKOmZtW5qQ1J5M9Mm+kZHq7a+zyT4="; + containerdRev = "v1.5.11"; + containerdSha256 = "sha256-YzFtv6DIjImSK0SywxhZrEeEmCnHTceAi3pfwnPubKg="; tiniRev = "v0.19.0"; tiniSha256 = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; diff --git a/pkgs/applications/virtualization/docker/gc.nix b/pkgs/applications/virtualization/docker/gc.nix index 52ca54501d75d..0736516ee7d26 100644 --- a/pkgs/applications/virtualization/docker/gc.nix +++ b/pkgs/applications/virtualization/docker/gc.nix @@ -3,13 +3,13 @@ with lib; stdenv.mkDerivation rec { - name = "docker-gc-${rev}"; - rev = "b0cc52aa3da2e2ac0080794e0be6e674b1f063fc"; + pname = "docker-gc"; + version = "unstable-2015-10-5"; src = fetchFromGitHub { - inherit rev; owner = "spotify"; repo = "docker-gc"; + rev = "b0cc52aa3da2e2ac0080794e0be6e674b1f063fc"; sha256 = "07wf9yn0f771xkm3x12946x5rp83hxjkd70xgfgy35zvj27wskzm"; }; diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix index a247e2cecfafe..6038a129e2a1c 100644 --- a/pkgs/applications/virtualization/docker/proxy.nix +++ b/pkgs/applications/virtualization/docker/proxy.nix @@ -1,13 +1,13 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "docker-proxy-${rev}"; - rev = "fa125a3512ee0f6187721c88582bf8c4378bd4d7"; + pname = "docker-proxy"; + version = "unstable-2020-12-15"; src = fetchFromGitHub { - inherit rev; owner = "docker"; repo = "libnetwork"; + rev = "fa125a3512ee0f6187721c88582bf8c4378bd4d7"; sha256 = "1r47y0gww3j7fas4kgiqbhrz5fazsx1c6sxnccdfhj8fzik77s9y"; }; diff --git a/pkgs/applications/virtualization/gvisor/containerd-shim.nix b/pkgs/applications/virtualization/gvisor/containerd-shim.nix index c8610b73865b5..612ef0f4b5365 100644 --- a/pkgs/applications/virtualization/gvisor/containerd-shim.nix +++ b/pkgs/applications/virtualization/gvisor/containerd-shim.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { - name = "gvisor-containerd-shim-${version}"; - version = "2019-10-09"; + pname = "gvisor-containerd-shim"; + version = "unstable-2019-10-09"; src = fetchFromGitHub { owner = "google"; diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix index 4cd043d4eb6d6..cf6f2102e6ace 100644 --- a/pkgs/applications/virtualization/gvisor/default.nix +++ b/pkgs/applications/virtualization/gvisor/default.nix @@ -52,7 +52,7 @@ let }; in buildBazelPackage rec { - name = "gvisor-${version}"; + pname = "gvisor"; version = "20210518.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/virtualization/qemu/utils.nix b/pkgs/applications/virtualization/qemu/utils.nix index 90783039a1a0b..d9a88bf545b38 100644 --- a/pkgs/applications/virtualization/qemu/utils.nix +++ b/pkgs/applications/virtualization/qemu/utils.nix @@ -1,8 +1,8 @@ { stdenv, installShellFiles, qemu }: stdenv.mkDerivation rec { - name = "qemu-utils-${version}"; - version = qemu.version; + pname = "qemu-utils"; + inherit (qemu) version; nativeBuildInputs = [ installShellFiles ]; buildInputs = [ qemu ]; diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 29e05a069ce7f..86474da9ee611 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -35,12 +35,11 @@ assert spiceSupport -> ( with lib; stdenv.mkDerivation rec { - baseName = "virt-viewer"; + pname = "virt-viewer"; version = "11.0"; - name = "${baseName}-${version}"; src = fetchurl { - url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.xz"; + url = "https://releases.pagure.org/virt-viewer/virt-viewer-${version}.tar.xz"; sha256 = "sha256-pD+iMlxMHHelyMmAZaww7wURohrJjlkPIjQIabrZq9A="; }; diff --git a/pkgs/applications/window-managers/clfswm/default.nix b/pkgs/applications/window-managers/clfswm/default.nix index 1c6f92a38f292..9984e8788460a 100644 --- a/pkgs/applications/window-managers/clfswm/default.nix +++ b/pkgs/applications/window-managers/clfswm/default.nix @@ -2,11 +2,12 @@ , makeWrapper }: stdenv.mkDerivation { - name = "clfswm"; + pname = "clfswm"; + version = "unstable-2016-11-12"; src = fetchgit { url = "https://gitlab.common-lisp.net/clfswm/clfswm.git"; - rev = "refs/heads/master"; + rev = "3c7721dba6339ebb4f8c8d7ce2341740fa86f837"; sha256 = "0hynzh3a1zr719cxfb0k4cvh5lskzs616hwn7p942isyvhwzhynd"; }; diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix index 7d9e5f9c1cb09..2afb6e505c336 100644 --- a/pkgs/applications/window-managers/taffybar/default.nix +++ b/pkgs/applications/window-managers/taffybar/default.nix @@ -5,7 +5,8 @@ let self.taffybar ] ++ packages self); in stdenv.mkDerivation { - name = "taffybar-with-packages-${taffybarEnv.version}"; + pname = "taffybar-with-packages"; + inherit (taffybarEnv) version; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/window-managers/xmonad/wrapper.nix b/pkgs/applications/window-managers/xmonad/wrapper.nix index f5c9f12a23f6d..409bf73c893f6 100644 --- a/pkgs/applications/window-managers/xmonad/wrapper.nix +++ b/pkgs/applications/window-managers/xmonad/wrapper.nix @@ -3,7 +3,8 @@ let xmonadEnv = ghcWithPackages (self: [ self.xmonad ] ++ packages self); in stdenv.mkDerivation { - name = "xmonad-with-packages-${xmonadEnv.version}"; + pname = "xmonad-with-packages"; + inherit (xmonadEnv) version; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix index 93292122b739c..a36008d752bd9 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix @@ -59,6 +59,9 @@ let export PATH="/run/wrappers/bin:/usr/bin:/usr/sbin:$PATH" export TZDIR='/etc/zoneinfo' + # XDG_DATA_DIRS is used by pressure-vessel (steam proton) and vulkan loaders to find the corresponding icd + export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/run/opengl-driver/share:/run/opengl-driver-32/share + # Force compilers and other tools to look in default search paths unset NIX_ENFORCE_PURITY export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1 diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index cdc3096fcbfd5..09457caecb865 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -60,6 +60,9 @@ let export PATH="/run/wrappers/bin:/usr/bin:/usr/sbin:$PATH" export TZDIR='/etc/zoneinfo' + # XDG_DATA_DIRS is used by pressure-vessel (steam proton) and vulkan loaders to find the corresponding icd + export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/run/opengl-driver/share:/run/opengl-driver-32/share + # Force compilers and other tools to look in default search paths unset NIX_ENFORCE_PURITY export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1 diff --git a/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix b/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix index d21e0475e2df5..fde977c3636b7 100644 --- a/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix +++ b/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix @@ -5,6 +5,7 @@ let CFBundleDevelopmentRegion = "English"; CFBundleExecutable = "$name"; CFBundleIconFile = "$icon"; + CFBundleIconFiles = [ "$icon" ]; CFBundleIdentifier = "org.nixos.$name"; CFBundleInfoDictionaryVersion = "6.0"; CFBundleName = "$name"; @@ -25,11 +26,8 @@ in writeScriptBin "write-darwin-bundle" '' ${pListText} EOF - if [[ $squircle != 0 && $squircle != "false" ]]; then - sed " - s|CFBundleIconFile|CFBundleIconFiles|; - s|<string>$icon</string>|<array><string>$icon</string></array>| - " -i "$plist" + if [[ $squircle == 0 || $squircle == "false" ]]; then + sed '/CFBundleIconFiles/,\|</array>|d' -i "$plist" fi cat > "$prefix/Applications/$name.app/Contents/MacOS/$name" <<EOF diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index b2e2738cb6ece..d54af90b68888 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -18,7 +18,9 @@ convertIconTheme() { local -r iconName=$3 local -r theme=${4:-hicolor} - local -ra iconSizes=(16 32 48 128 256 512) + # Sizes based on archived Apple documentation: + # https://developer.apple.com/design/human-interface-guidelines/macos/icons-and-images/app-icon#app-icon-sizes + local -ra iconSizes=(16 32 128 256 512) local -ra scales=([1]="" [2]="@2") # Based loosely on the algorithm at: @@ -31,13 +33,6 @@ convertIconTheme() { local scaleSuffix=${scales[$scale]} local exactSize=${iconSize}x${iconSize}${scaleSuffix} - if [[ $exactSize = '48x48@2' ]]; then - # macOS does not support a 2x scale variant of 48x48 icons - # See: https://en.wikipedia.org/wiki/Apple_Icon_Image_format#Icon_types - echo "unsupported" - return 0 - fi - local -a validSizes=( ${exactSize} $((iconSize + 1))x$((iconSize + 1))${scaleSuffix} @@ -55,8 +50,10 @@ convertIconTheme() { else echo "threshold $icon" fi - return 0 + elif [[ -a $icon ]]; then + echo "fallback $icon" fi + return 0 done done echo "scalable" @@ -106,6 +103,17 @@ convertIconTheme() { scalableIcon=('-') fi + # Tri-state variable, NONE means no icons have been found, an empty + # icns file will be generated, not sure that's necessary because macOS + # will default to a generic icon if no icon can be found. + # + # OTHER means an appropriate icon was found. + # + # Any other value is a path to an icon file that isn't scalable or + # within the threshold. This is used as a fallback in case no better + # icon can be found and will be scaled as much as + # necessary to result in appropriate icon sizes. + local foundIcon=NONE for iconSize in "${iconSizes[@]}"; do for scale in "${!scales[@]}"; do local iconResult=$(findIcon $iconSize $scale) @@ -117,6 +125,7 @@ convertIconTheme() { fixed) local density=$((72 * scale))x$((72 * scale)) magick convert -density "$density" -units PixelsPerInch "$icon" "$result" + foundIcon=OTHER ;; threshold) # Synthesize an icon of the exact size if a scalable icon is available @@ -124,21 +133,38 @@ convertIconTheme() { if ! synthesizeIcon "${scalableIcon[0]}" "$result" "$iconSize" "$scale"; then resizeIcon "$icon" "$result" "$iconSize" "$scale" fi + foundIcon=OTHER ;; scalable) synthesizeIcon "${scalableIcon[0]}" "$result" "$iconSize" "$scale" || true + foundIcon=OTHER + ;; + fallback) + # Use the largest size available to scale to + # appropriate sizes. + if [[ $foundIcon != OTHER ]]; then + foundIcon=$icon + fi ;; *) ;; esac done done + if [[ $foundIcon != NONE && $foundIcon != OTHER ]]; then + # Ideally we'd only resize to whatever the closest sizes are, + # starting from whatever icon sizes are available. + for iconSize in 16 32 128 256 512; do + local result=${resultdir}/${iconSize}x${iconSize}.png + resizeIcon "$foundIcon" "$result" "$iconSize" 1 + done + fi echo "$resultdir" } iconsdir=$(getIcons "$sharePath" "apps/${iconName}" "$theme") - if [[ ! -z "$(ls -1 "$iconsdir/"*)" ]]; then - icnsutil compose "$out/${iconName}.icns" "$iconsdir/"* + if [[ -n "$(ls -1 "$iconsdir/"*)" ]]; then + icnsutil compose --toc "$out/${iconName}.icns" "$iconsdir/"* else echo "Warning: no icons were found. Creating an empty icon for ${iconName}.icns." touch "$out/${iconName}.icns" diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 60a7e3f229f59..5b33714fc258a 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux development manual pages"; homepage = "https://www.kernel.org/doc/man-pages/"; - repositories.git = "https://git.kernel.org/pub/scm/docs/man-pages/man-pages"; license = licenses.gpl2Plus; platforms = with platforms; unix; priority = 30; # if a package comes with its own man page, prefer it diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix index a2f9f005eb933..c9ce9c2bf7646 100644 --- a/pkgs/data/documentation/std-man-pages/default.nix +++ b/pkgs/data/documentation/std-man-pages/default.nix @@ -1,10 +1,11 @@ { stdenv, lib, fetchurl }: -stdenv.mkDerivation { - name = "std-man-pages-4.4.0"; +stdenv.mkDerivation rec { + pname = "std-man-pages"; + version = "4.4.0"; src = fetchurl { - url = "mirror://gcc/libstdc++/doxygen/libstdc++-man.4.4.0.tar.bz2"; + url = "mirror://gcc/libstdc++/doxygen/libstdc++-man.${version}.tar.bz2"; sha256 = "0153py77ll759jacq41dp2z2ksr08pdcfic0rwjd6pr84dk89y9v"; }; diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index efd58b348dcdd..57c356136748d 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -1,14 +1,14 @@ { lib, fetchurl, libarchive }: let - version = "0.36.0"; + version = "0.36.1"; in fetchurl { name = "sarasa-gothic-${version}"; # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; - sha256 = "sha256-ENBF7dVFp9lrGGRwNIB0Yg7y1F5XbVivgD2e9pLZQwQ="; + sha256 = "sha256-w8PVDvbnHFZF7/X4EzO0IJsEKMC7c+GPng1sn8Q8G14="; recursiveHash = true; downloadToTemp = true; diff --git a/pkgs/data/icons/faba-icon-theme/default.nix b/pkgs/data/icons/faba-icon-theme/default.nix index 6ccd4c4622fa7..1119e248522a0 100644 --- a/pkgs/data/icons/faba-icon-theme/default.nix +++ b/pkgs/data/icons/faba-icon-theme/default.nix @@ -1,13 +1,12 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "${package-name}-${version}"; - package-name = "faba-icon-theme"; + pname = "faba-icon-theme"; version = "4.3"; src = fetchFromGitHub { owner = "moka-project"; - repo = package-name; + repo = "faba-icon-theme"; rev = "v${version}"; sha256 = "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n"; }; diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix index 09d0875ca8a3b..9e6b0666a1189 100644 --- a/pkgs/data/icons/tango-icon-theme/default.nix +++ b/pkgs/data/icons/tango-icon-theme/default.nix @@ -3,10 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tango-icon-theme-0.8.90"; + pname = "tango-icon-theme"; + version = "0.8.90"; src = fetchurl { - url = "http://tango.freedesktop.org/releases/${name}.tar.gz"; + url = "http://tango.freedesktop.org/releases/tango-icon-theme-${version}.tar.gz"; sha256 = "13n8cpml71w6zfm2jz5fa7r1z18qlzk4gv07r6n1in2p5l1xi63f"; }; diff --git a/pkgs/data/misc/brise/default.nix b/pkgs/data/misc/brise/default.nix index f4e1a6d2905f5..45f86f6be21cf 100644 --- a/pkgs/data/misc/brise/default.nix +++ b/pkgs/data/misc/brise/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, librime }: stdenv.mkDerivation { - name = "brise-unstable-2017-09-16"; + pname = "brise"; + version = "unstable-2017-09-16"; src = fetchFromGitHub { owner = "rime"; diff --git a/pkgs/data/misc/miscfiles/default.nix b/pkgs/data/misc/miscfiles/default.nix index 783dc29ecb2d5..ad58e5bd7b79b 100644 --- a/pkgs/data/misc/miscfiles/default.nix +++ b/pkgs/data/misc/miscfiles/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "miscfiles-1.5"; + pname = "miscfiles"; + version = "1.5"; src = fetchurl { - url = "mirror://gnu/miscfiles/${name}.tar.gz"; + url = "mirror://gnu/miscfiles/miscfiles-${version}.tar.gz"; sha256 = "005588vfrwx8ghsdv9p7zczj9lbc9a3r4m5aphcaqv8gif4siaka"; }; diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/data/misc/shared-desktop-ontologies/default.nix index 88f9eec8fcada..fd797d8d63f0d 100644 --- a/pkgs/data/misc/shared-desktop-ontologies/default.nix +++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "shared-desktop-ontologies-0.11.0"; + pname = "shared-desktop-ontologies"; + version = "0.11.0"; src = fetchurl { - url = "mirror://sourceforge/oscaf/${name}.tar.bz2"; + url = "mirror://sourceforge/oscaf/shared-desktop-ontologies-${version}.tar.bz2"; sha256 = "1m5vnijg7rnwg41vig2ckg632dlczzdab1gsq51g4x7m9k1fdbw2"; }; diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 7e2b12e863fb9..1e0d35d52000d 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202203170039"; + version = "202203240042"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "0b5c94c368dc5f70ebf995e87188aa8f40d45489"; - sha256 = "sha256-iaqU6CkrewICONps43nbZaUiM2aahSwfSD5bZz1P4Zc="; + rev = "d7ff77f883216595a4b6674e9507f305195dcda3"; + sha256 = "sha256-wSm24nXz4QIM8e7Z8d08NjluLaBWEdl09FNAL3GR9so="; }; installPhase = '' diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index ea18da119c7e7..11e76c202764c 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -3,36 +3,33 @@ , sassc , meson , ninja -, pkg-config -, gtk3 , glib , gnome , gtk-engine-murrine -, optipng , inkscape , cinnamon +, makeFontsConf +, python3 }: stdenv.mkDerivation rec { pname = "arc-theme"; - version = "20211018"; + version = "20220223"; src = fetchFromGitHub { owner = "jnsh"; repo = pname; rev = version; - sha256 = "1rrxm5b7l8kq1h0lm08ck54xljzm8w573mxx904n3rhdg3ri9d63"; + sha256 = "sha256-qsZdXDNxT1/gIlkUsC1cfVrULApC+dHreBXXjVTJQiA="; }; nativeBuildInputs = [ meson ninja - pkg-config sassc - optipng inkscape - gtk3 glib # for glib-compile-resources + python3 ]; propagatedUserEnvPkgs = [ @@ -40,17 +37,23 @@ stdenv.mkDerivation rec { gtk-engine-murrine ]; + postPatch = '' + patchShebangs meson/install-file.py + ''; + preBuild = '' # Shut up inkscape's warnings about creating profile directory - export HOME="$NIX_BUILD_ROOT" + export HOME="$TMPDIR" ''; + # Fontconfig error: Cannot load default config file: No such file: (null) + FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; + mesonFlags = [ - "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm,metacity" - "-Dvariants=light,darker,dark,lighter" + # "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm,metacity" + # "-Dvariants=light,darker,dark,lighter" "-Dcinnamon_version=${cinnamon.cinnamon-common.version}" "-Dgnome_shell_version=${gnome.gnome-shell.version}" - "-Dgtk3_version=${gtk3.version}" # You will need to patch gdm to make use of this. "-Dgnome_shell_gresource=true" ]; diff --git a/pkgs/data/themes/dracula-theme/default.nix b/pkgs/data/themes/dracula-theme/default.nix index cb6fc84723f27..326e004070b37 100644 --- a/pkgs/data/themes/dracula-theme/default.nix +++ b/pkgs/data/themes/dracula-theme/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { installPhase = '' runHook preInstall mkdir -p $out/share/themes/${themeName} - cp -a {assets,cinnamon,gnome-shell,gtk-2.0,gtk-3.0,gtk-3.20,index.theme,metacity-1,unity,xfwm4} $out/share/themes/${themeName} + cp -a {assets,cinnamon,gnome-shell,gtk-2.0,gtk-3.0,gtk-3.20,gtk-4.0,index.theme,metacity-1,unity,xfwm4} $out/share/themes/${themeName} cp -a kde/{color-schemes,plasma} $out/share/ cp -a kde/kvantum $out/share/Kvantum diff --git a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix index 06b0e32d1b7a8..b77c136e4067f 100644 --- a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix +++ b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "kde-rounded-corners"; - version = "unstable-2021-11-06"; + version = "0.1.1"; src = fetchFromGitHub { owner = "matinlotfali"; repo = "KDE-Rounded-Corners"; - rev = "8ad8f5f5eff9d1625abc57cb24dc484d51f0e1bd"; - sha256 = "0xbskf7jd03d2invfz1nnfc82klzvc784snw539n4kn6c6rc381p"; + rev = "v${version}"; + hash = "sha256-cXpJabeOHnat7OljtRzduUdOaA6Z3z6vV3aBKwiIrR0="; }; postConfigure = '' diff --git a/pkgs/desktops/gnome/apps/gnome-notes/default.nix b/pkgs/desktops/gnome/apps/gnome-notes/default.nix index 6af206069e292..0ecd1e2ef6fd5 100644 --- a/pkgs/desktops/gnome/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-notes/default.nix @@ -1,8 +1,10 @@ -{ lib, stdenv +{ stdenv +, lib , meson , ninja , gettext , fetchurl +, fetchpatch , pkg-config , wrapGAppsHook , itstool @@ -32,6 +34,15 @@ stdenv.mkDerivation rec { sha256 = "1gvvb2klkzbmyzwkjgmscdiqcl8lyz9b0rxb4igjz079csq6z805"; }; + patches = [ + # Fix build with meson 0.61 + # data/appdata/meson.build:3:5: ERROR: Function does not take positional arguments. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-notes/-/commit/994af76ce5144062d55d141129bf6bf5fab002ee.patch"; + sha256 = "sha256-z7dPOLZzaqvdqUIDy6+V3dKossRbG0EDjBu2oJCF6b4="; + }) + ]; + doCheck = true; postPatch = '' diff --git a/pkgs/desktops/gnome/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome/core/gnome-dictionary/default.nix index a399c4e85377c..6cdb8831c48f6 100644 --- a/pkgs/desktops/gnome/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome/core/gnome-dictionary/default.nix @@ -1,6 +1,24 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, desktop-file-utils, appstream-glib, libxslt -, libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 -, gnome, gtk3, glib, gsettings-desktop-schemas }: +{ stdenv +, lib +, fetchurl +, fetchpatch +, meson +, ninja +, pkg-config +, desktop-file-utils +, appstream-glib +, libxslt +, libxml2 +, gettext +, itstool +, wrapGAppsHook +, docbook_xsl +, docbook_xml_dtd_43 +, gnome +, gtk3 +, glib +, gsettings-desktop-schemas +}: stdenv.mkDerivation rec { pname = "gnome-dictionary"; @@ -11,13 +29,44 @@ stdenv.mkDerivation rec { sha256 = "1d8dhcfys788vv27v34i3s3x3jdvdi2kqn2a5p8c937a9hm0qr9f"; }; - doCheck = true; + patches = [ + # Fix test dependencies with meson 0.57, can be removed on next bump + # We need to explicitly depend on the generated files. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-dictionary/-/commit/87c026cfe4acbcfc62d15950f88a71d8d9678c7e.patch"; + sha256 = "tKesWeOK3OqOxrXm4dZvCZHHdTD7AQbYDjtYDCsLd3A="; + }) + # Fix build with meson 0.61, can be removed on next bump + # data/appdata/meson.build:3:5: ERROR: Function does not take positional arguments. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-dictionary/-/commit/cf3f8a67cd6f3059c555ed9cf0f5fba10abb7f68.patch"; + sha256 = "cIRM6ACqsnEo2JWYvr6EBye5o0BudugZMShCe1U5hz8="; + }) + ]; nativeBuildInputs = [ - meson ninja pkg-config wrapGAppsHook libxml2 gettext itstool - desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43 + meson + ninja + pkg-config + wrapGAppsHook + libxml2 + gettext + itstool + desktop-file-utils + appstream-glib + libxslt + docbook_xsl + docbook_xml_dtd_43 + ]; + + buildInputs = [ + gtk3 + glib + gsettings-desktop-schemas + gnome.adwaita-icon-theme ]; - buildInputs = [ gtk3 glib gsettings-desktop-schemas gnome.adwaita-icon-theme ]; + + doCheck = true; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/desktops/gnome/core/gucharmap/default.nix b/pkgs/desktops/gnome/core/gucharmap/default.nix index 7d15e6b41ef60..3dc08e66357a3 100644 --- a/pkgs/desktops/gnome/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome/core/gucharmap/default.nix @@ -7,7 +7,7 @@ , pkg-config , python3 , gtk3 -, adwaita-icon-theme +, pcre2 , glib , desktop-file-utils , gtk-doc @@ -45,7 +45,7 @@ let }; in stdenv.mkDerivation rec { pname = "gucharmap"; - version = "14.0.0"; + version = "14.0.2"; outputs = [ "out" "lib" "dev" "devdoc" ]; @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { owner = "GNOME"; repo = pname; rev = version; - sha256 = "sha256-d283zVRH42NZNq+vGmItN3ZBrRrl9gpYDco7osm3RoY="; + sha256 = "sha256-gyOm/S0ae0kX4AFUiglqyGRGB8C/KUuaG/dr/Wf1ug0="; }; nativeBuildInputs = [ @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { gtk3 glib gsettings-desktop-schemas - adwaita-icon-theme + pcre2 ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix index 7ef68e470e1d6..698741ba8366e 100644 --- a/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix @@ -1,6 +1,20 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook -, librsvg, gettext, itstool, libxml2 -, meson, ninja, glib, vala, desktop-file-utils +{ stdenv +, lib +, fetchurl +, fetchpatch +, pkg-config +, gnome +, gtk3 +, wrapGAppsHook +, librsvg +, gettext +, itstool +, libxml2 +, meson +, ninja +, glib +, vala +, desktop-file-utils }: stdenv.mkDerivation rec { @@ -12,12 +26,30 @@ stdenv.mkDerivation rec { sha256 = "144ia3zn9rhwa1xbdkvsz6m0dsysl6mxvqw9bnrlh845hmyy9cfj"; }; + patches = [ + # Fix build with meson 0.61 + # data/meson.build:24:0: ERROR: Function does not take positional arguments. + # data/meson.build:45:0: ERROR: Function does not take positional arguments. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/commit/a2037b0747163601a5d5b57856d037eecf3a4db7.patch"; + sha256 = "Wcder6Y9H6c1f8I+IPDvST3umaCU21HgxfXn809JDz0="; + }) + ]; + nativeBuildInputs = [ - meson ninja vala desktop-file-utils - pkg-config gnome.adwaita-icon-theme - libxml2 itstool gettext wrapGAppsHook + meson + ninja + vala + desktop-file-utils + pkg-config + gnome.adwaita-icon-theme + libxml2 + itstool + gettext + wrapGAppsHook glib # for glib-compile-schemas ]; + buildInputs = [ glib gtk3 diff --git a/pkgs/desktops/gnome/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome/games/gnome-tetravex/default.nix index a1cdf98d9a155..6578bf7c0589e 100644 --- a/pkgs/desktops/gnome/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome/games/gnome-tetravex/default.nix @@ -1,6 +1,19 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook -, libxml2, gettext, itstool, meson, ninja, python3 -, vala, desktop-file-utils +{ stdenv +, lib +, fetchurl +, fetchpatch +, pkg-config +, gnome +, gtk3 +, wrapGAppsHook +, libxml2 +, gettext +, itstool +, meson +, ninja +, python3 +, vala +, desktop-file-utils }: stdenv.mkDerivation rec { @@ -12,14 +25,31 @@ stdenv.mkDerivation rec { sha256 = "06wihvqp2p52zd2dnknsc3rii69qib4a30yp15h558xrg44z3k8z"; }; - passthru = { - updateScript = gnome.updateScript { packageName = "gnome-tetravex"; attrPath = "gnome.gnome-tetravex"; }; - }; + patches = [ + # Fix build with meson 0.61 + # data/meson.build:37:0: ERROR: Function does not take positional arguments. + # data/meson.build:59:0: ERROR: Function does not take positional arguments. + # Taken from https://gitlab.gnome.org/GNOME/gnome-tetravex/-/merge_requests/20 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-tetravex/-/commit/80912d06f5e588f6aca966fa516103275e58d94e.patch"; + sha256 = "2+nFw5sJzbInibKaq3J10Ufbl3CnZWlgnUtzRTZ5G0I="; + }) + ]; nativeBuildInputs = [ - wrapGAppsHook itstool libxml2 gnome.adwaita-icon-theme - pkg-config gettext meson ninja python3 vala desktop-file-utils + wrapGAppsHook + itstool + libxml2 + gnome.adwaita-icon-theme + pkg-config + gettext + meson + ninja + python3 + vala + desktop-file-utils ]; + buildInputs = [ gtk3 ]; @@ -29,6 +59,13 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson_post_install.py ''; + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-tetravex"; + attrPath = "gnome.gnome-tetravex"; + }; + }; + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Tetravex"; description = "Complete the puzzle by matching numbered tiles"; diff --git a/pkgs/desktops/gnome/games/hitori/default.nix b/pkgs/desktops/gnome/games/hitori/default.nix index 15759c6819840..bb210c2fffb15 100644 --- a/pkgs/desktops/gnome/games/hitori/default.nix +++ b/pkgs/desktops/gnome/games/hitori/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -25,6 +27,15 @@ stdenv.mkDerivation rec { sha256 = "99cQPLBjP7ATcwExqYw646IWK5+5SZ/H8ZUS1YG/ZWk="; }; + patches = [ + # Fix build with meson 0.61 + # data/meson.build:3:0: ERROR: Function does not take positional arguments. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/hitori/-/commit/d25728e122f1d7b985029a5ba96810c3e57c27f7.patch"; + sha256 = "LwBpFFr+vLacLTpto7PwvO1p2lku6epyEv9YZvUvW+g="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/desktops/gnome/misc/gitg/default.nix b/pkgs/desktops/gnome/misc/gitg/default.nix index e29464556ec06..31e6bd7f2ed19 100644 --- a/pkgs/desktops/gnome/misc/gitg/default.nix +++ b/pkgs/desktops/gnome/misc/gitg/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , vala , gettext , pkg-config @@ -36,6 +37,15 @@ stdenv.mkDerivation rec { sha256 = "f7Ybn7EPuqVI0j1wZbq9cq1j5iHeVYQMBlzm45hsRik="; }; + patches = [ + # Fix build with meson 0.61 + # data/meson.build:8:5: ERROR: Function does not take positional arguments. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gitg/-/commit/1978973b12848741b08695ec2020bac98584d636.patch"; + sha256 = "sha256-RzaGPGGiKMgjy0waFqt48rV2yWBGZgC3kHehhVhxktk="; + }) + ]; + nativeBuildInputs = [ gobject-introspection gettext diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 0b713902358c0..54534f63f7d1c 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -133,10 +133,10 @@ let milou = callPackage ./milou.nix {}; oxygen = callPackage ./oxygen.nix {}; plasma-browser-integration = callPackage ./plasma-browser-integration.nix {}; - plasma-phone-components = callPackage ./plasma-phone-components {}; plasma-desktop = callPackage ./plasma-desktop {}; plasma-disks = callPackage ./plasma-disks.nix {}; plasma-integration = callPackage ./plasma-integration {}; + plasma-mobile = callPackage ./plasma-mobile {}; plasma-nano = callPackage ./plasma-nano {}; plasma-nm = callPackage ./plasma-nm {}; plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; }; @@ -168,6 +168,7 @@ let } // lib.optionalAttrs (config.allowAliases or true) { ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor"; + plasma-phone-components = throw "'plasma-phone-components' has been renamed to/replaced by 'plasma-mobile'"; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 44b96e8beb9dd..f517cc6371f2f 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.24.0/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.24.3/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/plasma-phone-components/default.nix b/pkgs/desktops/plasma-5/plasma-mobile/default.nix index ed0f434025d28..be628de65408b 100644 --- a/pkgs/desktops/plasma-5/plasma-phone-components/default.nix +++ b/pkgs/desktops/plasma-5/plasma-mobile/default.nix @@ -7,7 +7,7 @@ kdeclarative, kdelibs4support, kpeople, kconfig, krunner, kinit, kwayland, kwin, plasma-framework, telepathy, libphonenumber, protobuf, libqofono, modemmanager-qt, - plasma-workspace, + networkmanager-qt, plasma-workspace, maliit-framework, maliit-keyboard, qtwayland, qttools @@ -16,14 +16,14 @@ let inherit (lib) getBin getLib; in mkDerivation { - pname = "plasma-phone-components"; + pname = "plasma-mobile"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ appstream libdbusmenu pam wayland kdeclarative kdelibs4support kpeople kconfig krunner kinit kwayland kwin plasma-framework telepathy libphonenumber protobuf libqofono modemmanager-qt - maliit-framework maliit-keyboard + networkmanager-qt maliit-framework maliit-keyboard ]; postPatch = '' diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch index e00d8b4a5c9da..8254f7b4c4031 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch @@ -71,10 +71,10 @@ index 008fdfcaf..72468f21c 100644 } void cleanupPlasmaEnvironment(const std::optional<QProcessEnvironment> &oldSystemdEnvironment) -@@ -500,7 +500,7 @@ QProcess *setupKSplash() - KConfigGroup ksplashCfg = cfg.group("KSplash"); +@@ -501,7 +501,7 @@ QProcess *setupKSplash() if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) { p = new QProcess; + p->setProcessChannelMode(QProcess::ForwardedChannels); - p->start(QStringLiteral("ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))}); + p->start(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))}); } diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index c5da337d10d69..e98a769f60fe1 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,435 +4,427 @@ { bluedevil = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/bluedevil-5.24.0.tar.xz"; - sha256 = "128br83hkxxrb6wca3d1racygdnfgk3r5md1gcjvgwb0gpy6bnzp"; - name = "bluedevil-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/bluedevil-5.24.3.tar.xz"; + sha256 = "1hlyqhn14yq7960zfjwjygkpkvbmrlsanm1g1wrr7dwbmrp5dlcx"; + name = "bluedevil-5.24.3.tar.xz"; }; }; breeze = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/breeze-5.24.0.tar.xz"; - sha256 = "08b3hihz98z7kdybb0y1b74q1dn511ga81qqqxzlfirgpp8c9f9q"; - name = "breeze-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/breeze-5.24.3.tar.xz"; + sha256 = "0h19m6wmhjw8v6ys47kgzcb0h2nb9w2fcjzypnvmkvbjbkjr53sb"; + name = "breeze-5.24.3.tar.xz"; }; }; breeze-grub = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/breeze-grub-5.24.0.tar.xz"; - sha256 = "0p0pzmsd6scssyxcm9n58mp7fc9vz1lg4n7c1ch4bqragih1gnlr"; - name = "breeze-grub-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/breeze-grub-5.24.3.tar.xz"; + sha256 = "15cpmqp7klp4dhcil3i78iff4kjasfx273v36ml8y05hm8w0igjq"; + name = "breeze-grub-5.24.3.tar.xz"; }; }; breeze-gtk = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/breeze-gtk-5.24.0.tar.xz"; - sha256 = "090cczxc1ciic6wghz3p21gpfdwnc8pjcvq6wn7bfkp1i3r5mihp"; - name = "breeze-gtk-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/breeze-gtk-5.24.3.tar.xz"; + sha256 = "1922s17mh4ifaqbf4b7p6yj8pwd6z3qwpbf21j1fqhmdk4pvn499"; + name = "breeze-gtk-5.24.3.tar.xz"; }; }; breeze-plymouth = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/breeze-plymouth-5.24.0.tar.xz"; - sha256 = "1qqpwgp1yy3p1s0z21xwds6wx4z8daibkgk1bynj73cx7a2wch9g"; - name = "breeze-plymouth-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/breeze-plymouth-5.24.3.tar.xz"; + sha256 = "0nkf0ll4hcawmkd7nrh8gcf6hhbl0ajxiz2azf9njab9pv2lcz1j"; + name = "breeze-plymouth-5.24.3.tar.xz"; }; }; discover = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/discover-5.24.0.tar.xz"; - sha256 = "0dbfvqana31wqharsbyb8rcrw1w6l9x1g6p02aqwiph0inkrz20q"; - name = "discover-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/discover-5.24.3.tar.xz"; + sha256 = "097m5njz86vi4innap1mvizas60r1qcrdzdgsid1hd6p5a92rwca"; + name = "discover-5.24.3.tar.xz"; }; }; drkonqi = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/drkonqi-5.24.0.tar.xz"; - sha256 = "1ismgg7rcxijkprn4sci15wn4w2gmdn0fdbgvzxdcrqaf4g6qc3s"; - name = "drkonqi-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/drkonqi-5.24.3.tar.xz"; + sha256 = "1n6psvr3washk796zrc8ag011fwy677h2mdkw9ijx8dhrk80br0k"; + name = "drkonqi-5.24.3.tar.xz"; }; }; kactivitymanagerd = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/kactivitymanagerd-5.24.0.tar.xz"; - sha256 = "12dvgm3ilyqlxzm8209b7g42nfk0ahfzizs3pbmi18zapjszcsps"; - name = "kactivitymanagerd-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kactivitymanagerd-5.24.3.tar.xz"; + sha256 = "0qxf3j36dj1yklnl27znsi9qdjmn6nr779cnzms38x76dq9kxblw"; + name = "kactivitymanagerd-5.24.3.tar.xz"; }; }; kde-cli-tools = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/kde-cli-tools-5.24.0.tar.xz"; - sha256 = "0l8a4ysz1cqwdh3c20q51qamwh58vvs8yzb5jdvbp8bahsyyc4mr"; - name = "kde-cli-tools-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kde-cli-tools-5.24.3.tar.xz"; + sha256 = "00z8yxic5ibk05x8c25dsc4ijvk6yv0aw1iyfhnpnzmdwdydlr7y"; + name = "kde-cli-tools-5.24.3.tar.xz"; }; }; - kde-gtk-config = { - version = "5.24.0"; + kdecoration = { + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/kde-gtk-config-5.24.0.tar.xz"; - sha256 = "024pglycz2kbp9npnvbx5qpkz9381wyyp6xkalqynzr9gy58syrx"; - name = "kde-gtk-config-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kdecoration-5.24.3.tar.xz"; + sha256 = "0dpnaf5myn1h368cnkq9g6xfm1sqmyam6bxyidbd5j3dyy1kvz5v"; + name = "kdecoration-5.24.3.tar.xz"; }; }; - kdecoration = { - version = "5.24.0"; + kde-gtk-config = { + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/kdecoration-5.24.0.tar.xz"; - sha256 = "0xl8892w49z11k9mxgh7lp8a4l1x8wldmaij82kd1vnh9sxvb3f3"; - name = "kdecoration-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kde-gtk-config-5.24.3.tar.xz"; + sha256 = "0p50kf34csdrgck1y09d3lnz0r9ly0ca4778achrc59yr4qcsjzv"; + name = "kde-gtk-config-5.24.3.tar.xz"; }; }; kdeplasma-addons = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/kdeplasma-addons-5.24.0.tar.xz"; - sha256 = "0q8yf0gz4gjn1kyf545i8fpsn2dpy48qhjpm8ssp3ywv6s2abjxn"; - name = "kdeplasma-addons-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kdeplasma-addons-5.24.3.tar.xz"; + sha256 = "0g7jcvd6abnlzz9ibnc7phzm58pn6dv3795w4hhy47738jkhizl6"; + name = "kdeplasma-addons-5.24.3.tar.xz"; }; }; kgamma5 = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/kgamma5-5.24.0.tar.xz"; - sha256 = "07w7l25snpi98j5bxg3zri5lsymabnli6h9d5w0qx0c19wzjwayl"; - name = "kgamma5-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kgamma5-5.24.3.tar.xz"; + sha256 = "0rwqvz14a50s43p74n19v1zzd9y8f2lylfappxmhrdyxmbgkpnk6"; + name = "kgamma5-5.24.3.tar.xz"; }; }; khotkeys = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/khotkeys-5.24.0.tar.xz"; - sha256 = "0gjdwdzg5vybalima8jnwrprqj0rnxmzds0x8w707nb9ypz4k7k6"; - name = "khotkeys-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/khotkeys-5.24.3.tar.xz"; + sha256 = "1jxg91rpz09sh13fz270pxfw40qdy6p50j5xw7cpnyqlk2l5zx0p"; + name = "khotkeys-5.24.3.tar.xz"; }; }; kinfocenter = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/kinfocenter-5.24.0.tar.xz"; - sha256 = "09fq69q4300ppi1y9pp8s4h1bbai1p5qsz384bb445pjvwsyn6nf"; - name = "kinfocenter-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kinfocenter-5.24.3.tar.xz"; + sha256 = "08z2044bl0v4ydlx2chv849y6m4py0yd4lnw76sycd14lnvsrxfj"; + name = "kinfocenter-5.24.3.tar.xz"; }; }; kmenuedit = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/kmenuedit-5.24.0.tar.xz"; - sha256 = "0bjiqdw4wqi5vpkn98wjjz23x6k47lvxac8nyxs8ddd9i8mlklij"; - name = "kmenuedit-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kmenuedit-5.24.3.tar.xz"; + sha256 = "1yivrdix4jiycfbw9g6pzx8zkmdq4g8g51ndc7sy3r0qxzgx1icb"; + name = "kmenuedit-5.24.3.tar.xz"; }; }; kscreen = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/kscreen-5.24.0.tar.xz"; - sha256 = "19kqvvgj209ri035ldzn1k5l36l54rvagsnfzhw61v8rd9r6r02x"; - name = "kscreen-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kscreen-5.24.3.tar.xz"; + sha256 = "1wjbd33h8473v8i5qxdccxrsv04v6jyd7scrqdxqaln9n8ylp08f"; + name = "kscreen-5.24.3.tar.xz"; }; }; kscreenlocker = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/kscreenlocker-5.24.0.tar.xz"; - sha256 = "0d827h5br27sdd925brljb1mwnkzj739g5q0k8xkw9f9q9bxk8l8"; - name = "kscreenlocker-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kscreenlocker-5.24.3.tar.xz"; + sha256 = "1dh3z55hwakj11ffn2fm79vnlw7gcg1nkcxbxvcdcpq84ahpq583"; + name = "kscreenlocker-5.24.3.tar.xz"; }; }; ksshaskpass = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/ksshaskpass-5.24.0.tar.xz"; - sha256 = "1xiw25imhmkcikp746q9s393djmkdpkh9jb7h1diwwhambnimy6d"; - name = "ksshaskpass-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/ksshaskpass-5.24.3.tar.xz"; + sha256 = "0ivq9nyyqm1rrm6ck26jlsh8qv9q98dz5qwvcnpgpmxb3mr1dgiv"; + name = "ksshaskpass-5.24.3.tar.xz"; }; }; ksystemstats = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/ksystemstats-5.24.0.tar.xz"; - sha256 = "1182dfcg1av9329g9p9ll64yiwyxm46kczakxb3vj4d2ajaclzm1"; - name = "ksystemstats-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/ksystemstats-5.24.3.tar.xz"; + sha256 = "03ikpd3m0qk8cb92g63i7q9c8bks7ggf1pmmig559cmg7gbknc2c"; + name = "ksystemstats-5.24.3.tar.xz"; }; }; kwallet-pam = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/kwallet-pam-5.24.0.tar.xz"; - sha256 = "0jzi2rcwxxjp3lg8cywp96ysnwm51a0m9pdwk8z7n3v1ncr2p38q"; - name = "kwallet-pam-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kwallet-pam-5.24.3.tar.xz"; + sha256 = "0zxdrpjq8sg3qw2gfkvjs567b41labi940cq4qrix395v7251p9k"; + name = "kwallet-pam-5.24.3.tar.xz"; }; }; kwayland-integration = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/kwayland-integration-5.24.0.tar.xz"; - sha256 = "1yq9cjb8xcvqr747p5hm8xxg4rn6mahchd5c2camv3qrjbqm8ll6"; - name = "kwayland-integration-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kwayland-integration-5.24.3.tar.xz"; + sha256 = "1kq5vrrplbdxri8610h89apfz07a6xi1gnlvmr8gbsvas5zicvwz"; + name = "kwayland-integration-5.24.3.tar.xz"; }; }; kwayland-server = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/kwayland-server-5.24.0.tar.xz"; - sha256 = "1zbi4c14zvjwkxxqlg80mv749ybnkmcdvn72irmrzbbf4g1z7k32"; - name = "kwayland-server-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kwayland-server-5.24.3.tar.xz"; + sha256 = "0fq61qk3cp4xg9759ylqqw5ncx9s7kayjf0bilg5m725bfhj02sn"; + name = "kwayland-server-5.24.3.tar.xz"; }; }; kwin = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/kwin-5.24.0.tar.xz"; - sha256 = "19q5pphqnr1xc1c4z0sd3yr60jsiq190llwllfmlj4acjlbcbbn6"; - name = "kwin-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kwin-5.24.3.tar.xz"; + sha256 = "0szlrcsj4h4fa5yf27nmza7c4dyc0xcwdrihs05pl5qk5bivfkfq"; + name = "kwin-5.24.3.tar.xz"; }; }; kwrited = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/kwrited-5.24.0.tar.xz"; - sha256 = "018wvkkqzg4qyjd0w1h2d3ms72ghlq8mg79rrsj518l7hhlv6rsg"; - name = "kwrited-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kwrited-5.24.3.tar.xz"; + sha256 = "1sgd3iik647pz2zr5cpsbwm2ll8f11xyw2jv2sfxkbiiw53qaxid"; + name = "kwrited-5.24.3.tar.xz"; }; }; layer-shell-qt = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/layer-shell-qt-5.24.0.tar.xz"; - sha256 = "0y3z2xr9vpxnm84gs1zpa1apma341wza7pjcpwibaqd6aiz9vpqv"; - name = "layer-shell-qt-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/layer-shell-qt-5.24.3.tar.xz"; + sha256 = "0h3xlvmgyxyzxvazgbbn0a9l14hg5d38cl9hclnwmrnpwbn0bqax"; + name = "layer-shell-qt-5.24.3.tar.xz"; }; }; libkscreen = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/libkscreen-5.24.0.tar.xz"; - sha256 = "0h6sycib940gbw2rf6ax3v7mg77pzga36xzwzbyz9h49fba3dpjk"; - name = "libkscreen-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/libkscreen-5.24.3.tar.xz"; + sha256 = "18777lwn5j0isc347dks25731byyfdyls79lj6hnxqb6807lz1x6"; + name = "libkscreen-5.24.3.tar.xz"; }; }; libksysguard = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/libksysguard-5.24.0.tar.xz"; - sha256 = "1f0hwk2kzmgpjxmsjfd4g25sr91qyazp4hysyfjdhrrs2ajdkm0b"; - name = "libksysguard-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/libksysguard-5.24.3.tar.xz"; + sha256 = "18piiy24rd5fzvp4cnhgx0d4x4m6fnxx01zm1mx0sh676g7m31hl"; + name = "libksysguard-5.24.3.tar.xz"; }; }; milou = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/milou-5.24.0.tar.xz"; - sha256 = "0sxsisrzfancxwk8lsxhj2b85sgjdb9gzy4l0nax4fp942ygiirs"; - name = "milou-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/milou-5.24.3.tar.xz"; + sha256 = "06xx4afym92hfpvbiqrv7mx30bdm3dhdfn8vki5zxq2k0rv0pmri"; + name = "milou-5.24.3.tar.xz"; }; }; oxygen = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/oxygen-5.24.0.tar.xz"; - sha256 = "0ym74q29c2f32l1xm3kd0s2p7zzbg6a96g7d39fkp5paxicx5fb7"; - name = "oxygen-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/oxygen-5.24.3.tar.xz"; + sha256 = "02j0drc24mf2pfhdgzri5sdcscq1bbj4lhhmhp6bn1v74wybv381"; + name = "oxygen-5.24.3.tar.xz"; }; }; plasma-browser-integration = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/plasma-browser-integration-5.24.0.tar.xz"; - sha256 = "1gp9m7drwxflb0ms0vbvk7qydm1bghhzalc00lpcjh4nrf0bgh33"; - name = "plasma-browser-integration-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-browser-integration-5.24.3.tar.xz"; + sha256 = "1msib3c8arybqbv1vfj1ijx74a34a02hn8gvjy4sf95zcl07mc20"; + name = "plasma-browser-integration-5.24.3.tar.xz"; }; }; plasma-desktop = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/plasma-desktop-5.24.0.tar.xz"; - sha256 = "1brnm6yivjy2piy88ncmclv4g2rxkaiyi923c557dmiipah2bx7z"; - name = "plasma-desktop-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-desktop-5.24.3.tar.xz"; + sha256 = "1lwizprs6nk6nibydwkwmpi9c7c50lvg2k188pb6ddz2sb7pwgjq"; + name = "plasma-desktop-5.24.3.tar.xz"; }; }; plasma-disks = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/plasma-disks-5.24.0.tar.xz"; - sha256 = "1c3pwnyhdmj7grk3gjh4kw5437m5cxhp70qsbhnfsaacps3mdv5d"; - name = "plasma-disks-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-disks-5.24.3.tar.xz"; + sha256 = "0nklcimxyvci3xa6nc5jxbcxds4a14vkkwihgc6xfpc7xcca0wcy"; + name = "plasma-disks-5.24.3.tar.xz"; }; }; plasma-firewall = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/plasma-firewall-5.24.0.tar.xz"; - sha256 = "1jjw414547qksjxg2x5n666iq6qildbn9k9c8hqipmwnlkprpbb1"; - name = "plasma-firewall-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-firewall-5.24.3.tar.xz"; + sha256 = "0r7gh3asnc5lbfsp1jb33lmgcxfpjmlrqlyz41g0wv9aj9x6pwxz"; + name = "plasma-firewall-5.24.3.tar.xz"; }; }; plasma-integration = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/plasma-integration-5.24.0.tar.xz"; - sha256 = "17dqf6j1za3q8hzk7jfc5wc7s4kr28slrkq5iqvzqgyqjqy3z7rv"; - name = "plasma-integration-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-integration-5.24.3.tar.xz"; + sha256 = "031w205icblf50ps7bw7wp5q4azbqpcp4bnig2wh5d1lc8xqzvvs"; + name = "plasma-integration-5.24.3.tar.xz"; }; }; plasma-mobile = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/plasma-mobile-5.24.0.tar.xz"; - sha256 = "0g9mbb8dzqcngc1sq43knwyc3kr81w3vl359wyrgvnr8r1qikv2z"; - name = "plasma-mobile-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-mobile-5.24.3.tar.xz"; + sha256 = "1bwmy7xvd8wmh0snqqjh9jjgawib8ks2g30w48sqxwhplhf3da58"; + name = "plasma-mobile-5.24.3.tar.xz"; }; }; plasma-nano = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/plasma-nano-5.24.0.tar.xz"; - sha256 = "0i8lsp83g2i3c88djkmxawwbwa6lr0w89lzxj73fr6az6vdcrypj"; - name = "plasma-nano-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-nano-5.24.3.tar.xz"; + sha256 = "13jxhfi3c3dhg7zdyfqnsii661h1am0w9dsv82dalqvwr1mw28l5"; + name = "plasma-nano-5.24.3.tar.xz"; }; }; plasma-nm = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/plasma-nm-5.24.0.tar.xz"; - sha256 = "17pmyklmr46qg21w4ql9q5nhfdjw1xmmv1qz7lyhlww7qa6mz1ny"; - name = "plasma-nm-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-nm-5.24.3.tar.xz"; + sha256 = "1z9vzj2mbvqklnjxf2izpx9s6cq097im0kz41fy4c5cjxna4xxic"; + name = "plasma-nm-5.24.3.tar.xz"; }; }; plasma-pa = { - version = "5.24.0"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/plasma-pa-5.24.0.tar.xz"; - sha256 = "19n2plbk455qwgq0lcpb7rj2ck78ck64fpvlldmh53j9vxyzcasl"; - name = "plasma-pa-5.24.0.tar.xz"; - }; - }; - plasma-phone-components = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/plasma-phone-components-5.24.0.tar.xz"; - sha256 = "0g9mbb8dzqcngc1sq43knwyc3kr81w3vl359wyrgvnr8r1qikv2z"; - name = "plasma-phone-components-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-pa-5.24.3.tar.xz"; + sha256 = "0n87rb04izd0ix50iy2dgj6yzzr626vhpfk76lnqr57jz6fbx3z1"; + name = "plasma-pa-5.24.3.tar.xz"; }; }; plasma-sdk = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/plasma-sdk-5.24.0.tar.xz"; - sha256 = "16fn98rv4qaci3b5whzjs6csbbxyrnmnr9gngn5dirdpla8cffld"; - name = "plasma-sdk-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-sdk-5.24.3.tar.xz"; + sha256 = "0g6nypqsbmsp9msixd7p25lk58zismdamkp41f5lx3cbb49x1fpr"; + name = "plasma-sdk-5.24.3.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/plasma-systemmonitor-5.24.0.tar.xz"; - sha256 = "0zkvbgwm2rpyisbx72a75ywy45d2primjjpnmw76x6924j8sp7pd"; - name = "plasma-systemmonitor-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-systemmonitor-5.24.3.tar.xz"; + sha256 = "17a3q1az4d3xpk2ifqsj6sz7r4apxy58kk2r2l14p6s6aszhqk4h"; + name = "plasma-systemmonitor-5.24.3.tar.xz"; }; }; plasma-tests = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/plasma-tests-5.24.0.tar.xz"; - sha256 = "1q95mrrb0p9ah4dg3bhkc9yh2ydasdmyd87jclraybcsfl6fi9kf"; - name = "plasma-tests-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-tests-5.24.3.tar.xz"; + sha256 = "1x5hr465kj3dg6c335lji2lxvp7cbn86181l78qk4l75sj1ss721"; + name = "plasma-tests-5.24.3.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/plasma-thunderbolt-5.24.0.tar.xz"; - sha256 = "1vsb3wf2sgbfbm2wk8kj18qhv4z9l4yzxaf8g30zpz4d1sva7jdc"; - name = "plasma-thunderbolt-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-thunderbolt-5.24.3.tar.xz"; + sha256 = "1px5vfk37ak6hj6q3ipljj2dpazdbgdsga6nbkwcfn31708c7gjj"; + name = "plasma-thunderbolt-5.24.3.tar.xz"; }; }; plasma-vault = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/plasma-vault-5.24.0.tar.xz"; - sha256 = "1vk38iarhsr6rdrmhbcyjziw3dn8yjmgyn4dy2xdr0l4yqpq7qzz"; - name = "plasma-vault-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-vault-5.24.3.tar.xz"; + sha256 = "0f5yhz7qz4bqj7mc7hv7mvh2ji82pp02c901ws5cwwsh23yrhjcd"; + name = "plasma-vault-5.24.3.tar.xz"; }; }; plasma-workspace = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/plasma-workspace-5.24.0.tar.xz"; - sha256 = "0jnksl2i2viw5aaqv38b371z4lxrxah6p1bjp40a1zfa68vr8dz3"; - name = "plasma-workspace-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-workspace-5.24.3.tar.xz"; + sha256 = "1d1a8k75q0rdbbwkx8p1i38hc6xv9kggvfm6973lh3q0pc75qk0h"; + name = "plasma-workspace-5.24.3.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/plasma-workspace-wallpapers-5.24.0.tar.xz"; - sha256 = "0329ks3q32nb9k3dxddlmxccjilgyxx5jplwbpln5b0p4plkn77k"; - name = "plasma-workspace-wallpapers-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-workspace-wallpapers-5.24.3.tar.xz"; + sha256 = "0j1qqjc27grh3k02dgfb657ps11gym28lc9hzcw3qdxkf3djw9fs"; + name = "plasma-workspace-wallpapers-5.24.3.tar.xz"; }; }; plymouth-kcm = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/plymouth-kcm-5.24.0.tar.xz"; - sha256 = "1pcvfrv8vmk43s14209iv8gngi3al9g4za74yz2l79nxscyppzh5"; - name = "plymouth-kcm-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plymouth-kcm-5.24.3.tar.xz"; + sha256 = "196nx8h54bnnrly12zvnwl22ksr9nk2mi6g39k4xmp28agw94jv5"; + name = "plymouth-kcm-5.24.3.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.24.0"; + version = "1-5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/polkit-kde-agent-1-5.24.0.tar.xz"; - sha256 = "1qayxff5hl8qr9p5bsfrq0cz3x1jlwc8f0nx66rkbngphdm7085n"; - name = "polkit-kde-agent-1-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/polkit-kde-agent-1-5.24.3.tar.xz"; + sha256 = "1mbr8xpjvd8w9b5nd6k8fxcnjykzzygwqk19il4wirqyh4n3k3bq"; + name = "polkit-kde-agent-1-5.24.3.tar.xz"; }; }; powerdevil = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/powerdevil-5.24.0.tar.xz"; - sha256 = "06mrahlrqibvgfhcxywh72h6jblqq6sjsxqjzbq7zbq61vgc3jg3"; - name = "powerdevil-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/powerdevil-5.24.3.tar.xz"; + sha256 = "047h4lz8d1kdyakh5x7fr3kpk35r38z39vm7wb974rd9hjz7alj9"; + name = "powerdevil-5.24.3.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/qqc2-breeze-style-5.24.0.tar.xz"; - sha256 = "11kwrqsq5i1y1kvhg75hvax7bz122cjdsvb66f6hvni09yfcgyci"; - name = "qqc2-breeze-style-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/qqc2-breeze-style-5.24.3.tar.xz"; + sha256 = "1y21ldxwlb12kfqzxpyhdw9lkcaf5sfamwhg68r512hy785sg490"; + name = "qqc2-breeze-style-5.24.3.tar.xz"; }; }; sddm-kcm = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/sddm-kcm-5.24.0.tar.xz"; - sha256 = "011b68vca8nnmj9rxlyl5gl3xrrbysmcrx8szyfhha0wl9rgy2hx"; - name = "sddm-kcm-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/sddm-kcm-5.24.3.tar.xz"; + sha256 = "15n6drklwk3lmiaklw1af98qcixml4w83hngy23lwwv2lbnirl6h"; + name = "sddm-kcm-5.24.3.tar.xz"; }; }; systemsettings = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/systemsettings-5.24.0.tar.xz"; - sha256 = "1jx1kllfd5561fq11d90r7m68736rsdlyzb109yq8awdwrl1vkp3"; - name = "systemsettings-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/systemsettings-5.24.3.tar.xz"; + sha256 = "11fmjdh6v0a4gacqshhrk374i07px989p3x70w8438gr6y0n2032"; + name = "systemsettings-5.24.3.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.24.0"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.24.0/xdg-desktop-portal-kde-5.24.0.tar.xz"; - sha256 = "0f5wv4557avzcn7gf2hjqpn2p9r0d16k1iqcijzcfdmnvh2cp69d"; - name = "xdg-desktop-portal-kde-5.24.0.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/xdg-desktop-portal-kde-5.24.3.tar.xz"; + sha256 = "06qdr7j2m9s9l60mk8vspb2173va10zdv6sinhmkhxxp78h857z6"; + name = "xdg-desktop-portal-kde-5.24.3.tar.xz"; }; }; } diff --git a/pkgs/development/compilers/llvm/14/default.nix b/pkgs/development/compilers/llvm/14/default.nix index ce126f7b502ff..93cacafdc5556 100644 --- a/pkgs/development/compilers/llvm/14/default.nix +++ b/pkgs/development/compilers/llvm/14/default.nix @@ -19,7 +19,7 @@ let release_version = "14.0.0"; - candidate = "rc4"; # empty or "rcN" + candidate = ""; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; rev = ""; # When using a Git commit rev-version = ""; # When using a Git commit @@ -30,7 +30,7 @@ let owner = "llvm"; repo = "llvm-project"; rev = if rev != "" then rev else "llvmorg-${version}"; - sha256 = "0xm3hscg6xv48rjdi7sg9ky960af1qyg5k3jyavnaqimlaj9wxgp"; + sha256 = "1ixqzjzq4ad3mv1w44gwcg1shy34c2b3i9ja71vx1wa7l2ms2376"; }; llvm_meta = { diff --git a/pkgs/development/compilers/llvm/14/openmp/default.nix b/pkgs/development/compilers/llvm/14/openmp/default.nix index 2b580a9c169c9..622072b53e180 100644 --- a/pkgs/development/compilers/llvm/14/openmp/default.nix +++ b/pkgs/development/compilers/llvm/14/openmp/default.nix @@ -5,6 +5,7 @@ , runCommand , cmake , llvm +, lit , clang-unwrapped , perl , pkg-config @@ -25,16 +26,27 @@ stdenv.mkDerivation rec { patches = [ ./gnu-install-dirs.patch - ./fix-find-tool.patch + ./run-lit-directly.patch ]; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake perl pkg-config clang-unwrapped ]; + nativeBuildInputs = [ cmake perl pkg-config lit ]; buildInputs = [ llvm ]; + # Unsup:Pass:XFail:Fail + # 26:267:16:8 + doCheck = false; + checkTarget = "check-openmp"; + + preCheck = '' + patchShebangs ../tools/archer/tests/deflake.bash + ''; + cmakeFlags = [ - "-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF" # Building the AMDGCN device RTL currently fails + "-DCLANG_TOOL=${clang-unwrapped}/bin/clang" + "-DOPT_TOOL=${llvm}/bin/opt" + "-DLINK_TOOL=${llvm}/bin/llvm-link" ]; meta = llvm_meta // { @@ -50,6 +62,5 @@ stdenv.mkDerivation rec { # "All of the code is dual licensed under the MIT license and the UIUC # License (a BSD-like license)": license = with lib.licenses; [ mit ncsa ]; - broken = true; # TODO: gnu-install-dirs.patch fails to apply }; } diff --git a/pkgs/development/compilers/llvm/14/openmp/fix-find-tool.patch b/pkgs/development/compilers/llvm/14/openmp/fix-find-tool.patch deleted file mode 100644 index b5d0e7b417757..0000000000000 --- a/pkgs/development/compilers/llvm/14/openmp/fix-find-tool.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/libomptarget/DeviceRTL/CMakeLists.txt b/libomptarget/DeviceRTL/CMakeLists.txt -index 242df638f80d..a4654e96371f 100644 ---- a/libomptarget/DeviceRTL/CMakeLists.txt -+++ b/libomptarget/DeviceRTL/CMakeLists.txt -@@ -25,16 +25,16 @@ endif() - - if (LLVM_DIR) - # Builds that use pre-installed LLVM have LLVM_DIR set. -- find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) -+ find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) - find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} -- NO_DEFAULT_PATH) -- find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) -+ REQUIRED) -+ find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) - libomptarget_say("Building DeviceRTL. Using clang: ${CLANG_TOOL}") - elseif (LLVM_TOOL_CLANG_BUILD AND NOT CMAKE_CROSSCOMPILING AND NOT OPENMP_STANDALONE_BUILD) - # LLVM in-tree builds may use CMake target names to discover the tools. -- set(CLANG_TOOL $<TARGET_FILE:clang>) -- set(LINK_TOOL $<TARGET_FILE:llvm-link>) -- set(OPT_TOOL $<TARGET_FILE:opt>) -+ set(CLANG_TOOL $<TARGET_FILE:clang> REQUIRED) -+ set(LINK_TOOL $<TARGET_FILE:llvm-link> REQUIRED) -+ set(OPT_TOOL $<TARGET_FILE:opt> REQUIRED) - libomptarget_say("Building DeviceRTL. Using clang from in-tree build") - else() - libomptarget_say("Not building DeviceRTL. No appropriate clang found") -diff --git a/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt b/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt -index 3f4c02671aeb..be9f4677d7b5 100644 ---- a/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt -+++ b/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt -@@ -38,16 +38,16 @@ endif() - - if (LLVM_DIR) - # Builds that use pre-installed LLVM have LLVM_DIR set. -- find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) -+ find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) - find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} -- NO_DEFAULT_PATH) -- find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) -+ REQUIRED) -+ find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) - libomptarget_say("Building AMDGCN device RTL. Using clang: ${CLANG_TOOL}") - elseif (LLVM_TOOL_CLANG_BUILD AND NOT CMAKE_CROSSCOMPILING AND NOT OPENMP_STANDALONE_BUILD) - # LLVM in-tree builds may use CMake target names to discover the tools. -- set(CLANG_TOOL $<TARGET_FILE:clang>) -- set(LINK_TOOL $<TARGET_FILE:llvm-link>) -- set(OPT_TOOL $<TARGET_FILE:opt>) -+ set(CLANG_TOOL $<TARGET_FILE:clang> REQUIRED) -+ set(LINK_TOOL $<TARGET_FILE:llvm-link> REQUIRED) -+ set(OPT_TOOL $<TARGET_FILE:opt> REQUIRED) - libomptarget_say("Building AMDGCN device RTL. Using clang from in-tree build") - else() - libomptarget_say("Not building AMDGCN device RTL. No appropriate clang found") diff --git a/pkgs/development/compilers/llvm/14/openmp/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/14/openmp/gnu-install-dirs.patch index 352a469231158..e85fde46ca3fc 100644 --- a/pkgs/development/compilers/llvm/14/openmp/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/14/openmp/gnu-install-dirs.patch @@ -1,17 +1,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7f11a05f5622..fb90f8f6a49b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -8,6 +8,8 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S - set(OPENMP_STANDALONE_BUILD TRUE) - project(openmp C CXX) - -+ include(GNUInstallDirs) -+ - # CMAKE_BUILD_TYPE was not set, default to Release. - if (NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE Release) -@@ -19,7 +21,7 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S +@@ -24,7 +24,7 @@ if (OPENMP_STANDALONE_BUILD) set(OPENMP_LIBDIR_SUFFIX "" CACHE STRING "Suffix of lib installation directory, e.g. 64 => lib64") # Do not use OPENMP_LIBDIR_SUFFIX directly, use OPENMP_INSTALL_LIBDIR. @@ -20,7 +10,7 @@ index 7f11a05f5622..fb90f8f6a49b 100644 # Group test settings. set(OPENMP_TEST_C_COMPILER ${CMAKE_C_COMPILER} CACHE STRING -@@ -30,7 +32,7 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S +@@ -35,7 +35,7 @@ if (OPENMP_STANDALONE_BUILD) else() set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR}) # If building in tree, we honor the same install suffix LLVM uses. @@ -29,10 +19,10 @@ index 7f11a05f5622..fb90f8f6a49b 100644 if (NOT MSVC) set(OPENMP_TEST_C_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang) -index 0e1ce2afd154..8b3810f83713 100644 +diff --git a/libomptarget/plugins/amdgpu/CMakeLists.txt b/libomptarget/plugins/amdgpu/CMakeLists.txt --- a/libomptarget/plugins/amdgpu/CMakeLists.txt +++ b/libomptarget/plugins/amdgpu/CMakeLists.txt -@@ -80,7 +80,7 @@ add_library(omptarget.rtl.amdgpu SHARED +@@ -74,7 +74,7 @@ add_library(omptarget.rtl.amdgpu SHARED # Install plugin under the lib destination folder. # When we build for debug, OPENMP_LIBDIR_SUFFIX get set to -debug @@ -42,7 +32,6 @@ index 0e1ce2afd154..8b3810f83713 100644 if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") diff --git a/libomptarget/plugins/ve/CMakeLists.txt b/libomptarget/plugins/ve/CMakeLists.txt -index 16ce0891ca23..db30ee9c769f 100644 --- a/libomptarget/plugins/ve/CMakeLists.txt +++ b/libomptarget/plugins/ve/CMakeLists.txt @@ -32,7 +32,7 @@ if(${LIBOMPTARGET_DEP_VEO_FOUND}) @@ -54,36 +43,3 @@ index 16ce0891ca23..db30ee9c769f 100644 target_link_libraries( "omptarget.rtl.${tmachine_libname}" -diff --git a/runtime/src/CMakeLists.txt b/runtime/src/CMakeLists.txt -index e4f4e6e1e73f..1164b3b22b0e 100644 ---- a/runtime/src/CMakeLists.txt -+++ b/runtime/src/CMakeLists.txt -@@ -346,13 +346,13 @@ add_dependencies(libomp-micro-tests libomp-test-deps) - # We want to install libomp in DESTDIR/CMAKE_INSTALL_PREFIX/lib - # We want to install headers in DESTDIR/CMAKE_INSTALL_PREFIX/include - if(${OPENMP_STANDALONE_BUILD}) -- set(LIBOMP_HEADERS_INSTALL_PATH include) -+ set(LIBOMP_HEADERS_INSTALL_PATH "${CMAKE_INSTALL_INCLUDEDIR}") - else() - string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION ${PACKAGE_VERSION}) - set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include") - endif() - if(WIN32) -- install(TARGETS omp RUNTIME DESTINATION bin) -+ install(TARGETS omp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - install(TARGETS ${LIBOMP_IMP_LIB_TARGET} ARCHIVE DESTINATION "${OPENMP_INSTALL_LIBDIR}") - # Create aliases (regular copies) of the library for backwards compatibility - set(LIBOMP_ALIASES "libiomp5md") -diff --git a/tools/multiplex/CMakeLists.txt b/tools/multiplex/CMakeLists.txt -index 64317c112176..4002784da736 100644 ---- a/tools/multiplex/CMakeLists.txt -+++ b/tools/multiplex/CMakeLists.txt -@@ -4,7 +4,7 @@ if(LIBOMP_OMPT_SUPPORT) - add_library(ompt-multiplex INTERFACE) - target_include_directories(ompt-multiplex INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) - -- install(FILES ompt-multiplex.h DESTINATION include) -+ install(FILES ompt-multiplex.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - - add_subdirectory(tests) - endif() diff --git a/pkgs/development/compilers/llvm/14/openmp/run-lit-directly.patch b/pkgs/development/compilers/llvm/14/openmp/run-lit-directly.patch new file mode 100644 index 0000000000000..1e952fdc36a8f --- /dev/null +++ b/pkgs/development/compilers/llvm/14/openmp/run-lit-directly.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/OpenMPTesting.cmake b/cmake/OpenMPTesting.cmake +--- a/cmake/OpenMPTesting.cmake ++++ b/cmake/OpenMPTesting.cmake +@@ -185,7 +185,7 @@ function(add_openmp_testsuite target comment) + if (${OPENMP_STANDALONE_BUILD}) + set(LIT_ARGS ${OPENMP_LIT_ARGS} ${ARG_ARGS}) + add_custom_target(${target} +- COMMAND ${PYTHON_EXECUTABLE} ${OPENMP_LLVM_LIT_EXECUTABLE} ${LIT_ARGS} ${ARG_UNPARSED_ARGUMENTS} ++ COMMAND ${OPENMP_LLVM_LIT_EXECUTABLE} ${LIT_ARGS} ${ARG_UNPARSED_ARGUMENTS} + COMMENT ${comment} + DEPENDS ${ARG_DEPENDS} + USES_TERMINAL diff --git a/pkgs/development/compilers/ocaml/4.14.nix b/pkgs/development/compilers/ocaml/4.14.nix index 96e1c13d285bb..558a1491ca7f0 100644 --- a/pkgs/development/compilers/ocaml/4.14.nix +++ b/pkgs/development/compilers/ocaml/4.14.nix @@ -1,9 +1,9 @@ import ./generic.nix { major_version = "4"; minor_version = "14"; - patch_version = "0-beta1"; + patch_version = "0-rc2"; src = fetchTarball { - url = "https://caml.inria.fr/pub/distrib/ocaml-4.14/ocaml-4.14.0~beta1.tar.xz"; - sha256 = "0jiz20hb58jbbk8j38agx11ra4hg0v3prmzc5a9j70lm09mnzfcd"; + url = "https://caml.inria.fr/pub/distrib/ocaml-4.14/ocaml-4.14.0~rc2.tar.xz"; + sha256 = "sha256:0ch8nyfk2mzwhmlxb434cyamp7n14zxhwsq1h8033g629kw50kb0"; }; } diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 8d68c2a6010ed..dae405ff3b2f4 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkg-config, lndir, bash, cpio, file, which, unzip, zip +{ stdenv, lib, fetchFromGitHub, pkg-config, lndir, bash, cpio, file, which, unzip, zip , cups, freetype, alsa-lib, cacert, perl, liberation_ttf, fontconfig, zlib , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr , libjpeg, giflib @@ -19,68 +19,19 @@ let aarch64-linux = "aarch64"; }.${stdenv.system} or (throw "Unsupported platform"); - update = "272"; - build = if stdenv.isAarch64 then "b10" else "b10"; - baseurl = if stdenv.isAarch64 then "https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah" - else "https://hg.openjdk.java.net/jdk8u/jdk8u"; - repover = lib.optionalString stdenv.isAarch64 "aarch64-shenandoah-" - + "jdk8u${update}-${build}"; - - jdk8 = fetchurl { - name = "jdk8-${repover}.tar.gz"; - url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "db98897d6fddce85996a9b0daf4352abce4578be0b51eada41702ee1469dd415" - else "8f0e8324d3500432e8ed642b4cc7dff90a617dbb2a18a94c07c1020d32f93b7a"; - }; - langtools = fetchurl { - name = "langtools-${repover}.tar.gz"; - url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "6544c1cc455844bbbb3d2914ffc716b1cee7f19e6aa223764d41a7cddc41322c" - else "632417b0b067c929eda6958341352e29c5810056a5fec138641eb3503f9635b7"; - }; - hotspot = fetchurl { - name = "hotspot-${repover}.tar.gz"; - url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "37abb89e66641607dc6f372946bfc6bd413f23fec0b9c3baf75f41ce517e21d8" - else "2142f3b769800a955613b51ffe192551bab1db95b0c219900cf34febc6f20245"; - }; - corba = fetchurl { - name = "corba-${repover}.tar.gz"; - url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "5da82f7b4aceff32e02d2f559033e3b62b9509d79f1a6891af871502e1d125b1" - else "320098d64c843c1ff2ae62579817f9fb4a81772bc0313a543ce68976ad7a6d98"; - }; - jdk = fetchurl { - name = "jdk-${repover}.tar.gz"; - url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "ee613296d823605dcd1a0fe2f89b4c7393bdb8ae5f2659f48f5cbc0012bb1a47" - else "957c24fc58ac723c8cd808ab60c77d7853710148944c8b9a59f470c4c809e1a0"; - }; - jaxws = fetchurl { - name = "jaxws-${repover}.tar.gz"; - url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "7c426b85f0d378125fa46e6d1b25ddc27ad29d93514d38c5935c84fc540b26ce" - else "4efb0ee143dfe86c8ee06db2429fb81a0c8c65af9ea8fc18daa05148c8a1162f"; - }; - jaxp = fetchurl { - name = "jaxp-${repover}.tar.gz"; - url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "928e363877afa7e0ad0c350bb18be6ab056b23708c0624a0bd7f01c4106c2a14" - else "25a651c670d5b036042f7244617a3eb11fec80c07745c1c8181a1cdebeda3d8e"; - }; - nashorn = fetchurl { - name = "nashorn-${repover}.tar.gz"; - url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "f060e08c5924457d4f5047c02ad6a987bdbdcd1cea53d2208322073ba4f398c3" - else "a28b41d86f0c87ceacd2b686dd31c9bf391d851b1b5187a49ef5e565fc2cbc84"; - }; - openjdk8 = stdenv.mkDerivation { + update = "322"; + build = "ga"; + + openjdk8 = stdenv.mkDerivation rec { pname = "openjdk" + lib.optionalString headless "-headless"; version = "8u${update}-${build}"; - srcs = [ jdk8 langtools hotspot corba jdk jaxws jaxp nashorn ]; - sourceRoot = "."; - + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jdk8u"; + rev = "jdk${version}"; + sha256 = "sha256-e39Yv+NDQG7z6fGmpKEnkKd5MoHZ50SXlq/Q7lzWcDA="; + }; outputs = [ "out" "jre" ]; nativeBuildInputs = [ pkg-config lndir unzip ]; @@ -92,16 +43,6 @@ let gtk2 gnome_vfs GConf glib ]; - # move the seven other source dirs under the main jdk8u directory, - # with version suffixes removed, as the remainder of the build will expect - prePatch = '' - mainDir=$(find . -maxdepth 1 -name jdk8u\*); - find . -maxdepth 1 -name \*jdk\* -not -name jdk8u\* | awk -F- '{print $1}' | while read p; do - mv $p-* $mainDir/$p - done - cd $mainDir - ''; - patches = [ ./fix-java-home-jdk8.patch ./read-truststore-from-env-jdk8.patch diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix index 80aaf506139bb..a5dee94d045dc 100644 --- a/pkgs/development/coq-modules/VST/default.nix +++ b/pkgs/development/coq-modules/VST/default.nix @@ -37,6 +37,7 @@ mkCoqDerivation { preConfigure = '' patchShebangs util substituteInPlace Makefile \ + --replace 'COQVERSION= ' 'COQVERSION= 8.15.1 or-else '\ --replace 'FLOYD_FILES=' 'FLOYD_FILES= ${toString extra_floyd_files}' ''; diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 197f1a96fc4a2..092bb58d174fa 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -119,6 +119,11 @@ compcert.overrideAttrs (o: url = "https://github.com/AbsInt/CompCert/commit/a882f78c069f7337dd9f4abff117d4df98ef38a6.patch"; sha256 = "sha256:16i87s608fj9ni7cvd5wrd7gicqniad7w78wi26pxdy0pacl7bjg"; }) + # Support for Coq 8.15.1 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/10a976994d7fd30d143354c289ae735d210ccc09.patch"; + sha256 = "sha256:0bg58gpkgxlmxzp6sg0dvybrfk0pxnm7qd6vxlrbsbm2w6wk03jv"; + }) ]; } ] []; diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 1f1fa1dfbc450..3332c9d5a420c 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.0.16"; - sha256 = "sha256-9J+Bge4pRjoNI6DGWWnpLVj+6KxWTfkXz/WOSNZeGEk="; + version = "8.0.17"; + sha256 = "52811ee2dde71660ca32737a4ac696c24591eb22e846dd8e09ee77122660283f"; }); in diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 8d87a5e7a2252..aa98204b9979c 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.3"; - sha256 = "sha256-NUxOLFBgRuyoEtH8JSaISi9UtePSDvDt6RmmnrIy0L4="; + version = "8.1.4"; + sha256 = "b3f688cb69758523838b8e7f509aaef0152133d9b84a84a0b7cf68eeafc1df76"; }); in diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index aaa7c9e048bc5..869f38622418e 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "5.1.10"; + version = "5.1.12"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-BOJ/NUJnoTeDuURH8Lx6S4RlNZPfsQX4blJkpUdraBg="; + sha256 = "sha256-tmZ1XC8z4NUww58pvvqxZifOxFNXSrEBMY2biCJ55XM="; }; # Do not build static libraries diff --git a/pkgs/development/libraries/cglm/default.nix b/pkgs/development/libraries/cglm/default.nix index dfc9f81edb621..50a9bf62c54bf 100644 --- a/pkgs/development/libraries/cglm/default.nix +++ b/pkgs/development/libraries/cglm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cglm"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "recp"; repo = "cglm"; rev = "v${version}"; - sha256 = "sha256-AJK1M6iyYdL61pZQhbUWzf+YOUE5FEvUyKqxbQqc7H0="; + sha256 = "sha256-PJHDZXc0DD/d+K/4uouv5F8gAf1sE5e3jLkGILPMpnI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index 9c97faaa45cbc..b277a52a65837 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchurl +, fetchpatch , pkg-config , meson , ninja @@ -34,6 +35,16 @@ stdenv.mkDerivation rec { sha256 = "CQn8SeqK1IMtJ1ZP8v0dxmZpbioHxzlBxIgp5gVy2gE="; }; + patches = [ + # Pull upstream fix for meson-0.60: + # https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/81 + (fetchpatch { + name = "meson-0.60.patch"; + url = "https://gitlab.gnome.org/GNOME/gcr/-/commit/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch"; + sha256 = "15gwxkcm5q5p87p5lrqwgykpzx5gmk179xd3481yak93yhbvy165"; + }) + ]; + nativeBuildInputs = [ pkg-config meson diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix index bedddda3ba4d2..f5ab518ce6213 100644 --- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix @@ -1,12 +1,13 @@ { - mkDerivation, propagate, - extra-cmake-modules, kcoreaddons, polkit-qt, qttools + lib, mkDerivation, propagate, + extra-cmake-modules, kcoreaddons, qttools, + enablePolkit ? true, polkit-qt }: mkDerivation { pname = "kauth"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ polkit-qt qttools ]; + buildInputs = lib.optional enablePolkit polkit-qt ++ [ qttools ]; propagatedBuildInputs = [ kcoreaddons ]; patches = [ ./cmake-install-paths.patch diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 19f6589ec9505..704dcd2c73d07 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -40,6 +40,5 @@ stdenv.mkDerivation rec { license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; - repositories.git = "git://github.com/libass/libass.git"; }; } diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index e03416a221c19..039d3af37605f 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Allows you (with the right hardware) to control your device with your TV remote control using existing HDMI cabling"; homepage = "http://libcec.pulse-eight.com"; - repositories.git = "https://github.com/Pulse-Eight/libcec.git"; license = lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.titanous ]; diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix index cba1d0ba4c594..d9594c90b624a 100644 --- a/pkgs/development/libraries/libcec/platform.nix +++ b/pkgs/development/libraries/libcec/platform.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Platform library for libcec and Kodi addons"; homepage = "https://github.com/Pulse-Eight/platform"; - repositories.git = "https://github.com/Pulse-Eight/platform.git"; license = lib.licenses.gpl2Plus; platforms = platforms.all; maintainers = [ maintainers.titanous ]; diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/pkgs/development/libraries/libgcrypt/1.5.nix index b30aa89b14853..918ed20efaaf6 100644 --- a/pkgs/development/libraries/libgcrypt/1.5.nix +++ b/pkgs/development/libraries/libgcrypt/1.5.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { description = "General-pupose cryptographic library"; license = licenses.lgpl2Plus; platforms = platforms.all; - repositories.git = "git://git.gnupg.org/libgcrypt.git"; knownVulnerabilities = [ "CVE-2014-3591" "CVE-2015-0837" diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 9195019b05593..eb4e8e9486296 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -78,6 +78,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ vrthra ]; - repositories.git = "git://git.gnupg.org/libgcrypt.git"; }; } diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index ec2b614ee9caf..181829156c99c 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -40,6 +40,8 @@ in stdenv.mkDerivation (rec { '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isMusl) '' ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.arm-unknown-linux-musleabihf.h ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-musleabihf.h + '' + lib.optionalString (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isMusl) '' + ln -s lock-obj-pub.aarch64-unknown-linux-gnu.h src/syscfg/lock-obj-pub.linux-musl.h ''; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index e47bb070a36ea..a84b617e4c0e9 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { included. ''; - repositories.git = "git://git.savannah.gnu.org/libidn.git"; license = lib.licenses.lgpl2Plus; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ lsix ]; diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index 2b5434e723aa7..d8294f56adc35 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { detailed information. ''; - repositories.git = "https://gitlab.com/jas/libidn2"; license = with lib.licenses; [ lgpl3Plus gpl2Plus gpl3Plus ]; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ fpletz ]; diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 6b28175a9b62b..0f0fec46a2771 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/lastfm/liblastfm"; - repositories.git = "git://github.com/lastfm/liblastfm.git"; description = "Official LastFM library"; platforms = platforms.unix; maintainers = [ ]; diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix index 7ca9ec5acb6d9..3f2f02987fbb6 100644 --- a/pkgs/development/libraries/liboauth/default.nix +++ b/pkgs/development/libraries/liboauth/default.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; description = "C library implementing the OAuth secure authentication protocol"; homepage = "http://liboauth.sourceforge.net/"; - repositories.git = "https://github.com/x42/liboauth.git"; license = licenses.mit; }; diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index 53699ab7eacd3..bd8a521544c29 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.cypherpunks.ca/otr/"; - repositories.git = "git://git.code.sf.net/p/otr/libotr"; license = licenses.lgpl21; description = "Library for Off-The-Record Messaging"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix index 2fc1c7b7360d4..5cbc9b8f09b7b 100644 --- a/pkgs/development/libraries/libqb/default.nix +++ b/pkgs/development/libraries/libqb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libqb"; - version = "2.0.5"; + version = "2.0.6"; src = fetchFromGitHub { owner = "ClusterLabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G49JBEUkO4ySAamvI7xN6ct1SvN4afcOmdrzpDL90FE="; + sha256 = "sha256-vt9FmIRojX3INOn3CXAjkswVFD8Th4sRIz3RR4GJHFQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 10cc499d09d68..5d97a263b8800 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -53,7 +53,7 @@ in { }; libtoxcore_0_2 = generic { - version = "0.2.13"; - sha256 = "0a1cp00bnxl3q4l74yqp4aa6fg9slz4rg4lfzkl3khvmm6nzckds"; + version = "0.2.17"; + sha256 = "sha256-SOI6QKOSt/EK9JDrSaV6CrD5sx8aYb5ZL3StYq8u/Dg="; }; } diff --git a/pkgs/development/libraries/libusb-compat/0.1.nix b/pkgs/development/libraries/libusb-compat/0.1.nix index b23123f56eaa3..f977d72e72420 100644 --- a/pkgs/development/libraries/libusb-compat/0.1.nix +++ b/pkgs/development/libraries/libusb-compat/0.1.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://libusb.info/"; - repositories.git = "https://github.com/libusb/libusb-compat-0.1"; description = "cross-platform user-mode USB device library"; longDescription = '' libusb is a cross-platform user-mode library that provides access to USB devices. diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index ba01f820fd805..24b147d142d74 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://libusb.info/"; - repositories.git = "https://github.com/libusb/libusb"; description = "cross-platform user-mode USB device library"; longDescription = '' libusb is a cross-platform user-mode library that provides access to USB devices. diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 9e39c2fd2a659..cda7c091908d3 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -331,7 +331,6 @@ stdenv.mkDerivation rec { meta = { homepage = "https://libvirt.org/"; - repositories.git = "git://libvirt.org/libvirt.git"; description = '' A toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes) diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix index 9722210b9d10f..95acc77922eee 100644 --- a/pkgs/development/libraries/pcg-c/default.nix +++ b/pkgs/development/libraries/pcg-c/default.nix @@ -33,7 +33,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.unix; maintainers = [ maintainers.linus ]; - repositories.git = "git://github.com/imneme/pcg-c.git"; broken = stdenv.isi686; # https://github.com/imneme/pcg-c/issues/11 }; } diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix index 8983f09f2d37d..7b9759f553bc3 100644 --- a/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/pkgs/development/libraries/pipewire/wireplumber.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , nix-update-script , # base build deps meson @@ -27,7 +26,7 @@ let in stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.4.8"; + version = "0.4.9"; outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc"; @@ -36,19 +35,9 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - sha256 = "sha256-xwfggrjKHh5mZdvH6dKqQo6o1ltxuYdjoGYaWl31C/Y="; + sha256 = "sha256-U92ozuEUFJA416qKnalVowJuBjLRdORHfhmznGf1IFU="; }; - patches = [ - # backport a patch to fix hangs in some applications - # ref: https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/213 - # FIXME: drop this in 0.4.9 - (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/afbc0ce57aac7aee8dc1651de4620f15c73dbace.patch"; - sha256 = "sha256-8ycFnrzDq7QHgjwJ/772OTMsSsN3m7gjbdvTmlMJ+mU="; - }) - ]; - nativeBuildInputs = [ meson pkg-config diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index 5f136a5e6b646..666d013adebc9 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://taglib.org/"; - repositories.git = "git://github.com/taglib/taglib.git"; description = "A library for reading and editing audio file metadata"; longDescription = '' TagLib is a library for reading and editing the meta-data of several diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix index b84b771312fd9..71deaaca3853f 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -17,17 +17,22 @@ , compat28 ? false , compat30 ? true , unicode ? true -, withGtk2 ? true +, withGtk2 ? (!stdenv.isDarwin) , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, withWebKit ? false, webkitgtk +, withWebKit ? stdenv.isDarwin +, webkitgtk , setfile , AGL , Carbon , Cocoa , Kernel , QTKit +, AVFoundation +, AVKit +, WebKit }: +assert withWebKit -> stdenv.isDarwin; assert withGtk2 -> (!withWebKit); let @@ -55,6 +60,8 @@ stdenv.mkDerivation rec { buildInputs = [ gst_all_1.gst-plugins-base gst_all_1.gstreamer + ] + ++ lib.optionals (!stdenv.isDarwin) [ gtk libSM libXinerama @@ -66,19 +73,25 @@ stdenv.mkDerivation rec { gnome2.GConf ] ++ lib.optional withMesa libGLU - ++ lib.optional withWebKit webkitgtk + ++ lib.optional (withWebKit && !stdenv.isDarwin) webkitgtk + ++ lib.optional (withWebKit && stdenv.isDarwin) WebKit ++ lib.optionals stdenv.isDarwin [ + setfile Carbon Cocoa Kernel QTKit - setfile + AVFoundation + AVKit + WebKit ]; propagatedBuildInputs = lib.optional stdenv.isDarwin AGL; configureFlags = [ "--disable-precomp-headers" + # This is the default option, but be explicit + "--disable-monolithic" "--enable-mediactrl" (if compat28 then "--enable-compat28" else "--disable-compat28") (if compat30 then "--enable-compat30" else "--disable-compat30") @@ -86,10 +99,8 @@ stdenv.mkDerivation rec { ++ lib.optional unicode "--enable-unicode" ++ lib.optional withMesa "--with-opengl" ++ lib.optionals stdenv.isDarwin [ - # allow building on 64-bit - "--enable-universal-binaries" - "--with-cocoa" - "--with-macosx-version-min=10.7" + "--with-osx_cocoa" + "--with-libiconv" ] ++ lib.optionals withWebKit [ "--enable-webview" @@ -137,7 +148,6 @@ stdenv.mkDerivation rec { license = licenses.wxWindows; maintainers = with maintainers; [ AndersonTorres tfmoraes ]; platforms = platforms.unix; - badPlatforms = platforms.darwin; # ofBorg is failing, don't know if internal }; passthru = { diff --git a/pkgs/development/ocaml-modules/biniou/1.0.nix b/pkgs/development/ocaml-modules/biniou/1.0.nix index 5a2e2ea9a7fa1..ec81e5b8db912 100644 --- a/pkgs/development/ocaml-modules/biniou/1.0.nix +++ b/pkgs/development/ocaml-modules/biniou/1.0.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; preBuild = '' - mkdir $out/bin + mkdir -p $out/bin ''; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/csv/1.5.nix b/pkgs/development/ocaml-modules/csv/1.5.nix index cd298fb39a9f2..ef4ae4484d833 100644 --- a/pkgs/development/ocaml-modules/csv/1.5.nix +++ b/pkgs/development/ocaml-modules/csv/1.5.nix @@ -22,13 +22,17 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = "ocaml setup.ml -test"; - installPhase = "ocaml setup.ml -install"; + installPhase = '' + runHook preInstall + ocaml setup.ml -install + runHook postInstall + ''; meta = with lib; { description = "A pure OCaml library to read and write CSV files"; homepage = "https://github.com/Chris00/ocaml-csv"; license = licenses.lgpl21; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms or [ ]; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/magick/default.nix b/pkgs/development/ocaml-modules/magick/default.nix deleted file mode 100644 index 87c43fb686935..0000000000000 --- a/pkgs/development/ocaml-modules/magick/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, lib, fetchurl, which, pkg-config, ocaml, findlib, imagemagick }: - -if lib.versionAtLeast ocaml.version "4.06" -then throw "magick is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - pname = "ocaml-magick"; - version = "0.34"; - - src = fetchurl { - url = "http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/ImageMagick/OCaml-ImageMagick-${version}.tgz"; - sha256 = "0gn9l2qdr8gby2x8c2mb59x1kipb2plr45rbq6ymcxyi0wmzfh3q"; - }; - - nativeBuildInputs = [ which pkg-config ocaml findlib ]; - buildInputs = [ imagemagick ]; - - strictDeps = true; - - createFindlibDestdir = true; - - preConfigure = "substituteInPlace Makefile --replace gcc $CC"; - - installTargets = [ "find_install" ]; - - meta = { - homepage = "http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/"; - description = "ImageMagick Binding for OCaml"; - license = lib.licenses.mit; - platforms = imagemagick.meta.platforms; - maintainers = with lib.maintainers; [ vbgl ]; - }; -} diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index b4410981afbdc..f2336cf88bbb4 100644 --- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -1,5 +1,8 @@ { lib, stdenv, fetchFromGitLab, libvirt, autoreconfHook, pkg-config, ocaml, findlib, perl }: +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02") + "libvirt is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation rec { pname = "ocaml-libvirt"; version = "0.6.1.5"; diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 5a51661b8e1a5..860362971b23e 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.1.0"; + version = "0.1.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = version; - hash = "sha256-QruXxC/+61P2Mi0UILUIKp4S3wS1+E+WmzBbiUqlVe4="; + hash = "sha256-8OpC/w83us85NWpRXXLsWsLNiPG3v+8BHAToADdLaP4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 7cfe51e29c877..0083362c753b5 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "2.1.2"; + version = "2.1.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-GK/CqmMm67VmvzlhMV6ow+40m0DYUpXCFkP+9NgR/e4="; + hash = "sha256-2m5dD+gGDL5LnY7QbDYiGdu4GYu0C49WU29GZY2bnBo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index 94a0044d3ac47..c6886dc8bed7b 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "3.20.0"; + version = "3.22.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WIH2lMPehrqkXCh+JbEI5nf99nt61OwLhP/pF6BbsnQ="; + sha256 = "sha256-05yJbF6eXz+vJx+plY5gqzRRYL2SjDnF7gSfX6WIS4E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix index d71539efc2320..78605fd429c2c 100644 --- a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-applicationinsights"; - version = "2.1.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "68deed8ee884dd0b9631804e8b9c65fcd94e8e01c7218beae96a9fe557d7a0d7"; + sha256 = "sha256-K46J0WqQt4vwr1CE4yjxKUT/Atds5BLs0k8EjOA4yzA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 37a30147aa5fd..761472b631fff 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { - version = "20.1.0"; + version = "21.0.0"; pname = "azure-mgmt-resource"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "4fbb2158320e0bdd367882642f266a6dfb3b4b8610792b3afbbca39089f212d7"; + sha256 = "sha256-y9J/UhxwtA/YO/Y88XsStbwD5ecNwrbnpxtevYuQDQM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index 4b5ebc912b24b..f59e6418fe91b 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "bidict"; - version = "0.21.4"; + version = "0.22.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QshP++b43omK9gc7S+nqfM7c1400dKqETFTknVoHn28="; + sha256 = "sha256-XIJrPhXpfMbmFd4pV1aEfCgqebecVDDTv8kJsayfW9g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index e8e9962f9b4fd..be41b2acb87c1 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "blis"; - version = "0.7.6"; + version = "0.7.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/pexD2ihx7VMDlS+rahOGPTvto3UDJBvuHSPURR0PsY="; + sha256 = "sha256-XUqB+UONt6GayOZK1BMx9lplnqjzuxiJqcIIjP2f4QQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/brotlicffi/default.nix b/pkgs/development/python-modules/brotlicffi/default.nix index f78598b751a65..5e0600d343a84 100644 --- a/pkgs/development/python-modules/brotlicffi/default.nix +++ b/pkgs/development/python-modules/brotlicffi/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { export USE_SHARED_BROTLI=1 ''; - # Test data is not available, only when using libbortli git checkout + # Test data is not available, only when using libbrotli git checkout doCheck = false; pythonImportsCheck = [ "brotlicffi" ]; diff --git a/pkgs/development/python-modules/coqui-trainer/default.nix b/pkgs/development/python-modules/coqui-trainer/default.nix index de04e444e83a8..3c447db0a0e10 100644 --- a/pkgs/development/python-modules/coqui-trainer/default.nix +++ b/pkgs/development/python-modules/coqui-trainer/default.nix @@ -1,15 +1,16 @@ { lib , buildPythonPackage +, fetchpatch , fetchFromGitHub +, pythonAtLeast , coqpit , fsspec -, pytorch +, pytorch-bin , pytestCheckHook , soundfile -, tensorboardx -, torchvision +, torchvision-bin }: let @@ -20,6 +21,8 @@ buildPythonPackage { inherit pname version; format = "pyproject"; + disabled = pythonAtLeast "3.10"; # https://github.com/coqui-ai/Trainer/issues/22 + src = fetchFromGitHub { owner = "coqui-ai"; repo = "Trainer"; @@ -27,12 +30,18 @@ buildPythonPackage { hash = "sha256-NsgCh+N2qWmRkTOjXqisVCP5aInH2zcNz6lsnIfVLiY="; }; + patches = [ + (fetchpatch { + url = "https://github.com/coqui-ai/Trainer/commit/07b447abf3290c8f2e5e723687b8a480b7382265.patch"; + sha256 = "0v1hl784d9rghkblcfwgzp0gg9d6r5r0yv2kapzdz2qymiajy7y2"; + }) + ]; + propagatedBuildInputs = [ coqpit fsspec - pytorch + pytorch-bin soundfile - tensorboardx ]; # only one test and that requires training data from the internet @@ -40,7 +49,7 @@ buildPythonPackage { checkInputs = [ pytestCheckHook - torchvision + torchvision-bin ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 481f4c58b3ffc..f2a0d531a0a77 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.60.2"; + version = "0.61.1"; disabled = pythonOlder "3.6"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = version; - sha256 = "sha256-GehtjukmSVHffAnDeDwjopgnuycD1CLQRHzLtO1iLsE="; + sha256 = "sha256-HVzMyF4ujYK12UQ25il/XROPo+iBldsMxOTx+duoc5o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 1a3f2a0e642ef..86149cbd865a1 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "evdev"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "8782740eb1a86b187334c07feb5127d3faa0b236e113206dfe3ae8f77fb1aaf1"; + sha256 = "sha256-WzOxdPfIRXbn3WBx5Di/WtIn2pXv1DVqOf5Mg1VBL+Y="; }; buildInputs = [ linuxHeaders ]; diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 3127ac0dcdbf6..5860a959afcd8 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -3,7 +3,6 @@ , async_generator , buildPythonPackage , fetchPypi -, fetchpatch , hypothesis , lupa , pytest-asyncio @@ -17,29 +16,16 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "1.7.0"; - + version = "1.7.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yb0S5DAzbL0+GJ+uDpHrmZl7k+dtv91u1n+jUtxoTHE="; + hash = "sha256-fCxLobQuCnUzfFS3d78GcQVrRWllDj/5J+S5s4WvyOw="; }; - patches = [ - (fetchpatch { - # redis 4.1.0 compatibility - # https://github.com/jamesls/fakeredis/pull/324 - url = "https://github.com/jamesls/fakeredis/commit/8ef8dc6dacc9baf571d66a25ffbf0fadd7c70f78.patch"; - sha256 = "sha256:03xlqmwq8nkzisrjk7y51j2jd6qdin8nbj5n9hc4wjabbvlgx4qr"; - excludes = [ - "setup.cfg" - ]; - }) - ]; - propagatedBuildInputs = [ aioredis lupa @@ -60,11 +46,6 @@ buildPythonPackage rec { "fakeredis" ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "redis<4.1.0" "redis" - ''; - meta = with lib; { description = "Fake implementation of Redis API"; homepage = "https://github.com/jamesls/fakeredis"; diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix index 20e8f58882624..ef014011bdff0 100644 --- a/pkgs/development/python-modules/flake8-bugbear/default.nix +++ b/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "flake8-bugbear"; - version = "22.3.20"; + version = "22.3.23"; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = version; - sha256 = "sha256-tq008SNytZCttnVY1NLf9/2aeqP+iPLUNsRLZu0k3Uk="; + sha256 = "sha256-s1EnPM2He+R+vafu14XI1Xuft8Rg6W3vPH2Atc6N7I0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index e7464a38701fd..6b49d2d2a6ee1 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "http://flask.pocoo.org/"; + homepage = "https://flask.palletsprojects.com/"; description = "The Python micro framework for building web applications"; longDescription = '' Flask is a lightweight WSGI web application framework. It is diff --git a/pkgs/development/python-modules/gaphas/default.nix b/pkgs/development/python-modules/gaphas/default.nix index 0f23415fe6eea..3c8933686b226 100644 --- a/pkgs/development/python-modules/gaphas/default.nix +++ b/pkgs/development/python-modules/gaphas/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "gaphas"; - version = "3.5.1"; + version = "3.6.0"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-71oYuLhqJ7bst0W7v9tQSoaisjONZSa9zEWzYWtGl2E="; + sha256 = "sha256-yleYbAJdDVzZrMQ3izi9UX3Ji1vIuQDc+RK5+wzrMi4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index b66ff08cff8a1..ae3c6a8be74a0 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -8,20 +8,33 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.10.6"; + version = "2.10.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dBt2Vs9J0+l534YtKS70MuUEUegwVoU66zghmcz7fGk="; + hash = "sha256-I3oYldj915GBCX5VLEZRqGS7jMHWasQGVIvj50EUTK4="; }; - propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + grpc-google-iam-v1 + libcst + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; disabledTests = [ # requires credentials diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix index a73d9960f6938..97ccb7b912063 100644 --- a/pkgs/development/python-modules/h2/default.nix +++ b/pkgs/development/python-modules/h2/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { description = "HTTP/2 State-Machine based protocol implementation"; homepage = "https://github.com/python-hyper/h2"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 8bde06767844d..1df738f80fb7e 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.38.4"; + version = "0.38.5"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-WvcQTaYlKTOYbYwH/FbNTMoHdUhesYeeNYP8RDgQms4="; + sha256 = "sha256-RzTRRWHmdEjDQM/x4pX1gy7mIJD3K2hjQRAkz53xL50="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index f2e9b66b7b3c0..463d3ce5e0339 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "jdatetime"; - version = "4.0.0"; + version = "4.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-01uuou0hPk6Hu4QMYWNwAVQL0h6ORFS9EjUrBlkewI4="; + sha256 = "sha256-SmeoLuV+NbX2+ff75qDtpj9Wzh3Yr0CbTComozQEV9s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 16a8158091691..228aa1913c5d1 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "mkdocs-material"; - version = "8.2.5"; + version = "8.2.6"; src = fetchFromGitHub { owner = "squidfunk"; repo = pname; rev = version; - sha256 = "0v30x2cgc5i307p0hsy5h58pfd8w6xpnvimsb75614xlmx3ycaqd"; + sha256 = "sha256-4t9LBZc73V8eAIUO+BAZPgak+AX3o2YKZJWug+b6TBY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix index 8bed74a4d5201..5d67133b25598 100644 --- a/pkgs/development/python-modules/motionblinds/default.nix +++ b/pkgs/development/python-modules/motionblinds/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "motionblinds"; - version = "0.6.1"; + version = "0.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "motion-blinds"; rev = version; - sha256 = "sha256-31ofLiBQjSMDtptgYF5rqS1bB5UDUbsbo25Nrk4WvIY="; + sha256 = "sha256-Y5yF/dJUm0ICUY8UU8ILypSAnCVanvW4hzyz7ZOdBrc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index b224d40ee0bcb..cabbdaad35e65 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.3.0"; + version = "7.4.1"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "vemel"; repo = "mypy_boto3_builder"; rev = version; - hash = "sha256-X/dPO2p6GmnyJwcVPOmyo9zYda2uYfBAkuKTeX0Bt0Q="; + hash = "sha256-7sl6S1/bQceVP6i/3KMYqsrOxNBvpBZUKdpOrnlhYNk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ndspy/default.nix b/pkgs/development/python-modules/ndspy/default.nix index 9c4d91df9d651..7408949649fa0 100644 --- a/pkgs/development/python-modules/ndspy/default.nix +++ b/pkgs/development/python-modules/ndspy/default.nix @@ -1,22 +1,44 @@ -{ lib, buildPythonPackage, fetchPypi, crcmod }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, crcmod +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "ndspy"; - version = "3.0.0"; + version = "4.0.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "1s0i81gspas22bjwk9vhy3x5sw1svyybk7c2j1ixc77drr9ym20a"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "RoadrunnerWMC"; + repo = pname; + rev = "v${version}"; + sha256 = "0x3sp10had1mq192m7kgjivvs8kpjagxjgj9d4z95dfjhzzbjh70"; }; - propagatedBuildInputs = [ crcmod ]; + propagatedBuildInputs = [ + crcmod + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ndspy" + ]; - doCheck = false; # there are no tests - pythonImportsCheck = [ "ndspy" ]; + preCheck = '' + cd tests + ''; meta = with lib; { + description = "Python library for many Nintendo DS file formats"; homepage = "https://github.com/RoadrunnerWMC/ndspy"; - description = "A Python library for many Nintendo DS file formats"; license = licenses.gpl3Plus; maintainers = with maintainers; [ xfix ]; }; diff --git a/pkgs/development/python-modules/obfsproxy/default.nix b/pkgs/development/python-modules/obfsproxy/default.nix index 0c0781bc577b7..5f652cb97f3cf 100644 --- a/pkgs/development/python-modules/obfsproxy/default.nix +++ b/pkgs/development/python-modules/obfsproxy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { version = "0.2.13"; src = fetchgit { - url = meta.repositories.git; + url = "https://git.torproject.org/pluggable-transports/obfsproxy.git"; rev = "refs/tags/${pname}-${version}"; sha256 = "04ja1cl8xzqnwrd2gi6nlnxbmjri141bzwa5gybvr44d8h3k2nfa"; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { meta = with lib; { description = "A pluggable transport proxy"; homepage = "https://www.torproject.org/projects/obfsproxy"; - repositories.git = "https://git.torproject.org/pluggable-transports/obfsproxy.git"; maintainers = with maintainers; [ thoughtpolice ]; }; diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index a268f34cc71ab..fe5211802807d 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -80,6 +80,12 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + # https://github.com/ocrmypdf/OCRmyPDF/issues/933 + substituteInPlace setup.cfg \ + --replace "pdfminer.six!=20200720,>=20191110,<=20211012" "pdfminer.six!=20200720,>=20191110,<=20220319" + ''; + pythonImportsCheck = [ "ocrmypdf" ]; diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix index 6d2b0adcf41c7..449ea4f7fd778 100644 --- a/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/pkgs/development/python-modules/pdfminer_six/default.nix @@ -21,6 +21,12 @@ buildPythonPackage rec { done ''; + postPatch = '' + # Verion is not stored in repo, gets added by a GitHub action after tag is created + # https://github.com/pdfminer/pdfminer.six/pull/727 + substituteInPlace pdfminer/__init__.py --replace "__VERSION__" ${version} + ''; + checkInputs = [ pytestCheckHook ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pdfx/default.nix b/pkgs/development/python-modules/pdfx/default.nix index 3b63e67fddece..25efc4418bf9e 100644 --- a/pkgs/development/python-modules/pdfx/default.nix +++ b/pkgs/development/python-modules/pdfx/default.nix @@ -13,7 +13,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ - --replace "chardet==4.0.0" "chardet" + --replace "chardet==4.0.0" "chardet" \ + --replace "pdfminer.six==20201018" "pdfminer.six" ''; propagatedBuildInputs = [ pdfminer chardet ]; diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index ee356f86500a6..143598d750091 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -2,16 +2,19 @@ , buildPythonPackage , fetchPypi , flit-core +, pythonOlder }: buildPythonPackage rec { pname = "pex"; - version = "2.1.72"; + version = "2.1.73"; format = "flit"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-0hhnBkbgt4bSlqjvYKX2Mhty/T1vBGm91HhKmyvVzmA="; + hash = "sha256-OxIm0vFH0JadaKMGrKNNj8mA7ue1kazjpauSK6XNGiU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pint-pandas/default.nix b/pkgs/development/python-modules/pint-pandas/default.nix new file mode 100644 index 0000000000000..385c4c13bd6d1 --- /dev/null +++ b/pkgs/development/python-modules/pint-pandas/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, setuptools-scm +, pint +, pandas +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pint-pandas"; + version = "0.2"; + + src = fetchPypi { + pname = "Pint-Pandas"; + inherit version; + sha256 = "sha256-b2DS6ArBAuD5St25IG4PbMpe5C8Lf4kw2MeYAC5B+oc="; + }; + + patches = [ + # Fixes a failing test, see: https://github.com/hgrecco/pint-pandas/issues/107 + (fetchpatch{ + url = "https://github.com/hgrecco/pint-pandas/commit/4c31e25609af968665ee60d019b9b5366f328680.patch"; + sha256 = "vIT0LI4S73D4MBfGI8vtCZAM+Zb4PZ4E3xfpGKNyA4I="; + }) + ]; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + pint + pandas + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Pandas support for pint"; + license = licenses.bsd3; + homepage = "https://github.com/hgrecco/pint-pandas"; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/preprocess-cancellation/default.nix b/pkgs/development/python-modules/preprocess-cancellation/default.nix new file mode 100644 index 0000000000000..d671cb4d66eb7 --- /dev/null +++ b/pkgs/development/python-modules/preprocess-cancellation/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, poetry-core +, pytestCheckHook, pytest-cov +, shapely }: + +buildPythonPackage rec { + pname = "preprocess-cancellation"; + version = "0.2.0"; + disabled = pythonOlder "3.6"; # >= 3.6 + format = "pyproject"; + + # No tests in PyPI + src = fetchFromGitHub { + owner = "kageurufu"; + repo = "cancelobject-preprocessor"; + rev = version; + hash = "sha256-mn3/etXA5dkL+IsyxwD4/XjU/t4/roYFVyqQxlLOoOI="; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ shapely ]; + + checkInputs = [ pytestCheckHook pytest-cov ]; + + meta = with lib; { + description = "Klipper GCode Preprocessor for Object Cancellation"; + homepage = "https://github.com/kageurufu/cancelobject-preprocessor"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ zhaofengli ]; + }; +} diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index 584ef5538a0f4..1990915eef444 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "22.1.3"; + version = "22.3.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8o/kuIHdLMFE0tlPg+xg2MWaUmQqCtNjXMTQ+EBvSFg="; + sha256 = "sha256-zBdOHO69TmIixbePT0FfEugHU8mrdas1QVm0y1lQsIQ="; }; patches = [ diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix index 3d2e1b05e1014..24c4b3c9f5977 100644 --- a/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "py-synologydsm-api"; - version = "1.0.6"; + version = "1.0.7"; format = "pyproject"; src = fetchFromGitHub { owner = "mib1185"; repo = "synologydsm-api"; rev = "v${version}"; - sha256 = "sha256-jAdD6FCbsBocJNX7o+dpthgHaPLIueFWJMzBNoKAq7w="; + sha256 = "sha256-VhAzR/knvun6hJj8/YREqMfNvOKpTyYNI9fk9hsbHDQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyaussiebb/default.nix b/pkgs/development/python-modules/pyaussiebb/default.nix index d764e93e3f065..86d2f59e94242 100644 --- a/pkgs/development/python-modules/pyaussiebb/default.nix +++ b/pkgs/development/python-modules/pyaussiebb/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyaussiebb"; - version = "0.0.14"; + version = "0.0.15"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "yaleman"; repo = "aussiebb"; rev = "v${version}"; - hash = "sha256-Z+xLCKnUnBAH9nm0YR11zx1lyNrIb8BZLFmaZdpnfdw="; + hash = "sha256-V9yN05Bkv5vkHgXZ77ps3d6JS39M5iMuiijOGRBFi0U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index f2163621506fa..3585148b31c02 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -7,7 +7,6 @@ , openssl , bottle , pytestCheckHook -, nose , flaky }: @@ -38,7 +37,6 @@ buildPythonPackage rec { checkInputs = [ bottle pytestCheckHook - nose flaky ]; @@ -76,9 +74,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "http://pycurl.sourceforge.net/"; - description = "Python wrapper for libcurl"; - license = licenses.lgpl2Only; + homepage = "http://pycurl.io/"; + description = "Python Interface To The cURL library"; + license = with licenses; [ lgpl2Only mit ]; maintainers = with maintainers; []; }; } diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 68e5a90d0cfd3..909ce1caa38be 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { buildinputs_include = builtins.toJSON (builtins.concatMap (dep: [ "${lib.getDev dep}/" "${lib.getDev dep}/include" + "${lib.getDev dep}/include/SDL2" ]) buildInputs); buildinputs_lib = builtins.toJSON (builtins.concatMap (dep: [ "${lib.getLib dep}/" diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index fbf5ccf9edefd..db436983f3afc 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -18,13 +18,13 @@ }: buildPythonPackage rec { - version = "1.5.22"; + version = "1.5.23"; pname = "pyglet"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-VjDcNuoA/cEa06g5TGdkF+w2WyX92a9XoQfhmtxBGw8="; + sha256 = "sha256-3ukgIDzzBhWcUDurti84eHJocIl39clF0oM3WUt5fEY="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index d2ff1aab1a476..32bada43c1545 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pypandoc"; - version = "1.7.3"; + version = "1.7.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Tv0vqKN9AAXdfQRMt/QuqeFB3wNTh1DsWu0XNZukTUc="; + sha256 = "sha256-KN4j9kbZ6ARAPGth180yptdso1arx563IXvb/2dI+G4="; }; patches = [ diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index dfc10c638e0db..0bafd17a8eb60 100644 --- a/pkgs/development/python-modules/pyrogram/default.nix +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "1.4.8"; + version = "1.4.9"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "Pyrogram"; inherit version; - hash = "sha256-mUJEV8DLYhXNvYiuiVDCfgMmZRDCNZuydngj9C9FvQU="; + hash = "sha256-iAPzQDHRyFl8m/23zTGOFXA3v5ONU5BGp7KT1ZSywA4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix index ab757085d1ca2..2fc5c6a6ccdae 100644 --- a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-splunk"; - version = "0.2.0"; + version = "0.2.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-splunk"; rev = "v${version}"; - hash = "sha256-EP0gcK05hZ5TCOgTePezfEGbW45dGrnnksWyI9Jo9MQ="; + hash = "sha256-NAhAWK1eSSGQAlMGgMHrW/RTpT9LJMqwkhE9/8xWGT8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index be35230dbd6ba..cd3e9ed885952 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.4.2"; + version = "0.4.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "v${version}"; - hash = "sha256-0k6m86RQoP4QTuxmCWBpxiGqaJt3alOLS5BAuOFwdb4="; + hash = "sha256-NE6XmylUc3MeDRMOJo51jtb6J0Vi9tDT6tbYBepDsvw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytorch/bin.nix b/pkgs/development/python-modules/pytorch/bin.nix index df3e5da4c5ab2..24533a08e4752 100644 --- a/pkgs/development/python-modules/pytorch/bin.nix +++ b/pkgs/development/python-modules/pytorch/bin.nix @@ -4,6 +4,7 @@ , isPy37 , isPy38 , isPy39 +, isPy310 , python , addOpenGLRunpath , future @@ -19,7 +20,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "1.10.0"; + version = "1.11.0"; in buildPythonPackage { inherit version; @@ -28,7 +29,7 @@ in buildPythonPackage { format = "wheel"; - disabled = !(isPy37 || isPy38 || isPy39); + disabled = !(isPy37 || isPy38 || isPy39 || isPy310); src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; diff --git a/pkgs/development/python-modules/pytorch/binary-hashes.nix b/pkgs/development/python-modules/pytorch/binary-hashes.nix index 61f1e59d09e8d..945af484a4af9 100644 --- a/pkgs/development/python-modules/pytorch/binary-hashes.nix +++ b/pkgs/development/python-modules/pytorch/binary-hashes.nix @@ -6,46 +6,61 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "1.10.0" = { + "1.11.0" = { x86_64-linux-37 = { - name = "torch-1.10.0-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torch-1.10.0%2Bcu113-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-KpDbklee2HXSqgrWr1U1nj8EJqUjBWp7SbACw8xtKtg="; + name = "torch-1.11.0-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torch-1.11.0%2Bcu113-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-9WMzRw2uo8lweLN2B+ADXMz3L8XDb9hFRuGkuNmUTys="; }; x86_64-linux-38 = { - name = "torch-1.10.0-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torch-1.10.0%2Bcu113-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-zM3cMriUG9A+3in/ChzOLytRETpe4ju4uXkxasIRQYM="; + name = "torch-1.11.0-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torch-1.11.0%2Bcu113-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-tqeZvbbuPZFOXmK920J21KECSMGvTy0hdzjl+e4nSFs="; }; x86_64-linux-39 = { - name = "torch-1.10.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torch-1.10.0%2Bcu113-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-w8UJDh4b5cgDu7ZSvDoKzNH4hiXEyRfvpycNOg+wJOg="; + name = "torch-1.11.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torch-1.11.0%2Bcu113-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-6RJrCl2VcEvuQKnQ7xy9gtjceGPkY4o3a+9wLf1lk3A="; + }; + x86_64-linux-310 = { + name = "torch-1.11.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torch-1.11.0%2Bcu113-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-powzZXpUYTHrm8ROKpjS+nBKr66GFGCwUbgoE4Usy0Q="; }; x86_64-darwin-37 = { - name = "torch-1.10.0-cp37-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp37-none-macosx_10_9_x86_64.whl"; - hash = "sha256-RJkFVUcIfX736KdU8JwsTxRwKXrj5UkDY9umbHVQGyE="; + name = "torch-1.11.0-cp37-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp37-none-macosx_10_9_x86_64.whl"; + hash = "sha256-aGCx0b8LsLZ6a9R/haDkyCW1GO6hO11hAZmdu8vVvAw="; }; x86_64-darwin-38 = { - name = "torch-1.10.0-cp38-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp38-none-macosx_10_9_x86_64.whl"; - hash = "sha256-rvevti6bF0tODl4eSkLjurO4SQpmjWZvYvfUUXVZ+/I="; + name = "torch-1.11.0-cp38-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp38-none-macosx_10_9_x86_64.whl"; + hash = "sha256-DMyFzQYiej7fgJ4seV/Vdiw9Too4tcn3RMbnz4QTYbs="; }; x86_64-darwin-39 = { - name = "torch-1.10.0-cp39-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp39-none-macosx_10_9_x86_64.whl"; - hash = "sha256-1u+HRwtE35lw6EVCVH1bp3ILuJYWYCRB31VaObEk4rw="; + name = "torch-1.11.0-cp39-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp39-none-macosx_10_9_x86_64.whl"; + hash = "sha256-UP2b+FxXjIccKPHLCs6d/GAkQBx/OZsXT7DzcImfRFQ="; + }; + x86_64-darwin-310 = { + name = "torch-1.11.0-cp310-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp39-none-macosx_10_9_x86_64.whl"; + hash = "sha256-UP2b+FxXjIccKPHLCs6d/GAkQBx/OZsXT7DzcImfRFQ="; }; aarch64-darwin-38 = { - name = "torch-1.10.0-cp38-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp38-none-macosx_11_0_arm64.whl"; - hash = "sha256-1hhYJ7KFeAZTzdgdd6Cf3KdqWxkNWYbVUr4qXEQs+qQ="; + name = "torch-1.11.0-cp38-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp38-none-macosx_11_0_arm64.whl"; + hash = "sha256-wVVOSddPGyw+cgLXcFa6LddGVDdYW6xkBitYD3FKROk="; }; aarch64-darwin-39 = { - name = "torch-1.10.0-cp39-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp39-none-macosx_11_0_arm64.whl"; - hash = "sha256-7qZ17AHsS0oGVf0phPFmpco7kz2uatTrTlLrpwJtwXY="; + name = "torch-1.11.0-cp39-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp39-none-macosx_11_0_arm64.whl"; + hash = "sha256-DkivZq11Xw+cXyZkAopBT1fEnWrcN+d+Bv4ABNpO22E="; + }; + aarch64-darwin-310 = { + name = "torch-1.11.0-cp310-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp39-none-macosx_11_0_arm64.whl"; + hash = "sha256-DkivZq11Xw+cXyZkAopBT1fEnWrcN+d+Bv4ABNpO22E="; }; }; } diff --git a/pkgs/development/python-modules/pytorch/prefetch.sh b/pkgs/development/python-modules/pytorch/prefetch.sh index debf26bfa20a1..31aae438dc56d 100755 --- a/pkgs/development/python-modules/pytorch/prefetch.sh +++ b/pkgs/development/python-modules/pytorch/prefetch.sh @@ -5,12 +5,21 @@ set -eou pipefail version=$1 -bucket="https://download.pytorch.org/whl/cu113" +linux_bucket="https://download.pytorch.org/whl/cu113" +darwin_bucket="https://download.pytorch.org/whl/cpu" url_and_key_list=( - "x86_64-linux-37 $bucket/torch-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torch-${version}-cp37-cp37m-linux_x86_64.whl" - "x86_64-linux-38 $bucket/torch-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl" - "x86_64-linux-39 $bucket/torch-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-37 $linux_bucket/torch-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torch-${version}-cp37-cp37m-linux_x86_64.whl" + "x86_64-linux-38 $linux_bucket/torch-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl" + "x86_64-linux-39 $linux_bucket/torch-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-310 $linux_bucket/torch-${version}%2Bcu113-cp310-cp310-linux_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl" + "x86_64-darwin-37 $darwin_bucket/torch-${version}-cp37-none-macosx_10_9_x86_64.whl torch-${version}-cp37-none-macosx_10_9_x86_64.whl" + "x86_64-darwin-38 $darwin_bucket/torch-${version}-cp38-none-macosx_10_9_x86_64.whl torch-${version}-cp38-none-macosx_10_9_x86_64.whl" + "x86_64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_10_9_x86_64.whl torch-${version}-cp39-none-macosx_10_9_x86_64.whl" + "x86_64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_10_9_x86_64.whl torch-${version}-cp310-none-macosx_10_9_x86_64.whl" + "aarch64-darwin-38 $darwin_bucket/torch-${version}-cp38-none-macosx_11_0_arm64.whl torch-${version}-cp38-none-macosx_11_0_arm64.whl" + "aarch64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_11_0_arm64.whl torch-${version}-cp39-none-macosx_11_0_arm64.whl" + "aarch64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_11_0_arm64.whl torch-${version}-cp310-none-macosx_11_0_arm64.whl" ) hashfile="binary-hashes-$version.nix" diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index 99c2d03359040..24784afc842dc 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage -, six, systemd, pytest, mock, hypothesis, docutils +, six, udev, pytest, mock, hypothesis, docutils }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace src/pyudev/_ctypeslib/utils.py \ - --replace "find_library(name)" "'${lib.getLib systemd}/lib/libudev.so'" + --replace "find_library(name)" "'${lib.getLib udev}/lib/libudev.so'" ''; checkInputs = [ pytest mock hypothesis docutils ]; diff --git a/pkgs/development/python-modules/pyzbar/default.nix b/pkgs/development/python-modules/pyzbar/default.nix new file mode 100644 index 0000000000000..4ba523f6b21a1 --- /dev/null +++ b/pkgs/development/python-modules/pyzbar/default.nix @@ -0,0 +1,40 @@ +{ lib, buildPythonPackage, fetchFromGitHub, numpy, pillow, zbar, pytestCheckHook }: + +buildPythonPackage rec { + pname = "pyzbar"; + version = "0.1.9"; + + src = fetchFromGitHub { + owner = "NaturalHistoryMuseum"; + repo = "pyzbar"; + rev = "v${version}"; + sha256 = "8IZQY6qB4r1SUPItDlTDnVQuPs0I38K3yJ6LiPJuwbU="; + }; + + propagatedBuildInputs = [ zbar pillow numpy ]; + + checkInputs = [ pytestCheckHook ]; + + # find_library doesn't return an absolute path + # https://github.com/NixOS/nixpkgs/issues/7307 + postPatch = '' + substituteInPlace pyzbar/zbar_library.py \ + --replace "find_library('zbar')" "'${lib.getLib zbar}/lib/libzbar.so.0'" + ''; + + disabledTests = [ + # find_library has been replaced by a hardcoded path + # the test fails due to find_library not called + "test_found_non_windows" + "test_not_found_non_windows" + ]; + + pythonImportsCheck = [ "pyzbar" ]; + + meta = with lib; { + description = "Read one-dimensional barcodes and QR codes from Python using the zbar library."; + homepage = "https://github.com/NaturalHistoryMuseum/pyzbar"; + license = licenses.mit; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index ad5530712f2c2..6c574c47e7557 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-rf0HP/vS3oHceqoLmDSZ71xZyWrc/cyd6mDULKiF648="; + sha256 = "13zbhnl2rm30xafwrzfwdb4mjp7gk4s9h2xagbf83pnjzczhgzdd"; }; propagatedBuildInputs = [ @@ -46,7 +46,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Abstraction layer for PyQt5/PyQt4/PySide2/PySide"; + description = "Abstraction layer for PyQt5/PyQt6/PySide2/PySide6"; homepage = "https://github.com/spyder-ide/qtpy"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix index bed661ce20060..cd137b1547ea3 100644 --- a/pkgs/development/python-modules/samsungtvws/default.nix +++ b/pkgs/development/python-modules/samsungtvws/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "samsungtvws"; - version = "2.4.0"; + version = "2.5.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-LbNHaSbNCwoffox6B8kEUzxjkSJotB+P1bw3wbU7DZk="; + sha256 = "sha256-AFCN1b80GZ24g3oWe1qqc72yWQy4+/sorL8zwOYM7vo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index afde27967dbb4..a5fdf3d547edc 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -131,6 +131,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.cfg \ + --replace "pdfminer.six >= 20200101" "pdfminer.six" \ --replace "pluggy >= 0.12.0, < 1.0" "pluggy" \ --replace "pygmars >= 0.7.0" "pygmars" \ --replace "license_expression >= 21.6.14" "license_expression" diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix index 57a7e367d726b..d5e9b4da0ebfe 100644 --- a/pkgs/development/python-modules/sense-energy/default.nix +++ b/pkgs/development/python-modules/sense-energy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.10.2"; + version = "0.10.3"; format = "setuptools"; src = fetchFromGitHub { owner = "scottbonline"; repo = "sense"; rev = version; - hash = "sha256-0D0AagmLozF5nLbdcmtE9q65vG2WxWv+hZLTnjmmfEY="; + hash = "sha256-oekzLnEQleJPYO6QI2EwflXsbnrQVbqXQOZOnCfEHdg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index e98112628381c..04adc9721f981 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.67.0"; + version = "2.68.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cYuT1qGBBSQ7zgybSOUY9y8fCD0n8H4HuL2zpUH+ODU="; + hash = "sha256-X3lYAxM/KlC4NjBJrq/4Gze37wpcVKTA11VaQRpAt68="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 4809fde718d28..5cdc1dafc0345 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "1.8.0"; + version = "1.9.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9EFbsJPn543fVGQ46cikEE9rE4qBr/2q6vX7u4tui7I="; + sha256 = "sha256-Q/ltNdr2Huvfj1RmKFopJbaR4FSM7ziWadmDKPS26vc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index 1f6ae80b03290..ba504102329d6 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -2,6 +2,10 @@ , stdenv , buildPythonPackage , fetchurl +, isPy37 +, isPy38 +, isPy39 +, isPy310 , python , pytorch-bin , pythonOlder @@ -10,7 +14,7 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "0.10.0"; + version = "0.11.0"; format = "wheel"; src = @@ -19,7 +23,7 @@ buildPythonPackage rec { srcs = (import ./binary-hashes.nix version)."${stdenv.system}-${pyVerNoDot}" or unsupported; in fetchurl srcs; - disabled = ! (pythonAtLeast "3.7" && pythonOlder "3.10"); + disabled = !(isPy37 || isPy38 || isPy39 || isPy310); propagatedBuildInputs = [ pytorch-bin diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix index 764b9db426b9a..70ae3357221f6 100644 --- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -6,21 +6,61 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "0.10.0" = { + "0.11.0" = { x86_64-linux-37 = { - name = "torchaudio-0.10.0-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torchaudio-0.10.0%2Bcu113-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-FspXTTODdkO0nPUJcJm8+vLIvckUa8gRfBPBT9LcKPw="; + name = "torchaudio-0.11.0-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchaudio-0.11.0%2Bcu113-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-AdqgntXh2rTD7rBePshFAQ2tVl7b+734wG4r471/Y2U="; }; x86_64-linux-38 = { - name = "torchaudio-0.10.0-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torchaudio-0.10.0%2Bcu113-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-Mf7QdXBSIIWRfT7ACthEwFA1V2ieid8legbMnRQnzqI="; + name = "torchaudio-0.11.0-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchaudio-0.11.0%2Bcu113-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-zuCHDpz3bkOUjYWprqX9VXoUbXfR8Vhdf1VFfOUg8z4="; }; x86_64-linux-39 = { - name = "torchaudio-0.10.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torchaudio-0.10.0%2Bcu113-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-LMSGNdmku1iHRy1jCRTTOYcQlRL+Oc9jjZC1nx++skA="; + name = "torchaudio-0.11.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchaudio-0.11.0%2Bcu113-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-btI9TpsOjeLnIz6J56avNv4poJTpXjjhDbMy6+ZFQvI="; + }; + x86_64-linux-310 = { + name = "torchaudio-0.11.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchaudio-0.11.0%2Bcu113-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-Zk+AWytEXfJ+HM69BAPhVsvN6pgQwC6uaW7Xux2row4="; + }; + x86_64-darwin-37 = { + name = "torchaudio-0.11.0-cp37-cp37m-macosx_10_15_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp37-cp37m-macosx_10_15_x86_64.whl"; + hash = "sha256-uaTT4athEWHAZe0hBoBIM/9LhfZNhAIexZBGg2MWn50="; + }; + x86_64-darwin-38 = { + name = "torchaudio-0.11.0-cp38-cp38-macosx_10_15_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp38-cp38-macosx_10_15_x86_64.whl"; + hash = "sha256-9OndqejTzgu9XnkZJiGfUFS4uFNlx5vi7pAzOs+a2/w="; + }; + x86_64-darwin-39 = { + name = "torchaudio-0.11.0-cp39-cp39-macosx_10_15_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp39-cp39-macosx_10_15_x86_64.whl"; + hash = "sha256-cNi8B/J3YI0jqaoI2z+68DVmAlS8EtmzYWQMRVZ3dVk="; + }; + x86_64-darwin-310 = { + name = "torchaudio-0.11.0-cp310-cp310-macosx_10_15_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp310-cp310-macosx_10_15_x86_64.whl"; + hash = "sha256-g2Pj2wqK9YIP19O/g5agryPcgiHJqdS2Di44mAVJKUQ="; + }; + aarch64-darwin-38 = { + name = "torchaudio-0.11.0-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-MX/Y7Dn92zrx2tkGWTuezcPt9o5/V4DEL43pVlha5IA="; + }; + aarch64-darwin-39 = { + name = "torchaudio-0.11.0-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-5eVRP83VeHAGGWW++/B2V4eyX0mcPgC1j02ETkQYMXc="; + }; + aarch64-darwin-310 = { + name = "torchaudio-0.11.0-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-06OyzOuV8E7ZNtozvFO9Zm2rBxWnnbM65HGYUiQdwtI="; }; }; } diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh index 4e62ab4ed359f..294c917e0d17b 100755 --- a/pkgs/development/python-modules/torchaudio/prefetch.sh +++ b/pkgs/development/python-modules/torchaudio/prefetch.sh @@ -5,12 +5,21 @@ set -eou pipefail version=$1 -bucket="https://download.pytorch.org/whl/cu113" +linux_bucket="https://download.pytorch.org/whl/cu113" +darwin_bucket="https://download.pytorch.org/whl" url_and_key_list=( - "x86_64-linux-37 $bucket/torchaudio-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torchaudio-${version}-cp37-cp37m-linux_x86_64.whl" - "x86_64-linux-38 $bucket/torchaudio-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl" - "x86_64-linux-39 $bucket/torchaudio-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-37 $linux_bucket/torchaudio-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torchaudio-${version}-cp37-cp37m-linux_x86_64.whl" + "x86_64-linux-38 $linux_bucket/torchaudio-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl" + "x86_64-linux-39 $linux_bucket/torchaudio-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-310 $linux_bucket/torchaudio-${version}%2Bcu113-cp310-cp310-linux_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl" + "x86_64-darwin-37 $darwin_bucket/torchaudio-${version}-cp37-cp37m-macosx_10_15_x86_64.whl torchaudio-${version}-cp37-cp37m-macosx_10_15_x86_64.whl" + "x86_64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_10_15_x86_64.whl torchaudio-${version}-cp38-cp38-macosx_10_15_x86_64.whl" + "x86_64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_10_15_x86_64.whl torchaudio-${version}-cp39-cp39-macosx_10_15_x86_64.whl" + "x86_64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_10_15_x86_64.whl torchaudio-${version}-cp310-cp310-macosx_10_15_x86_64.whl" + "aarch64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl" + "aarch64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl" + "aarch64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl" ) hashfile=binary-hashes-"$version".nix diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index f7041dbb519de..8b1d0e2ec8dea 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -5,6 +5,7 @@ , isPy37 , isPy38 , isPy39 +, isPy310 , patchelf , pillow , python @@ -15,7 +16,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.11.1"; + version = "0.12.0"; in buildPythonPackage { inherit version; @@ -25,7 +26,7 @@ in buildPythonPackage { src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; - disabled = !(isPy37 || isPy38 || isPy39); + disabled = !(isPy37 || isPy38 || isPy39 || isPy310); nativeBuildInputs = [ patchelf diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index b608bab24409f..271968391ef0c 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -6,21 +6,61 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "0.11.1" = { + "0.12.0" = { x86_64-linux-37 = { - name = "torchvision-0.11.1-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torchvision-0.11.1%2Bcu113-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-2xKWqWNKqmOMyVJnPfbtF+B9PQ7z4S66J1T3P8EvM0I="; + name = "torchvision-0.12.0-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchvision-0.12.0%2Bcu113-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-i/qktZT+5HQYQjtTHtxOV751DcsP9AHMsSV9/svsGzA="; }; x86_64-linux-38 = { - name = "torchvision-0.11.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torchvision-0.11.1%2Bcu113-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-bFxvJaNEomytXXANHng+oU8YSLGkuO/TSzkoDskkaIE="; + name = "torchvision-0.12.0-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchvision-0.12.0%2Bcu113-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-NxM+jFsOwvAZmeWRFvbQ422a+xx/j1i9DD3ImW+DVBk="; }; x86_64-linux-39 = { - name = "torchvision-0.11.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torchvision-0.11.1%2Bcu113-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-ysN3LmSKR+FVKYGnCGQJqa8lVApVT5rPMO+NHmmazAc="; + name = "torchvision-0.12.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchvision-0.12.0%2Bcu113-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-bGO5q+KEnv7SexmbbUWaIbsBcIxyDbL8pevZQbLwDbg="; + }; + x86_64-linux-310 = { + name = "torchvision-0.12.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchvision-0.12.0%2Bcu113-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-ocsGOHa967HcZGV+1omD/xMHufmoi166Yg2Hr+SEhfE="; + }; + x86_64-darwin-37 = { + name = "torchvision-0.12.0-cp37-cp37m-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp37-cp37m-macosx_10_9_x86_64.whl"; + hash = "sha256-GJM7xZf0VjmTJJcZqWqV28fTN0yQ+7MNPafVGPOv60I="; + }; + x86_64-darwin-38 = { + name = "torchvision-0.12.0-cp38-cp38-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp38-cp38-macosx_10_9_x86_64.whl"; + hash = "sha256-DWAuCb1Fc2/y55aOjduw7s6Vb/ltcVSLGxtIeP33S9g="; + }; + x86_64-darwin-39 = { + name = "torchvision-0.12.0-cp39-cp39-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp39-cp39-macosx_10_9_x86_64.whl"; + hash = "sha256-RMye+ZLS4qtjsIg/fezrwiRNupO3JUe6EfV6yEUvbq0="; + }; + x86_64-darwin-310 = { + name = "torchvision-0.12.0-cp310-cp310-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp310-cp310-macosx_10_9_x86_64.whl"; + hash = "sha256-aTZW5nkLarIeSm6H6BwpgrrZ5FW16yThS7ZyOC7GEw8="; + }; + aarch64-darwin-38 = { + name = "torchvision-0.12.0-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-n0JCD38LKc09YXdt8xV4JyV6DPFrLAJ3bcFslquxJW0="; + }; + aarch64-darwin-39 = { + name = "torchvision-0.12.0-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-adgvR7Z7rW3cu4eDO6WVCmwnG6l7quTAlVYQBxvwNPU="; + }; + aarch64-darwin-310 = { + name = "torchvision-0.12.0-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-oL5FAcoLobGVZEySQ/SaHEmiblKn83kkxCOdC/XsvY0="; }; }; } diff --git a/pkgs/development/python-modules/torchvision/prefetch.sh b/pkgs/development/python-modules/torchvision/prefetch.sh index 686d1b3e62002..5f38bce8d8b30 100755 --- a/pkgs/development/python-modules/torchvision/prefetch.sh +++ b/pkgs/development/python-modules/torchvision/prefetch.sh @@ -5,12 +5,21 @@ set -eou pipefail version=$1 -bucket="https://download.pytorch.org/whl/cu113" +linux_bucket="https://download.pytorch.org/whl/cu113" +darwin_bucket="https://download.pytorch.org/whl" url_and_key_list=( - "x86_64-linux-37 $bucket/torchvision-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torchvision-${version}-cp37-cp37m-linux_x86_64.whl" - "x86_64-linux-38 $bucket/torchvision-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl" - "x86_64-linux-39 $bucket/torchvision-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-37 $linux_bucket/torchvision-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torchvision-${version}-cp37-cp37m-linux_x86_64.whl" + "x86_64-linux-38 $linux_bucket/torchvision-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl" + "x86_64-linux-39 $linux_bucket/torchvision-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-310 $linux_bucket/torchvision-${version}%2Bcu113-cp310-cp310-linux_x86_64.whl torchvision-${version}-cp310-cp310-linux_x86_64.whl" + "x86_64-darwin-37 $darwin_bucket/torchvision-${version}-cp37-cp37m-macosx_10_9_x86_64.whl torchvision-${version}-cp37-cp37m-macosx_10_9_x86_64.whl" + "x86_64-darwin-38 $darwin_bucket/torchvision-${version}-cp38-cp38-macosx_10_9_x86_64.whl torchvision-${version}-cp38-cp38-macosx_10_9_x86_64.whl" + "x86_64-darwin-39 $darwin_bucket/torchvision-${version}-cp39-cp39-macosx_10_9_x86_64.whl torchvision-${version}-cp39-cp39-macosx_10_9_x86_64.whl" + "x86_64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_10_9_x86_64.whl torchvision-${version}-cp310-cp310-macosx_10_9_x86_64.whl" + "aarch64-darwin-38 $darwin_bucket/torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl" + "aarch64-darwin-39 $darwin_bucket/torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl" + "aarch64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl" ) hashfile="binary-hashes-$version.nix" diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 0323c965ecd73..d0d14845b70d5 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.10.5"; + version = "3.10.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-GtdxStdWtioRgf/Y2/broyYElqIJ2RxP3otgROw3epI="; + sha256 = "sha256-oFNJ2hynf4bUY6sIXx7y4jEkCATi5rZetiCvNpwNzio="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 055fdd441489a..4641e4af40464 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -17,12 +17,12 @@ }: buildPythonPackage rec { pname = "Twisted"; - version = "22.1.0"; + version = "22.2.0"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - sha256 = "sha256-t5ceyYBbD4Dh3LGjch17+tY21fkJ3mh0MM43OXnWe2E="; + sha256 = "1wml02jxni8k15984pskks7d6yin81w4d2ac026cpyiqd0gjpwsp"; }; propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools typing-extensions ]; diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index 1055a91b675d3..a4d8d7ccf7b0e 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "3.19.12"; + version = "3.19.14"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sCIkc0dHEhmsvi/mjS82I9eIJS6Z6blzWLerkE0ming="; + sha256 = "sha256-ANWbHgfICPLwPGyouksHcoFYW7KBSKMCDPv37F/H+4Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 7dcc56d9f6e8a..3df7f6703a79b 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -1,8 +1,16 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, isPy27, glibcLocales }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, isPy27 +, glibcLocales +}: buildPythonPackage rec { pname = "urwid"; version = "2.1.2"; + format = "setuptools"; + disabled = isPy27; src = fetchPypi { @@ -17,13 +25,14 @@ buildPythonPackage rec { # tests which assert on strings don't decode results correctly doCheck = isPy3k; - pythonImportsCheck = [ "urwid" ]; + pythonImportsCheck = [ + "urwid" + ]; meta = with lib; { description = "A full-featured console (xterm et al.) user interface library"; - homepage = "https://excess.org/urwid"; - repositories.git = "git://github.com/wardi/urwid.git"; - license = licenses.lgpl21; + homepage = "https://urwid.org/"; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/yamale/default.nix b/pkgs/development/python-modules/yamale/default.nix index 7444d8d24ac52..5cd60f02b5899 100644 --- a/pkgs/development/python-modules/yamale/default.nix +++ b/pkgs/development/python-modules/yamale/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "yamale"; - version = "4.0.3"; + version = "4.0.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "23andMe"; repo = pname; rev = version; - sha256 = "sha256-EkCKUSPRrj3g2AY17tquBDxf+nWfpdnILu5AS/2SsLo="; + sha256 = "sha256-1GFvgfy3MDsJGKSEm0yaQoLM7VqIS2wphw16trNTUOc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index a025abf1e3434..8cda4a0b21280 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.975"; + version = "2.0.988"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-vzq6HKugjM9LBaklv0IlMauSAl3bqHOikDCzrhVBVPA="; + hash = "sha256-0/SL20N5d/oqWdyvVMZ+pzpPbehrYepaPi8P8SS8DSA="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 6c2427d3724ad..284ef21094e84 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "tfsec"; - version = "1.13.0"; + version = "1.13.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/N8p/tw97sDW4I1ysfJ2QXACGsSc5nRFSu6jHwQvPU4="; + sha256 = "sha256-ixiuAm1MCLS7daUwiFUPoO86YOoz9qEkQT5i/YlIdf0="; }; ldflags = [ @@ -21,7 +21,7 @@ buildGoModule rec { # "-extldflags '-fno-PIC -static'" ]; - vendorSha256 = "sha256-nTma96kT84mpJHRA9+/sZQVvwtz9arv/OHY9lgWJDFc="; + vendorSha256 = "sha256-WlZJvBIdJCMA+GJ0svEzwqrdPz2wnlJx/csVarjyExw="; subPackages = [ "cmd/tfsec" diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 6caccc45e97aa..f2989545f5c4a 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl }: let - version = "14.9.0"; + version = "14.9.1"; in buildGoModule rec { inherit version; @@ -20,7 +20,7 @@ buildGoModule rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0qqwg2k50cq7bc7k1389knrjq6xdbmlxd5kavyj7pg4sfapa3i8l"; + sha256 = "1h6fyhbc154fr6a8brva3clirgvga6sal6ikylf9mbkxbh7d9rcn"; }; patches = [ diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 635552842968e..377d287e531e2 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.6.11"; + version = "0.6.12"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-awlE+k4Oa64Z2n+XbeDuezea+5D0ol7hyscVY6j52gI="; + sha256 = "sha256-M8DnSpQhW4i83cu9wp0ZKyP7137IQVjyBl0cgVvQmPI="; }; - vendorSha256 = "sha256-uUx9C7uEdXjhDWxehGHuhuFQXdUjZAXK3qogESkRm8E="; + vendorSha256 = "sha256-GvTWj0uEsCyC4/RL6woym8UwA3OCFx8NWkNQApnVMM8="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/efm-langserver/default.nix b/pkgs/development/tools/efm-langserver/default.nix index 29304d7d26549..a030a271b487f 100644 --- a/pkgs/development/tools/efm-langserver/default.nix +++ b/pkgs/development/tools/efm-langserver/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "efm-langserver"; - version = "0.0.41"; + version = "0.0.42"; src = fetchFromGitHub { owner = "mattn"; repo = "efm-langserver"; rev = "v${version}"; - sha256 = "sha256-0s6GmMbjtXGUcChzc8Pkqvmt3iU5uDUqe76OUDngboU="; + sha256 = "sha256-1IAPtqIozp9Wp3L95mmhFuWvWvCDuTh1VsCVaJSzyfk="; }; - vendorSha256 = "sha256-tca+1SRrFyvU8ttHmfMFiGXd1A8rQSEWm1Mc2qp0EfI="; + vendorSha256 = "sha256-KABezphT5/o3XWSFNe2OvfawFR8uwsGMnjsI9xh378Q="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix index 3e5c7b0438fd3..adec880eabe04 100644 --- a/pkgs/development/tools/glade/default.nix +++ b/pkgs/development/tools/glade/default.nix @@ -1,6 +1,8 @@ -{ lib, stdenv +{ stdenv +, lib , gettext , fetchurl +, fetchpatch , python3 , meson , ninja @@ -30,6 +32,22 @@ stdenv.mkDerivation rec { sha256 = "1dxsiz9ahqkxg2a1dw9sbd8jg59y5pdz4c1gvnbmql48gmj8gz4q"; }; + patches = [ + # Fix build with meson 0.61 + # data/meson.build:4:5: ERROR: Function does not take positional arguments. + # Taken from https://gitlab.gnome.org/GNOME/glade/-/merge_requests/117 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/glade/-/commit/61304b2e8bac8ded76643cb7c3e781f73881dd2b.patch"; + sha256 = "9x6RK8Wgnm8bDxeBLV3PlUkUuH2706Ba9kwE5S87DgE="; + }) + # help/meson.build:6:6: ERROR: Tried to create target "help-glade-da-update-po", but a target of that name already exists. + # Taken from https://gitlab.gnome.org/GNOME/glade/-/merge_requests/117 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/glade/-/commit/04ba6f969f716fbfe3c7feb7e4bab8678cc1e9eb.patch"; + sha256 = "j3XfF7P6rndL+0PWqnp+QYph7Ba6bgcp4Pkikr2wuJA="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index 7607b1307f441..d7f557edfb019 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UC+1I87PPDuu+/A5zO2Q/Z5KbO/5jHuxsJ0r7a+uDLM="; + sha256 = "sha256-kYAVgQa5NAfZ7EVzO/3fW3A5Zl8uaFXguvxBco8DfRY="; }; - cargoSha256 = "sha256-0ezrcploLboYExcRzNnKj/vWgbJuBhteWi/Imlr4Wsg="; + cargoSha256 = "sha256-Mz+1A7Wg7sh0pxg7umRym3UkXsMkRE0AQDTkt+e7l+s="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; diff --git a/pkgs/development/tools/kube-linter/default.nix b/pkgs/development/tools/kube-linter/default.nix index 1b94b956293d3..d234e458c1846 100644 --- a/pkgs/development/tools/kube-linter/default.nix +++ b/pkgs/development/tools/kube-linter/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-linter"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "stackrox"; repo = pname; rev = "${version}"; - sha256 = "GUDrUEBorV4/ZqPnfNYcsbW4Zr1LpS3yL+4OgxFbTOk="; + sha256 = "nBF/AX4hgZxIj9/RYowpHX1eAJMMhvU7wunvEXWnO80="; }; - vendorSha256 = "xGghTP9thICOGIfc5VPJK06DeXfLiTckwa4nXv83/P8="; + vendorSha256 = "HJW28BZ9qFLtdH1qdW8/K4TzHA2ptekXaMF0XnMKbOY="; ldflags = [ "-s" "-w" "-X golang.stackrox.io/kube-linter/internal/version.version=${version}" diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index e8136be0eb404..62d26c09e514e 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/pkgs/development/tools/misc/cgdb/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { homepage = "https://cgdb.github.io/"; - repositories.git = "git://github.com/cgdb/cgdb.git"; - license = licenses.gpl2Plus; platforms = with platforms; linux ++ cygwin; diff --git a/pkgs/development/tools/misc/gef/default.nix b/pkgs/development/tools/misc/gef/default.nix new file mode 100644 index 0000000000000..0352ebc7cf327 --- /dev/null +++ b/pkgs/development/tools/misc/gef/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, gdb +, python3 +, file +, ps +, git +, coreutils +}: + +let + pythonPath = with python3.pkgs; makePythonPath [ + keystone-engine + unicorn + capstone + ropper + ]; + +in stdenv.mkDerivation rec { + pname = "gef"; + version = "2022.01"; + + src = fetchFromGitHub { + owner = "hugsy"; + repo = "gef"; + rev = version; + sha256 = "sha256-Ot0OYMbXFGCzJdmDHD+LoZRDShCbYJ+IGzLTcU2Rfd4="; + }; + + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/share/gef + cp gef.py $out/share/gef + makeWrapper ${gdb}/bin/gdb $out/bin/gef \ + --add-flags "-q -x $out/share/gef/gef.py" \ + --set NIX_PYTHONPATH ${pythonPath} \ + --prefix PATH : ${lib.makeBinPath [ python3 file ps ]} + ''; + + checkInputs = [ + gdb + file + ps + git + python3 + python3.pkgs.pytest + python3.pkgs.pytest-xdist + python3.pkgs.keystone-engine + python3.pkgs.unicorn + python3.pkgs.capstone + python3.pkgs.ropper + ]; + checkPhase = '' + # Skip some tests that require network access. + sed -i '/def test_cmd_shellcode_get(self):/i \ \ \ \ @unittest.skip(reason="not available in sandbox")' tests/runtests.py + sed -i '/def test_cmd_shellcode_search(self):/i \ \ \ \ @unittest.skip(reason="not available in sandbox")' tests/runtests.py + + # Patch the path to /bin/ls. + sed -i 's+/bin/ls+${coreutils}/bin/ls+g' tests/runtests.py + + # Run the tests. + make test + ''; + + meta = with lib; { + description = "A modern experience for GDB with advanced debugging features for exploit developers & reverse engineers"; + homepage = "https://github.com/hugsy/gef"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ freax13 ]; + }; +} diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index 55e9692a0a3ba..3134c310c4531 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; preBuild = '' - mkdir $out/bin + mkdir -p $out/bin ''; } diff --git a/pkgs/development/tools/oras/default.nix b/pkgs/development/tools/oras/default.nix new file mode 100644 index 0000000000000..94a81144ccc20 --- /dev/null +++ b/pkgs/development/tools/oras/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "oras"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "oras-project"; + repo = "oras"; + rev = "v${version}"; + sha256 = "sha256-6W7vmWFjULIJnOVtgSrCEKw/83W8jNSbM0AF4LZZR6U="; + }; + vendorSha256 = "sha256-3UKsH4Jbq7G5PRwhn5lW0NR80jhmuzT9daa++v2sFWk="; + + ldflags = [ + "-s" + "-w" + "-X github.com/oras-project/oras/internal/version.Version=${version}" + "-X github.com/oras-project/oras/internal/version.BuildMetadata=" + "-X github.com/oras-project/oras/internal/version.GitTreeState=clean" + ]; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/oras --help + $out/bin/oras version | grep "${version}" + + runHook postInstallCheck + ''; + + meta = with lib; { + homepage = "https://oras.land/"; + changelog = "https://github.com/oras-project/oras/releases/tag/v${version}"; + description = "The ORAS project provides a way to push and pull OCI Artifacts to and from OCI Registries"; + license = licenses.asl20; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index c7d22015d47a4..bd676389cd413 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -19,11 +19,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2022.1.8"; + version = "2022.3.23"; src = fetchPypi { inherit pname version; - sha256 = "f84d7119239b22ab2ac2b8fbc7d619d83cf41135206d72a17c4f151cda529fd0"; + sha256 = "sha256-pt9BdR31VTfe5UNJ4dy3eB586zS7mFsITphafg3EP8U="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index ac00e34187823..cadf9b9eeb169 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -40,7 +40,6 @@ in runCommand "systemtap-${kernel.version}-${version}" { nativeBuildInputs = [ makeWrapper ]; meta = { homepage = "https://sourceware.org/systemtap/"; - repositories.git = url; description = "Provides a scripting language for instrumentation on a live kernel plus user-space"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/pkgs/development/tools/protoc-gen-go/default.nix b/pkgs/development/tools/protoc-gen-go/default.nix index 79f97ddd745cc..271d51042e257 100644 --- a/pkgs/development/tools/protoc-gen-go/default.nix +++ b/pkgs/development/tools/protoc-gen-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "protoc-gen-go"; - version = "1.27.1"; + version = "1.28.0"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf-go"; rev = "v${version}"; - sha256 = "sha256-wkUvMsoJP38KMD5b3Fz65R1cnpeTtDcVqgE7tNlZXys="; + sha256 = "sha256-GXXhBXzeFgS4DjY3jDRaJu/9PbfUnmWJiE4BwDBh7Ns="; }; vendorSha256 = "sha256-yb8l4ooZwqfvenlxDRg95rqiL+hmsn0weS/dPv/oD2Y="; diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index 54d568726ddc0..9dbc380d93073 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.10"; + version = "0.9.11"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - sha256 = "0gbh990dd4514bfqh4x2nymh5w608ljp3s7akq100m4v723b6339"; + sha256 = "sha256-aXGXn6kxw37v0fn2SPQnGCdTg1CFJK03OIAgFjvaxpc="; }; - cargoSha256 = "0c0i274dkz3jx9dzcxl9hyf3imiga8vb6m6jc5z1f1wdq3vknh9r"; + cargoSha256 = "sha256-zuPWF2sxVmlhSMy70yhRZEV6dgL2W8AGkYRbnbJdMpQ="; cargoTestFlags = [ # TODO: investigate some more why these tests fail in nix "--" diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 213a8da8ce027..6618c0248514e 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "sha256-L3dHkF7yKnwXpXxCEswwA0TxVfjTzc89l0rpT7EYpIU="; + sha256 = "sha256-sbe16IcHkhsiBznsMKtG/xYJYJfJS6aZ34++QhkGTTc="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index 5752fe1477cf3..dca054db3feaf 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.19.9"; + version = "1.19.10"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cuntghTMGrAcrPunyi9ZWlxDcryYv7R6S3V8WJjEUtQ="; + sha256 = "sha256-RKOAs7MRHcGx6BNBml7WQ81bNvdB9ipd0R1ErLTwjTQ="; }; - cargoSha256 = "sha256-gao8vCfzb81GUte6WAt2x/pxecg443bpQxvUSQCXL40="; + cargoSha256 = "sha256-9GvKDLuDIW5q1R5g20rtSScv2c0sLSo+hI9LSA4W3M8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index 81d4a36a869c3..3b30e2a8af033 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -74,6 +74,7 @@ in rec { preBuild ? "", postBuild ? "", workspaceDependencies ? [], # List of yarn packages + packageResolutions ? {}, }: let extraNativeBuildInputs = @@ -98,7 +99,7 @@ in rec { workspaceJSON = pkgs.writeText "${name}-workspace-package.json" - (builtins.toJSON { private = true; workspaces = ["deps/**"]; }); # scoped packages need second splat + (builtins.toJSON { private = true; workspaces = ["deps/**"]; resolutions = packageResolutions; }); # scoped packages need second splat workspaceDependencyLinks = lib.concatMapStringsSep "\n" (dep: '' @@ -176,6 +177,8 @@ in rec { packageGlobs = if lib.isList package.workspaces then package.workspaces else package.workspaces.packages; + packageResolutions = package.resolutions or {}; + globElemToRegex = lib.replaceStrings ["*"] [".*"]; # PathGlob -> [PathGlobElem] @@ -223,7 +226,7 @@ in rec { inherit name; value = mkYarnPackage ( builtins.removeAttrs attrs ["packageOverrides"] - // { inherit src packageJSON yarnLock workspaceDependencies; } + // { inherit src packageJSON yarnLock packageResolutions workspaceDependencies; } // lib.attrByPath [name] {} packageOverrides ); }) @@ -245,6 +248,7 @@ in rec { extraBuildInputs ? [], publishBinsFor ? null, workspaceDependencies ? [], # List of yarnPackages + packageResolutions ? {}, ... }@attrs: let @@ -264,7 +268,7 @@ in rec { preBuild = yarnPreBuild; postBuild = yarnPostBuild; workspaceDependencies = workspaceDependenciesTransitive; - inherit packageJSON pname version yarnLock offlineCache yarnFlags pkgConfig; + inherit packageJSON pname version yarnLock offlineCache yarnFlags pkgConfig packageResolutions; }; publishBinsFor_ = unlessNull publishBinsFor [pname]; @@ -298,7 +302,7 @@ in rec { '') workspaceDependenciesTransitive; - in stdenv.mkDerivation (builtins.removeAttrs attrs ["yarnNix" "pkgConfig" "workspaceDependencies"] // { + in stdenv.mkDerivation (builtins.removeAttrs attrs ["yarnNix" "pkgConfig" "workspaceDependencies" "packageResolutions"] // { inherit src pname; name = baseName; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 89a64edb72447..894c536fa09a7 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.302"; + version = "0.0.306"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-J6djiBT25cLAWWD0ZQBLju8pef0pG6iYRXUm/5nZm+8="; + sha256 = "sha256-Nnt4Gj+/DbP3tAne99u15GYT099lBTM16O4r0QMuRXA="; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "sha256-ZtP/NgKCXpShCDe7Is/moCNPX7JmxcYMh47B+IgvY/4="; + vendorSha256 = "sha256-n5LZ6WP1LxnhdDKIm8oc3CVFD2jXUEQ/scbOLtMTWQk="; doCheck = false; diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 0efa2b41a9838..5caacbd0d5075 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "5.1.3"; + version = "5.1.4"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "sha256-BacAVAnS3qdmzHGVUdZI2hn4Arp9Qep6cAXRabpB10M="; + sha256 = "sha256-EoMSnT1MmYGeF82XC7Ed9woe8t+xzYJaylLBVpdFvoI="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix index a1bd3ecd451b7..7a3ec5fe4ae3b 100644 --- a/pkgs/development/web/kore/default.nix +++ b/pkgs/development/web/kore/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kore"; - version = "4.1.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "jorisvink"; repo = pname; rev = version; - sha256 = "sha256-w5H1USQ2aladwSFdfYsX925pjCt3QWoXK4HqyEL7rH0="; + sha256 = "sha256-MC4PCjRuAqWuGvNDsZXKohb4HdSWMV0Oc0pZ0rnhG7Y="; }; buildInputs = [ openssl curl postgresql yajl ]; diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 8c115e9b3120c..b877c3aac2fd4 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation { meta = { description = "Open source clone of UFO: Enemy Unknown"; homepage = "https://openxcom.org"; - repositories.git = "https://github.com/SupSuper/OpenXcom.git"; maintainers = [ lib.maintainers.cpages ]; platforms = lib.platforms.linux; license = lib.licenses.gpl3; diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index bf603e2f53080..55c61c4cbd826 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://springlobby.info/"; - repositories.git = "git://github.com/springlobby/springlobby.git"; description = "Cross-platform lobby client for the Spring RTS project"; license = licenses.gpl2; maintainers = with maintainers; [ qknight domenkozar ]; diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 10709102ecf21..c5fba68b22a10 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -228,9 +228,6 @@ in buildFHSUserEnv rec { export TZ="$new_TZ" fi fi - - # XDG_DATA_DIRS is used by pressure-vessel and vulkan loaders to find the corresponding icd - export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/run/opengl-driver/share:/run/opengl-driver-32/share '' + extraProfile; runScript = writeScript "steam-wrapper.sh" '' diff --git a/pkgs/misc/cups/drivers/mfcl2750dw/default.nix b/pkgs/misc/cups/drivers/mfcl2750dw/default.nix new file mode 100644 index 0000000000000..f51a5e74666cf --- /dev/null +++ b/pkgs/misc/cups/drivers/mfcl2750dw/default.nix @@ -0,0 +1,93 @@ +{ lib +, stdenv +, fetchurl +, dpkg +, autoPatchelfHook +, makeWrapper +, perl +, gnused +, ghostscript +, file +, coreutils +, gnugrep +, which +}: + +let + arches = [ "x86_64" "i686" "armv7l" ]; + + runtimeDeps = [ + ghostscript + file + gnused + gnugrep + coreutils + which + ]; +in + +stdenv.mkDerivation rec { + pname = "cups-brother-mfcl2750dw"; + version = "4.0.0-1"; + + nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook ]; + buildInputs = [ perl ]; + + dontUnpack = true; + + src = fetchurl { + url = "https://download.brother.com/welcome/dlf103530/mfcl2750dwpdrv-${version}.i386.deb"; + hash = "sha256-3uDwzLQTF8r1tsGZ7ChGhk4ryQmVsZYdUaj9eFaC0jc="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out + dpkg-deb -x $src $out + + # delete unnecessary files for the current architecture + '' + lib.concatMapStrings (arch: '' + echo Deleting files for ${arch} + rm -r "$out/opt/brother/Printers/MFCL2750DW/lpd/${arch}" + '') (builtins.filter (arch: arch != stdenv.hostPlatform.linuxArch) arches) + '' + + # bundled scripts don't understand the arch subdirectories for some reason + ln -s \ + "$out/opt/brother/Printers/MFCL2750DW/lpd/${stdenv.hostPlatform.linuxArch}/"* \ + "$out/opt/brother/Printers/MFCL2750DW/lpd/" + + # Fix global references and replace auto discovery mechanism with hardcoded values + substituteInPlace $out/opt/brother/Printers/MFCL2750DW/lpd/lpdfilter \ + --replace /opt "$out/opt" \ + --replace "my \$BR_PRT_PATH =" "my \$BR_PRT_PATH = \"$out/opt/brother/Printers/MFCL2750DW\"; #" \ + --replace "PRINTER =~" "PRINTER = \"MFCL2750DW\"; #" + + # Make sure all executables have the necessary runtime dependencies available + find "$out" -executable -and -type f | while read file; do + wrapProgram "$file" --prefix PATH : "${lib.makeBinPath runtimeDeps}" + done + + # Symlink filter and ppd into a location where CUPS will discover it + mkdir -p $out/lib/cups/filter + mkdir -p $out/share/cups/model + + ln -s \ + $out/opt/brother/Printers/MFCL2750DW/lpd/lpdfilter \ + $out/lib/cups/filter/brother_lpdwrapper_MFCL2750DW + + ln -s \ + $out/opt/brother/Printers/MFCL2750DW/cupswrapper/brother-MFCL2750DW-cups-en.ppd \ + $out/share/cups/model/ + + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://www.brother.com/"; + description = "Brother MFC-L2750DW printer driver"; + license = licenses.unfree; + platforms = builtins.map (arch: "${arch}-linux") arches; + maintainers = [ maintainers.lovesegfault ]; + }; +} diff --git a/pkgs/os-specific/darwin/m-cli/default.nix b/pkgs/os-specific/darwin/m-cli/default.nix index f19f5a0275bce..939ff36ef0ce2 100644 --- a/pkgs/os-specific/darwin/m-cli/default.nix +++ b/pkgs/os-specific/darwin/m-cli/default.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Swiss Army Knife for macOS"; inherit (src.meta) homepage; - repositories.git = "git://github.com/rgcr/m-cli.git"; license = licenses.mit; diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index fb75b99f03d90..ab9b7055fdda4 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -135,6 +135,5 @@ in stdenv.mkDerivation rec { homepage = "http://www.bluez.org/"; license = with licenses; [ gpl2 lgpl21 ]; platforms = platforms.linux; - repositories.git = "https://git.kernel.org/pub/scm/bluetooth/bluez.git"; }; } diff --git a/pkgs/os-specific/linux/earlyoom/default.nix b/pkgs/os-specific/linux/earlyoom/default.nix index 46e83609722a6..ad7468bac0f55 100644 --- a/pkgs/os-specific/linux/earlyoom/default.nix +++ b/pkgs/os-specific/linux/earlyoom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pandoc, installShellFiles, withManpage ? false }: +{ lib, stdenv, fetchFromGitHub, pandoc, installShellFiles, withManpage ? false, nixosTests }: stdenv.mkDerivation rec { pname = "earlyoom"; @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { installManPage earlyoom.1 ''; + passthru.tests = { + inherit (nixosTests) earlyoom; + }; + meta = with lib; { description = "Early OOM Daemon for Linux"; homepage = "https://github.com/rfjakob/earlyoom"; diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 8124da489aee2..3fdbaa9149a68 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -73,7 +73,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://hostap.epitest.fi"; - repositories.git = "git://w1.fi/hostap.git"; description = "A user space daemon for access point and authentication servers"; license = licenses.gpl2; maintainers = with maintainers; [ ninjatrappeur hexa ]; diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix index 7de8046483d41..9af2aba3d8066 100644 --- a/pkgs/os-specific/linux/i7z/default.nix +++ b/pkgs/os-specific/linux/i7z/default.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A better i7 (and now i3, i5) reporting tool for Linux"; homepage = "https://github.com/DimitryAndric/i7z"; - repositories.git = "https://github.com/DimitryAndric/i7z.git"; license = licenses.gpl2; maintainers = with maintainers; [ bluescreen303 ]; # broken on ARM diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 458f70a6a04ba..22d53bb2de68d 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -482,6 +482,7 @@ let DEFAULT_SECURITY_APPARMOR = yes; RANDOM_TRUST_CPU = whenAtLeast "4.19" yes; # allow RDRAND to seed the RNG + RANDOM_TRUST_BOOTLOADER = whenAtLeast "5.4" yes; # allow the bootloader to seed the RNG MODULE_SIG = no; # r13y, generates a random key during build and bakes it in # Depends on MODULE_SIG and only really helps when you sign your modules diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index dec0ebb154acd..00613f51606c0 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.106"; + version = "5.10.107"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0yjrlghcxw3lhd6nc2m4zy4gk536w3a3w6mxdsml690fqz4531n6"; + sha256 = "1snzzhkzdjlj92gqig3sanxlhv0xc0xk2xwjdjr0yds6g43w6ry4"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 7b76ab0c8a51b..0cfb2c91df0ed 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.29"; + version = "5.15.30"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -15,6 +15,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0vl7xm4xs59z071wfjna392yada3hg5h6h3dfjaswircc22fc1ar"; + sha256 = "0ckiz985x88x68psg6wazyk7zpv34k8rbzpzyzj0gaph13za4ki5"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.16.nix b/pkgs/os-specific/linux/kernel/linux-5.16.nix index 1fadc0d420e12..63dc8d0463a9d 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.16.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.16.15"; + version = "5.16.16"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1mi41npkk1inqchm3yp14xmzc5lrp50d7vbpazwxwq5kw04c8c4g"; + sha256 = "13qk6cjnjwgnxj25mphyv08pjf1sqz7bxxrr3fpl8gz3aghdd9yc"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index c234b4f898c40..b895855858824 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.185"; + version = "5.4.186"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "11rp3x05bq9cs9gwy4x36ynkgl7nb5ss29zi6m7n5ywvczdfjpyi"; + sha256 = "1f9rigm58miq5s98bx7pvylqi9hlzlfnq1nrj4cd8f4arcjcvxv1"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 50b3f18e9e215..cf0744bce6818 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.104-rt63"; # updated by ./update-rt.sh + version = "5.10.106-rt64"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1wb2ql58md45wi49bp3rck7ppgisyjdl7lxarzqd094fx9kr4jir"; + sha256 = "0yjrlghcxw3lhd6nc2m4zy4gk536w3a3w6mxdsml690fqz4531n6"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "17ivd6dm49axc9k6cqf39wjjqrjqbj5xd3n7lqk7vv95rg9fg0g7"; + sha256 = "0z5gyi1vyjyd05vyccmk9yfgvm5v1lc8vbfywahx495xzpp9i8xb"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 1ac9cbe00ead6..220f09ed8b505 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -301,7 +301,6 @@ let + ")"); license = lib.licenses.gpl2Only; homepage = "https://www.kernel.org/"; - repositories.git = "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"; maintainers = lib.teams.linux-kernel.members ++ [ maintainers.thoughtpolice ]; diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix index 072b53b02ec22..f8a519de847e2 100644 --- a/pkgs/os-specific/linux/ldm/default.nix +++ b/pkgs/os-specific/linux/ldm/default.nix @@ -4,7 +4,6 @@ assert mountPath != ""; let version = "0.5"; - git = "https://github.com/LemonBoy/ldm.git"; in stdenv.mkDerivation rec { pname = "ldm"; @@ -13,7 +12,7 @@ stdenv.mkDerivation rec { # There is a stable release, but we'll use the lvm branch, which # contains important fixes for LVM setups. src = fetchgit { - url = meta.repositories.git; + url = "https://github.com/LemonBoy/ldm"; rev = "refs/tags/v${version}"; sha256 = "0lxfypnbamfx6p9ar5k9wra20gvwn665l4pp2j4vsx4yi5q7rw2n"; }; @@ -36,8 +35,6 @@ stdenv.mkDerivation rec { meta = { description = "A lightweight device mounter, with libudev as only dependency"; license = lib.licenses.mit; - platforms = lib.platforms.linux; - repositories.git = git; }; } diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 0c3d64ace9c4b..695f173da8fc3 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -36,6 +36,11 @@ noFlake= # comma separated list of vars to preserve when using sudo preservedSudoVars=NIXOS_INSTALL_BOOTLOADER +# log the given argument to stderr +log() { + echo "$@" >&2 +} + while [ "$#" -gt 0 ]; do i="$1"; shift 1 case "$i" in @@ -47,7 +52,7 @@ while [ "$#" -gt 0 ]; do action="$i" ;; --install-grub) - echo "$0: --install-grub deprecated, use --install-bootloader instead" >&2 + log "$0: --install-grub deprecated, use --install-bootloader instead" export NIXOS_INSTALL_BOOTLOADER=1 ;; --install-bootloader) @@ -91,7 +96,7 @@ while [ "$#" -gt 0 ]; do ;; --profile-name|-p) if [ -z "$1" ]; then - echo "$0: ‘--profile-name’ requires an argument" + log "$0: ‘--profile-name’ requires an argument" exit 1 fi if [ "$1" != system ]; then @@ -132,7 +137,7 @@ while [ "$#" -gt 0 ]; do lockFlags+=("$i" "$j" "$k") ;; *) - echo "$0: unknown option \`$i'" + log "$0: unknown option \`$i'" exit 1 ;; esac @@ -239,7 +244,7 @@ nixBuild() { NIX_SSHOPTS=$SSHOPTS runCmd nix-copy-closure --to "$buildHost" "$drv" buildHostCmd nix-store -r "$drv" "${buildArgs[@]}" else - echo "nix-instantiate failed" + log "nix-instantiate failed" exit 1 fi fi @@ -290,7 +295,7 @@ nixFlakeBuild() { NIX_SSHOPTS=$SSHOPTS runCmd nix "${flakeFlags[@]}" copy --derivation --to "ssh://$buildHost" "$drv" buildHostCmd nix-store -r "$drv" "${buildArgs[@]}" else - echo "nix eval failed" + log "nix eval failed" exit 1 fi fi @@ -425,13 +430,13 @@ prebuiltNix() { elif [[ "$machine" = aarch64 ]]; then echo @nix_aarch64_linux@ else - echo "$0: unsupported platform" + log "$0: unsupported platform" exit 1 fi } if [[ -n $buildNix && -z $flake ]]; then - echo "building Nix..." >&2 + log "building Nix..." nixDrv= if ! nixDrv="$(runCmd nix-instantiate '<nixpkgs/nixos>' --add-root "$tmpDir/nix.drv" --indirect -A config.nix.package.out "${extraBuildFlags[@]}")"; then if ! nixDrv="$(runCmd nix-instantiate '<nixpkgs>' --add-root "$tmpDir/nix.drv" --indirect -A nix "${extraBuildFlags[@]}")"; then @@ -440,7 +445,7 @@ if [[ -n $buildNix && -z $flake ]]; then fi if ! runCmd nix-store -r "$nixStorePath" --add-root "${tmpDir}/nix" --indirect \ --option extra-binary-caches https://cache.nixos.org/; then - echo "warning: don't know how to get latest Nix" >&2 + log "warning: don't know how to get latest Nix" fi # Older version of nix-store -r don't support --add-root. [ -e "$tmpDir/nix" ] || ln -sf "$nixStorePath" "$tmpDir/nix" @@ -450,7 +455,7 @@ if [[ -n $buildNix && -z $flake ]]; then if ! buildHostCmd nix-store -r "$remoteNixStorePath" \ --option extra-binary-caches https://cache.nixos.org/ >/dev/null; then remoteNix= - echo "warning: don't know how to get latest Nix" >&2 + log "warning: don't know how to get latest Nix" fi fi fi @@ -490,7 +495,7 @@ fi # or "boot"), or just build it and create a symlink "result" in the # current directory (for "build" and "test"). if [ -z "$rollback" ]; then - echo "building the system configuration..." >&2 + log "building the system configuration..." if [[ "$action" = switch || "$action" = boot ]]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '<nixpkgs/nixos>' --no-out-link -A system "${extraBuildFlags[@]}")" @@ -547,7 +552,7 @@ fi # default and/or activate it now. if [[ "$action" = switch || "$action" = boot || "$action" = test || "$action" = dry-activate ]]; then if ! targetHostCmd "$pathToConfig/bin/switch-to-configuration" "$action"; then - echo "warning: error(s) occurred while switching to the new configuration" >&2 + log "warning: error(s) occurred while switching to the new configuration" exit 1 fi fi diff --git a/pkgs/os-specific/linux/projecteur/default.nix b/pkgs/os-specific/linux/projecteur/default.nix new file mode 100644 index 0000000000000..63de7453935ce --- /dev/null +++ b/pkgs/os-specific/linux/projecteur/default.nix @@ -0,0 +1,32 @@ +{ lib, mkDerivation, fetchFromGitHub, + cmake, pkg-config, + qtbase, qtgraphicaleffects, wrapQtAppsHook }: +mkDerivation rec { + pname = "projecteur"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "jahnf"; + repo = "Projecteur"; + rev = "v${version}"; + fetchSubmodules = false; + sha256 = "sha256-kg6oYtJ4H5A6RNATBg+XvMfCb9FlhEBFjfxamGosMQg="; + }; + + buildInputs = [ qtbase qtgraphicaleffects ]; + nativeBuildInputs = [ wrapQtAppsHook cmake pkg-config ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_PREFIX:PATH=${placeholder "out"}" + "-DPACKAGE_TARGETS=OFF" + "-DCMAKE_INSTALL_UDEVRULESDIR=${placeholder "out"}/lib/udev/rules.d" + ]; + + meta = with lib; { + description = "Linux/X11 application for the Logitech Spotlight device (and similar devices)."; + homepage = "https://github.com/jahnf/Projecteur"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ benneti ]; + }; +} diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix index 6fa15358582cc..de4dd52e511ca 100644 --- a/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -6,13 +6,13 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi in stdenv.mkDerivation rec { pname = "rtl8192eu"; - version = "${kernel.version}-4.4.1.20211023"; + version = "${kernel.version}-4.4.1.20220313"; src = fetchFromGitHub { owner = "Mange"; repo = "rtl8192eu-linux-driver"; - rev = "744bbe52976e51895fce2c1d4075f97a98dca2b2"; - sha256 = "1ayb3fljvpljwcgi47h8vj2d2w5imqyjxc7mvmfrvmilzg5d5cj7"; + rev = "e0f967cea1d0037c730246c572f7fef000865ff7"; + sha256 = "sha256-Wgp1MZ/z8AxbZPYsmR6t7Q4nsL0TFEqTEsrkkWPI6gI="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix index 0ea0682214bf7..a3d767d2ee676 100644 --- a/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rtl8821cu"; - version = "${kernel.version}-unstable-2021-10-21"; + version = "${kernel.version}-unstable-2022-03-08"; src = fetchFromGitHub { owner = "morrownr"; - repo = "8821cu"; - rev = "4e2d84c5e70245f850877f355e8bf293f252f61c"; - sha256 = "1j32psvfgzfs5b1pdff6xk76iz7j8scakji6zm3vgqb2ssbxx1k1"; + repo = "8821cu-20210118"; + rev = "4bdd7c8668562e43564cd5d786055633e591ad4d"; + sha256 = "sha256-dfvDpjsra/nHwIGywOkZICTEP/Ex7ooH4zzkXqAaDkI="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix index 1f27c262e673e..f975cc2b420b4 100644 --- a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, kernel }: let - rev = "307d694076b056588c652c2bdaa543a89eb255d9"; + rev = "37e27f9165300c89607144b646545fac576ec510"; in stdenv.mkDerivation rec { pname = "rtl88xxau-aircrack"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "aircrack-ng"; repo = "rtl8812au"; inherit rev; - sha256 = "sha256-iSJnKWc+LxGHUhb/wbFSMh7w6Oi9v4v5V+R+LI96X7w="; + sha256 = "sha256-TpmpueKAaCe7Nlmv8pMvgMXGVmXVa/1mBwtEoy4JyCY="; }; buildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index 434aeeb3a198a..c6d66427ab20f 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -12,8 +12,6 @@ let meta = with lib; { homepage = "https://qpid.apache.org"; - repositories.git = "git://git.apache.org/qpid.git"; - repositories.svn = "http://svn.apache.org/repos/asf/qpid"; description = "An AMQP message broker and a C++ messaging API"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/servers/dns/https-dns-proxy/default.nix b/pkgs/servers/dns/https-dns-proxy/default.nix index c32d3eca22637..5e2efae8a2878 100644 --- a/pkgs/servers/dns/https-dns-proxy/default.nix +++ b/pkgs/servers/dns/https-dns-proxy/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "https-dns-proxy"; # there are no stable releases (yet?) - version = "unstable-20200419"; + version = "unstable-2021-03-29"; src = fetchFromGitHub { owner = "aarond10"; repo = "https_dns_proxy"; - rev = "79fc7b085e3b1ad64c8332f7115dfe2bf5f1f3e4"; - sha256 = "1cdfswfjby4alp6gy7yyjm76kfyclh5ax0zadnqs2pyigg9plh0b"; + rev = "bbd9ef272dcda3ead515871f594768af13192af7"; + sha256 = "sha256-r+IpDklI3vITK8ZlZvIFm3JdDe2r8DK2ND3n1a/ThrM="; }; nativeBuildInputs = [ cmake gtest ]; diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index 4a6adb2b024a1..75282ad15c4f0 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2"; - version = "2.9.6"; + version = "2.10.0"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - sha256 = "sha256:1kcn1kkhm8fkwhjqmpysd2hvnrvh6bka8r67yq8d58m117l9wnpq"; + sha256 = "sha256:0fhhq6mzpwj3dh6w583n4sngshf15dm8zgbli5cacy7jkzmsz0wn"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/icingaweb2/ipl.nix b/pkgs/servers/icingaweb2/ipl.nix index 7e67e645be911..e9075d7d043a4 100644 --- a/pkgs/servers/icingaweb2/ipl.nix +++ b/pkgs/servers/icingaweb2/ipl.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2-ipl"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Icinga"; repo = "icinga-php-library"; rev = "v${version}"; - sha256 = "sha256:118bg9mxjxajm2ydbycgqdmdx8przwxblsaxc373r0g1dp1lv0fz"; + sha256 = "sha256:05k0qcd5c5xb124dpp6lvfdh4dzf6bkd34v4sy7aj776p4hrlqx2"; }; installPhase = '' diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 9d8a2b31bf127..19268de42ff1d 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -50,9 +50,11 @@ stdenv.mkDerivation rec { ln -s ${mkModuleXml "com.mysql" "mysql-connector-java.jar"} $module_path/com/mysql/main/module.xml ''} - wrapProgram $out/bin/standalone.sh --set JAVA_HOME ${jre} - wrapProgram $out/bin/add-user-keycloak.sh --set JAVA_HOME ${jre} - wrapProgram $out/bin/jboss-cli.sh --set JAVA_HOME ${jre} + for script in add-user-keycloak.sh add-user.sh domain.sh elytron-tool.sh jboss-cli.sh jconsole.sh jdr.sh standalone.sh wsconsume.sh wsprovide.sh; do + wrapProgram $out/bin/$script --set JAVA_HOME ${jre} + done + wrapProgram $out/bin/kcadm.sh --prefix PATH : ${jre}/bin + wrapProgram $out/bin/kcreg.sh --prefix PATH : ${jre}/bin ''; passthru.tests = nixosTests.keycloak; diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index e2932c16a1092..490bb9c9e094e 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -36,6 +36,11 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/klipper cp -r ./* $out/lib/klipper + # Moonraker expects `config_examples` and `docs` to be available + # under `klipper_path` + cp -r $src/docs $out/lib/docs + cp -r $src/config $out/lib/config + chmod 755 $out/lib/klipper/klippy.py runHook postInstall ''; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 824e90b4869f7..4461930b13cc9 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A distributed memory object caching system"; - repositories.git = "https://github.com/memcached/memcached.git"; homepage = "http://memcached.org/"; license = licenses.bsd3; maintainers = [ maintainers.coconnor ]; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 9823ee5dddd38..afa537bddd46c 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2022-03-17T06-34-49Z"; + version = "2022-03-22T02-05-10Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-iHwFkxfSLrtzSiOmfVFggBvfL0SL6ZLVJWMGK3RHZGU="; + sha256 = "sha256-N0ua+XHkLr33PElSdOzVQF3POPU+lx4/M6LJzxtkisI="; }; - vendorSha256 = "sha256-ujkrbP7FuL7jdYTRaGMEYha1BJKJnpCssuO47XGMBGo="; + vendorSha256 = "sha256-Ql3J2r489Hzhy6E9uZwQXJIw/njb5oafCYjOyWGzbXs="; doCheck = false; diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index da235ff96fb23..2349bac177c9f 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "blackbox_exporter"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "1lrabbp6nsd9h3hs3y5a37yl4g8zzkv0m3vhz2vrir3wmfn07n4g"; + sha256 = "sha256-Y3HdFIChkQVooxy2I2Gbqw3WLHsI4Zm+osHTzFluRZA="; }; - vendorSha256 = "1wi9dmbxb6i1qglnp1v0lkqpp7l29lrbsg4lvx052nkcwkgq8g1y"; + vendorSha256 = "sha256-KFLR0In4txQQp5dt8P0yAFtf82b4SBq2xMnlz+vMuuU="; # dns-lookup is performed for the tests doCheck = false; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 7d40e919773d1..0da2bb604a0b1 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -1,4 +1,7 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests + # darwin + , CoreFoundation, IOKit +}: buildGoModule rec { pname = "node_exporter"; @@ -17,6 +20,13 @@ buildGoModule rec { # FIXME: tests fail due to read-only nix store doCheck = false; + buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation IOKit ]; + # upstream currently doesn't work with the version of the macOS SDK + # we're building against in nix-darwin without a patch. + # this patch has been submitted upstream at https://github.com/prometheus/node_exporter/pull/2327 + # and only needs to be carried until it lands in a new release. + patches = lib.optionals stdenv.isDarwin [ ./node-exporter/node-exporter-darwin.patch ]; + excludedPackages = [ "docs/node-mixin" ]; ldflags = [ diff --git a/pkgs/servers/monitoring/prometheus/node-exporter/node-exporter-darwin.patch b/pkgs/servers/monitoring/prometheus/node-exporter/node-exporter-darwin.patch new file mode 100644 index 0000000000000..8077bbc47511e --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/node-exporter/node-exporter-darwin.patch @@ -0,0 +1,17 @@ +diff --git a/collector/powersupplyclass_darwin.go b/collector/powersupplyclass_darwin.go +index a070f64..01d7f18 100644 +--- a/collector/powersupplyclass_darwin.go ++++ b/collector/powersupplyclass_darwin.go +@@ -18,9 +18,11 @@ package collector + + /* + #cgo LDFLAGS: -framework IOKit -framework CoreFoundation ++#include <CoreFoundation/CFNumber.h> ++#include <CoreFoundation/CFRunLoop.h> ++#include <CoreFoundation/CFString.h> + #include <IOKit/ps/IOPowerSources.h> + #include <IOKit/ps/IOPSKeys.h> +-#include <CoreFoundation/CFArray.h> + + // values collected from IOKit Power Source APIs + // Functions documentation available at diff --git a/pkgs/servers/moonraker/default.nix b/pkgs/servers/moonraker/default.nix index 31525464c0cc3..2350cd18042a1 100644 --- a/pkgs/servers/moonraker/default.nix +++ b/pkgs/servers/moonraker/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenvNoCC, fetchFromGitHub, python3, makeWrapper, unstableGitUpdater }: +{ lib, stdenvNoCC, fetchFromGitHub, python3, makeWrapper, unstableGitUpdater, nixosTests }: let pythonEnv = python3.withPackages (packages: with packages; [ tornado - pyserial + pyserial-asyncio pillow lmdb streaming-form-data @@ -12,16 +12,21 @@ let libnacl paho-mqtt pycurl + zeroconf + preprocess-cancellation + jinja2 + dbus-next + apprise ]); in stdenvNoCC.mkDerivation rec { pname = "moonraker"; - version = "unstable-2021-12-05"; + version = "unstable-2022-03-10"; src = fetchFromGitHub { owner = "Arksine"; repo = "moonraker"; - rev = "ac73036857cc1ca83df072dd94bf28eb9d0ed8b0"; - sha256 = "Oqjt0z4grt+hdQ4t7KQSwkkCeRGoFFedJsTpMHwMm34="; + rev = "ee312ee9c6597c8d077d7c3208ccea4e696c97ca"; + sha256 = "l0VOQIfKgZ/Je4z+SKhWMgYzxye8WKs9W1GkNs7kABo="; }; nativeBuildInputs = [ makeWrapper ]; @@ -34,7 +39,10 @@ in stdenvNoCC.mkDerivation rec { --add-flags "$out/lib/moonraker/moonraker.py" ''; - passthru.updateScript = unstableGitUpdater { url = meta.homepage; }; + passthru = { + updateScript = unstableGitUpdater { url = meta.homepage; }; + tests.moonraker = nixosTests.moonraker; + }; meta = with lib; { description = "API web server for Klipper"; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index d9a4465a10a45..92e8d6ff5d21e 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -46,13 +46,13 @@ in { ''; nextcloud22 = generic { - version = "22.2.5"; - sha256 = "sha256-gb5N0u5tu4/nI2xIpjXwm2hiSDCrBhIDyN6gKGOsdS8="; + version = "22.2.6"; + sha256 = "0f1d0f0cb000c51b11886be25a8adce478846c3233572fcf28b44c5d4036e235"; }; nextcloud23 = generic { - version = "23.0.2"; - sha256 = "sha256-ngJGLTjqq2RX/KgHe9Rv54w6qtRC6RpuEuMvp9UbxO4="; + version = "23.0.3"; + sha256 = "39401d400fab02a84a175ea6e995b8ed4110fbaea48c876230b4f09755a62986"; }; # tip: get she sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index aec7178281e33..861d66b3d04f3 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.25.7.5604-980a13e02"; + version = "1.25.8.5663-e071c3d62"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - hash = "sha256-X0KaaX5NvF04pyRHSUeHtXQ+OTv9BK0bzDl1J5C6Vts="; + hash = "sha256-w9k8phyiA/sK+zRlK8PAciebt5UJvmVFA+cfx4r78Gs="; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - hash = "sha256-tqpOQDdHBl55jSyonNV7/UjCcx6jY9VdAzh/zBA/CAs="; + hash = "sha256-baOofe+7PZfLhwIXrB1ibKkkEJRVivgGHDN4phlg57Q="; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/sql/patroni/default.nix b/pkgs/servers/sql/patroni/default.nix index 846e61a5b4649..abf84d4bc6688 100644 --- a/pkgs/servers/sql/patroni/default.nix +++ b/pkgs/servers/sql/patroni/default.nix @@ -5,13 +5,13 @@ pythonPackages.buildPythonApplication rec { pname = "patroni"; - version = "2.0.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "zalando"; repo = pname; rev = "v${version}"; - sha256 = "048g211njwmgl2v7nx6x5x82b4bbp35n234z7ah10aybm3yrxnc7"; + sha256 = "sha256-cBkiBrty/6A3rIv9A1oh8GvPjwxhHwYEKuDIsNzHw1g="; }; # cdiff renamed to ydiff; remove when patroni source reflects this. diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 7d52b3a0a2665..31884fd802236 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -51,15 +51,8 @@ in version = "6.0.10"; sha256 = "1sr60wg5mzjb14y75cga836f19sbmmpgh13mwc4alyg3irsbz1bb"; }; - varnish70 = (common { - version = "7.0.2"; - sha256 = "0q9z1iilqwbh5flfy9pl18kxv0yjs5z91c4j81z5pgyjd9d4jjjj"; - }).overrideAttrs (oA: { - patches = [ - (fetchpatch { - url = "https://github.com/varnishcache/varnish-cache/commit/20e007a5b17c1f68f70ab42080de384f9e192900.patch"; - sha256 = "0vvihbjknb0skdv2ksn2lz89pwmn4f2rjmb6q65cvgnnjfj46s82"; - }) - ]; - }); + varnish71 = common { + version = "7.1.0"; + sha256 = "1flyqr212jamqpwafdil170vc966r1mbb7n3ngjn8xk6hn3bhjpm"; + }; } diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index 257b421112ed5..60141b1382965 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -1,4 +1,4 @@ -{ callPackages, callPackage, varnish60, varnish70, fetchFromGitHub }: { +{ callPackages, callPackage, varnish60, varnish71, fetchFromGitHub }: { varnish60Packages = rec { varnish = varnish60; modules = (callPackages ./modules.nix { inherit varnish; }).modules15; @@ -13,8 +13,8 @@ sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; }; }; - varnish70Packages = rec { - varnish = varnish70; + varnish71Packages = rec { + varnish = varnish71; modules = (callPackages ./modules.nix { inherit varnish; }).modules19; digest = callPackage ./digest.nix { inherit varnish; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 03fffa9ba95c0..c10951239a320 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2022-03-18"; + version = "2022-03-22"; pname = "oh-my-zsh"; - rev = "c96fc233c4903ba75fba5bc55e7f91f9dc8e460e"; + rev = "50113a53f379b7d98e6921ba58e8440324beb32c"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "HCFbdo08Um3ut9SngtHDbl/w265G6OOb+RF/liE1Rlg="; + sha256 = "RBaJ6/NmPS106xWEj47zBsTWSOp19aq3WTyXcdA5T3c="; }; installPhase = '' diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 40cedd713ab06..8ad5fa6b89bdf 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -240,7 +240,6 @@ let outputsToInstall = listOf str; position = str; available = bool; - repositories = attrsOf str; isBuildPythonPackage = platforms; schedulingPriority = int; isFcitxEngine = bool; diff --git a/pkgs/test/nixos-functions/default.nix b/pkgs/test/nixos-functions/default.nix index 6a4f3164f9296..a59160511b91f 100644 --- a/pkgs/test/nixos-functions/default.nix +++ b/pkgs/test/nixos-functions/default.nix @@ -26,14 +26,14 @@ in lib.optionalAttrs stdenv.hostPlatform.isLinux ( fileSystems."/".device = "/dev/null"; }).toplevel; - nixosTest-test = pkgs.nixosTest ({ lib, pkgs, ... }: { + nixosTest-test = pkgs.nixosTest ({ lib, pkgs, figlet, ... }: { name = "nixosTest-test"; machine = { pkgs, ... }: { system.nixos = dummyVersioning; - environment.systemPackages = [ pkgs.hello ]; + environment.systemPackages = [ pkgs.hello figlet ]; }; testScript = '' - machine.succeed("hello") + machine.succeed("hello | figlet >/dev/console") ''; }); diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index efbde87b6daf1..ee0ec6d662877 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -29,8 +29,8 @@ sha256 = "07zwhy1jfgwqcybyalrlwrqfkddk1xkqgb9g8dmgs2krx8fp9bsv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.38.1-linux-amd64.tar.gz"; - sha256 = "0rwkdizd1hqn86vfkxli7l4syp860rgil2m01l76pbpcx11yc7zb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.0.0-linux-amd64.tar.gz"; + sha256 = "1h9pypyl6k1qhvwd6vkzahwmva6zbjribfh04rydhw4gn3rhlzrd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.18.0-linux-amd64.tar.gz"; @@ -73,12 +73,12 @@ sha256 = "0n1xqsfsqi773lwg9xbvglrd4pfb060fq8llxf06qj8h2imlxx34"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.16.0-linux-amd64.tar.gz"; - sha256 = "10lm10affn92qwzgry2iab5ry6bcnx5iiy2cihxk9kgb6716wql3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.17.0-linux-amd64.tar.gz"; + sha256 = "1dbkkrb66iz2z66bj6qhhwhaz3s0md1xgm4mgw0bcdlirkrv1kpd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.10.0-linux-amd64.tar.gz"; - sha256 = "1lni4wzmdhjbchjjx9z5iqawv4x1bixl3s541h39cr4x3y36m66m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.10.1-linux-amd64.tar.gz"; + sha256 = "0bs0haa863a2qwwx140911mh2xprgyv316y98jcm8qbl03lmyzvs"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.6.0-linux-amd64.tar.gz"; @@ -117,12 +117,12 @@ sha256 = "05nfdwgfzi5f3hgj2g6dccaidqf9a9xzlv5vp3cd1rsxd159yk9j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.1-linux-amd64.tar.gz"; - sha256 = "1yianshwmlxs70h4a19c9006n29rp6qz3nf6n0kb5l52psmq679m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.2-linux-amd64.tar.gz"; + sha256 = "0agf96ji7mzkf4k4axm1v3psm5wkml41714dz88rn0csq0b31ca9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.5.1-linux-amd64.tar.gz"; - sha256 = "0a1q41cl9r93n8zvl25sd33mxvi0ysa10lz84x59sybfay4f7ppc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.5.2-linux-amd64.tar.gz"; + sha256 = "0b3sj2waa3l6x4xrrsf1dq4ax3n7v5r8n0wzmk9cbgmdx97297df"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.15.0-linux-amd64.tar.gz"; @@ -187,8 +187,8 @@ sha256 = "0bz177xi0ifhx14jq01i94gdqgjsivikmhrf24y27k96jq7n15ld"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.38.1-darwin-amd64.tar.gz"; - sha256 = "0qaf9q7ijkysvvnxrb942c2r6hj4y97kjfxnlwgjx1jvnv1l9859"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.0.0-darwin-amd64.tar.gz"; + sha256 = "1kw005yvima4bjkg5sa8ynixgrcapdbcnxd6s4qpgjli6q4imx8h"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.18.0-darwin-amd64.tar.gz"; @@ -231,12 +231,12 @@ sha256 = "0i3aysdy7i13fx2a2kpnvd3qpn7vmc2mbln718kks3mikiz26aii"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.16.0-darwin-amd64.tar.gz"; - sha256 = "1sdir66pqdxy5zwbx1ssv8bl63zvbzfapl3j5dl99zgjaw4k3mgx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.17.0-darwin-amd64.tar.gz"; + sha256 = "1cwdy4yr3c7wcj3p0sg1k0q6b6sn0mhlpqkbdi4xfk990d88c78c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.10.0-darwin-amd64.tar.gz"; - sha256 = "0i49x5s7sw69y19qmsrbrwhmjv7g07qrs5a3l1l8bsqawif5r65z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.10.1-darwin-amd64.tar.gz"; + sha256 = "0a8lycsgk2xawhg9yd6lkbfg7j6v6l3m0llvdzs0drb2k954wbym"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.6.0-darwin-amd64.tar.gz"; @@ -275,12 +275,12 @@ sha256 = "0q19sh7l1mjl40i5vdsrjfldncxnicalmlgv3yjkw5xpxkgr98z0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.1-darwin-amd64.tar.gz"; - sha256 = "13r63s8llr3v1jvl790gcirm0n1m3nhkalrdpm9ssnhyrgfcxpj0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.2-darwin-amd64.tar.gz"; + sha256 = "1wmvmhxnjp32kp43fhjp8w9nrb0biki63w23l4zjxsdk7njply7c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.5.1-darwin-amd64.tar.gz"; - sha256 = "1wswpqliibq1kr8vv4l6kqw57cbw76nrh4fnvdzvrcl4rhpbjrc8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.5.2-darwin-amd64.tar.gz"; + sha256 = "0digqqr920g2ahmbiyird7kidnk0j04bbzb9nr2p6lgmdd659ayq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.15.0-darwin-amd64.tar.gz"; @@ -345,8 +345,8 @@ sha256 = "0y519wmpq6iin20kqidw7b2zkqr6zky09lfsi10klbn0gzfpwbl5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.38.1-linux-arm64.tar.gz"; - sha256 = "0wv7c6sp4i64wq5v90k4zpxnzyrhhv34cwa1i4g4pgqfh6ahaz56"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.0.0-linux-arm64.tar.gz"; + sha256 = "10ch53avymp9j7f41mapl4ffi005vddy8x39ya1kn682i6a0y1ks"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.18.0-linux-arm64.tar.gz"; @@ -389,12 +389,12 @@ sha256 = "0qpan6zvny2h2ckigwnf4dhsgmnywam1m4d2jp0nj9pm3628pldv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.16.0-linux-arm64.tar.gz"; - sha256 = "0f8n8q1in0n4z2lzd0y065ksszv05dgn2lgsa8snmxlwfkrx955h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.17.0-linux-arm64.tar.gz"; + sha256 = "01pgzyy70f77cidh228gs72hybwchp65qvs748482wakjcmf44mn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.10.0-linux-arm64.tar.gz"; - sha256 = "0p8lr9iw1h9ax90aivya513bw1dipm7yycqm5094wgx08r2yfvlm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.10.1-linux-arm64.tar.gz"; + sha256 = "1lrbl7x7hf1i7xx10cpxz17hihl8b6654wphz8s8g9lp0jryn6am"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.6.0-linux-arm64.tar.gz"; @@ -433,12 +433,12 @@ sha256 = "0j2c23ii4dn9yhpw6nymij65gv82y1xp4gi8lgxxf41b1i9bpb2i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.1-linux-arm64.tar.gz"; - sha256 = "1jac7dj7vsrhcn0fp03bkwmp3km4gxsi9mc5fzjgkmbhh5xnhw3b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.2-linux-arm64.tar.gz"; + sha256 = "1x8v39icapr8iakp9yd50md9dyvj63z7yj93cl3b07qlwr9lcvmv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.5.1-linux-arm64.tar.gz"; - sha256 = "15cd5g1kdjrfpcsicb4zgwb3q8q2h4xmkwdwbj0m2rys5ygayy2k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.5.2-linux-arm64.tar.gz"; + sha256 = "0dbqyizvx8gxlidiqc390wjfix1hyikpan32q3hq8d4f8342vjks"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.15.0-linux-arm64.tar.gz"; @@ -503,8 +503,8 @@ sha256 = "174dk82cx35i9x1f1kavydg3qyqax0lhl7637d2n17ca97xa7y8p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.38.1-darwin-arm64.tar.gz"; - sha256 = "096xd57z12rabv5375w3nb6zxsnva3nwrvjjxsr4h0sa0yip7sh0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.0.0-darwin-arm64.tar.gz"; + sha256 = "0jqbj8fmdmsvr86vy7w6i89jm6pnhs7nchxarsqrlx1lb3qpg2xq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.18.0-darwin-arm64.tar.gz"; @@ -547,12 +547,12 @@ sha256 = "0jj35mj57sivi5qsbwv8qm2jginppi192qlx6ashvgm352gia9r1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.16.0-darwin-arm64.tar.gz"; - sha256 = "16llbsp06pszh4q232ly8nnj1pfr6f4p88a5k928716csh3zradq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.17.0-darwin-arm64.tar.gz"; + sha256 = "06lgq9p5mgqaifl4lrr5csbprx0j3khq93x29j4jvq5kw1qa3gc5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.10.0-darwin-arm64.tar.gz"; - sha256 = "167f7c7mpyjym0sw71adz5ffd7g8zmn87923xmjlrsz3wm6ybsq7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.10.1-darwin-arm64.tar.gz"; + sha256 = "1hx8rsf9yysvjg6df8dxzz8kqci000jxzg8wwxjfhcfb9adzjmy8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.6.0-darwin-arm64.tar.gz"; @@ -591,12 +591,12 @@ sha256 = "1i5ipmidg0yspayxyglbjaihajhj1bsk46saxkncfrkvqnh4iq50"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.1-darwin-arm64.tar.gz"; - sha256 = "12zlmihrrcwbmy4q4ysvmz6nys547g914nl8g8vnwviijqlx05df"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.4.2-darwin-arm64.tar.gz"; + sha256 = "1rbig2n5x2lzxpscnja0ya9a68z3jk0qz2zwdnzi66xy7i3zd39l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.5.1-darwin-arm64.tar.gz"; - sha256 = "0gg80cg2f9d5ah4j7b1i6pxx7ffhbg4pcax319vymcsl9srh51hp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.5.2-darwin-arm64.tar.gz"; + sha256 = "1r1ln833jfi7hpyfb0cbg8vgam1wghdgr03m75w4hbds5nllw3zm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.15.0-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 2bd735c33e919..01664c3c1c7f8 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.42.2"; + version = "0.42.4"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ejyUe2FM8pNQO9esWi9QbSiq6PVEjGbRu+AEnbCFqDE="; + sha256 = "sha256-cHjtANCHEuEthfmPmV5MDw4LYY6XI+aux9Gijld7KGc="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-o5Gq4ZN9H/rXSfIeU2hlExzV5KQZP9DfQsWbOZOB43E="; + vendorSha256 = "sha256-+dul6aMsuObmWU8mu+ZnEcWhHo5ClenEDIhKbg3zjB0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index a7b0212a7b00a..a15a29f9d5745 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -57,6 +57,7 @@ python.pkgs.buildPythonApplication rec { ''-e 's/${package}.*[<>=]+.*/${package}/g' \'' ) relaxedConstraints)} requirements.txt + sed -i '/tensorboardX/d' requirements.txt ''; nativeBuildInputs = with python.pkgs; [ @@ -84,7 +85,6 @@ python.pkgs.buildPythonApplication rec { pyworld scipy soundfile - tensorboardx tensorflow torchaudio-bin tqdm diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 72a624714307d..23df784a78efb 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -15,14 +15,14 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2022.2.6"; + version = "2022.3.1"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-AoSFtEg7GpUBdIrFCYlOMBRc2nBBtiFEkxoZnKC/xyQ="; + sha256 = "sha256-x2gdRUBpyhk6iKvuW6ZKSpokaHfYz1ugclBjP15rJsk="; }; postPatch = '' diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index c2425cf94cab3..a3e6ff2fd946c 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -92,6 +92,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ sander ]; platforms = with platforms; linux ++ darwin; - repositories.git = "https://github.com/MidnightCommander/mc.git"; }; } diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index 583e415f093ca..bb7ccb375ba12 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.5.13"; + version = "0.6.0"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - sha256 = "sha256-6PGh+CUQH5LEV7/qctn+ihdZgqjt888wknXTfGPS3SI="; + sha256 = "sha256-k8Z/CS1vbnQvoddos7Y0KcM1zB8QDAbXaROjNCyPEN0="; }; postPatch = '' @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { substituteInPlace mcfly.fish --replace '(command which mcfly)' '${placeholder "out"}/bin/mcfly' ''; - cargoSha256 = "sha256-dpDuM+kGuCC2xm5EdV2OoxLNbKgi8wmTGrr8K16AnpM="; + cargoSha256 = "sha256-2SKgzVJdtzH9poHx/NJba6+lj/C0PBcEgI/2ITO18Bk="; meta = with lib; { homepage = "https://github.com/cantino/mcfly"; diff --git a/pkgs/tools/misc/mmctl/default.nix b/pkgs/tools/misc/mmctl/default.nix index 71e4de7479c0d..c9de0bf14ca8c 100644 --- a/pkgs/tools/misc/mmctl/default.nix +++ b/pkgs/tools/misc/mmctl/default.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "mmctl"; - version = "6.3.3"; + version = "6.4.2"; src = fetchFromGitHub { owner = "mattermost"; repo = "mmctl"; rev = "v${version}"; - sha256 = "sha256-V2p6diXymu37aJdHs0ZQJ7ak4LWe55KYCq15JRzMF48="; + sha256 = "sha256-FlqkY4LvAW9Cibs+3UkMDWA+uc62wMh13BllWuxjVZU="; }; vendorSha256 = null; diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index f0fa2529f06ff..731278cafe0e6 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { pname = "nix-direnv"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = version; - sha256 = "sha256-vMs4CyMhEy96gWMWXD74rTR1uNjU+y21i0dh6AdaMGE="; + sha256 = "sha256-WgNfo9GRqIrXsIgNRhoNPU2/uwyPd8xG8xEEImEy4KY="; }; # Substitute instead of wrapping because the resulting file is diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 91251abde131a..6d5e0e37703b4 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -16,11 +16,11 @@ let in tcl.mkTclDerivation rec { pname = "remind"; - version = "03.04.01"; + version = "03.04.02"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "sha256-8INtFmftMb1JSotUdDtMXdSm+UE/8zQW/wIOExr8nkI="; + sha256 = "sha256-kjDcO0l39l2KJXo0elZesKZWDZoSoUXIu1Ua7IxWY4w="; }; propagatedBuildInputs = tclLibraries; diff --git a/pkgs/tools/networking/aardvark-dns/default.nix b/pkgs/tools/networking/aardvark-dns/default.nix index 5d49842237f2a..412b3e0349c0d 100644 --- a/pkgs/tools/networking/aardvark-dns/default.nix +++ b/pkgs/tools/networking/aardvark-dns/default.nix @@ -5,26 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "aardvark-dns"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6O/7GoGH0xNbTfIFeD5VLrifNFpHcxxG0bdq/YQb3Ew="; + sha256 = "sha256-d4YSCVZkNung4frgAeP46E9Ptpnu9y0HwmPRADo4t0U="; }; - cargoHash = "sha256-YdHIyCJ00MKH8PL0osOqQIMwaws3+cOUwvhvA8mOp84="; - - preBuild = '' - rm build.rs - - export \ - VERGEN_BUILD_SEMVER="${version}" \ - VERGEN_BUILD_TIMESTAMP="$SOURCE_DATE_EPOCH" \ - VERGEN_GIT_SHA="${src.rev}" \ - VERGEN_RUSTC_HOST_TRIPLE="" - ''; + cargoHash = "sha256-fu7ZopS55IzzeO7uzLx1wVHQ8A1Ff+9f7FagoZPerxk="; meta = with lib; { description = "Authoritative dns server for A/AAAA container records"; diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index cff2d4df8e867..8c8972d0cb5d3 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Sets your computer's clock from time servers on the Net"; homepage = "https://chrony.tuxfamily.org/"; - repositories.git = "git://git.tuxfamily.org/gitroot/chrony/chrony.git"; license = licenses.gpl2; platforms = with platforms; linux ++ freebsd ++ openbsd; maintainers = with maintainers; [ fpletz thoughtpolice ]; diff --git a/pkgs/tools/networking/drill/default.nix b/pkgs/tools/networking/drill/default.nix index fce409dc2dc44..7e5d1ac1e00ef 100644 --- a/pkgs/tools/networking/drill/default.nix +++ b/pkgs/tools/networking/drill/default.nix @@ -24,6 +24,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; + OPENSSL_LIB_DIR = "${openssl.out}/lib"; + OPENSSL_DIR="${lib.getDev openssl}"; + buildInputs = lib.optionals stdenv.isLinux [ openssl ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/tools/networking/lychee/default.nix b/pkgs/tools/networking/lychee/default.nix index d8376016bbfda..5e788638e6e99 100644 --- a/pkgs/tools/networking/lychee/default.nix +++ b/pkgs/tools/networking/lychee/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "lychee"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "lycheeverse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zgIFJLdYHSDsO34KFK51g4nVlSkc9/TFdXx2yPJ7kRQ="; + sha256 = "sha256-XjG4u0z3u89Wg2lrcD3T0OqNMgLxmKO1e1zYlGd3dqQ="; }; - cargoSha256 = "sha256-r4a+JkaXVYsynBiWUHaleATXvfxyhRHfR/qcooD0FmI="; + cargoSha256 = "sha256-aXxhKH0dB6VpXfoWJwXBjsxGFcK071MZfCoi4z9uHdc="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/networking/mqttui/default.nix b/pkgs/tools/networking/mqttui/default.nix index 4b14caf9b67a5..4243c7ddbd887 100644 --- a/pkgs/tools/networking/mqttui/default.nix +++ b/pkgs/tools/networking/mqttui/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "mqttui"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "EdJoPaTo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kGOQIoE+0lCBm9zQwPMFfYnLJgR79hSKECerWyOFsjI="; + sha256 = "sha256-nLUDuLolv52WJAwBG5gSADWM2LmquJt5jZJioZWX8VA="; }; - cargoSha256 = "sha256-vm4IR/yQlQDn9LN9Ifr4vJvM6cCqgjRU2vdAHVEsWnI="; + cargoSha256 = "sha256-Z6V7k69fjtiG01s1Xf0UA8lhRsq3T+ImDsCHPSVIDfQ="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/netavark/default.nix b/pkgs/tools/networking/netavark/default.nix index 34e60b25e32bb..3116644eb68bd 100644 --- a/pkgs/tools/networking/netavark/default.nix +++ b/pkgs/tools/networking/netavark/default.nix @@ -7,29 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "netavark"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-r9NoPDFCqmzESxlovs91j0OyunGDmfWJXN+U1f0w2QQ="; + sha256 = "sha256-2ElEhKit/XysRsUw+dg7SnhDl+Zf+FJb5pIYpq1ALNs="; }; - cargoHash = "sha256-/N9oKzcAwaxI2BbeoYZ2quN+Z3UO67ecpogK2SRG9Dw="; - - preBuild = '' - substituteInPlace Cargo.toml \ - --replace 'build = "build.rs"' "" - - rm build.rs - - export \ - VERGEN_BUILD_SEMVER="${version}" \ - VERGEN_BUILD_TIMESTAMP="$SOURCE_DATE_EPOCH" \ - VERGEN_GIT_SHA="${src.rev}" \ - VERGEN_RUSTC_HOST_TRIPLE="" - ''; + cargoHash = "sha256-w3qz4ygjIvn+Rxd1JEVO6Ax08leuuJvC4Bk7VygbBh4="; nativeBuildInputs = [ installShellFiles mandown ]; diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix index ab13d3f4ef988..a988a14cd4552 100644 --- a/pkgs/tools/networking/obfs4/default.nix +++ b/pkgs/tools/networking/obfs4/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { version = "0.0.11"; src = fetchgit { - url = meta.repositories.git; + url = "https://git.torproject.org/pluggable-transports/obfs4.git"; rev = "refs/tags/${pname}proxy-${version}"; sha256 = "sha256-VjJ/Pc1YjNB2iLnN/5CxuaxolcaR1IMWgoESMzOXU/g="; }; @@ -17,7 +17,6 @@ buildGoModule rec { meta = with lib; { description = "A pluggable transport proxy"; homepage = "https://www.torproject.org/projects/obfsproxy"; - repositories.git = "https://git.torproject.org/pluggable-transports/obfs4.git"; maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index 255455811a65e..06b3cbdbe80ab 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Utility for bidirectional data transfer between two independent data channels"; homepage = "http://www.dest-unreach.org/socat/"; - repositories.git = "git://repo.or.cz/socat.git"; platforms = platforms.unix; license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ eelco ]; diff --git a/pkgs/tools/networking/tuntox/default.nix b/pkgs/tools/networking/tuntox/default.nix index 8870f0e32ce7f..6df9f724500d5 100644 --- a/pkgs/tools/networking/tuntox/default.nix +++ b/pkgs/tools/networking/tuntox/default.nix @@ -9,6 +9,7 @@ , libsodium , libtoxcore , libvpx +, msgpack , pkg-config , python3 , python3Packages @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cscope git pkg-config ]; - buildInputs = [ libopus libtoxcore libsodium libevent libvpx python3 ]; + buildInputs = [ libopus libtoxcore libsodium libevent libvpx msgpack python3 ]; pythonBuildInputs = with python3Packages; [ jinja2 diff --git a/pkgs/tools/nix/info/info.sh b/pkgs/tools/nix/info/info.sh index 6708a541f3d94..c309e8be1649f 100755 --- a/pkgs/tools/nix/info/info.sh +++ b/pkgs/tools/nix/info/info.sh @@ -84,7 +84,7 @@ desc_host_os() { ( # shellcheck disable=SC1091 . /etc/os-release - printf ", %s, %s" "${NAME:-$(uname -v)}" "${VERSION:-noversion}" + printf ", %s, %s, %s" "${NAME:-$(uname -v)}" "${VERSION:-noversion}" "${BUILD_ID:-nobuild}" ) fi } diff --git a/pkgs/tools/security/authoscope/default.nix b/pkgs/tools/security/authoscope/default.nix index eafd5ebb7d2f2..f21df67035e40 100644 --- a/pkgs/tools/security/authoscope/default.nix +++ b/pkgs/tools/security/authoscope/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "authoscope"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "11ci38m6d3lj4f0g7cl3dqf10kfk258k2k92phd2nav1my4i90pf"; + sha256 = "sha256-SKgb/N249s0+Rb59moBT/MeFb4zAAElCMQJto0diyUk="; }; - cargoSha256 = "13x7i52i3k88vkfvk2smy2aqfg3na4317scvw7ali1rv545nbxds"; + cargoSha256 = "sha256-rSHuKy86iJNLAKSVcb7fn7A/cc75EOc97jGI14EaC6k="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/tools/security/cfripper/default.nix index 4e5d2e7e0304e..96848acd7c041 100644 --- a/pkgs/tools/security/cfripper/default.nix +++ b/pkgs/tools/security/cfripper/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "cfripper"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "Skyscanner"; repo = pname; rev = version; - hash = "sha256-bomQqg+xzq7+iccE+x6mN265HxkYvy13aAwBBikth3U="; + hash = "sha256-bYKusyEItnhj1mU6Tucsdi5pdMoWrUK4Y91SK8dNGE4="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index 2b0a30811e880..bbeca94a993ec 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.5.0"; + version = "8.5.1"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vd6mEjswqIX2F3GO7AF1Me4NolbeZZPwLxfyzJaNmT8="; + sha256 = "sha256-lx7xjOajFyeetnGcJwX66pIcZw2A7+QGWb5crCoA83g="; }; - vendorSha256 = "sha256-J1xX+r+Mph1QkqjK87tqGDkYvPZp0lHgdRhd88WZi1c="; + vendorSha256 = "sha256-gelUrZOYiThO0+COIv9cOgho/tjv7ZqSKOktWIbdADw="; ldflags = [ "-s" diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index e97a1b6fb13b6..3e3dc6ff098a5 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "grype"; - version = "0.34.4"; + version = "0.34.7"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-t5N9C69u8bTXXobptmxA+yuQ88Hko8Hhhp+nyC/tMFc="; + sha256 = "sha256-t95efLTqPnmYiXTBxuxEoDdafoZC/bXXTfKdA8gy3fk="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -25,7 +25,7 @@ buildGoModule rec { ''; }; - vendorSha256 = "sha256-u11SKoybGobfxsjLq9mYFzZWw01Dms5RyKxmZA47XqI="; + vendorSha256 = "sha256-FZMgS0aNZVq4nvwog4l62dOzC6wW7pQCNbOW1/jssWo="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/tools/security/jadx/default.nix index e5b805b89cc59..2aadf1fb7b27d 100644 --- a/pkgs/tools/security/jadx/default.nix +++ b/pkgs/tools/security/jadx/default.nix @@ -2,13 +2,13 @@ let pname = "jadx"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "skylot"; repo = pname; rev = "v${version}"; - hash = "sha256-z8u6j6YLBHmgZKSGh/rFDDSnWZrBgWsqfKP3vhaukbY="; + hash = "sha256-G2BgGhWk0Prbjni6HPZ/0+bWiC9uI2O13Q1SDCE5mBE="; }; deps = stdenv.mkDerivation { @@ -40,7 +40,7 @@ let ''; outputHashMode = "recursive"; - outputHash = "sha256-kiNtA63sINX7VRsq4JKAiZYzymHe1TrNetZsE6S9KVM="; + outputHash = "sha256-QZClHuj7oCUYX3I8B3A90m4zK7+FP24C19RIzYyPC1w="; }; in stdenv.mkDerivation { inherit pname version src; diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index d6f2e20611d2d..f06877b99fe13 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { See https://www.nitrokey.com/ for more information. ''; homepage = "https://github.com/Nitrokey/nitrokey-app"; - repositories.git = "https://github.com/Nitrokey/nitrokey-app.git"; license = licenses.gpl3; maintainers = with maintainers; [ kaiha fpletz ]; }; diff --git a/pkgs/tools/security/sigma-cli/default.nix b/pkgs/tools/security/sigma-cli/default.nix index 3d83653cb00f1..a2417e7b8fe23 100644 --- a/pkgs/tools/security/sigma-cli/default.nix +++ b/pkgs/tools/security/sigma-cli/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sigma-cli"; - version = "0.3.3"; + version = "0.3.4"; format = "pyproject"; src = fetchFromGitHub { owner = "SigmaHQ"; repo = pname; rev = "v${version}"; - hash = "sha256-AUAOZrwLNu+Llg8RX4RKm4vAETgpPLKK1mcpl8jxGYE="; + hash = "sha256-FWcPHtEYqS+81dU4lB+4BLFOXtFumcyhucwvmu2TAt8="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 571b4e7f4da74..14e0be73f01ea 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -97,7 +97,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.torproject.org/"; - repositories.git = "https://git.torproject.org/git/tor"; description = "Anonymizing overlay network"; longDescription = '' diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index 399afe7f75cb2..16eeca0ffad74 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.3.0"; src = fetchgit { - url = meta.repositories.git; + url = "https://git.torproject.org/torsocks.git"; rev = "refs/tags/v${version}"; sha256 = "0x0wpcigf22sjxg7bm0xzqihmsrz51hl4v8xf91qi4qnmr4ny1hb"; }; @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { meta = { description = "Wrapper to safely torify applications"; homepage = "https://github.com/dgoulet/torsocks"; - repositories.git = "https://git.torproject.org/torsocks.git"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ thoughtpolice ]; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 458e2a533896a..d349c205ad4f0 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.9.4"; + version = "1.10.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-zqtRM2p+RrLrXzDCMtHJZNx/dKWyFqM+3V5eICwWvWs="; + sha256 = "sha256-XgrEtAVfMcXbmAjwgIWME/v85QHJ11fUXapAZtS/lSw="; }; - vendorSha256 = "sha256-EiQ6XmGrw1O2Zd8TM7HSr3sQUd1naQYKbYLKB/vWdXU="; + vendorSha256 = "sha256-Bo0+HSG7NqaweMKPdl+kzB6RdbQsy2FAzmr7ZZVgcsg="; subPackages = [ "." ]; @@ -46,6 +46,6 @@ buildGoModule rec { changelog = "https://github.com/hashicorp/vault/blob/v${version}/CHANGELOG.md"; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; - maintainers = with maintainers; [ rushmorem lnl7 offline pradeepchhetri Chili-Man ]; + maintainers = with maintainers; [ rushmorem lnl7 offline pradeepchhetri Chili-Man techknowlogick ]; }; } diff --git a/pkgs/tools/security/vault/update-bin.sh b/pkgs/tools/security/vault/update-bin.sh new file mode 100644 index 0000000000000..25f41e2aad127 --- /dev/null +++ b/pkgs/tools/security/vault/update-bin.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused gawk nix-prefetch + +set -euo pipefail + +ROOT="$(dirname "$(readlink -f "$0")")" +NIX_DRV="$ROOT/vault-bin.nix" +if [ ! -f "$NIX_DRV" ]; then + echo "ERROR: cannot find vault-bin in $ROOT" + exit 1 +fi + +fetch_arch() { + VER="$1"; ARCH="$2" + URL="https://releases.hashicorp.com/vault/${VER}/vault_${VER}_${ARCH}.zip" + nix-prefetch "{ stdenv, fetchzip }: +stdenv.mkDerivation rec { + pname = \"vault-bin\"; version = \"${VER}\"; + src = fetchzip { url = \"$URL\"; }; +} +" +} + +replace_sha() { + sed -i "s#$1 = \"sha256-.\{44\}\"#$1 = \"$2\"#" "$NIX_DRV" +} + +# https://releases.hashicorp.com/vault/1.9.4/vault_1.9.4_linux_arm64.zip +VAULT_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/hashicorp/vault/releases/latest | awk -F'/' '{print $NF}' | sed 's/v//') + +VAULT_LINUX_X86_SHA256=$(fetch_arch "$VAULT_VER" "linux_386") +VAULT_LINUX_X64_SHA256=$(fetch_arch "$VAULT_VER" "linux_amd64") +VAULT_DARWIN_X64_SHA256=$(fetch_arch "$VAULT_VER" "darwin_amd64") +VAULT_LINUX_AARCH64_SHA256=$(fetch_arch "$VAULT_VER" "linux_arm64") +VAULT_DARWIN_AARCH64_SHA256=$(fetch_arch "$VAULT_VER" "darwin_arm64") + +sed -i "s/version = \".*\"/version = \"$VAULT_VER\"/" "$NIX_DRV" + +replace_sha "i686-linux" "$VAULT_LINUX_X86_SHA256" +replace_sha "x86_64-linux" "$VAULT_LINUX_X64_SHA256" +replace_sha "x86_64-darwin" "$VAULT_DARWIN_X64_SHA256" +replace_sha "aarch64-linux" "$VAULT_LINUX_AARCH64_SHA256" +replace_sha "aarch64-darwin" "$VAULT_DARWIN_AARCH64_SHA256" diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 1ffd793be8b23..ebb70a1f62922 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,63 +1,61 @@ -{ lib, stdenv, fetchurl, unzip, makeWrapper, gawk, glibc }: +{ lib, stdenv, fetchurl, unzip, makeWrapper, gawk, glibc, fetchzip }: -let - version = "1.9.1"; - - sources = let - base = "https://releases.hashicorp.com/vault/${version}"; - in { - x86_64-linux = fetchurl { - url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "sha256-kP1wLbkktVCTZopVaT0h/WKqAG3Pd9g7qeruk4MIWJM="; - }; - i686-linux = fetchurl { - url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "sha256-cTZ/hek8wQo9FxIRQ/cc23h7Nqjfonvprf492/lSzLw="; - }; - x86_64-darwin = fetchurl { - url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "sha256-uKW9Yl4PjxWJ886OVAHl1sbPhgYWoL6IJK44vczLQsY="; - }; - aarch64-darwin = fetchurl { - url = "${base}/vault_${version}_darwin_arm64.zip"; - sha256 = "sha256-J0qwUBcnZRZU5TTQB3K8wNE6rdQC1Boy/gKNQRvUYEI="; - }; - aarch64-linux = fetchurl { - url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "sha256-eU5s15tBuZFThJGNtnjOV07tiBoVjSSHMS9sY2WqO1o="; - }; - }; - -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "vault-bin"; - inherit version; - - src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); - - nativeBuildInputs = [ makeWrapper unzip ]; + version = "1.10.0"; + + src = + let + inherit (stdenv.hostPlatform) system; + selectSystem = attrs: attrs.${system} or (throw "Unsupported system: ${system}"); + suffix = selectSystem { + x86_64-linux = "linux_amd64"; + aarch64-linux = "linux_arm64"; + i686-linux = "linux_386"; + x86_64-darwin = "darwin_amd64"; + aarch64-darwin = "darwin_arm64"; + }; + sha256 = selectSystem { + x86_64-linux = "sha256-enD/JcOmeavvUd/njbu7IksAqp9dKepVdYPkLJHA8OQ="; + aarch64-linux = "sha256-FDkgUqFEVJoSED/FWqOXa4BTO6AYwkLS2iZh+BkzlqA="; + i686-linux = "sha256-XUTWB5Ynu92SMP9Nt/0jAki6til4upKv1sdFzPbWxiw="; + x86_64-darwin = "sha256-QNCsbIza56NqSU7R6+Cx//WBXiEOz6CEMCjrx4AR1x8="; + aarch64-darwin = "sha256-LBgd8gqeU92336kypSIwMtKo7I1qB/RP2dNoIGJgq7k="; + }; + in + fetchzip { + url = "https://releases.hashicorp.com/vault/${version}/vault_${version}_${suffix}.zip"; + inherit sha256; + }; - sourceRoot = "."; + dontConfigure = true; + dontBuild = true; + dontStrip = stdenv.isDarwin; installPhase = '' runHook preInstall - - mkdir -p $out/bin $out/share/bash-completion/completions - mv vault $out/bin - echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault - '' + lib.optionalString stdenv.isLinux '' - wrapProgram $out/bin/vault \ - --prefix PATH : ${lib.makeBinPath [ gawk glibc ]} - + install -D vault $out/bin/vault runHook postInstall ''; - dontStrip = stdenv.isDarwin; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/vault --help + $out/bin/vault version + runHook postInstallCheck + ''; + + dontPatchELF = true; + dontPatchShebangs = true; + + passthru.updateScript = ./update-bin.sh; meta = with lib; { homepage = "https://www.vaultproject.io"; description = "A tool for managing secrets, this binary includes the UI"; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; license = licenses.mpl20; - maintainers = with maintainers; teams.serokell.members ++ [ offline psyanticy Chili-Man ]; + maintainers = with maintainers; teams.serokell.members ++ [ offline psyanticy Chili-Man techknowlogick ]; }; } diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix index 36dfd02c33f60..6091eff255d8f 100644 --- a/pkgs/tools/system/ctop/default.nix +++ b/pkgs/tools/system/ctop/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ctop"; - version = "0.7.6"; + version = "0.7.7"; src = fetchFromGitHub { owner = "bcicen"; repo = pname; - rev = version; - sha256 = "sha256-ceRyYrqmgdTnV8m9LkLlR6iTrC5F81X/V3fWI2CiKBw="; + rev = "v${version}"; + sha256 = "sha256-tojSzgpoGQg6MwV/MVpQpCA5w6bZO+9IOvfkw0Ydr6c="; }; - vendorSha256 = "sha256-UCeMy4iT0c2sTcCDPg0TIYCLYfrIUvHluUuGIpzluSg="; + vendorSha256 = "sha256-UAja7XuoLqJFNcK1PgHGcuf/HbvSrWyRvW2D3T7Hg0g="; doCheck = false; diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/tools/system/evemu/default.nix index 61ef270df7943..6cb349c546b9b 100644 --- a/pkgs/tools/system/evemu/default.nix +++ b/pkgs/tools/system/evemu/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Records and replays device descriptions and events to emulate input devices through the kernel's input system"; homepage = "https://www.freedesktop.org/wiki/Evemu/"; - repositories.git = "git://git.freedesktop.org/git/evemu"; license = with licenses; [ lgpl3Only gpl3Only ]; maintainers = [ maintainers.amorsillo ]; platforms = platforms.linux; diff --git a/pkgs/tools/system/gohai/default.nix b/pkgs/tools/system/gohai/default.nix index 48c68f8d2f2ca..a4b07f112ae3f 100644 --- a/pkgs/tools/system/gohai/default.nix +++ b/pkgs/tools/system/gohai/default.nix @@ -21,7 +21,6 @@ buildGoPackage rec { license = licenses.mit; maintainers = [ maintainers.tazjin ]; platforms = platforms.unix; - repositories.git = "git://github.com/DataDog/gohai.git"; longDescription = '' Gohai is a tool which collects an inventory of system diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix index a790c600a9d33..a823186484955 100644 --- a/pkgs/tools/system/hardlink/default.nix +++ b/pkgs/tools/system/hardlink/default.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation { meta = with lib; { description = "Consolidate duplicate files via hardlinks"; homepage = "https://pagure.io/hardlink"; - repositories.git = "https://src.fedoraproject.org/cgit/rpms/hardlink.git"; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/tools/system/mq-cli/default.nix b/pkgs/tools/system/mq-cli/default.nix index 2c1baa24f6fa3..cdbff1921a79b 100644 --- a/pkgs/tools/system/mq-cli/default.nix +++ b/pkgs/tools/system/mq-cli/default.nix @@ -19,6 +19,5 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ tazjin ]; platforms = platforms.linux; - repositories.git = "git://github.com/aprilabank/mq-cli.git"; }; } diff --git a/pkgs/tools/system/nats-top/default.nix b/pkgs/tools/system/nats-top/default.nix index f2be03d4301c4..651a9635fb456 100644 --- a/pkgs/tools/system/nats-top/default.nix +++ b/pkgs/tools/system/nats-top/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nats-top"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - sha256 = "0b1hpnq8m1xfrn58ammmnx6lmhk319m8z4xjxgckz7wvy2fbzw0n"; + sha256 = "sha256-IZQDwopFAXPT0V+TTiJk6+j/KhLTA3g4kN1j1PVlNt0="; }; - vendorSha256 = "1a48p9gx5zdc340ma6cqakhi6f3lw9b0kz2597j1jcsk2qb7s581"; + vendorSha256 = "sha256-cBCR/OXUOa+Lh8UvL/VraDAW0hGGwV7teyvdswZQ5Lo="; meta = with lib; { description = "top-like tool for monitoring NATS servers"; diff --git a/pkgs/tools/text/gnused/422.nix b/pkgs/tools/text/gnused/422.nix deleted file mode 100644 index 15e57e319019e..0000000000000 --- a/pkgs/tools/text/gnused/422.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "gnused"; - version = "4.2.2"; - - src = fetchurl { - url = "mirror://gnu/sed/sed-${version}.tar.bz2"; - sha256 = "f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7"; - }; - - configureFlags = lib.optional stdenv.hostPlatform.isMinGW "ac_cv_func__set_invalid_parameter_handler=no"; - - outputs = [ "out" "info" ]; - - meta = { - homepage = "https://www.gnu.org/software/sed/"; - description = "GNU sed, a batch stream editor"; - - longDescription = '' - Sed (stream editor) isn't really a true text editor or text - processor. Instead, it is used to filter text, i.e., it takes - text input and performs some operation (or set of operations) on - it and outputs the modified text. Sed is typically used for - extracting part of a file using pattern matching or substituting - multiple occurrences of a string within a file. - ''; - - license = lib.licenses.gpl3Plus; - - platforms = lib.platforms.all; - maintainers = [ ]; - mainProgram = "sed"; - }; -} diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/pkgs/tools/typesetting/odpdown/default.nix index 252167fcea973..27053e36ffa1e 100644 --- a/pkgs/tools/typesetting/odpdown/default.nix +++ b/pkgs/tools/typesetting/odpdown/default.nix @@ -20,7 +20,6 @@ python2Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/thorstenb/odpdown"; - repositories.git = "https://github.com/thorstenb/odpdown.git"; description = "Create nice-looking slides from your favourite text editor"; longDescription = '' Have a tool like pandoc, latex beamer etc, that you can write (or diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9aceda93594da..6f0f48bb70167 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1263,6 +1263,7 @@ mapAliases ({ varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-07-26 varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-07-26 varnish65 = throw "varnish65 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-09-15 + varnish70 = throw "varnish70 was removed from nixpkgs, because it was superseded upstream. Please switch to a different release"; # Added 2022-03-17 vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # Added 2021-02-05 vimbWrapper = throw "'vimbWrapper' has been renamed to/replaced by 'vimb'"; # Converted to throw 2022-02-22 @@ -1448,7 +1449,7 @@ mapAliases ({ ksshaskpass ksystemlog kteatime ktimer ktorrent ktouch kturtle kwallet-pam kwalletmanager kwave kwayland-integration kwin kwrited marble milou minuet okular oxygen oxygen-icons5 picmi plasma-browser-integration plasma-desktop - plasma-integration plasma-nano plasma-nm plasma-pa plasma-phone-components + plasma-integration plasma-nano plasma-nm plasma-pa plasma-mobile plasma-systemmonitor plasma-thunderbolt plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent powerdevil qqc2-breeze-style sddm-kcm skanlite spectacle systemsettings xdg-desktop-portal-kde yakuake diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88874afb8c320..99c2efa1e7f93 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5783,6 +5783,8 @@ with pkgs; gdmap = callPackage ../tools/system/gdmap { }; + gef = callPackage ../development/tools/misc/gef { }; + gelasio = callPackage ../data/fonts/gelasio { }; gemget = callPackage ../tools/networking/gemget {}; @@ -6162,11 +6164,7 @@ with pkgs; gnu-pw-mgr = callPackage ../tools/security/gnu-pw-mgr { }; - gnused = if !stdenv.hostPlatform.isWindows - then callPackage ../tools/text/gnused { } # broken on Windows - else gnused_422; - # This is an easy work-around for [:space:] problems. - gnused_422 = callPackage ../tools/text/gnused/422.nix { }; + gnused = callPackage ../tools/text/gnused { }; gnutar = callPackage ../tools/archivers/gnutar { }; @@ -6264,6 +6262,8 @@ with pkgs; gpp = callPackage ../development/tools/gpp { }; + gnuastro = callPackage ../applications/science/astronomy/gnuastro { }; + gpredict = callPackage ../applications/science/astronomy/gpredict { hamlib = hamlib_4; }; @@ -11290,11 +11290,11 @@ with pkgs; valum = callPackage ../development/web/valum { }; inherit (callPackages ../servers/varnish { }) - varnish60 varnish70; + varnish60 varnish71; inherit (callPackages ../servers/varnish/packages.nix { }) - varnish60Packages varnish70Packages; + varnish60Packages varnish71Packages; - varnishPackages = varnish70Packages; + varnishPackages = varnish71Packages; varnish = varnishPackages.varnish; hitch = callPackage ../servers/hitch { }; @@ -19613,6 +19613,8 @@ with pkgs; optparse-bash = callPackage ../development/libraries/optparse-bash { }; + oras = callPackage ../development/tools/oras { }; + orcania = callPackage ../development/libraries/orcania { }; osm-gps-map = callPackage ../development/libraries/osm-gps-map { }; @@ -20732,7 +20734,7 @@ with pkgs; wxGTK31 = callPackage ../development/libraries/wxwidgets/wxGTK31.nix { inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit AVFoundation AVKit WebKit; }; wxGTK31-gtk2 = wxGTK31.override { withGtk2 = true; }; wxGTK31-gtk3 = wxGTK31.override { withGtk2 = false; }; @@ -22005,7 +22007,9 @@ with pkgs; prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { }; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix { }; - prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { }; + prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { + inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; + }; prometheus-openldap-exporter = callPackage ../servers/monitoring/prometheus/openldap-exporter.nix { }; prometheus-openvpn-exporter = callPackage ../servers/monitoring/prometheus/openvpn-exporter.nix { }; prometheus-pihole-exporter = callPackage ../servers/monitoring/prometheus/pihole-exporter.nix { }; @@ -22753,6 +22757,8 @@ with pkgs; powerstat = callPackage ../os-specific/linux/powerstat { }; + projecteur = libsForQt5.callPackage ../os-specific/linux/projecteur { }; + smemstat = callPackage ../os-specific/linux/smemstat { }; tgt = callPackage ../tools/networking/tgt { }; @@ -25043,9 +25049,8 @@ with pkgs; centerim = callPackage ../applications/networking/instant-messengers/centerim { }; - cgit = callPackage ../applications/version-management/git-and-tools/cgit { - inherit (python3Packages) python wrapPython pygments markdown; - }; + cgit = callPackage ../applications/version-management/git-and-tools/cgit { }; + cgit-pink = callPackage ../applications/version-management/git-and-tools/cgit/pink.nix { }; chatty = callPackage ../applications/networking/instant-messengers/chatty { }; @@ -25968,11 +25973,6 @@ with pkgs; firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix { callPackage = newScope { inherit (rustPackages) cargo rustc; - gnused = gnused_422; - inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling - Kerberos AVFoundation MediaToolbox - CoreLocation Foundation AddressBook; - inherit (darwin) libobjc; }; }); @@ -27107,6 +27107,8 @@ with pkgs; kubemqctl = callPackage ../applications/networking/cluster/kubemqctl { }; + kubent = callPackage ../applications/networking/cluster/kubent { }; + kubeseal = callPackage ../applications/networking/cluster/kubeseal { }; kubernix = callPackage ../applications/networking/cluster/kubernix { }; @@ -29455,11 +29457,6 @@ with pkgs; thunderbirdPackages = recurseIntoAttrs (callPackage ../applications/networking/mailreaders/thunderbird/packages.nix { callPackage = newScope { inherit (rustPackages) cargo rustc; - gnused = gnused_422; - inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling - Kerberos AVFoundation MediaToolbox - CoreLocation Foundation AddressBook; - inherit (darwin) libobjc; }; }); @@ -29670,6 +29667,8 @@ with pkgs; unigine-valley = callPackage ../applications/graphics/unigine-valley { }; + unigine-heaven = callPackage ../applications/graphics/unigine-heaven { }; + unipicker = callPackage ../applications/misc/unipicker { }; unison = callPackage ../applications/networking/sync/unison { @@ -33266,6 +33265,8 @@ with pkgs; cups-brother-hll2350dw = callPackage ../misc/cups/drivers/hll2350dw { }; + cups-brother-mfcl2750dw = callPackage ../misc/cups/drivers/mfcl2750dw { }; + cups-drv-rastertosag-gdi = callPackage ../misc/cups/drivers/cups-drv-rastertosag-gdi { }; # this driver ships with pre-compiled 32-bit binary libraries @@ -33716,9 +33717,7 @@ with pkgs; loadedTest = if builtins.typeOf test == "path" then import test else test; - calledTest = if lib.isFunction loadedTest - then callPackage loadedTest {} - else loadedTest; + calledTest = lib.toFunction loadedTest pkgs; in nixosTesting.makeTest calledTest; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index cc126dc320de2..5c45168524f76 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -709,8 +709,6 @@ let magic-mime = callPackage ../development/ocaml-modules/magic-mime { }; - magick = callPackage ../development/ocaml-modules/magick { }; - mariadb = callPackage ../development/ocaml-modules/mariadb { inherit (pkgs) mariadb; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d106a1897e427..8c14b875ae852 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5996,10 +5996,10 @@ let DevelPatchPerl = buildPerlPackage { pname = "Devel-PatchPerl"; - version = "2.04"; + version = "2.08"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-2.04.tar.gz"; - sha256 = "1q8xhz2sdlz2266pjl8j9vcixbhcaxsprmvsx56ra998miayc42p"; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-2.08.tar.gz"; + sha256 = "06bl2qqf5mv53l7k81xgynfx99in5fa8yi3ykn7403r62rqfkik9"; }; propagatedBuildInputs = [ Filepushd ModulePluggable ]; meta = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 242b458ae2075..be5244a70d392 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6164,6 +6164,8 @@ in { pint = callPackage ../development/python-modules/pint { }; + pint-pandas = callPackage ../development/python-modules/pint-pandas { }; + pip = callPackage ../development/python-modules/pip { }; pipdate = callPackage ../development/python-modules/pipdate { }; @@ -6309,6 +6311,8 @@ in { pyutil = callPackage ../development/python-modules/pyutil { }; + pyzbar = callPackage ../development/python-modules/pyzbar { }; + pkutils = callPackage ../development/python-modules/pkutils { }; plac = callPackage ../development/python-modules/plac { }; @@ -6462,6 +6466,8 @@ in { premailer = callPackage ../development/python-modules/premailer { }; + preprocess-cancellation = callPackage ../development/python-modules/preprocess-cancellation { }; + preshed = callPackage ../development/python-modules/preshed { }; pretend = callPackage ../development/python-modules/pretend { }; @@ -8373,7 +8379,7 @@ in { }; pyudev = callPackage ../development/python-modules/pyudev { - inherit (pkgs) systemd; + inherit (pkgs) udev; }; pyunbound = callPackage ../tools/networking/unbound/python.nix { }; |