diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 843ebdadcc38..6b73c678bc52 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4158,6 +4158,15 @@ githubId = 147284; name = "Jason Felice"; }; + ercao = { + email = "vip@ercao.cn"; + github = "ercao"; + githubId = 51725284; + name = "ercao"; + keys = [{ + fingerprint = "F3B0 36F7 B0CB 0964 3C12 D3C7 FFAB D125 7ECF 0889"; + }]; + }; erdnaxe = { email = "erdnaxe@crans.org"; github = "erdnaxe"; diff --git a/nixos/doc/manual/development/option-declarations.section.md b/nixos/doc/manual/development/option-declarations.section.md index 0f5673dd4d58..88617ab1920a 100644 --- a/nixos/doc/manual/development/option-declarations.section.md +++ b/nixos/doc/manual/development/option-declarations.section.md @@ -11,7 +11,7 @@ options = { type = type specification; default = default value; example = example value; - description = "Description for use in the NixOS manual."; + description = lib.mdDoc "Description for use in the NixOS manual."; }; }; ``` @@ -59,8 +59,9 @@ The function `mkOption` accepts the following arguments. : A textual description of the option, in [Nixpkgs-flavored Markdown]( https://nixos.org/nixpkgs/manual/#sec-contributing-markup) format, that will be included in the NixOS manual. During the migration process from DocBook - to CommonMark the description may also be written in DocBook, but this is - discouraged. + it is necessary to mark descriptions written in CommonMark with `lib.mdDoc`. + The description may still be written in DocBook (without any marker), but this + is discouraged and will be deprecated in the future. ## Utility functions for common option patterns {#sec-option-declarations-util} @@ -83,7 +84,7 @@ lib.mkOption { type = lib.types.bool; default = false; example = true; - description = "Whether to enable magic."; + description = lib.mdDoc "Whether to enable magic."; } ``` @@ -116,7 +117,7 @@ lib.mkOption { type = lib.types.package; default = pkgs.hello; defaultText = lib.literalExpression "pkgs.hello"; - description = "The hello package to use."; + description = lib.mdDoc "The hello package to use."; } ``` @@ -132,7 +133,7 @@ lib.mkOption { default = pkgs.ghc; defaultText = lib.literalExpression "pkgs.ghc"; example = lib.literalExpression "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])"; - description = "The GHC package to use."; + description = lib.mdDoc "The GHC package to use."; } ``` diff --git a/nixos/doc/manual/from_md/development/option-declarations.section.xml b/nixos/doc/manual/from_md/development/option-declarations.section.xml index 69163853b627..0932a51a18cd 100644 --- a/nixos/doc/manual/from_md/development/option-declarations.section.xml +++ b/nixos/doc/manual/from_md/development/option-declarations.section.xml @@ -12,7 +12,7 @@ options = { type = type specification; default = default value; example = example value; - description = "Description for use in the NixOS manual."; + description = lib.mdDoc "Description for use in the NixOS manual."; }; }; @@ -98,9 +98,11 @@ options = { A textual description of the option, in Nixpkgs-flavored Markdown format, that will be included in the NixOS - manual. During the migration process from DocBook to - CommonMark the description may also be written in DocBook, but - this is discouraged. + manual. During the migration process from DocBook it is + necessary to mark descriptions written in CommonMark with + lib.mdDoc. The description may still be + written in DocBook (without any marker), but this is + discouraged and will be deprecated in the future. @@ -132,7 +134,7 @@ lib.mkOption { type = lib.types.bool; default = false; example = true; - description = "Whether to enable magic."; + description = lib.mdDoc "Whether to enable magic."; }
@@ -182,7 +184,7 @@ lib.mkOption { type = lib.types.package; default = pkgs.hello; defaultText = lib.literalExpression "pkgs.hello"; - description = "The hello package to use."; + description = lib.mdDoc "The hello package to use."; } @@ -197,7 +199,7 @@ lib.mkOption { default = pkgs.ghc; defaultText = lib.literalExpression "pkgs.ghc"; example = lib.literalExpression "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])"; - description = "The GHC package to use."; + description = lib.mdDoc "The GHC package to use."; }
diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix index dde3cac1c1ba..e097aa5eebd8 100644 --- a/nixos/lib/make-options-doc/default.nix +++ b/nixos/lib/make-options-doc/default.nix @@ -40,6 +40,8 @@ # `false`, and a different renderer may be used with different bugs and performance # characteristics but (hopefully) indistinguishable output. , allowDocBook ? true +# whether lib.mdDoc is required for descriptions to be read as markdown. +, markdownByDefault ? false }: let @@ -152,6 +154,7 @@ in rec { python ${./mergeJSON.py} \ ${lib.optionalString warningsAreErrors "--warnings-are-errors"} \ ${lib.optionalString (! allowDocBook) "--error-on-docbook"} \ + ${lib.optionalString markdownByDefault "--markdown-by-default"} \ $baseJSON $options \ > $dst/options.json diff --git a/nixos/lib/make-options-doc/mergeJSON.py b/nixos/lib/make-options-doc/mergeJSON.py index 8a8498746bf6..750cd24fc653 100644 --- a/nixos/lib/make-options-doc/mergeJSON.py +++ b/nixos/lib/make-options-doc/mergeJSON.py @@ -201,19 +201,27 @@ def convertMD(options: Dict[str, Any]) -> str: return option[key]['_type'] == typ for (name, option) in options.items(): - if optionIs(option, 'description', 'mdDoc'): - option['description'] = convertString(name, option['description']['text']) - if optionIs(option, 'example', 'literalMD'): - docbook = convertString(name, option['example']['text']) - option['example'] = { '_type': 'literalDocBook', 'text': docbook } - if optionIs(option, 'default', 'literalMD'): - docbook = convertString(name, option['default']['text']) - option['default'] = { '_type': 'literalDocBook', 'text': docbook } + try: + if optionIs(option, 'description', 'mdDoc'): + option['description'] = convertString(name, option['description']['text']) + elif markdownByDefault: + option['description'] = convertString(name, option['description']) + + if optionIs(option, 'example', 'literalMD'): + docbook = convertString(name, option['example']['text']) + option['example'] = { '_type': 'literalDocBook', 'text': docbook } + if optionIs(option, 'default', 'literalMD'): + docbook = convertString(name, option['default']['text']) + option['default'] = { '_type': 'literalDocBook', 'text': docbook } + except Exception as e: + raise Exception(f"Failed to render option {name}: {str(e)}") + return options warningsAreErrors = False errorOnDocbook = False +markdownByDefault = False optOffset = 0 for arg in sys.argv[1:]: if arg == "--warnings-are-errors": @@ -222,6 +230,9 @@ for arg in sys.argv[1:]: if arg == "--error-on-docbook": optOffset += 1 errorOnDocbook = True + if arg == "--markdown-by-default": + optOffset += 1 + markdownByDefault = True options = pivot(json.load(open(sys.argv[1 + optOffset], 'r'))) overrides = pivot(json.load(open(sys.argv[2 + optOffset], 'r'))) diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index ccf8804943ac..e3d4afc074cf 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -88,7 +88,7 @@ with lib; type = types.nullOr types.str; default = "/var/lib/acme/acme-challenge"; description = lib.mdDoc '' - Directory for the acme challenge which is PUBLIC, don't put certs or keys in here. + Directory for the ACME challenge, which is **public**. Don't put certs or keys in here. Set to null to inherit from config.security.acme. ''; }; @@ -97,8 +97,12 @@ with lib; type = types.nullOr types.str; default = null; description = lib.mdDoc '' - Host which to proxy requests to if acme challenge is not found. Useful + Host which to proxy requests to if ACME challenge is not found. Useful if you want multiple hosts to be able to verify the same domain name. + + With this option, you could request certificates for the present domain + with an ACME client that is running on another host, which you would + specify here. ''; }; diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index a9d43d027e01..8cb7c7b8e47b 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -57,6 +57,12 @@ let --disallow-untyped-defs \ $out ''; + + finalSystemdBootBuilder = pkgs.writeScript "install-systemd-boot.sh" '' + #!${pkgs.runtimeShell} + ${checkedSystemdBootBuilder} "$@" + ${cfg.extraInstallCommands} + ''; in { imports = @@ -99,6 +105,22 @@ in { ''; }; + extraInstallCommands = mkOption { + default = ""; + example = '' + default_cfg=$(cat /boot/loader/loader.conf | grep default | awk '{print $2}') + init_value=$(cat /boot/loader/entries/$default_cfg | grep init= | awk '{print $2}') + sed -i "s|@INIT@|$init_value|g" /boot/custom/config_with_placeholder.conf + ''; + type = types.lines; + description = lib.mdDoc '' + Additional shell commands inserted in the bootloader installer + script after generating menu entries. It can be used to expand + on extra boot entries that cannot incorporate certain pieces of + information (such as the resulting `init=` kernel parameter). + ''; + }; + consoleMode = mkOption { default = "keep"; @@ -277,7 +299,7 @@ in { ]; system = { - build.installBootLoader = checkedSystemdBootBuilder; + build.installBootLoader = finalSystemdBootBuilder; boot.loader.id = "systemd-boot"; diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 9557aa65c19a..019196d74eb7 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.4.34"; + version = "1.4.36"; format = "other"; doCheck = false; @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "sha256-nkrnmpM/mVrXVGkfwzmbSxsO1L890LgsjxSXAYjevCs="; + sha256 = "sha256-Ka/rYgWGuCQTzguJiyQpY5SPC1iB5XOVy/Gezj+DYpk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index c795cc30b390..096fdf8427a8 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -5,6 +5,9 @@ , maven , autoPatchelfHook , libdbusmenu +, patchelf +, openssl +, expat , vmopts ? null }: @@ -41,12 +44,14 @@ let }).overrideAttrs (attrs: { nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ optionals (stdenv.isLinux) [ autoPatchelfHook + patchelf ]; buildInputs = (attrs.buildInputs or []) ++ optionals (stdenv.isLinux) [ python3 stdenv.cc.cc libdbusmenu - lldb + openssl.out + expat ]; dontAutoPatchelf = true; postFixup = (attrs.postFixup or "") + optionalString (stdenv.isLinux) '' @@ -58,9 +63,11 @@ let # bundled gdb does not find libcrypto 10 rm -rf bin/gdb/linux ln -s ${gdb} bin/gdb/linux - # bundled lldb does not find libssl - rm -rf bin/lldb/linux - ln -s ${lldb} bin/lldb/linux + + ls -d $PWD/bin/lldb/linux/lib/python3.8/lib-dynload/* | + xargs patchelf \ + --replace-needed libssl.so.10 libssl.so \ + --replace-needed libcrypto.so.10 libcrypto.so autoPatchelf $PWD/bin diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2cb093a89f89..b9142c400a87 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2615,8 +2615,8 @@ let mktplcRef = { name = "shellcheck"; publisher = "timonwong"; - version = "0.19.3"; - sha256 = "0l8fbim19jgcdgxxgidnhdczxvhls920vrffwrac8k1y34lgfl3v"; + version = "0.26.3"; + sha256 = "GlyOLc2VrRnA50MkaG83qa0yLUyJYwueqEO+ZeAStYs="; }; nativeBuildInputs = [ jq moreutils ]; postInstall = '' diff --git a/pkgs/applications/graphics/figma-linux/default.nix b/pkgs/applications/graphics/figma-linux/default.nix new file mode 100644 index 000000000000..1afc65ea0fc1 --- /dev/null +++ b/pkgs/applications/graphics/figma-linux/default.nix @@ -0,0 +1,77 @@ +{ pkgs +, lib +, stdenv +, fetchurl +, autoPatchelfHook +, dpkg +, ... +}: +with lib; +stdenv.mkDerivation rec { + pname = "figma-linux"; + version = "0.10.0"; + + src = fetchurl { + url = "https://github.com/Figma-Linux/figma-linux/releases/download/v${version}/figma-linux_${version}_linux_amd64.deb"; + sha256 = "sha256-+xiXEwSSxpt1/Eu9g57/L+Il/Av+a/mgGBQl/4LKR74="; + }; + + nativeBuildInputs = [ autoPatchelfHook dpkg ]; + + buildInputs = with pkgs;[ + alsa-lib + at-spi2-atk + cairo + cups.lib + dbus.lib + expat + gdk-pixbuf + glib + gtk3 + libdrm + libxkbcommon + mesa + nspr + nss + pango + ] ++ (with pkgs.xorg; [ + libX11 + libXcomposite + libXdamage + libXext + libXfixes + libXrandr + libxcb + libxshmfence + ]); + + runtimeDependencies = with pkgs; [ eudev ]; + + unpackCmd = "dpkg -x $src ."; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib && cp -r opt/figma-linux/* $_ + mkdir -p $out/bin && ln -s $out/lib/figma-linux $_/figma-linux + + cp -r usr/* $out + + runHook postInstall + ''; + + postFixup = '' + substituteInPlace $out/share/applications/figma-linux.desktop \ + --replace "Exec=/opt/figma-linux/figma-linux" "Exec=$out/bin/${pname}" + ''; + + meta = { + description = "unofficial Electron-based Figma desktop app for Linux"; + homepage = "https://github.com/Figma-Linux/figma-linux"; + platforms = [ "x86_64-linux" ]; + license = licenses.gpl2; + maintainers = with maintainers; [ ercao ]; + }; +} diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix index a38f6463e404..16635f17600f 100644 --- a/pkgs/applications/networking/cluster/atmos/default.nix +++ b/pkgs/applications/networking/cluster/atmos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atmos"; - version = "1.10.4"; + version = "1.13.1"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZNoucLjvj5nZxIDbzoAXtIx3TAg405+CaKBSLmC1PNM="; + sha256 = "sha256-iL8quRwW4idY880aEM2rwXRh6JXIvMzlfBDcz2TgHjw="; }; - vendorSha256 = "sha256-j4KvGLnFm3P9EUXxfRgsandKc0lJMs9ntBQacsEha2w="; + vendorSha256 = "sha256-pr33Ya6cg3EKIVTBTY8DD0lyTMPF1FcRQK2jdyPiE44="; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 5ec74e95e05c..bfc05e38a679 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubernetes-helm"; - version = "3.10.1"; + version = "3.10.2"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-OyU97zyN7fZMZAD2BEp8TW2z2E9Rl/yeiVkQaJ1GWZk="; + sha256 = "sha256-ly48zSsi+dV4te68LX8NtaJ9eLC46sSakExR2a+3b5U="; }; vendorSha256 = "sha256-vyHT/N5lat/vqM2jK4Q+jJOtZpS52YCYGcJqfa5e0KM="; diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index 49d9700feace..8bb4dc5ad80d 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "velero"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-xhsHFb3X1oM68xnYiVEa0eZr7VFdUCkNzeyvci6wb9g="; + sha256 = "sha256-UN1nxzcoaUrqmFAJ6LQ+Ro6Ywn/mG7J+MEJIUbpBiK4="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" ]; - vendorSha256 = "sha256-l8srlzoCcBZFOwVs7veQ1RvqWRIqQAaZLM/2CbNHN50="; + vendorSha256 = "sha256-QSR8nSKSKaFyFC6yik3f44mdNvSBgE4bFIGttuJ5oRM="; excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ]; diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix index 880981737d59..0573c7231e27 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix @@ -14,6 +14,7 @@ , Security , AppKit , CoreServices +, sqlcipher }: let @@ -87,7 +88,9 @@ stdenv.mkDerivation rec { done # executable wrapper + # LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102 makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ + --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \ --add-flags "$out/share/element/electron" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 19171c580461..fdfd722e8fb0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -5,13 +5,13 @@ let in buildPythonApplication rec { pname = "git-cola"; - version = "4.0.2"; + version = "4.0.3"; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "refs/tags/v${version}"; - hash = "sha256-5PE2Ey9IwNzxl4mk7tzaSWXiTmRFlxDO5MhoIYAwEag="; + hash = "sha256-w3SbuquHuWTYg1N3kcix4S5vrsmclVSrHf6uv8CYU6w="; }; buildInputs = [ git gettext ]; diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index b6b4af002d5c..52183660ad04 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 = "202211030059"; + version = "202211100058"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "b7d16c8aea9bbe2555fe4aabddd1fb86f9785229"; - sha256 = "sha256-1WxqD9a0uJY+/DiFwESkEceN2EJvDl5qhLg4oEs5uSA="; + rev = "6fcf11f003829b16b534a710a26549b741e81311"; + sha256 = "sha256-XlqfXRJa4xnw8lqC94TfRcXVW/8L7hrqENfC7A7rTpI="; }; installPhase = '' diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 207860b90c0e..e4cebab266e8 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -37,7 +37,7 @@ assert langGo -> langCC; assert langAda -> gnatboot != null; # threadsCross is just for MinGW -assert threadsCross != null -> stdenv.targetPlatform.isWindows; +assert threadsCross != {} -> stdenv.targetPlatform.isWindows; # profiledCompiler builds inject non-determinism in one of the compilation stages. # If turned on, we can't provide reproducible builds anymore @@ -65,7 +65,7 @@ let majorVersion = "10"; ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch + ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch ++ optional (buildPlatform.system == "aarch64-darwin" && targetPlatform != buildPlatform) (fetchpatch { url = "https://raw.githubusercontent.com/richard-vd/musl-cross-make/5e9e87f06fc3220e102c29d3413fbbffa456fcd6/patches/gcc-${version}/0008-darwin-aarch64-self-host-driver.patch"; @@ -179,7 +179,7 @@ stdenv.mkDerivation ({ ++ (optional (zlib != null) zlib) ; - depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; + depsTargetTarget = optional (!crossStageStatic && threadsCross != {} && threadsCross.package != null) threadsCross.package; NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; @@ -199,7 +199,7 @@ stdenv.mkDerivation ({ lib stdenv targetPackages - crossStageStatic libcCross + crossStageStatic libcCross threadsCross version gmp mpfr libmpc isl diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index 3b03e185dd86..220339c29595 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -37,7 +37,7 @@ assert langGo -> langCC; assert langAda -> gnatboot != null; # threadsCross is just for MinGW -assert threadsCross != null -> stdenv.targetPlatform.isWindows; +assert threadsCross != {} -> stdenv.targetPlatform.isWindows; # profiledCompiler builds inject non-determinism in one of the compilation stages. # If turned on, we can't provide reproducible builds anymore @@ -76,7 +76,7 @@ let majorVersion = "11"; }) # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch; + ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; @@ -187,7 +187,7 @@ stdenv.mkDerivation ({ ++ (optional (zlib != null) zlib) ; - depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; + depsTargetTarget = optional (!crossStageStatic && threadsCross != {} && threadsCross.package != null) threadsCross.package; NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; @@ -207,7 +207,7 @@ stdenv.mkDerivation ({ lib stdenv targetPackages - crossStageStatic libcCross + crossStageStatic libcCross threadsCross version gmp mpfr libmpc isl diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index c7fcd5475ade..78c7a12027ce 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -41,7 +41,7 @@ assert langAda -> gnatboot != null; assert !langD; # threadsCross is just for MinGW -assert threadsCross != null -> stdenv.targetPlatform.isWindows; +assert threadsCross != {} -> stdenv.targetPlatform.isWindows; # profiledCompiler builds inject non-determinism in one of the compilation stages. # If turned on, we can't provide reproducible builds anymore @@ -71,7 +71,7 @@ let majorVersion = "12"; ++ optional langD ../libphobos.patch # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch; + ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; @@ -180,7 +180,7 @@ stdenv.mkDerivation ({ ++ (optional (zlib != null) zlib) ; - depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; + depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package; NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; @@ -201,7 +201,7 @@ stdenv.mkDerivation ({ lib stdenv targetPackages - crossStageStatic libcCross + crossStageStatic libcCross threadsCross version gmp mpfr libmpc isl diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 0bd2e5e1b91e..ba084af53ee5 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -45,7 +45,7 @@ assert stdenv.buildPlatform.isDarwin -> gnused != null; assert langGo -> langCC; # threadsCross is just for MinGW -assert threadsCross != null -> stdenv.targetPlatform.isWindows; +assert threadsCross != {} -> stdenv.targetPlatform.isWindows; # profiledCompiler builds inject non-determinism in one of the compilation stages. # If turned on, we can't provide reproducible builds anymore @@ -188,7 +188,7 @@ stdenv.mkDerivation ({ ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ; - depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; + depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross; preConfigure = import ../common/pre-configure.nix { inherit lib; @@ -204,7 +204,7 @@ stdenv.mkDerivation ({ lib stdenv targetPackages - crossStageStatic libcCross + crossStageStatic libcCross threadsCross version gmp mpfr libmpc isl diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 9a977392aeb3..516cdee708d3 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -45,7 +45,7 @@ assert stdenv.buildPlatform.isDarwin -> gnused != null; assert langGo -> langCC; # threadsCross is just for MinGW -assert threadsCross != null -> stdenv.targetPlatform.isWindows; +assert threadsCross != {} -> stdenv.targetPlatform.isWindows; # profiledCompiler builds inject non-determinism in one of the compilation stages. # If turned on, we can't provide reproducible builds anymore @@ -208,7 +208,7 @@ stdenv.mkDerivation ({ ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ; - depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; + depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross; preConfigure = import ../common/pre-configure.nix { inherit lib; @@ -224,7 +224,7 @@ stdenv.mkDerivation ({ lib stdenv targetPackages - crossStageStatic libcCross + crossStageStatic libcCross threadsCross version gmp mpfr libmpc isl diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 8c28e9b4b466..8bd9d41f1eae 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -48,7 +48,7 @@ assert langGo -> langCC; assert langAda -> gnatboot != null; # threadsCross is just for MinGW -assert threadsCross != null -> stdenv.targetPlatform.isWindows; +assert threadsCross != {} -> stdenv.targetPlatform.isWindows; # profiledCompiler builds inject non-determinism in one of the compilation stages. # If turned on, we can't provide reproducible builds anymore @@ -72,7 +72,7 @@ let majorVersion = "6"; ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch + ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch ++ optional (targetPlatform.libc == "musl" && targetPlatform.isx86_32) (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/main/gcc/gcc-6.1-musl-libssp.patch?id=5e4b96e23871ee28ef593b439f8c07ca7c7eb5bb"; sha256 = "1jf1ciz4gr49lwyh8knfhw6l5gvfkwzjy90m7qiwkcbsf4a3fqn2"; @@ -217,7 +217,7 @@ stdenv.mkDerivation ({ ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ; - depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; + depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package; NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; @@ -235,7 +235,7 @@ stdenv.mkDerivation ({ lib stdenv targetPackages - crossStageStatic libcCross + crossStageStatic libcCross threadsCross version gmp mpfr libmpc isl diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 4097d6999d7a..637be9fd971c 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -32,7 +32,7 @@ assert stdenv.buildPlatform.isDarwin -> gnused != null; assert langGo -> langCC; # threadsCross is just for MinGW -assert threadsCross != null -> stdenv.targetPlatform.isWindows; +assert threadsCross != {} -> stdenv.targetPlatform.isWindows; # profiledCompiler builds inject non-determinism in one of the compilation stages. # If turned on, we can't provide reproducible builds anymore @@ -75,7 +75,7 @@ let majorVersion = "7"; ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch + ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch ++ [ ../libsanitizer-no-cyclades-9.patch ]; @@ -184,7 +184,7 @@ stdenv.mkDerivation ({ ++ (optional (zlib != null) zlib) ; - depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; + depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package; NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument"; NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; @@ -203,7 +203,7 @@ stdenv.mkDerivation ({ lib stdenv targetPackages - crossStageStatic libcCross + crossStageStatic libcCross threadsCross version gmp mpfr libmpc isl diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 26591000fd8e..4eb47d00c5c2 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -32,7 +32,7 @@ assert stdenv.buildPlatform.isDarwin -> gnused != null; assert langGo -> langCC; # threadsCross is just for MinGW -assert threadsCross != null -> stdenv.targetPlatform.isWindows; +assert threadsCross != {} -> stdenv.targetPlatform.isWindows; # profiledCompiler builds inject non-determinism in one of the compilation stages. # If turned on, we can't provide reproducible builds anymore @@ -59,8 +59,7 @@ let majorVersion = "8"; ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch - + ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch ++ [ ../libsanitizer-no-cyclades-9.patch ]; /* Cross-gcc settings (build == host != target) */ @@ -168,7 +167,7 @@ stdenv.mkDerivation ({ ++ (optional (zlib != null) zlib) ; - depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; + depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package; NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; @@ -186,7 +185,7 @@ stdenv.mkDerivation ({ lib stdenv targetPackages - crossStageStatic libcCross + crossStageStatic libcCross threadsCross version gmp mpfr libmpc isl diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index b970785d38ef..4c49cdaa3e25 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -41,7 +41,7 @@ assert langGo -> langCC; assert langAda -> gnatboot != null; # threadsCross is just for MinGW -assert threadsCross != null -> stdenv.targetPlatform.isWindows; +assert threadsCross != {} -> stdenv.targetPlatform.isWindows; # profiledCompiler builds inject non-determinism in one of the compilation stages. # If turned on, we can't provide reproducible builds anymore @@ -71,7 +71,7 @@ let majorVersion = "9"; ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch + ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch ; /* Cross-gcc settings (build == host != target) */ @@ -180,7 +180,7 @@ stdenv.mkDerivation ({ ++ (optional (zlib != null) zlib) ; - depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; + depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package; NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; @@ -198,7 +198,7 @@ stdenv.mkDerivation ({ lib stdenv targetPackages - crossStageStatic libcCross + crossStageStatic libcCross threadsCross version gmp mpfr libmpc isl diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 09533163cbfe..8e444d54bf39 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -2,6 +2,7 @@ , targetPackages , crossStageStatic, libcCross +, threadsCross , version , gmp, mpfr, libmpc, isl @@ -86,7 +87,7 @@ let "--enable-__cxa_atexit" "--enable-long-long" "--enable-threads=${if targetPlatform.isUnix then "posix" - else if targetPlatform.isWindows then "mcf" + else if targetPlatform.isWindows then (threadsCross.model or "win32") else "single"}" "--enable-nls" ] ++ lib.optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [ diff --git a/pkgs/development/compilers/gcc/common/extra-target-flags.nix b/pkgs/development/compilers/gcc/common/extra-target-flags.nix index ad4ab6bcb4bd..4dedd333b002 100644 --- a/pkgs/development/compilers/gcc/common/extra-target-flags.nix +++ b/pkgs/development/compilers/gcc/common/extra-target-flags.nix @@ -15,7 +15,7 @@ in "-B${lib.getLib dep}${dep.libdir or "/lib"}" ]); in mkFlags libcCross langD - ++ lib.optionals (!crossStageStatic) (mkFlags threadsCross langD) + ++ lib.optionals (!crossStageStatic) (mkFlags (threadsCross.package or null) langD) ; EXTRA_LDFLAGS_FOR_TARGET = let @@ -28,6 +28,6 @@ in "-Wl,-rpath-link,${lib.getLib dep}${dep.libdir or "/lib"}" ])); in mkFlags libcCross - ++ lib.optionals (!crossStageStatic) (mkFlags threadsCross) + ++ lib.optionals (!crossStageStatic) (mkFlags (threadsCross.package or null)) ; } diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix index 07a590f38845..7f6e2ce6ace8 100644 --- a/pkgs/development/compilers/go/1.18.nix +++ b/pkgs/development/compilers/go/1.18.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { depsBuildTarget = lib.optional isCross targetCC; - depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross; + depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package; postPatch = '' patchShebangs . diff --git a/pkgs/development/compilers/go/1.19.nix b/pkgs/development/compilers/go/1.19.nix index 0d977ec3af3a..a406b21458dc 100644 --- a/pkgs/development/compilers/go/1.19.nix +++ b/pkgs/development/compilers/go/1.19.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { depsBuildTarget = lib.optional isCross targetCC; - depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross; + depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package; postPatch = '' patchShebangs . diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 513ae50298e2..34e26f547093 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -30,6 +30,21 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional enableMmap "--enable-mmap" ++ lib.optional enableLargeConfig "--enable-large-config"; + # This stanza can be dropped when a release fixes this issue: + # https://github.com/ivmai/bdwgc/issues/376 + # The version is checked with == instead of versionAtLeast so we + # don't forget to disable the fix (and if the next release does + # not fix the problem the test failure will be a reminder to + # extend the set of versions requiring the workaround). + makeFlags = if (stdenv.hostPlatform.isPower64 && + finalAttrs.version == "8.2.2") + then [ + # do not use /proc primitives to track dirty bits; see: + # https://github.com/ivmai/bdwgc/issues/479#issuecomment-1279687537 + # https://github.com/ivmai/bdwgc/blob/54522af853de28f45195044dadfd795c4e5942aa/include/private/gcconfig.h#L741 + "CFLAGS_EXTRA=-DNO_SOFT_VDB" + ] else null; + # `gctest` fails under emulation on aarch64-darwin doCheck = !(stdenv.isDarwin && stdenv.isx86_64); diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index 3aa925b63d2e..53a852934d47 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "mne-python"; - version = "1.2.1"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "mne-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-PAgePQGf4pO+cciIk718Wlk0OEw4ltrhCdWRyDZzFh0="; + hash = "sha256-KFifnu9MR3FoVs7gLv+CpB/p3/6Iej9RJuBf1uc1HJs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 1c48a6afae77..eb36da387f60 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.25.0"; + version = "1.26.0.post1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-aJd/dEzjucQgiEZ/9m4z55HKPyew3FXztVApjwPqGm8="; + hash = "sha256-bXB5+Mc53Jk8vtrQc2KZxBOyl4FLc3laOFWnkWnsyTg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 0bc838839e6c..c3fe1c044708 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "7.3.2"; + version = "7.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+DihyuSzqFoQvDnlYUyvdyjravxMcU8PgYEq2FY2o9g="; + hash = "sha256-fg5/5x4vUsm0kvVJtvlgB3PZSmU4pXkU6V0+yEDqNRg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 0984dd3e0492..b0167bf17a3f 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.112"; + version = "2.1.113"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Mwns3l0cUylbMxC55wIZyYklVtqcPEQ02+5oxNd5SbQ="; + hash = "sha256-FykzeHQjBMBZ+NqOMzjwHiOCMLk1rvomjUaoHco2ZQg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pycocotools/default.nix b/pkgs/development/python-modules/pycocotools/default.nix index 52ce42b13918..d6c757ed2e34 100644 --- a/pkgs/development/python-modules/pycocotools/default.nix +++ b/pkgs/development/python-modules/pycocotools/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pycocotools"; - version = "2.0.5"; + version = "2.0.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QdH7Bi31urXrw+kpcUVaoIlHnnzRBVMnjKVGKLncm/U="; + sha256 = "sha256-f+CJsFzBjoBtzzvXZHCNhtq5IqEA83NOt3+3enCh0Yw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index 74f0ed630a26..5035f7c1a369 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -7,44 +7,42 @@ , pythonOlder , pyyaml , requests +, requests-mock , responses -, setuptools }: buildPythonPackage rec { pname = "pyrainbird"; - version = "0.4.3"; + version = "0.6.2"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "jbarrancos"; repo = pname; rev = version; - hash = "sha256-uRHknWvoPKPu3B5MbSEUlWqBKwAbNMwsgXuf6PZxhkU="; + hash = "sha256-MikJDW5Fo2DNpn9/Hyc1ecIIMEwE8GD5LKpka2t7aCk="; }; + postPatch = '' + substituteInPlace pytest.ini \ + --replace "--cov=pyrainbird --cov-report=term-missing" "" + ''; + propagatedBuildInputs = [ pycryptodome pyyaml requests - setuptools ]; checkInputs = [ - pytestCheckHook parameterized + pytestCheckHook + requests-mock responses ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "datetime" "" - substituteInPlace pytest.ini \ - --replace "--cov=pyrainbird --cov-report=term-missing --pep8 --flakes --mccabe" "" - ''; - pythonImportsCheck = [ "pyrainbird" ]; diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 14fff3d0d370..f09d40bc7236 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.20.3"; + version = "0.20.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-kyCCGXvjE3Ufmc473GiYDVZ9QpNn1GTuVbwvd3NUTwo="; + hash = "sha256-hBoK2Nx4pFCWt+RRmzVuoJok8QvVnEa82WINGrFpHqo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-ldap/default.nix b/pkgs/development/python-modules/python-ldap/default.nix index 7b3c2bdbc0ba..f8844c5eaec7 100644 --- a/pkgs/development/python-modules/python-ldap/default.nix +++ b/pkgs/development/python-modules/python-ldap/default.nix @@ -45,6 +45,11 @@ buildPythonPackage rec { export SCHEMA="${openldap}/etc/schema" ''; + disabledTests = [ + # https://github.com/python-ldap/python-ldap/issues/501 + "test_tls_ext_noca" + ]; + doCheck = !stdenv.isDarwin; meta = with lib; { diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index 2656f460ff6a..c6f42a38e0f1 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -1,6 +1,7 @@ { lib , fetchFromGitHub , buildPythonPackage +, certifi , geckodriver , pytestCheckHook , pythonOlder @@ -12,7 +13,9 @@ buildPythonPackage rec { pname = "selenium"; - version = "4.5.0"; + version = "4.6.0"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { @@ -20,7 +23,7 @@ buildPythonPackage rec { repo = "selenium"; # check if there is a newer tag with or without -python suffix rev = "refs/tags/selenium-${version}"; - hash = "sha256-K90CQYTeX9GKpP0ahxLx2HO5HG0P6MN7jeWmHtfiOns="; + hash = "sha256-xgGGtJo+DZIwPa0H6dsT0VClRTMM8iFbNzSDZjH7ImI="; }; postPatch = '' @@ -33,11 +36,11 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + certifi trio trio-websocket urllib3 - ] ++ urllib3.optional-dependencies.secure - ++ urllib3.optional-dependencies.socks; + ] ++ urllib3.optional-dependencies.socks; checkInputs = [ pytestCheckHook diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 8a239b4c37f7..105080ce2230 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -42,6 +42,10 @@ buildPythonApplication rec { hash = "sha256-dXpgm9S++jtBhuzX9db8Pm5LF6Qb4isXx5uyOGdWGUc="; }; + patches = [ + ./flake8-compat-5.x.patch + ]; + nativeBuildInputs = with py.pkgs; [ pythonRelaxDepsHook setuptools-scm @@ -137,6 +141,10 @@ buildPythonApplication rec { "checkov" ]; + postInstall = '' + chmod +x $out/bin/checkov + ''; + meta = with lib; { description = "Static code analysis tool for infrastructure-as-code"; homepage = "https://github.com/bridgecrewio/checkov"; diff --git a/pkgs/development/tools/analysis/checkov/flake8-compat-5.x.patch b/pkgs/development/tools/analysis/checkov/flake8-compat-5.x.patch new file mode 100644 index 000000000000..9bb019292536 --- /dev/null +++ b/pkgs/development/tools/analysis/checkov/flake8-compat-5.x.patch @@ -0,0 +1,25 @@ +diff --git a/flake8_plugins/flake8_class_attributes_plugin/tests/conftest.py b/flake8_plugins/flake8_class_attributes_plugin/tests/conftest.py +index 1ad762aed..c91078dcf 100644 +--- a/flake8_plugins/flake8_class_attributes_plugin/tests/conftest.py ++++ b/flake8_plugins/flake8_class_attributes_plugin/tests/conftest.py +@@ -1,6 +1,7 @@ + import ast + import os + ++import flake8 + from flake8.options.manager import OptionManager + + from flake8_plugins.flake8_class_attributes_plugin.flake8_class_attributes.checker import ClassAttributesChecker +@@ -17,7 +18,11 @@ def run_validator_for_test_file(filename, max_annotations_complexity=None, + raw_content = file_handler.read() + tree = ast.parse(raw_content) + +- options = OptionManager('flake8_class_attributes_order', '0.1.3') ++ options = OptionManager( ++ version=flake8.__version__, ++ plugin_versions='flake8_class_attributes_order: 0.1.3', ++ parents=[], ++ ) + options.use_class_attributes_order_strict_mode = strict_mode + options.class_attributes_order = attributes_order + ClassAttributesChecker.parse_options(options) diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 63ab2100f6d0..ae314347ff4f 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2022.10.25"; + version = "2022.11.11"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PjnI1aK8qrMkVSoYV2EFwqNeAguzEf9T106stYuFGFM="; + sha256 = "sha256-5p9kR36DWV87iR4eWLGxNV1MWTQy5jsHjcG+m9k8UGY="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/rust/cargo-auditable/default.nix b/pkgs/development/tools/rust/cargo-auditable/default.nix index 164a6b2184ad..82213d6a93bc 100644 --- a/pkgs/development/tools/rust/cargo-auditable/default.nix +++ b/pkgs/development/tools/rust/cargo-auditable/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-auditable"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "rust-secure-code"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4CHuthi7GXZKHenOE2Bk+Ps1AJlPkhvMIGHmV9Z00hA="; + sha256 = "sha256-bRx+a6vzjiS2dglVkTyUm8OASM2Qq05S7LuVkHaIYMU="; }; - cargoSha256 = "sha256-puq8BgYuynFZCepYZdQ9ggDYJlFDks7s/l3UxM9F7ag="; + cargoSha256 = "sha256-QZi45U+MV8h4AMcN3QLIfAn/gHzoBWuOsC7gDSBY2jI="; meta = with lib; { description = "A tool to make production Rust binaries auditable"; diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index d3b1a1f7d263..d248b091bba6 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.21.0"; + version = "0.22.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-wrNooeHFgIPJkjCeH4PoaaRjsukg2ASbioD/TTSNNgk="; + sha256 = "sha256-OjKvp3LsNBIIkpq15BAi9LqxbLgormkiW/lMqdPefZM="; }; - cargoSha256 = "sha256-2/yTRbGTE72PhSFf4I/6y0B6z9qYM5dwFmk5VCWU0mU="; + cargoSha256 = "sha256-TUXyWO1rNngv1Tli0jeaOHwaBJnh7LnXe+lNSR+7rfI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index df1b4deb0300..c29b39e78037 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.27.2"; + version = "1.28.0"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YDlZYYKibq8eAeGkU1qtTrJC0UF4YOK7XzkxWZjoQhM="; + sha256 = "sha256-u5qlHIzPaAKLOoNSmfcPr+iNug3ZPyAm5kkfI7IO45U="; }; - cargoSha256 = "sha256-3mXjAD4kzAaiFkK9XFEy7Df+ko6jHfWAle7gAoHxb7E="; + cargoSha256 = "sha256-+jc/k7YDk/MySJhuOWlas9KQSeqkwFrvRGGd9tDFEkc="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index eeafb988c097..32e2edccce1a 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.54.0"; + version = "0.55.0"; shas = { - x86_64-linux = "sha256-V7xBGdKtLZRRNoRyvY/8a3Cvw12zo8tz76ZR72xmG6U="; - aarch64-linux = "sha256-/KIZ2Feli7VNdgFUU+MC5QZ8dQJ88TKfjz/SOoux1zg="; - x86_64-darwin = "sha256-xBDMDvWFZPMwJb3alQe7ZuboTm2aFOh9F7memuHo180="; - aarch64-darwin = "sha256-Z62rnm8X0cro7HBBv5pbkvQJd+AW+wF2tthH1+5a0nU="; + x86_64-linux = "sha256-HztOb1r/9tWh0w4zQveBLOh3d6OfnSwQZkIx6drXJ7M="; + aarch64-linux = "sha256-rP0K875V4f4yHe7unUCpMCQbi7Fips6474gFZph73Ys="; + x86_64-darwin = "sha256-iiYttjs9h84YqZG8prxudTTi588BuoqA3zc2LkEks5E="; + aarch64-darwin = "sha256-RBA3fl3YdCqxb00xgl6KTYdbvl75U5Kgrux5N+dZg/g="; }; } diff --git a/pkgs/games/ferium/default.nix b/pkgs/games/ferium/default.nix index 7fc79f8be438..60cf85ddfb57 100644 --- a/pkgs/games/ferium/default.nix +++ b/pkgs/games/ferium/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "ferium"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "gorilla-devs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pJis4Lab/qRc5taeTxSoJOvNrhsWhGJrPILvkmB8k2A="; + sha256 = "sha256-tRJwx+yOzgy5SkVPtE2w4bhFSIaZUxXO4FBrZdhyz7g="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-J1BY0gSkUQRFZJ/UlikvQqrLvCjHlf2jxbg6BIoZZUE="; + cargoSha256 = "sha256-zfA+kCqfyI+zNleOHWAYGLePy5FHSw05xIcWRT8BHbY="; # Disable the GUI file picker so that GTK/XDG dependencies aren't used buildNoDefaultFeatures = true; diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix index 4c18f478798e..dbcf9522e723 100644 --- a/pkgs/os-specific/linux/jool/cli.nix +++ b/pkgs/os-specific/linux/jool/cli.nix @@ -10,6 +10,11 @@ stdenv.mkDerivation { src = sourceAttrs.src; + outputs = [ + "out" + "man" + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libnl iptables ]; diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix index 87e36fe5a9eb..600dd8a33a4a 100644 --- a/pkgs/os-specific/linux/jool/source.nix +++ b/pkgs/os-specific/linux/jool/source.nix @@ -1,11 +1,11 @@ { fetchFromGitHub }: rec { - version = "4.1.7"; + version = "4.1.8"; src = fetchFromGitHub { owner = "NICMx"; repo = "Jool"; rev = "v${version}"; - sha256 = "08z23mi6xkr6zzp0hzh1cppvl2y0177s0lnpxqbpy8jiii5fxw8f"; + hash = "sha256-b+1EM172NRnnTcbJOwBQfytIRuIr8zZBlKBBV/e7Ttg="; }; } diff --git a/pkgs/servers/http/dufs/default.nix b/pkgs/servers/http/dufs/default.nix index c89ccb8c7b13..e162a42863a5 100644 --- a/pkgs/servers/http/dufs/default.nix +++ b/pkgs/servers/http/dufs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "dufs"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "sigoden"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UJ93yUJqxkP+PyUrhKkjV90vr55MemC1zRbzh/gFqPU="; + sha256 = "sha256-fR3CeF+ScvDoPJaevAAShUdZDDjD/ocZQl7dIk2jHso="; }; - cargoSha256 = "sha256-dyn0wj11MC9NYwULsR6ytYUl+8wsRkVLBIwcgM5mMNQ="; + cargoSha256 = "sha256-VH/eu0qLh59J6uyj0RSqqEhlwghYg/JPp6u54BQzLPo="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index a3c19252c82d..9f08b323ca5e 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -2,7 +2,7 @@ let pname = "miniflux"; - version = "2.0.39"; + version = "2.0.40"; in buildGoModule { inherit pname version; @@ -11,10 +11,10 @@ in buildGoModule { owner = pname; repo = "v2"; rev = version; - sha256 = "sha256-vvGQc+Ot7w9gZuXV8yCGvMcRIRJJez59bMudX6D34es="; + sha256 = "sha256-T7W7DnMMRv4UmzfNB25ustLxv+gkG4Wtw/pMesDvIns="; }; - vendorSha256 = "sha256-IbOfEdCAuK70+3Z4rWkxVZKPw1rD1hHkohQoWAK1Z3w="; + vendorSha256 = "sha256-uRbRNUZVYzvxl+qomXG9tBAuXOkoyKOfUQaPF3q4a9Y="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/syncstorage-rs/default.nix b/pkgs/servers/syncstorage-rs/default.nix index 460f412a7f83..e0b836ae851d 100644 --- a/pkgs/servers/syncstorage-rs/default.nix +++ b/pkgs/servers/syncstorage-rs/default.nix @@ -21,13 +21,13 @@ in rustPlatform.buildRustPackage rec { pname = "syncstorage-rs"; - version = "0.12.4"; + version = "0.12.5"; src = fetchFromGitHub { owner = "mozilla-services"; repo = pname; rev = version; - hash = "sha256-X+AtorrDjxPYRmG1kVumF857mLFfHVUmfOntUbO7J1U="; + hash = "sha256-rayJvJ8+y1mw2BEKuaZqGnsIqtVKgBoFkINntRLtTLs="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { --prefix PATH : ${lib.makeBinPath [ pyFxADeps ]} ''; - cargoSha256 = "sha256-mCEQELIi4baPpQOO0Ya51bDfw24I/9tZIRjic6OzMF4="; + cargoSha256 = "sha256-FUWyR2mfXHyQ/WdyyV4/pIniBV9pr80WwpFA4c8D1UY="; buildFeatures = [ "grpcio/openssl" ]; diff --git a/pkgs/tools/backup/rustic-rs/default.nix b/pkgs/tools/backup/rustic-rs/default.nix new file mode 100644 index 000000000000..4d98fce5c60a --- /dev/null +++ b/pkgs/tools/backup/rustic-rs/default.nix @@ -0,0 +1,36 @@ +{ lib, fetchFromGitHub, rustPlatform, stdenv, darwin, installShellFiles }: + +rustPlatform.buildRustPackage rec { + pname = "rustic-rs"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "rustic-rs"; + repo = "rustic"; + rev = "v${version}"; + hash = "sha256-MGFtJUfPK6IH3w8xe/RZaXS+QDIVS3jFSnf4VYiSLM4="; + }; + + cargoHash = "sha256-siJrqL7HjUQvcyXpUN5rQWNeQNBc+693N1xTSvlOixI="; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ]; + + postInstall = '' + for shell in {ba,fi,z}sh; do + $out/bin/rustic completions $shell > rustic.$shell + done + + installShellCompletion rustic.{ba,fi,z}sh + ''; + + meta = { + homepage = "https://github.com/rustic-rs/rustic"; + changelog = "https://github.com/rustic-rs/rustic/blob/${src.rev}/changelog/${version}.txt"; + description = "fast, encrypted, deduplicated backups powered by pure Rust"; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + license = [ lib.licenses.mit lib.licenses.asl20 ]; + maintainers = [ lib.maintainers.nobbz ]; + }; +} diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index 3c7ae47991bc..7751ecdf25eb 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - sha256 = "sha256-Hlowm+wtj3bJBGJd/JndOaGC6iSdab3sURUjzshqh+k="; + sha256 = "sha256-KAm4ng+FIMmhHAxoFNNVo48GVbW3c+raX6Hcab+KCf8="; }; - cargoSha256 = "sha256-Ir3u57nCBgzEuwaOzx8z71cxXmrIJLkURhuwFRoB2Xw="; + cargoSha256 = "sha256-xbE1Olf0lh6o4kF9ubZhdnTbZsJcd5TvLf7P1nWLf9Q="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/tools/misc/mutagen-compose/default.nix b/pkgs/tools/misc/mutagen-compose/default.nix index 669ad1d3aea2..8c110b89bbd2 100644 --- a/pkgs/tools/misc/mutagen-compose/default.nix +++ b/pkgs/tools/misc/mutagen-compose/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mutagen-compose"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "mutagen-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fr4Emw8S7Uu0I08Yxha+hzZF54cJZ8UQgWF4GGvWDu0="; + sha256 = "sha256-tH1aYMjKsSMWls53IgsqtAgMMLUvotb5zGlAmV3dlvQ="; }; - vendorSha256 = "sha256-P6FnDp+nEEZM/7uvSb9Zkrn2zLha816A82xN2AFNgWc="; + vendorSha256 = "sha256-nRH26ty3JVSz2ZnrZ+owTj2fponnvYkrASQxcJXm8aE="; doCheck = false; diff --git a/pkgs/tools/misc/topicctl/default.nix b/pkgs/tools/misc/topicctl/default.nix index 213a44488881..26d7ac3971d7 100644 --- a/pkgs/tools/misc/topicctl/default.nix +++ b/pkgs/tools/misc/topicctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "topicctl"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-RbcycZPTZFxvtgwcjZ8d0LUiSzBtMyFxyC0AcwKGlv4="; + sha256 = "sha256-eHFqczZtJWcZ4ZVOzpCUlVoCJ7wjyWNpFfiZ9MaJHOI="; }; - vendorSha256 = "sha256-/f1uzil3FtKLByFI5qp2Tc52/lajCbx5sNBRRJzjWN8="; + vendorSha256 = "sha256-50UDRf8S9Yl0zwGOrFLa5L1TmSKF4RQ/ju0tnFzs56M="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index 22ae4cb210c2..6107efff7871 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "lldpd"; - version = "1.0.15"; + version = "1.0.16"; src = fetchurl { url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz"; - sha256 = "sha256-9/46EwvpihnEkUee9g82uO5Bqea8TX8sQQM/Y5VqMSY="; + sha256 = "sha256-47ORZQx7pnzqL+hNZ/201/yKoexc+G64u5hHEd+EZak="; }; configureFlags = [ diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index b87991003cf1..b1ce1a7b7f6a 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, perl, gettext, pkg-config, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.5.13"; + version = "5.5.14"; pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "sha256-Qd1tPRKbiTNmsOdawxQhJO1ykEA1VdAAXeBPPVlXwvI="; + sha256 = "sha256-UTUsuu/CGWhx9zYr7ppnJd7pumb6nGEyVwtJwC0loZ0="; }; nativeBuildInputs = [ perl gettext pkg-config ]; diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index 73e6cbd27d1e..036cc53efc99 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -2,24 +2,24 @@ , buildPythonApplication , fetchFromGitHub , nix -, nix-prefetch , nixpkgs-fmt , nixpkgs-review }: buildPythonApplication rec { pname = "nix-update"; - version = "0.7.0"; + version = "0.8.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - sha256 = "sha256-q3kC+CJ0+NRz3rqHFuJkiI4RCSAXZczqDiyfQB2CrFQ="; + sha256 = "sha256-EwEGHiJxdubecuXMuBrk6pDld3mNl2ortwlIa0Cdgu0="; }; makeWrapperArgs = [ - "--prefix" "PATH" ":" (lib.makeBinPath [ nix nix-prefetch nixpkgs-fmt nixpkgs-review ]) + "--prefix" "PATH" ":" (lib.makeBinPath [ nix nixpkgs-fmt nixpkgs-review ]) ]; checkPhase = '' diff --git a/pkgs/tools/text/comrak/default.nix b/pkgs/tools/text/comrak/default.nix index 5d51f708e6a3..f4ad0f485e40 100644 --- a/pkgs/tools/text/comrak/default.nix +++ b/pkgs/tools/text/comrak/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "comrak"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "kivikakk"; repo = pname; rev = version; - sha256 = "0a01s9lqhqjqpycszfkgmxk60bk4h2ja9ykdhp32aqvcdsjsj763"; + sha256 = "sha256-F6MZxbB3FYEJ8tzJ0tp9/s0aLaH35QUnOJS6mCVfzUQ="; }; - cargoSha256 = "sha256-+OQ4np+JaHMm3n4uayqlAwx+DTi5k4NgKEOWA2lB/BQ="; + cargoSha256 = "sha256-+QPzwfoxt6+gpb4bDMd++1dBKoXOTON0z2EDdgmyy60="; meta = with lib; { description = "A CommonMark-compatible GitHub Flavored Markdown parser and formatter"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99a3050a4fc6..d81cb564c149 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -482,6 +482,8 @@ with pkgs; expressvpn = callPackage ../applications/networking/expressvpn { }; + figma-linux = callPackage ../applications/graphics/figma-linux {}; + firefly-desktop = callPackage ../applications/misc/firefly-desktop { }; frece = callPackage ../development/tools/frece { }; @@ -13856,7 +13858,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; isl = if !stdenv.isDarwin then isl_0_14 else null; cloog = if !stdenv.isDarwin then cloog else null; @@ -13870,7 +13872,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; isl = if !stdenv.isDarwin then isl_0_11 else null; @@ -13887,7 +13889,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; # gcc 10 is too strict to cross compile gcc <= 8 stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; @@ -13906,7 +13908,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; # gcc 10 is too strict to cross compile gcc <= 8 stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; @@ -13921,7 +13923,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; # gcc 10 is too strict to cross compile gcc <= 8 stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; @@ -13936,7 +13938,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; isl = if !stdenv.isDarwin then isl_0_20 else null; })); @@ -13948,7 +13950,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; isl = if !stdenv.isDarwin then isl_0_20 else null; })); @@ -13960,7 +13962,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; isl = if !stdenv.isDarwin then isl_0_20 else null; })); @@ -13972,7 +13974,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else {}; isl = if !stdenv.isDarwin then isl_0_20 else null; })); @@ -15413,7 +15415,7 @@ with pkgs; # want the C++ library to be explicitly chosen by the caller, and null by # default. libcxx ? null - , extraPackages ? lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) threadsCross + , extraPackages ? lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) threadsCross.package , nixSupport ? {} , ... } @ extraArgs: @@ -19137,10 +19139,13 @@ with pkgs; libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc; - threadsCross = - if stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false) - then targetPackages.windows.mcfgthreads or windows.mcfgthreads - else null; + threadsCross = if stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false) + then { + # other possible values: win32 or posix + model = "mcf"; + # For win32 or posix set this to null + package = targetPackages.windows.mcfgthreads or windows.mcfgthreads; + } else {}; wasilibc = callPackage ../development/libraries/wasilibc { stdenv = crossLibcStdenv; @@ -24434,6 +24439,8 @@ with pkgs; roon-server = callPackage ../servers/roon-server { }; + rustic-rs = callPackage ../tools/backup/rustic-rs { }; + supervise = callPackage ../tools/system/supervise { }; spamassassin = callPackage ../servers/mail/spamassassin { };