nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 08:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2023-05-25 00:02:48 +00:00 committed by GitHub
commit a048bbb694
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
84 changed files with 515 additions and 473 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
maintainers/maintainer-list.nix
View File

@ -15305,6 +15305,13 @@
githubId = 20063502;
name = "Sybrand Aarnoutse";
};
syboxez = {
email = "syboxez@gmail.com";
matrix = "@Syboxez:matrix.org";
github = "syboxez";
githubId = 12841859;
name = "Syboxez Blank";
};
symphorien = {
email = "symphorien_nixpkgs@xlumurb.eu";
matrix = "@symphorien:xlumurb.eu";

2
maintainers/team-list.nix
View File

@ -383,7 +383,6 @@ with lib.maintainers; {
members = [
cleeyv
ryantm
yuka
];
scope = "Maintain Jitsi.";
shortName = "Jitsi";
@ -594,7 +593,6 @@ with lib.maintainers; {
lilyinstarlight
marsam
winter
yuka
];
scope = "Maintain Node.js runtimes and build tooling.";
shortName = "Node.js";

4
nixos/doc/manual/release-notes/rl-2305.section.md
View File

@ -419,6 +419,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The minimal ISO image now uses the `nixos/modules/profiles/minimal.nix` profile.
- NixOS installer ISOs can now be built for `powerpc64le-linux`; see `nixos/modules/installer/sd-card/sd-image-powerpc64le.nix` and [PR 192672](https://github.com/NixOS/nixpkgs/pull/192672). Hydra does not support this platform, so you must build the binaries yourself.
- The `ghcWithPackages` and `ghcWithHoogle` wrappers will now also symlink GHC's
and all included libraries' documentation to `$out/share/doc` for convenience.
If undesired, the old behavior can be restored by overriding the builders with
@ -522,6 +524,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The `services.fwupd` module now allows arbitrary daemon settings to be configured in a structured manner ([`services.fwupd.daemonSettings`](#opt-services.fwupd.daemonSettings)).
- Nixpkgs now uses [IEEE-standard floating point arithmetic](https://github.com/NixOS/nixpkgs/pull/170215) on `powerpc64le-linux`.
- `services.xserver.desktopManager.plasma5.phononBackend` now defaults to vlc according to [upstrean recommendation](https://community.kde.org/Distributions/Packaging_Recommendations#Non-Plasma_packages)
- The `zramSwap` is now implemented with `zram-generator`, and the option `zramSwap.numDevices` for using ZRAM devices as general purpose ephemeral block devices has been removed.

2
nixos/doc/manual/release-notes/rl-2311.section.md
View File

@ -12,7 +12,7 @@
## Backward Incompatibilities {#sec-release-23.11-incompatibilities}
- Create the first release note entry in this section!
- The latest version of `clonehero` now stores custom content in `~/.clonehero`. See the [migration instructions](https://clonehero.net/2022/11/29/v23-to-v1-migration-instructions.html). Typically, these content files would exist along side the binary, but the previous build used a wrapper script that would store them in `~/.config/unity3d/srylain Inc_/Clone Hero`.
## Other Notable Changes {#sec-release-23.11-notable-changes}

5
nixos/modules/services/networking/ssh/sshd.nix
View File

@ -569,7 +569,10 @@ in
'';
assertions = [{ assertion = if cfg.settings.X11Forwarding then cfgc.setXAuthLocation else true;
message = "cannot enable X11 forwarding without setting xauth location";}]
message = "cannot enable X11 forwarding without setting xauth location";}
{ assertion = lib.lists.unique (map (x: lib.strings.toLower x) (attrNames cfg.settings))
== (map (x: lib.strings.toLower x) (attrNames cfg.settings));
message = "Duplicate sshd config key; does your capitalization match the option's?"; } ]
++ forEach cfg.listenAddresses ({ addr, ... }: {
assertion = addr != null;
message = "addr must be specified in each listenAddresses entry";

2
pkgs/applications/audio/viper4linux-gui/default.nix
View File

@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
];
installPhase = ''
runHook preInstalli
runHook preInstall
install -D V4L_Frontend $out/bin/viper-gui
install -D icons/viper.png $out/share/icons/viper.png
runHook postInstall

4
pkgs/applications/misc/hugo/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "hugo";
version = "0.112.1";
version = "0.112.3";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
hash = "sha256-87nM2SxVM0L2ZkmB1SLi3ARWQ+XJT9HjD7HioROHgvg=";
hash = "sha256-5vAPDN4yoecCMuBF+ruedsKMEQhI49dB1pXbY6V1U5I=";
};
vendorHash = "sha256-A4mWrTSkE1NcLj8ozGXQJIrFMvqeoBC7y7eOTeh3ktw=";

4
pkgs/applications/networking/cluster/terranix/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "terranix";
version = "2.5.5";
version = "2.6.0";
src = fetchFromGitHub {
owner = "mrVanDalo";
repo = "terranix";
rev = version;
sha256 = "sha256-5s9YFvbYMp8x0uoXM/jOCPPdjau6+4zeK/rGRkXBdx0=";
sha256 = "sha256-pNuJxmVMGbBHw7pa+Bx0HY0orXIXoyyAXOKuQ1zpfus=";
};
nativeBuildInputs = [ makeWrapper ];

22
pkgs/applications/networking/mailreaders/himalaya/default.nix
View File

@ -10,6 +10,10 @@
, libiconv
, openssl
, notmuch
, withRusttlsTls ? true
, withRusttlsNativeCerts ? withRusttlsTls
, withNativeTls ? false
, withNativeTlsVendored ? withNativeTls
, withImapBackend ? true
, withNotmuchBackend ? false
, withSmtpSender ? true
@ -17,27 +21,31 @@
rustPlatform.buildRustPackage rec {
pname = "himalaya";
version = "0.7.1";
version = "0.7.3";
src = fetchFromGitHub {
owner = "soywod";
repo = pname;
rev = "v${version}";
sha256 = "sha256-yAfNH9LSXlS/Hzi5kAuur5BX2vITMucprDzxhlV8RiY=";
sha256 = "HmH4qL70ii8rS8OeUnUxsy9/wMx+f2SBd1AyRqlfKfc=";
};
cargoSha256 = "sha256-FXfh6T8dNsnD/V/wYSMDWs+ll0d1jg1Dc3cQT39b0ws=";
cargoSha256 = "NJFOtWlfKZRLr9vvDvPQjpT4LGMeytk0JFJb0r77bwE=";
nativeBuildInputs = [ ]
++ lib.optional (installManPages || installShellCompletions) installShellFiles
++ lib.optional (!stdenv.hostPlatform.isDarwin) pkg-config;
++ lib.optional (withNativeTls && !stdenv.hostPlatform.isDarwin) pkg-config;
buildInputs = [ ]
++ (if stdenv.hostPlatform.isDarwin then [ Security libiconv ] else [ openssl ])
++ lib.optional withNativeTls (if stdenv.hostPlatform.isDarwin then [ Security libiconv ] else [ openssl ])
++ lib.optional withNotmuchBackend notmuch;
buildNoDefaultFeatures = true;
buildFeatures = [ ]
++ lib.optional withRusttlsTls "rustls-tls"
++ lib.optional withRusttlsNativeCerts "rustls-native-certs"
++ lib.optional withNativeTls "native-tls"
++ lib.optional withNativeTlsVendored "native-tls-vendored"
++ lib.optional withImapBackend "imap-backend"
++ lib.optional withNotmuchBackend "notmuch-backend"
++ lib.optional withSmtpSender "smtp-sender";
@ -54,8 +62,8 @@ rustPlatform.buildRustPackage rec {
'';
meta = with lib; {
description = "Command-line interface for email management";
homepage = "https://github.com/soywod/himalaya";
description = "CLI to manage your emails.";
homepage = "https://pimalaya.org/himalaya/";
changelog = "https://github.com/soywod/himalaya/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ soywod toastal yanganto ];

6
pkgs/build-support/go/module.nix
View File

@ -2,14 +2,10 @@
{ name ? "${args'.pname}-${args'.version}"
, src
, buildInputs ? []
, nativeBuildInputs ? []
, passthru ? {}
, patches ? []
# Go linker flags, passed to go via -ldflags
, ldflags ? []
# Go tags, passed to go via -tag
, tags ? []
@ -55,8 +51,6 @@
, ... }@args':
with builtins;
assert goPackagePath != "" -> throw "`goPackagePath` is not needed with `buildGoModule`";
assert (vendorSha256 == "_unset" && vendorHash == "_unset") -> throw "either `vendorHash` or `vendorSha256` is required";
assert (vendorSha256 != "_unset" && vendorHash != "_unset") -> throw "both `vendorHash` and `vendorSha256` set. only one can be set.";

32
pkgs/development/compilers/fbc/default.nix
View File

@ -2,7 +2,6 @@
, buildPackages
, lib
, fetchzip
, fetchpatch
, gpm
, libffi
, libGL
@ -15,43 +14,16 @@
stdenv.mkDerivation rec {
pname = "fbc";
version = "1.09.0";
version = "1.10.0";
src = fetchzip {
# Bootstrap tarball has sources pretranslated from FreeBASIC to C
url = "https://github.com/freebasic/fbc/releases/download/${version}/FreeBASIC-${version}-source-bootstrap.tar.xz";
sha256 = "1q1gxp5kjz4vkcs9jl0x01v8qm1q2j789lgvxvikzd591ay0xini";
hash = "sha256-7FmyEfykOAgHaL2AG8zIgftzOszhwVzNKEqskiLGpfk=";
};
patches = [
# Fixes fbc_tests.udt_wstring_.midstmt ascii getting stuck due to stack corruption
# Remove when >1.09.0
(fetchpatch {
name = "fbc-tests-Fix-stack-corruption.patch";
url = "https://github.com/freebasic/fbc/commit/42f4f6dfdaafdd5302a647152f16cda78e4ec904.patch";
excludes = [ "changelog.txt" ];
sha256 = "sha256-Bn+mnTIkM2/uM2k/b9+Up4HJ7SJWwfD3bWLJsSycFRE=";
})
# Respect SOURCE_DATE_EPOCH when set
# Remove when >1.09.0
(fetchpatch {
name = "fbc-SOURCE_DATE_EPOCH-support.patch";
url = "https://github.com/freebasic/fbc/commit/74ea6efdcfe9a90d1c860f64d11ab4a6cd607269.patch";
excludes = [ "changelog.txt" ];
sha256 = "sha256-v5FTi4vKOvSV03kigZDiOH8SEGEphhzkBL6p1hd+NtU=";
})
];
postPatch = ''
patchShebangs tests/warnings/test.sh
# Some tests lack proper dependency on libstdc++
for missingStdcpp in tests/cpp/{class,call2}-fbc.bas; do
sed -i -e "/'"' TEST_MODE : /a #inclib "stdc++"' $missingStdcpp
done
# Help compiler find libstdc++ with gcc backend
sed -i -e '/fbcAddLibPathFor( "libgcc.a" )/a fbcAddLibPathFor( "libstdc++.so" )' src/compiler/fbc.bas
'';
dontConfigure = true;

2
pkgs/development/interpreters/wasm3/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
];
installPhase = ''
runHook preInstal
runHook preInstall
install -Dm755 wasm3 -t $out/bin
runHook postInstall
'';

13
pkgs/development/libraries/liblxi/default.nix
View File

@ -5,18 +5,23 @@
stdenv.mkDerivation rec {
pname = "liblxi";
version = "1.19";
version = "1.20";
src = fetchFromGitHub {
owner = "lxi-tools";
repo = "liblxi";
rev = "v${version}";
sha256 = "sha256-TdIUPAXBogGT9OQrX4wkSmPFjR9McdS9gnQ7c24U4qs=";
hash = "sha256-jS0huNkbyKrsJ3NkenrYtjkzLakOsTJpwlgSo98ribE=";
};
nativeBuildInputs = [ meson ninja cmake pkg-config rpcsvc-proto ];
buildInputs = [ libtirpc avahi libxml2 ];
buildInputs = lib.optionals (!stdenv.isDarwin) [
libtirpc
avahi
] ++ [
libxml2
];
meta = with lib; {
description = "Library for communicating with LXI compatible instruments";
@ -28,7 +33,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://lxi-tools.github.io/";
license = licenses.bsd3;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = [ maintainers.vq ];
};
}

2
pkgs/development/libraries/librclone/default.nix
View File

@ -14,7 +14,7 @@ in buildGoModule rec {
runHook preBuild
cd librclone
go build --buildmode=c-shared -o librclone${ext} github.com/rclone/rclone/librclone
runHook postBuildd
runHook postBuild
'';
installPhase = ''

4
pkgs/development/python-modules/graphene-django/default.nix
View File

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "graphene-django";
version = "3.0.2";
version = "3.1.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "graphql-python";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-dImot/jLKGePHk7ByM/gymgdstHHiS0OKxRq3YAmHuE=";
hash = "sha256-xMEC2GEP39UVWqdLQMRjLOn93PY0aJWEnQRcn8YwxWo=";
};
postPatch = ''

4
pkgs/development/python-modules/niaarm/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "niaarm";
version = "0.3.1";
version = "0.3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "firefly-cpp";
repo = "NiaARM";
rev = version;
hash = "sha256-5XOE3c7amvhw1KrX1hcmTxneYNvAuiHz+OZLb/yhB+I=";
hash = "sha256-9/VGr/Ci9f8SiuofX1vWVF/E4eoeQ0ESj9raQk53Zp4=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/pyatv/default.nix
View File

@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "pyatv";
version = "0.11.0";
version = "0.12.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "postlund";
repo = pname;
rev = "v${version}";
hash = "sha256-HWr+Pu/tMuCDFC2mV3R/Wqe0PfVw/DDgEIYBRnfYx/I=";
hash = "sha256-t7H4ut4atc2XDnpBzV03Q/OrCHMVmZk38r/iWcLKL7Q=";
};
postPatch = ''

4
pkgs/development/tools/doctl/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "doctl";
version = "1.95.0";
version = "1.96.0";
vendorHash = null;
@ -31,7 +31,7 @@ buildGoModule rec {
owner = "digitalocean";
repo = "doctl";
rev = "v${version}";
sha256 = "sha256-gRkReaRDbFGDty8AjuXwoBPEF2wnXMcWVSFaUDideQs=";
sha256 = "sha256-UptiVsT7pLOcJ4kXDnXiwpuloGKTY4AZMIxSYllfuUo=";
};
meta = with lib; {

4
pkgs/development/tools/language-servers/lua-language-server/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lua-language-server";
version = "3.6.19";
version = "3.6.21";
src = fetchFromGitHub {
owner = "luals";
repo = "lua-language-server";
rev = version;
sha256 = "sha256-AKPCS2w8PAW2jm5pquCouIHHq5PYFtrPWtIM5N6VAwA=";
sha256 = "sha256-db3lNo6aJXU0WaUXlegEK87kuXQUVBrTAFtvCeb7PzY=";
fetchSubmodules = true;
};

4
pkgs/development/tools/misc/ccache/default.nix
View File

@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ccache";
version = "4.8";
version = "4.8.1";
src = fetchFromGitHub {
owner = "ccache";
repo = "ccache";
rev = "refs/tags/v${finalAttrs.version}";
sha256 = "sha256-X7Pv+yEQaKPdWTiKq67kSAyimyKvLSCYr4EjLlw+J0U=";
sha256 = "sha256-v0XYIaUKgdCYNSlwLNA3+oBEh6IDo8f5GPNsmYzzYRM=";
};
outputs = [ "out" "man" ];

8
pkgs/development/tools/misc/texlab/default.nix
View File

@ -15,16 +15,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "texlab";
version = "5.5.1";
version = "5.6.0";
src = fetchFromGitHub {
owner = "latex-lsp";
repo = "texlab";
rev = "refs/tags/v${version}";
hash = "sha256-8m7GTD4EX7mWe1bYPuz+4g7FaPuW8++Y/fpIRsdxo6g=";
hash = "sha256-3s8Nn3jLj39LWRb3jPbNAx0IcNUxGlvzybm+7+M5FRU=";
};
cargoHash = "sha256-dcKVhHYODTFw46o3wM8EH0IpT6DkUfOHvdDmbMQmsX0=";
cargoHash = "sha256-fHw8ulW7VsgxexY+hbZ+2MXwrzz77Ku7vQtsFRAO/JA=";
outputs = [ "out" ] ++ lib.optional (!isCross) "man";
@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
# generate the man page
postInstall = lib.optionalString (!isCross) ''
# TexLab builds man page separately in CI:
# https://github.com/latex-lsp/texlab/blob/v5.5.1/.github/workflows/publish.yml#L127-L131
# https://github.com/latex-lsp/texlab/blob/v5.6.0/.github/workflows/publish.yml#L127-L131
help2man --no-info "$out/bin/texlab" > texlab.1
installManPage texlab.1
'';

132
pkgs/development/tools/misc/topiary/Cargo.lock generated
View File

@ -4,9 +4,9 @@ version = 3
[[package]]
name = "aho-corasick"
version = "0.7.20"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
dependencies = [
"memchr",
]
@ -28,15 +28,15 @@ dependencies = [
[[package]]
name = "anstream"
version = "0.2.6"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f"
checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
dependencies = [
"anstyle",
"anstyle 1.0.0",
"anstyle-parse",
"anstyle-query",
"anstyle-wincon",
"concolor-override",
"concolor-query",
"colorchoice",
"is-terminal",
"utf8parse",
]
@ -48,22 +48,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2"
[[package]]
name = "anstyle-parse"
version = "0.1.1"
name = "anstyle"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116"
checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
[[package]]
name = "anstyle-parse"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-wincon"
version = "0.2.0"
name = "anstyle-query"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa"
checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
dependencies = [
"anstyle",
"windows-sys 0.45.0",
"windows-sys 0.48.0",
]
[[package]]
name = "anstyle-wincon"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
dependencies = [
"anstyle 1.0.0",
"windows-sys 0.48.0",
]
[[package]]
@ -72,7 +87,7 @@ version = "2.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0b2340f55d9661d76793b2bfc2eb0e62689bd79d067a95707ea762afd5e9dd"
dependencies = [
"anstyle",
"anstyle 0.3.5",
"bstr",
"doc-comment",
"predicates",
@ -224,9 +239,9 @@ dependencies = [
[[package]]
name = "clap"
version = "4.2.1"
version = "4.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3"
checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc"
dependencies = [
"clap_builder",
"clap_derive",
@ -235,22 +250,22 @@ dependencies = [
[[package]]
name = "clap_builder"
version = "4.2.1"
version = "4.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f"
checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990"
dependencies = [
"anstream",
"anstyle",
"anstyle 1.0.0",
"bitflags",
"clap_lex 0.4.1",
"clap_lex 0.5.0",
"strsim 0.10.0",
]
[[package]]
name = "clap_derive"
version = "4.2.0"
version = "4.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4"
checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b"
dependencies = [
"heck 0.4.1",
"proc-macro2",
@ -269,24 +284,15 @@ dependencies = [
[[package]]
name = "clap_lex"
version = "0.4.1"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
[[package]]
name = "concolor-override"
name = "colorchoice"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f"
[[package]]
name = "concolor-query"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf"
dependencies = [
"windows-sys 0.45.0",
]
checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
[[package]]
name = "criterion"
@ -859,7 +865,7 @@ version = "3.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c575290b64d24745b6c57a12a31465f0a66f3a4799686a6921526a33b0797965"
dependencies = [
"anstyle",
"anstyle 0.3.5",
"difflib",
"itertools",
"predicates-core",
@ -1014,9 +1020,9 @@ dependencies = [
[[package]]
name = "regex"
version = "1.7.3"
version = "1.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
checksum = "d1a59b5d8e97dee33696bf13c5ba8ab85341c002922fba050069326b9c498974"
dependencies = [
"aho-corasick",
"memchr",
@ -1031,9 +1037,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
[[package]]
name = "regex-syntax"
version = "0.6.29"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
[[package]]
name = "rustix"
@ -1078,18 +1084,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "serde"
version = "1.0.159"
version = "1.0.163"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.159"
version = "1.0.163"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
dependencies = [
"proc-macro2",
"quote",
@ -1109,9 +1115,9 @@ dependencies = [
[[package]]
name = "serde_spanned"
version = "0.6.1"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d"
dependencies = [
"serde",
]
@ -1269,22 +1275,22 @@ dependencies = [
[[package]]
name = "tokio"
version = "1.27.0"
version = "1.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105"
dependencies = [
"autocfg",
"num_cpus",
"pin-project-lite",
"tokio-macros",
"windows-sys 0.45.0",
"windows-sys 0.48.0",
]
[[package]]
name = "tokio-macros"
version = "2.0.0"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2",
"quote",
@ -1317,9 +1323,9 @@ dependencies = [
[[package]]
name = "toml"
version = "0.7.3"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec"
dependencies = [
"serde",
"serde_spanned",
@ -1329,18 +1335,18 @@ dependencies = [
[[package]]
name = "toml_datetime"
version = "0.6.1"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
dependencies = [
"serde",
]
[[package]]
name = "toml_edit"
version = "0.19.8"
version = "0.19.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
checksum = "92d964908cec0d030b812013af25a0e57fddfadb1e066ecc6681d86253129d4f"
dependencies = [
"indexmap",
"serde",
@ -1351,7 +1357,7 @@ dependencies = [
[[package]]
name = "topiary"
version = "0.2.0"
version = "0.2.1"
dependencies = [
"criterion",
"futures",
@ -1379,10 +1385,10 @@ dependencies = [
[[package]]
name = "topiary-cli"
version = "0.2.0"
version = "0.2.1"
dependencies = [
"assert_cmd",
"clap 4.2.1",
"clap 4.3.0",
"env_logger",
"log",
"tempfile",
@ -1393,7 +1399,7 @@ dependencies = [
[[package]]
name = "topiary-playground"
version = "0.0.1"
version = "0.2.1"
dependencies = [
"cfg-if",
"itertools",

19
pkgs/development/tools/misc/topiary/default.nix
View File

@ -1,18 +1,17 @@
{ lib
, rustPlatform
, fetchFromGitHub
, fetchpatch
}:
rustPlatform.buildRustPackage rec {
pname = "topiary";
version = "0.2.0";
version = "0.2.1";
src = fetchFromGitHub {
owner = "tweag";
repo = pname;
rev = "v${version}";
hash = "sha256-OJdR+8eGbcDjirupjcczztYbGKGKaRywZnqqjv0EOSU=";
hash = "sha256-ShtwnxkDo/+31jZSg8XWnLLtrkLlqQQ5UiLVrPCM9ag=";
};
cargoLock = {
@ -27,15 +26,6 @@ rustPlatform.buildRustPackage rec {
};
};
patches = [
# the versions in `Cargo.toml`s are outdated
(fetchpatch {
name = "bump-version-to-0.2.0.patch";
url = "https://github.com/tweag/topiary/commit/612fdb64f50ab15889a0b508bf727f159f26a112.patch";
hash = "sha256-MHaAnYyjXdKbh/pE3bL2iAPX6bMQkK+LUGYCL5mBM44=";
})
];
cargoBuildFlags = [ "-p" "topiary-cli" ];
cargoTestFlags = cargoBuildFlags;
@ -43,6 +33,11 @@ rustPlatform.buildRustPackage rec {
TOPIARY_LANGUAGE_DIR = "${placeholder "out"}/share/languages";
};
# Cargo.lock is outdated
postPatch = ''
ln -sf ${./Cargo.lock} Cargo.lock
'';
postInstall = ''
install -Dm444 languages/* -t $out/share/languages
'';

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-c",
"rev": "f35789006ccbe5be8db21d1a2dd4cc0b5a1286f2",
"date": "2023-02-22T10:24:35+01:00",
"path": "/nix/store/7q7p3iw8dsa5gwvbabnn26w81fkbp46a-tree-sitter-c",
"sha256": "0dhl0vz0x0s64n4nq2chnncq89j7xsbg0s73cavpjdq4ajiamdjc",
"rev": "a015709e7d1bb4f823a2fc53175e0cbee96c1c3e",
"date": "2023-05-22T07:31:22+02:00",
"path": "/nix/store/mrl2pdg4jxn4hcyz6lpsnl47m0fxqwl8-tree-sitter-c",
"sha256": "086cz0ky1f0ds14v9m8nif57cil9ssvqym8c51la7qv4329dgs5b",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/sogaiu/tree-sitter-clojure",
"rev": "421546c2547c74d1d9a0d8c296c412071d37e7ca",
"date": "2023-02-25T16:13:05+09:00",
"path": "/nix/store/y64fl2527y2d97yl89i62m66dv0n68lq-tree-sitter-clojure",
"sha256": "0da18c1kj8pyrzmkg8zv186qy36xyjnmrj8wj7bl4k7gk18xmw0r",
"rev": "6e41628e9d18b19caea1cb1d72aae4ccff5bdfe9",
"date": "2023-05-05T15:36:48+09:00",
"path": "/nix/store/fx50ap0gdspwcpgf0zni4j1pzz29abk5-tree-sitter-clojure",
"sha256": "0hcl4svn0q4979mx0nn3hhi27xfxj1lz7g1926lcjx6sv1z4ihmj",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-comment.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/stsewd/tree-sitter-comment",
"rev": "a37ca370310ac6f89b6e0ebf2b86b2219780494e",
"date": "2022-03-28T20:21:33-05:00",
"path": "/nix/store/nbf4bgxb7a15mwbi6lsfn7gbq8x1s3c1-tree-sitter-comment",
"sha256": "0y0wqzgrwwg09ipfs6i3bcxm5hbvs938g2ksnygcbgqdwgd5h8f2",
"rev": "f08e7d44b2923e9da2bf487a2f365d08677d368e",
"date": "2023-04-10T20:11:04-05:00",
"path": "/nix/store/swaxl1n782g3gvvbxj0d659krb2zrxaw-tree-sitter-comment",
"sha256": "1r9bzf6fxc2cjb8ndrkvirpqgk9wixandcsp2311dxvyfk3phy5z",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-cpp",
"rev": "66262d3e76eb2046c76e6d661a6b72664bfb5819",
"date": "2023-02-22T10:24:05+01:00",
"path": "/nix/store/bairlzwv7gak6wfvk185q1jixncz4wj0-tree-sitter-cpp",
"sha256": "09myna6pa1pl0qzj6kfvs4h7jw0fm2mnfnx3lv8r90k6b1vf56ji",
"rev": "70aed2e9e83eb7320ab7c454d3084300bf587037",
"date": "2023-05-09T10:48:30+02:00",
"path": "/nix/store/v44wqlm6vlz3rw9v402hxykz6fvc4n22-tree-sitter-cpp",
"sha256": "1h2g7jy0znnzqrfgjnkz33hys4wcgxj6cqk3zcyb1zs77nmwn16y",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/thehamsta/tree-sitter-cuda",
"rev": "9b1f7481a151686fce8af66da147f40388f8ee4d",
"date": "2023-02-22T17:21:33-08:00",
"path": "/nix/store/d5aqw99m6kgqf56a4sl2h5wcqdmljglh-tree-sitter-cuda",
"sha256": "19zn8aqfqg7y225hbb1ag50ma59adlw0l0gjbpjns0f0dbz3qr11",
"rev": "9c20a3120c405db9efda9349cd005c29f2aace3c",
"date": "2023-05-22T10:54:56+02:00",
"path": "/nix/store/zzix5y046a7vj6s16cdkp0v2fhfr24fq-tree-sitter-cuda",
"sha256": "0z9va82k7n8rlnk6g9q52sxaw2lcb05arl3l5dqmji5s53sq5q1c",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/usernobody14/tree-sitter-dart",
"rev": "53485a8f301254e19c518aa20c80f1bcf7cf5c62",
"date": "2022-08-11T13:38:34-07:00",
"path": "/nix/store/frp77jynv64s1x0l6hix5dk12zlsf5wq-tree-sitter-dart",
"sha256": "1ds1hz9gkvc3dp6bz93zlb1rixzhyj8cm6xfpb7cm4a8rhajz1yl",
"rev": "1a525edd89026cc6f0a954b4718ce20fd7e45b15",
"date": "2023-05-23T15:35:37-06:00",
"path": "/nix/store/kv98km1sar3gxlzi3inyqln7i9701wgi-tree-sitter-dart",
"sha256": "0i2d6khh7gv48fpnc0f550gyxpzm328b8065sri7lhab0rjf17ai",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/joelspadin/tree-sitter-devicetree",
"rev": "877adbfa0174d25894c40fa75ad52d4515a36368",
"date": "2022-03-23T18:25:46-05:00",
"path": "/nix/store/q0rqqm39h4dh17nlrr10kbfcqbdfk5kl-tree-sitter-devicetree",
"sha256": "1ds7pa4x1yd54xa2mba37vp8lbi8n4l975lps0249x8xw35r0jrl",
"rev": "59faca63ab28d8aa8b79416bfcbe5b935f3fa604",
"date": "2023-04-23T12:18:55-05:00",
"path": "/nix/store/m39bl3vasy0b1r0qzdn8flb480ys8laq-tree-sitter-devicetree",
"sha256": "11r46v3zw03p1fldhawn9zwyzpi7h57pjw9sydwq7b1fgdmdxvn7",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/wilfred/tree-sitter-elisp",
"rev": "4b0e4a3891337514126ec72c7af394c0ff2cf48c",
"date": "2021-10-02T12:14:40-07:00",
"path": "/nix/store/1g3q3xzv5n9wzi84awrlbxwm6q3zh8qz-tree-sitter-elisp",
"sha256": "1g6qmpxn1y9hzk2kkpp9gpkphaq9j7vvm4nl5zv8a4wzy3w8p1wv",
"rev": "1991465e2722dd36c06e03dc7de6bc5d7da89d51",
"date": "2023-03-28T08:47:56-07:00",
"path": "/nix/store/mbb6q2yma6vszbzpw5hbpzf0iwg9y7vi-tree-sitter-elisp",
"sha256": "1m6lb60mlyk38pizcncp58f69kyf36b47rxnysf1l4193nscjqw6",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/elixir-lang/tree-sitter-elixir",
"rev": "b20eaa75565243c50be5e35e253d8beb58f45d56",
"date": "2022-10-16T19:20:07+00:00",
"path": "/nix/store/424sg83igjqrkl4yzyiqv0byv4hzii0n-tree-sitter-elixir",
"sha256": "1i0c0xki3sv24649p0ws7xs2jagbwg7z7baz1960239bj94nl487",
"rev": "869dff3ceb8823ca4b17ca33b663667c8e41e8ba",
"date": "2023-03-14T10:58:34+01:00",
"path": "/nix/store/d8k07yvr8q14rc21fvhcnqrlpcwhlnmk-tree-sitter-elixir",
"sha256": "0m10vykaj36yxk0wwh0vk0pzvpdmac4apgihmxn3j0dwwgirchf0",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/elm-tooling/tree-sitter-elm",
"rev": "cce0e5938e7779f86cf8bf445eadf7df4b88229d",
"date": "2022-09-03T13:02:26+02:00",
"path": "/nix/store/scick955z3qrbxmk1jr8cchwsnx4l814-tree-sitter-elm",
"sha256": "0b5jpj8bnil1ylisyc4w48j8a30dyf3zylhidj73mlrb8rf7xm2s",
"rev": "692c50c0b961364c40299e73c1306aecb5d20f40",
"date": "2023-04-15T15:07:51+02:00",
"path": "/nix/store/hmjs76plv6a64c2mgfxq79mh0ak2a45a-tree-sitter-elm",
"sha256": "0y5mz26ax2gzlv8cbrncn4bip9gin330a2zmynq9f1yfwv4nxfnh",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/thehamsta/tree-sitter-glsl",
"rev": "e2c2214045de2628b81089b1a739962f59654558",
"date": "2022-11-24T01:46:06+01:00",
"path": "/nix/store/s203fvxw2v3gvbnf5qavms10f308ssl0-tree-sitter-glsl",
"sha256": "146v3ki2c2g8grlkz40iay6wi2crkxiy3i3jkcpv096ya9wf3dhs",
"rev": "190c86e633e6a6dfdb8a96f8b8460e347ff93f1c",
"date": "2023-05-20T13:31:53+02:00",
"path": "/nix/store/hj5f27mzk311bbjb448azsw2wwrax171-tree-sitter-glsl",
"sha256": "0ag7w0cp22253hzlm9017fsxmryhn8b8m0vrpsmh5kd05xss413k",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-haskell",
"rev": "3bdba07c7a8eec23f87fa59ce9eb2ea4823348b3",
"date": "2023-02-09T02:03:40+01:00",
"path": "/nix/store/pv2ar6i072q3i1jy51s0wirarjqsk2ra-tree-sitter-haskell",
"sha256": "1hg19af1n510bndf5k5iri7dzb48xb527vispv1aapki4mvr98gx",
"rev": "c5cb0c860a399308305f44792bc4853737c40c07",
"date": "2023-05-06T16:49:31+02:00",
"path": "/nix/store/hh393wfdf43mghdgslq9315cqry1gim6-tree-sitter-haskell",
"sha256": "0an4d5q0vjl9amk4cwhs9d9cb3i4d1n20hzda165b88cq720lk7m",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-html",
"rev": "29f53d8f4f2335e61bf6418ab8958dac3282077a",
"date": "2022-05-06T09:01:49-07:00",
"path": "/nix/store/w5dy2r99rbzpmg0icwil5j9cp37l9hkk-tree-sitter-html",
"sha256": "0wadphmgndj4vq9mg258624pj0klspbpcx8qlc6f8by5xbshvkmz",
"rev": "86c253e675e7fdd1c0482efe0706f24bafbc3a7d",
"date": "2023-04-17T11:50:54+02:00",
"path": "/nix/store/a046axd86r1bd974b7c3ylyni4b90wma-tree-sitter-html",
"sha256": "12brygy11q1gkbpj9m4alg91jji6avc5j71lwv3m773c94jpbqlq",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/ntbbloodbath/tree-sitter-http",
"rev": "2c6c44574031263326cb1e51658bbc0c084326e7",
"date": "2023-01-06T03:29:38+01:00",
"path": "/nix/store/p6dxp8z5fyyjs9s0lky651dhmln7ciw0-tree-sitter-http",
"sha256": "15spzks4wpd1zvqkaq9irlr5xqk1n144lyxdkijkc9zvyvm6gka7",
"rev": "6824a247d1326079aab4fa9f9164e9319678081d",
"date": "2023-05-04T18:36:43-04:00",
"path": "/nix/store/7d2x9w6nqlhvgk70jahwlp6zg19iriij-tree-sitter-http",
"sha256": "0vhipdljx3s2pgzdk2a1zgqf8dd7p3bdbjckcb6z01hdg2p9v121",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/sogaiu/tree-sitter-janet-simple",
"rev": "c796533cc82ae29d64f13b9a36e715bc02e28e72",
"date": "2023-02-25T21:44:49+09:00",
"path": "/nix/store/mqc5gh2zfm3vbc63i4pi1mi9xhqpr2ha-tree-sitter-janet-simple",
"sha256": "00mnkkmfygfrnx5cjhcll42j3xjy0blj9sisz94s7hkf6x21m9a0",
"rev": "bd9cbaf1ea8b942dfd58e68df10c9a378ab3d2b6",
"date": "2023-04-29T13:15:11+09:00",
"path": "/nix/store/53gscixcapdpckbr4gfx26ax0jk84xcp-tree-sitter-janet-simple",
"sha256": "0hy1dm2jzghd7mi74n4b1ac5bhm809mcg3bcl9f300bh5m79qnyq",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-json",
"rev": "73076754005a460947cafe8e03a8cf5fa4fa2938",
"date": "2022-10-03T12:40:23-07:00",
"path": "/nix/store/v8s2xfc2jx8wvrfcf0silm5w4gj3m15j-tree-sitter-json",
"sha256": "1npf2hrx33jhjpmzcyi7aszg436m4d80sa6h4mhhkmx51q4kpcf1",
"rev": "40a81c01a40ac48744e0c8ccabbaba1920441199",
"date": "2023-04-21T17:11:30-07:00",
"path": "/nix/store/9wcmgficprni47bm3qj9k18bhmjqi6hx-tree-sitter-json",
"sha256": "0zji769g3nikqlwn0vb0h93908a7w59da4jf807r9g2s6fvmz4vx",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/cbarrete/tree-sitter-ledger",
"rev": "f787ae635ca79589faa25477b94291a87e2d3e23",
"date": "2023-02-16T12:14:48+01:00",
"path": "/nix/store/rv2mrwcnjf0q1wxwjsggpkx4a1f5jmbl-tree-sitter-ledger",
"sha256": "1r3c5svcrh5bb0i3qn7d2rnppxvqndwnnry918rlb18nhvc3c9zm",
"rev": "8a841fb20ce683bfbb3469e6ba67f2851cfdf94a",
"date": "2023-05-07T23:13:39-04:00",
"path": "/nix/store/hdf6hzhb4h9p28hx26iqqz0cwf471aq8-tree-sitter-ledger",
"sha256": "12mfn42nhn0i8gf39aqbqfkccqc1mbn5z1vw5gh98pc9392jccq4",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-llvm.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/benwilliamgraham/tree-sitter-llvm",
"rev": "e9948edc41e9e5869af99dddb2b5ff5cc5581af6",
"date": "2022-03-31T23:27:40-04:00",
"path": "/nix/store/8nkhzala4wscfip1g0skh1cxvmp3gp8l-tree-sitter-llvm",
"sha256": "0d579ylhi3hgzm5wbahs6hci1rhv7q1x6wsav9dbzv1y6np2dfrk",
"rev": "d47c95d78ef0e7495a74d214dd6fcddf6e402dfc",
"date": "2023-05-03T15:12:41-04:00",
"path": "/nix/store/fp1hrlrvj29ndsyp7dbvg4bgmja891s6-tree-sitter-llvm",
"sha256": "1d863cy214w26hlj22y60a4nw3j5qmr9a174f8vfgcc0lk9dzbh8",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/MunifTanjim/tree-sitter-lua",
"rev": "0fc89962b7ff5c7d676b8592c1cbce1ceaa806fd",
"date": "2022-12-16T15:23:55+06:00",
"path": "/nix/store/cm9ff3d8f48sqgjkrc38sqjg7lbpswz9-tree-sitter-lua",
"sha256": "07mj9jydnxmp2dr7ssj58qlwrjx3gp6jnri79wa2jxaaygblzcri",
"rev": "dcc44f7473ecec4d7b99af0a9529705d98a769f1",
"date": "2023-05-13T02:02:51+06:00",
"path": "/nix/store/079khfz0609hqllhwp08c2y96j2jkbwr-tree-sitter-lua",
"sha256": "13rmng6y6q653s0yk1ahbppjmxwcbr80h5kgr53q43bq9khjrjxx",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/MDeiml/tree-sitter-markdown",
"rev": "6138ee0c0d0ddafc4bf0e25728b73f902bbf2c98",
"date": "2023-02-28T15:28:45+01:00",
"path": "/nix/store/i184yz0i3afs1hbw10b3k9i58fxzdzcv-tree-sitter-markdown",
"sha256": "1rx6m2qj9a08qzzaxrkij68pcw7m1rl78qggg6k93caskjab461z",
"rev": "fa6bfd51727e4bef99f7eec5f43947f73d64ea7d",
"date": "2023-03-06T00:22:35+01:00",
"path": "/nix/store/8biwal105haahabfl6q01q2dm3danjzn-tree-sitter-markdown",
"sha256": "0wryvq7153a3jx9qs1plm5crlgd88sm1ymlqc3gs09mr2n456z9z",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/nickel-lang/tree-sitter-nickel",
"rev": "d6c7eeb751038f934b5b1aa7ff236376d0235c56",
"date": "2023-01-27T10:31:38+01:00",
"path": "/nix/store/nyv8hdasyh5hgs65r38saxdn2m26b70r-tree-sitter-nickel",
"sha256": "1qdhggiprs1z5nnans2a876znfga95az3nafl4qp7j0ngg0m3x0g",
"rev": "3a794388773f2424a97b2186828aa3fac4c66ce6",
"date": "2023-05-17T14:02:29+02:00",
"path": "/nix/store/m4siaf1k6xbr3smyyjm7f047szzp99sw-tree-sitter-nickel",
"sha256": "1m28gjdamysxr9grjzwpmj1qiniff4vy1nka9i3zjyskbm71pf1l",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/cstrahan/tree-sitter-nix",
"rev": "1b69cf1fa92366eefbe6863c184e5d2ece5f187d",
"date": "2022-09-29T23:30:43-05:00",
"path": "/nix/store/m5g4d7vddlwhhbdmzpwdvisqvb1hbh02-tree-sitter-nix",
"sha256": "0ls9djhpbbnjvd6b3166zjy92di0927f70720b57j2d3925538i5",
"rev": "02878b40ac77d2889833519c6b6e9e63cfc690e6",
"date": "2023-03-11T16:31:57-06:00",
"path": "/nix/store/mlasmj51yygqms5fwsd34fjb2h16q8q0-tree-sitter-nix",
"sha256": "1y737sif7hjnssif28xn16paf1kpamgsqh82k4j6grzbp11j4kpl",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/ganezdragon/tree-sitter-perl",
"rev": "c43bae0090cfcfc62d9904312599ded1b645a66d",
"date": "2023-02-25T16:52:44+05:30",
"path": "/nix/store/k7mnrlm1b2cw17fr1qn2cnip3fhmgqyp-tree-sitter-perl",
"sha256": "16bpjnydl1qdiqy6j0ahi0ff9fdsxhmz1n0sni4amn57xky6sxiz",
"rev": "60aa138f9e1db15becad53070f4d5898b0e8a98c",
"date": "2023-04-13T01:12:55+05:30",
"path": "/nix/store/dd6ymbx86sw0g6dp1lns65avs50kr9kr-tree-sitter-perl",
"sha256": "1br66y8prhq7k7fi50sl8v51y8s29wf590g44kh5a574dx51960s",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-php",
"rev": "f860e598194f4a71747f91789bf536b393ad4a56",
"date": "2023-02-10T07:41:01+01:00",
"path": "/nix/store/dmiqjxsagqmqvsmw9hp4z4wbrp9nsb26-tree-sitter-php",
"sha256": "02yc5b3qps8ghsmy4b5m5kldyr5pnqz9yw663v13pnz92r84k14g",
"rev": "1a40581b7a899201d7c2b4684ee34490bc306bd6",
"date": "2023-03-14T02:52:52-07:00",
"path": "/nix/store/nxhb4hdr16bfylq1jkzjznh65bkd0g8x-tree-sitter-php",
"sha256": "1hm7mpv0sggqzgbixh4r3bpap3dsh1zsy6msyknhdpkhblch4a5m",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/nvim-treesitter/tree-sitter-query",
"rev": "0717de07078a20a8608c98ad5f26c208949d0e15",
"date": "2022-12-19T17:53:12+01:00",
"path": "/nix/store/gdf77qz6qmfikks2vjqh38wxsvn80r8w-tree-sitter-query",
"sha256": "19025zagdmimqixd25gh2rwn5hr9jfr7s08fvil3n5fqr9zshrbm",
"rev": "e97504446f14f529d5a8e649667d3d60391e4dfd",
"date": "2023-03-09T05:33:03-08:00",
"path": "/nix/store/3p8d4hl2bnm1fzn0nx7zc62l73118vm2-tree-sitter-query",
"sha256": "0xd00idgmyr55yd10xaxma1pwahlvn7gqy78zf8zknfbqvd3rzqs",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-rust",
"rev": "fbf9e507d09d8b3c0bb9dfc4d46c31039a47dc4a",
"date": "2023-02-22T10:25:29+01:00",
"path": "/nix/store/90qz5h5a0ikn665d9q1d7nj4wcyyc5km-tree-sitter-rust",
"sha256": "1accbzkp6h4c9z7sakqnrjajx08ja5w8p6j17bgnbc9vy50jhsl5",
"rev": "0a70e15da977489d954c219af9b50b8a722630ee",
"date": "2023-04-25T13:09:18+02:00",
"path": "/nix/store/ymkvfvgf2wkxzsffxhyv7m8bq8j2f39f-tree-sitter-rust",
"sha256": "0m979bkrb7r58dapnm5plarvk3x3mvn5yyslrnrh6qgci7xmicqa",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-scala",
"rev": "918f0fb948405181707a1772cab639f2d278d384",
"date": "2023-01-05T16:03:13-05:00",
"path": "/nix/store/38yd5q5d19fdry4icmq5fqz0kkmz3xi3-tree-sitter-scala",
"sha256": "0ffcx6lrpvg56wci0a4crk58as8hs8aljrqsim2kqbb171mc4wzy",
"rev": "5aefc0ae4c174fa74d6e973faefa28692e081954",
"date": "2023-05-23T22:52:07-04:00",
"path": "/nix/store/2gag459nfdm3c0p1a79wj9m3mnpzqn83-tree-sitter-scala",
"sha256": "064hch4v9pkl2ylkb6imfxz0a5dfl6rc37m76rxcdzmiwcr7fmfw",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/6cdh/tree-sitter-scheme",
"rev": "67b90a365bebf4406af4e5a546d6336de787e135",
"date": "2023-01-16T14:32:14+08:00",
"path": "/nix/store/vsbfzbn9phgkn008633yjxr3d95zf4y1-tree-sitter-scheme",
"sha256": "1pvxckza1kdfwqs78ka3lbwldrwkgymb31f5x1fq5vyawg60wxk8",
"rev": "6abcfe33d976ebe3e244ca80273c7e8a070441b5",
"date": "2023-04-22T18:14:27+08:00",
"path": "/nix/store/18v6jgrcfdl3sgg7p02dpzkc3lj9mpn6-tree-sitter-scheme",
"sha256": "0iazh55cmznw2mkffnzwkpq4f8vkb1hxiapkgflmcnaq9wb6jp7a",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/derekstride/tree-sitter-sql",
"rev": "d4b8be1e52b07b66e5ec62d2f1c0d701dfa85ed9",
"date": "2023-03-01T10:01:35-05:00",
"path": "/nix/store/sx2ycgc20fw4hqc5vkh2lynl4s947qsg-tree-sitter-sql",
"sha256": "04if27bdl03w2fqgyja6aq29hy7j5lb82r5jd5s75am5g1lwiicj",
"rev": "63a6bad6d4ca2192cf252e10db73627414546732",
"date": "2023-05-23T15:22:05+00:00",
"path": "/nix/store/wkbdy34zr3ccs0pf0is1xc5223k3riai-tree-sitter-sql",
"sha256": "1g7ldcvwmw5rp97i12drcr26b8biczpphhgl08c4gack787sxgrk",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/Himujjal/tree-sitter-svelte",
"rev": "84c90ee15f851e1541c25c86e8a4338f5b4d5af2",
"date": "2022-04-13T11:35:15+05:30",
"path": "/nix/store/2miakcpw7xgg2pcwdbcg0kl2djijcfbj-tree-sitter-svelte",
"sha256": "0hidafgzbnksyigksab8731jdnvj1vqn7fv0jxsc1yfrwrmai6ls",
"rev": "be7f2e7db1fc19f0852265ec60923fc058380739",
"date": "2023-04-03T22:59:58+05:30",
"path": "/nix/store/lqqls8g9zhiv2v32if429cwycn092zq6-tree-sitter-svelte",
"sha256": "1kp91sarydq41zznwxwxdv2i2pflgzhmpfv0iqgq47fma9bcv2wy",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tiger.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/ambroisie/tree-sitter-tiger",
"rev": "a233ebe360a73a92c50978e5c4e9e471bc59ff42",
"date": "2022-11-22T10:59:45+01:00",
"path": "/nix/store/30fd7jd6p4rc2x1ahax19jxxa0blz7lq-tree-sitter-tiger",
"sha256": "0jv8dawvdjws0klypf80z4fff4va5963vcxdp22rvp3g1n8dc3cm",
"rev": "4a099243ed68a4fc72fdad8ea3ce57ec411ebfe3",
"date": "2023-04-01T17:11:28+01:00",
"path": "/nix/store/f8nmndxp42jf09lp1v2m3grj1h6f447y-tree-sitter-tiger",
"sha256": "0riyjsqdk4kiyl58vanfg7k64n55czcncsjx696l3gph2dyfjxnb",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/tlaplus-community/tree-sitter-tlaplus",
"rev": "c54aebd31e2ac394a0aa70b510724c99144119f1",
"date": "2023-02-04T13:10:02-05:00",
"path": "/nix/store/p4jybbcwfv9x1s3kxp9bzifl2zsd3nil-tree-sitter-tlaplus",
"sha256": "06sshz8ia27ypzbwy5isx7ndyi9sc6x4xyr8r50njcpy3av4d7wn",
"rev": "7ba226cf85280c7917d082940022006e6a3b7b6f",
"date": "2023-03-28T17:13:15-04:00",
"path": "/nix/store/biqm93z4n1ravfi5bs466fbp4bxadjmk-tree-sitter-tlaplus",
"sha256": "0md800h54792nv1mfzdw7wyjzz8wx5cvl6mzlb8l70p0ihjfrk1s",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/tree-sitter/tree-sitter-typescript",
"rev": "c6e56d44c686a67c89e29e773e662567285d610f",
"date": "2023-02-24T18:42:51+01:00",
"path": "/nix/store/m7hqakchzx02kb56d8sf17623jpkp35w-tree-sitter-typescript",
"sha256": "1vdqmna7zqs8aw7a87z4pn3ivplbgbn8jqjpyaxx6k5czmnl1ims",
"rev": "286e90c32060032225f636a573d0e999f7766c97",
"date": "2023-04-21T18:31:50-07:00",
"path": "/nix/store/cf6q6c3mclp70bplsdykgxbpjrnb2yh2-tree-sitter-typescript",
"sha256": "06kq9c26my2h53fv7qlmkpaia21ahbyd0lsrn9l4hric7b3ca3wn",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/vigoux/tree-sitter-viml",
"rev": "e39a7bbcfdcfc7900629962b785c7e14503ae590",
"date": "2023-02-06T05:55:47+01:00",
"path": "/nix/store/haqij5xp39vjwh7p1rzdrzbicscnqx3l-tree-sitter-viml",
"sha256": "0p9vkl4z0kvyl3mv71rq57zghddvl2ghxbir2amjgrwb00gh0xbz",
"rev": "7c317fbade4b40baa7babcd6c9097c157d148e60",
"date": "2023-05-05T08:51:55+02:00",
"path": "/nix/store/dazqp112dyrxh96yizdm382fsz1rmsdj-tree-sitter-viml",
"sha256": "1fsngbgpvq4mg0qfwkpdn4qqi3djg2kv4a8g49yw2i8a3d88yg7x",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

8
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json
View File

@ -1,9 +1,9 @@
{
"url": "https://github.com/maxxnino/tree-sitter-zig",
"rev": "1cd5f339b146b764f39b36bb7be98ca631a2e02a",
"date": "2023-02-28T21:37:35+07:00",
"path": "/nix/store/hl9gqwnlplia44nkq9mhd2ck3gf0clxy-tree-sitter-zig",
"sha256": "1pg17xq7x3m4nlqbnc261zz9603xwl3am82qs21b0wkqc6zs3fyb",
"rev": "0d08703e4c3f426ec61695d7617415fff97029bd",
"date": "2023-04-25T05:51:06-03:00",
"path": "/nix/store/fzz8x1pa11zksamgk199fw0j7dkbsz0s-tree-sitter-zig",
"sha256": "0whj44fl6hmcyap5bjqhy90rd6xnnxgsy3vn1z3mvq8d2mwbnxbb",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

1
pkgs/development/tools/parsing/tree-sitter/update.nix
View File

@ -141,6 +141,7 @@ let
"tree-sitter-sql" = {
orga = "derekstride";
repo = "tree-sitter-sql";
branch = "gh-pages";
};
"tree-sitter-vim" = {
orga = "vigoux";

15
pkgs/development/tools/parsing/tree-sitter/update_impl.py
View File

@ -3,7 +3,7 @@ import json
import subprocess as sub
import os
import sys
from typing import Iterator, Any, Literal, TypedDict
from typing import Iterator, Any, Literal, TypedDict, Optional
from tempfile import NamedTemporaryFile
debug: bool = True if os.environ.get("DEBUG", False) else False
@ -106,9 +106,13 @@ def fetchRepo() -> None:
release: str
match curl_result(out):
case "not found":
# github sometimes returns an empty list even tough there are releases
log(f"uh-oh, latest for {orga}/{repo} is not there, using HEAD")
release = "HEAD"
if "branch" in jsonArg:
branch = jsonArg.get("branch")
release = f"refs/heads/{branch}"
else:
# github sometimes returns an empty list even tough there are releases
log(f"uh-oh, latest for {orga}/{repo} is not there, using HEAD")
release = "HEAD"
case {"tag_name": tag_name}:
release = tag_name
case _:
@ -171,7 +175,8 @@ Grammar = TypedDict(
{
"nixRepoAttrName": str,
"orga": str,
"repo": str
"repo": str,
"branch": Optional[str]
}
)

6
pkgs/development/tools/rover/default.nix
View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "rover";
version = "0.11.0";
version = "0.14.0";
src = fetchFromGitHub {
owner = "apollographql";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Ei6EeM0+b3EsMoRo38nHO79onT9Oq/cfbiCZhyDYQrc=";
sha256 = "sha256-fVgo5Ds/VK0kBpF+F2FdMvBnQj2IB+B5ToOK8ONdq6c=";
};
cargoSha256 = "sha256-+iDU8LPb7P4MNQ8MB5ldbWq4wWRcnbgOmSZ93Z//5O0=";
cargoSha256 = "sha256-fNqnpLNENLJEhbqxLFUqyjAf8tEPCLoGSRV91gOY9LI=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security

31
pkgs/development/tools/ruff/Cargo.lock generated
View File

@ -711,7 +711,7 @@ dependencies = [
[[package]]
name = "flake8-to-ruff"
version = "0.0.269"
version = "0.0.270"
dependencies = [
"anyhow",
"clap 4.2.7",
@ -1723,7 +1723,7 @@ dependencies = [
[[package]]
name = "ruff"
version = "0.0.269"
version = "0.0.270"
dependencies = [
"annotate-snippets 0.9.1",
"anyhow",
@ -1780,6 +1780,7 @@ dependencies = [
"toml",
"typed-arena",
"unicode-width",
"unicode_names2",
]
[[package]]
@ -1812,7 +1813,7 @@ dependencies = [
[[package]]
name = "ruff_cli"
version = "0.0.269"
version = "0.0.270"
dependencies = [
"annotate-snippets 0.9.1",
"anyhow",
@ -1899,10 +1900,19 @@ dependencies = [
"rustc-hash",
"schemars",
"serde",
"static_assertions",
"tracing",
"unicode-width",
]
[[package]]
name = "ruff_index"
version = "0.0.0"
dependencies = [
"ruff_macros",
"static_assertions",
]
[[package]]
name = "ruff_macros"
version = "0.0.0"
@ -1927,9 +1937,9 @@ dependencies = [
"num-bigint",
"num-traits",
"once_cell",
"regex",
"ruff_text_size",
"rustc-hash",
"rustpython-ast",
"rustpython-literal",
"rustpython-parser",
"serde",
@ -1964,6 +1974,7 @@ dependencies = [
"bitflags 2.3.1",
"is-macro",
"nohash-hasher",
"ruff_index",
"ruff_python_ast",
"ruff_python_stdlib",
"ruff_text_size",
@ -2001,7 +2012,7 @@ dependencies = [
[[package]]
name = "ruff_text_size"
version = "0.0.0"
source = "git+https://github.com/RustPython/Parser.git?rev=3654cf0bdfc270df6b2b83e2df086843574ad082#3654cf0bdfc270df6b2b83e2df086843574ad082"
source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=335780aeeac1e6fcd85994ba001d7b8ce99fcf65#335780aeeac1e6fcd85994ba001d7b8ce99fcf65"
dependencies = [
"schemars",
"serde",
@ -2072,7 +2083,7 @@ dependencies = [
[[package]]
name = "rustpython-ast"
version = "0.2.0"
source = "git+https://github.com/RustPython/Parser.git?rev=3654cf0bdfc270df6b2b83e2df086843574ad082#3654cf0bdfc270df6b2b83e2df086843574ad082"
source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=335780aeeac1e6fcd85994ba001d7b8ce99fcf65#335780aeeac1e6fcd85994ba001d7b8ce99fcf65"
dependencies = [
"is-macro",
"num-bigint",
@ -2083,7 +2094,7 @@ dependencies = [
[[package]]
name = "rustpython-format"
version = "0.2.0"
source = "git+https://github.com/RustPython/Parser.git?rev=3654cf0bdfc270df6b2b83e2df086843574ad082#3654cf0bdfc270df6b2b83e2df086843574ad082"
source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=335780aeeac1e6fcd85994ba001d7b8ce99fcf65#335780aeeac1e6fcd85994ba001d7b8ce99fcf65"
dependencies = [
"bitflags 2.3.1",
"itertools",
@ -2095,7 +2106,7 @@ dependencies = [
[[package]]
name = "rustpython-literal"
version = "0.2.0"
source = "git+https://github.com/RustPython/Parser.git?rev=3654cf0bdfc270df6b2b83e2df086843574ad082#3654cf0bdfc270df6b2b83e2df086843574ad082"
source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=335780aeeac1e6fcd85994ba001d7b8ce99fcf65#335780aeeac1e6fcd85994ba001d7b8ce99fcf65"
dependencies = [
"hexf-parse",
"is-macro",
@ -2107,7 +2118,7 @@ dependencies = [
[[package]]
name = "rustpython-parser"
version = "0.2.0"
source = "git+https://github.com/RustPython/Parser.git?rev=3654cf0bdfc270df6b2b83e2df086843574ad082#3654cf0bdfc270df6b2b83e2df086843574ad082"
source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=335780aeeac1e6fcd85994ba001d7b8ce99fcf65#335780aeeac1e6fcd85994ba001d7b8ce99fcf65"
dependencies = [
"anyhow",
"is-macro",
@ -2130,7 +2141,7 @@ dependencies = [
[[package]]
name = "rustpython-parser-core"
version = "0.2.0"
source = "git+https://github.com/RustPython/Parser.git?rev=3654cf0bdfc270df6b2b83e2df086843574ad082#3654cf0bdfc270df6b2b83e2df086843574ad082"
source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=335780aeeac1e6fcd85994ba001d7b8ce99fcf65#335780aeeac1e6fcd85994ba001d7b8ce99fcf65"
dependencies = [
"is-macro",
"ruff_text_size",

6
pkgs/development/tools/ruff/default.nix
View File

@ -10,20 +10,20 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
version = "0.0.269";
version = "0.0.270";
src = fetchFromGitHub {
owner = "charliermarsh";
repo = pname;
rev = "v${version}";
hash = "sha256-3W5nCtZJ1ej96c4BEbI7OPfxxyIyp7anWD1zhJqG0OE=";
hash = "sha256-rruNNP/VkvMQexQ+V/ASxl5flHt00YomMAVzW+eWp20=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"libcst-0.1.0" = "sha256-jG9jYJP4reACkFLrQBWOYH6nbKniNyFVItD0cTZ+nW0=";
"ruff_text_size-0.0.0" = "sha256-mfD5RXRCaRfnV7RZrN88rTPkSZ3ITNLTRtCuos14hwE=";
"ruff_text_size-0.0.0" = "sha256-hiM4+YAb0UUt8mUoKhMqTAiR3hCyoRMyEDe6di6Ohrc=";
"unicode_names2-0.6.0" = "sha256-eWg9+ISm/vztB0KIdjhq5il2ZnwGJQCleCYfznCI3Wg=";
};
};

6
pkgs/development/tools/rust/cargo-generate/default.nix
View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-generate";
version = "0.18.2";
version = "0.18.3";
src = fetchFromGitHub {
owner = "cargo-generate";
repo = "cargo-generate";
rev = "v${version}";
sha256 = "sha256-FtYdhnw8QrW2wHjLLIXVcByiVFQ97eyrZWsaxt7mmPE=";
sha256 = "sha256-Prue55oe3+NeiOiOYdr41sRqc6WvAVKC9nHD0a6mvrc=";
};
cargoSha256 = "sha256-UM9sf4LMR7x6haDH7/DFjsZZCng+9E5EnLt6HtTLvCU=";
cargoSha256 = "sha256-TcJ8DeplbBOx3utdc67xkUg5Z4PYe/lnG+k/X5Zg0FQ=";
nativeBuildInputs = [ pkg-config ];

6
pkgs/development/tools/supabase-cli/default.nix
View File

@ -9,16 +9,16 @@
buildGoModule rec {
pname = "supabase-cli";
version = "1.62.3";
version = "1.63.1";
src = fetchFromGitHub {
owner = "supabase";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-5MORYOBEyKcSdiZQI+xbi8GVQr8/e2dJCA9AiS1tm8U=";
sha256 = "sha256-wFWILST5PYvs1bXWK44yiRWVidwZcczLVdtEI418+F8=";
};
vendorSha256 = "sha256-4ig9tkXNMiZa2HbwRPXlIsTiaYo8Tb3zxXUEfU8mFUA=";
vendorSha256 = "sha256-fRocOWnjYocTUXnTOvzTosdgKlQGfgyPLVN7FVGnW2o=";
ldflags = [
"-s"

18
pkgs/development/tools/wasmedge/default.nix
View File

@ -3,24 +3,24 @@
, llvmPackages
, boost
, cmake
, gtest
, spdlog
, libxml2
, libffi
, Foundation
, testers
}:
let
stdenv = llvmPackages.stdenv;
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "wasmedge";
version = "0.12.1";
src = fetchFromGitHub {
owner = "WasmEdge";
repo = "WasmEdge";
rev = version;
rev = finalAttrs.version;
sha256 = "sha256-pBaa90jvR4tLgVOBZEJOEUY2+VnBmdSN5kkJMB8wdUA=";
};
@ -46,6 +46,16 @@ stdenv.mkDerivation rec {
"-DWASMEDGE_FORCE_DISABLE_LTO=ON"
];
postPatch = ''
echo -n $version > VERSION
'';
passthru.tests = {
version = testers.testVersion {
package = finalAttrs.finalPackage;
};
};
meta = with lib; {
homepage = "https://wasmedge.org/";
license = with licenses; [ asl20 ];
@ -54,4 +64,4 @@ stdenv.mkDerivation rec {
# error: no member named 'utimensat' in the global namespace
broken = stdenv.isDarwin && stdenv.isx86_64;
};
}
})

4
pkgs/games/aaaaxy/default.nix
View File

@ -17,13 +17,13 @@
buildGoModule rec {
pname = "aaaaxy";
version = "1.3.530";
version = "1.3.538";
src = fetchFromGitHub {
owner = "divVerent";
repo = pname;
rev = "v${version}";
hash = "sha256-jbuBkxd686ky7KFYUaLJ51jon5hwuwkr0QdhMTtZ7eo=";
hash = "sha256-APoU+VlIUSwMai9INSOyqBp8azy970tF5bz8IDr5NiI=";
fetchSubmodules = true;
};

101
pkgs/games/clonehero/default.nix
View File

@ -2,24 +2,31 @@
, stdenv
, fetchurl
, autoPatchelfHook
, gtk3
, zlib
, alsa-lib
, gtk2
, dbus
, libXcursor
, libXext
, libXi
, libXinerama
, libxkbcommon
, libXrandr
, libXScrnSaver
, libXxf86vm
, udev
, zlib
, vulkan-loader # (not used by default, enable in settings menu)
, wayland # (not used by default, enable with SDL_VIDEODRIVER=wayland - doesn't support HiDPI)
, makeDesktopItem
}:
let
name = "clonehero";
in
stdenv.mkDerivation rec {
pname = "${name}-unwrapped";
version = "0.23.2.2";
stdenv.mkDerivation (finalAttrs: {
pname = "clonehero";
version = "1.0.0.4080";
src = fetchurl {
url = "http://dl.clonehero.net/${name}-v${lib.removePrefix "0" version}/${name}-linux.tar.gz";
sha256 = "0k9jcnd55yhr42gj8cmysd18yldp4k3cpk4z884p2ww03fyfq7mi";
url = "https://pubdl.clonehero.net/clonehero-v${finalAttrs.version}-final/clonehero-linux.tar.xz";
hash = "sha256-YWLV+wgQ9RfKRSSWh/x0PMjB6tFA4YpHb9WtYOOgZZI=";
};
outputs = [ "out" "doc" ];
@ -28,46 +35,86 @@ stdenv.mkDerivation rec {
buildInputs = [
# Load-time libraries (loaded from DT_NEEDED section in ELF binary)
gtk2
alsa-lib
gtk3
stdenv.cc.cc.lib
zlib
# Run-time libraries (loaded with dlopen)
alsa-lib # ALSA sound
libXrandr # X11 resolution detection
libXScrnSaver # X11 screensaver prevention
udev # udev input drivers
dbus
libXcursor
libXext
libXi
libXinerama
libxkbcommon
libXrandr
libXScrnSaver
libXxf86vm
udev
vulkan-loader
wayland
];
installPhase = ''
mkdir -p "$out/bin" "$out/share"
install -Dm755 ${name} "$out/bin"
cp -r clonehero_Data "$out/share"
desktopItem = makeDesktopItem {
name = "clonehero";
desktopName = "Clone Hero";
comment = finalAttrs.meta.description;
icon = "clonehero";
exec = "clonehero";
categories = [ "Game" ];
};
mkdir -p "$doc/share/${name}"
cp README.txt "$doc/share/${name}"
installPhase = ''
runHook preInstall
install -Dm755 clonehero "$out/bin/clonehero"
install -Dm644 UnityPlayer.so "$out/libexec/clonehero/UnityPlayer.so"
mkdir -p "$out/share/pixmaps"
cp -r clonehero_Data "$out/share/clonehero"
ln -s "$out/share/clonehero" "$out/bin/clonehero_Data"
ln -s "$out/share/clonehero/Resources/UnityPlayer.png" "$out/share/pixmaps/clonehero.png"
install -Dm644 "$desktopItem/share/applications/clonehero.desktop" "$out/share/applications/clonehero.desktop"
mkdir -p "$doc/share/doc/clonehero"
cp -r CLONE_HERO_MANUAL.{pdf,txt} Custom EULA.txt THIRDPARTY.txt "$doc/share/doc/clonehero"
runHook postInstall
'';
# Patch required run-time libraries as load-time libraries
#
# Libraries found with:
# > strings clonehero | grep '\.so'
# and
# > strace clonehero 2>&1 | grep '\.so'
# > strings UnityPlayer.so | grep '\.so'
# and:
# > LD_DEBUG=libs clonehero
postFixup = ''
patchelf \
--add-needed libasound.so.2 \
--add-needed libdbus-1.so.3 \
--add-needed libpthread.so.0 \
--add-needed libudev.so.1 \
--add-needed libvulkan.so.1 \
--add-needed libwayland-client.so.0 \
--add-needed libwayland-cursor.so.0 \
--add-needed libwayland-egl.so.1 \
--add-needed libX11.so.6 \
--add-needed libXcursor.so.1 \
--add-needed libXext.so.6 \
--add-needed libXi.so.6 \
--add-needed libXinerama.so.1 \
--add-needed libxkbcommon.so.0 \
--add-needed libXrandr.so.2 \
--add-needed libXss.so.1 \
"$out/bin/${name}"
--add-needed libXxf86vm.so.1 \
"$out/libexec/clonehero/UnityPlayer.so"
'';
meta = with lib; {
description = "Clone of Guitar Hero and Rockband-style games";
homepage = "https://clonehero.net";
license = licenses.unfree;
maintainers = with maintainers; [ kira-bruneau ];
maintainers = with maintainers; [ kira-bruneau syboxez ];
platforms = [ "x86_64-linux" ];
};
}
})

39
pkgs/games/clonehero/fhs-wrapper.nix
View File

@ -1,39 +0,0 @@
{ clonehero-unwrapped
, makeDesktopItem
, buildFHSEnv
, liberation_ttf
, callPackage
}:
let
name = "clonehero";
desktopName = "Clone Hero";
desktopItem = makeDesktopItem {
inherit name desktopName;
comment = clonehero-unwrapped.meta.description;
exec = name;
icon = name;
categories = [ "Game" ];
};
in
buildFHSEnv {
inherit name;
inherit (clonehero-unwrapped) meta;
# Clone Hero has /usr/share/fonts hard-coded in its binary for looking up fonts.
# This workaround is necessary for rendering text on the keybinding screen (and possibly elsewhere)
# If a better solution is found, the FHS environment can be removed.
extraBuildCommands = ''
chmod +w usr/share
mkdir -p usr/share/fonts/truetype
ln -s ${liberation_ttf}/share/fonts/truetype/* usr/share/fonts/truetype
'';
extraInstallCommands = ''
mkdir -p "$out/share/applications" "$out/share/pixmaps"
cp ${desktopItem}/share/applications/* "$out/share/applications"
ln -s ${clonehero-unwrapped}/share/clonehero_Data/Resources/UnityPlayer.png "$out/share/pixmaps/${name}.png"
'';
runScript = callPackage ./xdg-wrapper.nix { };
}

21
pkgs/games/clonehero/xdg-wrapper.nix
View File

@ -1,21 +0,0 @@
{ stdenv, clonehero-unwrapped, writeScript }:
# Clone Hero doesn't have an installer, so it just stores configuration & data relative to the binary.
# This wrapper works around that limitation, storing game configuration & data in XDG_CONFIG_HOME.
let
name = "clonehero";
desktopName = "Clone Hero";
in
writeScript "${name}-xdg-wrapper-${clonehero-unwrapped.version}" ''
#!${stdenv.shell} -e
configDir="''${XDG_CONFIG_HOME:-$HOME/.config}/unity3d/srylain Inc_/${desktopName}"
mkdir -p "$configDir"
# Force link shipped clonehero_Data, unless directory already exists (to allow modding)
if [ ! -d "$configDir/clonehero_Data" ] || [ -L "$configDir/clonehero_Data" ]; then
ln -snf ${clonehero-unwrapped}/share/clonehero_Data "$configDir"
fi
# Fake argv[0] to emulate running in the config directory
exec -a "$configDir/${name}" ${clonehero-unwrapped}/bin/${name} "$@"
''

6
pkgs/games/katago/default.nix
View File

@ -26,14 +26,14 @@ assert lib.assertOneOf "backend" backend [ "opencl" "cuda" "tensorrt" "eigen" ];
# of gcc. If you need to use cuda10, please override stdenv with gcc8Stdenv
stdenv.mkDerivation rec {
pname = "katago";
version = "1.12.4";
githash = "75280bf26582090dd4985dca62bc7124116c856d";
version = "1.13.1";
githash = "3539a3d410b12f79658bb7a2cdaf1ecb6c95e6c1";
src = fetchFromGitHub {
owner = "lightvector";
repo = "katago";
rev = "v${version}";
sha256 = "sha256-1rznAxEFJ/Ah5/WiSwc+rtITOUOPYOua5BLKeqHOBr0=";
sha256 = "sha256-A2ZvFcklYQoxfqYrLrazksrJkfdELnn90aAbkm7pJg0=";
};
fakegit = writeShellScriptBin "git" "echo ${githash}";

18
pkgs/os-specific/darwin/apple-sdk-11.0/default.nix
View File

@ -50,16 +50,18 @@ let
'';
};
mkStdenv = stdenv:
let
cc = stdenv.cc.override {
mkCc = cc:
if stdenv.isAarch64 then cc
else
cc.override {
bintools = stdenv.cc.bintools.override { libc = packages.Libsystem; };
libc = packages.Libsystem;
};
in
mkStdenv = stdenv:
if stdenv.isAarch64 then stdenv
else
(overrideCC stdenv cc).override {
(overrideCC stdenv (mkCc stdenv.cc)).override {
targetPlatform = stdenv.targetPlatform // {
darwinMinVersion = "10.12";
darwinSdkVersion = "11.0";
@ -104,6 +106,12 @@ let
rustPlatform = pkgs.makeRustPlatform {
inherit (pkgs.darwin.apple_sdk_11_0) stdenv;
inherit (pkgs) rustc cargo;
} // {
inherit (pkgs.callPackage ../../../build-support/rust/hooks {
inherit (pkgs.darwin.apple_sdk_11_0) stdenv;
inherit (pkgs) cargo rustc;
clang = mkCc pkgs.clang;
}) bindgenHook;
};
callPackage = newScope (lib.optionalAttrs stdenv.isDarwin (stdenvs // rec {

2
pkgs/servers/dns/ncdns/default.nix
View File

@ -73,7 +73,7 @@ buildGoModule {
chmod -R u+w -- "$sourceRoot"
cd $sourceRoot
runHook postUpack
runHook postUnpack
'';
# Same as above: can't use `patches` because that would

3
pkgs/servers/http/nginx/modules.nix
View File

@ -15,6 +15,7 @@
, geoip
, libbsd
, libiconv
, libkrb5
, libmaxminddb
, libmodsecurity
, libuuid
@ -783,6 +784,8 @@ let self = {
sha256 = "05rw3a7cv651951li995r5l1yzz6kwkm2xpbd59jsfzd74bw941i";
};
inputs = [ libkrb5 ];
meta = with lib; {
description = "SPNEGO HTTP Authentication Module";
homepage = "https://github.com/stnoonan/spnego-http-auth-nginx-module";

2
pkgs/servers/http/pomerium/default.nix
View File

@ -37,7 +37,7 @@ buildGoModule rec {
buildPhase = ''
runHook preBuild
yarn --offline build
runHook postbuild
runHook postBuild
'';
installPhase = ''

6
pkgs/tools/admin/qovery-cli/default.nix
View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "qovery-cli";
version = "0.58.10";
version = "0.58.12";
src = fetchFromGitHub {
owner = "Qovery";
repo = pname;
rev = "v${version}";
hash = "sha256-akWnbwogJaaVi3dmPg/qWYqqW9xdLpg7EUpIkCmS1xE=";
hash = "sha256-KNpmqx0+nK4Eo2h0D/mtMQ1lqBSmOmBUBQZrKPLBl5o=";
};
vendorHash = "sha256-WeHcB1yETbnTVxtccPf3q0JNwLDbTJyKKme02Xnfy60=";
vendorHash = "sha256-fyPq8/tc1Kzv3+BYEcFIpqBpRcMoQXzVTPao4NDCsXY=";
nativeBuildInputs = [ installShellFiles ];

75
pkgs/tools/games/ukmm/Cargo.lock generated
View File

@ -269,6 +269,12 @@ version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "base64"
version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
[[package]]
name = "bincode"
version = "1.3.3"
@ -280,20 +286,22 @@ dependencies = [
[[package]]
name = "binrw"
version = "0.9.2"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4abb4fd60add897b9e8827e0d5fa6c2ca129ece2432d9aa13454b21ac2ecc18f"
checksum = "ab81d22cbd2d745852348b2138f3db2103afa8ce043117a374581926a523e267"
dependencies = [
"array-init",
"binrw_derive",
"bytemuck",
]
[[package]]
name = "binrw_derive"
version = "0.9.0"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a36ff195a3a1a82d5eeb98e0069bdf3ea076042d28591396d9020fac763bf66f"
checksum = "d6b019a3efebe7f453612083202887b6f1ace59e20d010672e336eea4ed5be97"
dependencies = [
"either",
"owo-colors",
"proc-macro2 1.0.56",
"quote 1.0.26",
@ -363,9 +371,9 @@ dependencies = [
[[package]]
name = "botw-utils"
version = "0.4.1"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d528a00da0ca3e77131c90f89b00c4599b4ddfdd99ed3b30b00b4eea6f5d264f"
checksum = "92fcbb05a52a1b8cbb62f63f12a2d575aa89a35704f90e929ba5522a6550f634"
dependencies = [
"include-flate",
"once_cell",
@ -2100,6 +2108,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3a7d6e1419fa3129eb0802b4c99603c0d425c79fb5d76191d5a20d0ab0d664e8"
dependencies = [
"libflate",
"proc-macro-hack",
"proc-macro2 1.0.56",
"quote 1.0.26",
"syn 1.0.109",
@ -3602,12 +3611,12 @@ checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422"
[[package]]
name = "roead"
version = "0.20.3"
version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "445b9df719825043aaaf86b477169bf653e717f526947e856a327c763a5072fa"
checksum = "8d6ee119334dbf298d9c144867d9a6f5475020e3acb2116175cc16867e436941"
dependencies = [
"almost",
"base64 0.13.1",
"base64 0.21.0",
"binrw",
"cxx",
"cxx-build",
@ -3657,12 +3666,13 @@ dependencies = [
[[package]]
name = "rstb"
version = "0.6.0"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ac74c5091a7fa31438118781bec869b1b2d2d7aaf222ba993e8ac08821ea0a9"
checksum = "7926d979e44948756fef61f532234b87422a313f85551de4775f1e4c16ef92a9"
dependencies = [
"crc 2.1.0",
"include-flate",
"once_cell",
"phf",
"roead",
"serde",
@ -3758,9 +3768,9 @@ dependencies = [
[[package]]
name = "ryml"
version = "0.1.6"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "905fe991a678d13cadcc529060852cb5a724c38573fffe383fbe50c67587dc42"
checksum = "d623f90d8843413059c3de3ae7ae1b2e445dba85293247f3494ac97475accfc0"
dependencies = [
"auto-enum",
"cxx",
@ -3908,11 +3918,11 @@ dependencies = [
[[package]]
name = "serde_with"
version = "2.3.3"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe"
checksum = "9f02d8aa6e3c385bf084924f660ce2a3a6bd333ba55b35e8590b321f35d88513"
dependencies = [
"base64 0.13.1",
"base64 0.21.0",
"chrono",
"hex",
"indexmap",
@ -3924,9 +3934,9 @@ dependencies = [
[[package]]
name = "serde_with_macros"
version = "2.3.3"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f"
checksum = "edc7d5d3932fb12ce722ee5e64dd38c504efba37567f0c402f6ca728c3b8b070"
dependencies = [
"darling 0.20.0",
"proc-macro2 1.0.56",
@ -4585,7 +4595,7 @@ dependencies = [
[[package]]
name = "uk-content"
version = "0.1.0"
version = "0.10.0"
dependencies = [
"anyhow",
"indexmap",
@ -4607,6 +4617,7 @@ dependencies = [
"uk-content-derive",
"uk-ui",
"uk-ui-derive",
"uk-util",
"zstd",
]
@ -4621,7 +4632,7 @@ dependencies = [
[[package]]
name = "uk-editor"
version = "0.1.0"
version = "0.10.0"
dependencies = [
"anyhow",
"eframe",
@ -4643,11 +4654,12 @@ dependencies = [
"uk-mod",
"uk-ui",
"uk-ui-derive",
"uk-util",
]
[[package]]
name = "uk-manager"
version = "0.1.0"
version = "0.10.0"
dependencies = [
"anyhow",
"anyhow_ext",
@ -4679,12 +4691,13 @@ dependencies = [
"uk-content",
"uk-mod",
"uk-reader",
"uk-util",
"zip",
]
[[package]]
name = "uk-mod"
version = "0.1.0"
version = "0.10.0"
dependencies = [
"anyhow",
"anyhow_ext",
@ -4697,6 +4710,7 @@ dependencies = [
"indexmap",
"join_str",
"jwalk 0.8.1",
"lenient_semver",
"log",
"minicbor-ser",
"mmap-rs",
@ -4717,13 +4731,14 @@ dependencies = [
"typetag",
"uk-content",
"uk-reader",
"uk-util",
"zip",
"zstd",
]
[[package]]
name = "uk-reader"
version = "0.1.0"
version = "0.10.0"
dependencies = [
"anyhow",
"anyhow_ext",
@ -4742,12 +4757,13 @@ dependencies = [
"thiserror",
"typetag",
"uk-content",
"uk-util",
"zarchive",
]
[[package]]
name = "uk-ui"
version = "0.1.0"
version = "0.10.0"
dependencies = [
"catppuccin-egui",
"color-hex",
@ -4778,9 +4794,16 @@ dependencies = [
"syn 1.0.109",
]
[[package]]
name = "uk-util"
version = "0.10.0"
dependencies = [
"once_cell",
]
[[package]]
name = "ukmm"
version = "0.8.2"
version = "0.10.0"
dependencies = [
"anyhow",
"anyhow_ext",
@ -4799,6 +4822,7 @@ dependencies = [
"jwalk 0.8.1",
"lenient_semver",
"log",
"once_cell",
"open",
"parking_lot",
"rayon",
@ -4815,6 +4839,7 @@ dependencies = [
"uk-mod",
"uk-reader",
"uk-ui",
"uk-util",
"winres",
"xflags",
"zip",

29
pkgs/tools/games/ukmm/default.nix
View File

@ -7,31 +7,32 @@
, atk
, glib
, gtk3-x11
, nix-update-script
}:
rustPlatform.buildRustPackage rec {
pname = "ukmm";
version = "0.8.2";
version = "0.10.0";
src = fetchFromGitHub {
owner = "NiceneNerd";
repo = pname;
rev = "v${version}";
hash = "sha256-gZ9r+al6WsxwMEBoRPNAkBpZP5CdJkrxEEzSxH+0GdI=";
hash = "sha256-Cdbwb+YHAjGI8Sshb5dxHiCrm7QvLXRqkpEWJdvBA2Y=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"catppuccin-egui-1.0.2" = "sha256-+ILfvDgZxe/QPJuVqIbRjaHNovpRAX+ym2QZ96glb4w=";
"ecolor-0.20.0" = "sha256-uTDkNRWsA1nM8Qhb0X2LjVDRuaW31vWxR8kDLL27BVE=";
"egui-notify-0.4.0" = "sha256-jybtUnv9xqzulZ5nfg+T1u8iTOsPjKGVVQ7JhwbvPdU=";
"egui_commonmark-0.6.0" = "sha256-hsVbtL2F+jifnzN6FgcDAVtLd1bVxTs0twn0SMvq9eU=";
"egui_dock-0.2.1" = "sha256-gGIO0boXKxLu0ABDH/uJhEZEoE/ql8E65LRmr0Xhv3s=";
"junction-0.2.0" = "sha256-6+pPp5wG1NoIj16Z+OvO4Pvy0jnQibn/A9cTaHAEVq4=";
"msbt-0.1.1" = "sha256-PtBs60xgYrwS7yPnRzXpExwYUD3azIaqObRnnJEL5dE=";
"msyt-1.2.1" = "sha256-aw5whCoQBhO0u9Fx2rTO1sRuPdGnAAlmPWv5q8CbQcI=";
};
lockFile = ./Cargo.lock;
outputHashes = {
"catppuccin-egui-1.0.2" = "sha256-+ILfvDgZxe/QPJuVqIbRjaHNovpRAX+ym2QZ96glb4w=";
"ecolor-0.20.0" = "sha256-uTDkNRWsA1nM8Qhb0X2LjVDRuaW31vWxR8kDLL27BVE=";
"egui-notify-0.4.0" = "sha256-jybtUnv9xqzulZ5nfg+T1u8iTOsPjKGVVQ7JhwbvPdU=";
"egui_commonmark-0.6.0" = "sha256-hsVbtL2F+jifnzN6FgcDAVtLd1bVxTs0twn0SMvq9eU=";
"egui_dock-0.2.1" = "sha256-gGIO0boXKxLu0ABDH/uJhEZEoE/ql8E65LRmr0Xhv3s=";
"junction-0.2.0" = "sha256-6+pPp5wG1NoIj16Z+OvO4Pvy0jnQibn/A9cTaHAEVq4=";
"msbt-0.1.1" = "sha256-PtBs60xgYrwS7yPnRzXpExwYUD3azIaqObRnnJEL5dE=";
"msyt-1.2.1" = "sha256-aw5whCoQBhO0u9Fx2rTO1sRuPdGnAAlmPWv5q8CbQcI=";
};
};
RUSTC_BOOTSTRAP = true;
@ -66,6 +67,8 @@ rustPlatform.buildRustPackage rec {
"--skip=bnp::test_convert"
];
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "A new mod manager for The Legend of Zelda: Breath of the Wild";
homepage = "https://github.com/NiceneNerd/ukmm";

6
pkgs/tools/misc/killport/default.nix
View File

@ -1,8 +1,8 @@
{ lib
, rustPlatform
, fetchCrate
, llvmPackages
}:
rustPlatform.buildRustPackage rec {
pname = "killport";
version = "0.8.0";
@ -12,9 +12,9 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-ip7Ndy4i4P6n20COfSL/EtG1Y+xoab8Gox4gcNHH1/o=";
};
cargoSha256 = "sha256-M4riyvGueCQDKOj+lgYPm2lZ8UjCp1y/SyG692vZbS4=";
cargoHash = "sha256-M4riyvGueCQDKOj+lgYPm2lZ8UjCp1y/SyG692vZbS4=";
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
nativeBuildInputs = [ rustPlatform.bindgenHook ];
meta = with lib; {
description = "A command-line tool to easily kill processes running on a specified port";

2
pkgs/tools/networking/haproxy/default.nix
View File

@ -1,4 +1,4 @@
{ useLua ? !stdenv.isDarwin
{ useLua ? true
, usePcre ? true
, withPrometheusExporter ? true
, stdenv, lib, fetchurl, nixosTests

2
pkgs/tools/networking/lxi-tools/default.nix
View File

@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://lxi-tools.github.io/";
license = licenses.bsd3;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = [ maintainers.vq ];
};
}

4
pkgs/tools/security/kubernetes-polaris/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubernetes-polaris";
version = "7.4.1";
version = "7.4.2";
src = fetchFromGitHub {
owner = "FairwindsOps";
repo = "polaris";
rev = version;
sha256 = "sha256-PXyJpzmGTwSthaN0nVex8B7WpCxX7QxqRDoIJERSK6o=";
sha256 = "sha256-bapZ3snFq0YWZOT5IBwQaC0kwTs3sOVvbYFlL95LeNM=";
};
vendorHash = "sha256-SwHJRw75pP1zwi9ZMfUfcXt788pURM1KSbTNQF6XVqk=";

4
pkgs/tools/text/ov/default.nix
View File

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "ov";
version = "0.22.0";
version = "0.23.0";
src = fetchFromGitHub {
owner = "noborus";
repo = "ov";
rev = "refs/tags/v${version}";
hash = "sha256-+yxWvh9UjbGdMl8jyEi/ZqsnDWuIci/ZZ+RNFS/yxoo=";
hash = "sha256-zIPJvlzq9N5sjc7OkdQnxZZYK4RuM6jW4EWLrEzSabg=";
};
vendorHash = "sha256-bQREazHu0SQrMKyNPtUvzeKR/zb0FJOLpHBwHml43Hs=";

5
pkgs/top-level/all-packages.nix
View File

@ -14237,7 +14237,6 @@ with pkgs;
zbar = libsForQt5.callPackage ../tools/graphics/zbar {
inherit (darwin.apple_sdk.frameworks) Foundation;
autoreconfHook = buildPackages.autoreconfHook269;
};
zbctl = callPackage ../tools/admin/zbctl { };
@ -36291,9 +36290,7 @@ with pkgs;
chromium-bsu = callPackage ../games/chromium-bsu { };
clonehero-unwrapped = callPackage ../games/clonehero { };
clonehero = callPackage ../games/clonehero/fhs-wrapper.nix { };
clonehero = callPackage ../games/clonehero { };
vintagestory = callPackage ../games/vintagestory { };