Merge 319145a716 into haskell-updates
This commit is contained in:
@@ -1213,6 +1213,11 @@ lib.mapAttrs mkLicense (
|
||||
fullName = "SGML UG SGML Parser Materials license";
|
||||
};
|
||||
|
||||
sissl11 = {
|
||||
spdxId = "SISSL";
|
||||
fullName = "Sun Industry Standards Source License 1.1";
|
||||
};
|
||||
|
||||
sleepycat = {
|
||||
spdxId = "Sleepycat";
|
||||
fullName = "Sleepycat License";
|
||||
|
||||
@@ -17173,6 +17173,12 @@
|
||||
githubId = 85857;
|
||||
name = "Martin Milata";
|
||||
};
|
||||
mmkaram = {
|
||||
name = "Mahdy Karam";
|
||||
github = "mmkaram";
|
||||
githubId = 64036912;
|
||||
matrix = "@mmkaram:matrix.org";
|
||||
};
|
||||
mmlb = {
|
||||
email = "i@m.mmlb.dev";
|
||||
github = "mmlb";
|
||||
@@ -24421,6 +24427,12 @@
|
||||
name = "sportshead";
|
||||
keys = [ { fingerprint = "A6B6 D031 782E BDF7 631A 8E7E A874 DB2C BFD3 CFD0"; } ];
|
||||
};
|
||||
spreetin = {
|
||||
email = "spreetin@protonmail.com";
|
||||
name = "David Falk";
|
||||
github = "spreetin";
|
||||
githubId = 7392173;
|
||||
};
|
||||
sprock = {
|
||||
email = "rmason@mun.ca";
|
||||
github = "sprock";
|
||||
|
||||
@@ -164,6 +164,8 @@
|
||||
|
||||
- `programs.goldwarden` has been removed, due to the software not working with newer versions of the Bitwarden and Vaultwarden servers, as well as it being abandoned upstream.
|
||||
|
||||
- The default `kops` version is now 1.33.0 and versions 1.30 and older have been dropped. See [Upgrading Kubernetes](https://kops.sigs.k8s.io/tutorial/upgrading-kubernetes/) for instructions on how to update kOps.
|
||||
|
||||
- `Prosody` has been updated to major release 13 which removed some obsoleted modules and brought a couple of major and breaking changes:
|
||||
- The `http_files` module is now disabled by default because it now requires `http_files_dir` to be configured.
|
||||
- The `vcard_muc` module has been removed and got replaced by the inbuilt `muc_vcard` module.
|
||||
|
||||
@@ -84,7 +84,7 @@ in
|
||||
[
|
||||
lsof
|
||||
]
|
||||
++ lib.optionals (lib.elem "librespot" cfg.providers) [
|
||||
++ lib.optionals (lib.elem "spotify" cfg.providers) [
|
||||
librespot
|
||||
]
|
||||
++ lib.optionals (lib.elem "snapcast" cfg.providers) [
|
||||
|
||||
@@ -137,12 +137,8 @@ in
|
||||
|
||||
cleanupSettings = lib.mkOption {
|
||||
inherit (settingsFormat) type;
|
||||
default = {
|
||||
# required by json schema
|
||||
interfaces = { };
|
||||
# https://codeberg.org/liske/ifstate/issues/118
|
||||
namespaces = { };
|
||||
};
|
||||
# required by json schema
|
||||
default.interfaces = { };
|
||||
description = "Content of IfState's initrd cleanup configuration file. See <https://ifstate.net/2.0/schema/> for details. This configuration gets applied before systemd switches to stage two. The goas is to deconfigurate the whole network in order to prevent access to services, before the firewall is configured. The stage two IfState configuration will start after the firewall is configured.";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -218,7 +218,7 @@ in
|
||||
Type = "simple";
|
||||
Restart = "on-failure";
|
||||
|
||||
AmbientCapablities = [ ];
|
||||
AmbientCapabilities = [ ];
|
||||
CapabilityBoundingSet = [ ];
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
|
||||
@@ -283,8 +283,8 @@ in
|
||||
};
|
||||
|
||||
cutoffPackages = mkOption {
|
||||
default = [ config.system.build.initialRamdisk ];
|
||||
defaultText = literalExpression "[ config.system.build.initialRamdisk ]";
|
||||
default = lib.optionals config.boot.initrd.enable [ config.system.build.initialRamdisk ];
|
||||
defaultText = literalExpression "lib.optionals config.boot.initrd.enable [ config.system.build.initialRamdisk ]";
|
||||
type = types.listOf types.package;
|
||||
description = ''
|
||||
Packages to which no replacements should be applied.
|
||||
|
||||
@@ -208,6 +208,10 @@ let
|
||||
++ [
|
||||
"systemd-exit.service"
|
||||
"systemd-update-done.service"
|
||||
|
||||
# Capsule support
|
||||
"capsule@.service"
|
||||
"capsule.slice"
|
||||
]
|
||||
++ cfg.additionalUpstreamSystemUnits;
|
||||
|
||||
|
||||
@@ -30,6 +30,7 @@ let
|
||||
"background.slice"
|
||||
"basic.target"
|
||||
"bluetooth.target"
|
||||
"capsule@.target"
|
||||
"default.target"
|
||||
"exit.target"
|
||||
"graphical-session-pre.target"
|
||||
|
||||
@@ -103,13 +103,24 @@ in
|
||||
extraPackages = mkOption {
|
||||
type = with types; listOf package;
|
||||
default = [ ];
|
||||
description = ''
|
||||
Extra dependencies for podman to be placed on $PATH in the wrapper.
|
||||
'';
|
||||
};
|
||||
|
||||
extraRuntimes = mkOption {
|
||||
type = with types; listOf package;
|
||||
# keep the default in sync with the podman package
|
||||
default = lib.optionals pkgs.stdenv.hostPlatform.isLinux [ pkgs.runc ];
|
||||
defaultText = lib.literalExpression ''lib.optionals pkgs.stdenv.hostPlatform.isLinux [ pkgs.runc ]'';
|
||||
example = lib.literalExpression ''
|
||||
[
|
||||
pkgs.gvisor
|
||||
]
|
||||
'';
|
||||
description = ''
|
||||
Extra packages to be installed in the Podman wrapper.
|
||||
Extra runtime packages to be installed in the Podman wrapper.
|
||||
Those are then placed in libexec/podman, i.e. are seen as podman internal commands.
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -161,21 +172,20 @@ in
|
||||
config.systemd.package # To allow systemd-based container healthchecks
|
||||
]
|
||||
++ lib.optional (config.boot.supportedFilesystems.zfs or false) config.boot.zfs.package;
|
||||
extraRuntimes = [
|
||||
pkgs.runc
|
||||
]
|
||||
++
|
||||
lib.optionals
|
||||
(
|
||||
config.virtualisation.containers.containersConf.settings.network.default_rootless_network_cmd or ""
|
||||
== "slirp4netns"
|
||||
)
|
||||
(
|
||||
with pkgs;
|
||||
[
|
||||
slirp4netns
|
||||
]
|
||||
);
|
||||
extraRuntimes =
|
||||
cfg.extraRuntimes
|
||||
++
|
||||
lib.optionals
|
||||
(
|
||||
config.virtualisation.containers.containersConf.settings.network.default_rootless_network_cmd or ""
|
||||
== "slirp4netns"
|
||||
)
|
||||
(
|
||||
with pkgs;
|
||||
[
|
||||
slirp4netns
|
||||
]
|
||||
);
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -1388,7 +1388,10 @@ in
|
||||
sudo-rs = runTest ./sudo-rs.nix;
|
||||
sunshine = runTest ./sunshine.nix;
|
||||
suricata = runTest ./suricata.nix;
|
||||
suwayomi-server = handleTest ./suwayomi-server.nix { };
|
||||
suwayomi-server = import ./suwayomi-server.nix {
|
||||
inherit runTest;
|
||||
lib = pkgs.lib;
|
||||
};
|
||||
swap-file-btrfs = runTest ./swap-file-btrfs.nix;
|
||||
swap-partition = runTest ./swap-partition.nix;
|
||||
swap-random-encryption = runTest ./swap-random-encryption.nix;
|
||||
@@ -1411,6 +1414,7 @@ in
|
||||
systemd-binfmt = handleTestOn [ "x86_64-linux" ] ./systemd-binfmt.nix { };
|
||||
systemd-boot = handleTest ./systemd-boot.nix { };
|
||||
systemd-bpf = runTest ./systemd-bpf.nix;
|
||||
systemd-capsules = runTest ./systemd-capsules.nix;
|
||||
systemd-confinement = handleTest ./systemd-confinement { };
|
||||
systemd-coredump = runTest ./systemd-coredump.nix;
|
||||
systemd-credentials-tpm2 = runTest ./systemd-credentials-tpm2.nix;
|
||||
|
||||
@@ -32,6 +32,12 @@ import ../make-test-python.nix (
|
||||
boot.supportedFilesystems = [ "zfs" ];
|
||||
networking.hostId = "00000000";
|
||||
};
|
||||
rootful_norunc =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
virtualisation.podman.enable = true;
|
||||
virtualisation.podman.extraRuntimes = [ ];
|
||||
};
|
||||
rootless =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
@@ -80,6 +86,7 @@ import ../make-test-python.nix (
|
||||
|
||||
|
||||
rootful.wait_for_unit("sockets.target")
|
||||
rootful_norunc.wait_for_unit("sockets.target")
|
||||
rootless.wait_for_unit("sockets.target")
|
||||
dns.wait_for_unit("sockets.target")
|
||||
docker.wait_for_unit("sockets.target")
|
||||
@@ -112,6 +119,31 @@ import ../make-test-python.nix (
|
||||
rootful.succeed("podman stop sleeping")
|
||||
rootful.succeed("podman rm sleeping")
|
||||
|
||||
# now without installed runc
|
||||
with subtest("Run runc-less container as root with runc"):
|
||||
rootful_norunc.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
|
||||
rootful_norunc.fail(
|
||||
"podman run --runtime=runc -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
|
||||
)
|
||||
|
||||
with subtest("Run runc-less container as root with crun"):
|
||||
rootful_norunc.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
|
||||
rootful_norunc.succeed(
|
||||
"podman run --runtime=crun -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
|
||||
)
|
||||
rootful_norunc.succeed("podman ps | grep sleeping")
|
||||
rootful_norunc.succeed("podman stop sleeping")
|
||||
rootful_norunc.succeed("podman rm sleeping")
|
||||
|
||||
with subtest("Run runc-less container as root with the default backend"):
|
||||
rootful_norunc.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
|
||||
rootful_norunc.succeed(
|
||||
"podman run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
|
||||
)
|
||||
rootful_norunc.succeed("podman ps | grep sleeping")
|
||||
rootful_norunc.succeed("podman stop sleeping")
|
||||
rootful_norunc.succeed("podman rm sleeping")
|
||||
|
||||
# start systemd session for rootless
|
||||
rootless.succeed("loginctl enable-linger alice")
|
||||
rootless.succeed(su_cmd("whoami"))
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
{
|
||||
system ? builtins.currentSystem,
|
||||
pkgs,
|
||||
lib ? pkgs.lib,
|
||||
}:
|
||||
{ lib, runTest }:
|
||||
|
||||
let
|
||||
inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
|
||||
inherit (lib) recursiveUpdate;
|
||||
|
||||
baseTestConfig = {
|
||||
@@ -17,22 +13,23 @@ let
|
||||
settings.server.port = 1234;
|
||||
};
|
||||
};
|
||||
testScript = ''
|
||||
machine.wait_for_unit("suwayomi-server.service")
|
||||
machine.wait_for_open_port(1234)
|
||||
machine.succeed("curl --fail http://localhost:1234/")
|
||||
'';
|
||||
};
|
||||
in
|
||||
|
||||
{
|
||||
without-auth = makeTest (
|
||||
without-auth = runTest (
|
||||
recursiveUpdate baseTestConfig {
|
||||
name = "suwayomi-server-without-auth";
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("suwayomi-server.service")
|
||||
machine.wait_for_open_port(1234)
|
||||
machine.succeed("curl --fail http://localhost:1234/")
|
||||
'';
|
||||
}
|
||||
);
|
||||
|
||||
with-auth = makeTest (
|
||||
with-auth = runTest (
|
||||
recursiveUpdate baseTestConfig {
|
||||
name = "suwayomi-server-with-auth";
|
||||
|
||||
@@ -50,6 +47,12 @@ in
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("suwayomi-server.service")
|
||||
machine.wait_for_open_port(1234)
|
||||
machine.succeed("curl --fail -u alice:pass http://localhost:1234/")
|
||||
'';
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
{ lib, ... }:
|
||||
{
|
||||
name = "systemd-capsules";
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ fpletz ];
|
||||
|
||||
nodes.machine =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = [ pkgs.hello ];
|
||||
systemd.user.services.alice-sleep = {
|
||||
wantedBy = [ "capsule@alice.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.coreutils}/bin/sleep 999";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = # python
|
||||
''
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
|
||||
with subtest("capsule setup"):
|
||||
machine.succeed("systemctl start capsule@alice.service")
|
||||
|
||||
with subtest("imperative user service in capsule"):
|
||||
machine.succeed("systemd-run --capsule=alice --unit=sleeptest.service /run/current-system/sw/bin/sleep 999")
|
||||
machine.succeed("systemctl --capsule=alice status sleeptest.service")
|
||||
|
||||
with subtest("declarative user service in capsule"):
|
||||
machine.succeed("systemctl --capsule=alice status alice-sleep.service")
|
||||
machine.succeed("systemctl --capsule=alice stop alice-sleep.service")
|
||||
machine.fail("systemctl --capsule=alice status alice-sleep.service")
|
||||
machine.succeed("systemctl --capsule=alice start alice-sleep.service")
|
||||
machine.succeed("systemctl --capsule=alice status alice-sleep.service")
|
||||
|
||||
with subtest("interactive shell with terminal in capsule"):
|
||||
hello_output = machine.succeed("systemd-run -t --capsule=alice /run/current-system/sw/bin/bash -i -c 'hello | tee ~/hello'")
|
||||
assert hello_output == "Hello, world!\r\n"
|
||||
machine.copy_from_vm("/var/lib/capsules/alice/hello")
|
||||
|
||||
with subtest("capsule cleanup"):
|
||||
machine.succeed("systemctl --capsule=alice stop sleeptest.service")
|
||||
machine.succeed("systemctl stop capsule@alice.service")
|
||||
machine.succeed("systemctl clean --all capsule@alice.service")
|
||||
'';
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
{ pkgs, ... }:
|
||||
{ lib, pkgs, ... }:
|
||||
{
|
||||
name = "systemd";
|
||||
|
||||
@@ -108,6 +108,14 @@
|
||||
# Will not succeed unless ConditionFirstBoot=yes
|
||||
machine.wait_for_unit("first-boot-complete.target")
|
||||
|
||||
machine.succeed(
|
||||
"journalctl --system -o cat --grep 'systemd ${lib.escapeRegex pkgs.systemd.version} running'"
|
||||
)
|
||||
|
||||
assert "systemd ${lib.versions.major pkgs.systemd.version} (${pkgs.systemd.version})" in machine.succeed(
|
||||
"systemctl --version"
|
||||
)
|
||||
|
||||
# Make sure, a subsequent boot isn't a ConditionFirstBoot=yes.
|
||||
machine.reboot()
|
||||
machine.wait_for_x()
|
||||
|
||||
@@ -1,90 +1,90 @@
|
||||
{
|
||||
"platform_major": "4",
|
||||
"platform_minor": "36",
|
||||
"version": "4.36",
|
||||
"platform_minor": "37",
|
||||
"version": "4.37",
|
||||
"year": "2025",
|
||||
"month": "06",
|
||||
"buildmonth": "05",
|
||||
"dayHourMinute": "281830",
|
||||
"month": "09",
|
||||
"buildmonth": "09",
|
||||
"dayHourMinute": "050730",
|
||||
"eclipses": {
|
||||
"cpp": {
|
||||
"description": "Eclipse IDE for C/C++ Developers",
|
||||
"dropUrl": false,
|
||||
"hashes": {
|
||||
"x86_64": "sha256-UEiL8AlghabRlAy29Blx7s+RAYSsfS1C1AozqBB11Sg=",
|
||||
"aarch64": "sha256-MxRd2H+JSXPwGZjWuKWS1ocayQSFsinuYk21qBU+EzI="
|
||||
"x86_64": "sha256-La+sX7ouIfvgbXPNIlmkpDzwwiT5VJfkl4ma4eFKjqw=",
|
||||
"aarch64": "sha256-U1kFulGX7apNrlY3WPeu/FqQqu3SoxfsHHErbAscFtE="
|
||||
}
|
||||
},
|
||||
"dsl": {
|
||||
"description": "Eclipse IDE for Java and DSL Developers",
|
||||
"dropUrl": false,
|
||||
"hashes": {
|
||||
"x86_64": "sha256-SoaX7jWQ6CtirHh8yq5neZs3b36HCkzGDjQIiRJmKSM=",
|
||||
"aarch64": "sha256-Bi/HxncUPitaWKxntdQjVNlGcU8/kn2QxC3M3rejxXM="
|
||||
"x86_64": "sha256-8zXSMxKKTPnL8rqW7YT+6Gtud1pyHFmcLKOSihJWjCA=",
|
||||
"aarch64": "sha256-7nsn3iWBp9N/mdcpyPH7j5tfV+sL/jCTuhvpDHmKx8I="
|
||||
}
|
||||
},
|
||||
"embedcpp": {
|
||||
"description": "Eclipse IDE for Embedded C/C++ Developers",
|
||||
"dropUrl": false,
|
||||
"hashes": {
|
||||
"x86_64": "sha256-8B0qiKNRSl8PPzYDoura6t8vsFVjg5mNVrzvWwf1UFQ=",
|
||||
"aarch64": "sha256-NzzvijvwcW6jyy3QvwIRqLlNtHHdTsv79utkRMUfvew="
|
||||
"x86_64": "sha256-48cEpt11ndShjxUCQDX2ObI+cx9frGloJ7EICjmErC8=",
|
||||
"aarch64": "sha256-zSMDR+Y4JIdu+PoYFyk+FPNKcYbRiika2TeGg3g88pg="
|
||||
}
|
||||
},
|
||||
"modeling": {
|
||||
"description": "Eclipse Modeling Tools",
|
||||
"dropUrl": false,
|
||||
"hashes": {
|
||||
"x86_64": "sha256-r6cRPy4PgThRzVgMXpJS2X4m+tU6MFh7fLW8SGaYvGw=",
|
||||
"aarch64": "sha256-cM0OQdcbVeOYl+IgsdwSU52+jobGIECFc1pnI2Y4dwY="
|
||||
"x86_64": "sha256-9Qq5ziLa2vjX6bJjZ67qwF4nVNdqTQ80kz9GANtJCIw=",
|
||||
"aarch64": "sha256-6//g6G3U1fC5mGgOci6Zgxx3YTJEZQ2pMBVjbJ9/mPE="
|
||||
}
|
||||
},
|
||||
"platform": {
|
||||
"description": "Eclipse Platform ${year}-${month}",
|
||||
"dropUrl": true,
|
||||
"hashes": {
|
||||
"x86_64": "sha256-n5DtlmBqHUuzvuND0NLlDZxeHY7YvhHF5Sp4JdzvFYA=",
|
||||
"aarch64": "sha256-OgGjb5TtqnAfiTs9PgF1h+W+lr32+okYC/3I513VPa4="
|
||||
"x86_64": "sha256-C8P9x7C0tMYFQwJiBlF5JycWvWcF71ZWsDEwXPl1K34=",
|
||||
"aarch64": "sha256-8qpNqHpi1BEHQt3nkFbeLzQccPSwu0op2THyWulhnLU="
|
||||
}
|
||||
},
|
||||
"SDK": {
|
||||
"description": "Eclipse ${year}-${month} Classic",
|
||||
"dropUrl": true,
|
||||
"hashes": {
|
||||
"x86_64": "sha256-Wd90SkwUBSAOEMh+Qw7ATaPmHw98rVmyLak0M10h1Lw=",
|
||||
"aarch64": "sha256-YwC/7rmd/mVyJITz8xYaYrMZtjdIlHmp6sos9lcnLig="
|
||||
"x86_64": "sha256-Kx9WEpu4UbCeeKfmWV0iIyAd09xh9ffHm39dahlIlW8=",
|
||||
"aarch64": "sha256-MWI2KpZQPTbw7Ro0+3Ab+nnIzbSTPGwqjhBfeu4tmE8="
|
||||
}
|
||||
},
|
||||
"java": {
|
||||
"description": "Eclipse IDE for Java Developers",
|
||||
"dropUrl": false,
|
||||
"hashes": {
|
||||
"x86_64": "sha256-H3t1yYPqWYrPd3k6MwUwj86I4GDwlBhamqrbCYcSKOw=",
|
||||
"aarch64": "sha256-vzV8OvYPJJwJQ/NxXF0u3htSgqQZbPEHv2KZcHp1eqA="
|
||||
"x86_64": "sha256-L5vqC+jboYQAR+CtNAEXgDACxEG0r1rlx4ruc264cUc=",
|
||||
"aarch64": "sha256-xxZjwmF24CbKeK7IQXkgylFTTGIHo1Wz6FnL/EUmCaQ="
|
||||
}
|
||||
},
|
||||
"jee": {
|
||||
"description": "Eclipse IDE for Enterprise Java and Web Developers",
|
||||
"dropUrl": false,
|
||||
"hashes": {
|
||||
"x86_64": "sha256-5mYH71A/pCDQcjT7SZHacK5wl0k3n/sSfzrh5mE+r0E=",
|
||||
"aarch64": "sha256-grKXfdIN3xSsyEScmKnDumLqH7fiNpbLmHyD8sPlhIA="
|
||||
"x86_64": "sha256-bFCbFLRtltZ/GJwAoFd3MH/FknDF6hnvX9LQHQs9eKg=",
|
||||
"aarch64": "sha256-DXw/dt4Gjz0e7szjJUaKB3wsUdnNj3wCX8cVpMlYkCc="
|
||||
}
|
||||
},
|
||||
"committers": {
|
||||
"description": "Eclipse IDE for Eclipse Committers and Eclipse Platform Plugin Developers",
|
||||
"dropUrl": false,
|
||||
"hashes": {
|
||||
"x86_64": "sha256-BuXTbz4JaQw3GS7vnr+H0lBSJICbTTjqkYxl45mJfSw=",
|
||||
"aarch64": "sha256-wpZwKN9gjb5r0yi8wNcN599KG9dWrIHHW5LhWWYWLzs="
|
||||
"x86_64": "sha256-HF1RuiuDGFxwxFQrXXUcpssA4SnioTYGSjQrF0H/F2Q=",
|
||||
"aarch64": "sha256-ZZ7Wy6Nua4sKPlFv/LaiM+pRrF23PEuUVK4I5rA40Sk="
|
||||
}
|
||||
},
|
||||
"rcp": {
|
||||
"description": "Eclipse IDE for RCP and RAP Developers",
|
||||
"dropUrl": false,
|
||||
"hashes": {
|
||||
"x86_64": "sha256-fUVoq4h3nJ573CWREUJplEocz+f9ql5fa8AoC0B2ugs=",
|
||||
"aarch64": "sha256-YAYMTzPXEGfmeNIQ1bnHyR/b3Jm6XvGbeaezNtBl2wU="
|
||||
"x86_64": "sha256-jxLIw4MaLqAi+b6l6lf56cb9z7J8NBUJYbbxhv65uSc=",
|
||||
"aarch64": "sha256-A+3dk2FZaXBO/pb9F/33imO0Fk6j4zszLfnDsP+znG4="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,28 +9,28 @@
|
||||
}:
|
||||
rec {
|
||||
extraFontsSrc = fetchurl {
|
||||
url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz";
|
||||
sha256 = "0hylgjmd95y9yahbblmawkkw0i71vb145xxv2xqrmff81301n6k7";
|
||||
url = "https://www.texmacs.org/Download/ftp/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz";
|
||||
sha256 = "sha256-ZxobwAjIuZpxF7v3QsLa4UTA5+Sq0rWg8smX1Kp81EM=";
|
||||
};
|
||||
|
||||
fullFontsSrc = fetchurl {
|
||||
url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-windows-fonts-1.0-noarch.tar.gz";
|
||||
sha256 = "1yxzjpqpm7kvx0ly5jmfpzlfhsh41b0ibn1v84qv6xy73r2vis2f";
|
||||
url = "https://www.texmacs.org/Download/ftp/fonts/TeXmacs-windows-fonts-1.0-noarch.tar.gz";
|
||||
sha256 = "sha256-Tui4RR7Hd7MxQTvYFcEKBGro6L+uyuIp6HueevGVv/s=";
|
||||
};
|
||||
|
||||
chineseFontsSrc = fetchurl {
|
||||
url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-chinese-fonts.tar.gz";
|
||||
sha256 = "0yprqjsx5mfsaxr525mcm3xqwcadzxp14njm38ir1325baada2fp";
|
||||
url = "https://www.texmacs.org/Download/ftp/fonts/TeXmacs-chinese-fonts.tar.gz";
|
||||
sha256 = "sha256-1wnVlFpFjJAjGlVaEm7/TTGO+6isFlFyV9rV0rXE+Xo=";
|
||||
};
|
||||
|
||||
japaneseFontsSrc = fetchurl {
|
||||
url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-japanese-fonts.tar.gz";
|
||||
sha256 = "1dn6zvsa7gk59d61xicwpbapab3rm6kz48rp5w1bhmihxixw21jn";
|
||||
url = "https://www.texmacs.org/Download/ftp/fonts/TeXmacs-japanese-fonts.tar.gz";
|
||||
sha256 = "sha256-VgbBe+wwVrgCLzcj8qepeSx11bqcxR5MS2W+o/T+xrY=";
|
||||
};
|
||||
|
||||
koreanFontsSrc = fetchurl {
|
||||
url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-korean-fonts.tar.gz";
|
||||
sha256 = "07axg57mqm3jbnm4lawx0h3r2h56xv9acwzjppryfklw4c27f5hh";
|
||||
url = "https://www.texmacs.org/Download/ftp/fonts/TeXmacs-korean-fonts.tar.gz";
|
||||
sha256 = "sha256-EBZ3BCOcTufzvfJzptLupkCRBwSdK0qqXXJUXE95XR0=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
|
||||
@@ -3427,8 +3427,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "remote-containers";
|
||||
publisher = "ms-vscode-remote";
|
||||
version = "0.422.1";
|
||||
hash = "sha256-UT0vveuvdw47Bko05kHrIQzqtJX96xFtlGDKrWlULos=";
|
||||
version = "0.427.0";
|
||||
hash = "sha256-aSwC8NLJxelv2B+FnF8rmA5pnowugmdF+gnm+A0qSiE=";
|
||||
};
|
||||
meta = {
|
||||
description = "Open any folder or repository inside a Docker container";
|
||||
@@ -3461,8 +3461,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "remote-wsl";
|
||||
publisher = "ms-vscode-remote";
|
||||
version = "0.99.0";
|
||||
hash = "sha256-zwM4gj11sM00HjaOUFEZ77Vm07iCDwwPmEqiJ97kXL8=";
|
||||
version = "0.104.2";
|
||||
hash = "sha256-kkMrsElu+QrIJXWpSHwKtJF+E5lpkVUVFO090DwXmM8=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/ms-vscode-remote.remote-wsl/changelog";
|
||||
@@ -5034,8 +5034,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-gradle";
|
||||
publisher = "vscjava";
|
||||
version = "3.16.2024111106";
|
||||
hash = "sha256-w+3YJCEoq8WZSozo5AGL9Ux/MSSKxwcrB7701qQ6XVE=";
|
||||
version = "3.17.0";
|
||||
hash = "sha256-SZRSSgi4/8cEHGvhoGf9J8hrSIQWn1sFTh4NSsJcMDg=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "RooVeterinaryInc";
|
||||
name = "roo-cline";
|
||||
version = "3.27.0";
|
||||
hash = "sha256-Lkn0yoe/Oy3bbhIWf+qj0pNYTQHDiFfNRSFHSGAqPVc=";
|
||||
version = "3.28.3";
|
||||
hash = "sha256-aBS6T8S8+D9FGIAPi5dELKyqt3/oqFVa6XNDcTMYkoM=";
|
||||
};
|
||||
|
||||
passthru.updateScript = vscode-extension-update-script { };
|
||||
|
||||
@@ -36,20 +36,20 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-ABnbLiF8AKClsGjhHb/yK4jD3Tt8y/NdbxicSkp+Hbs=";
|
||||
x86_64-darwin = "sha256-eVMePttMG9z/gpvH7PraIV7uNL7mvBEPzb+2ileSaXQ=";
|
||||
aarch64-linux = "sha256-ktKbIgbF1el5xHB+AS3uP3o35H2dIhUJ4NHNCoQhI3s=";
|
||||
aarch64-darwin = "sha256-xa+CR4g/CaDLLtsooY+fVcTsPtO/fcFo4DYAYFCVrvY=";
|
||||
armv7l-linux = "sha256-MyLZj+hiHW1yP3mhNJlb2hh40KaqkG1CYz00Me7wzeo=";
|
||||
x86_64-linux = "sha256-y0Bjrxmp7DYV4iUDnQGC0aIYrQNM3oPicajbeVuEtqc=";
|
||||
x86_64-darwin = "sha256-6/BiMvVp955PW0hz22+NzdvC+IC+pNYjz25n3Op6V/k=";
|
||||
aarch64-linux = "sha256-DF8QnqvVFqNyxjrphR6NaUXOKr8Koe34NitRa5mTBYs=";
|
||||
aarch64-darwin = "sha256-v+m8AMpPph6CztUCjneBKC9txEOAKvcHsAXr/8KjIeA=";
|
||||
armv7l-linux = "sha256-py1FZYd77YVNloQbXm36ou4HGowmteY8HzOiUioGD8Y=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.104.0";
|
||||
version = "1.104.1";
|
||||
|
||||
# This is used for VS Code - Remote SSH test
|
||||
rev = "f220831ea2d946c0dcb0f3eaa480eb435a2c1260";
|
||||
rev = "0f0d87fa9e96c856c5212fc86db137ac0d783365";
|
||||
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-arCYSIxRJSKQxjhnYfFexY3CAjsw4mNoP197C/LzaV4=";
|
||||
hash = "sha256-o0O/WDH+hr3R9np+WPLJo+/nIVBRjP8H2JVwa8volfg=";
|
||||
};
|
||||
stdenv = stdenvNoCC;
|
||||
};
|
||||
|
||||
@@ -26,11 +26,11 @@ let
|
||||
|
||||
hash =
|
||||
{
|
||||
x86_64-linux = "sha256-4ynELB05qymWH5p8zx1yJ4ZFdkr/LHFV2ntBNE9vWbc=";
|
||||
x86_64-darwin = "sha256-4otc7yM06HLU7i60qrbZcA9aX8tZkDZo89xdeF5ztTM=";
|
||||
aarch64-linux = "sha256-fUgj9gGgjvsrLeSMIgWGgHdnUQydj8Jo9Aq9uOi19oA=";
|
||||
aarch64-darwin = "sha256-ZlWZIHAmAirwWML2rV8CrVWOGCn64yyE+aCobCK5kR0=";
|
||||
armv7l-linux = "sha256-JqESQgxVAG+NTFUUEqxZCP+utxYzwFBv65xuQUTRZfU=";
|
||||
x86_64-linux = "sha256-nGGaEEPP1LIm0NqqMu5DoYqVkwVYMn0fI5h3QySMT4Y=";
|
||||
x86_64-darwin = "sha256-Fuv0iQGVFnO2CTWkdBd1fTKWJKhId18vfbWC23F8i/s=";
|
||||
aarch64-linux = "sha256-5p9njg1YHaNuRSItG9QD9UTgm47+Qm3mJWevTh0HFKM=";
|
||||
aarch64-darwin = "sha256-LMrvGlPkl2QHdVQnLSwWtCT08SBtm4C3kXxzHvsLpXg=";
|
||||
armv7l-linux = "sha256-EAgd0s/4Wl58hgBM+oUeFmXPyXQdmDwTC+EXqaJf7ME=";
|
||||
}
|
||||
.${system} or throwSystem;
|
||||
|
||||
@@ -41,7 +41,7 @@ callPackage ./generic.nix rec {
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.104.06114";
|
||||
version = "1.104.16282";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
mpfr,
|
||||
nanosvg,
|
||||
nlopt,
|
||||
nlohmann_json,
|
||||
opencascade-occt_7_6_1,
|
||||
openvdb,
|
||||
qhull,
|
||||
@@ -39,6 +40,7 @@
|
||||
systemd,
|
||||
udevCheckHook,
|
||||
z3,
|
||||
nix-update-script,
|
||||
wxGTK-override ? null,
|
||||
opencascade-override ? null,
|
||||
}:
|
||||
@@ -61,12 +63,12 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "prusa-slicer";
|
||||
version = "2.9.2";
|
||||
version = "2.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prusa3d";
|
||||
repo = "PrusaSlicer";
|
||||
hash = "sha256-j/fdEgcFq0nWBLpyapwZIbBIXCnqEWV6Tk+6sTHk/Bc=";
|
||||
hash = "sha256-B2uHrh09xKehmxnk3I4MHIjBfB/pGgFXC6R5k10JoJY=";
|
||||
rev = "version_${finalAttrs.version}";
|
||||
};
|
||||
|
||||
@@ -132,6 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
catch2_3
|
||||
webkitgtk_4_1
|
||||
z3
|
||||
nlohmann_json
|
||||
]
|
||||
++ lib.optionals withSystemd [
|
||||
systemd
|
||||
@@ -223,20 +226,26 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"libslic3r_tests|sla_print_tests"
|
||||
];
|
||||
|
||||
meta =
|
||||
with lib;
|
||||
{
|
||||
description = "G-code generator for 3D printer";
|
||||
homepage = "https://github.com/prusa3d/PrusaSlicer";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [
|
||||
tweber
|
||||
tmarkus
|
||||
fliegendewurst
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
}
|
||||
// lib.optionalAttrs (stdenv.hostPlatform.isDarwin) {
|
||||
mainProgram = "PrusaSlicer";
|
||||
};
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"^version_(.+)$"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "G-code generator for 3D printer";
|
||||
homepage = "https://github.com/prusa3d/PrusaSlicer";
|
||||
changelog = "https://github.com/prusa3d/PrusaSlicer/releases/tag/version_${finalAttrs.version}";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
tweber
|
||||
tmarkus
|
||||
fliegendewurst
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
}
|
||||
// lib.optionalAttrs (stdenv.hostPlatform.isDarwin) {
|
||||
mainProgram = "PrusaSlicer";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -798,7 +798,7 @@
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "140.0.7339.127",
|
||||
"version": "140.0.7339.185",
|
||||
"deps": {
|
||||
"depot_tools": {
|
||||
"rev": "7d1e2bdb9168718566caba63a170a67cdab2356b",
|
||||
@@ -810,16 +810,16 @@
|
||||
"hash": "sha256-Z7bTto8BHnJzjvmKmcVAZ0/BrXimcAETV6YGKNTorQw="
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "140.0.7339.127-1",
|
||||
"hash": "sha256-mhMudxJU2arMcmECS9+3ne9X66zyKq5WGc8PSx9RfLc="
|
||||
"rev": "140.0.7339.185-1",
|
||||
"hash": "sha256-hhmjjlir2g4RmHKkibmY1e/Ayabyy82jeQXvxQq9gJ4="
|
||||
},
|
||||
"npmHash": "sha256-R2gOpfPOUAmnsnUTIvzDPHuHNzL/b2fwlyyfTrywEcI="
|
||||
},
|
||||
"DEPS": {
|
||||
"src": {
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git",
|
||||
"rev": "9412745860d8c3dfed9cf38f5daa943b163f8c69",
|
||||
"hash": "sha256-rAyS5AhWHL9+6N4+2PFYKPJjzErj8LfIm5ptcsTTV8E=",
|
||||
"rev": "eeea00e459e8b6cd69698eda5b236a0d4cb3234d",
|
||||
"hash": "sha256-BjjFH7/HhPBw/b7XmRZVNUrJYAUkWgCR0upHBn+Q5Ec=",
|
||||
"recompress": true
|
||||
},
|
||||
"src/third_party/clang-format/script": {
|
||||
@@ -929,8 +929,8 @@
|
||||
},
|
||||
"src/third_party/dawn": {
|
||||
"url": "https://dawn.googlesource.com/dawn.git",
|
||||
"rev": "8550f9c1ff8859d25cc49bdfacef083cff2c5121",
|
||||
"hash": "sha256-gDtFhalOMFWR25XLVbYB/GE1lSQd1ClZ8h175qkC6PU="
|
||||
"rev": "67be7fddacc4f4bcb21d0cf7bf8bb18752d8fb08",
|
||||
"hash": "sha256-ulw+gDGpUn8uWuNedlfQADwnSYYbPWpHN5Q+pJbwKGc="
|
||||
},
|
||||
"src/third_party/dawn/third_party/glfw": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
|
||||
@@ -1589,8 +1589,8 @@
|
||||
},
|
||||
"src/v8": {
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git",
|
||||
"rev": "fdb12b460f148895f6af2ff0e0d870ff8889f154",
|
||||
"hash": "sha256-x8a8VYFrAZ0huj3WRlczrhg0quXx4cztz8nDs9ToWYg="
|
||||
"rev": "6d56a0bd0840ce46c80ada63f8c962bd1bb336aa",
|
||||
"hash": "sha256-VtW/nwKo3jCYfLBHvpAVdLJIRNxw27RAP1K+WgaO5Uc="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"packageVersion": "142.0.1-1",
|
||||
"packageVersion": "143.0-1",
|
||||
"source": {
|
||||
"rev": "142.0.1-1",
|
||||
"hash": "sha256-frAMrNEGv36+SshorhjnOimT3bKe9uLaDjxbuqSp39c="
|
||||
"rev": "143.0-1",
|
||||
"hash": "sha256-eR5ArTe/XVz5CCEzgZ061i4ta+opX+hvbcChscsTBcs="
|
||||
},
|
||||
"firefox": {
|
||||
"version": "142.0.1",
|
||||
"hash": "sha512-/KG5xnoLLyFvHxH9XjoIkgmYkh49YetjPx3ef+actAzbtjpBod/E8QIlCdpkPjeRRn2I5i5+owspPr9p2Hu1hQ=="
|
||||
"version": "143.0",
|
||||
"hash": "sha512-Sf5eXbt1Ob4+TFF9PKxFPqm3OeYQQMSsGrzz1mZXMvul/5H7BA88ApSvD4woJCNalOYKycJuJcsU2J1LUMipEQ=="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -71,27 +71,21 @@ in
|
||||
rec {
|
||||
mkKops = generic;
|
||||
|
||||
kops_1_27 = mkKops rec {
|
||||
version = "1.27.1";
|
||||
sha256 = "sha256-WV+0380yj8GHckY4PDM3WspbZ/YuYZOAQEMd2ygEOjo=";
|
||||
kops_1_31 = mkKops rec {
|
||||
version = "1.31.0";
|
||||
sha256 = "sha256-q9megrNXXKJ/YqP/fjPHh8Oji4dPK5M3HLHa+ufwRAM=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
kops_1_28 = mkKops rec {
|
||||
version = "1.28.7";
|
||||
sha256 = "sha256-rTf7+w/o8MGSBKV9wCzZOEI0v31exZhOJpRABeF/KyI=";
|
||||
kops_1_32 = mkKops rec {
|
||||
version = "1.32.1";
|
||||
sha256 = "sha256-nQKeTDajtUffPBhPrPuaJ+1XWgLDUltwDQDZHkylys4=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
kops_1_29 = mkKops rec {
|
||||
version = "1.29.2";
|
||||
sha256 = "sha256-SRj0x9N+yfTG/UL/hu1ds46Zt6d5SUYU0PA9lPHO6jQ=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
kops_1_30 = mkKops rec {
|
||||
version = "1.30.4";
|
||||
sha256 = "sha256-f+VdgQj6tHWrn+LG6qkArjcADYfpKjuOp+bU0BTYsWY=";
|
||||
kops_1_33 = mkKops rec {
|
||||
version = "1.33.0";
|
||||
sha256 = "sha256-VnnKWcU83yqsKW54Q1tr99/Ln8ppMyB7GLl70rUFGDY=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -552,13 +552,13 @@
|
||||
"vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g="
|
||||
},
|
||||
"grafana": {
|
||||
"hash": "sha256-z/XV4HMbwTAmAUDerFpukvapEHuWGGT/LPE/phtykIU=",
|
||||
"hash": "sha256-HmHqRFdyzJLxkTIqde+NCv3FHILL4xjYFqlOiVCQprs=",
|
||||
"homepage": "https://registry.terraform.io/providers/grafana/grafana",
|
||||
"owner": "grafana",
|
||||
"repo": "terraform-provider-grafana",
|
||||
"rev": "v4.5.3",
|
||||
"rev": "v4.8.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-LkWUyuQYJYK5RK5DNKhbOQyfrg0qcM5Z+0oB65La3GQ="
|
||||
"vendorHash": "sha256-0l2Y8mWsJzZ/j7isUullkZ48z/MyDYFid4crH8b0Hp8="
|
||||
},
|
||||
"gridscale": {
|
||||
"hash": "sha256-zD3KiTLKALVOvFOewWyrd65p0XmLOi/bSIP27dXwveU=",
|
||||
@@ -597,11 +597,11 @@
|
||||
"vendorHash": "sha256-sPvX69R2BmlY/KhXZgxCunzseoOkz1h2b8yqekBBn0k="
|
||||
},
|
||||
"heroku": {
|
||||
"hash": "sha256-Kc9/k+PyUHXj3F3YnqlPI+d7eroscBkdHt68nUbwyX8=",
|
||||
"hash": "sha256-/2XfqyyoxwcFKgbLli1i7PX58OD0iczTPxVVz8Rkeoc=",
|
||||
"homepage": "https://registry.terraform.io/providers/heroku/heroku",
|
||||
"owner": "heroku",
|
||||
"repo": "terraform-provider-heroku",
|
||||
"rev": "v5.2.11",
|
||||
"rev": "v5.2.13",
|
||||
"spdx": null,
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -633,11 +633,11 @@
|
||||
"vendorHash": "sha256-SsEWNIBkgcdTlSrB4hIvRmhMv2eJ2qQaPUmiN09A+NM="
|
||||
},
|
||||
"huaweicloud": {
|
||||
"hash": "sha256-GHwwOk8ehMICu024vcJKEs1ruO7KZqIq+tvQIgPnbjg=",
|
||||
"hash": "sha256-0bfwqqI/o+erzfF2f0Hp0ULl6FxHjqXQAcdphTGI0CY=",
|
||||
"homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
|
||||
"owner": "huaweicloud",
|
||||
"repo": "terraform-provider-huaweicloud",
|
||||
"rev": "v1.78.1",
|
||||
"rev": "v1.78.4",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -831,13 +831,13 @@
|
||||
"vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI="
|
||||
},
|
||||
"migadu": {
|
||||
"hash": "sha256-4nNOcRM3iOtEs7HVCXKhhERankS1DKUY7cApWcfnHLY=",
|
||||
"hash": "sha256-G9/xg4wpqPesRg3+iJU6j71eP8iiFBuQNbSOBpvRR50=",
|
||||
"homepage": "https://registry.terraform.io/providers/metio/migadu",
|
||||
"owner": "metio",
|
||||
"repo": "terraform-provider-migadu",
|
||||
"rev": "2025.8.28",
|
||||
"rev": "2025.9.18",
|
||||
"spdx": "0BSD",
|
||||
"vendorHash": "sha256-33hZ+MB96pFkHCG3UkKcnPp8wpE8POEHLz12OSF8ujI="
|
||||
"vendorHash": "sha256-cmmTZNYnUebEUiRYZ300VqMz0AiuiTYLZyVOozqC8wo="
|
||||
},
|
||||
"minio": {
|
||||
"hash": "sha256-+I1nTNxLVny0pgdMF7vXPC3WxkInSXnbeHcqgrWG55s=",
|
||||
@@ -994,13 +994,13 @@
|
||||
"vendorHash": "sha256-AlB9tC3KejgUAjjT2pY7Q2mTS/AV4QRusSnyPiOheXE="
|
||||
},
|
||||
"opentelekomcloud": {
|
||||
"hash": "sha256-eZHDzF7029QKzvVegQnVVNe/BaG4m53tydcQlKeE57o=",
|
||||
"hash": "sha256-o4RIRu4SqjA+8mI+XvB1m8ecm2blINkK59UJOYGCyKk=",
|
||||
"homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
|
||||
"owner": "opentelekomcloud",
|
||||
"repo": "terraform-provider-opentelekomcloud",
|
||||
"rev": "v1.36.47",
|
||||
"rev": "v1.36.48",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-yTkPnoyOwp+eL8xDf4WISphw5IrGi3gL7WuLvG02rUE="
|
||||
"vendorHash": "sha256-TwF/DxoPDtaXyLhE432Su7h/nGncAP8ArsbnvcnABH8="
|
||||
},
|
||||
"openwrt": {
|
||||
"hash": "sha256-z78IceF2VJtiQpVqC+rTUDsph73LZawIK+az3rEhljA=",
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
# overridable. This is useful when the upstream archive was replaced
|
||||
# and nixpkgs is not in sync yet.
|
||||
officeVersion ? {
|
||||
version = "1224";
|
||||
version = "1228";
|
||||
edition = "";
|
||||
hash = "sha256-Y6x5E8WeI7Pf/wczWNKnHsCbXWW4Jdzo4ToBdzgmOF8=";
|
||||
hash = "sha256-Va0QkLQtsPbDAo3ygfp6UKr0OkLLBS0yAup+xLoLD0s=";
|
||||
},
|
||||
|
||||
...
|
||||
|
||||
@@ -7,9 +7,9 @@
|
||||
# Softmaker Office or when the upstream archive was replaced and
|
||||
# nixpkgs is not in sync yet.
|
||||
officeVersion ? {
|
||||
version = "1224";
|
||||
version = "1228";
|
||||
edition = "2024";
|
||||
hash = "sha256-ix9R9Xlugvu5qmKAqC2DsZFhyJ+VVsD7MSpBv+4lmTY=";
|
||||
hash = "sha256-3/pdn3LLYy5U6GZp5jABH2oMpP/kDU9oAO9KvMwo9V8=";
|
||||
},
|
||||
|
||||
...
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "air";
|
||||
version = "1.62.0";
|
||||
version = "1.63.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "air-verse";
|
||||
repo = "air";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-egduQyC/f8La39pWvVfDuQ2l5oRz5ZPiCqH8wAAS1OA=";
|
||||
hash = "sha256-S8ARa6vZzKQTUhGt2eEdRDXCFyspSNLdGqhlIy0RjDc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ESrIn06Uhmq4qP1fdgIcao6ha1ZCqeu3cxJ1vvjRNKk=";
|
||||
vendorHash = "sha256-1HUWdJc2YaLtszAswQTWn3bevDFJwY5xTCMlYM8j+GU=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -23,6 +23,22 @@
|
||||
bash,
|
||||
}:
|
||||
let
|
||||
awg-vendored = amneziawg-go.overrideAttrs (
|
||||
finalAttrs: prevAttrs: {
|
||||
name = "amneziawg-go";
|
||||
version = "0.2.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amnezia-vpn";
|
||||
repo = "amneziawg-go";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vXSPUGBMP37kXJ4Zn5TDLAzG8N+yO/IIj9nSKrZ+sFA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9OtIb3UQXpAA0OzPhDIdb9lXZQHHiYCcmjHAU+vCtpk=";
|
||||
}
|
||||
);
|
||||
|
||||
amnezia-tun2socks = tun2socks.overrideAttrs (
|
||||
finalAttrs: prevAttrs: {
|
||||
pname = "amnezia-tun2socks";
|
||||
@@ -77,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace client/platforms/linux/daemon/wireguardutilslinux.cpp \
|
||||
--replace-fail 'm_tunnel.start(appPath.filePath("../../client/bin/wireguard-go"), wgArgs);' 'm_tunnel.start("${amneziawg-go}/bin/amneziawg-go", wgArgs);'
|
||||
--replace-fail 'm_tunnel.start(appPath.filePath("../../client/bin/wireguard-go"), wgArgs);' 'm_tunnel.start("${awg-vendored}/bin/amneziawg-go", wgArgs);'
|
||||
substituteInPlace client/utilities.cpp \
|
||||
--replace-fail 'return Utils::executable("../../client/bin/openvpn", true);' 'return Utils::executable("${openvpn}/bin/openvpn", false);' \
|
||||
--replace-fail 'return Utils::executable("../../client/bin/tun2socks", true);' 'return Utils::executable("${amnezia-tun2socks}/bin/amnezia-tun2socks", false);' \
|
||||
@@ -146,13 +162,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit amnezia-tun2socks amnezia-xray;
|
||||
inherit amnezia-tun2socks amnezia-xray awg-vendored;
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--subpackage"
|
||||
"amnezia-tun2socks"
|
||||
"--subpackage"
|
||||
"amnezia-xray"
|
||||
"--subpackage"
|
||||
"awg-vendored"
|
||||
];
|
||||
};
|
||||
};
|
||||
@@ -164,6 +182,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = licenses.gpl3;
|
||||
mainProgram = "AmneziaVPN";
|
||||
maintainers = with maintainers; [ sund3RRR ];
|
||||
platforms = platforms.unix;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
}:
|
||||
|
||||
let
|
||||
snapshot = "20250105225747";
|
||||
snapshot = "20250820092243";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "apparency";
|
||||
version = "2.2";
|
||||
version = "2.3";
|
||||
|
||||
src = fetchurl {
|
||||
# Use externally archived download URL because
|
||||
# upstream does not provide stable URLs for versioned releases
|
||||
url = "https://web.archive.org/web/${snapshot}/https://www.mothersruin.com/software/downloads/Apparency.dmg";
|
||||
hash = "sha256-nktNbyJOXDydQPwb43Uq3nQv65XcwrqZTKu5OCcLyfU=";
|
||||
hash = "sha256-QaP7Ll5ZK0QVHPFzDPmV8rd0XmY3Ie0VPBDXJEDMECU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "atlantis";
|
||||
version = "0.35.1";
|
||||
version = "0.36.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "runatlantis";
|
||||
repo = "atlantis";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xYj6qu5bXpryuh2vqtYF+8HP/JRM5Cc8ctT+1S1gS2Q=";
|
||||
hash = "sha256-STw7qQHLyST5eyr3siBY1adO2vyUEH1xlwatj3Oyp0U=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
|
||||
"-X=main.date=1970-01-01T00:00:00Z"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-ac2IGN+wtDAXei1uxCIZQGOmwJ3+AhIX2qq0RMqO0G8=";
|
||||
vendorHash = "sha256-GeO+T8PUrN1zX0S6roeles5sB68KwStiuQ65k+tNf68=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "bark-server";
|
||||
version = "2.2.5";
|
||||
version = "2.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Finb";
|
||||
repo = "bark-server";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Fe0PXwwVCrvoMTYMoTUkQaT6kVDdGPadFLkTDRhlh5U=";
|
||||
hash = "sha256-PHUQA0Iv0iJ5Hmv129sQjtmdmnVfqEqYQqbyGux+gFg=";
|
||||
# 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 @@ buildGoModule (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lpRxwCF+3+32FSn5XQ551l2ONtyuA9ewDQgwHgYUnT0=";
|
||||
vendorHash = "sha256-/h3L4Ow2aBPkbH1hPXCEb9DKrzVEcaLh2+O9iZXkXN8=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -3,24 +3,24 @@
|
||||
|
||||
let
|
||||
pname = "brave";
|
||||
version = "1.82.166";
|
||||
version = "1.82.170";
|
||||
|
||||
allArchives = {
|
||||
aarch64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
|
||||
hash = "sha256-7ZQ9fCDrqlrTUXSCB2m9CIOibiH9pTbB+QlIqbv7XHQ=";
|
||||
hash = "sha256-mIz3ntO2NQX0NdNZ4puk+WPynm/ylqz40YgHaZ1fSQU=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-+S1/0W7z4eaF8dJ6aJonlyNW2oE7/eEI1nHy8+JZLwM=";
|
||||
hash = "sha256-6pJLrMmFK5jlLk+y5YEyBzpv7JVGlzDZsoS5IRcXHc0=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
|
||||
hash = "sha256-QZikEkGo4grM4t7Xb6qFFH408Pnxtlha8Fz79fo1m64=";
|
||||
hash = "sha256-hfXtVhcI7bxNYWtlKxUduBSxHDnItaktIVkHz3azys8=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
|
||||
hash = "sha256-gL0eJkfFKQkuEECiCYOpsH6Nl7TmpnZoKF/jDfJOb8E=";
|
||||
hash = "sha256-QyZ0J3/+hkHnkSZSTYt2J2PmOJ60xZVLIaHRjWLQfk4=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-about";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EmbarkStudios";
|
||||
repo = "cargo-about";
|
||||
rev = version;
|
||||
sha256 = "sha256-EHqivIsS3wWvm3kJylynyobAsN2OlogXwLv9WdvzvJg=";
|
||||
sha256 = "sha256-2ofyZgznnR7StzBuxva+I/5FVxLtbECb2kY1KsUBWRw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-J3kSBu81jQ/u6uLOT3pKFl4tfE6qOABWhpEea1O0BZI=";
|
||||
cargoHash = "sha256-oB7v/c2LJICuQFPmw/51qabIClEbVikwm6/v/YM6lhA=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -8,21 +8,25 @@
|
||||
|
||||
# Required dependencies for autoPatchelfHook
|
||||
alsa-lib,
|
||||
asar,
|
||||
gtk3,
|
||||
libgbm,
|
||||
libGL,
|
||||
nspr,
|
||||
nss,
|
||||
widevine-cdm,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cider-2";
|
||||
version = "3.0.0";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://repo.cider.sh/apt/pool/main/cider-v${version}-linux-x64.deb";
|
||||
hash = "sha256-XKyzt8QkPNQlgFxR12KA5t+PCJki7UuFpn4SGmoGkpg=";
|
||||
hash = "sha256-2gd/ThI59GFU/lMKFLtwHeRWSqp14jFd8YMrV8Cu/oQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
asar
|
||||
dpkg
|
||||
autoPatchelfHook
|
||||
makeWrapper
|
||||
@@ -32,6 +36,7 @@ stdenv.mkDerivation rec {
|
||||
alsa-lib
|
||||
gtk3
|
||||
libgbm
|
||||
libGL
|
||||
nspr
|
||||
nss
|
||||
];
|
||||
@@ -54,10 +59,25 @@ stdenv.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
${lib.getExe asar} extract $out/lib/cider/resources/app.asar ./cider-build
|
||||
|
||||
# Patch login popup webview creation
|
||||
substituteInPlace ./cider-build/.vite/build/events-*.js \
|
||||
--replace-fail 'else if(c.includes(r))return{action:"allow"}' 'else if(c.includes(r))return{action:"allow",overrideBrowserWindowOptions:{webPreferences:{devTools:!0,nodeIntegration:!1,contextIsolation:!0,webSecurity:!1,sandbox:!1,experimentalFeatures:!0}}}'
|
||||
|
||||
${lib.getExe asar} pack ./cider-build $out/lib/cider/resources/app.asar
|
||||
rm -rf ./cider-build
|
||||
|
||||
# Install Widevine CDM for DRM support
|
||||
ln -sf ${widevine-cdm}/share/google/chrome/WidevineCdm $out/lib/cider/
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper $out/lib/cider/Cider $out/bin/${pname} \
|
||||
--add-flags "\$\{NIXOS_OZONE_WL:+\$\{WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true\}\}" \
|
||||
--add-flags "--no-sandbox --disable-gpu-sandbox"
|
||||
--add-flags "--no-sandbox --disable-gpu-sandbox" \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}"
|
||||
|
||||
mv $out/share/applications/cider.desktop $out/share/applications/${pname}.desktop
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
|
||||
@@ -29,7 +29,7 @@ fi
|
||||
cd ../../../..
|
||||
|
||||
if [[ "${1-default}" != "--deps-only" ]]; then
|
||||
SHA="$(nix-prefetch-url --quiet --unpack --type sha256 $DEB_URL)"
|
||||
SHA="$(nix-prefetch-url --quiet --type sha256 $DEB_URL)"
|
||||
SRI=$(nix --experimental-features nix-command hash to-sri "sha256:$SHA")
|
||||
update-source-version cider-2 "$NEW_VERSION" "$SRI"
|
||||
fi
|
||||
|
||||
+4
-4
@@ -6,13 +6,13 @@
|
||||
"packages": {
|
||||
"": {
|
||||
"dependencies": {
|
||||
"@anthropic-ai/claude-code": "^1.0.117"
|
||||
"@anthropic-ai/claude-code": "^1.0.119"
|
||||
}
|
||||
},
|
||||
"node_modules/@anthropic-ai/claude-code": {
|
||||
"version": "1.0.117",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.117.tgz",
|
||||
"integrity": "sha512-ZSBFpwPqMZJZq9//BYSW0MLGQY0svAtncPe2EVxohO87Gym6Dqi+IRSVZkWSwF07gmzZH3luqrepX3q33l7T+Q==",
|
||||
"version": "1.0.119",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.119.tgz",
|
||||
"integrity": "sha512-0SxTgt7Htr2okxL2Uk0Mv5eB8JxBrRCZCdtTNwuYC/OBl2F7UDM8YFtIwHz97ygCoJw49j7SL6s+/MIZGaEzrA==",
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
"claude": "cli.js"
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "claude-code";
|
||||
version = "1.0.117";
|
||||
version = "1.0.119";
|
||||
|
||||
nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
|
||||
hash = "sha256-mGAc09YRUE6sjy4/gimGVIbPuRHANOyBP/hpuHsbZVI=";
|
||||
hash = "sha256-l6H3IaCIo15OkCR+QBsZJ9lQIxEaAuUOUy/yEQtcvDI=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-U/trPqqN4FNuH6yHlvkPL9DHR2Lw21+3xVtwenu/4Fs=";
|
||||
npmDepsHash = "sha256-J22dL6GuvMKRLZ7ZAkKn8iX/qBfgK/k3IXKPLGROwo4=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "clipcat";
|
||||
version = "0.21.0";
|
||||
version = "0.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xrelkd";
|
||||
repo = "clipcat";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-CIqV5V7NN2zsqBwheJrcBnOTOBEncIwqqXdsZ9DLAog=";
|
||||
hash = "sha256-MYWkUb9v8hnW6gUTpIcz0+jhlc8y3hZxsEQxRIZVVxI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-UA+NTtZ2qffUPUmvCidnTHwFzD3WOPTlxHR2e2vKwPQ=";
|
||||
cargoHash = "sha256-7ntsq6x/8QFaU6Hl4tk+Rtvc8ttcK9Mp00nlirNlUKY=";
|
||||
|
||||
patches = [
|
||||
# Fix compilation errors caused by stricter restrictions on unused code in Rust 1.89.
|
||||
|
||||
@@ -12,18 +12,18 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "codex";
|
||||
version = "0.38.0";
|
||||
version = "0.39.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openai";
|
||||
repo = "codex";
|
||||
tag = "rust-v${finalAttrs.version}";
|
||||
hash = "sha256-bgr5AKPae+m2oXVRO1+KtPFT7J3CKKS0hQ8SeNHFhUU=";
|
||||
hash = "sha256-VxfUhPyJRYu6xvrDJRa3BqS/G7gf+J9d+2FbW1Ps4kw=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/codex-rs";
|
||||
|
||||
cargoHash = "sha256-3M8A1xHTa/e5cKIsIHbmZSCOFyVEwixYiOC/wEv0ljU=";
|
||||
cargoHash = "sha256-62JkVo2Dlrtgr66qn6a3vuIUsJpVZDQ8uqIJnXeeU90=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -59,7 +59,7 @@ buildGoModule (finalAttrs: {
|
||||
changelog = "https://github.com/srl-labs/containerlab/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ aaronjheng ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
mainProgram = "containerlab";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -13,11 +13,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "copybara";
|
||||
version = "20250901";
|
||||
version = "20250915";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google/copybara/releases/download/v${finalAttrs.version}/copybara_deploy.jar";
|
||||
hash = "sha256-yewUQIfQIMQMX92l2Cth76zfsMErpfhSa3/pZ8FZEYA=";
|
||||
hash = "sha256-vDyLBavzdVzhX3fPpVUpc7Y6Dn9UGQpfoISyUX9ixek=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "copyright-update";
|
||||
version = "2016.1018";
|
||||
version = "2025.0404";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "${pname}-${version}-src";
|
||||
owner = "jaalto";
|
||||
repo = "project--copyright-update";
|
||||
rev = "release/${version}";
|
||||
sha256 = "1kj6jlgyxrgvrpv7fcgbibfqqa83xljp17v6sas42dlb105h6sgd";
|
||||
sha256 = "sha256-FeKWCgCDA77iJ/cWtfx6hXSyWxwmlkW4EidPxy1W9VY=";
|
||||
};
|
||||
|
||||
buildInputs = [ perl ];
|
||||
|
||||
@@ -24,13 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cubeb";
|
||||
version = "0-unstable-2025-08-21";
|
||||
version = "0-unstable-2025-09-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla";
|
||||
repo = "cubeb";
|
||||
rev = "e39320b5b8a558de880d27af6e9cafac01cdc6ba";
|
||||
hash = "sha256-aSdtaV2/xEYVL/5UXDhYBHYblS1ZZXk8fgBRq6DReX8=";
|
||||
rev = "e495bee4cd630c9f99907a764e16edba37a4b564";
|
||||
hash = "sha256-iBxYZppjJhFAwGi9v4/lTsyqC9Gy04Dc7bJNzgv18rE=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -9,26 +9,26 @@ let
|
||||
inherit (stdenv) hostPlatform;
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://downloads.cursor.com/lab/2025.09.04-fc40cd1/linux/x64/agent-cli-package.tar.gz";
|
||||
hash = "sha256-Y1ynrrHfhbmMKkbZ1C3Xl+uZy3AWnmAXwTC+OkMcquc=";
|
||||
url = "https://downloads.cursor.com/lab/2025.09.18-39624ef/linux/x64/agent-cli-package.tar.gz";
|
||||
hash = "sha256-LbckJixgsrxCUKxy06Llfurd4h52fcQ8MTRfY3YUxHk=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://downloads.cursor.com/lab/2025.09.04-fc40cd1/linux/arm64/agent-cli-package.tar.gz";
|
||||
hash = "sha256-EeeHCWFDCayFGpSKkeHxZe2JSHsQ+hJYAwepTm6i8Bo=";
|
||||
url = "https://downloads.cursor.com/lab/2025.09.18-39624ef/linux/arm64/agent-cli-package.tar.gz";
|
||||
hash = "sha256-9XvRwPnW6fezjAzsvxUINRppQIDwCq5nESpbYWojt5U=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://downloads.cursor.com/lab/2025.09.04-fc40cd1/darwin/x64/agent-cli-package.tar.gz";
|
||||
hash = "sha256-yzu0Ea5/X38RGyaFx0VR1O2aXzWs/XHopDyQzouFXP8=";
|
||||
url = "https://downloads.cursor.com/lab/2025.09.18-39624ef/darwin/x64/agent-cli-package.tar.gz";
|
||||
hash = "sha256-7cW29+jLfcm+tx1EmIeI+FWZXO8L4UdArJ7wvmMSCoM=";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://downloads.cursor.com/lab/2025.09.04-fc40cd1/darwin/arm64/agent-cli-package.tar.gz";
|
||||
hash = "sha256-C2av4foh8XcXi+CYzFEz6jeFIR7sTjZFi1fk2s0I46I=";
|
||||
url = "https://downloads.cursor.com/lab/2025.09.18-39624ef/darwin/arm64/agent-cli-package.tar.gz";
|
||||
hash = "sha256-LxuEMzROif0LO1bjS203lB8QBaXnVdmHHN+I3UXl578=";
|
||||
};
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "cursor-cli";
|
||||
version = "0-unstable-2025-09-04";
|
||||
version = "0-unstable-2025-09-18";
|
||||
|
||||
src = sources.${hostPlatform.system};
|
||||
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "databricks-cli";
|
||||
version = "0.267.0";
|
||||
version = "0.269.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "databricks";
|
||||
repo = "cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-VQc7UYyrc5eVl/3ETswUj5vYsRnAGi6QqJwBe950biQ=";
|
||||
hash = "sha256-E9wxDwWBLJYh1DKREfxxJ2kts6Gd52mxjCxjelI9NaM=";
|
||||
};
|
||||
|
||||
# Otherwise these tests fail asserting that the version is 0.0.0-dev
|
||||
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
|
||||
--replace-fail "cli/0.0.0-dev" "cli/${finalAttrs.version}"
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-B87LXkYLjPgabroRLj8LqGw2x8En9Wvytsac6s0RjiI=";
|
||||
vendorHash = "sha256-1XQ88nSziZ2+iWrHk4P0wGJo3jR9dGKMsdRZLqG+ouQ=";
|
||||
|
||||
excludedPackages = [
|
||||
"bundle/internal"
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ddev";
|
||||
version = "1.24.7";
|
||||
version = "1.24.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddev";
|
||||
repo = "ddev";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1BlipTmpjoHjzDz5ueCYn410qzsVePikA1c5Z93Rboo=";
|
||||
hash = "sha256-z0rxRY/Jxo+0aLj1vfODBVlmZYb3SOufctS7R9d/3gs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dns-collector";
|
||||
version = "1.10.0";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmachard";
|
||||
repo = "dns-collector";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-99mVCuoog9ZkJoCCcUWkRJ2vA0IwftEcsSl6I02Qd4A=";
|
||||
hash = "sha256-2NHJs2KdSDw36ePG8s/YSU4wlWG+14NQ6oWJYqMv2Wk=";
|
||||
};
|
||||
subPackages = [ "." ];
|
||||
|
||||
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
|
||||
"-X github.com/prometheus/common/version.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-se4vNVydYFYk07Shb3eRLnVmE82HG36cwFRYCdZiZPM=";
|
||||
vendorHash = "sha256-N0gaDyOlRvFR1Buj/SKoOjwkVMRxd8Uj7iT/cDBfM9A=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -54,13 +54,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dolphin-emu";
|
||||
version = "2506a";
|
||||
version = "2509";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolphin-emu";
|
||||
repo = "dolphin";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-xYGq2Yt4Gqb/QDA6HZajs7JCwETufuqigk3bZbsgdEM=";
|
||||
hash = "sha256-ZTNg8DRgtC1jS3MoYK1wwzjJbMkLNdkRub+KOg3NmYM=";
|
||||
fetchSubmodules = true;
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
name = "eigenwallet";
|
||||
version = "3.0.0-beta.8";
|
||||
version = "3.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/eigenwallet_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-9quyDsCQsGGTESdBg5BLbUaXCWhhxz3xmqkanCIdreE=";
|
||||
hash = "sha256-/yVx/FW+sVYPtpQNl03A3JNe4CbxRbo4OkvY/Kxnw8Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
diff --git a/src/main/versions.ts b/src/main/versions.ts
|
||||
index 501ba1a..0c11ff7 100644
|
||||
--- a/src/main/versions.ts
|
||||
+++ b/src/main/versions.ts
|
||||
@@ -5,7 +5,6 @@ import { IpcMainInvokeEvent, app } from 'electron';
|
||||
import fs from 'fs-extra';
|
||||
|
||||
import { ipcMainManager } from './ipc';
|
||||
-import releases from '../../static/releases.json';
|
||||
import { InstallState, Version } from '../interfaces';
|
||||
import { IpcEvents } from '../ipc-events';
|
||||
|
||||
@@ -72,7 +71,6 @@ export async function fetchVersions(): Promise<Version[]> {
|
||||
|
||||
export async function setupVersions() {
|
||||
knownVersions = await ElectronVersions.create({
|
||||
- initialVersions: releases,
|
||||
paths: {
|
||||
versionsCache: path.join(app.getPath('userData'), 'releases.json'),
|
||||
},
|
||||
diff --git a/tools/fetch-releases.ts b/tools/fetch-releases.ts
|
||||
index 744b814..94fd971 100644
|
||||
--- a/tools/fetch-releases.ts
|
||||
+++ b/tools/fetch-releases.ts
|
||||
@@ -6,6 +6,7 @@ import { ElectronVersions } from '@electron/fiddle-core';
|
||||
const file = path.join(__dirname, '..', 'static', 'releases.json');
|
||||
|
||||
export async function populateReleases() {
|
||||
+ return;
|
||||
const elves = await ElectronVersions.create({ ignoreCache: true });
|
||||
const releases = elves.versions.map(({ version }) =>
|
||||
elves.getReleaseInfo(version),
|
||||
@@ -3,7 +3,6 @@
|
||||
electron_36,
|
||||
fetchFromGitHub,
|
||||
fetchYarnDeps,
|
||||
fetchurl,
|
||||
git,
|
||||
lib,
|
||||
makeDesktopItem,
|
||||
@@ -17,32 +16,26 @@
|
||||
|
||||
let
|
||||
pname = "electron-fiddle";
|
||||
version = "0.36.5-unstable-2025-07-17";
|
||||
version = "0.37.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "electron";
|
||||
repo = "fiddle";
|
||||
rev = "0f3cd3007a336562a3c49ce95469022e6a729121"; # a revision that uses electron_36 instead of electron_33
|
||||
hash = "sha256-1q8bDpEPrQNbngrGZj6/AQFFo06ED6uJ4Z/XVg6KNXw=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-e9PLgkqWBNLBw7uuNpPluOQ6+aGLYQLyTzcLa+LMOzs=";
|
||||
};
|
||||
|
||||
electron = electron_36;
|
||||
|
||||
# As of https://github.com/electron/fiddle/pull/1316 this is fetched
|
||||
# from the network and has no stable hash. Grab an old version from
|
||||
# the repository.
|
||||
releasesJson = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/electron/fiddle/v0.32.4~18/static/releases.json";
|
||||
hash = "sha256-1sxd3eJ6/WjXS6XQbrgKUTNUmrhuc1dAvy+VAivGErg=";
|
||||
};
|
||||
|
||||
unwrapped = stdenvNoCC.mkDerivation {
|
||||
pname = "${pname}-unwrapped";
|
||||
inherit version src;
|
||||
|
||||
patches = [ ./dont-use-initial-releases-json.patch ];
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${src}/yarn.lock";
|
||||
hash = "sha256-n6rzi4VohVaX+IIE1NITDsxXGyw0Z6Fx1WJb15YT9Sg=";
|
||||
inherit src;
|
||||
hash = "sha256-mB8WG6tX204u6AJ8qLbWrA+pSN3oDihHqj0t3bWcuAI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -67,9 +60,7 @@ let
|
||||
|
||||
# force @electron/packager to use our electron instead of downloading it, even if it is a different version
|
||||
substituteInPlace node_modules/@electron/packager/dist/packager.js \
|
||||
--replace-fail 'await this.getElectronZipPath(downloadOpts)' '"electron.zip"'
|
||||
|
||||
ln -s ${releasesJson} static/releases.json
|
||||
--replace-fail 'await this.getElectronZipPath(downloadOpts)' '"electron.zip"'
|
||||
'';
|
||||
|
||||
yarnBuildScript = "package";
|
||||
@@ -105,7 +96,7 @@ let
|
||||
in
|
||||
buildFHSEnv {
|
||||
inherit pname version;
|
||||
runScript = "${electron}/bin/electron ${unwrapped}/lib/electron-fiddle/resources/app.asar";
|
||||
runScript = "${lib.getExe electron} ${unwrapped}/lib/electron-fiddle/resources/app.asar";
|
||||
|
||||
extraInstallCommands = ''
|
||||
mkdir -p "$out/share/icons/hicolor/scalable/apps"
|
||||
|
||||
@@ -6,18 +6,18 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "emmylua_doc_cli";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EmmyLuaLs";
|
||||
repo = "emmylua-analyzer-rust";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-93PlsVvlUravsnW7YBCii04jCEJPP+6U2vYbVBjcX8M=";
|
||||
hash = "sha256-V/Sy5h0dLayf9Oxgh9eFfDm00hJbwq1WAD8k0AA5GTw=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "crates/emmylua_doc_cli";
|
||||
|
||||
cargoHash = "sha256-SbsYlIVWDpBU2bxJqXUtOiMHkOoa8Up27X7rVKLLLm0=";
|
||||
cargoHash = "sha256-ijxLMf7FjX4LzrYwQilC1QfqRP91yFvq5WCoVFJ9V8M=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
softhsm,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
@@ -43,9 +44,35 @@ python3Packages.buildPythonApplication rec {
|
||||
hsm = [ python-pkcs11 ];
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
rm -v $out/bin/*.py
|
||||
'';
|
||||
''
|
||||
+
|
||||
lib.strings.concatMapStrings
|
||||
(
|
||||
cmd:
|
||||
# Unfortunately, espsecure and espefuse do not run in cross-compilation
|
||||
lib.optionalString
|
||||
(
|
||||
python3Packages.stdenv.buildPlatform.canExecute python3Packages.stdenv.hostPlatform
|
||||
|| cmd == "esptool"
|
||||
)
|
||||
''
|
||||
installShellCompletion --cmd ${cmd} \
|
||||
--bash <(_${lib.toUpper cmd}_COMPLETE=bash_source $out/bin/${cmd}) \
|
||||
--zsh <(_${lib.toUpper cmd}_COMPLETE=zsh_source $out/bin/${cmd}) \
|
||||
--fish <(_${lib.toUpper cmd}_COMPLETE=fish_source $out/bin/${cmd})
|
||||
''
|
||||
)
|
||||
[
|
||||
"esptool"
|
||||
"espsecure"
|
||||
"espefuse"
|
||||
];
|
||||
|
||||
nativeCheckInputs =
|
||||
with python3Packages;
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "exploitdb";
|
||||
version = "2025-09-17";
|
||||
version = "2025-09-18";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = "exploitdb";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-9RQ75FK1ZZMSBJBWTAstdCiUb8pB7PzfHOp7Jd03fG0=";
|
||||
hash = "sha256-+5zXe+64tZD7zjZKXrAuv5ggBRb1ecKzKZSY2Knzklg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "feh";
|
||||
version = "3.11.1";
|
||||
version = "3.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "derf";
|
||||
repo = "feh";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-gzMlPyuQft39U1hNs9PojohESqsjVxcPGuUbNRFMQBU=";
|
||||
hash = "sha256-bwp/hzkuwQTgPakE0zkNtBWrNUkVWt9btTD8MVx+Xq4=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
libxml2,
|
||||
openssl,
|
||||
range-v3,
|
||||
catch2,
|
||||
catch2_3,
|
||||
nasm,
|
||||
buildEnv,
|
||||
writeText,
|
||||
@@ -95,13 +95,13 @@ let
|
||||
in
|
||||
llvmPackages.stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fex";
|
||||
version = "2509";
|
||||
version = "2509.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FEX-Emu";
|
||||
repo = "FEX";
|
||||
tag = "FEX-${finalAttrs.version}";
|
||||
hash = "sha256-Dq87cx7tv+HJvpy57L8dcApE+3E8VEyyTYKhDyoUfVU=";
|
||||
hash = "sha256-eTm1ee8eS+OwzEUoklrrQDRIAJVX0FWBaWi2/TJrx48=";
|
||||
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
@@ -192,7 +192,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
|
||||
cmakeFlags = [
|
||||
(lib.cmakeFeature "USE_LINKER" "lld")
|
||||
(lib.cmakeFeature "OVERRIDE_VERSION" finalAttrs.version)
|
||||
(lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "BUILD_THUNKS" true)
|
||||
(lib.cmakeBool "BUILD_FEXCONFIG" withQt)
|
||||
(lib.cmakeFeature "X86_32_TOOLCHAIN_FILE" "${toolchain32}")
|
||||
@@ -206,7 +206,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
|
||||
doCheck = true;
|
||||
|
||||
nativeCheckInputs = [ nasm ];
|
||||
checkInputs = [ catch2 ];
|
||||
checkInputs = [ catch2_3 ];
|
||||
|
||||
# List not exhaustive, e.g. because they depend on an x86 compiler or some
|
||||
# other difficult-to-build test binaries.
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ffizer";
|
||||
version = "2.13.3";
|
||||
version = "2.13.5";
|
||||
|
||||
buildFeatures = [ "cli" ];
|
||||
|
||||
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "ffizer";
|
||||
repo = "ffizer";
|
||||
rev = version;
|
||||
hash = "sha256-S5iF2xjOw1g6scxUMGn6ghr3iASlLlz6IUYjsLo1wRk=";
|
||||
hash = "sha256-kYsHhNW9UkttKVNEY9+Z9EZWDNIuhCWTmRJytaZVgKc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-VYjxSZUFgdrYiL0yzHVLH3MgUx4geypxDV2h8lpqc0o=";
|
||||
cargoHash = "sha256-zsJ5RjqxzCwRJQvWi65NwZ/w3lIvZvkE80EdmNeJUdg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -6,15 +6,15 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "firezone-gateway";
|
||||
version = "1.4.15";
|
||||
version = "1.4.16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "firezone";
|
||||
repo = "firezone";
|
||||
tag = "gateway-${version}";
|
||||
hash = "sha256-eIef5csbrZdh2e2fxBSBYAgHSpSfHCMTbatTsHZR8DY=";
|
||||
hash = "sha256-Tu0Bq/Axj05dCRCd1eB7CiOXQ5n4i8hnE3ZiGCQ5ZdY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-OAWPO18s9749nfkyPEaArRkxdqnCKo69k8ZSRS2Tyw0=";
|
||||
cargoHash = "sha256-wlf+TtrRG7hHNav7WqLn2DSX9QkKFVzyiKP5CRdXlNY=";
|
||||
sourceRoot = "${src.name}/rust";
|
||||
buildAndTestSubdir = "gateway";
|
||||
RUSTFLAGS = "--cfg system_certs";
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
{
|
||||
lib,
|
||||
writeText,
|
||||
flutter329,
|
||||
flutter335,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
flutter329.buildFlutterApplication rec {
|
||||
flutter335.buildFlutterApplication rec {
|
||||
pname = "firmware-updater";
|
||||
version = "0-unstable-2024-20-11";
|
||||
version = "0-unstable-2025-09-09";
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
@@ -20,8 +19,8 @@ flutter329.buildFlutterApplication rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "canonical";
|
||||
repo = "firmware-updater";
|
||||
rev = "ab5d44d594d68d106aafb511252a94a24e94d601";
|
||||
hash = "sha256-4a0OojgNvOpvM4+8uSslxxKb6uwKDfDkvHo29rMXynQ=";
|
||||
rev = "402e97254b9d63c8d962c46724995e377ff922c8";
|
||||
hash = "sha256-nQn5mlgNj157h++67+mhez/F1ALz4yY+bxiGsi0/xX8=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,8 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchzip,
|
||||
imagemagick,
|
||||
libgbm,
|
||||
libdrm,
|
||||
@@ -21,17 +23,21 @@ let
|
||||
libdrm
|
||||
];
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
libwebrtc = fetchzip {
|
||||
url = "https://github.com/flutter-webrtc/flutter-webrtc/releases/download/v1.1.0/libwebrtc.zip";
|
||||
sha256 = "sha256-lRfymTSfoNUtR5tSUiAptAvrrTwbB8p+SaYQeOevMzA=";
|
||||
};
|
||||
in
|
||||
flutter332.buildFlutterApplication (
|
||||
rec {
|
||||
pname = "fluffychat-${targetFlutterPlatform}";
|
||||
version = "2.0.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "krille-chan";
|
||||
repo = "fluffychat";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-fFc6nIVQUY9OiGkEc7jrzXnBQPDWC5x5A4/XHUhu6hs=";
|
||||
hash = "sha256-Gk3PtIb90rmrEIq52aL+vBHhRG6LoyfG2jrAGH5Iyqo=";
|
||||
};
|
||||
|
||||
inherit pubspecLock;
|
||||
@@ -84,6 +90,31 @@ flutter332.buildFlutterApplication (
|
||||
})
|
||||
];
|
||||
|
||||
customSourceBuilders = {
|
||||
flutter_webrtc =
|
||||
{ version, src, ... }:
|
||||
stdenv.mkDerivation {
|
||||
pname = "flutter_webrtc";
|
||||
inherit version src;
|
||||
inherit (src) passthru;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace third_party/CMakeLists.txt \
|
||||
--replace-fail "\''${CMAKE_CURRENT_LIST_DIR}/downloads/libwebrtc.zip" ${libwebrtc}
|
||||
ln -s ${libwebrtc} third_party/libwebrtc
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir $out
|
||||
cp -r ./* $out/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
FAV=$out/app/fluffychat-linux/data/flutter_assets/assets/favicon.png
|
||||
ICO=$out/share/icons
|
||||
|
||||
@@ -4,27 +4,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "_fe_analyzer_shared",
|
||||
"sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab",
|
||||
"sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "76.0.0"
|
||||
},
|
||||
"_macros": {
|
||||
"dependency": "transitive",
|
||||
"description": "dart",
|
||||
"source": "sdk",
|
||||
"version": "0.3.3"
|
||||
"version": "67.0.0"
|
||||
},
|
||||
"analyzer": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "analyzer",
|
||||
"sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e",
|
||||
"sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.11.0"
|
||||
"version": "6.4.1"
|
||||
},
|
||||
"animations": {
|
||||
"dependency": "direct main",
|
||||
@@ -50,11 +44,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "app_links",
|
||||
"sha256": "85ed8fc1d25a76475914fff28cc994653bd900bc2c26e4b57a49e097febb54ba",
|
||||
"sha256": "5f88447519add627fe1cbcab4fd1da3d4fed15b9baf29f28b22535c95ecee3e8",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.4.0"
|
||||
"version": "6.4.1"
|
||||
},
|
||||
"app_links_linux": {
|
||||
"dependency": "transitive",
|
||||
@@ -90,11 +84,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "archive",
|
||||
"sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
|
||||
"sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.6.1"
|
||||
"version": "4.0.7"
|
||||
},
|
||||
"args": {
|
||||
"dependency": "transitive",
|
||||
@@ -230,11 +224,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "chewie",
|
||||
"sha256": "4d9554a8f87cc2dc6575dfd5ad20a4375015a29edd567fd6733febe6365e2566",
|
||||
"sha256": "19b93a1e60e4ba640a792208a6543f1c7d5b124d011ce0199e2f18802199d984",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.11.3"
|
||||
"version": "1.12.1"
|
||||
},
|
||||
"cli_config": {
|
||||
"dependency": "transitive",
|
||||
@@ -356,15 +350,35 @@
|
||||
"source": "hosted",
|
||||
"version": "1.0.8"
|
||||
},
|
||||
"dart_earcut": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "dart_earcut",
|
||||
"sha256": "e485001bfc05dcbc437d7bfb666316182e3522d4c3f9668048e004d0eb2ce43b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.0"
|
||||
},
|
||||
"dart_polylabel2": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "dart_polylabel2",
|
||||
"sha256": "7eeab15ce72894e4bdba6a8765712231fc81be0bd95247de4ad9966abc57adc6",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.0.0"
|
||||
},
|
||||
"dart_webrtc": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "dart_webrtc",
|
||||
"sha256": "5b76fd85ac95d6f5dee3e7d7de8d4b51bfbec1dc73804647c6aebb52d6297116",
|
||||
"sha256": "a2ae542cdadc21359022adedc26138fa3487cc3b3547c24ff4f556681869e28c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.5.3+hotfix.2"
|
||||
"version": "1.5.3+hotfix.4"
|
||||
},
|
||||
"dbus": {
|
||||
"dependency": "transitive",
|
||||
@@ -380,11 +394,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "desktop_drop",
|
||||
"sha256": "d55a010fe46c8e8fcff4ea4b451a9ff84a162217bdb3b2a0aa1479776205e15d",
|
||||
"sha256": "927511f590ce01ee90d0d80f79bc71b9c919d8522d01e495e89a00c6f4a4fb5b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.4.4"
|
||||
"version": "0.6.1"
|
||||
},
|
||||
"desktop_notifications": {
|
||||
"dependency": "direct main",
|
||||
@@ -400,41 +414,41 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "device_info_plus",
|
||||
"sha256": "a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074",
|
||||
"sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "10.1.2"
|
||||
"version": "11.5.0"
|
||||
},
|
||||
"device_info_plus_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "device_info_plus_platform_interface",
|
||||
"sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2",
|
||||
"sha256": "e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "7.0.2"
|
||||
"version": "7.0.3"
|
||||
},
|
||||
"dynamic_color": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "dynamic_color",
|
||||
"sha256": "eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d",
|
||||
"sha256": "43a5a6679649a7731ab860334a5812f2067c2d9ce6452cf069c5e0c25336c17c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.7.0"
|
||||
"version": "1.8.1"
|
||||
},
|
||||
"emoji_picker_flutter": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "emoji_picker_flutter",
|
||||
"sha256": "08567e6f914d36c32091a96cf2f51d2558c47aa2bd47a590dc4f50e42e0965f6",
|
||||
"sha256": "9a44c102079891ea5877f78c70f2e3c6e9df7b7fe0a01757d31f1046eeaa016d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.1.0"
|
||||
"version": "4.3.0"
|
||||
},
|
||||
"emojis": {
|
||||
"dependency": "direct main",
|
||||
@@ -490,11 +504,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "file_picker",
|
||||
"sha256": "ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810",
|
||||
"sha256": "ef7d2a085c1b1d69d17b6842d0734aad90156de08df6bd3c12496d0bd6ddf8e2",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "8.3.7"
|
||||
"version": "10.3.1"
|
||||
},
|
||||
"file_selector": {
|
||||
"dependency": "direct main",
|
||||
@@ -592,16 +606,6 @@
|
||||
"source": "sdk",
|
||||
"version": "0.0.0"
|
||||
},
|
||||
"flutter_cache_manager": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "flutter_cache_manager",
|
||||
"sha256": "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.4.1"
|
||||
},
|
||||
"flutter_driver": {
|
||||
"dependency": "transitive",
|
||||
"description": "flutter",
|
||||
@@ -612,11 +616,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "flutter_foreground_task",
|
||||
"sha256": "6cf10a27f5e344cd2ecad0752d3a5f4ec32846d82fda8753b3fe2480ebb832a3",
|
||||
"sha256": "9f1b25a81db95d7119d2c5cffc654048cbdd49d4056183e1beadc1a6a38f3e29",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.5.0"
|
||||
"version": "9.1.0"
|
||||
},
|
||||
"flutter_highlighter": {
|
||||
"dependency": "direct main",
|
||||
@@ -712,31 +716,41 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "flutter_local_notifications",
|
||||
"sha256": "674173fd3c9eda9d4c8528da2ce0ea69f161577495a9cc835a2a4ecd7eadeb35",
|
||||
"sha256": "20ca0a9c82ce0c855ac62a2e580ab867f3fbea82680a90647f7953832d0850ae",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "17.2.4"
|
||||
"version": "19.4.0"
|
||||
},
|
||||
"flutter_local_notifications_linux": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "flutter_local_notifications_linux",
|
||||
"sha256": "c49bd06165cad9beeb79090b18cd1eb0296f4bf4b23b84426e37dd7c027fc3af",
|
||||
"sha256": "e3c277b2daab8e36ac5a6820536668d07e83851aeeb79c446e525a70710770a5",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.0.1"
|
||||
"version": "6.0.0"
|
||||
},
|
||||
"flutter_local_notifications_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "flutter_local_notifications_platform_interface",
|
||||
"sha256": "85f8d07fe708c1bdcf45037f2c0109753b26ae077e9d9e899d55971711a4ea66",
|
||||
"sha256": "277d25d960c15674ce78ca97f57d0bae2ee401c844b6ac80fcd972a9c99d09fe",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "7.2.0"
|
||||
"version": "9.1.0"
|
||||
},
|
||||
"flutter_local_notifications_windows": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "flutter_local_notifications_windows",
|
||||
"sha256": "ed46d7ae4ec9d19e4c8fa2badac5fe27ba87a3fe387343ce726f927af074ec98",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.0.2"
|
||||
},
|
||||
"flutter_localizations": {
|
||||
"dependency": "direct main",
|
||||
@@ -748,21 +762,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "flutter_map",
|
||||
"sha256": "87cc8349b8fa5dccda5af50018c7374b6645334a0d680931c1fe11bce88fa5bb",
|
||||
"sha256": "df33e784b09fae857c6261a5521dd42bd4d3342cb6200884bb70730638af5fd5",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.2.1"
|
||||
"version": "8.2.1"
|
||||
},
|
||||
"flutter_native_splash": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "flutter_native_splash",
|
||||
"sha256": "7062602e0dbd29141fb8eb19220b5871ca650be5197ab9c1f193a28b17537bc7",
|
||||
"sha256": "8321a6d11a8d13977fa780c89de8d257cce3d841eecfb7a4cadffcc4f12d82dc",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.4.4"
|
||||
"version": "2.4.6"
|
||||
},
|
||||
"flutter_new_badger": {
|
||||
"dependency": "direct main",
|
||||
@@ -933,11 +947,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "flutter_webrtc",
|
||||
"sha256": "b832dc76c0d1577f14aaf35e9c38d4ed7667cbc89c492b7bf4505d8d5f62e08b",
|
||||
"sha256": "69095ba39b83da3de48286dfc0769aa8e9f10491f70058dc8d8ecc960ef7a260",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.12.12+hotfix.1"
|
||||
"version": "1.0.0"
|
||||
},
|
||||
"frontend_server_client": {
|
||||
"dependency": "transitive",
|
||||
@@ -955,25 +969,35 @@
|
||||
"source": "sdk",
|
||||
"version": "0.0.0"
|
||||
},
|
||||
"geoclue": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "geoclue",
|
||||
"sha256": "c2a998c77474fc57aa00c6baa2928e58f4b267649057a1c76738656e9dbd2a7f",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.1.1"
|
||||
},
|
||||
"geolocator": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "geolocator",
|
||||
"sha256": "f62bcd90459e63210bbf9c35deb6a51c521f992a78de19a1fe5c11704f9530e2",
|
||||
"sha256": "79939537046c9025be47ec645f35c8090ecadb6fe98eba146a0d25e8c1357516",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "13.0.4"
|
||||
"version": "14.0.2"
|
||||
},
|
||||
"geolocator_android": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "geolocator_android",
|
||||
"sha256": "fcb1760a50d7500deca37c9a666785c047139b5f9ee15aa5469fae7dbbe3170d",
|
||||
"sha256": "179c3cb66dfa674fc9ccbf2be872a02658724d1c067634e2c427cf6df7df901a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.6.2"
|
||||
"version": "5.0.2"
|
||||
},
|
||||
"geolocator_apple": {
|
||||
"dependency": "transitive",
|
||||
@@ -985,6 +1009,16 @@
|
||||
"source": "hosted",
|
||||
"version": "2.3.13"
|
||||
},
|
||||
"geolocator_linux": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "geolocator_linux",
|
||||
"sha256": "c4e966f0a7a87e70049eac7a2617f9e16fd4c585a26e4330bdfc3a71e6a721f3",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.2.3"
|
||||
},
|
||||
"geolocator_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -1019,11 +1053,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "get_it",
|
||||
"sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1",
|
||||
"sha256": "e87cd1d108e472a0580348a543a0c49ed3d70c8a5c809c6d418583e595d0a389",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "7.7.0"
|
||||
"version": "8.1.0"
|
||||
},
|
||||
"glob": {
|
||||
"dependency": "transitive",
|
||||
@@ -1039,11 +1073,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "go_router",
|
||||
"sha256": "0b1e06223bee260dee31a171fb1153e306907563a0b0225e8c1733211911429a",
|
||||
"sha256": "8b1f37dfaf6e958c6b872322db06f946509433bec3de753c3491a42ae9ec2b48",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "15.1.2"
|
||||
"version": "16.1.0"
|
||||
},
|
||||
"gsettings": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "gsettings",
|
||||
"sha256": "1b0ce661f5436d2db1e51f3c4295a49849f03d304003a7ba177d01e3a858249c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.2.8"
|
||||
},
|
||||
"gtk": {
|
||||
"dependency": "transitive",
|
||||
@@ -1075,26 +1119,6 @@
|
||||
"source": "hosted",
|
||||
"version": "0.1.1"
|
||||
},
|
||||
"hive": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "hive",
|
||||
"sha256": "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.2.3"
|
||||
},
|
||||
"hive_flutter": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "hive_flutter",
|
||||
"sha256": "dca1da446b1d808a51689fb5d0c6c9510c0a2ba01e22805d492c73b68e33eecc",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.0"
|
||||
},
|
||||
"html": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -1119,11 +1143,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "http",
|
||||
"sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b",
|
||||
"sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.4.0"
|
||||
"version": "1.5.0"
|
||||
},
|
||||
"http_multi_server": {
|
||||
"dependency": "transitive",
|
||||
@@ -1149,11 +1173,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "image",
|
||||
"sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d",
|
||||
"sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.3.0"
|
||||
"version": "4.5.4"
|
||||
},
|
||||
"image_picker": {
|
||||
"dependency": "direct main",
|
||||
@@ -1295,11 +1319,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "just_audio",
|
||||
"sha256": "f978d5b4ccea08f267dae0232ec5405c1b05d3f3cd63f82097ea46c015d5c09e",
|
||||
"sha256": "679637a3ec5b6e00f36472f5a3663667df00ee4822cbf5dafca0f568c710960a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.9.46"
|
||||
"version": "0.10.4"
|
||||
},
|
||||
"just_audio_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
@@ -1421,16 +1445,6 @@
|
||||
"source": "hosted",
|
||||
"version": "1.3.0"
|
||||
},
|
||||
"macros": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "macros",
|
||||
"sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.1.3-main.0"
|
||||
},
|
||||
"markdown": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -1465,11 +1479,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "matrix",
|
||||
"sha256": "996e3b1560959afaa3118ec2b5a06734ad29acf64f9c3c09a605c3ddef22039f",
|
||||
"sha256": "4e6c186115ee041c430aa5ed5210499d60e4323f907cea1f5e8a2f73a513a1bf",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.0.1"
|
||||
"version": "1.1.1"
|
||||
},
|
||||
"meta": {
|
||||
"dependency": "transitive",
|
||||
@@ -1495,21 +1509,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "mime",
|
||||
"sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a",
|
||||
"sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.0.6"
|
||||
"version": "2.0.0"
|
||||
},
|
||||
"msix": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "msix",
|
||||
"sha256": "edde648a8133bf301883c869d19d127049683037c65ff64173ba526ac7a8af2f",
|
||||
"sha256": "f88033fcb9e0dd8de5b18897cbebbd28ea30596810f4a7c86b12b0c03ace87e5",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.16.9"
|
||||
"version": "3.16.12"
|
||||
},
|
||||
"native_imaging": {
|
||||
"dependency": "direct main",
|
||||
@@ -1565,21 +1579,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "package_info_plus",
|
||||
"sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191",
|
||||
"sha256": "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "8.3.0"
|
||||
"version": "8.3.1"
|
||||
},
|
||||
"package_info_plus_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "package_info_plus_platform_interface",
|
||||
"sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c",
|
||||
"sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.2.0"
|
||||
"version": "3.2.1"
|
||||
},
|
||||
"pana": {
|
||||
"dependency": "transitive",
|
||||
@@ -1591,16 +1605,6 @@
|
||||
"source": "hosted",
|
||||
"version": "0.21.45"
|
||||
},
|
||||
"pasteboard": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "pasteboard",
|
||||
"sha256": "1c8b6a8b3f1d12e55d4e9404433cda1b4abe66db6b17bc2d2fb5965772c04674",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.2.0"
|
||||
},
|
||||
"path": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
@@ -1675,21 +1679,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "permission_handler",
|
||||
"sha256": "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849",
|
||||
"sha256": "bc917da36261b00137bbc8896bf1482169cd76f866282368948f032c8c1caae1",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "11.4.0"
|
||||
"version": "12.0.1"
|
||||
},
|
||||
"permission_handler_android": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "permission_handler_android",
|
||||
"sha256": "d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc",
|
||||
"sha256": "1e3bc410ca1bf84662104b100eb126e066cb55791b7451307f9708d4007350e6",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "12.1.0"
|
||||
"version": "13.0.1"
|
||||
},
|
||||
"permission_handler_apple": {
|
||||
"dependency": "transitive",
|
||||
@@ -1801,16 +1805,6 @@
|
||||
"source": "hosted",
|
||||
"version": "0.10.2+1"
|
||||
},
|
||||
"polylabel": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "polylabel",
|
||||
"sha256": "41b9099afb2aa6c1730bdd8a0fab1400d287694ec7615dd8516935fa3144214b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.0.1"
|
||||
},
|
||||
"pool": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -1821,15 +1815,25 @@
|
||||
"source": "hosted",
|
||||
"version": "1.5.1"
|
||||
},
|
||||
"posix": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "posix",
|
||||
"sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.0.3"
|
||||
},
|
||||
"pretty_qr_code": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "pretty_qr_code",
|
||||
"sha256": "b078bd5d51956dea4342378af1b092ad962b81bdbb55b10fffce03461da8db74",
|
||||
"sha256": "2291db3f68d70a3dcd46c6bd599f30991ae4c02f27f36215fbb3f4865a609259",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.4.0"
|
||||
"version": "3.5.0"
|
||||
},
|
||||
"process": {
|
||||
"dependency": "transitive",
|
||||
@@ -2075,21 +2079,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "share_plus",
|
||||
"sha256": "fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da",
|
||||
"sha256": "d7dc0630a923883c6328ca31b89aa682bacbf2f8304162d29f7c6aaff03a27a1",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "10.1.4"
|
||||
"version": "11.1.0"
|
||||
},
|
||||
"share_plus_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "share_plus_platform_interface",
|
||||
"sha256": "cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b",
|
||||
"sha256": "88023e53a13429bd65d8e85e11a9b484f49d4c190abbd96c7932b74d6927cc9a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.0.2"
|
||||
"version": "6.1.0"
|
||||
},
|
||||
"shared_preferences": {
|
||||
"dependency": "direct main",
|
||||
@@ -2257,26 +2261,6 @@
|
||||
"source": "hosted",
|
||||
"version": "7.0.0"
|
||||
},
|
||||
"sqflite": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "sqflite",
|
||||
"sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.4.2"
|
||||
},
|
||||
"sqflite_android": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "sqflite_android",
|
||||
"sha256": "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.4.1"
|
||||
},
|
||||
"sqflite_common": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -2291,51 +2275,31 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "sqflite_common_ffi",
|
||||
"sha256": "1f3ef3888d3bfbb47785cc1dda0dc7dd7ebd8c1955d32a9e8e9dae1e38d1c4c1",
|
||||
"sha256": "9faa2fedc5385ef238ce772589f7718c24cdddd27419b609bb9c6f703ea27988",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.3.5"
|
||||
},
|
||||
"sqflite_darwin": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "sqflite_darwin",
|
||||
"sha256": "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.4.2"
|
||||
},
|
||||
"sqflite_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "sqflite_platform_interface",
|
||||
"sha256": "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.4.0"
|
||||
"version": "2.3.6"
|
||||
},
|
||||
"sqlcipher_flutter_libs": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "sqlcipher_flutter_libs",
|
||||
"sha256": "777c3469ada8fe6b808bd50f1c752cdd2ca1b1f3cf751d434502ead15334f3a5",
|
||||
"sha256": "dd1fcc74d5baf3c36ad53e2652b2d06c9f8747494a3ccde0076e88b159dfe622",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.6.6"
|
||||
"version": "0.6.8"
|
||||
},
|
||||
"sqlite3": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "sqlite3",
|
||||
"sha256": "310af39c40dd0bb2058538333c9d9840a2725ae0b9f77e4fd09ad6696aa8f66e",
|
||||
"sha256": "608b56d594e4c8498c972c8f1507209f9fd74939971b948ddbbfbfd1c9cb3c15",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.7.5"
|
||||
"version": "2.7.7"
|
||||
},
|
||||
"stack_trace": {
|
||||
"dependency": "transitive",
|
||||
@@ -2461,11 +2425,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "timezone",
|
||||
"sha256": "2236ec079a174ce07434e89fcd3fcda430025eb7692244139a9cf54fdcf1fc7d",
|
||||
"sha256": "dd14a3b83cfd7cb19e7888f1cbc20f258b8d71b54c06f79ac585f14093a287d1",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.9.4"
|
||||
"version": "0.10.1"
|
||||
},
|
||||
"tint": {
|
||||
"dependency": "transitive",
|
||||
@@ -2521,31 +2485,31 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "unifiedpush",
|
||||
"sha256": "6dbed5a6305ca33f1865c7a3d814ae39476b79a2d23ca76a5708f023f405730f",
|
||||
"sha256": "1418375efb580af9640de4eaf4209cb6481f9a48792648ced3051f30e67d9568",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.0.2"
|
||||
"version": "6.0.2"
|
||||
},
|
||||
"unifiedpush_android": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "unifiedpush_android",
|
||||
"sha256": "7443dece0a850ae956514f809983eb2b39fc518c2c7d24dbfe817198bec89134",
|
||||
"sha256": "2f25db8eb2fc3183bf2e43db89fff20b2587adc1c361e1d1e06b223a0d45b50a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.3.0"
|
||||
"version": "3.1.1"
|
||||
},
|
||||
"unifiedpush_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "unifiedpush_platform_interface",
|
||||
"sha256": "dd588d78a8b2bfc10430e30035526e98caa543d0b7364a6344b5eb4815721c6d",
|
||||
"sha256": "bb49d2748211520e35e0374ab816faa8a2c635267e71909d334ad868d532eba5",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.0.2"
|
||||
"version": "3.0.1"
|
||||
},
|
||||
"unifiedpush_ui": {
|
||||
"dependency": "direct main",
|
||||
@@ -2577,6 +2541,16 @@
|
||||
"source": "hosted",
|
||||
"version": "2.2.2"
|
||||
},
|
||||
"universal_platform": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "universal_platform",
|
||||
"sha256": "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.0"
|
||||
},
|
||||
"unorm_dart": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
@@ -2591,11 +2565,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "url_launcher",
|
||||
"sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
|
||||
"sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.3.1"
|
||||
"version": "6.3.2"
|
||||
},
|
||||
"url_launcher_android": {
|
||||
"dependency": "transitive",
|
||||
@@ -2701,11 +2675,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "video_player",
|
||||
"sha256": "7d78f0cfaddc8c19d4cb2d3bebe1bfef11f2103b0a03e5398b303a1bf65eeb14",
|
||||
"sha256": "0d55b1f1a31e5ad4c4967bfaa8ade0240b07d20ee4af1dfef5f531056512961a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.9.5"
|
||||
"version": "2.10.0"
|
||||
},
|
||||
"video_player_android": {
|
||||
"dependency": "transitive",
|
||||
@@ -2858,24 +2832,24 @@
|
||||
"version": "1.2.2+hotfix.2"
|
||||
},
|
||||
"win32": {
|
||||
"dependency": "direct overridden",
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "win32",
|
||||
"sha256": "015002c060f1ae9f41a818f2d5640389cc05283e368be19dc8d77cecb43c40c9",
|
||||
"sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.5.3"
|
||||
"version": "5.14.0"
|
||||
},
|
||||
"win32_registry": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "win32_registry",
|
||||
"sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852",
|
||||
"sha256": "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.5"
|
||||
"version": "2.1.0"
|
||||
},
|
||||
"window_to_front": {
|
||||
"dependency": "transitive",
|
||||
@@ -2929,7 +2903,7 @@
|
||||
}
|
||||
},
|
||||
"sdks": {
|
||||
"dart": ">=3.7.0 <4.0.0",
|
||||
"flutter": ">=3.27.0"
|
||||
"dart": ">=3.8.0 <4.0.0",
|
||||
"flutter": ">=3.29.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "forecast";
|
||||
version = "0-unstable-2025-09-04";
|
||||
version = "0-unstable-2025-09-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cosmic-utils";
|
||||
repo = "forecast";
|
||||
rev = "9671eb42c35da6ceb8196db41a58b7d0929876cd";
|
||||
hash = "sha256-lwNjdblE/pRxhwAtRQiaXvx/UV6VbDiQeg/HZOZ2BYw=";
|
||||
rev = "eb09f7131a0e6e31229a01c83892ef489bed917a";
|
||||
hash = "sha256-aNMt4CK6k/pepxSq6s8SLu4l2qXdpbMUaQ0AJ5KvU+E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-mZ6nVQo83/o1fAVcHJGPqulBaQtE/8MJk3eLBAUoMmc=";
|
||||
cargoHash = "sha256-rSl09TD844DK5/8+wjQ07uvMMEwRznjyLSwWXvgnsn8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
libcosmicAppHook
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
sqlite-vec,
|
||||
frigate,
|
||||
nixosTests,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -77,6 +78,11 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
patches = [
|
||||
./constants.patch
|
||||
# Fixes hardcoded path /media/frigate/clips/faces. Remove in next version.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/blakeblackshear/frigate/commit/b86e6e484f64bd43b64d7adebe78671a7a426edb.patch";
|
||||
hash = "sha256-1+n0n0yCtjfAHkXzsZdIF0iCVdPGmsG7l8/VTqBVEjU=";
|
||||
})
|
||||
./ffmpeg.patch
|
||||
];
|
||||
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
diff --git a/froide/helper/templatetags/permission_helper.py b/froide/helper/templatetags/permission_helper.py
|
||||
index c9d692e2..5bddaa21 100644
|
||||
--- a/froide/helper/templatetags/permission_helper.py
|
||||
+++ b/froide/helper/templatetags/permission_helper.py
|
||||
@@ -1,7 +1,5 @@
|
||||
from django import template
|
||||
|
||||
-from ..auth import can_moderate_object
|
||||
-
|
||||
register = template.Library()
|
||||
|
||||
|
||||
@@ -12,4 +10,4 @@ def has_perm(user, perm):
|
||||
|
||||
@register.filter
|
||||
def can_moderate(obj, request):
|
||||
- return can_moderate_object(obj, request)
|
||||
+ return False
|
||||
@@ -21,7 +21,7 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "froide-govplan";
|
||||
version = "0-unstable-2025-06-25";
|
||||
version = "0-unstable-2025-07-14";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -29,8 +29,8 @@ python.pkgs.buildPythonApplication rec {
|
||||
repo = "froide-govplan";
|
||||
# No tagged release yet
|
||||
# https://github.com/okfde/froide-govplan/issues/15
|
||||
rev = "9c325e70a84f26fea37b5a34f24d19fd82ea62ff";
|
||||
hash = "sha256-OD4vvKt0FLuiAVGwpspWLB2ZuM1UJkZdv2YcbKKYk9A=";
|
||||
rev = "7d304ae0e34e44f3bc34dce2b7e5f3c62bd64299";
|
||||
hash = "sha256-/0KASLvKWgXBrhYkPeOkWfovNLAuKB5m0PVkQvC6w7s=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -80,17 +80,11 @@ python.pkgs.buildPythonApplication rec {
|
||||
django-tinymce
|
||||
django-treebeard
|
||||
djangocms-alias
|
||||
# Downgrade to last working version
|
||||
# Patch froide to avoid loading account module
|
||||
(toPythonModule (
|
||||
froide.overridePythonAttrs (prev: {
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
postBuild = "";
|
||||
patches = prev.patches ++ [ ./froide_avoid_loading_account_module.patch ];
|
||||
doCheck = false;
|
||||
pnpmDeps = null;
|
||||
src = prev.src.override {
|
||||
rev = "a78a4054f9f37b0a5109a6d8cfbbda742f86a8ca";
|
||||
hash = "sha256-gtOssbsVf3nG+pmLPgvh4685vHh2x+jlXiTjU+JhQa8=";
|
||||
};
|
||||
})
|
||||
))
|
||||
nh3
|
||||
|
||||
@@ -39,14 +39,14 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "froide";
|
||||
version = "0-unstable-2025-07-01";
|
||||
version = "0-unstable-2025-09-10";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okfde";
|
||||
repo = "froide";
|
||||
rev = "362bddb5a8fdfe762d59cdebd29016568c9531b2";
|
||||
hash = "sha256-c8I/FvXQSkAeacxMQJCpCMKFueNEnLI4R0ElqRbVbNg=";
|
||||
rev = "826415bbc402c3b71c62477f5eed112787169c95";
|
||||
hash = "sha256-K9TMtDfYP6v/lbL7SXeHBa6EngK+fsHgU13C1hat/K0=";
|
||||
};
|
||||
|
||||
patches = [ ./django_42_storages.patch ];
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
{
|
||||
atool,
|
||||
bat,
|
||||
catdoc,
|
||||
chafa,
|
||||
exiftool,
|
||||
eza,
|
||||
fetchFromGitHub,
|
||||
ffmpegthumbnailer,
|
||||
file,
|
||||
glow,
|
||||
gnumeric,
|
||||
jq,
|
||||
lib,
|
||||
libcdio,
|
||||
makeWrapper,
|
||||
mediainfo,
|
||||
odt2txt,
|
||||
openssl,
|
||||
p7zip,
|
||||
poppler-utils,
|
||||
stdenv,
|
||||
w3m,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "fzf-preview";
|
||||
version = "0-unstable-2025-06-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "niksingh710";
|
||||
repo = "fzf-preview";
|
||||
rev = "5f6e936d1c3943192f9bdade71cff8879bdab3a6";
|
||||
hash = "sha256-vDgYv9PjQQYcMKG97ryncd30JPplnEqAKBp5hAE0E+o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 -t $out/bin/ ./fzf-preview
|
||||
|
||||
wrapProgram $out/bin/fzf-preview \
|
||||
--prefix PATH ":" ${
|
||||
lib.makeBinPath [
|
||||
atool
|
||||
bat
|
||||
catdoc
|
||||
chafa
|
||||
exiftool
|
||||
eza
|
||||
ffmpegthumbnailer
|
||||
file
|
||||
glow
|
||||
gnumeric
|
||||
jq
|
||||
libcdio
|
||||
mediainfo
|
||||
odt2txt
|
||||
openssl
|
||||
p7zip
|
||||
poppler-utils
|
||||
w3m
|
||||
]
|
||||
}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Simple fzf preview script for previewing any filetype in fzf's preview window";
|
||||
|
||||
longDescription = ''
|
||||
fzf-preview is a lightweight Bash script designed to enhance the user experience
|
||||
with fzf (fuzzy finder) by providing instant previews of files directly in the
|
||||
fzf preview pane. It supports a wide variety of filetypes—including images and
|
||||
text—and delivers relevant file information in the terminal. The script aims to
|
||||
be simple, fast, and highly compatible, making it a useful tool for anyone
|
||||
leveraging fzf for file navigation or search.
|
||||
'';
|
||||
homepage = "https://github.com/niksingh710/fzf-preview";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
niksingh710
|
||||
];
|
||||
mainProgram = "fzf-preview";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gambit-project";
|
||||
version = "16.3.1";
|
||||
version = "16.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gambitproject";
|
||||
repo = "gambit";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-yGA8w7Mz8D96Cci+LO1KUvTZDVc9V5b/0t7Q+UndHXI=";
|
||||
hash = "sha256-fiWGRL7U4A7FKmAvzYt6WjlkOe0jSq3U2VfxPFvc+FA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ] ++ lib.optional withGui wxGTK31;
|
||||
|
||||
@@ -19,19 +19,19 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gancio";
|
||||
version = "1.26.1";
|
||||
version = "1.28.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "framagit.org";
|
||||
owner = "les";
|
||||
repo = "gancio";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-i69sne2kkimAuwYZb0r7LfoVOdl8v4hN0s4PzgELOrk=";
|
||||
hash = "sha256-0pwZdS/EQNxcHQhvNrTEm70VGkbDdILDgdqCV0qwd3k=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/yarn.lock";
|
||||
hash = "sha256-Jvp45pKeqyQN8lb8rzTryOGDTVwnETOw8OEUUnOPjEE=";
|
||||
hash = "sha256-skUlzmjKfeVdvKAHj5L+xO2LEn1j8af8DOjHTATLedo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gcli";
|
||||
version = "2.8.0";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "herrhotzenplotz";
|
||||
repo = "gcli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-s71RImg/N8v9h472upI94Pae/Zlw27f4Kc9SCavP1oY=";
|
||||
hash = "sha256-iWNVDKa8O1hAC8SBQqhQaRX7T81c4/+piOSkHb46hpw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -12,11 +12,11 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "gemini-cli-bin";
|
||||
version = "0.4.0";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/${owner}/${repo}/releases/download/v${finalAttrs.version}/${asset}";
|
||||
hash = "sha256-5uPzphiVsqczo3XOVrT0c0Y9hkFRUsyaORPRgJSqpck=";
|
||||
hash = "sha256-rwvL5cjxPOC1ZWopo54+I1NWGMewnm6lTTl6YhNlSBk=";
|
||||
};
|
||||
|
||||
phases = [
|
||||
|
||||
@@ -6,7 +6,6 @@ set -euo pipefail
|
||||
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||
|
||||
NIX_FILE="package.nix"
|
||||
RELEASE_ID="latest"
|
||||
|
||||
GITHUB_REPO="$1"
|
||||
ASSET_NAME="$2"
|
||||
@@ -14,10 +13,18 @@ REV_PREFIX="${3:-v}"
|
||||
|
||||
CURRENT_VER="$(grep -oP 'version = "\K[^"]+' "${NIX_FILE}")"
|
||||
CURRENT_HASH="$(grep -oP 'hash = "\K[^"]+' "${NIX_FILE}")"
|
||||
|
||||
JQ_FILTER='[.[] | select((.tag_name | test("preview|nightly")) | not)] |
|
||||
first | .tag_name, (.assets[] | select(.name == $asset_name) | .digest)'
|
||||
|
||||
{
|
||||
read -r LATEST_VER
|
||||
read -r ASSET_DIGEST
|
||||
} < <(curl --fail -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} "https://api.github.com/repos/${GITHUB_REPO}/releases/${RELEASE_ID}" | jq -r ".tag_name, (.assets[] | select(.name == \"${ASSET_NAME}\") | .digest)")
|
||||
} < <(
|
||||
curl --fail -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} \
|
||||
"https://api.github.com/repos/${GITHUB_REPO}/releases" |
|
||||
jq -r --arg asset_name "${ASSET_NAME}" "${JQ_FILTER}"
|
||||
)
|
||||
|
||||
LATEST_VER="${LATEST_VER#"${REV_PREFIX}"}"
|
||||
|
||||
|
||||
@@ -7,20 +7,17 @@
|
||||
}:
|
||||
crystal.buildCrystalPackage rec {
|
||||
pname = "gi-crystal";
|
||||
version = "0.24.0";
|
||||
version = "0.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hugopl";
|
||||
repo = "gi-crystal";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0LsYREn4zWLQYUTpNWJhLLHWmg7UQzxOoQiAMmw3ZXQ=";
|
||||
hash = "sha256-+sc36YjaVKBkrg8Ond4hCZoObnSHIU/jyMRalZ+OAwk=";
|
||||
};
|
||||
|
||||
# Make sure gi-crystal picks up the name of the so or dylib and not the leading nix store path
|
||||
# when the package name happens to start with “lib”.
|
||||
patches = [
|
||||
./src.patch
|
||||
./store-friendly-library-name.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ gobject-introspection ];
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
--- a/src/generator/lib_gen.cr 1969-12-31 17:00:01.000000000 -0700
|
||||
+++ b/src/generator/lib_gen.cr 2023-07-14 11:48:41.509397114 -0600
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
private def libraries : Array(String)
|
||||
namespace.shared_libraries.map do |library|
|
||||
- library[/lib([^\/]+)\.(?:so|.+?\.dylib).*/, 1]
|
||||
+ library[/(?:\/[^\/]*)+\/lib([^\/]+)\.(?:so|.+?\.dylib).*/, 1]
|
||||
end
|
||||
end
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "github-commenter";
|
||||
version = "0.28.0";
|
||||
version = "0.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudposse";
|
||||
repo = "github-commenter";
|
||||
rev = version;
|
||||
hash = "sha256-x3/ae22ub9Us3mvSmvq9ohlkujvZCUfSrmZeQNvIWzE=";
|
||||
hash = "sha256-ZQEiDY+gOnUMxolgreDWkm9Uuc72WxcysAkT5DK/XLc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-DS2cTYQasIKmyqHS3kTpNMA4fuLxSv4n7ZQjeRWE0gI=";
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
llvmPackages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gklib";
|
||||
version = "5.1.1-unstable-2025-07-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KarypisLab";
|
||||
repo = "GKlib";
|
||||
rev = "6e7951358fd896e2abed7887196b6871aac9f2f8";
|
||||
hash = "sha256-jT0hT5Y3E8GnE8OJWzDj5rtz9s59sMEXLduUnBV0I0Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = lib.optional stdenv.cc.isClang llvmPackages.openmp;
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "OPENMP" true)
|
||||
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
|
||||
# Turns off using clflush/sfence insns in gkuniq test app
|
||||
# https://github.com/KarypisLab/GKlib/issues/11#issuecomment-1532597211
|
||||
(lib.cmakeBool "NO_X86" (!stdenv.hostPlatform.isx86))
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Library of various helper routines and frameworks used by many of the lab's software";
|
||||
homepage = "https://github.com/KarypisLab/GKlib";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ qbisi ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-dnscollector";
|
||||
version = "1.10.0";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmachard";
|
||||
repo = "go-dnscollector";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-99mVCuoog9ZkJoCCcUWkRJ2vA0IwftEcsSl6I02Qd4A=";
|
||||
sha256 = "sha256-2NHJs2KdSDw36ePG8s/YSU4wlWG+14NQ6oWJYqMv2Wk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-se4vNVydYFYk07Shb3eRLnVmE82HG36cwFRYCdZiZPM=";
|
||||
vendorHash = "sha256-N0gaDyOlRvFR1Buj/SKoOjwkVMRxd8Uj7iT/cDBfM9A=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gofumpt";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mvdan";
|
||||
repo = "gofumpt";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-5+dc60PyU41NBKOmkp6IwhN+dPliaT38eUcyBNbPIbg=";
|
||||
hash = "sha256-2JahPQQfiYfctMi7AqNB9Y1dS1Pg8usLtzM2wSlC5E0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ziqhBWkfWQ0T+gLFqv352PtNcpyCTRFHBfV6iilVGLs=";
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
yt-dlp,
|
||||
mpv,
|
||||
fzf,
|
||||
chafa,
|
||||
makeBinaryWrapper,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gophertube";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KrishnaSSH";
|
||||
repo = "GopherTube";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0TStXYghfRR11ETJcK2lnkBtS2IUy/YgeFFn0wXpeOU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WfVoCxzMk+h4AP1zgTNRXTpj8Ltu71YrsQ7OoU3Y4tg=";
|
||||
|
||||
ldflags = [
|
||||
"-X gophertube/internal/app.version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
versionCheckProgramArg = "-v";
|
||||
|
||||
propagatedUserEnvPkgs = [
|
||||
yt-dlp
|
||||
mpv
|
||||
fzf
|
||||
chafa
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/gophertube \
|
||||
--suffix PATH : ${lib.makeBinPath finalAttrs.propagatedUserEnvPkgs}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Terminal user interface for search and watching YouTube videos using mpv and chafa";
|
||||
homepage = "https://github.com/KrishnaSSh/GopherTube";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
spreetin
|
||||
yiyu
|
||||
];
|
||||
mainProgram = "gophertube";
|
||||
};
|
||||
})
|
||||
@@ -7,13 +7,13 @@
|
||||
lib,
|
||||
}:
|
||||
let
|
||||
version = "0.11.2";
|
||||
version = "0.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "gose";
|
||||
owner = "stv0g";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-AeGrnRnKThv29wFopx91BSep22WFkkKkUsTa7qFQOzs=";
|
||||
hash = "sha256-dcx1uLLLFepqGTIJQNf3I1GzbXwrVPt7Jb8TW3AGnhU=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage {
|
||||
@@ -37,7 +37,7 @@ buildGoModule {
|
||||
inherit version;
|
||||
inherit src;
|
||||
|
||||
vendorHash = "sha256-9qQXk8XyvVsussu5YfoSrjEul0E1301W019vTVSgnkk=";
|
||||
vendorHash = "sha256-cvZLR5c8WqarhnXBFAyxUUQtqX2fhveonUtsrFjFmq0=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "greenmask";
|
||||
version = "0.2.13";
|
||||
version = "0.2.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GreenmaskIO";
|
||||
repo = "greenmask";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-aV/H2UuMm66No2J1t7VnO0s/WozacmCYsSgKb0SAupQ=";
|
||||
hash = "sha256-AHZJWYHfUKYNXPP6vFIM5tdr5aQ8q2pkqB/M1lhxUic=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-t2U65GAGBGdMRXPTkCQCuXfLuqohA6erTlvAN/xx/ek=";
|
||||
|
||||
@@ -20,13 +20,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-zWBwrnCNKi2sIopdu2XQj/7IoTsJQzlcIFNNKM0glDQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-building-on-arm.patch";
|
||||
url = "https://vcgit.hhi.fraunhofer.de/jvet/HM/-/commit/fd37cd88f557478b591dc0b9157d027354d82e2f.patch";
|
||||
hash = "sha256-xP54lBvDabc9Dy1UklH2BJH7fUGLTA4sf9WLt7WzoU8=";
|
||||
})
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "-msse4.1" ""
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "HIGH_BITDEPTH" true)
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
let
|
||||
self = python3Packages.buildPythonApplication rec {
|
||||
pname = "ifstate";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitea {
|
||||
@@ -22,7 +22,7 @@ let
|
||||
owner = "liske";
|
||||
repo = "ifstate";
|
||||
tag = version;
|
||||
hash = "sha256-YxLyiTVLN4nxc2ppqGGnYCGudbdPLSLV8EwDURtpO0U=";
|
||||
hash = "sha256-QxjziDlkbTxAVd3qA8u4+JT8NWJxBMVAp7G5Zma9d10=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -7,22 +7,22 @@
|
||||
}:
|
||||
let
|
||||
pname = "insomnia";
|
||||
version = "11.0.1";
|
||||
version = "11.6.0";
|
||||
|
||||
src =
|
||||
fetchurl
|
||||
{
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.dmg";
|
||||
hash = "sha256-3LjQYFCIIrjEQ+J0m7Xau3qcHMRR3xU078QOVgoBat4=";
|
||||
hash = "sha256-9/Xkwgwyi/CqqmrroxhJ9IhvVK83qKROfCEF5IS5r+w=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.dmg";
|
||||
hash = "sha256-3LjQYFCIIrjEQ+J0m7Xau3qcHMRR3xU078QOVgoBat4=";
|
||||
hash = "sha256-9/Xkwgwyi/CqqmrroxhJ9IhvVK83qKROfCEF5IS5r+w=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.AppImage";
|
||||
hash = "sha256-X0UiD+IhyMTrUmsgocw0bpRZEk5YNEF3CMo3IkwKtvA=";
|
||||
hash = "sha256-xHqRCR6D1ahqTyWA9icVK5oykABMp5qcgk35w1jzB2s=";
|
||||
};
|
||||
}
|
||||
.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "JankyBorders";
|
||||
version = "1.8.0";
|
||||
version = "1.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FelixKratz";
|
||||
repo = "JankyBorders";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-LG3I2Zp7GU9khrDTBRMO0+qhreVL+4rwAQRI+AbXbW0=";
|
||||
hash = "sha256-lc61PjaRZ8ZOWAFhsf/G3sQkd1oUyePHU43w4pt1AWY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
freetype,
|
||||
harfbuzz,
|
||||
imlib2,
|
||||
libjpeg,
|
||||
ncurses,
|
||||
openjpeg,
|
||||
zlib,
|
||||
xorg,
|
||||
cmake,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jfbview";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jichu4n";
|
||||
repo = "jfbview";
|
||||
tag = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-ASgKXk5iVqKsBc1uzakHs5ojUb6AptGm9LxNyFcDngc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [
|
||||
freetype
|
||||
harfbuzz
|
||||
imlib2
|
||||
libjpeg
|
||||
ncurses
|
||||
openjpeg
|
||||
xorg.libX11
|
||||
zlib
|
||||
];
|
||||
|
||||
env.LDFLAGS = "-lImlib2";
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_TESTING" false)
|
||||
(lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
|
||||
(lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "/") # relative to $out
|
||||
];
|
||||
|
||||
makeFlags = [ "DESTDIR=${placeholder "out"}" ];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "PDF and image viewer for the Linux framebuffer";
|
||||
homepage = "https://github.com/jichu4n/jfbview";
|
||||
changelog = "https://github.com/jichu4n/jfbview/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ ulysseszhan ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "jfbview";
|
||||
};
|
||||
})
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jsonwatch";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbohdan";
|
||||
repo = "jsonwatch";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-/DYKjhHjfXPWpU1RFmRUbartSxIBgVP59nbgwKMd0jg=";
|
||||
hash = "sha256-HSyavdH3zhzEvk5qW5fiv8wqmgYsLUyx6Q6oEIOk5to=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QVS+b/mH7hnzaZjnGg8rw6k11uOuKGFeiPoXyqwD8tk=";
|
||||
cargoHash = "sha256-2CtB8TEn0bieT0S2w3cm4nLZWdFcIymvWSOnWDTXEJc=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Like watch -d but for JSON";
|
||||
@@ -27,6 +27,7 @@ rustPlatform.buildRustPackage rec {
|
||||
differences when the data changes.
|
||||
'';
|
||||
homepage = "https://github.com/dbohdan/jsonwatch";
|
||||
changelog = "https://github.com/dbohdan/jsonwatch/releases/tag/${src.tag}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "jsonwatch";
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "last";
|
||||
version = "1642";
|
||||
version = "1645";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "mcfrith";
|
||||
repo = "last";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-CBpx7dTL709nTBIUxbnuUBGpgaxo7zj5SPMvsBsvYVs=";
|
||||
hash = "sha256-oIGs5taAfT448BxXv6/ND+8CXAWgGd2jt7fO+vIXOZU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
version = "0.7.9";
|
||||
version = "0.8.0";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "lazyjournal";
|
||||
@@ -15,10 +15,10 @@ buildGoModule {
|
||||
owner = "Lifailon";
|
||||
repo = "lazyjournal";
|
||||
tag = version;
|
||||
hash = "sha256-ohMcTu4sK5M11FY2QkJcHnNxx6pmscdH3S2MbWorUVM=";
|
||||
hash = "sha256-dQKd7u4IGQWw8ExoHLd5qRenE07UQz69GNqGIAWN7ok=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-faMGgTJuD/6CqR+OfGknE0dGdDOSwoODySNcb3kBLv8=";
|
||||
vendorHash = "sha256-Wl8DmEBt1YtTk9QEvWybSWRQm0Lnfd5q3C/wg+gP33g=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "ldeep";
|
||||
version = "1.0.87";
|
||||
version = "1.0.88";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "franc-pentest";
|
||||
repo = "ldeep";
|
||||
tag = version;
|
||||
hash = "sha256-ym26uCWJU5fEbOyPxI8qUvorWj3HzCcHSmBk8kXPQUQ=";
|
||||
hash = "sha256-Auh9KCyPO1bWKY1wd9As5eycJfUhj0IhX/9xp99skhA=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
let
|
||||
pname = "ledger-live-desktop";
|
||||
version = "2.126.2";
|
||||
version = "2.128.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
|
||||
hash = "sha256-cnY/XfJuzlT1HyyBJcmgsNF9ihkDBS/y35idTLj+DFE=";
|
||||
hash = "sha256-qJuvpzBeGlB4nAu7vLDcppzeleo/7vxC5MrxCBqlsKM=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
icu,
|
||||
spdlog,
|
||||
tbb_2022,
|
||||
yaml-cpp,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -72,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(spdlog.override { fmt = fmt_11; })
|
||||
tbb_2022
|
||||
|
||||
finalAttrs.passthru.yaml-cpp # has merge-key support
|
||||
finalAttrs.passthru.libloadorder
|
||||
finalAttrs.passthru.esplugin
|
||||
finalAttrs.passthru.loot-condition-interpreter
|
||||
@@ -83,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeFeature "LIBLOADORDER_LIBRARIES" "loadorder_ffi")
|
||||
(lib.cmakeFeature "LCI_LIBRARIES" "loot_condition_interpreter_ffi")
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_TESTING-PLUGINS" "../testing-plugins")
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${finalAttrs.passthru.yaml-cpp-src}")
|
||||
(lib.cmakeBool "LIBLOOT_BUILD_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "LIBLOOT_INSTALL_DOCS" withDocs)
|
||||
];
|
||||
@@ -116,6 +115,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-3Aa98EwqpuGA3YlsRF8luWzXVEFO/rs6JXisXdLyIK4=";
|
||||
};
|
||||
|
||||
yaml-cpp-src = fetchFromGitHub {
|
||||
owner = "loot";
|
||||
repo = "yaml-cpp";
|
||||
tag = "0.8.0+merge-key-support.2";
|
||||
hash = "sha256-whYorebrLiDeO75LC2SMUX/8OD528BR0+DEgnJxxpoQ=";
|
||||
};
|
||||
|
||||
buildRustFFIPackage =
|
||||
args:
|
||||
rustPlatform.buildRustPackage (
|
||||
@@ -185,16 +191,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
lang = "c";
|
||||
header = "loot_condition_interpreter.h";
|
||||
};
|
||||
|
||||
yaml-cpp = yaml-cpp.overrideAttrs rec {
|
||||
version = "0.8.0+merge-key-support.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "loot";
|
||||
repo = "yaml-cpp";
|
||||
tag = version;
|
||||
hash = "sha256-whYorebrLiDeO75LC2SMUX/8OD528BR0+DEgnJxxpoQ=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -42,14 +42,14 @@ in
|
||||
# as bootloader for various platforms and corresponding binary and helper files.
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "limine";
|
||||
version = "9.6.7";
|
||||
version = "10.0.0";
|
||||
|
||||
# We don't use the Git source but the release tarball, as the source has a
|
||||
# `./bootstrap` script performing network access to download resources.
|
||||
# Packaging that in Nix is very cumbersome.
|
||||
src = fetchurl {
|
||||
url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-VGn/Ny9wVKBVFW7SNTTx+u7rr519jQ+CzbcZwTTBKps=";
|
||||
hash = "sha256-y709MUhV/SwohrKCHUW2iLAlQ/RzLxn1AeTVVo4Mf4c=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -6,18 +6,18 @@
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "lintspec";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "beeb";
|
||||
repo = "lintspec";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-5jNOMAohfzq/S+1LASQh0hvzqdMLQGdPYSb6rcGxmD8=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-NYa90VQiiT3XU0w3DciPOBpEM59XyZHk+ixtj8oTgO8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-m9n9r3SJtGx3/MURmZak2XRCLkmQZU06nPMQpROfvVs=";
|
||||
cargoHash = "sha256-RjAZIARClm7oHnKSOObOzAHJqOrR+eyHCmtBq4RaWi0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = {
|
||||
description = "Blazingly fast linter for NatSpec comments in Solidity code";
|
||||
homepage = "https://github.com/beeb/lintspec";
|
||||
changelog = "https://github.com/beeb/lintspec/releases/tag/v${version}";
|
||||
changelog = "https://github.com/beeb/lintspec/releases/tag/v${finalAttrs.version}";
|
||||
license = with lib.licenses; [
|
||||
mit
|
||||
asl20
|
||||
@@ -38,4 +38,4 @@ rustPlatform.buildRustPackage rec {
|
||||
maintainers = with lib.maintainers; [ beeb ];
|
||||
mainProgram = "lintspec";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -7,10 +7,10 @@
|
||||
let
|
||||
pname = "lmstudio";
|
||||
|
||||
version_aarch64-darwin = "0.3.25-2";
|
||||
hash_aarch64-darwin = "sha256-tbV7b59+98hf0eqkciGz0Zihx8I0+I+Y7gg+sg5fMqc=";
|
||||
version_x86_64-linux = "0.3.25-2";
|
||||
hash_x86_64-linux = "sha256-5KYZpQt0Y7oRIkXZ5Nyv2FkCl0T+KHsoC1zL4TjbcN4=";
|
||||
version_aarch64-darwin = "0.3.26-6";
|
||||
hash_aarch64-darwin = "sha256-2ss6lMU4vb3m23v1qQWFn4U1p+fZ2mSGVVkKw3ETgXc=";
|
||||
version_x86_64-linux = "0.3.26-6";
|
||||
hash_x86_64-linux = "sha256-UKdopw/sMuXY460KA9Oj8ckANdFDt2VApEsSZ1Gh1Wo=";
|
||||
|
||||
meta = {
|
||||
description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mdns-scanner";
|
||||
version = "0.23.1";
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CramBL";
|
||||
repo = "mdns-scanner";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/r2yycdNghvZPS2gJIrf3NNfuX1yICCFVmnqXVkDXVE=";
|
||||
hash = "sha256-0MHt/kSR6JvfCk08WIDPz6R9YYzDJ9RRTM6MU6sEwHk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-dPk/p4lb4TJvIM6hpbVNlCbDXjzmbP+ulYcG38idQtI=";
|
||||
cargoHash = "sha256-oJSsuU1vkisDISnp+/jFs1cWEVxr586l8yHbG6fkPjQ=";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/CramBL/mdns-scanner";
|
||||
|
||||
@@ -8,23 +8,23 @@
|
||||
|
||||
let
|
||||
hlsJs = fetchurl {
|
||||
url = "https://cdn.jsdelivr.net/npm/hls.js@v1.6.9/dist/hls.min.js";
|
||||
hash = "sha256-GObcOPuwxxMg0WOtl5BahSg9A3ds1IcCP+DPGZ8c27I=";
|
||||
url = "https://cdn.jsdelivr.net/npm/hls.js@v1.6.12/dist/hls.min.js";
|
||||
hash = "sha256-z9adeEMx2bwAw7qDIPG+vRM/AQJ/zAJl0i4vaycHHaM=";
|
||||
};
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "mediamtx";
|
||||
# check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION
|
||||
version = "1.14.0";
|
||||
version = "1.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bluenviron";
|
||||
repo = "mediamtx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-I1oKzovSv6hf2/lr2E5pRSqHV/pVoskNwn+gHRz8yv8=";
|
||||
hash = "sha256-omeaOAhH4adNpA0VXxcZkre3tGZUwHxBrIT85X3D+n0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5wSdbg7EAdvCUfIKxuX1aGihzHcwFM6Fiu/3eU1dMEY=";
|
||||
vendorHash = "sha256-YSH8cu7+LIsJ3/o2FYBYlnc6adORJdzhCqQVH0252Ec=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${hlsJs} internal/servers/hls/hls.min.js
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user