Merge staging-next into staging
This commit is contained in:
@@ -154,9 +154,12 @@ jobs:
|
||||
--arg beforeResultDir ./targetResult \
|
||||
--arg afterResultDir "$(realpath prResult)" \
|
||||
--arg touchedFilesJson ./touched-files.json \
|
||||
--argstr githubAuthorId "$AUTHOR_ID" \
|
||||
-o comparison
|
||||
|
||||
cat comparison/step-summary.md >> "$GITHUB_STEP_SUMMARY"
|
||||
env:
|
||||
AUTHOR_ID: ${{ github.event.pull_request.user.id }}
|
||||
|
||||
- name: Upload the combined results
|
||||
if: steps.targetRunId.outputs.targetRunId
|
||||
@@ -211,10 +214,10 @@ jobs:
|
||||
- name: Labelling pull request
|
||||
if: ${{ github.event_name == 'pull_request_target' && github.repository_owner == 'NixOS' }}
|
||||
run: |
|
||||
# Get all currently set rebuild labels
|
||||
# Get all currently set labels that we manage
|
||||
gh api \
|
||||
/repos/"$REPOSITORY"/issues/"$NUMBER"/labels \
|
||||
--jq '.[].name | select(startswith("10.rebuild"))' \
|
||||
--jq '.[].name | select(startswith("10.rebuild") or . == "11.by: package-maintainer")' \
|
||||
| sort > before
|
||||
|
||||
# And the labels that should be there
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
beforeResultDir,
|
||||
afterResultDir,
|
||||
touchedFilesJson,
|
||||
githubAuthorId,
|
||||
byName ? false,
|
||||
}:
|
||||
let
|
||||
@@ -114,7 +115,15 @@ let
|
||||
# Adds "10.rebuild-*-stdenv" label if the "stdenv" attribute was changed
|
||||
++ lib.mapAttrsToList (kernel: _: "10.rebuild-${kernel}-stdenv") (
|
||||
lib.filterAttrs (_: kernelRebuilds: kernelRebuilds ? "stdenv") rebuildsByKernel
|
||||
);
|
||||
)
|
||||
# Adds the "11.by: package-maintainer" label if all of the packages directly
|
||||
# changed are maintained by the PR's author. (https://github.com/NixOS/ofborg/blob/df400f44502d4a4a80fa283d33f2e55a4e43ee90/ofborg/src/tagger.rs#L83-L88)
|
||||
++ lib.optional (
|
||||
maintainers ? ${githubAuthorId}
|
||||
&& lib.all (lib.flip lib.elem maintainers.${githubAuthorId}) (
|
||||
lib.flatten (lib.attrValues maintainers)
|
||||
)
|
||||
) "11.by: package-maintainer";
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@ let
|
||||
);
|
||||
};
|
||||
|
||||
nix = nixVersions.nix_2_24;
|
||||
nix = nixVersions.latest;
|
||||
|
||||
supportedSystems = builtins.fromJSON (builtins.readFile ../supportedSystems.json);
|
||||
|
||||
|
||||
@@ -4411,6 +4411,13 @@
|
||||
githubId = 631802;
|
||||
keys = [ { fingerprint = "099E 3F97 FA08 3D47 8C75 EBEC E0EB AD78 F019 0BD9"; } ];
|
||||
};
|
||||
chillcicada = {
|
||||
email = "2210227279@qq.com";
|
||||
name = "chillcicada";
|
||||
github = "chillcicada";
|
||||
githubId = 116548943;
|
||||
keys = [ { fingerprint = "734C 20B3 33C4 FAB3 0BD0 743A 34C2 1231 0A99 754B"; } ];
|
||||
};
|
||||
chiroptical = {
|
||||
email = "chiroptical@gmail.com";
|
||||
github = "chiroptical";
|
||||
@@ -8106,6 +8113,12 @@
|
||||
githubId = 8182846;
|
||||
name = "Francesco Gazzetta";
|
||||
};
|
||||
fgrcl = {
|
||||
email = "fgrclaberge@gmail.com";
|
||||
github = "FGRCL";
|
||||
githubId = 35940434;
|
||||
name = "Francois LaBerge";
|
||||
};
|
||||
fidgetingbits = {
|
||||
name = "fidgetingbits";
|
||||
email = "nixpkgs.xe7au@passmail.net";
|
||||
@@ -18243,10 +18256,11 @@
|
||||
name = "Dakota";
|
||||
};
|
||||
ohheyrj = {
|
||||
email = "richard+nix@ohheyrj.co.uk";
|
||||
email = "richard@ohheyrj.co.uk";
|
||||
github = "ohheyrj";
|
||||
name = "ohheyrj";
|
||||
githubId = 5339261;
|
||||
keys = [ { fingerprint = "4258 3FE7 12E9 6071 E84D 53C7 6E1D A270 0B72 746D"; } ];
|
||||
};
|
||||
oida = {
|
||||
email = "oida@posteo.de";
|
||||
|
||||
@@ -1192,7 +1192,12 @@ with lib.maintainers;
|
||||
};
|
||||
|
||||
systemd = {
|
||||
members = [ ];
|
||||
members = [
|
||||
flokli
|
||||
arianvp
|
||||
elvishjerricco
|
||||
aanderse
|
||||
];
|
||||
githubTeams = [ "systemd" ];
|
||||
scope = "Maintain systemd for NixOS.";
|
||||
shortName = "systemd";
|
||||
|
||||
@@ -126,6 +126,20 @@ in
|
||||
# TODO system.switch.enable = false;?
|
||||
system.disableInstallerTools = true;
|
||||
|
||||
# Allow the system derivation to be substituted, so that
|
||||
# users are less likely to run into a state where they need
|
||||
# the builder running to build the builder if they just want
|
||||
# to make a tweak that only affects the macOS side of things,
|
||||
# like changing the QEMU args.
|
||||
#
|
||||
# TODO(winter): Move to qemu-vm? Trying it here for now as a
|
||||
# low impact change that'll probably improve people's experience.
|
||||
#
|
||||
# (I have no clue what is going on in https://github.com/nix-darwin/nix-darwin/issues/1081
|
||||
# though, as this fix would only apply to one person in that thread... hopefully someone
|
||||
# comes across with a reproducer if this doesn't do it.)
|
||||
system.systemBuilderArgs.allowSubstitutes = true;
|
||||
|
||||
nix.settings = {
|
||||
min-free = cfg.min-free;
|
||||
|
||||
|
||||
@@ -358,12 +358,13 @@ in
|
||||
|
||||
system = {
|
||||
boot.loader.id = "limine";
|
||||
build.installBootLoader = pkgs.substituteAll {
|
||||
build.installBootLoader = pkgs.replaceVarsWith {
|
||||
src = ./limine-install.py;
|
||||
isExecutable = true;
|
||||
|
||||
python3 = pkgs.python3.withPackages (python-packages: [ python-packages.psutil ]);
|
||||
configPath = limineInstallConfig;
|
||||
replacements = {
|
||||
python3 = pkgs.python3.withPackages (python-packages: [ python-packages.psutil ]);
|
||||
configPath = limineInstallConfig;
|
||||
};
|
||||
};
|
||||
};
|
||||
})
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
where = "/run/nixos-etc-metadata";
|
||||
what = "/etc-metadata-image";
|
||||
type = "erofs";
|
||||
options = "loop,ro";
|
||||
options = "loop,ro,nodev,nosuid";
|
||||
unitConfig = {
|
||||
# Since this unit depends on the nix store being mounted, it cannot
|
||||
# be a dependency of local-fs.target, because if it did, we'd have
|
||||
@@ -81,6 +81,8 @@
|
||||
type = "overlay";
|
||||
options = lib.concatStringsSep "," (
|
||||
[
|
||||
"nodev"
|
||||
"nosuid"
|
||||
"relatime"
|
||||
"redirect_dir=on"
|
||||
"metacopy=on"
|
||||
|
||||
@@ -283,23 +283,23 @@ in
|
||||
''}
|
||||
|
||||
tmpMetadataMount=$(TMPDIR="/run" mktemp --directory -t nixos-etc-metadata.XXXXXXXXXX)
|
||||
mount --type erofs -o ro ${config.system.build.etcMetadataImage} $tmpMetadataMount
|
||||
mount --type erofs --options ro,nodev,nosuid ${config.system.build.etcMetadataImage} $tmpMetadataMount
|
||||
|
||||
# There was no previous /etc mounted. This happens when we're called
|
||||
# directly without an initrd, like with nixos-enter.
|
||||
if ! mountpoint -q /etc; then
|
||||
mount --type overlay overlay \
|
||||
--options lowerdir=$tmpMetadataMount::${config.system.build.etcBasedir},${etcOverlayOptions} \
|
||||
/etc
|
||||
mount --type overlay \
|
||||
--options nodev,nosuid,lowerdir=$tmpMetadataMount::${config.system.build.etcBasedir},${etcOverlayOptions} \
|
||||
overlay /etc
|
||||
else
|
||||
# Mount the new /etc overlay to a temporary private mount.
|
||||
# This needs the indirection via a private bind mount because you
|
||||
# cannot move shared mounts.
|
||||
tmpEtcMount=$(TMPDIR="/run" mktemp --directory -t nixos-etc.XXXXXXXXXX)
|
||||
mount --bind --make-private $tmpEtcMount $tmpEtcMount
|
||||
mount --type overlay overlay \
|
||||
--options lowerdir=$tmpMetadataMount::${config.system.build.etcBasedir},${etcOverlayOptions} \
|
||||
$tmpEtcMount
|
||||
mount --type overlay \
|
||||
--options nodev,nosuid,lowerdir=$tmpMetadataMount::${config.system.build.etcBasedir},${etcOverlayOptions} \
|
||||
overlay $tmpEtcMount
|
||||
|
||||
# Before moving the new /etc overlay under the old /etc, we have to
|
||||
# move mounts on top of /etc to the new /etc mountpoint.
|
||||
|
||||
@@ -75,10 +75,25 @@ in
|
||||
environment.systemPackages = [ cfg.package ] ++ cfg.extraPackages;
|
||||
services.printing.drivers = [ cfg.package ];
|
||||
|
||||
environment.etc."vmware/config".text = ''
|
||||
${builtins.readFile "${cfg.package}/etc/vmware/config"}
|
||||
${cfg.extraConfig}
|
||||
'';
|
||||
environment.etc."vmware/config".source =
|
||||
let
|
||||
packageConfig = "${cfg.package}/etc/vmware/config";
|
||||
in
|
||||
if cfg.extraConfig == "" then
|
||||
packageConfig
|
||||
else
|
||||
pkgs.runCommandLocal "etc-vmware-config"
|
||||
{
|
||||
inherit packageConfig;
|
||||
inherit (cfg) extraConfig;
|
||||
}
|
||||
''
|
||||
(
|
||||
cat "$packageConfig"
|
||||
printf "\n"
|
||||
echo "$extraConfig"
|
||||
) >"$out"
|
||||
'';
|
||||
|
||||
environment.etc."vmware/bootstrap".source = "${cfg.package}/etc/vmware/bootstrap";
|
||||
environment.etc."vmware/icu".source = "${cfg.package}/etc/vmware/icu";
|
||||
|
||||
@@ -19,6 +19,9 @@
|
||||
We do that by creating a trusted CA and issuing a cert that includes
|
||||
all of the test domains as subject-alternative names and then spoofs the
|
||||
hostnames in /etc/hosts.
|
||||
- We started skipping the test_http2_headers test due to log format differences
|
||||
between the nghttpd2 version in nixpkgs and the outdated one curl-impersonate
|
||||
uses upstream for its tests.
|
||||
*/
|
||||
|
||||
import ./make-test-python.nix (
|
||||
@@ -125,7 +128,7 @@ import ./make-test-python.nix (
|
||||
|
||||
# Run tests
|
||||
cd tests
|
||||
pytest . --install-dir ../usr --capture-interface eth1
|
||||
pytest . --install-dir ../usr --capture-interface eth1 --exitfirst -k 'not test_http2_headers'
|
||||
'';
|
||||
in
|
||||
{
|
||||
|
||||
@@ -36,6 +36,17 @@ let
|
||||
from selenium.webdriver.firefox.options import Options
|
||||
from selenium.webdriver.support.ui import WebDriverWait
|
||||
from selenium.webdriver.support import expected_conditions as EC
|
||||
from selenium.common.exceptions import ElementClickInterceptedException
|
||||
|
||||
|
||||
def click_when_unobstructed(mark):
|
||||
while True:
|
||||
try:
|
||||
wait.until(EC.element_to_be_clickable(mark)).click()
|
||||
break
|
||||
except ElementClickInterceptedException:
|
||||
continue
|
||||
|
||||
|
||||
options = Options()
|
||||
options.add_argument('--headless')
|
||||
@@ -74,7 +85,7 @@ let
|
||||
)
|
||||
driver.find_element(By.XPATH, "//button[contains(., 'Log in with master password')]").click()
|
||||
|
||||
wait.until(EC.presence_of_element_located((By.CSS_SELECTOR, 'button#newItemDropdown'))).click()
|
||||
click_when_unobstructed((By.CSS_SELECTOR, 'button#newItemDropdown'))
|
||||
driver.find_element(By.XPATH, "//button[contains(., 'Item')]").click()
|
||||
|
||||
driver.find_element(By.CSS_SELECTOR, 'input#name').send_keys(
|
||||
@@ -178,6 +189,8 @@ let
|
||||
testScript
|
||||
else
|
||||
''
|
||||
import json
|
||||
|
||||
start_all()
|
||||
server.wait_for_unit("vaultwarden.service")
|
||||
server.wait_for_open_port(8080)
|
||||
@@ -202,11 +215,9 @@ let
|
||||
client.succeed(f"bw --nointeraction --raw --session {key} sync -f")
|
||||
|
||||
with subtest("get the password with the cli"):
|
||||
password = client.wait_until_succeeds(
|
||||
f"bw --nointeraction --raw --session {key} list items | ${pkgs.jq}/bin/jq -r .[].login.password",
|
||||
timeout=60
|
||||
)
|
||||
assert password.strip() == "${storedPassword}"
|
||||
output = json.loads(client.succeed(f"bw --nointeraction --raw --session {key} list items"))
|
||||
|
||||
assert output[0]['login']['password'] == "${storedPassword}"
|
||||
|
||||
with subtest("Check systemd unit hardening"):
|
||||
server.log(server.succeed("systemd-analyze security vaultwarden.service | grep -v ✓"))
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -302,7 +302,9 @@ in
|
||||
"blink-cmp-npm.utils.compute_meta_spec"
|
||||
"blink-cmp-npm.utils.generate_doc_spec"
|
||||
"blink-cmp-npm.utils.ignore_version_spec"
|
||||
"blink-cmp-npm.utils.is_cursor_in_dependencies_node_spec"
|
||||
"blink-cmp-npm.utils.semantic_sort_spec"
|
||||
"minit"
|
||||
];
|
||||
};
|
||||
|
||||
@@ -620,9 +622,10 @@ in
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
nvimSkipModules = [
|
||||
# Optional provider dependencies
|
||||
"codecompanion.providers.diff.mini_diff"
|
||||
"codecompanion.providers.actions.telescope"
|
||||
"codecompanion.providers.actions.mini_pick"
|
||||
"codecompanion.providers.actions.snacks"
|
||||
"codecompanion.providers.actions.telescope"
|
||||
"codecompanion.providers.diff.mini_diff"
|
||||
# Requires setup call
|
||||
"codecompanion.actions.static"
|
||||
"codecompanion.actions.init"
|
||||
@@ -1088,6 +1091,12 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
ecolog-nvim = super.ecolog-nvim.overrideAttrs {
|
||||
nvimSkipModules = [
|
||||
"repro"
|
||||
];
|
||||
};
|
||||
|
||||
efmls-configs-nvim = super.efmls-configs-nvim.overrideAttrs {
|
||||
dependencies = [ self.nvim-lspconfig ];
|
||||
};
|
||||
@@ -1505,6 +1514,10 @@ in
|
||||
substituteInPlace lua/kulala/config/defaults.lua \
|
||||
--replace-fail 'curl_path = "curl"' 'curl_path = "${lib.getExe curl}"'
|
||||
'';
|
||||
nvimSkipModules = [
|
||||
# Requires some extra work to get CLI working in nixpkgs
|
||||
"cli.kulala_cli"
|
||||
];
|
||||
};
|
||||
|
||||
LazyVim = super.LazyVim.overrideAttrs {
|
||||
@@ -3946,6 +3959,20 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
yaml-companion-nvim = super.yaml-companion-nvim.overrideAttrs {
|
||||
dependencies = [
|
||||
self.nvim-lspconfig
|
||||
self.plenary-nvim
|
||||
];
|
||||
};
|
||||
|
||||
yaml-schema-detect-nvim = super.yaml-schema-detect-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
plenary-nvim
|
||||
nvim-lspconfig
|
||||
];
|
||||
};
|
||||
|
||||
yanky-nvim = super.yanky-nvim.overrideAttrs {
|
||||
nvimSkipModules = [
|
||||
# Optional telescope integration
|
||||
|
||||
@@ -583,7 +583,7 @@ https://github.com/tadmccorkle/markdown.nvim/,HEAD,
|
||||
https://github.com/David-Kunz/markid/,HEAD,
|
||||
https://github.com/chentoast/marks.nvim/,,
|
||||
https://github.com/OXY2DEV/markview.nvim/,HEAD,
|
||||
https://github.com/williamboman/mason-lspconfig.nvim/,HEAD,
|
||||
https://github.com/mason-org/mason-lspconfig.nvim/,HEAD,
|
||||
https://github.com/jay-babu/mason-null-ls.nvim/,HEAD,
|
||||
https://github.com/jay-babu/mason-nvim-dap.nvim/,HEAD,
|
||||
https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/,HEAD,
|
||||
@@ -1652,6 +1652,8 @@ https://github.com/piersolenski/wtf.nvim/,HEAD,
|
||||
https://github.com/Mythos-404/xmake.nvim/,HEAD,
|
||||
https://github.com/drmingdrmer/xptemplate/,,
|
||||
https://github.com/guns/xterm-color-table.vim/,,
|
||||
https://github.com/someone-stole-my-name/yaml-companion.nvim/,HEAD,
|
||||
https://github.com/cwrau/yaml-schema-detect.nvim/,HEAD,
|
||||
https://github.com/gbprod/yanky.nvim/,HEAD,
|
||||
https://github.com/HerringtonDarkholme/yats.vim/,,
|
||||
https://github.com/mikavilpas/yazi.nvim/,HEAD,
|
||||
|
||||
@@ -17,6 +17,7 @@ stdenv.mkDerivation {
|
||||
inherit version;
|
||||
meta = metaCommon // {
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "trilium-server";
|
||||
};
|
||||
|
||||
src = fetchurl serverSource;
|
||||
@@ -50,6 +51,12 @@ stdenv.mkDerivation {
|
||||
exec ./node/bin/node src/www
|
||||
EOF
|
||||
chmod a+x $out/bin/trilium-server
|
||||
|
||||
# ERROR: noBrokenSymlinks: found 4 dangling symlinks, 0 reflexive symlinks and 0 unreadable symlinks
|
||||
unlink $out/share/trilium-server/node/bin/npx
|
||||
unlink $out/share/trilium-server/node/bin/npm
|
||||
unlink $out/share/trilium-server/node_modules/.bin/electron
|
||||
unlink $out/share/trilium-server/node_modules/.bin/electron-installer-debian
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
|
||||
@@ -43,13 +43,13 @@ let
|
||||
in
|
||||
buildPerlModule rec {
|
||||
pname = "pipe-viewer";
|
||||
version = "0.5.5";
|
||||
version = "0.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trizen";
|
||||
repo = "pipe-viewer";
|
||||
rev = version;
|
||||
hash = "sha256-NVUZn02rBhOQyIfBp/BArbL2YY19TuDTwfiQH2pEWzk=";
|
||||
hash = "sha256-ZcO07zDMXSFOWIC0XHqeqjgPJXzWWh8G2szTkvF8OjM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ] ++ lib.optionals withGtk3 [ wrapGAppsHook3 ];
|
||||
|
||||
@@ -7,17 +7,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "aardvark-dns";
|
||||
version = "1.14.0";
|
||||
version = "1.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "aardvark-dns";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mWaB1E/n/N2Tb5bqrMJX2XfPvZBCG+dxar3kGCHgv0I=";
|
||||
hash = "sha256-drDu+YaqlylDRJHs6ctbDvhaec3UqQ+0GsUeHfhY4Zg=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-t9qfPz4Jy1RueiDEY2fB3Y1uty0i/Wf0ElsR+nSVF5g=";
|
||||
cargoHash = "sha256-YUgaXx/+rZrTtscQIg3bkIp4L1bnjmSiudrim+ZXa64=";
|
||||
|
||||
passthru.tests = { inherit (nixosTests) podman; };
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
"owner": "advplyr",
|
||||
"repo": "audiobookshelf",
|
||||
"rev": "fd84cd0d7f647705a49f300b9bdb940f9725e1a7",
|
||||
"hash": "sha256-+e8CaJaDuYsj48nF98uLf9dSeXGWEDvNy5myQ9x2Yug=",
|
||||
"version": "2.21.0",
|
||||
"depsHash": "sha256-AwY4TrIm5jR7lu/l9RyOzwX4N31Q8x+WKeIbxW4+g8s=",
|
||||
"clientDepsHash": "sha256-rQT0l7Gs5xwDaP+5rhX2nUGBk5jaUMo0JR0Emo87ie4="
|
||||
"rev": "077273033657da2345494084dc7a1f399cc1a7ba",
|
||||
"hash": "sha256-6ygJrB7AvOyRLgDrkz/qLXiJXP+0U7uhi1HqZP62+gU=",
|
||||
"version": "2.23.0",
|
||||
"depsHash": "sha256-3ANieZvWxLVDiIZ1oGSB3UQgApZvukXN5OokyUnFyzg=",
|
||||
"clientDepsHash": "sha256-WiMQZwPFo5qTo4kTWZ+LuLKDEorediQ+GhUxAO+nRCc="
|
||||
}
|
||||
|
||||
@@ -27,11 +27,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bind";
|
||||
version = "9.20.7";
|
||||
version = "9.20.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-QzI8jSLSFEKCw3tAYOwR6Ywkg14iVoiHb60IunuV3KY=";
|
||||
hash = "sha256-MATZnEdr6rSamGwtSfkC4s13ZsmrGLJh6LNTyr86BLU=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "candy-icons";
|
||||
version = "0-unstable-2025-04-23";
|
||||
version = "0-unstable-2025-05-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = "candy-icons";
|
||||
rev = "1763fc1f476e6c2ba7ca8df878645815b808ebca";
|
||||
hash = "sha256-aXAtVtsJC9MdkhUJWZnOQteaR005+KnPxFrEepfomCk=";
|
||||
rev = "47abaeba8de75a1805b10f4fc8d698c6e8c614c9";
|
||||
hash = "sha256-COC926EPA7w1eUnXq40iFuANUF3Rch83e/BekBsHNFo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
||||
@@ -5,19 +5,23 @@
|
||||
protobuf,
|
||||
versionCheckHook,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "clash-rs";
|
||||
version = "0.7.5";
|
||||
version = "0.7.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Watfaq";
|
||||
repo = "clash-rs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-c4XF0F2ifTvbXTMGiJc1EaGTlS/X5ilZTpXe01uHs4Y=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-x89sFBQ6bAIHvaRTCxqKKgFKo7PpquVze0R6VicwrJw=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-ZSwNlknpZ0zKj+sklmO14Ey5DPZ0Wk9xxMiXwIiuRd0=";
|
||||
cargoHash = "sha256-jfc0Rmt9eEN3ds5Rakj+IcJcUa28CbhiSu4AfqHurf0=";
|
||||
|
||||
patches = [
|
||||
./unbounded-shifts.patch
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
protobuf
|
||||
@@ -53,4 +57,4 @@ rustPlatform.buildRustPackage rec {
|
||||
maintainers = with lib.maintainers; [ aaronjheng ];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/clash_lib/src/lib.rs b/clash_lib/src/lib.rs
|
||||
index 6ada034..420e465 100644
|
||||
--- a/clash_lib/src/lib.rs
|
||||
+++ b/clash_lib/src/lib.rs
|
||||
@@ -2,7 +2,7 @@
|
||||
#![feature(ip)]
|
||||
#![feature(sync_unsafe_cell)]
|
||||
#![feature(let_chains)]
|
||||
-#![cfg_attr(not(version("1.86.0")), feature(unbounded_shifts))]
|
||||
+#![feature(unbounded_shifts)]
|
||||
|
||||
#[macro_use]
|
||||
extern crate anyhow;
|
||||
@@ -15,21 +15,21 @@ let
|
||||
|
||||
channels = {
|
||||
stable = {
|
||||
version = "2.19.1";
|
||||
version = "2.20.3";
|
||||
hash = {
|
||||
x86_64-linux = "sha256-w8yET4jpuNn/DswFlJ8QpKS5YjI9gs0OTmQ0D1f5JZE=";
|
||||
x86_64-darwin = "sha256-2ttVjvemACsRLoRE7wMmgsUUDM2AFNo5lXG1kCL8Ae8=";
|
||||
aarch64-linux = "sha256-8BJrMj0s2MzgCueWlWsGKntEkBwW7rBYZF+5O3lVLN0=";
|
||||
aarch64-darwin = "sha256-9v0OzQMGq92lNKsOevpE1jjwto+ETgfmVmK5p+JdVBI=";
|
||||
x86_64-linux = "sha256-+s/xoiN7LYIMZU8n0pT3Zx6c48t+WYbWIAG73D1MkNE=";
|
||||
x86_64-darwin = "sha256-3T/Szjcfiau5k4fixz33jQDYQj+bmWxh6lztY+S+BKg=";
|
||||
aarch64-linux = "sha256-XJt22ZbSVRKyA3+VLh+hcy3hPSPg1witUahj6cLLshg=";
|
||||
aarch64-darwin = "sha256-v6efJ41ayxe/YaaM2g0KOo+Dk4jf+xbeLuLj4o09vKY=";
|
||||
};
|
||||
};
|
||||
mainline = {
|
||||
version = "2.20.0";
|
||||
version = "2.21.3";
|
||||
hash = {
|
||||
x86_64-linux = "sha256-Vk2Qhk4eNf9Akwza0QNuAc/lh2BtU0sd6QSS2IIyZo4=";
|
||||
x86_64-darwin = "sha256-TVQYQOqJj9gnTt5HaVVjyr7sBPD3mAPpy5vNw9RJ7dc=";
|
||||
aarch64-linux = "sha256-hBp7lVaJk30KD8eQ4ehoI1/DW28SWQisGtY4lJNVETw=";
|
||||
aarch64-darwin = "sha256-pvFZELrXk1bf5nfbDskY3bpSCv22Ls0Leo11Dgu/dfI=";
|
||||
x86_64-linux = "sha256-n5RBXjjjUfgo1xYT1atiI3M65/kQJNHkQ8q0jPifRFg=";
|
||||
x86_64-darwin = "sha256-xajUFNvv/r0ZqT1zkCwthXFWoxnP3oqcBuSap0DJ9og=";
|
||||
aarch64-linux = "sha256-ICIwkyu4lVXlsDzd0urvdw7u98PLPClnZn27qBMz4gs=";
|
||||
aarch64-darwin = "sha256-hFu3Q2jbxAIfLbatV4lh6Rn7B5kX4QnO24meMiouAk8=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -11,24 +11,24 @@
|
||||
}:
|
||||
|
||||
let
|
||||
embedded-protocol-version = "3.1.0";
|
||||
embedded-protocol-version = "3.2.0";
|
||||
|
||||
embedded-protocol = fetchFromGitHub {
|
||||
owner = "sass";
|
||||
repo = "sass";
|
||||
rev = "refs/tags/embedded-protocol-${embedded-protocol-version}";
|
||||
hash = "sha256-DBoGACNhc9JMT8D+dO50aKUitY8xx/3IGj/XntFts1w=";
|
||||
hash = "sha256-yX30i1gbVZalVhefj9c37mpFOIDaQlsLeAh7UnY56ro=";
|
||||
};
|
||||
in
|
||||
buildDartApplication rec {
|
||||
pname = "dart-sass";
|
||||
version = "1.87.0";
|
||||
version = "1.89.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sass";
|
||||
repo = "dart-sass";
|
||||
rev = version;
|
||||
hash = "sha256-orFmX5I5j8Ds0zTQ0HLEd0LOw433Age2LOl9of/ggKI=";
|
||||
hash = "sha256-ydKkZlpjshIf8/Q1ufUFHWmJGonYPtzMiXn4VxDgHDo=";
|
||||
};
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
@@ -14,11 +14,11 @@
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "analyzer",
|
||||
"sha256": "13c1e6c6fd460522ea840abec3f677cc226f5fec7872c04ad7b425517ccf54f7",
|
||||
"sha256": "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "7.4.4"
|
||||
"version": "7.4.5"
|
||||
},
|
||||
"archive": {
|
||||
"dependency": "direct dev",
|
||||
@@ -144,11 +144,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "coverage",
|
||||
"sha256": "9086475ef2da7102a0c0a4e37e1e30707e7fb7b6d28c209f559a9c5f8ce42016",
|
||||
"sha256": "802bd084fb82e55df091ec8ad1553a7331b61c08251eef19a508b6f3f3a9858d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.12.0"
|
||||
"version": "1.13.1"
|
||||
},
|
||||
"crypto": {
|
||||
"dependency": "direct dev",
|
||||
@@ -254,21 +254,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "html",
|
||||
"sha256": "9475be233c437f0e3637af55e7702cbbe5c23a68bd56e8a5fa2d426297b7c6c8",
|
||||
"sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.15.5+1"
|
||||
"version": "0.15.6"
|
||||
},
|
||||
"http": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "http",
|
||||
"sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f",
|
||||
"sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.3.0"
|
||||
"version": "1.4.0"
|
||||
},
|
||||
"http_multi_server": {
|
||||
"dependency": "transitive",
|
||||
@@ -364,11 +364,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "meta",
|
||||
"sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
|
||||
"sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.16.0"
|
||||
"version": "1.17.0"
|
||||
},
|
||||
"mime": {
|
||||
"dependency": "transitive",
|
||||
@@ -474,21 +474,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "protobuf",
|
||||
"sha256": "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d",
|
||||
"sha256": "fbb0c37d435641d0b84813c1dad41e6fa61ddc880a320bce16b3063ecec35aa6",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.1.0"
|
||||
"version": "4.0.0"
|
||||
},
|
||||
"protoc_plugin": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "protoc_plugin",
|
||||
"sha256": "fb0554851c9eca30bd18405fbbfe81e39166d4a2f0e5b770606fd69da3da0b2f",
|
||||
"sha256": "cb2c7ec4ca331a8b1b3042200d1fe329f989450c8d380b45565b21ae3f7f5ce9",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "21.1.2"
|
||||
"version": "22.1.0"
|
||||
},
|
||||
"pub_api_client": {
|
||||
"dependency": "direct dev",
|
||||
@@ -654,31 +654,31 @@
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "test",
|
||||
"sha256": "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e",
|
||||
"sha256": "f1665eeffe3b6b193548b5f515e8d1b54ccd9a6e0e7721a417e134e7ed7f06a1",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.25.15"
|
||||
"version": "1.26.0"
|
||||
},
|
||||
"test_api": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "test_api",
|
||||
"sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
|
||||
"sha256": "6c7653816b1c938e121b69ff63a33c9dc68102b65a5fb0a5c0f9786256ed33e6",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.7.4"
|
||||
"version": "0.7.5"
|
||||
},
|
||||
"test_core": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "test_core",
|
||||
"sha256": "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa",
|
||||
"sha256": "3caa7c3956b366643b2dedecff764cc32030317b2a15252aed845570df6bcc0f",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.6.8"
|
||||
"version": "0.6.9"
|
||||
},
|
||||
"test_descriptor": {
|
||||
"dependency": "direct dev",
|
||||
@@ -754,11 +754,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "web_socket",
|
||||
"sha256": "bfe6f435f6ec49cb6c01da1e275ae4228719e59a6b067048c51e72d9d63bcc4b",
|
||||
"sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.0.0"
|
||||
"version": "1.0.1"
|
||||
},
|
||||
"web_socket_channel": {
|
||||
"dependency": "transitive",
|
||||
|
||||
Generated
+1875
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,45 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
pkg-config,
|
||||
openssl,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "degit-rs";
|
||||
version = "0.1.2-unstable-2021-09-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "psnszsn";
|
||||
repo = "degit-rs";
|
||||
rev = "c7dbeb75131510a79400838e081b90665c654c80";
|
||||
hash = "sha256-swyfKnYQ+I4elnDnJ0yPDUryiFXEVnrGt9xHWiEe6wo=";
|
||||
};
|
||||
|
||||
# The source repo doesn't provide a Cargo.lock file, so we need to create one
|
||||
postPatch = ''
|
||||
ln -s ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
|
||||
cargoHash = "sha256-bUoZsXU7iWK7MZ/hXk1JNUX1hN88lrU1mc1rrYuiCYs=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
# The test suite is not working for it requires a network connection,
|
||||
# so we disable it
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Rust rewrite of degit";
|
||||
homepage = "https://github.com/psnszsn/degit-rs";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "degit";
|
||||
maintainers = with lib.maintainers; [ chillcicada ];
|
||||
};
|
||||
}
|
||||
@@ -14,31 +14,21 @@
|
||||
ladspaH,
|
||||
libtool,
|
||||
libpulseaudio,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dsp";
|
||||
version = "1.9";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bmc0";
|
||||
repo = "dsp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-S1pzVQ/ceNsx0vGmzdDWw2TjPVLiRgzR4edFblWsekY=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WUH4+5v1wv6EXTOuRq9iVVZsXMt5DVrtgX8vLE7a8s8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
patches = [
|
||||
# fix compatibility with ffmpeg7
|
||||
# https://github.com/bmc0/dsp/commit/58a9d0c1f99f2d4c7fc51b6dbe563447ec60120f
|
||||
(fetchpatch {
|
||||
url = "https://github.com/bmc0/dsp/commit/58a9d0c1f99f2d4c7fc51b6dbe563447ec60120f.patch?full_index=1";
|
||||
hash = "sha256-7WgJegDL9sVCRnRwm/f1ZZl2eiuRT5oAQaYoDLjEoqs=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fftw
|
||||
zita-convolver
|
||||
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "freref";
|
||||
repo = "fancy-cat";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ziHtPfK9GOxKF800kk+kh12Fwh91xbjDYx9wv2pLZWI=";
|
||||
hash = "sha256-Wasxhsv4QhGscOEsGirabsq92963S8v1vOBWvAFuRoM=";
|
||||
};
|
||||
|
||||
patches = [ ./0001-changes.patch ];
|
||||
@@ -50,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
broken = true; # build phase wants to fetch from github
|
||||
description = "PDF viewer for terminals using the Kitty image protocol";
|
||||
homepage = "https://github.com/freref/fancy-cat";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
|
||||
@@ -6,18 +6,18 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "flutter_rust_bridge_codegen";
|
||||
version = "2.9.0";
|
||||
version = "2.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fzyzcjy";
|
||||
repo = "flutter_rust_bridge";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pvKCiv7hUgetTXXp+NCs04Qo9xWaLUE2T1yHENhTGl4=";
|
||||
hash = "sha256-ReJmS8cfsWCD/wFEpZ+EJBFGMOQZE/zzlOYOk74UCfQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-efMA8VJaQlqClAmjJ3zIYLUfnuj62vEIBKsz0l3CWxA=";
|
||||
cargoHash = "sha256-6HVpETMnhL5gdIls46IdSkTxvJibvfiiPa6l/2GJy7k=";
|
||||
cargoBuildFlags = "--package flutter_rust_bridge_codegen";
|
||||
cargoTestFlags = "--package flutter_rust_bridge_codegen";
|
||||
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gat";
|
||||
version = "0.23.1";
|
||||
version = "0.23.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "koki-develop";
|
||||
repo = "gat";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-qodrMfAmrsreqBxzOp1ih41LiYqu9YEkIs75dYqgJug=";
|
||||
hash = "sha256-vJREExCJ+JvPYxNeJWQ6A4LRB2viEisnXrRM6yDGOc4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-x8vQsCGcVQdlASiPTnImJMAa7pG473Cjs8SVAgaE7S0=";
|
||||
vendorHash = "sha256-yGTzDlu9l1Vfnt9Za4Axh7nFWe5CmW2kqssa+51bA3w=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
{
|
||||
lib,
|
||||
fetchCrate,
|
||||
rustPlatform,
|
||||
openssl,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "geoclock";
|
||||
version = "1.0.0";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
src = fetchCrate {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-s23e9shdEnCnyr/LI0MioTW3vkoDZPIwWwJhyFUO7o4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-7mApZj3Ksy8Av0W+0+UZQCkH281bSBd4xo8/7JowmHs=";
|
||||
cargoDepsName = finalAttrs.pname;
|
||||
|
||||
meta = {
|
||||
description = "Displays time as calculated by your longitude";
|
||||
homepage = "https://github.com/FGRCL/geoclock";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.fgrcl ];
|
||||
};
|
||||
})
|
||||
@@ -2,19 +2,18 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
testers,
|
||||
gojq,
|
||||
installShellFiles,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gojq";
|
||||
version = "0.12.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "itchyny";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
repo = "gojq";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-zJkeghN3btF/fZZeuClHV1ndB/2tTTMljEukMYe7UWU=";
|
||||
};
|
||||
|
||||
@@ -31,16 +30,25 @@ buildGoModule rec {
|
||||
installShellCompletion --cmd gojq --zsh _gojq
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = gojq;
|
||||
};
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgramArg = "--version";
|
||||
postInstallCheck = ''
|
||||
$out/bin/gojq --help > /dev/null
|
||||
$out/bin/gojq --raw-output '.values[1]' <<< '{"values":["hello","world"]}' | grep '^world$' > /dev/null
|
||||
'';
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Pure Go implementation of jq";
|
||||
homepage = "https://github.com/itchyny/gojq";
|
||||
changelog = "https://github.com/itchyny/gojq/blob/v${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/itchyny/gojq/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ aaronjheng ];
|
||||
maintainers = with lib.maintainers; [
|
||||
xiaoxiangmoe
|
||||
aaronjheng
|
||||
];
|
||||
mainProgram = "gojq";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gotify-server";
|
||||
version = "2.6.1";
|
||||
version = "2.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gotify";
|
||||
repo = "server";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6PmJnRBovyufrSB+uMbU+bqhZb1bEs39MxBVMnnE6f8=";
|
||||
hash = "sha256-9vIReA29dWf3QwUYEW8JhzF9o74JZqG4zGobgI+gIWE=";
|
||||
};
|
||||
|
||||
# With `allowGoReference = true;`, `buildGoModule` adds the `-trimpath`
|
||||
@@ -25,7 +25,7 @@ buildGoModule rec {
|
||||
# server[780]: stat /var/lib/private/ui/build/index.html: no such file or directory
|
||||
allowGoReference = true;
|
||||
|
||||
vendorHash = "sha256-aru1Q3esLtyxV6CVup4qjsuaJlM5DuLuP8El4RYoVVE=";
|
||||
vendorHash = "sha256-rs6EfnJT6Jgif2TR5u5Tp5/Ozn+4uhSapksyKFnQiCo=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -68,13 +68,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
|
||||
stdenvNoCC.mkDerivation
|
||||
{
|
||||
inherit pname;
|
||||
version = "0-unstable-2024-11-06";
|
||||
version = "0-unstable-2025-04-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Fausto-Korpsvart";
|
||||
repo = "Gruvbox-GTK-Theme";
|
||||
rev = "d064cd480a1e4802851b35bf051e48c808802c2a";
|
||||
hash = "sha256-LOizbRbPj3X0B0bED6fRcwxYeRFY8vtLk0i64pqyIyY=";
|
||||
rev = "fbced4ba03975dadd1d74d6b73cccdcbbd5e8b90";
|
||||
hash = "sha256-zhY3uwvtHNKNrdWiD5Le/AMz1lgV39K/RNhFGnIMpzg=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
|
||||
|
||||
@@ -11,8 +11,8 @@ rustPlatform.buildRustPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "0xfalafel";
|
||||
repo = "hextazy";
|
||||
rev = "${version}";
|
||||
hash = "sha256-EdcUAYT/3mvoak+6HIV6z0jvFTyjuS7WpT2kivQKpyg=";
|
||||
tag = version;
|
||||
hash = "sha256-6G0mD55BLMfqpgz1wtQBsAfGKlRcVEYJAPQJ3z8Yxnw=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jailer";
|
||||
version = "16.6.1";
|
||||
version = "16.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Wisser";
|
||||
repo = "Jailer";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HyhozW8lMsC/LxExKfxG64L6ZKKqrgYQ8PX0606B6O0=";
|
||||
hash = "sha256-CeehX+btGexbFFD3p+FVmzXpH0bVWMW9Qdu5q6MJ5lw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -17,17 +17,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jay";
|
||||
version = "1.9.1";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mahkoh";
|
||||
repo = "jay";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dUp3QYno2rB3wuJmSvBpCqowSpfMQIJqUYc0lDVqVPA=";
|
||||
sha256 = "sha256-wrA/UGxhIUMc2T+0/UNKS9iN44pe9ap2l+xL8ZE5jsI=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-ovQxpUrRZAP1lHlsObfbIsgIjgMp+BLf6Ul+mzDVN5o=";
|
||||
cargoHash = "sha256-2LfEktaHB+uIQSWeSFG+v7+7wfkGlDz54m7P4KttPLI=";
|
||||
|
||||
SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib";
|
||||
|
||||
|
||||
@@ -26,10 +26,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
perl
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
lttng-tools
|
||||
libatomic_ops
|
||||
];
|
||||
buildInputs =
|
||||
[
|
||||
libatomic_ops
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
lttng-tools
|
||||
];
|
||||
|
||||
postUnpack = ''
|
||||
for f in "$(find . -type f -name "*.pl")"; do
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "luau-lsp";
|
||||
version = "1.46.0";
|
||||
version = "1.47.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JohnnyMorganz";
|
||||
repo = "luau-lsp";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-UlZ+v202E2daRsV3KBK2WD3NaXcIbhIFL32DZjZ/eus=";
|
||||
hash = "sha256-/LJCLH94Egk7FvsarsMimIyehE3T9tgMz7SK6vf+BDg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -70,13 +70,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
|
||||
stdenvNoCC.mkDerivation
|
||||
{
|
||||
inherit pname;
|
||||
version = "0-unstable-2024-11-06";
|
||||
version = "0-unstable-2025-05-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "D3vil0p3r";
|
||||
repo = "Matrix-GTK-Theme";
|
||||
rev = "a91254e5827f5fb331308ecf893881bc9643f01a";
|
||||
hash = "sha256-XiXKzXzzWcJIfEV8ngczovyjCqH7uX8tToihq66q+jo=";
|
||||
rev = "ef8a4e2e5e2b42c5ac1d649e88e40cba420321ca";
|
||||
hash = "sha256-H/MKwZ5IdRekoCKtw3hHOUke8fKU4hdBLT11Lzn7c7I=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
{
|
||||
"version": "3.141.0",
|
||||
"version": "3.142.0",
|
||||
"assets": {
|
||||
"x86_64-linux": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.141.0/mirrord_linux_x86_64",
|
||||
"hash": "sha256-fiwtZM1gyJZ2HOiDAhAu8f6jHl6hxmHcqyMTSMOCcFo="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.142.0/mirrord_linux_x86_64",
|
||||
"hash": "sha256-XR9zqZLoM2ZNCCMiiIcAfthSg1a9l90Df9IHsod4Oc0="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.141.0/mirrord_linux_aarch64",
|
||||
"hash": "sha256-HD93OHo+vkgkZYxgKMXd/L43o0loA1jAPc8JfwOfZPw="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.142.0/mirrord_linux_aarch64",
|
||||
"hash": "sha256-P4Gt7xBGeDQFP5x7fRX9UzHkKq2ILuMoHfritzI+EiM="
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.141.0/mirrord_mac_universal",
|
||||
"hash": "sha256-vLrUSgYQjPNk5WGEsBKR3E2222n8oP6xVAHf2ZPBIDk="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.142.0/mirrord_mac_universal",
|
||||
"hash": "sha256-Buw+QJ86e9vR1qDKiHUr6u/nlFrLYfUJ3Uu/GCsrm3Q="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.141.0/mirrord_mac_universal",
|
||||
"hash": "sha256-vLrUSgYQjPNk5WGEsBKR3E2222n8oP6xVAHf2ZPBIDk="
|
||||
"url": "https://github.com/metalbear-co/mirrord/releases/download/3.142.0/mirrord_mac_universal",
|
||||
"hash": "sha256-Buw+QJ86e9vR1qDKiHUr6u/nlFrLYfUJ3Uu/GCsrm3Q="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "misconfig-mapper";
|
||||
version = "1.14.2";
|
||||
version = "1.14.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intigriti";
|
||||
repo = "misconfig-mapper";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-7ObDlO/jHUMJdEIFwsFrdSyrbs6I6koNJxQyH6FbhZc=";
|
||||
hash = "sha256-ZYTPXzqQ0jKRjjpw0HFExNWjXBG3xopBhD2SoUEvdIE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-gxURT2S1m7J3bZ0VIYxFFsbxU3za2BgJ/6TONoPGzAw=";
|
||||
vendorHash = "sha256-A+71QaSmF7fzGeqmNOBvlZz5irJGxfO8+pR+1uxsiiU=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
}:
|
||||
buildDotnetModule (finalAttrs: rec {
|
||||
pname = "msbuild-structured-log-viewer";
|
||||
version = "2.2.476";
|
||||
version = "2.2.490";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KirillOsenkov";
|
||||
repo = "MSBuildStructuredLog";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HZhfrU7zPRaJWryEexf5/f3V22k5pdNMlVqDhOUw/UM=";
|
||||
hash = "sha256-VJun6bs47NKj90e/6ZGp66x+MG1R/qxqrn2L1bVkdHY=";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_8_0;
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
diff --git a/config/meson.build b/config/meson.build
|
||||
index 4d750dba..f6bd6e6e 100644
|
||||
--- a/config/meson.build
|
||||
+++ b/config/meson.build
|
||||
@@ -55,15 +55,15 @@ elif host_os in ['linux']
|
||||
cups_libdir = '/usr/lib'
|
||||
endif
|
||||
|
||||
-if have_appletalk and have_cups and cups_libdir != ''
|
||||
- configure_file(
|
||||
- input: 'pap.in',
|
||||
- output: 'pap',
|
||||
- configuration: cdata,
|
||||
- install: true,
|
||||
- install_dir: cups_libdir / 'cups/backend',
|
||||
- )
|
||||
-endif
|
||||
+#if have_appletalk and have_cups and cups_libdir != ''
|
||||
+# configure_file(
|
||||
+# input: 'pap.in',
|
||||
+# output: 'pap',
|
||||
+# configuration: cdata,
|
||||
+# install: true,
|
||||
+# install_dir: cups_libdir / 'cups/backend',
|
||||
+# )
|
||||
+#endif
|
||||
|
||||
foreach file : static_conf_files
|
||||
if (
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/config/meson.build b/config/meson.build
|
||||
index 4d750dba..111389e7 100644
|
||||
--- a/config/meson.build
|
||||
+++ b/config/meson.build
|
||||
@@ -89,7 +89,7 @@ if (
|
||||
)
|
||||
endif
|
||||
|
||||
-install_data('README', install_dir: localstatedir / 'netatalk/CNID')
|
||||
+# install_data('README', install_dir: localstatedir / 'netatalk/CNID')
|
||||
|
||||
if have_pam
|
||||
subdir('pam')
|
||||
@@ -22,25 +22,19 @@
|
||||
openldap,
|
||||
glib,
|
||||
dbus,
|
||||
docbook-xsl-nons,
|
||||
cmark-gfm,
|
||||
iniparser,
|
||||
pandoc,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "netatalk";
|
||||
version = "4.2.0";
|
||||
version = "4.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/netatalk/netatalk/netatalk-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-doqRAU4pjcHRTvKOvjMN2tSZKOPDTzBzU7i90xf1ClI=";
|
||||
hash = "sha256-EKPDpMEazsZX35wzxppiaeMZ26dZxeHfpB7lo/G4DEM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0000-no-install-under-usr-cupsd.patch
|
||||
./0001-no-install-under-var-CNID.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
meson
|
||||
@@ -64,9 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
glib
|
||||
perl
|
||||
dbus
|
||||
docbook-xsl-nons
|
||||
cmark-gfm
|
||||
iniparser
|
||||
pandoc
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
@@ -79,16 +72,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-Dwith-lockfile-path=/run/lock/"
|
||||
"-Dwith-cracklib=true"
|
||||
"-Dwith-cracklib-path=${cracklib.out}"
|
||||
"-Dwith-docbook-path=${docbook-xsl-nons.out}/share/xml/docbook-xsl-nons/"
|
||||
"-Dwith-statedir-creation=false"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Apple Filing Protocol Server";
|
||||
homepage = "https://netatalk.io/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ jcumming ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ jcumming ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -42,6 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ rc-zb ];
|
||||
mainProgram = "newlisp";
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nhost-cli";
|
||||
version = "1.29.6";
|
||||
version = "1.29.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nhost";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-h5M6OZ22/fb6sI536/+n164jHgxQD5Z1ds2dcDj1IjI=";
|
||||
hash = "sha256-CQWPDhHPKo2MYWQnVG07JBMzQLwWwDOWAcOc/3Ovr1M=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -70,13 +70,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
|
||||
stdenvNoCC.mkDerivation
|
||||
{
|
||||
inherit pname;
|
||||
version = "0-unstable-2024-11-06";
|
||||
version = "0-unstable-2025-04-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Fausto-Korpsvart";
|
||||
repo = "Nightfox-GTK-Theme";
|
||||
rev = "d9534b5275eb4bc588890c7bd8b30cf2b535c8e0";
|
||||
hash = "sha256-VVro8kkQisLkTyQVIBDSf55Qfnwb85glWOYWVfJbueI=";
|
||||
rev = "a301759d3650847d14a4c8f4d639f97015eb5b0d";
|
||||
hash = "sha256-dPplS1NKtby/+9L0FtNEKIjLuhlR9KqS+TxwW12sPwc=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "nuclei-templates";
|
||||
version = "10.2.0";
|
||||
version = "10.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "nuclei-templates";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-eOsnyOujOO6q7078XnOUTBgr91SdCGtuc7sFn9UZb70=";
|
||||
hash = "sha256-r2c6mmW/bLUGb8n1zvNJWrxyvSWBfPuTsU7tneeGaVE=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -32,13 +32,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pdi";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pdidev";
|
||||
repo = "pdi";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-eWBbhHBDS2NbY74vbeD/+UDdpam4XiX7loYb1chjryo=";
|
||||
hash = "sha256-Tmn4M+tcnNH6Bm4t5D/VgciOu4dDKKqYkbERKgpHX/Y=";
|
||||
};
|
||||
|
||||
# Current hdf5 version in nixpkgs is 1.14.4.3 which is 4 numbers long and doesn't match the 3 number regex. :')
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pmbootstrap";
|
||||
version = "3.3.2";
|
||||
version = "3.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "postmarketOS";
|
||||
repo = pname;
|
||||
repo = "pmbootstrap";
|
||||
tag = version;
|
||||
hash = "sha256-A/hWJwyx/k9+NNOJBuor2qQi5gRB3Rpp5qnRloFM0FM=";
|
||||
hash = "sha256-vNa0MMU5NHO8RjgfKxNjhQDKQ2Rd/ZGU0HndOD2Sypo=";
|
||||
domain = "gitlab.postmarketos.org";
|
||||
};
|
||||
|
||||
@@ -52,10 +52,16 @@ python3Packages.buildPythonApplication rec {
|
||||
'';
|
||||
|
||||
# skip impure tests
|
||||
disabledTests = [
|
||||
"test_pkgrepo_pmaports"
|
||||
"test_random_valid_deviceinfos"
|
||||
];
|
||||
disabledTests =
|
||||
[
|
||||
"test_pkgrepo_pmaports"
|
||||
"test_random_valid_deviceinfos"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
|
||||
# assert chroot.type == ChrootType.BUILDROOT
|
||||
# AssertionError: assert <ChrootType.NATIVE: 'native'> == <ChrootType.BUILDROOT: 'buildroot'>
|
||||
"test_valid_chroots"
|
||||
];
|
||||
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "presenterm";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfontanini";
|
||||
repo = "presenterm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5eDGoY4Yb27ATgBhNjlee6tSgwAKiLuuDMrL96cBpko=";
|
||||
hash = "sha256-vBEHk0gQe4kUTtH4qtc0jVfDvYGabnkJrwPxmxt10hs=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
];
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-MOX5QWxN7uEnvm9JU9jRW8Z2D2LMle+H1rOmfMxz100=";
|
||||
cargoHash = "sha256-u0wOWKAfzi1Fxmx6x2ckrIv/PKgtqKrDiDauD4/BY24=";
|
||||
|
||||
checkFlags = [
|
||||
# failed to load .tmpEeeeaQ: No such file or directory (os error 2)
|
||||
|
||||
@@ -10,17 +10,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "probe-rs-tools";
|
||||
version = "0.27.0";
|
||||
version = "0.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "probe-rs";
|
||||
repo = "probe-rs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-xtUaGJyzr0uQUb/A+7RmOVVgrXIctr2I9gLPU2/rXso=";
|
||||
hash = "sha256-CCB7NdLSg3Ve/iBSG7TuTbXKnGsevzhnELA2gN3n2t4=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-acGLTbWI0SHspFISWw5Lj+sqn5HE4du5jTC3NS5zzh8=";
|
||||
cargoHash = "sha256-jBkMUaC8aFCP0N8cbYDEJtJtVbagB+YAHge0IT8xm+c=";
|
||||
|
||||
buildAndTestSubdir = pname;
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ buildGoModule (finalAttrs: {
|
||||
owner = "paepckehh";
|
||||
repo = "solaredge_exporter";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Aw6rMXE0jgqdUScQcFplNnpglwl13BRdTEN1gMQJSd0=";
|
||||
hash = "sha256-vo0WaiigwjSEA+wEUs8Wdko+UHq5OXXcVcfgna/QVHE=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
||||
@@ -12,18 +12,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "qdrant";
|
||||
version = "1.13.6";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qdrant";
|
||||
repo = "qdrant";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-l/nWlpV3eecTzFK3MnHzmXGYocxKw+YPsyfHWuE/rwg=";
|
||||
hash = "sha256-o9Nv4UsFgVngKWpe5sUR8tovtpB81tJBSm6We6DN20c=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
|
||||
cargoHash = "sha256-VUUL+oz8nCCNvDohDLfRai+KKd6uG0RLti31mk40wVY=";
|
||||
cargoHash = "sha256-xt7uu+YZGazbKwXEKXeIwcGg8G4djQx7nKpQYFv/L3Y=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
protobuf
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "re-flex";
|
||||
version = "5.2.2";
|
||||
version = "5.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Genivia";
|
||||
repo = "RE-flex";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oLpgY8m0hwLrTVkUwxVW7O7vr4Hl7Bn+uIQwFEVSfvc=";
|
||||
hash = "sha256-BTzKR9C4J9DOszKGtcd+7Tiw+OkohPJuKKjbXZ8wX7k=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
tcl.mkTclDerivation rec {
|
||||
pname = "remind";
|
||||
version = "05.03.06";
|
||||
version = "05.03.07";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.skoll.ca";
|
||||
owner = "Skollsoft-Public";
|
||||
repo = "Remind";
|
||||
rev = version;
|
||||
hash = "sha256-zJmDx9AJntL08uBZEquho2Iud0y7WPZDGef/pSHX2h0=";
|
||||
hash = "sha256-gp6YGDh7gkCk4KFaPBfD72RJLbwGNz8iVAV764bfNe8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = lib.optionals withGui [
|
||||
|
||||
Generated
+56
-98
@@ -13,9 +13,9 @@
|
||||
},
|
||||
{
|
||||
"pname": "ICSharpCode.Decompiler",
|
||||
"version": "8.2.0.7535",
|
||||
"hash": "sha256-4BWs04Va9pc/SLeMA/vKoBydhw+Bu6s9MDtoo/Ucft8=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/icsharpcode.decompiler/8.2.0.7535/icsharpcode.decompiler.8.2.0.7535.nupkg"
|
||||
"version": "9.1.0.7988",
|
||||
"hash": "sha256-zPLgLNO4cCrtN9BR9x6X+W0MNkQ71nADIopOC1VBhAQ=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/icsharpcode.decompiler/9.1.0.7988/icsharpcode.decompiler.9.1.0.7988.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "MessagePack",
|
||||
@@ -41,12 +41,6 @@
|
||||
"hash": "sha256-SQCJa6u8coWMptbR9iQJLjoi/YkT9t0kJNbojh9vUPw=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack.annotations/2.5.187/messagepack.annotations.2.5.187.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace",
|
||||
"version": "9.0.0-preview.25064.4",
|
||||
"hash": "sha256-w6gQZ702lMi2lI/9hIKbeaxW4K42YlDkDnGiD5+cgFo=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.aspnetcore.razor.externalaccess.roslynworkspace/9.0.0-preview.25064.4/microsoft.aspnetcore.razor.externalaccess.roslynworkspace.9.0.0-preview.25064.4.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Bcl.AsyncInterfaces",
|
||||
"version": "9.0.0",
|
||||
@@ -59,6 +53,12 @@
|
||||
"hash": "sha256-gP6ZhEsjjbmw6a477sm7UuOvGFFTxZYfRE2kKxK8jnc=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.bcl.hashcode/1.1.1/microsoft.bcl.hashcode.1.1.1.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Build",
|
||||
"version": "17.11.4",
|
||||
"hash": "sha256-y2qkHCwPbRYZKXwmABQUNhEHHQB/67xSH1zq8fz9olo=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/17.11.4/microsoft.build.17.11.4.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Build",
|
||||
"version": "17.13.9",
|
||||
@@ -72,10 +72,10 @@
|
||||
"url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build/17.3.4/microsoft.build.17.3.4.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Build",
|
||||
"version": "17.7.2",
|
||||
"hash": "sha256-k35nFdPxC8t0zAltVSmAJtsepp/ubNIjPOsJ6k8jSqM=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/17.7.2/microsoft.build.17.7.2.nupkg"
|
||||
"pname": "Microsoft.Build.Framework",
|
||||
"version": "17.11.4",
|
||||
"hash": "sha256-CpRliCQT2v/Xw+TgEvUvFKLVlqYHnhX8NIEY/WaHLSE=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/17.11.4/microsoft.build.framework.17.11.4.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Build.Framework",
|
||||
@@ -89,18 +89,18 @@
|
||||
"hash": "sha256-p2JG7pMBGfDVP6sOzBOqOkImZmwotlGvfS+8BjjVYf8=",
|
||||
"url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build.framework/17.3.4/microsoft.build.framework.17.3.4.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Build.Framework",
|
||||
"version": "17.7.2",
|
||||
"hash": "sha256-fNWmVQYFTJDveAGmxEdNqJRAczV6+Ep8RA8clKBJFqw=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/17.7.2/microsoft.build.framework.17.7.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Build.Locator",
|
||||
"version": "1.6.10",
|
||||
"hash": "sha256-hOFFiQiCNkkDqt0Ad/4Y/sggj4t0zWXmfGjE+I/cqqM=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.locator/1.6.10/microsoft.build.locator.1.6.10.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Build.Tasks.Core",
|
||||
"version": "17.11.4",
|
||||
"hash": "sha256-Y1A6j3uuYVrjM+waJ4/AKNgiGGqZU3Cai3swu8FUtqM=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/17.11.4/microsoft.build.tasks.core.17.11.4.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Build.Tasks.Core",
|
||||
"version": "17.13.9",
|
||||
@@ -114,10 +114,10 @@
|
||||
"url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build.tasks.core/17.3.4/microsoft.build.tasks.core.17.3.4.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Build.Tasks.Core",
|
||||
"version": "17.7.2",
|
||||
"hash": "sha256-OrV/qWgZHzGlNUmaSfX5wDBcmg1aQeF3/OUHpSH+uZU=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/17.7.2/microsoft.build.tasks.core.17.7.2.nupkg"
|
||||
"pname": "Microsoft.Build.Utilities.Core",
|
||||
"version": "17.11.4",
|
||||
"hash": "sha256-1hfIxI2oIHDH1HUotX4l4SFzWerkjoCYSFYUcW0SF5g=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/17.11.4/microsoft.build.utilities.core.17.11.4.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Build.Utilities.Core",
|
||||
@@ -131,30 +131,24 @@
|
||||
"hash": "sha256-SfZxr5xDANnDnC1HCUgho2H9MnF6n51cM47Rrf07fWw=",
|
||||
"url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build.utilities.core/17.3.4/microsoft.build.utilities.core.17.3.4.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Build.Utilities.Core",
|
||||
"version": "17.7.2",
|
||||
"hash": "sha256-oatF0KfuP1nb4+OLNKg2/R/ZLO4EiACaO5leaxMEY4A=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/17.7.2/microsoft.build.utilities.core.17.7.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Analyzers",
|
||||
"version": "3.11.0",
|
||||
"hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzers/3.11.0/microsoft.codeanalysis.analyzers.3.11.0.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.AnalyzerUtilities",
|
||||
"version": "3.3.0",
|
||||
"hash": "sha256-nzFs+H0FFEgZzjl/bcmWyQQVKS2PncS6kMYHOqrxXSw=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzerutilities/3.3.0/microsoft.codeanalysis.analyzerutilities.3.3.0.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
|
||||
"version": "3.11.0-beta1.24081.1",
|
||||
"hash": "sha256-5UN//A8oc2w+UoxAwWmXWRXykQD+2mpa1hbJrAfh2Lg=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/3.11.0-beta1.24081.1/microsoft.codeanalysis.bannedapianalyzers.3.11.0-beta1.24081.1.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Common",
|
||||
"version": "3.11.0",
|
||||
"hash": "sha256-lOW5q1kAAk+Wpweb9TaZ1LztWzAODt9yZKe6SN5rkV8=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.common/3.11.0/microsoft.codeanalysis.common.3.11.0.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Common",
|
||||
"version": "4.1.0",
|
||||
@@ -199,15 +193,15 @@
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.DotNet.Arcade.Sdk",
|
||||
"version": "9.0.0-beta.25164.2",
|
||||
"hash": "sha256-NZ3Isdg/TWeD5oqBtzwZ+k4ouuVAbSevKR1AbFXzxR8=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25164.2/microsoft.dotnet.arcade.sdk.9.0.0-beta.25164.2.nupkg"
|
||||
"version": "9.0.0-beta.25255.5",
|
||||
"hash": "sha256-AgHPYDKvoO3a2zoRSgnokC6XrF521V1lQ9KEPcKyS5E=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25255.5/microsoft.dotnet.arcade.sdk.9.0.0-beta.25255.5.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.DotNet.XliffTasks",
|
||||
"version": "9.0.0-beta.25164.2",
|
||||
"hash": "sha256-1wCqxMI/Xn7HgxyaYP5LcLoXh8GGCM8aj6s8EQJzIyQ=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25164.2/microsoft.dotnet.xlifftasks.9.0.0-beta.25164.2.nupkg"
|
||||
"version": "9.0.0-beta.25255.5",
|
||||
"hash": "sha256-yigTPcb88S+1FUal0K/fL5pu5I/dmPACAo2sPOTDfZk=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25255.5/microsoft.dotnet.xlifftasks.9.0.0-beta.25255.5.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Configuration",
|
||||
@@ -233,12 +227,6 @@
|
||||
"hash": "sha256-dAH52PPlTLn7X+1aI/7npdrDzMEFPMXRv4isV1a+14k=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.dependencyinjection/9.0.0/microsoft.extensions.dependencyinjection.9.0.0.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.dependencyinjection.abstractions/8.0.0/microsoft.extensions.dependencyinjection.abstractions.8.0.0.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
|
||||
"version": "9.0.0",
|
||||
@@ -275,12 +263,6 @@
|
||||
"hash": "sha256-N2t9EUdlS6ippD4Z04qUUyBuQ4tKSR/8TpmKScb5zRw=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging.console/9.0.0/microsoft.extensions.logging.console.9.0.0.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.ObjectPool",
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-FxFr5GC0y6vnp5YD2A2vISXYizAz3k/QyrH7sBXP5kg=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.objectpool/8.0.0/microsoft.extensions.objectpool.8.0.0.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Options",
|
||||
"version": "9.0.0",
|
||||
@@ -305,6 +287,12 @@
|
||||
"hash": "sha256-IaATAy1M/MEBTid0mQiTrHj4aTwo2POCtckxSbLc3lU=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.io.redist/6.0.1/microsoft.io.redist.6.0.1.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NET.StringTools",
|
||||
"version": "17.11.4",
|
||||
"hash": "sha256-lWfzY35WQ+iKS9TpuztDTljgF9CIORhFhFEm0p1dVBE=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.11.4/microsoft.net.stringtools.17.11.4.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NET.StringTools",
|
||||
"version": "17.13.9",
|
||||
@@ -317,12 +305,6 @@
|
||||
"hash": "sha256-H2Qw8x47WyFOd/VmgRmGMc+uXySgUv68UISgK8Frsjw=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.6.3/microsoft.net.stringtools.17.6.3.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NET.StringTools",
|
||||
"version": "17.7.2",
|
||||
"hash": "sha256-hQE07TCgcQuyu9ZHVq2gPDb0+xe8ECJUdrgh17bJP4o=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.7.2/microsoft.net.stringtools.17.7.2.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.NETCore.Platforms",
|
||||
"version": "5.0.0",
|
||||
@@ -401,12 +383,6 @@
|
||||
"hash": "sha256-J/egIc9ovDi1MUrnyKnpadECQqAB1WUUyrbxINv4zRE=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.remotecontrol/16.3.52/microsoft.visualstudio.remotecontrol.16.3.52.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.VisualStudio.Setup.Configuration.Interop",
|
||||
"version": "3.2.2146",
|
||||
"hash": "sha256-ic5h0cmHIaowJfItTLXLnmFhIg4NhaoMoWVAFMHKdzQ=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.setup.configuration.interop/3.2.2146/microsoft.visualstudio.setup.configuration.interop.3.2.2146.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.VisualStudio.SolutionPersistence",
|
||||
"version": "1.0.28",
|
||||
@@ -787,9 +763,9 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.CodeDom",
|
||||
"version": "7.0.0",
|
||||
"hash": "sha256-7IPt39cY+0j0ZcRr/J45xPtEjnSXdUJ/5ai3ebaYQiE=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.codedom/7.0.0/system.codedom.7.0.0.nupkg"
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-uwVhi3xcvX7eiOGQi7dRETk3Qx1EfHsUfchZsEto338=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.codedom/8.0.0/system.codedom.8.0.0.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "System.Collections",
|
||||
@@ -811,9 +787,9 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.CommandLine",
|
||||
"version": "2.0.0-beta4.24528.1",
|
||||
"hash": "sha256-C1CMTF8ejnnk9h6Yih8ajWeNiQK6czWZTgBSEhGZNGQ=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/2.0.0-beta4.24528.1/system.commandline.2.0.0-beta4.24528.1.nupkg"
|
||||
"version": "2.0.0-beta5.25210.1",
|
||||
"hash": "sha256-AIUy4OsHWpfbH200l+rdZ2VvYsvDDMkccFfXd1ApE8Y=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/2.0.0-beta5.25210.1/system.commandline.2.0.0-beta5.25210.1.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "System.ComponentModel.Composition",
|
||||
@@ -919,9 +895,9 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Formats.Asn1",
|
||||
"version": "7.0.0",
|
||||
"hash": "sha256-eMF+SD/yeslf/wOIlOTlpfpj3LtP6HUilGeSj++bJKg=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.formats.asn1/7.0.0/system.formats.asn1.7.0.0.nupkg"
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-AVMl6N3SG2AqAcQHFruf2QDQeQIC3CICxID+Sh0vBxI=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.formats.asn1/8.0.0/system.formats.asn1.8.0.0.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "System.Formats.Nrbf",
|
||||
@@ -1049,12 +1025,6 @@
|
||||
"hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/9.0.0/system.reflection.metadata.9.0.0.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection.MetadataLoadContext",
|
||||
"version": "7.0.0",
|
||||
"hash": "sha256-VYl6SFD130K9Aw4eJH16ApJ9Sau4Xu0dcxEip2veuTI=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadataloadcontext/7.0.0/system.reflection.metadataloadcontext.7.0.0.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection.MetadataLoadContext",
|
||||
"version": "8.0.0",
|
||||
@@ -1117,9 +1087,9 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.Cryptography.Pkcs",
|
||||
"version": "7.0.2",
|
||||
"hash": "sha256-qS5Z/Yo8J+f3ExVX5Qkcpj1Z57oUZqz5rWa1h5bVpl8=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.pkcs/7.0.2/system.security.cryptography.pkcs.7.0.2.nupkg"
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-yqfIIeZchsII2KdcxJyApZNzxM/VKknjs25gDWlweBI=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.pkcs/8.0.0/system.security.cryptography.pkcs.8.0.0.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.Cryptography.ProtectedData",
|
||||
@@ -1129,15 +1099,9 @@
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.Cryptography.Xml",
|
||||
"version": "7.0.1",
|
||||
"hash": "sha256-CH8+JVC8LyCSW75/6ZQ7ecMbSOAE1c16z4dG8JTp01w=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.xml/7.0.1/system.security.cryptography.xml.7.0.1.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.Permissions",
|
||||
"version": "9.0.0",
|
||||
"hash": "sha256-BFrA9ottmQtLIAiKiGRbfSUpzNJwuaOCeFRDN4Z0ku0=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.permissions/9.0.0/system.security.permissions.9.0.0.nupkg"
|
||||
"version": "8.0.0",
|
||||
"hash": "sha256-XSg8r9TBoYi6KF10Tg3HyCN3pTm1pA2v0BonEgu+PXU=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.xml/8.0.0/system.security.cryptography.xml.8.0.0.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "System.Security.Principal",
|
||||
@@ -1240,11 +1204,5 @@
|
||||
"version": "4.5.0",
|
||||
"hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.valuetuple/4.5.0/system.valuetuple.4.5.0.nupkg"
|
||||
},
|
||||
{
|
||||
"pname": "System.Windows.Extensions",
|
||||
"version": "9.0.0",
|
||||
"hash": "sha256-RErD+Ju15qtnwdwB7E0SjjJGAnhXwJyC7UPcl24Z3Vs=",
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.windows.extensions/9.0.0/system.windows.extensions.9.0.0.nupkg"
|
||||
}
|
||||
]
|
||||
|
||||
@@ -32,18 +32,18 @@ in
|
||||
buildDotnetModule rec {
|
||||
inherit pname dotnet-sdk dotnet-runtime;
|
||||
|
||||
vsVersion = "2.74.24";
|
||||
vsVersion = "2.78.15";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dotnet";
|
||||
repo = "roslyn";
|
||||
rev = "VSCode-CSharp-${vsVersion}";
|
||||
hash = "sha256-Q5yt8eMUuLx+X7sNlc6uTlMsC20G0SXcn3RdsrSDapg=";
|
||||
hash = "sha256-Lim2f2//NFiMrZzvpREMlk6/5NWatVTiQrciAAxIiLY=";
|
||||
};
|
||||
|
||||
# versioned independently from vscode-csharp
|
||||
# "roslyn" in here:
|
||||
# https://github.com/dotnet/vscode-csharp/blob/main/package.json
|
||||
version = "5.0.0-1.25204.1";
|
||||
version = "5.0.0-1.25263.3";
|
||||
projectFile = "src/LanguageServer/${project}/${project}.csproj";
|
||||
useDotnetFromEnv = true;
|
||||
nugetDeps = ./deps.json;
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
cmake,
|
||||
curl,
|
||||
fetchFromGitHub,
|
||||
icu,
|
||||
jemalloc,
|
||||
libgff,
|
||||
libiconv,
|
||||
@@ -50,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
bzip2
|
||||
cereal_1_3_2
|
||||
curl
|
||||
icu
|
||||
jemalloc
|
||||
libgff
|
||||
libstaden-read
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sea-orm-cli";
|
||||
version = "1.1.8";
|
||||
version = "1.1.11";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-XPankeAVuG5zADxM/4ZZgV2GBhIA+XzkhN+MLvFZpiU=";
|
||||
hash = "sha256-JaUlRQfYTg/5GC3SHjDRYHc54naOW4NpdfB6lMcQqog=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-sxCfi8zcD48WCvcv8sJ2ocPyKOuxoINU5dDh7ons+nw=";
|
||||
cargoHash = "sha256-oytYVAbmGPotnnI7morg8ePH8Ox1hD1WhGwEct4F0vw=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
nix-update-script,
|
||||
python3Packages,
|
||||
squashfsTools,
|
||||
cacert,
|
||||
stdenv,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
@@ -118,6 +119,11 @@ python3Packages.buildPythonApplication rec {
|
||||
wrapProgram $out/bin/snapcraft --prefix PATH : ${squashfsTools}/bin
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
# _pygit2.GitError: OpenSSL error: failed to load certificates: error:00000000:lib(0)::reason(0)
|
||||
export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
|
||||
'';
|
||||
|
||||
nativeCheckInputs =
|
||||
with python3Packages;
|
||||
[
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tabby-agent";
|
||||
version = "0.27.0";
|
||||
version = "0.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TabbyML";
|
||||
repo = "tabby";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Z/Orl3T6NagmVcw9JYXhyy+32CK7t/xiQMdXooNcr9g=";
|
||||
hash = "sha256-I7FHiw7009AjLA3wFKJKNvjuwesB6/DYL/t0hZEtAAY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-cdbmEgwHA+2/nfc8gaLAsCxLH0FNEQ0hjfRzQvngLKI=";
|
||||
hash = "sha256-SiJJxRzmKQxqw3UESN7q+3qkU1nK+7z6K5RpIMRRces=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tar2ext4";
|
||||
version = "0.12.8";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "hcsshim";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-20+y7wFV3HxkrS1qHNq2neIc826HU5AXzuqqS7Ll2gg=";
|
||||
sha256 = "sha256-/ImyicXRBGclnUEpqygNYhknFYJmRqBqKkz/gNxVLWQ=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/cmd/tar2ext4";
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "teams-for-linux";
|
||||
version = "2.0.12";
|
||||
version = "2.0.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IsmaelMartinez";
|
||||
repo = "teams-for-linux";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-FTXwDwdXeXAa6Nk73WPPrxyrXvQ8Yg9tqtdkeekK4x8=";
|
||||
hash = "sha256-xkVJ8PrW2huf3oNVSYySQnzKPadsYFXnrMgi+mFXBQU=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-uwohbVV6zNdLmLgSihJsqRxm5ZR8P8mHeZdbCYjA78w=";
|
||||
npmDepsHash = "sha256-jDJH/lAbmUURMkdv49S1KeE4I/MOEzK0ZDWh1sbnzXY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "tideways-daemon";
|
||||
version = "1.9.38";
|
||||
version = "1.9.40";
|
||||
|
||||
src =
|
||||
finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
|
||||
@@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
sources = {
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-zQ8K0oHTZfQCEYAsnKsdgGaDTlRwEfCiJpd4lxy4Q5M=";
|
||||
hash = "sha256-6U6Vq908tJmR4JzZlbK/qjlfCl/iWrCIOJNvUh0Xvag=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-atRvSpc56z5Vxo5/YGz9QzCPEP79qjl2GN0vR3nkBAE=";
|
||||
hash = "sha256-2Yq2HvQoBPPDvEyZPjwyTjjc/bb4+zOrwknqHUnZsjc=";
|
||||
};
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-+X+WbHtOFW4YGyRmj388bBH0jHezWnPfTBiiOw3LFFY=";
|
||||
hash = "sha256-ab7ZAUYH4Em6KuE/VlVLItf3N0yMvIRuJnf7vOGDGsY=";
|
||||
};
|
||||
};
|
||||
updateScript = "${
|
||||
|
||||
@@ -42,6 +42,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# ugly hack for xgettext to work during build
|
||||
env.LD_LIBRARY_PATH = "${lib.getLib expat}/lib";
|
||||
|
||||
# with -std=c99, the build fails due to implicit function declaration errors
|
||||
# for the popen() and pclose() calls in src/tilda-lock-files.c
|
||||
postPatch = ''
|
||||
substituteInPlace configure.ac --replace-fail -std=c99 -std=gnu99
|
||||
'';
|
||||
|
||||
# The config locking scheme relies on the binary being called "tilda"
|
||||
# (`pgrep -C tilda`), so a simple `wrapProgram` won't suffice:
|
||||
postInstall = ''
|
||||
|
||||
@@ -71,13 +71,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
|
||||
stdenvNoCC.mkDerivation
|
||||
{
|
||||
inherit pname;
|
||||
version = "0-unstable-2024-11-06";
|
||||
version = "0-unstable-2025-04-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Fausto-Korpsvart";
|
||||
repo = "Tokyonight-GTK-Theme";
|
||||
rev = "4dc45d60bf35f50ebd9ee41f16ab63783f80dd64";
|
||||
hash = "sha256-AKZA+WCcfxDeNrNrq3XYw+SFoWd1VV2T9+CwK2y6+jA=";
|
||||
rev = "006154c78dde52b5851347a7e91f924af62f1b8f";
|
||||
hash = "sha256-h5k9p++zjzxGFkTK/6o/ISl/Litgf6fzy8Jf6Ikt5V8=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
|
||||
|
||||
@@ -0,0 +1,88 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
|
||||
# nativeBuildInputs
|
||||
installShellFiles,
|
||||
|
||||
buildPackages,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ty";
|
||||
version = "0.0.1-alpha.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "ty";
|
||||
tag = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-F3q6IpS7dk0jISG+aREKpPxwWHO5UdSfslOnclYa0R8=";
|
||||
};
|
||||
|
||||
# For Darwin platforms, remove the integration test for file notifications,
|
||||
# as these tests fail in its sandboxes.
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
rm ${finalAttrs.cargoRoot}/crates/ty/tests/file_watching.rs
|
||||
'';
|
||||
|
||||
cargoRoot = "ruff";
|
||||
buildAndTestSubdir = finalAttrs.cargoRoot;
|
||||
|
||||
cargoBuildFlags = [ "--package=ty" ];
|
||||
|
||||
cargoHash = "sha256-NXhO+xYHCz269jxEuiB8yMgaX21Z8wAySVl9XOc7W60=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
# `ty`'s tests use `insta-cmd`, which depends on the structure of the `target/` directory,
|
||||
# and also fails to find the environment variable `$CARGO_BIN_EXE_ty`, which leads to tests failing.
|
||||
# Instead, we specify the path ourselves and forgo the lookup.
|
||||
# As the patches occur solely in test code, they have no effect on the packaged `ty` binary itself.
|
||||
#
|
||||
# `stdenv.hostPlatform.rust.cargoShortTarget` is taken from `cargoSetupHook`'s `installPhase`,
|
||||
# which constructs a path as below to reference the built binary.
|
||||
preCheck = ''
|
||||
export CARGO_BIN_EXE_ty="$PWD"/target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/ty
|
||||
'';
|
||||
|
||||
# All the packages referenced in `crates/ty/README.md`, plus `crates/ty` itself.
|
||||
cargoTestFlags = [
|
||||
"--package=ty" # CLI tests; file-watching tests only on Linux platforms
|
||||
"--package=ty_python_semantic" # core type checking tests
|
||||
"--package=ty_test" # test framework tests
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
doInstallCheck = true;
|
||||
|
||||
postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
|
||||
let
|
||||
emulator = stdenv.hostPlatform.emulator buildPackages;
|
||||
in
|
||||
''
|
||||
installShellCompletion --cmd ty \
|
||||
--bash <(${emulator} $out/bin/ty generate-shell-completion bash) \
|
||||
--fish <(${emulator} $out/bin/ty generate-shell-completion fish) \
|
||||
--zsh <(${emulator} $out/bin/ty generate-shell-completion zsh)
|
||||
''
|
||||
);
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Extremely fast Python type checker and language server, written in Rust";
|
||||
homepage = "https://github.com/astral-sh/ty";
|
||||
changelog = "https://github.com/astral-sh/ty/blob/${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "ty";
|
||||
maintainers = [ lib.maintainers.bengsparks ];
|
||||
};
|
||||
})
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "uncrustify";
|
||||
version = "0.80.1";
|
||||
version = "0.81.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uncrustify";
|
||||
repo = "uncrustify";
|
||||
rev = "uncrustify-${version}";
|
||||
sha256 = "sha256-SsPuqPyv3IFjYtAqANjzK8cdTGsyGBXVLzGWEUl28dg=";
|
||||
sha256 = "sha256-8KTsrXUYOfqsWSGBAl0mZpGOYr+duFrRB0ITmq2Auqg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "versatiles";
|
||||
version = "0.15.5"; # When updating: Replace with current version
|
||||
version = "0.15.6"; # When updating: Replace with current version
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "versatiles-org";
|
||||
repo = "versatiles-rs";
|
||||
tag = "v${version}"; # When updating: Replace with long commit hash of new version
|
||||
hash = "sha256-j50KZBYNzO9YNq6Nu3hozBmR2+KHbpCZuowSWMZ4yk4="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed.
|
||||
hash = "sha256-JWMoXsMRdllYrTpUdKYEi7i5AI5957qwrr8agvyKeT8="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed.
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-SmN/E7vvf9aoopOyigiZJoYBp1mADter4gCwI/tsG0Q="; # When updating: Same as above
|
||||
cargoHash = "sha256-8DtkeWo+lxv/9JzknpWnGYCA9v2HA4jFN4ZvseFpOGU="; # When updating: Same as above
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vi-mongo";
|
||||
version = "0.1.26";
|
||||
version = "0.1.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kopecmaciej";
|
||||
repo = "vi-mongo";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-+2V5ojZsEaZDsJiur9/0G4fm0tMGTKForgRuqvMX+EI=";
|
||||
hash = "sha256-/hj2JMjBKl3HLd6Mfuz4UnaWbPKPYHYfqKPj3kjxLZg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OVd2wIssVJHamWpNrK+piQFl9Lz0xgYnnz/4D5yl1D4=";
|
||||
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
||||
owner = "endrazine";
|
||||
repo = "wcc";
|
||||
rev = "8cbb49345d9596dfd37bd1b681753aacaab96475";
|
||||
hash = "sha256-f19EqkXJ97k0gjVBEBLzfNqYZ/J7sCCGBEeFsSax3uU=";
|
||||
hash = "sha256-TYYtnMlrp/wbrTmwd3n90Uni7WE54gK6zKSBg4X9ZfA=";
|
||||
deepClone = true;
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "webdav";
|
||||
version = "5.7.4";
|
||||
version = "5.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hacdias";
|
||||
repo = "webdav";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-f4Z5DiwrcF18ZSfDeSf1kwQIRmVNK4K5WrkQJYfquIs=";
|
||||
hash = "sha256-iXU3ePALas/Z4caB1uhc5yW88zV/4iqv7qpOw4ZgZ3g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8M25/Pfu175CYsO+bvLN5wxT7OciUUt7iQV0BkezTVw=";
|
||||
vendorHash = "sha256-B78O13FPpkcuE808c2hLiIDPQdS5qlaw1dWLc9T7hvM=";
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
easyeffects,
|
||||
gjs,
|
||||
glib,
|
||||
gnome-menus,
|
||||
nautilus,
|
||||
gobject-introspection,
|
||||
hddtemp,
|
||||
@@ -47,6 +48,17 @@ in
|
||||
# the upstream repository's sources.
|
||||
super:
|
||||
lib.trivial.pipe super [
|
||||
(patchExtension "apps-menu@gnome-shell-extensions.gcampax.github.com" (old: {
|
||||
patches = [
|
||||
(replaceVars
|
||||
./extensionOverridesPatches/apps-menu_at_gnome-shell-extensions.gcampax.github.com.patch
|
||||
{
|
||||
gmenu_path = "${gnome-menus}/lib/girepository-1.0";
|
||||
}
|
||||
)
|
||||
];
|
||||
}))
|
||||
|
||||
(patchExtension "caffeine@patapon.info" (old: {
|
||||
meta.maintainers = with lib.maintainers; [ eperuffo ];
|
||||
}))
|
||||
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
diff --git a/extension.js b/extension.js
|
||||
index c608441..2b25335 100644
|
||||
--- a/extension.js
|
||||
+++ b/extension.js
|
||||
@@ -9,7 +9,11 @@ import Atk from 'gi://Atk';
|
||||
import Clutter from 'gi://Clutter';
|
||||
import Gio from 'gi://Gio';
|
||||
import GLib from 'gi://GLib';
|
||||
-import GMenu from 'gi://GMenu';
|
||||
+
|
||||
+import GIRepository from 'gi://GIRepository';
|
||||
+GIRepository.Repository.prepend_search_path('@gmenu_path@');
|
||||
+const {default: GMenu} = await import('gi://GMenu');
|
||||
+
|
||||
import GObject from 'gi://GObject';
|
||||
import Gtk from 'gi://Gtk';
|
||||
import Meta from 'gi://Meta';
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-gsconnect";
|
||||
version = "58";
|
||||
version = "62";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "GSConnect";
|
||||
repo = "gnome-shell-extension-gsconnect";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bpy4G+f3NJ2iVsycPluV+98at0G2wlp7t5cPEMGM90s=";
|
||||
hash = "sha256-HFm04XC61AjkJSt4YBc4dO9v563w+LsYDSaZckPYE14=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
recurseIntoAttrs,
|
||||
generateSplicesForMkScope,
|
||||
makeScopeWithSplicing',
|
||||
stdenvNoCC,
|
||||
writeScriptBin,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -70,6 +70,11 @@ let
|
||||
// {
|
||||
inherit callPackage fetchNupkg buildDotnetSdk;
|
||||
|
||||
generate-dotnet-sdk = writeScriptBin "generate-dotnet-sdk" (
|
||||
# Don't include current nixpkgs in the exposed version. We want to make the script runnable without nixpkgs repo.
|
||||
builtins.replaceStrings [ " -I nixpkgs=./." ] [ "" ] (builtins.readFile ./update.sh)
|
||||
);
|
||||
|
||||
# Convert a "stdenv.hostPlatform.system" to a dotnet RID
|
||||
systemToDotnetRid =
|
||||
system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}");
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "${passthru.prettyName}-unwrapped";
|
||||
# nixpkgs-update: no auto update
|
||||
version = "0-unstable-2024-10-13";
|
||||
version = "0-unstable-2025-05-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-watcom";
|
||||
repo = "open-watcom-v2";
|
||||
rev = "f0a6465832643ba08b7f94fb814c552804fb395b";
|
||||
hash = "sha256-rT3z0KrkCZ78SbsK2CEHfvJa1TEnRH2kwhzZhi8fZDo=";
|
||||
rev = "b168de07a7c32ad82b77dd56671b6a51a11dab70";
|
||||
hash = "sha256-9NNJcDHxOo+NKZraGqsHqK5whO3nL0QTeh+imzhThTg=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
@@ -29,19 +29,19 @@ stdenv.mkDerivation rec {
|
||||
|
||||
for dateSource in bld/wipfc/configure; do
|
||||
substituteInPlace $dateSource \
|
||||
--replace '`date ' '`date -ud "@$SOURCE_DATE_EPOCH" '
|
||||
--replace-fail '`date ' '`date -ud "@$SOURCE_DATE_EPOCH" '
|
||||
done
|
||||
|
||||
substituteInPlace bld/watcom/h/banner.h \
|
||||
--replace '__DATE__' "\"$(date -ud "@$SOURCE_DATE_EPOCH" +'%b %d %Y')\"" \
|
||||
--replace '__TIME__' "\"$(date -ud "@$SOURCE_DATE_EPOCH" +'%T')\""
|
||||
--replace-fail '__DATE__' "\"$(date -ud "@$SOURCE_DATE_EPOCH" +'%b %d %Y')\"" \
|
||||
--replace-fail '__TIME__' "\"$(date -ud "@$SOURCE_DATE_EPOCH" +'%T')\""
|
||||
|
||||
substituteInPlace build/makeinit \
|
||||
--replace '$+$(%__CYEAR__)$-' "$(date -ud "@$SOURCE_DATE_EPOCH" +'%Y')"
|
||||
--replace-fail '$+$(%__CYEAR__)$-' "$(date -ud "@$SOURCE_DATE_EPOCH" +'%Y')"
|
||||
''
|
||||
+ lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
substituteInPlace build/mif/local.mif \
|
||||
--replace '-static' ""
|
||||
--replace-fail '-static' ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs =
|
||||
|
||||
@@ -150,11 +150,16 @@ let
|
||||
wcl -bcl=dos -fe=dos test.c
|
||||
|
||||
echo "Test file format"
|
||||
file ./linux | grep "32-bit" | grep "Linux"
|
||||
file ./nt.exe | grep "PE32" | grep "Windows"
|
||||
file ./dos4g.exe | grep "MS-DOS" | grep "LE executable"
|
||||
file ./windows.exe | grep "MS-DOS" | grep "Windows 3.x"
|
||||
file ./dos.exe | grep "MS-DOS" | grep -v "LE" | grep -v "Windows 3.x"
|
||||
file ./linux
|
||||
file ./linux | grep "32-bit" | grep -q "Linux"
|
||||
file ./nt.exe
|
||||
file ./nt.exe | grep "PE32" | grep -q "Windows"
|
||||
file ./dos4g.exe
|
||||
file ./dos4g.exe | grep "MS-DOS" | grep -q "executable, LE"
|
||||
file ./windows.exe
|
||||
file ./windows.exe | grep "MS-DOS" | grep -q "Windows 3.00"
|
||||
file ./dos.exe
|
||||
file ./dos.exe | grep "MS-DOS" | grep -v "LE" | grep -qv "Windows 3."
|
||||
touch $out
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -17,13 +17,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lief";
|
||||
version = "0.16.4";
|
||||
version = "0.16.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lief-project";
|
||||
repo = "LIEF";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-3rLnT/zs7YrAYNc8I2EJevl98LHGcXFf7bVlJJfxqRc=";
|
||||
hash = "sha256-X1hkEOgU7AaQDeVlrFM4VDqweElADdColRffbV8/BfM=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
# https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
|
||||
clangStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "webkitgtk";
|
||||
version = "2.48.1";
|
||||
version = "2.48.2";
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${
|
||||
if lib.versionAtLeast gtk3.version "4.0" then
|
||||
"6.0"
|
||||
@@ -100,7 +100,7 @@ clangStdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-mO/fIcTNyg/gtzq1qMtSCTtapS2bGwFqk/cdv6HrJY8=";
|
||||
hash = "sha256-7Fj238JdOzYDiOGS+GUGjWmqsJtNffAh+Q4xTS+lTzc=";
|
||||
};
|
||||
|
||||
patches = lib.optionals clangStdenv.hostPlatform.isLinux [
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
pytest-mock,
|
||||
pytestCheckHook,
|
||||
pythonAtLeast,
|
||||
pythonOlder,
|
||||
redis,
|
||||
redisTestHook,
|
||||
setuptools,
|
||||
@@ -23,8 +22,6 @@ buildPythonPackage rec {
|
||||
version = "0.12.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aio-libs";
|
||||
repo = "aiocache";
|
||||
@@ -56,12 +53,19 @@ buildPythonPackage rec {
|
||||
"ignore::DeprecationWarning"
|
||||
# TypeError: object MagicMock can't be used in 'await' expression
|
||||
"--deselect=tests/ut/backends/test_redis.py::TestRedisBackend::test_close"
|
||||
# Tests can time out and leave redis/valkey in an unusable state for later tests
|
||||
"-x"
|
||||
];
|
||||
|
||||
disabledTests =
|
||||
[
|
||||
# Test calls apache benchmark and fails, no usable output
|
||||
"test_concurrency_error_rates"
|
||||
# susceptible to timing out / short ttl
|
||||
"test_cached_stampede"
|
||||
"test_locking_dogpile_lease_expiration"
|
||||
"test_set_ttl_handle"
|
||||
"test_set_cancel_previous_ttl_handle"
|
||||
]
|
||||
++ lib.optionals (pythonAtLeast "3.13") [
|
||||
# https://github.com/aio-libs/aiocache/issues/863
|
||||
@@ -71,17 +75,19 @@ buildPythonPackage rec {
|
||||
disabledTestPaths = [
|
||||
# Benchmark and performance tests are not relevant for Nixpkgs
|
||||
"tests/performance/"
|
||||
# Full of timing-sensitive tests
|
||||
"tests/ut/backends/test_redis.py"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
pythonImportsCheck = [ "aiocache" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python API Rate Limit Decorator";
|
||||
meta = {
|
||||
description = "Asyncio cache supporting multiple backends (memory, redis, memcached, etc.)";
|
||||
homepage = "https://github.com/aio-libs/aiocache";
|
||||
changelog = "https://github.com/aio-libs/aiocache/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -15,19 +15,19 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "apispec";
|
||||
version = "6.8.1";
|
||||
version = "6.8.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-9JFsu3vhVpY7GPWSmg5CvSNJE1g0toCoGxJDK8+qmjk=";
|
||||
hash = "sha256-zltpufzwJQy1a6DBpSp1/yLC98WGZU5XiEOZAYxRnyY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flit-core ];
|
||||
build-system = [ flit-core ];
|
||||
|
||||
propagatedBuildInputs = [ packaging ];
|
||||
dependencies = [ packaging ];
|
||||
|
||||
optional-dependencies = {
|
||||
marshmallow = [ marshmallow ];
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-search-documents";
|
||||
version = "11.4.0";
|
||||
version = "14.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = "azure-sdk-for-python";
|
||||
rev = "azure-search-documents_${version}";
|
||||
hash = "sha256-0J9AXDH7TOkcKDwFbICiMatLAwiFq3Jtoji8fJSOg8k=";
|
||||
tag = "azure-mgmt-containerregistry_${version}";
|
||||
hash = "sha256-FRdXdk3+G/xPraB2laTV6Xs/yNY65gebvMCKPOgby1g=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/sdk/search/azure-search-documents";
|
||||
@@ -41,7 +41,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Microsoft Azure Cognitive Search Client Library for Python";
|
||||
homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/search/azure-search-documents";
|
||||
changelog = "https://github.com/Azure/azure-sdk-for-python/blob/${src.rev}/sdk/search/azure-search-documents/CHANGELOG.md";
|
||||
changelog = "https://github.com/Azure/azure-sdk-for-python/blob/${src.tag}/sdk/search/azure-search-documents/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ natsukium ];
|
||||
};
|
||||
|
||||
@@ -359,7 +359,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.38.16";
|
||||
version = "1.38.18";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -367,7 +367,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-dZrhWJtN5u/rT0ehuEtObj536bNbT0bpqDTEmpEbfwQ=";
|
||||
hash = "sha256-4hn4/Xsx9tHaMWamBMazFWtGZq2OGwj+WCVu2UPzWpE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore-stubs";
|
||||
version = "1.38.16";
|
||||
version = "1.38.18";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "botocore_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-SOxutsOJI9Dg+UlOcshpRiq1/9NXi5HNLZH9lNNh4Dw=";
|
||||
hash = "sha256-lc6Rrf+iFOrV62uq8oHJkmxSsgrZsgjVTzsYM6HuxqQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "channels";
|
||||
version = "4.2.0";
|
||||
version = "4.2.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "django";
|
||||
repo = "channels";
|
||||
tag = version;
|
||||
hash = "sha256-JkmS+QVF1MTdLID+c686Fd8L3kA+AIr7sLCaAoABh+s=";
|
||||
hash = "sha256-Hx6ItDLt+QAy43SvyYVUY76Sva7+MYjcz0wJeXES/HQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -1,26 +1,36 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
catalogue,
|
||||
curated-tokenizers,
|
||||
fetchFromGitHub,
|
||||
huggingface-hub,
|
||||
setuptools,
|
||||
tokenizers,
|
||||
torch,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "curated-transformers";
|
||||
version = "0.1.1";
|
||||
version = "2.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "explosion";
|
||||
repo = "curated-transformers";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-QhJZnQIa9TilwdQCUlxnQCEc6Suj669cht6WHUAr/Gw=";
|
||||
hash = "sha256-2sedBVpwCppviWix+d3tJFTrLBe+2IBlWnCKgV6MucA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ torch ];
|
||||
dependencies = [
|
||||
catalogue
|
||||
curated-tokenizers
|
||||
huggingface-hub
|
||||
tokenizers
|
||||
torch
|
||||
];
|
||||
|
||||
# Unit tests are hard to use, since most tests rely on downloading
|
||||
# models from Hugging Face Hub.
|
||||
|
||||
@@ -6,25 +6,26 @@
|
||||
django,
|
||||
python,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-widget-tweaks";
|
||||
version = "1.5.0";
|
||||
format = "setuptools";
|
||||
version = "1.5.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jazzband";
|
||||
repo = pname;
|
||||
repo = "django-widget-tweaks";
|
||||
tag = version;
|
||||
hash = "sha256-/3UIsg75X3R9YGv9cEcoPw3IN2vkhUb+HCy68813d2E=";
|
||||
hash = "sha256-ymjBuNGfndUwQdBU2xnc9CA51oOaEPA+RaAspJMKQ04=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
propagatedBuildInputs = [ django ];
|
||||
dependencies = [ django ];
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} -m django test --settings=tests.settings
|
||||
@@ -33,7 +34,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Tweak the form field rendering in templates, not in python-level form definitions";
|
||||
homepage = "https://github.com/jazzband/django-widget-tweaks";
|
||||
changelog = "https://github.com/jazzband/django-widget-tweaks/blob/${version}/CHANGES.rst";
|
||||
changelog = "https://github.com/jazzband/django-widget-tweaks/blob/${src.tag}/CHANGES.rst";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ maxxk ];
|
||||
};
|
||||
|
||||
@@ -1,28 +1,26 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
pytestCheckHook,
|
||||
pytest-cov-stub,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
hatchling,
|
||||
fetchFromGitHub,
|
||||
buildPythonPackage,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "entry-points-txt";
|
||||
version = "0.2.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jwodder";
|
||||
repo = pname;
|
||||
repo = "entry-points-txt";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-hIUXxBJ0XSB4FrNZJdofJ1gTTncILNq9Xh+iAV1CD0s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
nativeBuildInputs = [ hatchling ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
@@ -34,7 +32,8 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Read & write entry_points.txt files";
|
||||
homepage = "https://github.com/jwodder/entry-points-txt";
|
||||
license = with licenses; [ mit ];
|
||||
changelog = "https://github.com/wheelodex/entry-points-txt/releases/tag/${src.tag}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ayazhafiz ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,11 +7,12 @@
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
validators,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "faraday-agent-parameters-types";
|
||||
version = "1.7.3";
|
||||
version = "1.8.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -19,7 +20,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "faraday_agent_parameters_types";
|
||||
inherit version;
|
||||
hash = "sha256-dpMxmCFo7e+/VA1SdpdSYRKR9rvr7zQWTri4pJt/4PY=";
|
||||
hash = "sha256-ZyTaQN6T+F8QKPuTfGcEtdKM/2hvtekghG4UwtER02A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -32,6 +33,7 @@ buildPythonPackage rec {
|
||||
dependencies = [
|
||||
marshmallow
|
||||
packaging
|
||||
validators
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
@@ -2,15 +2,15 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
hatchling,
|
||||
llama-index-core,
|
||||
llama-index-llms-openai,
|
||||
poetry-core,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-agent-openai";
|
||||
version = "0.4.6";
|
||||
version = "0.4.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -18,14 +18,12 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_agent_openai";
|
||||
inherit version;
|
||||
hash = "sha256-T2bBcxg2q2bEtEElWpXzOlF0PkmTuKqdr0MMsxqn1I4=";
|
||||
hash = "sha256-+xu6sfCkIzCVA2QaLO2Nwa5sB9WomLT3Ft4NuZV0bg0=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "llama-index-llms-openai" ];
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [
|
||||
llama-index-core
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
{
|
||||
lib,
|
||||
aiohttp,
|
||||
aiosqlite,
|
||||
banks,
|
||||
buildPythonPackage,
|
||||
dataclasses-json,
|
||||
deprecated,
|
||||
@@ -8,17 +10,17 @@
|
||||
fetchFromGitHub,
|
||||
filetype,
|
||||
fsspec,
|
||||
hatchling,
|
||||
jsonpath-ng,
|
||||
llamaindex-py-client,
|
||||
nest-asyncio,
|
||||
networkx,
|
||||
nltk,
|
||||
nltk-data,
|
||||
nltk,
|
||||
numpy,
|
||||
openai,
|
||||
pandas,
|
||||
pillow,
|
||||
poetry-core,
|
||||
pytest-asyncio,
|
||||
pytest-mock,
|
||||
pytestCheckHook,
|
||||
@@ -36,7 +38,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-core";
|
||||
version = "0.12.23";
|
||||
version = "0.12.35";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -45,7 +47,7 @@ buildPythonPackage rec {
|
||||
owner = "run-llama";
|
||||
repo = "llama_index";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-GFzaorzjeQGreyUjRXP7v7djbSq2boLWZjwO4R2W9E4=";
|
||||
hash = "sha256-qBLCuQjkUNER70wJiWH6pEN4D2J9L8emGQukdlWAAYU=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/${pname}";
|
||||
@@ -66,10 +68,12 @@ buildPythonPackage rec {
|
||||
|
||||
pythonRelaxDeps = [ "tenacity" ];
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
aiosqlite
|
||||
banks
|
||||
dataclasses-json
|
||||
deprecated
|
||||
dirtyjson
|
||||
@@ -139,6 +143,8 @@ buildPythonPackage rec {
|
||||
# asyncio.exceptions.InvalidStateError: invalid state
|
||||
"test_workflow_context_to_dict_mid_run"
|
||||
"test_SimpleDirectoryReader"
|
||||
# RuntimeError
|
||||
"test_str"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -3,14 +3,14 @@
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
llama-index-core,
|
||||
poetry-core,
|
||||
hatchling,
|
||||
pythonOlder,
|
||||
sentence-transformers,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-embeddings-huggingface";
|
||||
version = "0.5.3";
|
||||
version = "0.5.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -18,10 +18,10 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_embeddings_huggingface";
|
||||
inherit version;
|
||||
hash = "sha256-P+yzY8wNBYkGia78LRvaLwJDGFfgRW/a8ujElg+drq8=";
|
||||
hash = "sha256-nFjFrPt38Heo5DZgsbA3RgEmqNGAwXVwP/MeidqxnT4=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [
|
||||
llama-index-core
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
{
|
||||
lib,
|
||||
boto3,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
boto3,
|
||||
hatchling,
|
||||
llama-index-core,
|
||||
poetry-core,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-graph-stores-neptune";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -18,10 +18,10 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_graph_stores_neptune";
|
||||
inherit version;
|
||||
hash = "sha256-jSZ86qdK5KklPFtgyruPtYhJ2Yesd8C1QufhojhKO0A=";
|
||||
hash = "sha256-IqY4dEWcbM9371vuZ7C9NlDux9O/j6wF7Hcc4aiBiIE=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [
|
||||
boto3
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-llms-openai";
|
||||
version = "0.3.33";
|
||||
version = "0.3.38";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_llms_openai";
|
||||
inherit version;
|
||||
hash = "sha256-ESlCyiIcIjPtLPmV/a8IZfK3+SldmwHFp/yu83PBrIc=";
|
||||
hash = "sha256-vNHVISv3yUgwGVhxmh3zYb5is3tWIHMuTJzoBLwHi3c=";
|
||||
};
|
||||
|
||||
pythonRemoveDeps = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user