From c6132dcf238b8ddc01174290fe31ed5001a58c01 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 7 Jun 2023 23:43:37 +0100 Subject: [PATCH 01/22] pkgsCross.mingwW64.windows.mcfgthreads: add gcc13 compatible version Upstream `gcc-13` merged `mcfgthreads` support with a caveat: it's headers interface is not compatible with the patch `nixpkgs` was carrying in `gcc-12` and before. To keep both new (`gcc13`) and old (`_pre_gcc13`) version I held back previous `windows.mcfgthreads` attribute as `windows.mcfgthreads_pre_gcc_13`. It is used for `gcc` before 13. The change fixes the build of `pkgsCross.mingwW64.stdenv` itself and example program: $ nix build --impure --expr 'with import ./. {}; pkgsCross.mingwW64.re2c.override { stdenv = pkgsCross.mingwW64.gcc11Stdenv; }' --- pkgs/misc/dxvk/default.nix | 4 +-- pkgs/os-specific/windows/default.nix | 4 +++ .../windows/mcfgthreads/default.nix | 11 ++----- .../windows/mcfgthreads/pre_gcc_13.nix | 24 ++++++++++++++ pkgs/top-level/all-packages.nix | 31 +++++++++++++------ 5 files changed, 54 insertions(+), 20 deletions(-) create mode 100644 pkgs/os-specific/windows/mcfgthreads/pre_gcc_13.nix diff --git a/pkgs/misc/dxvk/default.nix b/pkgs/misc/dxvk/default.nix index e553d9b365cb4..49b6c4d0bebdd 100644 --- a/pkgs/misc/dxvk/default.nix +++ b/pkgs/misc/dxvk/default.nix @@ -27,8 +27,8 @@ stdenvNoCC.mkDerivation (finalAttrs: --subst-var-by bash ${bash} \ --subst-var-by dxvk32 ${dxvk32} \ --subst-var-by dxvk64 ${dxvk64} \ - --subst-var-by mcfgthreads32 "${pkgsCross.mingw32.windows.mcfgthreads}" \ - --subst-var-by mcfgthreads64 "${pkgsCross.mingwW64.windows.mcfgthreads}" + --subst-var-by mcfgthreads32 "${pkgsCross.mingw32.windows.mcfgthreads_pre_gcc_13}" \ + --subst-var-by mcfgthreads64 "${pkgsCross.mingwW64.windows.mcfgthreads_pre_gcc_13}" chmod a+x $out/bin/setup_dxvk.sh declare -A dxvks=( [x32]=${dxvk32} [x64]=${dxvk64} ) for arch in "''${!dxvks[@]}"; do diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix index c34f97a17db25..8d6dd50548e51 100644 --- a/pkgs/os-specific/windows/default.nix +++ b/pkgs/os-specific/windows/default.nix @@ -33,6 +33,10 @@ lib.makeScope newScope (self: with self; { stdenv = crossThreadsStdenv; }; + mcfgthreads_pre_gcc_13 = callPackage ./mcfgthreads/pre_gcc_13.nix { + stdenv = crossThreadsStdenv; + }; + mcfgthreads = callPackage ./mcfgthreads { stdenv = crossThreadsStdenv; }; diff --git a/pkgs/os-specific/windows/mcfgthreads/default.nix b/pkgs/os-specific/windows/mcfgthreads/default.nix index 45c80ab89796f..e0635efd0a540 100644 --- a/pkgs/os-specific/windows/mcfgthreads/default.nix +++ b/pkgs/os-specific/windows/mcfgthreads/default.nix @@ -2,22 +2,17 @@ stdenv.mkDerivation { pname = "mcfgthreads"; - version = "git"; + version = "unstable-2023-06-06"; src = fetchFromGitHub { owner = "lhmouse"; repo = "mcfgthread"; - rev = "c446cf4fcdc262fc899a188a4bb7136284c34222"; - sha256 = "1ib90lrd4dz8irq4yvzwhxqa86i5vxl2q2z3z04sf1i8hw427p2f"; + rev = "f0a335ce926906d634c787249a89220045bf0f7e"; + hash = "sha256-PLGIyoLdWgWvkHgRe0vHLIvnCxFpmHtbjS8xRhNM9Xw="; }; outputs = [ "out" "dev" ]; - # Don't want prebuilt binaries sneaking in. - postUnpack = '' - rm -r "$sourceRoot/debug" "$sourceRoot/release" - ''; - nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/os-specific/windows/mcfgthreads/pre_gcc_13.nix b/pkgs/os-specific/windows/mcfgthreads/pre_gcc_13.nix new file mode 100644 index 0000000000000..6be64814c93aa --- /dev/null +++ b/pkgs/os-specific/windows/mcfgthreads/pre_gcc_13.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation { + pname = "mcfgthreads"; + version = "git"; # unstable-2021-03-12, not in any branch + + src = fetchFromGitHub { + owner = "lhmouse"; + repo = "mcfgthread"; + rev = "c446cf4fcdc262fc899a188a4bb7136284c34222"; + sha256 = "1ib90lrd4dz8irq4yvzwhxqa86i5vxl2q2z3z04sf1i8hw427p2f"; + }; + + outputs = [ "out" "dev" ]; + + # Don't want prebuilt binaries sneaking in. + postUnpack = '' + rm -r "$sourceRoot/debug" "$sourceRoot/release" + ''; + + nativeBuildInputs = [ + autoreconfHook + ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 177d3eeea3e9f..f3dcbc5d36891 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15097,7 +15097,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { }; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross_pre_gcc_13 else { }; isl = if !stdenv.isDarwin then isl_0_14 else null; cloog = if !stdenv.isDarwin then cloog else null; @@ -15111,7 +15111,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { }; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross_pre_gcc_13 else { }; isl = if !stdenv.isDarwin then isl_0_11 else null; @@ -15128,7 +15128,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { }; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross_pre_gcc_13 else { }; # gcc 10 is too strict to cross compile gcc <= 8 stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; @@ -15147,7 +15147,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { }; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross_pre_gcc_13 else { }; # gcc 10 is too strict to cross compile gcc <= 8 stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; @@ -15162,7 +15162,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { }; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross_pre_gcc_13 else { }; # gcc 10 is too strict to cross compile gcc <= 8 stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; @@ -15177,7 +15177,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { }; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross_pre_gcc_13 else { }; isl = if !stdenv.isDarwin then isl_0_20 else null; })); @@ -15189,7 +15189,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { }; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross_pre_gcc_13 else { }; isl = if !stdenv.isDarwin then isl_0_20 else null; })); @@ -15201,7 +15201,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { }; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross_pre_gcc_13 else { }; isl = if !stdenv.isDarwin then isl_0_20 else null; })); @@ -15213,7 +15213,7 @@ with pkgs; profiledCompiler = false; libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; - threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { }; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross_pre_gcc_13 else { }; isl = if !stdenv.isDarwin then isl_0_20 else null; })); @@ -16819,7 +16819,10 @@ 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.package + , extraPackages ? lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) + (if lib.versionAtLeast cc.version "13" + then threadsCross.package + else threadsCross_pre_gcc_13.package) , nixSupport ? {} , ... } @ extraArgs: @@ -20803,6 +20806,14 @@ with pkgs; libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc; + threadsCross_pre_gcc_13 = 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_pre_gcc_13 or windows.mcfgthreads_pre_gcc_13; + } else { }; + threadsCross = if stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false) then { # other possible values: win32 or posix From abda6e3195378e9dfdab7863b98f46f1c89c5c91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Jun 2023 03:45:57 +0000 Subject: [PATCH 02/22] python310Packages.pymedio: 0.2.13 -> 0.2.14 --- pkgs/development/python-modules/pymedio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymedio/default.nix b/pkgs/development/python-modules/pymedio/default.nix index bf220a4dc2480..34d6d589d72c6 100644 --- a/pkgs/development/python-modules/pymedio/default.nix +++ b/pkgs/development/python-modules/pymedio/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pymedio"; - version = "0.2.13"; + version = "0.2.14"; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "jcreinhold"; repo = "pymedio"; rev = "refs/tags/v${version}"; - hash = "sha256-iHbClOrtYkHT1Nar+5j/ig4Krya8LdQdFB4Mmm5B9bg="; + hash = "sha256-x3CHoWASDrUoCXfj73NF+0Y/3Mb31dK2Lh+o4OD9ryk="; }; # relax Python dep to work with 3.10.x and 3.11.x From 3bf1d1f66689aaed53991cfac41a024a596509f6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 Jun 2023 09:53:21 +0200 Subject: [PATCH 03/22] python311Packages.pymedio: add changelog to meta --- pkgs/development/python-modules/pymedio/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pymedio/default.nix b/pkgs/development/python-modules/pymedio/default.nix index 34d6d589d72c6..bae93d071d68b 100644 --- a/pkgs/development/python-modules/pymedio/default.nix +++ b/pkgs/development/python-modules/pymedio/default.nix @@ -27,7 +27,9 @@ buildPythonPackage rec { substituteInPlace setup.cfg --replace "!=3.10.*," "" --replace "!=3.11.*" "" ''; - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = [ + numpy + ]; nativeCheckInputs = [ pytestCheckHook @@ -44,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Read medical image files into Numpy arrays"; homepage = "https://github.com/jcreinhold/pymedio"; + changelog = "https://github.com/jcreinhold/pymedio/blob/v${version}/HISTORY.rst"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; From 0a91f28138591327d3e5d1a2d45af6a2dbb2d556 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 Jun 2023 09:55:50 +0200 Subject: [PATCH 04/22] python310Packages.pymedio: remove postPatch section --- pkgs/development/python-modules/pymedio/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pymedio/default.nix b/pkgs/development/python-modules/pymedio/default.nix index bae93d071d68b..36673b071e61d 100644 --- a/pkgs/development/python-modules/pymedio/default.nix +++ b/pkgs/development/python-modules/pymedio/default.nix @@ -13,6 +13,8 @@ buildPythonPackage rec { pname = "pymedio"; version = "0.2.14"; + format = "setuptools"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { @@ -22,11 +24,6 @@ buildPythonPackage rec { hash = "sha256-x3CHoWASDrUoCXfj73NF+0Y/3Mb31dK2Lh+o4OD9ryk="; }; - # relax Python dep to work with 3.10.x and 3.11.x - postPatch = '' - substituteInPlace setup.cfg --replace "!=3.10.*," "" --replace "!=3.11.*" "" - ''; - propagatedBuildInputs = [ numpy ]; From f6ffd144d9e3866d8a322b4da36dd148afa5a572 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 9 Jun 2023 09:13:01 -0400 Subject: [PATCH 05/22] funzzy: 0.6.1 -> 1.0.0 Diff: https://github.com/cristianoliveira/funzzy/compare/v0.6.1...v1.0.0 Changelog: https://github.com/cristianoliveira/funzzy/releases/tag/v1.0.0 --- pkgs/development/tools/misc/funzzy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/funzzy/default.nix b/pkgs/development/tools/misc/funzzy/default.nix index 28aca21203cdf..570ff6faebb28 100644 --- a/pkgs/development/tools/misc/funzzy/default.nix +++ b/pkgs/development/tools/misc/funzzy/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "funzzy"; - version = "0.6.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "cristianoliveira"; repo = "funzzy"; rev = "v${version}"; - hash = "sha256-Vfx/AJTeMM5GwIhDTqoteVIdr7tx4tea7SKAczauUjo="; + hash = "sha256-6rScRkiVot6VORpCu8kMOun8q2QKaNDQ8Qh9LfEUYis="; }; - cargoHash = "sha256-uOhlx38URy7+LqYhUi/hRtfr84visq0wqCU3qm42IKo="; + cargoHash = "sha256-KQWesfmFmAo8rC7GoqyufnEGA+tgOLGA950O6lSWWEg="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices From 7e66d21d24e332061a8802df1ef92ee812bdf592 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 8 Jun 2023 13:16:53 +0200 Subject: [PATCH 06/22] muzika: init at unstable-2023-06-07 --- pkgs/applications/audio/muzika/default.nix | 82 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 84 insertions(+) create mode 100644 pkgs/applications/audio/muzika/default.nix diff --git a/pkgs/applications/audio/muzika/default.nix b/pkgs/applications/audio/muzika/default.nix new file mode 100644 index 0000000000000..01f09a5bef927 --- /dev/null +++ b/pkgs/applications/audio/muzika/default.nix @@ -0,0 +1,82 @@ +{ lib +, desktop-file-utils +, fetchFromGitHub +, fetchYarnDeps +, fixup_yarn_lock +, gjs +, glib-networking +, gobject-introspection +, gst_all_1 +, gtk4 +, libadwaita +, libsoup_3 +, meson +, ninja +, pkg-config +, stdenv +, wrapGAppsHook4 +, yarn +, nodejs +}: + +stdenv.mkDerivation rec { + pname = "muzika"; + version = "unstable-2023-06-07"; + + src = fetchFromGitHub { + owner = "vixalien"; + repo = "muzika"; + rev = "d0ca7eebad67082e73513ebd7ca04edb1fdec7ce"; + hash = "sha256-ycnHpyYaUJZgproTLCWCVzsvnUisXlq3fqlij1KryWA="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + desktop-file-utils + gobject-introspection + meson + ninja + nodejs + pkg-config + wrapGAppsHook4 + yarn + ]; + + buildInputs = [ + gjs + glib-networking + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gtk4 + libadwaita + libsoup_3 + ]; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + hash = "sha256-FvPEbYIydgfyKKsf2jnXUbPEhIboPi3wR7BWzEuo72Q="; + }; + + preConfigure = '' + export HOME="$PWD" + yarn config --offline set yarn-offline-mirror $yarnOfflineCache + ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock + ''; + + mesonFlags = [ + "-Dyarnrc=../.yarnrc" + ]; + + postFixup = '' + sed -i "1 a imports.package._findEffectiveEntryPointName = () => 'com.vixalien.muzika';" $out/bin/.com.vixalien.muzika-wrapped + ln -s $out/bin/com.vixalien.muzika $out/bin/muzika + ''; + + meta = with lib; { + description = "Elegant music streaming app"; + homepage = "https://github.com/vixalien/muzika"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00e6c0320bf0d..137551a087946 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31112,6 +31112,8 @@ with pkgs; molsketch = libsForQt5.callPackage ../applications/editors/molsketch { }; + muzika = callPackage ../applications/audio/muzika { }; + pattypan = callPackage ../applications/misc/pattypan { jdk = jdk.override { enableJavaFX = true; }; }; From d2965a2cd49f4cd0ab937083b704fecb5c03cdec Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 9 Jun 2023 21:09:32 -0400 Subject: [PATCH 07/22] ezno: init at 0.0.8 https://github.com/kaleidawave/ezno --- pkgs/development/tools/misc/ezno/default.nix | 34 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/tools/misc/ezno/default.nix diff --git a/pkgs/development/tools/misc/ezno/default.nix b/pkgs/development/tools/misc/ezno/default.nix new file mode 100644 index 0000000000000..a31ab15607465 --- /dev/null +++ b/pkgs/development/tools/misc/ezno/default.nix @@ -0,0 +1,34 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "ezno"; + version = "0.0.8"; + + src = fetchFromGitHub { + owner = "kaleidawave"; + repo = "ezno"; + rev = "release/ezno-${version}"; + hash = "sha256-0yLEpNkl7KjBEGxNONtfMjVlWMSKGZ6TbYJMsCeQ3ms="; + }; + + cargoHash = "sha256-noMfKx6BsmWhAVI4r8LlC961Uwogv1JGMYSrNGlLGPQ="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + ]; + + cargoBuildFlags = [ "--bin" "ezno" ]; + + meta = with lib; { + description = "A JavaScript compiler and TypeScript checker with a focus on static analysis and runtime performance"; + homepage = "https://github.com/kaleidawave/ezno"; + changelog = "https://github.com/kaleidawave/ezno/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a3866691b37c..9bc56cebe94e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18457,6 +18457,8 @@ with pkgs; explain = callPackage ../development/tools/explain { }; + ezno = callPackage ../development/tools/misc/ezno { }; + func = callPackage ../applications/networking/cluster/func { }; funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; From abc576fdcefc89a7cee4e134be9581eaacbcc4ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Jun 2023 11:37:01 +0000 Subject: [PATCH 08/22] istioctl: 1.17.2 -> 1.18.0 --- pkgs/applications/networking/cluster/istioctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 37e0e6de17389..b516640648854 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.17.2"; + version = "1.18.0"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-YEkvY+Z+zM+9t+vnVk0gXJRTJd0u/Ryk3hYkbSHwP8M="; + sha256 = "sha256-vC8EE9v3U6FNbjxWb3At+gL4DUgBIb7MY2xBu7WNMKw="; }; - vendorHash = "sha256-LMmWhKwuy+HfqkLabTjlTd0f/6DYCGbEzpItQvckE9g="; + vendorHash = "sha256-YgRW/sVRQLqrtEFxC+bGHZEQoEro5bzNzqKv7c7iO4Y="; nativeBuildInputs = [ installShellFiles ]; From 96363a967992f7ff7c926a5c3636dcfb1ca7c631 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 10 Jun 2023 11:42:36 +0000 Subject: [PATCH 09/22] =?UTF-8?q?gnome.mutter:=2044.1=20=E2=86=92=2044.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/mutter/-/compare/44.1...44.2 --- pkgs/desktops/gnome/core/mutter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index 3a2d8981b0b88..c502eefa352ec 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "44.1"; + version = "44.2"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - sha256 = "lzrq+rQvBvk0oJlPyEh4lYzbTSdmpMhnpczcVH3VcFY="; + sha256 = "N1ZtflXJPciJTpx/I6e6WHmoswuvZVWCIwCdK0Z0AqE="; }; mesonFlags = [ From ad78249de01eb21aeebbf7f9136dc13988442fec Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 10 Jun 2023 11:43:38 +0000 Subject: [PATCH 10/22] =?UTF-8?q?gnome.gnome-shell:=2044.1=20=E2=86=92=204?= =?UTF-8?q?4.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/44.1...44.2 --- pkgs/desktops/gnome/core/gnome-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index e476844127652..528f44ae66d51 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -67,13 +67,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "44.1"; + version = "44.2"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "C/vkOU0mdiUVTQjQFGe9vZnoFXUS/I30XVwC3bdVHKY="; + sha256 = "VfJ57GMDt8DIkkbs7YEkfIf8HHOUj0XrISpkchjRtj8="; }; patches = [ From bb6069ec20918fea1521bfb225d90e03d03ecee3 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 10 Jun 2023 12:43:05 -0700 Subject: [PATCH 11/22] dtc: fix overrides: use finalAttrs, not rec Prior to this commit, dtc was accessing its own derivation attributes via `rec`. This means that ``` overrideAttrs (_: { doCheck = ..; }) ``` will produce inconsistent behavior, with part of the derivation seeing the old value and part seeing the new value. finalAttrs is the preferred way to do this. Let's switch to that. --- pkgs/development/compilers/dtc/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index 44d98d8e36bd9..5ec3d6ec36cc0 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -14,13 +14,13 @@ , libyaml }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dtc"; version = "1.7.0"; src = fetchgit { url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git"; - rev = "refs/tags/v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; sha256 = "sha256-FMh3VvlY3fUK8fbd0M+aCmlUrmG9YegiOOQ7MOByffc="; }; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { }) ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; nativeBuildInputs = [ meson @@ -72,9 +72,9 @@ stdenv.mkDerivation rec { # meson.build: bump version to 1.7.0 substituteInPlace libfdt/meson.build \ - --replace "version: '1.6.0'," "version: '${version}'," + --replace "version: '1.6.0'," "version: '${finalAttrs.version}'," substituteInPlace meson.build \ - --replace "version: '1.6.0'," "version: '${version}'," + --replace "version: '1.6.0'," "version: '${finalAttrs.version}'," ''; # Required for installation of Python library and is innocuous otherwise. @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { mesonAutoFeatures = "auto"; mesonFlags = [ (lib.mesonBool "static-build" stdenv.hostPlatform.isStatic) - (lib.mesonBool "tests" doCheck) + (lib.mesonBool "tests" finalAttrs.doCheck) ]; # Checks are broken on aarch64 darwin @@ -97,4 +97,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.dezgeg ]; platforms = platforms.unix; }; -} +}) From 9365ef23e9d8b93c898047a0d54dd5e99eb3c4af Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 10 Jun 2023 21:25:36 -0400 Subject: [PATCH 12/22] ain: init at 1.3.0 https://github.com/jonaslu/ain --- pkgs/tools/networking/ain/default.nix | 32 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/networking/ain/default.nix diff --git a/pkgs/tools/networking/ain/default.nix b/pkgs/tools/networking/ain/default.nix new file mode 100644 index 0000000000000..cd8d518c06053 --- /dev/null +++ b/pkgs/tools/networking/ain/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "ain"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "jonaslu"; + repo = "ain"; + rev = "v${version}"; + hash = "sha256-QBtnVtTGONbYToGhZ0L4CZ3o2hViEN1l94ZKJHVMd1w="; + }; + + vendorHash = "sha256-eyB+0D0+4hHG4yKDj/m9QB+8YTyv+por8fTyu/WcZyg="; + + ldflags = [ + "-s" + "-w" + "-X=main.gitSha=${src.rev}" + ]; + + meta = with lib; { + description = "A HTTP API client for the terminal"; + homepage = "https://github.com/jonaslu/ain"; + changelog = "https://github.com/jonaslu/ain/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac889474701d1..e1ed213f07818 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1454,6 +1454,8 @@ with pkgs; aide = callPackage ../tools/security/aide { }; + ain = callPackage ../tools/networking/ain { }; + aioblescan = with python3Packages; toPythonApplication aioblescan; aiodnsbrute = callPackage ../tools/security/aiodnsbrute { }; From 3c045cc137425c828ffd53db8ceade04a12afc99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Jun 2023 07:35:46 +0000 Subject: [PATCH 13/22] dagger: 0.6.0 -> 0.6.1 --- .../tools/continuous-integration/dagger/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/dagger/default.nix b/pkgs/development/tools/continuous-integration/dagger/default.nix index b850b3b555551..6571b7212dab3 100644 --- a/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dagger"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "dagger"; repo = "dagger"; rev = "v${version}"; - hash = "sha256-NFQ1VPgY3WDwMsOi0wZ/b7sV/Ckv/WCeegSyLCnOPJM="; + hash = "sha256-9QQ6aDCkTWNq5KOSGF6FH6UQrOYa51ctW3CMcGrCJAQ="; }; - vendorHash = "sha256-KniHuJWkwZEzFcdtZUaYEoqcvmotbO+yuEB5L3Q3FGI="; + vendorHash = "sha256-r1E0JrwLDMlBINxtHKI5XfrG4kYWRcuep8CvtvVCqio="; proxyVendor = true; subPackages = [ From 5f4fe47957a680fb0c170a76eb5e64cb8a264ddd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 11 Jun 2023 13:50:39 +0200 Subject: [PATCH 14/22] smbmap: unstable-2023-03-29 -> 1.9.1 Changelog: https://github.com/ShawnDEvans/smbmap/releases/tag/v1.9.1 --- pkgs/tools/security/smbmap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/smbmap/default.nix b/pkgs/tools/security/smbmap/default.nix index a32503083638f..7da066712ba56 100644 --- a/pkgs/tools/security/smbmap/default.nix +++ b/pkgs/tools/security/smbmap/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "smbmap"; - version = "unstable-2023-03-29"; + version = "1.9.1"; format = "setuptools"; src = fetchFromGitHub { owner = "ShawnDEvans"; repo = "smbmap"; - rev = "ce60773320e11b2ecd1ce1b5ab2a62d43d4a4423"; - hash = "sha256-4DdiICH3B7x8Wr5CcqiuhCHPv6W/5bT5MGdXkyE0OKA="; + rev = "refs/tags/v${version}"; + hash = "sha256-NsxmH1W5VUckGvqqTIrxhaVz0l7gsHmc8KJuvC/iVbA="; }; propagatedBuildInputs = with python3.pkgs; [ From 4e652ceabaa4ec2d1ff6068ba175137305fd889d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 11 Jun 2023 13:55:38 +0200 Subject: [PATCH 15/22] gosh: use release --- pkgs/tools/security/gosh/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/gosh/default.nix b/pkgs/tools/security/gosh/default.nix index a4c74f1a5636e..41ef9fa1f540e 100644 --- a/pkgs/tools/security/gosh/default.nix +++ b/pkgs/tools/security/gosh/default.nix @@ -5,18 +5,16 @@ buildGoModule rec { pname = "gosh"; - # https://github.com/redcode-labs/GoSH/issues/4 - version = "2020523-${lib.strings.substring 0 7 rev}"; - rev = "7ccb068279cded1121eacc5a962c14b2064a1859"; + version = "1.0.0"; src = fetchFromGitHub { owner = "redcode-labs"; repo = "GoSH"; - inherit rev; - sha256 = "143ig0lqnkpnydhl8gnfzhg613x4wc38ibdbikkqwfyijlr6sgzd"; + rev = "refs/tags/v${version}"; + hash = "sha256-h4WqaN2okAeaU/+0fs8zLYDtyQLuLkCDdGrkGz8rdhg="; }; - vendorSha256 = "sha256-ITz6nkhttG6bsIZLsp03rcbEBHUQ7pFl4H6FOHTXIU4="; + vendorHash = "sha256-ITz6nkhttG6bsIZLsp03rcbEBHUQ7pFl4H6FOHTXIU4="; subPackages = [ "." ]; From 55ae35dc27b3ece4a910c41ce676d393fe136c51 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Jun 2023 12:06:25 +0000 Subject: [PATCH 16/22] python310Packages.dnachisel: 3.2.10 -> 3.2.11 --- pkgs/development/python-modules/dnachisel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dnachisel/default.nix b/pkgs/development/python-modules/dnachisel/default.nix index 52ca9eff669ba..4a63698554480 100644 --- a/pkgs/development/python-modules/dnachisel/default.nix +++ b/pkgs/development/python-modules/dnachisel/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "dnachisel"; - version = "3.2.10"; + version = "3.2.11"; src = fetchFromGitHub { owner = "Edinburgh-Genome-Foundry"; repo = "DnaChisel"; rev = "refs/tags/v${version}"; - hash = "sha256-YlNOvK7ZXUHYdRX1NFEdZ646NGLtGXU1YgAjN6RY2QE="; + hash = "sha256-rcZq/HhU1xIyQ1jM8+gO9ONDLBAxiUIByoWk2nMwuGA="; }; propagatedBuildInputs = [ From 9401a0c780b49faf6c28adf55764f230301d0dce Mon Sep 17 00:00:00 2001 From: Lucas Eduardo Date: Sun, 11 Jun 2023 09:54:35 -0300 Subject: [PATCH 17/22] doc/contributing/review-contributions: fix small typo (#237186) Signed-off-by: lucasew --- doc/contributing/reviewing-contributions.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/contributing/reviewing-contributions.chapter.md b/doc/contributing/reviewing-contributions.chapter.md index ecc166eab6aa6..b4caf11f6d4bf 100644 --- a/doc/contributing/reviewing-contributions.chapter.md +++ b/doc/contributing/reviewing-contributions.chapter.md @@ -12,7 +12,7 @@ When reviewing a pull request, please always be nice and polite. Controversial c GitHub provides reactions as a simple and quick way to provide feedback to pull requests or any comments. The thumb-down reaction should be used with care and if possible accompanied with some explanation so the submitter has directions to improve their contribution. -pull request reviews should include a list of what has been reviewed in a comment, so other reviewers and mergers can know the state of the review. +Pull request reviews should include a list of what has been reviewed in a comment, so other reviewers and mergers can know the state of the review. All the review template samples provided in this section are generic and meant as examples. Their usage is optional and the reviewer is free to adapt them to their liking. From f09bde4cd04ea035b199537b28ccc72985693cde Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 11 Jun 2023 15:05:08 +0200 Subject: [PATCH 18/22] python310Packages.dnachisel: add changelog to meta --- pkgs/development/python-modules/dnachisel/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dnachisel/default.nix b/pkgs/development/python-modules/dnachisel/default.nix index 4a63698554480..697051337b842 100644 --- a/pkgs/development/python-modules/dnachisel/default.nix +++ b/pkgs/development/python-modules/dnachisel/default.nix @@ -50,12 +50,16 @@ buildPythonPackage rec { "test_avoid_phage_blast_matches" "test_avoid_matches_with_list" "test_avoid_matches_with_phage" - ]; - pythonImportsCheck = [ "dnachisel" ]; + ]; + + pythonImportsCheck = [ + "dnachisel" + ]; meta = with lib; { homepage = "https://github.com/Edinburgh-Genome-Foundry/DnaChisel"; description = "Optimize DNA sequences under constraints"; + changelog = "https://github.com/Edinburgh-Genome-Foundry/DnaChisel/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ prusnak ]; }; From e85f0c7cf6f7319a91674f11fccbbc9a8d5ca30f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 11 Jun 2023 15:06:46 +0200 Subject: [PATCH 19/22] python310Packages.dnachisel: add format - disable on unsupported Python releases --- pkgs/development/python-modules/dnachisel/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/dnachisel/default.nix b/pkgs/development/python-modules/dnachisel/default.nix index 697051337b842..5a70ae1c16df6 100644 --- a/pkgs/development/python-modules/dnachisel/default.nix +++ b/pkgs/development/python-modules/dnachisel/default.nix @@ -7,6 +7,7 @@ , numpy , proglog , pytestCheckHook +, pythonOlder , python-codon-tables , primer3 , genome-collector @@ -16,6 +17,9 @@ buildPythonPackage rec { pname = "dnachisel"; version = "3.2.11"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Edinburgh-Genome-Foundry"; From 302ce22a5ab7e043120ef21d62dfc47a6c0effcc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Jun 2023 15:16:57 +0000 Subject: [PATCH 20/22] b3sum: 1.3.3 -> 1.4.0 --- pkgs/tools/security/b3sum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/b3sum/default.nix b/pkgs/tools/security/b3sum/default.nix index fa7b9e4e5c9c8..dc074a5616af2 100644 --- a/pkgs/tools/security/b3sum/default.nix +++ b/pkgs/tools/security/b3sum/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "b3sum"; - version = "1.3.3"; + version = "1.4.0"; src = fetchCrate { inherit version pname; - sha256 = "sha256-PeH4oMeLxEM1pKqMsZBhsbmZOAVdLEmWKyPjuRNjowA="; + sha256 = "sha256-rh5xELjiwm5rSFVgIMZUMG4J/VxKKF8xrxX/wK+sVF8="; }; - cargoSha256 = "sha256-dvxQY1KgZGOCIeFoxfOewF9gm9xORLelJxJMMtrNWDs="; + cargoHash = "sha256-q10NC3QH4+ExF4vO6j/Ud8LenzXIuhZC8Yyev+2gJNU="; meta = { description = "BLAKE3 cryptographic hash function"; From e7529c47643149d3a6497283ac4b007ec9d5ed72 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 11 Jun 2023 08:47:41 -0700 Subject: [PATCH 21/22] click-command-tree: 1.1.0 -> 1.1.1 --- .../python-modules/click-command-tree/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/click-command-tree/default.nix b/pkgs/development/python-modules/click-command-tree/default.nix index 1f836a64e9fd0..ccd7e74fc8dcf 100644 --- a/pkgs/development/python-modules/click-command-tree/default.nix +++ b/pkgs/development/python-modules/click-command-tree/default.nix @@ -1,31 +1,22 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , click , pytestCheckHook }: buildPythonPackage rec { pname = "click-command-tree"; - version = "1.1.0"; + version = "1.1.1"; format = "setuptools"; src = fetchFromGitHub { owner = "whwright"; repo = pname; rev = version; - hash = "sha256-vFOcn+ibyLZnhU3OQMtnHI04UqAY2/CCvhq4EEU4XFo="; + hash = "sha256-uBp7462LutL8aFRFix3pbVYbSf1af6k0nW0J0HhJa1U="; }; - patches = [ - (fetchpatch { - name = "remove-setup-downloading-flake8.patch"; - url = "https://github.com/whwright/click-command-tree/commit/1ecfcfa29bf01e1131e6ec712bd7338ac1283dc8.patch"; - hash = "sha256-u5jsNfEo1+XNlkVGPCM/rsDPnYko6cr2z2si9nq+sLA="; - }) - ]; - propagatedBuildInputs = [ click ]; From 6387a932b8e81a8e0a9a2f517367c45a12370486 Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 11 Jun 2023 23:57:03 +0800 Subject: [PATCH 22/22] neocmakelsp: init at 0.5.18 --- .../language-servers/neocmakelsp/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/language-servers/neocmakelsp/default.nix diff --git a/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/pkgs/development/tools/language-servers/neocmakelsp/default.nix new file mode 100644 index 0000000000000..d900046701bb1 --- /dev/null +++ b/pkgs/development/tools/language-servers/neocmakelsp/default.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "neocmakelsp"; + version = "0.5.18"; + + src = fetchFromGitHub { + owner = "Decodetalkers"; + repo = "neocmakelsp"; + rev = "v${version}"; + hash = "sha256-3Bv1tRskxQ4Fk+gEGCYRq8WtkBHYP2VjirtTZ3SWJlQ="; + }; + + cargoHash = "sha256-O8E5PmXYrNOB8fXFs5ar30c1X5flIQZ/lrRSl/3XH+o="; + + meta = with lib; { + description = "A cmake lsp based on tower-lsp and treesitter"; + homepage = "https://github.com/Decodetalkers/neocmakelsp"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ rewine ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1459ff76fa62..4e96e234d09b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17754,6 +17754,8 @@ with pkgs; millet = callPackage ../development/tools/language-servers/millet { }; + neocmakelsp = callPackage ../development/tools/language-servers/neocmakelsp { }; + nil = callPackage ../development/tools/language-servers/nil { }; nls = callPackage ../development/tools/language-servers/nls { };