Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -2,30 +2,43 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (attrs: {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "air-formatter";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "posit-dev";
|
||||
repo = "air";
|
||||
rev = attrs.version;
|
||||
hash = "sha256-BUbOG4D5UD+Z8Cpr4qodUrM3FFcMwjBd4M/YdPZPtpM=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ePTbXwOYIJF8xsiHR03EUwQnKP8KSN/8S8iRY8ME988=";
|
||||
};
|
||||
|
||||
# Remove duplicate entries from cargo lock
|
||||
cargoPatches = [ ./cargo-lock.patch ];
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-EnvhqAZK76O6g99OgLruQDBUe9m9bn5ier3bgHI/f+A=";
|
||||
cargoHash = "sha256-EHhelQDXGLZqbUia84OqU7frlRBXfi2oPDxhLuW7d64=";
|
||||
|
||||
useNextest = true;
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgram = "${placeholder "out"}/bin/air";
|
||||
versionCheckProgramArg = [ "--version" ];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "An extremely fast R code formatter";
|
||||
homepage = "https://posit-dev.github.io/air";
|
||||
changelog = "https://github.com/posit-dev/air/blob/" + attrs.version + "/CHANGELOG.md";
|
||||
changelog = "https://github.com/posit-dev/air/blob/${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.kupac ];
|
||||
mainProgram = "air";
|
||||
|
||||
@@ -27,13 +27,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "amdvlk";
|
||||
version = "2025.Q1.1";
|
||||
version = "2025.Q1.2";
|
||||
|
||||
src = fetchRepoProject {
|
||||
name = "amdvlk-src";
|
||||
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
|
||||
rev = "refs/tags/v-${finalAttrs.version}";
|
||||
hash = "sha256-snwNyi/8voptLhZkXLK0QNh7pKo4SFx1iQojNzVr1Ms=";
|
||||
hash = "sha256-NIRIrcCVFPxeILnfmOaE8yFBXYrXhtljXsccvoU2lf8=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@@ -23,19 +23,19 @@ let
|
||||
];
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "bacon";
|
||||
version = "3.10.0";
|
||||
version = "3.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = "bacon";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-FU7hIMAJIXD/pJ9FZSPkO1CQhmmSWwaewGyogGdZoeI=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yFU4U1TWoumg61Vs6F5Gqz22VuI2Qs0IRz/TPGBYX4E=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-+lk4YrJ7zI6t24y76kODfUok5Ibu3fFxpLIUQZQqgcw=";
|
||||
cargoHash = "sha256-g8DWFhgguxPked7kCCsmUPXzRqu5DaPopoxORBl4/1o=";
|
||||
|
||||
buildFeatures = lib.optionals withSound [
|
||||
"sound"
|
||||
@@ -62,11 +62,11 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "Background rust code checker";
|
||||
mainProgram = "bacon";
|
||||
homepage = "https://github.com/Canop/bacon";
|
||||
changelog = "https://github.com/Canop/bacon/blob/v${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/Canop/bacon/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
FlorianFranzen
|
||||
matthiasbeyer
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -17,20 +17,20 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "bruno";
|
||||
version = "1.38.1";
|
||||
version = "1.39.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usebruno";
|
||||
repo = "bruno";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-VZRVmOJkNjZLpIG5oBIbDVJl8EZhOtBMywwJKdfD9Hc=";
|
||||
hash = "sha256-WPbiQWfGE4rFxb/Xazxm+nu+RINLTQk7PnrLuY6giX0=";
|
||||
|
||||
postFetch = ''
|
||||
${lib.getExe npm-lockfile-fix} $out/package-lock.json
|
||||
'';
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-qgg/dpkBAbOgBeGC0BiKQTyLsOOKwfsJD3fhs/cXYHo=";
|
||||
npmDepsHash = "sha256-SIx2qIWqR1K9K2eUHo5tADdz4vk5ySdSWDBAjBFIVVc=";
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
|
||||
nativeBuildInputs =
|
||||
@@ -66,7 +66,7 @@ buildNpmPackage rec {
|
||||
|
||||
# disable telemetry
|
||||
substituteInPlace packages/bruno-app/src/providers/App/index.js \
|
||||
--replace-fail "useTelemetry();" ""
|
||||
--replace-fail "useTelemetry({ version });" ""
|
||||
'';
|
||||
|
||||
postConfigure = ''
|
||||
|
||||
@@ -9,17 +9,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cedar";
|
||||
version = "4.3.2";
|
||||
version = "4.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cedar-policy";
|
||||
repo = "cedar";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-by2Y+zh2fMvobFLl2eiUWtw2iU/znKt8YoZGKvdJK+g=";
|
||||
hash = "sha256-o4oSZcQdOQsCbu92w0jY/EQKGtQis+8tUxaLIqVC1po=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-5g4YYs96Dxp7HaZpHO3drEekZoDz/yiO0ngWeTnwnbo=";
|
||||
cargoHash = "sha256-1vEI0dtdb9CKhNvFeBL8KdxSfzF77X7zl1xxpvvRCQk=";
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion { package = cedar; };
|
||||
|
||||
@@ -25,14 +25,14 @@ with py.pkgs;
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "3.2.377";
|
||||
version = "3.2.379";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = "checkov";
|
||||
tag = version;
|
||||
hash = "sha256-lZJ4BKssV1stsclXwc3ymiQjA4XyGIWS+zw/gtOCd4Y=";
|
||||
hash = "sha256-TjSBAddoy6BD5XbztDH7G/ZSYeiwuZtgnefYJsWlXqs=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "clairvoyant";
|
||||
version = "3.1.8";
|
||||
version = "3.1.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cassidyjames";
|
||||
repo = "clairvoyant";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-SksJ0hOt2CJwrQj4dz63D53GM/PYx7Q/g+OgCo76dIE=";
|
||||
hash = "sha256-CSORiNPqzliIpslV28NRPs/+bc9iblsLTPOm1WxxTjc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -17,14 +17,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "drum-machine";
|
||||
version = "1.0.0";
|
||||
version = "1.3.1";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Revisto";
|
||||
repo = "drum-machine";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-7D9Cda0HILRC/RLySC7jEJ7QhoO2KOQBFNZtn9wD+54=";
|
||||
hash = "sha256-/ziI2rRuhGG/7VZbZi6lr+Lmbo2kt9VxH9bqtCdreQs=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -22,19 +22,19 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flare";
|
||||
version = "0.15.9";
|
||||
version = "0.15.12";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.com";
|
||||
owner = "schmiddi-on-mobile";
|
||||
repo = "flare";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-48BJ2k0j6y2IjwZg6ZBwdVNUV+u3lLNYdA04vyKP2U4=";
|
||||
hash = "sha256-qj34x/e5Nc3wPdFaHFZHQ8uCMHIlxfVNyvlp7eb3tSo=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-ckTROUWLAkkWfqOyUjEa/RQGd7CYSupqf4Sr6dOLfwU=";
|
||||
hash = "sha256-Nri3GOq7aaY3yIVQESMPUck3z8++FnAmIbIdkTe+GXw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -31,13 +31,13 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "frankenphp";
|
||||
version = "1.4.3";
|
||||
version = "1.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dunglas";
|
||||
repo = "frankenphp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-k5kLPUI3dV8C4rBeAM3ghmwXtas/Q16v332M3JlL8jk=";
|
||||
hash = "sha256-KuCc9IBneRst8ZnKksTX/8Z4/voVZxpymkZAXYmc37E=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/caddy";
|
||||
@@ -45,7 +45,7 @@ buildGoModule rec {
|
||||
# frankenphp requires C code that would be removed with `go mod tidy`
|
||||
# https://github.com/golang/go/issues/26366
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-snSkbgZPc92uQnpDc9+zdyiFnO35vCXYk1e80AwbVGA=";
|
||||
vendorHash = "sha256-lXVxROMrEoQuIC7DyK78UsbPtbIyZfQ5JGzkVzhOoWk=";
|
||||
|
||||
buildInputs = [
|
||||
phpUnwrapped
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "github-backup";
|
||||
version = "0.49.0";
|
||||
version = "0.50.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "josegonzalez";
|
||||
repo = "python-github-backup";
|
||||
tag = version;
|
||||
hash = "sha256-RoRRuFXgykifdpcq3uBAARc54YTfzn0NiGcGkwcmcbc=";
|
||||
hash = "sha256-c/e3PTQWq43ztsvTDExXAtwe1F+qcgwVTVl+hQz0mSY=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
@@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec {
|
||||
meta = with lib; {
|
||||
description = "Backup a github user or organization";
|
||||
homepage = "https://github.com/josegonzalez/python-github-backup";
|
||||
changelog = "https://github.com/josegonzalez/python-github-backup/blob/${version}/CHANGES.rst";
|
||||
changelog = "https://github.com/josegonzalez/python-github-backup/blob/${src.tag}/CHANGES.rst";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
mainProgram = "github-backup";
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "komikku";
|
||||
version = "1.70.0";
|
||||
version = "1.71.0";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitea {
|
||||
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "valos";
|
||||
repo = "Komikku";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JkuA7He3gVhKZGsZGZkfQad8jUDlG7MaLlfkuhpcd3w=";
|
||||
hash = "sha256-Y5mqSXV0a16pZVOgOjIeOrpMh8a53qLRmraLfIhKTVI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -38,7 +38,7 @@ makeSetupHook {
|
||||
xorg.libXi
|
||||
xorg.libxcb
|
||||
]
|
||||
++ lib.optionals (!stdenv.isDarwin) [
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
wayland
|
||||
vulkan-loader
|
||||
];
|
||||
@@ -64,7 +64,7 @@ makeSetupHook {
|
||||
# for x11rb
|
||||
"xcb"
|
||||
]
|
||||
++ lib.optionals (!stdenv.isDarwin) [
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
# for wgpu-hal, wayland-sys
|
||||
"wayland-client"
|
||||
# for wgpu-hal
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "1.156.1";
|
||||
version = "1.156.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-XzVpl9TnUU7inckjCCVGGGi4V2iIb9tiu9E5UUgZqXM=";
|
||||
hash = "sha256-CpFnO8stLLTH/XOZZS3j9nVrf2FRekjkQ/R1pmw5o9A=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
pname = "deltachat-core-rust";
|
||||
inherit version src;
|
||||
hash = "sha256-bCg8khR0z4F12CUNBMsRGR6ivnmKwLfDOzmLJS8XQno=";
|
||||
hash = "sha256-jrsGMNgKglk+Rq/ZGiZgSZrT4uSA5RjbTYaDtW0Ijyg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -27,16 +27,16 @@ let
|
||||
in
|
||||
phpPackage.buildComposerProject2 rec {
|
||||
pname = "librenms";
|
||||
version = "25.1.0";
|
||||
version = "25.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "librenms";
|
||||
repo = pname;
|
||||
tag = version;
|
||||
sha256 = "sha256-Uo+JOgb1KSZkludoupIIGnuK88ER3LthGnGmShpkrNU=";
|
||||
sha256 = "sha256-BzMtUYIKbfyap8TNmGy5RReKraOoafC0Jrnq8L5URtM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9cywwX0vWrvbi3HGARxrjsObckGiGbJPRILe0ASgrGU=";
|
||||
vendorHash = "sha256-Dkoq84E9zP7lrvZ9P5hSIeVJf1hjuhebGxEhBkYNWDM=";
|
||||
|
||||
php = phpPackage;
|
||||
|
||||
|
||||
@@ -31,13 +31,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openvas-scanner";
|
||||
version = "23.15.4";
|
||||
version = "23.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greenbone";
|
||||
repo = "openvas-scanner";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-9IHxpskPiXONqO6V6wHLPxJV8yi7orU6zpRvO2/+THg=";
|
||||
hash = "sha256-ocMtXZHqeMgGoTdMF8OU7oSyps6G1PNth3qwnAxFlc8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,78 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
buildPackages,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
libisoburn,
|
||||
libvirt,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "podman-bootc";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman-bootc";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Hxg2QSedPAWYZpuesUEFol9bpTppjB0/MpCcB+txMDc=";
|
||||
};
|
||||
|
||||
patches = [ ./respect-home-env.patch ];
|
||||
|
||||
vendorHash = "sha256-8QP4NziLwEo0M4NW5UgSEMAVgBDxmnE+PLbpyclK9RQ=";
|
||||
|
||||
tags = [
|
||||
"exclude_graphdriver_btrfs"
|
||||
"btrfs_noversion"
|
||||
"exclude_graphdriver_devicemapper"
|
||||
"containers_image_openpgp"
|
||||
"remote"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
installShellFiles
|
||||
];
|
||||
buildInputs = [
|
||||
libvirt
|
||||
libisoburn
|
||||
];
|
||||
|
||||
# All tests depend on booting virtual machines, which is infeasible here.
|
||||
doCheck = false;
|
||||
|
||||
postInstall =
|
||||
let
|
||||
podman-bootc = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/podman-bootc";
|
||||
in
|
||||
lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ''
|
||||
# podman-bootc always tries to touch cache and run dirs, no matter the command
|
||||
export HOME=$TMPDIR
|
||||
export XDG_RUNTIME_DIR=$TMPDIR
|
||||
|
||||
installShellCompletion --cmd podman-bootc \
|
||||
--bash <(${podman-bootc} completion bash) \
|
||||
--fish <(${podman-bootc} completion fish) \
|
||||
--zsh <(${podman-bootc} completion zsh)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Streamlining podman+bootc interactions";
|
||||
homepage = "https://github.com/containers/podman-bootc";
|
||||
changelog = "https://github.com/containers/podman-bootc/releases/tag/${src.tag}";
|
||||
maintainers = with lib.maintainers; [ evan-goode ];
|
||||
license = lib.licenses.asl20;
|
||||
# x86_64-darwin does not seem to be supported at this time:
|
||||
# https://github.com/containers/podman-bootc/issues/46
|
||||
platforms = [
|
||||
"aarch64-linux"
|
||||
"aarch64-darwin"
|
||||
"x86_64-linux"
|
||||
];
|
||||
mainProgram = "podman-bootc";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
diff --git a/pkg/user/user.go b/pkg/user/user.go
|
||||
index 1f8dbcf..713a6a7 100644
|
||||
--- a/pkg/user/user.go
|
||||
+++ b/pkg/user/user.go
|
||||
@@ -38,6 +38,9 @@ func NewUser() (u User, err error) {
|
||||
}
|
||||
|
||||
func (u *User) HomeDir() string {
|
||||
+ if envHome := os.Getenv("HOME"); envHome != "" {
|
||||
+ return envHome
|
||||
+ }
|
||||
return u.OSUser.HomeDir
|
||||
}
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "primesieve";
|
||||
version = "12.6";
|
||||
version = "12.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimwalisch";
|
||||
repo = "primesieve";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-XbHZDB6QbzS/+8wbgXIwWWla0nt5fCGbW3MAQvxavTk=";
|
||||
hash = "sha256-wWxbEu8nBY7LI5Ut1w0b6qMuQ4O/hCV6/dpxcojWepU=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
Generated
-4902
File diff suppressed because it is too large
Load Diff
@@ -32,16 +32,13 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "flxzt";
|
||||
repo = "rnote";
|
||||
rev = "v${version}";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RbuEgmly6Mjmx58zOV+tg6Mv5ghCNy/dE5FXYrEXtdg=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"ink-stroke-modeler-rs-0.1.0" = "sha256-B6lT6qSOIHxqBpKTE4nO2+Xs9KF7JLVRUHOkYp8Sl+M=";
|
||||
"piet-0.6.2" = "sha256-3juXzuKwoLuxia6MoVwbcBJ3jXBQ9QRNVoxo3yFp2Iw=";
|
||||
};
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-0c3Me9SobMvUiJqTyz/3zhEvntkiJFS92BNJ9rRBAv0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -90,16 +87,16 @@ stdenv.mkDerivation rec {
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/flxzt/rnote";
|
||||
changelog = "https://github.com/flxzt/rnote/releases/tag/${src.rev}";
|
||||
description = "Simple drawing application to create handwritten notes";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
dotlambda
|
||||
gepbird
|
||||
yrd
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -37,15 +37,15 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "slint-lsp";
|
||||
version = "1.9.2";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-1yXyf/9St03B8mZPfw8GVUIFOX/nWbwwCs/8ON3uBDw=";
|
||||
hash = "sha256-5LDEjJx+PC6pOem06DKFkPcjpIkF20gbxi/PAVZT1ns=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-FFNMI6mGYAqHPpdVo8iA2i8R2JNz8F5oQFXh7rk6wdI=";
|
||||
cargoHash = "sha256-1/4dOlhByJDpduExu9ZOjb7JYFKehnLiLCboWUnmfp8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -71,6 +71,13 @@ let
|
||||
done;
|
||||
|
||||
cp ${desktopItem}/share/applications/*.desktop $out/share/applications
|
||||
if ! grep -q StartupWMClass= "$out"/share/applications/*.desktop; then
|
||||
chmod +w "$out"/share/applications/*.desktop
|
||||
echo "StartupWMClass=com-st-microxplorer-maingui-STM32CubeMX" >> "$out"/share/applications/*.desktop
|
||||
else
|
||||
echo "error: upstream already provides StartupWMClass= in desktop file -- please update package expr" >&2
|
||||
exit 1
|
||||
fi
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "svu";
|
||||
version = "3.0.0";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "caarlos0";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-z+2H49fhi0X7rH1NvgOlkJFCrEftAMk5PA/qUUJIfmY=";
|
||||
sha256 = "sha256-O21twOVXFnrfSFX0DSPK/NNL0Z0Xe+44qWMYZPsAp2g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lqE5S13VQ7WLow6tXcFOWcK/dw7LvvEDpgRTQ8aJGeg=";
|
||||
|
||||
@@ -6,28 +6,26 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "swc";
|
||||
version = "0.91.369";
|
||||
|
||||
env = {
|
||||
# swc depends on nightly features
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
};
|
||||
version = "0.91.495";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "swc_cli";
|
||||
inherit version;
|
||||
hash = "sha256-6n6zHMV87h1kmjzEmdE86/toHI99q2HO1EEGHUE9sg8=";
|
||||
hash = "sha256-th+VLeKdTqyAjyRer0GeGLprBX0XhYTd9F7kwBDrzLo=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-YuqoT5vGuUZfTenSgPPrC/7bTC0syiiiMYF/y0szG4Q=";
|
||||
cargoHash = "sha256-mIFZ9F0XS16OGSQlzu7H2wQZN4YUEKJlK+KHmkrc12w=";
|
||||
|
||||
meta = with lib; {
|
||||
# swc depends on nightly features
|
||||
env.RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
meta = {
|
||||
description = "Rust-based platform for the Web";
|
||||
mainProgram = "swc";
|
||||
homepage = "https://github.com/swc-project/swc";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
dit7ya
|
||||
kashw2
|
||||
];
|
||||
|
||||
@@ -10,16 +10,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tenv";
|
||||
version = "4.1.0";
|
||||
version = "4.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tofuutils";
|
||||
repo = "tenv";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6Em/cauhHuK0RN8Jp1JkPFBHFBwu65QxVHTAu0rh+Vo=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-r0vIrhqCHTYuQMafGCsJbEo9mOWjxGRYSEXQa49FCZU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JrAzjnXqZSlsukLRXqHReiKPuOyWQS85/F2EnXf043U=";
|
||||
vendorHash = "sha256-0+RZ4kJS2hIePhWInPqtkeM0V0iWu3+eaaiH8wwRwVI=";
|
||||
|
||||
excludedPackages = [ "tools" ];
|
||||
|
||||
# Tests disabled for requiring network access to release.hashicorp.com
|
||||
doCheck = false;
|
||||
|
||||
@@ -8,11 +8,16 @@
|
||||
libtorrent-rasterbar-1_2_x,
|
||||
qt5,
|
||||
nix-update-script,
|
||||
boost186,
|
||||
}:
|
||||
|
||||
let
|
||||
# libtorrent-rasterbar-1_2_x requires python311
|
||||
python3 = python311;
|
||||
# libtorrent-rasterbar-1_2_x requires python311 and boost 1.86
|
||||
python3 = python311.override {
|
||||
packageOverrides = final: prev: {
|
||||
boost = boost186;
|
||||
};
|
||||
};
|
||||
libtorrent = (python3.pkgs.toPythonModule (libtorrent-rasterbar-1_2_x)).python;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trojan-go";
|
||||
version = "0.10.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "p4gefau1t";
|
||||
repo = "trojan-go";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ZzIEKyLhHwYEWBfi6fHlCbkEImetEaRewbsHQEduB5Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-c6H/8/dmCWasFKVR15U/kty4AzQAqmiL/VLKrPtH+s4=";
|
||||
|
||||
# tests fail due to requiring networking
|
||||
doCheck = false;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Proxy mechanism to bypass GFW";
|
||||
homepage = "https://p4gefau1t.github.io/trojan-go/";
|
||||
changelog = "https://github.com/p4gefau1t/trojan-go/releases/tag/v${version}";
|
||||
maintainers = with lib.maintainers; [ ethancedwards8 ];
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "trojan-go";
|
||||
};
|
||||
}
|
||||
@@ -9,12 +9,12 @@
|
||||
let
|
||||
generator = pkgsBuildBuild.buildGoModule rec {
|
||||
pname = "v2ray-domain-list-community";
|
||||
version = "20250227085631";
|
||||
version = "20250302153845";
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "domain-list-community";
|
||||
rev = version;
|
||||
hash = "sha256-JzcEtUNxdbItblu2jVeFlBzEpZbMu+JejuX1EK1c2io=";
|
||||
hash = "sha256-j2e3NJOIs50NZqaJ76zKjxrrxDwkb0n6XJP9XmZLXlE=";
|
||||
};
|
||||
vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg=";
|
||||
meta = with lib; {
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "waycheck";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "serebit";
|
||||
repo = "waycheck";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-uicwbAIEQh457eYerpC0C4adjRNtmJMsOg+xe5KaIRg=";
|
||||
hash = "sha256-w6JasxkxwWrkWECsW/dCMj2HcnmeM/VVMnkOXzwNWCQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,25 +1,25 @@
|
||||
{
|
||||
"version": "0.143.0",
|
||||
"version": "0.144.0",
|
||||
"binaries": {
|
||||
"aarch64-darwin": {
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.143.0/darwin/arm64/yc",
|
||||
"hash": "sha256-LZA3mac/jnvYdNkyfOhfcRqGoQYyXvegZ0a3ik0A6F0="
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.144.0/darwin/arm64/yc",
|
||||
"hash": "sha256-4yjhQYJjcglFClhjLWCyKvS4QhFDozIj0Cke+86Mabs="
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.143.0/linux/arm64/yc",
|
||||
"hash": "sha256-xwoR4GbJLLhsQfRhGNXrxFyEkFb1G8ktdtmP9/l65Zw="
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.144.0/linux/arm64/yc",
|
||||
"hash": "sha256-qtE6nZ5rwgu+eWr58N5+hII/g6fyYSyrJ1Vjp3/0fo4="
|
||||
},
|
||||
"i686-linux": {
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.143.0/linux/386/yc",
|
||||
"hash": "sha256-+kCCFX2bPRi9ounbgoH5XruTFYEueMTVsG9BviNjGqc="
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.144.0/linux/386/yc",
|
||||
"hash": "sha256-TiRoz3xGW4Ah13d+kWgPK2pAHzfPiaJsi5Dz3JX2ooA="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.143.0/darwin/amd64/yc",
|
||||
"hash": "sha256-h+yItND8bwEineqhyMN+P6m7widbmTJjBh9B3M5F27E="
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.144.0/darwin/amd64/yc",
|
||||
"hash": "sha256-yQKSRex47U9AHMYslAHHS9zmfKzwsbyFxhsEFbyvFUA="
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.143.0/linux/amd64/yc",
|
||||
"hash": "sha256-uXIhrkvtVyjafyqowjRrSXd7JsU/0vBPc8Qghc9f7bo="
|
||||
"url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.144.0/linux/amd64/yc",
|
||||
"hash": "sha256-NkQ0gvjBrzeQHM3k8lGBAEHKdDA6Pfj/220w6+rAtWw="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,17 +8,16 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "yutto";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = python3Packages.pythonOlder "3.9";
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yutto-dev";
|
||||
repo = "yutto";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-qbT72SGtSz7/7j1xUzQh5bXxM0GKsJorZ6Y8jshP2WU=";
|
||||
hash = "sha256-ejNVQYG56dOIYLipdi/m9ELwaP0qPqYL5gg09uU/JZY=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [ hatchling ];
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "zsh-forgit";
|
||||
version = "25.02.0";
|
||||
version = "25.03.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wfxr";
|
||||
repo = "forgit";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-vVsJe/MycQrwHLJOlBFLCuKuVDwQfQSMp56Y7beEUyg=";
|
||||
hash = "sha256-wYCuCxPv3HGEGaze/+an6ZprCtXu5ThsTCwaIquEy3Y=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -35,7 +35,6 @@
|
||||
libyaml,
|
||||
|
||||
withGui ? false,
|
||||
libX11,
|
||||
libXpm,
|
||||
libXext,
|
||||
libXft,
|
||||
@@ -80,7 +79,7 @@
|
||||
|
||||
let
|
||||
# minorVersion is even for stable, odd for unstable
|
||||
version = "9.2.7";
|
||||
version = "9.2.9";
|
||||
|
||||
# This package provides several with* options, which replaces the old extraLibraries option.
|
||||
# This error should help users that still use this option find their way to these flags.
|
||||
@@ -127,8 +126,8 @@ stdenv.mkDerivation {
|
||||
src = fetchFromGitHub {
|
||||
owner = "SWI-Prolog";
|
||||
repo = "swipl";
|
||||
rev = "V${version}";
|
||||
hash = "sha256-O9ogltcbBST111FA85jEVW6jGOLJSt/5PeBABtMu2Ws=";
|
||||
tag = "V${version}";
|
||||
hash = "sha256-M0stUwiD3Auz5OsmgVJFWg2RAswu42UUp8bafqZOC7A=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -18,11 +18,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation (final: {
|
||||
pname = "quarto";
|
||||
version = "1.6.39";
|
||||
version = "1.6.41";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz";
|
||||
hash = "sha256-15fHlnE6V8FNgRX0mkXWJqFkeGlwlqBCHy0tmA5fnUo=";
|
||||
hash = "sha256-+OsTnNxb/67sy3SOV0wHmR7Nm+hpgy5k2Jn28J6RNmw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -10,32 +10,23 @@
|
||||
logs,
|
||||
lwt,
|
||||
macaddr,
|
||||
mirage-time,
|
||||
mirage-sleep,
|
||||
alcotest,
|
||||
mirage-clock-unix,
|
||||
mirage-flow,
|
||||
mirage-random,
|
||||
mirage-random-test,
|
||||
mirage-time-unix,
|
||||
bos,
|
||||
mirage-vnetif,
|
||||
bisect_ppx,
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "arp";
|
||||
version = "3.1.1";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz";
|
||||
hash = "sha256-6jPFiene6jAPtivCugtVfP3+6k9A5gBoWzpoxoaPBvE=";
|
||||
hash = "sha256-C2Bh/2NwZqCJEidCnkhwRMoW3AsbQtvwdFh9IiJkDaU=";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
nativeBuildInputs = [
|
||||
bisect_ppx
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cstruct
|
||||
duration
|
||||
@@ -44,18 +35,14 @@ buildDunePackage rec {
|
||||
logs
|
||||
lwt
|
||||
macaddr
|
||||
mirage-time
|
||||
mirage-sleep
|
||||
];
|
||||
|
||||
## NOTE: As of 18 april 2023 and ARP version 3.0.0, tests fail on Darwin.
|
||||
doCheck = !stdenv.hostPlatform.isDarwin;
|
||||
checkInputs = [
|
||||
alcotest
|
||||
mirage-clock-unix
|
||||
mirage-flow
|
||||
mirage-random
|
||||
mirage-random-test
|
||||
mirage-time-unix
|
||||
bos
|
||||
mirage-vnetif
|
||||
];
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
tcpip,
|
||||
tls,
|
||||
tls-mirage,
|
||||
mirage-crypto-rng-mirage,
|
||||
dnssec,
|
||||
alcotest,
|
||||
}:
|
||||
@@ -37,6 +38,7 @@ buildDunePackage {
|
||||
tcpip
|
||||
tls
|
||||
tls-mirage
|
||||
mirage-crypto-rng-mirage
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
{
|
||||
lib,
|
||||
fetchurl,
|
||||
buildDunePackage,
|
||||
mtime,
|
||||
version ? "5.0.0",
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "mirage-mtime";
|
||||
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/mirage-mtime/releases/download/v${version}/mirage-mtime-${version}.tbz";
|
||||
hash = "sha256-IwdaAyZyj8gfRPxQP9SOwb28AbtVy9PY7qcr0Pns9GU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
mtime
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Monotonic time for MirageOS";
|
||||
license = lib.licenses.isc;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
homepage = "https://github.com/mirage/mirage-mtime";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
{
|
||||
lib,
|
||||
buildDunePackage,
|
||||
fetchurl,
|
||||
lwt,
|
||||
duration,
|
||||
version ? "4.0.0",
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
inherit version;
|
||||
pname = "mirage-sleep";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/mirage-sleep/releases/download/v${version}/mirage-sleep-${version}.tbz";
|
||||
hash = "sha256-J7cw7sE3EE3BIhSdwD1KV3VeXjEqviVmys3LgGhEE/A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
duration
|
||||
lwt
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Sleep operations for MirageOS";
|
||||
homepage = "https://github.com/mirage/mirage-sleep";
|
||||
changelog = "https://raw.githubusercontent.com/mirage/mirage-sleep/refs/tags/v${version}/CHANGES.md";
|
||||
license = lib.licenses.isc;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
};
|
||||
}
|
||||
@@ -6,9 +6,9 @@
|
||||
cstruct,
|
||||
cstruct-lwt,
|
||||
mirage-net,
|
||||
mirage-clock,
|
||||
mirage-crypto-rng-mirage,
|
||||
mirage-time,
|
||||
mirage-mtime,
|
||||
mirage-crypto-rng,
|
||||
mirage-sleep,
|
||||
macaddr,
|
||||
macaddr-cstruct,
|
||||
fmt,
|
||||
@@ -22,10 +22,8 @@
|
||||
mirage-flow,
|
||||
mirage-vnetif,
|
||||
pcap-format,
|
||||
mirage-clock-unix,
|
||||
arp,
|
||||
ipaddr-cstruct,
|
||||
mirage-crypto-rng,
|
||||
lru,
|
||||
metrics,
|
||||
withFreestanding ? false,
|
||||
@@ -34,11 +32,11 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "tcpip";
|
||||
version = "8.2.0";
|
||||
version = "9.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
|
||||
hash = "sha256-kW5oirqJdnbERNuBKfSWOtc5+NG+Yx2eAJxiKLS31u0=";
|
||||
hash = "sha256-WTd+01kIDY2pSuyRR0pTO62VXBK+eYJ77IU8y0ltZZo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -50,9 +48,9 @@ buildDunePackage rec {
|
||||
cstruct
|
||||
cstruct-lwt
|
||||
mirage-net
|
||||
mirage-clock
|
||||
mirage-crypto-rng-mirage
|
||||
mirage-time
|
||||
mirage-mtime
|
||||
mirage-crypto-rng
|
||||
mirage-sleep
|
||||
ipaddr-cstruct
|
||||
macaddr
|
||||
macaddr-cstruct
|
||||
@@ -75,11 +73,8 @@ buildDunePackage rec {
|
||||
doCheck = true;
|
||||
checkInputs = [
|
||||
alcotest
|
||||
mirage-crypto-rng
|
||||
mirage-flow
|
||||
mirage-vnetif
|
||||
pcap-format
|
||||
mirage-clock-unix
|
||||
];
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ php.buildComposerProject2 (finalAttrs: {
|
||||
# Upstream doesn't provide a composer.lock.
|
||||
# More info at https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7590
|
||||
composerLock = ./composer.lock;
|
||||
vendorHash = "sha256-lOlwQjBh/Uy+Hr3cc+NQC+2Fu3UODKOCSXpSrNOBNWY=";
|
||||
vendorHash = "sha256-/Vn4hyX3XTAdnPPwiKGluuE3Cl56nZ3eVozLnhZ3RJM=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/tag/v${finalAttrs.version}";
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
aiohttp,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiosseclient";
|
||||
version = "0.1.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ebraminio";
|
||||
repo = "aiosseclient";
|
||||
rev = version;
|
||||
hash = "sha256-T97HmO53w1zNpASPU+LRcnqtnQVqPWtlOXycpBw4WmY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ aiohttp ];
|
||||
|
||||
# Test requires network access
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "aiosseclient" ];
|
||||
|
||||
meta = {
|
||||
description = "Asynchronous Server Side Events (SSE) client";
|
||||
homepage = "https://github.com/ebraminio/aiosseclient";
|
||||
changelog = "https://github.com/ebraminio/aiosseclient/releases/tag/${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-otp-webauthn";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "django_otp_webauthn";
|
||||
hash = "sha256-BXwIjQjynTjFK+bNML5i35qxQ7TJeb4Xc+duS6Y+5Fk=";
|
||||
hash = "sha256-dtyP+0z7J9so2+ESjKv4VlaMD5DFGVn3ZHYRzpy33yQ=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qbusmqttapi";
|
||||
version = "1.2.4";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Qbus-iot";
|
||||
repo = "qbusmqttapi";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-daa+AwoOLJRaMzaUCai6pbYd8ux9v8NTR/mnsss/r4c=";
|
||||
hash = "sha256-1Srp1FOnTw7TwE0OTY+q6R1d/M7/LH9leCUZMADE++Y=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
{
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
legacy-cgi,
|
||||
lib,
|
||||
pyopenssl,
|
||||
pytestCheckHook,
|
||||
pythonAtLeast,
|
||||
requests,
|
||||
}:
|
||||
|
||||
@@ -19,7 +21,9 @@ buildPythonPackage rec {
|
||||
hash = "sha256-hIqXwhmvstCslsCO973oK5FF2c8gZJ0wNUI/z8W+OjU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyopenssl ];
|
||||
dependencies = [
|
||||
pyopenssl
|
||||
] ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "simsimd";
|
||||
version = "6.3.3";
|
||||
version = "6.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ashvardanian";
|
||||
repo = "simsimd";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8D3mMhGrHATqxc79OvfcG92UnDGjU6YDfFjReXdR6cs=";
|
||||
hash = "sha256-o9GhLfFuH3mTE4V6DGyGwU7o3EfP4iEoxUfFvR5gtLc=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.0.1328";
|
||||
version = "3.0.1330";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
tag = version;
|
||||
hash = "sha256-RCavlW9itqi/oT/QPrwaGYml87rD8T5MpR+2++zhGa8=";
|
||||
hash = "sha256-gWc9fYUbvpnQl+H9yq5G3MF5bMcUCGLabNq/U/lJjJ8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wolf-comm";
|
||||
version = "0.0.19";
|
||||
version = "0.0.21";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janrothkegel";
|
||||
repo = "wolf-comm";
|
||||
tag = version;
|
||||
hash = "sha256-majkiDGyR6qHMi6VmlopWAJK7rXPPR5TeAw6gPjiCw8=";
|
||||
hash = "sha256-IZJxtMWZNGzzcGpXAzHEOrc2DngZop4yKmfnuXp9urc=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -7,7 +7,17 @@
|
||||
shared-mime-info,
|
||||
xz,
|
||||
mariadb,
|
||||
postgresql,
|
||||
sqlite,
|
||||
backend ? "mysql",
|
||||
}:
|
||||
|
||||
assert lib.assertOneOf "backend" backend [
|
||||
"mysql"
|
||||
"postgres"
|
||||
"sqlite"
|
||||
];
|
||||
|
||||
mkKdeDerivation {
|
||||
pname = "akonadi";
|
||||
|
||||
@@ -16,24 +26,40 @@ mkKdeDerivation {
|
||||
./ignore-mysql-config-timestamp.patch
|
||||
];
|
||||
|
||||
extraCmakeFlags = [
|
||||
"-DMYSQLD_SCRIPTS_PATH=${lib.getBin mariadb}/bin"
|
||||
];
|
||||
extraCmakeFlags =
|
||||
[ "-DDATABASE_BACKEND=${lib.toUpper backend}" ]
|
||||
++ lib.optionals (backend == "mysql") [
|
||||
"-DMYSQLD_SCRIPTS_PATH=${lib.getBin mariadb}/bin"
|
||||
]
|
||||
++ lib.optionals (backend == "postgres") [
|
||||
"-DPOSTGRES_PATH=${lib.getBin postgresql}/bin"
|
||||
];
|
||||
|
||||
extraNativeBuildInputs = [
|
||||
qttools
|
||||
shared-mime-info
|
||||
];
|
||||
extraBuildInputs = [
|
||||
kaccounts-integration
|
||||
accounts-qt
|
||||
xz
|
||||
mariadb
|
||||
];
|
||||
|
||||
extraBuildInputs =
|
||||
[
|
||||
kaccounts-integration
|
||||
accounts-qt
|
||||
xz
|
||||
]
|
||||
++ lib.optionals (backend == "mysql") [ mariadb ]
|
||||
++ lib.optionals (backend == "postgres") [ postgresql ]
|
||||
++ lib.optionals (backend == "sqlite") [ sqlite ];
|
||||
|
||||
# Hardcoded as a QString, which is UTF-16 so Nix can't pick it up automatically
|
||||
postFixup = ''
|
||||
mkdir -p $out/nix-support
|
||||
echo "${mariadb}" > $out/nix-support/depends
|
||||
'';
|
||||
|
||||
postFixup =
|
||||
''
|
||||
mkdir -p $out/nix-support
|
||||
''
|
||||
+ lib.optionalString (backend == "mysql") ''
|
||||
echo "${mariadb}" > $out/nix-support/depends
|
||||
''
|
||||
+ lib.optionalString (backend == "postgres") ''
|
||||
echo "${postgresql}" > $out/nix-support/depends
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
lib,
|
||||
virtualglLib,
|
||||
virtualglLib_i686 ? null,
|
||||
makeWrapper,
|
||||
vulkan-loader,
|
||||
addDriverRunpath,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@@ -10,6 +13,7 @@ stdenv.mkDerivation {
|
||||
version = lib.getVersion virtualglLib;
|
||||
|
||||
paths = [ virtualglLib ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildCommand =
|
||||
''
|
||||
@@ -17,6 +21,19 @@ stdenv.mkDerivation {
|
||||
for i in ${virtualglLib}/bin/* ${virtualglLib}/bin/.vglrun*; do
|
||||
ln -s "$i" $out/bin
|
||||
done
|
||||
|
||||
wrapProgram $out/bin/vglrun \
|
||||
--prefix LD_LIBRARY_PATH : "${
|
||||
lib.makeLibraryPath [
|
||||
virtualglLib
|
||||
virtualglLib_i686
|
||||
|
||||
addDriverRunpath.driverLink
|
||||
|
||||
# Needed for vulkaninfo to work
|
||||
vulkan-loader
|
||||
]
|
||||
}"
|
||||
''
|
||||
+ lib.optionalString (virtualglLib_i686 != null) ''
|
||||
ln -sf ${virtualglLib_i686}/bin/.vglrun.vars32 $out/bin
|
||||
|
||||
@@ -1206,6 +1206,8 @@ let
|
||||
|
||||
mirage-logs = callPackage ../development/ocaml-modules/mirage-logs { };
|
||||
|
||||
mirage-mtime = callPackage ../development/ocaml-modules/mirage-mtime { };
|
||||
|
||||
mirage-nat = callPackage ../development/ocaml-modules/mirage-nat { };
|
||||
|
||||
mirage-net = callPackage ../development/ocaml-modules/mirage-net { };
|
||||
@@ -1224,6 +1226,8 @@ let
|
||||
|
||||
mirage-runtime = callPackage ../development/ocaml-modules/mirage/runtime.nix { };
|
||||
|
||||
mirage-sleep = callPackage ../development/ocaml-modules/mirage-sleep { };
|
||||
|
||||
mirage-time = callPackage ../development/ocaml-modules/mirage-time { };
|
||||
|
||||
mirage-time-unix = callPackage ../development/ocaml-modules/mirage-time/unix.nix { };
|
||||
|
||||
@@ -427,6 +427,8 @@ self: super: with self; {
|
||||
|
||||
aiosql = callPackage ../development/python-modules/aiosql { };
|
||||
|
||||
aiosseclient = callPackage ../development/python-modules/aiosseclient { };
|
||||
|
||||
aiosenz = callPackage ../development/python-modules/aiosenz { };
|
||||
|
||||
aioserial = callPackage ../development/python-modules/aioserial { };
|
||||
|
||||
Reference in New Issue
Block a user