Merge d08251c583 into haskell-updates

This commit is contained in:
nixpkgs-ci[bot]
2025-10-20 00:23:09 +00:00
committed by GitHub
222 changed files with 2541 additions and 1273 deletions
+4 -1
View File
@@ -26,7 +26,10 @@ module.exports = async ({ github, context, core, dry }) => {
// be detected, no maintainers pinged.
// We can just check the temporary merge commit, and if it's empty the PR can safely be
// closed - there are no further changes.
if (pull_request.merge_commit_sha) {
// We only do this for PRs, which are non-empty to start with. This avoids closing PRs
// which have been created with an empty commit for notification purposes, for example
// the yearly election notification for voters.
if (pull_request.merge_commit_sha && pull_request.changed_files > 0) {
const commit = (
await github.rest.repos.getCommit({
...context.repo,
@@ -1,6 +1,6 @@
# pkgs.dockerTools {#sec-pkgs-dockerTools}
`pkgs.dockerTools` is a set of functions for creating and manipulating Docker images according to the [Docker Image Specification v1.3.0](https://github.com/moby/moby/blob/46f7ab808b9504d735d600e259ca0723f76fb164/image/spec/spec.md#image-json-field-descriptions).
`pkgs.dockerTools` is a set of functions for creating and manipulating Docker images according to the [Docker Image Specification v1.3.1](https://github.com/moby/docker-image-spec/blob/v1.3.1/spec.md).
Docker itself is not used to perform any of the operations done by these functions.
## buildImage {#ssec-pkgs-dockerTools-buildImage}
@@ -130,7 +130,7 @@ Similarly, if you encounter errors similar to `Error_Protocol ("certificate has
`config` (Attribute Set or Null; _optional_)
: Used to specify the configuration of the containers that will be started off the generated image.
Must be an attribute set, with each attribute as listed in the [Docker Image Specification v1.3.0](https://github.com/moby/moby/blob/46f7ab808b9504d735d600e259ca0723f76fb164/image/spec/spec.md#image-json-field-descriptions).
Must be an attribute set, with each attribute as listed in the [Docker Image Specification v1.3.1](https://github.com/moby/docker-image-spec/blob/v1.3.1/spec.md#image-json-field-descriptions).
_Default value:_ `null`.
@@ -138,7 +138,7 @@ Similarly, if you encounter errors similar to `Error_Protocol ("certificate has
: Used to specify the image architecture.
This is useful for multi-architecture builds that don't need cross compiling.
If specified, its value should follow the [OCI Image Configuration Specification](https://github.com/opencontainers/image-spec/blob/main/config.md#properties), which should still be compatible with Docker.
If specified, its value should follow the [OCI Image Configuration Specification](https://github.com/opencontainers/image-spec/blob/v1.1.1/config.md#properties), which should still be compatible with Docker.
According to the linked specification, all possible values for `$GOARCH` in [the Go docs](https://go.dev/doc/install/source#environment) should be valid, but will commonly be one of `386`, `amd64`, `arm`, or `arm64`.
_Default value:_ the same value from `pkgs.go.GOARCH`.
+5
View File
@@ -421,6 +421,11 @@ Check that two paths have the same contents.
: A message that is printed last if the file system object contents at the two paths don't match exactly.
`checkMetadata` (boolean)
: Whether to fail on metadata differences, such as permissions or ownership.
Defaults to `true`.
:::{.example #ex-testEqualContents-toyexample}
# Check that two paths have the same contents
+8
View File
@@ -30,6 +30,14 @@ This setting has no tangible effect when running the build in a sandboxed deriva
The default value is `build`.
#### `cmakeBuildType` {#cmake-build-type}
Build type of cmake output.
Internally populates the `CMAKE_BUILD_TYPE` cmake flag.
The default value is `Release`.
#### `dontUseCmakeConfigure` {#dont-use-cmake-configure}
When set to true, don't use the predefined `cmakeConfigurePhase`.
+3 -12
View File
@@ -237,9 +237,6 @@
"sec-meta-identifiers-cpe": [
"index.html#sec-meta-identifiers-cpe"
],
"sec-meta-identifiers-purl": [
"index.html#sec-meta-identifiers-purl"
],
"sec-modify-via-packageOverrides": [
"index.html#sec-modify-via-packageOverrides"
],
@@ -664,15 +661,6 @@
"var-meta-identifiers-possibleCPEs": [
"index.html#var-meta-identifiers-possibleCPEs"
],
"var-meta-identifiers-purl": [
"index.html#var-meta-identifiers-purl"
],
"var-meta-identifiers-purlParts": [
"index.html#var-meta-identifiers-purlParts"
],
"var-meta-identifiers-purls": [
"index.html#var-meta-identifiers-purls"
],
"var-meta-teams": [
"index.html#var-meta-teams"
],
@@ -2381,6 +2369,9 @@
"cmake-build-dir": [
"index.html#cmake-build-dir"
],
"cmake-build-type": [
"index.html#cmake-build-type"
],
"dont-use-cmake-configure": [
"index.html#dont-use-cmake-configure"
],
-2
View File
@@ -240,8 +240,6 @@
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- Metadata identifier purl (Package URL, https://github.com/package-url/purl-spec) has been added for fetchgit, fetchpypi and fetchFromGithub fetchers and mkDerivation has been adjusted to reuse these informations. Package URL's enables a reliable identification and locatization of software packages. Maintainers of derivations using the adopted fetchers should rely on the `drv.src.meta.identifiers.v1.purl` default identifier and can enhance their `drv.meta.identifiers.v1.purls` list once they would like to have additional identifiers. Maintainers using fetchurl for `drv.src` are urged to adopt their `drv.meta.identifiers.purlParts` for proper identification.
- Added `rewriteURL` attribute to the nixpkgs `config`, to allow for rewriting the URLs downloaded by `fetchurl`.
- Added `hashedMirrors` attribute to the nixpkgs `config`, to allow for customization of the hashed mirrors used by `fetchurl`.
-19
View File
@@ -319,22 +319,3 @@ A readonly attribute that concatenates all CPE parts in one string.
#### `meta.identifiers.possibleCPEs` {#var-meta-identifiers-possibleCPEs}
A readonly attribute containing the list of guesses for what CPE for this package can look like. It includes all variants of version handling mentioned above. Each item is an attrset with attributes `cpeParts` and `cpe` for each guess.
### Package URL {#sec-meta-identifiers-purl}
[Package-URL](https://github.com/package-url/purl-spec) (PURL) is a specification to reliably identify and locate software packages. Through identification of software packages, additional (non-major) use cases are e.g. software license cross-verification via third party databases or initial vulnerability response management. Package URL's default to the mkDerivation.src, as the original consumed software package is the single point of truth.
#### `meta.identifiers.purlParts` {#var-meta-identifiers-purlParts}
This attribute contains an attribute set of all parts of the PURL for this package.
* `type` mandatory [type](https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/docs/standard/summary.md) which needs to be provided
* `spec` specify the PURL in accordance with the [purl-spec](https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/purl-specification.md)
#### `meta.identifiers.purl` {#var-meta-identifiers-purl}
An extendable attribute which is built based on purlParts. It is the main identifier, consumers should consider using the PURL's list interface to be prepared for edge cases.
#### `meta.identifiers.purls` {#var-meta-identifiers-purls}
An extendable attribute list which defaults to a single element equal to the main PURL. It provides an interface for additional identifiers of mkDerivation.src and / or vendored dependencies inside mkDerivation.src, which maintainers can conciously decide to use on top. Identifiers different to the default src identifier are not recommended by default as they might cause maintenance overhead or may diverge (e.g. differences between source distribution pkg:github and binary distribution like pkg:pypi).
+6
View File
@@ -14068,6 +14068,12 @@
githubId = 629430;
keys = [ { fingerprint = "2843 750C B1AB E256 94BE 40E2 D843 D30B 42CA 0E2D"; } ];
};
KunyaKud = {
name = "KunyaKud";
email = "KunyaKud@proton.me";
github = "KunyaKud";
githubId = 238898928;
};
kupac = {
github = "Kupac";
githubId = 8224569;
@@ -15,6 +15,7 @@ let
mkEnableOption
mkIf
mkPackageOption
mkRemovedOptionModule
types
;
@@ -28,8 +29,17 @@ let
in
{
imports = [
(mkRemovedOptionModule [
"services"
"wymoing"
"openwakeword"
"preLoadModels"
] "Passing a list of models to preload was removed in wyoming-openwakeword 2.0")
];
options.services.wyoming.openwakeword = with types; {
enable = mkEnableOption "Wyoming openWakeWord server";
enable = mkEnableOption "Wyoming protocol server for openWakeWord wake word detection system";
package = mkPackageOption pkgs "wyoming-openwakeword" { };
@@ -50,24 +60,6 @@ in
'';
};
preloadModels = mkOption {
type = listOf str;
default = [
"ok_nabu"
];
example = [
# wyoming_openwakeword/models/*.tflite
"alexa"
"hey_jarvis"
"hey_mycroft"
"hey_rhasspy"
"ok_nabu"
];
description = ''
List of wake word models to preload after startup.
'';
};
threshold = mkOption {
type = numbers.between 0.0 1.0;
default = 0.5;
@@ -91,6 +83,16 @@ in
apply = toString;
};
refractorySeconds = mkOption {
type = either int float;
default = 2;
example = 1.5;
description = ''
Duration in seconds before a wake word can be detected again.
'';
apply = toString;
};
extraArgs = mkOption {
type = listOf str;
default = [ ];
@@ -125,11 +127,9 @@ in
cfg.threshold
"--trigger-level"
cfg.triggerLevel
"--refractory-seconds"
cfg.refractorySeconds
]
++ (concatMap (model: [
"--preload-model"
model
]) cfg.preloadModels)
++ (concatMap (dir: [
"--custom-model-dir"
(toString dir)
+9 -1
View File
@@ -138,7 +138,15 @@ in
Type = "simple";
ExecStart = "${pkgs.nats-server}/bin/nats-server -c ${configFile}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
ExecStop = "${pkgs.coreutils}/bin/kill -SIGINT $MAINPID";
KillMode = "mixed";
KillSignal = "SIGUSR2";
SuccessExitStatus = [
0
"SIGUSR2"
];
TimeoutStopSec = "150"; # must exceed lame_duck_duration, which defaults to 2min
Restart = "on-failure";
User = cfg.user;
@@ -85,13 +85,12 @@ let
restartService = optionalAttrs cfg.restartAfterSleep {
openvpn-restart = {
wantedBy = [ "sleep.target" ];
path = [ pkgs.procps ];
script =
let
unitNames = map (n: "openvpn-${n}.service") (builtins.attrNames cfg.servers);
in
"systemctl try-restart ${lib.escapeShellArgs unitNames}";
description = "Sends a signal to OpenVPN process to trigger a restart after return from sleep";
description = "Restart system OpenVPN connections when returning from sleep";
};
};
+7 -6
View File
@@ -101,14 +101,15 @@ in
serviceConfig = {
Type = "simple";
ExecStart = utils.escapeSystemdExecArgs (
[
(lib.getExe' cfg.package cfg.scheduler)
]
++ cfg.extraArgs
);
ExecStart = ''
${pkgs.runtimeShell} -c 'exec ${cfg.package}/bin/''${SCX_SCHEDULER_OVERRIDE:-$SCX_SCHEDULER} ''${SCX_FLAGS_OVERRIDE:-$SCX_FLAGS}'
'';
Restart = "on-failure";
};
environment = {
SCX_SCHEDULER = cfg.scheduler;
SCX_FLAGS = lib.escapeShellArgs cfg.extraArgs;
};
wantedBy = [ "multi-user.target" ];
};
+10 -9
View File
@@ -322,15 +322,16 @@ in
"vector"
"vchord"
];
sqlFile = pkgs.writeText "immich-pgvectors-setup.sql" ''
${lib.concatMapStringsSep "\n" (ext: "CREATE EXTENSION IF NOT EXISTS \"${ext}\";") extensions}
ALTER SCHEMA public OWNER TO ${cfg.database.user};
${lib.optionalString cfg.database.enableVectors "ALTER SCHEMA vectors OWNER TO ${cfg.database.user};"}
GRANT SELECT ON TABLE pg_vector_index_stat TO ${cfg.database.user};
${lib.concatMapStringsSep "\n" (ext: "ALTER EXTENSION \"${ext}\" UPDATE;") extensions}
'';
sqlFile =
pkgs.writeText "immich-pgvectors-setup.sql" ''
${lib.concatMapStringsSep "\n" (ext: "CREATE EXTENSION IF NOT EXISTS \"${ext}\";") extensions}
${lib.concatMapStringsSep "\n" (ext: "ALTER EXTENSION \"${ext}\" UPDATE;") extensions}
ALTER SCHEMA public OWNER TO ${cfg.database.user};
''
+ lib.optionalString cfg.database.enableVectors ''
ALTER SCHEMA vectors OWNER TO ${cfg.database.user};
GRANT SELECT ON TABLE pg_vector_index_stat TO ${cfg.database.user};
'';
in
[
''
+1
View File
@@ -717,6 +717,7 @@ in
homepage-dashboard = runTest ./homepage-dashboard.nix;
homer = handleTest ./homer { };
honk = runTest ./honk.nix;
hoogle = runTest ./hoogle.nix;
hostname = handleTest ./hostname.nix { };
hound = runTest ./hound.nix;
hub = runTest ./git/hub.nix;
+31
View File
@@ -0,0 +1,31 @@
{ lib, ... }:
{
name = "hoogle";
meta.maintainers = with lib.maintainers; [ h7x4 ];
nodes.machine =
{ pkgs, ... }:
{
services.hoogle = {
enable = true;
packages =
hp: with hp; [
arrows
lens
];
};
};
testScript =
{ nodes, ... }:
let
cfg = nodes.machine.services.hoogle;
in
''
machine.wait_for_unit("hoogle.service")
machine.wait_for_open_port(${toString cfg.port})
machine.succeed("curl http://${cfg.host}:${toString cfg.port} | grep '<title>Hoogle</title>'")
machine.succeed("curl 'http://${cfg.host}:${toString cfg.port}?hoogle=>>>' | grep Arrow")
'';
}
+1
View File
@@ -8,4 +8,5 @@
prometheus-pair = runTest ./prometheus-pair.nix;
pushgateway = runTest ./pushgateway.nix;
remote-write = runTest ./remote-write.nix;
ui = runTest ./ui.nix;
}
+86
View File
@@ -0,0 +1,86 @@
{ lib, pkgs, ... }:
{
name = "prometheus-ui";
nodes = {
browser =
{ config, pkgs, ... }:
{
environment.systemPackages =
let
prometheusSeleniumScript =
pkgs.writers.writePython3Bin "prometheus-selenium-script"
{
libraries = with pkgs.python3Packages; [ selenium ];
}
''
from selenium import webdriver
from selenium.webdriver.common.by import By
from selenium.webdriver.firefox.options import Options
from selenium.webdriver.support.ui import WebDriverWait
options = Options()
options.add_argument("--headless")
service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}") # noqa: E501
driver = webdriver.Firefox(options=options, service=service)
driver.implicitly_wait(10)
driver.get("http://prometheus:9090/")
wait = WebDriverWait(driver, 60)
assert len(driver.find_elements(By.CLASS_NAME, "mantine-AppShell-header")) > 0 # noqa: E501
assert len(driver.find_elements(By.CLASS_NAME, "mantine-AppShell-main")) > 0 # noqa: E501
driver.close()
'';
in
with pkgs;
[
curl
firefox-unwrapped
geckodriver
prometheusSeleniumScript
];
};
prometheus =
{ config, pkgs, ... }:
{
networking.firewall.allowedTCPPorts = [ config.services.prometheus.port ];
services.prometheus = {
enable = true;
globalConfig.scrape_interval = "2s";
scrapeConfigs = [
{
job_name = "prometheus";
static_configs = [
{
targets = [
"prometheus1:${toString config.services.prometheus.port}"
"prometheus2:${toString config.services.prometheus.port}"
];
}
];
}
];
};
};
};
testScript = ''
prometheus.wait_for_unit("prometheus")
prometheus.wait_for_open_port(9090)
prometheus.wait_until_succeeds("curl -sSf http://localhost:9090/-/healthy")
browser.systemctl("start network-online.target")
browser.wait_for_unit("network-online.target")
browser.succeed("curl -kLs http://prometheus:9090/query | grep 'Prometheus Time Series Collection and Processing Server'")
# Ensure the application is actually rendered by the Javascript
browser.succeed("PYTHONUNBUFFERED=1 prometheus-selenium-script")
'';
}
+2
View File
@@ -27,6 +27,8 @@ import ./make-test-python.nix (
meta = {
maintainers = [ ];
timeout = 600;
# https://hydra.nixos.org/build/309924543/nixlog/1
broken = true;
};
nodes =
@@ -112,6 +112,21 @@ stdenv.mkDerivation (finalAttrs: {
-e 's,-Wno-unused-private-field,,g'
sed -i CMakeLists.txt \
-e 's,libprotobuf.a,protobuf,g'
# CMake 3.0.0 is deprecated and no longer supported by CMake > 4
# https://github.com/NixOS/nixpkgs/issues/445447
substituteInPlace 3rdparty/{qsqlite,qtsingleapplication,qtiocompressor,qxt}/CMakeLists.txt \
cmake/{ParseArguments.cmake,Translations.cmake} \
tests/CMakeLists.txt gst/moodbar/CMakeLists.txt \
--replace-fail \
"cmake_minimum_required(VERSION 3.0.0)" \
"cmake_minimum_required(VERSION 3.10)"
substituteInPlace 3rdparty/libmygpo-qt5/CMakeLists.txt --replace-fail \
"cmake_minimum_required( VERSION 3.0.0 FATAL_ERROR )" \
"cmake_minimum_required(VERSION 3.10)"
substituteInPlace CMakeLists.txt --replace-fail \
"cmake_policy(SET CMP0053 OLD)" \
""
'';
preConfigure = ''
@@ -87,8 +87,8 @@ stdenv.mkDerivation (finalAttrs: {
publicKeys = fetchFromGitHub {
owner = "bitcoinknots";
repo = "guix.sigs";
rev = "7ee29a9ffbd1c26ba065ba06055242a01c3e63ff";
sha256 = "sha256-ZW1I7Y35Pi4WZhgCCYSI5gPhcvbfnpBObhOUTqZGVvM=";
rev = "251a8f2141e5f8439175fdd7b6cd6819d743cc01";
sha256 = "sha256-pZOK/lD1m9x8mz1IB39kLA/27fBnLvEL3qrwTRjL9Ec=";
};
checksums = fetchurl {
@@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
signatures = fetchurl {
url = "https://bitcoinknots.org/files/${majorVersion}.x/${finalAttrs.version}/SHA256SUMS.asc";
hash = "sha256-jy4gxuczCSsJQkkH3axMljuf7k2VdmLp4PkgRoQnoSY=";
hash = "sha256-fSjYdscQ4viuXutP43prWjrNT7cMaJ9J8SsUykNjJtw";
};
verifyBuilderKeys =
@@ -116,7 +116,7 @@ in
})
]
else
previousAttrs.patches or null;
previousAttrs.patches or [ ];
preBuild =
if applyOrgRoamMissingPatch then
previousAttrs.preBuild or ""
@@ -129,7 +129,7 @@ in
popd
''
else
previousAttrs.preBuild or null;
previousAttrs.preBuild or "";
}
);
@@ -18,7 +18,7 @@ rec {
if predicate finalAttrs previousAttrs then
previousAttrs.packageRequires or [ ] ++ packageRequires
else
previousAttrs.packageRequires or null;
previousAttrs.packageRequires or [ ];
}
);
@@ -89,7 +89,7 @@ rec {
if predicate finalAttrs previousAttrs then
previousAttrs.nativeBuildInputs or [ ] ++ [ pkgs.writableTmpDirAsHomeHook ]
else
previousAttrs.nativeBuildInputs or null;
previousAttrs.nativeBuildInputs or [ ];
}
);
}
@@ -830,7 +830,7 @@ let
rm --recursive --verbose etc/elisp/screenshot
''
else
previousAttrs.preBuild or null;
previousAttrs.preBuild or "";
}
);
@@ -897,7 +897,7 @@ let
rm --verbose --force test-bpr.el
''
else
previousAttrs;
previousAttrs.preBuild or "";
}
);
@@ -991,7 +991,7 @@ let
})
]
else
previousAttrs.patches or null;
previousAttrs.patches or [ ];
}
)
);
@@ -1055,7 +1055,7 @@ let
''
+ previousAttrs.preBuild or ""
else
previousAttrs.preBuild or null;
previousAttrs.preBuild or "";
}
);
@@ -1221,7 +1221,7 @@ let
rm --verbose packages/javascript/test-suppport.el
''
else
previousAttrs.preBuild or null;
previousAttrs.preBuild or "";
}
);
@@ -1392,7 +1392,7 @@ let
})
]
else
previousAttrs.patches or null;
previousAttrs.patches or [ ];
}
);
@@ -1543,7 +1543,7 @@ let
})
]
else
previousAttrs.patches or null;
previousAttrs.patches or [ ];
}
);
@@ -1561,7 +1561,7 @@ let
''
+ previousAttrs.preBuild or ""
else
previousAttrs.preBuild or null;
previousAttrs.preBuild or "";
}
);
@@ -12,12 +12,12 @@
pkgs,
}:
let
version = "0.0.27-unstable-2025-10-12";
version = "0.0.27-unstable-2025-10-18";
src = fetchFromGitHub {
owner = "yetone";
repo = "avante.nvim";
rev = "f092bb3ec0acf87b838e082209b6a7eddcbf5940";
hash = "sha256-zKDp9It/VgUD8BN5ktTmfbQX0s3SBo20T8no8nwsyfY=";
rev = "cc7a41262e4dc38003b7578c3553a75c0ec4b8d2";
hash = "sha256-L6fOo3OPfMtClmyGW1Bn7YDJtuTKO6F66D1oYsii5so=";
};
avante-nvim-lib = rustPlatform.buildRustPackage {
pname = "avante-nvim-lib";
@@ -0,0 +1,70 @@
{
lib,
fetchFromGitHub,
rustPlatform,
pkg-config,
perl,
openssl,
vimUtils,
nix-update-script,
}:
let
version = "0-unstable-2025-10-18";
src = fetchFromGitHub {
owner = "dmtrKovalenko";
repo = "fff.nvim";
rev = "ee8bd6e839ff3e70660e794d79d4ce26a33a8e1e";
hash = "sha256-Wj6YLTUqLzOngiSDkM3ci85WwdQgjoonwHbvXyvN9cE=";
};
fff-nvim-lib = rustPlatform.buildRustPackage {
pname = "fff-nvim-lib";
inherit version src;
cargoHash = "sha256-ZZt4BlMgRik4LH92F5cgS84WI1Jeuw68jP+y1+QXfDE=";
nativeBuildInputs = [
pkg-config
perl
];
buildInputs = [
openssl
];
env = {
RUSTC_BOOTSTRAP = 1; # We need rust unstable features
OPENSSL_NO_VENDOR = true;
};
};
in
vimUtils.buildVimPlugin {
pname = "fff.nvim";
inherit version src;
postPatch = ''
substituteInPlace lua/fff/download.lua \
--replace-fail \
"return plugin_dir .. '/../target'" \
"return '${fff-nvim-lib}/lib'"
'';
passthru = {
updateScript = nix-update-script {
extraArgs = [ "--version=branch" ];
attrPath = "vimPlugins.fff-nvim.fff-nvim-lib";
};
# needed for the update script
inherit fff-nvim-lib;
};
meta = {
description = "Fast Fuzzy File Finder for Neovim";
homepage = "https://github.com/dmtrKovalenko/fff.nvim";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
GaetanLepage
];
};
}
@@ -7,19 +7,19 @@
let
supported = {
x86_64-linux = {
hash = "sha256-2m1hVQ497zQs2pmk+F+5thO4cz7dP4dDEPznPBqKfX0=";
hash = "sha256-jfjd2V7IJ4GQlz/pXmrY/LlBjQ2qtlsQV4ZRD8RiWTg=";
arch = "linux-x64";
};
x86_64-darwin = {
hash = "sha256-U2BcDUiper4chL8rF4ZUSos7erfXaq1LNqYYsRe2GDk=";
hash = "sha256-aOFoTLVaaMFsdGoWV0OC31/nmOHXUhr2Y8K4SWcNil8=";
arch = "darwin-x64";
};
aarch64-linux = {
hash = "sha256-qYdYmPZPlf++cJWLbhvqeO0uePbAJE4hL2bVYlKbk0c=";
hash = "sha256-ugluaghNNZ/VrQORVIhc0Fuv3rHo++LO3Uwg2ujmsQc=";
arch = "linux-arm64";
};
aarch64-darwin = {
hash = "sha256-oN3CWc/OLbeuyKfdPoh26yUQzH3d6YfpxacByWM43qk=";
hash = "sha256-6NhhAhE+r3m5tY1eR8ibKeMivmCqPooAt2rkWjWkv2w=";
arch = "darwin-arm64";
};
};
@@ -33,7 +33,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = base // {
publisher = "docker";
name = "docker";
version = "0.17.0";
version = "0.18.0";
};
meta = {
@@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
sources = {
"x86_64-linux" = {
arch = "linux-x64";
hash = "sha256-Jqi9NTrKSweDpZ+YtXeiH77XPRgsKVJXlA4Fds7m8T0=";
hash = "sha256-WhCUOHS2y1NNTEs3Oo6lHz1YcQmj/9zcLFNi7dIO2Hs=";
};
"x86_64-darwin" = {
arch = "darwin-x64";
hash = "sha256-8inRXcCkKbEm3D6+o5pEyUkkjj+58CgIGufHG5Qsl5Y=";
hash = "sha256-M3ZC9lq0hVoBaxzaOuzeKRy7iAPsPgi+2IHU0KaujmI=";
};
"aarch64-linux" = {
arch = "linux-arm64";
hash = "sha256-sTwJVM6XxbT2JAJWqAhMA/GJvP1GOnMfIezj+MMaiJ8=";
hash = "sha256-ElqAiZGulYiSVay74UC04C0lKSHo1AwhtE05To8ir84=";
};
"aarch64-darwin" = {
arch = "darwin-arm64";
hash = "sha256-eJ/hKySxQDEh1hr36BAk0D7K6t4f9qj54T2Fc1Eq1t0=";
hash = "sha256-x7sZdxjouRBuCz5po+54HJ5Cdc9oEk5REplfQmNdvB4=";
};
};
in
{
name = "visualjj";
publisher = "visualjj";
version = "0.17.1";
version = "0.18.0";
}
// sources.${stdenvNoCC.hostPlatform.system}
or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
+8 -8
View File
@@ -36,20 +36,20 @@ let
hash =
{
x86_64-linux = "sha256-i1MFtqfWiAsvxgyc/MZlOdo/Py6PQlJmjHGeYnhygso=";
x86_64-darwin = "sha256-HElY2mOgYxfE5LULFMpipmd/igDAapd6G2VlZeCGWTI=";
aarch64-linux = "sha256-NiVXjiii9Df3mRkDVULsiLgRhfJKX+H2/VYuxUImFzI=";
aarch64-darwin = "sha256-IDqupYgoslZb7Po8nimOTwojTJ0TO5efgfTqtTQ+dUI=";
armv7l-linux = "sha256-cN4EXCM5v5ULZUb+glqbI9g+oOsjELB+OWEGDVxN/Y4=";
x86_64-linux = "sha256-MqZQ8aER3wA1StlXH1fRImg3Z3dnfdWvIWLq2SEGeok=";
x86_64-darwin = "sha256-mA8Qpif6drxQDIK8dqp+45P7GHe+2AYS7utsBVeOjAc=";
aarch64-linux = "sha256-RXnlJmT+LfLYByS0IKurGCfTBSDw52b3YIQD26L+lL0=";
aarch64-darwin = "sha256-p9EFEk1enIHr0LtKr+W7e9OW5n8AdeQEaWNLWe8+Lao=";
armv7l-linux = "sha256-X6VhFrlV4S08bPgARVmIAcizYqz2V4sQrwIGzkeDLuE=";
}
.${system} or throwSystem;
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.105.0";
version = "1.105.1";
# This is used for VS Code - Remote SSH test
rev = "03c265b1adee71ac88f833e065f7bb956b60550a";
rev = "7d842fb85a0275a4a8e4d7e040d2625abbf7f084";
in
callPackage ./generic.nix {
pname = "vscode" + lib.optionalString isInsiders "-insiders";
@@ -82,7 +82,7 @@ callPackage ./generic.nix {
src = fetchurl {
name = "vscode-server-${rev}.tar.gz";
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
hash = "sha256-0tGqGDMmLURqdQwqFWCO10d/RkVha8iC0Uv/JFp9nNQ=";
hash = "sha256-lMNmzwFh8Wn1xXCTpTnQZozzIRaO5aMJ2wP42u2zWIs=";
};
stdenv = stdenvNoCC;
};
@@ -21,13 +21,13 @@ assert
stdenv.mkDerivation (finalAttrs: {
pname = "box64";
version = "0.3.6";
version = "0.3.8";
src = fetchFromGitHub {
owner = "ptitSeb";
repo = "box64";
rev = "v${finalAttrs.version}";
hash = "sha256-Z8r7aonVj7VSifgLKx/L7VRdGNnQtTvS4mjI+2+uPxY=";
tag = "v${finalAttrs.version}";
hash = "sha256-PVzv1790UhWbqLmw/93+mU3Gw8lQek7NBls4LXks4wQ=";
};
# Setting cpu doesn't seem to work (or maybe isn't enough / gets overwritten by the wrapper's arch flag?), errors about unsupported instructions for target
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "bsnes";
version = "0-unstable-2025-10-03";
version = "0-unstable-2025-10-10";
src = fetchFromGitHub {
owner = "libretro";
repo = "bsnes-libretro";
rev = "e0e6cef46582a436e8b08a339f4751411dc5bd63";
hash = "sha256-fIlTIF1042oWIHxqD7h7MdUfb6QDfIP0jqVlBNOTBmY=";
rev = "57155d8037463346307123daabeaa27298e0f956";
hash = "sha256-eQaeAdQ7OWRzPVSbNOPUmMKIvkztZYGm2tzBavJO4Gs=";
};
makefile = "Makefile";
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "dosbox-pure";
version = "0-unstable-2025-09-28";
version = "0-unstable-2025-10-18";
src = fetchFromGitHub {
owner = "schellingb";
repo = "dosbox-pure";
rev = "150a8e02ec53bfd5fc571587dab902c075f9e291";
hash = "sha256-3l566sa5sCjeppUD06chpTZ21CnfEzdRpZKM7jxkS2M=";
rev = "fe0bdab8a04eedb912634d89ad8137de75529cff";
hash = "sha256-kF69s5rGp4XWtoaDWTu66VoUFjba0BFNBdKuA0OKkms=";
};
hardeningDisable = [ "format" ];
@@ -8,13 +8,13 @@
}:
mkLibretroCore {
core = "flycast";
version = "0-unstable-2025-10-03";
version = "0-unstable-2025-10-18";
src = fetchFromGitHub {
owner = "flyinghead";
repo = "flycast";
rev = "af5f67c15d52b16d35e95671a5b74502288c4397";
hash = "sha256-eMkyNwGdgyYDmwqYy3xzzSTYqUcoKpQkDYFP8bQdz58=";
rev = "5d628f8167947bc8a2a7608d52e4ff8b71b9ef34";
hash = "sha256-QKUAVJsJL1Ff8KNz6lpMU/IZNb1I09++AqqccIBdAPw=";
fetchSubmodules = true;
};
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "gambatte";
version = "0-unstable-2025-09-18";
version = "0-unstable-2025-10-10";
src = fetchFromGitHub {
owner = "libretro";
repo = "gambatte-libretro";
rev = "0092232a0aaef0ded0ead1c2003ccf7a85ccdfc0";
hash = "sha256-baiTlYArNSBz79Cm16Sg3VZEp909zMkF/ExqhrPYN80=";
rev = "b75225203ffea8b65124bb31acb598e91e7f22d9";
hash = "sha256-q2gq4eBa1I89PROkxTt7XGIjI2H1eWFDi6lMH+emlmg=";
};
meta = {
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "genesis-plus-gx";
version = "0-unstable-2025-10-06";
version = "0-unstable-2025-10-17";
src = fetchFromGitHub {
owner = "libretro";
repo = "Genesis-Plus-GX";
rev = "252a94c0c40047b52d9ecced567846a9dd5b2020";
hash = "sha256-Eys3iDJfi3bRuPjWRK34CEAN5o5MC+of1ktT7z2DdAI=";
rev = "a2fa5673736922540978c73f4610b82e71de3cf8";
hash = "sha256-CGxfucym0HyrIUZoDFJU5lfq4t5yfnOaJqqggDoQWp8=";
};
meta = {
@@ -14,13 +14,13 @@
}:
mkLibretroCore {
core = "play";
version = "0-unstable-2025-09-22";
version = "0-unstable-2025-10-01";
src = fetchFromGitHub {
owner = "jpd002";
repo = "Play-";
rev = "a3d84f977b721cda752299739fec525addce1ef9";
hash = "sha256-NVuz52c0zt/c8b3uoJWpKO2TMM9PFh/thQt8CfRFZhk=";
rev = "2180be50f804952f94ce848fab8d3f8b6d76d027";
hash = "sha256-Fikcp2Bik4PNOFfu9FoEWJid/OoLYPJ6cZG4aA9jgEo=";
fetchSubmodules = true;
};
+2 -2
View File
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "fetchmail";
version = "6.5.6";
version = "6.5.7";
src = fetchurl {
url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
hash = "sha256-7BDg4OqkFzE1WTee3nbHRhR2bYOLOUcLZkdIY6ppDas=";
hash = "sha256-c+trHUIbWYaGatSmt3fBFAo5AFKYxjv4R95TeXbL+9s=";
};
buildInputs = [
@@ -45,7 +45,9 @@ let
x86_64-darwin = "mac";
};
arch = mozillaPlatforms.${stdenv.hostPlatform.system};
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
arch = mozillaPlatforms.${stdenv.hostPlatform.system} or throwSystem;
isPrefixOf = prefix: string: builtins.substring 0 (builtins.stringLength prefix) string == prefix;
@@ -47,23 +47,7 @@ let
extraPatches = [
# The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
(if lib.versionOlder version "140" then ./no-buildconfig.patch else ./no-buildconfig-tb140.patch)
]
++ lib.optional (lib.versionAtLeast version "140") (fetchpatch2 {
# https://bugzilla.mozilla.org/show_bug.cgi?id=1982003
name = "rustc-1.89.patch";
url = "https://raw.githubusercontent.com/openbsd/ports/3ef8a2538893109bea8211ef13a870822264e096/mail/mozilla-thunderbird/patches/patch-third_party_rust_allocator-api2_src_stable_vec_mod_rs";
extraPrefix = "";
hash = "sha256-eL+RNVLMkj8x/8qQJVUFHDdDpS0ahV1XEN1L0reaYG4=";
})
++ lib.optionals (lib.versionOlder version "139") [
# clang-19 fixes for char_traits build issue
# https://github.com/rnpgp/rnp/pull/2242/commits/e0790a2c4ff8e09d52522785cec1c9db23d304ac
# https://github.com/rnpgp/sexpp/pull/54/commits/46744a14ffc235330bb99cebfaf294829c31bba4
# Remove when upstream bumps bundled rnp version: https://bugzilla.mozilla.org/show_bug.cgi?id=1893950
./0001-Removed-lookup-against-basic_string-uint8_t.patch
./0001-Implemented-char_traits-for-SEXP-octet_t.patch
];
extraPassthru = {
icu73 = icu73';
icu77 = icu77';
@@ -101,8 +85,8 @@ rec {
thunderbird = thunderbird-latest;
thunderbird-latest = common {
version = "143.0.1";
sha512 = "5f4fd5e4f5bc9fee9852d51b8e675f7c9c605660332c24aa0c90e5437301b468153c1788720bc80a53cfc1c3bf95a4bdb622a0533b8f11fb9853b290485c47c6";
version = "144.0.1";
sha512 = "e1859ecd247260c9303a335d14f51d2b80bca7fe0125c41cf6f6bdf1331072dcef490d75fba588b37db5410ce2e7084bbe1c8f568d40c46303891ae2bfbe431c";
updateScript = callPackage ./update.nix {
attrPath = "thunderbirdPackages.thunderbird-latest";
@@ -115,8 +99,8 @@ rec {
thunderbird-140 = common {
applicationName = "Thunderbird ESR";
version = "140.3.0esr";
sha512 = "82a9c4aa250b01e0e4d53890b0337972e46504636831c1b6307b841c4c5aeec86482b2da3c1666c46e870a75f6cb54db9f759664688b382ad66efa647145d900";
version = "140.4.0esr";
sha512 = "23a7c99f51a346f9df6e0da257040a78da0b9afd70966a0fd5c0f5a4dcd4806520f8d510a382cf5d76a099aa889219a5eec185b774a6a9b65c4ccdcb75662554";
updateScript = callPackage ./update.nix {
attrPath = "thunderbirdPackages.thunderbird-140";
@@ -30,7 +30,7 @@ mkDerivation rec {
"out"
"dev"
];
version = "15.70.4";
version = "15.70.6";
src =
let
@@ -39,11 +39,11 @@ mkDerivation rec {
{
x86_64-linux = fetchurl {
url = "${base_url}/teamviewer_${version}_amd64.deb";
hash = "sha256-VF/afz1PUnoPhc/Bi2P3eTAz6l0aecWEnl0Tcehv4RA=";
hash = "sha256-39hJPR9rS5EAaNc0jaBndwYAkSE7r2dz0H1vQDfUhK8=";
};
aarch64-linux = fetchurl {
url = "${base_url}/teamviewer_${version}_arm64.deb";
hash = "sha256-XronqLbPnXrCUF8v6oVjUO2xv4OM8MyJLffbv8/FEcg=";
hash = "sha256-mXJObC8KFjRkw6IbSOpL1MxL58Bk4QovA8zDalPi56g=";
};
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -21,13 +21,13 @@
let
# SHA256 of the fritzing-parts HEAD on the master branch,
# which contains the latest stable parts definitions
partsSha = "76235099ed556e52003de63522fdd74e61d53a36";
partsSha = "4f7d39b22a6c307e6cca62c7f78eae96696e8b2c";
parts = fetchFromGitHub {
owner = "fritzing";
repo = "fritzing-parts";
rev = partsSha;
hash = "sha256-1QVcPbRBOSYnNFsp7B2OyPXYuPaINRv9yEqGZFd662Y=";
hash = "sha256-mAzY5CVZJF5hAvWVlDiYRxoB+9mGDG9OI/8n9aY5aFE=";
};
# Header-only library
@@ -41,13 +41,13 @@ in
stdenv.mkDerivation {
pname = "fritzing";
version = "1.0.4";
version = "1.0.5";
src = fetchFromGitHub {
owner = "fritzing";
repo = "fritzing-app";
rev = "a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25";
hash = "sha256-a/bWAUeDPj3g8BECOlXuqyCi4JgGLLs1605m380Drt0=";
rev = "b9add9eaa7c426963de20c8514a69d3f15e83bdf";
hash = "sha256-OnIX+2eXT0JAs6VgSAIr1t+2DhpoUDgKVGPFjjZrKas=";
};
patches = [
@@ -99,11 +99,14 @@ stdenv.mkDerivation {
'';
env = {
NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [
"-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}"
"-I${svgpp}/include"
"-I${clipper}/include/polyclipping"
];
NIX_CFLAGS_COMPILE = lib.concatStringsSep " " (
[
"-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}"
"-I${svgpp}/include"
"-I${clipper}/include/polyclipping"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ "-F${qt5compat}/lib" ]
);
NIX_LDFLAGS = "-lquazip1-qt${lib.versions.major qtbase.version}";
};
@@ -0,0 +1,104 @@
{
lib,
stdenv,
fetchurl,
pkgsStatic,
python3,
docutils,
bzip2,
zlib,
darwin,
static ? stdenv.hostPlatform.isStatic, # generates static libraries *only*
enableForMonotone ? false, # Is it being imported for Monotone use?
}:
stdenv.mkDerivation (finalAttrs: {
pname = "botan";
version = "2.19.5";
__structuredAttrs = true;
enableParallelBuilding = true;
strictDeps = true;
outputs = [
"bin"
"out"
"dev"
"doc"
"man"
];
src = fetchurl {
url = "http://botan.randombit.net/releases/Botan-${finalAttrs.version}.tar.xz";
hash = "sha256-3+6g4KbybWckxK8B2pp7iEh62y2Bunxy/K9S21IsmtQ=";
};
nativeBuildInputs = [
python3
docutils
];
buildInputs = [
bzip2
zlib
];
buildTargets = [
"cli"
]
++ lib.optionals finalAttrs.finalPackage.doCheck [ "tests" ]
++ lib.optionals static [ "static" ]
++ lib.optionals (!static) [ "shared" ];
botanConfigureFlags = [
"--prefix=${placeholder "out"}"
"--bindir=${placeholder "bin"}/bin"
"--docdir=${placeholder "doc"}/share/doc"
"--mandir=${placeholder "man"}/share/man"
"--no-install-python-module"
"--build-targets=${lib.concatStringsSep "," finalAttrs.buildTargets}"
"--with-bzip2"
"--with-zlib"
"--with-rst2man"
"--cpu=${stdenv.hostPlatform.parsed.cpu.name}"
]
++ lib.optionals stdenv.cc.isClang [
"--cc=clang"
]
++ lib.optionals (stdenv.hostPlatform.isMinGW) [
"--os=mingw"
];
configurePhase = ''
runHook preConfigure
python configure.py ''${botanConfigureFlags[@]}
runHook postConfigure
'';
preInstall = ''
if [ -d src/scripts ]; then
patchShebangs src/scripts
fi
'';
postInstall = ''
cd "$out"/lib/pkgconfig
ln -s botan-*.pc botan.pc || true
'';
doCheck = true;
meta = with lib; {
description = "Cryptographic algorithms library";
homepage = "https://botan.randombit.net";
mainProgram = "botan";
maintainers = with maintainers; [
raskin
];
platforms = platforms.unix;
license = licenses.bsd2;
knownVulnerabilities = lib.optional (
!enableForMonotone
) "Botan2 is EOL and its full interface surface contains unpatched vulnerabilities";
};
})
@@ -4,7 +4,6 @@
fetchFromGitHub,
boost,
zlib,
botan2,
libidn,
lua,
pcre,
@@ -19,11 +18,14 @@
autoreconfHook,
texinfo,
fetchpatch,
callPackage,
}:
let
version = "1.1-unstable-2021-05-01";
perlVersion = lib.getVersion perl;
botan = callPackage ./botan2.nix { enableForMonotone = true; };
in
assert perlVersion != "";
@@ -79,7 +81,7 @@ stdenv.mkDerivation rec {
buildInputs = [
boost
zlib
botan2
botan
libidn
lua
pcre
@@ -89,7 +89,6 @@ in
nasm,
nspr,
nss_esr,
nss_3_115,
nss_latest,
onnxruntime,
pango,
@@ -572,14 +571,7 @@ buildStdenv.mkDerivation {
xorg.pixman
xorg.xorgproto
zlib
(
if (lib.versionAtLeast version "144") then
nss_latest
else if (lib.versionAtLeast version "143") then
nss_3_115
else
nss_esr
)
(if (lib.versionAtLeast version "144") then nss_latest else nss_esr)
]
++ lib.optional alsaSupport alsa-lib
++ lib.optional jackSupport libjack2
+16 -8
View File
@@ -1241,7 +1241,8 @@ rec {
result
);
# This function streams a docker image that behaves like a nix-shell for a derivation
# This function streams a docker image that behaves like a nix-shell for a derivation.
#
# Docs: doc/build-helpers/images/dockertools.section.md
# Tests: nixos/tests/docker-tools-nix-shell.nix
streamNixShellImage =
@@ -1251,6 +1252,9 @@ rec {
tag ? null,
uid ? 1000,
gid ? 1000,
# Default to `/build` instead of a non-existent `/homeless-shelter` for backwards compatibility.
#
# https://github.com/NixOS/nix/issues/6379
homeDirectory ? "/build",
shell ? bashInteractive + "/bin/bash",
command ? null,
@@ -1357,10 +1361,14 @@ rec {
binSh
usrBinEnv
(fakeNss.override {
# Allows programs to look up the build user's home directory
# Allows programs to look up the build user's home directory.
#
# https://github.com/NixOS/nix/blob/2.32.0/src/libstore/unix/build/linux-derivation-builder.cc#L409-L416
# Slightly differs however: We use the passed-in homeDirectory instead of sandboxBuildDir.
# We're doing this because it's arguably a bug in Nix that sandboxBuildDir is used here: https://github.com/NixOS/nix/issues/6379
#
# This slightly differs, however, since we use the passed-in `homeDirectory` instead of `sandboxBuildDir`.
# We're doing this because it is arguably a bug in Nix that `sandboxBuildDir` is used here.
#
# https://github.com/NixOS/nix/issues/6379
extraPasswdLines = [
"nixbld:x:${toString uid}:${toString gid}:Build user:${homeDirectory}:/noshell"
];
@@ -1373,12 +1381,11 @@ rec {
fakeRootCommands = ''
# Effectively a single-user installation of Nix, giving the user full
# control over the Nix store. Needed for building the derivation this
# shell is for, but also in case one wants to use Nix inside the
# image
# shell is for, but also in case one wants to use Nix inside the image.
mkdir -p ./nix/{store,var/nix} ./etc/nix
chown -R ${toString uid}:${toString gid} ./nix ./etc/nix
# Gives the user control over the build directory
# Gives the user control over the build directory.
mkdir -p .${sandboxBuildDir}
chown -R ${toString uid}:${toString gid} .${sandboxBuildDir}
'';
@@ -1403,7 +1410,8 @@ rec {
config.Env = lib.mapAttrsToList (name: value: "${name}=${value}") envVars;
};
# Wrapper around streamNixShellImage to build an image from the result
# Wrapper around `streamNixShellImage` to build an image from the result.
#
# Docs: doc/build-helpers/images/dockertools.section.md
# Tests: nixos/tests/docker-tools-nix-shell.nix
buildNixShellImage =
+1 -12
View File
@@ -190,18 +190,7 @@ lib.makeOverridable (
"FETCHGIT_HTTP_PROXIES"
];
inherit preferLocalBuild allowedRequisites;
meta = meta // {
identifiers = {
purlParts = {
type = "generic";
# https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/generic-definition.md
spec = "${name}?vcs_url=${url}@${(lib.revOrTag rev tag)}";
};
}
// meta.identifiers or { };
};
inherit preferLocalBuild meta allowedRequisites;
passthru = {
gitRepoUrl = url;
+1 -18
View File
@@ -47,28 +47,11 @@ lib.makeOverridable (
meta
// {
homepage = meta.homepage or baseUrl;
identifiers = {
purlParts =
if githubBase == "github.com" then
{
type = "github";
# https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/github-definition.md
spec = "${owner}/${repo}@${(lib.revOrTag rev tag)}";
}
else
{
type = "generic";
# https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/generic-definition.md
spec = "${repo}?vcs_url=https://${githubBase}/${owner}/${repo}@${(lib.revOrTag rev tag)}";
};
}
// meta.identifiers or { };
}
// lib.optionalAttrs (position != null) {
# to indicate where derivation originates, similar to make-derivation.nix's mkDerivation
position = "${position.file}:${toString position.line}";
};
passthruAttrs = removeAttrs args [
"owner"
"repo"
@@ -172,12 +155,12 @@ lib.makeOverridable (
// passthruAttrs
// {
inherit name;
meta = newMeta;
};
in
fetcher fetcherArgs
// {
meta = newMeta;
inherit owner repo tag;
rev = revWithTag;
}
+1 -15
View File
@@ -51,8 +51,6 @@ makeOverridable (
format ? "setuptools",
sha256 ? "",
hash ? "",
pname,
version,
...
}@attrs:
let
@@ -62,20 +60,8 @@ makeOverridable (
"hash"
]
);
meta = {
identifiers.purlParts = {
type = "pypi";
# https://github.com/package-url/purl-spec/blob/18fd3e395dda53c00bc8b11fe481666dc7b3807a/types-doc/pypi-definition.md
spec = "${pname}@${version}";
};
};
in
fetchurl {
inherit
url
sha256
hash
meta
;
inherit url sha256 hash;
}
)
+3 -1
View File
@@ -57,6 +57,7 @@
actual,
expected,
postFailureMessage ? null,
checkMetadata ? true,
}:
runCommand "equal-contents-${lib.strings.toLower assertion}"
{
@@ -66,12 +67,13 @@
expected
postFailureMessage
;
excludeMetadata = if checkMetadata then "no" else "yes";
nativeBuildInputs = [ diffoscopeMinimal ];
}
''
echo "Checking:"
printf '%s\n' "$assertion"
if ! diffoscope --no-progress --text-color=always --exclude-directory-metadata=no -- "$actual" "$expected"
if ! diffoscope --no-progress --text-color=always --exclude-directory-metadata="$excludeMetadata" -- "$actual" "$expected"
then
echo
echo 'Contents must be equal, but were not!'
+10 -10
View File
@@ -29,28 +29,28 @@
},
"beta": {
"linux": {
"version": "8.11.14-19.BETA",
"version": "8.11.14-20.BETA",
"sources": {
"x86_64": {
"url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.14-19.BETA.x64.tar.gz",
"hash": "sha256-b9D+1iSkXJ23ZImB2XtNL/3uA4mcHw5o0blNU2sZX4Y="
"url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.14-20.BETA.x64.tar.gz",
"hash": "sha256-/B06ghBsr7xgEWgXo+jkz5PUJVS51WfzyBZFxwu3XBM="
},
"aarch64": {
"url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.14-19.BETA.arm64.tar.gz",
"hash": "sha256-hDrmXWPdlmyc9gtbMJ+M3tGlL6QdavrYi5vH4HF8a/Q="
"url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.14-20.BETA.arm64.tar.gz",
"hash": "sha256-gSdlXULW7q7uRWm5CncA/ya+LA4k4y8g+Lj79h5V2kc="
}
}
},
"darwin": {
"version": "8.11.14-19.BETA",
"version": "8.11.14-20.BETA",
"sources": {
"x86_64": {
"url": "https://downloads.1password.com/mac/1Password-8.11.14-19.BETA-x86_64.zip",
"hash": "sha256-ULmPdLwFObQBM0CrEkBVgSFIEEeHtn3G0grC0WhWmbs="
"url": "https://downloads.1password.com/mac/1Password-8.11.14-20.BETA-x86_64.zip",
"hash": "sha256-1ZPekYyHLVbIop2Yw3sj1XsWCG5SgoI0MFVK44HJfCs="
},
"aarch64": {
"url": "https://downloads.1password.com/mac/1Password-8.11.14-19.BETA-aarch64.zip",
"hash": "sha256-lK0ATvTCPrwkLkPkkTBuPo8S2g/W4q9BNdSv3fdZorM="
"url": "https://downloads.1password.com/mac/1Password-8.11.14-20.BETA-aarch64.zip",
"hash": "sha256-Ca3jpcfxaINKSR0JjF7fT+6rfrbK//f22RT7UhEhDaM="
}
}
}
+631 -29
View File
@@ -8,49 +8,483 @@
let
pname = "aeron";
version = "1.44.1";
version = "1.49.0";
groupId = "io.aeron";
aeronAll_1_40_0 = fetchMavenArtifact {
inherit groupId;
version = "1.40.0";
artifactId = "aeron-all";
hash = "sha512-NyhYaQqOWcSBwzwpje6DMAp36CEgGSNXBSdaRrDyP+Fn2Z0nvh5o2czog6GKKtbjH9inYfyyF/21gehfgLF6qA==";
};
aeronSamples_1_40_0 = fetchMavenArtifact {
inherit groupId;
version = "1.40.0";
artifactId = "aeron-samples";
hash = "sha512-vyAq4mfLDDyaVk7wcIpPvPcxSt92Ek8mxfuuZwaX+0Wu9oJCpwbnjvS9+bvzcE4qSGxzY6eJIIX6nMdw0LkACg==";
};
aeronAll_1_42_1 = fetchMavenArtifact {
aeronAll_1_49_0 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.42.1";
hash = "sha512-pjX+JopK6onDwElMIroj+ZXrKwdPj5H2uPg08XgNlrK1rAkHo9MUT8weBGbuFVFDLeqOZrHj0bt1wJ9XgYY5aA==";
version = "1.49.0";
hash = "sha256-n3qoLs+iYzrb95skr29DrpQPHsWBZL6IygnayNJ1s6Q=";
};
aeronSamples_1_42_1 = fetchMavenArtifact {
aeronSamples_1_49_0 = fetchMavenArtifact {
inherit groupId;
version = "1.42.1";
version = "1.49.0";
artifactId = "aeron-samples";
hash = "sha512-4JnHn22vJf2lmOg6ev5PD+/YiaL3KgfuyWAK92djX3KBVXO7ERMY2kH79dveVCJG1rbekvE1j1pnjaAIxwJcqg==";
hash = "sha256-ePhAUBebeZP5exfBOGpUTTntAeZIdsolPuyhpbv0GVo=";
};
aeronAll_1_43_0 = fetchMavenArtifact {
aeronAll_1_48_6 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.43.0";
hash = "sha512-ZKjUA1Kp++RLnCNUOi2K/iGc4zIIR4pC4j8qPfO+rcgp7ghZfgsXO8sB+JD307kzeikUXnPFX7ef28DlzI8s8Q==";
version = "1.48.6";
hash = "sha256-IWURDka8Qudit1nN/aHi4DHOAxpj++/1iSAbI5QNaBg=";
};
aeronSamples_1_43_0 = fetchMavenArtifact {
aeronSamples_1_48_6 = fetchMavenArtifact {
inherit groupId;
version = "1.43.0";
version = "1.48.6";
artifactId = "aeron-samples";
hash = "sha512-a/ti4Kd8WwzOzDGMgdYk0pxsu8vRA4kRD9cm4D3S+r6xc/rL8ECHVoogOMDeabDd1EYSIbx/sKE01BJOW7BVsg==";
hash = "sha256-L5DFzZSfBRSGZOxDkfX1CTYyRNawd8tJLQaLZzYQTew=";
};
aeronAll_1_48_5 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.48.5";
hash = "sha256-yPLTh8bYBRwG0y5Tc+Z9TSSoYZSe55RQOb22LbBL804=";
};
aeronSamples_1_48_5 = fetchMavenArtifact {
inherit groupId;
version = "1.48.5";
artifactId = "aeron-samples";
hash = "sha256-poxiGXdA2SWJQ1oFe8kh2q5T5GOytrxcAhkNv5k64Qo=";
};
aeronAll_1_48_4 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.48.4";
hash = "sha256-6a8rgdNPkbYqo8N/7tSS4LxDF1j0s4JvDlYNSUSgrog=";
};
aeronSamples_1_48_4 = fetchMavenArtifact {
inherit groupId;
version = "1.48.4";
artifactId = "aeron-samples";
hash = "sha256-nB5YqF+jd2C8f++1pH36aZNtuscfP5ZMKx/6W3iiz4I=";
};
aeronAll_1_48_3 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.48.3";
hash = "sha256-VEyowi5J7mJWQ+Xj8dO7iL2cHLkeEzcJZkk5yyuDeuU=";
};
aeronSamples_1_48_3 = fetchMavenArtifact {
inherit groupId;
version = "1.48.3";
artifactId = "aeron-samples";
hash = "sha256-/E7fF8Np8D3/DYHYLeRjLPkP3AQJ5kTYvZRsQmyUBzk=";
};
aeronAll_1_48_2 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.48.2";
hash = "sha256-PQFlitiG43NO8zx/JfXiu7R5x/cYU/o5/x9U4/CioEw=";
};
aeronSamples_1_48_2 = fetchMavenArtifact {
inherit groupId;
version = "1.48.2";
artifactId = "aeron-samples";
hash = "sha256-nQ4kv/nQV0zkDgCL716AtRzEK/FDenHZMFNOhgVkd3s=";
};
aeronAll_1_48_1 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.48.1";
hash = "sha256-ZRf4YZLxF1O6GhWpCFS/PJqIHyti3dHCXPoxuuiJEz0=";
};
aeronSamples_1_48_1 = fetchMavenArtifact {
inherit groupId;
version = "1.48.1";
artifactId = "aeron-samples";
hash = "sha256-wtCOtwtp6hQUm7SfCV5yP4bwxufs8kRgA4V9/LRoAls=";
};
aeronAll_1_48_0 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.48.0";
hash = "sha256-eUc9tdR6iOGivovzX00VxLuHvEcXMFKxs2oJqug+ayA=";
};
aeronSamples_1_48_0 = fetchMavenArtifact {
inherit groupId;
version = "1.48.0";
artifactId = "aeron-samples";
hash = "sha256-31WO354XNsR2sZNPoh9kCNfSTz/ZM44IoRnmsx1iwMU=";
};
aeronAll_1_47_7 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.47.7";
hash = "sha256-8j2nKjAjZ3tpGbCPtQ3opGL4y3vVR2kC5Wh8xQvVG8Q=";
};
aeronSamples_1_47_7 = fetchMavenArtifact {
inherit groupId;
version = "1.47.7";
artifactId = "aeron-samples";
hash = "sha256-zKan26LpNFOAst78qN0S9tmG59oKKowVphCYKfMu1lg=";
};
aeronAll_1_47_5 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.47.5";
hash = "sha256-Hi7I/N+L4l05rNjfqPf4fUEFOAzt8FWx5T9UDAdVOLI=";
};
aeronSamples_1_47_5 = fetchMavenArtifact {
inherit groupId;
version = "1.47.5";
artifactId = "aeron-samples";
hash = "sha256-VFFfZKosTfMx1/C8qgSZNpYGP9oqN2y+rcbyTNH7vYE=";
};
aeronAll_1_47_4 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.47.4";
hash = "sha256-PHc3vcRYI1rIJanrNyz7wCFE9znzPZMprPGO+oO8Tgc=";
};
aeronSamples_1_47_4 = fetchMavenArtifact {
inherit groupId;
version = "1.47.4";
artifactId = "aeron-samples";
hash = "sha256-z/FubK2sIDm8KtlaNwrO1nTlZrw+PC9tjGoiWbe7wBE=";
};
aeronAll_1_47_3 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.47.3";
hash = "sha256-K5pVvHY0jltueoEjTv8tr9z/EtTwkhLjgE9Qw+mtN50=";
};
aeronSamples_1_47_3 = fetchMavenArtifact {
inherit groupId;
version = "1.47.3";
artifactId = "aeron-samples";
hash = "sha256-6HU7ykfDXlrQCdB5hYjZsQV+s0yFybXKqN8QHkEqSrw=";
};
aeronAll_1_47_2 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.47.2";
hash = "sha256-qQAp3YcuIoxIJKgxoZ1ahNGRjS+b+Vr6PicN3S4xYUw=";
};
aeronSamples_1_47_2 = fetchMavenArtifact {
inherit groupId;
version = "1.47.2";
artifactId = "aeron-samples";
hash = "sha256-GVmAxQQZrfixMqylDh/TNXJk4cF0Z1Tg/iTaeohRrdw=";
};
aeronAll_1_47_1 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.47.1";
hash = "sha256-QoKJxdkrZ8P7JwCFUGZ1lukG/Q4MgwksAp1R5RdVea0=";
};
aeronSamples_1_47_1 = fetchMavenArtifact {
inherit groupId;
version = "1.47.1";
artifactId = "aeron-samples";
hash = "sha256-FPkDrp0vyStm62Kf+F160KTXhNu5CdaQaB48uJkNC78=";
};
aeronAll_1_47_0 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.47.0";
hash = "sha256-CfWsJBpk637o+CKkvpAMS+muEY/8tCh4SkEML8kYY1k=";
};
aeronSamples_1_47_0 = fetchMavenArtifact {
inherit groupId;
version = "1.47.0";
artifactId = "aeron-samples";
hash = "sha256-QVlBif/EmzFTB3XPLWXRdZME46Ipky+O300AH+kd9+M=";
};
aeronAll_1_46_9 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.46.9";
hash = "sha256-HlIZfQHb3lKE773cE3bWZfAmkUkHD9qhUqHwlPLSvrw=";
};
aeronSamples_1_46_9 = fetchMavenArtifact {
inherit groupId;
version = "1.46.9";
artifactId = "aeron-samples";
hash = "sha256-o1PcXx8/z+rDHzTP/zSK2LjLM1TRmqSxW/KtCNBzsuc=";
};
aeronAll_1_46_8 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.46.8";
hash = "sha256-+Y6kz+rvnzw4Q/K00Y1us3XQAkHpUSoe1nAS9yS6U4I=";
};
aeronSamples_1_46_8 = fetchMavenArtifact {
inherit groupId;
version = "1.46.8";
artifactId = "aeron-samples";
hash = "sha256-7kT+Ueg9RxrjKmLSfuUMpqbhUkGwGq0P3fpw2J1ruyg=";
};
aeronAll_1_46_7 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.46.7";
hash = "sha256-3tLtPFtzmR4xxDmnViopTl1VZvlVw6noEImiimtbnVU=";
};
aeronSamples_1_46_7 = fetchMavenArtifact {
inherit groupId;
version = "1.46.7";
artifactId = "aeron-samples";
hash = "sha256-XaG8r2a2xXRUqdgK491KOSlptSu7dM3vzEHAh91aBqI=";
};
aeronAll_1_46_6 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.46.6";
hash = "sha256-PMcXyzpjBkBC4qnb76D+22qPdgs7mhagZDWvGt9CXwk=";
};
aeronSamples_1_46_6 = fetchMavenArtifact {
inherit groupId;
version = "1.46.6";
artifactId = "aeron-samples";
hash = "sha256-JBf5531tiRY8w1lSPfic2TnepNln6CJ3PC9S56Fi68Q=";
};
aeronAll_1_46_5 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.46.5";
hash = "sha256-ozFVbbNqqYb+giORCtTkNBcn06F0Lfu12Eyd5r/E370=";
};
aeronSamples_1_46_5 = fetchMavenArtifact {
inherit groupId;
version = "1.46.5";
artifactId = "aeron-samples";
hash = "sha256-0U/Ye9VcCeCtpBdBE7JUaEHe4wsE+yoa+ndLPVJiuBs=";
};
aeronAll_1_46_4 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.46.4";
hash = "sha256-9TMGUZ9NUYMXihSFElifeqpJc0Sz7ks9NOcvjUSofaM=";
};
aeronSamples_1_46_4 = fetchMavenArtifact {
inherit groupId;
version = "1.46.4";
artifactId = "aeron-samples";
hash = "sha256-qo+HRhsdK/LLpAcZz4M4gxlngnokYIaJc1F/KMX8sDQ=";
};
aeronAll_1_46_3 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.46.3";
hash = "sha256-lToJIeTM84rAA/oiNqRNdYs5Ropfuw9WJ08Nb0m87MQ=";
};
aeronSamples_1_46_3 = fetchMavenArtifact {
inherit groupId;
version = "1.46.3";
artifactId = "aeron-samples";
hash = "sha256-MRNGUCOW3w7gctNLsle39Zus89RBS1ukc34o4pzHOnU=";
};
aeronAll_1_46_2 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.46.2";
hash = "sha256-2iwmx1X1gbjUabRyCR6Ek6iuDKhtvgEonwBdbF0h3MY=";
};
aeronSamples_1_46_2 = fetchMavenArtifact {
inherit groupId;
version = "1.46.2";
artifactId = "aeron-samples";
hash = "sha256-jv8tWpuuRnCQSlGGtd9ger562IF/5x0wSEtrlM1s1Ks=";
};
aeronAll_1_46_1 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.46.1";
hash = "sha256-KH2mt64ewpdwLOM7q95l0j3ftLOCu3uICcaVUXe/vyY=";
};
aeronSamples_1_46_1 = fetchMavenArtifact {
inherit groupId;
version = "1.46.1";
artifactId = "aeron-samples";
hash = "sha256-IF9dRX/EUUF8An/baMxb9iEXq/wZlvvgdzKIk2c8+aA=";
};
aeronAll_1_46_0 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.46.0";
hash = "sha256-ngFeYSDJxxqxawtGrALZrsjRO9WlPdnhdO9NuZKhPr8=";
};
aeronSamples_1_46_0 = fetchMavenArtifact {
inherit groupId;
version = "1.46.0";
artifactId = "aeron-samples";
hash = "sha256-arnWZD5znkrnn4usKG2R3gdUXljYKvoibFQ0b466iks=";
};
aeronAll_1_45_2 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.45.2";
hash = "sha256-m1FJwC+1ZZlCPTU9KksLq7ozP3X1v7/kZaCb/vFwveQ=";
};
aeronSamples_1_45_2 = fetchMavenArtifact {
inherit groupId;
version = "1.45.2";
artifactId = "aeron-samples";
hash = "sha256-RB51I7WjV19pT7FCUH9FVrcbt64vjPIjMjRxgLIzEjw=";
};
aeronAll_1_45_1 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.45.1";
hash = "sha256-cD50jk95OAcdPKJuc45t1O6WVRgM2j1gMZ5IudbL4U8=";
};
aeronSamples_1_45_1 = fetchMavenArtifact {
inherit groupId;
version = "1.45.1";
artifactId = "aeron-samples";
hash = "sha256-QSC5Yp35eJjUHByShdQWDP14jW1Y3pL3osLDGLsxsqg=";
};
aeronAll_1_45_0 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.45.0";
hash = "sha256-gImfORn61k1fVyqPfr5Uk2Hu5yPfnShCXIUB3qSuFnI=";
};
aeronSamples_1_45_0 = fetchMavenArtifact {
inherit groupId;
version = "1.45.0";
artifactId = "aeron-samples";
hash = "sha256-7o37/YzQHTBguTlpoIXFa8JNFtyG7zKKnVdijIqAeDY=";
};
aeronAll_1_44_7 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.44.7";
hash = "sha256-ZbM17fXbCZQWYjE1QG6MO506sMqth9ukD1an3RbxypA=";
};
aeronSamples_1_44_7 = fetchMavenArtifact {
inherit groupId;
version = "1.44.7";
artifactId = "aeron-samples";
hash = "sha256-vBtx5bN4JtOhvQwoHAof1Y7uLPiadQCNscw5eiaYDec=";
};
aeronAll_1_44_6 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.44.6";
hash = "sha256-FJSPOvjXgcuqQQn8VuXz87sj4qfN7Ayt0CHg6CE2uHA=";
};
aeronSamples_1_44_6 = fetchMavenArtifact {
inherit groupId;
version = "1.44.6";
artifactId = "aeron-samples";
hash = "sha256-9NKudRW06/Q7xg/tDaVixBy1J0Pv3Y6FGOq0oG/IXO0=";
};
aeronAll_1_44_5 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.44.5";
hash = "sha256-s9Jo2sU4obp6OrfLZjJvRlXYpyg3gsVnYH5xNQSjQSQ=";
};
aeronSamples_1_44_5 = fetchMavenArtifact {
inherit groupId;
version = "1.44.5";
artifactId = "aeron-samples";
hash = "sha256-hvRBaMoEM2KTHDXLruRnrUMi7VQH8QdDr79y1pLk/PA=";
};
aeronAll_1_44_4 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.44.4";
hash = "sha256-CfoB7zJ4ZWZXOvy7fZoCg5zCiHI+6CTxLd7UgWslC5I=";
};
aeronSamples_1_44_4 = fetchMavenArtifact {
inherit groupId;
version = "1.44.4";
artifactId = "aeron-samples";
hash = "sha256-ZGkYlQCV60R1Ua3ecqBkCD3CN2r+/opx1oI1lKsqC7w=";
};
aeronAll_1_44_3 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.44.3";
hash = "sha256-uqjLQUE6IEvGMwZqUOocL0NfK+dPIaQAJTAILIK6Kao=";
};
aeronSamples_1_44_3 = fetchMavenArtifact {
inherit groupId;
version = "1.44.3";
artifactId = "aeron-samples";
hash = "sha256-EfkhMx4iQIDqk3jnVf1oEvb21sN9GyLwJJjok619YW0=";
};
aeronAll_1_44_2 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.44.2";
hash = "sha256-C3xr8OeVVpnmE70j+5meawWg+56/FhIBqQm9BTwbOj4=";
};
aeronSamples_1_44_2 = fetchMavenArtifact {
inherit groupId;
version = "1.44.2";
artifactId = "aeron-samples";
hash = "sha256-laY1xdgaBwwCVdAUrJtrFW2rduguRdcpTaglcWa0jB0=";
};
aeronAll_1_44_1 = fetchMavenArtifact {
@@ -67,8 +501,176 @@ let
hash = "sha256-ZSuTed45BRzr4JJuGeXghUgEifv/FpnCzTNJWa+nwjo=";
};
aeronAll = aeronAll_1_44_1;
aeronSamples = aeronSamples_1_44_1;
aeronAll_1_44_0 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.44.0";
hash = "sha256-j7WXJaIQZPKOTLmZg+nGxLUowYAuZYj062pmxS0ycnk=";
};
aeronSamples_1_44_0 = fetchMavenArtifact {
inherit groupId;
version = "1.44.0";
artifactId = "aeron-samples";
hash = "sha256-DXsYKnFvQT2BRGZyLXIfLBxglZMFRKBG3VDXD0UITLU=";
};
aeronAll_1_43_0 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.43.0";
hash = "sha512-ZKjUA1Kp++RLnCNUOi2K/iGc4zIIR4pC4j8qPfO+rcgp7ghZfgsXO8sB+JD307kzeikUXnPFX7ef28DlzI8s8Q==";
};
aeronSamples_1_43_0 = fetchMavenArtifact {
inherit groupId;
version = "1.43.0";
artifactId = "aeron-samples";
hash = "sha512-a/ti4Kd8WwzOzDGMgdYk0pxsu8vRA4kRD9cm4D3S+r6xc/rL8ECHVoogOMDeabDd1EYSIbx/sKE01BJOW7BVsg==";
};
aeronAll_1_42_1 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.42.1";
hash = "sha512-pjX+JopK6onDwElMIroj+ZXrKwdPj5H2uPg08XgNlrK1rAkHo9MUT8weBGbuFVFDLeqOZrHj0bt1wJ9XgYY5aA==";
};
aeronSamples_1_42_1 = fetchMavenArtifact {
inherit groupId;
version = "1.42.1";
artifactId = "aeron-samples";
hash = "sha512-4JnHn22vJf2lmOg6ev5PD+/YiaL3KgfuyWAK92djX3KBVXO7ERMY2kH79dveVCJG1rbekvE1j1pnjaAIxwJcqg==";
};
aeronAll_1_42_0 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.42.0";
hash = "sha256-rcUKHUh2rsBvO8kn2x+wYFRuM9XV21hINwFG7ej6uyw=";
};
aeronSamples_1_42_0 = fetchMavenArtifact {
inherit groupId;
version = "1.42.0";
artifactId = "aeron-samples";
hash = "sha256-dmLEuEcgUuoEBEM0zW+c+0o6oOpIk+5FCzZgP5j1jXk=";
};
aeronAll_1_41_6 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.41.6";
hash = "sha256-YUfQ98lGEeGjl1LB12tP9fON+KycMUJFI7ntqsYa3O8=";
};
aeronSamples_1_41_6 = fetchMavenArtifact {
inherit groupId;
version = "1.41.6";
artifactId = "aeron-samples";
hash = "sha256-vaO2meykLq5aK6Y0DINcVCq920Qns8GCFu18CavCvis=";
};
aeronAll_1_41_5 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.41.5";
hash = "sha256-+yYOBwRsWgAtmDplB9dltU76wTX650KharSkMjWlG6M=";
};
aeronSamples_1_41_5 = fetchMavenArtifact {
inherit groupId;
version = "1.41.5";
artifactId = "aeron-samples";
hash = "sha256-1RHFDMtaAJHKNdz32Aeo6YplvoMDJerQRi10NUyp/OI=";
};
aeronAll_1_41_4 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.41.4";
hash = "sha256-Z06nAaCO1LU6ChNm4YnipuUNgusY7iY6WhV8AeBPRoE=";
};
aeronSamples_1_41_4 = fetchMavenArtifact {
inherit groupId;
version = "1.41.4";
artifactId = "aeron-samples";
hash = "sha256-9gyKDu7R/Q8HtkCR5D1ohZnVa1jIOv5Z0lgOcRIumCw=";
};
aeronAll_1_41_3 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.41.3";
hash = "sha256-aQ+oZ6oqi853fZfwRcGpgRsuEAfP7AJsu5C0pfwxlzU=";
};
aeronSamples_1_41_3 = fetchMavenArtifact {
inherit groupId;
version = "1.41.3";
artifactId = "aeron-samples";
hash = "sha256-FTiz5IrPoE1zWNjAym4ynjvny0p8uP7QzizK1jCJKgM=";
};
aeronAll_1_41_2 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.41.2";
hash = "sha256-0XSoKbFnhEwOlx0+9cJj/Qf6XAUjtskun9BwIq/WxW8=";
};
aeronSamples_1_41_2 = fetchMavenArtifact {
inherit groupId;
version = "1.41.2";
artifactId = "aeron-samples";
hash = "sha256-7ht2Jklvx3cfk2PopRjUVDQ0Uo+5M5262SI91ItS9Ow=";
};
aeronAll_1_41_1 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.41.1";
hash = "sha256-/JufYICrSefm9nGlVcfQHcUkYMnzrZcNDjB8fAfSKGE=";
};
aeronSamples_1_41_1 = fetchMavenArtifact {
inherit groupId;
version = "1.41.1";
artifactId = "aeron-samples";
hash = "sha256-6/o1t6/ehYYhMqU6pYQ0uScZhsZTuowr0uwJ3TbmtHk=";
};
aeronAll_1_41_0 = fetchMavenArtifact {
inherit groupId;
artifactId = "aeron-all";
version = "1.41.0";
hash = "sha256-g2dFf+htF72ByJCcjKuHtLuehLtjjjpqjvWq1rTkmYg=";
};
aeronSamples_1_41_0 = fetchMavenArtifact {
inherit groupId;
version = "1.41.0";
artifactId = "aeron-samples";
hash = "sha256-nUX9JM0p06m0XyH4ugPXQ0+Fc9ydmhJlaND+VUCZ788=";
};
aeronAll_1_40_0 = fetchMavenArtifact {
inherit groupId;
version = "1.40.0";
artifactId = "aeron-all";
hash = "sha512-NyhYaQqOWcSBwzwpje6DMAp36CEgGSNXBSdaRrDyP+Fn2Z0nvh5o2czog6GKKtbjH9inYfyyF/21gehfgLF6qA==";
};
aeronSamples_1_40_0 = fetchMavenArtifact {
inherit groupId;
version = "1.40.0";
artifactId = "aeron-samples";
hash = "sha512-vyAq4mfLDDyaVk7wcIpPvPcxSt92Ek8mxfuuZwaX+0Wu9oJCpwbnjvS9+bvzcE4qSGxzY6eJIIX6nMdw0LkACg==";
};
aeronAll = aeronAll_1_49_0;
aeronSamples = aeronSamples_1_49_0;
in
stdenv.mkDerivation {
+2 -2
View File
@@ -81,13 +81,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "amnezia-vpn";
version = "4.8.10.0";
version = "4.8.11.0";
src = fetchFromGitHub {
owner = "amnezia-vpn";
repo = "amnezia-client";
tag = finalAttrs.version;
hash = "sha256-w1uBhp47XRinZpSuKeFaASOIOyjRDkDA81uqW4pK3F4=";
hash = "sha256-JZ6cGqLybHgy6xIklH3A//XNXiXlsM4NixGmk0KoubU=";
fetchSubmodules = true;
};
@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation {
pname = "ananicy-rules-cachyos";
version = "0-unstable-2025-09-09";
version = "0-unstable-2025-10-17";
src = fetchFromGitHub {
owner = "CachyOS";
repo = "ananicy-rules";
rev = "0f5d7883cc4c49b8e9c51d5512ba145b5289eb05";
hash = "sha256-8zzUp1am6nu/6EnQkPTDkd/TLb2SBgSSyNpUyv44Zr8=";
rev = "53b0c689faaa4bb7edcb9dae799602c417634351";
hash = "sha256-awGCaVl0m1IqADeQW53wFSEAeUYR6677oc0Z2ZfZ898=";
};
dontConfigure = true;
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "applesauce";
version = "0.5.19";
version = "0.5.20";
src = fetchFromGitHub {
owner = "Dr-Emann";
repo = "applesauce";
tag = "applesauce-cli-v${finalAttrs.version}";
hash = "sha256-OJZOB7h3qFkaCaPi+EJxIFX8q/Q38vtI0CmDK4PMD1g=";
hash = "sha256-KiivMFp772x/rFHh9PpDBjCxxC/6n6+KyAaZTmhnZV0=";
};
cargoHash = "sha256-gQQpvS2LtlDBXjTqQvSUCXv5UCiQm1kiS/yPcG5KGxY=";
cargoHash = "sha256-WyDHp34NQi3/OotM4+4/d4ySOSYg+PDDmnLUn5R9yaU=";
meta = {
description = "Transparent compression for Apple File System Compression (AFSC)";
+11 -4
View File
@@ -7,23 +7,30 @@
buildGoModule rec {
pname = "apprun-cli";
version = "0.3.2";
version = "0.5.0";
src = fetchFromGitHub {
owner = "fujiwara";
repo = "apprun-cli";
tag = "v${version}";
hash = "sha256-k8ZFDWIuUjYqDIm7JdiqjeF2qaPX0SaOgqk4oud09Lc=";
hash = "sha256-3M+kRXTQ0yaxQc9E5T9UThqEda2S1F77SJzX7burZlU=";
};
vendorHash = "sha256-WQRDkxL52RQmZn2aeE13pU4YGk8UjuZtS1lTNb53/hQ=";
vendorHash = "sha256-i3ZthsZVxAYQDX6ZA1bU81F4BbYSsWdu1sOAiY7FK7Y=";
ldflags = [
"-s"
"-w"
];
passthru.updateScript = nix-update-script { };
passthru.updateScript = nix-update-script {
extraArgs = [
"--version-regex"
# Until a stable version is released, v0 tags are incorrectly recognized as the latest,
# so specify minor releases
"^v0.([0-9.]+)$"
];
};
meta = {
description = "CLI for sakura AppRun";
+2 -4
View File
@@ -19,7 +19,7 @@
ninja,
pkg-config,
sqlite,
# webkitgtk_4_0,
webkitgtk_4_1,
wrapGAppsHook3,
}:
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
libsecret
openssl
sqlite
# webkitgtk_4_0
webkitgtk_4_1
];
mesonFlags = [
@@ -78,8 +78,6 @@ stdenv.mkDerivation (finalAttrs: {
enableParallelBuilding = true;
meta = {
# webkitgtk_4_0 was removed
broken = true;
description = "E-mail client for GNOME";
homepage = "https://gitlab.gnome.org/GNOME/balsa";
changelog = "https://gitlab.gnome.org/GNOME/balsa/-/blob/master/ChangeLog";
+3 -3
View File
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "bat";
version = "0.25.0";
version = "0.26.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "bat";
rev = "v${version}";
hash = "sha256-82IhLhw0TdaMh21phBxcUZ5JI5xOXb0DrwnBmPwyfAQ=";
hash = "sha256-JWpdAO+OCqoWa6KVR8sxvHHy1SdR4BmRO0oU0ZAOWl0=";
};
cargoHash = "sha256-EnEc+B62dK3q6in8yn5wdeVmBw8XMkP8YKpCN7lCPnc=";
cargoHash = "sha256-wb86yWWnRHs1vG8+oyhs6bUD4x7AdWvIvPPNBcLs4Hs=";
nativeBuildInputs = [
pkg-config
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "bato";
version = "0.1.7";
version = "0.2.1";
src = fetchFromGitHub {
owner = "doums";
repo = "bato";
rev = "v${version}";
hash = "sha256-i2gw8vXiKutq26ACzkVXH3kED7jAngSv2mNo9P3qXnA=";
hash = "sha256-pq+i4NGl7yv+vmMoYVT9JRvOsuV7nBqXpsebgMcNEY0=";
};
cargoHash = "sha256-bGbLQaYfNLem47iMPsNeKm4pP3+Pij9SJ3Nq5VWX3hE=";
cargoHash = "sha256-ZVzIoq+s2Xw996NoQMIGHUqo2uXJMu9lXfY5Us9NMPg=";
nativeBuildInputs = [
pkg-config
+2 -2
View File
@@ -21,14 +21,14 @@ let
in
stdenv.mkDerivation rec {
pname = "bitbox";
version = "4.48.1";
version = "4.48.6";
src = fetchFromGitHub {
owner = "BitBoxSwiss";
repo = "bitbox-wallet-app";
tag = "v${version}";
fetchSubmodules = true;
hash = "sha256-zpkjYnGsmPKjxUpp2H1qSzqthOO1mTmki3bPqo35sBo=";
hash = "sha256-qNcwBaJywWMo/Bb1QkOM9FQ76Sf2DqULUr+W583ufAk=";
};
postPatch = ''
+3 -3
View File
@@ -6,16 +6,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-modules";
version = "0.24.3";
version = "0.25.0";
src = fetchFromGitHub {
owner = "regexident";
repo = "cargo-modules";
tag = "v${version}";
hash = "sha256-ZotG9eYVwNb123dQ6D4bsVCb7vS/jc/I67JPrQnJ59U=";
hash = "sha256-FghGqRV9KaRPZ7l3t/AB7f1XufOsNdiGFUk8GUwAxtY=";
};
cargoHash = "sha256-CNOzNaA/bOvuBsON42m0cPEvAcqpCp1oNNOetuDEN04=";
cargoHash = "sha256-Lt5zqhBpHlPYoPgIVmVYu35SnuguqPw5Qg0oTL5cgCs=";
checkFlags = [
"--skip=cfg_test::with_tests::smoke"
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "cdncheck";
version = "1.2.5";
version = "1.2.6";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "cdncheck";
tag = "v${version}";
hash = "sha256-Ty+W5uiFkr8MBhWUweHsFQnIZ8R+oJoCcvQabHFdu7U=";
hash = "sha256-MZA9PkDftUyHqcC5i9QLvMTq+q1m7MVEkMPyD4EiWtk=";
};
vendorHash = "sha256-YjkO3QTQZlCfbKm/uYNVwnyQ/1Tde77YB2m7CqKsRtM=";
vendorHash = "sha256-tPhWKjaoUHQq6MdhktSZpfF7651YKeWd9ecg8V3E6aQ=";
subPackages = [ "cmd/cdncheck/" ];
@@ -8,10 +8,11 @@
unzip,
yq,
dotnet-runtime_8,
everest,
executableName ? "Celeste",
desktopItems ? null,
everest ? null,
withEverest ? false,
overrideSrc ? null,
writableDir ? null,
launchFlags ? "",
@@ -36,12 +37,12 @@ let
phome = "$out/lib/Celeste";
launchFlags' =
if launchFlags != "" && everest == null then
if launchFlags != "" && !withEverest then
lib.warn "launchFlags is useless without Everest." ""
else
launchFlags;
launchEnv' =
if launchEnv != "" && everest == null then
if launchEnv != "" && !withEverest then
lib.warn "launchEnv is useless without Everest." ""
else
''
@@ -91,7 +92,7 @@ stdenvNoCC.mkDerivation {
mkdir -p ${phome}
unzip -q $src -d ${phome}
''
+ lib.optionalString (everest != null) ''
+ lib.optionalString withEverest ''
cp -r ${everest}/* $out
chmod -R +w ${phome} # Files copied from other derivations are not writable by default
@@ -137,7 +138,7 @@ stdenvNoCC.mkDerivation {
# https://github.com/EverestAPI/Everest/blob/7bd41c26850bbdfef937e2ed929174e864101c4c/Celeste.Mod.mm/Mod/Everest/BOOT.cs#L188-L201
# It is hardcoded that it launches Celeste instead of Celeste-unwrapped.
# Therefore, we need to prevent it from restarting.
lib.optionalString (everest != null) "--prefix LD_LIBRARY_PATH : ${phome}/lib64-linux"
lib.optionalString withEverest "--prefix LD_LIBRARY_PATH : ${phome}/lib64-linux"
} --chdir ${phome}
icon=$out/share/icons/hicolor/512x512/apps/Celeste.png
@@ -149,7 +150,7 @@ stdenvNoCC.mkDerivation {
dontStrip = true;
dontPatchShebangs = true;
postFixup =
lib.optionalString (everest != null) ''
lib.optionalString withEverest ''
rm -r ${phome}/Mods # Currently it is empty.
ln -s "${writableDir}"/{Mods,LogHistory,CrashLogs,${everestLogFilename}} -t ${phome}
''
+10 -12
View File
@@ -7,10 +7,11 @@
writeShellScript,
autoPatchelfHook,
runtimeShell,
# Override this to everest-bin if you want to use steam-run.
everest,
withEverest ? false,
overrideSrc ? null,
# A package. Omit to build without Everest.
everest ? null,
# If build with Everest, must set writableDir to the path of a writable dir
# so that the mods can be installed there.
# It must be an absolute path.
@@ -29,8 +30,8 @@
# For those who would like to use steam-run or alike to launch Celeste
# (useful when using the `olympus` package with its `celesteWrapper` argument overridden),
# install `celestegame.passthru.celeste-unwrapped` instead of `celestegame`, and if you want Everest,
# override `everest` to `celestegame.passthru.everest-bin` instead of `celestegame.passthru.everest`
# install `celestegame.passthru.celeste-unwrapped` instead of `celestegame`,
# and if you want Everest, override `everest` to `everest-bin`
# (steam-run cannot launch the latter for some currently unclear reason).
# For those who would like to launch Celeste without the need of any additional wrapper like steam-run,
# install `celestegame` with the `writableDir` argument overridden.
@@ -41,7 +42,7 @@ let
executableName = "Celeste";
writableDir' =
if writableDir == null && everest != null then
if writableDir == null && withEverest then
lib.warn "writableDir is not set, so mods will not work." "/tmp"
else
writableDir;
@@ -49,10 +50,11 @@ let
everestLogFilename = "everest-log.txt";
celeste = callPackage ./celeste {
celeste = callPackage ./celeste.nix {
inherit
executableName
everest
withEverest
overrideSrc
launchFlags
launchEnv
@@ -77,7 +79,7 @@ let
in
buildFHSEnv {
inherit pname executableName;
version = celeste.version + (lib.optionalString (everest != null) "+everest.${everest.version}");
version = celeste.version + (lib.optionalString withEverest "+everest.${everest.version}");
multiPkgs =
pkgs:
@@ -175,7 +177,7 @@ buildFHSEnv {
exec $NIX_CELESTE_LAUNCHER"' "$@"' > "${writableDir'}/Celeste"
chmod +x "${writableDir'}/Celeste"
''
+ lib.optionalString (everest != null) ''
+ lib.optionalString withEverest ''
mkdir -p "${writableDir'}"/{LogHistory,Mods,CrashLogs}
touch "${writableDir'}/${everestLogFilename}"
@@ -203,10 +205,6 @@ buildFHSEnv {
);
passthru.celeste-unwrapped = celeste;
passthru.everest = callPackage ./everest { };
passthru.everest-bin = callPackage ./everest-bin { };
passthru.updateScript = ./update.sh;
meta = {
inherit (celeste.meta)
+5 -5
View File
@@ -11,16 +11,16 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "clouddrive2";
version = "0.9.9";
version = "0.9.10";
src = fetchurl {
url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz";
hash =
{
x86_64-linux = "sha256-IM8KcR5fNxLlzIvrrc5SD9ZK/+rtGnMudd8JrbTZ/1U=";
aarch64-linux = "sha256-bi+ihd+EFQ9GFL4l7aHeI/YhCIfFC90x48Y6EKaq2S8=";
x86_64-darwin = "sha256-62eNxxXYT0jjxl/5l+hz54Iq0S+BkoH8/z49e9BbDc0=";
aarch64-darwin = "sha256-5j2qvw6yN2MjHXfz1i1Q+xr1gmgKrzSAhFUFJEqu3ek=";
x86_64-linux = "sha256-moj3gSrnkBcsZ9GrvsJBvwW0tB1Yyg7iRXd9SsXaRYY=";
aarch64-linux = "sha256-v4YJKoTS/KRec3mqZdDTtAuPb6HI1G4c/rQoLan59KE=";
x86_64-darwin = "sha256-93zuCvQE2sQDFwK3nmRELa5EGosAcY4D0E5yqREVXOY=";
aarch64-darwin = "sha256-5FvpzSbql92QrTr24yxcCi1t9uDTfgqamEZq7VWx618=";
}
.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
};
+3 -3
View File
@@ -14,18 +14,18 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "codex";
version = "0.46.0";
version = "0.47.0";
src = fetchFromGitHub {
owner = "openai";
repo = "codex";
tag = "rust-v${finalAttrs.version}";
hash = "sha256-o898VjjPKevr1VRlRhJUNWsrHEGEn7jkdzWBj+DpbCs=";
hash = "sha256-5AyatNXgHuia656OuSDozQzQv80bNHncgLN1X23bfM4=";
};
sourceRoot = "${finalAttrs.src.name}/codex-rs";
cargoHash = "sha256-Qp5zezXjVdOp8OylLgUZRLc0HQlgII6nOZodnOrok6U=";
cargoHash = "sha256-PQ1NxwNBaI48gQ4GGoricA/j7vpsnaLlL6st5P+CTHk=";
nativeBuildInputs = [
installShellFiles
+11 -1
View File
@@ -2,6 +2,7 @@
lib,
python3,
fetchFromGitHub,
fetchpatch,
}:
let
@@ -34,6 +35,15 @@ python.pkgs.buildPythonApplication rec {
hash = "sha256-xYCms+Su7FmaG7KVHZpzfD/wx9Gepz11t8dEK/YDfvI=";
};
patches = [
# https://github.com/CompassSecurity/conkeyscan/pull/3
(fetchpatch {
name = "replace-random-user-agent-with-fake-useragent.patch";
url = "https://github.com/nagapraneethk/conkeyscan/commit/f6cf61cc42fcc07930a06891b6c4a2653bfbf47f.patch";
hash = "sha256-zfHU/KsgzQvn/kNsWZy1hGZaBHw/he1zDTUHHV/BHFc=";
})
];
postPatch = ''
substituteInPlace setup.py \
--replace-fail "{{VERSION_PLACEHOLDER}}" "${version}"
@@ -47,7 +57,7 @@ python.pkgs.buildPythonApplication rec {
clize
loguru
pysocks
random-user-agent
fake-useragent
readchar
requests-ratelimiter
];
+3 -3
View File
@@ -10,16 +10,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "cook-cli";
version = "0.18.1";
version = "0.18.2";
src = fetchFromGitHub {
owner = "cooklang";
repo = "cookcli";
rev = "v${version}";
hash = "sha256-alrmQOt9PY155fIWXmp1m2dfhhkMOd4PkfkBWS2XXRg=";
hash = "sha256-uw1xwE7hIE00OADV9kOXR1/gKSzvleW1/5PwfhH4fvE=";
};
cargoHash = "sha256-tYD49UrLzPPS8G2zy2GKFBK4SGYXQ7UEjFWKcHvUTSY=";
cargoHash = "sha256-Yxln5eKNXONGd4Hy9Ru9t92iqK9zcTSpzu2j75bc3fk=";
# Build without the self-updating feature
buildNoDefaultFeatures = true;
+3 -3
View File
@@ -6,16 +6,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "crates-lsp";
version = "0.4.2";
version = "0.4.3";
src = fetchFromGitHub {
owner = "MathiasPius";
repo = "crates-lsp";
tag = "v${finalAttrs.version}";
hash = "sha256-s42nWQC2tD7vhQNPdTQNRokwXqeBhELidVYTlos+No0=";
hash = "sha256-HzoOsizeV2LOXXc8BKA7u5mwBJbWNaBZvPepAaVeTCQ=";
};
cargoHash = "sha256-XqUWcbaOZXRWzIvL9Kbo6Unl0rmeGxHO4+674uHukAs=";
cargoHash = "sha256-tQBNCTqvVNYqT5ArQE7ji0MeDWxi7Bcd9AxPP3sHvX4=";
passthru.updateScript = nix-update-script { };
+2 -2
View File
@@ -6,14 +6,14 @@
python3Packages.buildPythonApplication rec {
pname = "cyclonedx-python";
version = "7.1.0";
version = "7.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "CycloneDX";
repo = "cyclonedx-python";
tag = "v${version}";
hash = "sha256-RHw+FYj1oYM5Yf8YcU8tOsxG+3qu0ti/AYzcGxYAp/8=";
hash = "sha256-4Mvt8l6kDT7GR4ufIelQd9rTt5ljdpMVWwRGZV5jIc8=";
};
build-system = with python3Packages; [ poetry-core ];
+2 -2
View File
@@ -28,11 +28,11 @@
stdenvNoCC.mkDerivation rec {
pname = "deezer-enhanced";
version = "1.3.0";
version = "1.4.0";
src = fetchurl {
url = "https://github.com/duzda/deezer-enhanced/releases/download/v${version}/deezer-enhanced_${version}_amd64.deb";
hash = "sha256-zHgrLzPByAPww0aSEDETsddX71O/GU80AZH729YjQQ0=";
hash = "sha256-/FEp9J+5YrwPIu6/zPqUYjYRSU1iHdoIRs7WJLQIu+8=";
};
nativeBuildInputs = [
@@ -19,17 +19,17 @@
let
deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec {
version = "2.20.0";
version = "2.22.0";
src = fetchFromGitHub {
owner = "chatmail";
repo = "core";
tag = "v${version}";
hash = "sha256-QPKy88c/GLeazGCjNYHj5kOxwiuvjJ/+pM4SQ4TZ1sw=";
hash = "sha256-DKqqdcG3C7/RF/wz2SqaiPUjZ/7vMFJTR5DIGTXjoTY=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
pname = "chatmail-core";
inherit version src;
hash = "sha256-2Js4VQsXf1ApRq9Vf1xwX/1BXiFUQgykvofb2ykOdcc=";
hash = "sha256-x71vytk9ytIhHlRR0lDhDcIaDNJGDdPwb6fkB1SI+NQ=";
};
};
electron = electron_37;
@@ -37,19 +37,19 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "deltachat-desktop";
version = "2.20.0";
version = "2.22.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-desktop";
tag = "v${finalAttrs.version}";
hash = "sha256-tzRk4IwMm3qDzQtGKezkiRbnNSF7EabMYMHXMrrDW8w=";
hash = "sha256-IEYfdA1rGg452pZVWW/XuIsNffyhAlI9qyGwcnksgAs=";
};
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
fetcherVersion = 1;
hash = "sha256-423I4ZXekDyqIY39hEUo7/hLthb3gjnvQHnVknZQFnI=";
hash = "sha256-fEzp+nrfLakmtUsPef0HG6tZGn5/q+271YwVyBkFKJw=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -7,18 +7,18 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "emmylua_check";
version = "0.15.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "EmmyLuaLs";
repo = "emmylua-analyzer-rust";
tag = finalAttrs.version;
hash = "sha256-UfsSsS+yXpWY1L2Wcgcj+JxS/LNr3BYhHq2JzUdxwqE=";
hash = "sha256-6mcVIOKsC+1cboZ8e23J0m2ed/2ohR0F3LfrM9UlaR4=";
};
buildAndTestSubdir = "crates/emmylua_check";
cargoHash = "sha256-rVTxAOQOngeJaP2SDfgeqOuoc2T8dEvlpe9gKfu5tas=";
cargoHash = "sha256-d6dhrib4mz7KmHo3EbkUXBPpjEGu35GeYNkpIrJrKJI=";
nativeInstallCheckInputs = [
versionCheckHook
+3 -3
View File
@@ -7,18 +7,18 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "emmylua_ls";
version = "0.15.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "EmmyLuaLs";
repo = "emmylua-analyzer-rust";
tag = finalAttrs.version;
hash = "sha256-UfsSsS+yXpWY1L2Wcgcj+JxS/LNr3BYhHq2JzUdxwqE=";
hash = "sha256-6mcVIOKsC+1cboZ8e23J0m2ed/2ohR0F3LfrM9UlaR4=";
};
buildAndTestSubdir = "crates/emmylua_ls";
cargoHash = "sha256-rVTxAOQOngeJaP2SDfgeqOuoc2T8dEvlpe9gKfu5tas=";
cargoHash = "sha256-d6dhrib4mz7KmHo3EbkUXBPpjEGu35GeYNkpIrJrKJI=";
nativeInstallCheckInputs = [
versionCheckHook
+1 -1
View File
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Other cutest Discord client mod";
homepage = "https://github.com/Equicord/Equicord";
license = lib.licenses.gpl3Only;
platforms = lib.platforms.linux;
platforms = lib.platforms.unix;
maintainers = [
lib.maintainers.NotAShelf
];
-1
View File
@@ -83,7 +83,6 @@ buildGo125Module rec {
ldflags = [
"-X github.com/evcc-io/evcc/util.Version=${version}"
"-X github.com/evcc-io/evcc/util.Commit=${src.tag}"
"-s"
"-w"
];
@@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation {
autoPatchelf ${phome}/MiniInstaller-linux
'';
meta = {
description = "Celeste mod loader";
description = "Celeste mod loader (don't install; use celestegame instead)";
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [ ulysseszhan ];
homepage = "https://everestapi.github.io";
@@ -51,8 +51,8 @@
},
{
"pname": "Microsoft.AspNetCore.App.Ref",
"version": "8.0.19",
"hash": "sha256-QySX2bih1UvwmLcn9cy1j+RuvZZwbcFKggL5Y/WcTnw="
"version": "8.0.20",
"hash": "sha256-A6300qL9iP7iuY4wF9QkmOcuvoJFB0H64BAM5oGZF/4="
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
@@ -81,8 +81,8 @@
},
{
"pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
"version": "8.0.19",
"hash": "sha256-u50rdLuoADSDCthx2Fg+AnT192TalHhFrzFCfMgmTn4="
"version": "8.0.20",
"hash": "sha256-rToqTSs66gvIi2I69+0/qjhKAXk5/rRQUh0KetP3ZxE="
},
{
"pname": "Microsoft.Build.Tasks.Git",
@@ -166,8 +166,8 @@
},
{
"pname": "Microsoft.NETCore.App.Host.linux-x64",
"version": "8.0.19",
"hash": "sha256-a9t/bX+WIKOu9q2R52b/hPGwOpkAgpYuP42SW2QXTak="
"version": "8.0.20",
"hash": "sha256-NlwDtSJmxP+9oIqWEMKU12o96g9TzQAEt//votxI2PU="
},
{
"pname": "Microsoft.NETCore.App.Ref",
@@ -196,8 +196,8 @@
},
{
"pname": "Microsoft.NETCore.App.Ref",
"version": "8.0.19",
"hash": "sha256-4ymel0R1c0HrX0plAWubJPzev52y0Fsx1esyQ1R7bXc="
"version": "8.0.20",
"hash": "sha256-1YXXJaiMZOIbLduuWyFGSWt6hOxKa3URNsPDfiMrnDM="
},
{
"pname": "Microsoft.NETCore.App.Runtime.linux-x64",
@@ -226,8 +226,8 @@
},
{
"pname": "Microsoft.NETCore.App.Runtime.linux-x64",
"version": "8.0.19",
"hash": "sha256-Ou51zUFTPESAAzP/z0+sLDAAXC54+oDlESBBT12M2lM="
"version": "8.0.20",
"hash": "sha256-BkV2ZjBpQvLhijWFSwWDpr5m2ffNlCtYJA5TUTro6no="
},
{
"pname": "Microsoft.NETCore.DotNetAppHost",
@@ -6,7 +6,6 @@
dotnetCorePackages,
autoPatchelfHook,
mono,
git,
icu,
}:
@@ -23,14 +22,12 @@ buildDotnetModule {
repo = "Everest";
rev = "e47f67fc8c4b0b60b0a75112c5c90704ed371040";
fetchSubmodules = true;
leaveDotGit = true; # MonoMod.SourceGen.Internal needs .git
hash = "sha256-uxb9LwCDGJIc+JN2EqNqHdLLwULnG7Bd/Az3H1zKf3E=";
# TODO: use leaveDotGit = true and modify external/MonoMod in postFetch to please SourceLink
# Microsoft.SourceLink.Common.targets(53,5): warning : Source control information is not available - the generated source link is empty.
hash = "sha256-scizz5U9DQaeJsh0dg7Lllycd/D3Ezu8QNYPPZFGJhY=";
};
nativeBuildInputs = [
git
autoPatchelfHook
];
nativeBuildInputs = [ autoPatchelfHook ];
buildInputs = [
icu # For autoPatchelf
@@ -39,7 +36,7 @@ buildDotnetModule {
postPatch = ''
# MonoMod.ILHelpers.Patcher complains at build phase: You must install .NET to run this application.
sed -i 's|<Exec Command="&quot;|<Exec Command="DOTNET_ROOT=${dotnetCorePackages.runtime_8_0}/share/dotnet \&quot;|' external/MonoMod/tools/Common.IL.targets
sed -i 's|<Exec Command="&quot;|<Exec Command="DOTNET_ROOT=${dotnetCorePackages.runtime_9_0}/share/dotnet \&quot;|' external/MonoMod/tools/Common.IL.targets
# Moving files after publishing somehow doesn't work. Will do this manually in postInstall.
sed -i 's|<Move.*/>||' Celeste.Mod.mm/Celeste.Mod.mm.csproj
@@ -48,14 +45,6 @@ buildDotnetModule {
'';
dotnet-sdk = dotnetCorePackages.sdk_9_0;
preConfigure = ''
# Microsoft.SourceLink.GitHub complains: Unable to determine repository url, the source code won't be available via source link.
cd external/MonoMod
git -c safe.directory='*' remote add origin https://github.com/MonoMod/MonoMod.git
cd ../..
'';
nugetDeps = ./deps.json;
# Needed for ILAsm projects: https://github.com/NixOS/nixpkgs/issues/370754#issuecomment-2571475814
@@ -93,8 +82,10 @@ buildDotnetModule {
dontPatchShebangs = true;
dontAutoPatchelf = true;
passthru.updateScript = ./update.sh;
meta = {
description = "Celeste mod loader";
description = "Celeste mod loader (don't install; use celestegame instead)";
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [ ulysseszhan ];
homepage = "https://everestapi.github.io";
@@ -18,6 +18,7 @@ commit=$(echo "$latest" | jq -r .commit)
version=$(echo "$latest" | jq -r .version)
url=$(echo "$latest" | jq -r .mainDownload)
update-source-version celestegame.passthru.everest $version --rev=$commit
"$(nix-build --attr celestegame.passthru.everest.fetch-deps --no-out-link)"
update-source-version celestegame.passthru.everest-bin $version "" $url
update-source-version everest $version --rev=$commit
echo > "$(dirname "$(nix-instantiate --eval --strict -A everest.meta.position | sed -re 's/^"(.*):[0-9]+"$/\1/')")/deps.json"
"$(nix-build --attr everest.fetch-deps --no-out-link)"
update-source-version everest-bin $version "" $url
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "files-cli";
version = "2.15.111";
version = "2.15.121";
src = fetchFromGitHub {
repo = "files-cli";
owner = "files-com";
rev = "v${version}";
hash = "sha256-M6SVLloMn/6AmIpfZ0Ib0yUQ33hC9MFjbFTxOlN7kqs=";
hash = "sha256-Lf+kWLmCMbP0FIPxmtroakv1RayqTqMrFhYpVBoHqiA=";
};
vendorHash = "sha256-fxh9YOO0xnYo04HwJyctspipSXgWcDoUu40UwhDf8Uk=";
vendorHash = "sha256-GygNBB7ydaq11vU2wY9i/ZHmmLomMDKr4cJSdpcEoxk=";
ldflags = [
"-s"
+8 -5
View File
@@ -42,11 +42,14 @@ buildGoModule (finalAttrs: {
doCheck = !stdenv.hostPlatform.isDarwin;
checkFlags = [
# https://github.com/dundee/gdu/issues/371
"-skip=TestStoredAnalyzer"
"-skip=TestAnalyzePathWithIgnoring"
];
checkFlags =
let
skippedTests = [
"TestStoredAnalyzer" # https://github.com/dundee/gdu/issues/371
"TestAnalyzePathWithIgnoring"
];
in
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
doInstallCheck = true;
+3 -3
View File
@@ -11,13 +11,13 @@
buildNpmPackage rec {
pname = "ghostfolio";
version = "2.208.0";
version = "2.209.0";
src = fetchFromGitHub {
owner = "ghostfolio";
repo = "ghostfolio";
tag = version;
hash = "sha256-AZc9STEbM9QOa8vD3VzUkPINeP95B031yLxS8rQ1zvw=";
hash = "sha256-2tXapVGZ3p+Fq/CD8XOcUMHRwQUiIZdm+Rl+xQL5HBI=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
'';
};
npmDepsHash = "sha256-ayuPQ7uKN9XZe2svr+CBGS/r4RjCOiCvS342AQSe82s=";
npmDepsHash = "sha256-WtvCSQzzokZ9tGMp7G7M1ZfoPxjQ5OiVNR4Wa4A7vTE=";
nativeBuildInputs = [
prisma
+3 -3
View File
@@ -24,8 +24,8 @@ let
in
stdenv.mkDerivation rec {
srcVersion = "oct25a";
version = "20251001_a";
srcVersion = "oct25c";
version = "20251001_c";
pname = "gildas";
src = fetchurl {
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
"http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
"http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz"
];
hash = "sha256-n1IQajRXIHWkaFpLOtctlm4P+2vrxTWdyQiD3caQd3A=";
hash = "sha256-uMDIsjvq7hiEw2VVosDBjJgUrS6/KUQ/KSOUNlTcJck=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule (finalAttrs: {
pname = "git-spice";
version = "0.18.0";
version = "0.19.0";
src = fetchFromGitHub {
owner = "abhinav";
repo = "git-spice";
tag = "v${finalAttrs.version}";
hash = "sha256-9Gt4dS1Wu3w/iS0vtYO3XHyknKQEveob9slwNA/HAks=";
hash = "sha256-LFzu7EeH6veambFHou7leJgrJU4L/iYyl5H6IaM3afs=";
};
vendorHash = "sha256-VCUNaWi14Pc39ncWzZZsdsZSd+IxYFhbm1cfTZ40dMw=";
vendorHash = "sha256-hr4t3VseLxV3xFWFtpTTiG+2XK7kFxxYrfzCwCU/zx8=";
subPackages = [ "." ];
+5 -5
View File
@@ -5,7 +5,7 @@
git,
pkg-config,
openssl,
erlang_27,
erlang,
nodejs,
bun,
deno,
@@ -15,20 +15,20 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "gleam";
version = "1.12.0";
version = "1.13.0";
src = fetchFromGitHub {
owner = "gleam-lang";
repo = "gleam";
tag = "v${finalAttrs.version}";
hash = "sha256-Qjl+I09tnBbGc771SVJVb6fzAZ2tVOnBNhGfrIUh824=";
hash = "sha256-06ap5z1vtv2Rsd98LcLRpvxff1NfkuHNdI844DZuEhQ=";
};
cargoHash = "sha256-Ya0glVECB3cb9kgguuH4nY0ClK5NPH1mKAX9INDLzx4=";
cargoHash = "sha256-TzHjXW9sSbOJv7PrUaQzZ0jOPocVci1DjcmLzv7aaBY=";
nativeBuildInputs = [
pkg-config
erlang_27
erlang
];
buildInputs = [ openssl ];
+5 -3
View File
@@ -6,17 +6,18 @@
git,
installShellFiles,
openssl,
net-tools,
}:
buildGoModule (finalAttrs: {
pname = "grype";
version = "0.101.0";
version = "0.101.1";
src = fetchFromGitHub {
owner = "anchore";
repo = "grype";
tag = "v${finalAttrs.version}";
hash = "sha256-20nl2mfU5PeEtUwyOUrKZ58nHyVvxZol4M37IPabx3A=";
hash = "sha256-EbRkK8qTEP1UICqHs4V4xteh/bUh3WxlRihPtUcJw6M=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -31,13 +32,14 @@ buildGoModule (finalAttrs: {
proxyVendor = true;
vendorHash = "sha256-VbJKdd04S1aXXnflEZTtpIh4eJFe17WXZXqWDDo9YiI=";
vendorHash = "sha256-Zqtd10KrmAH5yOvKnCl8w8neLsQPylr4lFAU5OTm7Kk=";
nativeBuildInputs = [ installShellFiles ];
nativeCheckInputs = [
git
openssl
net-tools
];
subPackages = [ "cmd/grype" ];
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "hath-rust";
version = "1.12.1";
version = "1.13.0";
src = fetchFromGitHub {
owner = "james58899";
repo = "hath-rust";
tag = "v${finalAttrs.version}";
hash = "sha256-4dbloi88oR84JnD1nepLTJNSgxgB337F3nxr7i4nZV8=";
hash = "sha256-81nt+epuZGWxmIEdTAsQJUxLOZjfMFl9SJNJILo9o+8=";
};
cargoHash = "sha256-P975lZ6LgL+dT52td8uA8QVnuJd6QKWkpBCfoLpLW9E=";
cargoHash = "sha256-7529DN55X6XbAxqXhTYSBL0c+/2fOKc4oyFnvMmEDeU=";
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgramArg = "--version";
+3 -3
View File
@@ -19,14 +19,14 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "home-manager";
version = "0-unstable-2025-10-12";
version = "0-unstable-2025-10-18";
src = fetchFromGitHub {
name = "home-manager-source";
owner = "nix-community";
repo = "home-manager";
rev = "e121f3773fa596ecaba5b22e518936a632d72a90";
hash = "sha256-U9SkK45314urw9P7MmjhEgiQwwD/BTj+T3HTuz1JU1Q=";
rev = "870883ba11ba1c84f756c0c1f9fa74cdb2a16c1e";
hash = "sha256-OxGcFcQdfOK8veZkPdQuqXIotFYiy4sBQB58dMNLeHY=";
};
nativeBuildInputs = [
+3 -2
View File
@@ -16,14 +16,14 @@
python3Packages.buildPythonApplication rec {
pname = "hydrus";
version = "631";
version = "643";
format = "other";
src = fetchFromGitHub {
owner = "hydrusnetwork";
repo = "hydrus";
tag = "v${version}";
hash = "sha256-YZnlQIiq0dUGEnQgVCTvNS+kuSpXlaAN5UvZAQ3xeZM=";
hash = "sha256-8pxokenzKYXdvyNnNBQTphBi8FBAv85rnHSnEQrseLY=";
};
nativeBuildInputs = [
@@ -165,6 +165,7 @@ python3Packages.buildPythonApplication rec {
maintainers = with lib.maintainers; [
dandellion
evanjs
KunyaKud
];
};
}
+1 -1
View File
@@ -17,7 +17,7 @@ let
in
stdenv.mkDerivation rec {
pname = "${name}-bin";
version = "33.3.1";
version = "33.3.3";
src = fetchurl {
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip";
+90 -90
View File
@@ -1,93 +1,93 @@
# This file was autogenerated. DO NOT EDIT!
{
Iosevka = "0p8f9z9ribn9zvbr0klg9q37w7z4v6r6gwz9kqc3cml6q0x4lv2n";
IosevkaAile = "1f18pnbp8vnsjzax43gijc95z1nx54l0vc2lqiqm9xvddhpam7ww";
IosevkaCurly = "01gzyqlg6n0fzi5kvwrz1slcr8pkdlg6yd61i059kzmw9sw8g7m5";
IosevkaCurlySlab = "0vxc3mb7ncvm4x7flrvlfkw1lw2pcv50344ias97j96gzaafr0mr";
IosevkaEtoile = "1qalf37fm3lxbg3y8ias92vyz19rhf20rjyn7zq9prmrx412sglv";
IosevkaSlab = "1kggrmkga333jknycbr27bziwaa6maw83wrkh60w7a78mp32a2fc";
IosevkaSS01 = "0yaly4pkilrrd7knqvv43976rnjvp2s2wd4c8zczc4fhmjw2b7j6";
IosevkaSS02 = "0h1hdynqfqmw6v49qnvspqw6y2ihqysrkcivjc9fvx4w876clr86";
IosevkaSS03 = "1mvn6ix5944kxmr1byx200ydzm9ny9qafv14nmssfqx7rhn71r29";
IosevkaSS04 = "0x0sfbd4g6rb5vndddxvqvjjhr43dnbywybb8n67sh40x22jcf5b";
IosevkaSS05 = "0fsscv5z9dn7934547cgq5082v25n94kcx8zdk5n99n7mnbc7gfy";
IosevkaSS06 = "1yyhvnxqbdmry6knd8jakz0jqhnphfip2a4rgb5l07vq1nrcb566";
IosevkaSS07 = "1w50ma10fzw4gy6im009i20dgvxlj3m4iasmj074k5mxfmazjcyv";
IosevkaSS08 = "1mh7h8dlk02rijlxbml5zpha2hvkhvir7j8hk6fd0pihzj3ybn0i";
IosevkaSS09 = "08mxsa67gpdzygj9vr0m6a6pz397ffbg77rfik5c46gqknd2y7mf";
IosevkaSS10 = "1k6xks2q7szmz3zsy9dd6bn7j6g60hf1whvp3c6j65m5rhi87z6v";
IosevkaSS11 = "1r8fk9m32kakclxxxingy6k1dwgvfizr0c68miqp2g6189mkz1lw";
IosevkaSS12 = "0amgwwq0yik9xhh7d12fmn7inimqzpmsmcjwnw1dsghrvf0mwdsa";
IosevkaSS13 = "1agaihxccj0k5wg7bd1lm5ix0mwdhj387i2wypc76q6az116a4ln";
IosevkaSS14 = "106fw5d3kqc389cnvcv00zfcfbzvavfym8mjhqrn0h23fpfy5na2";
IosevkaSS15 = "15rjgg8bi2ichisg5ri9hqr5rikfcvwdx2smw93vazn3shzzkn45";
IosevkaSS16 = "0ipdh5avia6gj1pb78ihhfydg9dn334kv0pir9h136f0bwxibjp0";
IosevkaSS17 = "08grkzyd4ssjzkkyljzc2mlnhrchxbw7y9425sgz8cq026f5cvd5";
IosevkaSS18 = "1052s4ijqhvb4h81nvx6m9sdlk3d51n7zqr0cr78ydl13g1qvdh9";
SGr-Iosevka = "0p7nd7x4zq4bfhdrvjhn0j5y6w217w8nlai9nc0flrwjh4qf14ih";
SGr-IosevkaCurly = "1qjv7zrr7113v2qq0fnkrxcslv2wy0x5nv8mjal5b710q9gppxfr";
SGr-IosevkaCurlySlab = "0bavl9z4j9n7hxch8acw89j8f070vwir1f15af1xb76q09ihi5r2";
SGr-IosevkaFixed = "0kgyn4da6a58fa6k9aqm1ndzlzjpbwip13pyb60jasrqf7wqm66z";
SGr-IosevkaFixedCurly = "1mzszgwp3xbkjvhqlsmwrr6mhv3czmsiz4vgxr615sfhyl24cjb7";
SGr-IosevkaFixedCurlySlab = "1dzww7084clp8ivsd74r638rh41zw6b5la0fif4xz01kvsz67wc6";
SGr-IosevkaFixedSlab = "11cc5gm7a69693b9j0lckbvwn0pnfhklrdvqa719m43d39wqhgas";
SGr-IosevkaFixedSS01 = "0bh62hlxc05wd33mf0ql3f8dxc6xriv4jzr8qcz6a64qiy12j6c0";
SGr-IosevkaFixedSS02 = "1z3yy7zv1iml3d2dj418aias4wgh4sk07gk6fsk068mxg2mlcpys";
SGr-IosevkaFixedSS03 = "1fdp7897m039r6qj40jq17gn602cfx5l9jkgfh29ghk7l6kh0za5";
SGr-IosevkaFixedSS04 = "0gamh519mrw4qvzs28r4gpsyfqwibbvwckfcsmm4i7g9idnwmmwn";
SGr-IosevkaFixedSS05 = "09bp6nxcc54s2g0s4icd1zlcjar87hqdyp2chys5agk69l1j9p2a";
SGr-IosevkaFixedSS06 = "160di7qxp8blyzjnakdqvkxy2dpiy7fxc5518hnk0jswg2d90ydp";
SGr-IosevkaFixedSS07 = "004hk72g086xhkb0rrpmk5kxf032j24is2r2lbp9hizrmw9x3dl0";
SGr-IosevkaFixedSS08 = "0i7k3bissz76idgwf5cpbk3s0ynhlgza07v3lwyvyxhgvyj9hp56";
SGr-IosevkaFixedSS09 = "1lih2kq9gnigchidibpdd2ym12hjpjlb42fbfzdc1s9fs7700d8i";
SGr-IosevkaFixedSS10 = "04paymx35g3dii4cgnsljdxi8778vn60jkqjx28bx5lvd9hkzc9k";
SGr-IosevkaFixedSS11 = "023mkvqvajpm59q5807snwyc9mqqvsmrzxa33mrgr0v2qs6zxsnm";
SGr-IosevkaFixedSS12 = "01d55hi9y5y1szd39ij7hiswkyzazb9k97wsh09sdx0442d1aydc";
SGr-IosevkaFixedSS13 = "1dxyj0pqxs4795ksmaw56dndj8s6s9isv6kmj8520cl6wmrgm5k7";
SGr-IosevkaFixedSS14 = "0hl6lmndcf13jm16n0hxn3w0qf4abddrmhq7im9l2zsplm241dz0";
SGr-IosevkaFixedSS15 = "1sz33rnxx288hasd0g3y2cid6v8vck8yrwallhpbs81sraj50nn9";
SGr-IosevkaFixedSS16 = "0fx6fwzmcx48ndfly0a7kks2ml6v0hfkvqm5qijwaxysz5cbzk4z";
SGr-IosevkaFixedSS17 = "03vyl438fx8zqdslhxsy2q86rkgl0dccvvy2hk7jniaswnxj5p69";
SGr-IosevkaFixedSS18 = "02z2m7qn9qkrkk9c9nk14d56j4kl8advpkgajmxn5nzlp35a4pc8";
SGr-IosevkaSlab = "1m06ylahl5ql2918cn44nr541lfaipyry4ihm059xx0skmm2qk6p";
SGr-IosevkaSS01 = "1z3ba34q3m8p6yp1qvsrh1hqvk263gg2dd0vz39nz6slm2h6qb9r";
SGr-IosevkaSS02 = "1wxflbh1b03q4dqqf0snr7w39vmnm26bpnpmx99ms7lj5p3390c1";
SGr-IosevkaSS03 = "128lj2kbc0kskq8ylr8713bh49rd3ms63vpgbgp82dnhfza5ql76";
SGr-IosevkaSS04 = "1gr8y0p1sqg87v2g6wk6ysbj88m3jmqbx2bczl1piwbl32mccci0";
SGr-IosevkaSS05 = "1g36pzz30jd1zihrwvkpm77cql34xk2bv4xangf19imnibp753dl";
SGr-IosevkaSS06 = "1aacbijz06rgphbxlv68ds3i8qkw32y9sa4a4fg2fni0naq0c05w";
SGr-IosevkaSS07 = "0kyg9cp95rw7c4wlpssf0y71c9nbg9nm5y3bzjh48mn5hgpzp762";
SGr-IosevkaSS08 = "0k6siq14r5gka50x99cily3v39slj9by2cxlsjd8nnvax3ar59ys";
SGr-IosevkaSS09 = "1gsxbi28jw21915aqn6qfydxh8f0xkxgnh6fmwk8qxb73bqwh9nf";
SGr-IosevkaSS10 = "0jm5mr0mf30qkfwqff7lgzfa25scafgfkg7w697qb6qz3bvka09n";
SGr-IosevkaSS11 = "0n7xmxgg4sg7japz8ajxdprqwx6shrh0y2vmp205aqw5lm6lc4g3";
SGr-IosevkaSS12 = "0mwcxg2ls8d8463ykc4byvk938ygaca0wc65gllr5jkccwfk5lxs";
SGr-IosevkaSS13 = "12gjkrvy1850dxmbhibgp49rdxj7bb8b8vliydxk4a0k48zn6bqc";
SGr-IosevkaSS14 = "090i5rhhqcc65k6b9sgbj2w5vs9jrd6qnmm99lp18akpsspm2w3r";
SGr-IosevkaSS15 = "1c96pckim333bmfqpj0v9jcklsi8az81m6jhzvy3b153p2di29r9";
SGr-IosevkaSS16 = "0xvv55zmjyly00ykaycndac3lyn2w7y2gvr908kql17lpnw3x0ya";
SGr-IosevkaSS17 = "1kilxf5f51fzxwpy4xjrb5jcrmdb70h3z04j9f1cpaccc8h654wk";
SGr-IosevkaSS18 = "0vyqa0b935js0i0fhaj071yjlgkxkdr2pybn8z2g4pv3ixyk6msh";
SGr-IosevkaTerm = "0pxa3zcnhfl1gpynx5mn3h21r6cr45lmax09vk8x6z23adxcgkrd";
SGr-IosevkaTermCurly = "1nv1xqsf9zf2j9xrrqlcjzy764mnfhmjp4xwsq391fl8vy7pwdbl";
SGr-IosevkaTermCurlySlab = "0nblg2ql79wi7vnn3akz7pm26mwjvqg3wgh6kwqbr1rvs4n7krwp";
SGr-IosevkaTermSlab = "12cav088hsml2x81ihpbnr0pcwargkh1kn7ijacqv3mgirdhfp52";
SGr-IosevkaTermSS01 = "056bs4r7ry7k2h7iwrldfkrani79bxkb2y38ibn15hdvmbw5k7xg";
SGr-IosevkaTermSS02 = "1f2ywnqz97i6pjg4na5344k4p4d0mvc9s30ylc6a2nwq64wl48wf";
SGr-IosevkaTermSS03 = "08l939ar4z1yw1pwsdfjkfymi476ms7738yvkgz7ycf5nifpp1w1";
SGr-IosevkaTermSS04 = "0jgkbdv9kjg7028f3lk4h4ph6i5icv80dmhkxi7r430khfdgq0h9";
SGr-IosevkaTermSS05 = "0n6zf2s8can1sknc5gnr2fhs86dnswrhjx6fk2n06grkf97srmzx";
SGr-IosevkaTermSS06 = "0krq3kp3ydxv2y5yi15gy517w8kwarxw3lkw0vwjlf5qplpl4s7b";
SGr-IosevkaTermSS07 = "1pm5ckgyr18mj13ih548n1awipbsaiqcvzgjgyg8jhydpvv25f1d";
SGr-IosevkaTermSS08 = "1qq19fz9ybk6wwj80vb2pcpaklr0nk3a9brc5iqzli4v42bvqqar";
SGr-IosevkaTermSS09 = "13ki9125qz5fszcg4mdmkcgz2w9p6w06n6d6aa96m4cvxf9b38g7";
SGr-IosevkaTermSS10 = "161cxv8my2g0yg5amawy0mp8hsdf3zwcvf4pb2w9wdm19k7pdgsy";
SGr-IosevkaTermSS11 = "0c2rrcnbp4wh2xwqzrvj2fxzz7ph2hz0j89p72a46lp939wjqllm";
SGr-IosevkaTermSS12 = "1wyih90ilpvms0w6s1hyqwvclhli1gwxbhc61qgnvkz4lf57j1aw";
SGr-IosevkaTermSS13 = "1jk7z6cbfkm4ljslvxysq1w95xv9573lgcb1lznzkd41p3vss9hy";
SGr-IosevkaTermSS14 = "1nv18klmp3npl70q5ffc1p59hqa2d60w677jqjvjl51q8cksms8y";
SGr-IosevkaTermSS15 = "1gjydq5zvcbjp55kgc19shjy5v8427m7kdv5wxf808kdm0cyl9cf";
SGr-IosevkaTermSS16 = "1v4cyci25bdpid1cag84yif38mkqz1d6bssdvw62y9p9xb4x1g4b";
SGr-IosevkaTermSS17 = "0nr9hrjgy3dhlacbdr8j5gxh6qbiy9l1m1c25dl9dqym7h9i2a2z";
SGr-IosevkaTermSS18 = "1k66xsw3c5izc334v24wf8xvpbxh3dikawghrgfqbkdd7ilp6y7a";
Iosevka = "1ml8abhvb6jishi3a2q3ysd5zj0153697wypzjkj5hzxwmx6r7nv";
IosevkaAile = "13m46frkmczcn94dx27gamf4jwnqlngqrk5bxmfxzn56pzyavpyh";
IosevkaCurly = "0i97zbfidqvzgxi6pr7qc50y5g740d4hgbg2fyjdiiyacp1a4bpq";
IosevkaCurlySlab = "1rp3z7083adc9l5cxwygc4ln58z6iy79hxbbf1lqmfi9p6vjgq97";
IosevkaEtoile = "1cc3kwq4skd5gg420l1599hzaxhs3fh33jwsrh4fclrqbhhsgdb9";
IosevkaSlab = "1q0bgz7a3jn59sjdaql13ij9sa3qbxcjnhnfvc9fb3v6vaxlhqmi";
IosevkaSS01 = "0fsbiisllg673359xfxn1izhcnhkdsfp2h6n7y58la692i967vjm";
IosevkaSS02 = "1wc1hcsmf6yl99rjk3ncmn7dbnylids68l21i21dfj4k13x6mvyi";
IosevkaSS03 = "125m32asdvdfks08dangmv86phkf0if4in6050klf45a7q9818ad";
IosevkaSS04 = "0m10d5l88dnsaxcb959g6g17kzrxh91hk083ip5mxq1wjrx1bcfq";
IosevkaSS05 = "0q34293px1gj9jgh810mhgidcf7lj2vdvdn48ljq9hg4ni7yvzn8";
IosevkaSS06 = "067pz09b9iminj2960qdqipaxgaawxnbxzndi1gw33kpl5lgrjak";
IosevkaSS07 = "1f078l8vxcyb6lbf1ywf3s4s0bdrni4my6n70m77vi7vgawvfwz0";
IosevkaSS08 = "0mk0il1c4h06xvgxgaqh2z79m7k286smjs4swl09skqjab3nmssx";
IosevkaSS09 = "1pcwbi6ajy4i0likmdfgs9c4nwa852fsz9cmcjw12dmf0zirv7cn";
IosevkaSS10 = "1lv58ypcz1d4azz9m9xnbw2n6l5fs67kyx5zrh5mqd51qcigr1bx";
IosevkaSS11 = "1w37535g96js8iy5r3s6xaz0mjjivv06rdazaxdx0j4frh743lng";
IosevkaSS12 = "1p9lwdbngpsm4a7viz04137ckbpimknznibln39sscykc6j93lqx";
IosevkaSS13 = "0p1ffg507xcclwp117ikjzbkixlh95a21l7mmpd9cnckdvj1xz45";
IosevkaSS14 = "1dcikdxbbr82amzhwn310qkzx95h4dprxw5rwlgn8wcvx9pk96sc";
IosevkaSS15 = "0lsgkc1qz4f1rqhasvadjl90qwyf2hxz2d0svwmig7q91jaii4nz";
IosevkaSS16 = "1a6k40i1p1l94fwr4mi2m82rspjc9l93vxilgla1kpqm40bsspng";
IosevkaSS17 = "0v9zvi8d0ll0kdryjjglf6m1a53hjnsj73bcdaxyprni5f88qpvy";
IosevkaSS18 = "0g8b6drc98l08zdp4by7c4zr6c5rkaxsplbm1csyhcrpaxc43r71";
SGr-Iosevka = "0g5lklzmyhpych8hkx4ssa3iir7dscc8q1jbzpfsla36r5sf91jl";
SGr-IosevkaCurly = "1h3vgshs6l92l8r87kji7ln6ncq36iwrf439vzzramb34izy8ixr";
SGr-IosevkaCurlySlab = "0rsl1f9bc1hhy3wzbq5ls6vkc0y0qaw5yb67i7rda5xv50m8bqxi";
SGr-IosevkaFixed = "0s6d7kprgrkmdwklzhv0hz85y9w5lgrwc5mams21akmnchjqrgzf";
SGr-IosevkaFixedCurly = "0q5n1axnpl5p51lg4zrarsjn5aglb5s0axn9qp7ddh5gxv2n0knq";
SGr-IosevkaFixedCurlySlab = "04pn89y4jpgdllk0xziigjf2p8836a6zmwvzkix2kqsmbvpjj4kn";
SGr-IosevkaFixedSlab = "1zm06h0z43j31qzd6ndgamr3r5b9av5qcp39sr16fxr8hhnjrqhn";
SGr-IosevkaFixedSS01 = "0jkv4f529y934il9qzdaav8acqqgnrgf4anf6zcgx52zrzgrkg0x";
SGr-IosevkaFixedSS02 = "1zkibhlsfyhxbi84dwc6w90n2p8w6zwkszk1z5a3db6lyz824z88";
SGr-IosevkaFixedSS03 = "15r5q0bg2109z52nwygr85vx3svg6q3j26q0y0syxnrxq4iksdg7";
SGr-IosevkaFixedSS04 = "0bhgd1mmsdlcwp3nz7wf992g75zwkp625xc7fbqwsrpd81111566";
SGr-IosevkaFixedSS05 = "1nmhs4ya6bm2j4bq5jz3m5r7gbwd4i16m3zsblvif1lb6flb89dj";
SGr-IosevkaFixedSS06 = "0a1wxqlm8fchbg68vzwac7p8nvx8hiy565qcqjjs73m33bpp00zj";
SGr-IosevkaFixedSS07 = "0s1jh060hkbb7idqzgvc3f6czfhdkiw8ylmyjfa3vh851lpnxym2";
SGr-IosevkaFixedSS08 = "0ncdhg8cha9imy6bb72p39bvadzmdrncr2p0di80yfiimdbcfbp4";
SGr-IosevkaFixedSS09 = "1wl0bf1phhjzw988r7v3fprb4ljwikpkn7yvs8hskmgi3fkvji9q";
SGr-IosevkaFixedSS10 = "08cr4zkfjrnj3105kj70dswaf8zjdhzbjwyav0x054s32j4yrs54";
SGr-IosevkaFixedSS11 = "0vgx6zycbqcnrar537ym7ra949q0f8zvrmb1d823rfavy0zkpv9q";
SGr-IosevkaFixedSS12 = "0jw73v1bci7w2z5354cfwqgxd3r56fa03i7mr19y6y8pi9i5l9yn";
SGr-IosevkaFixedSS13 = "1dy29fhjncsxgsqfyz091qssps4a6xbr27157bawvjn4nlm12cab";
SGr-IosevkaFixedSS14 = "047ql1fqsv98mp7ihg1r71y90qjk0sgkygjs79b20smzvzapcs7g";
SGr-IosevkaFixedSS15 = "14njl7x94yicb7nzjsv0j8h8f4ikawn01899pccr617mf3xxyap4";
SGr-IosevkaFixedSS16 = "14p00n6gw7fwqxdwrz2lxrjkicw1mk1qk8z5mazr45s5pq9sz7wf";
SGr-IosevkaFixedSS17 = "0gca50g55csx86wksa1ch1ay2chzj4p11dmhsf4pf4jyq3ziihw8";
SGr-IosevkaFixedSS18 = "18q8sjnz9dfv7whjjm4a6cqm8ffwz46bkwna8giqsplhyca1c9sd";
SGr-IosevkaSlab = "176pr90h53hf1cbgwaqbdd11pd5d3p14d5lll057dlmws63lhk71";
SGr-IosevkaSS01 = "05fwnmziyas7l53sywi6g39pdi6jpnalw35gjl3dvyp93jk5f9sn";
SGr-IosevkaSS02 = "00cyqsng2izf1cjkmz1pf2h1h17ph69f0nz38n9jlynsffp2rkv8";
SGr-IosevkaSS03 = "0xg4kss5kvl7ihzvdq9gcv869x8nr8ds8hw5lrvqx2010pfvzksc";
SGr-IosevkaSS04 = "0mpzyj404081in6ymgajcyy2ips6d12k9ng00cw92v7shjpz6cqh";
SGr-IosevkaSS05 = "1kzw92nb7wxrjfhp0cf29xny86ga6libsfy2pzdc7hs499f0fsss";
SGr-IosevkaSS06 = "12qw1grnwq8lgdgz25vx0pcdyd5zgwln99w8cafrl6y3ckrasnrx";
SGr-IosevkaSS07 = "0fjdnf0lr0kfbfddc1ar4wj2if9xsyqlp4cl2gmczy5b3zkmmhrn";
SGr-IosevkaSS08 = "1v7crn5i2v12dh8b34hbm418zxyc8xhh3bnbfgif3v36885rxd8g";
SGr-IosevkaSS09 = "0jipz18pgncwfb75c1bb6bh5ar33q8kk579l6zyvqm39w2ik98f6";
SGr-IosevkaSS10 = "0c1w2kgy4gk3a3979x47d5hjg19bbam3s4hzd0wyal1wn9m98xl6";
SGr-IosevkaSS11 = "1sqagzb28xbkpn30s24ydf2da8n2dvsqzfvkbc3p1469jihzfviq";
SGr-IosevkaSS12 = "1n1d85drb3m0f8cnrcqxh1la7y75z3a2k9af8q6z48843ddx4qmg";
SGr-IosevkaSS13 = "1ynr47avzywrpf5zdjwmpybs6kf71pmjbrvlssx60z6b4hc0w42i";
SGr-IosevkaSS14 = "0r87wlvrd7xgcsibymmdkwd0pqbf5wn2c7mcssqwi3zwxpi12s83";
SGr-IosevkaSS15 = "03av6w7x4w00hxyhmz1qp00aj5b47qkma666y3c7ylsfql2b5ybh";
SGr-IosevkaSS16 = "01m5sz7lid4v68v8vagyj6zd61hs969lc4igf48a4jz0ip9367sl";
SGr-IosevkaSS17 = "0rl4g8iv8hz25ns52zb2n2ymcf2l26dhza1glp79l9swk3xgvpx2";
SGr-IosevkaSS18 = "0zyjl2x8i8d5m4ymm6sa5nm3916nwykh718k02aii2gl2p33faqs";
SGr-IosevkaTerm = "0rkvwizyr3bhkm518kq57n7n3rygvbgjahi9r5nm6jhyvjjf85d6";
SGr-IosevkaTermCurly = "041xhkw4b379zkwbcbmsg7d0w434dy48ppmgpy5gxaa4fzxvfihl";
SGr-IosevkaTermCurlySlab = "0kc62bllcrzmlj2ynzk3n1z3znhlsbsy0pwnfjx80zbirnj19dwh";
SGr-IosevkaTermSlab = "00l8hzhsrqrsp8izh4mzg2gvzzpd54psn15v3fgc1bs1c84wgxw5";
SGr-IosevkaTermSS01 = "0mifbc9vm8yassfp5r5bv8a7jxq14dpnbby09dbfdg3273yx1dv9";
SGr-IosevkaTermSS02 = "0ami4zdg0cpgszp8c5xary6crfhx3vx3bdcbvnsmzr5zbaf189fi";
SGr-IosevkaTermSS03 = "1yfd99sb3y469qzszrgfdd3m6m6rg49kv5l2swf4yijr1zmb5wfa";
SGr-IosevkaTermSS04 = "14ccwjilzrrzikhaj5rnarvw9y78m4d8w7817akg4wg2gh5jsxvr";
SGr-IosevkaTermSS05 = "1byaypapwq1zai701sq8qyxp9sb4b62jjin9vgzqcchdy32gnr38";
SGr-IosevkaTermSS06 = "0qcwpw10qn34awv0w43xg3l81w3cn949hcsci8802layrwq7lfas";
SGr-IosevkaTermSS07 = "0nyrg2fqc6828mq72lhkjn8hdv5s5r5931y38wdriy81yl5lqm9j";
SGr-IosevkaTermSS08 = "02mjjz04pqyvaiwm5wsr7h3r2la3wfsi8nnq1njgbaglp25hx6f1";
SGr-IosevkaTermSS09 = "07w12z244iaic5cpqkxl20ya03pnirjh9n5yy30r6wx79d1p7q57";
SGr-IosevkaTermSS10 = "19w59qs3p5ww7bg5a0k9f6065311ngj583mx9xb8aawc2v9hrhjr";
SGr-IosevkaTermSS11 = "10l4sk924w94pah96xipwhqi6x43j62k75ng4lsy0rw3lbs9lyvk";
SGr-IosevkaTermSS12 = "018m8wwxip1l5argplcim513zvwrihdl7xbz5i8hsmjjvia225v6";
SGr-IosevkaTermSS13 = "1b7nca31yj0vc2j4h804wlllpzjjphnh1bfgv6zcgvd4qmpk4qna";
SGr-IosevkaTermSS14 = "1pqrsvnnqb86300hkil4x093r9ybrkpdxvhcp56ph4pshijypb08";
SGr-IosevkaTermSS15 = "0inrfcrajmlqxzm87l4l4myrz4bw4wz7y79ibwcjqa0f395jlms3";
SGr-IosevkaTermSS16 = "13w9j3sp1lg9wrsj9n5bf3cm38rkkjifk5kqbrkpg9p98k4lfsx5";
SGr-IosevkaTermSS17 = "0gcf73bs21phvrjg083l61s37glqvwzckm03gndbqyw7a64k9fdc";
SGr-IosevkaTermSS18 = "1aa8hy10wa4zgyrzsnmx4rkbrjjqv56nd4prijdn50qbc5qfw18a";
}
+2 -2
View File
@@ -6,14 +6,14 @@
python3Packages.buildPythonApplication rec {
pname = "jj-pre-push";
version = "0.2.2";
version = "0.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "acarapetis";
repo = "jj-pre-push";
tag = "v${version}";
hash = "sha256-SdGnhHk8MelX6hqKQmZnQYXBJ5VpjPBe+PWUxaGsxC4=";
hash = "sha256-nWkMXXlzJeXz0kHBuN4g8YWW6JmwrfE/y9oFfEOqeQk=";
};
build-system = [
-4
View File
@@ -134,9 +134,5 @@ stdenv.mkDerivation (finalAttrs: {
];
platforms = lib.platforms.unix;
mainProgram = "jq";
identifiers.purlParts = {
type = "github";
spec = "jqlang/jq@jq-${finalAttrs.version}";
};
};
})
+2 -2
View File
@@ -24,11 +24,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "keycloak";
version = "26.4.0";
version = "26.4.1";
src = fetchzip {
url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip";
hash = "sha256-mWgTkvop5oRA3DzxxI3Q8kgftLZZteGeJ3Zxgh5SIww=";
hash = "sha256-TUTTBsxRuk907OLFxFyABuOGMaO7EjqnzD0eEQVfl98=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "kics";
version = "2.1.13";
version = "2.1.14";
src = fetchFromGitHub {
owner = "Checkmarx";
repo = "kics";
tag = "v${version}";
hash = "sha256-7ulu5PVCD6VoIj7RVpBGzsb9uWctOkVfYVb8qB5YMB0=";
hash = "sha256-VcVF0vqlMNpVR/KmeZV75j16NxWg5iuhEy54NeNK4pY=";
};
vendorHash = "sha256-kKK3kSWjork6KZdPzKySsiHR0bOLKlzltP/u6ZQioqM=";
vendorHash = "sha256-tcJ1df9hetzDSxoTP3lvY8ixh6VWsliGJqzXHshmc9A=";
subPackages = [ "cmd/console" ];
@@ -0,0 +1,31 @@
commit 4277cc75bc147d0af6ffddc7db96f48492977968
Author: bakersdozen123 <taunts_bakers_3r@icloud.com>
Date: Sat Oct 11 09:56:48 2025 -0700
ssh: fix custom ssh heap buffer overflow
The `ssh_custom_free()` function calls `strlen()` on the `publickey`
field, which stores binary data, not a null-terminated string. This
causes a heap buffer overflow when the public key data is not
null-terminated or contains embedded null bytes.
The `publickey` field stores binary data, as required by the underlying
`libssh2_userauth_publickey()` function, which accepts a public key
parameter of the type `const unsigned char*`.
Use the stored `publickey_len` instead of `strlen()` to determine the
correct buffer size.
diff --git a/src/libgit2/transports/credential.c b/src/libgit2/transports/credential.c
index b47bd63a1..7d0eacecf 100644
--- a/src/libgit2/transports/credential.c
+++ b/src/libgit2/transports/credential.c
@@ -161,7 +161,7 @@ static void ssh_custom_free(struct git_credential *cred)
if (c->publickey) {
/* Zero the memory which previously held the publickey */
- size_t key_len = strlen(c->publickey);
+ size_t key_len = c->publickey_len;
git__memzero(c->publickey, key_len);
git__free(c->publickey);
}
+5
View File
@@ -39,6 +39,11 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-/xI3v7LNhpgfjv/m+sZwYDhhYvS6kQYxiiiG3+EF8Mw=";
};
patches = [
# https://github.com/libgit2/libgit2/pull/7146
./fix-ssh-custom-heap-buffer-overflow.patch
];
cmakeFlags = [
"-DREGEX_BACKEND=pcre2"
"-DUSE_HTTP_PARSER=llhttp"
@@ -0,0 +1,11 @@
--- a/meson.build
+++ b/meson.build
@@ -163,7 +163,7 @@
objc_args: ['-Dlibui_EXPORTS'],
link_args: libui_libui_link_args,
soversion: libui_soversion,
- darwin_versions: []) # TODO
+ darwin_versions: '0.0.0') # TODO
install_headers('ui.h')
# TODO when the API is stable enough to be versioned, create a pkg-config file (https://mesonbuild.com/Pkgconfig-module.html) and a declare_dependency() section too
-11
View File
@@ -1,11 +0,0 @@
prefix=@out@
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${exec_prefix}/include
Name: libui
Description: Simple and portable (but not inflexible) GUI library
Version: @version@
Libs: -L${libdir} -lui
Cflags: -I${includedir}
+22 -43
View File
@@ -2,69 +2,48 @@
lib,
stdenv,
fetchFromGitHub,
cmake,
meson,
ninja,
pkg-config,
gtk3,
}:
let
backend = if stdenv.hostPlatform.isDarwin then "darwin" else "unix";
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "libui";
version = "4.1a";
version = "4.1a-unstable-2021-01-02";
src = fetchFromGitHub {
owner = "andlabs";
repo = "libui";
rev = "alpha4.1";
sha256 = "0bm6xvqk4drg2kw6d304x6mlfal7gh8mbl5a9f0509smmdzgdkwm";
rev = "fea45b2d5b75839be0af9acc842a147c5cba9295";
hash = "sha256-BGbL15hBHY4aZE2ANAEd677vzZMQzMCICBafRtoQIvA=";
};
nativeBuildInputs = [
cmake
meson
ninja
pkg-config
];
propagatedBuildInputs = lib.optional stdenv.hostPlatform.isLinux gtk3;
patches = [
./darwin_versions.patch
./pkg-config.patch
];
postPatch = ''
substituteInPlace meson.build \
--subst-var-by version "${finalAttrs.version}"
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace darwin/text.m unix/text.c \
--replace-fail "strcasecmp" "g_strcasecmp"
'';
preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt
'';
installPhase = ''
mkdir -p $out/{include,lib}
mkdir -p $out/lib/pkgconfig
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
mv ./out/libui.so.0 $out/lib/
ln -s $out/lib/libui.so.0 $out/lib/libui.so
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
mv ./out/libui.A.dylib $out/lib/
ln -s $out/lib/libui.A.dylib $out/lib/libui.dylib
''
+ ''
cp $src/ui.h $out/include
cp $src/ui_${backend}.h $out/include
cp ${./libui.pc} $out/lib/pkgconfig/libui.pc
substituteInPlace $out/lib/pkgconfig/libui.pc \
--subst-var-by out $out \
--subst-var-by version "${version}"
'';
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
install_name_tool -id $out/lib/libui.A.dylib $out/lib/libui.A.dylib
'';
meta = with lib; {
meta = {
homepage = "https://github.com/andlabs/libui";
description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports";
license = licenses.mit;
platforms = platforms.unix;
license = lib.licenses.mit;
platforms = lib.platforms.unix;
};
}
})
+15
View File
@@ -0,0 +1,15 @@
--- a/meson.build
+++ b/meson.build
@@ -167,6 +167,12 @@
install_headers('ui.h')
# TODO when the API is stable enough to be versioned, create a pkg-config file (https://mesonbuild.com/Pkgconfig-module.html) and a declare_dependency() section too
+pkg = import('pkgconfig')
+pkg.generate(libui_libui,
+ description: 'Simple and portable (but not inflexible) GUI library',
+ filebase: 'libui',
+ name: 'libui',
+ version: '@version@')
libui_binary_deps = []
if libui_mode == 'static'

Some files were not shown because too many files have changed in this diff Show More