diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 93351ce1bdb3..e87ab4727077 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -309,7 +309,7 @@ The attribute can also contain a list, a script followed by arguments to be pass passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ]; ``` -The script will be run with `UPDATE_NIX_ATTR_PATH` environment variable set to the attribute path it is supposed to update. +The script will be run with the `UPDATE_NIX_NAME`, `UPDATE_NIX_PNAME`, `UPDATE_NIX_OLD_VERSION` and `UPDATE_NIX_ATTR_PATH` environment variables set respectively to the name, pname, old version and attribute path of the package it is supposed to update. ::: {.note} The script will be usually run from the root of the Nixpkgs repository but you should not rely on that. Also note that the update scripts will be run in parallel by default; you should avoid running `git commit` or any other commands that cannot handle that. diff --git a/maintainers/scripts/update.py b/maintainers/scripts/update.py index f1bed6527e79..7ae08958a164 100644 --- a/maintainers/scripts/update.py +++ b/maintainers/scripts/update.py @@ -52,7 +52,17 @@ async def run_update_script(nixpkgs_root: str, merge_lock: asyncio.Lock, temp_di eprint(f" - {package['name']}: UPDATING ...") try: - update_process = await check_subprocess('env', f"UPDATE_NIX_ATTR_PATH={package['attrPath']}", *update_script_command, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE, cwd=worktree) + update_process = await check_subprocess( + 'env', + f"UPDATE_NIX_NAME={package['name']}", + f"UPDATE_NIX_PNAME={package['pname']}", + f"UPDATE_NIX_OLD_VERSION={package['oldVersion']}", + f"UPDATE_NIX_ATTR_PATH={package['attrPath']}", + *update_script_command, + stdout=asyncio.subprocess.PIPE, + stderr=asyncio.subprocess.PIPE, + cwd=worktree, + ) update_info = await update_process.stdout.read() await merge_changes(merge_lock, package, update_info, temp_dir) diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 337064034efb..994aa0e33cbf 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -555,6 +555,9 @@ while read -u 3 mountPoint; do umount /tmp-iso rmdir /tmp-iso + if [ -n "$isoPath" ] && [ $fsType = "iso9660" ] && mountpoint -q /findiso; then + umount /findiso + fi continue fi diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 7f6ff3be034f..27ec34e15961 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -20,7 +20,9 @@ let }); }; commonOverrides = [ - (mkOverride "jsonschema" "3.2.0" "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") + (self: super: { + jsonschema = super.jsonschema_3; + }) ]; }; mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 8d1ab4e590c5..9d0b947e3f18 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -10,6 +10,7 @@ , python3 , fetchFromGitHub , wrapQtAppsHook +, packageOverrides ? self: super: {} }: let @@ -17,21 +18,7 @@ let ]; python = python3.override { - packageOverrides = lib.foldr lib.composeExtensions (self: super: { - jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec { - version = "3.2.0"; - - src = super.fetchPypi { - inherit (oldAttrs) pname; - inherit version; - sha256 = "sha256-yKhbKNN3zHc35G4tnytPRO48Dh3qxr9G3e/HGH0weXo="; - }; - - SETUPTOOLS_SCM_PRETEND_VERSION = version; - - doCheck = false; - }); - }) defaultOverrides; + packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); }; in python.pkgs.buildPythonPackage rec { pname = "gns3-gui"; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 50a2453b0408..814beec74773 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -14,22 +14,6 @@ let defaultOverrides = commonOverrides ++ [ - (self: super: { - jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec { - version = "3.2.0"; - - src = super.fetchPypi { - inherit (oldAttrs) pname; - inherit version; - sha256 = "sha256-yKhbKNN3zHc35G4tnytPRO48Dh3qxr9G3e/HGH0weXo="; - }; - - SETUPTOOLS_SCM_PRETEND_VERSION = version; - - doCheck = false; - }); - - }) ]; python = python3.override { diff --git a/pkgs/applications/networking/powerdns-admin/default.nix b/pkgs/applications/networking/powerdns-admin/default.nix index d8b4a6b2f329..d889fdcf100d 100644 --- a/pkgs/applications/networking/powerdns-admin/default.nix +++ b/pkgs/applications/networking/powerdns-admin/default.nix @@ -13,19 +13,7 @@ let packageOverrides = self: super: { # The bravado-core dependency is incompatible with jschonschema 4.0: # https://github.com/Yelp/bravado-core/pull/385 - jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec { - version = "3.2.0"; - - src = oldAttrs.src.override { - inherit version; - hash = "sha256-yKhbKNN3zHc35G4tnytPRO48Dh3qxr9G3e/HGH0weXo="; - sha256 = ""; - }; - - SETUPTOOLS_SCM_PRETEND_VERSION = version; - - doCheck = false; - }); + jsonschema = super.jsonschema_3; }; }; diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 8acd9f75dd96..114826a778bf 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "7.14.0"; + version = "7.14.1"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-JuoZ/xE3Z6uB7iJQj72l+VX0cHHi/ZV+6q3QZ/CYjAk="; + hash = "sha256-o2pERzt6wU/EiXBc9kI2qn9PhXGyvNiEWbSRzI85R8c="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 6be7b8cc9c04..7c529cd9cb9c 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "0.6.2"; + version = "0.7.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PMWaaCcguziQAnuBL5He2AQaAhCTmpNsOHUNnExK0mU="; + sha256 = "sha256-d38PocmvGRvyKMCNMhE8IFNGOn6r42ODLPVo/Ak3q/8="; }; - cargoSha256 = "sha256-IVlOenWvy6BsUCsSMWuJj7H8XKQRQkJtTYnmUhcesNw="; + cargoSha256 = "sha256-74FIlSV/prlxuMxqVx27M0ltXY3m0ddUVyHTltQLnuM="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index 38eea0a70f56..16ad5f3534df 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { pname = "quarto"; - version = "1.1.189"; + version = "1.1.251"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${version}/quarto-${version}-linux-amd64.tar.gz"; - sha256 = "1a3xsgqdccm4ky1xjnin1idpp8gsansskq37c00mrxz1raxn1mi7"; + sha256 = "sha256-VEYUEI4xzQPXlyTbCThAW2npBCZNPDJ5x2cWnkNz7RE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index d69c22db8029..252468061717 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -1,8 +1,11 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner +, cmdlinerSupport ? lib.versionAtLeast cmdliner.version "1.1" +}: + let pname = "uunf"; webpage = "https://erratique.ch/software/${pname}"; - version = "14.0.0"; + version = "15.0.0"; in if lib.versionOlder ocaml.version "4.03" @@ -15,11 +18,12 @@ stdenv.mkDerivation { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "sha256:17wv0nm3vvwcbzb1b09akw8jblmigyhbfmh1sy9lkb5756ni94a2"; + sha256 = "sha256-B/prPAwfqS8ZPS3fyDDIzXWRbKofwOCyCfwvh9veuug="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; - buildInputs = [ topkg uutf cmdliner ]; + buildInputs = [ topkg uutf ] + ++ lib.optional cmdlinerSupport cmdliner; propagatedBuildInputs = [ uchar ]; @@ -27,7 +31,15 @@ stdenv.mkDerivation { prePatch = lib.optionalString stdenv.isAarch64 "ulimit -s 16384"; - inherit (topkg) buildPhase installPhase; + buildPhase = '' + runHook preBuild + ${topkg.run} build \ + --with-uutf true \ + --with-cmdliner ${lib.boolToString cmdlinerSupport} + runHook postBuild + ''; + + inherit (topkg) installPhase; meta = with lib; { description = "An OCaml module for normalizing Unicode text"; diff --git a/pkgs/development/python-modules/jsonschema/3_x.nix b/pkgs/development/python-modules/jsonschema/3_x.nix new file mode 100644 index 000000000000..b78165fc4f32 --- /dev/null +++ b/pkgs/development/python-modules/jsonschema/3_x.nix @@ -0,0 +1,39 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, attrs +, functools32 +, importlib-metadata +, mock +, nose +, pyperf +, pyrsistent +, setuptools-scm +, twisted +, vcversioner +}: + +buildPythonPackage rec { + pname = "jsonschema"; + version = "3.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a"; + }; + + nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ attrs importlib-metadata functools32 pyrsistent ]; + checkInputs = [ nose mock pyperf twisted vcversioner ]; + + # zope namespace collides on py27 + doCheck = !isPy27; + checkPhase = '' + nosetests + ''; + + meta = with lib; { + homepage = "https://github.com/Julian/jsonschema"; + description = "An implementation of JSON Schema validation for Python"; + license = licenses.mit; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index 71fbea7253f7..9350d7ee83ba 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "10.1.0"; + version = "11.0.1"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Cbgpmew+2O59+7pvMv0QD0bi9f6cdWN1zAa9wUdJ1qM="; + sha256 = "sha256-ovbhU23m4idWOSmdzPh5RH5/DxPjzsk1qqccIzGjNY4="; }; vendorSha256 = "sha256-A4+sshIzPla7udHfnMmbFqn+fW3SOCrI6g7tArzmh1E="; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 0da2bb604a0b..4fa5476e7d4c 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "node_exporter"; - version = "1.3.1"; + version = "1.4.0"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "node_exporter"; - sha256 = "sha256-+0k9LBsHqNHmoOAY1UDzbbqni+ikj+c3ijfT41rCfLc="; + sha256 = "sha256-KO33Cyrc4Oh6vvTMazo5iuekpyxNsi18gIb66Z8B9i4="; }; - vendorSha256 = "sha256-nAvODyy+PfkGFAaq+3hBhQaPji5GUMU7N8xcgbGQMeI="; + vendorSha256 = "sha256-eJbb56U6VStwfi6iSemWrriDYNaPiDegW3KJr8rH1NU="; # FIXME: tests fail due to read-only nix store doCheck = false; diff --git a/pkgs/tools/networking/onetun/default.nix b/pkgs/tools/networking/onetun/default.nix index 7fb5f506d502..77b6a7dedf0e 100644 --- a/pkgs/tools/networking/onetun/default.nix +++ b/pkgs/tools/networking/onetun/default.nix @@ -5,17 +5,17 @@ }: rustPlatform.buildRustPackage rec { pname = "onetun"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "aramperes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TYDSAJxWwNF/e42KR9656vrWfIanFMaJKvof0gcZ80U="; + sha256 = "sha256-gVw1aVbYjDPYTtMYIXq3k+LN0gUBAbQm275sxzwoYw8="; }; - cargoSha256 = "sha256-aki3jL+0ETPa/0eMyxuBKdF3K1wM86BZx8FrOkaUAFQ="; + cargoSha256 = "sha256-/sOjd0JKk3MNNXYpTEXteFYtqDWYfyVItZrkX4uzjtc="; meta = with lib; { description = "A cross-platform, user-space WireGuard port-forwarder that requires no root-access or system network configurations"; diff --git a/pkgs/tools/security/scilla/default.nix b/pkgs/tools/security/scilla/default.nix index 4c9b1764205c..c19afe300161 100644 --- a/pkgs/tools/security/scilla/default.nix +++ b/pkgs/tools/security/scilla/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "scilla"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "edoardottt"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VTX4NG3BzmLpf2sIxZ5DGjg9dnCTSO0VbGx2PMhjBPg="; + sha256 = "sha256-8ZRYgQ4xME71vlO0nKnxiCqeju0G4SwgEXnUol1jQxk="; }; - vendorSha256 = "sha256-aoz2H7hkk85ntao6e5Chn++T2kA5jogHrd/ltVqNS3A="; + vendorSha256 = "sha256-Y4Zi0Hy6ydGxLTohgJGF3L9O+79z+3t+4ZA64otCJpE="; meta = with lib; { description = "Information gathering tool for DNS, ports and more"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d3320d4cf3e5..e688923a22aa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4846,6 +4846,8 @@ in { jsonschema = callPackage ../development/python-modules/jsonschema { }; + jsonschema_3 = callPackage ../development/python-modules/jsonschema/3_x.nix { }; + jsonschema-spec = callPackage ../development/python-modules/jsonschema-spec { }; jsonstreams = callPackage ../development/python-modules/jsonstreams { };