From de8743c2734c682a750694a51b8cf024c2dd3df5 Mon Sep 17 00:00:00 2001 From: GenericNerdyUsername Date: Thu, 22 Sep 2022 11:47:34 +0100 Subject: [PATCH 01/50] jetbrains.clion: patch lldb instead of replacing Using LLDB to debug rust programs failed due to a missing executable. See https://github.com/NixOS/nixpkgs/pull/186976#issuecomment-1252194831 --- pkgs/applications/editors/jetbrains/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 47dabbf0cbb9..292895107b83 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 From 90babdcf38cd283b116fed0d79bf815e270c4638 Mon Sep 17 00:00:00 2001 From: ercao Date: Sun, 6 Nov 2022 14:48:22 +0800 Subject: [PATCH 02/50] maintainers: add ercao Signed-off-by: ercao --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 85dfc9c1f008..010c2ccd1aeb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4117,6 +4117,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"; From 06ecc51368bb4181c313dd6fea1bc573b9b9a033 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 6 Nov 2022 22:03:18 -0800 Subject: [PATCH 03/50] boehmgc: disable SOFT_VDB on powerpc64le for version 8.2.2 Upstream has not yet fixed the bug: https://github.com/ivmai/bdwgc/issues/376 https://github.com/ivmai/bdwgc/issues/479 However there is a recommended workaround: https://github.com/ivmai/bdwgc/issues/479#issuecomment-1279687537 This adds `CFLAGS_EXTRA=-DNO_SOFT_VDB` to the `makeFlags`, which prevents direct accesses to `/proc` being used for tracking dirtied pages (which must be rescanned): https://github.com/ivmai/bdwgc/blob/54522af853de28f45195044dadfd795c4e5942aa/include/private/gcconfig.h#L741 The collector will fall back to using mprotect() to trigger page faults on writes to clean pages and maintain its own dirty bits, which is slightly less efficient but (in this case) more reliable. Unreliable page-dirtiness bits can lead to use-after-free() corruption; this is not a situation where disabling the tests is a good idea. --- pkgs/development/libraries/boehm-gc/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 513ae50298e2..1a5924fbf55e 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -30,6 +30,17 @@ 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 + makeFlags = lib.optionals (stdenv.hostPlatform.isPower64 && + lib.versionAtLeast finalAttrs.version "8.2.2") + [ + # 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" + ]; + # `gctest` fails under emulation on aarch64-darwin doCheck = !(stdenv.isDarwin && stdenv.isx86_64); From 8260aed123ea511cd10fb5a3385fe07cd12d349a Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 6 Nov 2022 22:28:31 -0800 Subject: [PATCH 04/50] rephrase to avoid mass-rebuild --- pkgs/development/libraries/boehm-gc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 1a5924fbf55e..0e7a936b4c2a 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -32,14 +32,14 @@ stdenv.mkDerivation (finalAttrs: { # this stanza can be dropped when a release fixes this issue: # https://github.com/ivmai/bdwgc/issues/376 - makeFlags = lib.optionals (stdenv.hostPlatform.isPower64 && - lib.versionAtLeast finalAttrs.version "8.2.2") - [ + makeFlags = if (stdenv.hostPlatform.isPower64 && + lib.versionAtLeast 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); From 7343a3b642cbdbac47770fe24d65aa9f9d23e6fa Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 6 Nov 2022 23:08:33 -0800 Subject: [PATCH 05/50] boehmgc: switch from versionAtLeast to == for powerpc workaround --- pkgs/development/libraries/boehm-gc/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 0e7a936b4c2a..34e26f547093 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -30,10 +30,14 @@ 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 + # 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 && - lib.versionAtLeast finalAttrs.version "8.2.2") + 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 From 429ba6c71426418562b2047cf1433d3ed6f45533 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 11 Nov 2022 06:15:46 +0100 Subject: [PATCH 06/50] nixosOptionsDoc: Add markdownByDefault parameter --- nixos/lib/make-options-doc/default.nix | 3 +++ nixos/lib/make-options-doc/mergeJSON.py | 7 +++++++ 2 files changed, 10 insertions(+) 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..f8353a794b6a 100644 --- a/nixos/lib/make-options-doc/mergeJSON.py +++ b/nixos/lib/make-options-doc/mergeJSON.py @@ -203,6 +203,9 @@ def convertMD(options: Dict[str, Any]) -> str: for (name, option) in options.items(): 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 } @@ -214,6 +217,7 @@ def convertMD(options: Dict[str, Any]) -> str: warningsAreErrors = False errorOnDocbook = False +markdownByDefault = False optOffset = 0 for arg in sys.argv[1:]: if arg == "--warnings-are-errors": @@ -222,6 +226,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'))) From b106ff14ede4034f8771025f8ac785144358f3cd Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 11 Nov 2022 06:31:15 +0100 Subject: [PATCH 07/50] nixosOptionsDoc: Report in which option an error occurs --- nixos/lib/make-options-doc/mergeJSON.py | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/nixos/lib/make-options-doc/mergeJSON.py b/nixos/lib/make-options-doc/mergeJSON.py index f8353a794b6a..750cd24fc653 100644 --- a/nixos/lib/make-options-doc/mergeJSON.py +++ b/nixos/lib/make-options-doc/mergeJSON.py @@ -201,17 +201,21 @@ 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']) - elif markdownByDefault: - option['description'] = convertString(name, option['description']) + 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)}") - 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 } return options From bf7a3f6dcf9545464da358f350df32647c92323d Mon Sep 17 00:00:00 2001 From: kilianar Date: Fri, 11 Nov 2022 11:13:36 +0100 Subject: [PATCH 08/50] git-cola: 4.0.2 -> 4.0.3 https://github.com/git-cola/git-cola/releases/tag/v4.0.3 --- .../version-management/git-and-tools/git-cola/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From f8de2411a175d09ec61e0053353bbd7b81077578 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Nov 2022 11:48:09 +0100 Subject: [PATCH 09/50] python310Packages.selenium: 4.5.0 -> 4.6.0 --- pkgs/development/python-modules/selenium/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 From a25c3c56e74ff7827c9326534368bac247106ea0 Mon Sep 17 00:00:00 2001 From: ercao Date: Sun, 6 Nov 2022 14:59:10 +0800 Subject: [PATCH 10/50] figma-linux: init at 0.10.1 Signed-off-by: ercao --- .../graphics/figma-linux/default.nix | 77 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 79 insertions(+) create mode 100644 pkgs/applications/graphics/figma-linux/default.nix 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e391e772558c..0a910c7a69bc 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 { }; From 73dc3187f58a9a4cb9388964011e85c73c013ef4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Nov 2022 14:14:04 +0000 Subject: [PATCH 11/50] python310Packages.mne-python: 1.2.1 -> 1.2.2 --- pkgs/development/python-modules/mne-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 6a16d555f34874fdba158911ae394e0f42a86224 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Nov 2022 16:02:27 +0000 Subject: [PATCH 12/50] python310Packages.mypy-boto3-s3: 1.25.0 -> 1.26.0.post1 --- pkgs/development/python-modules/mypy-boto3-s3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From ed23e9bb9c4aa2e1731509e2dd22b6deccb684d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Nov 2022 19:27:32 +0000 Subject: [PATCH 13/50] python310Packages.peaqevcore: 7.3.2 -> 7.3.3 --- pkgs/development/python-modules/peaqevcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = '' From 1b00c83b12e45e6d5a84c8f6c4458a67384a3fd4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Nov 2022 19:48:48 +0000 Subject: [PATCH 14/50] python310Packages.pex: 2.1.112 -> 2.1.113 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 7ba6ae6310e42c11d4f8ea9cb08b9632421b57d8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Nov 2022 21:19:41 +0100 Subject: [PATCH 15/50] python310Packages.pyrainbird: 0.4.3 -> 0.6.2 --- .../python-modules/pyrainbird/default.nix | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) 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" ]; From 404a5ad09207f5da9b452c0aa8bb0103b40bd3f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Nov 2022 23:15:48 +0000 Subject: [PATCH 16/50] python310Packages.pycocotools: 2.0.5 -> 2.0.6 --- pkgs/development/python-modules/pycocotools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 0bcc9969b25b9870868a4bc2f5af3ebab7bc28ac Mon Sep 17 00:00:00 2001 From: MidAutumnMoon Date: Mon, 14 Nov 2022 09:56:52 +0800 Subject: [PATCH 17/50] miniflux: 2.0.39 -> 2.0.40 --- pkgs/servers/miniflux/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 ]; From 5a65cc178188ebcc98fb763861b6e378a729d977 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Nov 2022 03:03:15 +0000 Subject: [PATCH 18/50] python310Packages.pyswitchbot: 0.20.3 -> 0.20.4 --- pkgs/development/python-modules/pyswitchbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 10a4e2f5584c5ee42ad02b80d6fd18639cb8db80 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Nov 2022 07:53:53 +0000 Subject: [PATCH 19/50] cargo-auditable: 0.5.2 -> 0.5.3 --- pkgs/development/tools/rust/cargo-auditable/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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"; From b64b13430961a4ab7842acb4853987088ce9b7f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Nov 2022 08:16:57 +0000 Subject: [PATCH 20/50] comrak: 0.14.0 -> 0.15.0 --- pkgs/tools/text/comrak/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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"; From ab44b8890a41845f55dab39cd96f28cfbe0108ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Nov 2022 09:47:00 +0000 Subject: [PATCH 21/50] dufs: 0.30.0 -> 0.31.0 --- pkgs/servers/http/dufs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 From fd9eed5bf351ba90c754f2479a56455d101cb597 Mon Sep 17 00:00:00 2001 From: Bryan Richter Date: Mon, 14 Nov 2022 11:38:12 +0200 Subject: [PATCH 22/50] nixos/nginx: Extend acmeFallbackHost documentation This extra example would have saved me a lot of uncertainty and doubt. --- nixos/modules/services/web-servers/nginx/vhost-options.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index ccf8804943ac..b708f5b3be5c 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -99,6 +99,10 @@ with lib; description = lib.mdDoc '' 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. + + For example, you could request certificates for the present domain with + an acme client that is running on another host, which you would specify + here. ''; }; From e3fc19b301f7467df9920cdf721adcb705a783f7 Mon Sep 17 00:00:00 2001 From: Bryan Richter Date: Mon, 14 Nov 2022 12:17:12 +0200 Subject: [PATCH 23/50] nixos/nginx: docs: Update formatting * Capitalize ACME * Use bold instead of ALL CAPS * Tweak sentence structure --- .../services/web-servers/nginx/vhost-options.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index b708f5b3be5c..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,12 +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. - For example, you could request certificates for the present domain with - an acme client that is running on another host, which you would specify - here. + 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. ''; }; From 3024d77c8221a8696ca53789169c279ab18ddf3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Nov 2022 10:28:58 +0000 Subject: [PATCH 24/50] deno: 1.27.2 -> 1.28.0 --- pkgs/development/web/deno/default.nix | 6 +++--- pkgs/development/web/deno/librusty_v8.nix | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) 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="; }; } From 0e69f6db6498ee6f5e6c3b16c1af8d8620a6aeb4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Nov 2022 10:57:01 +0000 Subject: [PATCH 25/50] ferium: 4.2.0 -> 4.2.1 --- pkgs/games/ferium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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; From 2f1ca6e27f0fd2a3dc250eefe53fedbff722fd80 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 14 Nov 2022 12:15:54 +0100 Subject: [PATCH 26/50] whois: 5.5.13 -> 5.5.14 --- pkgs/tools/networking/whois/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From eebb43a334806859a9444d9f99b9c52f1d432dac Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 14 Nov 2022 12:18:21 +0100 Subject: [PATCH 27/50] lldpd: 1.0.15 -> 1.0.16 --- pkgs/tools/networking/lldpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From ec7467e2ea318b8abd0eb913262b839f1601afb0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 14 Nov 2022 12:46:08 +0100 Subject: [PATCH 28/50] jool: 4.1.7 -> 4.1.8 --- pkgs/os-specific/linux/jool/source.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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="; }; } From 890d0576c5f68852cd3d6ca81c5428122c620560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 6 Nov 2022 19:53:50 +0100 Subject: [PATCH 29/50] cross/mingw: make threading library configureable --- pkgs/development/compilers/gcc/10/default.nix | 8 ++--- pkgs/development/compilers/gcc/11/default.nix | 8 ++--- pkgs/development/compilers/gcc/12/default.nix | 8 ++--- .../development/compilers/gcc/4.8/default.nix | 6 ++-- .../development/compilers/gcc/4.9/default.nix | 6 ++-- pkgs/development/compilers/gcc/6/default.nix | 8 ++--- pkgs/development/compilers/gcc/7/default.nix | 8 ++--- pkgs/development/compilers/gcc/8/default.nix | 9 +++--- pkgs/development/compilers/gcc/9/default.nix | 8 ++--- .../compilers/gcc/common/configure-flags.nix | 3 +- .../gcc/common/extra-target-flags.nix | 4 +-- pkgs/development/compilers/go/1.18.nix | 2 +- pkgs/development/compilers/go/1.19.nix | 2 +- pkgs/top-level/all-packages.nix | 31 ++++++++++--------- 14 files changed, 57 insertions(+), 54 deletions(-) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fe5c03a38c8..d6220b12f68d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13856,7 +13856,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 +13870,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 +13887,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 +13906,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 +13921,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 +13936,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 +13948,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 +13960,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 +13972,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 +15413,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: @@ -19140,10 +19140,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; From b08b69c5a11c2f21e54c3e9878e5812cb03c7f13 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Nov 2022 11:57:32 +0000 Subject: [PATCH 30/50] gifski: 1.7.2 -> 1.8.0 --- pkgs/tools/graphics/gifski/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 ]; From 5a04b70e1463d1ecf18ba819c1b9b6db43c56320 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 14 Nov 2022 12:57:48 +0100 Subject: [PATCH 31/50] jool-cli: divert man pages --- pkgs/os-specific/linux/jool/cli.nix | 5 +++++ 1 file changed, 5 insertions(+) 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 ]; From af9a4dd35eb387c527cc04e6cc86c4607e532082 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Nov 2022 08:09:37 +0000 Subject: [PATCH 32/50] cargo-public-api: 0.21.0 -> 0.22.0 --- pkgs/development/tools/rust/cargo-public-api/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 ]; From f23a62a5dccf7bc7e3f8413e3a8146a2f739f75f Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 10 Nov 2022 12:29:57 -0500 Subject: [PATCH 33/50] kubernetes-helm: 3.10.1 -> 3.10.2 --- pkgs/applications/networking/cluster/helm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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="; From e5da3f3aef4b692fafc270568449436ec70071b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Nov 2022 14:32:28 +0000 Subject: [PATCH 34/50] v2ray-geoip: 202211030059 -> 202211100058 --- pkgs/data/misc/v2ray-geoip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 = '' From 232a9b93b2dc6f71194be6b00bb3a9f8dfe434ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Nov 2022 05:15:35 +0000 Subject: [PATCH 35/50] velero: 1.9.2 -> 1.9.3 --- pkgs/applications/networking/cluster/velero/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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" ]; From f955ad1647fdaf66d9a929cbd101ac93b2d6a60c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Nov 2022 01:51:56 +0000 Subject: [PATCH 36/50] mutagen-compose: 0.16.0 -> 0.16.1 --- pkgs/tools/misc/mutagen-compose/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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; From 36ce474508e9de1209ca9857907a66fcbc9d27e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Nov 2022 11:30:53 +0000 Subject: [PATCH 37/50] atmos: 1.10.4 -> 1.13.1 --- pkgs/applications/networking/cluster/atmos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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}" ]; From 84da129f182579be04935e88dc96e77358552ce4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Nov 2022 22:22:28 +0000 Subject: [PATCH 38/50] pipenv: 2022.10.25 -> 2022.11.11 --- pkgs/development/tools/pipenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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"; From 5bc1b01a403e071500a3b0659364fb6ee20391e1 Mon Sep 17 00:00:00 2001 From: Markus Partheymueller Date: Mon, 14 Nov 2022 14:20:58 +0100 Subject: [PATCH 39/50] boot.loader.systemd-boot: add extraInstallCommands option (#200715) --- .../boot/loader/systemd-boot/systemd-boot.nix | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) 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"; From 4b14567454aa524f6393ba2810930f54e47e3b33 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Nov 2022 02:58:08 +0000 Subject: [PATCH 40/50] topicctl: 1.6.1 -> 1.7.0 --- pkgs/tools/misc/topicctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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}" From 88f2d44dc112d156d1b5063f1e27ff2a3d944a01 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 14 Nov 2022 14:03:19 +0100 Subject: [PATCH 41/50] nix-update: 0.7.0 -> 0.8.0 https://github.com/Mic92/nix-update/releases/tag/0.8.0 --- pkgs/tools/package-management/nix-update/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 = '' From b676b764e7de2ff56b48c87bee83e879154bd465 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 14 Nov 2022 07:39:25 +0100 Subject: [PATCH 42/50] rustic-rs: init at 0.3.2 --- pkgs/tools/backup/rustic-rs/default.nix | 36 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/backup/rustic-rs/default.nix 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a70dd9e0494c..dd8067ebf796 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24433,6 +24433,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 { }; From f5ecd16cc8bea85e8adbb49b3ec992998662c9c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Nov 2022 15:55:27 +0000 Subject: [PATCH 43/50] syncstorage-rs: 0.12.4 -> 0.12.5 --- pkgs/servers/syncstorage-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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" ]; From 07e5701aca54f1b5cc5f517ac259d4bcd4208d42 Mon Sep 17 00:00:00 2001 From: pennae Date: Mon, 14 Nov 2022 15:30:24 +0100 Subject: [PATCH 44/50] nixos/manual: re-add mention of mdDoc marker --- .../development/option-declarations.section.md | 13 +++++++------ .../development/option-declarations.section.xml | 16 +++++++++------- 2 files changed, 16 insertions(+), 13 deletions(-) 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."; }
From b8ba78f1d614e9faa981c6d74e83aff0c9cf66cf Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 14 Nov 2022 09:55:35 -0500 Subject: [PATCH 45/50] checkov: Fix build checkov build has been broken since https://hydra.nixos.org/build/187798638 due to a minor incompatibility with flake8 5.x on Python 3.8+; this remedies it. Upstream does not notice this issue presently since they only run unit tests against Python 3.7, and positional-only arguments did not appear till 3.8. See https://github.com/PyCQA/flake8/pull/1490/commits/f98d52a398cd2ff5cad270fdee9e37b62444550a for details on the change. --- .../tools/analysis/checkov/default.nix | 4 +++ .../analysis/checkov/flake8-compat-5.x.patch | 25 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/analysis/checkov/flake8-compat-5.x.patch diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 8a239b4c37f7..b89a9695939c 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 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) From 41c56cadffe23835e60489f846675cb9e3c0a804 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 14 Nov 2022 10:08:52 -0500 Subject: [PATCH 46/50] checkov: Fix exe not executable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Not really sure why it’s not—it’s executable in the Git repo and is listed properly as a script in setup.py. --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index b89a9695939c..105080ce2230 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -141,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"; From e88c8f6c53e8b5a96ac58baf365bf9141681cd44 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 14 Nov 2022 16:28:36 +0100 Subject: [PATCH 47/50] python3.pkgs.ldap: disable failing test (#201190) --- pkgs/development/python-modules/python-ldap/default.nix | 5 +++++ 1 file changed, 5 insertions(+) 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; { From cecc553095ea244e516003f7e0714669afb4af70 Mon Sep 17 00:00:00 2001 From: Yureka Date: Mon, 14 Nov 2022 16:47:51 +0100 Subject: [PATCH 48/50] schildichat-desktop: copy sqlcipher fix from element-desktop (#201179) --- .../instant-messengers/schildichat/schildichat-desktop.nix | 3 +++ 1 file changed, 3 insertions(+) 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}}" From 9aad525eac929e5c1e5285226f8cb5a6981335b9 Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Mon, 14 Nov 2022 17:06:08 +0100 Subject: [PATCH 49/50] vscode-extensions.timonwong.shellcheck: 0.193 -> 0.26.3 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index e866c25e29d0..364b9e237fa7 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2478,8 +2478,8 @@ let mktplcRef = { name = "shellcheck"; publisher = "timonwong"; - version = "0.19.3"; - sha256 = "0l8fbim19jgcdgxxgidnhdczxvhls920vrffwrac8k1y34lgfl3v"; + version = "0.26.3"; + sha256 = "GlyOLc2VrRnA50MkaG83qa0yLUyJYwueqEO+ZeAStYs="; }; nativeBuildInputs = [ jq moreutils ]; postInstall = '' From bdd39e5757d858bd6ea58ed65b4a2e52c8ed11ca Mon Sep 17 00:00:00 2001 From: Anna Aurora Date: Mon, 14 Nov 2022 14:12:26 +0100 Subject: [PATCH 50/50] =?UTF-8?q?lollypop:=201.4.24=20=E2=86=92=201.4.36?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/audio/lollypop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [