Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
fb53f9f64b
@ -5603,6 +5603,12 @@
|
||||
name = "Misha Gusarov";
|
||||
keys = [ { fingerprint = "A8DF 1326 9E5D 9A38 E57C FAC2 9D20 F650 3E33 8888"; } ];
|
||||
};
|
||||
dottybot = {
|
||||
name = "Scala Organization (dottybot)";
|
||||
email = "dottybot@groupes.epfl.ch";
|
||||
github = "dottybot";
|
||||
githubId = 12519979;
|
||||
};
|
||||
dpaetzel = {
|
||||
email = "david.paetzel@posteo.de";
|
||||
github = "dpaetzel";
|
||||
@ -8243,6 +8249,12 @@
|
||||
githubId = 1742172;
|
||||
name = "Hamish Hutchings";
|
||||
};
|
||||
hamzaremmal = {
|
||||
email = "hamza.remmal@epfl.ch";
|
||||
github = "hamzaremmal";
|
||||
githubId = 56235032;
|
||||
name = "Hamza Remmal";
|
||||
};
|
||||
hanemile = {
|
||||
email = "mail@emile.space";
|
||||
github = "HanEmile";
|
||||
@ -14765,6 +14777,13 @@
|
||||
githubId = 818502;
|
||||
name = "Nathan Yong";
|
||||
};
|
||||
natsukagami = {
|
||||
email = "natsukagami@gmail.com";
|
||||
github = "natsukagami";
|
||||
githubId = 9061737;
|
||||
name = "Natsu Kagami";
|
||||
keys = [ { fingerprint = "5581 26DC 886F E14D 501D B0F2 D6AD 7B57 A992 460C"; } ];
|
||||
};
|
||||
natsukium = {
|
||||
email = "nixpkgs@natsukium.com";
|
||||
github = "natsukium";
|
||||
|
||||
@ -196,14 +196,8 @@ in
|
||||
# To prevent gratuitous rebuilds on each change to Nixpkgs
|
||||
nixos.revision = null;
|
||||
|
||||
stateVersion = lib.mkDefault (throw ''
|
||||
The macOS linux builder should not need a stateVersion to be set, but a module
|
||||
has accessed stateVersion nonetheless.
|
||||
Please inspect the trace of the following command to figure out which module
|
||||
has a dependency on stateVersion.
|
||||
|
||||
nix-instantiate --attr darwin.linux-builder --show-trace
|
||||
'');
|
||||
# to be updated by module maintainers, see nixpkgs#325610
|
||||
stateVersion = "24.05";
|
||||
};
|
||||
|
||||
users.users."${user}" = {
|
||||
|
||||
@ -22,7 +22,7 @@ let
|
||||
serverOptions = { name, config, ... }: {
|
||||
freeformType = attrsOf (either scalarType (listOf scalarType));
|
||||
# Client system-options file directives are explained here:
|
||||
# https://www.ibm.com/docs/en/storage-protect/8.1.23?topic=commands-processing-options
|
||||
# https://www.ibm.com/docs/en/storage-protect/8.1.24?topic=commands-processing-options
|
||||
options.servername = mkOption {
|
||||
type = servernameType;
|
||||
default = name;
|
||||
|
||||
@ -90,7 +90,7 @@ in
|
||||
environment.HOME = "/var/lib/tsm-backup";
|
||||
serviceConfig = {
|
||||
# for exit status description see
|
||||
# https://www.ibm.com/docs/en/storage-protect/8.1.23?topic=clients-client-return-codes
|
||||
# https://www.ibm.com/docs/en/storage-protect/8.1.24?topic=clients-client-return-codes
|
||||
SuccessExitStatus = "4 8";
|
||||
# The `-se` option must come after the command.
|
||||
# The `-optfile` option suppresses a `dsm.opt`-not-found warning.
|
||||
|
||||
@ -192,10 +192,7 @@ in
|
||||
xdg.portal.enable = true;
|
||||
xdg.portal.extraPortals = [
|
||||
pkgs.xdg-desktop-portal-xapp
|
||||
(pkgs.xdg-desktop-portal-gtk.override {
|
||||
# Do not build portals that we already have.
|
||||
buildPortalsInGnome = false;
|
||||
})
|
||||
pkgs.xdg-desktop-portal-gtk
|
||||
];
|
||||
|
||||
services.orca.enable = mkDefault (notExcluded pkgs.orca);
|
||||
|
||||
@ -74,9 +74,7 @@ in
|
||||
xdg.icons.enable = true;
|
||||
xdg.portal.enable = mkDefault true;
|
||||
xdg.portal.extraPortals = mkDefault [
|
||||
(pkgs.xdg-desktop-portal-gtk.override {
|
||||
buildPortalsInGnome = false;
|
||||
})
|
||||
pkgs.xdg-desktop-portal-gtk
|
||||
];
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/pull/247766#issuecomment-1722839259
|
||||
|
||||
@ -281,10 +281,7 @@ in
|
||||
xdg.portal.enable = true;
|
||||
xdg.portal.extraPortals = [
|
||||
pkgs.xdg-desktop-portal-gnome
|
||||
(pkgs.xdg-desktop-portal-gtk.override {
|
||||
# Do not build portals that we already have.
|
||||
buildPortalsInGnome = false;
|
||||
})
|
||||
pkgs.xdg-desktop-portal-gtk
|
||||
];
|
||||
xdg.portal.configPackages = mkDefault [ pkgs.gnome-session ];
|
||||
|
||||
|
||||
@ -109,13 +109,15 @@ let
|
||||
|
||||
cp --remove-destination /etc/resolv.conf "$root/etc/resolv.conf"
|
||||
|
||||
declare -a extraFlags
|
||||
|
||||
if [ "$PRIVATE_NETWORK" = 1 ]; then
|
||||
extraFlags+=" --private-network"
|
||||
extraFlags+=("--private-network")
|
||||
fi
|
||||
|
||||
if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] ||
|
||||
[ -n "$HOST_ADDRESS6" ] || [ -n "$LOCAL_ADDRESS6" ]; then
|
||||
extraFlags+=" --network-veth"
|
||||
extraFlags+=("--network-veth")
|
||||
fi
|
||||
|
||||
if [ -n "$HOST_PORT" ]; then
|
||||
@ -123,30 +125,30 @@ let
|
||||
IFS=","
|
||||
for i in $HOST_PORT
|
||||
do
|
||||
extraFlags+=" --port=$i"
|
||||
extraFlags+=("--port=$i")
|
||||
done
|
||||
IFS=$OIFS
|
||||
fi
|
||||
|
||||
if [ -n "$HOST_BRIDGE" ]; then
|
||||
extraFlags+=" --network-bridge=$HOST_BRIDGE"
|
||||
extraFlags+=("--network-bridge=$HOST_BRIDGE")
|
||||
fi
|
||||
|
||||
extraFlags+=" ${concatStringsSep " " (mapAttrsToList nspawnExtraVethArgs cfg.extraVeths)}"
|
||||
extraFlags+=(${lib.escapeShellArgs (mapAttrsToList nspawnExtraVethArgs cfg.extraVeths)})
|
||||
|
||||
for iface in $INTERFACES; do
|
||||
extraFlags+=" --network-interface=$iface"
|
||||
extraFlags+=("--network-interface=$iface")
|
||||
done
|
||||
|
||||
for iface in $MACVLANS; do
|
||||
extraFlags+=" --network-macvlan=$iface"
|
||||
extraFlags+=("--network-macvlan=$iface")
|
||||
done
|
||||
|
||||
# If the host is 64-bit and the container is 32-bit, add a
|
||||
# --personality flag.
|
||||
${optionalString (pkgs.stdenv.hostPlatform.system == "x86_64-linux") ''
|
||||
if [ "$(< "''${SYSTEM_PATH:-/nix/var/nix/profiles/per-container/$INSTANCE/system}/system")" = i686-linux ]; then
|
||||
extraFlags+=" --personality=x86"
|
||||
extraFlags+=("--personality=x86")
|
||||
fi
|
||||
''}
|
||||
|
||||
@ -157,9 +159,11 @@ let
|
||||
# Kill signal handling means systemd-nspawn will pass a system-halt signal
|
||||
# to the container systemd when it receives SIGTERM for container shutdown;
|
||||
# containerInit and stage2 have to handle this as well.
|
||||
# TODO: fix shellcheck issue properly
|
||||
# shellcheck disable=SC2086
|
||||
exec ${config.systemd.package}/bin/systemd-nspawn \
|
||||
--keep-unit \
|
||||
-M "$INSTANCE" -D "$root" $extraFlags \
|
||||
-M "$INSTANCE" -D "$root" "''${extraFlags[@]}" \
|
||||
$EXTRA_NSPAWN_FLAGS \
|
||||
--notify-ready=yes \
|
||||
--kill-signal=SIGRTMIN+3 \
|
||||
|
||||
@ -123,7 +123,7 @@ rustPlatform.buildRustPackage rec {
|
||||
wasm-pack
|
||||
httplz
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
++ lib.optionals stdenv.buildPlatform.isDarwin [
|
||||
python3
|
||||
];
|
||||
|
||||
|
||||
@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])
|
||||
if stdenv.hostPlatform.isAarch64 then
|
||||
rec {
|
||||
pname = "brave";
|
||||
version = "1.70.119";
|
||||
version = "1.70.123";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
|
||||
hash = "sha256-we/M1/hMdnxxKfhS6q+Lc3G2OCj+wyBpoC6pfd0Ta08=";
|
||||
hash = "sha256-YqSZYQinNyQQQds5ACyDCeZA+D4sBxyMvMiOvD6CVeU=";
|
||||
platform = "aarch64-linux";
|
||||
}
|
||||
else if stdenv.hostPlatform.isx86_64 then
|
||||
rec {
|
||||
pname = "brave";
|
||||
version = "1.70.119";
|
||||
version = "1.70.123";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-GtFkE0R4s0G9pO2Omt1V+YvBv0kvyJrcPc41ba07TTQ=";
|
||||
hash = "sha256-Hr7/Yry7fhSDe1gzpZqtjuIDrbB6HuC1PSeBQ3HlAdE=";
|
||||
platform = "x86_64-linux";
|
||||
}
|
||||
else
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "iroh";
|
||||
version = "0.25.0";
|
||||
version = "0.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "n0-computer";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hF1Nf4+uJXVPpkfsLFKjySMmCSmJdX2LeSHNb0vrBoA=";
|
||||
hash = "sha256-MQJQsM1nH6p91JWPR75iAvNox8eem4ZnM6n5DUxFzlE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-t1re2vpxGZkC45n0jUytqe2SPAC/+fh4Itq1h9znYnM=";
|
||||
cargoHash = "sha256-24sBTXE+2CeiietuSL3UNbsjkE25gnYkQtc62RgD6eM=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
|
||||
with darwin.apple_sdk.frameworks; [
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
lib,
|
||||
restic,
|
||||
util-linux,
|
||||
stdenv,
|
||||
}:
|
||||
let
|
||||
pname = "backrest";
|
||||
@ -44,8 +45,17 @@ buildGoModule {
|
||||
|
||||
nativeCheckInputs = [ util-linux ];
|
||||
|
||||
# Fails with handler returned wrong content encoding
|
||||
checkFlags = [ "-skip=TestServeIndex" ];
|
||||
checkFlags =
|
||||
let
|
||||
skippedTests =
|
||||
[
|
||||
"TestServeIndex" # Fails with handler returned wrong content encoding
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
"TestBackup" # relies on ionice
|
||||
];
|
||||
in
|
||||
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
||||
|
||||
preCheck = ''
|
||||
# Use restic from nixpkgs, otherwise download fails in sandbox
|
||||
|
||||
@ -1,37 +1,14 @@
|
||||
{
|
||||
lib,
|
||||
git,
|
||||
python3,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
pydantic-yaml = super.pydantic-yaml.overridePythonAttrs (old: rec {
|
||||
version = "0.11.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NowanIlfideme";
|
||||
repo = "pydantic-yaml";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-AeUyVav0/k4Fz69Qizn4hcJKoi/CDR9eUan/nJhWsDY=";
|
||||
};
|
||||
dependencies = with self; [
|
||||
deprecated
|
||||
importlib-metadata
|
||||
pydantic_1
|
||||
ruamel-yaml
|
||||
types-deprecated
|
||||
];
|
||||
});
|
||||
};
|
||||
};
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "charmcraft";
|
||||
version = "3.1.2";
|
||||
version = "3.2.1";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@ -39,14 +16,14 @@ python.pkgs.buildPythonApplication rec {
|
||||
owner = "canonical";
|
||||
repo = "charmcraft";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Qi2ZtAYgQlKj77QPovcT3RrPwAlEwaFyoJ0MAq4EETE=";
|
||||
hash = "sha256-VqJZP82OIfxPBkayq0ijXDsotgKPbo34RTMuNkLfjls=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace charmcraft/__init__.py --replace-fail "dev" "${version}"
|
||||
'';
|
||||
|
||||
dependencies = with python.pkgs; [
|
||||
dependencies = with python3Packages; [
|
||||
craft-application
|
||||
craft-cli
|
||||
craft-parts
|
||||
@ -58,7 +35,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
humanize
|
||||
jinja2
|
||||
jsonschema
|
||||
pydantic_1
|
||||
pydantic
|
||||
python-dateutil
|
||||
pyyaml
|
||||
requests
|
||||
@ -69,15 +46,15 @@ python.pkgs.buildPythonApplication rec {
|
||||
urllib3
|
||||
];
|
||||
|
||||
build-system = with python.pkgs; [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
build-system = with python3Packages; [ setuptools-scm ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"urllib3"
|
||||
"craft-application"
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [ "urllib3" ];
|
||||
|
||||
nativeCheckInputs =
|
||||
with python.pkgs;
|
||||
with python3Packages;
|
||||
[
|
||||
hypothesis
|
||||
pyfakefs
|
||||
|
||||
@ -33,9 +33,8 @@ buildNpmPackage rec {
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
electron
|
||||
autoPatchelfHook # for onnx libs
|
||||
pkg-config
|
||||
];
|
||||
] ++ lib.optional stdenv.isLinux autoPatchelfHook; # for onnx libs
|
||||
|
||||
buildInputs = [
|
||||
stdenv.cc.cc.lib # for libstdc++.so, required by onnxruntime
|
||||
|
||||
@ -113,6 +113,6 @@ rustPlatform.buildRustPackage rec {
|
||||
];
|
||||
# NOTE: `aligned_alloc` error on darwin SDK < 10.15. Can't do usual overrideSDK with rust toolchain in current implementation.
|
||||
# Should be fixed with darwin SDK refactor and can be revisited.
|
||||
broken = stdenv.isDarwin && stdenv.isx86_64;
|
||||
badPlatforms = [ "x86_64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -29,5 +29,6 @@ buildGoModule rec {
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "go-secdump";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
From 58eeb4eeee8a9e7f9fa9c62443d00f0ec6797078 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
|
||||
Date: Fri, 6 Sep 2024 17:10:01 -0400
|
||||
Subject: [PATCH] incusd/instance/qemu: Force threads I/O mode for
|
||||
unsafe/writeback
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The default "native" aioMode requires direct I/O which is incompatible
|
||||
with unsafe/writeback.
|
||||
|
||||
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
|
||||
---
|
||||
internal/server/instance/drivers/driver_qemu.go | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/internal/server/instance/drivers/driver_qemu.go b/internal/server/instance/drivers/driver_qemu.go
|
||||
index 9609b73c1b..a5a4944d40 100644
|
||||
--- a/internal/server/instance/drivers/driver_qemu.go
|
||||
+++ b/internal/server/instance/drivers/driver_qemu.go
|
||||
@@ -4088,9 +4088,11 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string]
|
||||
noFlushCache := false // Don't ignore any flush requests for the device.
|
||||
|
||||
if cacheMode == "unsafe" {
|
||||
+ aioMode = "threads"
|
||||
directCache = false
|
||||
noFlushCache = true
|
||||
} else if cacheMode == "writeback" {
|
||||
+ aioMode = "threads"
|
||||
directCache = false
|
||||
}
|
||||
|
||||
@ -1,11 +1,6 @@
|
||||
import ./generic.nix {
|
||||
hash = "sha256-FdoJI0SUH8KS3Epyw/HejgyhISWGLePsIjYUS2YTBvc=";
|
||||
version = "6.5.0";
|
||||
vendorHash = "sha256-8e2X7HIy1IEx6p41SHJyq5dNUJ3rRC2maXC4uNaSlnk=";
|
||||
patches = [
|
||||
# qemu 9.1 compat, remove in 6.6
|
||||
./572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch
|
||||
./58eeb4eeee8a9e7f9fa9c62443d00f0ec6797078.patch
|
||||
./0c37b7e3ec65b4d0e166e2127d9f1835320165b8.patch
|
||||
];
|
||||
hash = "sha256-hjBJGtIBYwgPpnWb1337RP1jU9rQNLQ3yp1AnwBH13o=";
|
||||
version = "6.6.0";
|
||||
vendorHash = "sha256-Cpbgn2WHMVKtPrAzuNnXkS1rYvzLwde6oTcKTKW3XHs=";
|
||||
patches = [ ];
|
||||
}
|
||||
|
||||
@ -7,12 +7,12 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "latexminted";
|
||||
version = "0.1.0";
|
||||
version = "0.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-h7M45e8DDfpZix4Ej6fqSMQIP0zEUvCXfthJLzpIY18=";
|
||||
hash = "sha256-vJziNgVYcnJfmAnok2OeYZEOwGtGfhZyup3D3+BuZsU=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
jemalloc,
|
||||
ffmpeg-headless,
|
||||
writeShellScript,
|
||||
xcbuild,
|
||||
...
|
||||
}:
|
||||
|
||||
@ -32,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pnpm.configHook
|
||||
makeWrapper
|
||||
python3
|
||||
];
|
||||
] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun ];
|
||||
|
||||
# https://nixos.org/manual/nixpkgs/unstable/#javascript-pnpm
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
|
||||
@ -47,8 +47,12 @@ stdenv.mkDerivation rec {
|
||||
++ (lib.optional enableGui qtbase)
|
||||
++ (lib.optional stdenv.cc.isClang llvmPackages.openmp);
|
||||
|
||||
cmakeFlags =
|
||||
[ "-DCURRENT_GIT_VERSION=${lib.substring 0 7 (lib.elemAt srcs 0).rev}"
|
||||
cmakeFlags = let
|
||||
# the specified version must always start with "nextpnr-", so add it if
|
||||
# missing (e.g. if the user overrides with a git hash)
|
||||
rev = main_src.rev;
|
||||
version = if (lib.hasPrefix "nextpnr-" rev) then rev else "nextpnr-${rev}";
|
||||
in ["-DCURRENT_GIT_VERSION=${version}"
|
||||
"-DARCH=generic;ice40;ecp5;gowin;himbaechel"
|
||||
"-DBUILD_TESTS=ON"
|
||||
"-DICESTORM_INSTALL_PREFIX=${icestorm}"
|
||||
|
||||
@ -1,59 +1,20 @@
|
||||
{
|
||||
lib,
|
||||
python3,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
dpkg,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
craft-application = super.craft-application.overridePythonAttrs (old: rec {
|
||||
version = "1.2.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "canonical";
|
||||
repo = "craft-application";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-CXZEWVoE66dlQJp4G8tinufjyaDJaH1Muxz/qd/81oA=";
|
||||
};
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "setuptools==67.7.2" "setuptools"
|
||||
'';
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
});
|
||||
pydantic-yaml = super.pydantic-yaml.overridePythonAttrs (old: rec {
|
||||
version = "0.11.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NowanIlfideme";
|
||||
repo = "pydantic-yaml";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-AeUyVav0/k4Fz69Qizn4hcJKoi/CDR9eUan/nJhWsDY=";
|
||||
};
|
||||
dependencies = with self; [
|
||||
deprecated
|
||||
importlib-metadata
|
||||
pydantic_1
|
||||
ruamel-yaml
|
||||
types-deprecated
|
||||
];
|
||||
});
|
||||
};
|
||||
};
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "rockcraft";
|
||||
version = "1.2.3";
|
||||
version = "1.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "canonical";
|
||||
repo = "rockcraft";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Qk7Fi4I/5TCf9llGTsTBQsAxUkeVmAlH6tFNYMsyZ1c=";
|
||||
rev = "1d87e33cf207b3a2f16eb125743ec11546fa0cb1";
|
||||
hash = "sha256-QnW3BMu4Tuvj8PCt5eYJbNMiojXpyJ1uza6hpMxxSOE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -64,17 +25,19 @@ python.pkgs.buildPythonApplication rec {
|
||||
--replace-fail "distutils.util" "setuptools.dist"
|
||||
'';
|
||||
|
||||
build-system = with python.pkgs; [ setuptools-scm ];
|
||||
build-system = with python3Packages; [ setuptools-scm ];
|
||||
|
||||
dependencies = with python.pkgs; [
|
||||
dependencies = with python3Packages; [
|
||||
craft-application
|
||||
craft-archives
|
||||
craft-platforms
|
||||
spdx-lookup
|
||||
];
|
||||
|
||||
nativeCheckInputs =
|
||||
with python.pkgs;
|
||||
with python3Packages;
|
||||
[
|
||||
craft-platforms
|
||||
pytest-check
|
||||
pytest-mock
|
||||
pytest-subprocess
|
||||
|
||||
83
pkgs/by-name/ru/ruff/Cargo.lock
generated
83
pkgs/by-name/ru/ruff/Cargo.lock
generated
@ -225,7 +225,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
"regex-automata 0.4.6",
|
||||
"regex-automata 0.4.8",
|
||||
"serde",
|
||||
]
|
||||
|
||||
@ -879,9 +879,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "fastrand"
|
||||
version = "2.0.2"
|
||||
version = "2.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984"
|
||||
checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
|
||||
|
||||
[[package]]
|
||||
name = "fern"
|
||||
@ -994,8 +994,8 @@ dependencies = [
|
||||
"aho-corasick",
|
||||
"bstr",
|
||||
"log",
|
||||
"regex-automata 0.4.6",
|
||||
"regex-syntax 0.8.3",
|
||||
"regex-automata 0.4.8",
|
||||
"regex-syntax 0.8.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1114,7 +1114,7 @@ dependencies = [
|
||||
"globset",
|
||||
"log",
|
||||
"memchr",
|
||||
"regex-automata 0.4.6",
|
||||
"regex-automata 0.4.8",
|
||||
"same-file",
|
||||
"walkdir",
|
||||
"winapi-util",
|
||||
@ -1347,9 +1347,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.158"
|
||||
version = "0.2.159"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
|
||||
checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
|
||||
|
||||
[[package]]
|
||||
name = "libcst"
|
||||
@ -1405,9 +1405,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
|
||||
|
||||
[[package]]
|
||||
name = "linux-raw-sys"
|
||||
version = "0.4.13"
|
||||
version = "0.4.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
|
||||
checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
|
||||
|
||||
[[package]]
|
||||
name = "lock_api"
|
||||
@ -2084,6 +2084,7 @@ dependencies = [
|
||||
"hashbrown",
|
||||
"insta",
|
||||
"ordermap",
|
||||
"red_knot_vendored",
|
||||
"ruff_db",
|
||||
"ruff_index",
|
||||
"ruff_python_ast",
|
||||
@ -2092,7 +2093,6 @@ dependencies = [
|
||||
"ruff_python_stdlib",
|
||||
"ruff_source_file",
|
||||
"ruff_text_size",
|
||||
"ruff_vendored",
|
||||
"rustc-hash 2.0.0",
|
||||
"salsa",
|
||||
"smallvec",
|
||||
@ -2127,6 +2127,17 @@ dependencies = [
|
||||
"tracing-subscriber",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "red_knot_vendored"
|
||||
version = "0.0.0"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
"path-slash",
|
||||
"ruff_db",
|
||||
"walkdir",
|
||||
"zip",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "red_knot_wasm"
|
||||
version = "0.0.0"
|
||||
@ -2152,11 +2163,11 @@ dependencies = [
|
||||
"notify",
|
||||
"rayon",
|
||||
"red_knot_python_semantic",
|
||||
"red_knot_vendored",
|
||||
"ruff_cache",
|
||||
"ruff_db",
|
||||
"ruff_python_ast",
|
||||
"ruff_text_size",
|
||||
"ruff_vendored",
|
||||
"rustc-hash 2.0.0",
|
||||
"salsa",
|
||||
"tempfile",
|
||||
@ -2194,14 +2205,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.10.6"
|
||||
version = "1.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
|
||||
checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
"regex-automata 0.4.6",
|
||||
"regex-syntax 0.8.3",
|
||||
"regex-automata 0.4.8",
|
||||
"regex-syntax 0.8.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -2215,13 +2226,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "regex-automata"
|
||||
version = "0.4.6"
|
||||
version = "0.4.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
|
||||
checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
"regex-syntax 0.8.3",
|
||||
"regex-syntax 0.8.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -2232,9 +2243,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
|
||||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.8.3"
|
||||
version = "0.8.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
|
||||
checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
|
||||
|
||||
[[package]]
|
||||
name = "ring"
|
||||
@ -2253,7 +2264,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ruff"
|
||||
version = "0.6.8"
|
||||
version = "0.6.9"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"argfile",
|
||||
@ -2325,6 +2336,7 @@ dependencies = [
|
||||
"ruff_python_formatter",
|
||||
"ruff_python_parser",
|
||||
"ruff_python_trivia",
|
||||
"rustc-hash 2.0.0",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"tikv-jemallocator",
|
||||
@ -2472,7 +2484,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ruff_linter"
|
||||
version = "0.6.8"
|
||||
version = "0.6.9"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"annotate-snippets 0.9.2",
|
||||
@ -2790,20 +2802,9 @@ dependencies = [
|
||||
"static_assertions",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ruff_vendored"
|
||||
version = "0.0.0"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
"path-slash",
|
||||
"ruff_db",
|
||||
"walkdir",
|
||||
"zip",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ruff_wasm"
|
||||
version = "0.6.8"
|
||||
version = "0.6.9"
|
||||
dependencies = [
|
||||
"console_error_panic_hook",
|
||||
"console_log",
|
||||
@ -2886,9 +2887,9 @@ checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
|
||||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "0.38.34"
|
||||
version = "0.38.37"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
|
||||
checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
|
||||
dependencies = [
|
||||
"bitflags 2.6.0",
|
||||
"errno",
|
||||
@ -3245,9 +3246,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.77"
|
||||
version = "2.0.79"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
|
||||
checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@ -3267,9 +3268,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tempfile"
|
||||
version = "3.12.0"
|
||||
version = "3.13.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
|
||||
checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"fastrand",
|
||||
|
||||
@ -8,19 +8,18 @@
|
||||
rust-jemalloc-sys,
|
||||
ruff-lsp,
|
||||
nix-update-script,
|
||||
testers,
|
||||
ruff,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ruff";
|
||||
version = "0.6.8";
|
||||
version = "0.6.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "ruff";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-guRg35waq6w+P8eaXJFwMtROoXU3d3yURGwzG2SIzhc=";
|
||||
hash = "sha256-O8iRCVxHrchBSf9kLdkdT0+oMi+5fLCAF9CMEsPrHqw=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
@ -44,10 +43,11 @@ rustPlatform.buildRustPackage rec {
|
||||
--zsh <($out/bin/ruff generate-shell-completion zsh)
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
inherit ruff-lsp;
|
||||
passthru = {
|
||||
tests = {
|
||||
inherit ruff-lsp;
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
version = testers.testVersion { package = ruff; };
|
||||
};
|
||||
|
||||
# Failing on darwin for an unclear reason.
|
||||
@ -73,6 +73,12 @@ rustPlatform.buildRustPackage rec {
|
||||
"--skip=unix::symlink_inside_workspace"
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgramArg = [ "--version" ];
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Extremely fast Python linter";
|
||||
homepage = "https://github.com/astral-sh/ruff";
|
||||
|
||||
10
pkgs/by-name/sc/scala-next/package.nix
Normal file
10
pkgs/by-name/sc/scala-next/package.nix
Normal file
@ -0,0 +1,10 @@
|
||||
{ scala, fetchurl }:
|
||||
|
||||
scala.bare.overrideAttrs (oldAttrs: {
|
||||
version = "3.5.1";
|
||||
pname = "scala-next";
|
||||
src = fetchurl {
|
||||
inherit (oldAttrs.src) url;
|
||||
hash = "sha256-pRfoCXFVnnEh3zyB9HbUZK3qrQ94Gq3iXX2fWGS/l9o=";
|
||||
};
|
||||
})
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
buildGo123Module,
|
||||
fetchFromGitHub,
|
||||
fetchYarnDeps,
|
||||
yarnConfigHook,
|
||||
@ -10,13 +10,13 @@
|
||||
}:
|
||||
let
|
||||
|
||||
version = "1.10.5";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "screego";
|
||||
repo = "server";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4WF9PfG6W1BLBqgWkKhTFEzed0+jDpRFMTsHw/1lPnQ=";
|
||||
hash = "sha256-PTGIcv+jgX8t37otBypuZG6DaGIeo92+w6YlRynIkZE=";
|
||||
};
|
||||
|
||||
ui = stdenv.mkDerivation {
|
||||
@ -27,7 +27,7 @@ let
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/ui/yarn.lock";
|
||||
hash = "sha256-ye8UDkal10k/5uCd0VrZsG2FJGB727q+luExFTUmB/M=";
|
||||
hash = "sha256-yjHxyKEqXMxYsm+KroPB9KulfqYSOU/7ghbKnlSFrd0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -36,6 +36,10 @@ let
|
||||
nodejs
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
cp -r build $out
|
||||
'';
|
||||
@ -44,12 +48,12 @@ let
|
||||
|
||||
in
|
||||
|
||||
buildGoModule rec {
|
||||
buildGo123Module rec {
|
||||
inherit src version;
|
||||
|
||||
pname = "screego-server";
|
||||
|
||||
vendorHash = "sha256-ry8LO+KmNU9MKL8/buk9qriDe/zq+2uIsws6wVZmoo4=";
|
||||
vendorHash = "sha256-190Fp2QtnZis0sophGwhnWhXNWLhODWlnzE3bfScZ+Q=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
@ -68,6 +72,8 @@ buildGoModule rec {
|
||||
mv $out/bin/server $out/bin/screego
|
||||
'';
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Screen sharing for developers";
|
||||
homepage = "https://screego.net";
|
||||
|
||||
@ -5,37 +5,14 @@
|
||||
lib,
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
python3,
|
||||
python3Packages,
|
||||
squashfsTools,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
pydantic-yaml = super.pydantic-yaml.overridePythonAttrs (old: rec {
|
||||
version = "0.11.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NowanIlfideme";
|
||||
repo = "pydantic-yaml";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-AeUyVav0/k4Fz69Qizn4hcJKoi/CDR9eUan/nJhWsDY=";
|
||||
};
|
||||
dependencies = with self; [
|
||||
deprecated
|
||||
importlib-metadata
|
||||
pydantic_1
|
||||
ruamel-yaml
|
||||
types-deprecated
|
||||
];
|
||||
});
|
||||
};
|
||||
};
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "snapcraft";
|
||||
version = "8.3.3";
|
||||
version = "8.4.1";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@ -43,7 +20,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
owner = "canonical";
|
||||
repo = "snapcraft";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-xE+5nYvXawl9HjeBI9ogwyYAVCj/sPoMCVfEeZL5vN4=";
|
||||
hash = "sha256-34LtQ0CV5Ov0RJvN2eNFYEvtccHebpqjaYlhExE/z4c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -93,7 +70,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
dependencies = with python.pkgs; [
|
||||
dependencies = with python3Packages; [
|
||||
attrs
|
||||
catkin-pkg
|
||||
click
|
||||
@ -102,6 +79,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
craft-cli
|
||||
craft-grammar
|
||||
craft-parts
|
||||
craft-platforms
|
||||
craft-providers
|
||||
craft-store
|
||||
debian
|
||||
@ -136,7 +114,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
validators
|
||||
];
|
||||
|
||||
build-system = with python.pkgs; [ setuptools ];
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"docutils"
|
||||
@ -151,7 +129,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
'';
|
||||
|
||||
nativeCheckInputs =
|
||||
with python.pkgs;
|
||||
with python3Packages;
|
||||
[
|
||||
pytest-check
|
||||
pytest-cov-stub
|
||||
|
||||
@ -45,7 +45,7 @@
|
||||
# point to this derivations `/dsmi_dir` directory symlink.
|
||||
# Other environment variables might be necessary,
|
||||
# depending on local configuration or usage; see:
|
||||
# https://www.ibm.com/docs/en/storage-protect/8.1.23?topic=solaris-set-api-environment-variables
|
||||
# https://www.ibm.com/docs/en/storage-protect/8.1.24?topic=solaris-set-api-environment-variables
|
||||
|
||||
|
||||
# The newest version of TSM client should be discoverable by
|
||||
@ -104,10 +104,10 @@ let
|
||||
|
||||
unwrapped = stdenv.mkDerivation (finalAttrs: {
|
||||
name = "tsm-client-${finalAttrs.version}-unwrapped";
|
||||
version = "8.1.23.0";
|
||||
version = "8.1.24.0";
|
||||
src = fetchurl {
|
||||
url = mkSrcUrl finalAttrs.version;
|
||||
hash = "sha512-LydzEvzcv7sizSQkVmkbJ/WhunP6oJm32M6nstIfSginCLwYoSb5WbnjeQq2PM2xncFN8W/SteUtCPYbOVKaKA==";
|
||||
hash = "sha512-TqTDE2oJK/Wu/MNYUCqxmOE6asAqDLz4GtdcFZuKqvfT8pJUCYKz9yjRPIrM3u2XfLH0wDq+Q8ER4ui680mswA==";
|
||||
};
|
||||
inherit meta passthru;
|
||||
|
||||
|
||||
47
pkgs/by-name/wc/wchisp/package.nix
Normal file
47
pkgs/by-name/wc/wchisp/package.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchCrate,
|
||||
pkg-config,
|
||||
libusb1,
|
||||
nix-update-script,
|
||||
testers,
|
||||
wchisp,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wchisp";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-6WNXsRvbldEjAykMn1DCiuKctBrsTHGv1fJuRXBblu0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-5kJ0MK0rUzyJvLZH/3nje+gTAM6et0mNE3sxVoK1L5s=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
libusb1
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion {
|
||||
package = wchisp;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A command-line implementation of WCHISPTool, for flashing ch32 MCUs";
|
||||
homepage = "https://ch32-rs.github.io/wchisp/";
|
||||
changelog = "https://github.com/ch32-rs/wchisp/releases/tag/v${version}";
|
||||
license = with licenses; [ gpl2Only ];
|
||||
platforms = with platforms; linux ++ darwin ++ windows;
|
||||
broken = !stdenv.hostPlatform.isLinux;
|
||||
maintainers = with maintainers; [ jwillikers ];
|
||||
mainProgram = "wchisp";
|
||||
};
|
||||
}
|
||||
@ -4,7 +4,7 @@
|
||||
lib,
|
||||
}:
|
||||
let
|
||||
version = "0.2.1";
|
||||
version = "0.3.0";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "wush";
|
||||
@ -14,10 +14,10 @@ buildGoModule {
|
||||
owner = "coder";
|
||||
repo = "wush";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kxynXymCz3cLEeeINT72Xl8TOEAFyB4Z3y5WNtARnSI=";
|
||||
hash = "sha256-2mFe1p15HRyy86pw5LoBtiW9lKrw/N9V81/jkiT4jo4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-g3QqXII9nI5+wBa2YyTajz15Bx1F5/6PV9oNlbcZbe4=";
|
||||
vendorHash = "sha256-Po1DDKP9ekScRDGMjCXZr9HUUwFenQx3bzIZrNI+ctY=";
|
||||
|
||||
ldflags = [
|
||||
"-s -w -X main.version=${version}"
|
||||
|
||||
@ -15,18 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
name = "xmoji";
|
||||
version = "0.5.1";
|
||||
version = "0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Zirias";
|
||||
repo = "xmoji";
|
||||
rev =
|
||||
let
|
||||
inherit (lib.versions) majorMinor patch;
|
||||
inherit (finalAttrs) version;
|
||||
in
|
||||
"refs/tags/v${majorMinor version}-${patch version}";
|
||||
hash = "sha256-ZZ1jW97JUv003bAMZZfGWbAAPgeZlpBKREaedFi3R8M=";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-uYynbzexj1MDHcU8tryJLCGmqTfYOmY0vXrHZ3MlZa0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -1,15 +1,25 @@
|
||||
{ lib, stdenv, fetchurl, makeWrapper, jre, ncurses }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
makeWrapper,
|
||||
jre,
|
||||
ncurses,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "3.3.3";
|
||||
pname = "scala-bare";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lampepfl/dotty/releases/download/${version}/scala3-${version}.tar.gz";
|
||||
url = "https://github.com/scala/scala3/releases/download/${finalAttrs.version}/scala3-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-61lAETEvqkEqr5pbDltFkh+Qvp+EnCDilXN9X67NFNE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jre ncurses.dev ] ;
|
||||
propagatedBuildInputs = [
|
||||
jre
|
||||
ncurses.dev
|
||||
];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
@ -20,23 +30,24 @@ stdenv.mkDerivation rec {
|
||||
# Use preFixup instead of fixupPhase
|
||||
# because we want the default fixupPhase as well
|
||||
preFixup = ''
|
||||
bin_files=$(find $out/bin -type f ! -name common)
|
||||
for f in $bin_files ; do
|
||||
wrapProgram $f --set JAVA_HOME ${jre} --prefix PATH : '${ncurses.dev}/bin'
|
||||
done
|
||||
bin_files=$(find $out/bin -type f ! -name "*common*" ! -name "scala-cli.jar")
|
||||
for f in $bin_files ; do
|
||||
wrapProgram $f --set JAVA_HOME ${jre} --prefix PATH : '${ncurses.dev}/bin'
|
||||
done
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Research platform for new language concepts and compiler technologies for Scala";
|
||||
longDescription = ''
|
||||
Dotty is a platform to try out new language concepts and compiler technologies for Scala.
|
||||
The focus is mainly on simplification. We remove extraneous syntax (e.g. no XML literals),
|
||||
and try to boil down Scala’s types into a smaller set of more fundamental constructs.
|
||||
The theory behind these constructs is researched in DOT, a calculus for dependent object types.
|
||||
'';
|
||||
homepage = "http://dotty.epfl.ch/";
|
||||
license = licenses.bsd3;
|
||||
description = "The Scala 3 compiler, also known as Dotty";
|
||||
homepage = "https://scala-lang.org/";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ karolchmist virusdave kashw2 ];
|
||||
maintainers = with maintainers; [
|
||||
karolchmist
|
||||
virusdave
|
||||
kashw2
|
||||
natsukagami
|
||||
hamzaremmal
|
||||
dottybot
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -1,8 +1,19 @@
|
||||
{ stdenv, fetchurl, makeWrapper, jre, callPackage }:
|
||||
{
|
||||
stdenv,
|
||||
fetchurl,
|
||||
makeWrapper,
|
||||
jre,
|
||||
callPackage,
|
||||
}:
|
||||
|
||||
let
|
||||
bare = callPackage ./bare.nix {
|
||||
inherit stdenv fetchurl makeWrapper jre;
|
||||
inherit
|
||||
stdenv
|
||||
fetchurl
|
||||
makeWrapper
|
||||
jre
|
||||
;
|
||||
};
|
||||
in
|
||||
|
||||
@ -21,4 +32,7 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
inherit (bare) meta;
|
||||
} // { inherit bare; }
|
||||
}
|
||||
// {
|
||||
inherit bare;
|
||||
}
|
||||
|
||||
@ -11,7 +11,6 @@
|
||||
, glib
|
||||
, wrapGAppsHook3
|
||||
, gsettings-desktop-schemas
|
||||
, buildPortalsInGnome ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@ -36,19 +35,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
glib
|
||||
gtk3
|
||||
xdg-desktop-portal
|
||||
] ++ lib.optionals buildPortalsInGnome [
|
||||
gsettings-desktop-schemas # settings exposed by settings portal
|
||||
gnome-desktop
|
||||
gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s, just mouse and xsettings)
|
||||
];
|
||||
|
||||
mesonFlags = lib.optionals (!buildPortalsInGnome) [
|
||||
"-Dwallpaper=disabled"
|
||||
"-Dsettings=disabled"
|
||||
"-Dappchooser=disabled"
|
||||
"-Dlockdown=disabled"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Desktop integration portals for sandboxed apps";
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "awslambdaric";
|
||||
version = "2.1.0";
|
||||
version = "2.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = isPy27;
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "aws";
|
||||
repo = "aws-lambda-python-runtime-interface-client";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-FHZ7ZTCOzElW/DM07TScp6bfOOFe4b307q/ALVX1fWQ=";
|
||||
sha256 = "sha256-IA2Kx4+U0+8lPl9TTTZC46Y3WhSUb5HR5Hr9QZSJIDU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ simplejson ];
|
||||
|
||||
412
pkgs/development/python-modules/blake3/Cargo.lock
generated
Normal file
412
pkgs/development/python-modules/blake3/Cargo.lock
generated
Normal file
@ -0,0 +1,412 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 3
|
||||
|
||||
[[package]]
|
||||
name = "arrayref"
|
||||
version = "0.3.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
|
||||
|
||||
[[package]]
|
||||
name = "arrayvec"
|
||||
version = "0.7.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
|
||||
|
||||
[[package]]
|
||||
name = "autocfg"
|
||||
version = "1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "2.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
|
||||
|
||||
[[package]]
|
||||
name = "blake3"
|
||||
version = "0.4.1"
|
||||
dependencies = [
|
||||
"blake3 1.5.4",
|
||||
"hex",
|
||||
"pyo3",
|
||||
"rayon",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "blake3"
|
||||
version = "1.5.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7"
|
||||
dependencies = [
|
||||
"arrayref",
|
||||
"arrayvec",
|
||||
"cc",
|
||||
"cfg-if",
|
||||
"constant_time_eq",
|
||||
"memmap2",
|
||||
"rayon-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.1.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0"
|
||||
dependencies = [
|
||||
"shlex",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "constant_time_eq"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-deque"
|
||||
version = "0.8.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
|
||||
dependencies = [
|
||||
"crossbeam-epoch",
|
||||
"crossbeam-utils",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-epoch"
|
||||
version = "0.9.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
|
||||
dependencies = [
|
||||
"crossbeam-utils",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-utils"
|
||||
version = "0.8.20"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
|
||||
|
||||
[[package]]
|
||||
name = "either"
|
||||
version = "1.13.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
|
||||
|
||||
[[package]]
|
||||
name = "heck"
|
||||
version = "0.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
|
||||
|
||||
[[package]]
|
||||
name = "hex"
|
||||
version = "0.4.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
|
||||
|
||||
[[package]]
|
||||
name = "indoc"
|
||||
version = "2.0.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.158"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
|
||||
|
||||
[[package]]
|
||||
name = "lock_api"
|
||||
version = "0.4.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"scopeguard",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "memmap2"
|
||||
version = "0.9.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "memoffset"
|
||||
version = "0.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.19.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot"
|
||||
version = "0.12.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
|
||||
dependencies = [
|
||||
"lock_api",
|
||||
"parking_lot_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot_core"
|
||||
version = "0.9.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"redox_syscall",
|
||||
"smallvec",
|
||||
"windows-targets",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "portable-atomic"
|
||||
version = "1.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.86"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pyo3"
|
||||
version = "0.20.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"indoc",
|
||||
"libc",
|
||||
"memoffset",
|
||||
"parking_lot",
|
||||
"portable-atomic",
|
||||
"pyo3-build-config",
|
||||
"pyo3-ffi",
|
||||
"pyo3-macros",
|
||||
"unindent",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pyo3-build-config"
|
||||
version = "0.20.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
"target-lexicon",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pyo3-ffi"
|
||||
version = "0.20.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"pyo3-build-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pyo3-macros"
|
||||
version = "0.20.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"pyo3-macros-backend",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pyo3-macros-backend"
|
||||
version = "0.20.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
"pyo3-build-config",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.37"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rayon"
|
||||
version = "1.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
|
||||
dependencies = [
|
||||
"either",
|
||||
"rayon-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rayon-core"
|
||||
version = "1.12.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
|
||||
dependencies = [
|
||||
"crossbeam-deque",
|
||||
"crossbeam-utils",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.5.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "scopeguard"
|
||||
version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
|
||||
|
||||
[[package]]
|
||||
name = "shlex"
|
||||
version = "1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
|
||||
|
||||
[[package]]
|
||||
name = "smallvec"
|
||||
version = "1.13.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.77"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "target-lexicon"
|
||||
version = "0.12.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
|
||||
|
||||
[[package]]
|
||||
name = "unindent"
|
||||
version = "0.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
|
||||
|
||||
[[package]]
|
||||
name = "windows-targets"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm",
|
||||
"windows_aarch64_msvc",
|
||||
"windows_i686_gnu",
|
||||
"windows_i686_gnullvm",
|
||||
"windows_i686_msvc",
|
||||
"windows_x86_64_gnu",
|
||||
"windows_x86_64_gnullvm",
|
||||
"windows_x86_64_msvc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnullvm"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
|
||||
58
pkgs/development/python-modules/blake3/default.nix
Normal file
58
pkgs/development/python-modules/blake3/default.nix
Normal file
@ -0,0 +1,58 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
libiconv,
|
||||
numpy,
|
||||
pytestCheckHook,
|
||||
rustPlatform,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "blake3";
|
||||
version = "0.4.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oconnor663";
|
||||
repo = "blake3-py";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Ju40ea8IQMOPg9BiN47BMmr/WU8HptbqqzVI+jNGpA8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
ln -s '${./Cargo.lock}' Cargo.lock
|
||||
'';
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
libiconv
|
||||
];
|
||||
|
||||
nativeBuildInputs = with rustPlatform; [
|
||||
cargoSetupHook
|
||||
maturinBuildHook
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
numpy
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "blake3" ];
|
||||
|
||||
meta = {
|
||||
description = "Python bindings for the BLAKE3 cryptographic hash function";
|
||||
homepage = "https://github.com/oconnor663/blake3-py";
|
||||
changelog = "https://github.com/oconnor663/blake3-py/releases/tag/${version}";
|
||||
license = with lib.licenses; [
|
||||
cc0
|
||||
asl20
|
||||
];
|
||||
maintainers = with lib.maintainers; [ Luflosi ];
|
||||
};
|
||||
}
|
||||
@ -10,12 +10,13 @@
|
||||
fetchFromGitHub,
|
||||
git,
|
||||
hypothesis,
|
||||
license-expression,
|
||||
nix-update-script,
|
||||
pydantic-yaml,
|
||||
pyfakefs,
|
||||
pygit2,
|
||||
pytest-check,
|
||||
pytest-mock,
|
||||
pytest-subprocess,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
pyyaml,
|
||||
@ -26,7 +27,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "craft-application";
|
||||
version = "3.2.0";
|
||||
version = "4.2.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -35,12 +36,12 @@ buildPythonPackage rec {
|
||||
owner = "canonical";
|
||||
repo = "craft-application";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-2JfCe7FJtuObC/4miA+OC/ctGy1fhdgI7DsowNYjQk8=";
|
||||
hash = "sha256-Z9jiIVPh/DozFHoE478VQWinpohOOQplkxFP2ZyAySE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "setuptools==70.1.0" "setuptools"
|
||||
--replace-fail "setuptools==74.1.1" "setuptools"
|
||||
'';
|
||||
|
||||
build-system = [ setuptools-scm ];
|
||||
@ -56,7 +57,7 @@ buildPythonPackage rec {
|
||||
craft-grammar
|
||||
craft-parts
|
||||
craft-providers
|
||||
pydantic-yaml
|
||||
license-expression
|
||||
pygit2
|
||||
pyyaml
|
||||
snap-helpers
|
||||
@ -68,6 +69,7 @@ buildPythonPackage rec {
|
||||
pyfakefs
|
||||
pytest-check
|
||||
pytest-mock
|
||||
pytest-subprocess
|
||||
pytestCheckHook
|
||||
responses
|
||||
];
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
launchpadlib,
|
||||
lazr-restfulclient,
|
||||
overrides,
|
||||
pydantic_1,
|
||||
pydantic,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
tabulate,
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "craft-archives";
|
||||
version = "1.2.0";
|
||||
version = "2.0.0";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "canonical";
|
||||
repo = "craft-archives";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-4BYRwuBDKFbVvK805e+L4ZR8wtS8GHHYteexH4YZmSE=";
|
||||
hash = "sha256-BrKyOdfbwt9qU5Bt/kX/+GgxH7LCFmmFg4mevBWVp2I=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -36,16 +36,13 @@ buildPythonPackage rec {
|
||||
--replace-fail "setuptools==67.7.2" "setuptools"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
launchpadlib
|
||||
lazr-restfulclient
|
||||
overrides
|
||||
pydantic_1
|
||||
pydantic
|
||||
tabulate
|
||||
];
|
||||
|
||||
|
||||
@ -4,15 +4,15 @@
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
overrides,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
pytestCheckHook,
|
||||
pydantic_1,
|
||||
pydantic,
|
||||
pyyaml,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "craft-grammar";
|
||||
version = "1.2.0";
|
||||
version = "2.0.1";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@ -20,17 +20,17 @@ buildPythonPackage rec {
|
||||
owner = "canonical";
|
||||
repo = "craft-grammar";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-YQpxgdmUxYLkhAXDLlkLAK6VpjIEycLFY3nsE/M4o2g=";
|
||||
hash = "sha256-xex+7rCXqRegnws470VtVltM49fx7fSHzWDZawRmOdM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
propagatedBuildInputs = [ overrides ];
|
||||
dependencies = [ overrides ];
|
||||
|
||||
pythonImportsCheck = [ "craft_grammar" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pydantic_1
|
||||
pydantic
|
||||
pytestCheckHook
|
||||
pyyaml
|
||||
];
|
||||
|
||||
@ -4,8 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
overrides,
|
||||
pydantic_1,
|
||||
pydantic-yaml,
|
||||
pydantic,
|
||||
pyxdg,
|
||||
pyyaml,
|
||||
requests,
|
||||
@ -17,6 +16,7 @@
|
||||
pytest-subprocess,
|
||||
requests-mock,
|
||||
hypothesis,
|
||||
jsonschema,
|
||||
git,
|
||||
squashfsTools,
|
||||
setuptools-scm,
|
||||
@ -25,7 +25,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "craft-parts";
|
||||
version = "1.33.0";
|
||||
version = "2.1.1";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||
owner = "canonical";
|
||||
repo = "craft-parts";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-SP2mkaXsU0btnA3aanSA18GkdW6ReLgImOWdpnwZiyU=";
|
||||
hash = "sha256-I98YQDJJroCnAQgepDXqYnH5M2WZTGDljm/KufGd7yM=";
|
||||
};
|
||||
|
||||
patches = [ ./bash-path.patch ];
|
||||
@ -43,12 +43,12 @@ buildPythonPackage rec {
|
||||
pythonRelaxDeps = [
|
||||
"requests"
|
||||
"urllib3"
|
||||
"pydantic"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
overrides
|
||||
pydantic_1
|
||||
pydantic-yaml
|
||||
pydantic
|
||||
pyxdg
|
||||
pyyaml
|
||||
requests
|
||||
@ -61,6 +61,7 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [
|
||||
git
|
||||
hypothesis
|
||||
jsonschema
|
||||
pytest-check
|
||||
pytest-mock
|
||||
pytest-subprocess
|
||||
@ -105,7 +106,6 @@ buildPythonPackage rec {
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
broken = lib.versionAtLeast pydantic-yaml.version "1";
|
||||
description = "Software artifact parts builder from Canonical";
|
||||
homepage = "https://github.com/canonical/craft-parts";
|
||||
changelog = "https://github.com/canonical/craft-parts/releases/tag/${version}";
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
distro,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
hypothesis,
|
||||
pytest-check,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "craft-platforms";
|
||||
version = "0.2.0";
|
||||
version = "0.3.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -23,17 +23,14 @@ buildPythonPackage rec {
|
||||
owner = "canonical";
|
||||
repo = "craft-platforms";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-chCPuncy+//Y5iohTh0d8qRNaEno6Sqze2Zoas3uwPQ=";
|
||||
hash = "sha256-VDSwvBWoGHcjGCEA4RDVwRzQGNVaphwZu/iaktAweb0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace craft_platforms/__init__.py --replace-fail "dev" "${version}"
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
dependencies = [
|
||||
annotated-types
|
||||
@ -41,6 +38,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
hypothesis
|
||||
pytestCheckHook
|
||||
pytest-check
|
||||
];
|
||||
|
||||
@ -5,10 +5,9 @@
|
||||
nix-update-script,
|
||||
packaging,
|
||||
platformdirs,
|
||||
pydantic_1,
|
||||
pydantic,
|
||||
pyyaml,
|
||||
requests-unixsocket,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
urllib3,
|
||||
pytest-check,
|
||||
@ -22,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "craft-providers";
|
||||
version = "1.24.2";
|
||||
version = "2.0.3";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@ -30,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "canonical";
|
||||
repo = "craft-providers";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-2629Xk2KB1WX3JzAupBWmKg+Ztp5FFJ0x9Xa/w+8tns=";
|
||||
hash = "sha256-DTUXT5vFIDI06oxka3diWJ5E5oqiX6GXB4ivq6+VrDk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -52,21 +51,18 @@ buildPythonPackage rec {
|
||||
# The urllib3 incompat: https://github.com/msabramo/requests-unixsocket/pull/69
|
||||
# This is already patched in nixpkgs.
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "setuptools==" "setuptools>=" \
|
||||
--replace-fail "setuptools==73.0.1" "setuptools" \
|
||||
--replace-fail "urllib3<2" "urllib3"
|
||||
'';
|
||||
|
||||
pythonRelaxDeps = [ "requests" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
packaging
|
||||
platformdirs
|
||||
pydantic_1
|
||||
pydantic
|
||||
pyyaml
|
||||
requests-unixsocket
|
||||
urllib3
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
setuptools-scm,
|
||||
pytest-check,
|
||||
pytest-mock,
|
||||
pydantic_1,
|
||||
pydantic,
|
||||
pyyaml,
|
||||
pytestCheckHook,
|
||||
keyring_24,
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "craft-store";
|
||||
version = "2.6.2";
|
||||
version = "3.0.2";
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||
owner = "canonical";
|
||||
repo = "craft-store";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-QKfXOgAWMV1mVm32ZP3HQTJmWKm82dEDmy3fo5d67TU=";
|
||||
hash = "sha256-l8WnuaMJN4/nZRkWoU6omgbd4hKR2m7YC+YVcvAqzcA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -36,16 +36,13 @@ buildPythonPackage rec {
|
||||
--replace-fail "setuptools==" "setuptools>="
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
keyring_24
|
||||
macaroonbakery
|
||||
overrides
|
||||
pydantic_1
|
||||
pydantic
|
||||
pyxdg
|
||||
requests
|
||||
requests-toolbelt
|
||||
@ -56,7 +53,7 @@ buildPythonPackage rec {
|
||||
pythonImportsCheck = [ "craft_store" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pydantic_1
|
||||
pydantic
|
||||
pytest-check
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
@ -30,16 +29,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dm-control";
|
||||
version = "1.0.22";
|
||||
version = "1.0.23";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google-deepmind";
|
||||
repo = "dm_control";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Tw4VZmunSeb0H7ltPnLCEidSZ2cvcoWLei1DB32vWpw=";
|
||||
hash = "sha256-eSvER3lceAEZZ+DhCjvjNW3YpdzCeP/lly5AP3eDnbA=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fire";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "google";
|
||||
repo = "python-fire";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-tBmsy0MuJu0Ei+4lUy/XfKoOU+OuH4xqmjPv/uKVuwg=";
|
||||
hash = "sha256-cYlkMnZOa0J6dOiWsWZplk/MajVRiCYe8tK3641fD0w=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -11,12 +11,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "getjump";
|
||||
version = "2.5.0";
|
||||
version = "2.6.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-3VxsKum6aB35XYjz9ZKkUBdPuofOWzG+ttkX9pnzu7U=";
|
||||
hash = "sha256-WuAsTfOe38i90jWqOpIBYbizmb9gLtXD+ttZ1WAFDes=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "krb5";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-cSugkvvjoo7BiCC7Gx7SzBA3t1xccDP5cMaoyXu9Egk=";
|
||||
hash = "sha256-ajCPLhfRUcOVsk5q7Hvf9qVv42J6MgQvyG1BI5ipLd0=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "labelbox";
|
||||
version = "4.0.0";
|
||||
version = "5.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -40,7 +40,7 @@ buildPythonPackage rec {
|
||||
owner = "Labelbox";
|
||||
repo = "labelbox-python";
|
||||
rev = "refs/tags/v.${version}";
|
||||
hash = "sha256-jIbSKT/jRWVyN2LH6Ih0VFc5QKICR7cYONzGpZ9bJvM=";
|
||||
hash = "sha256-M55cwT7BrY+8m9ec+2bKDCxGkHJp/c50Gzib4sEg7Bk=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/labelbox";
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "manim-slides";
|
||||
version = "5.1.7";
|
||||
version = "5.1.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -44,7 +44,7 @@ buildPythonPackage rec {
|
||||
owner = "jeertmans";
|
||||
repo = "manim-slides";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-egQYL4Qvs1fQcJ5WEM461TSYqs2XN39wbyfx9uEFeIs=";
|
||||
hash = "sha256-0csCUJpIeq3EyER9gqiUgqrfHL9WSzX144Y0djL3dqQ=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@ -21,35 +21,12 @@
|
||||
tifffile,
|
||||
lmdb,
|
||||
mmengine,
|
||||
symlinkJoin,
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (torch) cudaCapabilities cudaPackages cudaSupport;
|
||||
inherit (cudaPackages) backendStdenv cudaVersion;
|
||||
inherit (cudaPackages) backendStdenv;
|
||||
|
||||
cuda-common-redist = with cudaPackages; [
|
||||
cuda_cccl # <thrust/*>
|
||||
libcublas # cublas_v2.h
|
||||
libcusolver # cusolverDn.h
|
||||
libcusparse # cusparse.h
|
||||
];
|
||||
|
||||
cuda-native-redist = symlinkJoin {
|
||||
name = "cuda-native-redist-${cudaVersion}";
|
||||
paths =
|
||||
with cudaPackages;
|
||||
[
|
||||
cuda_cudart # cuda_runtime.h
|
||||
cuda_nvcc
|
||||
]
|
||||
++ cuda-common-redist;
|
||||
};
|
||||
|
||||
cuda-redist = symlinkJoin {
|
||||
name = "cuda-redist-${cudaVersion}";
|
||||
paths = cuda-common-redist;
|
||||
};
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "mmcv";
|
||||
@ -65,6 +42,8 @@ buildPythonPackage rec {
|
||||
hash = "sha256-NNF9sLJWV1q6uBE73LUW4UWwYm4TBMTBJjJkFArBmsc=";
|
||||
};
|
||||
|
||||
env.CUDA_HOME = lib.optionalString cudaSupport (lib.getDev cudaPackages.cuda_nvcc);
|
||||
|
||||
preConfigure =
|
||||
''
|
||||
export MMCV_WITH_OPS=1
|
||||
@ -77,7 +56,7 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace "cpu_use = 4" "cpu_use = $NIX_BUILD_CORES"
|
||||
substituteInPlace setup.py --replace-fail "cpu_use = 4" "cpu_use = $NIX_BUILD_CORES"
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
@ -102,12 +81,23 @@ buildPythonPackage rec {
|
||||
nativeBuildInputs = [
|
||||
ninja
|
||||
which
|
||||
] ++ lib.optionals cudaSupport [ cuda-native-redist ];
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pybind11
|
||||
torch
|
||||
] ++ lib.optionals cudaSupport [ cuda-redist ];
|
||||
buildInputs =
|
||||
[
|
||||
pybind11
|
||||
torch
|
||||
]
|
||||
++ lib.optionals cudaSupport (
|
||||
with cudaPackages;
|
||||
[
|
||||
cuda_cudart # cuda_runtime.h
|
||||
cuda_cccl # <thrust/*>
|
||||
libcublas # cublas_v2.h
|
||||
libcusolver # cusolverDn.h
|
||||
libcusparse # cusparse.h
|
||||
]
|
||||
);
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "modelcif";
|
||||
version = "1.0";
|
||||
version = "1.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ihmwg";
|
||||
repo = "python-modelcif";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-zJLwBdyUyWnH1hBx9Kejl5NfY7zJUxeGb//swBT02Dw=";
|
||||
hash = "sha256-HUS9MW6jbwjK3I6egmmsH+Bx+nNgszWc3t3QRo/EWpc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -33,12 +33,12 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "pwntools";
|
||||
version = "4.13.0";
|
||||
version = "4.13.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-HVyiU4PsEPtk4o0ULB2Gj5HqHFOpPTUx0wFdgwgo08M=";
|
||||
hash = "sha256-szInJftQMdwwll44VQc2CNmr900qv5enLGfUSq3843w=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydeconz";
|
||||
version = "116";
|
||||
version = "117";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "Kane610";
|
||||
repo = "deconz";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-XtcAs+xKSTJcQN0mCj6ewkT7owvA7nlZ8PhWfL9NZh8=";
|
||||
hash = "sha256-G04Lb92yrSQBs/Vc3wW60jR74nsWzfjAUfQPzqVhoLk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygraphviz";
|
||||
version = "1.13";
|
||||
version = "1.14";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "pygraphviz";
|
||||
repo = "pygraphviz";
|
||||
rev = "refs/tags/pygraphviz-${version}";
|
||||
hash = "sha256-/H7eHgs3jtbgat8//1Y1S3iV5s0UBKW+J+zK+f8qGqI=";
|
||||
hash = "sha256-RyUmT2djj2GnVG82xO9HULMAJZb2LYMUGDRvCwaYBg8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysmlight";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smlight-tech";
|
||||
repo = "pysmlight";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-b1f17jOEDQFtwBJa2zhbI8j2rRoMNJy8/WsVWanf6BI=";
|
||||
hash = "sha256-ouPUNKlTlF2t2K7RMG7oDSfeITjNPoGb5pNC7oUyGDI=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-ecobee-api";
|
||||
version = "0.2.19";
|
||||
version = "0.2.20";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "nkgilley";
|
||||
repo = "python-ecobee-api";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-osEqDUVf7fU5DWRUQyFaM8jOi2OgSqbtMaLSWMKQMPw=";
|
||||
hash = "sha256-ffCd109hweeKJn+nnsVo/kDVg3bam/WONZWJOA2EibE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -17,14 +17,14 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "webdataset";
|
||||
version = "0.2.100";
|
||||
version = "0.2.107";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "webdataset";
|
||||
repo = "webdataset";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-+Rvb4VY4qBcVKM1CUkLZTQdlZklpHcuiMO8r6VNInLc=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-L9RUQItmW/7O/eTst2Sl/415EP4Jo662bKWbYA6p5bk=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@ -16,14 +16,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-update";
|
||||
version = "14.1.1";
|
||||
version = "15.0.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-2UV+BetL6MBHAyPcMTbssLNgJQKoJOo2iG3uGPWSrUs=";
|
||||
hash = "sha256-2Z/fRd80qZi61KO07gx3Jdnslxv1KUCubv9bIUmjGKU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Qn2DquO3HmhZvCk6FaowodgURvtA5gXrztN+wp60bSA=";
|
||||
cargoHash = "sha256-v5rsFzox1x2pf/LilZy/YI985sL5Pigm2GGaCWWjB7s=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fastly";
|
||||
version = "10.14.1";
|
||||
version = "10.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastly";
|
||||
repo = "cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7awNvXlumeY6GXB91rUs8/rWIon0ig3C6S11fBdRj6Y=";
|
||||
hash = "sha256-zKF9ef28lZns2WWZ7BjLSP7Z5N5+wIaztLmgfzA05+c=";
|
||||
# The git commit is part of the `fastly version` original output;
|
||||
# leave that output the same in nixpkgs. Use the `.git` directory
|
||||
# to retrieve the commit SHA, and remove the directory afterwards,
|
||||
@ -33,7 +33,7 @@ buildGoModule rec {
|
||||
"cmd/fastly"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-innmJ40h80SFx8dRVsY4vR5QehFuavkl357zShXiyIE=";
|
||||
vendorHash = "sha256-PoP4dMhNj+pHPSNmX24W/qipUJJeL88mjx1sqtcF40M=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "sof-firmware";
|
||||
version = "2024.06";
|
||||
version = "2024.09";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/thesofproject/sof-bin/releases/download/v${version}/sof-bin-${version}.tar.gz";
|
||||
sha256 = "sha256-WByjKFu1aDeolUlT9inr3c5kQVK2c+zUu/rhUEMG19Y=";
|
||||
sha256 = "sha256-6kfZn4E1kAjQdhi8oQPPePgthOlAv+lBoor+B8jLxiA=";
|
||||
};
|
||||
|
||||
dontFixup = true; # binaries must not be stripped or patchelfed
|
||||
|
||||
@ -32,31 +32,31 @@
|
||||
"6.1": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-v6.1.110-hardened1.patch",
|
||||
"sha256": "1v43n3h9d3y3xjjyf6r8n7a3fh3zpqw4f925bn2z5vwzblmg4bhf",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.110-hardened1/linux-hardened-v6.1.110-hardened1.patch"
|
||||
"name": "linux-hardened-v6.1.112-hardened1.patch",
|
||||
"sha256": "1kna12dhs1csg2cd9ixm261pgnc44v7q67njd0z1mnjrk9q1y7n6",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.112-hardened1/linux-hardened-v6.1.112-hardened1.patch"
|
||||
},
|
||||
"sha256": "0slgvwldjdyi5vzhgriamkmrj4p942yacclgcw29331gfjs39gly",
|
||||
"version": "6.1.110"
|
||||
"sha256": "094z3wfcxqx2rbi072i5frshpy6rdvk39aahwm9nc07vc8sxxn4b",
|
||||
"version": "6.1.112"
|
||||
},
|
||||
"6.10": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-v6.10.10-hardened1.patch",
|
||||
"sha256": "13hlk1qd9inq711bz2sw4rq6r2lcagdl7mwxkx6rq8iimic758f2",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.10.10-hardened1/linux-hardened-v6.10.10-hardened1.patch"
|
||||
"name": "linux-hardened-v6.10.12-hardened1.patch",
|
||||
"sha256": "07z35f4nqj9vgj2ynq7spgckb770a0w0906m7l28i1x0kch2kr3j",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.10.12-hardened1/linux-hardened-v6.10.12-hardened1.patch"
|
||||
},
|
||||
"sha256": "1kcvh1g3p1sj4q34ylcmm43824f97z4k695lcxnzp7pbnlsyg1z6",
|
||||
"version": "6.10.10"
|
||||
"sha256": "1kvkwgnq5gsdqarrdg32qjrbq1dggxp1x2yy2zpsjsaq5y2mhj2j",
|
||||
"version": "6.10.12"
|
||||
},
|
||||
"6.6": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-v6.6.51-hardened1.patch",
|
||||
"sha256": "03m82lylflnk466ixz3dywnj7scp6ynif4qhbx67ak3f0n44f738",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.51-hardened1/linux-hardened-v6.6.51-hardened1.patch"
|
||||
"name": "linux-hardened-v6.6.53-hardened1.patch",
|
||||
"sha256": "09i25qrn18psyrzr8srav4zcbyqmn2z8ycfk9fix2pdfxsaxl8h9",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.53-hardened1/linux-hardened-v6.6.53-hardened1.patch"
|
||||
},
|
||||
"sha256": "1cq8l3n12gnk6kgms5c7v71l199ip8lc9fpx7s8w8y88cla9l30w",
|
||||
"version": "6.6.51"
|
||||
"sha256": "0yfpyiz57wz9rkwif6n3k2n87waw46ad0h7h0pwhnar53cfihp98",
|
||||
"version": "6.6.53"
|
||||
}
|
||||
}
|
||||
|
||||
@ -20,15 +20,15 @@
|
||||
"hash": "sha256:0axkwfhvq3w2072xjqww476qa3rjglxyqmf72mlp9b5ymswil8kp"
|
||||
},
|
||||
"6.6": {
|
||||
"version": "6.6.53",
|
||||
"hash": "sha256:0yfpyiz57wz9rkwif6n3k2n87waw46ad0h7h0pwhnar53cfihp98"
|
||||
"version": "6.6.54",
|
||||
"hash": "sha256:186ggr0yz7fgp05qav6k6j72aazvwdljdnf2zwb5q194dafqdbjz"
|
||||
},
|
||||
"6.10": {
|
||||
"version": "6.10.12",
|
||||
"hash": "sha256:1kvkwgnq5gsdqarrdg32qjrbq1dggxp1x2yy2zpsjsaq5y2mhj2j"
|
||||
"version": "6.10.13",
|
||||
"hash": "sha256:0smimvnivdswiggplz9x65d03vdysgr3v9iijbk4f5fva0iypz2z"
|
||||
},
|
||||
"6.11": {
|
||||
"version": "6.11.1",
|
||||
"hash": "sha256:0ggfg3f8nkcgs2pg7y5ccfrcjzj7j7x4n41g59gzbsp1nirj6dra"
|
||||
"version": "6.11.2",
|
||||
"hash": "sha256:0hlwsfq6brdkdcwdq6d1aq2b210hkqgpmy0y1sa5bfyfp6hgg7pc"
|
||||
}
|
||||
}
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.15.163-rt78"; # updated by ./update-rt.sh
|
||||
version = "5.15.167-rt79"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
@ -19,14 +19,14 @@ in buildLinux (args // {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
|
||||
sha256 = "00mkipkhz0i5xld7kyaxcj8cj8faw4gmjl5fribg832nn7ccfpq2";
|
||||
sha256 = "0c6s6l5sz9ibws7bymb393ww0z9i3amsk1yx0bahipz3xhc1yxdi";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "030aycnrcnjhylkqj0wrfi992v2l26v17rgvxl16514zpdjmiv1x";
|
||||
sha256 = "0z9yhg0vxzrqn2vyg973pd8qy5iq30jkza8c0mrjjpjzyc8jvm57";
|
||||
};
|
||||
}; in [ rt-patch ] ++ kernelPatches;
|
||||
|
||||
|
||||
@ -1,197 +0,0 @@
|
||||
From b68e8356cf85fa75582237b4bc02f47efc40e8f0 Mon Sep 17 00:00:00 2001
|
||||
From: Picnoir <picnoir@alternativebit.fr>
|
||||
Date: Tue, 6 Aug 2024 11:43:34 +0200
|
||||
Subject: [PATCH] cargo.lock: bump time version
|
||||
|
||||
Bumping time to 0.3.36. Fix the build for rustc > 1.80.
|
||||
|
||||
Fix https://github.com/twosigma/nsncd/issues/118
|
||||
---
|
||||
Cargo.lock | 74 ++++++++++++++++++++++++++++++++++++++++--------------
|
||||
1 file changed, 55 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index a043bde..f6ce6f4 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -205,6 +205,15 @@ version = "0.8.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
|
||||
|
||||
+[[package]]
|
||||
+name = "deranged"
|
||||
+version = "0.3.11"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
|
||||
+dependencies = [
|
||||
+ "powerfmt",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "dirs-next"
|
||||
version = "2.0.0"
|
||||
@@ -426,6 +435,12 @@ dependencies = [
|
||||
"temp-env",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "num-conv"
|
||||
+version = "0.1.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
|
||||
+
|
||||
[[package]]
|
||||
name = "num-derive"
|
||||
version = "0.3.3"
|
||||
@@ -434,7 +449,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn",
|
||||
+ "syn 1.0.109",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -519,20 +534,26 @@ dependencies = [
|
||||
"plotters-backend",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "powerfmt"
|
||||
+version = "0.2.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
|
||||
+
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
-version = "1.0.64"
|
||||
+version = "1.0.86"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da"
|
||||
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
-version = "1.0.23"
|
||||
+version = "1.0.36"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
|
||||
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
@@ -652,22 +673,22 @@ checksum = "621e3680f3e07db4c9c2c3fb07c6223ab2fab2e54bd3c04c3ae037990f428c32"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
-version = "1.0.154"
|
||||
+version = "1.0.204"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "8cdd151213925e7f1ab45a9bbfb129316bd00799784b174b7cc7bcd16961c49e"
|
||||
+checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
-version = "1.0.154"
|
||||
+version = "1.0.204"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "4fc80d722935453bcafdc2c9a73cd6fac4dc1938f0346035d84bf99fa9e33217"
|
||||
+checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn",
|
||||
+ "syn 2.0.72",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -745,6 +766,17 @@ dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "syn"
|
||||
+version = "2.0.72"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
|
||||
+dependencies = [
|
||||
+ "proc-macro2",
|
||||
+ "quote",
|
||||
+ "unicode-ident",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "take_mut"
|
||||
version = "0.2.2"
|
||||
@@ -788,7 +820,7 @@ checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn",
|
||||
+ "syn 1.0.109",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -803,11 +835,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "time"
|
||||
-version = "0.3.20"
|
||||
+version = "0.3.36"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
|
||||
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
|
||||
dependencies = [
|
||||
+ "deranged",
|
||||
"itoa",
|
||||
+ "num-conv",
|
||||
+ "powerfmt",
|
||||
"serde",
|
||||
"time-core",
|
||||
"time-macros",
|
||||
@@ -815,16 +850,17 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "time-core"
|
||||
-version = "0.1.0"
|
||||
+version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
|
||||
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
|
||||
|
||||
[[package]]
|
||||
name = "time-macros"
|
||||
-version = "0.2.8"
|
||||
+version = "0.2.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36"
|
||||
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
|
||||
dependencies = [
|
||||
+ "num-conv",
|
||||
"time-core",
|
||||
]
|
||||
|
||||
@@ -882,7 +918,7 @@ dependencies = [
|
||||
"once_cell",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn",
|
||||
+ "syn 1.0.109",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
||||
@@ -904,7 +940,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn",
|
||||
+ "syn 1.0.109",
|
||||
"wasm-bindgen-backend",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
@ -3,26 +3,22 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "nsncd";
|
||||
version = "1.4.1-unstable-2024-04-10";
|
||||
version = "1.4.1-unstable-2024-10-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twosigma";
|
||||
repo = "nsncd";
|
||||
rev = "7605e330d5a313a8656e6fcaf1c10cd6b5cdd427";
|
||||
hash = "sha256-Bd7qE9MP5coBCkr70TdoJfwYhQpdrn/zmN4KoARcaMI=";
|
||||
rev = "cf94e3cfc7dfff69867209c7e68945bac2d3913d";
|
||||
hash = "sha256-mjTbyO0b9i4LMv7DWHm0Y4z1pvcapCtFsHLV5cTAxQE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-N7U9YsyGh8+fLT973GGZTmVXcdnWhpqkeYTxzJ0rzdo=";
|
||||
|
||||
# TOREMOVE when https://github.com/twosigma/nsncd/pull/119 gets merged.
|
||||
cargoPatches = [ ./0001-cargo-bump.patch ];
|
||||
|
||||
# TOREMOVE when https://github.com/twosigma/nsncd/pull/119 gets merged.
|
||||
RUSTFLAGS = "-A dead_code";
|
||||
cargoHash = "sha256-cgdob/HmE6I59W5UQRItAFXDj7IvazNt99LbJlKQDNo=";
|
||||
|
||||
checkFlags = [
|
||||
# Relies on the test environment to be able to resolve "localhost"
|
||||
@ -46,4 +42,9 @@ rustPlatform.buildRustPackage {
|
||||
# never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
|
||||
passthru = {
|
||||
tests.nscd = nixosTests.nscd;
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
}
|
||||
|
||||
@ -69,11 +69,11 @@ rec {
|
||||
# Vulkan developer beta driver
|
||||
# See here for more information: https://developer.nvidia.com/vulkan-driver
|
||||
vulkan_beta = generic rec {
|
||||
version = "550.40.71";
|
||||
version = "550.40.75";
|
||||
persistencedVersion = "550.54.14";
|
||||
settingsVersion = "550.54.14";
|
||||
sha256_64bit = "sha256-LDh3Kz7Iop+Y2rxXANuPPkDr6WKPuZ5KV9L3+RPa2d0=";
|
||||
openSha256 = "sha256-0HGAE0SlQmEc75E0h7Oq7qu7rVfLhQoBqQF1OuHSa2Y=";
|
||||
sha256_64bit = "sha256-Bgze1hx2gTKhchNHNVTnPnGOqpUe5UjNXJW5tVFi0wE=";
|
||||
openSha256 = "sha256-NnJ3AxLWg90WjoZ81vzjII/UT2RaERF4IEZp5bRgElk=";
|
||||
settingsSha256 = "sha256-m2rNASJp0i0Ez2OuqL+JpgEF0Yd8sYVCyrOoo/ln2a4=";
|
||||
persistencedSha256 = "sha256-XaPN8jVTjdag9frLPgBtqvO/goB5zxeGzaTU0CdL6C4=";
|
||||
url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "uptime-kuma";
|
||||
version = "1.23.13";
|
||||
version = "1.23.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "louislam";
|
||||
repo = "uptime-kuma";
|
||||
rev = version;
|
||||
hash = "sha256-7JWn78gRLzuXuZjhTvjdJ7JVtLOtQ08zyokqkPdzYh0=";
|
||||
hash = "sha256-/UAou+l7ppXU3t54YYdDZcXUNvEw7VGcn/OVPXdFdj0=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-MKONzKCGYeMQK8JR9W9KiPLaqP/F0uAOzql4wZK4Sp4=";
|
||||
npmDepsHash = "sha256-KaOnlqvfGatrdEqtw2Y0SudLuyzU6yC78DWn3+EZcec=";
|
||||
|
||||
patches = [
|
||||
# Fixes the permissions of the database being not set correctly
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "zsh-forgit";
|
||||
version = "24.09.0";
|
||||
version = "24.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wfxr";
|
||||
repo = "forgit";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-8QgnEu41BHeX6heP2slQT+X+Dti+7Ij+J2zqmU4dm3I=";
|
||||
hash = "sha256-g1uedR9BLG0DuGdM/9xqFv6yhBHHnqjQMt1n0z9I29I=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -41,6 +41,8 @@ python3.pkgs.buildPythonApplication rec {
|
||||
"TestLoginUrl"
|
||||
"test_timeit2" # flakey, and depends sleep being precise to the milisecond
|
||||
"test_internet" # uses network, fails on Darwin (not sure why it doesn't fail on linux)
|
||||
"test_markdown" # uses sys.version_info for conditional testing
|
||||
"test_itms_services" # uses sys.version_info for conditional testing
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
let
|
||||
pkg_path = "$out/lib/ghidra";
|
||||
pname = "ghidra";
|
||||
version = "11.1.2";
|
||||
version = "11.2";
|
||||
|
||||
releaseName = "NIX";
|
||||
distroPrefix = "ghidra_${version}_${releaseName}";
|
||||
@ -28,7 +28,7 @@ let
|
||||
owner = "NationalSecurityAgency";
|
||||
repo = "Ghidra";
|
||||
rev = "Ghidra_${version}_build";
|
||||
hash = "sha256-FL1nLaq8A9PI+RzqZg5+O+4+ZsH16MG3cf7OIKimDqw=";
|
||||
hash = "sha256-iO6g3t8JNdc/wAC+JG+6Y7aZCq7T9zYQC3KKZcr+wzc=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
||||
32
pkgs/tools/security/ghidra/deps.json
generated
32
pkgs/tools/security/ghidra/deps.json
generated
@ -10,9 +10,6 @@
|
||||
"27/d6/003e593296a85fd6ed616ed962795b2f87709c3eee2bca4f6d0fe55c6d00/wheel-0.37.1-py2.py3-none-any": {
|
||||
"whl": "sha256-S9zX2EATgIYSbNCSVNxhlftPxvAcBQodcjbyYw2x0io="
|
||||
},
|
||||
"2d/e0/f877c91e036fcaed2a827f80d6cbdf1d26cffc3333c9ebda31c55c45f050/Pybag-2.2.10-py3-none-any": {
|
||||
"whl": "sha256-gc8eM91mfdIX3FahIzJnluZ5m4Vp8sbvt4wWN1yvmys="
|
||||
},
|
||||
"50/8f/518a37381e55a8857a638afa86143efa5508434613541402d20611a1b322/comtypes-1.4.1-py3-none-any": {
|
||||
"whl": "sha256-ogig48ocClNic12g/2YYIoAdzocxK4lNfXUq3QEKIbA="
|
||||
},
|
||||
@ -28,6 +25,9 @@
|
||||
"c7/42/be1c7bbdd83e1bfb160c94b9cafd8e25efc7400346cf7ccdbdb452c467fa/setuptools-68.0.0-py3-none-any": {
|
||||
"whl": "sha256-EeUsZ0FaOB0Q1rRiztnPuXBmF58OhxOZ4AbEqxAfyF8="
|
||||
},
|
||||
"ce/78/91db67e7fe1546dc8b02c38591b7732980373d2d252372f7358054031dd4/Pybag-2.2.12-py3-none-any": {
|
||||
"whl": "sha256-7aXubE6HOQKYG39SW0KgJCi4fHNo3yxb3+He0OaIQSY="
|
||||
},
|
||||
"d0/dd/b28df50316ca193dd1275a4c47115a720796d9e1501c1888c4bfa5dc2260/capstone-5.0.1-py3-none-win_amd64": {
|
||||
"whl": "sha256-G/pcgeaIDK9BoxlGzW0tBpwEi8wi7fEhJUtQGgSN5nU="
|
||||
}
|
||||
@ -38,37 +38,37 @@
|
||||
}
|
||||
},
|
||||
"https://github.com": {
|
||||
"NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2012_x64": {
|
||||
"NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vs2012_x64": {
|
||||
"fidb": "sha256-1OmKs/eQuDF5MhhDC7oNiySl+/TaZbDB/6jLDPvrDNw="
|
||||
},
|
||||
"NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2012_x86": {
|
||||
"NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vs2012_x86": {
|
||||
"fidb": "sha256-pJDtfi7SHlh0Wf6urOcDa37eTOhOcuEN/YxXQ0ppGLY="
|
||||
},
|
||||
"NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2015_x64": {
|
||||
"NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vs2015_x64": {
|
||||
"fidb": "sha256-4E6eQPnstgHIX02E7Zv2a0U2O+HR6CwWLkyZArjLUI8="
|
||||
},
|
||||
"NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2015_x86": {
|
||||
"NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vs2015_x86": {
|
||||
"fidb": "sha256-tm7mlmU+LtNlkZ3qrviFEDEgx5LiLnmvcNEgnX4dhkQ="
|
||||
},
|
||||
"NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2017_x64": {
|
||||
"NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vs2017_x64": {
|
||||
"fidb": "sha256-1fpfaXKYF0+lPSR9NZnmoSiEYFrRgce5VOI4DsHwvYk="
|
||||
},
|
||||
"NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2017_x86": {
|
||||
"NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vs2017_x86": {
|
||||
"fidb": "sha256-04nLjXb/SlnKNfiRuFIccq1fDfluJTlzotIahhSkzIE="
|
||||
},
|
||||
"NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2019_x64": {
|
||||
"NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vs2019_x64": {
|
||||
"fidb": "sha256-FQAHeW/DakBpZgrWJEmq2q890Rs4ZKXvIeeYMcnOkRg="
|
||||
},
|
||||
"NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vs2019_x86": {
|
||||
"NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vs2019_x86": {
|
||||
"fidb": "sha256-62MKNvqlhqNx63NNwLvY0TzK72l/PbWHJZY1jz3SQyo="
|
||||
},
|
||||
"NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vsOlder_x64": {
|
||||
"NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vsOlder_x64": {
|
||||
"fidb": "sha256-jDtR9GYM0n4aDWEKnz8tX7yDOmasnuQ5PuLySB6FWGY="
|
||||
},
|
||||
"NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/FunctionID/vsOlder_x86": {
|
||||
"NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/FunctionID/vsOlder_x86": {
|
||||
"fidb": "sha256-mGBca2uSFKlF2ETkHIWGDVRkmkW8p4c+9pkcDpNyB4c="
|
||||
},
|
||||
"NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.2/lib/java-sarif-2.1-modified": {
|
||||
"NationalSecurityAgency/ghidra-data/raw/Ghidra_11.2/lib/java-sarif-2.1-modified": {
|
||||
"jar": "sha256-f3NlZklHVtJxql5LGvbIncUNB0qxxjdKR9+CImQiawE="
|
||||
},
|
||||
"pxb1988/dex2jar/releases/download/v2.1/dex2jar-2.1": {
|
||||
@ -742,8 +742,8 @@
|
||||
"pydev/files/pydev/PyDev%206.3.1/PyDev%206.3.1": {
|
||||
"zip": "sha256-TYH+nYr+dmW46iCETT9RB/RGdCknxZlz6t5PKYCbBpk="
|
||||
},
|
||||
"yajsw/files/yajsw/yajsw-stable-13.09/yajsw-stable-13.09": {
|
||||
"zip": "sha256-Ta5zKlNYRq5d+rdT6CpNX5OtmgWgZeIXK7l3ShsVRTo="
|
||||
"yajsw/files/yajsw/yajsw-stable-13.12/yajsw-stable-13.12": {
|
||||
"zip": "sha256-xvxZgV04ANFOyXeSaor9P2BqDr100s/WBgFndGbt6qI="
|
||||
}
|
||||
},
|
||||
"https://storage.googleapis.com": {
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
buildGhidraExtension,
|
||||
ghidra,
|
||||
}:
|
||||
@ -14,7 +15,16 @@ buildGhidraExtension {
|
||||
rev = "0617c75746ddde7fe2bdbbf880175af8ad27553e";
|
||||
hash = "sha256-+G5ccdHnFL0sHpueuIYwLRU9FhzN658CYqQCHCBwxV4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch is needed to get the extension compiling with Ghidra 11.2.
|
||||
# Once it's fixed upstream, the src can be updated and this can be removed.
|
||||
(fetchpatch {
|
||||
# https://github.com/bootleg/ret-sync/pull/126
|
||||
name = "ghidra-11.2-fix.patch";
|
||||
url = "https://github.com/bootleg/ret-sync/commit/d81d953c24b4369b499e90ba64c1c9f78513a008.patch";
|
||||
hash = "sha256-t/voPcBfsZtfdYnskgBAPfqMTBw1LRTT0aXyyb5qtr8=";
|
||||
})
|
||||
];
|
||||
preConfigure = ''
|
||||
cd ext_ghidra
|
||||
'';
|
||||
|
||||
@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gtklock module adding power controls to the lockscreen";
|
||||
homepage = "https://github.com/jovanlanik/gtklock-powerbar-module";
|
||||
description = "Gtklock module adding media player controls to the lockscreen";
|
||||
homepage = "https://github.com/jovanlanik/gtklock-playerctl-module";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ aleksana ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -16757,39 +16757,11 @@ with pkgs;
|
||||
|
||||
guile = guile_3_0;
|
||||
|
||||
guile-cairo = callPackage ../development/guile-modules/guile-cairo { };
|
||||
|
||||
guile-commonmark = callPackage ../development/guile-modules/guile-commonmark { };
|
||||
|
||||
guile-config = callPackage ../development/guile-modules/guile-config { };
|
||||
|
||||
guile-fibers = callPackage ../development/guile-modules/guile-fibers { };
|
||||
|
||||
guile-gcrypt = callPackage ../development/guile-modules/guile-gcrypt { };
|
||||
|
||||
guile-git = callPackage ../development/guile-modules/guile-git { };
|
||||
|
||||
guile-gnutls = callPackage ../development/guile-modules/guile-gnutls { };
|
||||
|
||||
guile-json = callPackage ../development/guile-modules/guile-json { };
|
||||
|
||||
guile-lib = callPackage ../development/guile-modules/guile-lib { };
|
||||
|
||||
guile-ncurses = callPackage ../development/guile-modules/guile-ncurses { };
|
||||
|
||||
guile-opengl = callPackage ../development/guile-modules/guile-opengl { };
|
||||
|
||||
guile-reader = callPackage ../development/guile-modules/guile-reader { };
|
||||
|
||||
guile-sdl = callPackage ../by-name/gu/guile-sdl/package.nix {
|
||||
guile = guile_2_2;
|
||||
};
|
||||
|
||||
guile-sdl2 = callPackage ../development/guile-modules/guile-sdl2 { };
|
||||
|
||||
guile-ssh = callPackage ../development/guile-modules/guile-ssh { };
|
||||
|
||||
guile-xcb = callPackage ../development/guile-modules/guile-xcb {
|
||||
guile-xcb = callPackage ../by-name/gu/guile-xcb/package.nix {
|
||||
guile = guile_2_2;
|
||||
};
|
||||
|
||||
@ -17835,9 +17807,8 @@ with pkgs;
|
||||
|
||||
guff = callPackage ../tools/graphics/guff { };
|
||||
|
||||
guile-hall = callPackage ../development/tools/guile/guile-hall { };
|
||||
|
||||
gwrap = callPackage ../development/tools/guile/g-wrap {
|
||||
gwrap = g-wrap;
|
||||
g-wrap = callPackage ../by-name/g-/g-wrap/package.nix {
|
||||
guile = guile_2_2;
|
||||
};
|
||||
|
||||
|
||||
@ -1675,6 +1675,8 @@ self: super: with self; {
|
||||
|
||||
blackrenderer = callPackage ../development/python-modules/blackrenderer { };
|
||||
|
||||
blake3 = callPackage ../development/python-modules/blake3 { };
|
||||
|
||||
bleach = callPackage ../development/python-modules/bleach { };
|
||||
|
||||
bleach-allowlist = callPackage ../development/python-modules/bleach-allowlist { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user