diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index ef8204e2cf53..bc1a9bad9b33 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -2858,6 +2858,17 @@ let }) ]; + stage1Options = { + options.boot.initrd.systemd.network.networks = mkOption { + type = with types; attrsOf (submodule { + # Default in initrd is dhcp-on-stop, which is correct if flushBeforeStage2 = false + config = mkIf config.boot.initrd.network.flushBeforeStage2 { + networkConfig.KeepConfiguration = mkDefault false; + }; + }); + }; + }; + stage1Config = let cfg = config.boot.initrd.systemd.network; in mkMerge [ @@ -2921,45 +2932,14 @@ let ]; kernelModules = [ "af_packet" ]; - systemd.services.nixos-flush-networkd = mkIf config.boot.initrd.network.flushBeforeStage2 { - description = "Flush Network Configuration"; - wantedBy = ["initrd.target"]; - after = ["systemd-networkd.service" "dbus.socket" "dbus.service"]; - before = ["shutdown.target" "initrd-switch-root.target"]; - conflicts = ["shutdown.target" "initrd-switch-root.target"]; - unitConfig.DefaultDependencies = false; - serviceConfig = { - # This service does nothing when starting, but brings down - # interfaces when switching root. This is the easiest way to - # ensure proper ordering while stopping. See systemd.unit(5) - # section on Before= and After=. The important part is that - # we are stopped before units we need, like dbus.service, - # and that we are stopped before starting units like - # initrd-switch-root.target - Type = "oneshot"; - RemainAfterExit = true; - ExecStart = "/bin/true"; - }; - # systemd-networkd doesn't bring down interfaces on its own - # when it exits (see: systemd-networkd(8)), so we have to do - # it ourselves. The networkctl command doesn't have a way to - # bring all interfaces down, so we have to iterate over the - # list and filter out unmanaged interfaces to bring them down - # individually. - preStop = '' - networkctl list --full --no-legend | while read _idx link _type _operational setup _; do - [ "$setup" = unmanaged ] && continue - networkctl down "$link" - done - ''; - }; - }) ]; in { + imports = [ stage1Options ]; + options = { systemd.network = commonOptions true; boot.initrd.systemd.network = commonOptions "shallow"; diff --git a/pkgs/applications/blockchains/fulcrum/default.nix b/pkgs/applications/blockchains/fulcrum/default.nix index c26efb5d4e60..584d6927d73a 100644 --- a/pkgs/applications/blockchains/fulcrum/default.nix +++ b/pkgs/applications/blockchains/fulcrum/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fulcrum"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "cculianu"; repo = "Fulcrum"; rev = "v${version}"; - sha256 = "sha256-guvOs/HsSuj5QOMTzmKxMaC8iUyTkVgEpp8pQ63aIIQ="; + sha256 = "sha256-iHVrJySNdbZ9RXP7QgsDy2o2U/EISAp1/9NFpcEOGeI="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 523573e3116c..d95b64f04298 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "irssi"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "irssi"; repo = "irssi"; rev = version; - hash = "sha256-a/+9M2zoywZBdOfXHrA4O6Q9W7HJZNTthB/aseUNefA="; + hash = "sha256-D+KMjkweStMqVhoQoiJPFt/G0vdf7x2FjYCvqGS8UqY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 3612892548fc..10bc3ca68637 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -6,7 +6,6 @@ , copyDesktopItems , makeDesktopItem , wrapGAppsHook -, glib , gsettings-desktop-schemas , zlib , enableX11 ? true @@ -26,10 +25,11 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ glib wrapGAppsHook ocamlPackages.ocaml ] - ++ lib.optional enableX11 copyDesktopItems; - buildInputs = [ gsettings-desktop-schemas ncurses zlib ] - ++ lib.optional stdenv.isDarwin Cocoa; + nativeBuildInputs = [ ocamlPackages.ocaml ] + ++ lib.optionals enableX11 [ copyDesktopItems wrapGAppsHook ]; + buildInputs = [ ncurses zlib ] + ++ lib.optionals enableX11 [ gsettings-desktop-schemas ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; preBuild = lib.optionalString enableX11 '' sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.lablgtk3}"/lib/ocaml/*/site-lib/lablgtk3)|" src/Makefile.OCaml diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index 014304592b4b..7e66aacf25c1 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.4.0.2"; + version = "3.4.0.3"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "refs/tags/v${version}"; - sha256 = "sha256-mAhdablRr97DXNmwRk8cA9Q0rS9PsEocVvNc686Gco0="; + hash = "sha256-TakQqyHKuiFdBL73JQzflNUMYmBINyY0flqitqoIpmg="; }; # On Darwin this package segfaults due to mismatch of pure and impure diff --git a/pkgs/development/ocaml-modules/containers/data.nix b/pkgs/development/ocaml-modules/containers/data.nix index bdad78cdf6f6..470ed354f25e 100644 --- a/pkgs/development/ocaml-modules/containers/data.nix +++ b/pkgs/development/ocaml-modules/containers/data.nix @@ -1,6 +1,7 @@ { buildDunePackage, containers , dune-configurator , gen, iter, qcheck-core +, mdx }: buildDunePackage { @@ -8,9 +9,8 @@ buildDunePackage { inherit (containers) src version doCheck; - duneVersion = "3"; - buildInputs = [ dune-configurator ]; + nativeCheckInputs = [ mdx.bin ]; checkInputs = [ gen iter qcheck-core ]; propagatedBuildInputs = [ containers ]; diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index f1c82f189bba..ee3d7045d565 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -5,16 +5,14 @@ }: buildDunePackage rec { - version = "3.11"; + version = "3.12"; pname = "containers"; - duneVersion = "3"; - src = fetchFromGitHub { owner = "c-cube"; repo = "ocaml-containers"; rev = "v${version}"; - hash = "sha256-tGAsg98/T6VKvG95I4qioabWM3TEKrDKlsrfUJqxCyM="; + hash = "sha256-15Wd6k/NvjAvTmxlPlZPClODBtFXM6FG3VxniC66u88="; }; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/decompress/default.nix b/pkgs/development/ocaml-modules/decompress/default.nix index 3e15bd5bbcd1..b20ef17d08b9 100644 --- a/pkgs/development/ocaml-modules/decompress/default.nix +++ b/pkgs/development/ocaml-modules/decompress/default.nix @@ -6,14 +6,13 @@ buildDunePackage rec { pname = "decompress"; - version = "1.5.2"; + version = "1.5.3"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-${version}.tbz"; - hash = "sha256-qMmmuhMlFNVq02JvvV55EkhEg2AQNQ7hYdQ7spv1di4="; + hash = "sha256-+R5peL7/P8thRA0y98mcmfHoZUtPsYQIdB02A1NzrGA="; }; buildInputs = [ cmdliner ]; diff --git a/pkgs/development/ocaml-modules/pp/default.nix b/pkgs/development/ocaml-modules/pp/default.nix index bd6688001669..5412f8955d76 100644 --- a/pkgs/development/ocaml-modules/pp/default.nix +++ b/pkgs/development/ocaml-modules/pp/default.nix @@ -1,16 +1,13 @@ -{ buildDunePackage -, fetchurl -, ppx_expect -, lib -}: +{ buildDunePackage, fetchurl, ppx_expect, lib }: buildDunePackage rec { pname = "pp"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://github.com/ocaml-dune/pp/releases/download/${version}/pp-${version}.tbz"; - hash = "sha256-5KTpjZaxu3aVD81tpOk4yG2YnfTX5I8C96RFlfWvHVY="; + url = + "https://github.com/ocaml-dune/pp/releases/download/${version}/pp-${version}.tbz"; + hash = "sha256-pegiVzxVr7Qtsp7FbqzR8qzY9lzy3yh44pHeN0zmkJw="; }; duneVersion = "3"; @@ -20,7 +17,8 @@ buildDunePackage rec { doCheck = true; meta = with lib; { - description = "A an alternative pretty printing library to the Format module of the OCaml standard library"; + description = + "A an alternative pretty printing library to the Format module of the OCaml standard library"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 07cbd66027f9..76b289d49de5 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.70"; + version = "9.2.71"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oe+p1x+NbcKJ2JDVeiTsxAHqgQnyadEwQ9S8QOqUYoM="; + hash = "sha256-urTztt+e0toD3tY0QwOmUhi6xzOv6NkrTzV8RerySSo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 10c9fa0964b4..da7b016d131d 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.70"; + version = "9.2.71"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-21AaK4L8LLk9UcAFAPVOsbs06WQUhXdUrCuMsjArTPo="; + hash = "sha256-qdH7lLetLoqXvZw+HmxOyiLzYjdbpeZygqwFYwGRTRQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index ed3c85744de7..a2ceae590f06 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.70"; + version = "9.2.71"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-09nFen98AQC4X0Jf6CMswQvs8stQMIb+tTosFtlq1Z8="; + hash = "sha256-AZMbE+/2uw7mFtBKwwLWCiVwupnB+EkUrgZFkGiKHtM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 84544cbff4e1..a0f5144fab47 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.70"; + version = "9.2.71"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-xzbABww5jj3vuQeRhTwz6Z9MGVGVWPvSxv/LRXrb46M="; + hash = "sha256-jdmgtW+oIxx/Xr8EI0z8HIUZ8MYVqaxA0zXJaLZJBJ4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index ab1f600c745c..3596c4751aae 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,14 +16,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.70"; + version = "9.2.71"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-BQwP3qq+2o/Z05RcnhJyrBAo/kqosHMJ8Bn8T7ZBlaA="; + hash = "sha256-jp0UcfrjSRTbDPkQStvJpZzbMiHosMJVUaUQc7nSuHQ="; }; in @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1ekHkkjoGY1y4WV0vCnk4EWkkH60gQAOvlJV6AIOatw="; + hash = "sha256-Uc4W4dXZs3HcSvn5fES0y+14KhED21sS5vzi92QC5hI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 4bda4e40b6f7..dba6e4be3c4e 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.10.0"; + version = "2023.10.4"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-1G77gMeLXU6/WyqboxVg1gK9fM9n0golaAqLZ+eGs+8="; + hash = "sha256-SDkwKJVymWpl65TGVWpZL0KQhMdnjTLyOR+G3nyRWw0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix index f519ebb89c48..d44166b82f7d 100644 --- a/pkgs/development/python-modules/msgpack/default.nix +++ b/pkgs/development/python-modules/msgpack/default.nix @@ -1,29 +1,26 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pytestCheckHook , pythonOlder , setuptools -, cython_3 +, borgbackup }: buildPythonPackage rec { pname = "msgpack"; - version = "1.0.7"; - pyproject = true; + version = "1.0.5"; + format = "setuptools"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.6"; - src = fetchFromGitHub { - owner = "msgpack"; - repo = "msgpack-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-ayEyvKiTYPdhy4puUjtyGIR+jsTXd2HRINaAYxQGTZM="; + src = fetchPypi { + inherit pname version; + hash = "sha256-wHVUQoTq3Fzdxw9HVzMdmdy8FrK71ISdFfiq5M820xw="; }; nativeBuildInputs = [ setuptools - cython_3 ]; nativeCheckInputs = [ @@ -34,6 +31,12 @@ buildPythonPackage rec { "msgpack" ]; + passthru.tests = { + # borgbackup is sensible to msgpack versions: https://github.com/borgbackup/borg/issues/3753 + # please be mindful before bumping versions. + inherit borgbackup; + }; + meta = with lib; { description = "MessagePack serializer implementation"; homepage = "https://github.com/msgpack/msgpack-python"; diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix index f5ae1860039c..c4d7d2f73c63 100644 --- a/pkgs/development/python-modules/msgspec/default.nix +++ b/pkgs/development/python-modules/msgspec/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "msgspec"; - version = "0.18.2"; + version = "0.18.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jcrist"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-t5TM7CgVIxdXR6jMOXh1XhpA9vBrYHBcR2iLYP4A/Jc="; + hash = "sha256-PtI+dlhDyFRHSOqdU0TUZtllAlTFtYwOsYQrFrDSFDY="; }; # Requires libasan to be accessible diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index e9f7ed8aaf1e..93de496d51ee 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.5.0"; + version = "19.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-b/sTrSXj3+dkg8++zDZfroSBHIMJIeyPbY5aRnv8mI4="; + hash = "sha256-ACfS444n/PcgieNbl9os720nGAUQDesBHpzVAgMMRew="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 291bcee9c500..99a336f99d8b 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.11.0"; + version = "1.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-ZwDqctkbF3PUu4F9s7amdBoOYQ15jJk64HK4I7rJX/A="; + hash = "sha256-r2d/lc7x45usIhT09JSNnHSErJI4zrr+HuLhznoy1CM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index e27c18bd27d8..641ce68f9039 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.70"; + version = "9.2.71"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-zLbftRhInZPHm5NUG9CnoZ9iLKw+gNDaPiCx5Gd4OXY="; + hash = "sha256-AnSd9+r4+Qz3CyIgA3tOXAYJROOvAR3nI/9fSFeYl24="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index dd45055c420d..7e6d4a826eeb 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -5,6 +5,7 @@ , dbus-next , dbus-python , glib +, iwlib , libdrm , libinput , libxkbcommon @@ -60,31 +61,32 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config - setuptools-scm setuptools + setuptools-scm ]; propagatedBuildInputs = [ - xcffib (cairocffi.override { withXcffib = true; }) - python-dateutil - dbus-python dbus-next + dbus-python + iwlib mpd2 psutil pulsectl-asyncio - pyxdg pygobject3 + python-dateutil pywayland pywlroots + pyxdg + xcffib xkbcommon ]; buildInputs = [ libinput + libxkbcommon wayland wlroots - libxkbcommon xcbutilwm ]; diff --git a/pkgs/development/python-modules/simple-rest-client/default.nix b/pkgs/development/python-modules/simple-rest-client/default.nix index 673028a76387..325454c30ea7 100644 --- a/pkgs/development/python-modules/simple-rest-client/default.nix +++ b/pkgs/development/python-modules/simple-rest-client/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "simple-rest-client"; - version = "1.1.3"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "allisson"; repo = "python-simple-rest-client"; rev = version; - hash = "sha256-HdGYLDrqQvd7hvjwhC5dY2amdHUZHTYJvD1QP89lcXU="; + hash = "sha256-IaLo7nBMIabi4ZjZ4ZLJliCL/dzidaCBCmn0cq7Fzdw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqltrie/default.nix b/pkgs/development/python-modules/sqltrie/default.nix index 77ad7ab0425f..b18731c172f9 100644 --- a/pkgs/development/python-modules/sqltrie/default.nix +++ b/pkgs/development/python-modules/sqltrie/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sqltrie"; - version = "0.7.0"; + version = "0.8.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-+o0JY572q3qSX4FeXsk9ke0hn94Om/N6HN3HNoUgSkc="; + hash = "sha256-9EjvMEpvGjYPUt5qCxv8xXiIxHxXfPEmluA3ZdQU2xI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/tools/neil/default.nix b/pkgs/development/tools/neil/default.nix index 1052e174a725..60efba29b3c2 100644 --- a/pkgs/development/tools/neil/default.nix +++ b/pkgs/development/tools/neil/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "neil"; - version = "0.1.55"; + version = "0.2.61"; src = fetchFromGitHub { owner = "babashka"; repo = "neil"; rev = "v${version}"; - sha256 = "sha256-+0+d0XZhZeRTAXRvA3QcWvbuOqlhNbFo2gTnROevJtU="; + sha256 = "sha256-MoQf7dxdmUlIZZMjuKBJOCu61L8qiAlmVssf6pUhqA8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 06d2e93cdfa6..8b6c7c962c48 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.0.3"; + version = "1.0.4"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-M0OG9V+TVqUqNuEDvpPCJR1KvILty7M59JiYjOsRjS0="; + hash = "sha256-ko0DFCYUfuww3qrz4yUde6Mr4yPVcMJwwGdrG9Fiwhg="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-0Nto5EikWEvW6PCX6801qxDdlB1PtWJ1iym0mwh/YJI="; + hash = "sha256-0KFAvfyTJU1z/KeKVbxFx6+Ijz4YzMsCMiytom730QI="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-3GUQk7Nv5Nx25SPk+Z+6EDNEsDbLW68IOXmLt8NkSYQ="; + hash = "sha256-YEIXthisgNx+99wZF8hZ1T3MU20Yeyms3/q1UGDAwso="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-8xMBU3jloMsdekejKrnswWfzXhxwvsHFNgcUf4hn0W4="; + hash = "sha256-lEEIrmIEcIdE2SqnKlVxpiq9ae2wNRepHY61jWqk584="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index fc19ad8d1301..f24bf4746476 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2671,11 +2671,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videosiliconmotion = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpciaccess, xorgserver }: stdenv.mkDerivation { pname = "xf86-video-siliconmotion"; - version = "1.7.9"; + version = "1.7.10"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2"; - sha256 = "1g2r6gxqrmjdff95d42msxdw6vmkg2zn5sqv0rxd420iwy8wdwyh"; + url = "mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.10.tar.xz"; + sha256 = "1h4g2mqxshaxii416ldw0aqy6cxnsbnzayfin51xm2526dw9q18n"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 953711d70bc8..888ddf036ac2 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -112,7 +112,7 @@ mirror://xorg/individual/driver/xf86-video-r128-6.12.1.tar.xz mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-s3virge-1.11.1.tar.xz mirror://xorg/individual/driver/xf86-video-savage-2.4.0.tar.xz -mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2 +mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.10.tar.xz mirror://xorg/individual/driver/xf86-video-sis-0.12.0.tar.gz mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-suncg6-1.1.3.tar.xz diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index f1bad0bf7f4e..2f775a35627b 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.32.0"; + version = "2.33.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - hash = "sha256-qxxa7V96cJJLu9Ki2NL5UreRyiR9sPhIVA9cllF4y70="; + hash = "sha256-5CNN0aKy9FnoqRwhbNVTUs04q+hkzoAWlDuDKMeT+1s="; }; - vendorHash = "sha256-lVejUufXI5Ihv7hU1N8/MHrwUgIfaHmcj1MR0RTsKVU="; + vendorHash = "sha256-P96qMc9KHDMreuPI3xY/yI/+8qp/znQM/O2B6t6iFug="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/tools/security/ldeep/default.nix b/pkgs/tools/security/ldeep/default.nix index b2ce04a78cd0..e82dd9381a3c 100644 --- a/pkgs/tools/security/ldeep/default.nix +++ b/pkgs/tools/security/ldeep/default.nix @@ -5,16 +5,20 @@ python3.pkgs.buildPythonApplication rec { pname = "ldeep"; - version = "1.0.35"; + version = "1.0.38"; format = "setuptools"; src = fetchFromGitHub { owner = "franc-pentest"; repo = "ldeep"; rev = "refs/tags/${version}"; - hash = "sha256-xt+IPU1709kAKRXBD5+U6L3gDdK7npXbgBdNiqu7yJs="; + hash = "sha256-QoisQL7K4Xg4k7IGymvsMjNfTkjHtkVJpygHtX8lUqs="; }; + nativeBuildInputs = with python3.pkgs; [ + cython + ]; + propagatedBuildInputs = with python3.pkgs; [ commandparse cryptography diff --git a/pkgs/tools/security/ssh-to-age/default.nix b/pkgs/tools/security/ssh-to-age/default.nix index 52997fc24259..90ea4c9b7eb5 100644 --- a/pkgs/tools/security/ssh-to-age/default.nix +++ b/pkgs/tools/security/ssh-to-age/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ssh-to-age"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "Mic92"; repo = "ssh-to-age"; rev = version; - sha256 = "sha256-vER4PG2LFi/NM9TmCffqsF3aR4ZycwWVeKls2fNupo0="; + sha256 = "sha256-cYSrosDFdueEJPQdDYCMObMPwQTvuXUBHXPO0rhehxk="; }; - vendorHash = "sha256-g8qVV2cd7nxBN/BGNz28gJbtNkCUDJDdSdupXxhFw9Q="; + vendorHash = "sha256-dmxFkoz/2qyUv2/I8bLFTYAfUcYdHjVYQgmg8xleIxA="; checkPhase = '' runHook preCheck diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index 4ca22cb23859..dd6ab9868aa8 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -1,4 +1,5 @@ { lib +, coreutils , stdenv , fetchurl , fetchpatch @@ -6,14 +7,15 @@ , libcap , gnused , nixosTests +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.29"; pname = "fakeroot"; src = fetchurl { - url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${version}.orig.tar.gz"; + url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${finalAttrs.version}.orig.tar.gz"; sha256 = "sha256-j7uvt4DJFz46zkoEr7wdkA8zfzIWiDk59cfbNDG+fCA="; }; @@ -39,16 +41,23 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ getopt gnused ] - ++ lib.optional (!stdenv.isDarwin) libcap - ; + buildInputs = lib.optional (!stdenv.isDarwin) libcap; postUnpack = '' - sed -i -e "s@getopt@$(type -p getopt)@g" -e "s@sed@$(type -p sed)@g" ${pname}-${version}/scripts/fakeroot.in + sed -i \ + -e 's@getopt@${getopt}/bin/getopt@g' \ + -e 's@sed@${gnused}/bin/sed@g' \ + -e 's@kill@${coreutils}/bin/kill@g' \ + -e 's@/bin/ls@${coreutils}/bin/ls@g' \ + -e 's@cut@${coreutils}/bin/cut@g' \ + fakeroot-${finalAttrs.version}/scripts/fakeroot.in ''; passthru = { tests = { + version = testers.testVersion { + package = finalAttrs; + }; # A lightweight *unit* test that exercises fakeroot and fakechroot together: nixos-etc = nixosTests.etc.test-etc-fakeroot; }; @@ -61,4 +70,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [viric]; platforms = lib.platforms.unix; }; -} +})