Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -2521,6 +2521,21 @@ runTests {
|
||||
expr = (with types; either int (listOf (either bool str))).description;
|
||||
expected = "signed integer or list of (boolean or string)";
|
||||
};
|
||||
testTypeFunctionToPropagateFunctionArgs = {
|
||||
expr = lib.functionArgs ((types.functionTo types.null).merge [] [
|
||||
{
|
||||
value = {a, b ? false, ... }: null;
|
||||
}
|
||||
{
|
||||
value = {b, c ? false, ... }: null;
|
||||
}
|
||||
]);
|
||||
expected = {
|
||||
a = false;
|
||||
b = false;
|
||||
c = true;
|
||||
};
|
||||
};
|
||||
|
||||
# Meta
|
||||
testGetExe'Output = {
|
||||
|
||||
+7
-2
@@ -873,8 +873,13 @@ rec {
|
||||
description = "function that evaluates to a(n) ${optionDescriptionPhrase (class: class == "noun" || class == "composite") elemType}";
|
||||
descriptionClass = "composite";
|
||||
check = isFunction;
|
||||
merge = loc: defs:
|
||||
fnArgs: (mergeDefinitions (loc ++ [ "<function body>" ]) elemType (map (fn: { inherit (fn) file; value = fn.value fnArgs; }) defs)).mergedValue;
|
||||
merge = loc: defs: {
|
||||
# An argument attribute has a default when it has a default in all definitions
|
||||
__functionArgs = lib.zipAttrsWith (_: lib.all (x: x)) (
|
||||
lib.map (fn: lib.functionArgs fn.value) defs
|
||||
);
|
||||
__functor = _: callerArgs: (mergeDefinitions (loc ++ [ "<function body>" ]) elemType (map (fn: { inherit (fn) file; value = fn.value callerArgs; }) defs)).mergedValue;
|
||||
};
|
||||
getSubOptions = prefix: elemType.getSubOptions (prefix ++ [ "<function body>" ]);
|
||||
getSubModules = elemType.getSubModules;
|
||||
substSubModules = m: functionTo (elemType.substSubModules m);
|
||||
|
||||
@@ -12621,6 +12621,12 @@
|
||||
githubId = 36413794;
|
||||
name = "Arek Kalandyk";
|
||||
};
|
||||
koschi13 = {
|
||||
email = "maximilian.konter@protonmail.com";
|
||||
github = "koschi13";
|
||||
githubId = 17250956;
|
||||
name = "Maximilian Konter";
|
||||
};
|
||||
koslambrou = {
|
||||
email = "koslambrou@gmail.com";
|
||||
github = "koslambrou";
|
||||
|
||||
@@ -465,6 +465,10 @@
|
||||
[Prisma ORM upgrade guide](https://www.prisma.io/docs/orm/more/upgrade-guides/upgrading-versions/upgrading-to-prisma-6)
|
||||
for more information.
|
||||
|
||||
- `depdendency-track` no longer bundes the UI inside the jar. This bundling
|
||||
functionality is deprecated by upstream and causes UI assets not being served
|
||||
after weeks of runtime.
|
||||
|
||||
- `nq` was updated to 1.0, which renames the `fq` and `tq` utilities to `nqtail` and `nqterm` respectively.
|
||||
|
||||
- `zf` was updated to 0.10.2, which includes breaking changes from the [0.10.0 release](https://github.com/natecraddock/zf/releases/tag/0.10.0).
|
||||
|
||||
@@ -70,7 +70,7 @@ in
|
||||
};
|
||||
|
||||
noiseScale = mkOption {
|
||||
type = numbers.between 0.0 1.0;
|
||||
type = float;
|
||||
default = 0.667;
|
||||
description = ''
|
||||
Generator noise value.
|
||||
@@ -79,7 +79,7 @@ in
|
||||
};
|
||||
|
||||
noiseWidth = mkOption {
|
||||
type = numbers.between 0.0 1.0;
|
||||
type = float;
|
||||
default = 0.333;
|
||||
description = ''
|
||||
Phoneme width noise value.
|
||||
@@ -88,7 +88,7 @@ in
|
||||
};
|
||||
|
||||
lengthScale = mkOption {
|
||||
type = numbers.between 0.0 1.0;
|
||||
type = float;
|
||||
default = 1.0;
|
||||
description = ''
|
||||
Phoneme length value.
|
||||
|
||||
@@ -509,7 +509,8 @@ in
|
||||
upstreams.dependency-track.servers."localhost:${toString cfg.port}" = { };
|
||||
virtualHosts.${cfg.nginx.domain} = {
|
||||
locations = {
|
||||
"/".proxyPass = "http://dependency-track";
|
||||
"/".alias = "${cfg.package.frontend}/dist/";
|
||||
"/api".proxyPass = "http://dependency-track";
|
||||
"= /static/config.json".alias = frontendConfigFile;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -16,6 +16,7 @@ import ./make-test-python.nix (
|
||||
virtualisation = {
|
||||
cores = 2;
|
||||
diskSize = 4096;
|
||||
memorySize = 1024 * 2;
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [ curl ];
|
||||
|
||||
@@ -4628,6 +4628,10 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
streetsidesoftware.code-spell-checker-german =
|
||||
callPackage ./streetsidesoftware.code-spell-checker-german
|
||||
{ };
|
||||
|
||||
styled-components.vscode-styled-components = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-styled-components";
|
||||
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
{ lib, vscode-utils }:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "code-spell-checker-german";
|
||||
publisher = "streetsidesoftware";
|
||||
version = "2.3.2";
|
||||
hash = "sha256-40Oc6ycNog9cxG4G5gCps2ADrM/wLuKWFrD4lnd91Z4=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker-german/changelog";
|
||||
description = "German dictionary extension for VS Code.";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=streetsidesoftware.code-spell-checker-german";
|
||||
homepage = "https://streetsidesoftware.github.io/vscode-spell-checker-german";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = [ lib.maintainers.koschi13 ];
|
||||
};
|
||||
}
|
||||
@@ -12,7 +12,7 @@
|
||||
fetchFromGitHub,
|
||||
flac,
|
||||
gitMinimal,
|
||||
gtk3,
|
||||
wrapGAppsHook3,
|
||||
glew,
|
||||
gtest,
|
||||
jasper,
|
||||
@@ -68,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cmake
|
||||
pkg-config
|
||||
gtest
|
||||
wrapGAppsHook3
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
lsb-release
|
||||
@@ -89,7 +90,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
AppKit
|
||||
]
|
||||
++ [
|
||||
gtk3
|
||||
glew
|
||||
jasper
|
||||
libGLU
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"packageVersion": "135.0-1",
|
||||
"packageVersion": "135.0.1-1",
|
||||
"source": {
|
||||
"rev": "135.0-1",
|
||||
"hash": "sha256-UyKfgu6/VAfPkLCjlGgG8SGAG/nOyoP3uyesXqLc5Dk"
|
||||
"rev": "135.0.1-1",
|
||||
"hash": "sha256-w//XSGqKd9nNX3NmsJvl4UN3tEA1/b9g0xn+hck4hKc="
|
||||
},
|
||||
"firefox": {
|
||||
"version": "135.0",
|
||||
"hash": "sha256-gn4SqWLvR1EQia9EmPZev0L6V8ox23kL/X6agg0WuWA="
|
||||
"version": "135.0.1",
|
||||
"hash": "sha512-n/fCq2vBZg4znNzXdF+L2sW+JdOnm58DkzhZNScNfvSIWZhWvDjCKuCwZzifpxppmXA7dIBKbg6oJl65l4jOqQ=="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
nix-prefetch-git,
|
||||
moreutils,
|
||||
runtimeShell,
|
||||
nix,
|
||||
...
|
||||
}:
|
||||
|
||||
@@ -25,6 +26,7 @@ writeScript "update-librewolf" ''
|
||||
jq
|
||||
moreutils
|
||||
nix-prefetch-git
|
||||
nix
|
||||
]
|
||||
}
|
||||
set -euo pipefail
|
||||
@@ -44,7 +46,7 @@ writeScript "update-librewolf" ''
|
||||
repoUrl=https://codeberg.org/librewolf/source.git
|
||||
nix-prefetch-git $repoUrl --quiet --rev $latestTag --fetch-submodules > $prefetchOut
|
||||
srcDir=$(jq -r .path < $prefetchOut)
|
||||
srcHash=$(jq -r .sha256 < $prefetchOut)
|
||||
srcHash=$(nix hash convert --to sri --hash-algo sha256 $(jq -r .sha256 < $prefetchOut))
|
||||
|
||||
ffVersion=$(<$srcDir/version)
|
||||
lwRelease=$(<$srcDir/release)
|
||||
@@ -66,12 +68,12 @@ writeScript "update-librewolf" ''
|
||||
curl --silent --show-error -o "$HOME"/shasums.asc "$mozillaUrl$ffVersion/SHA512SUMS.asc"
|
||||
gpgv --keyring="$GNUPGHOME"/pubring.kbx "$HOME"/shasums.asc "$HOME"/shasums
|
||||
|
||||
ffHash=$(grep '\.source\.tar\.xz$' "$HOME"/shasums | grep '^[^ ]*' -o)
|
||||
ffHash=$(nix hash convert --to sri --hash-algo sha512 $(grep '\.source\.tar\.xz$' "$HOME"/shasums | grep '^[^ ]*' -o))
|
||||
echo "ffHash=$ffHash"
|
||||
|
||||
jq ".source.rev = \"$latestTag\"" $srcJson | sponge $srcJson
|
||||
jq ".source.sha256 = \"$srcHash\"" $srcJson | sponge $srcJson
|
||||
jq ".source.hash = \"$srcHash\"" $srcJson | sponge $srcJson
|
||||
jq ".firefox.version = \"$ffVersion\"" $srcJson | sponge $srcJson
|
||||
jq ".firefox.sha512 = \"$ffHash\"" $srcJson | sponge $srcJson
|
||||
jq ".firefox.hash = \"$ffHash\"" $srcJson | sponge $srcJson
|
||||
jq ".packageVersion = \"$lwVersion\"" $srcJson | sponge $srcJson
|
||||
''
|
||||
|
||||
@@ -40,11 +40,11 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gajim";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz";
|
||||
hash = "sha256-q/KAWmZsHvfhEi4MkAawh+veJ4bUWEcEcFEKQUBnMmA=";
|
||||
hash = "sha256-qhN7bXj6m9GcE3+H0vf97dsTamfRCLisuC0c2t/yd94=";
|
||||
};
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ad";
|
||||
version = "0.2.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sminez";
|
||||
repo = "ad";
|
||||
tag = version;
|
||||
hash = "sha256-c2oSQ81qCZbwUl4TqovDWm8TUqI6RdrQPvoP/FaTI/A=";
|
||||
sha256 = "0rd4krklpnvaimzblqx2ckab6lk4apkmvnqr618gnx8i5f4nyl6m";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-WEU1pipIQmlvfIBUmXiGYDN45M/C7OJdf4nzFbNQhLc=";
|
||||
cargoHash = "sha256:12g3fcym8184py66fgwahpb9q05dm9r9rbhh4l50yd62gkmifc93";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installManPage doc/man/ad.1
|
||||
installManPage docs/man/ad.1
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
|
||||
@@ -15,11 +15,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "angular-language-server";
|
||||
version = "19.1.0";
|
||||
version = "19.2.0";
|
||||
src = fetchurl {
|
||||
name = "angular-language-server-${finalAttrs.version}.zip";
|
||||
url = "https://github.com/angular/vscode-ng-language-service/releases/download/v${finalAttrs.version}/ng-template.vsix";
|
||||
hash = "sha256-ipF8UOUUuUr6LWetJ9V7Mm1EcxL4fQCZvl1ti5VBo5U=";
|
||||
hash = "sha256-Xf2ziPU3JWbmjoNy4ufaJHgnbxAw1fwuw+nH6r/8oTA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
patches = [
|
||||
./remove-default-commit-hash.patch
|
||||
./remove-vendored-libraries.patch
|
||||
] ++ finalAttrs.cargoDeps.patches;
|
||||
] ++ finalAttrs.cargoDeps.vendorStaging.patches;
|
||||
|
||||
cmakeDir = "../src";
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "cura-appimage";
|
||||
version = "5.9.0";
|
||||
version = "5.9.1";
|
||||
|
||||
# Give some good names so the intermediate packages are easy
|
||||
# to recognise by name in the Nix store.
|
||||
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Ultimaker/Cura/releases/download/${version}/Ultimaker-Cura-${version}-linux-X64.AppImage";
|
||||
hash = "sha256-STtVeM4Zs+PVSRO3cI0LxnjRDhOxSlttZF+2RIXnAp4=";
|
||||
hash = "sha256-kkZGmpskFXEtTYHh62/Zyk6JBZsH5mSiQwzqrfjCrqU=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
||||
@@ -28,6 +28,11 @@ let
|
||||
hash = "sha256-IcahhuWX1Ba7kmyJaNJlY1gcVHOR6uynyr7w5MMwRgo=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
cp -R ./dist $out/
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-LeSKSZYtjrZ84RkhGbLEMHVi1fw7FK/137F0V4hjSCE=";
|
||||
forceGitDeps = true;
|
||||
makeCacheWritable = true;
|
||||
@@ -74,17 +79,11 @@ maven.buildMavenPackage rec {
|
||||
"-Dmaven.test.skip=true"
|
||||
"-P enhance"
|
||||
"-P embedded-jetty"
|
||||
"-P bundle-ui"
|
||||
"-Dservices.bom.merge.skip=false"
|
||||
"-Dlogback.configuration.file=${src}/src/main/docker/logback.xml"
|
||||
"-Dcyclonedx-cli.path=${lib.getExe cyclonedx-cli}"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p frontend
|
||||
cp -r ${frontend}/lib/node_modules/@dependencytrack/frontend/dist frontend/
|
||||
'';
|
||||
|
||||
afterDepsSetup = ''
|
||||
mvn cyclonedx:makeBom -Dmaven.repo.local=$mvnDeps/.m2 \
|
||||
org.codehaus.mojo:exec-maven-plugin:exec@merge-services-bom
|
||||
@@ -105,7 +104,6 @@ maven.buildMavenPackage rec {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
# passthru for nix-update
|
||||
inherit frontend;
|
||||
tests = {
|
||||
inherit (nixosTests) dependency-track;
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
buildDotnetGlobalTool {
|
||||
pname = "fantomas";
|
||||
version = "7.0.0";
|
||||
version = "7.0.1";
|
||||
|
||||
nugetHash = "sha256-v4bXmvjZOYxl5RSIHuqVfDzBQdRz5SrmzZtD6SeEYTY=";
|
||||
nugetHash = "sha256-2aGD6Kjh83gmssRqqZ/Uihi7VbNqNUelX4otIfCuhTI=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "F# source code formatter";
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "granted";
|
||||
version = "0.37.0";
|
||||
version = "0.38.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "common-fate";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dy56xrn2BiVoFoQMnkl9jglecY9HAoRU/yubv5ddNU8=";
|
||||
sha256 = "sha256-xHpYtHG0fJ/VvJ/4lJ90ept3yGzJRnmtFQFbYxJtxwY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xL4+N1+Jb8KI9UbLfPV4R/MrIqL+6Lgpzsgq86J9cnE=";
|
||||
vendorHash = "sha256-Y8g5495IYgQ2lvq5qbnQmoxwEYfzzx12KfMS6wF2QXE=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
lib,
|
||||
}:
|
||||
let
|
||||
version = "0.15.7";
|
||||
version = "0.15.8";
|
||||
in
|
||||
buildGo124Module {
|
||||
pname = "heimdall-proxy";
|
||||
@@ -15,10 +15,10 @@ buildGo124Module {
|
||||
owner = "dadrus";
|
||||
repo = "heimdall";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vHPojkcKW3CfPavhN8s6frio46qvv0M2Ujq0bHW+VJs=";
|
||||
hash = "sha256-UUQWYChZEb/5mc2YYwIJSQ+pCUXIwvB09KaR0FoKrA4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-hoQYMDEEwT5g8CJBT3AGDzmv/A65DLVcS79VS/CgL8k=";
|
||||
vendorHash = "sha256-4bnVqUV3H/mZ9FiApZk6pVbRWAqpy17+/dGxXR0fjW0=";
|
||||
|
||||
tags = [ "sqlite" ];
|
||||
|
||||
@@ -38,6 +38,6 @@ buildGo124Module {
|
||||
homepage = "https://dadrus.github.io/heimdall";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ albertilagan ];
|
||||
mainProgram = "heimdall-proxy";
|
||||
mainProgram = "heimdall";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "hot-resize";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "liberodark";
|
||||
repo = "hot-resize";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-uWPO+nUuA9REWLBLCOOO/T7QiSc5b5EPKH1N5N2KnC4=";
|
||||
hash = "sha256-aGiu+YPflbyemk1IB0tPystu4hao0qLzLtuV0KAJtYg=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
|
||||
@@ -129,6 +129,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
RUST_BACKTRACE = 1;
|
||||
# https://github.com/Riey/kime/issues/688
|
||||
RUSTFLAGS = "-Clink-args=-L./target/release";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/Riey/kime";
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kube-bench";
|
||||
version = "0.10.0";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
tag = "v${version}";
|
||||
hash = "sha256-+2WoQJtH5uuVSOi70WQ+DYnUNlXoThXPJvz2jckn2cw=";
|
||||
hash = "sha256-5vgAK99a0gCYAVd0f/dd6Z1qsGzAeHL+eTTb/hcFlp4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2jlYDpUJr4y4Ahzw9xDwVlQ/XPADMbAc5qYf+6N7Ado=";
|
||||
vendorHash = "sha256-2HUvy9O7c1j4oXdIw7VZPtkEjQj2en8YPetiGwDaeYg=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
version = "0.4.3";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "lightningstream";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PowerDNS";
|
||||
repo = "lightningstream";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gnLmqm35HHpQlglKjw57NBMs8jMAHDieWlnE3OAQR4I=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.version=${version}"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-wkLoaR46l+jCm3TJDflcuI2hDvluoH2o5lLIqtrVRqo=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
# Install shell completions so long as we can run the binary to do so. This means that
|
||||
# when cross compiling we may not be able to generate shell completions.
|
||||
# See https://github.com/NixOS/nixpkgs/issues/308283
|
||||
#
|
||||
# Dummy config file is currently required to generate completions. This may be fixed
|
||||
# upstream; see https://github.com/PowerDNS/lightningstream/issues/85
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
cat <<END > lightningstream.yaml
|
||||
lmdbs:
|
||||
dummy:
|
||||
path: dummy
|
||||
END
|
||||
|
||||
installShellCompletion \
|
||||
--cmd lightningstream \
|
||||
--bash <($out/bin/lightningstream completion bash) \
|
||||
--fish <($out/bin/lightningstream completion fish) \
|
||||
--zsh <($out/bin/lightningstream completion zsh)
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "LMDB sync via S3 buckets";
|
||||
mainProgram = "lightningstream";
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://doc.powerdns.com/lightningstream/latest/index.html";
|
||||
maintainers = with lib.maintainers; [ samw ];
|
||||
};
|
||||
}
|
||||
@@ -7,17 +7,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "managarr";
|
||||
version = "0.4.2";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dark-Alex-17";
|
||||
repo = "managarr";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-OxGFubtMsGnR8cWDKkeAgryY095uydA3LzE5SS0dspQ=";
|
||||
hash = "sha256-VWlKfot6G97H7o1JhcAQgAjhYr2hvPrez1ZkeniWYBQ=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-oJN9jhcMu2kFZZ2kW7mrf7bZNb/9cauSemZjQe4Myz0=";
|
||||
cargoHash = "sha256-bddsQlPsVXrhKoitEmxb2fZIoq4ePsVCGBN1y5hMn2U=";
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "multimon-ng";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EliasOenal";
|
||||
repo = "multimon-ng";
|
||||
rev = version;
|
||||
sha256 = "sha256-ji87sNecPj1pWtTPIbIUSFWp1UfV/3MSjqbv7lrPnog=";
|
||||
sha256 = "sha256-/2NHUlAojDamNq/EVs8hoBYVikPLAFFFu/2syG4Xo4U=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
|
||||
@@ -3,17 +3,18 @@
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "nickel";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tweag";
|
||||
repo = "nickel";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-CnEGC4SnLRfAPl3WTv83xertH2ulG5onseZpq3vxfwc=";
|
||||
};
|
||||
|
||||
@@ -41,16 +42,10 @@ rustPlatform.buildRustPackage rec {
|
||||
# dependency with that name, but that dependency uses the "dep:" syntax in
|
||||
# the features table, so it does not have an implicit feature with that name.
|
||||
preBuild = ''
|
||||
sed -i 's/dep:comrak/comrak/' core/Cargo.toml
|
||||
substituteInPlace core/Cargo.toml \
|
||||
--replace-fail "dep:comrak" "comrak"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $nls/bin
|
||||
mv $out/bin/nls $nls/bin/nls
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
checkFlags = [
|
||||
# https://github.com/tweag/nickel/blob/1.10.0/git/tests/main.rs#L60
|
||||
# fails because src is not a git repo
|
||||
@@ -58,7 +53,20 @@ rustPlatform.buildRustPackage rec {
|
||||
"--skip=fetch_targets"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
postInstall = ''
|
||||
mkdir -p $nls/bin
|
||||
mv $out/bin/nls $nls/bin/nls
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgramArg = [ "--version" ];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://nickel-lang.org/";
|
||||
description = "Better configuration for less";
|
||||
longDescription = ''
|
||||
@@ -69,12 +77,17 @@ rustPlatform.buildRustPackage rec {
|
||||
that are then fed to another system. It is designed to have a simple,
|
||||
well-understood core: it is in essence JSON with functions.
|
||||
'';
|
||||
changelog = "https://github.com/tweag/nickel/blob/${version}/RELEASES.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
changelog = "https://github.com/tweag/nickel/blob/${finalAttrs.version}/RELEASES.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
felschr
|
||||
matthiasbeyer
|
||||
];
|
||||
mainProgram = "nickel";
|
||||
badPlatforms = [
|
||||
# collect2: error: ld returned 1 exit status
|
||||
# undefined reference to `PyExc_TypeError'
|
||||
"aarch64-linux"
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
let
|
||||
odoo_version = "18.0";
|
||||
odoo_release = "20241010";
|
||||
odoo_release = "20250213";
|
||||
python = python312.override {
|
||||
self = python;
|
||||
};
|
||||
@@ -25,7 +25,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
# find latest version on https://nightly.odoo.com/${odoo_version}/nightly/src
|
||||
url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip";
|
||||
name = "odoo-${version}";
|
||||
hash = "sha256-TUfLyB0m8XyEiS493Q/ECgSJutAd1rtWX93f3mwfOK0="; # odoo
|
||||
hash = "sha256-iohlJ5OQ10iUaWjC4AFYmBwXuf9OOXAdCgdhdJAchYQ="; # odoo
|
||||
};
|
||||
|
||||
makeWrapperArgs = [
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
python312,
|
||||
nixosTests,
|
||||
fetchurl,
|
||||
}:
|
||||
let
|
||||
pname = "open-webui";
|
||||
@@ -16,9 +17,17 @@ let
|
||||
hash = "sha256-SFw5bCzMSBuzIzZmhA+ylXXkouZ+OSsMBfc7QG7OSLU=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage {
|
||||
frontend = buildNpmPackage rec {
|
||||
inherit pname version src;
|
||||
|
||||
# the backend for run-on-client-browser python execution
|
||||
# must match lock file in open-webui
|
||||
pyodideVersion = "0.27.2";
|
||||
pyodide = fetchurl {
|
||||
hash = "sha256-sZ47IxPiL1e12rmpH3Zv2v6L2+1tz/kIrT4uYbng+Ec=";
|
||||
url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-rEV68SizR7NyYsRzlndg/ulvr8BeiDq3MpiBmaCUn2M=";
|
||||
|
||||
# Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
|
||||
@@ -32,6 +41,10 @@ let
|
||||
env.ONNXRUNTIME_NODE_INSTALL_CUDA = "skip";
|
||||
env.NODE_OPTIONS = "--max-old-space-size=8192";
|
||||
|
||||
preBuild = ''
|
||||
tar xf ${pyodide} -C static/
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -167,6 +180,7 @@ python312.pkgs.buildPythonApplication rec {
|
||||
inherit (nixosTests) open-webui;
|
||||
};
|
||||
updateScript = ./update.sh;
|
||||
inherit frontend;
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -9,13 +9,14 @@ version="$(curl --silent "https://api.github.com/repos/open-webui/open-webui/rel
|
||||
|
||||
update-source-version open-webui "${version:1}" --file="$path"
|
||||
|
||||
# Fetch npm deps
|
||||
# Fetch npm deps and pyodide
|
||||
tmpdir=$(mktemp -d)
|
||||
curl -O --output-dir $tmpdir "https://raw.githubusercontent.com/open-webui/open-webui/refs/tags/${version}/package-lock.json"
|
||||
curl -O --output-dir $tmpdir "https://raw.githubusercontent.com/open-webui/open-webui/refs/tags/${version}/package.json"
|
||||
pushd $tmpdir
|
||||
npm_hash=$(prefetch-npm-deps package-lock.json)
|
||||
sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' "$path"
|
||||
pyodide_version=$(sed -rn 's/^.*pyodide.*\^([0-9.]*)\".*$/\1/p' package.json)
|
||||
popd
|
||||
update-source-version open-webui.frontend "${pyodide_version}" --file="$path" --version-key=pyodideVersion --source-key=pyodide
|
||||
rm -rf $tmpdir
|
||||
|
||||
|
||||
@@ -5,23 +5,23 @@
|
||||
jsoncpp,
|
||||
lib,
|
||||
libGL,
|
||||
nix-update-script,
|
||||
openxr-loader,
|
||||
python3,
|
||||
stdenv,
|
||||
unstableGitUpdater,
|
||||
vulkan-headers,
|
||||
vulkan-loader,
|
||||
xorg,
|
||||
openxr-loader,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "opencomposite";
|
||||
version = "0-unstable-2025-02-08";
|
||||
version = "1.0.1473";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "znixian";
|
||||
repo = "OpenOVR";
|
||||
rev = "175e3b3a5408ff120bd21036faa703deb57159fc";
|
||||
tag = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-kwu8eM/rQBcZfs91loh7QAB46a01F9n5Xm1DmMd53MQ=";
|
||||
};
|
||||
@@ -54,10 +54,7 @@ stdenv.mkDerivation {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = unstableGitUpdater {
|
||||
hardcodeZeroVersion = true;
|
||||
branch = "openxr";
|
||||
};
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Reimplementation of OpenVR, translating calls to OpenXR";
|
||||
@@ -67,4 +64,4 @@ stdenv.mkDerivation {
|
||||
# This can realistically only work on systems that support OpenXR Loader
|
||||
inherit (openxr-loader.meta) platforms;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pipenv-poetry-migrate";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yhino";
|
||||
repo = "pipenv-poetry-migrate";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-B13/QHHruZGkks1AKHLUw8h5FJkqaVjPHjiKH8vkV/8=";
|
||||
hash = "sha256-kx03w02XUEMoPA8KKvyBGS81IHP3KFjKCVhAoyQ9j+I=";
|
||||
};
|
||||
|
||||
build-system = [ python3Packages.poetry-core ];
|
||||
@@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec {
|
||||
description = "This is simple migration script, migrate pipenv to poetry";
|
||||
mainProgram = "pipenv-poetry-migrate";
|
||||
homepage = "https://github.com/yhino/pipenv-poetry-migrate";
|
||||
changelog = "https://github.com/yhino/pipenv-poetry-migrate/blob/v${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/yhino/pipenv-poetry-migrate/blob/${src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ gador ];
|
||||
};
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
(qbittorrent.override { inherit guiSupport; }).overrideAttrs (old: rec {
|
||||
pname = "qbittorrent-enhanced" + lib.optionalString (!guiSupport) "-nox";
|
||||
version = "5.0.3.10";
|
||||
version = "5.0.4.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "c0re100";
|
||||
repo = "qBittorrent-Enhanced-Edition";
|
||||
rev = "release-${version}";
|
||||
hash = "sha256-efQFjdJeVMrPvCQ5aYtUb65hozKc73MnP0/Kheti9BI=";
|
||||
hash = "sha256-qYGDPEg4BZZgHschgFjp23EnmaBtmM+UNoC2Lympt/g=";
|
||||
};
|
||||
|
||||
meta = old.meta // {
|
||||
|
||||
@@ -42,8 +42,8 @@ let
|
||||
|
||||
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
|
||||
# source of the latter disappears much faster.
|
||||
version = "8.136.0.203";
|
||||
revision = "382";
|
||||
version = "8.137.0.425";
|
||||
revision = "384";
|
||||
|
||||
rpath =
|
||||
lib.makeLibraryPath [
|
||||
@@ -103,7 +103,7 @@ let
|
||||
fetchurl {
|
||||
name = "skypeforlinux-${version}-${revision}.snap";
|
||||
url = "https://api.snapcraft.io/api/v1/snaps/download/QRDEfjn4WJYnm0FzDKwqqRZZI77awQEV_${revision}.snap";
|
||||
hash = "sha512-zEhgde/UdN5rm866uqPAouHrexDC/vxquFyfp5bLtWDUWhGhzTHQlo+Mnkicju1IaY3jGVh4u5fRZrg24/9PBw==";
|
||||
hash = "sha512-JU6CtIJWwqP4CHsLXA1imYfx21ZYSbgbJ9iUsDQC67TRbgliI8TTJHPDHjOYbhVELvu/fAzbENVxCmKDwsQX6g==";
|
||||
}
|
||||
else
|
||||
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
||||
@@ -0,0 +1,126 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
curl,
|
||||
pkg-config,
|
||||
makeBinaryWrapper,
|
||||
libgit2,
|
||||
oniguruma,
|
||||
openssl,
|
||||
sqlite,
|
||||
zlib,
|
||||
|
||||
unstableGitUpdater,
|
||||
writeShellScript,
|
||||
yq,
|
||||
|
||||
includeLSP ? true,
|
||||
includeForge ? true,
|
||||
}:
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "steel";
|
||||
version = "0.6.0-unstable-2025-02-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattwparas";
|
||||
repo = "steel";
|
||||
rev = "f1a605a0f3fe321f4605a80c4497eda2eac5ffce";
|
||||
hash = "sha256-3Iqoy2J9wY3T5jOSjtEk1aT+Q3ncNmmpQ/LY/iyvKuY=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-PWE64CwHCQWvOGeOqdsqX6rAruWlnCwsQpcxS221M3g=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
curl
|
||||
makeBinaryWrapper
|
||||
pkg-config
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
libgit2
|
||||
oniguruma
|
||||
openssl
|
||||
sqlite
|
||||
zlib
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
rm .cargo/config.toml
|
||||
'';
|
||||
|
||||
cargoBuildFlags =
|
||||
[
|
||||
"--package"
|
||||
"steel-interpreter"
|
||||
"--package"
|
||||
"cargo-steel-lib"
|
||||
]
|
||||
++ lib.optionals includeLSP [
|
||||
"--package"
|
||||
"steel-language-server"
|
||||
]
|
||||
++ lib.optionals includeForge [
|
||||
"--package"
|
||||
"forge"
|
||||
];
|
||||
|
||||
# Tests are disabled since they always fail when building with Nix
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib/steel
|
||||
|
||||
substituteInPlace cogs/installer/download.scm \
|
||||
--replace-fail '"cargo-steel-lib"' '"$out/bin/cargo-steel-lib"'
|
||||
|
||||
pushd cogs
|
||||
$out/bin/steel install.scm
|
||||
popd
|
||||
|
||||
mv $out/lib/steel/bin/repl-connect $out/bin
|
||||
rm -rf $out/lib/steel/bin
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/steel --set-default STEEL_HOME "$out/lib/steel"
|
||||
'';
|
||||
|
||||
env = {
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
RUSTONIG_SYSTEM_LIBONIG = true;
|
||||
STEEL_HOME = "${placeholder "out"}/lib/steel";
|
||||
};
|
||||
|
||||
passthru.updateScript = unstableGitUpdater {
|
||||
tagConverter = writeShellScript "steel-tagConverter.sh" ''
|
||||
export PATH="${
|
||||
lib.makeBinPath [
|
||||
curl
|
||||
yq
|
||||
]
|
||||
}:$PATH"
|
||||
|
||||
version=$(curl -s https://raw.githubusercontent.com/mattwparas/steel/refs/heads/master/Cargo.toml | tomlq -r .workspace.package.version)
|
||||
|
||||
read -r tag
|
||||
test "$tag" = "0" && tag="$version"; echo "$tag"
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Embedded scheme interpreter in Rust";
|
||||
homepage = "https://github.com/mattwparas/steel";
|
||||
license = with lib.licenses; [
|
||||
asl20
|
||||
mit
|
||||
];
|
||||
maintainers = with lib.maintainers; [ HeitorAugustoLN ];
|
||||
mainProgram = "steel";
|
||||
platforms = lib.platforms.unix;
|
||||
sourceProvenance = [ lib.sourceTypes.fromSource ];
|
||||
};
|
||||
}
|
||||
@@ -13,23 +13,25 @@
|
||||
libadwaita,
|
||||
desktop-file-utils,
|
||||
openssl,
|
||||
gst_all_1,
|
||||
clapper,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "televido";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "d-k-bo";
|
||||
repo = "televido";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pMrMXRnfvpDLFkL2IqYJKRao/OF78mXUCBqBgT97+hc=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-9hoKX1fGjMOlvU3kNx4aLMV++k+nynDIK1UQRrw242k=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-o857QBRfANkk6e/zIwc0JLpsiP2+wCb5U7Umlx4xMdI=";
|
||||
hash = "sha256-D9gchFS5zrD1cttq/gveT7wY2Y/5hfiUrwBa7qHD9cs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -47,14 +49,18 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
libadwaita
|
||||
desktop-file-utils
|
||||
clapper
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-libav
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Viewer for German-language public broadcasting live streams and archives";
|
||||
homepage = "https://github.com/d-k-bo/televido";
|
||||
license = licenses.gpl3;
|
||||
license = lib.licenses.gpl3;
|
||||
mainProgram = "televido";
|
||||
maintainers = with maintainers; [ seineeloquenz ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with lib.maintainers; [ seineeloquenz ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,19 +6,20 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tidgi";
|
||||
version = "0.9.6";
|
||||
version = "0.12.1";
|
||||
|
||||
src =
|
||||
if stdenv.hostPlatform.isAarch64 then
|
||||
fetchurl {
|
||||
url = "https://github.com/tiddly-gittly/TidGi-Desktop/releases/download/v${version}/TidGi-darwin-arm64-${version}.zip";
|
||||
hash = "sha256-1Z9lxZZWrUVQEhBO/Kt2AS/uNs2XfihdL0iGrguPQ5g=";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = "https://github.com/tiddly-gittly/TidGi-Desktop/releases/download/v${version}/TidGi-darwin-x64-${version}.zip";
|
||||
hash = "sha256-5jHW/QrgzsGQfX4LvsRebdOJPzYTvhtC5mczxp2wPI8=";
|
||||
{
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://github.com/tiddly-gittly/TidGi-Desktop/releases/download/v${version}-update/TidGi-darwin-x64-${version}.zip";
|
||||
hash = "sha256-XZraotf6ewsrb2LBbZTTRMrT+B52NNWsZY/Qxju8hNw=";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://github.com/tiddly-gittly/TidGi-Desktop/releases/download/v${version}-update/TidGi-darwin-arm64-${version}.zip";
|
||||
hash = "sha256-/fcMCS7k2LT0ELcrFPpiQ/WNJtxaJoYOLLhROHTgIdY=";
|
||||
};
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
|
||||
@@ -8,22 +8,24 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "tortoisehg";
|
||||
version = "6.6.3";
|
||||
version = "6.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz";
|
||||
sha256 = "sha256-9pg1N5uj1ZaZCAm4N8toRwfVHme7nAsNMZkXSRgFves=";
|
||||
hash = "sha256-j+HuAq/elnXIOoX4eoqMeOyGq3qjbdoJw6pcZsSa+AI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
mercurial
|
||||
# The one from python3Packages
|
||||
qscintilla-qt5
|
||||
iniparse
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
# Makes wrapQtAppsHook add these qt libraries to the wrapper search paths
|
||||
qt5.qtwayland
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "twitch-dl";
|
||||
version = "2.10.0";
|
||||
version = "2.11.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ihabunek";
|
||||
repo = "twitch-dl";
|
||||
tag = version;
|
||||
hash = "sha256-D8jVm1nezEAvXpAToDdgr2OK7HZUaGrnT8qLqjBLJF8=";
|
||||
hash = "sha256-L+IbcSUaxhTg2slNc5x1VJPnA5e2qrPEeWjspK2COAI=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
@@ -79,7 +79,7 @@ python3Packages.buildPythonApplication rec {
|
||||
meta = with lib; {
|
||||
description = "CLI tool for downloading videos from Twitch";
|
||||
homepage = "https://github.com/ihabunek/twitch-dl";
|
||||
changelog = "https://github.com/ihabunek/twitch-dl/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/ihabunek/twitch-dl/blob/${src.tag}/CHANGELOG.md";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [
|
||||
pbsds
|
||||
|
||||
@@ -20,17 +20,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "uv";
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "uv";
|
||||
tag = version;
|
||||
hash = "sha256-eT+pCw5azFhUS9ChOsJm7zXKAr/PeJeakBcoGolL+lI=";
|
||||
hash = "sha256-4Fnc36jcgV5rZnipepgucfoUZ0V1VGC6axMPHOJX80A=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-tCbNMV2r05bIo/xa1TmzocL8ccJyVCDKV735epPxd24=";
|
||||
cargoHash = "sha256-8lo3R4U61zM+dHehFowySW8/fDCxBb03/e3njqG8l9g=";
|
||||
|
||||
buildInputs = [
|
||||
rust-jemalloc-sys
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
diff --git a/script/generate-licenses b/script/generate-licenses
|
||||
index 51749a91e2..d3fd7ee351 100755
|
||||
index 368f63b..c2bf3a5 100644
|
||||
--- a/script/generate-licenses
|
||||
+++ b/script/generate-licenses
|
||||
@@ -16,28 +16,17 @@ cat assets/icons/LICENSES >> $OUTPUT_FILE
|
||||
|
||||
echo -e "\n# ###### CODE LICENSES ######\n" >> $OUTPUT_FILE
|
||||
@@ -18,17 +18,9 @@ echo -n "" > "$OUTPUT_FILE"
|
||||
echo -e "\n# ###### CODE LICENSES ######\n"
|
||||
} >> "$OUTPUT_FILE"
|
||||
|
||||
-if ! cargo install --list | grep "cargo-about v$CARGO_ABOUT_VERSION" > /dev/null; then
|
||||
- echo "Installing cargo-about@$CARGO_ABOUT_VERSION..."
|
||||
@@ -12,22 +12,11 @@ index 51749a91e2..d3fd7ee351 100755
|
||||
-else
|
||||
- echo "cargo-about@$CARGO_ABOUT_VERSION is already installed."
|
||||
-fi
|
||||
|
||||
-
|
||||
echo "Generating cargo licenses"
|
||||
|
||||
stderr_file=$(mktemp)
|
||||
|
||||
cargo about generate \
|
||||
- --fail \
|
||||
-c script/licenses/zed-licenses.toml \
|
||||
"${TEMPLATE_FILE}" \
|
||||
2> >(tee "$stderr_file") \
|
||||
>> $OUTPUT_FILE
|
||||
"$TEMPLATE_FILE" >> "$OUTPUT_FILE"
|
||||
|
||||
-if cat "$stderr_file" | grep -v "\[WARN\]" > /dev/null; then
|
||||
- echo "Error: License check failed - warnings found" >&2
|
||||
- exit 1
|
||||
-fi
|
||||
|
||||
sed -i.bak 's/"/"/g' $OUTPUT_FILE
|
||||
sed -i.bak 's/'/'\''/g' $OUTPUT_FILE # The ` '\'' ` thing ends the string, appends a single quote, and re-opens the string
|
||||
|
||||
@@ -96,7 +96,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zed-editor";
|
||||
version = "0.175.5";
|
||||
version = "0.176.1";
|
||||
|
||||
outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server";
|
||||
|
||||
@@ -104,7 +104,7 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-CeuZv5GFZ9tttpj+4JAgQZcKtPpbE+NxawcW5W0CFws=";
|
||||
hash = "sha256-Onf3mce327oLbvBPTkJIzJNAf145/ogFK+J6+Asuh9w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -130,7 +130,7 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-UJAH1hCf/p974GNJtvNMzZs8RkxtJQeLhUBCJjLsapU=";
|
||||
cargoHash = "sha256-hlX4IMpsEqwYrzDvzFUhh6PVqM9U+4kp/bBYG08BPQA=";
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
|
||||
@@ -464,14 +464,21 @@ let
|
||||
stripLen = 1;
|
||||
})
|
||||
]
|
||||
++ lib.optionals (lib.versions.major metadata.release_version == "14") [
|
||||
# fix RuntimeDyld usage on aarch64-linux (e.g. python312Packages.numba tests)
|
||||
(fetchpatch {
|
||||
url = "https://github.com/llvm/llvm-project/commit/2e1b838a889f9793d4bcd5dbfe10db9796b77143.patch";
|
||||
relative = "llvm";
|
||||
hash = "sha256-Ot45P/iwaR4hkcM3xtLwfryQNgHI6pv6ADjv98tgdZA=";
|
||||
})
|
||||
]
|
||||
++
|
||||
lib.optionals
|
||||
(
|
||||
(lib.versionAtLeast (lib.versions.major metadata.release_version) "14")
|
||||
&& (lib.versionOlder (lib.versions.major metadata.release_version) "17")
|
||||
)
|
||||
[
|
||||
# fix RuntimeDyld usage on aarch64-linux (e.g. python312Packages.numba tests)
|
||||
# See also: https://github.com/numba/numba/issues/9109
|
||||
(fetchpatch {
|
||||
url = "https://github.com/llvm/llvm-project/commit/2e1b838a889f9793d4bcd5dbfe10db9796b77143.patch";
|
||||
relative = "llvm";
|
||||
hash = "sha256-Ot45P/iwaR4hkcM3xtLwfryQNgHI6pv6ADjv98tgdZA=";
|
||||
})
|
||||
]
|
||||
++
|
||||
lib.optional (lib.versions.major metadata.release_version == "17")
|
||||
# resolves https://github.com/llvm/llvm-project/issues/75168
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
stdenv,
|
||||
wrapQtAppsHook,
|
||||
fetchFromGitHub,
|
||||
fetchFromGitLab,
|
||||
fetchpatch,
|
||||
unstableGitUpdater,
|
||||
cmake,
|
||||
ninja,
|
||||
@@ -36,7 +38,32 @@ stdenv.mkDerivation {
|
||||
python.pkgs.pythonImportsCheckHook
|
||||
];
|
||||
buildInputs = [
|
||||
eigen
|
||||
# reverts 'eigen: 3.4.0 -> 3.4.0-unstable-2022-05-19'
|
||||
# https://github.com/nixos/nixpkgs/commit/d298f046edabc84b56bd788e11eaf7ed72f8171c
|
||||
(eigen.overrideAttrs (old: rec {
|
||||
version = "3.4.0";
|
||||
src = fetchFromGitLab {
|
||||
owner = "libeigen";
|
||||
repo = "eigen";
|
||||
rev = version;
|
||||
hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw=";
|
||||
};
|
||||
patches = (old.patches or [ ]) ++ [
|
||||
# Fixes e.g. onnxruntime on aarch64-darwin:
|
||||
# https://hydra.nixos.org/build/248915128/nixlog/1,
|
||||
# originally suggested in https://github.com/NixOS/nixpkgs/pull/258392.
|
||||
#
|
||||
# The patch is from
|
||||
# ["Fix vectorized reductions for Eigen::half"](https://gitlab.com/libeigen/eigen/-/merge_requests/699)
|
||||
# which is two years old,
|
||||
# but Eigen hasn't had a release in two years either:
|
||||
# https://gitlab.com/libeigen/eigen/-/issues/2699.
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/libeigen/eigen/-/commit/d0e3791b1a0e2db9edd5f1d1befdb2ac5a40efe0.patch";
|
||||
hash = "sha256-8qiNpuYehnoiGiqy0c3Mcb45pwrmc6W4rzCxoLDSvj0=";
|
||||
})
|
||||
];
|
||||
}))
|
||||
zlib
|
||||
libpng
|
||||
boost
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "celery-redbeat";
|
||||
version = "2.2.0";
|
||||
version = "2.3.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sibson";
|
||||
repo = "redbeat";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-lAEbhRTp0jYrCgHaTvPrl+lW1NRezmmTqAnUmLdpVwY=";
|
||||
hash = "sha256-nUVioETVIAjLPOmhBSf+bOUsYuV1C1VGwHz5KjbIjHc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
django,
|
||||
django-debug-toolbar,
|
||||
psycopg2,
|
||||
jinja2,
|
||||
beautifulsoup4,
|
||||
python,
|
||||
pytz,
|
||||
@@ -34,11 +35,20 @@ buildPythonPackage rec {
|
||||
beautifulsoup4
|
||||
django-debug-toolbar
|
||||
psycopg2
|
||||
jinja2
|
||||
pytz
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "cachalot" ];
|
||||
|
||||
# disable broken pinning test
|
||||
preCheck = ''
|
||||
substituteInPlace cachalot/tests/read.py \
|
||||
--replace-fail \
|
||||
"def test_explain(" \
|
||||
"def _test_explain("
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
${python.interpreter} runtests.py
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
{
|
||||
lib,
|
||||
callPackage,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
llm,
|
||||
nix-update-script,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "llm-jq";
|
||||
version = "0.1.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simonw";
|
||||
repo = "llm-jq";
|
||||
tag = version;
|
||||
hash = "sha256-Mf/tbB9+UdmSRpulqv5Wagr8wjDcRrNs2741DNQZhO4=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
llm
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "llm_jq" ];
|
||||
|
||||
passthru.tests = {
|
||||
llm-plugin = callPackage ./tests/llm-plugin.nix { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Write and execute jq programs with the help of LLM";
|
||||
homepage = "https://github.com/simonw/llm-jq";
|
||||
changelog = "https://github.com/simonw/llm-jq/releases/tag/${version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ josh ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
{
|
||||
runCommand,
|
||||
python,
|
||||
yq,
|
||||
}:
|
||||
let
|
||||
venv = python.withPackages (ps: [
|
||||
ps.llm
|
||||
ps.llm-jq
|
||||
]);
|
||||
in
|
||||
runCommand "llm-jq-test-llm-plugin"
|
||||
{
|
||||
nativeBuildInputs = [
|
||||
venv
|
||||
yq
|
||||
];
|
||||
}
|
||||
''
|
||||
llm plugins | yq --exit-status 'any(.name == "llm-jq")'
|
||||
llm jq --help
|
||||
touch "$out"
|
||||
''
|
||||
@@ -32,14 +32,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytensor";
|
||||
version = "2.28.1";
|
||||
version = "2.28.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pymc-devs";
|
||||
repo = "pytensor";
|
||||
tag = "rel-${version}";
|
||||
hash = "sha256-vDgGcTDvtAxkEln4x43wZnMvn24mFzGfbxHd8Ny2/VQ=";
|
||||
hash = "sha256-ZLCIc4fB++B7oMo+jyt5XACG9N1XAwIzJJmIXDISWtA=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
@@ -79,111 +79,78 @@ buildPythonPackage rec {
|
||||
rm -rf pytensor
|
||||
'';
|
||||
|
||||
disabledTests =
|
||||
[
|
||||
# benchmarks (require pytest-benchmark):
|
||||
"test_elemwise_speed"
|
||||
"test_fused_elemwise_benchmark"
|
||||
"test_logsumexp_benchmark"
|
||||
"test_minimal_random_function_call_benchmark"
|
||||
"test_scan_multiple_output"
|
||||
"test_vector_taps_benchmark"
|
||||
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# pytensor.link.c.exceptions.CompileError: Compilation failed (return status=1)
|
||||
"OpFromGraph"
|
||||
"add"
|
||||
"cls_ofg1"
|
||||
"direct"
|
||||
"multiply"
|
||||
"test_AddDS"
|
||||
"test_AddSD"
|
||||
"test_AddSS"
|
||||
"test_MulDS"
|
||||
"test_MulSD"
|
||||
"test_MulSS"
|
||||
"test_NoOutputFromInplace"
|
||||
"test_OpFromGraph"
|
||||
"test_adv_sub1_sparse_grad"
|
||||
"test_alloc"
|
||||
"test_binary"
|
||||
"test_borrow_input"
|
||||
"test_borrow_output"
|
||||
"test_cache_race_condition"
|
||||
"test_check_for_aliased_inputs"
|
||||
"test_clinker_literal_cache"
|
||||
"test_csm_grad"
|
||||
"test_csm_unsorted"
|
||||
"test_csr_dense_grad"
|
||||
"test_debugprint"
|
||||
"test_ellipsis_einsum"
|
||||
"test_empty_elemwise"
|
||||
"test_flatten"
|
||||
"test_fprop"
|
||||
"test_get_item_list_grad"
|
||||
"test_grad"
|
||||
"test_infer_shape"
|
||||
"test_jax_pad"
|
||||
"test_kron"
|
||||
"test_masked_input"
|
||||
"test_max"
|
||||
"test_modes"
|
||||
"test_mul_s_v_grad"
|
||||
"test_multiple_outputs"
|
||||
"test_not_inplace"
|
||||
"test_numba_Cholesky_grad"
|
||||
"test_numba_pad"
|
||||
"test_optimizations_preserved"
|
||||
"test_overided_function"
|
||||
"test_potential_output_aliasing_induced_by_updates"
|
||||
"test_profiling"
|
||||
"test_rebuild_strict"
|
||||
"test_runtime_broadcast_c"
|
||||
"test_scan_err1"
|
||||
"test_scan_err2"
|
||||
"test_shared"
|
||||
"test_solve_triangular_grad"
|
||||
"test_structured_add_s_v_grad"
|
||||
"test_structureddot_csc_grad"
|
||||
"test_structureddot_csr_grad"
|
||||
"test_sum"
|
||||
"test_swap_SharedVariable_with_given"
|
||||
"test_test_value_op"
|
||||
"test_unary"
|
||||
"test_unbroadcast"
|
||||
"test_update_equiv"
|
||||
"test_update_same"
|
||||
];
|
||||
|
||||
# Failure reported upstream: https://github.com/pymc-devs/pytensor/issues/980
|
||||
"test_choose_signature"
|
||||
|
||||
# AssertionError: Not equal to tolerance rtol=1e-06, atol=1e-06
|
||||
# Mismatched elements: 9 / 81 (11.1%)
|
||||
"test_jax_pad"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# pytensor.link.c.exceptions.CompileError: Compilation failed (return status=1)
|
||||
"OpFromGraph"
|
||||
"add"
|
||||
"cls_ofg1"
|
||||
"direct"
|
||||
"multiply"
|
||||
"test_AddDS"
|
||||
"test_AddSD"
|
||||
"test_AddSS"
|
||||
"test_MulDS"
|
||||
"test_MulSD"
|
||||
"test_MulSS"
|
||||
"test_NoOutputFromInplace"
|
||||
"test_OpFromGraph"
|
||||
"test_adv_sub1_sparse_grad"
|
||||
"test_alloc"
|
||||
"test_binary"
|
||||
"test_borrow_input"
|
||||
"test_borrow_output"
|
||||
"test_cache_race_condition"
|
||||
"test_check_for_aliased_inputs"
|
||||
"test_clinker_literal_cache"
|
||||
"test_csm_grad"
|
||||
"test_csm_unsorted"
|
||||
"test_csr_dense_grad"
|
||||
"test_debugprint"
|
||||
"test_ellipsis_einsum"
|
||||
"test_empty_elemwise"
|
||||
"test_flatten"
|
||||
"test_fprop"
|
||||
"test_get_item_list_grad"
|
||||
"test_grad"
|
||||
"test_infer_shape"
|
||||
"test_jax_pad"
|
||||
"test_kron"
|
||||
"test_masked_input"
|
||||
"test_max"
|
||||
"test_modes"
|
||||
"test_mul_s_v_grad"
|
||||
"test_multiple_outputs"
|
||||
"test_not_inplace"
|
||||
"test_numba_Cholesky_grad"
|
||||
"test_numba_pad"
|
||||
"test_optimizations_preserved"
|
||||
"test_overided_function"
|
||||
"test_potential_output_aliasing_induced_by_updates"
|
||||
"test_profiling"
|
||||
"test_rebuild_strict"
|
||||
"test_runtime_broadcast_c"
|
||||
"test_scan_err1"
|
||||
"test_scan_err2"
|
||||
"test_shared"
|
||||
"test_solve_triangular_grad"
|
||||
"test_structured_add_s_v_grad"
|
||||
"test_structureddot_csc_grad"
|
||||
"test_structureddot_csr_grad"
|
||||
"test_sum"
|
||||
"test_swap_SharedVariable_with_given"
|
||||
"test_test_value_op"
|
||||
"test_unary"
|
||||
"test_unbroadcast"
|
||||
"test_update_equiv"
|
||||
"test_update_same"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
|
||||
# Fatal Python error: Segmentation fault
|
||||
# pytensor/link/basic.py", line 665 in thunk
|
||||
"test_Unique"
|
||||
"test_aligned_RandomVariable"
|
||||
"test_blockwise"
|
||||
"test_mvnormal_cov_decomposition_method"
|
||||
"test_unnatural_batched_dims"
|
||||
];
|
||||
|
||||
disabledTestPaths =
|
||||
[
|
||||
# Don't run the most compute-intense tests
|
||||
"tests/scan/"
|
||||
"tests/tensor/"
|
||||
"tests/sparse/sandbox/"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
|
||||
# Fatal Python error: Segmentation fault
|
||||
# pytensor/link/basic.py", line 665 in thunk
|
||||
"tests/link/numba/test_nlinalg.py"
|
||||
"tests/link/numba/test_slinalg.py"
|
||||
];
|
||||
disabledTestPaths = [
|
||||
# Don't run the most compute-intense tests
|
||||
"tests/scan/"
|
||||
"tests/tensor/"
|
||||
"tests/sparse/sandbox/"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
@@ -196,7 +163,7 @@ buildPythonPackage rec {
|
||||
description = "Python library to define, optimize, and efficiently evaluate mathematical expressions involving multi-dimensional arrays";
|
||||
mainProgram = "pytensor-cache";
|
||||
homepage = "https://github.com/pymc-devs/pytensor";
|
||||
changelog = "https://github.com/pymc-devs/pytensor/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/pymc-devs/pytensor/releases/tag/red-${version}";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [
|
||||
bcdarwin
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "starlette-context";
|
||||
version = "0.3.6";
|
||||
version = "0.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "tomwojcik";
|
||||
repo = "starlette-context";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ZKwE2M86clYKdptd0o/j8VYUOj/Y/72uUnpxFbJ65vw=";
|
||||
hash = "sha256-PzVZ458TdBLdbFJDN+X8hVU5zsRxcesihoDB+jRaKAg=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -2,8 +2,10 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
pythonAtLeast,
|
||||
pytestCheckHook,
|
||||
cheroot,
|
||||
legacy-cgi,
|
||||
dbutils,
|
||||
mysqlclient,
|
||||
pymysql,
|
||||
@@ -20,7 +22,9 @@ buildPythonPackage rec {
|
||||
sha256 = "5ce684caa240654cae5950da8b4b7bc178812031e08f990518d072bd44ab525e";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ cheroot ];
|
||||
propagatedBuildInputs = [
|
||||
cheroot
|
||||
] ++ lib.optional (pythonAtLeast "3.13") legacy-cgi;
|
||||
|
||||
# requires multiple running databases
|
||||
doCheck = false;
|
||||
|
||||
@@ -14,6 +14,8 @@
|
||||
setuptools,
|
||||
six,
|
||||
fetchpatch2,
|
||||
pythonAtLeast,
|
||||
legacy-cgi,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -46,14 +48,17 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
chardet
|
||||
distutils # src/wfuzz/plugin_api/base.py
|
||||
pycurl
|
||||
six
|
||||
setuptools
|
||||
pyparsing
|
||||
] ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ];
|
||||
dependencies =
|
||||
[
|
||||
chardet
|
||||
distutils # src/wfuzz/plugin_api/base.py
|
||||
pycurl
|
||||
six
|
||||
setuptools
|
||||
pyparsing
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ]
|
||||
++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
netaddr
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
version = "0.35.0";
|
||||
version = "0.36.0";
|
||||
pname = "geckodriver";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla";
|
||||
repo = "geckodriver";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-3EJP+y+Egz0kj5e+1FRHPGWfneB/tCCVggmgmylMyDE=";
|
||||
sha256 = "sha256-rqJ6+QKfEhdHGZBT9yEWtsBlETxz4XeEZXisXf7RdIE=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-BZosk8tCHpQqQTNFe8BPArdkTHoRN/SViG10xtYs8jY=";
|
||||
cargoHash = "sha256-wFRZhQzFBwwNfiszwr7XK3e8tfqqFG6DIe7viWvB5vg=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
libiconv
|
||||
|
||||
@@ -65,10 +65,6 @@ let
|
||||
# https://github.com/ARM-software/arm-trusted-firmware/blob/4ec2948fe3f65dba2f19e691e702f7de2949179c/make_helpers/toolchains/rk3399-m0.mk#L21-L22
|
||||
rk3399-m0-oc = "${pkgsCross.arm-embedded.stdenv.cc.targetPrefix}objcopy";
|
||||
|
||||
# Some platforms like sun50i_a64 have ENABLE_LTO := 1, which requires $(ARCH)-ld/cc-id == "gnu-gcc"
|
||||
aarch64-cc-id = "gnu-gcc";
|
||||
aarch64-ld-id = "gnu-gcc";
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
makeFlags =
|
||||
@@ -77,6 +73,8 @@ let
|
||||
"M0_CROSS_COMPILE=${pkgsCross.arm-embedded.stdenv.cc.targetPrefix}"
|
||||
"CROSS_COMPILE=${stdenv.cc.targetPrefix}"
|
||||
# Make the new toolchain guessing (from 2.11+) happy
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
"LD=${stdenv.cc.targetPrefix}cc"
|
||||
"AS=${stdenv.cc.targetPrefix}cc"
|
||||
"OC=${stdenv.cc.targetPrefix}objcopy"
|
||||
"OD=${stdenv.cc.targetPrefix}objdump"
|
||||
@@ -98,9 +96,6 @@ let
|
||||
hardeningDisable = [ "all" ];
|
||||
dontStrip = true;
|
||||
|
||||
# Fatal error: can't create build/sun50iw1p1/release/bl31/sunxi_clocks.o: No such file or directory
|
||||
enableParallelBuilding = false;
|
||||
|
||||
meta =
|
||||
with lib;
|
||||
{
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
let
|
||||
pname = "pgadmin";
|
||||
version = "9.0";
|
||||
yarnHash = "sha256-CVanJx4gmhtiCMpmDzViY/kw9cu9ey0S6r5SPZKzVxA=";
|
||||
version = "9.1";
|
||||
yarnHash = "sha256-RMsmYtesCaNI4SGH2QIdcZAivKp/a8Wo6cBzi13MXqs=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgadmin-org";
|
||||
repo = "pgadmin4";
|
||||
rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";
|
||||
hash = "sha256-WscqFuxdy29SIaTfKgKu7pKcQrU0f6tNvC7BifaDnYQ=";
|
||||
hash = "sha256-NqtdR0aX6PDskbA6+AaBMhyvuKjl/CHQso9V4Vpd+LU=";
|
||||
};
|
||||
|
||||
# keep the scope, as it is used throughout the derivation and tests
|
||||
|
||||
+488
-462
File diff suppressed because it is too large
Load Diff
@@ -9,13 +9,13 @@
|
||||
buildNpmPackage,
|
||||
}:
|
||||
let
|
||||
version = "0.3.1";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ekzhang";
|
||||
repo = "sshx";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-AOmtN+NoBWuyCDe73dDWFmAWYEAxH8N5Vue1V87CZVU=";
|
||||
hash = "sha256-+IHV+dJb/j1/tmdqDXo6bqhvj3nBQ7i4AsUeHFA3+NU=";
|
||||
};
|
||||
|
||||
mkSshxPackage =
|
||||
@@ -60,12 +60,12 @@ in
|
||||
{
|
||||
sshx = mkSshxPackage {
|
||||
pname = "sshx";
|
||||
cargoHash = "sha256-S07xqDiINhOrr7G5EWpEzOrV3UYr74bGehgzRNBlJTo=";
|
||||
cargoHash = "sha256-QftBUGDQvCSHoOBLnEzNOe1dMTpVTvMDXNp5qZr0C2M=";
|
||||
};
|
||||
|
||||
sshx-server = mkSshxPackage rec {
|
||||
pname = "sshx-server";
|
||||
cargoHash = "sha256-S07xqDiINhOrr7G5EWpEzOrV3UYr74bGehgzRNBlJTo=";
|
||||
cargoHash = "sha256-QftBUGDQvCSHoOBLnEzNOe1dMTpVTvMDXNp5qZr0C2M=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace crates/sshx-server/src/web.rs \
|
||||
@@ -86,7 +86,7 @@ in
|
||||
--replace-fail 'execSync("git rev-parse --short HEAD").toString().trim()' '"${src.rev}"'
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-2cO0+ComNa4kDgo3SNGd1kPgKCE0/x9L9arAeHY0sQ4=";
|
||||
npmDepsHash = "sha256-QdgNtQMjK229QzB5LbCry1hKVPon8IWUnj+v5L7ydfI=";
|
||||
|
||||
installPhase = ''
|
||||
cp -r build $out
|
||||
|
||||
@@ -7759,6 +7759,8 @@ self: super: with self; {
|
||||
|
||||
llm-gguf = callPackage ../development/python-modules/llm-gguf { };
|
||||
|
||||
llm-jq = callPackage ../development/python-modules/llm-jq { };
|
||||
|
||||
llm-ollama = callPackage ../development/python-modules/llm-ollama { };
|
||||
|
||||
llmx = callPackage ../development/python-modules/llmx { };
|
||||
|
||||
Reference in New Issue
Block a user