Merge master into staging-nixos
This commit is contained in:
@@ -15559,6 +15559,11 @@
|
||||
github = "ljxfstorm";
|
||||
githubId = 7077478;
|
||||
};
|
||||
lks = {
|
||||
name = "Lukas";
|
||||
github = "1H0";
|
||||
githubId = 37246258;
|
||||
};
|
||||
llakala = {
|
||||
email = "elevenaka11@gmail.com";
|
||||
github = "llakala";
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ lib, ... }:
|
||||
let
|
||||
domain = "docs.local";
|
||||
oidcDomain = "127.0.0.1:8080";
|
||||
s3Domain = "127.0.0.1:9000";
|
||||
oidcAddr = "127.0.0.1:8080";
|
||||
s3Addr = "127.0.0.1:9000";
|
||||
|
||||
minioAccessKey = "a8dff633d164068418a5";
|
||||
minioSecretKey = "d546ea5f9c9bfdcf83755a7c09f2f7fb";
|
||||
garageAccessKey = "GKaaaaaaaaaaaaaaaaaaaaaaaa";
|
||||
garageSecretKey = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
|
||||
in
|
||||
|
||||
{
|
||||
@@ -24,7 +24,6 @@ in
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
jq
|
||||
minio-client
|
||||
];
|
||||
|
||||
services.lasuite-docs = {
|
||||
@@ -34,17 +33,17 @@ in
|
||||
postgresql.createLocally = true;
|
||||
|
||||
inherit domain;
|
||||
s3Url = "http://${s3Domain}/lasuite-docs";
|
||||
s3Url = "http://${s3Addr}/lasuite-docs";
|
||||
|
||||
settings = {
|
||||
DJANGO_SECRET_KEY_FILE = pkgs.writeText "django-secret-file" ''
|
||||
8540db59c03943d48c3ed1a0f96ce3b560e0f45274f120f7ee4dace3cc366a6b
|
||||
'';
|
||||
|
||||
OIDC_OP_JWKS_ENDPOINT = "http://${oidcDomain}/dex/keys";
|
||||
OIDC_OP_AUTHORIZATION_ENDPOINT = "http://${oidcDomain}/dex/auth/mock";
|
||||
OIDC_OP_TOKEN_ENDPOINT = "http://${oidcDomain}/dex/token";
|
||||
OIDC_OP_USER_ENDPOINT = "http://${oidcDomain}/dex/userinfo";
|
||||
OIDC_OP_JWKS_ENDPOINT = "http://${oidcAddr}/dex/keys";
|
||||
OIDC_OP_AUTHORIZATION_ENDPOINT = "http://${oidcAddr}/dex/auth/mock";
|
||||
OIDC_OP_TOKEN_ENDPOINT = "http://${oidcAddr}/dex/token";
|
||||
OIDC_OP_USER_ENDPOINT = "http://${oidcAddr}/dex/userinfo";
|
||||
OIDC_RP_CLIENT_ID = "lasuite-docs";
|
||||
OIDC_RP_SIGN_ALGO = "RS256";
|
||||
OIDC_RP_SCOPES = "openid email";
|
||||
@@ -54,9 +53,9 @@ in
|
||||
LOGIN_REDIRECT_URL_FAILURE = "http://${domain}";
|
||||
LOGOUT_REDIRECT_URL = "http://${domain}";
|
||||
|
||||
AWS_S3_ENDPOINT_URL = "http://${s3Domain}";
|
||||
AWS_S3_ACCESS_KEY_ID = minioAccessKey;
|
||||
AWS_S3_SECRET_ACCESS_KEY = minioSecretKey;
|
||||
AWS_S3_ENDPOINT_URL = "http://${s3Addr}";
|
||||
AWS_S3_ACCESS_KEY_ID = garageAccessKey;
|
||||
AWS_S3_SECRET_ACCESS_KEY = garageSecretKey;
|
||||
AWS_STORAGE_BUCKET_NAME = "lasuite-docs";
|
||||
MEDIA_BASE_URL = "http://${domain}";
|
||||
|
||||
@@ -72,7 +71,7 @@ in
|
||||
services.dex = {
|
||||
enable = true;
|
||||
settings = {
|
||||
issuer = "http://${oidcDomain}/dex";
|
||||
issuer = "http://${oidcAddr}/dex";
|
||||
storage = {
|
||||
type = "postgres";
|
||||
config.host = "/var/run/postgresql";
|
||||
@@ -101,25 +100,27 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
services.minio = {
|
||||
services.garage = {
|
||||
enable = true;
|
||||
rootCredentialsFile = "/etc/minio/minio-root-credentials";
|
||||
};
|
||||
package = pkgs.garage_2;
|
||||
settings = {
|
||||
rpc_bind_addr = "127.0.0.1:3901";
|
||||
rpc_public_addr = "127.0.0.1:3901";
|
||||
rpc_secret = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
|
||||
replication_factor = 1;
|
||||
|
||||
s3_api = {
|
||||
s3_region = "garage";
|
||||
api_bind_addr = s3Addr;
|
||||
};
|
||||
};
|
||||
};
|
||||
environment.etc."dex/lasuite-docs" = {
|
||||
mode = "0400";
|
||||
user = "dex";
|
||||
text = "lasuitedocsclientsecret";
|
||||
};
|
||||
|
||||
environment.etc."minio/minio-root-credentials" = {
|
||||
mode = "0400";
|
||||
text = ''
|
||||
MINIO_ROOT_USER=${minioAccessKey}
|
||||
MINIO_ROOT_PASSWORD=${minioSecretKey}
|
||||
'';
|
||||
};
|
||||
|
||||
services.postgresql = {
|
||||
enable = true;
|
||||
ensureDatabases = [ "dex" ];
|
||||
@@ -135,25 +136,30 @@ in
|
||||
testScript = ''
|
||||
with subtest("Wait for units to start"):
|
||||
machine.wait_for_unit("dex.service")
|
||||
machine.wait_for_unit("minio.service")
|
||||
machine.wait_for_unit("garage.service")
|
||||
machine.wait_for_unit("lasuite-docs.service")
|
||||
machine.wait_for_unit("lasuite-docs-celery.service")
|
||||
machine.wait_for_unit("lasuite-docs-collaboration-server.service")
|
||||
|
||||
with subtest("Create S3 bucket"):
|
||||
machine.succeed("mc alias set minio http://${s3Domain} ${minioAccessKey} ${minioSecretKey} --api s3v4")
|
||||
machine.succeed("mc mb lasuite-docs")
|
||||
machine.wait_for_open_port(3901)
|
||||
garage_node_id = machine.succeed("garage status | tail -n1 | awk '{ print $1 }'")
|
||||
machine.succeed(f"garage layout assign -c 100MB -z garage {garage_node_id}")
|
||||
machine.succeed("garage layout apply --version 1")
|
||||
machine.succeed("garage key import ${garageAccessKey} ${garageSecretKey} --yes")
|
||||
machine.succeed("garage bucket create lasuite-docs")
|
||||
machine.succeed("garage bucket allow --read --write --owner lasuite-docs --key ${garageAccessKey}")
|
||||
|
||||
with subtest("Wait for web servers to start"):
|
||||
machine.wait_until_succeeds("curl -fs 'http://${domain}/api/v1.0/authenticate/'", timeout=120)
|
||||
machine.wait_until_succeeds("curl -fs '${oidcDomain}/dex/auth/mock?client_id=lasuite-docs&response_type=code&redirect_uri=http://${domain}/api/v1.0/callback/&scope=openid'", timeout=120)
|
||||
machine.wait_until_succeeds("curl -fs '${oidcAddr}/dex/auth/mock?client_id=lasuite-docs&response_type=code&redirect_uri=http://${domain}/api/v1.0/callback/&scope=openid'", timeout=120)
|
||||
|
||||
with subtest("Login"):
|
||||
state, nonce = machine.succeed("curl -fs -c cjar 'http://${domain}/api/v1.0/authenticate/' -w '%{redirect_url}' | sed -n 's/.*state=\\(.*\\)&nonce=\\(.*\\)/\\1 \\2/p'").strip().split(' ')
|
||||
|
||||
oidc_state = machine.succeed(f"curl -fs '${oidcDomain}/dex/auth/mock?client_id=lasuite-docs&response_type=code&redirect_uri=http://${domain}/api/v1.0/callback/&scope=openid+email&state={state}&nonce={nonce}' | sed -n 's/.*state=\\(.*\\)\">.*/\\1/p'").strip()
|
||||
oidc_state = machine.succeed(f"curl -fs '${oidcAddr}/dex/auth/mock?client_id=lasuite-docs&response_type=code&redirect_uri=http://${domain}/api/v1.0/callback/&scope=openid+email&state={state}&nonce={nonce}' | sed -n 's/.*state=\\(.*\\)\">.*/\\1/p'").strip()
|
||||
|
||||
code = machine.succeed(f"curl -fs '${oidcDomain}/dex/auth/mock/login?back=&state={oidc_state}' -d 'login=admin&password=password' -w '%{{redirect_url}}' | sed -n 's/.*code=\\(.*\\)&.*/\\1/p'").strip()
|
||||
code = machine.succeed(f"curl -fs '${oidcAddr}/dex/auth/mock/login?back=&state={oidc_state}' -d 'login=admin&password=password' -w '%{{redirect_url}}' | sed -n 's/.*code=\\(.*\\)&.*/\\1/p'").strip()
|
||||
print(f"Got approval code {code}")
|
||||
|
||||
machine.succeed(f"curl -fs -c cjar -b cjar 'http://${domain}/api/v1.0/callback/?code={code}&state={state}'")
|
||||
|
||||
@@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-wakatime";
|
||||
publisher = "WakaTime";
|
||||
version = "30.0.4";
|
||||
hash = "sha256-5y7LTkiR7dnSHbL80pqsTb57rnLyEbIrHT4xzseVj84=";
|
||||
version = "30.0.5";
|
||||
hash = "sha256-8K8EgdHOGL3sYW5j8hpfbZFifbInMNWEYe60F1UGsj4=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -2413,6 +2413,8 @@ let
|
||||
|
||||
jackmacwindows.craftos-pc = callPackage ./jackmacwindows.craftos-pc { };
|
||||
|
||||
jakestanger.corn = callPackage ./jakestanger.corn { };
|
||||
|
||||
james-yu.latex-workshop = callPackage ./james-yu.latex-workshop { };
|
||||
|
||||
jamesyang999.vscode-emacs-minimum = buildVscodeMarketplaceExtension {
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
{
|
||||
vscode-utils,
|
||||
lib,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "corn";
|
||||
publisher = "JakeStanger";
|
||||
version = "0.1.0";
|
||||
hash = "sha256-6c9lxwJDVUuT3VKAbIohd0mRHFbfmfDgKfYJ+XET5hQ=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/JakeStanger.corn/changelog";
|
||||
description = "Visual Studio Code extension for Cornlang";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=JakeStanger.corn";
|
||||
homepage = "https://github.com/corn-config/corn-vscode";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ drupol ];
|
||||
};
|
||||
}
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "claude-dev";
|
||||
publisher = "saoudrizwan";
|
||||
version = "3.77.0";
|
||||
hash = "sha256-xJDHPmqPRAc9hOD8tIat4isTqLYpN1mOzgw/f+nt1GI=";
|
||||
version = "3.78.0";
|
||||
hash = "sha256-Aah8K+ZOrlpJofeJIlOgL/42QVTmLsc6Ldk2xSK3RUw=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -400,13 +400,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"fastly_fastly": {
|
||||
"hash": "sha256-PCfCsr4FMbMT+BKP+U1Ji51heTmXrOQ/vCgnQYN2u3k=",
|
||||
"hash": "sha256-2QfgzzWYXPOCMAX2EBodDPVEtcIHHPT4Lbh0W1+q2to=",
|
||||
"homepage": "https://registry.terraform.io/providers/fastly/fastly",
|
||||
"owner": "fastly",
|
||||
"repo": "terraform-provider-fastly",
|
||||
"rev": "v8.8.0",
|
||||
"rev": "v9.1.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-WF+9Piyx+6vaUVujmlD3mKIEw/8KNJnlx7RlEWELbRg="
|
||||
"vendorHash": "sha256-E64AMHGFpAhg6UNYHJXAdRWPdWWdZineW/b+Gs2O2jk="
|
||||
},
|
||||
"flexibleenginecloud_flexibleengine": {
|
||||
"hash": "sha256-yEZ9JiUSqFFbfqzOOD59ZBv4yFCeUBBKlp6aiUqDqiM=",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+11
-10
@@ -4,14 +4,13 @@
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
qtbase,
|
||||
qt5,
|
||||
capstone,
|
||||
bison,
|
||||
flex,
|
||||
wrapQtAppsHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "boomerang";
|
||||
version = "0.5.2";
|
||||
# NOTE: When bumping version beyond 0.5.2, you likely need to remove
|
||||
@@ -20,9 +19,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BoomerangDecompiler";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0xncdp0z8ry4lkzmvbj5d7hlzikivghpwicgywlv47spgh8ny0ix";
|
||||
repo = "boomerang";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PQJvEXxXH7Ip949FfuHbccZP4WlFrl3/pMRn9MFtzHY=";
|
||||
};
|
||||
|
||||
# Boomerang usually compiles with -Werror but has not been updated for newer
|
||||
@@ -34,17 +33,19 @@ stdenv.mkDerivation rec {
|
||||
cmake
|
||||
bison
|
||||
flex
|
||||
wrapQtAppsHook
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qt5.qtbase
|
||||
capstone
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "include-missing-cstdint.patch";
|
||||
url = "https://github.com/BoomerangDecompiler/boomerang/commit/3342b0eac6b7617d9913226c06c1470820593e74.patch";
|
||||
sha256 = "sha256-941IydcV3mqj7AWvXTM6GePW5VgawEcL0wrBCXqeWvc=";
|
||||
hash = "sha256-941IydcV3mqj7AWvXTM6GePW5VgawEcL0wrBCXqeWvc=";
|
||||
})
|
||||
];
|
||||
|
||||
@@ -54,4 +55,4 @@ stdenv.mkDerivation rec {
|
||||
description = "General, open source, retargetable decompiler";
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -12,16 +12,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cantus";
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CodedNil";
|
||||
repo = "cantus";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-7MaUdrFbpqfQ4Bim1zbQdT/J+SI79zXoaAmmwMbMeqg=";
|
||||
hash = "sha256-C/djQKG25azM/Vfw6UurPhgIyHGhWcMwM8FXQt+alko=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ttV8Ff+il71d6RbCCH3XkAj4CyKW3LO5zY5FiYOAWxo=";
|
||||
cargoHash = "sha256-qg7YeIJVDzrAmUNUjfIB7eoZYUTMNu69L7dlZ6D9nLU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "check-sieve";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dburkart";
|
||||
repo = "check-sieve";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-dElVfLSVtlELleuxCScR6BGuLsJ+KRqcNA8y0lgrBfI=";
|
||||
hash = "sha256-kNHRid87RW+tm3nmMEe8Y5dcgLZMHICzY2rgWlK3h0M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
+5
-6
@@ -3,9 +3,8 @@
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
lib,
|
||||
qttools,
|
||||
qt5,
|
||||
fribidi,
|
||||
libunibreak,
|
||||
zstd,
|
||||
@@ -18,8 +17,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "buggins";
|
||||
repo = "coolreader";
|
||||
rev = "cr${finalAttrs.version}";
|
||||
sha256 = "sha256-RgVEOaNBaEuPBC75B8PdCkbqMvEzNmnEYmiI1ny/WFQ=";
|
||||
tag = "cr${finalAttrs.version}";
|
||||
hash = "sha256-RgVEOaNBaEuPBC75B8PdCkbqMvEzNmnEYmiI1ny/WFQ=";
|
||||
};
|
||||
|
||||
patches = [ ./cmake_policy_version_3_5.patch ];
|
||||
@@ -27,11 +26,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qttools
|
||||
qt5.qttools
|
||||
fribidi
|
||||
libunibreak
|
||||
zstd
|
||||
@@ -0,0 +1,53 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "corn-cli";
|
||||
version = "0.10.1";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "corn-config";
|
||||
repo = "corn";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TPGLF72fp1aX19kQgI/bYdzTIsP0M7gn1ZSUny10kMs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4WDL1A29vQ9NrDbfA0nBZ7PcBz2zTmlOaxI6V4u4x5o=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--package"
|
||||
"corn-cli"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
preCheck = ''
|
||||
export CORN_TEST=bar
|
||||
'';
|
||||
|
||||
# Single failing test
|
||||
checkFlags = [
|
||||
"--skip=toml_complex"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "CLI for Cornlang, a simple and pain-free configuration language";
|
||||
homepage = "https://cornlang.dev/";
|
||||
changelog = "https://github.com/corn-config/corn/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ drupol ];
|
||||
mainProgram = "corn-cli";
|
||||
};
|
||||
})
|
||||
+10
-14
@@ -3,36 +3,32 @@
|
||||
stdenv,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
libxml2,
|
||||
libdatovka,
|
||||
qmake,
|
||||
qtbase,
|
||||
qtwebsockets,
|
||||
qtsvg,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "datovka";
|
||||
version = "4.28.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz";
|
||||
sha256 = "sha256-vTfmJEwbfaPFnZE8o3YnZhjwfMZ0At7eZ0iMoh4/HQE=";
|
||||
url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${finalAttrs.version}/datovka-v${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-vTfmJEwbfaPFnZE8o3YnZhjwfMZ0At7eZ0iMoh4/HQE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libdatovka
|
||||
qmake
|
||||
qtbase
|
||||
qtsvg
|
||||
libsForQt5.qmake
|
||||
libsForQt5.qtbase
|
||||
libsForQt5.qtsvg
|
||||
libxml2
|
||||
qtwebsockets
|
||||
libsForQt5.qtwebsockets
|
||||
];
|
||||
|
||||
meta = {
|
||||
@@ -43,4 +39,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "datovka";
|
||||
};
|
||||
}
|
||||
})
|
||||
+12
-15
@@ -7,33 +7,30 @@
|
||||
log4cpp,
|
||||
openjpeg,
|
||||
libpng12,
|
||||
poppler,
|
||||
qtbase,
|
||||
libsForQt5,
|
||||
qt5,
|
||||
qmake,
|
||||
wrapQtAppsHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "engauge-digitizer";
|
||||
version = "12.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "akhuettel";
|
||||
repo = "engauge-digitizer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Wj9o3wWbtHsEi6LFH4xDpwVR9BwcWc472jJ/QFDQZvY=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Wj9o3wWbtHsEi6LFH4xDpwVR9BwcWc472jJ/QFDQZvY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
qt5.qmake
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qt5.qtbase
|
||||
qt5.qttools
|
||||
poppler
|
||||
libsForQt5.poppler
|
||||
libpng12
|
||||
openjpeg
|
||||
openjpeg.dev
|
||||
@@ -49,11 +46,11 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
env = {
|
||||
POPPLER_INCLUDE = "${poppler.dev}/include/poppler/qt5";
|
||||
POPPLER_INCLUDE = "${libsForQt5.poppler.dev}/include/poppler/qt5";
|
||||
|
||||
POPPLER_LIB = "${poppler}/lib";
|
||||
POPPLER_LIB = "${libsForQt5.poppler}/lib";
|
||||
|
||||
OPENJPEG_INCLUDE = "${openjpeg.dev}/include/${openjpeg.pname}-${lib.versions.majorMinor openjpeg.version}";
|
||||
OPENJPEG_INCLUDE = "${openjpeg.dev}/include/openjpeg-${lib.versions.majorMinor openjpeg.version}";
|
||||
|
||||
OPENJPEG_LIB = "${openjpeg}/lib";
|
||||
};
|
||||
@@ -75,4 +72,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.sheepforce ];
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -17,16 +17,16 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.304.2";
|
||||
version = "0.304.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = "evcc";
|
||||
tag = version;
|
||||
hash = "sha256-BViPo9P3c5ptI+pvKfpPVrYJFbbV5cF3Nn1eZ90BaRM=";
|
||||
hash = "sha256-JS9zRWuRx1Qaipw3XRh1nr4TnH44isEWWa4NwifNPgY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-CDbFutP+pLHt9IJWaCdVxoM/PE/tJ/XU7SStqMd6A6Y=";
|
||||
vendorHash = "sha256-mrfrF97wp6cPnvqLTBN+nJ2yOfsJ0e8GSH+uebxvOFk=";
|
||||
|
||||
commonMeta = {
|
||||
license = lib.licenses.mit;
|
||||
@@ -52,7 +52,7 @@ buildGo126Module rec {
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
hash = "sha256-DmpwSART/Aw2vLMAp9fxoZ6iDZiSfDfvNCFLlAdDDRU=";
|
||||
hash = "sha256-5xphgrFXY7aTVMDTzmf9vKBBMuEHv7a0tV4yf7IfcZg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
+7
-11
@@ -2,11 +2,7 @@
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
qtbase,
|
||||
qtdeclarative,
|
||||
qtquickcontrols,
|
||||
wrapQtAppsHook,
|
||||
qt5,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "firebird-emu";
|
||||
@@ -15,20 +11,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "nspire-emus";
|
||||
repo = "firebird";
|
||||
rev = "v${finalAttrs.version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-ZptjlnOiF+hKuKYvBFJL95H5YQuR99d4biOco/MVEmE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapQtAppsHook
|
||||
qmake
|
||||
qt5.wrapQtAppsHook
|
||||
qt5.qmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtdeclarative
|
||||
qtquickcontrols
|
||||
qt5.qtbase
|
||||
qt5.qtdeclarative
|
||||
qt5.qtquickcontrols
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
@@ -4,6 +4,7 @@
|
||||
autoPatchelfHook,
|
||||
fetchurl,
|
||||
makeBinaryWrapper,
|
||||
bash,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
@@ -40,7 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postInstall = ''
|
||||
# Filename must explictly be "copilot" for internal self-referencing
|
||||
makeWrapper $out/libexec/copilot $out/bin/copilot \
|
||||
--add-flags "--no-auto-update"
|
||||
--add-flags "--no-auto-update" \
|
||||
--prefix PATH : "${lib.makeBinPath [ bash ]}"
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "go-tpc";
|
||||
version = "1.0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pingcap";
|
||||
repo = "go-tpc";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-O+zHHSjucFh8T42P/IQAA993DmskJfoo1WdO8T95I88=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JInXHnHW5jfKism5OscYSJJjBBB7URYLSVpo4EJ/HAs=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X 'main.version=${finalAttrs.version}'"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Toolbox to benchmark TPC workloads in Go";
|
||||
homepage = "https://github.com/pingcap/go-tpc";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "go-tpc";
|
||||
maintainers = with lib.maintainers; [ lks ];
|
||||
};
|
||||
})
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "golazo";
|
||||
version = "0.22.0";
|
||||
version = "0.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "0xjuanma";
|
||||
repo = "golazo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-t8jzZcOVJaeQ4SGb8WO9lqzVgllz2mX8mUwk+JsNWzI=";
|
||||
hash = "sha256-hrdiNccvIgX9v187l4Htc7viqOb1lGgxOkeLJgFyF4M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-M2gfqU5rOfuiVSZnH/Dr8OVmDhyU2jYkgW7RuIUTd+E=";
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
fetchpatch,
|
||||
glib,
|
||||
cmake,
|
||||
libxml2,
|
||||
@@ -14,19 +13,18 @@
|
||||
polkit,
|
||||
udevCheckHook,
|
||||
libssc,
|
||||
libqmi,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iio-sensor-proxy";
|
||||
version = "3.8";
|
||||
version = "3.9";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "hadess";
|
||||
repo = "iio-sensor-proxy";
|
||||
rev = version;
|
||||
hash = "sha256-ZVaV4Aj4alr5eP3uz6SunpeRsMOo8YcZMqCcB0DUYGY=";
|
||||
hash = "sha256-2N/4Fp6QtAhgEzX9cHEDJhFtRsyrtZ80I2jdHdeEmxA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -35,14 +33,6 @@ stdenv.mkDerivation rec {
|
||||
--replace 'polkit_policy_directory' "'$out/share/polkit-1/actions'"
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/merge_requests/381
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.postmarketos.org/postmarketOS/pmaports/-/raw/af17d8f3a7572ed2be40d5a28c6ce08c74bd36c7/temp/iio-sensor-proxy/0001-iio-sensor-proxy-depend-on-libssc.patch";
|
||||
hash = "sha256-faOpfR6qit68R2b+sk9/k4XeA6Ao5UuerrfFzMaD3MM=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libgudev
|
||||
systemd
|
||||
@@ -63,7 +53,7 @@ stdenv.mkDerivation rec {
|
||||
mesonFlags = [
|
||||
(lib.mesonOption "udevrulesdir" "${placeholder "out"}/lib/udev/rules.d")
|
||||
(lib.mesonOption "systemdsystemunitdir" "${placeholder "out"}/lib/systemd/system")
|
||||
(lib.mesonBool "ssc-support" true)
|
||||
(lib.mesonOption "ssc-support" "enabled")
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff '--color=auto' -u -r khard-0.20.1/doc/source/conf.py new/doc/source/conf.py
|
||||
--- khard-0.20.1/doc/source/conf.py 2025-07-29 04:47:18.000000000 +0800
|
||||
+++ new/doc/source/conf.py 2026-03-29 12:53:42.904389827 +0800
|
||||
@@ -52,8 +52,8 @@
|
||||
'sphinx.ext.autodoc', # https://pypi.org/project/sphinx-autodoc-typehints/
|
||||
'sphinx.ext.autosectionlabel',
|
||||
'sphinx.ext.todo',
|
||||
- 'sphinx_autodoc_typehints', # https://pypi.org/project/sphinx-autodoc-typehints/
|
||||
'sphinxarg.ext',
|
||||
+ 'sphinx_autodoc_typehints', # https://pypi.org/project/sphinx-autodoc-typehints/
|
||||
]
|
||||
|
||||
autoapi_type = 'python'
|
||||
@@ -1,7 +1,9 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
python3,
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
@@ -10,18 +12,31 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
version = "0.20.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-s+W/rfa11+jxaNDDIMdLlU5NDvQZSyh5EUD+V3pI+Ug=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lucc";
|
||||
repo = "khard";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5ZKLOwoAzY36htMzMLpdwn1Xo34rGe56+TFuHRfFB9Q=";
|
||||
};
|
||||
|
||||
patches = [ ./khard-sphinx.patch ];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lucc/khard/commit/4e07412b8870f210409077a925d74ae47152a80c.patch";
|
||||
hash = "sha256-tApB1xYLBHV/XQ73ITJjKxCjOz6DNPDsKXn8f7KQZRc=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
sphinxHook
|
||||
sphinx-argparse
|
||||
sphinx-autoapi
|
||||
sphinx-autodoc-typehints
|
||||
];
|
||||
|
||||
sphinxBuilders = [ "man" ];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
configobj
|
||||
ruamel-yaml
|
||||
@@ -42,6 +57,18 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
|
||||
nativeCheckInputs = [
|
||||
versionCheckHook
|
||||
python3.pkgs.pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
# Nixpkgs' default is `--capture=fd`, and with it, 2 command mock tests
|
||||
# fail, see: https://github.com/lucc/khard/issues/353
|
||||
"--capture=no"
|
||||
];
|
||||
|
||||
disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# https://github.com/lucc/khard/issues/354
|
||||
"test/test_khard.py::TestSortContacts::test_sorting_of_korean_names"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kubelogin";
|
||||
version = "1.35.2";
|
||||
version = "1.36.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "int128";
|
||||
repo = "kubelogin";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jSPNvr+spZvilTooK7s6l8CyvP5tzSWxqJzaoJCA5AM=";
|
||||
hash = "sha256-v6kNz75+xRQHfTfBKpKaNZodQzZNmJiF+WX0wJfGZ2M=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
@@ -22,7 +22,7 @@ buildGoModule (finalAttrs: {
|
||||
"-X main.version=v${finalAttrs.version}"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-otzcOmW3mkiJrIv69wme5cHp5/iO2YSH+ecZgeX2aV0=";
|
||||
vendorHash = "sha256-f9Umpdlb6m38J05CanNJktS1T31SBSy1T1rOCzBUYkQ=";
|
||||
|
||||
# test all packages
|
||||
preCheck = ''
|
||||
|
||||
@@ -3,22 +3,29 @@
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
stdenv,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
buildGoModule rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "lazycommit";
|
||||
version = "1.4.0";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "m7medvision";
|
||||
repo = "lazycommit";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-DD3DXTev8WHNkAYDrPY2PISuA8WwKuK0GCLebpn01Rg=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-tS5jWucT4/1YRAXySUnElEkjaF2+Bl7O3taSzZf2NF0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4OPCUWXxsAnzxsqZPHhjvhxQQf5Knm7nGqrdjH4I4YY=";
|
||||
|
||||
nativeCheckInputs = [ writableTmpDirAsHomeHook ];
|
||||
|
||||
# Error reading config file: open /nix/build/nix-53143-2282724270/.home/.config/.lazycommit.yaml: no such file or directory
|
||||
checkFlags = lib.optional stdenv.hostPlatform.isDarwin "-skip=^TestSetEndpoint_Validation$";
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=${version}"
|
||||
"-X main.version=${finalAttrs.version}"
|
||||
"-X main.buildSource=nix"
|
||||
];
|
||||
|
||||
@@ -34,11 +41,11 @@ buildGoModule rec {
|
||||
meta = {
|
||||
description = "Simple cli for generating git commits";
|
||||
homepage = "https://github.com/m7medvision/lazycommit";
|
||||
changelog = "https://github.com/m7medvision/lazycommit/releases/tag/v${version}";
|
||||
changelog = "https://github.com/m7medvision/lazycommit/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
m7medvision
|
||||
];
|
||||
mainProgram = "lazycommit";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
diff --git a/arc-core/build.gradle b/arc-core/build.gradle
|
||||
index ca6244fa..8541bf3e 100644
|
||||
--- a/Arc/arc-core/build.gradle
|
||||
+++ b/Arc/arc-core/build.gradle
|
||||
@@ -2,23 +2,12 @@ sourceSets.main.java.srcDirs = ["src"]
|
||||
sourceSets.test.java.srcDirs = ["test"]
|
||||
sourceSets.test.resources.srcDirs = ["test/resources"]
|
||||
|
||||
-configurations{
|
||||
- extraLibs
|
||||
-}
|
||||
-
|
||||
dependencies{
|
||||
testImplementation libraries.junit
|
||||
testImplementation aproj(":natives:natives-desktop")
|
||||
testImplementation files("unsafe/unsafe.jar")
|
||||
//file generated from UnsafeBuffers.java
|
||||
compileOnly files("unsafe/unsafe.jar")
|
||||
- extraLibs files("unsafe/unsafe.jar")
|
||||
-}
|
||||
-
|
||||
-jar{
|
||||
- from{
|
||||
- configurations.extraLibs.collect{ it.isDirectory() ? it : zipTree(it) }
|
||||
- }
|
||||
}
|
||||
|
||||
//now, you may ask: why don't I make this a new module? why do I include JARs in the repository? why don't I make this a separate build step?
|
||||
@@ -120,6 +109,8 @@ tasks.register('copyUnsafeStuff'){
|
||||
}
|
||||
}
|
||||
|
||||
+jar.dependsOn copyUnsafeStuff
|
||||
+
|
||||
getTasksByName("jnigen", true).each{
|
||||
it.dependsOn copyUnsafeStuff
|
||||
}
|
||||
Generated
+5
-4
@@ -63,6 +63,11 @@
|
||||
}
|
||||
},
|
||||
"https://repo.maven.apache.org/maven2": {
|
||||
"at/yawk/lz4#lz4-java/1.10.2": {
|
||||
"jar": "sha256-JS2r1YbSIUmjFmGor8GlB0dxTrGimL1KbngMjJGhOGY=",
|
||||
"module": "sha256-LYLf2sMRuwSqec4UpQGJCvdAbJyj6CQHMidx1/QaXrQ=",
|
||||
"pom": "sha256-7o1bwxjqVI5VT8I/gm1Fooq5AEpGqZ4dkaZIQxuHcAc="
|
||||
},
|
||||
"com/github/javaparser#javaparser-core/3.14.14": {
|
||||
"jar": "sha256-Z4GYXisXFCvQfhp75Zt5NIXLAms3ZnN30WYQrpgUi24=",
|
||||
"pom": "sha256-70ERyN/Uh+Zp5w1Qzz2z8O3YuTLKvjXmYzuzzuuGpIo="
|
||||
@@ -306,10 +311,6 @@
|
||||
"module": "sha256-S2knc2Ouooq1DFpnYZ++q/jAgk5JOOYmC6wEjlvrga8=",
|
||||
"pom": "sha256-dmAvWZVKo9+mjjHIDKibb7ouoAG0+wbLUfoV6tfIWjA="
|
||||
},
|
||||
"org/lz4#lz4-java/1.8.0": {
|
||||
"jar": "sha256-10ozNPs1GVAJszipUfkYID1rvKPR01kDPcM+3Rytye8=",
|
||||
"pom": "sha256-DbittR4TJFSlxAbeuy8aDfgfk91Z++IMuUcQKZRokDQ="
|
||||
},
|
||||
"org/opentest4j#opentest4j/1.2.0": {
|
||||
"jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=",
|
||||
"pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ="
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
let
|
||||
pname = "mindustry";
|
||||
version = "154.3";
|
||||
version = "155.4";
|
||||
buildVersion = makeBuildVersion version;
|
||||
|
||||
jdk = jdk17;
|
||||
@@ -48,14 +48,14 @@ let
|
||||
owner = "Anuken";
|
||||
repo = "Mindustry";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-PguKdpZ3yaV7eW1NKZpbsOEUiMxX6gdYZxJ4p7wkvi8=";
|
||||
hash = "sha256-NHI+YLh4ptuAEff6NM9ZgN2haB+iZ9np7nf6iRMzgHw=";
|
||||
};
|
||||
Arc = fetchFromGitHub {
|
||||
name = "Arc-source";
|
||||
owner = "Anuken";
|
||||
repo = "Arc";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RMoXtyDh9DbEYxYLAopItp6Bf8kg92Av+g5lSqKFhdU=";
|
||||
hash = "sha256-9nUj9aP1yAvZEDBuJPfE4ZzGEbZOSuVK+KbD1kUG+dM=";
|
||||
};
|
||||
soloud = fetchFromGitHub {
|
||||
owner = "Anuken";
|
||||
@@ -92,12 +92,6 @@ stdenv.mkDerivation {
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# Fixes a build system issue where the classes UnsafeBuffers and Java16Buffers get built
|
||||
# and copied multiple times, which causes conflicts when zipping up the final arc-core jar.
|
||||
./0001-fix-duplicate-classes.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Ensure the prebuilt shared objects don't accidentally get shipped
|
||||
rm -r Arc/natives/natives-*/libs/*
|
||||
@@ -106,6 +100,10 @@ stdenv.mkDerivation {
|
||||
|
||||
cd Mindustry
|
||||
|
||||
# Fix duplicate class entries in arc-core jar with newer Gradle
|
||||
substituteInPlace ../Arc/arc-core/build.gradle \
|
||||
--replace-fail 'jar{' 'jar{ duplicatesStrategy = DuplicatesStrategy.EXCLUDE'
|
||||
|
||||
# Remove unbuildable iOS stuff
|
||||
sed -i '/^project(":ios"){/,/^}/d' build.gradle
|
||||
sed -i '/robo(vm|VM)/d' build.gradle
|
||||
@@ -162,20 +160,20 @@ stdenv.mkDerivation {
|
||||
''
|
||||
+ lib.optionalString enableClient ''
|
||||
pushd ../Arc
|
||||
# unsupported platforms need to be excluded because their native build tools aren't available
|
||||
gradle jnigenBuild -x jnigenBuildAndroid -x jnigenBuildWindows -x jnigenBuildWindows64
|
||||
gradle jnigenJarNativesDesktop
|
||||
glewlib=${lib.getLib glew}/lib/libGLEW.so
|
||||
sdllib=${lib.getLib SDL2}/lib/libSDL2.so
|
||||
patchelf backends/backend-sdl/build/Arc/backends/backend-sdl/libs/linux64/libsdl-arc*.so \
|
||||
--add-needed "$glewlib" \
|
||||
--add-needed "$sdllib"
|
||||
# Put the freshly-built libraries where the pre-built libraries used to be:
|
||||
cp arc-core/libs/*/* natives/natives-desktop/libs/
|
||||
cp backends/backend-sdl/build/Arc/backends/backend-sdl/libs/*/* natives/natives-desktop/libs/
|
||||
# below target dirs are based on Arc upstream: Arc/extensions/../build.gradle
|
||||
gradle jnigenBuildLinux64
|
||||
# Copy freshly-built libraries to where Gradle resource dirs expect them.
|
||||
# Using jnigenBuildLinux64 skips the postJni tasks, so we copy manually.
|
||||
# arc-core uses relative libsDir, others use absolute which causes path doubling.
|
||||
cp arc-core/libs/linux64/* natives/natives-desktop/libs/
|
||||
cp -r backends/backend-sdl/build/Arc/backends/backend-sdl/libs/* backends/backend-sdl/libs/
|
||||
cp extensions/freetype/build/Arc/extensions/freetype/libs/*/* natives/natives-freetype-desktop/libs/
|
||||
cp extensions/filedialogs/build/Arc/extensions/filedialogs/libs/*/* natives/natives-filedialogs/libs/
|
||||
glewlib=${lib.getLib glew}/lib/libGLEW.so
|
||||
sdllib=${lib.getLib SDL2}/lib/libSDL2.so
|
||||
patchelf backends/backend-sdl/libs/linux64/libsdl-arc*.so \
|
||||
--add-needed "$glewlib" \
|
||||
--add-needed "$sdllib"
|
||||
gradle jnigenJarNativesDesktop
|
||||
popd
|
||||
|
||||
gradle desktop:dist
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mle";
|
||||
version = "1.7.2";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adsr";
|
||||
repo = "mle";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "0rkk7mh6w5y1lrbdv7wmxdgl5cqzpzw0p26adazkqlfdyb6wbj9k";
|
||||
sha256 = "sha256-xyelmIWqT4FmkFmI02XfdoIgkumQEso5Lf6oEaZP9yM=";
|
||||
};
|
||||
|
||||
# Fix location of Lua 5.4 header and library
|
||||
|
||||
@@ -9,12 +9,12 @@
|
||||
}:
|
||||
let
|
||||
pname = "models-dev";
|
||||
version = "0-unstable-2026-04-04";
|
||||
version = "0-unstable-2026-04-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "anomalyco";
|
||||
repo = "models.dev";
|
||||
rev = "1eb0b8c8e17ffddd89f53b2a3e426777dc560542";
|
||||
hash = "sha256-KICnZDxBt6eo4sVJCpp2gBJgzht7+qB6i9pykXze7AY=";
|
||||
rev = "f07262370fe55447966ec90eb9b45f93239e5b88";
|
||||
hash = "sha256-noDM0g7YfAXJ7SpqtW9hT56ZpAXMjMTgQ6SzU+b7UZY=";
|
||||
};
|
||||
|
||||
node_modules = stdenvNoCC.mkDerivation {
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nomore403";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "devploit";
|
||||
repo = "nomore403";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7rtmLBHv7QcfrD5+y6+r1uX1vB3VlxJzXQeBYUW6tK8=";
|
||||
hash = "sha256-Or5a4905TGvBn4mcVaYNXoHkciEegY4+VbAhkIxAoM8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zAkS0o+wOQLmCil7Lh7DIZCcHYiceb1KwiK/vkSYYwk=";
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nvc";
|
||||
version = "1.19.3";
|
||||
version = "1.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickg";
|
||||
repo = "nvc";
|
||||
tag = "r${finalAttrs.version}";
|
||||
hash = "sha256-Mfg73xsawf8leDu2r1mKufxbXtzGeyXvp6NUp5r4P/4=";
|
||||
hash = "sha256-DtJyGzrs6G1eZ9xFgBp/2PLlzMiRp/ePTINv0lLZauw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
versionCheckHook,
|
||||
rolldown,
|
||||
installShellFiles,
|
||||
version ? "2026.4.9",
|
||||
version ? "2026.4.10",
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "openclaw";
|
||||
@@ -21,10 +21,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
owner = "openclaw";
|
||||
repo = "openclaw";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wqvLBe+cEoo0x096fK6qKR8bDs4QHPTlxK5e64K4yls=";
|
||||
hash = "sha256-uQpIdemz/x0KhknVxO4ZVd3+Gg7J+PCdU0Ycc/cLczM=";
|
||||
};
|
||||
|
||||
pnpmDepsHash = "sha256-mdppNeJVf0Def0GohiKks6W3uzsaoJUYJo/ggGmypKQ=";
|
||||
pnpmDepsHash = "sha256-4tisW4TcCXyrFDkQ220cnVWm38L51UnIuDHnx79Eyjc=";
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "opentrack";
|
||||
version = "2026.1.0-unstable-2026-03-16";
|
||||
version = "2026.1.0-unstable-2026-03-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opentrack";
|
||||
repo = "opentrack";
|
||||
rev = "1432fee95d7c7f7b44384d2cd007dae96ea8df56";
|
||||
hash = "sha256-/EhKoApMOS0+G/TDO9r7tfPVd7pKXLGZxdAGZUIcSTw=";
|
||||
rev = "ffd7eb0fab60b9c0b9998fb84e3c8653afdd573f";
|
||||
hash = "sha256-ABvggZ53l8PNunFFOYLgpRliM0naz2o+YqKYbA1vd3s=";
|
||||
};
|
||||
|
||||
aruco = callPackage ./aruco.nix { };
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "pyroscope";
|
||||
version = "1.19.1";
|
||||
version = "1.20.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "pyroscope";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-UPxGimkzXLFACqmAM1hNQIoNjN6OquVibwVmNvP00+s=";
|
||||
hash = "sha256-IZA6xaZgjcS/3QBsz2L12QEBeCzRFAv+Qpag+O4aOVI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-O8ZKIl5d2gvmtCqJOJJ5SU+qhNRyWj2kH0xHZzfLN5Y=";
|
||||
vendorHash = "sha256-hy/MM/VOy182MM+Fd+PDVivHwduG2zkBUOWqOnFtWRI=";
|
||||
proxyVendor = true;
|
||||
|
||||
subPackages = [
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "rectangle";
|
||||
version = "0.94";
|
||||
version = "0.95";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rxhanson/Rectangle/releases/download/v${finalAttrs.version}/Rectangle${finalAttrs.version}.dmg";
|
||||
hash = "sha256-XeM+Mu59tW8uGiAGBOroMUggqPGK/XuN7doT4dfQdxQ=";
|
||||
hash = "sha256-fykSgXAGxouBHAlcW4rcKthApQVkYfRiuw5GnI6hIAA=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
}:
|
||||
buildDartApplication rec {
|
||||
pname = "serverpod_cli";
|
||||
version = "3.4.5";
|
||||
version = "3.4.6";
|
||||
|
||||
# Fetch the whole monorepo
|
||||
src = fetchFromGitHub {
|
||||
owner = "serverpod";
|
||||
repo = "serverpod";
|
||||
tag = version;
|
||||
hash = "sha256-hxZ5s4VZWFyNdhVpBU/SZyFYuB6Xh4YBYzE9amduOTo=";
|
||||
hash = "sha256-VWwyCNBc3AZ+RvDWVOneazNtbm2DUJCfc5VZNmLQUBg=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/tools/serverpod_cli";
|
||||
|
||||
@@ -514,51 +514,51 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "serverpod_client",
|
||||
"sha256": "bb927f4880cfb982c198426818d09cd3b07830f6232e25169dfc0ab443fc83a7",
|
||||
"sha256": "3b6c6b2d0acc064df75225436f9bdf97f9af17547b58024b231e44195e1f7f2a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.4.5"
|
||||
"version": "3.4.6"
|
||||
},
|
||||
"serverpod_lints": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "serverpod_lints",
|
||||
"sha256": "04ce1b4023c12499351b7945884ee5dce69ebe8edd7f5787673a53ef941b976f",
|
||||
"sha256": "f033e4234d74558150cc683db4065fedb5a14d9452353155cf593d98ef59d85e",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.4.5"
|
||||
"version": "3.4.6"
|
||||
},
|
||||
"serverpod_serialization": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "serverpod_serialization",
|
||||
"sha256": "be8f84c9409bafe35d1ab65abeaa5c2f7d92116155059e489366c7fdedcca55f",
|
||||
"sha256": "8e6a5421c0ecea309938b76a20228a421d8b3f96bb3e9c227be1ccac1fe0fb33",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.4.5"
|
||||
"version": "3.4.6"
|
||||
},
|
||||
"serverpod_service_client": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "serverpod_service_client",
|
||||
"sha256": "beb5f12f095b880bd12676648fd6733c9c3afbaa922aa4f1364d4e97b4b4b664",
|
||||
"sha256": "2934809a7205cf3d4990adccb2966a8bcf42024304adb908bf9e527236ca51c7",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.4.5"
|
||||
"version": "3.4.6"
|
||||
},
|
||||
"serverpod_shared": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "serverpod_shared",
|
||||
"sha256": "de25d8bfe73f43544f120ae7584fefe37d47f713bf98d2af4a784d89cccadc2d",
|
||||
"sha256": "27b807dc27a41c10ddf57fd977fcc22245b6d46b8f24190efaf7260c270b860a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.4.5"
|
||||
"version": "3.4.6"
|
||||
},
|
||||
"shelf": {
|
||||
"dependency": "transitive",
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "textcompare";
|
||||
version = "0.1.9";
|
||||
version = "0.1.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "josephmawa";
|
||||
repo = "TextCompare";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/K+aBcaC5N24RkduWf2VMyF6oPxKnLyDDdTA+Iucen0=";
|
||||
hash = "sha256-xcrw2bDRZbphYQUnCbjicYyg+9RfDlIQx8Jr+KRLAh0=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "troubadix";
|
||||
version = "26.4.0";
|
||||
version = "26.4.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greenbone";
|
||||
repo = "troubadix";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+S/BU6Iaq1gDI3Ncxcm4pxeIvE6vP6AK8IC8w8+FkS0=";
|
||||
hash = "sha256-kHi2Q+h6aRikuSZcErLmeUTGSCIXoML0uePgLKuO+Lw=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
mkYaziPlugin,
|
||||
}:
|
||||
|
||||
mkYaziPlugin {
|
||||
pname = "split-tabs.yazi";
|
||||
version = "0-unstable-2026-04-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terrakok";
|
||||
repo = "split-tabs.yazi";
|
||||
rev = "3f297277ed79cef5d22ea19883ce4d22e40c45a8";
|
||||
hash = "sha256-exa9I5GaF5T2dBnKIcB1gSdtdp2QlzbHv2J9FGxfpBM=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Yazi plugin that provides a dual-pane view by splitting the screen between two tabs";
|
||||
homepage = "https://github.com/terrakok/split-tabs.yazi";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ philocalyst ];
|
||||
};
|
||||
}
|
||||
@@ -3,13 +3,9 @@
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
copyDesktopItems,
|
||||
curl,
|
||||
perl,
|
||||
pkg-config,
|
||||
protobuf,
|
||||
fontconfig,
|
||||
freetype,
|
||||
libgit2,
|
||||
openssl,
|
||||
sqlite,
|
||||
@@ -19,10 +15,8 @@
|
||||
alsa-lib,
|
||||
libxkbcommon,
|
||||
wayland,
|
||||
libglvnd,
|
||||
libxcb,
|
||||
stdenv,
|
||||
makeFontsConf,
|
||||
vulkan-loader,
|
||||
envsubst,
|
||||
nix-update-script,
|
||||
@@ -31,8 +25,6 @@
|
||||
buildFHSEnv,
|
||||
cargo-bundle,
|
||||
git,
|
||||
apple-sdk_15,
|
||||
darwinMinVersionHook,
|
||||
makeBinaryWrapper,
|
||||
nodejs,
|
||||
libGL,
|
||||
@@ -42,13 +34,9 @@
|
||||
testers,
|
||||
writableTmpDirAsHomeHook,
|
||||
|
||||
withGLES ? false,
|
||||
buildRemoteServer ? true,
|
||||
zed-editor,
|
||||
}:
|
||||
|
||||
assert withGLES -> stdenv.hostPlatform.isLinux;
|
||||
|
||||
let
|
||||
channel = "stable";
|
||||
executableName = "zeditor";
|
||||
@@ -106,8 +94,6 @@ let
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
gpu-lib = if withGLES then libglvnd else vulkan-loader;
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zed-editor";
|
||||
@@ -152,14 +138,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
cargoHash = "sha256-++2q4zeLBDSW4ooTu7dU77YsuHggeX/sWkvuCb3PF50=";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
copyDesktopItems
|
||||
curl
|
||||
perl
|
||||
pkg-config
|
||||
protobuf
|
||||
rustPlatform.bindgenHook
|
||||
cargo-about
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ makeBinaryWrapper ]
|
||||
@@ -168,16 +152,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
fontconfig
|
||||
freetype
|
||||
libgit2
|
||||
openssl
|
||||
sqlite
|
||||
zlib
|
||||
zstd
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
fontconfig
|
||||
openssl
|
||||
glib
|
||||
alsa-lib
|
||||
libxkbcommon
|
||||
@@ -187,12 +169,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
libGL
|
||||
libx11
|
||||
libxext
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_15
|
||||
# ScreenCaptureKit, required by livekit, is only available on 12.3 and up:
|
||||
# https://developer.apple.com/documentation/screencapturekit
|
||||
(darwinMinVersionHook "12.3")
|
||||
];
|
||||
|
||||
cargoBuildFlags = [
|
||||
@@ -216,20 +192,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
env = {
|
||||
ALLOW_MISSING_LICENSES = true;
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
LIBGIT2_NO_VENDOR = true;
|
||||
LIBSQLITE3_SYS_USE_PKG_CONFIG = true;
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
FONTCONFIG_FILE = makeFontsConf {
|
||||
fontDirectories = [
|
||||
"${finalAttrs.src}/assets/fonts/plex-mono"
|
||||
"${finalAttrs.src}/assets/fonts/plex-sans"
|
||||
];
|
||||
};
|
||||
# Setting this environment variable allows to disable auto-updates
|
||||
# https://zed.dev/docs/development/linux#notes-for-packaging-zed
|
||||
ZED_UPDATE_EXPLANATION = "Zed has been installed using Nix. Auto-updates have thus been disabled.";
|
||||
# Used by `zed --version`
|
||||
RELEASE_VERSION = finalAttrs.version;
|
||||
LK_CUSTOM_WEBRTC = livekit-libwebrtc;
|
||||
RUSTFLAGS = lib.optionalString withGLES "--cfg gles";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
@@ -237,8 +209,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
patchelf --add-rpath ${gpu-lib}/lib $out/libexec/*
|
||||
patchelf --add-rpath ${wayland}/lib $out/libexec/*
|
||||
patchelf $out/libexec/zed-editor --add-rpath ${
|
||||
lib.makeLibraryPath [
|
||||
libGL
|
||||
vulkan-loader
|
||||
wayland
|
||||
]
|
||||
}
|
||||
wrapProgram $out/libexec/zed-editor --suffix PATH : ${lib.makeBinPath [ nodejs ]}
|
||||
'';
|
||||
|
||||
@@ -259,21 +236,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
mv $release_target/zed target/release/zed
|
||||
|
||||
pushd crates/zed
|
||||
|
||||
# Note that this is GNU sed, while Zed's bundle-mac uses BSD sed
|
||||
sed -i "s/package.metadata.bundle-stable/package.metadata.bundle/" Cargo.toml
|
||||
export CARGO_BUNDLE_SKIP_BUILD=true
|
||||
app_path=$(cargo bundle --release | xargs)
|
||||
|
||||
# We're not using Zed's fork of cargo-bundle, so we must manually append their plist extensions
|
||||
# Remove closing tags from Info.plist (last two lines)
|
||||
head -n -2 $app_path/Contents/Info.plist > Info.plist
|
||||
# Append extensions
|
||||
cat resources/info/*.plist >> Info.plist
|
||||
# Add closing tags
|
||||
printf "</dict>\n</plist>\n" >> Info.plist
|
||||
mv Info.plist $app_path/Contents/Info.plist
|
||||
|
||||
popd
|
||||
|
||||
mkdir -p $out/Applications $out/bin
|
||||
@@ -290,7 +256,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
install -Dm755 $release_target/zed $out/libexec/zed-editor
|
||||
install -Dm755 $release_target/cli $out/bin/zeditor
|
||||
|
||||
install -Dm644 $src/crates/zed/resources/app-icon@2x.png $out/share/icons/hicolor/1024x1024@2x/apps/zed.png
|
||||
install -Dm644 $src/crates/zed/resources/app-icon@2x.png $out/share/icons/hicolor/512x512@2x/apps/zed.png
|
||||
install -Dm644 $src/crates/zed/resources/app-icon.png $out/share/icons/hicolor/512x512/apps/zed.png
|
||||
|
||||
# extracted from https://github.com/zed-industries/zed/blob/v0.141.2/script/bundle-linux (envsubst)
|
||||
@@ -342,9 +308,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
package = finalAttrs.finalPackage.remote_server;
|
||||
command = "${finalAttrs.remoteServerExecutableName} version";
|
||||
};
|
||||
}
|
||||
// lib.optionalAttrs stdenv.hostPlatform.isLinux {
|
||||
withGles = zed-editor.override { withGLES = true; };
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ assert lib.elem allowPolkitPolicy [
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-systemd-manager";
|
||||
version = "19";
|
||||
version = "20";
|
||||
|
||||
# Upstream doesn't post new versions in extensions.gnome.org anymore, see also:
|
||||
# https://github.com/hardpixel/systemd-manager/issues/19
|
||||
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
owner = "hardpixel";
|
||||
repo = "systemd-manager";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qmRDTyI2Kyr+ViNNgmna/E8xH1qzPyxzdPXyrwrgQGY=";
|
||||
hash = "sha256-vpqxx41oWEAeBbCoBb3/vW2OR4tw3Q43hIzRkmc+NTs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ glib ];
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lomiri-settings-components";
|
||||
version = "1.1.3";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ubports";
|
||||
repo = "development/core/lomiri-settings-components";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-WKLdTiTVfgX9IAVPsRGx7GWBbYMI9iICXevzrfuHPGc=";
|
||||
hash = "sha256-vJpqNhSlBV5z0hRP3ayh7/YbYxh7mLEsK0jh63hkG1w=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -43,12 +43,12 @@ in
|
||||
);
|
||||
julia_112-bin = wrapJulia (
|
||||
callPackage (import ./generic-bin.nix {
|
||||
version = "1.12.5";
|
||||
version = "1.12.6";
|
||||
sha256 = {
|
||||
x86_64-linux = "1rxsb2bnk2wgd2nkzxwpj1xj8gbpblczm4lyxprzp5jfgrr4vf21";
|
||||
aarch64-linux = "1qp8ydagd39c1rcj9ryrq0y1hcimw1dgmaaviaqbyqj4x92fhp9f";
|
||||
x86_64-darwin = "1b8mdpy6ww89xngsl1q3ym245iyw59alki9cvnplcbg3iqjhgdz4";
|
||||
aarch64-darwin = "01fli18s43p74hb7z2fcv8sv72pijp3k1azba6rjjpgfic7f1h0z";
|
||||
x86_64-linux = "16h77px97qpzfcf5lfrj8kj8baq6fs07sxjasbdsj8cly6zg7axv";
|
||||
aarch64-linux = "16a8gkaqzsxw5z8axdyp13qdlqxapg9q11csgxigs3xxayw976q2";
|
||||
x86_64-darwin = "0b34hb93pyqj4yfljy4krzf182dkwmlj6wkf4j5c7fnn0v3bfw0s";
|
||||
aarch64-darwin = "0cbarn632dxn1x1zi68k31plimvrr4yizr5kcc4rvagdsbxq4z97";
|
||||
};
|
||||
}) { }
|
||||
);
|
||||
@@ -87,8 +87,8 @@ in
|
||||
julia_112 = wrapJulia (
|
||||
callPackage
|
||||
(import ./generic.nix {
|
||||
version = "1.12.5";
|
||||
hash = "sha256-3jvzaT2TjX4VU5pcOsIXfFRqzQ17e8TjJ+MNanI48eM=";
|
||||
version = "1.12.6";
|
||||
hash = "sha256-cR86qNbsXJAEWT6489U+NWTNdZrLqK1K2ulnr8IDMsw=";
|
||||
})
|
||||
{
|
||||
stdenv = gcc14Stdenv;
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "llama-index-workflows";
|
||||
version = "2.17.1";
|
||||
version = "2.17.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_workflows";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-xi+r5QnPAAPd/lsrJ/SLNEPHyahOnNyQTG+e1fjL4l0=";
|
||||
hash = "sha256-hfbc2/IUcAqwdB3DIlrU6q8ckP2fDggliKpwxHNbJsM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -6,19 +6,19 @@
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "mdurl";
|
||||
version = "0.1.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hukkin";
|
||||
owner = "executablebooks";
|
||||
repo = "mdurl";
|
||||
rev = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-wxV8DKeTwKpFTUBuGTQXaVHc0eW1//Y+2V8Kgs85TDM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flit-core ];
|
||||
build-system = [ flit-core ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
@@ -26,8 +26,8 @@ buildPythonPackage rec {
|
||||
|
||||
meta = {
|
||||
description = "URL utilities for markdown-it";
|
||||
homepage = "https://github.com/hukkin/mdurl";
|
||||
homepage = "https://github.com/executablebooks/mdurl";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -22,14 +22,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "posthog";
|
||||
version = "7.9.12";
|
||||
version = "7.11.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PostHog";
|
||||
repo = "posthog-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RW6klOCYJMyuiPniMfQDNwYAP0Qkjy9m0ztljoPmC0w=";
|
||||
hash = "sha256-GmwFI23HUp9/p6o+UFCES7WwvnexrBrVTDhLd/YYWOs=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xgrammar";
|
||||
version = "0.1.31";
|
||||
version = "0.1.33";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -35,7 +35,7 @@ buildPythonPackage rec {
|
||||
repo = "xgrammar";
|
||||
tag = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-Baa/DiRoNcIv4UOC+msi4PgfRWnwprnZpLG2v7qB2h4=";
|
||||
hash = "sha256-mliAmFBY3eLnUP+2HCRGX36KPUjaxn0Eb+2aKyDwdaM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -99,6 +99,7 @@ buildPythonPackage rec {
|
||||
disabledTestPaths = [
|
||||
# Requires internet access
|
||||
"tests/python/test_structural_tag_converter.py"
|
||||
"tests/python/test_structural_tag_for_model.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "xgrammar" ];
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
postgresqlBuildExtension (finalAttrs: {
|
||||
pname = "system_stats";
|
||||
version = "3.2.1";
|
||||
version = "4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EnterpriseDB";
|
||||
repo = "system_stats";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VuSWpBqd8HeHEqfOcx8gNuCLtVWOkG7FJ8XM8Mp54ls=";
|
||||
hash = "sha256-+DHfhLBoYdWBvXZVcvnWlNwceTNsQ/irEdgnklv5onA=";
|
||||
};
|
||||
|
||||
buildFlags = [ "PG_CFLAGS=-Wno-error=vla" ];
|
||||
@@ -20,7 +20,7 @@ postgresqlBuildExtension (finalAttrs: {
|
||||
meta = {
|
||||
description = "Postgres extension for exposing system metrics such as CPU, memory and disk information";
|
||||
homepage = "https://github.com/EnterpriseDB/system_stats";
|
||||
changelog = "https://github.com/EnterpriseDB/system_stats/raw/v${finalAttrs.version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/EnterpriseDB/system_stats/releases/tag/v${finalAttrs.version}";
|
||||
maintainers = with lib.maintainers; [ shivaraj-bh ];
|
||||
platforms = postgresql.meta.platforms;
|
||||
license = lib.licenses.postgresql;
|
||||
|
||||
@@ -1249,8 +1249,6 @@ with pkgs;
|
||||
fceux-qt5 = fceux.override { ___qtVersion = "5"; };
|
||||
fceux-qt6 = fceux.override { ___qtVersion = "6"; };
|
||||
|
||||
firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { };
|
||||
|
||||
gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { };
|
||||
|
||||
goldberg-emu = callPackage ../applications/emulators/goldberg-emu {
|
||||
@@ -1493,8 +1491,6 @@ with pkgs;
|
||||
|
||||
coconut = with python312Packages; toPythonApplication coconut;
|
||||
|
||||
coolreader = libsForQt5.callPackage ../applications/misc/coolreader { };
|
||||
|
||||
corsair = with python3Packages; toPythonApplication corsair-scan;
|
||||
|
||||
inherit (cue) writeCueValidator;
|
||||
@@ -1622,8 +1618,6 @@ with pkgs;
|
||||
bogofilter-sqlite = bogofilter.override { database = sqlite; };
|
||||
bogofilter-db = bogofilter.override { database = db; };
|
||||
|
||||
boomerang = libsForQt5.callPackage ../development/tools/boomerang { };
|
||||
|
||||
bozohttpd-minimal = bozohttpd.override { minimal = true; };
|
||||
|
||||
cabal2nix-unwrapped = haskell.lib.compose.justStaticExecutables (
|
||||
@@ -1684,14 +1678,10 @@ with pkgs;
|
||||
|
||||
csv2md = with python3Packages; toPythonApplication csv2md;
|
||||
|
||||
csvtool = callPackage ../development/ocaml-modules/csv/csvtool.nix { };
|
||||
|
||||
dataclass-wizard = with python3Packages; toPythonApplication dataclass-wizard;
|
||||
|
||||
datasette = with python3Packages; toPythonApplication datasette;
|
||||
|
||||
datovka = libsForQt5.callPackage ../applications/networking/datovka { };
|
||||
|
||||
diagrams-builder = callPackage ../tools/graphics/diagrams-builder {
|
||||
inherit (haskellPackages) ghcWithPackages diagrams-builder;
|
||||
};
|
||||
@@ -2229,8 +2219,6 @@ with pkgs;
|
||||
|
||||
dvtm-unstable = callPackage ../tools/misc/dvtm/unstable.nix { };
|
||||
|
||||
engauge-digitizer = libsForQt5.callPackage ../applications/science/math/engauge-digitizer { };
|
||||
|
||||
rocmPackages = recurseIntoAttrs (callPackage ../development/rocm-modules { });
|
||||
|
||||
tsm-client-withGui = callPackage ../by-name/ts/tsm-client/package.nix { enableGui = true; };
|
||||
|
||||
@@ -25313,10 +25313,10 @@ with self;
|
||||
|
||||
NetCIDRLite = buildPerlPackage {
|
||||
pname = "Net-CIDR-Lite";
|
||||
version = "0.22";
|
||||
version = "0.23";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/S/ST/STIGTSP/Net-CIDR-Lite-0.22.tar.gz";
|
||||
hash = "sha256-QxfYyzQaYXueCIjaQ8Cc3//8sMnt97jJko10KlY7hRc=";
|
||||
url = "mirror://cpan/authors/id/S/ST/STIGTSP/Net-CIDR-Lite-0.23.tar.gz";
|
||||
hash = "sha256-mlgnjkmgjN65vsAc7N06lb5zbQ59TQXRP5COOj/hDTI=";
|
||||
};
|
||||
meta = {
|
||||
description = "Perl extension for merging IPv4 or IPv6 CIDR addresses";
|
||||
|
||||
Reference in New Issue
Block a user