diff options
45 files changed, 264 insertions, 159 deletions
diff --git a/nixos/tests/udisks2.nix b/nixos/tests/udisks2.nix index 6afb200f856..8cc148750c7 100644 --- a/nixos/tests/udisks2.nix +++ b/nixos/tests/udisks2.nix @@ -32,6 +32,9 @@ in '' import lzma + machine.systemctl("start udisks2") + machine.wait_for_unit("udisks2.service") + with lzma.open( "${stick}" ) as data, open(machine.state_dir / "usbstick.img", "wb") as stick: diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix index 1362bab0afc..508c59bab7c 100644 --- a/pkgs/applications/misc/appeditor/default.nix +++ b/pkgs/applications/misc/appeditor/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "appeditor"; - version = "1.1.3"; + version = "1.1.5"; src = fetchFromGitHub { owner = "donadigo"; repo = "appeditor"; rev = version; - sha256 = "sha256-0zutz1nnThyF7h44cDxjE53hhAJfJf6DTs9p4HflXr8="; + sha256 = "sha256-A0YasHw5osGrgUPiUPuRBnv1MR/Pth6jVHGEx/klOGY="; }; nativeBuildInputs = [ @@ -43,11 +43,6 @@ stdenv.mkDerivation rec { ]; postPatch = '' - # Fix build with vala 0.56 - # https://github.com/donadigo/appeditor/pull/122 - substituteInPlace src/Application.vala \ - --replace "private static string? create_exec_filename;" "public static string? create_exec_filename;" - chmod +x meson/post_install.py patchShebangs meson/post_install.py ''; diff --git a/pkgs/by-name/cp/cpu-x/package.nix b/pkgs/by-name/cp/cpu-x/package.nix index 5e15b860db3..e287d379fe7 100644 --- a/pkgs/by-name/cp/cpu-x/package.nix +++ b/pkgs/by-name/cp/cpu-x/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "cpu-x"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "X0rg"; repo = "CPU-X"; rev = "v${version}"; - sha256 = "sha256-mykN+E2ghp2+a06WLYXg9oaQQ2SJDyxIVQSUM00zrCo="; + sha256 = "sha256-g3k9P7EevVeDHvnc1dG8cI4C7xhjrDy7gwdoWj6G6zA="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ]; diff --git a/pkgs/desktops/lomiri/data/lomiri-schemas/default.nix b/pkgs/desktops/lomiri/data/lomiri-schemas/default.nix new file mode 100644 index 00000000000..c612011cbff --- /dev/null +++ b/pkgs/desktops/lomiri/data/lomiri-schemas/default.nix @@ -0,0 +1,58 @@ +{ stdenv +, lib +, fetchFromGitLab +, gitUpdater +, testers +, cmake +, cmake-extras +, glib +, intltool +, pkg-config +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-schemas"; + version = "0.1.3"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lomiri-schemas"; + rev = finalAttrs.version; + hash = "sha256-FrDUFqdD0KW2VG2pTA6LMb6/9PdNtQUlYTEo1vnW6QQ="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + glib # glib-compile-schemas + pkg-config + intltool + ]; + + buildInputs = [ + cmake-extras + glib + ]; + + cmakeFlags = [ + "-DGSETTINGS_LOCALINSTALL=ON" + "-DGSETTINGS_COMPILE=ON" + ]; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "GSettings / AccountsService schema files for Lomiri"; + homepage = "https://gitlab.com/ubports/development/core/lomiri-schemas"; + license = licenses.lgpl21Plus; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + pkgConfigModules = [ + "lomiri-schemas" + ]; + }; +}) diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix index 4aa91bae9f9..2b559a6a727 100644 --- a/pkgs/desktops/lomiri/default.nix +++ b/pkgs/desktops/lomiri/default.nix @@ -7,6 +7,9 @@ let packages = self: let inherit (self) callPackage; in { + #### Data + lomiri-schemas = callPackage ./data/lomiri-schemas { }; + #### Development tools / libraries cmake-extras = callPackage ./development/cmake-extras { }; deviceinfo = callPackage ./development/deviceinfo { }; diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index d7ac817c647..02309b275bd 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -1,7 +1,7 @@ { majorVersion, minorVersion, sourceSha256, patchesToFetch ? [] }: { stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libpng, libtiff , fetchpatch -, enableQt ? false, qtbase, qtx11extras, qttools, qtdeclarative, qtEnv +, enableQt ? false, qtx11extras, qttools, qtdeclarative, qtEnv , enablePython ? false, python ? throw "vtk: Python support requested, but no python interpreter was given." # Darwin support , AGL, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL @@ -11,11 +11,12 @@ let inherit (lib) optionalString optionals optional; + version = "${majorVersion}.${minorVersion}"; pythonMajor = lib.substring 0 1 python.pythonVersion; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "vtk${optionalString enableQt "-qvtk"}"; - version = "${majorVersion}.${minorVersion}"; + inherit version; src = fetchurl { url = "https://www.vtk.org/files/release/${majorVersion}/VTK-${version}.tar.gz"; @@ -25,9 +26,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libpng libtiff ] - ++ optionals enableQt (if lib.versionOlder majorVersion "9" - then [ qtbase qtx11extras qttools ] - else [ (qtEnv "qvtk-qt-env" [ qtx11extras qttools qtdeclarative ]) ]) + ++ optionals enableQt [ (qtEnv "qvtk-qt-env" [ qtx11extras qttools qtdeclarative ]) ] ++ optionals stdenv.isLinux [ libGLU xorgproto @@ -66,8 +65,8 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" - "-D${if lib.versionOlder version "9.0" then "VTK_USE_SYSTEM_PNG" else "VTK_MODULE_USE_EXTERNAL_vtkpng"}=ON" - "-D${if lib.versionOlder version "9.0" then "VTK_USE_SYSTEM_TIFF" else "VTK_MODULE_USE_EXTERNAL_vtktiff"}=1" + "-DVTK_MODULE_USE_EXTERNAL_vtkpng=ON" + "-DVTK_MODULE_USE_EXTERNAL_vtktiff=1" ] ++ lib.optionals (!stdenv.isDarwin) [ "-DOPENGL_INCLUDE_DIR=${libGL}/include" ] ++ [ @@ -76,9 +75,7 @@ in stdenv.mkDerivation rec { "-DCMAKE_INSTALL_BINDIR=bin" "-DVTK_VERSIONED_INSTALL=OFF" ] ++ optionals enableQt [ - "-D${if lib.versionOlder version "9.0" then "VTK_Group_Qt:BOOL=ON" else "VTK_GROUP_ENABLE_Qt:STRING=YES"}" - ] ++ optionals (enableQt && lib.versionOlder version "8.0") [ - "-DVTK_QT_VERSION=5" + "-DVTK_GROUP_ENABLE_Qt:STRING=YES" ] ++ optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] ++ optionals enablePython [ @@ -109,7 +106,5 @@ in stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ knedlsepp tfmoraes lheckemann ]; platforms = with platforms; unix; - # /nix/store/xxxxxxx-apple-framework-Security/Library/Frameworks/Security.framework/Headers/Authorization.h:192:7: error: variably modified 'bytes' at file scope - broken = stdenv.isDarwin && (lib.versions.major majorVersion == "8"); }; } diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 1db2f4ce6d8..8192dded7e4 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.42.1"; + version = "2.42.2"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-b0H6yZidPuUcCMSN4dQ5ze3ey8dX40thgJh9mbFtJJk="; + hash = "sha256-VyCqPoYn8bn2MlIYfU3w+CM65x1pexeW6/vlynUL0Rg="; }; patches = lib.optionals stdenv.isLinux [ diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index ceb5bf0303b..d4357124747 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -6,6 +6,7 @@ , autoreconfHook , util-linux , openssl +, cacert # The primary --enable-XXX variant. 'all' enables most features, but causes build-errors for some software, # requiring to build a special variant for that software. Example: 'haproxy' , variant ? "all" @@ -14,13 +15,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "wolfssl-${variant}"; - version = "5.6.3"; + version = "5.6.4"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "refs/tags/v${finalAttrs.version}-stable"; - hash = "sha256-UN4zs+Rxh/bsLD1BQA+f1YN/UOJ6OB2HduhoetEp10Y="; + hash = "sha256-a9a3ca4Zb/XTS5YfPJwnXPYbDjmgD8qylhPQg5pjzJM="; }; patches = [ @@ -92,6 +93,7 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ openssl + cacert ]; postInstall = '' diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index cb885b7b069..abe1649e009 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -1,24 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, ocaml, findlib, libGLU, libGL, freeglut, darwin } : +{ lib, stdenv, fetchFromGitHub, ocaml, findlib, libGLU, libGL, freeglut, camlp-streams, darwin } : -if lib.versionOlder ocaml.version "4.03" +if lib.versionOlder ocaml.version "4.06" then throw "lablgl is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-lablgl"; - version = "1.06"; + version = "1.07"; src = fetchFromGitHub { owner = "garrigue"; repo = "lablgl"; rev = "v${version}"; - sha256 = "sha256:141kc816iv59z96738i3vn9m9iw9g2zhi45hk4cchpwd99ar5l6k"; + hash = "sha256-GiQKHMn5zHyvDrA2ve12X5YTm3/RZp8tukIqifgVaW4="; }; strictDeps = true; nativeBuildInputs = [ ocaml findlib ]; - buildInputs = [ freeglut ]; + buildInputs = [ freeglut camlp-streams ]; propagatedBuildInputs = [ libGLU libGL diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix deleted file mode 100644 index 2a33d8b17cc..00000000000 --- a/pkgs/development/ocaml-modules/ocamlsdl/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{stdenv, lib, fetchurl, ocaml, pkg-config, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }: - -let - pname = "ocamlsdl"; -in - -if lib.versionAtLeast ocaml.version "4.06" -then throw "${pname} is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "0.9.1"; - - src = fetchurl { - url = "mirror://sourceforge/project/ocamlsdl/OCamlSDL/ocamlsdl-0.9.1/ocamlsdl-0.9.1.tar.gz"; - sha256 = "abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f"; - }; - - strictDeps = true; - - nativeBuildInputs = [ pkg-config ocaml findlib ]; - buildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx lablgl ]; - - propagatedBuildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx pkg-config ]; - createFindlibDestdir = true; - - meta = { - homepage = "http://ocamlsdl.sourceforge.net/"; - description = "OCaml bindings for SDL 1.2"; - license = lib.licenses.lgpl21; - }; -} diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index 13297b0cd6d..4426f930b0d 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "acquire"; version = "3.9"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; diff --git a/pkgs/development/python-modules/dissect-esedb/default.nix b/pkgs/development/python-modules/dissect-esedb/default.nix index 5ae671c06a7..8c9767f6c06 100644 --- a/pkgs/development/python-modules/dissect-esedb/default.nix +++ b/pkgs/development/python-modules/dissect-esedb/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dissect-esedb"; version = "3.9"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; diff --git a/pkgs/development/python-modules/dissect-evidence/default.nix b/pkgs/development/python-modules/dissect-evidence/default.nix index 7e022eb1797..b1d8bb2b1b8 100644 --- a/pkgs/development/python-modules/dissect-evidence/default.nix +++ b/pkgs/development/python-modules/dissect-evidence/default.nix @@ -12,9 +12,9 @@ buildPythonPackage rec { pname = "dissect-evidence"; version = "3.7"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; diff --git a/pkgs/development/python-modules/dissect-fat/default.nix b/pkgs/development/python-modules/dissect-fat/default.nix index 0fd868f4835..9fa9457b284 100644 --- a/pkgs/development/python-modules/dissect-fat/default.nix +++ b/pkgs/development/python-modules/dissect-fat/default.nix @@ -11,9 +11,9 @@ buildPythonPackage rec { pname = "dissect-fat"; version = "3.6"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; diff --git a/pkgs/development/python-modules/dissect-hypervisor/default.nix b/pkgs/development/python-modules/dissect-hypervisor/default.nix index ff1395b932c..55ce876fe21 100644 --- a/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, defusedxml , dissect-cstruct , dissect-util , fetchFromGitHub @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "dissect-hypervisor"; version = "3.9"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -33,6 +34,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + defusedxml dissect-cstruct dissect-util ]; diff --git a/pkgs/development/python-modules/dissect-regf/default.nix b/pkgs/development/python-modules/dissect-regf/default.nix index bc0d8798255..9671bb33c8a 100644 --- a/pkgs/development/python-modules/dissect-regf/default.nix +++ b/pkgs/development/python-modules/dissect-regf/default.nix @@ -12,9 +12,9 @@ buildPythonPackage rec { pname = "dissect-regf"; version = "3.7"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index 7704766d434..dfb7f786753 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -39,16 +39,16 @@ buildPythonPackage rec { pname = "dissect-target"; - version = "3.12"; + version = "3.13"; format = "pyproject"; - disabled = pythonOlder "3.12"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.target"; rev = "refs/tags/${version}"; - hash = "sha256-ByjeQcoDi0edum2XebF2DQ7d0xeH2nyulj6vt7bztKg="; + hash = "sha256-4dtKAFhxaS8PRoeLY6ZYrE/4P1pbcii1gWQ9RRVOBzs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -108,6 +108,11 @@ buildPythonPackage rec { "test_exec_target_command" # Issue with tar file "test_tar_sensitive_drive_letter" + "test_dpapi_decrypt_blob" + "test_notifications_appdb" + "test_md" + "test_notifications_wpndatabase" + "test_nested_md_lvm" # Tests compare dates and times "yum" # Filesystem access, windows defender tests diff --git a/pkgs/development/python-modules/dissect-thumbcache/default.nix b/pkgs/development/python-modules/dissect-thumbcache/default.nix index a9224d0d436..e63e7bb4ac9 100644 --- a/pkgs/development/python-modules/dissect-thumbcache/default.nix +++ b/pkgs/development/python-modules/dissect-thumbcache/default.nix @@ -12,9 +12,9 @@ buildPythonPackage rec { pname = "dissect-thumbcache"; version = "1.6"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; diff --git a/pkgs/development/python-modules/dissect-util/default.nix b/pkgs/development/python-modules/dissect-util/default.nix index 735ad9820f2..bfbc76b73c9 100644 --- a/pkgs/development/python-modules/dissect-util/default.nix +++ b/pkgs/development/python-modules/dissect-util/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "dissect-util"; - version = "3.11"; + version = "3.12"; format = "pyproject"; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.util"; rev = "refs/tags/${version}"; - hash = "sha256-PtmvXnmZ6f8YxEejqaVwtaoV7d1Oa7063ZFagH110yk="; + hash = "sha256-rso6TIw8cQnkb58KtGKOfzIzpqJLW05L9sRWIGX3teA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect-volume/default.nix b/pkgs/development/python-modules/dissect-volume/default.nix index 3cf3282c0b5..1ef6ffb4499 100644 --- a/pkgs/development/python-modules/dissect-volume/default.nix +++ b/pkgs/development/python-modules/dissect-volume/default.nix @@ -12,9 +12,9 @@ buildPythonPackage rec { pname = "dissect-volume"; version = "3.7"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index e9b1c6b46a6..6ff49258842 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "dissect"; - version = "3.9"; + version = "3.10"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect"; rev = "refs/tags/${version}"; - hash = "sha256-lNa6GiX0hCZFVyiokBzEKGsvimSkUkgR1bkQMhxUbDw="; + hash = "sha256-AgmBU2sC3/okC7LKQC6yMEJ3u69WwAMAANILMASBIjw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index 3479f3b3d57..1562600a231 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { version = "3.12"; format = "pyproject"; - disabled = pythonOlder "3.12"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fox-it"; diff --git a/pkgs/development/python-modules/hdf5plugin/default.nix b/pkgs/development/python-modules/hdf5plugin/default.nix index 38782e3240c..c5a1ad4141d 100644 --- a/pkgs/development/python-modules/hdf5plugin/default.nix +++ b/pkgs/development/python-modules/hdf5plugin/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hdf5plugin"; - version = "4.2.0"; + version = "4.3.0"; format = "setuptools"; src = fetchFromGitHub { owner = "silx-kit"; repo = "hdf5plugin"; rev = "refs/tags/v${version}"; - hash = "sha256-y0iDPAfm66FdclPREPnvurupWd9ZUgz8PqFd/JoapDc="; + hash = "sha256-xOSGykG6D2Am/gnAPoqLOvIQz6FfxRQe9lPyRHxUoew="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index de8736efedf..5a99cbb62ee 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.40.1"; + version = "0.41.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-qKNsXN9nc3YS1gRNPPQUBgXDs01/rhdtRz707cfaYx8="; + hash = "sha256-n4hTS3LnS8AOr1VNSqcVYul/qiTiLvI2bsOJJLbKA3E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-velbus/default.nix b/pkgs/development/python-modules/python-velbus/default.nix index 5dca7585de1..75d4e24f869 100644 --- a/pkgs/development/python-modules/python-velbus/default.nix +++ b/pkgs/development/python-modules/python-velbus/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "python-velbus"; - version = "2.1.12"; + version = "2.1.14"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-X0jg1qd4rWbaRZqgMBJKOZD50sFq3Eyhw9RU6cEjORo="; + hash = "sha256-3eDfXPMO167QI/umLBjlHTBV67XQ8QYkg4EzfrRTw6M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix index cbfe657219e..1d8168467db 100644 --- a/pkgs/development/python-modules/vector/default.nix +++ b/pkgs/development/python-modules/vector/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "vector"; - version = "1.1.1"; + version = "1.1.1.post1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-aVdFHlnOUI9hgzVRnFPzDOuItwU9ZfPRZkWf1wjtOLU="; + hash = "sha256-elWuVJgW5fyg5S+rjMZtSw5Ls7d1OTPoW0FnZXlANys="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index 436ab5fa1ba..26660fec990 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "vertica-python"; - version = "1.3.5"; + version = "1.3.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KzvJcBR6Bc+z6IAmJ0KR88aSQMjRx1UilS28oBv9nTE="; + hash = "sha256-LLlaLP9NgzpJyxsEGPd7sdcVX/qXY8mO3ZQNm39gocM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/webauthn/default.nix b/pkgs/development/python-modules/webauthn/default.nix index 57c7857ca71..257649a9db0 100644 --- a/pkgs/development/python-modules/webauthn/default.nix +++ b/pkgs/development/python-modules/webauthn/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "webauthn"; - version = "1.11.0"; + version = "1.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "duo-labs"; repo = "py_webauthn"; rev = "refs/tags/v${version}"; - hash = "sha256-mZBnTmjlmR9jOOmu6uY114UZpm05ny2ZMEF0NXhVrME="; + hash = "sha256-+pp21rtwavtjj6ahG091xsJpsYOH3zpqU3xH2/YFXqY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zamg/default.nix b/pkgs/development/python-modules/zamg/default.nix index af5b6053389..b878a1198f8 100644 --- a/pkgs/development/python-modules/zamg/default.nix +++ b/pkgs/development/python-modules/zamg/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zamg"; - version = "0.3.0"; + version = "0.3.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "killer0071234"; repo = "python-zamg"; rev = "refs/tags/v${version}"; - hash = "sha256-dt0y423Xw/IFi83DFvGdsN1uzJBMbm13pBYtMgMntuU="; + hash = "sha256-snYRYwJc9H6H+dxaQM4beGvu5AuaXv7W8w5xjR6RPyw="; }; postPatch = '' diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix index 0236a5f51f3..38bbd1cb157 100644 --- a/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "timescaledb-tune"; - version = "0.14.4"; + version = "0.15.0"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lCbxGW6+/r5AnsSXvrE7jYL1ZywcTlb4RK3MurL1JWg="; + sha256 = "sha256-YgG8yuHnJrhrqJHNUkMjJvKNzEQ3ClY9OQzt+ET4LEk="; }; - vendorHash = "sha256-yXWeINubvfZ2S+3gVFsrzeVO3XXIiZ14qfK+9Bj3SV4="; + vendorHash = "sha256-8Q+KMYu1yiHEYS035NmCvxSgIS/+oRhhcZa6SwmvGgk="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index a55589c5a63..be6719c3512 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchgit, python3 }: +{ lib, stdenv, fetchFromSavannah, python3 }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gnulib"; - version = "20210702"; + version = "20231109"; - src = fetchgit { - url = "https://git.savannah.gnu.org/r/gnulib.git"; - rev = "901694b904cd861adc2529b2e05a3fb33f9b534f"; - sha256 = "1f5znlv2wjziglw9vlygdgm4jfbsz34h2dz6w4h90bl4hm0ycb1w"; + src = fetchFromSavannah { + repo = "gnulib"; + rev = "2dd1a7984c6b3e6056cef7e3f9933e0039c21634"; + hash = "sha256-QtWf3mljEnr0TTogkoKN63Y5HTm14A2e/sIXX3xe2SE="; }; postPatch = '' @@ -40,6 +40,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Central location for code to be shared among GNU packages"; homepage = "https://www.gnu.org/software/gnulib/"; + changelog = "https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=ChangeLog"; license = licenses.gpl3Plus; mainProgram = "gnulib-tool"; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index 1e6c2b94f23..8fa555cf809 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -12,42 +12,42 @@ let phpMajor = lib.versions.majorMinor php.version; - version = "1.90.0"; + version = "1.91.0"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-Cq44SJXe8B/RtVGFDDljDBPVs85ELa1K8B7q1u5SEug="; - "8.2" = "sha256-YZ6rEYfssG8bF40wpEGvW5zb1aoIpo3pM+AEZ7yU74E="; + "8.1" = "sha256-PIpfTeHWVO8MJ4+c8o1iC477M+HXzuHbnwv1EkYkQHY="; + "8.2" = "sha256-wEdEFooXlJTeuVfMeX3OI3uKJ5Acj1ZqmVYt6fyGQXI="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-Gc0kin1z4WLT67lQjfQb1yxZ45bo/q9KV4RQN5zmnTc="; - "8.2" = "sha256-46OF4GMwHFG1CPQJfHI7OrMYGw2hJXgRIFLKcnaKnaI="; + "8.1" = "sha256-yEfWtUegN4HVRS95eY3vYA97iGAaY2gxoGtb9DZpXhY="; + "8.2" = "sha256-FGbgozRmniS/rtAcvPiA+w8miauc8Gr/np5NdP4iGT8="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-rV4YoqGOOQWK2WR5RY7SQ/xePpD54vA4+Km8rFNpv4g="; - "8.2" = "sha256-9NuJfa/n3/tyiSn7lcrOUhD+eYUuanJsrzVAJ9cYWhs="; + "8.1" = "sha256-zfVx3NGkjhZK7YjTi8FBJyrn++Ub7vlFDCmiY/7F/yE="; + "8.2" = "sha256-gMoBIsvnR6lQMT4IaHWJEp+GbU/Yiid+pmDejR/vAUA="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-G9cep5apYGFEdTOka3QClteCmEUktLtV8I+oIBzsZ9U="; - "8.2" = "sha256-3wGiekRaGUEHdTpUniPz0Nay2AM0DOQfgFUAC1ezBCs="; + "8.1" = "sha256-UDd4knBfgdUriJ6N1cfka/iCIjaWiOgIbrq6kNkYUjA="; + "8.2" = "sha256-BZzFVLfebKzuSDz2DQEwd9HOxJ1nZSNmQHpayiGe8qI="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-BKdngfG78U0lHa7MTW1kndeM2umyEn7ns5T4mglLWnA="; - "8.2" = "sha256-02kXdXqj8HuJG0NblkwYPvgiAmbxC19X0xQ7XU2anhg="; + "8.1" = "sha256-51w3Ji8R6ulloZuTPHu/0gkYiq33H1tMOwrGe2DWtRI="; + "8.2" = "sha256-0p6CNKjhdD3L6x6gtMKLTKrHUO4LMwXpVU7hR32ejMI="; }; }; }; diff --git a/pkgs/development/tools/misc/kool/default.nix b/pkgs/development/tools/misc/kool/default.nix index 370aebb3aca..5b326beb1ef 100644 --- a/pkgs/development/tools/misc/kool/default.nix +++ b/pkgs/development/tools/misc/kool/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kool"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "kool-dev"; repo = "kool"; rev = version; - hash = "sha256-Gtw+47EQVPxiW9xjY/cWlE4aJ1aYYhpvsVQzt0EnI8I="; + hash = "sha256-YVgUKA7bMcncZDYaxaN2kCbE3JUmM9aM3GoQkOXEWpA="; }; - vendorHash = "sha256-8t+OZB9jrlOVHLURPmtz0ent6COEOVMFfObe2LH1jRM="; + vendorHash = "sha256-zsrqppHl7Z8o+J1SzZnv1jOdPO04JaF1K38a//+uAxU="; ldflags = [ "-s" diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 49b2fddba1d..c16aa954e64 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -12,12 +12,12 @@ "hash": "sha256:1v453q4sf0j8708ivs1zmdf645hgimqvxfc8xz7czgnnmipn3zdr" }, "5.15": { - "version": "5.15.137", - "hash": "sha256:1xxjbxldrhmnh2q6rykpxyfbj8xqgl82q30n8sfavrzr14bb4jcp" + "version": "5.15.138", + "hash": "sha256:1ajaxy97gx0c9cdxiyxa49ykfsykir22i9abfrcizh71ci0yb15g" }, "5.10": { - "version": "5.10.199", - "hash": "sha256:1h944syk7n6c4j1djlx19n77alzwbxcdza77c9ykicgfynhpgsm0" + "version": "5.10.200", + "hash": "sha256:012i41bj8rcqn0vhfxrwq3gg82nb6pp2cwq8n146wj47pwgrcbcx" }, "5.4": { "version": "5.4.260", diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index e9af8a2be35..9cf5f46cfb8 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19438"; - sha256 = "14bdnxw23d0pl53b1rn7g69wn9a7hr6c0q8zd5p6j2aap0i7c4a4"; + rev = "19441"; + sha256 = "1z0x8cw9nr7qf5qh3xjf6rg20q0i79bg71lik847sabyb6vcrk0z"; } , ... }: diff --git a/pkgs/tools/X11/xprintidle-ng/default.nix b/pkgs/tools/X11/xprintidle-ng/default.nix index fdb3b7c58a5..ec8a2ed459d 100644 --- a/pkgs/tools/X11/xprintidle-ng/default.nix +++ b/pkgs/tools/X11/xprintidle-ng/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { sha256 = "0a5024vimpfrpj6w60j1ad8qvjkrmxiy8w1yijxfwk917ag9rkpq"; }; + patches = [ + ./fix-config_h-includes-should-be-first.patch + ]; + postPatch = '' substituteInPlace configure.ac \ --replace "AC_PREREQ([2.62])" "AC_PREREQ([2.64])" @@ -59,8 +63,8 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "A command-line tool to print idle time from libXss"; - homepage = "http://taktoa.me/xprintidle-ng/"; - license = lib.licenses.gpl2; + homepage = "https://github.com/taktoa/xprintidle-ng"; + license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/tools/X11/xprintidle-ng/fix-config_h-includes-should-be-first.patch b/pkgs/tools/X11/xprintidle-ng/fix-config_h-includes-should-be-first.patch new file mode 100644 index 00000000000..01b4b5d63bd --- /dev/null +++ b/pkgs/tools/X11/xprintidle-ng/fix-config_h-includes-should-be-first.patch @@ -0,0 +1,62 @@ +Fixes the config.h include error during build: + +```console +In file included from src/xprintidle-ng.c:36: +lib/time.h:28:3: error: #error "Please include config.h first." + 28 | #error "Please include config.h first." + | ^~~~~ +``` + +Introduced since gnulib upgrade: +* https://github.com/coreutils/gnulib/commit/8ad7bc6 +* https://lists.gnu.org/archive/html/bug-gnulib/2023-04/msg00088.html +* https://www.gnu.org/software/gnulib/manual/html_node/Source-changes.html + +The last version of gnulib now checks that config.h is the first include +in every compilation unit. + +This is not the case with the xprintidle-ng source code, so this patch +moves these `config.h` inclusions to be first. + +--- + src/time-format.c | 2 +- + src/xprintidle-ng.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/time-format.c b/src/time-format.c +index 3a46749..4c0a4d2 100644 +--- a/src/time-format.c ++++ b/src/time-format.c +@@ -18,10 +18,10 @@ + // 51 Franklin Street, Fifth Floor + // Boston, MA 02110-1301, USA. + ++#include <config.h> + #include <stdbool.h> + #include <signal.h> + #include <time.h> +-#include <config.h> + #include "system.h" + #include "xalloc.h" + +diff --git a/src/xprintidle-ng.c b/src/xprintidle-ng.c +index 5156adf..ca69b2d 100644 +--- a/src/xprintidle-ng.c ++++ b/src/xprintidle-ng.c +@@ -28,13 +28,13 @@ + // Eivind Magnus Hvidevold <hvidevold@gmail.com>. + // kpowersave is licensed under the GNU GPL, version 2 _only_. + ++#include <config.h> + #include <X11/Xlib.h> + #include <X11/extensions/dpms.h> + #include <X11/extensions/scrnsaver.h> + #include <stdbool.h> + #include <signal.h> + #include <time.h> +-#include <config.h> + #include "system.h" + #include "errno.h" + #include "error.h" +-- +2.42.0 diff --git a/pkgs/tools/admin/winbox/default.nix b/pkgs/tools/admin/winbox/default.nix index 6c9b9290494..f4a39b2cbbc 100644 --- a/pkgs/tools/admin/winbox/default.nix +++ b/pkgs/tools/admin/winbox/default.nix @@ -10,15 +10,15 @@ let inherit (lib) last splitString; pname = "winbox"; - version = "3.38"; + version = "3.40"; name = "${pname}-${version}"; executable = fetchurl (if (wine.meta.mainProgram == "wine64") then { url = "https://download.mikrotik.com/winbox/${version}/winbox64.exe"; - sha256 = "RV+j8FQigpwPprR2xuMYpDRMDwugSZD+O2ZmyPZDz54="; + sha256 = "1dxny1qmq4pmdn40j9zk461p3qwwjin5d18ajhczrnqrcr2v1xwi"; } else { url = "https://download.mikrotik.com/winbox/${version}/winbox.exe"; - sha256 = "dh3P+otukhnEpVTqTu16MgIHVnJbzp4Voj+wZ3r5Fxg="; + sha256 = "11vmdkwi38y7wkdkgsqpfs4l2bdaj9yg6c8wlgfzp91227gjn5li"; }); # This is from the winbox AUR package: diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix index 6a4fa896161..cbdf1b76104 100644 --- a/pkgs/tools/misc/idutils/default.nix +++ b/pkgs/tools/misc/idutils/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, emacs, gnulib, autoconf, bison, automake, gettext, gperf, texinfo, perl, rsync}: +{ fetchurl, lib, stdenv, emacs, gnulib, autoconf, bison, automake, gettext, gperf, texinfo, perl, rsync, darwin }: stdenv.mkDerivation rec { pname = "idutils"; @@ -16,7 +16,12 @@ stdenv.mkDerivation rec { ./bootstrap --force --gnulib-srcdir=${gnulib} --skip-po --bootstrap-sync --no-git ''; - buildInputs = lib.optional stdenv.isLinux emacs; + buildInputs = lib.optionals stdenv.isLinux [ + emacs + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + ]; + nativeBuildInputs = [ gnulib autoconf bison automake gettext gperf texinfo perl rsync ]; doCheck = !stdenv.isDarwin; diff --git a/pkgs/tools/networking/wget2/default.nix b/pkgs/tools/networking/wget2/default.nix index 03eb6135ccd..9b77133de56 100644 --- a/pkgs/tools/networking/wget2/default.nix +++ b/pkgs/tools/networking/wget2/default.nix @@ -10,6 +10,7 @@ # libraries , brotli , bzip2 +, darwin , gpgme , libhsts , libidn2 @@ -65,7 +66,11 @@ stdenv.mkDerivation rec { xz zlib zstd - ] ++ lib.optional sslSupport openssl; + ] ++ lib.optionals sslSupport [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + ]; # TODO: include translation files autoreconfPhase = '' diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index a4c0fc51b64..34088e3afbc 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.8.7"; + version = "0.4.8.9"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-sg0rnHTbKKAMB/CQ7lsCQbK2hPOv3szMa4AIkxxVdJE="; + sha256 = "sha256-Wbt9iJD2ExtM5TRPPc6l3rIYK39PEP8MtOTYHxGyz2U="; }; outputs = [ "out" "geoip" ]; @@ -46,6 +46,11 @@ stdenv.mkDerivation rec { patches = [ ./disable-monotonic-timer-tests.patch ]; configureFlags = + # allow inclusion of GPL-licensed code (needed for Proof of Work defense for onion services) + # for more details see + # https://gitlab.torproject.org/tpo/onion-services/onion-support/-/wikis/Documentation/PoW-FAQ#compiling-c-tor-with-the-pow-defense + [ "--enable-gpl" ] + ++ # cross compiles correctly but needs the following lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--disable-tool-name-check" ] ++ @@ -113,7 +118,7 @@ stdenv.mkDerivation rec { the TCP protocol. ''; - license = licenses.bsd3; + license = with licenses; [ bsd3 gpl3Only ]; maintainers = with maintainers; [ thoughtpolice joachifm prusnak ]; diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index bb505f4062b..1a497c6affa 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -6,7 +6,7 @@ , callPackage, ghostscript_headless, harfbuzz , makeWrapper, installShellFiles , python3, ruby, perl, tk, jdk, bash, snobol4 -, coreutils, findutils, gawk, getopt, gnugrep, gnumake, gnupg, gnused, gzip, ncurses, zip +, coreutils, findutils, gawk, getopt, gnugrep, gnumake, gnupg, gnused, gzip, html-tidy, ncurses, zip , libfaketime, asymptote, biber-ms, makeFontsConf , useFixedHashes ? true , recurseIntoAttrs @@ -33,7 +33,7 @@ let stdenv lib bin tlpdb tlpdbxz tl installShellFiles coreutils findutils gawk getopt ghostscript_headless gnugrep - gnumake gnupg gnused gzip ncurses perl python3 ruby zip; + gnumake gnupg gnused gzip html-tidy ncurses perl python3 ruby zip; }; in overrides tlpdb; diff --git a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix index e9b448dc430..83f07016bcd 100644 --- a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix +++ b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix @@ -1,7 +1,7 @@ { stdenv, lib, tlpdb, bin, tlpdbxz, tl , installShellFiles , coreutils, findutils, gawk, getopt, ghostscript_headless, gnugrep -, gnumake, gnupg, gnused, gzip, ncurses, perl, python3, ruby, zip +, gnumake, gnupg, gnused, gzip, html-tidy, ncurses, perl, python3, ruby, zip }: oldTlpdb: @@ -88,6 +88,7 @@ in lib.recursiveUpdate orig rec { pkfix-helper.extraBuildInputs = [ ghostscript_headless ]; ps2eps.extraBuildInputs = [ ghostscript_headless ]; pst2pdf.extraBuildInputs = [ ghostscript_headless ]; + tex4ebook.extraBuildInputs = [ html-tidy ]; tex4ht.extraBuildInputs = [ ruby ]; texlive-scripts.extraBuildInputs = [ gnused ]; texlive-scripts-extra.extraBuildInputs = [ coreutils findutils ghostscript_headless gnused ]; @@ -241,6 +242,10 @@ in lib.recursiveUpdate orig rec { sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath pst2pdf.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/pst2pdf ''; + tex4ebook.postFixup = '' + sed -i '2ios.setenv("PATH","${lib.makeBinPath tex4ebook.extraBuildInputs}" .. (os.getenv("PATH") and ":" .. os.getenv("PATH") or ""))' "$out"/bin/tex4ebook + ''; + tex4ht.postFixup = '' sed -i -e '2iPATH="${lib.makeBinPath tex4ht.extraBuildInputs}''${PATH:+:$PATH}"' -e 's/\\rubyCall//g;' "$out"/bin/htcontext ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f43d3eb223..604f9a5674e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14948,17 +14948,7 @@ with pkgs; wget = callPackage ../tools/networking/wget { }; - wget2 = callPackage ../tools/networking/wget2 { - # update breaks grub2 - gnulib = pkgs.gnulib.overrideAttrs { - version = "20210208"; - src = fetchgit { - url = "https://git.savannah.gnu.org/r/gnulib.git"; - rev = "0b38e1d69f03d3977d7ae7926c1efeb461a8a971"; - hash = "sha256-9z/Vg3/g5WRWHH9I0QR6BZ5JCJBo+lEMLAM6xpFPchk="; - }; - }; - }; + wget2 = callPackage ../tools/networking/wget2 { }; wgpu-utils = callPackage ../tools/graphics/wgpu-utils { inherit (darwin.apple_sdk.frameworks) QuartzCore; @@ -24423,8 +24413,8 @@ with pkgs; boringssl = callPackage ../development/libraries/boringssl { }; - wolfssl = callPackage ../development/libraries/wolfssl { - inherit (darwin.apple_sdk.frameworks) Security; + wolfssl = darwin.apple_sdk_11_0.callPackage ../development/libraries/wolfssl { + inherit (darwin.apple_sdk_11_0.frameworks) Security; }; openssl = openssl_3; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ff9aa962be7..635a8d71c2e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1296,8 +1296,6 @@ let ocamlscript = callPackage ../development/tools/ocaml/ocamlscript { }; - ocamlsdl = callPackage ../development/ocaml-modules/ocamlsdl { }; - ocb-stubblr = callPackage ../development/ocaml-modules/ocb-stubblr { }; ocf = callPackage ../development/ocaml-modules/ocf { }; |