Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge staging-next into staging

authored by github-actions[bot] and committed by GitHub 73ac0953 c06baacc

+334 -174
+8
nixos/modules/services/misc/ollama.nix
··· 9 9 enable = lib.mkEnableOption ( 10 10 lib.mdDoc "Server for local large language models" 11 11 ); 12 + listenAddress = lib.mkOption { 13 + type = lib.types.str; 14 + default = "127.0.0.1:11434"; 15 + description = lib.mdDoc '' 16 + Specifies the bind address on which the ollama server HTTP interface listens. 17 + ''; 18 + }; 12 19 package = lib.mkPackageOption pkgs "ollama" { }; 13 20 }; 14 21 }; ··· 23 30 environment = { 24 31 HOME = "%S/ollama"; 25 32 OLLAMA_MODELS = "%S/ollama/models"; 33 + OLLAMA_HOST = cfg.listenAddress; 26 34 }; 27 35 serviceConfig = { 28 36 ExecStart = "${lib.getExe cfg.package} serve";
+27 -7
nixos/modules/services/misc/taskserver/helper-tool.py
··· 61 61 os.setuid(uid) 62 62 63 63 64 + def run_as_taskd_group(): 65 + gid = grp.getgrnam(TASKD_GROUP).gr_gid 66 + os.setgid(gid) 67 + 64 68 def taskd_cmd(cmd, *args, **kwargs): 65 69 """ 66 70 Invoke taskd with the specified command with the privileges of the 'taskd' ··· 90 94 """ 91 95 return subprocess.check_output( 92 96 [CERTTOOL_COMMAND] + list(args), 93 - preexec_fn=lambda: os.umask(0o077), 97 + preexec_fn=run_as_taskd_group, 94 98 stderr=subprocess.STDOUT, 95 99 **kwargs 96 100 ) ··· 156 160 sys.stderr.write(msg.format(user)) 157 161 return 158 162 159 - basedir = os.path.join(TASKD_DATA_DIR, "keys", org, user) 160 - if os.path.exists(basedir): 163 + keysdir = os.path.join(TASKD_DATA_DIR, "keys" ) 164 + orgdir = os.path.join(keysdir , org ) 165 + userdir = os.path.join(orgdir , user ) 166 + if os.path.exists(userdir): 161 167 raise OSError("Keyfile directory for {} already exists.".format(user)) 162 168 163 - privkey = os.path.join(basedir, "private.key") 164 - pubcert = os.path.join(basedir, "public.cert") 169 + privkey = os.path.join(userdir, "private.key") 170 + pubcert = os.path.join(userdir, "public.cert") 165 171 166 172 try: 167 - os.makedirs(basedir, mode=0o700) 173 + # We change the permissions and the owner ship of the base directories 174 + # so that cfg.group and cfg.user could read the directories' contents. 175 + # See also: https://bugs.python.org/issue42367 176 + for bd in [keysdir, orgdir, userdir]: 177 + # Allow cfg.group, but not others to read the contents of this group 178 + os.makedirs(bd, exist_ok=True) 179 + # not using mode= argument to makedirs intentionally - forcing the 180 + # permissions we want 181 + os.chmod(bd, mode=0o750) 182 + os.chown( 183 + bd, 184 + uid=pwd.getpwnam(TASKD_USER).pw_uid, 185 + gid=grp.getgrnam(TASKD_GROUP).gr_gid, 186 + ) 168 187 169 188 certtool_cmd("-p", "--bits", CERT_BITS, "--outfile", privkey) 189 + os.chmod(privkey, 0o640) 170 190 171 191 template_data = [ 172 192 "organization = {0}".format(org), ··· 187 207 "--outfile", pubcert 188 208 ) 189 209 except: 190 - rmtree(basedir) 210 + rmtree(userdir) 191 211 raise 192 212 193 213
+2 -2
pkgs/applications/networking/instant-messengers/baresip/default.nix
··· 27 27 , dbusSupport ? true 28 28 }: 29 29 stdenv.mkDerivation rec { 30 - version = "3.8.0"; 30 + version = "3.8.1"; 31 31 pname = "baresip"; 32 32 src = fetchFromGitHub { 33 33 owner = "baresip"; 34 34 repo = "baresip"; 35 35 rev = "v${version}"; 36 - hash = "sha256-7QqaKK8zalyopn9+MkKmdt9XaCkDFBNiXwVd2iXmqMA="; 36 + hash = "sha256-39HRvRTyA0V8NKFUUpj7UGc01KVXULTE3HUd9Kh06bw="; 37 37 }; 38 38 prePatch = lib.optionalString (!dbusSupport) '' 39 39 substituteInPlace cmake/modules.cmake --replace 'list(APPEND MODULES ctrl_dbus)' ""
+2 -2
pkgs/applications/networking/irc/weechat/default.nix
··· 36 36 in 37 37 assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; 38 38 stdenv.mkDerivation rec { 39 - version = "4.1.2"; 39 + version = "4.2.0"; 40 40 pname = "weechat"; 41 41 42 42 hardeningEnable = [ "pie" ]; 43 43 44 44 src = fetchurl { 45 45 url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; 46 - hash = "sha256-mpuRD752i7nefHrJRPXbjyM4M/NFsuUF4W7G7zXv+7U="; 46 + hash = "sha256-Mvam8hP7Y025MeKrjwGtuam1Dnf6ocUsoRbvoyBXWko="; 47 47 }; 48 48 49 49 # Why is this needed? https://github.com/weechat/weechat/issues/2031
+3 -3
pkgs/applications/office/qownnotes/default.nix
··· 19 19 let 20 20 pname = "qownnotes"; 21 21 appname = "QOwnNotes"; 22 - version = "24.1.2"; 22 + version = "24.1.4"; 23 23 in 24 24 stdenv.mkDerivation { 25 - inherit pname appname version; 25 + inherit pname version; 26 26 27 27 src = fetchurl { 28 28 url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; 29 - hash = "sha256-UlHLGO5Rictj0/eZKxyFKxa/2XasQOAixnejOc+dH0M="; 29 + hash = "sha256-RWAg89rbmoOSzOu9YjAkDluyPiYjT6f8gmri5AAHyww="; 30 30 }; 31 31 32 32 nativeBuildInputs = [
+3 -3
pkgs/by-name/te/terraform-plugin-docs/package.nix
··· 10 10 11 11 buildGoModule rec { 12 12 pname = "terraform-plugin-docs"; 13 - version = "0.16.0"; 13 + version = "0.17.0"; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "hashicorp"; 17 17 repo = "terraform-plugin-docs"; 18 18 rev = "refs/tags/v${version}"; 19 - sha256 = "sha256-5vbi69GMgkzvN3aEQbNTbk99rg+kfvAvUrdDsuyIm9s="; 19 + sha256 = "sha256-ID+4Pz6SUPzZTZYX6IHn/U02Ffw95he/gogV0mNA2OA="; 20 20 }; 21 21 22 - vendorHash = "sha256-AjW6BokLVDkIWXToJ7wNq/g19xKTAfpQ/gVlKCV5qw0="; 22 + vendorHash = "sha256-HseQBCvflmnlKX4PygWejPbyXRJmNUyl2K2//b4/tik="; 23 23 24 24 nativeBuildInputs = [ makeWrapper ]; 25 25
+2 -2
pkgs/development/libraries/allegro/5.nix
··· 40 40 41 41 stdenv.mkDerivation rec { 42 42 pname = "allegro"; 43 - version = "5.2.9.0"; 43 + version = "5.2.9.1"; 44 44 45 45 src = fetchFromGitHub { 46 46 owner = "liballeg"; 47 47 repo = "allegro5"; 48 48 rev = version; 49 - sha256 = "sha256-lGaHhFlc9zcalRFx0Xcyd0pZdC9lln0ez5hdfRz6Kt8="; 49 + sha256 = "sha256-n2OCmZmAqeXjtnCTqJgQ5q4j8/lnPfH+5tpWKIFKle0="; 50 50 }; 51 51 52 52 nativeBuildInputs = [
+2 -11
pkgs/development/libraries/libnbd/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchurl 4 - , fetchpatch 5 4 , bash-completion 6 5 , pkg-config 7 6 , perl ··· 13 12 14 13 stdenv.mkDerivation rec { 15 14 pname = "libnbd"; 16 - version = "1.18.1"; 15 + version = "1.18.2"; 17 16 18 17 src = fetchurl { 19 18 url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz"; 20 - hash = "sha256-UNHRphDw1ycRnp0KClzHlSuLIxs5Mc4gcjB+EF/smbY="; 19 + hash = "sha256-OYtNHAIGgwJuapoJNEMVkurUK9bQ7KO+V223bGC0TFI="; 21 20 }; 22 - 23 - patches = [ 24 - (fetchpatch { 25 - name = "CVE-2023-5871.patch"; 26 - url = "https://gitlab.com/nbdkit/libnbd/-/commit/4451e5b61ca07771ceef3e012223779e7a0c7701.patch"; 27 - hash = "sha256-zmg/kxSJtjp2w9917Sp33ezt7Ccj/inngzCUVesF1Tc="; 28 - }) 29 - ]; 30 21 31 22 nativeBuildInputs = [ 32 23 bash-completion
+1 -1
pkgs/development/libraries/qt-6/default.nix
··· 164 164 qtwayland = callPackage ./modules/qtwayland.nix { }; 165 165 qtwebchannel = callPackage ./modules/qtwebchannel.nix { }; 166 166 qtwebengine = callPackage ./modules/qtwebengine.nix { 167 - inherit (darwin) bootstrap_cmds cctools xnu; 167 + inherit (darwin) autoSignDarwinBinariesHook bootstrap_cmds cctools xnu; 168 168 inherit (darwin.apple_sdk_11_0) libpm libunwind; 169 169 inherit (darwin.apple_sdk_11_0.libs) sandbox; 170 170 inherit (darwin.apple_sdk_11_0.frameworks)
+10 -4
pkgs/development/libraries/qt-6/modules/qtwebengine.nix
··· 60 60 , mesa 61 61 , enableProprietaryCodecs ? true 62 62 # darwin 63 + , autoSignDarwinBinariesHook 63 64 , bootstrap_cmds 64 65 , cctools 65 66 , xcbuild ··· 105 106 gn 106 107 nodejs 107 108 ] ++ lib.optionals stdenv.isDarwin [ 109 + autoSignDarwinBinariesHook 108 110 bootstrap_cmds 109 111 cctools 110 112 xcbuild ··· 185 187 "-DQT_FEATURE_pdf_xfa_gif=ON" 186 188 "-DQT_FEATURE_pdf_xfa_png=ON" 187 189 "-DQT_FEATURE_pdf_xfa_tiff=ON" 188 - "-DQT_FEATURE_webengine_system_icu=ON" 189 190 "-DQT_FEATURE_webengine_system_libevent=ON" 190 - "-DQT_FEATURE_webengine_system_libxml=ON" 191 191 "-DQT_FEATURE_webengine_system_ffmpeg=ON" 192 192 # android only. https://bugreports.qt.io/browse/QTBUG-100293 193 193 # "-DQT_FEATURE_webengine_native_spellchecker=ON" 194 194 "-DQT_FEATURE_webengine_sanitizer=ON" 195 195 "-DQT_FEATURE_webengine_kerberos=ON" 196 196 ] ++ lib.optionals stdenv.isLinux [ 197 + "-DQT_FEATURE_webengine_system_libxml=ON" 197 198 "-DQT_FEATURE_webengine_webrtc_pipewire=ON" 199 + 200 + # Appears not to work on some platforms 201 + # https://github.com/Homebrew/homebrew-core/issues/104008 202 + "-DQT_FEATURE_webengine_system_icu=ON" 198 203 ] ++ lib.optionals enableProprietaryCodecs [ 199 204 "-DQT_FEATURE_webengine_proprietary_codecs=ON" 200 205 ] ++ lib.optionals stdenv.isDarwin [ ··· 222 227 223 228 # Text rendering 224 229 harfbuzz 225 - icu 226 230 227 231 openssl 228 232 glib 229 - libxml2 230 233 libxslt 231 234 lcms2 232 235 ··· 240 243 nss 241 244 protobuf 242 245 jsoncpp 246 + 247 + icu 248 + libxml2 243 249 244 250 # Audio formats 245 251 alsa-lib
+11 -4
pkgs/development/libraries/qt-6/patches/qtwebengine-libxml-2.12.patch
··· 1 1 --- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h 2 2 +++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h 3 - @@ -77,7 +77,7 @@ class XSLTProcessor final : public ScriptWrappable { 3 + @@ -77,7 +77,12 @@ class XSLTProcessor final : public ScriptWrappable { 4 4 5 5 void reset(); 6 6 7 - - static void ParseErrorFunc(void* user_data, xmlError*); 7 + +#if LIBXML_VERSION >= 21200 8 8 + static void ParseErrorFunc(void* user_data, const xmlError*); 9 + +#else 10 + static void ParseErrorFunc(void* user_data, xmlError*); 11 + +#endif 12 + + 9 13 static void GenericErrorFunc(void* user_data, const char* msg, ...); 10 14 11 15 // Only for libXSLT callbacks 12 16 --- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc 13 17 +++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc 14 - @@ -66,7 +66,7 @@ void XSLTProcessor::GenericErrorFunc(void*, const char*, ...) { 18 + @@ -66,7 +66,11 @@ void XSLTProcessor::GenericErrorFunc(void*, const char*, ...) { 15 19 // It would be nice to do something with this error message. 16 20 } 17 21 18 - -void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) { 22 + +#if LIBXML_VERSION >= 21200 19 23 +void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) { 24 + +#else 25 + void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) { 26 + +#endif 20 27 FrameConsole* console = static_cast<FrameConsole*>(user_data); 21 28 if (!console) 22 29 return;
+8 -2
pkgs/development/mobile/genymotion/default.nix
··· 1 1 { stdenv, lib, fetchurl, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon 2 2 , xdg-utils, libXrender, fontconfig, freetype, systemd, libpulseaudio 3 + , cairo, gdk-pixbuf, gtk3, pixman 3 4 # For glewinfo 4 5 , libXmu, libXi, libXext }: 5 6 ··· 19 20 freetype 20 21 systemd 21 22 libpulseaudio 23 + cairo 24 + gdk-pixbuf 25 + gtk3 26 + pixman 22 27 ]; 23 28 libPath = lib.makeLibraryPath packages; 24 29 in ··· 31 36 sha256 = "sha256-CS1A9udt47bhgnYJqqkCG3z4XaPVHmz417VTsY2ccOA="; 32 37 }; 33 38 34 - nativeBuildInputs = [ makeWrapper ]; 35 - buildInputs = [ which xdg-utils ]; 39 + nativeBuildInputs = [ makeWrapper which xdg-utils ]; 36 40 37 41 unpackPhase = '' 38 42 mkdir -p phony-home $out/share/applications ··· 73 77 74 78 patchExecutable genymotion 75 79 patchExecutable player 80 + patchExecutable qemu/x86_64/bin/qemu-img 81 + patchExecutable qemu/x86_64/bin/qemu-system-x86_64 76 82 77 83 patchTool adb 78 84 patchTool aapt
+2 -2
pkgs/development/php-packages/php-cs-fixer/default.nix
··· 2 2 3 3 let 4 4 pname = "php-cs-fixer"; 5 - version = "3.45.0"; 5 + version = "3.48.0"; 6 6 in 7 7 mkDerivation { 8 8 inherit pname version; 9 9 10 10 src = fetchurl { 11 11 url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; 12 - sha256 = "sha256-0i5ES1BfekNAOJuGQ4q9lqle/RS3YxgLt+CJa/Ow5/k="; 12 + sha256 = "sha256-JPFZ297l83PqJv+yyzTN6DIKsk82MJuo9IEdMPPAPGM="; 13 13 }; 14 14 15 15 dontUnpack = true;
+2 -2
pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix
··· 7 7 8 8 buildPythonPackage rec { 9 9 pname = "aliyun-python-sdk-iot"; 10 - version = "8.57.0"; 10 + version = "8.58.0"; 11 11 format = "setuptools"; 12 12 13 13 disabled = pythonOlder "3.7"; 14 14 15 15 src = fetchPypi { 16 16 inherit pname version; 17 - hash = "sha256-Ea0IUn2mlu0c7QYJZkUrBUrtjUuTHoTeuvZHw/il+4A="; 17 + hash = "sha256-Aafqju0EcaXv9RYkNSlcc1JnffluXXSl3KR1OcIX+OI="; 18 18 }; 19 19 20 20 propagatedBuildInputs = [
+11 -4
pkgs/development/python-modules/demetriek/default.nix
··· 1 1 { lib 2 2 , aiohttp 3 + , aresponses 3 4 , awesomeversion 4 5 , backoff 5 6 , buildPythonPackage 6 - , pydantic 7 7 , fetchFromGitHub 8 8 , fetchpatch 9 9 , poetry-core 10 - , yarl 11 - , aresponses 10 + , pydantic 12 11 , pytest-asyncio 13 12 , pytestCheckHook 14 13 , pythonOlder 14 + , pythonRelaxDepsHook 15 + , yarl 15 16 }: 16 17 17 18 buildPythonPackage rec { 18 19 pname = "demetriek"; 19 20 version = "0.4.0"; 20 - format = "pyproject"; 21 + pyproject = true; 21 22 22 23 disabled = pythonOlder "3.9"; 23 24 ··· 45 46 --replace "--cov" "" 46 47 ''; 47 48 49 + pythonRelaxDeps = [ 50 + "pydantic" 51 + ]; 52 + 48 53 nativeBuildInputs = [ 49 54 poetry-core 55 + pythonRelaxDepsHook 50 56 ]; 51 57 52 58 propagatedBuildInputs = [ ··· 72 78 meta = with lib; { 73 79 description = "Python client for LaMetric TIME devices"; 74 80 homepage = "https://github.com/frenck/python-demetriek"; 81 + changelog = "https://github.com/frenck/python-demetriek/releases/tag/v${version}"; 75 82 license = licenses.mit; 76 83 maintainers = with maintainers; [ fab ]; 77 84 };
+22 -14
pkgs/development/python-modules/extruct/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , fetchFromGitHub 4 - , pythonRelaxDepsHook 5 4 , html-text 6 5 , jstyleson 7 6 , lxml 8 7 , mf2py 8 + , mock 9 9 , pyrdfa3 10 + , pytestCheckHook 11 + , pythonOlder 12 + , pythonRelaxDepsHook 10 13 , rdflib 14 + , setuptools 11 15 , six 12 16 , w3lib 13 - , pytestCheckHook 14 - , mock 15 17 }: 16 18 17 19 buildPythonPackage rec { 18 20 pname = "extruct"; 19 - version = "0.13.0"; 20 - format = "setuptools"; 21 + version = "0.16.0"; 22 + pyproject = true; 23 + 24 + disabled = pythonOlder "3.8"; 21 25 22 26 src = fetchFromGitHub { 23 27 owner = "scrapinghub"; 24 28 repo = "extruct"; 25 - rev = "v${version}"; 26 - hash = "sha256-hf6b/tZLggHzgFmZ6aldZIBd17Ni7vCTIIzhNlyjvxw="; 29 + rev = "refs/tags/v${version}"; 30 + hash = "sha256-6lAb17EoR0FKyIOb9hk1jcpmPtZ7vClfuCrDZ83XBeg="; 27 31 }; 28 32 29 33 nativeBuildInputs = [ 30 - pythonRelaxDepsHook 31 - ]; 32 - 33 - # rdflib-jsonld functionality is part of rdblib from version 6 onwards 34 - pythonRemoveDeps = [ 35 - "rdflib-jsonld" 34 + setuptools 36 35 ]; 37 36 38 37 propagatedBuildInputs = [ ··· 51 50 pytestCheckHook 52 51 ]; 53 52 54 - pythonImportsCheck = [ "extruct" ]; 53 + pythonImportsCheck = [ 54 + "extruct" 55 + ]; 56 + 57 + disabledTests = [ 58 + # AssertionError: Lists differ 59 + "test_microformat" 60 + "test_umicroformat" 61 + ]; 55 62 56 63 meta = with lib; { 57 64 description = "Extract embedded metadata from HTML markup"; 58 65 homepage = "https://github.com/scrapinghub/extruct"; 66 + changelog = "https://github.com/scrapinghub/extruct/blob/v${version}/HISTORY.rst"; 59 67 license = licenses.bsd3; 60 68 maintainers = with maintainers; [ ambroisie ]; 61 69 };
+3 -3
pkgs/development/python-modules/flet-core/default.nix
··· 12 12 13 13 buildPythonPackage rec { 14 14 pname = "flet-core"; 15 - version = "0.18.0"; 16 - format = "pyproject"; 15 + version = "0.19.0"; 16 + pyproject = true; 17 17 18 18 src = fetchPypi { 19 19 pname = "flet_core"; 20 20 inherit version; 21 - hash = "sha256-PbAzbDK9DkQBdrym9H3uBvPeeK8Qocq+t8veF+7izOQ="; 21 + hash = "sha256-JRV56SwIhrsJHX/fzQKI0R2o/I+H5xXCXVu7uBiyIP8="; 22 22 }; 23 23 24 24 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/flet-runtime/default.nix
··· 10 10 11 11 buildPythonPackage rec { 12 12 pname = "flet-runtime"; 13 - version = "0.18.0"; 13 + version = "0.19.0"; 14 14 pyproject = true; 15 15 16 16 src = fetchPypi { 17 17 pname = "flet_runtime"; 18 18 inherit version; 19 - hash = "sha256-VfPTfCJXpRZsKM4ToFyl7zxbk58HT6eOYthfzAM4f88="; 19 + hash = "sha256-no2oDGZG1svrOZLNAao279qeHwyk5SGibDG4UqpriiU="; 20 20 }; 21 21 22 22 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/flet/default.nix
··· 22 22 23 23 buildPythonPackage rec { 24 24 pname = "flet"; 25 - version = "0.18.0"; 25 + version = "0.19.0"; 26 26 pyproject = true; 27 27 28 28 src = fetchPypi { 29 29 inherit pname version; 30 - hash = "sha256-ix9O4wBq7/gwkV+23B+dnxTYv/VL6w8RmnvbYWcWqmc="; 30 + hash = "sha256-YpML/NIUiL1WYg6zR6l60nJ6KRBfjMOjRbPDdjhR3/Q="; 31 31 }; 32 32 33 33 nativeBuildInputs = [
+19 -8
pkgs/development/python-modules/mf2py/default.nix
··· 1 1 { lib 2 + , beautifulsoup4 2 3 , buildPythonPackage 3 4 , fetchFromGitHub 4 - , beautifulsoup4 5 5 , html5lib 6 - , requests 7 6 , lxml 8 7 , mock 9 - , nose 8 + , poetry-core 9 + , pytestCheckHook 10 + , pythonOlder 11 + , requests 10 12 }: 11 13 12 14 buildPythonPackage rec { 13 15 pname = "mf2py"; 14 - version = "1.1.3"; 15 - format = "setuptools"; 16 + version = "2.0.1"; 17 + pyproject = true; 18 + 19 + disabled = pythonOlder "3.8"; 16 20 17 21 src = fetchFromGitHub { 18 22 owner = "microformats"; 19 23 repo = "mf2py"; 20 24 rev = "refs/tags/v${version}"; 21 - hash = "sha256-Ya8DND1Dqbygbf1hjIGMlPwyc/MYIWIj+KnWB6Bqu1k="; 25 + hash = "sha256-mhJ+s1rtXEJ6DqVmiyWNEK+3cdDLpR63Q4QGmD9wVio="; 22 26 }; 27 + 28 + nativeBuildInputs = [ 29 + poetry-core 30 + ]; 23 31 24 32 propagatedBuildInputs = [ 25 33 beautifulsoup4 ··· 30 38 nativeCheckInputs = [ 31 39 lxml 32 40 mock 33 - nose 41 + pytestCheckHook 34 42 ]; 35 43 36 - pythonImportsCheck = [ "mf2py" ]; 44 + pythonImportsCheck = [ 45 + "mf2py" 46 + ]; 37 47 38 48 meta = with lib; { 39 49 description = "Microformats2 parser written in Python"; 40 50 homepage = "https://microformats.org/wiki/mf2py"; 51 + changelog = "https://github.com/microformats/mf2py/blob/v${version}/CHANGELOG.md"; 41 52 license = licenses.mit; 42 53 maintainers = with maintainers; [ ambroisie ]; 43 54 };
+5 -1
pkgs/development/python-modules/mypy-boto3-builder/default.nix
··· 9 9 , md-toc 10 10 , mdformat 11 11 , newversion 12 + , pip 12 13 , poetry-core 13 14 , pyparsing 14 15 , pytestCheckHook 15 16 , pythonOlder 16 17 , setuptools 18 + , typing-extensions 17 19 }: 18 20 19 21 buildPythonPackage rec { 20 22 pname = "mypy-boto3-builder"; 21 23 version = "7.21.0"; 22 - format = "pyproject"; 24 + pyproject = true; 23 25 24 26 disabled = pythonOlder "3.10"; 25 27 ··· 43 45 md-toc 44 46 mdformat 45 47 newversion 48 + pip 46 49 pyparsing 47 50 setuptools 51 + typing-extensions 48 52 ]; 49 53 50 54 nativeCheckInputs = [
+2 -2
pkgs/development/python-modules/plugwise/default.nix
··· 21 21 22 22 buildPythonPackage rec { 23 23 pname = "plugwise"; 24 - version = "0.36.2"; 24 + version = "0.36.3"; 25 25 pyproject = true; 26 26 27 27 disabled = pythonOlder "3.11"; ··· 30 30 owner = "plugwise"; 31 31 repo = "python-plugwise"; 32 32 rev = "refs/tags/v${version}"; 33 - hash = "sha256-3TTrfvhTQIhig0QUP56+IkciiboXZD4025FvotAZgzo="; 33 + hash = "sha256-LhwrrGle9B2zGhlgPLH+uB6ZiWbNPm1GbPXuUh8RLyo="; 34 34 }; 35 35 36 36 postPatch = ''
+21 -7
pkgs/development/python-modules/pylint-django/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , django 4 + , django-tables2 5 + , django-tastypie 4 6 , factory-boy 5 7 , fetchFromGitHub 8 + , poetry-core 6 9 , pylint-plugin-utils 7 10 , pytestCheckHook 8 11 , pythonOlder ··· 11 14 buildPythonPackage rec { 12 15 pname = "pylint-django"; 13 16 version = "2.5.4"; 14 - format = "setuptools"; 17 + pyproject = true; 15 18 16 19 disabled = pythonOlder "3.7"; 17 20 18 21 src = fetchFromGitHub { 19 22 owner = "PyCQA"; 20 - repo = pname; 23 + repo = "pylint-django"; 21 24 rev = "refs/tags/v${version}"; 22 25 hash = "sha256-MNgu3LvFoohXA+JzUiHIaYFw0ssEe+H5T8Ea56LcGuI="; 23 26 }; 24 27 28 + nativeBuildInputs = [ 29 + poetry-core 30 + ]; 31 + 25 32 propagatedBuildInputs = [ 26 - django 27 33 pylint-plugin-utils 28 34 ]; 29 35 36 + passthru.optional-dependencies = { 37 + with_django = [ 38 + django 39 + ]; 40 + }; 41 + 30 42 nativeCheckInputs = [ 43 + django-tables2 44 + django-tastypie 31 45 factory-boy 32 46 pytestCheckHook 33 47 ]; 34 48 35 49 disabledTests = [ 36 - # AttributeError, AssertionError 37 - "external_django_tables2_noerror_meta_class" 38 - "external_tastypie_noerror_foreign_key" 50 + # AttributeError: module 'pylint.interfaces' has no attribute 'IAstroidChecker' 51 + "test_migrations_plugin" 39 52 "func_noerror_model_unicode_lambda" 40 - "0001_noerror_initial" 53 + "test_linter_should_be_pickleable_with_pylint_django_plugin_installed" 41 54 ]; 42 55 43 56 pythonImportsCheck = [ ··· 47 60 meta = with lib; { 48 61 description = "Pylint plugin to analyze Django applications"; 49 62 homepage = "https://github.com/PyCQA/pylint-django"; 63 + changelog = "https://github.com/pylint-dev/pylint-django/releases/tag/v${version}"; 50 64 license = licenses.gpl2Plus; 51 65 maintainers = with maintainers; [ kamadorueda ]; 52 66 };
+10 -5
pkgs/development/python-modules/pylint-plugin-utils/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , fetchFromGitHub 4 + , poetry-core 4 5 , pylint 5 6 , pytestCheckHook 6 7 , pythonOlder ··· 9 10 10 11 buildPythonPackage rec { 11 12 pname = "pylint-plugin-utils"; 12 - version = "0.7"; 13 - format = "setuptools"; 13 + version = "0.8.2"; 14 + pyproject = true; 14 15 15 16 disabled = pythonOlder "3.7"; 16 17 17 18 src = fetchFromGitHub { 18 19 owner = "PyCQA"; 19 - repo = pname; 20 - rev = version; 21 - hash = "sha256-uDsSSUWdlzuQz6umoYLbIotOYNEnLQu041ZZVMRd2ww="; 20 + repo = "pylint-plugin-utils"; 21 + rev = "refs/tags/${version}"; 22 + hash = "sha256-xuPU1txfB+6+zJjtlfvNA950S5n7/PWPPFn1F3RtvCc="; 22 23 }; 24 + 25 + nativeBuildInputs = [ 26 + poetry-core 27 + ]; 23 28 24 29 propagatedBuildInputs = [ 25 30 pylint
+20 -10
pkgs/development/python-modules/pyrdfa3/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 - , fetchPypi 4 3 , fetchpatch 5 - , isPy27 6 - , rdflib 4 + , fetchPypi 7 5 , html5lib 6 + , pythonOlder 7 + , rdflib 8 + , setuptools 8 9 }: 9 10 10 11 buildPythonPackage rec { 11 12 pname = "pyrdfa3"; 12 13 version = "3.5.3"; 13 - format = "setuptools"; 14 - disabled = isPy27; 14 + pyproject = true; 15 + 16 + disabled = pythonOlder "3.7"; 15 17 16 18 src = fetchPypi { 17 19 inherit version; ··· 21 23 22 24 patches = [ 23 25 (fetchpatch { 26 + # https://github.com/RDFLib/pyrdfa3/pull/40 24 27 name = "CVE-2022-4396.patch"; 25 28 url = "https://github.com/RDFLib/pyrdfa3/commit/ffd1d62dd50d5f4190013b39cedcdfbd81f3ce3e.patch"; 26 29 hash = "sha256-prRrOwylYcEqKLr/8LIpyJ5Yyt+6+HTUqH5sQXU8tqc="; ··· 31 34 substituteInPlace setup.py \ 32 35 --replace "'html = pyRdfa.rdflibparsers:StructuredDataParser'" "'html = pyRdfa.rdflibparsers:StructuredDataParser'," \ 33 36 --replace "'hturtle = pyRdfa.rdflibparsers:HTurtleParser'" "'hturtle = pyRdfa.rdflibparsers:HTurtleParser'," 37 + # https://github.com/RDFLib/pyrdfa3/issues/31 38 + substituteInPlace pyRdfa/utils.py \ 39 + --replace "imp," "" 34 40 ''; 35 41 42 + nativeBuildInputs = [ 43 + setuptools 44 + ]; 45 + 36 46 propagatedBuildInputs = [ 37 47 rdflib 38 48 html5lib 39 49 ]; 40 50 41 - # Does not work with python3 42 - doCheck = false; 43 - 44 - pythonImportsCheck = [ "pyRdfa" ]; 51 + pythonImportsCheck = [ 52 + "pyRdfa" 53 + ]; 45 54 46 55 meta = with lib; { 47 56 description = "RDFa 1.1 distiller/parser library"; 48 - homepage = "https://www.w3.org/2012/pyRdfa/"; 57 + homepage = "https://github.com/prrvchr/pyrdfa3/"; 58 + changelog = "https://github.com/prrvchr/pyrdfa3/releases/tag/v${version}"; 49 59 license = licenses.w3c; 50 60 maintainers = with maintainers; [ ambroisie ]; 51 61 };
+6
pkgs/development/python-modules/pysolcast/default.nix
··· 9 9 , requests 10 10 , responses 11 11 , poetry-core 12 + , pythonRelaxDepsHook 12 13 }: 13 14 14 15 buildPythonPackage rec { ··· 25 26 hash = "sha256-jLhM47o6LvkPux0kusOrRk4TDS6VLWE0QMEiQxlBCwo="; 26 27 }; 27 28 29 + pythonRelaxDeps = [ 30 + "responses" 31 + ]; 32 + 28 33 nativeBuildInputs = [ 29 34 poetry-core 35 + pythonRelaxDepsHook 30 36 ]; 31 37 32 38 propagatedBuildInputs = [
+10 -5
pkgs/development/python-modules/pytest-check/default.nix
··· 8 8 9 9 buildPythonPackage rec { 10 10 pname = "pytest-check"; 11 - version = "2.2.4"; 12 - format = "pyproject"; 11 + version = "2.3.1"; 12 + pyproject = true; 13 13 14 14 src = fetchPypi { 15 15 pname = "pytest_check"; 16 16 inherit version; 17 - hash = "sha256-0uaWYDFB9bLekFuTWD5FmE7DxhzscCZJ3rEL2XSFYLs="; 17 + hash = "sha256-UbjxiozKpCbF2RPE4ORvAUqqdXlIHqA9Itfh9Jj2ibI="; 18 18 }; 19 19 20 20 nativeBuildInputs = [ 21 21 flit-core 22 22 ]; 23 23 24 - propagatedBuildInputs = [ 24 + buildInputs = [ 25 25 pytest 26 26 ]; 27 27 ··· 29 29 pytestCheckHook 30 30 ]; 31 31 32 + pythonImportsCheck = [ 33 + "pytest_check" 34 + ]; 35 + 32 36 meta = with lib; { 33 37 description = "pytest plugin allowing multiple failures per test"; 34 38 homepage = "https://github.com/okken/pytest-check"; 39 + changelog = "https://github.com/okken/pytest-check/releases/tag/${version}"; 35 40 license = licenses.mit; 36 - maintainers = [ maintainers.flokli ]; 41 + maintainers = with maintainers; [ flokli ]; 37 42 }; 38 43 }
+2 -2
pkgs/development/python-modules/pyvista/default.nix
··· 13 13 14 14 buildPythonPackage rec { 15 15 pname = "pyvista"; 16 - version = "0.43.1"; 16 + version = "0.43.2"; 17 17 format = "setuptools"; 18 18 19 19 disabled = pythonOlder "3.8"; ··· 22 22 owner = pname; 23 23 repo = pname; 24 24 rev = "refs/tags/v${version}"; 25 - hash = "sha256-H7WkRK9lP92L47nFNDT1WusWfU0bLgXBA+KQqTyedL4="; 25 + hash = "sha256-2gh5qpiHda611bWWZzRXu+tkiRk9x4qNehFP8MARtk0="; 26 26 }; 27 27 28 28 propagatedBuildInputs = [
+14 -8
pkgs/development/python-modules/recipe-scrapers/default.nix
··· 9 9 , pytestCheckHook 10 10 , responses 11 11 , setuptools 12 + , pythonOlder 12 13 }: 13 14 14 15 buildPythonPackage rec { 15 16 pname = "recipe-scrapers"; 16 - version = "14.52.0"; 17 - format = "pyproject"; 17 + version = "14.53.0"; 18 + pyproject = true; 19 + 20 + disabled = pythonOlder "3.8"; 18 21 19 22 src = fetchFromGitHub { 20 23 owner = "hhursev"; 21 24 repo = "recipe-scrapers"; 22 25 rev = "refs/tags/${version}"; 23 - hash = "sha256-VdJZnwo+DwVDZuuuqk0X26CXs7ZrUFXqC8qEYaX74Zc="; 26 + hash = "sha256-uYUzn3JlsZmzzbk740aD3PW3OuGqdsAfU7HlYX5kPrY="; 24 27 }; 25 28 26 29 nativeBuildInputs = [ ··· 40 43 responses 41 44 ]; 42 45 43 - disabledTestPaths = [ 44 - # This is not actual code, just some pre-written boiler-plate template 45 - "templates/test_scraper.py" 46 + disabledTests = [ 47 + # Fixture is broken 48 + "test_instructions" 46 49 ]; 47 50 48 - pythonImportsCheck = [ "recipe_scrapers" ]; 51 + pythonImportsCheck = [ 52 + "recipe_scrapers" 53 + ]; 49 54 50 55 meta = with lib; { 51 - description = "Python package for scraping recipes data "; 56 + description = "Python package for scraping recipes data"; 52 57 homepage = "https://github.com/hhursev/recipe-scrapers"; 58 + changelog = "https://github.com/hhursev/recipe-scrapers/releases/tag/${version}"; 53 59 license = licenses.mit; 54 60 maintainers = with maintainers; [ ambroisie ]; 55 61 };
+9 -3
pkgs/development/python-modules/rki-covid-parser/default.nix
··· 6 6 , pytest-aiohttp 7 7 , pytestCheckHook 8 8 , pythonOlder 9 + , setuptools 9 10 }: 10 11 11 12 buildPythonPackage rec { 12 13 pname = "rki-covid-parser"; 13 14 version = "1.3.3"; 14 - format = "pyproject"; 15 + pyproject = true; 15 16 16 17 disabled = pythonOlder "3.6"; 17 18 18 19 src = fetchFromGitHub { 19 20 owner = "thebino"; 20 - repo = pname; 21 - rev = "v${version}"; 21 + repo = "rki-covid-parser"; 22 + rev = "refs/tags/v${version}"; 22 23 hash = "sha256-e0MJjE4zgBPL+vt9EkgsdGrgqUyKK/1S9ZFxy56PUjc="; 23 24 }; 25 + 26 + nativeBuildInputs = [ 27 + setuptools 28 + ]; 24 29 25 30 propagatedBuildInputs = [ 26 31 aiohttp ··· 45 50 meta = with lib; { 46 51 description = "Python module for working with data from the Robert-Koch Institut"; 47 52 homepage = "https://github.com/thebino/rki-covid-parser"; 53 + changelog = "https://github.com/thebino/rki-covid-parser/blob/v${version}/CHANGELOG.md"; 48 54 license = with licenses; [ asl20 ]; 49 55 maintainers = with maintainers; [ fab ]; 50 56 };
+2 -2
pkgs/development/python-modules/simplisafe-python/default.nix
··· 20 20 21 21 buildPythonPackage rec { 22 22 pname = "simplisafe-python"; 23 - version = "2023.12.0"; 23 + version = "2024.01.0"; 24 24 pyproject = true; 25 25 26 26 disabled = pythonOlder "3.10"; ··· 29 29 owner = "bachya"; 30 30 repo = "simplisafe-python"; 31 31 rev = "refs/tags/${version}"; 32 - hash = "sha256-Nr4HvjIOLk/WMKCjj/ZX67OBSImRhs9SfZtLjFs81Sk="; 32 + hash = "sha256-ewbR2FI0t2F8HF0ZL5omsclB9OPAjHygGLPtSkVlvgM="; 33 33 }; 34 34 35 35
+2 -2
pkgs/development/python-modules/types-awscrt/default.nix
··· 7 7 8 8 buildPythonPackage rec { 9 9 pname = "types-awscrt"; 10 - version = "0.20.0"; 10 + version = "0.20.2"; 11 11 pyproject = true; 12 12 13 13 disabled = pythonOlder "3.7"; ··· 15 15 src = fetchPypi { 16 16 pname = "types_awscrt"; 17 17 inherit version; 18 - hash = "sha256-mXeMlS4erhDMelNGhBMAEXcCbJQ0NFvwASC7LqW3kQk="; 18 + hash = "sha256-XimYakrTlorD2CyqhdZo08ZiJMnueL4/5kvOMNrnt5g="; 19 19 }; 20 20 21 21 nativeBuildInputs = [
+6 -5
pkgs/development/tools/buf/default.nix
··· 10 10 11 11 buildGoModule rec { 12 12 pname = "buf"; 13 - version = "1.27.0"; 13 + version = "1.28.1"; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "bufbuild"; 17 17 repo = pname; 18 18 rev = "v${version}"; 19 - hash = "sha256-QBU04/w7Z8yaTzDqhiVcxC8xEuDpDJs7rNRpOtwodGg="; 19 + hash = "sha256-wFUSf3+EZa1pzpKci4dPa9MVfNk5XQHraUFcoiTd/0Q="; 20 20 }; 21 21 22 - vendorHash = "sha256-4JSmn/TUojZjCQMZCgJic0y84VMP26J7uBybB5/BCoE="; 22 + vendorHash = "sha256-REAU2FoEYWRYlPQel6oDLLdhbJOiGRaWZO6inefSd3M="; 23 23 24 24 patches = [ 25 - # Skip a test that requires networking to be available to work. 26 - ./skip_test_requiring_network.patch 25 + # Skip a test that requires networking to be available to work, 26 + # and a test which requires the source checkout to be part of a git repository 27 + ./skip_broken_tests.patch 27 28 ]; 28 29 29 30 nativeBuildInputs = [ installShellFiles ];
+28
pkgs/development/tools/buf/skip_broken_tests.patch
··· 1 + diff --git a/private/buf/cmd/buf/workspace_unix_test.go b/private/buf/cmd/buf/workspace_unix_test.go 2 + index 22c84385..22548555 100644 3 + --- a/private/buf/cmd/buf/workspace_unix_test.go 4 + +++ b/private/buf/cmd/buf/workspace_unix_test.go 5 + @@ -93,6 +93,8 @@ func TestWorkspaceAbsoluteFail(t *testing.T) { 6 + // Workflow run: https://github.com/bufbuild/buf/actions/runs/6510804063/job/17685247791. 7 + // Potential fix: https://stackoverflow.com/questions/22575662/filename-too-long-in-git-for-windows. 8 + func TestWorkspaceGit(t *testing.T) { 9 + + // Fails because the source checkout is not part of a git repository while building with nix 10 + + t.Skip() 11 + // Directory paths specified as a git reference within a workspace. 12 + t.Parallel() 13 + testRunStdout( 14 + diff --git a/private/bufpkg/buftesting/buftesting.go b/private/bufpkg/buftesting/buftesting.go 15 + index d9e1fdc6..6e08c439 100644 16 + --- a/private/bufpkg/buftesting/buftesting.go 17 + +++ b/private/bufpkg/buftesting/buftesting.go 18 + @@ -104,6 +104,10 @@ func RunActualProtoc( 19 + 20 + // GetGoogleapisDirPath gets the path to a clone of googleapis. 21 + func GetGoogleapisDirPath(t *testing.T, buftestingDirPath string) string { 22 + + // Requires network access, which is not available during 23 + + // the nixpkgs sandboxed build 24 + + t.Skip() 25 + + 26 + googleapisDirPath := filepath.Join(buftestingDirPath, testGoogleapisDirPath) 27 + require.NoError( 28 + t,
-15
pkgs/development/tools/buf/skip_test_requiring_network.patch
··· 1 - diff --git a/private/bufpkg/buftesting/buftesting.go b/private/bufpkg/buftesting/buftesting.go 2 - index 82b3ec4..ef8263a 100644 3 - --- a/private/bufpkg/buftesting/buftesting.go 4 - +++ b/private/bufpkg/buftesting/buftesting.go 5 - @@ -99,6 +99,10 @@ func RunActualProtoc( 6 - 7 - // GetGoogleapisDirPath gets the path to a clone of googleapis. 8 - func GetGoogleapisDirPath(t *testing.T, buftestingDirPath string) string { 9 - + // Requires network access, which is not available during 10 - + // the nixpkgs sandboxed build 11 - + t.Skip() 12 - + 13 - googleapisDirPath := filepath.Join(buftestingDirPath, testGoogleapisDirPath) 14 - require.NoError( 15 - t,
+3 -3
pkgs/development/tools/misc/texlab/default.nix
··· 15 15 in 16 16 rustPlatform.buildRustPackage rec { 17 17 pname = "texlab"; 18 - version = "5.12.1"; 18 + version = "5.12.2"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "latex-lsp"; 22 22 repo = "texlab"; 23 23 rev = "refs/tags/v${version}"; 24 - hash = "sha256-/M6j33KNX4leLPJg6qLubejhjacXsd7NZ77wuGtdbw8="; 24 + hash = "sha256-NEiUWMmJjhhK9XYbW1dla7iZJG4bdttbuSJmtO4f1UE="; 25 25 }; 26 26 27 - cargoHash = "sha256-xslsj5mE7NOZYVwuxJ06hZAUWS3mhgzrl73P47mjkTY="; 27 + cargoHash = "sha256-OFgBBO4RZ7oS2da9cGIePnLhfFdHfW3FdOT0B8bNC3g="; 28 28 29 29 outputs = [ "out" ] ++ lib.optional (!isCross) "man"; 30 30
+11 -7
pkgs/development/tools/pur/default.nix
··· 5 5 6 6 python3.pkgs.buildPythonApplication rec { 7 7 pname = "pur"; 8 - version = "7.0.0"; 8 + version = "7.3.1"; 9 + format = "setuptools"; 9 10 10 11 src = fetchFromGitHub { 11 12 owner = "alanhamlett"; 12 13 repo = "pip-update-requirements"; 13 14 rev = "refs/tags/${version}"; 14 - hash = "sha256-JAjz9A9r1H6MJX7MSq7UvQKfULhB9UuPP3tI6Cggx9I="; 15 + hash = "sha256-W6otdj1C3Nn3DUvwp9MPqMo2y4ITqgYrqlW/uxIj2YA="; 15 16 }; 16 17 17 - propagatedBuildInputs = [ 18 - python3.pkgs.click 18 + propagatedBuildInputs = with python3.pkgs; [ 19 + click 19 20 ]; 20 21 21 - nativeCheckInputs = [ 22 - python3.pkgs.pytestCheckHook 22 + nativeCheckInputs = with python3.pkgs; [ 23 + pytestCheckHook 23 24 ]; 24 25 25 - pythonImportsCheck = [ "pur" ]; 26 + pythonImportsCheck = [ 27 + "pur" 28 + ]; 26 29 27 30 meta = with lib; { 28 31 description = "Python library for update and track the requirements"; 29 32 homepage = "https://github.com/alanhamlett/pip-update-requirements"; 33 + changelog = "https://github.com/alanhamlett/pip-update-requirements/blob/${version}/HISTORY.rst"; 30 34 license = with licenses; [ bsd2 ]; 31 35 maintainers = with maintainers; [ fab ]; 32 36 };
+2 -2
pkgs/servers/roundcube/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "roundcube"; 5 - version = "1.6.5"; 5 + version = "1.6.6"; 6 6 7 7 src = fetchurl { 8 8 url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; 9 - sha256 = "sha256-Fktyy3jeidEEdB7pCQ9AJOY7+tpDlJA0hENl8/pwtf0="; 9 + sha256 = "sha256-wbk6Ptvil0VzlrCgMdixPIpdwwyTcHBN+5ssEiUBfVI="; 10 10 }; 11 11 12 12 patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];
+2 -2
pkgs/tools/audio/abcmidi/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "abcMIDI"; 5 - version = "2023.12.28"; 5 + version = "2024.01.04"; 6 6 7 7 src = fetchzip { 8 8 url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; 9 - hash = "sha256-HOwHmn67ZT2h0MKV1wxv1pINUv/5S4AgafGBM1PEBzY="; 9 + hash = "sha256-IsQ+lAmQQGitKRlQUc7PgRKgwlEgYsR5q2XHp9k7tEM="; 10 10 }; 11 11 12 12 meta = with lib; {
+2 -2
pkgs/tools/misc/fastfetch/default.nix
··· 32 32 33 33 stdenv.mkDerivation (finalAttrs: { 34 34 pname = "fastfetch"; 35 - version = "2.6.0"; 35 + version = "2.6.1"; 36 36 37 37 src = fetchFromGitHub { 38 38 owner = "fastfetch-cli"; 39 39 repo = "fastfetch"; 40 40 rev = finalAttrs.version; 41 - hash = "sha256-cjNVN/2N/CiItsysZFJNL0mqXL6B86BihjDJ7IwD1a4="; 41 + hash = "sha256-XxQtAEGQEnwX3ks1ukAfDrGvgFfFjwe2XdF6uQViRjc="; 42 42 }; 43 43 44 44 nativeBuildInputs = [
+10
pkgs/tools/networking/fast-ssh/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 + , fetchpatch 4 5 , rustPlatform 5 6 , Security 6 7 }: ··· 17 18 }; 18 19 19 20 cargoSha256 = "sha256-sIQNoH3UWX3SwCFCPZEREIFR7C28ml4oGsrq6wuOAT0="; 21 + 22 + patches = [ 23 + # Can be removed as soon as this is is merged: https://github.com/Julien-R44/fast-ssh/pull/22 24 + (fetchpatch { 25 + name = "fix-ambiguous-as_ref.patch"; 26 + url = "https://github.com/Julien-R44/fast-ssh/commit/c082a64a4b412380b2ab145c24161fdaa26175db.patch"; 27 + hash = "sha256-egkoJF+rQiuClNL8ltzmB7oHngbpOxO29rlwZ3nELOE="; 28 + }) 29 + ]; 20 30 21 31 buildInputs = lib.optional stdenv.isDarwin Security; 22 32
+2 -2
pkgs/tools/networking/lldpd/default.nix
··· 4 4 5 5 stdenv.mkDerivation rec { 6 6 pname = "lldpd"; 7 - version = "1.0.17"; 7 + version = "1.0.18"; 8 8 9 9 src = fetchurl { 10 10 url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz"; 11 - sha256 = "sha256-k0MXfxRdK8pm7wPVlSgHnT8WY8YkseK50IJo79xhJ84="; 11 + hash = "sha256-SzIGddYIkBpKDU/v+PlruEbUkT2RSwz3W30K6ASQ8vc="; 12 12 }; 13 13 14 14 configureFlags = [
+2 -2
pkgs/tools/security/cloudhunter/default.nix
··· 5 5 6 6 python3.pkgs.buildPythonApplication rec { 7 7 pname = "cloudhunter"; 8 - version = "0.7.0"; 8 + version = "0.7.1"; 9 9 format = "other"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "belane"; 13 13 repo = "CloudHunter"; 14 14 rev = "refs/tags/v${version}"; 15 - hash = "sha256-yRl3x1dboOcoPeKxpUEhDk8OJx1hynEJRHL9/Su8OyA="; 15 + hash = "sha256-7iT4vr0kcNXEyJJdBbJsllIcbZRGY3T5t/FjEONkuq0="; 16 16 }; 17 17 18 18 postPatch = ''
+10 -3
pkgs/tools/security/keepwn/default.nix
··· 6 6 7 7 python3.pkgs.buildPythonApplication rec { 8 8 pname = "keepwn"; 9 - version = "0.1"; 10 - format = "setuptools"; 9 + version = "0.3"; 10 + pyproject = true; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "Orange-Cyberdefense"; 14 14 repo = "KeePwn"; 15 15 rev = "refs/tags/${version}"; 16 - hash = "sha256-s+r6QEUzkzCbs5j1G+PVgDx8cvnmQzEQ1MHAakG+skA="; 16 + hash = "sha256-haKWuoTtyC9vIise+gznruHEwMIDz1W6euihLLKnSdc="; 17 17 }; 18 18 19 + nativeBuildInputs = with python3.pkgs; [ 20 + setuptools 21 + ]; 22 + 19 23 propagatedBuildInputs = with python3.pkgs; [ 20 24 chardet 21 25 impacket 22 26 lxml 27 + pefile 28 + pykeepass 29 + python-magic 23 30 termcolor 24 31 ]; 25 32
+8 -3
pkgs/tools/security/naabu/default.nix
··· 6 6 7 7 buildGoModule rec { 8 8 pname = "naabu"; 9 - version = "2.2.0"; 9 + version = "2.2.1"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "projectdiscovery"; 13 13 repo = "naabu"; 14 14 rev = "refs/tags/v${version}"; 15 - hash = "sha256-he9SJ4lCFNV3DvwqYR7lcWPIPwLIpJDWWnnei069k1k="; 15 + hash = "sha256-z81LL+tx15Zo6OWj4gRSodo7Dk763M+QQ5kYgjrWO3Q="; 16 16 }; 17 17 18 - vendorHash = "sha256-fVqPRDycT9ImBkHakNrby0uXPWrXXatTk8QQSi2OnV0="; 18 + vendorHash = "sha256-nwrqxlbvr9FZXJpzmcn0IBEtlJfeYCy8DJsBvxEgj6k="; 19 19 20 20 buildInputs = [ 21 21 libpcap ··· 25 25 26 26 subPackages = [ 27 27 "cmd/naabu/" 28 + ]; 29 + 30 + ldflags = [ 31 + "-w" 32 + "-s" 28 33 ]; 29 34 30 35 meta = with lib; {
+3 -3
pkgs/tools/text/ov/default.nix
··· 10 10 11 11 buildGoModule rec { 12 12 pname = "ov"; 13 - version = "0.33.0"; 13 + version = "0.33.1"; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "noborus"; 17 17 repo = "ov"; 18 18 rev = "refs/tags/v${version}"; 19 - hash = "sha256-UD8YKhdoMAtKTC2KEMEamjgOZb3rv1SU9eXZg/zjYTY="; 19 + hash = "sha256-ub6BPasgJcEeYsmlYKCToEQ70RV17Uq8OSM0XB1e1yg="; 20 20 }; 21 21 22 - vendorHash = "sha256-T40hnlYhJ3lhrQW7iFBQCGUNblSSYtL8jNw0rPRy/Aw="; 22 + vendorHash = "sha256-/S7YKIwuZyQBGIbcPt/ffv8Vx6vzXsk/fDRCIXANPTE="; 23 23 24 24 ldflags = [ 25 25 "-s"