diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/applications/graphics/comical/default.nix index 36da9d26410e..095905ff06d8 100644 --- a/pkgs/applications/graphics/comical/default.nix +++ b/pkgs/applications/graphics/comical/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, wxGTK, util-linux, zlib }: +{ lib, stdenv, fetchurl, wxGTK32, util-linux, zlib, Cocoa }: stdenv.mkDerivation rec { pname = "comical"; @@ -9,10 +9,21 @@ stdenv.mkDerivation rec { sha256 = "0b6527cc06b25a937041f1eb248d0fd881cf055362097036b939817f785ab85e"; }; - buildInputs = [ wxGTK util-linux zlib ]; - makeFlags = [ "prefix=${placeholder "out"}" ]; + patches = [ ./wxgtk-3.2.patch ]; - patches = [ ./wxgtk-2.8.patch ]; + buildInputs = [ + wxGTK32 + util-linux + zlib + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + ]; + + makeFlags = [ + "prefix=${placeholder "out"}" + "CC=${stdenv.cc.targetPrefix}cc" + "CXX=${stdenv.cc.targetPrefix}c++" + ]; preInstall = "mkdir -pv $out/bin"; @@ -20,7 +31,8 @@ stdenv.mkDerivation rec { description = "Viewer of CBR and CBZ files, often used to store scanned comics"; homepage = "http://comical.sourceforge.net/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ viric ]; - platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [ viric wegank ]; + platforms = with lib.platforms; unix; + mainProgram = "comical"; }; } diff --git a/pkgs/applications/graphics/comical/wxgtk-2.8.patch b/pkgs/applications/graphics/comical/wxgtk-2.8.patch deleted file mode 100644 index db7626074a0f..000000000000 --- a/pkgs/applications/graphics/comical/wxgtk-2.8.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/Makefile b/Makefile -index a648e72..181c47f 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,5 +1,5 @@ - CC = `wx-config --cxx` --LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip -+LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip -lz - INSTALL = install - INSTALL_PROGRAM = $(INSTALL) - prefix = /usr/local -diff --git a/src/ComicalApp.cpp b/src/ComicalApp.cpp -index 0c004cd..667e75e 100644 ---- a/src/ComicalApp.cpp -+++ b/src/ComicalApp.cpp -@@ -28,6 +28,7 @@ - #include "ComicalApp.h" - #include "ComicalFrame.h" - #include -+#include - - #if !defined(__WXMAC__) && !defined(__WXCOCOA__) && !defined(__WXMSW__) && !defined(__WXPM__) - #include "../Comical Icons/comical.xpm" -diff --git a/unzip/unzip.h b/unzip/unzip.h -index b247937..5bb6a69 100644 ---- a/unzip/unzip.h -+++ b/unzip/unzip.h -@@ -50,7 +50,7 @@ extern "C" { - #endif - - #ifndef _ZLIB_H --#include "zlib.h" -+#include - #endif - - #ifndef _ZLIBIOAPI_H diff --git a/pkgs/applications/graphics/comical/wxgtk-3.2.patch b/pkgs/applications/graphics/comical/wxgtk-3.2.patch new file mode 100644 index 000000000000..72bafd733ce3 --- /dev/null +++ b/pkgs/applications/graphics/comical/wxgtk-3.2.patch @@ -0,0 +1,139 @@ +diff --git a/Makefile b/Makefile +index a648e72..0387ac1 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,5 @@ +-CC = `wx-config --cxx` +-LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip ++WX_CC = `wx-config --cxx` ++LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip -lz + INSTALL = install + INSTALL_PROGRAM = $(INSTALL) + prefix = /usr/local +@@ -13,7 +13,7 @@ OBJS = $(patsubst %.cpp,%.o,$(wildcard src/*.cpp)) + all: comical + + comical: $(OBJS) unrar/libunrar.a unzip/libminiunzip.a +- $(CC) -o $@ $(OBJS) $(LDFLAGS) ++ $(WX_CC) -o $@ $(OBJS) $(LDFLAGS) + + $(OBJS): + $(MAKE) -C src +diff --git a/src/ComicalApp.cpp b/src/ComicalApp.cpp +index 0c004cd..667e75e 100644 +--- a/src/ComicalApp.cpp ++++ b/src/ComicalApp.cpp +@@ -28,6 +28,7 @@ + #include "ComicalApp.h" + #include "ComicalFrame.h" + #include ++#include + + #if !defined(__WXMAC__) && !defined(__WXCOCOA__) && !defined(__WXMSW__) && !defined(__WXPM__) + #include "../Comical Icons/comical.xpm" +diff --git a/src/ComicalCanvas.cpp b/src/ComicalCanvas.cpp +index 75da72f..febce50 100644 +--- a/src/ComicalCanvas.cpp ++++ b/src/ComicalCanvas.cpp +@@ -792,11 +792,11 @@ void ComicalCanvas::OnKeyDown(wxKeyEvent& event) + + switch(event.GetKeyCode()) { + +- case WXK_PRIOR: ++ case WXK_PAGEUP: + PrevPageTurn(); + break; + +- case WXK_NEXT: ++ case WXK_PAGEDOWN: + NextPageTurn(); + break; + +diff --git a/src/ComicalFrame.cpp b/src/ComicalFrame.cpp +index 2256be8..154fd6d 100644 +--- a/src/ComicalFrame.cpp ++++ b/src/ComicalFrame.cpp +@@ -240,7 +240,7 @@ ComicalFrame::ComicalFrame(const wxString& title, const wxPoint& pos, const wxSi + toolbarSizer->AddSpacer(10); + toolbarSizer->Add(toolBarNav, 0, wxALIGN_CENTER, 0); + toolbarSizer->AddSpacer(10); +- toolbarSizer->Add(labelRight, 1, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL, 0); ++ toolbarSizer->Add(labelRight, 1, wxALIGN_CENTER_VERTICAL, 0); + toolbarSizer->Layout(); + bookPanelSizer->Add(toolbarSizer, 0, wxEXPAND, 0); + frameSizer->Add(bookPanelSizer, 1, wxEXPAND); +@@ -279,12 +279,12 @@ void ComicalFrame::OnClose(wxCloseEvent& event) + + wxRect frameDim = GetRect(); + config->Write(wxT("CacheLength"), (int) cacheLen); +- config->Write(wxT("Zoom"), zoom); ++ config->Write(wxT("Zoom"), (int) zoom); + config->Write(wxT("ZoomLevel"), zoomLevel); + config->Write(wxT("FitOnlyOversize"), fitOnlyOversize); +- config->Write(wxT("Filter"), filter); +- config->Write(wxT("Mode"), mode); +- config->Write(wxT("Direction"), direction); ++ config->Write(wxT("Filter"), (int) filter); ++ config->Write(wxT("Mode"), (int) mode); ++ config->Write(wxT("Direction"), (int) direction); + config->Write(wxT("FrameWidth"), frameDim.width); + config->Write(wxT("FrameHeight"), frameDim.height); + config->Write(wxT("FrameX"), frameDim.x); +@@ -309,7 +309,7 @@ void ComicalFrame::OnOpen(wxCommandEvent& event) + { + wxString cwd; + config->Read(wxT("CWD"), &cwd); +- wxString filename = wxFileSelector(wxT("Open a Comic Book"), cwd, wxT(""), wxT(""), wxT("Comic Books (*.cbr,*.cbz,*.rar,*.zip)|*.cbr;*.CBR;*.cbz;*.CBZ;*.rar;*.RAR;*.zip;*.ZIP"), wxOPEN | wxCHANGE_DIR | wxFILE_MUST_EXIST, this); ++ wxString filename = wxFileSelector(wxT("Open a Comic Book"), cwd, wxT(""), wxT(""), wxT("Comic Books (*.cbr,*.cbz,*.rar,*.zip)|*.cbr;*.CBR;*.cbz;*.CBZ;*.rar;*.RAR;*.zip;*.ZIP"), wxFD_OPEN | wxFD_CHANGE_DIR | wxFD_FILE_MUST_EXIST, this); + + if (!filename.empty()) + OpenFile(filename); +diff --git a/src/ComicalManager.cpp b/src/ComicalManager.cpp +index 12d8334..b10d8fa 100644 +--- a/src/ComicalManager.cpp ++++ b/src/ComicalManager.cpp +@@ -27,7 +27,7 @@ + + #include "ComicalManager.h" + +-ComicalManager::ComicalManager(ComicalFrame *_frame) : wxDocManager(wxDEFAULT_DOCMAN_FLAGS, false), frame(_frame) ++ComicalManager::ComicalManager(ComicalFrame *_frame) : wxDocManager(0, false), frame(_frame) + { + } + +diff --git a/src/Makefile b/src/Makefile +index 2a7dc3b..e0a9874 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -1,3 +1,4 @@ ++WX_CC = `wx-config --cxx` + INCLUDE = -I../unrar -I../unzip + CFLAGS = -O2 -Wall -pipe + CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE) +@@ -21,11 +22,11 @@ all: $(OBJS) + @echo -e "};\n\n#endif" >> $@ + + %.o : %.cpp +- $(CC) $(CPPFLAGS) -c -o $*.o $< ++ $(WX_CC) $(CPPFLAGS) -c -o $*.o $< + + %.d : %.cpp + @set -e; rm -f $@; \ +- $(CC) -MM -MG $(CPPFLAGS) -MT '$*.o' $< > $@.$$$$; \ ++ $(WX_CC) -MM -MG $(CPPFLAGS) -MT '$*.o' $< > $@.$$$$; \ + sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \ + rm -f $@.$$$$ + +diff --git a/unzip/unzip.h b/unzip/unzip.h +index b247937..5bb6a69 100644 +--- a/unzip/unzip.h ++++ b/unzip/unzip.h +@@ -50,7 +50,7 @@ extern "C" { + #endif + + #ifndef _ZLIB_H +-#include "zlib.h" ++#include + #endif + + #ifndef _ZLIBIOAPI_H diff --git a/pkgs/applications/graphics/eyedropper/default.nix b/pkgs/applications/graphics/eyedropper/default.nix index fdb56440ed13..32098c977044 100644 --- a/pkgs/applications/graphics/eyedropper/default.nix +++ b/pkgs/applications/graphics/eyedropper/default.nix @@ -15,19 +15,19 @@ stdenv.mkDerivation rec { pname = "eyedropper"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "FineFindus"; repo = pname; rev = version; - hash = "sha256-dOB274OA7h1vwCuapzivHnMLLw/NTzsmOfFtHHaca1I="; + hash = "sha256-bOpwHaFOoUlh+yyC1go6BeFxfJhUmwZPi6kYAqCagEI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-ymRl/nIUuT1BXa1dF5CMemBI8aYrdqeoVtghm6NF8cs="; + hash = "sha256-TkdOq+icU2zNbXzN6nbkXjL1o/Lfumqr/5S0pQaxY5Q="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index e469562bff2b..d98a09439fe7 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.15.0"; + version = "1.15.2"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-exLLmrHHXAp/S7z4JwIr8umwxZkmV6/kp/4fd8ODh1I="; + sha256 = "sha256-ZbOh0BMvYnJQD0WjZcKKiG4ECn1Lbr9760Hn2ecdPH8="; }; - vendorSha256 = "sha256-A0Haf18ot3WckibSmZe5INjMr7zTrMB6xqqnqpUKV34="; + vendorSha256 = "sha256-RgxGPPNBYXe1/gFNKeM+huPCD6EGBPea5EtciSA9o58="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 8c87d0ed4c2e..6ff9b6bd26fd 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,26 +7,49 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.27"; + version = "3.32"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-kvKUgw6A4UHOuDmKuOv+XS/0XiOf2ENWxl2WmJ4cVTE="; + hash = "sha256-GMOLlkBfY3ShVojdRrmpMYgoea52kq4aXr/oZj5bJWo="; }; - vendorSha256 = "sha256-sgLHRDdi9gkcSzeBaDCxtbvWSzjTshb2WbmMyRepUKA="; + vendorHash = "sha256-cEzPKx54rssyAytYenIcud3K0f7xuO8WzE8wdMqZipE="; subPackages = [ "weed" ]; - passthru.tests.version = - testers.testVersion { package = seaweedfs; command = "weed version"; }; + ldflags = [ + "-w" + "-s" + "-X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=N/A" + ]; + + tags = [ + "elastic" + "gocdk" + "sqlite" + "ydb" + "tikv" + ]; + + preBuild = '' + export GODEBUG=http2client=0 + ''; + + # There are no tests. + doCheck = false; + + passthru.tests.version = testers.testVersion { + package = seaweedfs; + command = "weed version"; + }; meta = with lib; { description = "Simple and highly scalable distributed file system"; homepage = "https://github.com/chrislusf/seaweedfs"; - maintainers = with maintainers; [ cmacrae ]; + maintainers = with maintainers; [ azahi cmacrae ]; mainProgram = "weed"; license = licenses.asl20; }; diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix index fd9ef63dc73f..95206ee6a8c6 100644 --- a/pkgs/applications/office/libreoffice/wrapper.nix +++ b/pkgs/applications/office/libreoffice/wrapper.nix @@ -1,10 +1,11 @@ { lib, runCommand , libreoffice, dbus, bash, substituteAll +, coreutils, gnugrep , dolphinTemplates ? true }: runCommand libreoffice.name { inherit (libreoffice) jdk meta; - inherit dbus libreoffice bash; + inherit coreutils dbus gnugrep libreoffice bash; } ('' mkdir -p "$out/bin" substituteAll "${./wrapper.sh}" "$out/bin/soffice" diff --git a/pkgs/applications/office/libreoffice/wrapper.sh b/pkgs/applications/office/libreoffice/wrapper.sh index 9ab3a907a985..162bede3ec69 100644 --- a/pkgs/applications/office/libreoffice/wrapper.sh +++ b/pkgs/applications/office/libreoffice/wrapper.sh @@ -2,7 +2,7 @@ export JAVA_HOME="${JAVA_HOME:-@jdk@}" #export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}" -if uname | grep Linux > /dev/null && +if "@coreutils@"/bin/uname | "@gnugrep@"/bin/grep Linux > /dev/null && ! ( test -n "$DBUS_SESSION_BUS_ADDRESS" ); then dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus" if ! test -d "$dbus_tmp_dir" && test -d "/run"; then @@ -25,7 +25,7 @@ for PROFILE in $NIX_PROFILES; do fi done -"@libreoffice@/bin/$(basename "$0")" "$@" +"@libreoffice@/bin/$("@coreutils@"/bin/basename "$0")" "$@" code="$?" test -n "$dbus_socket_dir" && { rm -rf "$dbus_socket_dir"; kill $dbus_pid; } diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 0a98c1b7a03b..703416f074aa 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -3,7 +3,7 @@ }: let - python3Env = python3.withPackages(ps: with ps; [ numpy ]); + python3Env = python3.withPackages(ps: with ps; [ numpy setuptools ]); in stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]); - patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ]; + patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ./python-ldflags.patch ]; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; diff --git a/pkgs/applications/science/astronomy/gildas/python-ldflags.patch b/pkgs/applications/science/astronomy/gildas/python-ldflags.patch new file mode 100644 index 000000000000..3bbcb9f36e99 --- /dev/null +++ b/pkgs/applications/science/astronomy/gildas/python-ldflags.patch @@ -0,0 +1,13 @@ +diff -ruN gildas-src-oct22b/admin/python-config-ldflags.py gildas-src-oct22b.patched/admin/python-config-ldflags.py +--- gildas-src-oct22b/admin/python-config-ldflags.py 2022-10-03 14:16:33.000000000 +0200 ++++ gildas-src-oct22b.patched/admin/python-config-ldflags.py 2022-10-19 22:03:53.000000000 +0200 +@@ -32,7 +32,7 @@ + libs.insert(0, '-L' + getvar('LIBDIR')) + + # Framework (specific for Mac) +-if not getvar('PYTHONFRAMEWORK'): +- libs.extend(getvar('LINKFORSHARED').split()) ++#if not getvar('PYTHONFRAMEWORK'): ++# libs.extend(getvar('LINKFORSHARED').split()) + + print(' '.join(libs)) diff --git a/pkgs/applications/window-managers/fvwm/2.6.nix b/pkgs/applications/window-managers/fvwm/2.6.nix index 44dde60ac05d..e771a170c489 100644 --- a/pkgs/applications/window-managers/fvwm/2.6.nix +++ b/pkgs/applications/window-managers/fvwm/2.6.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "fvwm"; - version = "2.6.9"; + version = "2.7.0"; src = fetchFromGitHub { owner = "fvwmorg"; repo = pname; rev = version; - hash = "sha256-sBVOrrl2WrZ2wWN/r1kDUtR+tPwXgDoSJDaxGeFkXJI="; + hash = "sha256-KcuX8las1n8UUE/BOHj7WOeZjva5hxgpFHtATMUk3bg="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/arcan/cat9/default.nix b/pkgs/desktops/arcan/cat9/default.nix new file mode 100644 index 000000000000..909f4d57993b --- /dev/null +++ b/pkgs/desktops/arcan/cat9/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation (finalPackages: { + pname = "cat9"; + version = "unstable-2018-09-13"; + + src = fetchFromGitHub { + owner = "letoram"; + repo = finalPackages.pname; + rev = "754d9d2900d647a0fa264720528117471a32f295"; + hash = "sha256-UmbynVOJYvHz+deA99lj/BBFOauZzwSNs+qR28pASPY="; + }; + + dontConfigure = true; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p ${placeholder "out"}/share/arcan/appl/cat9 + cp -a ./* ${placeholder "out"}/share/arcan/appl/cat9 + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/letoram/cat9"; + description = "A User shell for LASH"; + license = licenses.bsd3; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/desktops/arcan/default.nix b/pkgs/desktops/arcan/default.nix index 3db4d4eb819c..76cc6a2a4a03 100644 --- a/pkgs/desktops/arcan/default.nix +++ b/pkgs/desktops/arcan/default.nix @@ -15,6 +15,12 @@ lib.makeScope pkgs.newScope (self: with self; { # Appls + cat9 = callPackage ./cat9 { }; + cat9-wrapped = callPackage ./wrapper.nix { + name = "cat9-wrapped"; + appls = [ cat9 ]; + }; + durden = callPackage ./durden { }; durden-wrapped = callPackage ./wrapper.nix { name = "durden-wrapped"; @@ -38,6 +44,6 @@ lib.makeScope pkgs.newScope (self: with self; { all-wrapped = callPackage ./wrapper.nix { name = "all-wrapped"; - appls = [ durden pipeworld ]; + appls = [ durden cat9 pipeworld ]; }; }) diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix index 111f1054f368..3c51fa9371d9 100644 --- a/pkgs/development/libraries/catch2/default.nix +++ b/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "2.13.9"; + version = "2.13.10"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="sha256-G6rMTHvrBJbUaTNkR738YClAn2v2xVBr+tXLjpNzVZg="; + sha256="sha256-XnT2ziES94Y4uzWmaxSw7nWegJFQjAqFUG8PkwK5nLU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix index c9793d5440b3..f0afda7a9001 100644 --- a/pkgs/development/libraries/shapelib/default.nix +++ b/pkgs/development/libraries/shapelib/default.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation rec { }) ]; + doCheck = true; + preCheck = '' + patchShebangs tests contrib/tests + ''; + meta = with lib; { description = "C Library for reading, writing and updating ESRI Shapefiles"; homepage = "http://shapelib.maptools.org/"; diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix index 4e07a2021e32..753a3e82c0de 100644 --- a/pkgs/development/ocaml-modules/react/default.nix +++ b/pkgs/development/ocaml-modules/react/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ocaml-react"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { url = "https://erratique.ch/software/react/releases/react-${version}.tbz"; - sha256 = "1aj8w79gdd9xnrbz7s5p8glcb4pmimi8jp9f439dqnf6ih3mqb3v"; + sha256 = "sha256-xK3TFdbx8VPRFe58qN1gwSZf9NQIwmYSX8tRJP0ij5k="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { homepage = "https://erratique.ch/software/react"; description = "Applicative events and signals for OCaml"; license = licenses.bsd3; - platforms = ocaml.meta.platforms or [ ]; + inherit (ocaml.meta) platforms; maintainers = with maintainers; [ maggesi vbmithr gal_bolle ]; }; } diff --git a/pkgs/development/python-modules/cdcs/default.nix b/pkgs/development/python-modules/cdcs/default.nix index 748d0ff623fd..2c608c06251e 100644 --- a/pkgs/development/python-modules/cdcs/default.nix +++ b/pkgs/development/python-modules/cdcs/default.nix @@ -1,16 +1,20 @@ { lib , buildPythonPackage , fetchFromGitHub +, ipython , numpy , pandas , pytestCheckHook , pythonOlder , requests +, responses +, setuptools +, tqdm }: buildPythonPackage rec { - version = "0.1.8"; pname = "cdcs"; + version = "0.1.9"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,18 +22,27 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "usnistgov"; repo = "pycdcs"; - rev = "v${version}"; - sha256 = "sha256-s+COE7hus1J5I8PTdagl7KEK5QFoidjQ3ee46kOWmkE="; + # https://github.com/usnistgov/pycdcs/issues/1 + rev = "0a770b752301c27e227ca40a4752f305b55dee20"; + sha256 = "sha256-AUrVEFea4VtBJXWWgECqdBFCqKuHWAlh07Dljp+HBa0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ + ipython numpy pandas requests + tqdm ]; - # Project has no tests - doCheck = false; + checkInputs = [ + pytestCheckHook + responses + ]; pythonImportsCheck = [ "cdcs" diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index a17c2c9c079a..8171688b0176 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.17.8"; + version = "0.18.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DFajAD5mnXLQmJGRv4j2mWhtIj77nZNSQhbesX4qMys="; + sha256 = "sha256-ymSnGgcy1sW7HlWsSbSRty+60MtChzpF56eH7wrdfh8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index b79673e2b240..7e5d62454c6b 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -71,6 +71,7 @@ buildPythonPackage rec { "test_truesendall_after_mocket_session" "test_real_request_session" "test_asyncio_record_replay" + "test_gethostbyname" ]; pythonImportsCheck = [ "mocket" ]; diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index 0ced7c057545..72892a109539 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , argon2-cffi @@ -25,12 +26,16 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.argon2 - ++ passthru.optional-dependencies.bcrypt - ++ passthru.optional-dependencies.totp; + ++ passthru.optional-dependencies.bcrypt + ++ passthru.optional-dependencies.totp; disabledTests = [ # timming sensitive "test_dummy_verify" + ] + # These tests fail because they don't expect support for algorithms provided through libxcrypt + ++ lib.optionals stdenv.isDarwin [ + "test_82_crypt_support" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 81766441aaa0..a76bb773a84a 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -106,8 +106,15 @@ buildPythonPackage rec { pytest-xdist ]; - preCheck = '' + preCheck = ('' export HOME=$TMPDIR + '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 + export no_proxy='*'; + ''); + + postCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + unset no_proxy ''; disabledTests = [ diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 4cf5bc4b93f6..147fb131b185 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.190.0"; + version = "0.190.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-/MxV1nbOwqW1SKaKhWFpdg6PuQflmqRgF76/JPuegRg="; + sha256 = "sha256-mDNzqNKXQ3H25y+T/E3yooPPhgA5Pz1q/Tm24l5bWK8="; }; makeFlags = [ "FLOW_RELEASE=1" ]; diff --git a/pkgs/development/tools/changie/default.nix b/pkgs/development/tools/changie/default.nix index e2a9bed25099..0f5fccd797a8 100644 --- a/pkgs/development/tools/changie/default.nix +++ b/pkgs/development/tools/changie/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "changie"; - version = "1.9.1"; + version = "1.10.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "miniscruff"; repo = pname; - sha256 = "sha256-3AGz84z0YmDiLxlbDO0f9ny75hyLB4fnYQSICElJVK4="; + sha256 = "sha256-8wcnbmS3T/rPKEN3zpo9ysaEIjgbPN50Jp9URpkRaUI="; }; - vendorSha256 = "sha256-9Cpyemq/f62rVMvGwOtgDGd9XllvICXL2dqNwUoFQmg="; + vendorSha256 = "sha256-Ddw4YnOFURZxwqRBX9e1YGMO9E3hUNAoLTVcSJuaCU0="; patches = [ ./skip-flaky-test.patch ]; diff --git a/pkgs/development/tools/cotton/default.nix b/pkgs/development/tools/cotton/default.nix new file mode 100644 index 000000000000..34cf19d40fdd --- /dev/null +++ b/pkgs/development/tools/cotton/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "cotton"; + version = "unstable-2022-10-04"; + + src = fetchFromGitHub { + owner = "danielhuang"; + repo = pname; + rev = "30f3aa7ec6792f3e2dbafc9f4b009b1a6eadc755"; + sha256 = "sha256-jq5aW6dViHTxh2btP5smtcyUSZ1EoMrQVN7K8zs1jJM="; + }; + + cargoSha256 = "sha256-qpV3UriOidIk/0di9d8RjXvjcjgD6dXqg7wLAywI66o="; + + meta = with lib; { + description = "A package manager for JavaScript projects"; + homepage = "https://github.com/danielhuang/cotton"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/development/tools/millet/default.nix b/pkgs/development/tools/millet/default.nix index aab15d2a9681..b7f9d0e50e50 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.4.2"; + version = "0.5.6"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WWZi943PyWnm5TrFIWk/Lg/uQPWdfMuTQTxgNM9lF5w="; + sha256 = "sha256-figP1PgM84jIbjuYzcklzYshedO5UXbxm9sbEXWkLzs="; }; - cargoSha256 = "sha256-bHGDbHaMdQG+T1kA/clxDmnJblRYn2X7uVVF+MpvEGE="; + cargoSha256 = "sha256-PF1NxUypOBevGwj5bFySQluhNh7PD1NFXfJvYuKHixQ="; postPatch = '' rm .cargo/config.toml diff --git a/pkgs/development/tools/wrangler_1/default.nix b/pkgs/development/tools/wrangler_1/default.nix index 66ad89100908..986be513ca76 100644 --- a/pkgs/development/tools/wrangler_1/default.nix +++ b/pkgs/development/tools/wrangler_1/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.19.12"; + version = "1.20.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "wrangler"; rev = "v${version}"; - sha256 = "sha256-HnenF3X/6tvzwlbuOiQAvB76GrdRsqETG+3fp1fx334="; + sha256 = "sha256-miXgzBaqCcFHRlot2uUKyH+GP2JTMOhFrReXZUl0ms0="; }; - cargoSha256 = "sha256-mJyuqVSiuBKI/x3P865W1/ei5Ya2mV5LVXzaL3peocE="; + cargoSha256 = "sha256-DJefvaUc1quh43q1eZ5B76V3TEv9vNsxuUKaABWiTCo="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 99dcd9909649..38864995297a 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.415"; + version = "0.0.417"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-pw8LDp4uuU0J1HFEBdntROcyJUR8mBId5Xwm/5w9F04="; + sha256 = "sha256-Bxe0YzSHF7ziCLiyxb1inWbwZAqRO6/qFxWsllbjXK4="; }; - vendorSha256 = "sha256-AlPdKUNscp71GttiLfPJf8rs/72Ff0CELDSSHcfY/4g="; + vendorSha256 = "sha256-a0ZnZlKB/Uotrm4npXB1dd1+oWHRhJVW7ofMSKlqcvM="; subPackages = [ "." ]; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 34d6a3874801..95ef57ece2d9 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -21,42 +21,42 @@ }, "5.10": { "patch": { - "extra": "-hardened2", - "name": "linux-hardened-5.10.147-hardened2.patch", - "sha256": "0j44mfyc66vq6hncc5w3mxxw8jcpa66w4w40d3wm7ka6yr6p34sh", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.147-hardened2/linux-hardened-5.10.147-hardened2.patch" + "extra": "-hardened1", + "name": "linux-hardened-5.10.148-hardened1.patch", + "sha256": "1r4s7qpwjhhbp1phkk2dd8rbm3x9l3i3g10jz865l1vp253pmb65", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.148-hardened1/linux-hardened-5.10.148-hardened1.patch" }, - "sha256": "16pdpjmvrdml7am7s2kydrif1l7f4aq0wh4ak0xh3dby16zkl9c5", - "version": "5.10.147" + "sha256": "0mp9qs8f50hxf72b6cgh8izkyjbhrrmij6slxja701i1w9mkylhj", + "version": "5.10.148" }, "5.15": { "patch": { - "extra": "-hardened3", - "name": "linux-hardened-5.15.73-hardened3.patch", - "sha256": "1p4cm1viyryf4npbfvg72a4kpqs22vqvfqj2hl6pq5wrpgg677g0", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.73-hardened3/linux-hardened-5.15.73-hardened3.patch" + "extra": "-hardened1", + "name": "linux-hardened-5.15.74-hardened1.patch", + "sha256": "0ygfz210zz0k5fza2530vwayjz3r32973lbhfsyyc0fq6vghqhn2", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.74-hardened1/linux-hardened-5.15.74-hardened1.patch" }, - "sha256": "0pbi640llcdbx57vwwzc5axa75w0y5rixa9r752h725f4naz08m8", - "version": "5.15.73" + "sha256": "0ra2ijpw7w07gm3kjwyszlwfq2rbnmq84z50qhv5r0svz2i3j59c", + "version": "5.15.74" }, "5.19": { "patch": { - "extra": "-hardened2", - "name": "linux-hardened-5.19.15-hardened2.patch", - "sha256": "12si2gy6maxbvf252ircp94ci0ihqlxv3l9sf4xwxrs66gn3z2fa", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.15-hardened2/linux-hardened-5.19.15-hardened2.patch" + "extra": "-hardened1", + "name": "linux-hardened-5.19.16-hardened1.patch", + "sha256": "1y9c26pyyvifkza7anl9gphnn3jpw7jwiqwjw6i748wwxynhx596", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.16-hardened1/linux-hardened-5.19.16-hardened1.patch" }, - "sha256": "06zband5q6m9imyvn4y4naafdakjcj00rg23227cagnv8wwf71j6", - "version": "5.19.15" + "sha256": "13g0c6ljxk3sd0ja39ndih5vrzp2ssj78qxaf8nswn8hgrkazsx1", + "version": "5.19.16" }, "5.4": { "patch": { - "extra": "-hardened2", - "name": "linux-hardened-5.4.217-hardened2.patch", - "sha256": "16hcwjll5dkfc8sb81w3dipqx9j1np91f5gad45b0xfcnqcn70ab", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.217-hardened2/linux-hardened-5.4.217-hardened2.patch" + "extra": "-hardened1", + "name": "linux-hardened-5.4.218-hardened1.patch", + "sha256": "1ylhkhkm4vamdap0kb6vnw9w0rjaacdfgly1yin75dxxymy0x026", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.218-hardened1/linux-hardened-5.4.218-hardened1.patch" }, - "sha256": "0qrfrk0g1dky5apg8gdxczj2ir0g0z41zmdmbwwcxkxjz76jdf1b", - "version": "5.4.217" + "sha256": "0f7lm5qq763zrnwwq9jmfpgvskhzi3gwy5rbq2q7gmiphl179p9x", + "version": "5.4.218" } } diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index be2e09bc6a3d..68515e2e84c3 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.148"; + version = "5.10.149"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0mp9qs8f50hxf72b6cgh8izkyjbhrrmij6slxja701i1w9mkylhj"; + sha256 = "1lv5q0m24ccbiqywy03s9s3wyxzm0v7f691rag89qfsn6z2k8q8g"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index a39e28bfc91f..57d4d41add94 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.218"; + version = "5.4.219"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0f7lm5qq763zrnwwq9jmfpgvskhzi3gwy5rbq2q7gmiphl179p9x"; + sha256 = "0qd2a0cx6bq11qq2513xmm5jxzfrq6axvsc0pjbvdpv9fa9av4sj"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-6.0.nix b/pkgs/os-specific/linux/kernel/linux-6.0.nix index 27f8166ecefc..574f04c386c4 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.0.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.0.2"; + version = "6.0.3"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "17awx4c5fz7f656ig5bydccci052jsai0lczrn2bdk5cihw2cg51"; + sha256 = "1krx3kp7ivgp91fkcvgvqsb698b3l0dk6zd6yf54sy8530j25mdh"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 370952054736..99980b46e08b 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.0.2"; #zen - suffix = "zen1"; #zen - sha256 = "1x80ah2cszj3fbxfpdnlr30r1fblgrhydslfh9vrk48l0z3z80a7"; #zen + version = "6.0.3"; #zen + suffix = "zen2"; #zen + sha256 = "1paywv7y4jizlq092irjcn9r62npzglrf5s008l6129b9q5ib0v8"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { version = "5.19.16"; #lqx - suffix = "lqx2"; #lqx - sha256 = "1n4hbkb1af9gzdvk7cp73i004j2slb0im9yk1b869h27pxs4il6s"; #lqx + suffix = "lqx4"; #lqx + sha256 = "0mzrgy2kq0i26vgcdfc7nz7m6rw17s0lr9idwy71iz1f8i1pz82w"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 98f1d5ec562a..1458a20f12f3 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -9,11 +9,11 @@ let python = python3.override { packageOverrides = self: super: { tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec { - version = "1.25.0a20"; + version = "1.26.0a5"; pname = "tulir-telethon"; src = super.fetchPypi { inherit pname version; - sha256 = "sha256-X9oo+YCNMqQrJvQa/PIi9dFgaeQxbrlnwUJnwjRb6Jc="; + sha256 = "sha256-s6pj9kHqcl6XU1KQ/aOw1XWQ3CyDotaDl0m7aj9SbW4="; }; doCheck = false; }); @@ -21,14 +21,14 @@ let }; in python.pkgs.buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.12.0"; + version = "0.12.1"; disabled = python.pythonOlder "3.8"; src = fetchFromGitHub { owner = "mautrix"; repo = "telegram"; rev = "v${version}"; - sha256 = "sha256-SUwiRrTY8NgOGQ643prsm3ZklOlwX/59m/u1aewFuik="; + sha256 = "sha256-ecNcoNz++HtuDZnDLsXfPL0MRF+XMQ1BU/NFkKPbD5U="; }; patches = [ ./0001-Re-add-entrypoint.patch ]; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index ff87083c49e1..8e772ca8893c 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2022-10-15T19-57-03Z"; + version = "2022-10-20T00-55-09Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-EqEvLhqgvX+2MO+9HQaEURHknWYBSqYtzuSfqa6pZ4I="; + sha256 = "sha256-O3+2FKAiprFucx05T9lYcA30yr9KSlDF9VEbAgH4B0E="; }; - vendorSha256 = "sha256-3XRdqk8SVW1TlOgm5E1b1p25UjrGK9mvAT8GFR5ZjGc="; + vendorSha256 = "sha256-dl+7K/Vd1ybCc1IHwITaHroeLymyk5kWqqIwmLgYYA8="; doCheck = false; diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/servers/nosql/ferretdb/default.nix index 01105ffd0b19..0769e70974de 100644 --- a/pkgs/servers/nosql/ferretdb/default.nix +++ b/pkgs/servers/nosql/ferretdb/default.nix @@ -5,20 +5,20 @@ buildGoModule rec { pname = "ferretdb"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; rev = "v${version}"; - sha256 = "sha256-WSdscZ1/Dix83RE95Iv61rdaSBWx1GMi6qOIPNus+ZI="; + sha256 = "sha256-GRxs+MTF+ZhZH2yGMY3+2ZCRmVZ7m8uYlqNXASEiS+8="; }; postPatch = '' echo ${version} > internal/util/version/gen/version.txt ''; - vendorSha256 = "sha256-fGmGE08w9w2QnBVdMZ2IKo8Zq3euJGCBVTTHNKYFY3U="; + vendorSha256 = "sha256-MSIU99IOpCU3g5GASCKc6mqghnkFXXpan9PyI6L5+dI="; CGO_ENABLED = 0; diff --git a/pkgs/tools/admin/infra/default.nix b/pkgs/tools/admin/infra/default.nix index bb6def108078..fa00ef9098ab 100644 --- a/pkgs/tools/admin/infra/default.nix +++ b/pkgs/tools/admin/infra/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "infra"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "infrahq"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4JygXCn+2FACflheiddLZhw53XANdvdzPeFw1YysmKI="; + sha256 = "sha256-luwswGFI+ygLWp8Yi0PuZpkjQiPiF7bCv0kc8DNYxkw="; }; - vendorSha256 = "sha256-Z+x1QStDfFkHoh2cWK2vk3whItpBVgqRdk3utp26BJc="; + vendorSha256 = "sha256-j+ZtBqAIeI25qRKu6RvW79Ug/lUGreC06qXL5dgchHc="; subPackages = [ "." ]; diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix index e11fad78d9f1..ebdedd5b4aa3 100644 --- a/pkgs/tools/filesystems/f3/default.nix +++ b/pkgs/tools/filesystems/f3/default.nix @@ -1,5 +1,9 @@ -{ stdenv, lib, fetchFromGitHub -, parted, systemd, argp-standalone +{ stdenv +, lib +, fetchFromGitHub +, parted +, systemd +, argp-standalone }: stdenv.mkDerivation rec { @@ -14,20 +18,18 @@ stdenv.mkDerivation rec { }; postPatch = '' - sed -i 's/-oroot -groot//' Makefile + sed -i 's/-oroot -groot//' Makefile - for f in f3write.h2w log-f3wr; do - substituteInPlace $f \ - --replace '$(dirname $0)' $out/bin - done + for f in f3write.h2w log-f3wr; do + substituteInPlace $f \ + --replace '$(dirname $0)' $out/bin + done ''; - buildInputs = lib.optional stdenv.isLinux [ systemd parted ] - ++ lib.optional stdenv.isDarwin [ argp-standalone ]; + buildInputs = lib.optionals stdenv.isLinux [ systemd parted ] + ++ lib.optionals stdenv.isDarwin [ argp-standalone ]; - enableParallelBuilding = true; - - buildFlags = [ + buildFlags = [ "all" # f3read, f3write ] ++ lib.optional stdenv.isLinux "extra"; # f3brew, f3fix, f3probe @@ -48,8 +50,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fight Flash Fraud"; - homepage = "http://oss.digirati.com.br/f3/"; + homepage = "https://fight-flash-fraud.readthedocs.io/en/stable/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ makefu ]; + maintainers = with maintainers; [ makefu evils ]; }; } diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index 32f311c6ee7c..dd0aafbae84d 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -1,16 +1,16 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, stdenv }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "infracost"; - version = "0.10.12"; + version = "0.10.13"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-sobIgUiFMLZ2/vkKO2DIQfEM92eRK1PV+oKaWfwk/nE="; + sha256 = "sha256-zxVFF+2KKBGtgnA3YNMZdhG3jDylgMjaiGUPbtg5Dss="; }; - vendorSha256 = "sha256-QowKhRakXkkmKDI0vbSjWdftz4nXnjKNpdD4gscR3dM="; + vendorSha256 = "sha256-3WUU9Yid9PxqzHg+QBVkqxNxnRKU0zzcBYcpSslFzyM="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; @@ -63,6 +63,5 @@ buildGoModule rec { ''; license = licenses.asl20; maintainers = with maintainers; [ davegallant jk ]; - broken = stdenv.isx86_64; # https://hydra.nixos.org/build/193087915 }; } diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index fcd1c25c3fd0..8635bdf4f673 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2022-10-12T18-12-50Z"; + version = "2022-10-20T23-26-33Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-kzIJL3cB/zifu5H1OT0/4luMNHa6XuHVdsUcAh2sY0c="; + sha256 = "sha256-XsZMnrZzsjS11rZkD7hiLqq20FOD/DnrYf+fLvvVqQw="; }; - vendorSha256 = "sha256-DA1EpLmr0/+QEDRHW8nzF1myuZd5IZ7WHG5rrFrb/kE="; + vendorSha256 = "sha256-vW/hGvzAtd/q9Fbjr19TvpSZzFVX9HSGGSPWErw+v0A="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index b6e3056e0232..63df6a144bc1 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "thc-hydra"; - version = "9.3"; + version = "9.4"; src = fetchFromGitHub { owner = "vanhauser-thc"; repo = "thc-hydra"; rev = "v${version}"; - sha256 = "sha256-SzbaU52IXw5+ztN/GKD6Ki6/cx2icoZEzLHBu/J8sk0="; + sha256 = "sha256-+UkMJmIUIt/yTGY07Q4nu1zbWQq5chTvMNQSh5U/fTU="; }; postPatch = let @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { license = licenses.agpl3Plus; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; - badPlatforms = platforms.darwin; # fails to build since v9.3 + badPlatforms = platforms.darwin; # fails to build since v9.4 }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 159e33aac906..59b9934a95e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13547,6 +13547,8 @@ with pkgs; copper = callPackage ../development/compilers/copper {}; + cotton = callPackage ../development/tools/cotton { }; + inherit (callPackages ../development/compilers/crystal { llvmPackages = if stdenv.system == "aarch64-darwin" then llvmPackages_11 else llvmPackages_10; }) @@ -15056,7 +15058,6 @@ with pkgs; }; rust-script = callPackage ../development/tools/rust/rust-script { }; rustup = callPackage ../development/tools/rust/rustup { - openssl = openssl_1_1; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; rustup-toolchain-install-master = callPackage ../development/tools/rust/rustup-toolchain-install-master { @@ -27599,7 +27600,9 @@ with pkgs; convos = callPackage ../applications/networking/irc/convos { }; - comical = callPackage ../applications/graphics/comical { }; + comical = callPackage ../applications/graphics/comical { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; containerd = callPackage ../applications/virtualization/containerd { };