diff --git a/pkgs/applications/file-managers/mc/default.nix b/pkgs/applications/file-managers/mc/default.nix index 6f80c2c5e928..d261dab6e6e2 100644 --- a/pkgs/applications/file-managers/mc/default.nix +++ b/pkgs/applications/file-managers/mc/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchurl +, buildPackages , pkg-config , glib , gpm @@ -31,6 +32,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-6ZTZvppxcumsSkrWIQeSH2qjEuZosFbf5bi867r1OAM="; }; + patches = [ + # Add support for PERL_FOR_BUILD to fix cross-compilation: + # https://midnight-commander.org/ticket/4399 + (fetchurl { + url = "https://midnight-commander.org/raw-attachment/ticket/4399/0001-configure.ac-introduce-PERL_FOR_BUILD.patch"; + hash = "sha256-i4cbg/pner+yPfgmP04DEIvpNDlM9YDca1TNBdhWhwI="; + }) + ]; + nativeBuildInputs = [ pkg-config autoreconfHook unzip ] # The preFixup hook rewrites the binary, which invaliates the code # signature. Add the fixup hook to sign the output. @@ -52,7 +62,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = [ "PERL=${perl}/bin/perl" ]; + configureFlags = [ + # used for vfs helpers at run time: + "PERL=${perl}/bin/perl" + # used for .hlp generation at build time: + "PERL_FOR_BUILD=${buildPackages.perl}/bin/perl" + + # configure arguments have a bunch of build-only dependencies. + # Avoid their retention in final closure. + "--disable-configure-args" + ]; postPatch = '' substituteInPlace src/filemanager/ext.c \ @@ -62,11 +81,6 @@ stdenv.mkDerivation rec { --replace /bin/cat ${coreutils}/bin/cat ''; - preFixup = '' - # remove unwanted build-dependency references - sed -i -e "s!PKG_CONFIG_PATH=''${PKG_CONFIG_PATH}!PKG_CONFIG_PATH=$(echo "$PKG_CONFIG_PATH" | sed -e 's/./0/g')!" $out/bin/mc - ''; - postFixup = lib.optionalString (!stdenv.isDarwin) '' # libX11.so is loaded dynamically so autopatch doesn't detect it patchelf \ diff --git a/pkgs/applications/kde/messagelib.nix b/pkgs/applications/kde/messagelib.nix index 3273716ca673..193b9cadf53c 100644 --- a/pkgs/applications/kde/messagelib.nix +++ b/pkgs/applications/kde/messagelib.nix @@ -1,12 +1,11 @@ { mkDerivation, lib, kdepimTeam, - cmake_3_23, extra-cmake-modules, kdoctools, akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee, grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts, kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap, kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo, - pimcommon, qca-qt5, qtwebengine, syntax-highlighting + pimcommon, qca-qt5, qtwebengine, syntax-highlighting, fetchpatch }: mkDerivation { @@ -15,7 +14,18 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; - nativeBuildInputs = [ (extra-cmake-modules.override { cmake = cmake_3_23; }) kdoctools ]; + patches = [ + # fix compatibility with cmake 3.24 + (fetchpatch { + url = "https://invent.kde.org/pim/messagelib/-/commit/6eaef36d42bdb05f3.patch"; + hash = "sha256-H0ayU81HxX5moHOQ3hDW7tg824oqK1p9atrBhuvZ8K8="; + }) + (fetchpatch { + url = "https://invent.kde.org/pim/messagelib/-/commit/3edc93673f94604c2.patch"; + hash = "sha256-tBFWCfttjDjyQyWnKdhVfLY6QsixzqqYuvD77GVH080="; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi-notes akonadi-search gpgme grantlee grantleetheme karchive kcodecs kconfig kconfigwidgets kiconthemes kio kjobwidgets kldap diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix index bacb622e2c8b..7b98b429c82e 100644 --- a/pkgs/applications/misc/batsignal/default.nix +++ b/pkgs/applications/misc/batsignal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "batsignal"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; rev = version; - sha256 = "sha256-lXxHvcUlIl5yb4QBJ/poLdTbwBMBlDYmTz4tSdNtCyY="; + sha256 = "sha256-uDfC/PqT1Bb8np0l2DDIZUoNP9QpjxZH5v1hK2k1Miw="; }; buildInputs = [ libnotify glib ]; diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix index e6476cb42212..68dc30c90080 100644 --- a/pkgs/applications/misc/tickrs/default.nix +++ b/pkgs/applications/misc/tickrs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tickrs"; - version = "0.14.4"; + version = "0.14.6"; src = fetchFromGitHub { owner = "tarkah"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OOsBo+NCfn++2XyfQVoeEPcbSv645Ng7g9s4W7X2xg4="; + sha256 = "sha256-tsPCx/4ap2udfZHRK5ebxRYEBYw2W6EgnDI6P3riV04="; }; - cargoSha256 = "sha256-HAkJKqoz4vrY4mGFSz6sylV6DdrjWvPfwb4BiLWEyKY="; + cargoSha256 = "sha256-xpUI8IflLqBrwsU5YccGzQlPUJT46GJa5AdsIv9qfjU="; nativeBuildInputs = [ perl ]; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index cda4a3738812..2a617587775c 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,8 +45,8 @@ } }, "ungoogled-chromium": { - "version": "104.0.5112.81", - "sha256": "0x17jzzvn2aqx3ahqyi6ijyn70sn79kg648r0ks9m5gib1bbgf0y", + "version": "104.0.5112.102", + "sha256": "0sjpmfln6c96c2i83q8c2v1jfii8527951nbnyqi0g4wam5jqrfj", "sha256bin64": null, "deps": { "gn": { @@ -56,8 +56,8 @@ "sha256": "1q06vsz9b4bb764wy1wy8n177z2pgpm97kq3rl1hmq185mz5fhra" }, "ungoogled-patches": { - "rev": "104.0.5112.81-1", - "sha256": "0dvwh470h06x5a4p8kw22pi4lvch16knh90i2kh10y0wfggqz78w" + "rev": "104.0.5112.102-1", + "sha256": "06l6af4a6ywjn6x02dgb5ywk057p30rylrvr483iwvrj4jlhqvii" } } } diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 633abdfa3ec8..dd2a34a60fa4 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.10.10"; + version = "0.10.11"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz"; - sha256 = "sha256-VXL4eeBK8hY5gw8tAdqKQGOc+z1AOAPDyHfBe/fDONc="; + sha256 = "sha256-tBgtSYKSoyze9qFWpy6IUdwMU9KCLZGEIpOkjLdHsHM="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 6048fb079edb..ec33f99809ef 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.87.0.403"; + version = "8.87.0.406"; rpath = lib.makeLibraryPath [ alsa-lib @@ -68,7 +68,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "sha256-ibugr15eRQ2gbvX8wmk2lFioLPST9ljAuWcJHCoi9l8="; + sha256 = "sha256-lWnQIdMmfz90h3tOWkQv0vo3HnRi3z6W27vK28+Ksjo="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 32f59a718f00..72e84487b28a 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "6.0.10"; + version = "6.0.12"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "sha256-+RFTFOZVf0w9HBlk05pEsssiFlEaPJ9XTq29QpuIil8="; + sha256 = "sha256-RIPFn0fLk2CbOoiZ4a5ungnbvfRWFQQUypCYVvVIQms="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/development/coq-modules/coq-record-update/default.nix b/pkgs/development/coq-modules/coq-record-update/default.nix index 63b97b07dd7b..fcc7b0362a0b 100644 --- a/pkgs/development/coq-modules/coq-record-update/default.nix +++ b/pkgs/development/coq-modules/coq-record-update/default.nix @@ -1,12 +1,13 @@ -{ lib, mkCoqDerivation, coq, version ? null , paco, coq-ext-lib }: +{ lib, mkCoqDerivation, coq, version ? null }: with lib; mkCoqDerivation rec { pname = "coq-record-update"; owner = "tchajed"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.10" "8.16"; out = "0.3.0"; } + { case = range "8.10" "8.16"; out = "0.3.1"; } ] null; + release."0.3.1".sha256 = "sha256-DyGxO2tqmYZZluXN6Oy5Tw6fuLMyuyxonj8CCToWKkk="; release."0.3.0".sha256 = "1ffr21dd6hy19gxnvcd4if2450iksvglvkd6q5713fajd72hmc0z"; releaseRev = v: "v${v}"; buildFlags = "NO_TEST=1"; diff --git a/pkgs/development/libraries/hmat-oss/default.nix b/pkgs/development/libraries/hmat-oss/default.nix new file mode 100644 index 000000000000..3455cf250ce6 --- /dev/null +++ b/pkgs/development/libraries/hmat-oss/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, blas +, lapack +}: + + +stdenv.mkDerivation rec { + pname = "hmat-oss"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "jeromerobert"; + repo = "hmat-oss"; + rev = "refs/tags/${version}"; + sha256 = "sha256-Xc8AbeyEtM6R5I4HdgF4XR5/b8ZYBOv34kY1xrYk/Jw="; + }; + + cmakeFlags = [ + "-DHMAT_GIT_VERSION=OFF" + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ blas lapack ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "A hierarchical matrix C/C++ library"; + homepage = "https://github.com/jeromerobert/hmat-oss"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ gdinh ]; + }; +} diff --git a/pkgs/development/libraries/libportal/default.nix b/pkgs/development/libraries/libportal/default.nix index 29080f119cd4..93ca52c243c6 100644 --- a/pkgs/development/libraries/libportal/default.nix +++ b/pkgs/development/libraries/libportal/default.nix @@ -30,11 +30,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-wDDE43UC6FBgPYLS+WWExeheURCH/3fCKu5oJg7GM+A="; }; + # TODO: remove on 0.7 patches = [ + # https://github.com/flatpak/libportal/pull/107 (fetchpatch { - name = "fix-build-on-darwin.patch"; - url = "https://github.com/flatpak/libportal/pull/106/commits/73f63ee57669c4fa604a7772484cd235d4fb612c.patch"; - sha256 = "sha256-c9WUQPhn4IA3X1ie7SwnxuZXdvpPkpGdU4xgDwKN/L0="; + name = "check-presence-of-sys-vfs-h.patch"; + url = "https://github.com/flatpak/libportal/commit/e91a5d2ceb494ca0dd67295736e671b0142c7540.patch"; + sha256 = "sha256-uFyhlU2fJgW4z0I31fABdc+pimLFYkqM4lggSIFs1tw="; }) ]; diff --git a/pkgs/development/ocaml-modules/cmdliner/1_1.nix b/pkgs/development/ocaml-modules/cmdliner/1_1.nix index 001d967fca1b..9e7f6db6e695 100644 --- a/pkgs/development/ocaml-modules/cmdliner/1_1.nix +++ b/pkgs/development/ocaml-modules/cmdliner/1_1.nix @@ -1,5 +1,8 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }: +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") + "cmdliner 1.1 is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation rec { pname = "cmdliner"; version = "1.1.1"; @@ -9,7 +12,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-oa6Hw6eZQO+NHdWfdED3dtHckm4BmEbdMiAuRkYntfs="; }; - minimalOCamlVersion = "4.08"; nativeBuildInputs = [ ocaml ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/python-modules/aiocoap/default.nix b/pkgs/development/python-modules/aiocoap/default.nix index 2e8fd124fa2b..db9cb191c9cf 100644 --- a/pkgs/development/python-modules/aiocoap/default.nix +++ b/pkgs/development/python-modules/aiocoap/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiocoap"; - version = "0.4.3"; + version = "0.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "chrysn"; repo = pname; rev = version; - sha256 = "sha256-fTRDx9VEXDoMKM78YYL+mBEdvhbLtHiHdo66kwRnNhA="; + sha256 = "sha256-m/tU1qf+CB9/2eoXktpBSgwjj8lMuMQ/WGYL6HhMNxA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index 432958255d2c..ee4ced91c6a9 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.1.7"; + version = "2.1.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "v${version}"; - hash = "sha256-1GJef+6Aqah9W9yPwqD8QCh0sNn/X9UwlzmsCk51QMY="; + hash = "sha256-iPCFflibEqA286j+7Vp4ZQaO9e6Bp+o7A/a7DELJcxA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index c9ef2298559f..d9de15ad76ee 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -1,54 +1,69 @@ { lib -, buildPythonPackage -, fetchPypi , ansiwrap +, azure-datalake-store +, azure-storage-blob +, boto3 +, buildPythonPackage , click -, future -, pyyaml -, nbformat -, nbconvert -, nbclient -, six -, tqdm -, jupyter-client -, requests , entrypoints -, tenacity -, futures ? null -, backports_tempfile -, isPy27 -, pytestCheckHook +, fetchPypi +, gcsfs +, nbclient +, nbformat +, pyarrow +, PyGithub , pytest-mock +, pytestCheckHook +, pythonOlder +, pyyaml +, requests +, tenacity +, tqdm }: buildPythonPackage rec { pname = "papermill"; - version = "2.3.4"; + version = "2.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "be12d2728989c0ae17b42fcb05b623500004e94b34f56bd153355ccebb84a59a"; + hash = "sha256-b4+KmwazlnfyB8CRAMjThrz1kvDLvdqfD1DoFEVpdic="; }; propagatedBuildInputs = [ ansiwrap click - future pyyaml nbformat - nbconvert nbclient - six tqdm - jupyter-client requests entrypoints tenacity - ] ++ lib.optionals isPy27 [ - futures - backports_tempfile ]; + passthru.optional-dependencies = { + azure = [ + azure-datalake-store + azure-storage-blob + ]; + gcs = [ + gcsfs + ]; + github = [ + PyGithub + ]; + hdfs = [ + pyarrow + ]; + s3 = [ + boto3 + ]; + }; + checkInputs = [ pytestCheckHook pytest-mock @@ -58,13 +73,17 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - # the test suite depends on cloud resources azure/aws + # The test suite depends on cloud resources azure/aws doCheck = false; + pythonImportsCheck = [ + "papermill" + ]; + meta = with lib; { - description = "Parametrize and run Jupyter and nteract Notebooks"; + description = "Parametrize and run Jupyter and interact with notebooks"; homepage = "https://github.com/nteract/papermill"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/striprtf/default.nix b/pkgs/development/python-modules/striprtf/default.nix index 52fe3769e224..040985107003 100644 --- a/pkgs/development/python-modules/striprtf/default.nix +++ b/pkgs/development/python-modules/striprtf/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "striprtf"; - version = "0.0.20"; + version = "0.0.21"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8eMeMrazl1o9XcIyWICDg6ycRMtFMfgTUNz51w9hAmc="; + sha256 = "sha256-/wqYbdJ+OI/RTODnKB34e7zADHzCPEX0LkTausqFNtY="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 96ca562dcd84..38587c3f2261 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.13.4"; + version = "3.13.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NTHh5kWu3Nri+Yoi9yvkHlWRD3slYraktKfcah7CEY8="; + sha256 = "sha256-1+BycZ1fFEfbqoHs/TDnGZXc8IRzWzy2pZ2YkTOPMaA="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 4d0fc2908e65..f681d2b369f0 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "6.4.3"; + version = "6.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LzpEHUL1RUPtg4mQqViGHQ1iCfIwQ7KTlEcDZQfhHzA="; + sha256 = "sha256-eTYm3anMKhgoaB8t5jald5XRD3PIVijJP4vmh0pA9lE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/build-managers/cmake/3_23.nix b/pkgs/development/tools/build-managers/cmake/3_23.nix deleted file mode 100644 index 863d82d8aaed..000000000000 --- a/pkgs/development/tools/build-managers/cmake/3_23.nix +++ /dev/null @@ -1,168 +0,0 @@ -{ lib -, stdenv -, buildPackages -, bzip2 -, curlMinimal -, expat -, fetchurl -, libarchive -, libuv -, ncurses -, openssl -, pkg-config -, qtbase -, rhash -, sphinx -, texinfo -, wrapQtAppsHook -, xz -, zlib -, SystemConfiguration -, ps ? null -, isBootstrap ? false -, useOpenSSL ? !isBootstrap -, useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) -, uiToolkits ? [] # can contain "ncurses" and/or "qt5" -, buildDocs ? !(isBootstrap || (uiToolkits == [])) -}: - -let - cursesUI = lib.elem "ncurses" uiToolkits; - qt5UI = lib.elem "qt5" uiToolkits; -in -# Accepts only "ncurses" and "qt5" as possible uiToolkits -assert lib.subtractLists [ "ncurses" "qt5" ] uiToolkits == []; -stdenv.mkDerivation rec { - pname = "cmake" - + lib.optionalString isBootstrap "-boot" - + lib.optionalString cursesUI "-cursesUI" - + lib.optionalString qt5UI "-qt5UI"; - version = "3.23.3"; - - src = fetchurl { - url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; - sha256 = "sha256-Bv768K2UmJcktW9zMJPCYj9vhDVuW+uVWVf5zj7iiAk="; - }; - - patches = [ - # Don't search in non-Nix locations such as /usr, but do search in our libc. - ./001-search-path.diff - # Don't depend on frameworks. - ./002-application-services.diff - # Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d - ./003-libuv-application-services.diff - ] - ++ lib.optional stdenv.isCygwin ./004-cygwin.diff - # Derived from https://github.com/curl/curl/commit/31f631a142d855f069242f3e0c643beec25d1b51 - ++ lib.optional (stdenv.isDarwin && isBootstrap) ./005-remove-systemconfiguration-dep.diff - # On Darwin, always set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG. - ++ lib.optional stdenv.isDarwin ./006-darwin-always-set-runtime-c-flag.diff; - - outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" "info" ]; - setOutputFlags = false; - - setupHook = ./setup-hook.sh; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - nativeBuildInputs = [ - pkg-config - setupHook - ] - ++ lib.optionals buildDocs [ texinfo ] - ++ lib.optionals qt5UI [ wrapQtAppsHook ]; - - buildInputs = lib.optionals useSharedLibraries [ - bzip2 - curlMinimal - expat - libarchive - xz - zlib - libuv - rhash - ] - ++ lib.optional useOpenSSL openssl - ++ lib.optional cursesUI ncurses - ++ lib.optional qt5UI qtbase - ++ lib.optional (stdenv.isDarwin && !isBootstrap) SystemConfiguration; - - propagatedBuildInputs = lib.optional stdenv.isDarwin ps; - - preConfigure = '' - fixCmakeFiles . - substituteInPlace Modules/Platform/UnixPaths.cmake \ - --subst-var-by libc_bin ${lib.getBin stdenv.cc.libc} \ - --subst-var-by libc_dev ${lib.getDev stdenv.cc.libc} \ - --subst-var-by libc_lib ${lib.getLib stdenv.cc.libc} - # CC_FOR_BUILD and CXX_FOR_BUILD are used to bootstrap cmake - configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD $configureFlags" - ''; - - configureFlags = [ - "CXXFLAGS=-Wno-elaborated-enum-base" - "--docdir=share/doc/${pname}${version}" - ] ++ (if useSharedLibraries - then [ "--no-system-jsoncpp" "--system-libs" ] - else [ "--no-system-libs" ]) # FIXME: cleanup - ++ lib.optional qt5UI "--qt-gui" - ++ lib.optionals buildDocs [ - "--sphinx-build=${sphinx}/bin/sphinx-build" - "--sphinx-info" - "--sphinx-man" - ] - # Workaround https://gitlab.kitware.com/cmake/cmake/-/issues/20568 - ++ lib.optionals stdenv.hostPlatform.is32bit [ - "CFLAGS=-D_FILE_OFFSET_BITS=64" - "CXXFLAGS=-D_FILE_OFFSET_BITS=64" - ] - ++ [ - "--" - # We should set the proper `CMAKE_SYSTEM_NAME`. - # http://www.cmake.org/Wiki/CMake_Cross_Compiling - # - # Unfortunately cmake seems to expect absolute paths for ar, ranlib, and - # strip. Otherwise they are taken to be relative to the source root of the - # package being built. - "-DCMAKE_CXX_COMPILER=${stdenv.cc.targetPrefix}c++" - "-DCMAKE_C_COMPILER=${stdenv.cc.targetPrefix}cc" - "-DCMAKE_AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" - "-DCMAKE_RANLIB=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" - "-DCMAKE_STRIP=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip" - - "-DCMAKE_USE_OPENSSL=${if useOpenSSL then "ON" else "OFF"}" - # Avoid depending on frameworks. - "-DBUILD_CursesDialog=${if cursesUI then "ON" else "OFF"}" - ]; - - # make install attempts to use the just-built cmake - preInstall = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - sed -i 's|bin/cmake|${buildPackages.cmakeMinimal}/bin/cmake|g' Makefile - ''; - - dontUseCmakeConfigure = true; - enableParallelBuilding = true; - - # This isn't an autoconf configure script; triples are passed via - # CMAKE_SYSTEM_NAME, etc. - configurePlatforms = [ ]; - - doCheck = false; # fails - - meta = with lib; { - homepage = "https://cmake.org/"; - description = "Cross-platform, open-source build system generator"; - longDescription = '' - CMake is an open-source, cross-platform family of tools designed to build, - test and package software. CMake is used to control the software - compilation process using simple platform and compiler independent - configuration files, and generate native makefiles and workspaces that can - be used in the compiler environment of your choice. - ''; - changelog = "https://cmake.org/cmake/help/v${lib.versions.majorMinor version}/release/${lib.versions.majorMinor version}.html"; - license = licenses.bsd3; - maintainers = with maintainers; [ ttuegel lnl7 AndersonTorres ]; - platforms = platforms.all; - broken = (qt5UI && stdenv.isDarwin); - }; -} diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 230dd7b47b3d..6d28a2056c94 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.16.4"; + version = "0.17.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TiXP7ftzQ3yWWfTDqfO33Fuk0XlgVwgt1+tZqSr6mJQ="; + sha256 = "sha256-8rp0bfgqPl48RHIPSp3rpDAmPQ0eZnvAbO66jbp6TCk="; }; - vendorSha256 = "sha256-YsnqasRywNtJLq0noUpil9k2AILXJz//+aYoy/tlRIo="; + vendorSha256 = "sha256-4Hm8zqeRNhIX2aN7JdEX1GruqbEafpBjY1r/vijPs8M="; ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; diff --git a/pkgs/development/tools/ocaml/crunch/default.nix b/pkgs/development/tools/ocaml/crunch/default.nix index 07082b7f5d22..54f6639fbeba 100644 --- a/pkgs/development/tools/ocaml/crunch/default.nix +++ b/pkgs/development/tools/ocaml/crunch/default.nix @@ -1,18 +1,18 @@ -{ lib, buildDunePackage, fetchurl, ocaml, cmdliner, ptime }: +{ lib, buildDunePackage, fetchurl, ocaml, cmdliner_1_1, ptime }: buildDunePackage rec { pname = "crunch"; - version = "3.1.0"; - - useDune2 = true; + version = "3.3.1"; src = fetchurl { - url = "https://github.com/mirage/ocaml-crunch/releases/download/v${version}/crunch-v${version}.tbz"; - sha256 = "0d26715a4h9r1wibnc12xy690m1kan7hrcgbb5qk8x78zsr67lnf"; + url = "https://github.com/mirage/ocaml-crunch/releases/download/v${version}/crunch-${version}.tbz"; + sha256 = "sha256-LFug1BELy7dzHLpOr7bESnSHw/iMGtR0AScbaf+o7Wo="; }; - propagatedBuildInputs = [ cmdliner ptime ]; + buildInputs = [ cmdliner_1_1 ]; + + propagatedBuildInputs = [ ptime ]; outputs = [ "lib" "bin" "out" ]; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 267de2fb7474..35ef199c9d6a 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,11 +52,11 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.208-hardened1.patch", - "sha256": "0pknl9ac0qn8yig1hfm3hmlmvf5pxswymyilv0w3kcsacgg22xyi", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.208-hardened1/linux-hardened-5.4.208-hardened1.patch" + "name": "linux-hardened-5.4.210-hardened1.patch", + "sha256": "0qbz9h97m0lxa45j85sv2lhhmrlx9nv5z0bf5vdhyq6g0h7d2mm9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.210-hardened1/linux-hardened-5.4.210-hardened1.patch" }, - "sha256": "0i0fxv04r6g5ha84chih5cqsy59cv67pjxp8zfrdk1qapwddyvgh", - "version": "5.4.208" + "sha256": "13l8zh5balciqhi4k4328sznza30v8g871wxcqqka61cij3rc0wl", + "version": "5.4.210" } } diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 636ec481748b..4bf8303b2a41 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.60"; + version = "5.15.61"; # 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 = "0yi3bvqz4qn8nvgr910ic09zvpisafwi282j0y2gvbvgr7vlb59d"; + sha256 = "0hpx0ziz162lc41jwi2ybj3qgidinjcsp71lchvmp6h0vyiddj9v"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.18.nix b/pkgs/os-specific/linux/kernel/linux-5.18.nix index ebba401dd671..096f197a1a1c 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.18.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.18.17"; + version = "5.18.18"; # 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 = "0i7yms65b8kxjm92ahic0787vb9h7xblbwp1v6cq8zpns3ivv0ih"; + sha256 = "0as0cslwz6zdiwd5wzcjggw3qpa9hzvfmxlhy72jdhn5vk47dhy1"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.19.nix b/pkgs/os-specific/linux/kernel/linux-5.19.nix index 79d106150b4b..09e226ba3410 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.19.1"; + version = "5.19.2"; # 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 = "0mgak94i4z9s1kdyw211ks4si4ngaii71xdiin06pim2ds97pqpl"; + sha256 = "0gg63y078k886clgfq4k5n7nh2r0359ksvf8wd06rv01alghmr28"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 00bb005f636a..bc66e3c8b7eb 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -12,30 +12,40 @@ let kernel = callPackage # a hacky way of extracting parameters from callPackage ({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { }; + + selectHighestVersion = a: b: if lib.versionOlder a.version b.version + then b + else a; in rec { + # Official Unix Drivers - https://www.nvidia.com/en-us/drivers/unix/ + # Branch/Maturity data - http://people.freedesktop.org/~aplattner/nvidia-versions.txt + # Policy: use the highest stable version as the default (on our master). - stable = if stdenv.hostPlatform.system == "x86_64-linux" - then generic { - version = "515.65.01"; - sha256_64bit = "sha256-BJLdxbXmWqAMvHYujWaAIFyNCOEDtxMQh6FRJq7klek="; - openSha256 = "sha256-GCCDnaDsbXTmbCYZBCM3fpHmOSWti/DkBJwYrRGAMPI="; - settingsSha256 = "sha256-kBELMJCIWD9peZba14wfCoxsi3UXO3ehFYcVh4nvzVg="; - persistencedSha256 = "sha256-P8oT7g944HvNk2Ot/0T0sJM7dZs+e0d+KwbwRrmsuDY="; - } - else legacy_390; + stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest; - # see https://www.nvidia.com/en-us/drivers/unix/ "Production branch" - production = stable; + production = generic { + version = "515.65.01"; + sha256_64bit = "sha256-BJLdxbXmWqAMvHYujWaAIFyNCOEDtxMQh6FRJq7klek="; + openSha256 = "sha256-GCCDnaDsbXTmbCYZBCM3fpHmOSWti/DkBJwYrRGAMPI="; + settingsSha256 = "sha256-kBELMJCIWD9peZba14wfCoxsi3UXO3ehFYcVh4nvzVg="; + persistencedSha256 = "sha256-P8oT7g944HvNk2Ot/0T0sJM7dZs+e0d+KwbwRrmsuDY="; + }; - beta = generic { + latest = selectHighestVersion production (generic { + version = "495.46"; + sha256_64bit = "2Dt30X2gxUZnqlsT1uqVpcUTBCV7Hs8vjUo7WuMcYvU="; + settingsSha256 = "vbcZYn+UBBGwjfrJ6SyXt3+JLBeNcXK4h8mjj7qxZPk="; + persistencedSha256 = "ieYqkVxe26cLw1LUgBsFSSowAyfZkTcItIzQCestCXI="; + }); + + beta = selectHighestVersion latest (generic { version = "515.43.04"; sha256_64bit = "sha256-PodaTTUOSyMW8rtdtabIkSLskgzAymQyfToNlwxPPcc="; openSha256 = "sha256-1bAr5dWZ4jnY3Uo2JaEz/rhw2HuW9LZ5bACmA1VG068="; settingsSha256 = "sha256-j47LtP6FNTPfiXFh9KwXX8vZOQzlytA30ZfW9N5F2PY="; persistencedSha256 = "sha256-hULBy0wnVpLH8I0L6O9/HfgvJURtE2whpXOgN/vb3Wo="; - broken = kernel.kernelAtLeast "5.19"; # Added at 2022-08-12 - }; + }); # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 768d4179111f..d6dcc7ad6cd0 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -103,7 +103,10 @@ let disallowedReferences = optional (!libsOnly) [ kernel.dev ]; passthru = { - open = mapNullable (hash: callPackage (import ./open.nix self hash) { }) openSha256; + open = mapNullable (hash: callPackage ./open.nix { + inherit hash broken; + nvidia_x11 = self; + }) openSha256; settings = (if settings32Bit then pkgsi686Linux.callPackage else callPackage) (import ./settings.nix self settingsSha256) { withGtk2 = preferGtk2; withGtk3 = !preferGtk2; diff --git a/pkgs/os-specific/linux/nvidia-x11/open.nix b/pkgs/os-specific/linux/nvidia-x11/open.nix index 5f8715aa7360..3e21dade83ae 100644 --- a/pkgs/os-specific/linux/nvidia-x11/open.nix +++ b/pkgs/os-specific/linux/nvidia-x11/open.nix @@ -1,8 +1,10 @@ -nvidia_x11: hash: { stdenv , lib , fetchFromGitHub , kernel +, nvidia_x11 +, hash +, broken ? false }: stdenv.mkDerivation { @@ -32,7 +34,7 @@ stdenv.mkDerivation { homepage = "https://github.com/NVIDIA/open-gpu-kernel-modules"; license = with licenses; [ gpl2Plus mit ]; platforms = platforms.linux; - broken = kernel.kernelAtLeast "5.19"; maintainers = with maintainers; [ nickcao ]; + inherit broken; }; } diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 3b2faf7eaa45..61f105a62bd4 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -17,11 +17,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.5.1"; + version = "5.5.2"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "9bad1edfd6631446da2d2331bd869887d7fe502f6eeaf62b2e43e2c113f02b6d"; + sha256 = "3f78aa69c3f28edc42b5900b9788fba39498d8bffda7fb9c772bb470865780cb"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index b8e1c9e1ebfc..2d122bf58d2c 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.36.0"; + version = "2.37.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - hash = "sha256-J+sjJEZlkNWGAt66iwNmlIgqzRgp3nKO62FzSXN4cGE="; + hash = "sha256-+1Io0sA+ZaGPReNfCTEnTzG3o0R6XyvpyA8bhXpEduM="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index d59f021678aa..06b1cea4f010 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.40.25"; + version = "0.40.26"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-MPfi6rfqlbrnl3CE0YKtIAUagqCB6f3cJtZ7mGUQ5Ng="; + sha256 = "sha256-onv7IGB8Tq1R0KDQkZQnzY5EWAk2hn+7LnbjZPicUUE="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "sha256-Iy01voXaCzbBEbJRxcLDzr5BKj4PHfcib3KH21VzFS4="; + vendorSha256 = "sha256-5MWEc3gWmBHWbasdGvgYPd4eelH+FwkoR9SAB/gi6nY="; doCheck = false; diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/servers/tracing/tempo/default.nix index 19f2df40ed45..d058a0b2931a 100644 --- a/pkgs/servers/tracing/tempo/default.nix +++ b/pkgs/servers/tracing/tempo/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tempo"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "grafana"; repo = "tempo"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-kxR+xwhthsK3gThs0jPJfWlsRG35kCuWvKH3Wr7ENTs="; + sha256 = "sha256-m7tfDd0Yjg4+VHZPxYJXEx2XNNodepMcPLucBjvd88s="; }; vendorSha256 = null; @@ -17,12 +17,19 @@ buildGoModule rec { subPackages = [ "cmd/tempo-cli" "cmd/tempo-query" - # FIXME: build is broken upstream, enable for next release - # "cmd/tempo-serverless" + "cmd/tempo-serverless" "cmd/tempo-vulture" "cmd/tempo" ]; + ldflags = [ + "-s" + "-w" + "-X=main.Version=${version}" + "-X=main.Branch=" + "-X=main.Revision=${version}" + ]; + # tests use docker doCheck = false; diff --git a/pkgs/tools/misc/xcp/default.nix b/pkgs/tools/misc/xcp/default.nix index 4b649aecb698..c427a802539e 100644 --- a/pkgs/tools/misc/xcp/default.nix +++ b/pkgs/tools/misc/xcp/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "xcp"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "tarka"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Kwt1qLuP63bIn0VY3oFEcbKh1GGBdObfOmtPV4DMQUU="; + sha256 = "sha256-fzwlDYjNCWAnMrRSGvR+OwL+TEs4eRsjqF7uPjui3T0="; }; # no such file or directory errors doCheck = false; - cargoSha256 = "sha256-wFOXRQSOfmGB6Zmkqn7KoK+vyHeFKyGNx7Zf2zzPcE4="; + cargoSha256 = "sha256-c3jUG/ysTzV/67HmGgFSM0KWKlQKo6iqOCQT4E9QA9k="; meta = with lib; { description = "An extended cp(1)"; diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index ac4d926a2eda..06fdaf193468 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.31.1"; + version = "0.31.2"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-8ISOyfLNtLW244HkCOpB38fhafnxRaOBBezpVz4Mb2o="; + sha256 = "sha256-btuBVG/ZF996RLTfB6HvMRuuZOwJGAMvoefVtw9SjME="; }; - cargoSha256 = "sha256-lBmJL7p7mqfly6CmZBFR2FFD4QlAccCAYU251HuI9jY="; + cargoSha256 = "sha256-r5+BBiC2IS7DAKTwPNW6mM41nlIgSeP4cNPRWXNFkrU="; nativeBuildInputs = [ mandown diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index f4830ad408ac..22ae4cb210c2 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "lldpd"; - version = "1.0.14"; + version = "1.0.15"; src = fetchurl { url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz"; - sha256 = "sha256-p0gZIU8Ral28QHo9SQyqAbpAGiSVF6yCajdAWcEtEug="; + sha256 = "sha256-9/46EwvpihnEkUee9g82uO5Bqea8TX8sQQM/Y5VqMSY="; }; configureFlags = [ diff --git a/pkgs/tools/networking/swagger-codegen3/default.nix b/pkgs/tools/networking/swagger-codegen3/default.nix index d1443ddd20a8..01c82c1fff54 100644 --- a/pkgs/tools/networking/swagger-codegen3/default.nix +++ b/pkgs/tools/networking/swagger-codegen3/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "3.0.34"; + version = "3.0.35"; pname = "swagger-codegen"; jarfilename = "${pname}-cli-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}"; - sha256 = "sha256-C6uSqb8o6hcK7r7NxlHckMBcdMf2APK4FYRpQFMaE9Y="; + sha256 = "sha256-GTqB2wyDguzxrVgnkGiQGgkDVt+caaoyRvUdpeItPcA="; }; dontUnpack = true; diff --git a/pkgs/tools/wayland/swayr/default.nix b/pkgs/tools/wayland/swayr/default.nix index f7daa1116edb..6a391a274451 100644 --- a/pkgs/tools/wayland/swayr/default.nix +++ b/pkgs/tools/wayland/swayr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "swayr"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromSourcehut { owner = "~tsdh"; repo = "swayr"; rev = "swayr-${version}"; - sha256 = "sha256-Od23QF4vasr1gvtahENLPkz4wbx1WFaN1mauB4iDftk="; + sha256 = "sha256-kHFo5FJMzPRlnYg5iER1ULThhfJ0pY5apJNXPyHrMzE="; }; - cargoSha256 = "sha256-ZgFTmeCrFpdGv9vkFKG7VY/tPeOIVKWCMk0JyrtJ22s="; + cargoSha256 = "sha256-Tm+LSL13COfKyH2021oiKme2yO9jurQ/F+U2y9klz18="; patches = [ ./icon-paths.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f53bc2fbc7e..6297c90c5633 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15841,11 +15841,6 @@ with pkgs; inherit (libsForQt5) qtbase wrapQtAppsHook; }; - cmake_3_23 = callPackage ../development/tools/build-managers/cmake/3_23.nix { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration; - inherit (libsForQt5) qtbase wrapQtAppsHook; - }; - cmakeMinimal = callPackage ../development/tools/build-managers/cmake { isBootstrap = true; qtbase = null; @@ -18525,6 +18520,8 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; + hmat-oss = callPackage ../development/libraries/hmat-oss { }; + hound = callPackage ../development/tools/misc/hound { }; hpx = callPackage ../development/libraries/hpx { diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 3dd6e2c43c30..6ae89a716f69 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -356,12 +356,13 @@ in { nvidiaPackages = dontRecurseIntoAttrs (lib.makeExtensible (_: callPackage ../os-specific/linux/nvidia-x11 { })); + nvidia_x11 = nvidiaPackages.stable; + nvidia_x11_beta = nvidiaPackages.beta; nvidia_x11_legacy340 = nvidiaPackages.legacy_340; nvidia_x11_legacy390 = nvidiaPackages.legacy_390; nvidia_x11_legacy470 = nvidiaPackages.legacy_470; - nvidia_x11_beta = nvidiaPackages.beta; + nvidia_x11_production = nvidiaPackages.production; nvidia_x11_vulkan_beta = nvidiaPackages.vulkan_beta; - nvidia_x11 = nvidiaPackages.stable; # this is not a replacement for nvidia_x11 # only the opensource kernel driver exposed for hydra to build