Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-04-02 12:02:57 +00:00 committed by GitHub
commit 44f4ca9ce4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
55 changed files with 4319 additions and 192 deletions

8
.github/labeler.yml vendored
View File

@ -95,6 +95,14 @@
- pkgs/top-level/haskell-packages.nix
- pkgs/top-level/release-haskell.nix
"6.topic: julia":
- any:
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/julia.section.md
- pkgs/development/compilers/julia/**/*
- pkgs/development/julia-modules/**/*
"6.topic: jupyter":
- any:
- changed-files:

View File

@ -3693,6 +3693,13 @@
githubId = 46303707;
name = "Christian Lütke-Stetzkamp";
};
clot27 = {
name = "Clot";
email = "adityayadav11082@protonmail.com";
github = "clot27";
githubId = 69784758;
matrix = "@clot27:matrix.org";
};
clr-cera = {
email = "clrcera05@gmail.com";
github = "clr-cera";
@ -5850,6 +5857,13 @@
githubId = 418227;
name = "Jean-Philippe Braun";
};
eopb = {
email = "ethanboxx@gmail.com";
github = "eopb";
githubId = 8074468;
matrix = "@efun:matrix.org";
name = "Ethan Brierley";
};
eownerdead = {
name = "EOWNERDEAD";
email = "eownerdead@disroot.org";

View File

@ -8,6 +8,7 @@ busted,,,,,,
cassowary,,,,,,marsam alerque
cldr,,,,,,alerque
compat53,,,,,,vcunat
commons.nvim,,,,,,mrcjkb
cosmo,,,,,,marsam
coxpcall,,,,1.17.0-1,,
cqueues,,,,,,vcunat
@ -18,6 +19,8 @@ fennel,,,,,,misterio77
fidget.nvim,,,,,,mrcjkb
fifo,,,,,,
fluent,,,,,,alerque
funnyfiles.nvim,,,,,,mrcjkb
fzf-lua,,,,,,mrcjkb
fzy,,,,,,mrcjkb
gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,5.1,
haskell-tools.nvim,,,,,,
@ -85,6 +88,7 @@ luaunbound,,,,,,
luaunit,,,,,,lockejan
luautf8,,,,,,pstn
luazip,,,,,,
lua-utils.nvim,,,,,,mrcjkb
lua-yajl,,,,,,pstn
lua-iconv,,,,7.0.0,,
luuid,,,,20120509-2,,
@ -98,6 +102,7 @@ middleclass,,,,,,
mimetypes,,,,,,
mpack,,,,,,
moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn
neotest,,,,,,mrcjkb
nlua,,,,,,teto
nui.nvim,,,,,,mrcjkb
nvim-cmp,https://github.com/hrsh7th/nvim-cmp,,,,,
@ -107,6 +112,10 @@ plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,5.1,
rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,,
rocks.nvim,,,,,5.1,teto mrcjkb
rest.nvim,,,,,5.1,teto
rocks.nvim,,,,,,mrcjkb
rocks-git.nvim,,,,,,mrcjkb
rocks-config.nvim,,,,,,mrcjkb
rocks-dev.nvim,,,,,,mrcjkb
rustaceanvim,,,,,,mrcjkb
say,https://github.com/Olivine-Labs/say.git,,,,,
serpent,,,,,,lockejan

1 name src ref server version luaversion maintainers
8 cassowary marsam alerque
9 cldr alerque
10 compat53 vcunat
11 commons.nvim mrcjkb
12 cosmo marsam
13 coxpcall 1.17.0-1
14 cqueues vcunat
19 fidget.nvim mrcjkb
20 fifo
21 fluent alerque
22 funnyfiles.nvim mrcjkb
23 fzf-lua mrcjkb
24 fzy mrcjkb
25 gitsigns.nvim https://github.com/lewis6991/gitsigns.nvim.git 5.1
26 haskell-tools.nvim
88 luaunit lockejan
89 luautf8 pstn
90 luazip
91 lua-utils.nvim mrcjkb
92 lua-yajl pstn
93 lua-iconv 7.0.0
94 luuid 20120509-2
102 mimetypes
103 mpack
104 moonscript https://github.com/leafo/moonscript.git dev-1 arobyn
105 neotest mrcjkb
106 nlua teto
107 nui.nvim mrcjkb
108 nvim-cmp https://github.com/hrsh7th/nvim-cmp
112 rapidjson https://github.com/xpol/lua-rapidjson.git
113 rocks.nvim 5.1 teto mrcjkb
114 rest.nvim 5.1 teto
115 rocks.nvim mrcjkb
116 rocks-git.nvim mrcjkb
117 rocks-config.nvim mrcjkb
118 rocks-dev.nvim mrcjkb
119 rustaceanvim mrcjkb
120 say https://github.com/Olivine-Labs/say.git
121 serpent lockejan

View File

@ -276,8 +276,8 @@ in
{ assertion = pgsqlLocal -> cfg.database.user == cfg.database.name;
message = "services.redmine.database.user and services.redmine.database.name must be the same when using a local postgresql database";
}
{ assertion = cfg.database.createLocally -> cfg.database.type != "sqlite3" && cfg.database.socket != null;
message = "services.redmine.database.socket must be set if services.redmine.database.createLocally is set to true";
{ assertion = (cfg.database.createLocally && cfg.database.type != "sqlite3") -> cfg.database.socket != null;
message = "services.redmine.database.socket must be set if services.redmine.database.createLocally is set to true and no sqlite database is used";
}
{ assertion = cfg.database.createLocally -> cfg.database.host == "localhost";
message = "services.redmine.database.host must be set to localhost if services.redmine.database.createLocally is set to true";

View File

@ -246,12 +246,8 @@ in
shopt -s lastpipe
${pkg}/bin/makekeys | { read private ipv6 public; }
umask 0077
echo "CJDNS_PRIVATE_KEY=$private" >> /etc/cjdns.keys
echo -e "CJDNS_IPV6=$ipv6\nCJDNS_PUBLIC_KEY=$public" > /etc/cjdns.public
chmod 600 /etc/cjdns.keys
chmod 444 /etc/cjdns.public
install -m 600 <(echo "CJDNS_PRIVATE_KEY=$private") /etc/cjdns.keys
install -m 444 <(echo -e "CJDNS_IPV6=$ipv6\nCJDNS_PUBLIC_KEY=$public") /etc/cjdns.public
fi
if [ -z "$CJDNS_ADMIN_PASSWORD" ]; then

View File

@ -39,6 +39,7 @@ let
meta.maintainers = [ maintainers.aanderse ];
};
in {
sqlite3 = redmineTest { name = "sqlite3"; type = "sqlite3"; };
mysql = redmineTest { name = "mysql"; type = "mysql2"; };
pgsql = redmineTest { name = "pgsql"; type = "postgresql"; };
}

View File

@ -690,8 +690,8 @@ let
mktplcRef = {
name = "vscode-intelephense-client";
publisher = "bmewburn";
version = "1.10.2";
sha256 = "sha256-he/aPcsxfqYWI/RJ51d5V0reaTPTATci34xPm93qxGs=";
version = "1.10.4";
sha256 = "sha256-bD7AL4x0yL5S+MzQXMBrSZs1pVclfvsTfUbImP1oQok=";
};
meta = {
description = "PHP code intelligence for Visual Studio Code";

View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "lf";
version = "31";
version = "32";
src = fetchFromGitHub {
owner = "gokcehan";
repo = "lf";
rev = "r${version}";
hash = "sha256-Tuk/4R/gGtSY+4M/+OhQCbhXftZGoxZ0SeLIwYjTLA4=";
hash = "sha256-rFK1M15NcshVY2vtXcMWZhB9Rd/DRC8JyKE5u4wjh2I=";
};
vendorHash = "sha256-PVvHrXfMN6ZSWqd5GJ08VaeKaHrFsz6FKdDoe0tk2BE=";
vendorHash = "sha256-r1Kq6CYGNbxTTue3sb3CKMsWZJDzX2dKX7QHQ73nZ8g=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -7,7 +7,7 @@
((buildMozillaMach rec {
pname = "floorp";
packageVersion = "11.10.5";
packageVersion = "11.11.2";
applicationName = "Floorp";
binaryName = "floorp";
branding = "browser/branding/official";
@ -15,14 +15,14 @@
allowAddonSideload = true;
# Must match the contents of `browser/config/version.txt` in the source tree
version = "115.8.0";
version = "115.10.0";
src = fetchFromGitHub {
owner = "Floorp-Projects";
repo = "Floorp";
fetchSubmodules = true;
rev = "v${packageVersion}";
hash = "sha256-uKgN74xn0v86E/YfqbJNnMIR3gS+3dhdgLJ5VUerurQ=";
hash = "sha256-a9f4+t2w8aOOLNaKkr+FuY0ENa/Nkukg9pvJTiUMfWk=";
};
extraConfigureFlags = [
@ -31,6 +31,8 @@
"--with-unsigned-addon-scopes=app,system"
];
updateScript = ./update.sh;
meta = {
description = "A fork of Firefox, focused on keeping the Open, Private and Sustainable Web alive, built in Japan";
homepage = "https://floorp.app/";

View File

@ -0,0 +1,38 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl nix-prefetch-github jq gnused
set -e
owner=Floorp-Projects
repo=Floorp
dirname="$(dirname "$0")"
updateVersion() {
sed -i "s/packageVersion = \"[0-9.]*\";/packageVersion = \"$1\";/g" "$dirname/default.nix"
}
updateBaseVersion() {
local base
base=$(curl -s "https://raw.githubusercontent.com/$owner/$repo/v$1/browser/config/version.txt")
sed -i "s/version = \"[0-9.]*\";/version = \"$base\";/g" "$dirname/default.nix"
}
updateHash() {
local hash
hash=$(nix-prefetch-github --fetch-submodules --rev "v$1" $owner $repo | jq .hash)
sed -i "s|hash = \"[a-zA-Z0-9\/+-=]*\";|hash = \"$hash\";|g" "$dirname/default.nix"
}
currentVersion=$(cd "$dirname" && nix eval --raw -f ../../../../.. floorp.version)
latestTag=$(curl -s https://api.github.com/repos/Floorp-Projects/Floorp/releases/latest | jq -r ".tag_name")
latestVersion="$(expr "$latestTag" : 'v\(.*\)')"
if [[ "$currentVersion" == "$latestVersion" ]]; then
echo "Floorp is up-to-date: ${currentVersion}"
exit 0
fi
updateVersion "$latestVersion"
updateBaseVersion "$latestVersion"
updateHash "$latestVersion"

View File

@ -1,8 +1,8 @@
{
k3sVersion = "1.26.14+k3s1";
k3sCommit = "c7e6922aa84369b3c0d28bb800e67bb162895a1c";
k3sRepoSha256 = "1spvyyzk711g4ik1pv21xaasy7va5l5gcvbfkamfv4ijn0wz4mjx";
k3sVendorHash = "sha256-ursq2Vq1J9MdkwDl3kKioxizhR46yo2urNc3VpwVH2A=";
k3sVersion = "1.26.15+k3s1";
k3sCommit = "132972364806998c35d250153e2af245f9ecf18d";
k3sRepoSha256 = "13iwmjxyf71l2g66kxdivnj21bf9lmr5p4qlp8kmysm23w2badj9";
k3sVendorHash = "sha256-xoscRchOK4p3d1DAnxbJq7oIvxIn1twePmOBDdfXzw8=";
chartVersions = import ./chart-versions.nix;
k3sRootVersion = "0.12.2";
k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k";

View File

@ -1,8 +1,8 @@
{
k3sVersion = "1.28.7+k3s1";
k3sCommit = "051b14b248655896fdfd7ba6c93db6182cde7431";
k3sRepoSha256 = "1136h9xwg1p26lh3m63a4c55qsahla0d0xvlr09qqbhqiyv7fn0b";
k3sVendorHash = "sha256-FzalTtDleFIN12lvn0k7+nWchr6y/Ztcxs0bs2E4UO0=";
k3sVersion = "1.28.8+k3s1";
k3sCommit = "653dd61aaa2d0ef8bd83ac4dbc6d150dde792efc";
k3sRepoSha256 = "0pf8xw1m56m2s8i99vxj4i2l7fz7388kiynwzfrck43jb7v7kbbw";
k3sVendorHash = "sha256-wglwRW2RO9QJI6CRLgkVg5Upt6R0M3gX76zy0kT02ec=";
chartVersions = import ./chart-versions.nix;
k3sRootVersion = "0.12.2";
k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k";

View File

@ -1,8 +1,8 @@
{
k3sVersion = "1.29.2+k3s1";
k3sCommit = "86f102134ed6b1669badd3bfb6420f73e8f015d0";
k3sRepoSha256 = "0gd35ficik92x4svcg4mlw1v6vms7sfw1asmdahh16li4j27wdz5";
k3sVendorHash = "sha256-KG795CA3l+iCdJlYMNTQLmv3YqmtM2juacbsmH7B//M=";
k3sVersion = "1.29.3+k3s1";
k3sCommit = "8aecc26b0f167d5e9e4e9fbcfd5a471488bf5957";
k3sRepoSha256 = "12285mhwi6cifsw3gjxxmd1g2i5f7vkdgzdc6a78rkvnx7z1j3p3";
k3sVendorHash = "sha256-pID2h/rvvKyfHWoglYPbbliAby+9R2zoh7Ajd36qjVQ=";
chartVersions = import ./chart-versions.nix;
k3sRootVersion = "0.12.2";
k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k";

View File

@ -0,0 +1,31 @@
{ lib
, stdenv
, fetchFromGitHub
, telegram-desktop
}:
telegram-desktop.overrideAttrs (old: rec {
pname = "64Gram";
version = "1.1.15";
src = fetchFromGitHub {
owner = "TDesktop-x64";
repo = "tdesktop";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-3HLRv8RTyyfnjMF7w+euSOj6SbxlxOuczap5Nlizsvg=";
};
meta = with lib; {
description = "An unofficial Telegram Desktop providing Windows 64bit build and extra features";
license = licenses.gpl3Only;
platforms = platforms.all;
homepage = "https://github.com/TDesktop-x64/tdesktop";
changelog = "https://github.com/TDesktop-x64/tdesktop/releases/tag/v${version}";
maintainers = with maintainers; [ clot27 ];
mainProgram = "telegram-desktop";
broken = stdenv.isDarwin;
};
})

View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "ast-grep";
version = "0.20.0";
version = "0.20.2";
src = fetchFromGitHub {
owner = "ast-grep";
repo = "ast-grep";
rev = version;
hash = "sha256-vOHBrz/a42jRyQs7oJLkg3/ra3SMR9FKuiwJ9RrFizw=";
hash = "sha256-hq5C6VMnkJ/Y75y7i5ipTUE7s5HsLnmomyFZJlQp/5Y=";
};
cargoHash = "sha256-T30V9FYNmh2Rg5ZFc9elcf4ZbTR1vwieirawEs3a4sI=";
cargoHash = "sha256-klQa8LB473tB3slDfA7p3SSzXBnzhCRZWeIeHskm71c=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -52,6 +52,8 @@ rustPlatform.buildRustPackage rec {
"--skip=pager_more"
"--skip=pager_most"
"--skip=pager_overwrite"
# Fails if the filesystem performs UTF-8 validation (such as ZFS with utf8only=on)
"--skip=file_with_invalid_utf8_filename"
];
doInstallCheck = true;

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,62 @@
{ lib
, rustPlatform
, fetchFromGitHub
, makeWrapper
, pkg-config
, openssl
, rustc
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-information";
version = "0.4.2";
src = fetchFromGitHub {
owner = "hi-rustin";
repo = "cargo-information";
rev = "v${version}";
hash = "sha256-k481iHQ1tVi9fF5/xYR99/1/oRv1nS3WH7W55aPSyfc=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"cargo-test-macro-0.1.0" = "sha256-4u3Ium+WYBdyocuehDulRgUOR74JC6AUI2+A5xlnUGw=";
};
};
checkFlags = [
# Require network access
"--skip=cargo_information::specify_version_within_ws_and_match_with_lockfile::case"
"--skip=cargo_information::within_ws::case"
"--skip=cargo_information::within_ws_with_alternative_registry::case"
"--skip=cargo_information::within_ws_without_lockfile::case"
];
nativeBuildInputs = [
pkg-config
makeWrapper
];
buildInputs = [
openssl
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
postFixup = ''
wrapProgram $out/bin/cargo-info \
--prefix PATH : ${lib.makeBinPath [ rustc ]}
'';
meta = with lib; {
description = "A cargo subcommand to show information about crates";
mainProgram = "cargo-info";
homepage = "https://github.com/hi-rustin/cargo-information";
changelog = "https://github.com/hi-rustin/cargo-information/blob/v${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ eopb ];
};
}

View File

@ -0,0 +1,76 @@
{ lib, stdenv, fetchFromGitHub, runCommand, inflow, diffutils }:
stdenv.mkDerivation rec {
pname = "inflow";
version = "1.0.1";
src = fetchFromGitHub {
owner = "stephen-huan";
repo = "inflow";
rev = "v${version}";
sha256 = "sha256-xKUqkrPwITai8g6U1NiNieAip/AzISgFfFtvR30hLNk=";
};
buildPhase = ''
runHook preBuild
$CXX -Wall -Wpedantic -Wextra -O3 -o inflow inflow.cpp
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -Dm755 inflow -t $out/bin
runHook postInstall
'';
passthru.tests = {
reflowWithLineLength = runCommand "${pname}-test"
{
nativeBuildInputs = [ inflow ];
buildInputs = [ diffutils ];
} ''
cat <<EOF > input.txt
xxxxx xxx xxx xxxx xxxxxxxxx xx x xxxxxxxxx x xxxx xxxx xxxxxxx xxxxxxxx xxx
xxxxxxxxx xxxxxxxx xx xx xxxxx xxxxx xxxx xx x xxxx xx xxxxxxxx xxxxxxxx xxxx
xxx xxxx xxxx xxx xxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxx xxx xxxxx xx xxxx x xxxx
xxxxxxxx xxxx xxxx xx xxxxx xxxx xxxxx xxxx xxxxxxxxx xxx xxxxxxxxxxx xxxxxx
xxx xxxxxxxxx xxxx xxxx xx x xx xxxx xxx xxxx xx xxx xxx xxxxxxxxxxx xxxx xxxxx
x xxxxx xxxxxxx xxxxxxx xx xx xxxxxx xx xxxxx
EOF
inflow 72 < input.txt > actual.txt
cat <<EOF > expected.txt
xxxxx xxx xxx xxxx xxxxxxxxx xx x xxxxxxxxx x xxxx xxxx xxxxxxx
xxxxxxxx xxx xxxxxxxxx xxxxxxxx xx xx xxxxx xxxxx xxxx xx x xxxx
xx xxxxxxxx xxxxxxxx xxxx xxx xxxx xxxx xxx xxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxx xxx xxxxx xx xxxx x xxxx xxxxxxxx xxxx xxxx xx xxxxx
xxxx xxxxx xxxx xxxxxxxxx xxx xxxxxxxxxxx xxxxxx xxx xxxxxxxxx
xxxx xxxx xx x xx xxxx xxx xxxx xx xxx xxx xxxxxxxxxxx xxxx xxxxx
x xxxxx xxxxxxx xxxxxxx xx xx xxxxxx xx xxxxx
EOF
if ! cmp --silent expected.txt actual.txt
then
echo "Error: actual.txt and expected.txt are different"
diff actual.txt expected.txt
exit 1
fi
touch $out
'';
};
meta = with lib; {
description = "Variance-optimal paragraph formatter";
homepage = "https://github.com/stephen-huan/inflow";
license = licenses.unlicense;
mainProgram = "inflow";
maintainers = with maintainers; [ fbrs ];
platforms = platforms.all;
};
}

View File

@ -0,0 +1,25 @@
{ lib
, fetchFromGitHub
, buildGoModule
}:
buildGoModule rec {
pname = "meg";
version = "0.3.0";
vendorHash = "sha256-kQsGRmK7Qqz36whd6RI7Gecj40MM0o/fgRv7a+4yGZI=";
src = fetchFromGitHub {
owner = "tomnomnom";
repo = "meg";
rev = "v${version}";
hash = "sha256-uhfPNpvuuC9kBYUBCGE6X46TeZ5QxIcnDQ4HRrn2mT4=";
};
meta = with lib; {
homepage = "https://github.com/tomnomnom/meg";
description = "Fetch many paths for many hosts without flooding hosts";
mainProgram = "meg";
maintainers = with maintainers; [ averagebit ];
license = licenses.mit;
};
}

View File

@ -1,12 +1,33 @@
{
"depends": [
{
"method": "fetchzip",
"packages": [
"atlas"
],
"path": "/nix/store/v015scfifr10ialyimn7xxm0rdg4dha2-source",
"rev": "60681b93af4c8914afbd8eae9fc9820ba4d198a0",
"sha256": "1kc47w20ipbdh31s1gcblcikzlvlagmmha1qw3by70fc7mgazrxf",
"srcDir": "src",
"url": "https://github.com/nim-lang/atlas/archive/60681b93af4c8914afbd8eae9fc9820ba4d198a0.tar.gz"
},
{
"method": "fetchzip",
"packages": [
"bigints"
],
"path": "/nix/store/jvrm392g8adfsgf36prgwkbyd7vh5jsw-source",
"rev": "86ea14d31eea9275e1408ca34e6bfe9c99989a96",
"sha256": "15pcpmnk1bnw3k8769rjzcpg00nahyrypwbxs88jnwr4aczp99j4",
"srcDir": "src",
"url": "https://github.com/ehmry/nim-bigints/archive/86ea14d31eea9275e1408ca34e6bfe9c99989a96.tar.gz"
},
{
"method": "fetchzip",
"packages": [
"npeg"
],
"path": "/nix/store/ffkxmjmigfs7zhhiiqm0iw2c34smyciy-source",
"ref": "1.2.1",
"rev": "26d62fdc40feb84c6533956dc11d5ee9ea9b6c09",
"sha256": "0xpzifjkfp49w76qmaylan8q181bs45anmp46l4bwr3lkrr7bpwh",
"srcDir": "src",
@ -17,12 +38,11 @@
"packages": [
"preserves"
],
"path": "/nix/store/nrcpzf9hx70kry3gwhrdzcs3qicjncjh-source",
"ref": "20231021",
"rev": "edece399be70818208bf2263c30cb2bcf435bbff",
"sha256": "0xmw35wmw3a4lja9q4qvlvpxv3xk0hnkjg4fwfw6f3inh6zfiqki",
"path": "/nix/store/6nnn5di5vip1vladlb7z56rbw18d1y7j-source",
"rev": "2825bceecf33a15b9b7942db5331a32cbc39b281",
"sha256": "145vf46fy3wc52j6vs509fm9bi5lx7c53gskbkpcfbkv82l86dgk",
"srcDir": "src",
"url": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/edece399be70818208bf2263c30cb2bcf435bbff.tar.gz"
"url": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/2825bceecf33a15b9b7942db5331a32cbc39b281.tar.gz"
}
]
}

View File

@ -8,25 +8,28 @@
, makeWrapper
}:
buildNimPackage (finalAttrs: {
let nim' = nim.passthru.nim;
in buildNimPackage (finalAttrs: {
pname = "nim_lk";
version = "20231031";
version = "20240210";
src = fetchFromSourcehut {
owner = "~ehmry";
repo = "nim_lk";
rev = finalAttrs.version;
hash = "sha256-dXm3dfXAxgucek19f1KdRShOsJyELPTB32qgGSKId6A=";
hash = "sha256-LLOf8HNee0Mol+e7/dvu9hQUCmpaVBNggTxaAl/wV6Y=";
};
lockFile = ./lock.json;
buildInputs = [ openssl ];
nativeBuildInputs = [ makeWrapper ];
lockFile = ./lock.json;
nimFlags = [ "--path:${nim'}/nim" ];
postFixup = ''
wrapProgram $out/bin/nim_lk \
--suffix PATH : ${lib.makeBinPath [ nim nix-prefetch nix-prefetch-git ]}
--suffix PATH : ${lib.makeBinPath [ nim' nix-prefetch nix-prefetch-git ]}
'';
meta = finalAttrs.src.meta // {

View File

@ -0,0 +1,60 @@
{ lib
, fetchFromGitHub
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "offat";
version = "0.16.0";
pyproject = true;
src = fetchFromGitHub {
owner = "OWASP";
repo = "OFFAT";
rev = "refs/tags/v${version}";
hash = "sha256-ald+hanICvY0jTgL7GtIMiArLWazykaJAJSfzPKE4/I=";
};
sourceRoot = "${src.name}/src";
build-system = with python3.pkgs; [
poetry-core
];
dependencies = with python3.pkgs; [
aiohttp
aiolimiter
fastapi
openapi-spec-validator
requests
rich
setuptools
tenacity
];
passthru.optional-dependencies = {
api = with python3.pkgs; [
fastapi
uvicorn
redis
rq
python-dotenv
];
};
# Project has no tests
doCheck = false;
pythonImportsCheck = [
"offat"
];
meta = with lib; {
description = "Tool to test APIs for prevalent vulnerabilities";
homepage = "https://github.com/OWASP/OFFAT/";
changelog = "https://github.com/OWASP/OFFAT/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
mainProgram = "offat";
};
}

View File

@ -0,0 +1,37 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "pingme";
version = "0.2.6";
src = fetchFromGitHub {
owner = "kha7iq";
repo = "pingme";
rev = "v${version}";
hash = "sha256-i+EZ3HfuxHSuZDe0+nfZVvoNZN5XcdQFwfgOg4OLBOs=";
};
vendorHash = "sha256-fEJII8qSDIbMNhRfuYUsRA1AmOXR27iHpBPNCDFI4xQ=";
# bump go version
preBuild = ''
substituteInPlace go.mod \
--replace-fail 'go 1.16' 'go 1.21'
go mod tidy
'';
proxyVendor = true;
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
meta = {
changelog = "https://github.com/kha7iq/pingme/releases/tag/${src.rev}";
description = "Send messages or alerts to multiple messaging platforms & email";
homepage = "https://pingme.lmno.pk";
license = lib.licenses.mit;
mainProgram = "pingme";
maintainers = with lib.maintainers; [ emilytrau ];
};
}

View File

@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "simdutf";
version = "5.0.0";
version = "5.2.0";
src = fetchFromGitHub {
owner = "simdutf";
repo = "simdutf";
rev = "v${finalAttrs.version}";
hash = "sha256-ZCpLSMmgZSLAlVKzXFsaENnZwQAeKbNfKkj241PM26c=";
hash = "sha256-4yo962iiwSPW1JeQq5mLse5DJUub7AWqMDA+AdpsRBo=";
};
# Fix build on darwin

View File

@ -0,0 +1,30 @@
{ lib, stdenvNoCC, fetchFromGitHub }:
stdenvNoCC.mkDerivation rec {
pname = "sn-pro";
version = "1.1.0";
src = fetchFromGitHub {
owner = "supernotes";
repo = "sn-pro";
rev = version;
hash = "sha256-G/DIHWs91HYVbrV/jZ4aFsCCjqORo8YeqcHGN0LZ8p4=";
};
installPhase = ''
runHook preInstall
install -Dm644 -t $out/share/fonts/otf exports/SNPro/*.otf
install -Dm644 -t $out/share/fonts/woff2 exports/SNPro/*.woff2
runHook postInstall
'';
meta = with lib; {
description = "SN Pro Font Family";
homepage = "https://github.com/supernotes/sn-pro";
license = licenses.ofl;
maintainers = with maintainers; [ colemickens ];
platforms = platforms.all;
};
}

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wiremock";
version = "3.4.2";
version = "3.5.2";
src = fetchurl {
url = "mirror://maven/org/wiremock/wiremock-standalone/${version}/wiremock-standalone-${version}.jar";
hash = "sha256-Btf7oQRmfQnHdl5DawF2xOczDrR/5Po/9NytgqTLkVQ=";
hash = "sha256-27DIcfP5R1Qiwl2fhvUQjFsE8pTHTv5MuFqHGa+whVY=";
};
dontUnpack = true;

View File

@ -3,12 +3,12 @@
let
generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community";
version = "20240324094850";
version = "20240402003241";
src = fetchFromGitHub {
owner = "v2fly";
repo = "domain-list-community";
rev = version;
hash = "sha256-Fdb0Bk0dk0SkBmUdeBjMH8/++fDvw1GtiKCYXdVAfCc=";
hash = "sha256-tIQqTvrQUGjLeZL1aQiqaViZSAysUfX+QlTkhH7N3Iw=";
};
vendorHash = "sha256-azvMUi8eLNoNofRa2X4SKTTiMd6aOyO6H/rOiKjkpIY=";
meta = with lib; {

View File

@ -11,7 +11,10 @@ mkCoqDerivation {
sourceRoot = "source/coq";
meta = coq.ocamlPackages.vpl-core.meta // {
meta = {
description = "Coq interface to VPL abstract domain of convex polyhedra";
homepage = "https://amarechal.gitlab.io/home/projects/vpl/";
license = lib.licenses.lgpl3Only;
maintainers = [ lib.maintainers.vbgl ];
};
}

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "robin-map";
version = "1.2.1";
version = "1.2.2";
src = fetchFromGitHub {
owner = "Tessil";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-axVMJHTnGW2c4kGcYhEEAvKbVKYA2oxiYfwjiz7xh6Q=";
hash = "sha256-33oNUvLofFuM5QyRk+Jc6Q7vvWk68c/QqX0oiELoUrw=";
};
nativeBuildInputs = [

View File

@ -240,6 +240,30 @@ buildLuarocksPackage {
};
}) {};
commons-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder }:
buildLuarocksPackage {
pname = "commons.nvim";
version = "15.0.0-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/commons.nvim-15.0.0-1.rockspec";
sha256 = "1f3izlp5jkr772pfbdm3q6qm5vmqqzdn4pl9qyq9fp9jzxrbv62r";
}).outPath;
src = fetchzip {
url = "https://github.com/linrongbin16/commons.nvim/archive/b50a5a220c25baa5d7568137451bdc8c3c08e80c.zip";
sha256 = "1ylvrywms5igixmkpgk6kv3a8w6d4c17dzlca9av0xxxj7ny3vgq";
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
meta = {
homepage = "https://linrongbin16.github.io/commons.nvim/";
description = "The commons lua library for Neovim plugin project.";
maintainers = with lib.maintainers; [ mrcjkb ];
license.fullName = "MIT";
};
}) {};
compat53 = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }:
buildLuarocksPackage {
pname = "compat53";
@ -536,6 +560,54 @@ buildLuarocksPackage {
};
}) {};
funnyfiles-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder }:
buildLuarocksPackage {
pname = "funnyfiles.nvim";
version = "1.0.1-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/funnyfiles.nvim-1.0.1-1.rockspec";
sha256 = "1r3cgx8wvc1c4syk167m94ws513g0cdmmxnymf3zyidlszdwamy5";
}).outPath;
src = fetchzip {
url = "https://github.com/aikooo7/funnyfiles.nvim/archive/v1.0.1.zip";
sha256 = "00p026r05gldbf18mmv8da9ap09di8dhy0rrd586pr2s2s36nzpd";
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
meta = {
homepage = "https://github.com/aikooo7/funnyfiles.nvim";
description = "This plugin is a way of creating/deleting files/folders without needing to open a file explorer.";
maintainers = with lib.maintainers; [ mrcjkb ];
license.fullName = "MIT";
};
}) {};
fzf-lua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder }:
buildLuarocksPackage {
pname = "fzf-lua";
version = "0.0.1195-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/fzf-lua-0.0.1195-1.rockspec";
sha256 = "1bcjis9mkbzq7178fkpqkafs6656bhvq1wh13vm1r3khbvi0jkp1";
}).outPath;
src = fetchzip {
url = "https://github.com/ibhagwan/fzf-lua/archive/0c884bb24ab0fef204f315f34e711b13ece0ea9f.zip";
sha256 = "04gif5hyb6qzh649xzcwzx81rlrk2glking05q8wxp2cpa3nifpw";
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
meta = {
homepage = "https://github.com/ibhagwan/fzf-lua";
description = "Improved fzf.vim written in lua";
maintainers = with lib.maintainers; [ mrcjkb ];
license.fullName = "AGPL-3.0";
};
}) {};
fzy = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }:
buildLuarocksPackage {
pname = "fzy";
@ -2483,6 +2555,30 @@ buildLuarocksPackage {
};
}) {};
lua-utils-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder }:
buildLuarocksPackage {
pname = "lua-utils.nvim";
version = "1.0.2-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/lua-utils.nvim-1.0.2-1.rockspec";
sha256 = "0s11j4vd26haz72rb0c5m5h953292rh8r62mvlxbss6i69v2dkr9";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neorg/lua-utils.nvim/archive/v1.0.2.zip";
sha256 = "0bnl2kvxs55l8cjhfpa834bm010n8r4gmsmivjcp548c076msagn";
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
meta = {
homepage = "https://github.com/nvim-neorg/lua-utils.nvim";
description = "A set of utility functions for Neovim plugins.";
maintainers = with lib.maintainers; [ mrcjkb ];
license.fullName = "MIT";
};
}) {};
luazip = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }:
buildLuarocksPackage {
pname = "luazip";
@ -2801,6 +2897,30 @@ buildLuarocksPackage {
};
}) {};
neotest = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, plenary-nvim }:
buildLuarocksPackage {
pname = "neotest";
version = "4.2.0-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/neotest-4.2.0-1.rockspec";
sha256 = "0mkjwag6h7psff6rmsirn945ax38dszag0kwch2az2axk1nl6nj8";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neotest/neotest/archive/a2f1cb4072bb29fcc067605fb712bbd83917513e.zip";
sha256 = "0f8rn9v26v3a6yq0wngdzrgz5rdwlpmnc74b98l1aqb2ikn6gxvd";
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua plenary-nvim ];
meta = {
homepage = "https://github.com/nvim-neotest/neotest";
description = "An extensible framework for interacting with tests within NeoVim.";
maintainers = with lib.maintainers; [ mrcjkb ];
license.fullName = "MIT";
};
}) {};
nlua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder }:
buildLuarocksPackage {
pname = "nlua";
@ -2887,14 +3007,14 @@ buildLuarocksPackage {
nvim-nio = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder }:
buildLuarocksPackage {
pname = "nvim-nio";
version = "1.2.0-1";
version = "1.8.1-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/nvim-nio-1.2.0-1.rockspec";
sha256 = "0a62iv1lyx8ldrdbip6az0ixm8dmpcai3k8j5jsf49cr4zjpcjzk";
url = "mirror://luarocks/nvim-nio-1.8.1-1.rockspec";
sha256 = "0f9ccrli5jcvcyawkjd99nm6himnnnd6z54938rd0wjp21d8s4s9";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neotest/nvim-nio/archive/11864149f47e0c7a38c4dadbcea8fc17c968556e.zip";
sha256 = "141py3csgbijpqhscgmsbnkg4lbx7ma7nwpj0akfc7v37c143dq3";
url = "https://github.com/nvim-neotest/nvim-nio/archive/v1.8.1.zip";
sha256 = "0zax50chrh7qrgh56avd5ny0lb3i0y906wk13mhbkp9i5d9anw1h";
};
disabled = (luaOlder "5.1");
@ -2903,6 +3023,7 @@ buildLuarocksPackage {
meta = {
homepage = "https://github.com/nvim-neotest/nvim-nio";
description = "A library for asynchronous IO in Neovim";
maintainers = with lib.maintainers; [ mrcjkb ];
license.fullName = "MIT";
};
}) {};
@ -2995,29 +3116,6 @@ buildLuarocksPackage {
};
}) {};
rocks-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, fzy, lua, luaOlder, nvim-nio, toml, toml-edit }:
buildLuarocksPackage {
pname = "rocks.nvim";
version = "2.7.3-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/rocks.nvim-2.7.3-1.rockspec";
sha256 = "1nv6ym32d9vk69c6mg2i4bzn1lq0p1c039g5scf7482rx029zvnh";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.7.3.zip";
sha256 = "02s7bqskfpk2xbipryvv7ybxl3gjllmn8wa8by1sqmmb4p56836j";
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ fidget-nvim fzy lua nvim-nio toml toml-edit ];
meta = {
homepage = "https://github.com/nvim-neorocks/rocks.nvim";
description = "Neovim plugin management inspired by Cargo.";
license.fullName = "GPL-3.0";
};
}) {};
rest-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder }:
buildLuarocksPackage {
pname = "rest.nvim";
@ -3042,6 +3140,102 @@ buildLuarocksPackage {
};
}) {};
rocks-config-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, rocks-nvim }:
buildLuarocksPackage {
pname = "rocks-config.nvim";
version = "1.2.3-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/rocks-config.nvim-1.2.3-1.rockspec";
sha256 = "0lwy0fkmrxbnj46jh35i9l1hmfa88a879spmasmh7kw4vpd1bbpr";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neorocks/rocks-config.nvim/archive/v1.2.3.zip";
sha256 = "0byf1q18ykgs3hsz8wyjimkcnq0pl26ikxjlv0ly0acxrg9x9kcp";
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua rocks-nvim ];
meta = {
homepage = "https://github.com/nvim-neorocks/rocks-config.nvim";
description = "Allow rocks.nvim to help configure your plugins.";
maintainers = with lib.maintainers; [ mrcjkb ];
license.fullName = "GPL-3.0";
};
}) {};
rocks-dev-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, nvim-nio, rocks-nvim }:
buildLuarocksPackage {
pname = "rocks-dev.nvim";
version = "1.1.2-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/rocks-dev.nvim-1.1.2-1.rockspec";
sha256 = "09yz84akkparvqfsjpslxpv3wzvkjrbqil8fxwl5crffggn5mz1b";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neorocks/rocks-dev.nvim/archive/v1.1.2.zip";
sha256 = "19g8dlz2zch0sz21zm92l6ic81bx68wklidjw94xrjyv26139akc";
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua nvim-nio rocks-nvim ];
meta = {
homepage = "https://github.com/nvim-neorocks/rocks-dev.nvim";
description = "A swiss-army knife for testing and developing rocks.nvim modules.";
maintainers = with lib.maintainers; [ mrcjkb ];
license.fullName = "GPL-3.0";
};
}) {};
rocks-git-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, nvim-nio, rocks-nvim }:
buildLuarocksPackage {
pname = "rocks-git.nvim";
version = "1.3.0-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/rocks-git.nvim-1.3.0-1.rockspec";
sha256 = "196wjjdkjgqdx1lj8cxcn1xh6dysn0a0w544yc62vg6h227c6igi";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v1.3.0.zip";
sha256 = "024zvl91ixb25rkpikwcxb73qfd6wsc2a5qwkwfy6sibkff7jgaq";
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua nvim-nio rocks-nvim ];
meta = {
homepage = "https://github.com/nvim-neorocks/rocks-git.nvim";
description = "Use rocks.nvim to install plugins from git!";
maintainers = with lib.maintainers; [ mrcjkb ];
license.fullName = "GPL-3.0";
};
}) {};
rocks-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, fzy, lua, luaOlder, nvim-nio, toml, toml-edit }:
buildLuarocksPackage {
pname = "rocks.nvim";
version = "2.19.1-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/rocks.nvim-2.19.1-1.rockspec";
sha256 = "1n712a8wqhli2hbq8s6isa9jaxxvqy20737njakqdkakqp2xsdbs";
}).outPath;
src = fetchzip {
url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.19.1.zip";
sha256 = "1n3za055vdi6v1hx72sdrh9dpgs6g58b2haq0ad3q5ncsy951h0q";
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ fidget-nvim fzy lua nvim-nio toml toml-edit ];
meta = {
homepage = "https://github.com/nvim-neorocks/rocks.nvim";
description = "Neovim plugin management inspired by Cargo.";
maintainers = with lib.maintainers; [ mrcjkb ];
license.fullName = "GPL-3.0";
};
}) {};
rustaceanvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder }:
buildLuarocksPackage {
pname = "rustaceanvim";

View File

@ -4,18 +4,18 @@ version = 3
[[package]]
name = "aho-corasick"
version = "1.1.2"
version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
dependencies = [
"memchr",
]
[[package]]
name = "autocfg"
version = "1.1.0"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
[[package]]
name = "bitflags"
@ -25,7 +25,7 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "breezy"
version = "3.3.5"
version = "3.3.6"
dependencies = [
"pyo3",
]
@ -44,9 +44,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "indoc"
version = "2.0.4"
version = "2.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
[[package]]
name = "lazy_static"
@ -56,9 +56,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
version = "0.2.152"
version = "0.2.153"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
[[package]]
name = "lock_api"
@ -72,15 +72,15 @@ dependencies = [
[[package]]
name = "memchr"
version = "2.7.1"
version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
[[package]]
name = "memoffset"
version = "0.9.0"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
dependencies = [
"autocfg",
]
@ -115,25 +115,32 @@ dependencies = [
]
[[package]]
name = "proc-macro2"
version = "1.0.78"
name = "portable-atomic"
version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
[[package]]
name = "proc-macro2"
version = "1.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
dependencies = [
"unicode-ident",
]
[[package]]
name = "pyo3"
version = "0.20.2"
version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a89dc7a5850d0e983be1ec2a463a171d20990487c3cfcd68b5363f1ee3d6fe0"
checksum = "a7a8b1990bd018761768d5e608a13df8bd1ac5f678456e0f301bb93e5f3ea16b"
dependencies = [
"cfg-if",
"indoc",
"libc",
"memoffset",
"parking_lot",
"portable-atomic",
"pyo3-build-config",
"pyo3-ffi",
"pyo3-macros",
@ -142,9 +149,9 @@ dependencies = [
[[package]]
name = "pyo3-build-config"
version = "0.20.2"
version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07426f0d8fe5a601f26293f300afd1a7b1ed5e78b2a705870c5f30893c5163be"
checksum = "650dca34d463b6cdbdb02b1d71bfd6eb6b6816afc708faebb3bac1380ff4aef7"
dependencies = [
"once_cell",
"target-lexicon",
@ -152,9 +159,9 @@ dependencies = [
[[package]]
name = "pyo3-ffi"
version = "0.20.2"
version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dbb7dec17e17766b46bca4f1a4215a85006b4c2ecde122076c562dd058da6cf1"
checksum = "09a7da8fc04a8a2084909b59f29e1b8474decac98b951d77b80b26dc45f046ad"
dependencies = [
"libc",
"pyo3-build-config",
@ -162,9 +169,9 @@ dependencies = [
[[package]]
name = "pyo3-macros"
version = "0.20.2"
version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05f738b4e40d50b5711957f142878cfa0f28e054aa0ebdfc3fd137a843f74ed3"
checksum = "4b8a199fce11ebb28e3569387228836ea98110e43a804a530a9fd83ade36d513"
dependencies = [
"proc-macro2",
"pyo3-macros-backend",
@ -174,12 +181,13 @@ dependencies = [
[[package]]
name = "pyo3-macros-backend"
version = "0.20.2"
version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fc910d4851847827daf9d6cdd4a823fbdaab5b8818325c5e97a86da79e8881f"
checksum = "93fbbfd7eb553d10036513cb122b888dcd362a945a00b06c165f2ab480d4cc3b"
dependencies = [
"heck",
"proc-macro2",
"pyo3-build-config",
"quote",
"syn",
]
@ -204,9 +212,9 @@ dependencies = [
[[package]]
name = "regex"
version = "1.10.3"
version = "1.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
dependencies = [
"aho-corasick",
"memchr",
@ -216,9 +224,9 @@ dependencies = [
[[package]]
name = "regex-automata"
version = "0.4.5"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
dependencies = [
"aho-corasick",
"memchr",
@ -227,13 +235,13 @@ dependencies = [
[[package]]
name = "regex-syntax"
version = "0.8.2"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
[[package]]
name = "rio-py"
version = "3.3.5"
version = "3.3.6"
dependencies = [
"lazy_static",
"pyo3",
@ -248,15 +256,15 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "smallvec"
version = "1.13.1"
version = "1.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]]
name = "syn"
version = "2.0.48"
version = "2.0.57"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35"
dependencies = [
"proc-macro2",
"quote",
@ -265,9 +273,9 @@ dependencies = [
[[package]]
name = "target-lexicon"
version = "0.12.13"
version = "0.12.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae"
checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
[[package]]
name = "unicode-ident"

View File

@ -13,6 +13,7 @@
, merge3
, patiencediff
, pyyaml
, tzlocal
, urllib3
, breezy
, launchpadlib
@ -28,7 +29,7 @@
buildPythonPackage rec {
pname = "breezy";
version = "3.3.5";
version = "3.3.6";
pyproject = true;
disabled = pythonOlder "3.7";
@ -37,7 +38,7 @@ buildPythonPackage rec {
owner = "breezy-team";
repo = "breezy";
rev = "brz-${version}";
hash = "sha256-z8NKb8gFgA6dufM12jnZIZ6b1ZMZRzFA3w7t7gECEts=";
hash = "sha256-d2TZPFqKRI4sf6R2X/pczqN+LcfpTmP1W+wkDlKX6HE=";
};
cargoDeps = rustPlatform.importCargoLock {
@ -67,6 +68,7 @@ buildPythonPackage rec {
merge3
patiencediff
pyyaml
tzlocal
urllib3
] ++ passthru.optional-dependencies.launchpad
++ passthru.optional-dependencies.fastimport

View File

@ -25,7 +25,7 @@
buildPythonPackage rec {
pname = "craft-parts";
version = "1.26.2";
version = "1.29.0";
pyproject = true;
@ -33,7 +33,7 @@ buildPythonPackage rec {
owner = "canonical";
repo = "craft-parts";
rev = "refs/tags/${version}";
hash = "sha256-wHv0JWffS916RK4Kgk+FuRthx+ajh0Ka4DBwGrLdUBs=";
hash = "sha256-3AWiuRGUGj6q6ZEnShc64DSL1S6kTsry4Z1IYMelvzg=";
};
patches = [

View File

@ -6,6 +6,7 @@
, dbt-postgres
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, pythonRelaxDepsHook
, redshift-connector
, setuptools
@ -13,27 +14,32 @@
buildPythonPackage rec {
pname = "dbt-redshift";
version = "1.7.4";
version = "1.7.5";
pyproject = true;
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "dbt-labs";
repo = "dbt-redshift";
rev = "refs/tags/v${version}";
hash = "sha256-Ny6Nnb5OhtqSQZ0BMOQrb0ic6i29GVywy3hn3UuVtxE=";
hash = "sha256-wFNPXUU2EuDEiPpEAzjRIRdR27PHLVcOvgQ9E/bpgwM=";
};
nativeBuildInputs = [
pythonRelaxDepsHook
setuptools
];
pythonRelaxDeps = [
"boto3"
"redshift-connector"
];
propagatedBuildInputs = [
nativeBuildInputs = [
pythonRelaxDepsHook
];
build-system = [
setuptools
];
dependencies = [
agate
boto3
dbt-core

View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "hstspreload";
version = "2024.3.1";
version = "2024.4.1";
pyproject = true;
disabled = pythonOlder "3.6";
@ -16,10 +16,10 @@ buildPythonPackage rec {
owner = "sethmlarson";
repo = "hstspreload";
rev = "refs/tags/${version}";
hash = "sha256-TlPZg1IbgOODbkgJHWI6dNdk3jsyL2L/3qhLtXvQjqI=";
hash = "sha256-kbcUf06tgVgr5qu5YSCwHtlBVzUEEqF1A/D+4RCnUcc=";
};
nativeBuildInputs = [
build-system = [
setuptools
];

View File

@ -33,7 +33,7 @@
buildPythonPackage rec {
pname = "litellm";
version = "1.34.16";
version = "1.34.20";
pyproject = true;
disabled = pythonOlder "3.8";
@ -42,7 +42,7 @@ buildPythonPackage rec {
owner = "BerriAI";
repo = "litellm";
rev = "refs/tags/v${version}";
hash = "sha256-ei4fMjEL7IytpQs/szTjRNu+3TByLZLVYX7qxwjT4OQ=";
hash = "sha256-9MZOqNhrBFtflznqroRUc/B7dUgy9t5HdUW/LGYQOYw=";
};
postPatch = ''

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "switchbot-api";
version = "2.0.0";
version = "2.1.0";
pyproject = true;
disabled = pythonOlder "3.10";
@ -17,14 +17,14 @@ buildPythonPackage rec {
owner = "SeraphicCorp";
repo = "py-switchbot-api";
rev = "refs/tags/v${version}";
hash = "sha256-QM8oVfd+hdVNdhOgI3ujyY82Im0Yr5Nl+OcqzEtZ7XE=";
hash = "sha256-dJLjWwBzrT3GnsRpTIXu3SkVDUlnAbRwBlfSQaHWPzc=";
};
nativeBuildInputs = [
build-system = [
poetry-core
];
propagatedBuildInputs = [
dependencies = [
aiohttp
];

View File

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "twilio";
version = "9.0.2";
version = "9.0.3";
pyproject = true;
disabled = pythonOlder "3.7";
@ -28,14 +28,14 @@ buildPythonPackage rec {
owner = "twilio";
repo = "twilio-python";
rev = "refs/tags/${version}";
hash = "sha256-xFl+Ucu7ve7She8zUaW5YdK0gE733NNadDka4NeJ8Tg=";
hash = "sha256-MyK5ICGNR3BEJtVhFM3A6azceU5HjSDep4tpuQ8D4Rs=";
};
nativeBuildInputs = [
build-system = [
setuptools
];
propagatedBuildInputs = [
dependencies = [
aiohttp
aiohttp-retry
pyjwt

View File

@ -6,15 +6,15 @@
buildPythonPackage rec {
pname = "types-docutils";
version = "0.20.0.20240317";
version = "0.20.0.20240331";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-I2V6qw3lhjTREZFLZ3sYVYZ/Fs2anqEQJU4jtIZT4ag=";
hash = "sha256-rJnN80BAyYIIH1QjfWAX+PXa/gvruBilmL+Xpl9bFxU=";
};
nativeBuildInputs = [
build-system = [
setuptools
];

View File

@ -11,24 +11,24 @@
buildPythonPackage rec {
pname = "velbus-aio";
version = "2023.12.0";
version = "2024.4.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Cereal2nd";
repo = pname;
repo = "velbus-aio";
rev = "refs/tags/${version}";
hash = "sha256-cYqEF2Odouu7U0DiU+n/gKUYJia8I4Qs1l+UI6JrWTM=";
hash = "sha256-wYcASRmUxVdUpfKlNIteQlHw3ZaYxZ7VenKtaju1yTE=";
fetchSubmodules = true;
};
nativeBuildInputs = [
build-system = [
setuptools
];
propagatedBuildInputs = [
dependencies = [
backoff
pyserial
pyserial-asyncio

View File

@ -5,24 +5,29 @@
, pytestCheckHook
, pythonAtLeast
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "xkcdpass";
version = "1.19.8";
format = "setuptools";
version = "1.19.9";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-MK//Q5m4PeNioRsmxHaMbN2x7a4SkgVy0xkxuvnUufo=";
hash = "sha256-qU+HG9qHBmjlxl64QpbpOWADYt8swDa5HFyjgVvSktc=";
};
nativeBuildInputs = [
installShellFiles
];
build-system = [
setuptools
];
nativeCheckInputs = [
pytestCheckHook
];
@ -43,9 +48,9 @@ buildPythonPackage rec {
meta = with lib; {
description = "Generate secure multiword passwords/passphrases, inspired by XKCD";
mainProgram = "xkcdpass";
homepage = "https://github.com/redacted/XKCD-password-generator";
license = licenses.bsd3;
maintainers = with maintainers; [ peterhoeg ];
mainProgram = "xkcdpass";
};
}

View File

@ -1,12 +1,12 @@
{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre }:
stdenvNoCC.mkDerivation rec {
version = "10.14.2";
version = "10.15.0";
pname = "checkstyle";
src = fetchurl {
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
sha256 = "sha256-5OR/HJ0DqquvhWcB35TsKueGUfo7cM3b9mNszMJAz2o=";
sha256 = "sha256-9p9JXjkkCHGCdNIs/Kh/I/JdU6xOVuc8Ff1WZERxiM4=";
};
nativeBuildInputs = [ makeBinaryWrapper ];

View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
version = "0.3.4";
version = "0.3.5";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "ruff";
rev = "refs/tags/v${version}";
hash = "sha256-P0k/0tWbhY2HaxI4QThxpHD48JUjtF/d3iU4MIFhdHI=";
hash = "sha256-sGmNrkZv03yzEm9fM00H/BZnVr915LW3qGWjci1QACc=";
};
cargoHash = "sha256-LckX8/c3Yg9i/0C2d0XSxxNJSpaVxmj2s8tkEUDhbmA=";
cargoHash = "sha256-6ZqbyM8MXN916HPG86PZAtAPFkXGvMD27Y5ql6o/tUQ=";
nativeBuildInputs = [
installShellFiles

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "typos";
version = "1.19.0";
version = "1.20.1";
src = fetchFromGitHub {
owner = "crate-ci";
repo = pname;
rev = "v${version}";
hash = "sha256-2beVIS6vzaX9k+M6545F/QDq6mxPTpmDDD2B9+eLxTk=";
hash = "sha256-X9m+2zJsHYbek/G9oyH3394/StolG3cDjVigTJZNzu0=";
};
cargoHash = "sha256-GpooXnJc3ADQRhvVSnDjj6OOuQW+emVo5TGoshPI+WY=";
cargoHash = "sha256-eCcuDfolsjv6Xt+sqo8VxWZhy5DLoukuI9rQiNXrUVs=";
meta = with lib; {
description = "Source code spell checker";

View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, fetchYarnDeps
, yarn
, prefetch-yarn-deps
@ -18,18 +17,18 @@
let appName = "heroic";
in stdenv.mkDerivation rec {
pname = "heroic-unwrapped";
version = "2.13.0";
version = "2.14.0";
src = fetchFromGitHub {
owner = "Heroic-Games-Launcher";
repo = "HeroicGamesLauncher";
rev = "v${version}";
hash = "sha256-02agp4EGT23QBKC8j1JIAkzVLRykFl55aH/wPF0bU/Y=";
hash = "sha256-EARNmvzOOE/AAQKqiXZhhCf2A/j9Cn2BRV9Yc0ezKfE=";
};
offlineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-hd0wY1an12zY0E6VPjiD23Mn5ZDPvFvIdu6FGoc7nYY=";
hash = "sha256-3CYSw1Qy363eyhy3UyFgihSau+miNHwvKjhlq/kWxWQ=";
};
nativeBuildInputs = [
@ -46,11 +45,6 @@ in stdenv.mkDerivation rec {
./remove-drm-support.patch
# Make Heroic create Steam shortcuts (to non-steam games) with the correct path to heroic.
./fix-non-steam-shortcuts.patch
(fetchpatch {
name = "adtraction-fallback.patch";
url = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/pull/3575.patch";
hash = "sha256-XhYYLQf/oSX3uK+0KzfnAb49iaGwhl9W64Tg2Fqi8Gg=";
})
];
postPatch = ''

View File

@ -7,11 +7,11 @@
}:
mkKdeDerivation rec {
pname = "kirigami-addons";
version = "1.0.1";
version = "1.1.0";
src = fetchurl {
url = "mirror://kde/stable/kirigami-addons/kirigami-addons-${version}.tar.xz";
hash = "sha256-nQE4R++wBIxqJ5nuDtKBsU7uFTFKwg1/uoUxl+RfKbc=";
hash = "sha256-jvNSSZE5YWsxQqbXqSqyN0nFaEA+zo2FTwZKlB0IVTY=";
};
extraBuildInputs = [qtdeclarative];

View File

@ -1,7 +1,7 @@
{
"testing": {
"version": "6.9-rc1",
"hash": "sha256:05hi2vfmsjwl5yhqmy4h5a954090nv48z9gabhvh16xlaqlfh8nz"
"version": "6.9-rc2",
"hash": "sha256:14yjrkd63qsd2hip53x146fsd42d261pxdh85fprcvsrg656c6gp"
},
"6.1": {
"version": "6.1.83",

View File

@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "19509";
sha256 = "0dkjvpb075jdasvic8sfpy0dj48fsxgj2yl0zrply7gkaahgns8q";
rev = "19523";
sha256 = "0j3fhmb931niskv67v6ngwc11v2z78rr3bcy4369j44aqnbfaq1y";
}
, ...
}:

View File

@ -6,7 +6,7 @@
, ... } @ args:
let
version = "6.1.82-rt27"; # updated by ./update-rt.sh
version = "6.1.83-rt28"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
sha256 = "01pcrcjp5mifjjmfz7j1jb8nhq8nkxspavxmv1l7d1qnskcx4l6i";
sha256 = "145iw3wii7znhrqdmgnwhswk235g6gw8axjjji2cw4rn148rddl8";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "03mj6p9z5c2hzdl46479gb9x41papq91g86yyc61fv8hj8kxgysc";
sha256 = "07wv3zd7n5378k8ywdavrp5ndqkdcis923dwpswfv7062xm34y5h";
};
}; in [ rt-patch ] ++ kernelPatches;

View File

@ -6,7 +6,7 @@
, ... } @ args:
let
version = "6.6.22-rt27"; # updated by ./update-rt.sh
version = "6.6.23-rt28"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
sha256 = "1x52c6ywmspp3naishzsknhy7i0b7mv9baxx25a0y987cjsygqr3";
sha256 = "1fd824ia3ngy65c5qaaln7m66ca4p80bwlnvvk76pw4yrccx23r0";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "01n9khj51xf8dj2hhxhlkha4f8hwf6w5marc227ljm9w5hlza12g";
sha256 = "0l9509qnv333fwjlxkr46rb23dhxs43bzj6iisk1r2lq69jhmyx4";
};
}; in [ rt-patch ] ++ kernelPatches;

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "parallel";
version = "20240222";
version = "20240322";
src = fetchurl {
url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2";
sha256 = "sha256-66Cban4jj2Iik/fUYVl/NQdctW8XDQpzFI9T0lnshVY=";
hash = "sha256-CxcCmiA9q/e6bKflLC05EP/0ayl5R24SqREJILeeapU=";
};
outputs = [ "out" "man" "doc" ];

View File

@ -9,14 +9,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "nix-update";
version = "1.3.0";
version = "1.3.1";
pyproject = true;
src = fetchFromGitHub {
owner = "Mic92";
repo = pname;
rev = version;
hash = "sha256-Nu9/mzL/notnR6Tvtj938Mo0TmYJutA2oJ6/rg2uZCo=";
hash = "sha256-QWfW8tI4tk8hk9eNN6/3i2E4rwfIWgqjxj+htSZVdrc=";
};
nativeBuildInputs = [

View File

@ -6,7 +6,7 @@ buildGoModule rec {
src = fetchFromGitHub {
rev = "v${version}";
owner = "variantdev";
owner = "helmfile";
repo = pname;
sha256 = "sha256-jD7fYvPOR6fwpCqNhxNXzjc8qtmjXkJy+f/L7t9Jlu4=";
};
@ -31,8 +31,8 @@ buildGoModule rec {
description = "Helm-like configuration values loader with support for various sources";
mainProgram = "vals";
license = licenses.asl20;
homepage = "https://github.com/variantdev/vals";
changelog = "https://github.com/variantdev/vals/releases/v${version}";
homepage = "https://github.com/helmfile/vals";
changelog = "https://github.com/helmfile/vals/releases/v${version}";
maintainers = with maintainers; [ stehessel ];
};
}

View File

@ -36643,7 +36643,7 @@ with pkgs;
heroic-unwrapped = callPackage ../games/heroic {
# Match the version used by the upstream package.
electron = electron_27;
electron = electron_29;
};
heroic = callPackage ../games/heroic/fhsenv.nix { };