diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b0917d818018..372081244460 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19677,6 +19677,13 @@ githubId = 5629639; name = "Nindouja"; }; + ninelore = { + email = "9l+nix@9lo.re"; + matrix = "@9lore:tchncs.de"; + github = "ninelore"; + githubId = 21343557; + name = "Ingo Reitz"; + }; ninjafb = { email = "oscar@oronberg.com"; github = "NinjaFB"; diff --git a/nixos/modules/system/boot/loader/limine/limine-install.py b/nixos/modules/system/boot/loader/limine/limine-install.py index 2d8e8b5741de..366d1285a74c 100644 --- a/nixos/modules/system/boot/loader/limine/limine-install.py +++ b/nixos/modules/system/boot/loader/limine/limine-install.py @@ -479,6 +479,8 @@ def install_bootloader() -> None: config_file += option_from_config('interface_resolution', ['style', 'interface', 'resolution']) config_file += option_from_config('interface_branding', ['style', 'interface', 'branding']) config_file += option_from_config('interface_branding_colour', ['style', 'interface', 'brandingColor']) + config_file += option_from_config('interface_help_colour', ['style', 'interface', 'helpColor']) + config_file += option_from_config('interface_help_colour_bright', ['style', 'interface', 'helpColorBright']) config_file += option_from_config('interface_help_hidden', ['style', 'interface', 'helpHidden']) config_file += option_from_config('term_font_scale', ['style', 'graphicalTerminal', 'font', 'scale']) config_file += option_from_config('term_font_spacing', ['style', 'graphicalTerminal', 'font', 'spacing']) diff --git a/nixos/modules/system/boot/loader/limine/limine.nix b/nixos/modules/system/boot/loader/limine/limine.nix index 62687e741638..fefc9ab78530 100644 --- a/nixos/modules/system/boot/loader/limine/limine.nix +++ b/nixos/modules/system/boot/loader/limine/limine.nix @@ -297,9 +297,25 @@ in brandingColor = lib.mkOption { default = null; - type = lib.types.nullOr lib.types.int; + type = lib.types.nullOr lib.types.str; description = '' - Color index of the title at the top of the screen in the range of 0-7 (Limine defaults to 6 (cyan)). + Color of the title at the top of the screen in RRGGBB format (Limine defaults to #00AAAA (cyan)). + ''; + }; + + helpColor = lib.mkOption { + default = null; + type = lib.types.nullOr lib.types.str; + description = '' + Color of the help text displayed beside keybinds in RRGGBB format (Limine defaults to #00AA00 (dark green)). + ''; + }; + + helpColorBright = lib.mkOption { + default = null; + type = lib.types.nullOr lib.types.str; + description = '' + Color of the bright help text used for the auto-boot countdown digit in RRGGBB format (Limine defaults to #55FF55 (bright green)). ''; }; diff --git a/pkgs/by-name/bf/bfs/package.nix b/pkgs/by-name/bf/bfs/package.nix index b64898bbfaeb..cc59e92d3876 100644 --- a/pkgs/by-name/bf/bfs/package.nix +++ b/pkgs/by-name/bf/bfs/package.nix @@ -30,7 +30,12 @@ stdenv.mkDerivation (finalAttrs: { liburing ]; - configureFlags = [ "--enable-release" ]; + # The configure script is not from GNU autotools, so most options injected by Nix are not supported + configurePhase = '' + runHook preConfigure + ./configure --prefix=$out --enable-release + runHook postConfigure + ''; makeFlags = [ "PREFIX=$(out)" ]; meta = { diff --git a/pkgs/by-name/bu/burn-central-cli/package.nix b/pkgs/by-name/bu/burn-central-cli/package.nix index 6dd2826b874a..793b429274dc 100644 --- a/pkgs/by-name/bu/burn-central-cli/package.nix +++ b/pkgs/by-name/bu/burn-central-cli/package.nix @@ -19,6 +19,9 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-wXLfmCV6aElnYnhOCScr/3+4I6oOfNPrZ8+0t4TPDOA="; }; + strictDeps = true; + __structuredAttrs = true; + buildAndTestSubdir = "crates/burn-central-cli"; cargoHash = "sha256-MeDIYFXkyJdxierq9iVIAvEIc8JU13szrbSTfKyUkJk="; diff --git a/pkgs/by-name/co/commafeed/package.nix b/pkgs/by-name/co/commafeed/package.nix index a2744751b123..1a53c5bbd7fa 100644 --- a/pkgs/by-name/co/commafeed/package.nix +++ b/pkgs/by-name/co/commafeed/package.nix @@ -12,13 +12,13 @@ stdenv, }: let - version = "7.0.0"; + version = "7.1.0"; src = fetchFromGitHub { owner = "Athou"; repo = "commafeed"; tag = version; - hash = "sha256-hoRaegcpimIYfUv81txgXSSdwX8iCU4K5EtZMyozjFQ="; + hash = "sha256-n68REVBLThChiCq+Rx4Cy3KS/GlgOr5DBn2wzLWX6TY="; }; frontend = buildNpmPackage { @@ -28,7 +28,7 @@ let sourceRoot = "${src.name}/commafeed-client"; - npmDepsHash = "sha256-z6W0xyOpGbTogqZ0UgVQMNPXjwLW0ulpwLBtXvf00bQ="; + npmDepsHash = "sha256-bP0f2+n01YdZf/NCAWE41x/dezpHzYy4qvAscs/b+Lc="; nativeBuildInputs = [ biome ]; @@ -54,7 +54,7 @@ maven.buildMavenPackage { pname = "commafeed"; - mvnHash = "sha256-YY/etqDtnobarg8Cj4vDv7rmzPrOqz6YCyAxjIQlzeU="; + mvnHash = "sha256-jAU1zaTftMuB1WgOeFzU1i+fFHAw6JYxTGw2mY8VlQw="; mvnJdk = jdk25; mvnParameters = lib.escapeShellArgs [ diff --git a/pkgs/by-name/fo/fortran-fpm/package.nix b/pkgs/by-name/fo/fortran-fpm/package.nix index 6f02474dbb84..6e4786cf20c4 100644 --- a/pkgs/by-name/fo/fortran-fpm/package.nix +++ b/pkgs/by-name/fo/fortran-fpm/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "fortran-fpm"; - version = "0.11.0"; + version = "0.13.0"; src = fetchurl { url = "https://github.com/fortran-lang/fpm/releases/download/v${finalAttrs.version}/fpm-${finalAttrs.version}.F90"; - hash = "sha256-mIozF+4kSO5yB9CilBDwinnIa92sMxSyoXWAGpz1jSc="; + hash = "sha256-ABz/bPEUXyFbqgiIuieswGzqMKibedGovpfbP/+8jNI="; }; dontUnpack = true; diff --git a/pkgs/by-name/hy/hyprtoolkit/package.nix b/pkgs/by-name/hy/hyprtoolkit/package.nix index f6a877554231..d3575fd8779d 100644 --- a/pkgs/by-name/hy/hyprtoolkit/package.nix +++ b/pkgs/by-name/hy/hyprtoolkit/package.nix @@ -25,13 +25,13 @@ gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprtoolkit"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprtoolkit"; tag = "v${finalAttrs.version}"; - hash = "sha256-kf7Q31BXRZsiNuQjkvRbGkM1aGj9u8HwyOCIUtwKS0o="; + hash = "sha256-gJSBj4Pd4e9nERAKo/qiHqDMpS2hBfyOI0uGCbbiML4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ig/igir/package.nix b/pkgs/by-name/ig/igir/package.nix index 1dfe4d074cc0..d676eebee49d 100644 --- a/pkgs/by-name/ig/igir/package.nix +++ b/pkgs/by-name/ig/igir/package.nix @@ -18,16 +18,16 @@ buildNpmPackage rec { pname = "igir"; - version = "4.3.2"; + version = "5.0.1"; src = fetchFromGitHub { owner = "emmercm"; repo = "igir"; rev = "v${version}"; - hash = "sha256-I87Ssynu4kbJs7Ip23fwYTH5NCvoMWxxOU1STbLKVNM="; + hash = "sha256-EKi1m2p4/7E/godxEPnaGaqkRX6PlSbqQYQXw+Eg5hA="; }; - npmDepsHash = "sha256-uWuuYU9eK8AFnxHeyFjXlgHFmI2TwVNKrM8vU4IBdjw="; + npmDepsHash = "sha256-98+DFC7j3lmr9GGnDbrzChzGJG1uU1TTr429JAx7310="; # I have no clue why I have to do this postPatch = '' diff --git a/pkgs/by-name/ir/ircd-hybrid/package.nix b/pkgs/by-name/ir/ircd-hybrid/package.nix index 4d608618a122..ba5626b7179e 100644 --- a/pkgs/by-name/ir/ircd-hybrid/package.nix +++ b/pkgs/by-name/ir/ircd-hybrid/package.nix @@ -1,7 +1,8 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, + jansson, openssl, zlib, libxcrypt, @@ -9,14 +10,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "ircd-hybrid"; - version = "8.2.46"; + version = "8.2.47"; - src = fetchurl { - url = "mirror://sourceforge/ircd-hybrid/ircd-hybrid-${finalAttrs.version}.tgz"; - sha256 = "sha256-pdXI8YiPqC+97XoxNFb1plm4cfLOB+b/getajXPzx0s="; + src = fetchFromGitHub { + owner = "ircd-hybrid"; + repo = "ircd-hybrid"; + tag = finalAttrs.version; + hash = "sha256-A6YWKtwqCWfP3fvuSxXFer21T+RMOfR+OhKiYbQpUao="; }; buildInputs = [ + jansson openssl zlib libxcrypt @@ -32,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "IPv6-capable IRC server"; + maintainers = with lib.maintainers; [ tbutter ]; platforms = lib.platforms.unix; homepage = "https://www.ircd-hybrid.org/"; }; diff --git a/pkgs/by-name/iv/ivpn-service/package.nix b/pkgs/by-name/iv/ivpn-service/package.nix index ea75f4e1ccb9..37c67ce44ace 100644 --- a/pkgs/by-name/iv/ivpn-service/package.nix +++ b/pkgs/by-name/iv/ivpn-service/package.nix @@ -29,6 +29,9 @@ buildGoModule (finalAttrs: { hash = "sha256-Y+oW/2WDkH/YydR+xSzEHPdCNKTmmsV4yEsju+OmDYE="; }; + strictDeps = true; + __structuredAttrs = true; + modRoot = "daemon"; vendorHash = "sha256-DVKSCcEeE7vI8aOYuEwk22n0wtF7MMDOyAgYoXYadwI="; diff --git a/pkgs/by-name/iv/ivpn/package.nix b/pkgs/by-name/iv/ivpn/package.nix index 45ec69e21304..82a4666a777b 100644 --- a/pkgs/by-name/iv/ivpn/package.nix +++ b/pkgs/by-name/iv/ivpn/package.nix @@ -18,6 +18,8 @@ buildGoModule (finalAttrs: { hash = "sha256-Y+oW/2WDkH/YydR+xSzEHPdCNKTmmsV4yEsju+OmDYE="; }; + __structuredAttrs = true; + modRoot = "cli"; vendorHash = "sha256-xZ1tMiv06fE2wtpDagKjHiVTPYWpj32hM6n/v9ZcgrE="; diff --git a/pkgs/by-name/kn/knossosnet/package.nix b/pkgs/by-name/kn/knossosnet/package.nix index 6960548ed496..cf2b56838ef4 100644 --- a/pkgs/by-name/kn/knossosnet/package.nix +++ b/pkgs/by-name/kn/knossosnet/package.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "knossosnet"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "KnossosNET"; repo = "Knossos.NET"; tag = "v${version}"; - hash = "sha256-UvkJiUQ1magZZ4ylKxelQab/xxARj8T6Zl/Kh/bXaqI="; + hash = "sha256-5EQ34o1hgQvLfuVMS5l+YFD8wvnQuKioZUQhoImBo28="; }; patches = [ ./dotnet-8-upgrade.patch ]; diff --git a/pkgs/by-name/ma/magika-cli/package.nix b/pkgs/by-name/ma/magika-cli/package.nix index 6ea3a46014cc..dc20c6b24b91 100644 --- a/pkgs/by-name/ma/magika-cli/package.nix +++ b/pkgs/by-name/ma/magika-cli/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "magika-cli"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "google"; repo = "magika"; tag = "cli/v${finalAttrs.version}"; - hash = "sha256-1WJRkqFQqlSFzr4wkEbRwj1WoxDKTG/1OCtC+914ryY="; + hash = "sha256-rxkyC8/4nnVqfoubXiOchvmmGI1Z6dC8j2Oqpbt9kE0="; }; - cargoHash = "sha256-rA+GYCWuinwRVWf3VuFbPgmAwl3vDsaxLjCtsKMtpiU="; + cargoHash = "sha256-08dbfb4F2A3hB2xKKqR/+BNG7M74HG5UZi4ejULwVRw="; cargoRoot = "rust/cli"; buildAndTestSubdir = finalAttrs.cargoRoot; diff --git a/pkgs/by-name/op/openshell/package.nix b/pkgs/by-name/op/openshell/package.nix index e0f73669d7f1..bc0c1885360f 100644 --- a/pkgs/by-name/op/openshell/package.nix +++ b/pkgs/by-name/op/openshell/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "openshell"; - version = "0.0.34"; + version = "0.0.36"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "OpenShell"; tag = "v${finalAttrs.version}"; - hash = "sha256-wchygUeSYbHXVgq5mR3nObPiEygREgvIk579gnPVMvM="; + hash = "sha256-AnZliQrn5kwaVJw1LEorT+VPtIk2NIbVY0QISxfnORs="; }; - cargoHash = "sha256-ovg7IZL022wsj5EUjySCWsf0KrUCZLwQrjvvWld8Owo="; + cargoHash = "sha256-kmmzzph39KaAXkEbjOHMoTRltX2ttqxtHppb6apoSSs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ox/oxdraw/package.nix b/pkgs/by-name/ox/oxdraw/package.nix index d8fe85772f44..43a825783523 100644 --- a/pkgs/by-name/ox/oxdraw/package.nix +++ b/pkgs/by-name/ox/oxdraw/package.nix @@ -52,6 +52,9 @@ rustPlatform.buildRustPackage ( hash = "sha256-2B0G5aWRtUvZiCsX1fOw6M2UhShZaDj11r/fXCemGVc="; }; + strictDeps = true; + __structuredAttrs = true; + cargoHash = "sha256-YedNESkXKbfl7FWea7VpDR+59b9WLtZ7GNcyJ7D9yPg="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/pa/package-version-server/package.nix b/pkgs/by-name/pa/package-version-server/package.nix index 7b97fbdccd6b..abc5c11d75d3 100644 --- a/pkgs/by-name/pa/package-version-server/package.nix +++ b/pkgs/by-name/pa/package-version-server/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "package-version-server"; - version = "0.0.7"; + version = "0.0.10"; src = fetchFromGitHub { owner = "zed-industries"; repo = "package-version-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-/YyJ8+tKrNKVrN+F/oHgtExBBRatIIOvWr9mAyTHA3E="; + hash = "sha256-1+7oqWiJd7AZUlaDGYRtR1lyenrlhyaaGeWufW9lPUU="; }; - cargoHash = "sha256-/t1GPdb/zXe0pKeG/A4FKjKFFZ0zy2nT2PV8nxenKXc="; + cargoHash = "sha256-AOE0fs3QK8vTIMOIxMg6SooDSQVtqFdB0tF3S88J7Ew="; nativeBuildInputs = [ pkg-config ]; @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage (finalAttrs: { updateScript = nix-update-script { }; }; - doCheck = lib.versionAtLeast finalAttrs.version "0.0.8"; + # Needs https://github.com/zed-industries/package-version-server/pull/2 to be merged + doCheck = false; meta = { description = "Language server that handles hover information in package.json files"; diff --git a/pkgs/by-name/po/podofo_1_0/package.nix b/pkgs/by-name/po/podofo_1_0/package.nix index 09c2c3fc4950..1576ce6bc232 100644 --- a/pkgs/by-name/po/podofo_1_0/package.nix +++ b/pkgs/by-name/po/podofo_1_0/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "podofo"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitHub { owner = "podofo"; repo = "podofo"; rev = finalAttrs.version; - hash = "sha256-BJSQkcaE3oKq7ojJgfPyvOphw7pq+ilEIVIxaoIcdXw="; + hash = "sha256-gzkIMyGV3nmOrGX2PDLrA9NHbtAwk74vcyrQ+yc5TOw="; }; outputs = [ diff --git a/pkgs/by-name/ro/roswell/package.nix b/pkgs/by-name/ro/roswell/package.nix index 9d545119ac26..3b6ab6e7a958 100644 --- a/pkgs/by-name/ro/roswell/package.nix +++ b/pkgs/by-name/ro/roswell/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "roswell"; - version = "24.10.115"; + version = "26.02.116"; src = fetchFromGitHub { owner = "roswell"; repo = "roswell"; - rev = "v${finalAttrs.version}"; - hash = "sha256-2aYA1AzRPXaM82Sh+dMiQJcOAD0rzwV09VyLy0oS6as="; + tag = "v${finalAttrs.version}"; + hash = "sha256-saKCLr1Nmzl+zcPbYSXt7o82hh6vYhACCfUUzEs/31E="; }; patches = [ @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ hiro98 ]; platforms = lib.platforms.unix; homepage = "https://github.com/roswell/roswell"; - changelog = "https://github.com/roswell/roswell/blob/v${finalAttrs.version}/ChangeLog"; + changelog = "https://github.com/roswell/roswell/blob/${finalAttrs.src.tag}/ChangeLog"; mainProgram = "ros"; }; }) diff --git a/pkgs/by-name/so/somo/package.nix b/pkgs/by-name/so/somo/package.nix index 44749dc532f7..40d6971423b9 100644 --- a/pkgs/by-name/so/somo/package.nix +++ b/pkgs/by-name/so/somo/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "somo"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "theopfr"; repo = "somo"; tag = "v${finalAttrs.version}"; - hash = "sha256-EFU2JuNAWtlyS8UI4wnxgQEWVGSRu+02wPqUsWkQD9A="; + hash = "sha256-+NXB+iOuimd3nz8EqMNL0j2N15fZtURH40dwicytd88="; }; - cargoHash = "sha256-/l8nHbJWqSvJ/u1K/S+icHOdXfWe/aR9sJndGvKEOyM="; + cargoHash = "sha256-TAIUgyq8NBx7gQdZeY0dTGEvkRveMdozBjINQeyJOss="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/to/toolhive/package.nix b/pkgs/by-name/to/toolhive/package.nix index c5ebff99b7de..ee1679115063 100644 --- a/pkgs/by-name/to/toolhive/package.nix +++ b/pkgs/by-name/to/toolhive/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "toolhive"; - version = "0.6.9"; + version = "0.26.1"; src = fetchFromGitHub { owner = "stacklok"; repo = "toolhive"; tag = "v${finalAttrs.version}"; - hash = "sha256-qeUeRcxMo2hgsYcydQjTA9N125gpfC0ts7h7axLES24="; + hash = "sha256-vJCto9gDcUHZVQ7sjqYtQTrE4aJPKZarzQ+hfc5EC6g="; }; - vendorHash = "sha256-k7dPbHqsQVUL0pJoduq4clFG/q1i6gsTaQtES28xTKU="; + vendorHash = "sha256-ajZ/f30gveA6EHIshMGgIzf+Hk650zpnOS9KcbM9Dgo="; # Build only the main CLI and operator binaries subPackages = [ diff --git a/pkgs/by-name/un/unified-memory-framework/package.nix b/pkgs/by-name/un/unified-memory-framework/package.nix index d5c3bfcb3af7..81565596c749 100644 --- a/pkgs/by-name/un/unified-memory-framework/package.nix +++ b/pkgs/by-name/un/unified-memory-framework/package.nix @@ -63,6 +63,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-1Z65rNsUNeaeSJmxwpEHPbiU4KEDvyrWL9LyAWFsR1c="; }; + strictDeps = true; + __structuredAttrs = true; + postPatch = '' # The CMake tries to find out the version via git. # Since we're not in a clone, git describe won't work. diff --git a/pkgs/by-name/wl/wl-mirror/package.nix b/pkgs/by-name/wl/wl-mirror/package.nix index 56bdaf62ed0b..4026c59d50dd 100644 --- a/pkgs/by-name/wl/wl-mirror/package.nix +++ b/pkgs/by-name/wl/wl-mirror/package.nix @@ -86,10 +86,11 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { + mainProgram = "wl-mirror"; homepage = "https://github.com/Ferdi265/wl-mirror"; description = "Simple Wayland output mirror client"; license = lib.licenses.gpl3; - maintainers = [ ]; + maintainers = with lib.maintainers; [ ninelore ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ze/zeekscript/package.nix b/pkgs/by-name/ze/zeekscript/package.nix index 661cda3bcba6..2520ca747d89 100644 --- a/pkgs/by-name/ze/zeekscript/package.nix +++ b/pkgs/by-name/ze/zeekscript/package.nix @@ -2,19 +2,18 @@ lib, python3, fetchFromGitHub, - writeScript, }: python3.pkgs.buildPythonApplication rec { pname = "zeekscript"; - version = "1.3.3"; + version = "1.3.4"; pyproject = true; src = fetchFromGitHub { owner = "zeek"; repo = "zeekscript"; - rev = "065edacf0321dd9a0cdd64285b93dec954bf448e"; - hash = "sha256-uNVmY+yJy/4H/zRGqg68Pop2TcwZgsrT46cdx3bhKIo="; + tag = "v${version}"; + hash = "sha256-icc5mMhl/MK0+0fLYJG07wqWaKKX2QFcpD1IIvdmASw="; }; build-system = with python3.pkgs; [ setuptools ]; @@ -36,19 +35,6 @@ python3.pkgs.buildPythonApplication rec { "zeekscript" ]; - passthru.updateScript = writeScript "update-${pname}" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p git common-updater-scripts - tmpdir="$(mktemp -d)" - git clone "${src.gitRepoUrl}" "$tmpdir" - pushd "$tmpdir" - newVersion=$(cat VERSION) - newRevision=$(git log -s -n 1 --pretty='format:%H' VERSION) - popd - rm -rf "$tmpdir" - update-source-version "${pname}" "$newVersion" --rev="$newRevision" - ''; - meta = { description = "Zeek script formatter and analyzer"; homepage = "https://github.com/zeek/zeekscript"; diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix index 560fdd9569ed..58ee6bf093e4 100644 --- a/pkgs/by-name/zw/zwave-js-ui/package.nix +++ b/pkgs/by-name/zw/zwave-js-ui/package.nix @@ -7,15 +7,15 @@ buildNpmPackage rec { pname = "zwave-js-ui"; - version = "11.16.1"; + version = "11.16.2"; src = fetchFromGitHub { owner = "zwave-js"; repo = "zwave-js-ui"; tag = "v${version}"; - hash = "sha256-GgKQN55WZxdOJxL11KxObzln+Z2KhYoueAld+nz7dl4="; + hash = "sha256-1x5nYWPT30AQBk98yuOdB55Ac/7wRKBc4DUwY4kO6LY="; }; - npmDepsHash = "sha256-Cp3EYWiyPx5ATD2LyKPSXw4PZ+oqfKHycc9zhn89r5w="; + npmDepsHash = "sha256-4kCHoYB2oH2jUk+31aGjbfBkdz3wdUOqctVk3/JXrBI="; passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui; diff --git a/pkgs/development/python-modules/tree-sitter-zeek/default.nix b/pkgs/development/python-modules/tree-sitter-zeek/default.nix index 00ebad4d7c94..ed820c6e1396 100644 --- a/pkgs/development/python-modules/tree-sitter-zeek/default.nix +++ b/pkgs/development/python-modules/tree-sitter-zeek/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "tree-sitter-zeek"; - version = "0.2.12"; + version = "0.2.13"; pyproject = true; src = fetchFromGitHub { owner = "zeek"; repo = "tree-sitter-zeek"; tag = "v${version}"; - hash = "sha256-BWrzPMsUgbIvdWsafTtXApmGGr7Sdpb382iqhM8Etqk="; + hash = "sha256-okm65ls/38PnzHpfdNT1McouaZ1r1dBflXcGUzaM9Z0="; }; build-system = [ setuptools ];