From 22bb5607ed8060cbae0190f205ee3eb5a8431875 Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Fri, 16 Sep 2022 10:54:42 -0700 Subject: [PATCH 01/66] cocogitto: refactor to use libgit2 --- pkgs/development/tools/cocogitto/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/development/tools/cocogitto/default.nix index b07946e70bb7..52fdf0c1e400 100644 --- a/pkgs/development/tools/cocogitto/default.nix +++ b/pkgs/development/tools/cocogitto/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv, Security, makeWrapper, git }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv, Security, makeWrapper, libgit2 }: rustPlatform.buildRustPackage rec { pname = "cocogitto"; @@ -17,18 +17,15 @@ rustPlatform.buildRustPackage rec { # and might be failing to create the test repository it works in. doCheck = false; - nativeBuildInputs = [ installShellFiles makeWrapper ]; + nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = [ libgit2 ] ++ lib.optional stdenv.isDarwin Security; postInstall = '' installShellCompletion --cmd cog \ --bash <($out/bin/cog generate-completions bash) \ --fish <($out/bin/cog generate-completions fish) \ --zsh <($out/bin/cog generate-completions zsh) - - wrapProgram $out/bin/cog \ - --prefix PATH : "${lib.makeBinPath [ git ]}" ''; meta = with lib; { From 16b094714a9a8d282f9c44da1d312643fdb73c28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Oct 2022 09:16:53 +0000 Subject: [PATCH 02/66] k3s: 1.25.2+k3s1 -> 1.25.3+k3s1 --- pkgs/applications/networking/cluster/k3s/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 0fdc7cc4f429..116fd7de9bab 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -47,15 +47,15 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.25.2+k3s1"; # k3s git tag - k3sCommit = "53c268d8eb90ceea5e1c7865f89db5c7fb8763bc"; # k3s git commit at the above version - k3sRepoSha256 = "1w040bsrf981k19rwaaxjsv52pgzc0k77x083fkhysmrca565z0y"; - k3sVendorSha256 = "sha256-8Xti08sjFk1WKimH/GEb99oqBdFO79WVCvYyXIWMpgo="; + k3sVersion = "1.25.3+k3s1"; # k3s git tag + k3sCommit = "f2585c1671b31b4b34bddbb3bf4e7d69662b0821"; # k3s git commit at the above version + k3sRepoSha256 = "0zwf3iwjcidx14zw36s1hr0q8wmmbfc0rfqwd7fmpjq597h8zkms"; + k3sVendorSha256 = "sha256-U67tJRGqPFk5AfRe7I50zKGC9HJ2oh+iI/C7qF/76BQ="; # taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9 # The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know. - traefikChartVersion = "10.19.3"; - traefikChartSha256 = "04zg5li957svgscdmkzmzjkwljaljyav68rzxmhakkwgav6q9058"; + traefikChartVersion = "12.0.0"; + traefikChartSha256 = "1sqmi71fi3ad5dh5fmsp9mv80x6pkgqwi4r9fr8l6i9sdnai6f1a"; # taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47 k3sRootVersion = "0.11.0"; From 5ab7ec1e321a82f20b7ab2baa4cabfeb9c5f7e9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Oct 2022 10:51:59 +0000 Subject: [PATCH 03/66] kind: 0.15.0 -> 0.17.0 --- pkgs/development/tools/kind/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index 6fc217006f00..15cf9c30322d 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -4,13 +4,13 @@ with lib; buildGoModule rec { pname = "kind"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "kubernetes-sigs"; repo = "kind"; - sha256 = "sha256-IDSWmNWHnTKOl6/N1Mz+OKOkZSBarpuN39CBsSjYhKY="; + sha256 = "sha256-YAa5Dr8Pc6P3RZ3SCiyi7zwmVd5tPalM88R8bxgg6JU="; }; patches = [ @@ -18,7 +18,7 @@ buildGoModule rec { ./kernel-module-path.patch ]; - vendorSha256 = "sha256-FE1GvNgXkBt2cH4YB3jTsPXp91DSiYlniQLtMwvi384="; + vendorSha256 = "sha256-J/sJd2LLMBr53Z3sGrWgnWA8Ry+XqqfCEObqFyUD96g="; CGO_ENABLED = 0; GOFLAGS = [ "-trimpath" ]; From 30d66019b450e7027a844957d2f0bb1df078950c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 27 Oct 2022 15:30:15 +0200 Subject: [PATCH 04/66] wxGTK31: drop gtk2 support --- pkgs/applications/audio/tenacity/default.nix | 7 ++--- .../editors/codeblocks/default.nix | 4 +-- pkgs/applications/gis/saga/default.nix | 4 +-- .../misc/prusa-slicer/default.nix | 10 +++---- .../misc/prusa-slicer/super-slicer.nix | 4 +-- .../science/electronics/kicad/base.nix | 3 ++- .../science/electronics/kicad/default.nix | 7 ++--- .../libraries/wxwidgets/wxGTK31.nix | 27 +++++-------------- .../python-modules/wxPython/4.1.nix | 7 ++--- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 8 +++--- pkgs/top-level/python-packages.nix | 2 +- 12 files changed, 38 insertions(+), 47 deletions(-) diff --git a/pkgs/applications/audio/tenacity/default.nix b/pkgs/applications/audio/tenacity/default.nix index 89051e70b519..748ce090c776 100644 --- a/pkgs/applications/audio/tenacity/default.nix +++ b/pkgs/applications/audio/tenacity/default.nix @@ -2,7 +2,8 @@ , lib , fetchFromSourcehut , cmake -, wxGTK +, wxGTK31 +, gtk3 , pkg-config , python3 , gettext @@ -123,8 +124,8 @@ stdenv.mkDerivation rec { sratom suil twolame - wxGTK - wxGTK.gtk + wxGTK31 + gtk3 ] ++ lib.optionals stdenv.isLinux [ at-spi2-core dbus diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 032fd765b27f..7a1c0af2c643 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, file, zip, wxGTK31-gtk3, gtk3 +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, file, zip, wxGTK31, gtk3 , contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config file zip wrapGAppsHook ]; - buildInputs = [ wxGTK31-gtk3 gtk3 ] + buildInputs = [ wxGTK31 gtk3 ] ++ optionals contribPlugins [ hunspell gamin boost ]; enableParallelBuilding = true; patches = [ diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index db7278c23bd3..3fd7a488e40b 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -7,7 +7,7 @@ , pkg-config # not native , gdal -, wxGTK31-gtk3 +, wxGTK31 , proj , dxflib , curl @@ -56,7 +56,7 @@ mkDerivation rec { libsvm hdf5 gdal - wxGTK31-gtk3 + wxGTK31 proj libharu opencv diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 1592ef546155..75c1ed16e1d1 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -28,13 +28,13 @@ , qhull , systemd , tbb -, wxGTK31-gtk3 +, wxGTK31 , xorg , fetchpatch -, wxGTK31-gtk3-override ? null +, wxGTK31-override ? null }: let - wxGTK31-gtk3-prusa = wxGTK31-gtk3.overrideAttrs (old: rec { + wxGTK31-prusa = wxGTK31.overrideAttrs (old: rec { pname = "wxwidgets-prusa3d-patched"; version = "3.1.4"; src = fetchFromGitHub { @@ -45,7 +45,7 @@ let fetchSubmodules = true; }; }); - wxGTK31-gtk3-override' = if wxGTK31-gtk3-override == null then wxGTK31-gtk3-prusa else wxGTK31-gtk3-override; + wxGTK31-override' = if wxGTK31-override == null then wxGTK31-prusa else wxGTK31-override; in stdenv.mkDerivation rec { pname = "prusa-slicer"; @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { pcre systemd tbb - wxGTK31-gtk3-override' + wxGTK31-override' xorg.libX11 ] ++ checkInputs; diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index b385542d679a..a3c8fc6cdcc6 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, makeDesktopItem, prusa-slicer, wxGTK31-gtk3 }: +{ lib, fetchFromGitHub, fetchpatch, makeDesktopItem, prusa-slicer, wxGTK31 }: let appname = "SuperSlicer"; pname = "super-slicer"; @@ -71,7 +71,7 @@ let passthru = allVersions; }; - prusa-slicer' = prusa-slicer.override { wxGTK31-gtk3-override = wxGTK31-gtk3; }; + prusa-slicer' = prusa-slicer.override { wxGTK31-override = wxGTK31; }; allVersions = builtins.mapAttrs (_name: version: (prusa-slicer'.overrideAttrs (override version))) versions; in allVersions.stable diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 1503230b3afd..f81710cfb911 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -5,6 +5,7 @@ , libGL , zlib , wxGTK +, gtk3 , libX11 , gettext , glew @@ -143,7 +144,7 @@ stdenv.mkDerivation rec { zlib libX11 wxGTK - wxGTK.gtk + gtk3 pcre libXdmcp gettext diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 95e88ff14071..9042862eac32 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -2,7 +2,8 @@ , fetchFromGitLab , gnome , dconf -, wxGTK31-gtk3 +, wxGTK31 +, gtk3 , makeWrapper , gsettings-desktop-schemas , hicolor-icon-theme @@ -103,7 +104,7 @@ let if srcOverridep "libVersion" then srcs.libVersion else versionsImport.${baseName}.libVersion.version; - wxGTK = wxGTK31-gtk3; + wxGTK = wxGTK31; python = python3; wxPython = python.pkgs.wxPython_4_1; @@ -143,7 +144,7 @@ stdenv.mkDerivation rec { "--prefix XDG_DATA_DIRS : ${base}/share" "--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share" "--prefix XDG_DATA_DIRS : ${gnome.adwaita-icon-theme}/share" - "--prefix XDG_DATA_DIRS : ${wxGTK.gtk}/share/gsettings-schemas/${wxGTK.gtk.name}" + "--prefix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}" "--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" # wrapGAppsHook did these two as well, no idea if it matters... "--prefix XDG_DATA_DIRS : ${cups}/share" diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix index d84c8a5aa5e4..af673695ace5 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -4,7 +4,6 @@ , fetchurl , gnome2 , gst_all_1 -, gtk2 , gtk3 , libGL , libGLU @@ -18,7 +17,6 @@ , compat30 ? true , unicode ? true , withEGL ? true -, withGtk2 ? (!stdenv.isDarwin) , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , withWebKit ? stdenv.isDarwin , webkitgtk @@ -33,11 +31,6 @@ , WebKit }: -assert withGtk2 -> (!withWebKit); - -let - gtk = if withGtk2 then gtk2 else gtk3; -in stdenv.mkDerivation rec { pname = "wxwidgets"; version = "3.1.5"; @@ -60,18 +53,14 @@ stdenv.mkDerivation rec { buildInputs = [ gst_all_1.gst-plugins-base gst_all_1.gstreamer - ] - ++ lib.optionals (!stdenv.isDarwin) [ - gtk + ] ++ lib.optionals (!stdenv.isDarwin) [ + gtk3 libSM libXinerama libXtst libXxf86vm xorgproto ] - ++ lib.optionals withGtk2 [ - gnome2.GConf - ] ++ lib.optional withMesa libGLU ++ lib.optional (withWebKit && !stdenv.isDarwin) webkitgtk ++ lib.optional (withWebKit && stdenv.isDarwin) WebKit @@ -102,8 +91,7 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ "--with-osx_cocoa" "--with-libiconv" - ] - ++ lib.optionals withWebKit [ + ] ++ lib.optionals withWebKit [ "--enable-webview" "--enable-webviewwebkit" ]; @@ -133,6 +121,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + inherit compat28 compat30 unicode; + }; + meta = with lib; { homepage = "https://www.wxwidgets.org/"; description = "A Cross-Platform C++ GUI Library"; @@ -150,9 +142,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ tfmoraes ]; platforms = platforms.unix; }; - - passthru = { - inherit gtk; - inherit compat28 compat30 unicode; - }; } diff --git a/pkgs/development/python-modules/wxPython/4.1.nix b/pkgs/development/python-modules/wxPython/4.1.nix index dceab0dd26a9..3198dbc004c3 100644 --- a/pkgs/development/python-modules/wxPython/4.1.nix +++ b/pkgs/development/python-modules/wxPython/4.1.nix @@ -13,6 +13,7 @@ , ncurses , pango , wxGTK +, gtk3 , AGL , AudioToolbox , AVFoundation @@ -70,7 +71,7 @@ buildPythonPackage rec { nativeBuildInputs = [ which doxygen - wxGTK.gtk + gtk3 pkg-config setuptools ] ++ lib.optionals stdenv.isLinux [ @@ -78,7 +79,7 @@ buildPythonPackage rec { ]; buildInputs = [ - wxGTK.gtk + gtk3 ncurses ] ++ lib.optionals stdenv.isLinux [ libXinerama @@ -120,7 +121,7 @@ buildPythonPackage rec { preConfigure = lib.optionalString (!stdenv.isDarwin) '' substituteInPlace wx/lib/wxcairo/wx_pycairo.py \ --replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [ - ("gdk", "${wxGTK.gtk}/lib/libgtk-x11-3.0.so"), + ("gdk", "${gtk3}/lib/libgtk-x11-3.0.so"), ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"), ("cairoLib = None", "cairoLib = ctypes.CDLL('${cairo}/lib/libcairo.so')"), ("appsvc", None) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f892c5de4af0..ac16901e15bd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1550,6 +1550,8 @@ mapAliases ({ wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name wmii_hg = wmii; ws = throw "ws has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03 + wxGTK31-gtk2 = throw "'wxGTK31-gtk2' has been removed from nixpkgs as it depends on deprecated GTK2"; # Added 2022-10-27 + wxGTK31-gtk3 = throw "'wxGTK31-gtk3' has been renamed to/replaced by 'wxGTK31'"; # Added 2022-10-27 wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared"; # Added 2022-01-31 wxcam = throw "'wxcam' has seen no updates in ten years, crashes (SIGABRT) on startup and depends on deprecated wxGTK28/GNOME2/GTK2, use 'gnome.cheese'"; # Added 2022-06-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae6f203331d9..7a38896ff4e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22769,8 +22769,6 @@ with pkgs; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit AVFoundation AVKit WebKit; }; - wxGTK31-gtk2 = wxGTK31.override { withGtk2 = true; }; - wxGTK31-gtk3 = wxGTK31.override { withGtk2 = false; }; wxGTK32 = callPackage ../development/libraries/wxwidgets/wxGTK32.nix { inherit (darwin.stubs) setfile; @@ -31766,14 +31764,14 @@ with pkgs; prusa-slicer = callPackage ../applications/misc/prusa-slicer { }; super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { - wxGTK31-gtk3 = wxGTK31-gtk3.override { + wxGTK31 = wxGTK31.override { # https://github.com/supermerill/SuperSlicer/issues/1093 withEGL = false; }; }; super-slicer-latest = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix { - wxGTK31-gtk3 = wxGTK31-gtk3.override { + wxGTK31 = wxGTK31.override { # https://github.com/supermerill/SuperSlicer/issues/1093 withEGL = false; }; @@ -32057,7 +32055,7 @@ with pkgs; temporal-cli = callPackage ../applications/networking/cluster/temporal-cli { }; - tenacity = callPackage ../applications/audio/tenacity { wxGTK = wxGTK31-gtk3; }; + tenacity = callPackage ../applications/audio/tenacity { }; tendermint = callPackage ../tools/networking/tendermint { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 02897df6519b..c0202aab5592 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11907,7 +11907,7 @@ self: super: with self; { wxPython_4_1 = callPackage ../development/python-modules/wxPython/4.1.nix { inherit (pkgs.darwin.apple_sdk.frameworks) AGL AudioToolbox AVFoundation AVKit Carbon Cocoa CoreMedia CoreFoundation IOKit Kernel OpenGL Security WebKit; - wxGTK = pkgs.wxGTK31-gtk3.override { + wxGTK = pkgs.wxGTK31.override { withWebKit = true; }; }; From 4ed7e2a8669dda9cf6abac113264b563657c1949 Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Sat, 13 Aug 2022 10:15:13 +0800 Subject: [PATCH 05/66] recoll: fix no/bad configuration error on darwin Prior to this fix, running recoll fails with the following error: No/bad main configuration file in /nix/store/.../Resources/examples. The path is incorrect and RECOLL_DATADIR should be used. --- pkgs/applications/search/recoll/default.nix | 7 +++++++ pkgs/applications/search/recoll/fix-datadir.patch | 13 +++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/applications/search/recoll/fix-datadir.patch diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 8d33a910546c..4117c8ac78a9 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -46,6 +46,13 @@ mkDerivation rec { ++ lib.optionals (!withGui) [ "--disable-qtgui" "--disable-x11mon" ] ++ (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]); + NIX_CFLAGS_COMPILE = [ "-DNIXPKGS" ]; + + patches = [ + # fix "No/bad main configuration file" error + ./fix-datadir.patch + ]; + nativeBuildInputs = [ file pkg-config python3Packages.setuptools which ]; diff --git a/pkgs/applications/search/recoll/fix-datadir.patch b/pkgs/applications/search/recoll/fix-datadir.patch new file mode 100644 index 000000000000..3b316f4d90c6 --- /dev/null +++ b/pkgs/applications/search/recoll/fix-datadir.patch @@ -0,0 +1,13 @@ +diff --git a/utils/rclutil.cpp b/utils/rclutil.cpp +index 60ff5fb..4a59ccc 100644 +--- a/utils/rclutil.cpp ++++ b/utils/rclutil.cpp +@@ -279,7 +279,7 @@ const string& path_pkgdatadir() + "a subfolder of the installation directory. \n" + "Please set the RECOLL_DATADIR environment variable to point to it\n" + "(e.g. setx RECOLL_DATADIR \"C:/Program Files (X86)/Recoll/Share)\"\n"; +-#elif defined(__APPLE__) && !defined(MACPORTS) && !defined(HOMEBREW) ++#elif defined(__APPLE__) && !defined(MACPORTS) && !defined(HOMEBREW) && !defined(NIXPKGS) + uint32_t size = 0; + _NSGetExecutablePath(nullptr, &size); + char *path= (char*)malloc(size+1); From b1ac2756759ab09606fb7fe004b08d9af5b2e42e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Oct 2022 20:24:24 +0000 Subject: [PATCH 06/66] jsonnet: 0.19.0 -> 0.19.1 --- pkgs/development/compilers/jsonnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix index cd6e204b1d10..d8b71f8ea68f 100644 --- a/pkgs/development/compilers/jsonnet/default.nix +++ b/pkgs/development/compilers/jsonnet/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "jsonnet"; - version = "0.19.0"; + version = "0.19.1"; outputs = ["out" "doc"]; src = fetchFromGitHub { rev = "v${version}"; owner = "google"; repo = "jsonnet"; - sha256 = "sha256-tCK6iEj6GNL46zGMzOnVv40/P0T6EpttoK0NokJ6qyM="; + sha256 = "sha256-q1MNdbyrx4vvN5woe0o90pPqaNtsZjI5RQ7KJt7rOpU="; }; nativeBuildInputs = [ jekyll ]; From 77dec2d67b20b6f1b08a063888a210b7253e0aee Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Fri, 28 Oct 2022 03:10:46 +0200 Subject: [PATCH 07/66] python3Packages.hydrus-api: init at 4.0.0 --- .../python-modules/hydrus-api/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/hydrus-api/default.nix diff --git a/pkgs/development/python-modules/hydrus-api/default.nix b/pkgs/development/python-modules/hydrus-api/default.nix new file mode 100644 index 000000000000..d9afe61a65e0 --- /dev/null +++ b/pkgs/development/python-modules/hydrus-api/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "hydrus-api"; + version = "4.0.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-4by2TlZJIKElGgaof1w555ik2hUNbg16YekSWwICGmg="; + }; + + disabled = pythonOlder "3.9"; + + propagatedBuildInputs = [ + requests + ]; + + pythonImportsCheck = [ "hydrus_api" ]; + + # There are no unit tests + doCheck = false; + + meta = with lib; { + description = "Python module implementing the Hydrus API"; + homepage = "https://gitlab.com/cryzed/hydrus-api"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 04c9ec2047cb..b19971362b08 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4309,6 +4309,8 @@ self: super: with self; { hydrawiser = callPackage ../development/python-modules/hydrawiser { }; + hydrus-api = callPackage ../development/python-modules/hydrus-api { }; + hypchat = callPackage ../development/python-modules/hypchat { }; hypercorn = callPackage ../development/python-modules/hypercorn { }; From 9d477c37ac1e05195d192a4b746f9c3764816930 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Fri, 28 Oct 2022 20:43:16 -0700 Subject: [PATCH 08/66] nixos/tests/k3s: fix multi-node test This corrects the multi-node test after a couple recent changes which resulted in it being broken. The `lib.toString` change was an incorrect tree-wide refactor, and the aarch64 change also introduced an error in python indentation/formatting I believe. --- nixos/tests/k3s/multi-node.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/tests/k3s/multi-node.nix b/nixos/tests/k3s/multi-node.nix index 2a3aa22b96bf..9a6c7fd46573 100644 --- a/nixos/tests/k3s/multi-node.nix +++ b/nixos/tests/k3s/multi-node.nix @@ -112,7 +112,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: enable = true; role = "agent"; serverAddr = "https://192.168.1.3:6443"; - extraFlags = lib.toString [ + extraFlags = lib.concatStringsSep " " [ "--pause-image" "test.local/pause:local" "--node-ip" "192.168.1.2" ]; @@ -138,12 +138,15 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: m.start() m.wait_for_unit("k3s") + is_aarch64 = "${toString pkgs.stdenv.isAarch64}" == "1" + # wait for the agent to show up server.wait_until_succeeds("k3s kubectl get node agent") for m in machines: - '' # Fix-Me: Tests fail for 'aarch64-linux' as: "CONFIG_CGROUP_FREEZER: missing (fail)" - + lib.optionalString (!pkgs.stdenv.isAarch64) ''m.succeed("k3s check-config")'' + '' + # Fix-Me: Tests fail for 'aarch64-linux' as: "CONFIG_CGROUP_FREEZER: missing (fail)" + if not is_aarch64: + m.succeed("k3s check-config") m.succeed( "${pauseImage} | k3s ctr image import -" ) From 7af141305e944f152fa598c9784e82c4d8f31de6 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 29 Oct 2022 04:20:00 +0000 Subject: [PATCH 09/66] millet: 0.5.8 -> 0.5.10 --- pkgs/development/tools/millet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/millet/default.nix b/pkgs/development/tools/millet/default.nix index 6322e5b2bc5a..f0620b36278c 100644 --- a/pkgs/development/tools/millet/default.nix +++ b/pkgs/development/tools/millet/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.5.8"; + version = "0.5.10"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AsI0n76ZWzW326/kpzP+6zjVA42WrhPqnid02OJ5fEo="; + sha256 = "sha256-6TFXaVIbdHO6smM20I2olURdBPZfcPBQ4Pyk5hU9Mx8="; }; - cargoSha256 = "sha256-tHa/DXcWLdOlMlauerSiLsLImYrbnslN6R991mSTyvs="; + cargoSha256 = "sha256-fsguAk77XXMaGokqyGEumngBW2G4lmSU3Q2HMo5EtKY="; postPatch = '' rm .cargo/config.toml From e2f0896eb9156a7b109b7c4ca29ad78a3068ddce Mon Sep 17 00:00:00 2001 From: Mostly Void <7rat13@gmail.com> Date: Sat, 29 Oct 2022 13:55:54 +0530 Subject: [PATCH 10/66] toast: init at 0.45.5 --- pkgs/development/tools/toast/default.nix | 27 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/toast/default.nix diff --git a/pkgs/development/tools/toast/default.nix b/pkgs/development/tools/toast/default.nix new file mode 100644 index 000000000000..1fd8392c9576 --- /dev/null +++ b/pkgs/development/tools/toast/default.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "toast"; + version = "0.45.5"; + + src = fetchFromGitHub { + owner = "stepchowfun"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-7EF9DCT8Vg7aGOUlRG9c4Lv2EhCX/P9k4zQC6Ruqv0c="; + }; + + cargoSha256 = "sha256-tyZrNUT2i9i0yOqz1KqIuFSb4PO+fx1SNa+ZVNfIGfM="; + + checkFlags = [ "--skip=format::tests::code_str_display" ]; # fails + + meta = with lib; { + description = "Containerize your development and continuous integration environments"; + homepage = "https://github.com/stepchowfun/toast"; + license = licenses.mit; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01034566a665..e4a60de025d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1425,6 +1425,8 @@ with pkgs; tnat64 = callPackage ../tools/networking/tnat64 { }; + toast = callPackage ../development/tools/toast { }; + topicctl = callPackage ../tools/misc/topicctl { }; ttchat = callPackage ../tools/misc/ttchat { }; From 248ad2f5ca9724cf50b80e2f5f1afbeddddfb973 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 29 Oct 2022 16:51:32 +0200 Subject: [PATCH 11/66] python3Packages.pywlroots: 0.15.22 -> 0.15.24 https://github.com/flacjacket/pywlroots/releases/tag/v0.15.23 https://github.com/flacjacket/pywlroots/releases/tag/v0.15.24 --- pkgs/development/python-modules/pywlroots/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix index 8a3dec179c10..0edd0b06be6d 100644 --- a/pkgs/development/python-modules/pywlroots/default.nix +++ b/pkgs/development/python-modules/pywlroots/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pywlroots"; - version = "0.15.22"; + version = "0.15.24"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KzpQk7ANinEVvOBeZ+8vPmuuu4LbatjHBKUL44bcAAI="; + sha256 = "sha256-TvYhxiAbK+mpcEE9y79WH96dzeDnvI0xPaUxSYQqyHE="; }; nativeBuildInputs = [ pkg-config ]; From c6f6226649940bf515abf5f65163efe25faadb61 Mon Sep 17 00:00:00 2001 From: Christian Kemper Date: Sat, 29 Oct 2022 17:27:27 +0100 Subject: [PATCH 12/66] pulumi-bin: 3.44.1 -> 3.44.3 --- pkgs/tools/admin/pulumi/data.nix | 82 +++++++++++++++---------------- pkgs/tools/admin/pulumi/update.sh | 2 +- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 7229d878a987..da597137f013 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.44.1"; + version = "3.44.3"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.44.1-linux-x64.tar.gz"; - sha256 = "14riwmvq3dyakrpjk33fwy7inndm7ziyznf16vlnzj1fikv8q6bg"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.44.3-linux-x64.tar.gz"; + sha256 = "0mykgk7gkb0369i3a52jjcnwm87a8c8vfr92k9mca6hr6z79d9kp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-linux-amd64.tar.gz"; @@ -25,12 +25,12 @@ sha256 = "15qs31vpip7dbzmhaa2rh6439qdd9b88dblkilwr3rypwiwdsdvy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.13.0-linux-amd64.tar.gz"; - sha256 = "0y7np2qg2hp81cji78bjbcw7ng2g81y1asbnqb2jd2ip0yf43aqp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.14.0-linux-amd64.tar.gz"; + sha256 = "1rp0kdsrljlyzp58zrzvs8ifygrlz3qz6wqi1cxmf482gn1ck3xg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.18.0-linux-amd64.tar.gz"; - sha256 = "153abxmq0z0m06nm5kbdypbl7np8rpkn78s8c54dqm4v0kjgiwgf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.19.0-linux-amd64.tar.gz"; + sha256 = "182281jvafg0ixd6k17y6zvnkfpfi57khf42jsdgn6q97xz9bvfs"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.23.0-linux-amd64.tar.gz"; @@ -61,8 +61,8 @@ sha256 = "0dwnrqng4w02wcmznksdxksak9kgfrj6pg2jny175a1lr6584blf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.4.1-linux-amd64.tar.gz"; - sha256 = "0nxbbkk98w35dxsibfc67m6y5b2h48kckk62i2qw0ix2v8qgmcks"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.5.0-linux-amd64.tar.gz"; + sha256 = "1wkz9lr1q668kf71gz38n6wd11rxc5np0akw91i5fln5z9wd2jcf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-amd64.tar.gz"; @@ -93,8 +93,8 @@ sha256 = "09i6lh9wfsfpa5jkj2nb80f3gvmpg3m3flfgfcc794khlrikqmib"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.22.0-linux-amd64.tar.gz"; - sha256 = "0mfd82i4f2lkpafpxx8f67zqw1hj33ai2zah07vm7sv1h2dmaxlc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.22.1-linux-amd64.tar.gz"; + sha256 = "1iiri83hvsvx9nz9whsjj9gswrs06ihywh8lf58rjzmr7bw141ln"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.44.1-darwin-x64.tar.gz"; - sha256 = "18w0k1jgwvpgdshai9bmminzdaarisvwhl57kz6gmzjria4gfyxy"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.44.3-darwin-x64.tar.gz"; + sha256 = "0jjz3xwlqw62g8vzmc3pjpad9h6i81vfskxlwr88n1sgwsr6z6ml"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-darwin-amd64.tar.gz"; @@ -183,12 +183,12 @@ sha256 = "1iw5xzgyfjr6j9dmhvmbnfhw8q4x94af5jb3jzzhbfjnsrbricwb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.13.0-darwin-amd64.tar.gz"; - sha256 = "0dz583zm47v2x2aznc4yszxibmp9schp3b38yzmbry0xrkm1gryx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.14.0-darwin-amd64.tar.gz"; + sha256 = "1ss0si046ikx60l94121vfd80h2axcbddiak3pnwq3cikabyw8r7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.18.0-darwin-amd64.tar.gz"; - sha256 = "0daw6h47n1apwnbb2s4bjqa7llhbdpczfmh9xm22nwgj5a4nca30"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.19.0-darwin-amd64.tar.gz"; + sha256 = "02jcdmmgm2v5abdqhi4l2w6nd76xh5r12sz7i27ifrq92y67hdwi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.23.0-darwin-amd64.tar.gz"; @@ -219,8 +219,8 @@ sha256 = "08v8s77plv9fv5bjx6g6wfq1fxknmmacws33zgl06vqdgdsfg1gx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.4.1-darwin-amd64.tar.gz"; - sha256 = "17qxlhqnxnkvgsym4cgymnpg38pgg83xq6jcjk28ap7d31ginzmg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.5.0-darwin-amd64.tar.gz"; + sha256 = "07kxf42j2a4z1ph161mqll2vlzhgw1ibrvd69gzqwr4d4098s7sb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz"; @@ -251,8 +251,8 @@ sha256 = "1jp9cfw8jj1wms73b5d1xhkmnylly061fxilxzvnpd49glam7da6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.22.0-darwin-amd64.tar.gz"; - sha256 = "0402ygp40dv3km8qp6hdy1y4prl86gxg69m0sdgaximjkvkfs4bm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.22.1-darwin-amd64.tar.gz"; + sha256 = "15dhf48k3vwg5ralcaljzg20vssvl4r615z3la852s9hlyr0rvzz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.44.1-linux-arm64.tar.gz"; - sha256 = "1dmghbm7ngrqdaqb2w0ifl9wxrngsz5y26bfrj0bj6j0vhgd6qw8"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.44.3-linux-arm64.tar.gz"; + sha256 = "1nqsvpms3l5vbcjcn8yhwia4li1v9hgnbc2mmb1ywmv2za7nbq2h"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-linux-arm64.tar.gz"; @@ -341,12 +341,12 @@ sha256 = "1yqqnc03hv79l1px8qxppwf8n3shdcd8jd46q1xm9f9fm7bkxd9i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.13.0-linux-arm64.tar.gz"; - sha256 = "0ni0dp0wghcaybnzvvwyf0nbnyq8k2akkghxlym48z8dq7n4206y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.14.0-linux-arm64.tar.gz"; + sha256 = "1r8rq9m2rayylspz38x8wqj7d9nlks3ynr5ifdiqf10a5xchcw96"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.18.0-linux-arm64.tar.gz"; - sha256 = "10yd58z8mwswik507p84b136xlgaaz9hjbg2hir2nwkycaa3xjj8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.19.0-linux-arm64.tar.gz"; + sha256 = "13bkgsb8wqy9jcmmwignx7609m5qhmj2ghsprwmmbjnmcnsc21k7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.23.0-linux-arm64.tar.gz"; @@ -377,8 +377,8 @@ sha256 = "0bx2dczfm1zqpkclyf1pj0m0iv2w7c3dlqdajfgism3inyb6313c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.4.1-linux-arm64.tar.gz"; - sha256 = "1bh1ikp9dvs1akc9qqs65mdcakkmxcx2ki5pvh7sc0zdgp6ppm76"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.5.0-linux-arm64.tar.gz"; + sha256 = "0600s9hyvxxqbbcaikmwqg0ib6ibjz9wxadlpd9ch50kvsmfi0w4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-arm64.tar.gz"; @@ -409,8 +409,8 @@ sha256 = "0gis39k5kgdxl0i4afy78hkcmwpzm1shh4x713p7dg6h8w0afdmi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.22.0-linux-arm64.tar.gz"; - sha256 = "1rmdc65f166zd83rkncl474w2fmwc315h0jmlik75dqykh5d2sfx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.22.1-linux-arm64.tar.gz"; + sha256 = "16if0nrj433b7xclg2mv9lcq2p5phkj4lviyi5xb655mapyzkqg2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.44.1-darwin-arm64.tar.gz"; - sha256 = "0g47sjqc16xhmbsj4bqy31ia079jq1j68ww0mqvwd0wb3i1lfpsk"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.44.3-darwin-arm64.tar.gz"; + sha256 = "1nwgf0mg82vlc93adplw9c3x3fa3277ql8zbc8jqxbvm4l1hr4h2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-darwin-arm64.tar.gz"; @@ -499,12 +499,12 @@ sha256 = "0g882459cqbxcl9ml7mdc4s4xx6kg7srk56n0x7ypj3k0j7hjbd0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.13.0-darwin-arm64.tar.gz"; - sha256 = "11qrwc44vl0s59bbhjbb15nkcy8nb9lcsw9brb7whvxh2z080nbk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.14.0-darwin-arm64.tar.gz"; + sha256 = "0dvcbni3s6gpcizgdilsjnks7z3srvdmzqlcdd61dzv0j5jkfshp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.18.0-darwin-arm64.tar.gz"; - sha256 = "17nvcn59yd789qqwj92amwjf4xrw34yi5v80qry8vv03c4z8y0gm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.19.0-darwin-arm64.tar.gz"; + sha256 = "0hszy2nsw88qirnf58yrbmsgra98j2zla635y58ap10f7am1x69x"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.23.0-darwin-arm64.tar.gz"; @@ -535,8 +535,8 @@ sha256 = "1gzh37b5jmpz3ih7s7r11vx7wpph7pvn3iidy6gckrs9rw9jp7l4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.4.1-darwin-arm64.tar.gz"; - sha256 = "1ph2vnx5ayzckgbdgmjzbs0i9qf1bkmp29794v82582f0hdmz97q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.5.0-darwin-arm64.tar.gz"; + sha256 = "0bl2sqinn5bf3hp7maw7092n08v0pnjrcjpxhls7n234kq124rlk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-arm64.tar.gz"; @@ -567,8 +567,8 @@ sha256 = "1679zpv2r3i2acjmx2a6i7dc47p73gf3jw1k1aclasd5cyjf46jf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.22.0-darwin-arm64.tar.gz"; - sha256 = "1d7vcz66myixs0f78bmnx1qii6lrq2h5fswwhzlb6w2nj9x4hq76"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.22.1-darwin-arm64.tar.gz"; + sha256 = "1q5xx4d1kk8hm39bnagq9f4y78ganrnw7380bsgm1qxkbq3k1lcm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index 1616fd78ff42..9e21d1c116af 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -12,7 +12,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.44.1" +VERSION="3.44.3" # An array of plugin names. The respective repository inside Pulumi's # Github organization is called pulumi-$name by convention. From 7a1914356e6ab0c0e8a7a4ba06ec891f78301281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 29 Oct 2022 19:48:16 +0200 Subject: [PATCH 13/66] patchelf_0_9: drop From the commit messages in 2020 it's not clear why this package was added back. But since there are no consumers, let's drop it. --- pkgs/development/tools/misc/patchelf/0.9.nix | 17 ----------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 18 deletions(-) delete mode 100644 pkgs/development/tools/misc/patchelf/0.9.nix diff --git a/pkgs/development/tools/misc/patchelf/0.9.nix b/pkgs/development/tools/misc/patchelf/0.9.nix deleted file mode 100644 index 142e6b0d7603..000000000000 --- a/pkgs/development/tools/misc/patchelf/0.9.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, patchelf }: - -stdenv.mkDerivation rec { - pname = "patchelf"; - version = "0.9"; - - src = fetchurl { - url = "https://nixos.org/releases/patchelf/patchelf-${version}/patchelf-${version}.tar.bz2"; - sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83"; - }; - - setupHook = [ ./setup-hook.sh ]; - - doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6 - - inherit (patchelf) meta; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc9750804988..1d72bd0113b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17334,7 +17334,6 @@ with pkgs; patchelf_0_13 else patchelf_0_14; - patchelf_0_9 = callPackage ../development/tools/misc/patchelf/0.9.nix { }; patchelf_0_13 = callPackage ../development/tools/misc/patchelf/0.13.nix { patchelf = patchelf_0_14; }; From ea0f2f725084c2f29a976c06b5b9e3fcb1c01f7c Mon Sep 17 00:00:00 2001 From: Laurent Canis Date: Fri, 28 Oct 2022 16:20:23 -0400 Subject: [PATCH 14/66] ligo: 0.54.0 -> 0.54.1 --- pkgs/development/compilers/ligo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index 0858711c9033..1f6492b911a6 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -9,12 +9,12 @@ ocamlPackages.buildDunePackage rec { pname = "ligo"; - version = "0.54.0"; + version = "0.54.1"; src = fetchFromGitLab { owner = "ligolang"; repo = "ligo"; rev = version; - sha256 = "sha256-Iq72gDaS05yhxAYjIUrqiCwBkx5aWbVpYPcQlgojhNU="; + sha256 = "sha256-P4oScKsf2A6qtkzpep8lewqSMM9A+vHyN5VaH7+/6xQ="; fetchSubmodules = true; }; From ad826d15b6e66d71b6b0bed7bc3cadb01d2e3d1b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 Oct 2022 21:56:59 +0200 Subject: [PATCH 15/66] python310Packages.nasdaq-data-link: init at 1.0.4 --- .../nasdaq-data-link/default.nix | 63 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/development/python-modules/nasdaq-data-link/default.nix diff --git a/pkgs/development/python-modules/nasdaq-data-link/default.nix b/pkgs/development/python-modules/nasdaq-data-link/default.nix new file mode 100644 index 000000000000..ac1141af34ef --- /dev/null +++ b/pkgs/development/python-modules/nasdaq-data-link/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, factory_boy +, fetchFromGitHub +, httpretty +, inflection +, jsondate +, mock +, more-itertools +, numpy +, pandas +, parameterized +, pytestCheckHook +, python-dateutil +, pythonOlder +, requests +, six +}: + +buildPythonPackage rec { + pname = "nasdaq-data-link"; + version = "1.0.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Nasdaq"; + repo = "data-link-python"; + rev = "refs/tags/${version}"; + hash = "sha256-Q3Ay9FpJsvSVu0WU2bxFyo3ODKP/ZUo3SqsBtOGrIIE="; + }; + + propagatedBuildInputs = [ + inflection + more-itertools + numpy + pandas + python-dateutil + requests + six + ]; + + checkInputs = [ + factory_boy + httpretty + jsondate + mock + parameterized + pytestCheckHook + ]; + + pythonImportsCheck = [ + "nasdaqdatalink" + ]; + + meta = with lib; { + description = "Library for Nasdaq Data Link's RESTful API"; + homepage = "https://github.com/Nasdaq/data-link-python"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c4714ffe9a52..0e14fd5f403c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5987,6 +5987,8 @@ self: super: with self; { napari-svg = callPackage ../development/python-modules/napari-svg { }; + nasdaq-data-link = callPackage ../development/python-modules/nasdaq-data-link { }; + nats-py = callPackage ../development/python-modules/nats-py { }; nats-python = callPackage ../development/python-modules/nats-python { }; From 32034da16cc2050c5c8703c5c4a13d62507bd79f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 30 Oct 2022 00:56:43 +0200 Subject: [PATCH 16/66] python3Packages.enlighten: fix build --- pkgs/development/python-modules/enlighten/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix index 1946aa614974..b808801928e3 100644 --- a/pkgs/development/python-modules/enlighten/default.nix +++ b/pkgs/development/python-modules/enlighten/default.nix @@ -36,6 +36,9 @@ buildPythonPackage rec { disabledTests = [ # AssertionError: <_io.TextIOWrapper name='' mode='w' encoding='utf-8'> is not... "test_init" + # AssertionError: Invalid format specifier (deprecated since prefixed 0.4.0) + "test_floats_prefixed" + "test_subcounter_prefixed" ] ++ lib.optionals stdenv.isDarwin [ # https://github.com/Rockhopper-Technologies/enlighten/issues/44 "test_autorefresh" From d4f4b726076e0eff7bab350adfab64c6172e5b27 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 29 Oct 2022 23:23:21 +0000 Subject: [PATCH 17/66] minio-client: 2022-10-22T03-39-29Z -> 2022-10-29T10-09-23Z --- pkgs/tools/networking/minio-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 45d27f092047..fcf71db2eebb 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "minio-client"; - version = "2022-10-22T03-39-29Z"; + version = "2022-10-29T10-09-23Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-/vEKLKbpjSy1vZC9+6iCEqK9+4z7vUaaLWJT8ZzqBNE="; + sha256 = "sha256-9fXxHfSA/h6JjhKEY7PmPBJX1P127V+AekrBPFQEtSI="; }; vendorSha256 = "sha256-vW/hGvzAtd/q9Fbjr19TvpSZzFVX9HSGGSPWErw+v0A="; From bbab142a73b26cb38af1cd107078e73f4a4cf565 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 29 Oct 2022 23:23:32 +0000 Subject: [PATCH 18/66] minio: 2022-10-24T18-35-07Z -> 2022-10-29T06-21-33Z --- pkgs/servers/minio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 13c29ac6e399..059ceda8cdaa 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,13 +15,13 @@ let in buildGoModule rec { pname = "minio"; - version = "2022-10-24T18-35-07Z"; + version = "2022-10-29T06-21-33Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-sABNzhyfBNU5pWyE/VWHUzuSyKsx0glj01ectJPakV8="; + sha256 = "sha256-fQikYzaFFBYwtwKUOehxhK1+8M6Mlg4bBojkviheOco="; }; vendorSha256 = "sha256-wB3UiuptT6D0CIUlHC1d5k0rjIxNeh5yAWOmYpyLGmA="; From b517f6794dbd7ff88c928f563cd585b9d4ecb960 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 01:28:35 +0200 Subject: [PATCH 19/66] python310Packages.aiorecollect: 2021.10.0 -> 2022.10.0 --- pkgs/development/python-modules/aiorecollect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiorecollect/default.nix b/pkgs/development/python-modules/aiorecollect/default.nix index 79bc2a787b96..71a2f8d6f1f9 100644 --- a/pkgs/development/python-modules/aiorecollect/default.nix +++ b/pkgs/development/python-modules/aiorecollect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiorecollect"; - version = "2021.10.0"; + version = "2022.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-cLutszJ8VXGcqb8kZv7Qn1ZD/LRYjVgQWQxNMHNd0UQ="; + sha256 = "sha256-JIh6jr4pFXGZTUi6K7VsymaCxCrTNBevk9xo9TsrFnM="; }; nativeBuildInputs = [ From ea21be3c67e758d5841f42c019d46e3439b7e935 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 01:29:19 +0200 Subject: [PATCH 20/66] python310Packages.aioridwell: 2022.03.0 -> 2022.10.0 --- pkgs/development/python-modules/aioridwell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioridwell/default.nix b/pkgs/development/python-modules/aioridwell/default.nix index 2b4cb28bbb59..26c7f2e9809a 100644 --- a/pkgs/development/python-modules/aioridwell/default.nix +++ b/pkgs/development/python-modules/aioridwell/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aioridwell"; - version = "2022.03.0"; + version = "2022.10.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - hash = "sha256-UiHT1YbBb9UTughVw2oJxRtvhUDVqQWqEcXMEXwy2cI="; + hash = "sha256-cc5l72QHcyCBFZtw3F9EFFtmz58NnZ9gkDTcFZFlL4E="; }; nativeBuildInputs = [ From 56703430700889a029a673e47ff042cf33072102 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 01:31:37 +0200 Subject: [PATCH 21/66] python310Packages.aioambient: 2021.12.0 -> 2022.10.0 --- pkgs/development/python-modules/aioambient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioambient/default.nix b/pkgs/development/python-modules/aioambient/default.nix index 2396b24f6d9f..6a9ade641dbd 100644 --- a/pkgs/development/python-modules/aioambient/default.nix +++ b/pkgs/development/python-modules/aioambient/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioambient"; - version = "2021.12.0"; + version = "2022.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-nFCLMpkuSVPecKrtJ/z7KuyGw4Z9X79wKXmWsewbxvY="; + sha256 = "sha256-Oppi4J0TuLbqwVn1Hpa4xcU9c/I+YDP3E0VXwiP8a/w="; }; postPatch = '' From c22386ca2a19cdc05c55497f7bd4643acfd34a20 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 01:33:46 +0200 Subject: [PATCH 22/66] python310Packages.aioguardian: 2022.07.0 -> 2022.10.0 --- pkgs/development/python-modules/aioguardian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index 511400ccfc59..aa5b31972221 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "aioguardian"; - version = "2022.07.0"; + version = "2022.10.0"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-87MumQ6MuhRRDHrcH1nmOPviKDaT4crYnq5Pd26qsLw="; + sha256 = "sha256-plgO+pyKmG0mYnFZxDcrENcuEg5AG2Og2xWipzuzyHo="; }; format = "pyproject"; From 21e95fef889baf18bb64cea155726508defdc380 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 01:36:55 +0200 Subject: [PATCH 23/66] python310Packages.peaqevcore: 7.0.10 -> 7.0.13 --- 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 8ca7b10fb561..17c6ff296319 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.0.10"; + version = "7.0.13"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-97Evn/FT1SCQaiSNKBi0akajc7LkywqzJQEaqxm6s+U="; + hash = "sha256-0qzqnmMzgiUBe2NQsYC/EmjmoBmZsG+tUkfGc9cyKP8="; }; postPatch = '' From 96596bec5f0702870dc2f761743ff80799f13b3e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 01:43:22 +0200 Subject: [PATCH 24/66] python310Packages.velbus-aio: 2022.10.3 -> 2022.10.4 --- pkgs/development/python-modules/velbus-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index 62596add2c86..664ff0d1fe96 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2022.10.3"; + version = "2022.10.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = pname; rev = version; - sha256 = "sha256-p/oWyi5417rTSG2+xYsPlaiiHfdyAACyvRwTsmqAoUI="; + sha256 = "sha256-6Sg2t8UmIyVCfjTW3GDldOk09gVg2ngV9sXhyQI4Kz4="; fetchSubmodules = true; }; From 38090aea8938b320f8014831dee9b3aed7c28877 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 01:45:26 +0200 Subject: [PATCH 25/66] python310Packages.teamcity-messages: 1.31 -> 1.32 --- pkgs/development/python-modules/teamcity-messages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/teamcity-messages/default.nix b/pkgs/development/python-modules/teamcity-messages/default.nix index 4f2b7f76de89..482386ac89b3 100644 --- a/pkgs/development/python-modules/teamcity-messages/default.nix +++ b/pkgs/development/python-modules/teamcity-messages/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "teamcity-messages"; - version = "1.31"; + version = "1.32"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "JetBrains"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oYXP9HWdgmEq48rYyuX6zHf+cp835C0BtHUAME+5S+k="; + sha256 = "sha256-9az7kD7nKqMF2b3/eFgF+pOKKIYLvTy2sf4TSJfHRnA="; }; checkInputs = [ From 8f4dd2cad1cf1299dbb0c6610685936ad76d0c57 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 01:49:52 +0200 Subject: [PATCH 26/66] python310Packages.shtab: 1.5.5 -> 1.5.6 --- pkgs/development/python-modules/shtab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shtab/default.nix b/pkgs/development/python-modules/shtab/default.nix index f5a276497502..4e8ba675b9c1 100644 --- a/pkgs/development/python-modules/shtab/default.nix +++ b/pkgs/development/python-modules/shtab/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "shtab"; - version = "1.5.5"; + version = "1.5.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-I6De64eawNi36c8NiyVxj63PkxnZfUYYT4Dw4l42Ztk="; + hash = "sha256-w04wvmzWcp92slPIc2f1En+52J9Z/XvjGHHntCeuTd0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 5b4f0e60911acadf5b69958aa8ce76e64750a922 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 01:52:41 +0200 Subject: [PATCH 27/66] python310Packages.md-toc: 8.1.4 -> 8.1.5 --- pkgs/development/python-modules/md-toc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix index 0510aed835ad..40a637dda188 100644 --- a/pkgs/development/python-modules/md-toc/default.nix +++ b/pkgs/development/python-modules/md-toc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "md-toc"; - version = "8.1.4"; + version = "8.1.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "frnmst"; repo = pname; rev = version; - hash = "sha256-7bXd+kTB1NF5KfcDVsvemCfIbZxv6nAw851bNo375Xs="; + hash = "sha256-jt2ZZV63s7LL0R9ay/tvMH3cIDElYXiNPBuHlxj/Z8E="; }; propagatedBuildInputs = [ From 3171790bc778180e5a1fc8f490300e9b3f42bc3b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 01:55:21 +0200 Subject: [PATCH 28/66] python310Packages.aionotion: 2021.10.0 -> 2022.10.0 --- pkgs/development/python-modules/aionotion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aionotion/default.nix b/pkgs/development/python-modules/aionotion/default.nix index 4e161ba6804b..4ea83ea22a6b 100644 --- a/pkgs/development/python-modules/aionotion/default.nix +++ b/pkgs/development/python-modules/aionotion/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aionotion"; - version = "2021.10.0"; + version = "2022.10.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-5bu2XveDi2e6lGdI/T+0apqXzcnqdztVtaHEpp+Vkzs="; + sha256 = "sha256-DJkqFj87N8OlWHNto+tInj8QvVoNA9faLBb/pBbQl0U="; }; nativeBuildInputs = [ poetry-core ]; From 556082b2f533f4b6dc0c308cf9c0a3d0a059af19 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 01:57:23 +0200 Subject: [PATCH 29/66] python310Packages.aionotion: update disabled --- .../python-modules/aionotion/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aionotion/default.nix b/pkgs/development/python-modules/aionotion/default.nix index 4ea83ea22a6b..71fc39dead59 100644 --- a/pkgs/development/python-modules/aionotion/default.nix +++ b/pkgs/development/python-modules/aionotion/default.nix @@ -15,16 +15,19 @@ buildPythonPackage rec { pname = "aionotion"; version = "2022.10.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-DJkqFj87N8OlWHNto+tInj8QvVoNA9faLBb/pBbQl0U="; + hash = "sha256-DJkqFj87N8OlWHNto+tInj8QvVoNA9faLBb/pBbQl0U="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ aiohttp @@ -38,9 +41,13 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = [ "examples" ]; + disabledTestPaths = [ + "examples" + ]; - pythonImportsCheck = [ "aionotion" ]; + pythonImportsCheck = [ + "aionotion" + ]; meta = with lib; { description = "Python library for Notion Home Monitoring"; From e8119355961b95db09c1bd9f590ee5bfba163783 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 02:07:15 +0200 Subject: [PATCH 30/66] python310Packages.aioswitcher: 3.1.0 -> 3.2.0 --- pkgs/development/python-modules/aioswitcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index 2b6b7fede1d8..4c7a382813c5 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "3.1.0"; + version = "3.2.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "TomerFi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-UnKi9/+BmQoJcv/Mlv9C9FYUgMy3J8KCGRrWPMGrM8Y="; + hash = "sha256-Vob5p0+SlZR2eHj5Br2pWp3FCxW+zgY6crh8jrkreT0="; }; nativeBuildInputs = [ From 610fcf1243fef570261c3255e8150b87b11c9604 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Sat, 29 Oct 2022 16:24:03 -0400 Subject: [PATCH 31/66] nixos/mautrix-facebook: add new required config option --- nixos/modules/services/matrix/mautrix-facebook.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/matrix/mautrix-facebook.nix b/nixos/modules/services/matrix/mautrix-facebook.nix index 18c91f649b12..e74f25df764d 100644 --- a/nixos/modules/services/matrix/mautrix-facebook.nix +++ b/nixos/modules/services/matrix/mautrix-facebook.nix @@ -25,6 +25,7 @@ in { default = { homeserver = { address = "http://localhost:8008"; + software = "standard"; }; appservice = rec { From 651e30bc43698df2117958d67df04e8b6df0ceff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Oct 2022 01:01:05 +0000 Subject: [PATCH 32/66] python310Packages.meshtastic: 1.3.42 -> 1.3.43 --- pkgs/development/python-modules/meshtastic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index a98d3354ef2f..0e6fe74bc728 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.3.42"; + version = "1.3.43"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,8 +26,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "meshtastic"; repo = "Meshtastic-python"; - rev = version; - hash = "sha256-yQjUepoKHYsQg49hY3ABtRGBxAppqm/DODnCM4tBH5A="; + rev = "refs/tags/${version}"; + hash = "sha256-Gy9fnYUbv5jR+YeFjbNGdng+loM/J71Yn9Y1mKERVUA="; }; propagatedBuildInputs = [ From 907817187980cedc9e048045276002379fd19063 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Oct 2022 01:17:48 +0000 Subject: [PATCH 33/66] python310Packages.motor: 3.1.0 -> 3.1.1 --- pkgs/development/python-modules/motor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/motor/default.nix b/pkgs/development/python-modules/motor/default.nix index 06a17ffab15c..c25070a7fa86 100644 --- a/pkgs/development/python-modules/motor/default.nix +++ b/pkgs/development/python-modules/motor/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "motor"; - version = "3.1.0"; + version = "3.1.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "mongodb"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Wc0C4sO33v/frBtZVV2u9ESunHKyJI+eQ59l72h2eFk="; + sha256 = "sha256-PD41ZyUFY4fYaO4Fo7kiTWcn1a6LOd81K3PWAAagmr4="; }; propagatedBuildInputs = [ pymongo ]; From c85289ae3bac9deb668c1a6f3154d6fbb6a64e76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Oct 2022 02:28:37 +0000 Subject: [PATCH 34/66] oh-my-posh: 12.9.1 -> 12.10.0 --- pkgs/development/tools/oh-my-posh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index 5b08cafa308b..4e4987fa53df 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "12.9.1"; + version = "12.10.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bjmYGQBJ4YdeQR+rlnXxE5Z6QRoF2EONciLz2ka29ys="; + sha256 = "sha256-iPSaJL1mvPjzZjXtgqeFS1p1jlOqc6B/R1/Zwym0j3g="; }; vendorSha256 = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU="; From 2f74bf9ce86149f3094c86ee93d695864bad1b90 Mon Sep 17 00:00:00 2001 From: Maas Lalani Date: Thu, 27 Oct 2022 12:36:22 -0400 Subject: [PATCH 35/66] vhs: init at 0.1.1 --- pkgs/applications/misc/vhs/default.nix | 38 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/misc/vhs/default.nix diff --git a/pkgs/applications/misc/vhs/default.nix b/pkgs/applications/misc/vhs/default.nix new file mode 100644 index 000000000000..5ea0a82c850e --- /dev/null +++ b/pkgs/applications/misc/vhs/default.nix @@ -0,0 +1,38 @@ +{ lib, buildGoModule, installShellFiles, fetchFromGitHub, ffmpeg, ttyd, makeWrapper }: + +buildGoModule rec { + pname = "vhs"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "charmbracelet"; + repo = pname; + rev = "v${version}"; + hash = "sha256-wcOLUA/U+xRwo7slnACCURQO7D0F3pFP2/SHDfEHeTA="; + }; + + vendorHash = "sha256-f8EHDxu+NWAFJx9ujzsiDhNymdEzExmdreP11gV56AI="; + + nativeBuildInputs = [ installShellFiles makeWrapper ]; + buildInputs = [ ttyd ffmpeg ]; + + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + + postInstall = '' + wrapProgram $out/bin/vhs --prefix PATH : ${lib.makeBinPath [ ffmpeg ttyd ]} + $out/bin/vhs man > vhs.1 + installManPage vhs.1 + installShellCompletion --cmd vhs \ + --bash <($out/bin/vhs completion bash) \ + --fish <($out/bin/vhs completion fish) \ + --zsh <($out/bin/vhs completion zsh) + ''; + + meta = with lib; { + description = "A tool for generating terminal GIFs with code"; + homepage = "https://github.com/charmbracelet/vhs"; + changelog = "https://github.com/charmbracelet/vhs/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ maaslalani ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f923ae0d2456..eaaf3e3be7a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37202,6 +37202,8 @@ with pkgs; vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; + vhs = callPackage ../applications/misc/vhs { }; + vgmstream = callPackage ../applications/audio/vgmstream { }; viddy = callPackage ../tools/misc/viddy { }; From 0922d4127e4ae165b127a6d1c599c94aa68707ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Oct 2022 02:53:09 +0000 Subject: [PATCH 36/66] packer: 1.8.3 -> 1.8.4 --- pkgs/development/tools/packer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 741107860e0e..1d3cdf62c081 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "packer"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "sha256-Ar8O/zbM3L898FwJiITON/vID4b+dN/KIk7TRTepD/0="; + sha256 = "sha256-m8PKigVm46PN55hchc5a1OUUuhxoGn3e2sMRqqvkPgs="; }; - vendorSha256 = "sha256-kM+D981x3/2uUFKElWbNrsfKhKbGgAvEklMD+FSaDRE="; + vendorSha256 = "sha256-hSZCYSV7nMGd5KQsV+Z4ig7vk4j8cZnOvsg0DqPiEvg="; subPackages = [ "." ]; From e81347c4ecd6924dcedb84cb8d7bef4d9f4d5d75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Oct 2022 02:55:04 +0000 Subject: [PATCH 37/66] python310Packages.mss: 6.1.0 -> 7.0.1 --- pkgs/development/python-modules/mss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mss/default.nix b/pkgs/development/python-modules/mss/default.nix index a0d74719e794..ef10915f9a62 100644 --- a/pkgs/development/python-modules/mss/default.nix +++ b/pkgs/development/python-modules/mss/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "mss"; - version = "6.1.0"; + version = "7.0.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "aebd069f3e05667fe9c7b9fa4b1771fe42a4710ce1058ce0236936ce06fa5394"; + sha256 = "sha256-8UzuUokDw7AdO48SCc1JhCL3Hj0NLZLFuTPt07l3ICI="; }; # By default it attempts to build Windows-only functionality From 8eecb712e7f9f233e37e0f1f2e38370d18501916 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Oct 2022 03:59:26 +0000 Subject: [PATCH 38/66] python310Packages.panel: 0.14.0 -> 0.14.1 --- pkgs/development/python-modules/panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index d59fb9bf3bcd..1271fb3b4da0 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "panel"; - version = "0.14.0"; + version = "0.14.1"; format = "wheel"; @@ -23,7 +23,7 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-3kZba0R9J978bvjsjRMLSTo7dOPd5Ml7VPkZqMQV2uY="; + hash = "sha256-DSurTC+inYSoGJ047u03K+wEQhGFqqRX0uS5qb3sNEI="; }; propagatedBuildInputs = [ From 84510146d4420d0fb659263c89e05bf7f346d46e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 30 Oct 2022 03:45:34 +0000 Subject: [PATCH 39/66] =?UTF-8?q?terraform-providers.flexibleengine:=201.3?= =?UTF-8?q?3.0=20=E2=86=92=201.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8da5babc4617..95e53d097708 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -394,13 +394,13 @@ "version": "2.4.0" }, "flexibleengine": { - "hash": "sha256-2eXNumT1Hkc33bW635qYr5jxlByX+yZ8zSKRpgKWQJo=", + "hash": "sha256-yg3o7jsWGJ7/fJmDDbFnCpDmKRu0oEbe9wYoILbVwq8=", "owner": "FlexibleEngineCloud", "provider-source-address": "registry.terraform.io/FlexibleEngineCloud/flexibleengine", "repo": "terraform-provider-flexibleengine", - "rev": "v1.33.0", - "vendorHash": "sha256-smk44z0q2Ku9iO+74vhb/gk5DvdaJe/wDFg7EtQEh/E=", - "version": "1.33.0" + "rev": "v1.34.0", + "vendorHash": "sha256-m0Bv/w0TZASE3n7wEyCmHRHEpjc3snP5Bxyx+2A5dQQ=", + "version": "1.34.0" }, "fortios": { "deleteVendor": true, From 4fbac1297f16ed6a096ab982d99a33cd90ae3c07 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 29 Oct 2022 22:25:40 +0100 Subject: [PATCH 40/66] qmmp: drop unused xlibsWrapper Tested as no material change in `out` output with `diffoscope`. --- pkgs/applications/audio/qmmp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index bed02f77e7b2..6eea4562de99 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchurl, cmake, pkg-config, xlibsWrapper +{ lib, mkDerivation, fetchurl, cmake, pkg-config , qtbase, qttools, qtmultimedia, qtx11extras # transports , curl, libmms @@ -40,7 +40,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ # basic requirements - qtbase qttools qtmultimedia qtx11extras xlibsWrapper + qtbase qttools qtmultimedia qtx11extras # transports curl libmms # input plugins From c2e1495fd7a0f88b84cdd83afeb0113e6d640df1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Oct 2022 05:33:45 +0000 Subject: [PATCH 41/66] python310Packages.progressbar2: 4.1.1 -> 4.2.0 --- pkgs/development/python-modules/progressbar2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 5678eefc212c..892655a4ffeb 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "progressbar2"; - version = "4.1.1"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Y5odWSJ4RIg5kwvf/SQrTU6pzgyeZWrqgQKCwtNrwSE="; + sha256 = "sha256-E5OSL8tkWYlErUV1afvrSzrBie9Qta25zvMoTofjlM4="; }; propagatedBuildInputs = [ python-utils ]; From 3c2305ebc320840db33847db45a134118383211e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Oct 2022 05:39:11 +0000 Subject: [PATCH 42/66] python310Packages.psygnal: 0.5.0 -> 0.6.0 --- pkgs/development/python-modules/psygnal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix index a62e90a80e71..778c5516c635 100644 --- a/pkgs/development/python-modules/psygnal/default.nix +++ b/pkgs/development/python-modules/psygnal/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "psygnal"; - version = "0.5.0"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "tlambert03"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Hh1HG4VVcNXo62M/4mU3ZcSQNHmalcIDprkwD6/WRf8="; + hash = "sha256-KCdX+pMUAQxeQRZhkrdGCKGjBaB1Ode/r1W8LJQPxyM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From e90683d79f50aa600e3e918273490497c8fce358 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Oct 2022 05:44:15 +0000 Subject: [PATCH 43/66] python310Packages.pulumi-aws: 5.18.0 -> 5.19.0 --- pkgs/development/python-modules/pulumi-aws/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index ee3f7d22f35f..8627c4f3d519 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "5.18.0"; + version = "5.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-IHvmiX5drRm4PNY+N5VZ7OjsH5xIswr/G7AREN1XYtM="; + hash = "sha256-ZpbWqhTScWOlcVsX4OYlA5dYQg0UsfOhMLllXjEDdUI="; }; sourceRoot = "${src.name}/sdk/python"; From d97c29dd842cc0815b7536c8d78bd81b0b9c0dcb Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 30 Oct 2022 07:29:50 +0000 Subject: [PATCH 44/66] notion: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- pkgs/applications/window-managers/notion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix index e59103d7d6d0..4e546c067155 100644 --- a/pkgs/applications/window-managers/notion/default.nix +++ b/pkgs/applications/window-managers/notion/default.nix @@ -2,7 +2,7 @@ , lua, gettext, which, groff, xmessage, xterm , readline, fontconfig, libX11, libXext, libSM , libXinerama, libXrandr, libXft -, xlibsWrapper, makeWrapper +, makeWrapper }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config makeWrapper groff ]; buildInputs = [ lua gettext which readline fontconfig libX11 libXext libSM - libXinerama libXrandr libXft xlibsWrapper ]; + libXinerama libXrandr libXft ]; buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" ]; From ec02fca53a70b069c5e708a7bdad6859e2c47f53 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 09:08:18 +0100 Subject: [PATCH 45/66] python310Packages.mss: disable on older Python releases --- .../development/python-modules/mss/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/mss/default.nix b/pkgs/development/python-modules/mss/default.nix index ef10915f9a62..a707ccefda1a 100644 --- a/pkgs/development/python-modules/mss/default.nix +++ b/pkgs/development/python-modules/mss/default.nix @@ -1,13 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "mss"; version = "7.0.1"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8UzuUokDw7AdO48SCc1JhCL3Hj0NLZLFuTPt07l3ICI="; + hash = "sha256-8UzuUokDw7AdO48SCc1JhCL3Hj0NLZLFuTPt07l3ICI="; }; # By default it attempts to build Windows-only functionality @@ -16,10 +22,12 @@ buildPythonPackage rec { ''; # Skipping tests due to most relying on DISPLAY being set - pythonImportsCheck = [ "mss" ]; + pythonImportsCheck = [ + "mss" + ]; meta = with lib; { - description = "Cross-platform multiple screenshots module in pure Python"; + description = "Cross-platform multiple screenshots module"; homepage = "https://github.com/BoboTiG/python-mss"; license = licenses.mit; maintainers = with maintainers; [ austinbutler ]; From 54cb67ac972aebf45cf8bd6330d72fe6ba30fa38 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 09:17:08 +0100 Subject: [PATCH 46/66] python310Packages.motor: update disabled --- .../python-modules/motor/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/motor/default.nix b/pkgs/development/python-modules/motor/default.nix index c25070a7fa86..cd819a14a879 100644 --- a/pkgs/development/python-modules/motor/default.nix +++ b/pkgs/development/python-modules/motor/default.nix @@ -9,23 +9,31 @@ buildPythonPackage rec { pname = "motor"; version = "3.1.1"; - disabled = pythonOlder "3.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mongodb"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-PD41ZyUFY4fYaO4Fo7kiTWcn1a6LOd81K3PWAAagmr4="; + hash = "sha256-PD41ZyUFY4fYaO4Fo7kiTWcn1a6LOd81K3PWAAagmr4="; }; - propagatedBuildInputs = [ pymongo ]; + propagatedBuildInputs = [ + pymongo + ]; - checkInputs = [ mockupdb ]; + checkInputs = [ + mockupdb + ]; # network connections doCheck = false; - pythonImportsCheck = [ "motor" ]; + pythonImportsCheck = [ + "motor" + ]; meta = with lib; { description = "Non-blocking MongoDB driver for Tornado or asyncio"; From b91b22248c0479e74789ed9b94393ea84c3fe411 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 29 Oct 2022 13:03:58 +1000 Subject: [PATCH 47/66] lima: 0.12.0 -> 0.13.0 https://github.com/lima-vm/lima/releases/tag/v0.13.0 --- pkgs/applications/virtualization/lima/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 8da73d834aa8..03d049477b5d 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-v2zvcUDbzjisJVxEic6VDZewaE0kp1rcB2NK8y3utnQ="; + sha256 = "sha256-alE7fUVxJRkLMtdia5ruHxh9nlWIubM0J6iIrmpreRM="; }; - vendorSha256 = "sha256-MlfDvdzkegtS8sW/GjkOMLQTK30G6RipHaYzNcwIkEE="; + vendorSha256 = "sha256-Kb2R8USWOWRFMjQO3tjdl5UHOzzb2B3ld+5vO2gF3KY="; nativeBuildInputs = [ makeWrapper installShellFiles ]; From d654690be5aee7d227d7426e92e167f7afe1d451 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Oct 2022 09:01:11 +0000 Subject: [PATCH 48/66] yq-go: 4.28.2 -> 4.29.1 --- pkgs/development/tools/yq-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 795147640ab1..c9c439c7a052 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.28.2"; + version = "4.29.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-wLb7M/M/t6CCpjTyhMMDODaQUp1t6gbQaCY+JPBi/4Q="; + sha256 = "sha256-aZMlWC6qtN2TvND18QO8Q3UicSNa9cZT/xPmia3V6FM="; }; - vendorSha256 = "sha256-5GHkl9bwzf0ZUQXjhDPke4Fm7ffH+GqbTXC1Qd71B7M="; + vendorSha256 = "sha256-L3l6wH4bR1/R6MtQTHYsyRE5E/EPnpNwa310zUONo+s="; nativeBuildInputs = [ installShellFiles ]; From 170c46ce2b75d67d7a98cc262b52f8155e9610e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 10:05:03 +0100 Subject: [PATCH 49/66] python310Packages.progressbar2: use pytestCheckHook - add pythonImportsCheck - disable on older Python releases --- .../python-modules/progressbar2/default.nix | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 892655a4ffeb..e3ee0a208a6a 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -1,26 +1,44 @@ { lib -, python , buildPythonPackage , fetchPypi +, freezegun +, pytestCheckHook , python-utils +, pythonOlder }: buildPythonPackage rec { pname = "progressbar2"; version = "4.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-E5OSL8tkWYlErUV1afvrSzrBie9Qta25zvMoTofjlM4="; + hash = "sha256-E5OSL8tkWYlErUV1afvrSzrBie9Qta25zvMoTofjlM4="; }; - propagatedBuildInputs = [ python-utils ]; + postPatch = '' + sed -i "/-cov/d" pytest.ini + ''; - pythonImportsCheck = [ "progressbar" ]; + propagatedBuildInputs = [ + python-utils + ]; + + checkInputs = [ + freezegun + pytestCheckHook + ]; + + pythonImportsCheck = [ + "progressbar" + ]; meta = with lib; { - homepage = "https://progressbar-2.readthedocs.io/en/latest/"; - description = "Text progressbar library for python"; + description = "Text progressbar library"; + homepage = "https://progressbar-2.readthedocs.io/"; license = licenses.bsd3; maintainers = with maintainers; [ ashgillman turion ]; }; From c0eb1f38f821d75066fac0d335ba76fa3552d10e Mon Sep 17 00:00:00 2001 From: Victor Buttner Date: Sun, 30 Oct 2022 11:02:11 +0100 Subject: [PATCH 50/66] netdiscover: 0.9 -> 0.10 --- pkgs/tools/networking/netdiscover/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/netdiscover/default.nix b/pkgs/tools/networking/netdiscover/default.nix index 2146dd63b99e..471dd55c4e17 100644 --- a/pkgs/tools/networking/netdiscover/default.nix +++ b/pkgs/tools/networking/netdiscover/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "netdiscover"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "netdiscover-scanner"; repo = pname; rev = version; - sha256 = "sha256-4pSGWMTOMECXKpba5739OQA8FIuNmffFbniU9Gd4GlM="; + sha256 = "sha256-Pd/Rf1G9z8sBZA5i+bzuzYUCiNI0Tv7Bz0lJDJCQU9I="; }; nativeBuildInputs = [ autoreconfHook ]; From 4eb6161eeeb7c35647fe9dd230c5a2e4028614db Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 30 Oct 2022 00:26:48 +0100 Subject: [PATCH 51/66] oneko: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- pkgs/applications/misc/oneko/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix index e8399aeb098f..17a94511e3fc 100644 --- a/pkgs/applications/misc/oneko/default.nix +++ b/pkgs/applications/misc/oneko/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, imake, gccmakedep, xlibsWrapper }: +{ lib +, stdenv +, fetchFromGitHub +, imake +, gccmakedep +, libX11 +, libXext +}: stdenv.mkDerivation rec { version_name = "1.2.hanami.6"; @@ -11,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0vx12v5fm8ar3f1g6jbpmd3b1q652d32nc67ahkf28djbqjgcbnc"; }; nativeBuildInputs = [ imake gccmakedep ]; - buildInputs = [ xlibsWrapper ]; + buildInputs = [ libX11 libXext ]; makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ]; installTargets = [ "install" "install.man" ]; From 4cef88b8526cd9de2eb742fea179e169ed7d8a7b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 30 Oct 2022 00:22:54 +0100 Subject: [PATCH 52/66] openrw: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- pkgs/games/openrw/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index 95ec3d64cfb4..cd7d9cc1ae03 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -8,7 +8,6 @@ , bullet , glm , libmad -, xlibsWrapper , openal , SDL2 , boost @@ -36,7 +35,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ - sfml libGLU libGL bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg + sfml libGLU libGL bullet glm libmad openal SDL2 boost ffmpeg ] ++ lib.optionals stdenv.isDarwin [ OpenAL Cocoa ]; meta = with lib; { From d09843bf11098b696fc2831f47287369745c6a56 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Sat, 29 Oct 2022 16:44:06 -0400 Subject: [PATCH 53/66] blender: 3.3.0 -> 3.3.1 --- pkgs/applications/misc/blender/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index e6bdd340c979..1d617718ff90 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -28,11 +28,11 @@ let in stdenv.mkDerivation rec { pname = "blender"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - hash = "sha256-IsUaTmY4XLFIGKpNdtz3+m1uEDr7DTaRbhLqFZiNIfA="; + hash = "sha256-KtpI8L+KDKgCuYfXV0UgEuH48krPTSNFOwnC1ZURjMo="; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; From b4530d1ed4f3dc5cbf1d2a08fb8ed4cbb5b94114 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 29 Oct 2022 23:03:46 +0100 Subject: [PATCH 54/66] povray: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- pkgs/tools/graphics/povray/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 537e5d0a6db0..f9a08543fb95 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, boost -, zlib, libpng, libjpeg, libtiff, xlibsWrapper, SDL +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, automake +, boost +, zlib +, libX11 +, libICE +, libSM +, libpng +, libjpeg +, libtiff +, SDL }: stdenv.mkDerivation rec { @@ -14,7 +26,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ automake autoconf ]; - buildInputs = [ boost zlib libpng libjpeg libtiff xlibsWrapper SDL ]; + buildInputs = [ boost zlib libX11 libICE libSM libpng libjpeg libtiff SDL ]; # the installPhase wants to put files into $HOME. I let it put the files # to $TMPDIR, so they don't get into the $out From d5b82c0a63c9faea8109c04f243aab7dafb2cd76 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 29 Oct 2022 22:41:03 +0100 Subject: [PATCH 55/66] fox: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- pkgs/development/libraries/fox/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 14233488844d..2eda944048ab 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft -, CoreServices ? null }: +{ lib +, stdenv +, fetchurl +, libpng +, libjpeg +, libtiff +, zlib +, bzip2 +, libXcursor +, libXext +, libXrandr +, libXft +, CoreServices ? null +}: stdenv.mkDerivation rec { pname = "fox"; @@ -12,7 +24,7 @@ stdenv.mkDerivation rec { patches = [ ./clang.patch ]; - buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ] + buildInputs = [ libpng libjpeg libtiff zlib bzip2 libXcursor libXext libXrandr libXft ] ++ lib.optional stdenv.isDarwin CoreServices; doCheck = true; From f88447d108b9da9dbf300fb7b249e703ac8a9e53 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 29 Oct 2022 22:14:27 +0100 Subject: [PATCH 56/66] soxt: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- pkgs/development/libraries/soxt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/soxt/default.nix b/pkgs/development/libraries/soxt/default.nix index 5ea23aae8791..4e155f496ec2 100644 --- a/pkgs/development/libraries/soxt/default.nix +++ b/pkgs/development/libraries/soxt/default.nix @@ -1,4 +1,4 @@ -{ fetchhg, lib, stdenv, cmake, coin3d, motif, xlibsWrapper, libXmu, libGLU, libGL }: +{ fetchhg, lib, stdenv, cmake, coin3d, motif, libXext, libXmu, libGLU, libGL }: stdenv.mkDerivation { pname = "soxt"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ coin3d motif xlibsWrapper libGLU libGL libXmu ]; + buildInputs = [ coin3d motif libGLU libGL libXext libXmu ]; meta = with lib; { homepage = "https://bitbucket.org/Coin3D/coin/wiki/Home"; From e8229690bb1fdc41b44fbc432a0df559bd6457cc Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 29 Oct 2022 23:08:28 +0100 Subject: [PATCH 57/66] pasystray: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- pkgs/tools/audio/pasystray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index be9dbca4baa9..8df578d03109 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, autoreconfHook, wrapGAppsHook , gnome, avahi, gtk3, libayatana-appindicator, libnotify, libpulseaudio -, xlibsWrapper, gsettings-desktop-schemas +, gsettings-desktop-schemas }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ]; buildInputs = [ gnome.adwaita-icon-theme - avahi gtk3 libayatana-appindicator libnotify libpulseaudio xlibsWrapper + avahi gtk3 libayatana-appindicator libnotify libpulseaudio gsettings-desktop-schemas ]; From d9ffff599a22c8091687d4e5f56140a838ba337a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 29 Oct 2022 21:16:50 +0100 Subject: [PATCH 58/66] unclutter: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- pkgs/tools/misc/unclutter/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix index 74fc46563c7e..b11df6655bf3 100644 --- a/pkgs/tools/misc/unclutter/default.nix +++ b/pkgs/tools/misc/unclutter/default.nix @@ -1,4 +1,8 @@ -{lib, stdenv, fetchurl, xlibsWrapper}: +{ lib +, stdenv +, fetchurl +, libX11 +}: stdenv.mkDerivation rec { pname = "unclutter"; @@ -8,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6"; }; - buildInputs = [xlibsWrapper]; + buildInputs = [ libX11 ]; buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; From 3d5f6e4c314662988aeb49680f431bfc5e23dea6 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 29 Oct 2022 21:11:44 +0100 Subject: [PATCH 59/66] unclutter-xfixes: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- pkgs/tools/misc/unclutter-xfixes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/unclutter-xfixes/default.nix b/pkgs/tools/misc/unclutter-xfixes/default.nix index d04846637a0c..93e0d750a2ac 100644 --- a/pkgs/tools/misc/unclutter-xfixes/default.nix +++ b/pkgs/tools/misc/unclutter-xfixes/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, - xlibsWrapper, libev, libXi, libXfixes, + libev, libX11, libXext, libXi, libXfixes, pkg-config, asciidoc, libxslt, docbook_xsl }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config asciidoc libxslt docbook_xsl ]; - buildInputs = [ xlibsWrapper libev libXi libXfixes ]; + buildInputs = [ libev libX11 libXext libXi libXfixes ]; prePatch = '' substituteInPlace Makefile --replace 'PKG_CONFIG =' 'PKG_CONFIG ?=' From 3fd2a24468aad7fc0faab16fcd639c2dbb36be58 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 30 Oct 2022 11:24:02 +0100 Subject: [PATCH 60/66] bitcoind-knots: 22.0.knots20211108 -> 23.0.knots20220529 --- pkgs/applications/blockchains/bitcoin-knots/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix index 803e27969e7a..ca998248a6c5 100644 --- a/pkgs/applications/blockchains/bitcoin-knots/default.nix +++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix @@ -26,11 +26,11 @@ with lib; stdenv.mkDerivation rec { pname = if withGui then "bitcoin-knots" else "bitcoind-knots"; - version = "22.0.knots20211108"; + version = "23.0.knots20220529"; src = fetchurl { - url = "https://bitcoinknots.org/files/22.x/${version}/guix/bitcoin-${version}.tar.gz"; - sha256 = "04sqbx4sp3bzwbl8z53nz96n3s0590h327ih0mbgyvfvl3b8pj4i"; + url = "https://bitcoinknots.org/files/23.x/${version}/bitcoin-${version}.tar.gz"; + sha256 = "0c6l4bvj4ck8gp5vm4dla3l32swsp6ijk12fyf330wgry4mhqxyi"; }; nativeBuildInputs = From 3809602fd4cc838f0a35e79f94afed056db814cc Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 29 Oct 2022 17:58:24 +0100 Subject: [PATCH 61/66] wordnet: drop unused xlibsWrapper Tested as no material change in `out` output with `diffoscope`. --- pkgs/applications/misc/wordnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index 5b52caeaf1ad..d49f55574a86 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, tcl, tk, Cocoa, xlibsWrapper, makeWrapper }: +{ lib, stdenv, fetchurl, tcl, tk, Cocoa, makeWrapper }: stdenv.mkDerivation rec { version = "3.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ tcl tk xlibsWrapper ] + buildInputs = [ tcl tk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; hardeningDisable = [ "format" ]; From bfa191404f33bc72d6b6fa1647ea3462ebacdbe4 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 29 Oct 2022 19:19:41 +0100 Subject: [PATCH 62/66] voxelands: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- pkgs/games/voxelands/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix index 0d28a93e401e..906c3b9bd36c 100644 --- a/pkgs/games/voxelands/default.nix +++ b/pkgs/games/voxelands/default.nix @@ -3,9 +3,14 @@ , bzip2 , cmake , expat +, freetype , irrlicht +, libICE , libGL , libGLU +, libSM +, libX11 +, libXext , libXxf86vm , libjpeg , libpng @@ -13,7 +18,6 @@ , openal , pkg-config , sqlite -, xlibsWrapper }: stdenv.mkDerivation rec { @@ -39,18 +43,24 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + # has to go before others to override transitive libpng-1.6 + libpng + bzip2 expat + freetype irrlicht + libICE libGL libGLU + libSM + libX11 + libXext libXxf86vm libjpeg - libpng libvorbis openal sqlite - xlibsWrapper ]; meta = with lib; { From 229fa2fd6da968085fc3a4225c5ed84ab76fc02b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 29 Oct 2022 16:50:36 +0100 Subject: [PATCH 63/66] xautolock: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- pkgs/misc/screensavers/xautolock/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index cdb12b554647..fc87290da69a 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, xlibsWrapper -, imake, gccmakedep, libXScrnSaver, xorgproto +{ lib, stdenv, fetchFromGitHub +, imake, gccmakedep, libX11, libXext, libXScrnSaver, xorgproto }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ imake gccmakedep ]; - buildInputs = [ xlibsWrapper libXScrnSaver xorgproto ]; + buildInputs = [ libX11 libXext libXScrnSaver xorgproto ]; makeFlags = [ "BINDIR=$(out)/bin" From 593929c7484e1113b6759c69bcd27993b7fa2347 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 29 Oct 2022 16:45:11 +0100 Subject: [PATCH 64/66] xfe: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. --- .../file-managers/xfe/default.nix | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/file-managers/xfe/default.nix b/pkgs/applications/file-managers/xfe/default.nix index 160363937840..92b3fae31596 100644 --- a/pkgs/applications/file-managers/xfe/default.nix +++ b/pkgs/applications/file-managers/xfe/default.nix @@ -1,4 +1,18 @@ -{ lib, stdenv, fetchurl, fox, pkg-config, gettext, xlibsWrapper, xcbutil, gcc, intltool, file, libpng }: +{ lib +, stdenv +, fetchurl +, fox +, fontconfig +, freetype +, pkg-config +, gettext +, xcbutil +, gcc +, intltool +, file +, libpng +, xorg +}: stdenv.mkDerivation rec { pname = "xfe"; @@ -10,7 +24,18 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [ fox gettext xlibsWrapper xcbutil gcc file libpng ]; + buildInputs = [ + fox + gettext + xcbutil + gcc + file + libpng + fontconfig + freetype + xorg.libX11 + xorg.libXft + ]; preConfigure = '' sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h From da9574e43153ac3eb245eeaa684657a5b04458a4 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 30 Oct 2022 07:45:01 +0000 Subject: [PATCH 65/66] nedit: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `out` output with `diffoscope`. Co-authored-by: Anderson Torres --- pkgs/applications/editors/nedit/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index 5a523c05d795..b49fbc14fad9 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, xlibsWrapper, motif, libXpm }: +{ lib, stdenv, fetchurl, motif, libXpm, libXt }: stdenv.mkDerivation rec { pname = "nedit"; @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ xlibsWrapper ]; - buildInputs = [ motif libXpm ]; + buildInputs = [ motif libXpm libXt ]; # the linux config works fine on darwin too! buildFlags = lib.optional (stdenv.isLinux || stdenv.isDarwin) "linux"; From 3fa15c357033b1c7bdb88f34c1fb9f6427b4754c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 30 Oct 2022 15:02:09 +0000 Subject: [PATCH 66/66] freeglut: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `dev` and `out` outputs with `diffoscope`. --- pkgs/development/libraries/freeglut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 21b2d117558b..00b8dac9105d 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }: +{ lib, stdenv, fetchurl, libICE, libXext, libXi, libXrandr, libXxf86vm, libGL, libGLU, cmake }: stdenv.mkDerivation rec { pname = "freeglut"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ libXi libXrandr libXxf86vm libGL libGLU xlibsWrapper ]; + buildInputs = [ libICE libXext libXi libXrandr libXxf86vm libGL libGLU ]; cmakeFlags = lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${libGL}/include"