Merge master into staging-next
This commit is contained in:
@@ -21,6 +21,8 @@ in
|
||||
|
||||
enable = lib.mkEnableOption "Gonic music server";
|
||||
|
||||
package = lib.mkPackageOption pkgs "gonic" { };
|
||||
|
||||
settings = lib.mkOption rec {
|
||||
type = settingsFormat.type;
|
||||
apply = lib.recursiveUpdate default;
|
||||
@@ -62,8 +64,7 @@ in
|
||||
n: v: !((n == "tls-cert" || n == "tls-key") && v == null)
|
||||
) cfg.settings;
|
||||
in
|
||||
"${pkgs.gonic}/bin/gonic -config-path ${settingsFormat.generate "gonic" filteredSettings}";
|
||||
DynamicUser = true;
|
||||
"${lib.getExe cfg.package} -config-path ${settingsFormat.generate "gonic" filteredSettings}";
|
||||
StateDirectory = "gonic";
|
||||
CacheDirectory = "gonic";
|
||||
WorkingDirectory = "/var/lib/gonic";
|
||||
|
||||
@@ -61,7 +61,15 @@ class ComposefsPath:
|
||||
self.path = path
|
||||
self.size = size
|
||||
self.filetype = filetype
|
||||
self.mode = mode
|
||||
|
||||
match len(mode):
|
||||
case 3 | 4:
|
||||
# We need to pad the mode, because we will later use the concatentation
|
||||
# filetype|mode, which assumes that the mode has a length of 4.
|
||||
self.mode = f"{mode:0>4}"
|
||||
case _:
|
||||
raise ValueError(f"mode should be 3 or 4 octal digits, got: {mode}")
|
||||
|
||||
self.uid = attrs["uid"]
|
||||
self.gid = attrs["gid"]
|
||||
self.payload = payload
|
||||
|
||||
@@ -11,6 +11,17 @@
|
||||
system.etc.overlay.enable = true;
|
||||
system.etc.overlay.mutable = false;
|
||||
|
||||
environment.etc = {
|
||||
modetest = {
|
||||
text = "foo";
|
||||
mode = "300";
|
||||
};
|
||||
modetest2 = {
|
||||
text = "foo";
|
||||
mode = "0300";
|
||||
};
|
||||
};
|
||||
|
||||
# Prerequisites
|
||||
systemd.sysusers.enable = true;
|
||||
users.mutableUsers = false;
|
||||
@@ -49,6 +60,10 @@
|
||||
with subtest("/etc is mounted as an overlay"):
|
||||
machine.succeed("findmnt --kernel --type overlay /etc")
|
||||
|
||||
with subtest("modes work correctly"):
|
||||
machine.succeed("stat --format '%F' /etc/modetest | tee /dev/stderr | grep -q 'regular file'")
|
||||
machine.succeed("stat --format '%F' /etc/modetest2 | tee /dev/stderr | grep -q 'regular file'")
|
||||
|
||||
with subtest("direct symlinks point to the target without indirection"):
|
||||
assert machine.succeed("readlink -n /etc/localtime") == "/etc/zoneinfo/Utc"
|
||||
|
||||
|
||||
@@ -11,6 +11,17 @@
|
||||
system.etc.overlay.enable = true;
|
||||
system.etc.overlay.mutable = true;
|
||||
|
||||
environment.etc = {
|
||||
modetest = {
|
||||
text = "foo";
|
||||
mode = "300";
|
||||
};
|
||||
modetest2 = {
|
||||
text = "foo";
|
||||
mode = "0300";
|
||||
};
|
||||
};
|
||||
|
||||
# Prerequisites
|
||||
boot.initrd.systemd.enable = true;
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
@@ -37,6 +48,12 @@
|
||||
with subtest("/etc is mounted as an overlay"):
|
||||
machine.succeed("findmnt --kernel --type overlay /etc")
|
||||
|
||||
with subtest("modes work correctly"):
|
||||
machine.succeed("stat --format '%F' /etc/modetest | tee /dev/stderr | grep -Eq '^regular file$'")
|
||||
machine.succeed("stat --format '%a' /etc/modetest | tee /dev/stderr | grep -Eq '^300$'")
|
||||
machine.succeed("stat --format '%F' /etc/modetest2 | tee /dev/stderr | grep -Eq '^regular file$'")
|
||||
machine.succeed("stat --format '%a' /etc/modetest2 | tee /dev/stderr | grep -Eq '^300$'")
|
||||
|
||||
with subtest("switching to the same generation"):
|
||||
machine.succeed("/run/current-system/bin/switch-to-configuration test")
|
||||
|
||||
|
||||
+45
-5
@@ -1,19 +1,34 @@
|
||||
{ pkgs, ... }:
|
||||
{ lib, pkgs, ... }:
|
||||
{
|
||||
name = "gonic";
|
||||
meta.maintainers = pkgs.gonic.meta.maintainers;
|
||||
|
||||
nodes.machine =
|
||||
{ ... }:
|
||||
nodes.default_cache_dir =
|
||||
{ config, ... }:
|
||||
{
|
||||
systemd.tmpfiles.settings = {
|
||||
"10-gonic" = {
|
||||
"/tmp/music"."d" = { };
|
||||
"/tmp/podcast"."d" = { };
|
||||
"/tmp/playlists"."d" = { };
|
||||
"/tmp/secrets"."d" = { };
|
||||
};
|
||||
};
|
||||
services.gonic = {
|
||||
enable = true;
|
||||
# Wrap gonic to check that the required paths are writable.
|
||||
# This isn't necessarily checked by successful service startup.
|
||||
package = pkgs.writeShellApplication {
|
||||
name = "gonic-test-wrapper";
|
||||
runtimeInputs = [ pkgs.gonic ];
|
||||
text = ''
|
||||
touch ${config.services.gonic.settings.cache-path}/foo && echo "cache dir writeable" >&2
|
||||
touch /tmp/podcast/foo && echo "podcast dir writeable" >&2
|
||||
touch /tmp/playlists/foo && echo "playlists dir writeable" >&2
|
||||
touch /tmp/secrets/foo && echo "shouldn't be able to write /tmp/secrets" >&2 && exit 1
|
||||
exec ${lib.getExe pkgs.gonic} "$@"
|
||||
'';
|
||||
};
|
||||
settings = {
|
||||
music-path = [ "/tmp/music" ];
|
||||
podcast-path = "/tmp/podcast";
|
||||
@@ -22,8 +37,33 @@
|
||||
};
|
||||
};
|
||||
|
||||
nodes.custom_cache_dir =
|
||||
{ ... }:
|
||||
{
|
||||
systemd.tmpfiles.settings = {
|
||||
"10-gonic" = {
|
||||
"/tmp/music"."d" = { };
|
||||
"/tmp/podcast"."d" = { };
|
||||
"/tmp/playlists"."d" = { };
|
||||
"/tmp/cache"."d" = { };
|
||||
};
|
||||
};
|
||||
services.gonic = {
|
||||
enable = true;
|
||||
settings = {
|
||||
music-path = [ "/tmp/music" ];
|
||||
podcast-path = "/tmp/podcast";
|
||||
playlists-path = "/tmp/playlists";
|
||||
cache-path = "/tmp/cache";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("gonic")
|
||||
machine.wait_for_open_port(4747)
|
||||
default_cache_dir.wait_for_unit("gonic")
|
||||
default_cache_dir.wait_for_open_port(4747)
|
||||
|
||||
custom_cache_dir.wait_for_unit("gonic")
|
||||
custom_cache_dir.wait_for_open_port(4747)
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "flycast";
|
||||
version = "0-unstable-2025-11-15";
|
||||
version = "0-unstable-2025-11-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flyinghead";
|
||||
repo = "flycast";
|
||||
rev = "4747e6190899949bafd3391b3ba33b8e4c37219c";
|
||||
hash = "sha256-su1nWwLEUcJtf85U9ABXMHltWOBVqlrYsMLHqNebWUs=";
|
||||
rev = "1666eb0875613ee16b04e08be8ed89c27dbd5c25";
|
||||
hash = "sha256-uQvr4C8iO+3FXh6ki+Rgv7Y/+p1WHwXuqy9Xyq4gSeo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -579,11 +579,11 @@
|
||||
"vendorHash": "sha256-JDFKEn011onzch07tLu/kVbiCwXPqwomFA/X5fbQ3bc="
|
||||
},
|
||||
"hashicorp_helm": {
|
||||
"hash": "sha256-XU5AxXYvZtHnxGotOvGOojybcusVX9DRK2sazfytkAw=",
|
||||
"hash": "sha256-S4Fe65f+gEWWxRMC+/i93dwwe7QigPccx4wiqNBpcL8=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/helm",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-helm",
|
||||
"rev": "v3.1.0",
|
||||
"rev": "v3.1.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-qzwm0R51jvElo+T8ypkHrlQy/MH8c/o+NWIS+YrQ4uw="
|
||||
},
|
||||
@@ -669,13 +669,13 @@
|
||||
"vendorHash": "sha256-tYvQURTrFtr+rgSMGq2zi/5p5jJVGIse7+hj95gz68U="
|
||||
},
|
||||
"hashicorp_vault": {
|
||||
"hash": "sha256-xmi+79FoT8vXHJqMmIAIV+YcpZzAA40cNOxDOufJkro=",
|
||||
"hash": "sha256-a3lCdcEO0i+xaWv/CsKcxOcGnVFWuCVWmuqHOR2tds8=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/vault",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-vault",
|
||||
"rev": "v5.4.0",
|
||||
"rev": "v5.5.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-zZUFUcgMQkbnh7It9k/7J/2KfiP1q3nlcC58xPb2bBo="
|
||||
"vendorHash": "sha256-rpyfECDw9kXpm9CxFSrn9aVXxWMQXF5ZJdCLgAtXGlM="
|
||||
},
|
||||
"hashicorp_vsphere": {
|
||||
"hash": "sha256-vRO6vxzi4d0hNc0MmQLhN7roONnsjxPBtFt0fyvxWd8=",
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "amazon-q-cli";
|
||||
version = "1.19.6";
|
||||
version = "1.19.7";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@@ -16,14 +16,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "aws";
|
||||
repo = "amazon-q-developer-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lJ1+EYlG+IzeUvbIGpeN+LisJQgFcYdXPN01cuB66Lw=";
|
||||
hash = "sha256-KeYSZB3/eVKOVGYA92QwVweLPvamcizcSBtj08HtcCU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
cargoHash = "sha256-Y411prX2CH3nkZaVMgZuJChs2tjLJjDj2WPWm7b1cuo=";
|
||||
cargoHash = "sha256-BlHdEMt3Z/dBnU8PevH9/g/64G1Vz5lwAps0gv60cmw=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
|
||||
+4
-4
@@ -5,7 +5,7 @@
|
||||
"packages": {
|
||||
"": {
|
||||
"dependencies": {
|
||||
"@sourcegraph/amp": "^0.0.1763236881-g2ce1ea"
|
||||
"@sourcegraph/amp": "^0.0.1763812881-gc5f191"
|
||||
}
|
||||
},
|
||||
"node_modules/@napi-rs/keyring": {
|
||||
@@ -228,9 +228,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@sourcegraph/amp": {
|
||||
"version": "0.0.1763236881-g2ce1ea",
|
||||
"resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1763236881-g2ce1ea.tgz",
|
||||
"integrity": "sha512-65ghGiRw2y2sjGK2zsh5WaYNYP4g/7Ad87CAHGV51UrVEFYRdB9Mje35foScL/nzWa30rUjRpPNP1pKw55GQxQ==",
|
||||
"version": "0.0.1763812881-gc5f191",
|
||||
"resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1763812881-gc5f191.tgz",
|
||||
"integrity": "sha512-lgiSK9liftvcT17BZFwSWOKHBsj9Bo9ZQZefIzB0jYpw6aOblDxFH5I7QdPQIyGS8bsJSUo8CA3so7Cb3sQJHw==",
|
||||
"license": "Sourcegraph Commercial License",
|
||||
"dependencies": {
|
||||
"@napi-rs/keyring": "1.1.9"
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "amp-cli";
|
||||
version = "0.0.1763236881-g2ce1ea";
|
||||
version = "0.0.1763812881-gc5f191";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-2pkn3Anp5MB8D+leDU1GCsyd70N3b0S4FjhQYlyc7bs=";
|
||||
hash = "sha256-lsRQZM5OdQUnGAEn70k/IRgu0BcyAppgDCFvYkfbsmw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
|
||||
chmod +x bin/amp-wrapper.js
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-ACMguY9qWJ+3YNYFfwLpv5jZt+kVRabms+YZjMzRhzE=";
|
||||
npmDepsHash = "sha256-5FpZX1citPeT4nqORqxkPFWQUwtSwXBmrGXN8oyexy8=";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ripgrep
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
Ascii85 (1.1.1)
|
||||
Ascii85 (2.0.1)
|
||||
addressable (2.8.7)
|
||||
public_suffix (>= 2.0.2, < 7.0)
|
||||
afm (0.2.2)
|
||||
asciidoctor (2.0.23)
|
||||
asciidoctor-pdf (2.3.19)
|
||||
afm (1.0.0)
|
||||
asciidoctor (2.0.26)
|
||||
asciidoctor-pdf (2.3.24)
|
||||
asciidoctor (~> 2.0)
|
||||
concurrent-ruby (~> 1.1)
|
||||
concurrent-ruby (~> 1.3)
|
||||
matrix (~> 0.4)
|
||||
prawn (~> 2.4.0)
|
||||
prawn-icon (~> 3.0.0)
|
||||
@@ -18,15 +18,15 @@ GEM
|
||||
treetop (~> 1.6.0)
|
||||
ttfunk (~> 1.7.0)
|
||||
coderay (1.1.3)
|
||||
concurrent-ruby (1.3.4)
|
||||
css_parser (1.19.1)
|
||||
concurrent-ruby (1.3.5)
|
||||
css_parser (1.21.1)
|
||||
addressable
|
||||
hashery (2.1.2)
|
||||
matrix (0.4.2)
|
||||
matrix (0.4.3)
|
||||
pdf-core (0.9.0)
|
||||
pdf-reader (2.12.0)
|
||||
Ascii85 (~> 1.0)
|
||||
afm (~> 0.2.1)
|
||||
pdf-reader (2.15.0)
|
||||
Ascii85 (>= 1.0, < 3.0, != 2.0.0)
|
||||
afm (>= 0.2.1, < 2)
|
||||
hashery (~> 2.0)
|
||||
ruby-rc4
|
||||
ttfunk
|
||||
@@ -46,13 +46,13 @@ GEM
|
||||
prawn-templates (0.1.2)
|
||||
pdf-reader (~> 2.0)
|
||||
prawn (~> 2.2)
|
||||
public_suffix (6.0.1)
|
||||
pygments.rb (3.0.0)
|
||||
rexml (3.3.9)
|
||||
rouge (4.4.0)
|
||||
public_suffix (6.0.2)
|
||||
pygments.rb (4.0.0)
|
||||
rexml (3.4.4)
|
||||
rouge (4.6.1)
|
||||
ruby-rc4 (0.1.5)
|
||||
tilt (2.4.0)
|
||||
treetop (1.6.12)
|
||||
tilt (2.6.1)
|
||||
treetop (1.6.18)
|
||||
polyglot (~> 0.3)
|
||||
ttfunk (1.7.0)
|
||||
|
||||
@@ -68,4 +68,4 @@ DEPENDENCIES
|
||||
tilt
|
||||
|
||||
BUNDLED WITH
|
||||
2.5.16
|
||||
2.7.2
|
||||
|
||||
@@ -15,30 +15,30 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "06kj9hgd0z8pj27bxp2diwqh6fv7qhwwm17z64rhdc4sfn76jgn8";
|
||||
sha256 = "0ia5iw9xvvy1igaxsa08vvv4b5ry9ipyr18917pi8w0y4kvddm2v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.2";
|
||||
version = "1.0.0";
|
||||
};
|
||||
Ascii85 = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1c62cx96r0v265mywnlik43qx0wf6bjbzl54qa47x6dzjg861mvk";
|
||||
sha256 = "0nmyxpngg5rycyryhq9l9hapz1y3iqyflskyksxkqm0832a5vjqm";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.1";
|
||||
version = "2.0.1";
|
||||
};
|
||||
asciidoctor = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1wyxgwmnz9bw377r3lba26b090hbsq9qnbw8575a1prpy83qh82j";
|
||||
sha256 = "1hbin3j8wynl2fpqa3d6vb932pyngyfn8j2q6gbbn1n23z7srqqn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.23";
|
||||
version = "2.0.26";
|
||||
};
|
||||
asciidoctor-pdf = {
|
||||
dependencies = [
|
||||
@@ -57,10 +57,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1ybkw3xjv75xsc0wbwg76bk83sfspr50k2phshpvh9ynchli8jh3";
|
||||
sha256 = "0ldh43ps15dpnrgqaybyq2py9cn1m14q2z6djgg22fyl698yaxih";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.19";
|
||||
version = "2.3.24";
|
||||
};
|
||||
coderay = {
|
||||
groups = [ "default" ];
|
||||
@@ -77,10 +77,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
|
||||
sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.4";
|
||||
version = "1.3.5";
|
||||
};
|
||||
css_parser = {
|
||||
dependencies = [ "addressable" ];
|
||||
@@ -88,10 +88,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "17i0fn99kswvfps8r698zw2cr16rc98xdrl0d26y36rv3vhdqh0r";
|
||||
sha256 = "1izp5vna86s7xivqzml4nviy01bv76arrd5is8wkncwp1by3zzbc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.19.1";
|
||||
version = "1.21.1";
|
||||
};
|
||||
hashery = {
|
||||
groups = [ "default" ];
|
||||
@@ -108,10 +108,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i";
|
||||
sha256 = "0nscas3a4mmrp1rc07cdjlbbpb2rydkindmbj3v3z5y1viyspmd0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
};
|
||||
pdf-core = {
|
||||
groups = [ "default" ];
|
||||
@@ -135,10 +135,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0n0pp7blk3np3fqsb54l34fsamrww80cp3dhlhskfayg7542mrv1";
|
||||
sha256 = "11h8dhhd2c8mxssibk9q6qn7ilj4p71crlfirw8pppn8pr85f0n5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.12.0";
|
||||
version = "2.15.0";
|
||||
};
|
||||
polyglot = {
|
||||
groups = [ "default" ];
|
||||
@@ -221,40 +221,40 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
|
||||
sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.0.1";
|
||||
version = "6.0.2";
|
||||
};
|
||||
"pygments.rb" = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "14xhvfnj188pypy6pxj29hrn60pznv6dc4ycdgyd6jv2d769wwj1";
|
||||
sha256 = "0mzfxkzvgyrj9g6471mxa6d1jy59fsds9mfkx1balpng50xb12zl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.0";
|
||||
version = "4.0.0";
|
||||
};
|
||||
rexml = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p";
|
||||
sha256 = "0hninnbvqd2pn40h863lbrn9p11gvdxp928izkag5ysx8b1s5q0r";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.3.9";
|
||||
version = "3.4.4";
|
||||
};
|
||||
rouge = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0r0b48945hakgy0y7lg6h1bb7pkfz8jqd0r6777f80ij3sansvbs";
|
||||
sha256 = "1pkp5icgm7s10b2n6b2pzbdsfiv0l5sxqyizx55qdmlpaxnk8xah";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.4.0";
|
||||
version = "4.6.1";
|
||||
};
|
||||
ruby-rc4 = {
|
||||
groups = [ "default" ];
|
||||
@@ -271,10 +271,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0kds7wkxmb038cwp6ravnwn8k65ixc68wpm8j5jx5bhx8ndg4x6z";
|
||||
sha256 = "0w27v04d7rnxjr3f65w1m7xyvr6ch6szjj2v5wv1wz6z5ax9pa9m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.4.0";
|
||||
version = "2.6.1";
|
||||
};
|
||||
treetop = {
|
||||
dependencies = [ "polyglot" ];
|
||||
@@ -282,10 +282,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0adc8qblz8ii668r3rksjx83p675iryh52rvdvysimx2hkbasj7d";
|
||||
sha256 = "1nl3q5ai7ikaa5sjdbspfa4njbrdvf7898zkplmalln6y4r3y153";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.12";
|
||||
version = "1.6.18";
|
||||
};
|
||||
ttfunk = {
|
||||
groups = [ "default" ];
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "bikeshed";
|
||||
version = "5.4.0";
|
||||
version = "5.4.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-lI05x3IYiXyInjm/It8c3JwR1H1m6VVBuehjKiNEZzo=";
|
||||
hash = "sha256-vgjS8jAtLA2OvJG/pJAJnvaaMPMLkbKHgzIMsdzXTBM=";
|
||||
};
|
||||
|
||||
build-system = [ python3Packages.setuptools ];
|
||||
|
||||
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
|
||||
hash =
|
||||
{
|
||||
"2.2.0" = "sha256-6O0lz0YJzk1eJblQ0/f9PnSYqD8WoendIZioQiGUpCg=";
|
||||
"2.1.3" = "sha256-W3kO+6nVzkmJXyHJU+NZWP0oatK3gon4EWF1/03rgL4=";
|
||||
"2.0.0" = "sha256-qoeEM9SdpuFuBPeQlCzuhPLcJ+bMQkTUTGiT8QdU8rc=";
|
||||
}
|
||||
.${version};
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
gtksourceview5,
|
||||
libadwaita,
|
||||
libhandy,
|
||||
libxml2,
|
||||
webkitgtk_4_1,
|
||||
webkitgtk_6_0,
|
||||
nix-update-script,
|
||||
@@ -23,7 +24,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "cambalache";
|
||||
version = "0.94.1";
|
||||
version = "0.99.3";
|
||||
pyproject = false;
|
||||
|
||||
# Did not fetch submodule since it is only for tests we don't run.
|
||||
@@ -32,7 +33,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "jpu";
|
||||
repo = "cambalache";
|
||||
tag = version;
|
||||
hash = "sha256-dX9YiBCBG/ALWX0W1CjvdUlOCQ6UulnQCiYUscRMKWk=";
|
||||
hash = "sha256-1X7fXYSIXoj8qhQLIfz2gMrCnNBZ7OJCeMykBSpnYD4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -60,6 +61,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
# For extra widgets support.
|
||||
libadwaita
|
||||
libhandy
|
||||
libxml2
|
||||
casilda
|
||||
];
|
||||
|
||||
@@ -88,6 +90,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
homepage = "https://gitlab.gnome.org/jpu/cambalache";
|
||||
description = "RAD tool for GTK 4 and 3 with data model first philosophy";
|
||||
mainProgram = "cambalache";
|
||||
maintainers = with lib.maintainers; [ clerie ];
|
||||
teams = [ lib.teams.gnome ];
|
||||
license = with lib.licenses; [
|
||||
lgpl21Only # Cambalache
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "casilda";
|
||||
version = "0.9.1";
|
||||
version = "1.0.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "jpu";
|
||||
repo = "casilda";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-7A3XzfUALsmkykwOqF/8fg7T7LoVzwk1+7TmRkh1Wys=";
|
||||
hash = "sha256-KXICqldEJC3xKc0bd1X4O2glLeipzqHE1cGle7TKvAw=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
homepage = "https://gitlab.gnome.org/jpu/casilda";
|
||||
description = "Simple Wayland compositor widget for Gtk 4 which can be used to embed other processes windows in Gtk 4 application";
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ clerie ];
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
@@ -14,18 +14,18 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "codex";
|
||||
version = "0.61.0";
|
||||
version = "0.63.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openai";
|
||||
repo = "codex";
|
||||
tag = "rust-v${finalAttrs.version}";
|
||||
hash = "sha256-1DmnrRgwWNTkjG9DODUfLbz4ZYydhTapnv4yv9qOEmU=";
|
||||
hash = "sha256-CWISGlSpS0A2yuXNC11L+5iT5Z9heHqkcIGQDJoUWFE=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/codex-rs";
|
||||
|
||||
cargoHash = "sha256-9zZZG00TzovQBwhidWt2p84dkj8jU35+lSmNIPmDOZY=";
|
||||
cargoHash = "sha256-S6KCJ/b2fY8ydCoR+BfhEV4bbcgwQ6V0xHA9Mbl87jo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
libz,
|
||||
}:
|
||||
let
|
||||
version = "1.1.7";
|
||||
version = "1.1.8";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "committed";
|
||||
@@ -19,10 +19,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "crate-ci";
|
||||
repo = "committed";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8Np7kSLSoZCytQ9RN+kRzUlQa8Lj9F70hbbYNfdgQKI=";
|
||||
hash = "sha256-JjVF2Qv3gcS1bNAlWLDHthOgtX3J36IDEb45hMFlPYw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-gmB2NXxoD9xc24avjWyEFihVVZN1rPggOGwXz/gaZ1c=";
|
||||
cargoHash = "sha256-W6znChJaDPKdqACDGrVRyEYWKGRinZKLb/21fze2t0c=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Until upstream bumps the libz-sys dependency to >= 1.1.15 the build fails on unstable
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "ctags-lsp";
|
||||
version = "0.8.1";
|
||||
version = "0.9.0";
|
||||
vendorHash = null;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netmute";
|
||||
repo = "ctags-lsp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-S+9DT4lcZTcm2dppYbkFklDKzeoOhta2b1OuDytE5sU=";
|
||||
hash = "sha256-CcaYwfmWtBoyAkgF1xwBjNG3MtSa94x2/prW6VQpbQ0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -16,13 +16,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dokieli";
|
||||
version = "0-unstable-2025-10-31";
|
||||
version = "0-unstable-2025-11-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dokieli";
|
||||
repo = "dokieli";
|
||||
rev = "491ba0313e7890443ea9efefe83529821ca5689f";
|
||||
hash = "sha256-7ZY2s/dC6+ITxnoaOWP8VnB1hYwaVfxMTWh6OlqOuc4=";
|
||||
rev = "dced39925955631fd320b763cfe2f0895e5ea5bd";
|
||||
hash = "sha256-A7T4cGoRB4L1PgK+BcpR+l2AraOrKLzc8Et6XN+0q1g=";
|
||||
};
|
||||
|
||||
missingHashes = ./missing-hashes.json;
|
||||
|
||||
@@ -179,8 +179,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
|
||||
|
||||
meta = {
|
||||
description = "Enhanched port of Duke Nukem 3D for various platforms";
|
||||
homepage = "http://eduke32.com";
|
||||
description = "Enhanced port of Duke Nukem 3D for various platforms";
|
||||
homepage = "https://eduke32.com";
|
||||
license = with lib.licenses; [ gpl2Plus ];
|
||||
maintainers = with lib.maintainers; [
|
||||
qubitnano
|
||||
|
||||
@@ -7,15 +7,15 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "fleet";
|
||||
version = "4.75.1";
|
||||
version = "4.76.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fleetdm";
|
||||
repo = "fleet";
|
||||
tag = "fleet-v${finalAttrs.version}";
|
||||
hash = "sha256-0vnGdcCq3sHTS7CxlnYMYxr0KZr9exrrU+4lIeGkv+0=";
|
||||
hash = "sha256-DWrErGFKhhAP+qePYz5VJ26dySMOicGkHEN16J9qOx4=";
|
||||
};
|
||||
vendorHash = "sha256-SMQskb2Sth1Wi02e/EwT/z+dUsxGBN7gd/H3f33Oq1M=";
|
||||
vendorHash = "sha256-VLxhlzuQqt/jtUwllCutj2CO2tXWFgLRpU2mGtZM6RE=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/fleet"
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "git-machete";
|
||||
version = "3.37.0";
|
||||
version = "3.37.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "virtuslab";
|
||||
repo = "git-machete";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-sTeztSdMqTJYBNKnDPnlVHeEIyUodiL6sZiQvyWQBmE=";
|
||||
hash = "sha256-E1rLMCFnczZqwxC+hNDCyhRFHM39/oQMlaa5D363Ac4=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [ setuptools ];
|
||||
|
||||
@@ -5,27 +5,28 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "goat";
|
||||
version = "0-unstable-2024-07-31"; # Upstream currently isn't doing tags/releases.
|
||||
version = "0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blampe";
|
||||
repo = "goat";
|
||||
rev = "177de93b192b8ffae608e5d9ec421cc99bf68402";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-/DR6RN7dCROp18P7dgm4DMppwdtYl0AOVNMEtXz8ldk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-24YllmSUzRcqWbJ8NLyhsJaoGG2+yE8/eXX6teJ1nV8=";
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Go ASCII Tool. Render ASCII art as SVG diagrams";
|
||||
homepage = "https://github.com/blampe/goat";
|
||||
changelog = "https://github.com/blampe/goat/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ katexochen ];
|
||||
mainProgram = "goat";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gtree";
|
||||
version = "1.12.0";
|
||||
version = "1.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddddddO";
|
||||
repo = "gtree";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wb7VzjAxcxFDOquYd1P9jcqR0ivBIuEUZ1R/812w7Ew=";
|
||||
hash = "sha256-+Prv0TtyqE02DHbYwooy8OWQn4C82Lyfikd+l0YEHZc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3r3nriiOtKX6pzSpAI4ro1VqcQRTArocEuleqhYKOj0=";
|
||||
vendorHash = "sha256-0St9T9xJ8lOZgBUtwfzrHqSpcv6SAoxy4PNBBuuNO+A=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/gtree"
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.2.1";
|
||||
version = "4.3.0";
|
||||
pname = "libdigidocpp";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-eid";
|
||||
repo = "libdigidocpp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-YWpehK/Gkb4c81KGbXzZoagTdcE94tSKWLh+BBZ3rKY=";
|
||||
hash = "sha256-f5wU3C6NC4op+9Wy+khwNJ6slFyPhq7hZl1Tj5hnYc8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,12 +15,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libtraceevent";
|
||||
version = "1.8.5";
|
||||
version = "1.8.6";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git";
|
||||
rev = "libtraceevent-${version}";
|
||||
hash = "sha256-Mn30qyTXYMFMGYhXz3nYS+HHw71N3t5A0dCEJFcu6os=";
|
||||
hash = "sha256-k084Sl0Uv+/mQM+Voktz3jjcKmXSi7n2VWpZLRcKSrY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -22,16 +22,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mise";
|
||||
version = "2025.11.6";
|
||||
version = "2025.11.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jdx";
|
||||
repo = "mise";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-P+FHyCWlYWiJlv846QFhgjbERPH/MOkSlNTr7eVq9qw=";
|
||||
hash = "sha256-R4DmHUsXPiXwfn+9pO3Vl58fQXhZhsaa0tonspcTHFU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ZHWfMQRIx4rOs+KDanf7u1DctPCYpSr2VUXWrIhUTzg=";
|
||||
cargoHash = "sha256-qxJcUrH+JK1T2qTWYe3/DE8zuiNlZ52BM19uooUTDYM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -279,7 +279,7 @@ It must be one of the following:
|
||||
attribute path from file specified by the *--file* option. If specified
|
||||
without *--file* option, uses _default.nix_ in current directory.
|
||||
|
||||
*--flake* _flake-uri[#name]_
|
||||
*--flake* _flake-uri[#name]_, *-F* _flake-uri[#name]_
|
||||
Build the NixOS system from the specified flake. It defaults to the
|
||||
directory containing the target of the symlink _/etc/nixos/flake.nix_,
|
||||
if it exists. The flake must contain an output named
|
||||
|
||||
@@ -100,6 +100,7 @@ def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentPa
|
||||
)
|
||||
main_parser.add_argument(
|
||||
"--flake",
|
||||
"-F",
|
||||
nargs="?",
|
||||
const=True,
|
||||
help="Build the NixOS system from the specified flake",
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
let
|
||||
pname = "open-webui";
|
||||
version = "0.6.36";
|
||||
version = "0.6.37";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-webui";
|
||||
repo = "open-webui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-7+KFMmiJZB14kUtkKxTLZrZ2bA2MR1qA/cx7GX+FnUw=";
|
||||
hash = "sha256-NiQq+ACLKkf+l6v6YWOHnbblLYAdfXPtG7y/qnHMEUU=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage rec {
|
||||
@@ -32,7 +32,7 @@ let
|
||||
url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-CEjWmDcHHr0PeltETi5uIdoQ2C2Twmg+gDBZT5myo/E=";
|
||||
npmDepsHash = "sha256-KtrHSKVVFt4wxp/JQGU35Mpga4eJHKYoNtrpxc04lug=";
|
||||
|
||||
# See https://github.com/open-webui/open-webui/issues/15880
|
||||
npmFlags = [
|
||||
@@ -136,6 +136,7 @@ python3Packages.buildPythonApplication rec {
|
||||
ldap3
|
||||
loguru
|
||||
markdown
|
||||
msoffcrypto-tool
|
||||
mcp
|
||||
nltk
|
||||
onnxruntime
|
||||
@@ -204,6 +205,7 @@ python3Packages.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
all = [
|
||||
azure-search-documents
|
||||
colbert-ai
|
||||
elasticsearch
|
||||
firecrawl-py
|
||||
@@ -215,6 +217,7 @@ python3Packages.buildPythonApplication rec {
|
||||
pymilvus
|
||||
pymongo
|
||||
qdrant-client
|
||||
weaviate-client
|
||||
]
|
||||
++ moto.optional-dependencies.s3
|
||||
++ postgres;
|
||||
|
||||
@@ -40,6 +40,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-NM9SspeMXu1q3tfpcFk4OuLapu/clbotJLu2u4nmAlY=";
|
||||
};
|
||||
|
||||
# Fix build with Qt 6.10.1
|
||||
# Submitted upstream: https://github.com/opencloud-eu/desktop/pull/710
|
||||
patches = [
|
||||
./qt-6.10.1.patch
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ecm618
|
||||
qt6.qtbase
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/libsync/globalconfig.h b/src/libsync/globalconfig.h
|
||||
index 7094385b4..2ef8a44d2 100644
|
||||
--- a/src/libsync/globalconfig.h
|
||||
+++ b/src/libsync/globalconfig.h
|
||||
@@ -6,7 +6,7 @@
|
||||
#include "libsync/opencloudsynclib.h"
|
||||
|
||||
#include <QVariant>
|
||||
-#include <QtQmlMeta>
|
||||
+#include <QtQmlIntegration/QtQmlIntegration>
|
||||
|
||||
namespace OCC {
|
||||
class OPENCLOUD_SYNC_EXPORT GlobalConfig : public QObject
|
||||
@@ -41,12 +41,12 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "peergos";
|
||||
version = "1.15.0";
|
||||
version = "1.16.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Peergos";
|
||||
repo = "web-ui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ic1d/aLwrzFo18icX9U0mKniEGo2YkofM0fJUPUQtm0=";
|
||||
hash = "sha256-v8Pw9AlxFDu4DqYeJlx+xF2PJe1xnQxHUVccXCn/jIs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qdigidoc";
|
||||
version = "4.8.2";
|
||||
version = "4.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-eid";
|
||||
repo = "DigiDoc4-Client";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-HxFH1vpXXPVSYnaMrPOJwYCt8Z0pnOLrpixQlDkTN5w=";
|
||||
hash = "sha256-lVx8Sqj9c8fvsPKjt3JDa59h44fvv6n7+odjrb00TPo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
+19
-13
@@ -1,9 +1,9 @@
|
||||
{
|
||||
"META-INF": {
|
||||
"VER": 1,
|
||||
"SERIAL": 188,
|
||||
"SERIAL": 197,
|
||||
"URL": "https://id.eesti.ee/config.json",
|
||||
"DATE": "20250722064215Z"
|
||||
"DATE": "20251106100015Z"
|
||||
},
|
||||
"TSL-URL": "https://ec.europa.eu/tools/lotl/eu-lotl.xml",
|
||||
"TSL-CERTS": [
|
||||
@@ -33,6 +33,10 @@
|
||||
"EMAIL-ACTIVATE-URL": "https://sisene.www.eesti.ee/idportaal/postisysteem.lisa_suunamine?=%1",
|
||||
"SIVA-URL": "https://siva.eesti.ee/V3/validate",
|
||||
"SIVA-CERT": "",
|
||||
"LDAP-PERSON-URLS": [
|
||||
"ldaps://esteid.ldap.sk.ee",
|
||||
"ldaps://ldap.eidpki.ee/dc=ldap,dc=eidpki,dc=ee"
|
||||
],
|
||||
"CDOC2-CONF": {
|
||||
"00000000-0000-0000-0000-000000000000": {
|
||||
"NAME": "RIA",
|
||||
@@ -44,12 +48,12 @@
|
||||
"CDOC2-DEFAULT-KEYSERVER": "00000000-0000-0000-0000-000000000000",
|
||||
"QDIGIDOC-SUPPORTED": "4.0.0.23",
|
||||
"QDIGIDOC-LATEST": "3.13.6.1525",
|
||||
"QDIGIDOC4-SUPPORTED": "4.5.0.0",
|
||||
"QDIGIDOC4-LATEST": "4.8.0.0",
|
||||
"QDIGIDOC4-SUPPORTED": "4.8.0.0",
|
||||
"QDIGIDOC4-LATEST": "4.8.2.0",
|
||||
"QESTEIDUTIL-SUPPORTED": "4.0.0.23",
|
||||
"QESTEIDUTIL-LATEST": "3.12.10.1265",
|
||||
"WIN-LATEST": "25.6.9.8395",
|
||||
"WIN-DOWNLOAD": "https://installer.id.ee/media/win/Open-EID-25.6.9.8395.exe",
|
||||
"WIN-LATEST": "25.8.18.8398",
|
||||
"WIN-DOWNLOAD": "https://installer.id.ee/media/win/Open-EID-25.8.18.8398.exe",
|
||||
"WIN-UPGRADECODE": "{f1c4d351-269d-4bee-8cdb-6ea70c968875}",
|
||||
"OSX-LATEST": "25.5.0.1954",
|
||||
"OSX-DOWNLOAD": "https://installer.id.ee/media/osx/Open-EID_25.5.0.1954.dmg",
|
||||
@@ -60,21 +64,23 @@
|
||||
"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"
|
||||
],
|
||||
"LDAP-CERTS": [
|
||||
"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"
|
||||
],
|
||||
"ALLOWED-EXTENSIONS": [
|
||||
"ddoc",
|
||||
@@ -117,4 +123,4 @@
|
||||
"csv",
|
||||
"cdoc2"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
+5
-5
@@ -1,5 +1,5 @@
|
||||
uN+IaPh/pmA96fd2aUXZeNai8XkAYnUy69Rhd2Bvu0kGnQg4oH2sYWmJCzaQECGbI86nlt/UXIqC
|
||||
ZDvJqGaK5jqhvUwNcb/RubN8tsOdM4xn/Bg7tPeQPcbCaM38EHIwRfNFKr+vuWrna/KUynWP0PHD
|
||||
Mpsq1MxtNT/L4WFNf2zKvtfiI0lRPQcBCRgrA21BVTZRu5nbAkLc5w1OliTwauQgx7GFh7M+gYms
|
||||
bkAZSaJJJQczbCn2xizG0HrBn/lQ/EZYlL432Wai7tJL0maZcXoRGJfvZQkDAdzyfDBOK291JnCW
|
||||
/tjoLEMwDBYLxoL2mztivwdT1W8HLUyi7jvhpQ==
|
||||
IHEoHA1wYCSHW799un+GZQcb5OXV+yHW920Ara71VlUBtYVWJICGmfXu+J3HMTxdXed0aEzMEnVv
|
||||
t3q0Yi58gR8viBh0c9zrPSli21kUYvh0p8lQE3xyyec9hZH+yVXc2hBfYlZRH7uzWNBRwWSYToEs
|
||||
fCRb5flzH8yudU6wGHb49ID7nBdcG55J4mB2bMTCxZA+xavo38NvRK/FcTx/qdPDwHn5+o1/bNnq
|
||||
BMzj+x02xlmC5Cs04I8pmYg3xZkU7WNdCllI8+Qf2l6y1ywDqX638y4lwIUjyq0fj5unw/fh9JhX
|
||||
wRHmjxdu9qc6z3LRxrA3k+cYY+Zl6/1FpBpIYg==
|
||||
|
||||
+50
-40
File diff suppressed because one or more lines are too long
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "re-Isearch";
|
||||
version = "2.20220925.4.0a-unstable-2025-11-11";
|
||||
version = "2.20220925.4.0a-unstable-2025-11-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "re-Isearch";
|
||||
repo = "re-Isearch";
|
||||
rev = "3a199894329f426651954c3a3ae17bdd45992b7f";
|
||||
hash = "sha256-/KXWwZXyAKhJ3ss08RDrB2QW4IgXGQ3DJhVYB+sCW80=";
|
||||
rev = "70d28aef0ea767e67a949774d7910b9337ec3ca7";
|
||||
hash = "sha256-10MXa+28sOWCDq7sKfZJqibVUOy4QS2ldc/6fsLvGQQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "rmapi";
|
||||
version = "0.0.31";
|
||||
version = "0.0.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddvk";
|
||||
repo = "rmapi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8OzDXOyyz0VTeJg0P6jOBTA9OZbCLSK8SASSEHsrBxc=";
|
||||
sha256 = "sha256-0FrcvOjcVg5lXR6iS/eo7IUQnNvqHVHEj1XSIbdrzms=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Qisfw+lCFZns13jRe9NskCaCKVj5bV1CV8WPpGBhKFc=";
|
||||
|
||||
@@ -16,18 +16,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ruff";
|
||||
version = "0.14.5";
|
||||
version = "0.14.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "ruff";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-oABi0FnI09TCm++rUPPZeeKEFLWFRQMhTawYE/DLB9k=";
|
||||
hash = "sha256-xGQGodhDHrXIfCJ/Igv8TunsLo38FRRgnR1el+VKWGM=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [ "--package=ruff" ];
|
||||
|
||||
cargoHash = "sha256-8YjIGdtxlbLhJkz1HAwEkCgLpvQda1CoYsvoJY+4LVo=";
|
||||
cargoHash = "sha256-xbYWTuSvC1iqCNF+kIHKuQEjtdv+Z7DlL/4KUAXNcW0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ser2net";
|
||||
version = "4.6.5";
|
||||
version = "4.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cminyard";
|
||||
repo = "ser2net";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Iyr0ix+V9EXK01RceVQLc37tN/b83TvhUfuD+HSUjc0=";
|
||||
hash = "sha256-TL6btl8Q8hpIBfzHdJ+TLdF+r9zQRLytzVx810R7yYI=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -18,11 +18,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sgt-puzzles";
|
||||
version = "20251021.790f585";
|
||||
version = "20251120.28032bd";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-4EZgFswP0oqjS0OZbkyTHCs7dKm2PgUKpsJWssQAvQ4=";
|
||||
hash = "sha256-aD4EOuquUpjtmKVClzIKbO+6LD2T3vqgSDf7D/wPYrE=";
|
||||
};
|
||||
|
||||
sgt-puzzles-menu = fetchurl {
|
||||
|
||||
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
installManPage ./build/shikane.*
|
||||
installManPage ./build/man/shikane.*
|
||||
'';
|
||||
|
||||
# upstream has no tests
|
||||
|
||||
@@ -63,6 +63,13 @@ python3.pkgs.buildPythonApplication rec {
|
||||
"test_check_exclude"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# AssertionError
|
||||
"tests/test_analyze.py"
|
||||
"tests/test_convert.py"
|
||||
"tests/test_filters.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "sigma.cli" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ callPackage, commandLineArgs }:
|
||||
callPackage ./generic.nix { inherit commandLineArgs; } {
|
||||
pname = "signal-desktop-bin";
|
||||
version = "7.79.0";
|
||||
version = "7.80.0";
|
||||
|
||||
libdir = "usr/lib64/signal-desktop";
|
||||
bindir = "usr/bin";
|
||||
@@ -10,6 +10,6 @@ callPackage ./generic.nix { inherit commandLineArgs; } {
|
||||
bsdtar -xf $downloadedFile -C "$out"
|
||||
'';
|
||||
|
||||
url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09795013-signal-desktop/signal-desktop-7.79.0-1.fc42.aarch64.rpm";
|
||||
hash = "sha256-1XH9gw5/1n10u9d67EM2Y//6+oywE0ziv2ZXafL+h0Q=";
|
||||
url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09815595-signal-desktop/signal-desktop-7.80.0-1.fc42.aarch64.rpm";
|
||||
hash = "sha256-RunFdBUGBmDmztWdn9Rjbotnzwiid+gCIKPz1Nrc8v0=";
|
||||
}
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "signal-desktop-bin";
|
||||
version = "7.79.0";
|
||||
version = "7.80.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg";
|
||||
hash = "sha256-gXXVj+63TyOqxVUeva48VBCYP45GTlxyDIBYZ7NDcZ8=";
|
||||
hash = "sha256-hoWFoC+l4WwCYVWwlbIudrBNTw0wSUmB8Hyuy4/xyBs=";
|
||||
};
|
||||
sourceRoot = ".";
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{ callPackage, commandLineArgs }:
|
||||
callPackage ./generic.nix { inherit commandLineArgs; } rec {
|
||||
pname = "signal-desktop-bin";
|
||||
version = "7.79.0";
|
||||
version = "7.80.0";
|
||||
|
||||
libdir = "opt/Signal";
|
||||
bindir = libdir;
|
||||
extractPkg = "dpkg-deb -x $downloadedFile $out";
|
||||
|
||||
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
hash = "sha256-LhYYJjiPjJAa/5cSe+x5ZnLuy7qx7L2hTh2kcW41vpQ=";
|
||||
hash = "sha256-d0OTlGtTGN4d7ZIShhVc39TiSJvEg9UMonqeP++R7x4=";
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
cmake,
|
||||
}:
|
||||
let
|
||||
version = "12.1.1";
|
||||
version = "12.6.0";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "source-meta-json-schema";
|
||||
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "sourcemeta";
|
||||
repo = "jsonschema";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LZxH+S0Vv6ZzQM5BU9f5eqwspPZXxQmweUF/EmHj2IU=";
|
||||
hash = "sha256-j8FQLOJSdVzNsO4piQK1B90p4cCbAQQgceNH5Us6/bE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "stylelint";
|
||||
version = "16.25.0";
|
||||
version = "16.26.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stylelint";
|
||||
repo = "stylelint";
|
||||
tag = version;
|
||||
hash = "sha256-oRDQct7R+ZOQ5bKCc7YZY3JsOg42ZthIgdCDJAH5m9E=";
|
||||
hash = "sha256-Lw36rmGNoqobDoMdzYX7JaOFTyFGmjiBe55WI9RgAlY=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-Hwq7UEix1qn6M4jtjlliSVCWLx2XxHBOYo5UEfr+UH0=";
|
||||
npmDepsHash = "sha256-CCvyJzLCXbuipBXJrLdkAv/dT9RoZNhbwrUZhSaja8s=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
|
||||
@@ -2,17 +2,32 @@
|
||||
appimageTools,
|
||||
fetchurl,
|
||||
lib,
|
||||
xorg,
|
||||
}:
|
||||
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "sylk";
|
||||
version = "3.0.1";
|
||||
version = "3.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage";
|
||||
hash = "sha256-VgepO7LHFmNKq/H0RFcIkafgtiVGt8K/LdiCO5Dw2s4=";
|
||||
url = "https://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage";
|
||||
hash = "sha256-3lWWc3aSn+aKM/gX4v2suVbj5sZPKl1r36eQP3a2pNg=";
|
||||
};
|
||||
|
||||
extraPkgs = pkgs: [
|
||||
xorg.libxshmfence
|
||||
];
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
|
||||
extraInstallCommands = ''
|
||||
install -Dm444 ${appimageContents}/sylk-electron.desktop -t $out/share/applications/
|
||||
install -Dm444 ${appimageContents}/sylk-electron.png -t $out/share/icons/hicolor/512x512/apps/
|
||||
|
||||
substituteInPlace $out/share/applications/sylk-electron.desktop \
|
||||
--replace-fail 'Exec=AppRun --no-sandbox' 'Exec=${pname}'
|
||||
'';
|
||||
|
||||
profile = ''
|
||||
export LC_ALL=C.UTF-8
|
||||
'';
|
||||
@@ -21,8 +36,9 @@ appimageTools.wrapType2 rec {
|
||||
description = "Desktop client for SylkServer, a multiparty conferencing tool";
|
||||
homepage = "https://sylkserver.com/";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
mainProgram = "Sylk";
|
||||
mainProgram = "sylk";
|
||||
maintainers = with lib.maintainers; [ zimbatm ];
|
||||
teams = with lib.teams; [ ngi ];
|
||||
platforms = [
|
||||
"i386-linux"
|
||||
"x86_64-linux"
|
||||
|
||||
@@ -171,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
termite
|
||||
xfce4-terminal
|
||||
;
|
||||
blackbox-terminal = blackbox-terminal.override { sixelSupport = true; };
|
||||
inherit blackbox-terminal;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
# allow overriding electron
|
||||
electron_37,
|
||||
electron_39,
|
||||
webcord,
|
||||
replaceVars,
|
||||
lib,
|
||||
@@ -8,7 +8,7 @@
|
||||
}:
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
(webcord.override { inherit electron_37; }).overrideAttrs (old: {
|
||||
(webcord.override { inherit electron_39; }).overrideAttrs (old: {
|
||||
pname = "webcord-vencord";
|
||||
|
||||
patches = (old.patches or [ ]) ++ [
|
||||
|
||||
@@ -5,22 +5,22 @@
|
||||
copyDesktopItems,
|
||||
python3,
|
||||
xdg-utils,
|
||||
electron_37,
|
||||
electron_39,
|
||||
makeDesktopItem,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "webcord";
|
||||
version = "4.11.1";
|
||||
version = "4.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpacingBat3";
|
||||
repo = "WebCord";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-u2Asoc5cwVRtD6yz77iJ8hA2IfVSA4iYI8snPCLufnE=";
|
||||
hash = "sha256-wUlraWv23BRXag3MNqjQy9Ntwz9UO2jNsNt758+GUXo=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-sREnthfmE01yzVwqMN6zbhTAquulztriytMSOcj3ZCo=";
|
||||
npmDepsHash = "sha256-quBWEO9mi/dYQDap6ivN8oxDfGcxedqS1E45ExmceE0=";
|
||||
|
||||
makeCacheWritable = true;
|
||||
|
||||
@@ -55,7 +55,7 @@ buildNpmPackage rec {
|
||||
install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png
|
||||
|
||||
# Add xdg-utils to path via suffix, per PR #181171
|
||||
makeWrapper '${lib.getExe electron_37}' $out/bin/webcord \
|
||||
makeWrapper '${lib.getExe electron_39}' $out/bin/webcord \
|
||||
--suffix PATH : "${binPath}" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--add-flags $out/lib/node_modules/webcord/
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wrangler";
|
||||
version = "4.48.0";
|
||||
version = "4.50.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudflare";
|
||||
repo = "workers-sdk";
|
||||
rev = "wrangler@${finalAttrs.version}";
|
||||
hash = "sha256-0ren1A943mMzsAxFiUb2GUR9GFhFJ1Oen0Q4badAVKM=";
|
||||
hash = "sha256-/hAqcaZCzF6n1yS2dsqXDk9J6Zu6+MDTc+BzKJ81XYk=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postPatch
|
||||
;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-n5nKP6BLw0xMgIecFVNt/vjfdQmO3HiI0vrqAtpA4ms=";
|
||||
hash = "sha256-z38rGh9Wnj9iDR196hcVmS2AY1l07UJfcAhmD0Qx1Co=";
|
||||
};
|
||||
# pnpm packageManager version in workers-sdk root package.json may not match nixpkgs
|
||||
postPatch = ''
|
||||
|
||||
@@ -101,7 +101,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zed-editor";
|
||||
version = "0.213.3";
|
||||
version = "0.213.4";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -114,7 +114,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-H4g21r2BO0ppv/zjacUfib6pc8r4D5aE0iBQGE5XU3w=";
|
||||
hash = "sha256-Xlqe5D22XEVTB7ODKGDy+e52kJSwzG8rwlQxc0R/qvQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -134,7 +134,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
rm -r $out/git/*/candle-book/
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-sr77w3r1MfGXPIFbQ8FohBbErJOE7mmZRLj6agzFeuU=";
|
||||
cargoHash = "sha256-WiCzafRZWEhUN6Ud6gIlTKuheAOagvoCNQwouRN/4hA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -27,9 +27,9 @@ let
|
||||
"20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw=";
|
||||
"21.1.2".officialRelease.sha256 = "sha256-SgZdBL0ivfv6/4EqmPQ+I57qT2t6i/rqnm20+T1BsFY=";
|
||||
"22.0.0-git".gitRelease = {
|
||||
rev = "99630eb1bf752d93f31aae8f90bd3772a0566ad5";
|
||||
rev-version = "22.0.0-unstable-2025-11-16";
|
||||
sha256 = "sha256-jNxmoarX9ZMUpjJM8XFAC9dIguK5BZiDc1SNpQahYmw=";
|
||||
rev = "25c2cc4b98092e8dccc8ff46162bea65e9a63bbc";
|
||||
rev-version = "22.0.0-unstable-2025-11-23";
|
||||
sha256 = "sha256-9JbcykED9RyeXTjfuyHnLxexw98wO5huapt7veWa5A0=";
|
||||
};
|
||||
}
|
||||
// llvmVersions;
|
||||
|
||||
@@ -23,7 +23,7 @@ let
|
||||
] null;
|
||||
|
||||
release = {
|
||||
"1.3.2+9.1".sha256 = "sha256-SXNVniCzx8yUcwkNRRCqfETiGQi+8hSO46/UQnyGa8E=";
|
||||
"1.3.2+9.1".sha256 = "sha256-tf+Hrfv/ZrLXryTjJchvLfydxzjkXB2hbL7P280Clzw=";
|
||||
"1.3.2+9.0".sha256 = "sha256-/UHtK9fjpHTbra4/Cnsjt8fg1fvxx7U6kGjQPm15NwM=";
|
||||
"1.3.2+8.20".sha256 = "sha256-RuX2aInSjwebs/aEOoisNxqcIPqDA2kWehN9tFYqOx4=";
|
||||
"1.3.2+8.19".sha256 = "sha256-Zd7piAWlKPAZKEz7HVWxhnzOLbA/eR9C/E0T298MJVY=";
|
||||
|
||||
@@ -5,17 +5,16 @@
|
||||
lwt,
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "lwt-canceler";
|
||||
version = "0.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "nomadic-labs";
|
||||
repo = "lwt-canceler";
|
||||
rev = "v${version}";
|
||||
sha256 = "1xbb7012hp901b755kxmfgg293rz34rkhwzg2z9i6sakwd7i0h9p";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-N0EQT+NTaRPTF+9zODMZP48k3nO1z1LOCiBdKAI4a/U=";
|
||||
};
|
||||
useDune2 = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
lwt
|
||||
@@ -29,4 +28,4 @@ buildDunePackage rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.ulrikstrid ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -3,31 +3,26 @@
|
||||
buildDunePackage,
|
||||
fetchurl,
|
||||
lwt,
|
||||
ocaml,
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "lwt-dllist";
|
||||
version = "1.0.1";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
minimalOCamlVersion = "4.02";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
|
||||
sha256 = "e86ce75e40f00d51514cf8b2e71e5184c4cb5dae96136be24613406cfc0dba6e";
|
||||
url = "https://github.com/mirage/lwt-dllist/releases/download/v${finalAttrs.version}/lwt-dllist-v${finalAttrs.version}.tbz";
|
||||
hash = "sha256-6GznXkDwDVFRTPiy5x5RhMTLXa6WE2viRhNAbPwNum4=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
lwt
|
||||
];
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.03";
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Mutable doubly-linked list with Lwt iterators";
|
||||
homepage = "https://github.com/mirage/lwt-dllist";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.sternenseemann ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.sternenseemann ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,20 +6,16 @@
|
||||
ptime,
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "lwt-exit";
|
||||
version = "1.0";
|
||||
src = fetchFromGitLab {
|
||||
owner = "nomadic-labs";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1k763bmj1asj9ijar39rh3h1d59rckmsf21h2y8966lgglsf42bd";
|
||||
repo = "lwt-exit";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-bQniNH2PGpOQFzAIp+tkOZUW4IA5jaxkTFKrIOsa5sw=";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
lwt
|
||||
ptime
|
||||
@@ -33,4 +29,4 @@ buildDunePackage rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.ulrikstrid ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -5,18 +5,16 @@
|
||||
lwt,
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "lwt-watcher";
|
||||
version = "0.2";
|
||||
src = fetchFromGitLab {
|
||||
owner = "nomadic-labs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
repo = "lwt-watcher";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-35Z73bSzEEgTabNH2cD9lRdDczsyIMZR2ktyKx4aN9k=";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
lwt
|
||||
];
|
||||
@@ -28,4 +26,4 @@ buildDunePackage rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.ulrikstrid ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -4,13 +4,12 @@
|
||||
fetchurl,
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "path_glob";
|
||||
version = "0.2";
|
||||
useDune2 = true;
|
||||
version = "0.3";
|
||||
src = fetchurl {
|
||||
url = "https://gasche.gitlab.io/path_glob/releases/path_glob-${version}.tbz";
|
||||
sha256 = "01ra20bzjiihbgma74axsp70gqmid6x7jmiizg48mdkni0aa42ay";
|
||||
url = "https://gasche.gitlab.io/path_glob/releases/path_glob-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-My2uI7cA+gUNH9bk89LiS43R2yyOpPdsVOLlSFHJ0iY=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@@ -18,4 +17,4 @@ buildDunePackage rec {
|
||||
description = "Checking glob patterns on paths";
|
||||
license = lib.licenses.lgpl2Only;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asserts";
|
||||
version = "0.13.1";
|
||||
version = "0.14.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "srittau";
|
||||
repo = "python-asserts";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-hjTzGCcURI0NH9pgZ6KB0J3tSbgIaneDnWr8zrLVG6M=";
|
||||
hash = "sha256-nSL28LaKWVkzOmyI1TpCXJxyKdqpvK/YHRLUJ77sRA8=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "essentials-openapi";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Neoteroi";
|
||||
repo = "essentials-openapi";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-HckCdDQ7wNg+uHLwAaoBIxg2cfubkcFC1mhviOeFdDg=";
|
||||
hash = "sha256-MmH/X8qm/ZeUjyX3gL2lHU+H90fb81wmnFWgD/M5P/o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ hatchling ];
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hf-xet";
|
||||
version = "1.1.10";
|
||||
version = "1.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huggingface";
|
||||
repo = "xet-core";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-dCyHRspViTIt8nc+KmmS6xJzL1oqRvCX4ndK2yGaf6A=";
|
||||
hash = "sha256-nRxLVCJF3meoVa1mc3jt0hJUFDwfSFl7U/fFLDQL44M=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/hf_xet";
|
||||
@@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||
src
|
||||
sourceRoot
|
||||
;
|
||||
hash = "sha256-6XBKiMXTPtqbFtDVHZL23zYow/l6UYLjZOPPZdyKPwg=";
|
||||
hash = "sha256-xMfsd7xOghktQu/do7TMmkUx4uTBHPK44XODePluUgc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyter-ydoc";
|
||||
version = "3.1.0";
|
||||
version = "3.3.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jupyter-server";
|
||||
repo = "jupyter_ydoc";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-AI/Ml1MgMFaclJxuHbZMXT8Cf531tzX0uaWPVg6SgMM=";
|
||||
hash = "sha256-PGZu3CVF8X9LeFr8HRD7G6LcYoq/RPbqztopopFcAuA=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "llm-gemini";
|
||||
version = "0.26.1";
|
||||
version = "0.27";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simonw";
|
||||
repo = "llm-gemini";
|
||||
tag = version;
|
||||
hash = "sha256-HZUbO1R8qVc4iuRNs9ezR9dnjjAy+s8g0TTlfOCyeVc=";
|
||||
hash = "sha256-BkMLldozPv1yj5+02U6SW16x2mg0EdJJCVlXvj0gQpo=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -12,12 +12,12 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "luma-core";
|
||||
version = "2.5.1";
|
||||
version = "2.5.2";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "luma_core";
|
||||
inherit version;
|
||||
hash = "sha256-m4j76GiYnsRHfiEP4pk+d0p0Jdfeg3iBQQn5i+MsplM=";
|
||||
hash = "sha256-Lkb4dW3OSdO1OT2re1IcO8ba1vXmpiCLVbygtxGt+zE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "netbox-contextmenus";
|
||||
version = "1.4.12";
|
||||
version = "1.4.13";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PieterL75";
|
||||
repo = "netbox_contextmenus";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-7fyExxj9esRbVCQXqzABnGKxY4MiNJxSJFXZvDuyQ1o=";
|
||||
hash = "sha256-xgJ9EzdLc2xK9Kam8fS3f9bEgWq2O7NFx3D8Ci3Hc8o=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -7,23 +7,20 @@
|
||||
openpyxl,
|
||||
pandas,
|
||||
poetry-core,
|
||||
pytest7CheckHook,
|
||||
pytestCheckHook,
|
||||
pytest-xdist,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "niapy";
|
||||
version = "2.5.2";
|
||||
version = "2.6.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NiaOrg";
|
||||
repo = "NiaPy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8hKT0WxnJijm22w4DkzicvtikaTL/mL3VhQX/WVHL58=";
|
||||
hash = "sha256-o/JHFPsYMHxSkUMfRbR3SJawbzTsoh6ae0pyxLd1bAs=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
@@ -40,7 +37,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest7CheckHook
|
||||
pytestCheckHook
|
||||
pytest-xdist
|
||||
];
|
||||
|
||||
@@ -49,7 +46,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Micro framework for building nature-inspired algorithms";
|
||||
homepage = "https://niapy.org/";
|
||||
changelog = "https://github.com/NiaOrg/NiaPy/releases/tag/${version}";
|
||||
changelog = "https://github.com/NiaOrg/NiaPy/releases/tag/${src.tag}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oslo-context";
|
||||
version = "6.1.0";
|
||||
version = "6.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "oslo_context";
|
||||
hash = "sha256-wajRfHn1DHECTVTMF8wLAeidv/JYMV3BHX4E5rGgLOM=";
|
||||
hash = "sha256-Rlxn2k2S3Clg3uwUje5GnXrnc2r4aVgeLjtzziz6J6g=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oslo-i18n";
|
||||
version = "6.7.0";
|
||||
version = "6.7.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "oslo_i18n";
|
||||
inherit version;
|
||||
hash = "sha256-0m1SlXtFCgSuD6Xjl4p+TF6gXTcC+2Hv2CqoCcpVx8w=";
|
||||
hash = "sha256-fch5CJBW/ih6b7Rvouc62I+NS5ib1j8ASG9JRDWyTO0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"testing": {
|
||||
"version": "6.18-rc3",
|
||||
"hash": "sha256:01cjjg23av5p8hxbqwfz4jbl0rzm3d1ldibapqcbkkxfcjri612n",
|
||||
"version": "6.18-rc7",
|
||||
"hash": "sha256:03k1kj4bqg3bn0p4lzkbz0yqj1p50v2yr94lrld8rrkbwdawxx3r",
|
||||
"lts": false
|
||||
},
|
||||
"6.1": {
|
||||
@@ -20,18 +20,18 @@
|
||||
"lts": true
|
||||
},
|
||||
"6.6": {
|
||||
"version": "6.6.116",
|
||||
"hash": "sha256:07d5629579apc1d8yb0ki226iyb5n3lwp1yw0p189qlvq919g9d9",
|
||||
"version": "6.6.117",
|
||||
"hash": "sha256:1la3if0n4pv8lii4ggh4c69a61aga66bdl7x1jkvvz92j83k2fv4",
|
||||
"lts": true
|
||||
},
|
||||
"6.12": {
|
||||
"version": "6.12.58",
|
||||
"hash": "sha256:1b0k8snqa2hhviv9imn02y6jrbbb62an3ypx8q8ai9k0cra4q72z",
|
||||
"version": "6.12.59",
|
||||
"hash": "sha256:1gjqr91qysbzx55ic8101l8vsfb4q09bph8m4q1fq3pi4xrwvlm1",
|
||||
"lts": true
|
||||
},
|
||||
"6.17": {
|
||||
"version": "6.17.8",
|
||||
"hash": "sha256:1nmi5xmsys023xgy55dikm1ihim7fp7pf2kc3k00d9zwfm5fd3as",
|
||||
"version": "6.17.9",
|
||||
"hash": "sha256:01lfiw67jm853jr3wddvv0hl6lljscg2ils4ips9sl1wjlxq023d",
|
||||
"lts": false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@ _nixos-rebuild() {
|
||||
|
||||
# flakes options
|
||||
--commit-lock-file
|
||||
--flake # flake-uri
|
||||
--flake -F # flake-uri
|
||||
--override-input # input-name flake-uri
|
||||
--recreate-lock-file
|
||||
--update-input
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
.br
|
||||
.Op Fl -file | f Ar path
|
||||
.Op Fl -attr | A Ar attrPath
|
||||
.Op Fl -flake Ar flake-uri
|
||||
.Op Fl -flake | F Ar flake-uri
|
||||
.Op Fl -no-flake
|
||||
.Op Fl -recreate-lock-file
|
||||
.Op Fl -no-update-lock-file
|
||||
|
||||
@@ -176,7 +176,7 @@ while [ "$#" -gt 0 ]; do
|
||||
--no-ssh-tty)
|
||||
noSSHTTY=1
|
||||
;;
|
||||
--flake)
|
||||
--flake|-F)
|
||||
flake="$1"
|
||||
shift 1
|
||||
;;
|
||||
|
||||
@@ -156,7 +156,11 @@
|
||||
# adds python to closure which is too much by default
|
||||
withUkify ? false,
|
||||
withUserDb ? true,
|
||||
withUtmp ? true,
|
||||
# utmp does not exist on musl, so it would be implicitly disabled
|
||||
# It is important to document the lack of utmp in nix,
|
||||
# otherwise the condition for systemd-update-utmp.service will
|
||||
# attempt to load a service which does not exist, resulting in errors.
|
||||
withUtmp ? !stdenv.hostPlatform.isMusl,
|
||||
withVmspawn ? true,
|
||||
# kernel-install shouldn't usually be used on NixOS, but can be useful, e.g. for
|
||||
# building disk images for non-NixOS systems. To save users from trying to use it
|
||||
|
||||
@@ -21,8 +21,8 @@ let
|
||||
in
|
||||
buildMongoDB {
|
||||
inherit avxSupport;
|
||||
version = "7.0.25";
|
||||
sha256 = "sha256-RAJg1uXGZKi9qOPvW9UK/j0JFTftL8YwGcE7YnZ4Tks=";
|
||||
version = "7.0.26";
|
||||
sha256 = "sha256-731rmMz5C2cmOVKRWmT439uiRUW3kWQCz2/l/Ffk9zI=";
|
||||
patches = [
|
||||
# ModuleNotFoundError: No module named 'mongo_tooling_metrics':
|
||||
# NameError: name 'SConsToolingMetrics' is not defined:
|
||||
|
||||
@@ -1,33 +1,8 @@
|
||||
diff --git a/SConstruct b/SConstruct
|
||||
index 07579349b83..68a26f26a49 100644
|
||||
index 4ec07a36a51..0010dcb6d27 100644
|
||||
--- a/SConstruct
|
||||
+++ b/SConstruct
|
||||
@@ -23,7 +23,6 @@ from pkg_resources import parse_version
|
||||
|
||||
import SCons
|
||||
import SCons.Script
|
||||
-from mongo_tooling_metrics.lib.top_level_metrics import SConsToolingMetrics
|
||||
from site_scons.mongo import build_profiles
|
||||
|
||||
# This must be first, even before EnsureSConsVersion, if
|
||||
@@ -1653,16 +1652,6 @@ env = Environment(variables=env_vars, **envDict)
|
||||
del envDict
|
||||
env.AddMethod(lambda env, name, **kwargs: add_option(name, **kwargs), 'AddOption')
|
||||
|
||||
-# The placement of this is intentional. Here we setup an atexit method to store tooling metrics.
|
||||
-# We should only register this function after env, env_vars and the parser have been properly initialized.
|
||||
-SConsToolingMetrics.register_metrics(
|
||||
- utc_starttime=datetime.utcnow(),
|
||||
- artifact_dir=env.Dir('$BUILD_DIR').get_abspath(),
|
||||
- env_vars=env_vars,
|
||||
- env=env,
|
||||
- parser=_parser,
|
||||
-)
|
||||
-
|
||||
if get_option('build-metrics'):
|
||||
env['BUILD_METRICS_ARTIFACTS_DIR'] = '$BUILD_ROOT/$VARIANT_DIR'
|
||||
env.Tool('build_metrics')
|
||||
@@ -3549,33 +3538,6 @@ def doConfigure(myenv):
|
||||
@@ -3535,33 +3535,6 @@ def doConfigure(myenv):
|
||||
myenv.AddMethod(
|
||||
functools.partial(var_func, var=var, func=CheckFlag), f"Check{var}Supported")
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
libsForQt5,
|
||||
qt6Packages,
|
||||
fcitx5-gtk,
|
||||
librsvg,
|
||||
addons ? [ ],
|
||||
}:
|
||||
|
||||
@@ -25,10 +26,15 @@ symlinkJoin {
|
||||
]
|
||||
++ addons;
|
||||
|
||||
buildInputs = [
|
||||
librsvg
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
postBuild = ''
|
||||
wrapProgram $out/bin/fcitx5 \
|
||||
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
|
||||
--prefix FCITX_ADDON_DIRS : "$out/lib/fcitx5" \
|
||||
--suffix XDG_DATA_DIRS : "$out/share" \
|
||||
--suffix PATH : "$out/bin" \
|
||||
|
||||
@@ -13648,6 +13648,10 @@ with pkgs;
|
||||
stdenv = gccStdenv;
|
||||
};
|
||||
|
||||
cvc5 = callPackage ../by-name/cv/cvc5/package.nix {
|
||||
cadical = cadical.override { version = "2.1.3"; };
|
||||
};
|
||||
|
||||
ekrhyper = callPackage ../applications/science/logic/ekrhyper {
|
||||
ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user