Merge staging-next into staging
This commit is contained in:
github-actions[bot]
@@ -198,6 +198,8 @@
|
||||
|
||||
- [tiny-dfr](https://github.com/WhatAmISupposedToPutHere/tiny-dfr), a dynamic function row daemon for the Touch Bar found on some Apple laptops. Available as [hardware.apple.touchBar.enable](options.html#opt-hardware.apple.touchBar.enable).
|
||||
|
||||
- [Swapspace](https://github.com/Tookmund/Swapspace), a dynamic swap space manager, turns your unused free space into swap automatically. Available as [services.swapspace](#opt-services.swapspace.enable).
|
||||
|
||||
## Backward Incompatibilities {#sec-release-24.11-incompatibilities}
|
||||
|
||||
- The `sound` options have been removed or renamed, as they had a lot of unintended side effects. See [below](#sec-release-24.11-migration-sound) for details.
|
||||
|
||||
@@ -101,6 +101,11 @@ in
|
||||
) // {
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
||||
# the image will be self-contained so we can drop references
|
||||
# to the closure that was used to build it
|
||||
unsafeDiscardReferences.out = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
systemd
|
||||
fakeroot
|
||||
|
||||
@@ -117,10 +117,6 @@ in
|
||||
|
||||
# do not prepare the ESP, this is done in the final image
|
||||
systemdRepartFlags = previousAttrs.systemdRepartFlags ++ [ "--defer-partitions=esp" ];
|
||||
|
||||
# the image will be self-contained so we can drop references
|
||||
# to the closure that was used to build it
|
||||
unsafeDiscardReferences.out = true;
|
||||
}
|
||||
);
|
||||
|
||||
@@ -210,10 +206,6 @@ in
|
||||
|
||||
rm -v repart-output_orig.json
|
||||
'';
|
||||
|
||||
# the image will be self-contained so we can drop references
|
||||
# to the closure that was used to build it
|
||||
unsafeDiscardReferences.out = true;
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
@@ -1357,6 +1357,7 @@
|
||||
./services/system/nscd.nix
|
||||
./services/system/saslauthd.nix
|
||||
./services/system/self-deploy.nix
|
||||
./services/system/swapspace.nix
|
||||
./services/system/systembus-notify.nix
|
||||
./services/system/systemd-lock-handler.nix
|
||||
./services/system/uptimed.nix
|
||||
|
||||
@@ -198,16 +198,19 @@ let
|
||||
'';
|
||||
|
||||
serverPort =
|
||||
let
|
||||
address = cfg.serverSettings.bindaddress;
|
||||
in
|
||||
# ipv6:
|
||||
if hasInfix "]:" cfg.serverSettings.bindaddress then
|
||||
last (splitString "]:" cfg.serverSettings.bindaddress)
|
||||
if hasInfix "]:" address then
|
||||
last (splitString "]:" address)
|
||||
else
|
||||
# ipv4:
|
||||
if hasInfix "." cfg.serverSettings.bindaddress then
|
||||
last (splitString ":" cfg.serverSettings.bindaddress)
|
||||
if hasInfix "." address then
|
||||
last (splitString ":" address)
|
||||
# default is 8443
|
||||
else
|
||||
"8443";
|
||||
throw "Address not parseable as IPv4 nor IPv6.";
|
||||
in
|
||||
{
|
||||
options.services.kanidm = {
|
||||
@@ -225,6 +228,7 @@ in
|
||||
bindaddress = mkOption {
|
||||
description = "Address/port combination the webserver binds to.";
|
||||
example = "[::1]:8443";
|
||||
default = "127.0.0.1:8443";
|
||||
type = types.str;
|
||||
};
|
||||
# Should be optional but toml does not accept null
|
||||
|
||||
@@ -0,0 +1,120 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
utils,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.services.swapspace;
|
||||
inherit (lib)
|
||||
types
|
||||
mkOption
|
||||
mkPackageOption
|
||||
mkEnableOption
|
||||
;
|
||||
configFile = pkgs.writeText "swapspace.conf" (lib.generators.toKeyValue { } cfg.settings);
|
||||
in
|
||||
{
|
||||
options.services.swapspace = {
|
||||
enable = mkEnableOption "Swapspace, a dynamic swap space manager";
|
||||
package = mkPackageOption pkgs "swapspace" { };
|
||||
extraArgs = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ ];
|
||||
example = [
|
||||
"-P"
|
||||
"-v"
|
||||
];
|
||||
description = "Any extra arguments to pass to swapspace";
|
||||
};
|
||||
settings = mkOption {
|
||||
type = types.submodule {
|
||||
options = {
|
||||
swappath = mkOption {
|
||||
type = types.str;
|
||||
default = "/var/lib/swapspace";
|
||||
description = "Location where swapspace may create and delete swapfiles";
|
||||
};
|
||||
lower_freelimit = mkOption {
|
||||
type = types.ints.between 0 99;
|
||||
default = 20;
|
||||
description = "Lower free-space threshold: if the percentage of free space drops below this number, additional swapspace is allocated";
|
||||
};
|
||||
upper_freelimit = mkOption {
|
||||
type = types.ints.between 0 100;
|
||||
default = 60;
|
||||
description = "Upper free-space threshold: if the percentage of free space exceeds this number, swapspace will attempt to free up swapspace";
|
||||
};
|
||||
freetarget = mkOption {
|
||||
type = types.ints.between 2 99;
|
||||
default = 30;
|
||||
description = ''
|
||||
Percentage of free space swapspace should aim for when adding swapspace.
|
||||
This should fall somewhere between lower_freelimit and upper_freelimit.
|
||||
'';
|
||||
};
|
||||
min_swapsize = mkOption {
|
||||
type = types.str;
|
||||
default = "4m";
|
||||
description = "Smallest allowed size for individual swapfiles";
|
||||
};
|
||||
max_swapsize = mkOption {
|
||||
type = types.str;
|
||||
default = "2t";
|
||||
description = "Greatest allowed size for individual swapfiles";
|
||||
};
|
||||
cooldown = mkOption {
|
||||
type = types.ints.unsigned;
|
||||
default = 600;
|
||||
description = ''
|
||||
Duration (roughly in seconds) of the moratorium on swap allocation that is instated if disk space runs out, or the cooldown time after a new swapfile is successfully allocated before swapspace will consider deallocating swap space again.
|
||||
The default cooldown period is about 10 minutes.
|
||||
'';
|
||||
};
|
||||
buffer_elasticity = mkOption {
|
||||
type = types.ints.between 0 100;
|
||||
default = 30;
|
||||
description = ''Percentage of buffer space considered to be "free"'';
|
||||
};
|
||||
cache_elasticity = mkOption {
|
||||
type = types.ints.between 0 100;
|
||||
default = 80;
|
||||
description = ''Percentage of cache space considered to be "free"'';
|
||||
};
|
||||
};
|
||||
};
|
||||
default = { };
|
||||
description = ''
|
||||
Config file for swapspace.
|
||||
See the options here: <https://github.com/Tookmund/Swapspace/blob/master/swapspace.conf>
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
systemd.packages = [ cfg.package ];
|
||||
systemd.services.swapspace = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = [
|
||||
""
|
||||
"${lib.getExe cfg.package} -c ${configFile} ${utils.escapeSystemdExecArgs cfg.extraArgs}"
|
||||
];
|
||||
};
|
||||
};
|
||||
systemd.tmpfiles.settings.swapspace = {
|
||||
${cfg.settings.swappath}.d = {
|
||||
mode = "0700";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [
|
||||
Luflosi
|
||||
phanirithvij
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -14,6 +14,7 @@ with lib;
|
||||
unitConfig = {
|
||||
DefaultDependencies = false;
|
||||
ConditionPathExists = "/dev/rtc";
|
||||
ConditionPathIsReadWrite = "/etc/";
|
||||
};
|
||||
|
||||
serviceConfig = {
|
||||
|
||||
@@ -960,6 +960,7 @@ in {
|
||||
swap-file-btrfs = handleTest ./swap-file-btrfs.nix {};
|
||||
swap-partition = handleTest ./swap-partition.nix {};
|
||||
swap-random-encryption = handleTest ./swap-random-encryption.nix {};
|
||||
swapspace = handleTestOn ["aarch64-linux" "x86_64-linux"] ./swapspace.nix {};
|
||||
sway = handleTest ./sway.nix {};
|
||||
swayfx = handleTest ./swayfx.nix {};
|
||||
switchTest = handleTest ./switch-test.nix { ng = false; };
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
import ./make-test-python.nix (
|
||||
{ pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
name = "swapspace";
|
||||
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [
|
||||
Luflosi
|
||||
phanirithvij
|
||||
];
|
||||
};
|
||||
|
||||
nodes.machine = {
|
||||
virtualisation.memorySize = 512;
|
||||
|
||||
services.swapspace = {
|
||||
enable = true;
|
||||
extraArgs = [ "-v" ];
|
||||
settings = {
|
||||
# test outside /var/lib/swapspace
|
||||
swappath = "/swamp";
|
||||
cooldown = 1;
|
||||
};
|
||||
};
|
||||
|
||||
swapDevices = lib.mkOverride 0 [
|
||||
{
|
||||
size = 127;
|
||||
device = "/root/swapfile";
|
||||
}
|
||||
];
|
||||
boot.kernel.sysctl."vm.swappiness" = 60;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
machine.wait_for_unit("swapspace.service")
|
||||
machine.wait_for_unit("root-swapfile.swap")
|
||||
|
||||
swamp = False
|
||||
with subtest("swapspace works"):
|
||||
machine.execute("mkdir /root/memfs")
|
||||
machine.execute("mount -o size=2G -t tmpfs none /root/memfs")
|
||||
i = 0
|
||||
while i < 14:
|
||||
print(machine.succeed("free -h"))
|
||||
out = machine.succeed("sh -c 'swapon --show --noheadings --raw --bytes | grep /root/swapfile'")
|
||||
row = out.split(' ')
|
||||
# leave 1MB free to not get killed by oom
|
||||
freebytes=int(row[2]) - int(row[3]) - 1*1024*1024
|
||||
machine.succeed(f"dd if=/dev/random of=/root/memfs/{i} bs={freebytes} count=1")
|
||||
machine.sleep(1)
|
||||
out = machine.succeed("swapon --show")
|
||||
print(out)
|
||||
swamp = "/swamp" in out
|
||||
if not swamp:
|
||||
i += 1
|
||||
else:
|
||||
print("*"*10, "SWAPED", "*"*10)
|
||||
machine.succeed("rm -f /root/memfs/*")
|
||||
break
|
||||
|
||||
print(machine.succeed("swapspace -e -s /swamp"))
|
||||
assert "/swamp" not in machine.execute("swapon --show")
|
||||
assert swamp
|
||||
'';
|
||||
}
|
||||
)
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sidplayfp";
|
||||
version = "2.10.0";
|
||||
version = "2.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libsidplayfp";
|
||||
repo = "sidplayfp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-PT0WijNvcF7opTVxpj6oRb514Alz12gZCSMYa4bqyrY=";
|
||||
hash = "sha256-X2ds7pYglxvwLOHXfCULwSeWAS9l2Y3PUdSxcuugwHs=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pdfsam-basic";
|
||||
version = "5.2.8";
|
||||
version = "5.2.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
|
||||
hash = "sha256-81TIGTo00qSAlmfCTjvqeJH1xKYQPkvti3JFgVvLwmQ=";
|
||||
hash = "sha256-ZLVO2VD0XUVUG/GSot21c6nJ2N8h39vDzyzAzk1pQ6c=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dnscontrol";
|
||||
version = "4.14.0";
|
||||
version = "4.14.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StackExchange";
|
||||
repo = "dnscontrol";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XKsP6ZJCY196wYsp54d0OgF4zj0b9H8820wBAOjrDbg=";
|
||||
hash = "sha256-Sdm/3Svg37NW710whH58YtFULKWXU5+87LmErfjRm3Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6ePEgHVFPtkW+C57+cPLj5yc9YaCRKrnBFo2Y1pcglM=";
|
||||
vendorHash = "sha256-yyj5uP1v49mieLnNvCDG6n4+jC/+zRvdtfjaTYsAhhA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
"version" = "1.11.82";
|
||||
"version" = "1.11.84";
|
||||
"hashes" = {
|
||||
"desktopSrcHash" = "sha256-XG8q37N4PehYKPyoedgsIIBp2jrSHtoSJKaGrsxaIM8=";
|
||||
"desktopYarnHash" = "11130y915pa356fikk3i96w81ms41284x11d4xm1xw8385smjbgq";
|
||||
"webSrcHash" = "sha256-2W3noZfVnxpxwihimH6mlTxFpBpAdvXtLLfVHRiToxE=";
|
||||
"webYarnHash" = "1rmimxkd70ynrf29s67336vv43g2i6ry8bibc06zb8qyicg6ld83";
|
||||
"desktopSrcHash" = "sha256-XpXyLMYaxXTnDeJJio729TFMLn5BpUQnSb4/Rn434uo=";
|
||||
"desktopYarnHash" = "1wh867yw7ic3nx623c5dknn9wk4zgq9b000p9mdf79spfp57lqlw";
|
||||
"webSrcHash" = "sha256-va3r2Gk1zaP2fK/RGmU7wj52jVYo4PI5Gm/rRQGpuvo=";
|
||||
"webYarnHash" = "0w48744ick4ji1vwh9ma6ywsb4j5hfq4knw86zqqh0ciflylcywc";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signal-cli";
|
||||
version = "0.13.7";
|
||||
version = "0.13.9";
|
||||
|
||||
# Building from source would be preferred, but is much more involved.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";
|
||||
hash = "sha256-KeSKupExFIaLKdkXJw+UTclNaiMfrIomCec6GUV0E7M=";
|
||||
hash = "sha256-axvMUbF9TE1WLbunZni/KyjFUCdHSimP4AB8nSKf9zI=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libmatthew_java dbus dbus_java ];
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "seaweedfs";
|
||||
version = "3.75";
|
||||
version = "3.79";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "seaweedfs";
|
||||
repo = "seaweedfs";
|
||||
rev = version;
|
||||
hash = "sha256-f4ddm9+A3Km0aKlKFeoFMKxm94u0pbNvHaozesmQCH4=";
|
||||
hash = "sha256-oAgeK9ZPH1uTFaGQv9T+yhHVla/hxyp84WTZ2PfpjOg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-hdvlz3KbB6wPva3o5suEApgZ6w98R8TPYrPlmqYJbvo=";
|
||||
vendorHash = "sha256-4hftmcIHItEM4t2U/iT4mZsURejaO0JqSG3kjlBk77M=";
|
||||
|
||||
subPackages = [ "weed" ];
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
let
|
||||
# josh-ui requires javascript dependencies, haven't tried to figure it out yet
|
||||
cargoFlags = [ "--workspace" "--exclude" "josh-ui" ];
|
||||
version = "24.08.14";
|
||||
version = "24.10.04";
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
@@ -21,13 +21,13 @@ rustPlatform.buildRustPackage {
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esrlabs";
|
||||
owner = "josh-project";
|
||||
repo = "josh";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6U1nhERpPQAVgQm6xwRlHIhslYBLd65DomuGn5yRiSs=";
|
||||
rev = "r${version}";
|
||||
hash = "sha256-6rfNEWNeC0T/OXhCReaV5npcJjQoH6XhsZzHXGnnxOo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-s6+Bd4ucwUinrcbjNvlDsf9LhWc/U9SAvBRW7JAmxVA=";
|
||||
cargoHash = "sha256-tK/5qNvN1zs6DM7dXNc1nPhbUOt5lPqRpbie6h2d7Y0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, fetchYarnDeps
|
||||
, stdenv
|
||||
, yarn
|
||||
, nodejs
|
||||
, nixosTests
|
||||
, fixup-yarn-lock
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
fetchYarnDeps,
|
||||
stdenv,
|
||||
gitUpdater,
|
||||
yarn,
|
||||
nodejs,
|
||||
nixosTests,
|
||||
fixup-yarn-lock,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
@@ -32,7 +34,12 @@ buildGoModule rec {
|
||||
hash = "sha256-PwByNIegKYTOT8Yg3nDMDFZiLRVkbX07z99YaDiBsIY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ nodejs yarn fixup-yarn-lock ];
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
yarn
|
||||
fixup-yarn-lock
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
@@ -74,14 +81,17 @@ buildGoModule rec {
|
||||
subPackages = [ "cmd/alice-lg" ];
|
||||
doCheck = false;
|
||||
|
||||
passthru.tests = nixosTests.alice-lg;
|
||||
passthru = {
|
||||
tests = nixosTests.alice-lg;
|
||||
updateScript = gitUpdater { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/alice-lg/alice-lg";
|
||||
description = "Looking-glass for BGP sessions";
|
||||
changelog = "https://github.com/alice-lg/alice-lg/blob/main/CHANGELOG.md";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ stv0g ];
|
||||
mainProgram = "alice-lg";
|
||||
};
|
||||
}
|
||||
@@ -14,16 +14,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "argc";
|
||||
version = "1.20.1";
|
||||
version = "1.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigoden";
|
||||
repo = "argc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pOkZmk7boFPqHHBDet/on6Y8V2Ik+hpqN0cUtY0BiR0=";
|
||||
hash = "sha256-DTE78+POQXPOAXt16WWheyfO+WHvBKAmdCXKvRApyk8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-FxhDnTy/KAeN0Zd5I12EUgXRc0VhHN0lRm5DQyCinyw=";
|
||||
cargoHash = "sha256-xy8Vdy66Hb7NK2EEKj1Mn6HCVb7oxKkv/ffh+JS0Ync=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ] ++ lib.optional (!canExecuteHost) buildPackages.argc;
|
||||
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, nixosTests
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
nixosTests,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
@@ -19,16 +21,20 @@ buildGoModule rec {
|
||||
|
||||
deleteVendor = true;
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) birdwatcher;
|
||||
passthru = {
|
||||
tests = {
|
||||
inherit (nixosTests) birdwatcher;
|
||||
};
|
||||
|
||||
updateScript = gitUpdater { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/alice-lg/birdwatcher";
|
||||
description = "Small HTTP server meant to provide an API defined by Barry O'Donovan's birds-eye to the BIRD internet routing daemon";
|
||||
changelog = "https://github.com/alice-lg/birdwatcher/blob/master/CHANGELOG";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ stv0g ];
|
||||
mainProgram = "birdwatcher";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
libz,
|
||||
zstd,
|
||||
pkg-config,
|
||||
openssl,
|
||||
glib,
|
||||
ostree,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bootc";
|
||||
version = "1.1.0";
|
||||
cargoHash = "sha256-2Ka3n6sT1RUlReNjtV6tMe4ow/M7DFNvWPZktwcEi/w=";
|
||||
doInstallCheck = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "bootc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vsJwJHPE5Puv9xCnDRDtHzNuFj1U7s1HzZ2vQKTavhs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
libz
|
||||
zstd
|
||||
openssl
|
||||
glib
|
||||
ostree
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Boot and upgrade via container images";
|
||||
homepage = "https://containers.github.io/bootc";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "bootc";
|
||||
maintainers = with lib.maintainers; [ thesola10 ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -70,8 +70,13 @@ flutter.buildFlutterApplication {
|
||||
license = with lib.licenses; [
|
||||
agpl3Plus
|
||||
cc-by-sa-40
|
||||
asl20 # pdfium-binaries
|
||||
];
|
||||
maintainers = with lib.maintainers; [ aucub ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
fromSource
|
||||
binaryNativeCode # pdfium-binaries
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
cargo,
|
||||
rustc,
|
||||
blueprint-compiler,
|
||||
wrapGAppsHook4,
|
||||
desktop-file-utils,
|
||||
libxml2,
|
||||
libadwaita,
|
||||
gtksourceview5,
|
||||
openssl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cartero";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danirod";
|
||||
repo = "cartero";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-fXFrxaqHgf7XWX1guySsaP6PxmAPwVxoPaEOTpz4OqY=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-hbByC2r48+Zm/On99m9VWj4TJi6aeM/km2vcfvMMz38=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
rustPlatform.cargoSetupHook
|
||||
cargo
|
||||
rustc
|
||||
blueprint-compiler
|
||||
wrapGAppsHook4
|
||||
desktop-file-utils
|
||||
libxml2 # xmllint
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libadwaita
|
||||
gtksourceview5
|
||||
openssl
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Make HTTP requests and test APIs";
|
||||
longDescription = ''
|
||||
Cartero is a graphical HTTP client that can be used
|
||||
as a developer tool to test web APIs and perform all
|
||||
kind of HTTP requests to web servers. It is compatible
|
||||
with any REST, SOAP or XML-RPC API and it supports
|
||||
multiple request methods as well as attaching body
|
||||
payloads to compatible requests.
|
||||
'';
|
||||
homepage = "https://cartero.danirod.es";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
mainProgram = "cartero";
|
||||
maintainers = with lib.maintainers; [ aleksana ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "clerk";
|
||||
version = "4.0.5-unstable-2023-10-07";
|
||||
version = "0-unstable-2024-02-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "carnager";
|
||||
repo = "clerk";
|
||||
rev = "907138d8fc2b1709fb49d062d0b663a48eb210bd";
|
||||
hash = "sha256-V2nDLq2ViC5Twve0EILBEYOdEavqgYB/TQq/T+ftfmk=";
|
||||
rev = "a3c4a0b88597e8194a5b29a20bc9eab1a12f4de9";
|
||||
hash = "sha256-UlACMlH4iYj1l/GIpBf6Pb7MuRHWlgxLPgAqzc+Zol8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -19,16 +19,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "deno";
|
||||
version = "2.0.2";
|
||||
version = "2.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = "deno";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-nbwLkkO1ucRmlgGDRCJLHPpu4lk0xLQvz3wWpq7rics=";
|
||||
hash = "sha256-JTNLxUT1C9Q8XiP3BYn6NhytbvilQ20DzWwLjNXjlCI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-y/hAEu8c/CFS4mfp4f/pvPJRz4cxGoi39uIUbn5J+Pw=";
|
||||
cargoHash = "sha256-EDphp03j6HpTxgBgsaGHuO+hQX57QXkTz6fHN0+or48=";
|
||||
|
||||
postPatch = ''
|
||||
# upstream uses lld on aarch64-darwin for faster builds
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "duplicacy";
|
||||
version = "3.2.3";
|
||||
version = "3.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gilbertchen";
|
||||
repo = "duplicacy";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7LflTRBB4JG84QM46wvSJrP4o3CHV4gnR24RJgDSlDg=";
|
||||
hash = "sha256-JxBS40g97GPTzKXW+k0RrwLBuK4ItLvnVHzBZRSOEIM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4M/V4vP9XwHBkZ6UwsAxZ81YAzP4inuNC5yI+5ygQsA=";
|
||||
@@ -141,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
description = "Custom Discord App aiming to give you better performance and improve linux support";
|
||||
homepage = "https://github.com/Equicord/Equibop";
|
||||
changelog = "https://github.com/Equicord/Equibop/releases/tag/${finalAttrs.src.rev}";
|
||||
changelog = "https://github.com/Equicord/Equibop/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = [
|
||||
lib.maintainers.NotAShelf
|
||||
|
||||
@@ -155,7 +155,7 @@ buildGoModule rec {
|
||||
meta = {
|
||||
description = "Self-hosted lightweight software forge";
|
||||
homepage = "https://forgejo.org";
|
||||
changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/${src.rev}";
|
||||
changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/v${version}";
|
||||
license = if lib.versionAtLeast version "9.0.0" then lib.licenses.gpl3Plus else lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ emilylange urandom bendlas adamcstephens marie ];
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
|
||||
@@ -67,7 +67,7 @@ rustPlatform.buildRustPackage {
|
||||
meta = {
|
||||
description = "Community Manifest Creator for WinGet";
|
||||
homepage = "https://github.com/russellbanks/Komac";
|
||||
changelog = "https://github.com/russellbanks/Komac/releases/tag/${src.rev}";
|
||||
changelog = "https://github.com/russellbanks/Komac/releases/tag/v${version}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
kachick
|
||||
|
||||
@@ -54,6 +54,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
zbar
|
||||
];
|
||||
|
||||
patches = [
|
||||
# In the settings menu of Megapixels the user can select a different postprocessing script. The path to the script is then stored in a dconf setting. If the path changes, for example because it is in the Nix store and a dependency of the postprocessor changes, Megapixels will try to use this now non-existing old path. This will cause Megapixels to not save any images that were taken until the user opens the settings again and selects a postprocessor again. Using a global path allows the setting to keep working.
|
||||
# Note that this patch only fixes the issue for external postprocessors like postprocessd but the postprocessor script that comes with Megapixels is still refered to by the Nix store path.
|
||||
./search-for-postprocessors-in-NixOS-specific-global-location.patch
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
glib-compile-schemas $out/share/glib-2.0/schemas
|
||||
'';
|
||||
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
--- a/src/process_pipeline.c
|
||||
+++ b/src/process_pipeline.c
|
||||
@@ -179,10 +179,10 @@ mp_process_find_all_processors(GtkListStore *store)
|
||||
store, &iter, 0, buffer, 1, "(built-in) postprocess.sh", -1);
|
||||
}
|
||||
|
||||
- // Find extra packaged postprocessor scripts
|
||||
- // These should be packaged in
|
||||
- // /usr/share/megapixels/postprocessor.d/executable
|
||||
- sprintf(buffer, "%s/megapixels/postprocessor.d", DATADIR);
|
||||
+ // Find extra system postprocessor scripts
|
||||
+ // These should be accessible in
|
||||
+ // /run/current-system/sw/share/megapixels/postprocessor.d/executable
|
||||
+ sprintf(buffer, "/run/current-system/sw/share/megapixels/postprocessor.d");
|
||||
DIR *d;
|
||||
struct dirent *dir;
|
||||
d = opendir(buffer);
|
||||
@@ -192,8 +192,7 @@ mp_process_find_all_processors(GtkListStore *store)
|
||||
continue;
|
||||
}
|
||||
sprintf(buffer,
|
||||
- "%s/megapixels/postprocessor.d/%s",
|
||||
- DATADIR,
|
||||
+ "/run/current-system/sw/share/megapixels/postprocessor.d/%s",
|
||||
dir->d_name);
|
||||
gtk_list_store_insert(store, &iter, -1);
|
||||
gtk_list_store_set(
|
||||
@@ -22,13 +22,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mommy";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FWDekker";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kNhoEIzrPjCe6RA/GHFB/NtKjYFByM5TpxAwCLo5TDo=";
|
||||
hash = "sha256-RgneMpxUDMjfo1nVJpqCDaEAs3FRum4dWe8dNF9CCTo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
Generated
+36
-34
@@ -8,31 +8,31 @@
|
||||
(fetchNuGet { pname = "AutoFixture"; version = "4.18.1"; hash = "sha256-reP+aoYiPcIj4GbCIhjd5/OhuWVLCtD4hKuLPHe2EXI="; })
|
||||
(fetchNuGet { pname = "AutoFixture.Xunit2"; version = "4.18.1"; hash = "sha256-5hZm1Rx4n0e2JNsJ6lketE3c8z6AFdquTgKCQORqRfc="; })
|
||||
(fetchNuGet { pname = "Avalonia"; version = "11.0.0"; hash = "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E="; })
|
||||
(fetchNuGet { pname = "Avalonia"; version = "11.1.3"; hash = "sha256-kz+k/vkuWoL0XBvRT8SadMOmmRCFk9W/J4k/IM6oYX0="; })
|
||||
(fetchNuGet { pname = "Avalonia"; version = "11.1.4"; hash = "sha256-Gf9u4vQZXRku8syk7rRyl5wA9pBtjMB5/6ihkplqgiE="; })
|
||||
(fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.22045.20230930"; hash = "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="; })
|
||||
(fetchNuGet { pname = "Avalonia.AvaloniaEdit"; version = "11.1.0"; hash = "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8="; })
|
||||
(fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.28"; hash = "sha256-7NQWQl3xrBDOXhGihCkt5DIrws48KyDGon/7+gPzMDU="; })
|
||||
(fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; hash = "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.1.3"; hash = "sha256-W17Wvmi8/47cf5gCF3QRcaKLz0ZpXtZYCCkaERkbyXU="; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.1.3"; hash = "sha256-OOKTovi5kckn0x/8dMcq56cvq57UVMLzA9LRXDxm2Vc="; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.1.4"; hash = "sha256-7PTiLe1GsS4km/C7/aooH2CrRuR++y0eTV20J2+BcSM="; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.1.4"; hash = "sha256-EuCMo2FGx6OEOBP7+ElwWqfcoh0tELltoqEM/Qig278="; })
|
||||
(fetchNuGet { pname = "Avalonia.Controls.TreeDataGrid"; version = "11.0.10"; hash = "sha256-1R2AFOKQQPemN7qXsdxCGXcfMSRztRiC86DLqiV6CpY="; })
|
||||
(fetchNuGet { pname = "Avalonia.Desktop"; version = "11.1.3"; hash = "sha256-mNFscbtyqLlodzGa3SJ3oVY467JjWwY45LxZiKDAn/w="; })
|
||||
(fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.1.3"; hash = "sha256-PD9ZIeBZJrLaVDjmWBz4GocrdUSNUou11gAERU+xWDo="; })
|
||||
(fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.1.3"; hash = "sha256-nUBhSRE0Bly3dVC14wXwU19vP3g0VbE4bCUohx7DCVI="; })
|
||||
(fetchNuGet { pname = "Avalonia.Headless"; version = "11.1.3"; hash = "sha256-n/kRyxocJvlPM8ZZufHr1teo3E7BCu53HprUMRS6yTs="; })
|
||||
(fetchNuGet { pname = "Avalonia.Labs.Panels"; version = "11.1.0"; hash = "sha256-OiZYvUZG7BiWwCBQtLGBOE3JJ+Q88Kb/MIJflIEj99A="; })
|
||||
(fetchNuGet { pname = "Avalonia.Native"; version = "11.1.3"; hash = "sha256-byAVGW7XgkyzDj1TnqaCeDU/xTD9z8ACGrSJgwJ+XXs="; })
|
||||
(fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.1.3"; hash = "sha256-1VCFAJPKpLx9KyM5AK/8XbGtxNpGriQEFqidgN9eCtE="; })
|
||||
(fetchNuGet { pname = "Avalonia.Desktop"; version = "11.1.4"; hash = "sha256-Rqt7mKZy1e7IMNWjdFRS2KBsHlw38/3lHQUgkZYZNJU="; })
|
||||
(fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.1.4"; hash = "sha256-YlUNX0AIgyw74fsnfdmv7J/ox1T4rnSCTuiYl1OQrqM="; })
|
||||
(fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.1.4"; hash = "sha256-8vW9F08OBruC862nZnypc8sLxOZXe7NGOYJ/x6m9eRk="; })
|
||||
(fetchNuGet { pname = "Avalonia.Headless"; version = "11.1.4"; hash = "sha256-EAWcMTC3xo4NLY8mlgwa9yFJEET9EP/BGy93HbHuZ0Q="; })
|
||||
(fetchNuGet { pname = "Avalonia.Labs.Panels"; version = "11.2.0"; hash = "sha256-DhzjF4nhq8XXrCVHh9Eu1NTjVF2oPDNoto4BDQU7EJk="; })
|
||||
(fetchNuGet { pname = "Avalonia.Native"; version = "11.1.4"; hash = "sha256-FyB+1QdvNtsU1iCXF/FxI3j2UDd8/c9Qa6jUEa0iiH0="; })
|
||||
(fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.1.4"; hash = "sha256-J+4zwLZvrSTIR9aFedkB6yhKSz6bB9pnVkPJPbxJ/XA="; })
|
||||
(fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0"; hash = "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw="; })
|
||||
(fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.1.3"; hash = "sha256-CKF+62zCbK1Rd/HiC6MGrags3ylXrVQ1lni3Um0Muqk="; })
|
||||
(fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.1.4"; hash = "sha256-P8+yP2oPwO9eY6MYHQyikB8JOQhIZfY+UQ27Rz0SHts="; })
|
||||
(fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0"; hash = "sha256-A01nrs3Ij1eTo6tPmu7++T1K+Wo/H/9LvpeuOUGbQeU="; })
|
||||
(fetchNuGet { pname = "Avalonia.Skia"; version = "11.1.0"; hash = "sha256-w4ozV8lIs5vxoYP5D5Lut2iTMiJKVPbjdtqDB1sb0MI="; })
|
||||
(fetchNuGet { pname = "Avalonia.Skia"; version = "11.1.3"; hash = "sha256-EtB86g+nz6i8wL6xytMkYl2Ehgt3GFMMNPzQfhbfopM="; })
|
||||
(fetchNuGet { pname = "Avalonia.Skia"; version = "11.1.4"; hash = "sha256-i0HQokpcQ3+sGB111p6iuV1F89Xef6u8pZVyPiTNnCc="; })
|
||||
(fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "11.1.0.1"; hash = "sha256-WRU0C4cdCiL9+vkop8avI65cQLKZC86KaVxTjMN5gmA="; })
|
||||
(fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.1.3"; hash = "sha256-qfmRK2gLGSgHx4dNIeVesWxLUjcook9ET2xru/Xyiw8="; })
|
||||
(fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.1.3"; hash = "sha256-Q6jL5J/6aBtOY85I641RVp8RpuqJbPy6C6LxnRkFtMM="; })
|
||||
(fetchNuGet { pname = "Avalonia.Win32"; version = "11.1.3"; hash = "sha256-zcxTpEnpLf50p8Yaiylk5/CS9MNDe7lK1uX1CPaJBUc="; })
|
||||
(fetchNuGet { pname = "Avalonia.X11"; version = "11.1.3"; hash = "sha256-M2+y661/znDxZRdwNRIQi4mS2m6T4kQkBbYeE7KyQAw="; })
|
||||
(fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.1.4"; hash = "sha256-9In92SiSxnqP0Nj5HYpNM8vL/xcaq4Kwozs3fAm9qC4="; })
|
||||
(fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.1.4"; hash = "sha256-CVKoptReOkphMoUro82JjXjBfeREXUnBS4r2vUtX8pU="; })
|
||||
(fetchNuGet { pname = "Avalonia.Win32"; version = "11.1.4"; hash = "sha256-bFKOAoF3NU8bqsH5Td5uHwso5n4Ftgml34GInnwU9f8="; })
|
||||
(fetchNuGet { pname = "Avalonia.X11"; version = "11.1.4"; hash = "sha256-pmNTcg3LgDu4gaprE/glGjv11CDb/2RygkAZ+AWV0qQ="; })
|
||||
(fetchNuGet { pname = "AvaloniaEdit.TextMate"; version = "11.1.0"; hash = "sha256-Nv52bUxA02VcsKCbMqEAkNBl46gznSivRZ3llLHrhkM="; })
|
||||
(fetchNuGet { pname = "BenchmarkDotNet"; version = "0.13.12"; hash = "sha256-Xq7hnNeO1BbJVIlkDKEysJFgxn46eCvpujhQKZrIbt0="; })
|
||||
(fetchNuGet { pname = "BenchmarkDotNet.Annotations"; version = "0.13.12"; hash = "sha256-v3DRb2y0fbp9v8UGl9sou2HKx78SemK0UKh+rdsuv2s="; })
|
||||
@@ -65,17 +65,17 @@
|
||||
(fetchNuGet { pname = "FomodInstaller.Scripting"; version = "1.0.0"; hash = "sha256-GNqbLS+lU6aNThUUCfJpmZgP+rd4lF0fKyfMn2Y7Ckg="; })
|
||||
(fetchNuGet { pname = "FomodInstaller.Scripting.XmlScript"; version = "1.0.0"; hash = "sha256-fbekooynf0jQD0k0zbYueDvOTxPa3FIZUKjCcVMPeeY="; })
|
||||
(fetchNuGet { pname = "FomodInstaller.Utils"; version = "1.0.0"; hash = "sha256-H0Fc79msO6GhYstzqtZk9ttRcqxtXuDT9v0zQBwDRHI="; })
|
||||
(fetchNuGet { pname = "GameFinder"; version = "4.3.2"; hash = "sha256-1a3X8dfh/HinqqNTGj7qV9/zAia1JxrCOVOJjX1CBD4="; })
|
||||
(fetchNuGet { pname = "GameFinder.Common"; version = "4.3.2"; hash = "sha256-TVQut7hVy4wSCqapvbHlbuKo7ayvzSXQP0TWCvatNLg="; })
|
||||
(fetchNuGet { pname = "GameFinder.Launcher.Heroic"; version = "4.3.2"; hash = "sha256-aVK4fp1/qjtzTjDlcpKAjQcrWHS2LSYvMU/lkZ6SpQI="; })
|
||||
(fetchNuGet { pname = "GameFinder.RegistryUtils"; version = "4.3.2"; hash = "sha256-q0Ib8QTgER5c1ppVAYxnGo84JTRqYWBJ+SxB+b8dBEE="; })
|
||||
(fetchNuGet { pname = "GameFinder.StoreHandlers.EADesktop"; version = "4.3.2"; hash = "sha256-qVtzfgx4+UZPMTpCNK5mzeRCaQcABi9katbUPqB02Gc="; })
|
||||
(fetchNuGet { pname = "GameFinder.StoreHandlers.EGS"; version = "4.3.2"; hash = "sha256-6I+bUHMT+nwy22OxRdPgCTj0SbTbiES/AJKJe6iG/FI="; })
|
||||
(fetchNuGet { pname = "GameFinder.StoreHandlers.GOG"; version = "4.3.2"; hash = "sha256-pVixtrIHUqB8JKmt+gXuP5i58Ys23ZTVUfNWyJtG5eM="; })
|
||||
(fetchNuGet { pname = "GameFinder.StoreHandlers.Origin"; version = "4.3.2"; hash = "sha256-LXVFlO2Z/Y7BDh0+nCg3d21IX+e3jT09EPTqqoArs2M="; })
|
||||
(fetchNuGet { pname = "GameFinder.StoreHandlers.Steam"; version = "4.3.2"; hash = "sha256-shVLSqiQZ0GYd4a8jGq+CpJ5AlXcZEGkDBA5xCSZQqk="; })
|
||||
(fetchNuGet { pname = "GameFinder.StoreHandlers.Xbox"; version = "4.3.2"; hash = "sha256-zRwljOwIcTdMD2IVeWg5yY9m6ax+HI5FRB7K/YhQAFc="; })
|
||||
(fetchNuGet { pname = "GameFinder.Wine"; version = "4.3.2"; hash = "sha256-Qm/y6ZgZYJES33WHowYPrhPhdVpMhtvAVkKyK9fpqGU="; })
|
||||
(fetchNuGet { pname = "GameFinder"; version = "4.3.3"; hash = "sha256-uJzGa5CAa+6oHuG5gU0TN68biDb7ZQYGgqeW1nGLHQc="; })
|
||||
(fetchNuGet { pname = "GameFinder.Common"; version = "4.3.3"; hash = "sha256-0mITSz+9TyknYO8zzvLNB70jWPe5v2Q3sKHPupvGGBk="; })
|
||||
(fetchNuGet { pname = "GameFinder.Launcher.Heroic"; version = "4.3.3"; hash = "sha256-3DuhHRGbWeh4Smj0TXitzUsTPbCwHmtZsk3e+CVZHHA="; })
|
||||
(fetchNuGet { pname = "GameFinder.RegistryUtils"; version = "4.3.3"; hash = "sha256-bd6qpOthn4ljNpwQi7pdVe5P1EN8DnXbyKyR4PnSxJk="; })
|
||||
(fetchNuGet { pname = "GameFinder.StoreHandlers.EADesktop"; version = "4.3.3"; hash = "sha256-jvh672wPSH0T4W6dJHdvMGJi93LWDJBefcVFrkxT6hI="; })
|
||||
(fetchNuGet { pname = "GameFinder.StoreHandlers.EGS"; version = "4.3.3"; hash = "sha256-IKDDTnCor3G7HdsVjo0wYNJQjBoQjQ+a+MgjnGVOaek="; })
|
||||
(fetchNuGet { pname = "GameFinder.StoreHandlers.GOG"; version = "4.3.3"; hash = "sha256-76+W+wi33ms0Xm5OCXQBmHCAilWRaA/OMd343vkkhc0="; })
|
||||
(fetchNuGet { pname = "GameFinder.StoreHandlers.Origin"; version = "4.3.3"; hash = "sha256-Ss48fc+19RqhjkEP0tld5Eui65XwECFeAMu+126JCo4="; })
|
||||
(fetchNuGet { pname = "GameFinder.StoreHandlers.Steam"; version = "4.3.3"; hash = "sha256-EQxtM7k459MfHL0Z2Li45jWji6CgGvpJbJbJv8zXVc4="; })
|
||||
(fetchNuGet { pname = "GameFinder.StoreHandlers.Xbox"; version = "4.3.3"; hash = "sha256-uzIPKS3O/uxqXZMysZfgRlQaDUSUhj1y9hCKAwwhK0g="; })
|
||||
(fetchNuGet { pname = "GameFinder.Wine"; version = "4.3.3"; hash = "sha256-aEFkI7UVHsipCxdvHq3P+mrThgYdrFhpK6EbyFYqU6Y="; })
|
||||
(fetchNuGet { pname = "Gee.External.Capstone"; version = "2.3.0"; hash = "sha256-wdYT/F8SLL72OIVv/Q/hfLMfhlWMnhDNCTWx+wWlPoU="; })
|
||||
(fetchNuGet { pname = "GitHubActionsTestLogger"; version = "2.3.3"; hash = "sha256-/TxZ7f3AvArXXe6isyom6ZHLFZR2hi1ejaQuY/6KN4s="; })
|
||||
(fetchNuGet { pname = "Google.Protobuf"; version = "3.22.5"; hash = "sha256-KuPCqobX6vE9RYElAN9vw+FPonFipms7kE/cRDCLmSQ="; })
|
||||
@@ -297,12 +297,12 @@
|
||||
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; })
|
||||
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; })
|
||||
(fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; hash = "sha256-qofIFqViDsdBOE/X0IvzfGUklSrULaH8MoZQ+YrcMOQ="; })
|
||||
(fetchNuGet { pname = "NexusMods.Archives.Nx"; version = "0.5.0"; hash = "sha256-wt5kkxSotShfW8W+hgxVx/OaWLH006WfGknDFc9TbIU="; })
|
||||
(fetchNuGet { pname = "NexusMods.Hashing.xxHash64"; version = "2.0.2"; hash = "sha256-MEVouiZrdsYzkgadcICAmAZ7P1tFpJ/UOlt8mlUAzW4="; })
|
||||
(fetchNuGet { pname = "NexusMods.MnemonicDB"; version = "0.9.89"; hash = "sha256-bb+CG0nCH5Nha24RPaQA1z2X3zN6ZSGwMGnqgrwLbRE="; })
|
||||
(fetchNuGet { pname = "NexusMods.MnemonicDB.Abstractions"; version = "0.9.86"; hash = "sha256-IXZ/5VEf6YeRQsxTLdH8bpAdYJJ4gyzIkNoLVBKzEY0="; })
|
||||
(fetchNuGet { pname = "NexusMods.MnemonicDB.Abstractions"; version = "0.9.89"; hash = "sha256-RFYZ9tk1uZ4+emE8bipopW/pMGYVKMWtRW083eB5ZyI="; })
|
||||
(fetchNuGet { pname = "NexusMods.MnemonicDB.SourceGenerator"; version = "0.9.89"; hash = "sha256-5j/GgFiSV9OFghGADBIk7GOI+63tJPSAsD1BnCLRPmE="; })
|
||||
(fetchNuGet { pname = "NexusMods.Archives.Nx"; version = "0.6.1"; hash = "sha256-NDUxypEccSlGBG9nYTJJiTqYrZWjSjV1xt/uUbtfeS8="; })
|
||||
(fetchNuGet { pname = "NexusMods.Hashing.xxHash3"; version = "3.0.2"; hash = "sha256-AJwEgi+feVf61XQRZ4kmULkBq5+HKBVIZ30QwaAc04U="; })
|
||||
(fetchNuGet { pname = "NexusMods.Hashing.xxHash3.Paths"; version = "3.0.2"; hash = "sha256-Z6LrrMEQ+Kvuvc8hmudSdlrnoT739fglu87/dZIuMeY="; })
|
||||
(fetchNuGet { pname = "NexusMods.MnemonicDB"; version = "0.9.95"; hash = "sha256-C4jjS/7yfvNAj/qeHWtMpEId5MtNsOogl0BRvoUFjxQ="; })
|
||||
(fetchNuGet { pname = "NexusMods.MnemonicDB.Abstractions"; version = "0.9.95"; hash = "sha256-doLqDfSCuYwMENRTBaHH7OudS43jPhGyXW4GlY4ApFQ="; })
|
||||
(fetchNuGet { pname = "NexusMods.MnemonicDB.SourceGenerator"; version = "0.9.95"; hash = "sha256-soxAI6LIlEzFZdld3CV8bSl+rJnQqPjSm++cb20eOlU="; })
|
||||
(fetchNuGet { pname = "NexusMods.Paths"; version = "0.10.0"; hash = "sha256-tzUKPBrGNyZvVgScDAP0qvVF5nV6635v3NlBvzpnz1M="; })
|
||||
(fetchNuGet { pname = "NexusMods.Paths"; version = "0.9.5"; hash = "sha256-30IlPuu35i0VrUJSaLy86wSYwVCIDgdZc2HctnKuo6o="; })
|
||||
(fetchNuGet { pname = "NexusMods.Paths.Extensions.Nx"; version = "0.10.0"; hash = "sha256-DktYpARh+UwtrjSYck5dtuQ3YyroZqTJysAZ6jxneEU="; })
|
||||
@@ -325,6 +325,7 @@
|
||||
(fetchNuGet { pname = "OneOf"; version = "2.1.125"; hash = "sha256-3XkBNSEMwlNyNpY/H2gtJ47Mc7905p/CJH9d/VJyO3s="; })
|
||||
(fetchNuGet { pname = "OneOf"; version = "3.0.271"; hash = "sha256-tFWy8Jg/XVJfVOddjXeCAizq/AUljJrq6J8PF6ArYSU="; })
|
||||
(fetchNuGet { pname = "OneOf.Extended"; version = "2.1.125"; hash = "sha256-wJaz49zNFzZwSpMTeabEoJR65Kvk7NCrAqyTKxjfFkg="; })
|
||||
(fetchNuGet { pname = "Onigwrap"; version = "1.0.6"; hash = "sha256-p+dhMfIH4C6xLKRUREnUpC0DZwFazjvI+30KRT8TWnU="; })
|
||||
(fetchNuGet { pname = "OpenTelemetry"; version = "1.8.1"; hash = "sha256-AldbsateY7uhKy/0JM2sEgiOF1wGr5CwTifsuH6Tnuo="; })
|
||||
(fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.8.1"; hash = "sha256-xdMOKY90bGTcvRdBsBqj08Du3qRmDC1BecX+aK3dTTA="; })
|
||||
(fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.8.1"; hash = "sha256-j4XUh9cnF5SbyhRoNwjOWS3EXIl9ZSEFgkJZjQEN2lM="; })
|
||||
@@ -639,7 +640,8 @@
|
||||
(fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "20.0.28"; hash = "sha256-SwR51XEqt10sMgvrq9lSPgOIhtgzgA+GnzMqSL6RgtY="; })
|
||||
(fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "20.0.28"; hash = "sha256-evySmax2pcTz1Hb7+W/Pc7UiIpqaWM3o3A1nqU3CzXU="; })
|
||||
(fetchNuGet { pname = "TextMateSharp"; version = "1.0.59"; hash = "sha256-qfAGSgVpTrWMZSk0TFDVP1IgWWi6O1jEEvWc0Pvw9i0="; })
|
||||
(fetchNuGet { pname = "TextMateSharp.Grammars"; version = "1.0.59"; hash = "sha256-ru5VxQK4PFRJhHu+MvCzDt3EwbC/94n1whtDovUAUDA="; })
|
||||
(fetchNuGet { pname = "TextMateSharp"; version = "1.0.63"; hash = "sha256-be3i2lVNvfNmMdylWMNl2nfHHvX2HguW5tL3m1o86YQ="; })
|
||||
(fetchNuGet { pname = "TextMateSharp.Grammars"; version = "1.0.63"; hash = "sha256-AWMIh+dM5AsScOfBLiSYciLkuaCDkhVAFLYklz33gfk="; })
|
||||
(fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.16.0"; hash = "sha256-vKYEaa1EszR7alHj48R8G3uYArhI+zh2ZgiBv955E98="; })
|
||||
(fetchNuGet { pname = "TransparentValueObjects"; version = "1.0.1"; hash = "sha256-nTnJNjj0p0ztiZA9DPYdzTWKHXC2C6uQXJG7Pad//rA="; })
|
||||
(fetchNuGet { pname = "Validation"; version = "2.3.7"; hash = "sha256-VTSUT1Ij87fN8zlz7w2HTIUMMx3NBRdbfXmMtFvV5es="; })
|
||||
|
||||
@@ -24,14 +24,14 @@ let
|
||||
in
|
||||
buildDotnetModule (finalAttrs: {
|
||||
inherit pname;
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nexus-Mods";
|
||||
repo = "NexusMods.App";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-0uZdN24TvK4QoBEC0BSAYNALQv9swYZ8SgVJ03m2dzQ=";
|
||||
hash = "sha256-6oygXJEiTqb0xe7mKRUsZgghfTqrllCRXJy6IDeqJQI=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = false;
|
||||
@@ -103,7 +103,7 @@ buildDotnetModule (finalAttrs: {
|
||||
executables = [ "NexusMods.App" ];
|
||||
|
||||
dotnetBuildFlags = [
|
||||
# From https://github.com/Nexus-Mods/NexusMods.App/blob/v0.6.2/src/NexusMods.App/app.pupnet.conf#L38
|
||||
# From https://github.com/Nexus-Mods/NexusMods.App/blob/v0.6.3/src/NexusMods.App/app.pupnet.conf#L38
|
||||
"--property:Version=${finalAttrs.version}"
|
||||
"--property:TieredCompilation=true"
|
||||
"--property:PublishReadyToRun=true"
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ols";
|
||||
version = "0-unstable-2024-10-12";
|
||||
version = "0-unstable-2024-10-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DanielGavin";
|
||||
repo = "ols";
|
||||
rev = "834ec9ad3f50add0ee8e44071275c318a9f35abb";
|
||||
hash = "sha256-K32coqh6eCId+Rdfbu9TnN2RHDlvxF+BDsxAoP3Xk30=";
|
||||
rev = "a3b090c7ef9604b0d6630caedb9c204a708828ac";
|
||||
hash = "sha256-pmxdfS8GyJneuf+ADkGyj7DZVqiyQgyNILjztxMFC0c=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromSourcehut,
|
||||
libexif,
|
||||
libraw,
|
||||
meson,
|
||||
ninja,
|
||||
opencv4,
|
||||
pkg-config,
|
||||
scdoc,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "postprocessd";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~martijnbraam";
|
||||
repo = "postprocessd";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-xqEjjAv27TUrEU/5j8Um7fTFjmIYZovyJCccbtHPuGo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
scdoc
|
||||
];
|
||||
|
||||
depsBuildBuild = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libexif
|
||||
libraw
|
||||
opencv4
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = {
|
||||
description = "Queueing megapixels post-processor";
|
||||
homepage = "https://git.sr.ht/~martijnbraam/postprocessd";
|
||||
changelog = "https://git.sr.ht/~martijnbraam/postprocessd/refs/${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ Luflosi ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "postprocess-single";
|
||||
};
|
||||
})
|
||||
+17
-12
@@ -1,11 +1,12 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, doxygen
|
||||
, graphviz
|
||||
, gtest
|
||||
, valgrind
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
doxygen,
|
||||
graphviz,
|
||||
gtest,
|
||||
valgrind,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -69,11 +70,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
valgrind
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Fast JSON parser/generator for C++ with both SAX/DOM style API";
|
||||
homepage = "http://rapidjson.org/";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ dotlambda Madouura tobim ];
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [
|
||||
lib.maintainers.dotlambda
|
||||
lib.maintainers.Madouura
|
||||
lib.maintainers.tobim
|
||||
];
|
||||
};
|
||||
})
|
||||
Generated
+2900
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,110 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
appstream-glib,
|
||||
blueprint-compiler,
|
||||
cargo,
|
||||
desktop-file-utils,
|
||||
fetchFromGitea,
|
||||
glib,
|
||||
gst_all_1,
|
||||
gtk4,
|
||||
hicolor-icon-theme,
|
||||
libadwaita,
|
||||
libxml2,
|
||||
meson,
|
||||
ninja,
|
||||
nix-update-script,
|
||||
pkg-config,
|
||||
rustPlatform,
|
||||
rustc,
|
||||
sqlite,
|
||||
wrapGAppsHook4,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "recordbox";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "edestcroix";
|
||||
repo = "Recordbox";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-/yg/75LswCj3HhsUhMXgIDpx2tlNkdTuImkqMwU6uio=";
|
||||
};
|
||||
|
||||
# Patch in our Cargo.lock and ensure AppStream tests don't use the network
|
||||
# TODO: Switch back to the default `validate` when the upstream file actually
|
||||
# passes it
|
||||
postPatch = ''
|
||||
ln -s ${./Cargo.lock} Cargo.lock
|
||||
|
||||
substituteInPlace data/meson.build \
|
||||
--replace-fail "['validate', appstream_file]" "['validate-relax', '--nonet', appstream_file]"
|
||||
'';
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; };
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream-glib # For `appstream-util`
|
||||
blueprint-compiler
|
||||
cargo
|
||||
desktop-file-utils # For `desktop-file-validate`
|
||||
glib # For `glib-compile-schemas`
|
||||
gtk4 # For `gtk-update-icon-cache`
|
||||
libxml2 # For `xmllint`
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
rustPlatform.cargoCheckHook
|
||||
rustPlatform.cargoSetupHook
|
||||
rustc
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
gtk4
|
||||
hicolor-icon-theme
|
||||
libadwaita
|
||||
sqlite
|
||||
]
|
||||
++ (with gst_all_1; [
|
||||
gst-plugins-bad
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gst-plugins-rs
|
||||
gst-plugins-ugly
|
||||
gstreamer
|
||||
]);
|
||||
|
||||
mesonBuildType = "release";
|
||||
|
||||
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
cargoCheckType = if (finalAttrs.mesonBuildType != "debug") then "release" else "debug";
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
mesonCheckPhase
|
||||
cargoCheckHook
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Relatively simple music player";
|
||||
homepage = "https://codeberg.org/edestcroix/Recordbox";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ getchoo ];
|
||||
mainProgram = "recordbox";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "sarasa-gothic";
|
||||
version = "1.0.22";
|
||||
version = "1.0.23";
|
||||
|
||||
src = fetchurl {
|
||||
# Use the 'ttc' files here for a smaller closure size.
|
||||
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
|
||||
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip";
|
||||
hash = "sha256-356T39GotzLj4lu5KYulpFn2RmS7fZOgjz6Yy9M2T6Y=";
|
||||
hash = "sha256-g2IBx++zm2AandHhGVlNVH/r9AM42tPrIMd//Uv1uYg=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
+7
-4
@@ -6,7 +6,8 @@
|
||||
cmake,
|
||||
pkg-config,
|
||||
|
||||
darwin,
|
||||
apple-sdk_11,
|
||||
darwinMinVersionHook,
|
||||
dbus,
|
||||
openssl,
|
||||
sqlite,
|
||||
@@ -14,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20241025";
|
||||
version = "20241105-2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = "signalbackup-tools";
|
||||
rev = version;
|
||||
hash = "sha256-ivk7sqTP5kLXrTn+XDrat0VxiK0atA5xI3TzKXvxaV0=";
|
||||
hash = "sha256-ucyNJTn/wt4X4ptDrMu/XbeQrbeMKms8c0oXqH280H0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -35,7 +36,9 @@ stdenv.mkDerivation rec {
|
||||
] ++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
dbus
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk_11_0.frameworks.Security
|
||||
# Needed for `utimensat` on `x86_64-darwin`
|
||||
apple-sdk_11
|
||||
(darwinMinVersionHook "11.3")
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
@@ -0,0 +1,43 @@
|
||||
{
|
||||
buildGoModule,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
stdenv,
|
||||
darwin,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "slackdump";
|
||||
version = "2.5.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rusq";
|
||||
repo = "slackdump";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-othSIR+KyekUt+/LWhaM5Y6LGsujDCZTfLJotTcPXc0=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.IOKitTools;
|
||||
|
||||
checkFlags =
|
||||
let
|
||||
skippedTests = [
|
||||
"TestSession_saveUserCache"
|
||||
"TestSession_GetUsers"
|
||||
];
|
||||
in
|
||||
[
|
||||
"-skip=^${builtins.concatStringsSep "$|^" skippedTests}$"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-6GVXzaJ5Lrt4fF0c9cbx6AqpgCwlYgKf6jUJkUyxc0s=";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/rusq/slackdump";
|
||||
changelog = "https://github.com/rusq/slackdump/releases/tag/v${version}";
|
||||
description = "Tools for saving Slack's data without admin privileges";
|
||||
maintainers = with lib.maintainers; [ bot-wxt1221 ];
|
||||
mainProgram = "slackdump";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
};
|
||||
}
|
||||
@@ -1,4 +1,9 @@
|
||||
{ lib, stdenv, fetchFromGitHub, Carbon, Cocoa, ScriptingBridge, SkyLight }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
apple-sdk_12,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spacebar";
|
||||
@@ -11,7 +16,9 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-4LiG43kPZtsm7SQ/28RaGMpYsDshCaGvc1mouPG3jFM=";
|
||||
};
|
||||
|
||||
buildInputs = [ Carbon Cocoa ScriptingBridge SkyLight ];
|
||||
buildInputs = [
|
||||
apple-sdk_12
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
@@ -14,9 +14,9 @@
|
||||
}:
|
||||
stdenv.mkDerivation (self: {
|
||||
pname = "srm-cuarzo";
|
||||
version = "0.7.2-1";
|
||||
version = "0.8.0-1";
|
||||
rev = "v${self.version}";
|
||||
hash = "sha256-VxLiGA7AvNNjl8UjFbBE9Z/T+YrTj9Hb3LASgzE9iH0=";
|
||||
hash = "sha256-QQYn7TR2+6nZHOohjqEg6uMt4OBvfYD4+bFiDIaC7SU=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit (self) rev hash;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
trunk-ng,
|
||||
trunk,
|
||||
tailwindcss,
|
||||
fetchNpmDeps,
|
||||
nix-update-script,
|
||||
@@ -44,15 +44,20 @@ rustPlatform.buildRustPackage rec {
|
||||
nodejs
|
||||
npmHooks.npmConfigHook
|
||||
tailwindcss
|
||||
trunk-ng
|
||||
wasm-bindgen-cli
|
||||
trunk
|
||||
# needs to match with wasm-bindgen version in upstreams Cargo.lock
|
||||
(wasm-bindgen-cli.override {
|
||||
version = "0.2.93";
|
||||
hash = "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0=";
|
||||
cargoHash = "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ=";
|
||||
})
|
||||
zip
|
||||
];
|
||||
|
||||
NODE_PATH = "$npmDeps";
|
||||
|
||||
buildPhase = ''
|
||||
trunk-ng build --offline --verbose --release
|
||||
trunk build --offline --frozen --release
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -1,25 +1,22 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, stayrtr
|
||||
, testers
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
stayrtr,
|
||||
testers,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "stayrtr";
|
||||
version = "0.5.1";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bgp";
|
||||
repo = "stayrtr";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/KwL/SEnHquFhPcYXpvQs71W4K1BrbqTPakatTNF47Q=";
|
||||
hash = "sha256-uNZe3g8hs9c0uXrkWSTA+e/gziOpWqx5oFIJ2ZPgEzU=";
|
||||
};
|
||||
vendorHash = "sha256-ndMME9m3kbv/c1iKlU2Pn/YoiRQy7jfVQri3M+qhujk=";
|
||||
|
||||
patches = [
|
||||
./go.mod.patch
|
||||
];
|
||||
vendorHash = "sha256-0PtQzwBhUoASUMnAAVZ4EIDmqIEaH0nct2ngyIkR+Qg=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
@@ -32,9 +29,11 @@ buildGoModule rec {
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple RPKI-To-Router server. (Hard fork of GoRTR)";
|
||||
changelog = "https://github.com/bgp/stayrtr/releases/tag/v${version}";
|
||||
description = "RPKI-To-Router server implementation in Go";
|
||||
homepage = "https://github.com/bgp/stayrtr/";
|
||||
license = licenses.bsd3;
|
||||
mainProgram = "stayrtr";
|
||||
maintainers = with maintainers; [ _0x4A6F ];
|
||||
};
|
||||
}
|
||||
@@ -1,11 +1,8 @@
|
||||
{ lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
openssl,
|
||||
CoreServices,
|
||||
SystemConfiguration
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -20,9 +17,7 @@ rustPlatform.buildRustPackage rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = if stdenv.hostPlatform.isDarwin
|
||||
then [ CoreServices SystemConfiguration ]
|
||||
else [ openssl ];
|
||||
buildInputs = [ openssl ];
|
||||
# requires network
|
||||
checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ];
|
||||
|
||||
@@ -16,17 +16,17 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tsukimi";
|
||||
version = "0.16.7";
|
||||
version = "0.16.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tsukinaha";
|
||||
repo = "tsukimi";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OsdwjmvmVh8lVDy6KWlXe1+9e/EOzQ/auUwaoVHrksI=";
|
||||
hash = "sha256-SeABeXg2dpGYxGiDDwn811egRe8BYVdxK8hz7qfBagQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Su7ACU+n90ZkhPUKod/zb2I6bKce/ST+u2Kz3Dg6ogo=";
|
||||
cargoHash = "sha256-o6FjBauHjdhxNXpqlJc/yNNTkRJyX3R4smAMrdFUjLA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
TuxGuitar is a multitrack guitar tablature editor and player written
|
||||
in Java-SWT. It can open GuitarPro, PowerTab and TablEdit files.
|
||||
'';
|
||||
homepage = "http://www.tuxguitar.com.ar/";
|
||||
homepage = "https://github.com/helge17/tuxguitar";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
|
||||
license = lib.licenses.lgpl2;
|
||||
maintainers = with lib.maintainers; [ ardumont ];
|
||||
|
||||
@@ -75,7 +75,7 @@ rustPlatform.buildRustPackage rec {
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/typst/typst/releases/tag/${src.rev}";
|
||||
changelog = "https://github.com/typst/typst/releases/tag/v${version}";
|
||||
description = "New markup-based typesetting system that is powerful and easy to learn";
|
||||
homepage = "https://github.com/typst/typst";
|
||||
license = lib.licenses.asl20;
|
||||
|
||||
@@ -272,6 +272,7 @@ buildFHSEnv {
|
||||
inherit (wechat) name meta;
|
||||
runScript = writeShellScript "wechat-uos-launcher" ''
|
||||
export QT_QPA_PLATFORM=xcb
|
||||
export QT_AUTO_SCREEN_SCALE_FACTOR=1
|
||||
export LD_LIBRARY_PATH=${lib.makeLibraryPath wechat-uos-runtime}
|
||||
|
||||
if [[ ''${XMODIFIERS} =~ fcitx ]]; then
|
||||
|
||||
Generated
+1091
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,74 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
glfw3,
|
||||
nix-update-script,
|
||||
pkg-config,
|
||||
rustPlatform,
|
||||
wayland,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "woomer";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coffeeispower";
|
||||
repo = "woomer";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-puALhN54ma2KToXUF8ipaYysyayjaSp+ISZ3AgQvniw=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"libwayshot-0.3.2-dev" = "sha256-QETmdzA7a1XMGdMU7tUNSJzzDw/4nkH9gKZv3pP0Nwc=";
|
||||
};
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glfw3
|
||||
wayland
|
||||
];
|
||||
|
||||
# `raylib-sys` wants to compile examples that don't exist in its crate
|
||||
doCheck = false;
|
||||
|
||||
env = {
|
||||
# Force linking so libwayland-client.so can be `dlopen`'d
|
||||
CARGO_BUILD_RUSTFLAGS = toString (
|
||||
map (arg: "-C link-arg=" + arg) [
|
||||
"-Wl,--push-state,--as-needed"
|
||||
"-lwayland-client"
|
||||
"-Wl,--pop-state"
|
||||
]
|
||||
);
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Zoomer application for Wayland inspired by tsoding's boomer";
|
||||
homepage = "https://github.com/coffeeispower/woomer";
|
||||
changelog = "https://github.com/coffeeispower/woomer/releases/tag/${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ getchoo ];
|
||||
mainProgram = "woomer";
|
||||
inherit (wayland.meta) platforms;
|
||||
# TODO: Remove after upstream is no longer affected by
|
||||
# https://github.com/raylib-rs/raylib-rs/issues/74
|
||||
broken = stdenv.hostPlatform.isAarch64;
|
||||
};
|
||||
}
|
||||
@@ -1,6 +1,5 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
lib,
|
||||
nixosTests,
|
||||
python3Packages,
|
||||
@@ -8,7 +7,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "xandikos";
|
||||
version = "0.2.11";
|
||||
version = "0.2.12";
|
||||
pyproject = true;
|
||||
|
||||
disabled = python3Packages.pythonOlder "3.9";
|
||||
@@ -17,18 +16,9 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "jelmer";
|
||||
repo = "xandikos";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-cBsceJ6tib8OYx5L2Hv2AqRS+ADRSLIuJGIULNpAmEI=";
|
||||
hash = "sha256-wdEwIVN9dkLVj8oe+2eh5n258pZRfKgLgzVCmwafCis=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
name = "fix-compatibility-with-icalendar-v6.patch";
|
||||
url = "https://github.com/jelmer/xandikos/commit/ae8924c374ed86b2efde5bfbc75e56f6d8318086.patch";
|
||||
excludes = [ "requirements.txt" ];
|
||||
hash = "sha256-PCKo5C6Ejw9ZsFFLAMw1ZtMoCq9gJxR65K7CM6RUYwU=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
];
|
||||
@@ -105,7 +105,9 @@ stdenv.mkDerivation (args // {
|
||||
# sequential order among them as a single rule.
|
||||
makefile = ./Makefile.nixpkgs;
|
||||
buildFlags = if useNativeCompilers
|
||||
then ["nixpkgs_world_bootstrap_world_opt"]
|
||||
then [(if lib.versionOlder version "5.2"
|
||||
then "nixpkgs_world_bootstrap_world_opt"
|
||||
else "defaultentry")]
|
||||
else ["nixpkgs_world"];
|
||||
buildInputs = optional (lib.versionOlder version "4.07") ncurses
|
||||
++ optionals useX11 [ libX11 xorgproto ];
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libsidplayfp";
|
||||
version = "2.10.1";
|
||||
version = "2.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libsidplayfp";
|
||||
repo = "libsidplayfp";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-yZ2IiSzl78N/jrhKls/l2klnePJYKU1NCnZcBKUWiuU=";
|
||||
hash = "sha256-O6VzHjJT3k1uLI0bjBDRntLqAZdMurs8onLZ6L6NlIU=";
|
||||
};
|
||||
|
||||
outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ];
|
||||
|
||||
@@ -18,14 +18,14 @@ deployAndroidPackage {
|
||||
# Wrap all scripts that require JAVA_HOME
|
||||
find $ANDROID_SDK_ROOT/${package.path}/bin -maxdepth 1 -type f -executable | while read program; do
|
||||
if grep -q "JAVA_HOME" $program; then
|
||||
wrapProgram $program --prefix PATH : ${pkgs.jdk11}/bin \
|
||||
wrapProgram $program --prefix PATH : ${pkgs.jdk17}/bin \
|
||||
--prefix ANDROID_SDK_ROOT : $ANDROID_SDK_ROOT
|
||||
fi
|
||||
done
|
||||
|
||||
# Wrap sdkmanager script
|
||||
wrapProgram $ANDROID_SDK_ROOT/${package.path}/bin/sdkmanager \
|
||||
--prefix PATH : ${lib.makeBinPath [ pkgs.jdk11 ]} \
|
||||
--prefix PATH : ${lib.makeBinPath [ pkgs.jdk17 ]} \
|
||||
--add-flags "--sdk_root=$ANDROID_SDK_ROOT"
|
||||
|
||||
# Patch all script shebangs
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
lib,
|
||||
aiohttp,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
flit,
|
||||
fetchFromGitHub,
|
||||
flit-core,
|
||||
pytest-aiohttp,
|
||||
pytest-cov-stub,
|
||||
pytestCheckHook,
|
||||
@@ -13,20 +13,26 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohttp-remotes";
|
||||
version = "1.2.0";
|
||||
format = "pyproject";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "aiohttp_remotes";
|
||||
inherit version;
|
||||
sha256 = "f95c3a6be5e2de746a85ce9af49ec548da6db8378d7e81bb171ec77b13562a6c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "aio-libs";
|
||||
repo = "aiohttp-remotes";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/bcYrpZfO/sXc0Tcpr67GBqCu4ZSAVmUj9kzupIHHnM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flit ];
|
||||
build-system = [
|
||||
flit-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ aiohttp ] ++ lib.optionals (pythonOlder "3.7") [ typing-extensions ];
|
||||
dependencies = [
|
||||
aiohttp
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-aiohttp
|
||||
@@ -36,12 +42,6 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "aiohttp_remotes" ];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"-W"
|
||||
"ignore::DeprecationWarning"
|
||||
"--asyncio-mode=auto"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -21,26 +21,31 @@
|
||||
# checks
|
||||
cloudpickle,
|
||||
einops,
|
||||
flaxlib,
|
||||
keras,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
pytest-xdist,
|
||||
sphinx,
|
||||
tensorflow,
|
||||
treescope,
|
||||
|
||||
# optional-dependencies
|
||||
matplotlib,
|
||||
|
||||
writeScript,
|
||||
tomlq,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flax";
|
||||
version = "0.9.0";
|
||||
version = "0.10.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "flax";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-iDWuUJKO7V4QrbVsS4ALgy6fbllOC43o7W4mhjtZ9xc=";
|
||||
hash = "sha256-+URbQGnmqmSNgucEyWvI5DMnzXjpmJzLA+Pho2lX+S4=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -69,9 +74,11 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [
|
||||
cloudpickle
|
||||
einops
|
||||
flaxlib
|
||||
keras
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
pytest-xdist
|
||||
sphinx
|
||||
tensorflow
|
||||
treescope
|
||||
];
|
||||
@@ -108,6 +115,14 @@ buildPythonPackage rec {
|
||||
"test_vmap_and_cond_passthrough_error" # AssertionError: "at vmap.*'broadcast'.*got axis spec ...
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = writeScript "update.sh" ''
|
||||
nix-update flax # does not --build by default
|
||||
nix-build . -A flax.src # src is essentially a passthru
|
||||
nix-update flaxlib --version="$(${lib.getExe tomlq} <result/Cargo.toml .something.version)" --commit
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Neural network library for JAX";
|
||||
homepage = "https://github.com/google/flax";
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
flax,
|
||||
tomlq,
|
||||
rustPlatform,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flaxlib";
|
||||
version = "0.0.1-a1";
|
||||
pyproject = true;
|
||||
|
||||
inherit (flax) src;
|
||||
|
||||
sourceRoot = "${src.name}/flaxlib";
|
||||
|
||||
postPatch = ''
|
||||
expected_version="$version"
|
||||
actual_version=$(${lib.getExe tomlq} --file Cargo.toml "package.version")
|
||||
|
||||
if [ "$actual_version" != "$expected_version" ]; then
|
||||
echo -e "\n\tERROR:"
|
||||
echo -e "\tThe version of the flaxlib python package ($expected_version) does not match the one in its Cargo.toml file ($actual_version)"
|
||||
echo -e "\tPlease update the version attribute of the nix python3Packages.flaxlib package."
|
||||
exit 1
|
||||
fi
|
||||
'';
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
src
|
||||
sourceRoot
|
||||
;
|
||||
hash = "sha256-RPbMHnRdJaWKLU9Rkz39lmfibO20dnfZmLZqehHM3w4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.maturinBuildHook
|
||||
rustPlatform.cargoSetupHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "flaxlib" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# This package does not have tests (yet ?)
|
||||
doCheck = false;
|
||||
|
||||
passthru = {
|
||||
inherit (flax) updateScript;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Rust library used internally by flax";
|
||||
homepage = "https://github.com/google/flax/tree/main/flaxlib";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "holidays";
|
||||
version = "0.59";
|
||||
version = "0.60";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "vacanza";
|
||||
repo = "python-holidays";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-g7ldsWqVWM1FtOB2gFrCuATD5PthZhbelKT4NV6Rovg=";
|
||||
hash = "sha256-Ws+SSzQyfPjjwkXYT1plRtuhMATQYCvH3AKG8llWCGo=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mitogen";
|
||||
version = "0.3.15";
|
||||
version = "0.3.16";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "mitogen-hq";
|
||||
repo = "mitogen";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Zj5hVkIvKdyKLCUyXwhfDy5idH3jehmgIJNahmDdvJ4=";
|
||||
hash = "sha256-Rmf4uS18J+AWyobcG7iJHCvciLyj1euvIGqlTMjxaOs=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -22,14 +22,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plotnine";
|
||||
version = "0.14.0";
|
||||
version = "0.14.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "has2k1";
|
||||
repo = "plotnine";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-4x7euxf+G/HaqC3LVD7TCQEVcihdb/FSMqRvMWAqhgo=";
|
||||
hash = "sha256-K2Feqg3UiffZ4izYzrCW+iu7dH61sItOUVtwvzTMth0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plugwise";
|
||||
version = "1.4.3";
|
||||
version = "1.5.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "plugwise";
|
||||
repo = "python-plugwise";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-eeytJ9X2ChcQDbAfTUPokMl/qKVSU6PUuI/a30xJ6WU=";
|
||||
hash = "sha256-WcoHK8UZ7qOVoUBCSoTDZ+6fC568AyXFCBys/7sjJx8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -25,12 +25,13 @@
|
||||
srptools,
|
||||
stdenv,
|
||||
tabulate,
|
||||
tinytag,
|
||||
zeroconf,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyatv";
|
||||
version = "0.15.1";
|
||||
version = "0.16.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -39,7 +40,7 @@ buildPythonPackage rec {
|
||||
owner = "postlund";
|
||||
repo = "pyatv";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8ODhDuc4jaLtrLZYd1yJlpYygO6KaguyR/yLWb/rMR4=";
|
||||
hash = "sha256-yjPbSTmHoKnVwNArZw5mGf3Eh4Ei1+DkY9y2XRRy4YA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -77,6 +78,7 @@ buildPythonPackage rec {
|
||||
requests
|
||||
srptools
|
||||
tabulate
|
||||
tinytag
|
||||
zeroconf
|
||||
];
|
||||
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycookiecheat";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "n8henrie";
|
||||
repo = "pycookiecheat";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-x568e4M7fz93hq0y06Grz9GlrjGV38GxWd+PhNiAyBY=";
|
||||
hash = "sha256-jOyTfh2ZhKW/pMU7T5tfxaM0l/g59N+mirnbc0FLPbQ=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyenvisalink";
|
||||
version = "4.7";
|
||||
version = "4.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-b5v/7+B/yyCnKrWCs0scAuIgV1wSLk6cVa57n+HncUw=";
|
||||
hash = "sha256-IgYOlH0mYqhRLTO3McBAstChqYWHQkwuOVPL8gKdcTo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "telegram";
|
||||
version = "0.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1495l2ml8mg120wfvqhikqkfczhwwaby40vdmsz8v2l69jps01fl";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/liluo/telegram";
|
||||
description = "Telegram APIs";
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.0.1259";
|
||||
version = "3.0.1261";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-4jjUgUnZrCMDiGbV2keZGIRhqI9BD7BZqfYNWMnZX4E=";
|
||||
hash = "sha256-p2gta5rQvo+4Gm7sr3W7dfNKZukpOPtCVa75ofKzls8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "trimesh";
|
||||
version = "4.5.1";
|
||||
version = "4.5.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-LoUXn9vuHocqoA1CpbKGBaBTApaIV6gyGk36Q5ByWxw=";
|
||||
hash = "sha256-FlsS8omMPo3smaLtBexcg+r6L8gVC6jDD4s6YvaTQz8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -35,7 +35,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Implementation of the XDG Base Directory Specification in Python";
|
||||
homepage = "https://github.com/srstevenson/xdg-base-dirs";
|
||||
changelog = "https://github.com/srstevenson/xdg-base-dirs/releases/tag/${src.rev}";
|
||||
changelog = "https://github.com/srstevenson/xdg-base-dirs/releases/tag/${version}";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
|
||||
@@ -580,6 +580,7 @@ let
|
||||
RcppCWB = [ pkgs.pkg-config pkgs.pcre2 ];
|
||||
redux = [ pkgs.pkg-config ];
|
||||
rswipl = with pkgs; [ cmake pkg-config ];
|
||||
scorematchingad = [ pkgs.cmake ];
|
||||
rrd = [ pkgs.pkg-config ];
|
||||
surveyvoi = [ pkgs.pkg-config ];
|
||||
Rbwa = [ pkgs.zlib.dev ];
|
||||
|
||||
@@ -5,13 +5,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "minizinc-ide";
|
||||
version = "2.8.6";
|
||||
version = "2.8.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MiniZinc";
|
||||
repo = "MiniZincIDE";
|
||||
rev = version;
|
||||
hash = "sha256-B164KCY06SQRxv4eD9yuCKyGRRrMZfJRuaQ+OEmQC5k=";
|
||||
hash = "sha256-mlLW7RHwO+VHWJdKhDjIWYoRpdTrt7QpPKp0EiHGkEs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vultr-cli";
|
||||
version = "3.3.1";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vultr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pJrujiZfIuqRFwIHReWT7xPi94Zh3owcZFz23jtpsQg=";
|
||||
hash = "sha256-uk0tG66u0gQgEzpiFAeMC0qPrd+Pk6nbrXuuyOtVLe4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4HRzd5p5u8h07/escAoatF97RZ/hejYqW61Dlkp27Gk=";
|
||||
vendorHash = "sha256-qf0l76MGIFv5m7uSjo4FgS6XxYzCT4+Efgt6W6jA1i8=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@ let
|
||||
in
|
||||
{
|
||||
mir = common {
|
||||
version = "2.18.2";
|
||||
hash = "sha256-Yko5ws8dUazPziXzM77Zg4p1taC0mbjAcpOKJR0dJ5M=";
|
||||
version = "2.18.3";
|
||||
hash = "sha256-2PwLTWQeaVR80slZ6/BPr23gVahiDWXulFtdjc9ZUCs=";
|
||||
};
|
||||
|
||||
mir_2_15 = common {
|
||||
|
||||
@@ -3,6 +3,6 @@
|
||||
|
||||
set -eou pipefail
|
||||
|
||||
version="$(curl --silent "https://api.github.com/repos/canonical/mir/releases" | jq '.[0].tag_name' --raw-output)"
|
||||
version="$(curl --silent "https://api.github.com/repos/canonical/mir/tags" | jq '.[0].name' --raw-output)"
|
||||
|
||||
update-source-version mir "${version:1}" --file=./pkgs/servers/mir/default.nix
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
diff --git a/go.mod b/go.mod
|
||||
index 0116218..3e31f0e 100644
|
||||
--- a/go.mod
|
||||
+++ b/go.mod
|
||||
@@ -1,6 +1,6 @@
|
||||
module github.com/bgp/stayrtr
|
||||
|
||||
-go 1.16
|
||||
+go 1.17
|
||||
|
||||
require (
|
||||
github.com/google/go-cmp v0.5.6
|
||||
@@ -10,3 +10,17 @@ require (
|
||||
golang.org/x/crypto v0.6.0
|
||||
golang.org/x/sys v0.5.0
|
||||
)
|
||||
+
|
||||
+require (
|
||||
+ github.com/beorn7/perks v1.0.1 // indirect
|
||||
+ github.com/cespare/xxhash/v2 v2.1.1 // indirect
|
||||
+ github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
+ github.com/golang/protobuf v1.4.3 // indirect
|
||||
+ github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
|
||||
+ github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
+ github.com/prometheus/client_model v0.2.0 // indirect
|
||||
+ github.com/prometheus/common v0.26.0 // indirect
|
||||
+ github.com/prometheus/procfs v0.6.0 // indirect
|
||||
+ google.golang.org/protobuf v1.26.0-rc.1 // indirect
|
||||
+ gopkg.in/yaml.v2 v2.3.0 // indirect
|
||||
+)
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, rustPlatform, fetchFromGitHub, installShellFiles, makeBinaryWrapper, nix-eval-jobs, nixVersions
|
||||
{ stdenv, lib, fetchpatch, rustPlatform, fetchFromGitHub, installShellFiles, makeBinaryWrapper, nix-eval-jobs, nix
|
||||
, colmena, testers }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -20,6 +20,14 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
NIX_EVAL_JOBS = "${nix-eval-jobs}/bin/nix-eval-jobs";
|
||||
|
||||
patches = [
|
||||
# Fixes nix 2.24 compat: https://github.com/zhaofengli/colmena/pull/236
|
||||
(fetchpatch {
|
||||
url = "https://github.com/zhaofengli/colmena/commit/36382ee2bef95983848435065f7422500c7923a8.patch";
|
||||
sha256 = "sha256-5cQ2u3eTzhzjPN+rc6xWIskHNtheVXXvlSeJ1G/lz+E=";
|
||||
})
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd colmena \
|
||||
--bash <($out/bin/colmena gen-completions bash) \
|
||||
@@ -27,7 +35,7 @@ rustPlatform.buildRustPackage rec {
|
||||
--fish <($out/bin/colmena gen-completions fish)
|
||||
|
||||
wrapProgram $out/bin/colmena \
|
||||
--prefix PATH ":" "${lib.makeBinPath [ nixVersions.nix_2_18 ]}"
|
||||
--prefix PATH ":" "${lib.makeBinPath [ nix ]}"
|
||||
'';
|
||||
|
||||
# Recursive Nix is not stable yet
|
||||
|
||||
@@ -1,4 +1,14 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, installShellFiles, util-linux, binlore, swapspace }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
installShellFiles,
|
||||
util-linux,
|
||||
binlore,
|
||||
swapspace,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "swapspace";
|
||||
@@ -40,6 +50,9 @@ stdenv.mkDerivation rec {
|
||||
passthru.binlore.out = binlore.synthesize swapspace ''
|
||||
execer cannot bin/swapspace
|
||||
'';
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) swapspace;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Dynamic swap manager for Linux";
|
||||
|
||||
@@ -38,13 +38,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "astc-encoder";
|
||||
version = "4.8.0";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ARM-software";
|
||||
repo = "astc-encoder";
|
||||
rev = version;
|
||||
sha256 = "sha256-IG/UpTaeKTXdYIR++BZA7+bMRW4NWQUo9PxsEnqPuB4=";
|
||||
sha256 = "sha256-ngorPKDBRk4u4EUoJHAz5jrUiNUGffJKdEf9fiWbi/g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://www.flashrom.org";
|
||||
description = "Utility for reading, writing, erasing and verifying flash ROM chips";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ fpletz felixsinger ];
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
platforms = platforms.all;
|
||||
mainProgram = "flashrom";
|
||||
};
|
||||
|
||||
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "HDF4_BUILD_WITH_INSTALL_NAME" false)
|
||||
(lib.cmakeBool "HDF4_ENABLE_JPEG_LIB_SUPPORT" true)
|
||||
(lib.cmakeBool "HDF4_ENABLE_Z_LIB_SUPPORT" true)
|
||||
(lib.cmakeBool "HDF4_ENABLE_NETCD" netcdfSupport)
|
||||
(lib.cmakeBool "HDF4_ENABLE_NETCDF" netcdfSupport)
|
||||
(lib.cmakeBool "HDF4_BUILD_FORTRAN" fortranSupport)
|
||||
(lib.cmakeBool "HDF4_ENABLE_SZIP_SUPPORT" szipSupport)
|
||||
(lib.cmakeBool "HDF4_ENABLE_SZIP_ENCODING" szipSupport)
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "valeronoi";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ccoors";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-7z967y1hWpitZfXNlHHM8qEBdyuBQSFlJElS4ldsAaE=";
|
||||
sha256 = "sha256-5KXVSIqWDkXnpO+qgBzFtbJb444RW8dIVXp8Y/aAOrk=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "muffet";
|
||||
version = "2.10.3";
|
||||
version = "2.10.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raviqqe";
|
||||
repo = "muffet";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+g8DXvNWs7tqgxeZl7FWudbZRRx9N4/Cb6jQkuxnI98=";
|
||||
hash = "sha256-9dra/LhtSIWN2pjNEJMITz/GzyWRtXTyQBqBxRhjARc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JMQgDG0MQuDJBrcz7uf872bXkz4BM+bC1v/GhkuxeYU=";
|
||||
vendorHash = "sha256-MYU8zgqI05oBep/dehs59S3JcrThrgLEzIgrIr/Tr4Y=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Website link checker which scrapes and inspects all pages in a website recursively";
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "scraper";
|
||||
version = "0.20.0";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-ouyhdT6XTuWYBxi8HV0dWt/0dHml8YXjf2kzd90Eax0=";
|
||||
hash = "sha256-S9bVsLDAX7UJ9FV4ZuI1G1D2fSZSZsevtftr7y+HyI8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2R8dy9WnEPffkoJfQD8uFL0Ot3D2yibPxIjqRJ+6rMI=";
|
||||
cargoHash = "sha256-K4ZmarOniI7OgzjkaP66Py5ei+NKeJEOuziS//NXffw=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -215,7 +215,7 @@ mapAliases {
|
||||
clwrapperFunction = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
|
||||
CoinMP = coinmp; # Added 2024-06-12
|
||||
collada-dom = opencollada; # added 2024-02-21
|
||||
colorpicker = throw "'colorpicker' has been removed due to lack of maintenance upstream. Consider using 'gcolor3' or 'eyedropper' instead"; # Added 2024-10-19
|
||||
colorpicker = throw "'colorpicker' has been removed due to lack of maintenance upstream. Consider using 'xcolor', 'gcolor3', 'eyedropper' or 'gpick' instead"; # Added 2024-10-19
|
||||
coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27
|
||||
corretto19 = throw "Corretto 19 was removed as it has reached its end of life"; # Added 2024-08-01
|
||||
cosmic-tasks = tasks; # Added 2024-07-04
|
||||
|
||||
@@ -1604,8 +1604,6 @@ with pkgs;
|
||||
inherit (recurseIntoAttrs (callPackage ../tools/package-management/akku { }))
|
||||
akku akkuPackages;
|
||||
|
||||
alice-lg = callPackage ../servers/alice-lg{ };
|
||||
|
||||
alice-tools = callPackage ../tools/games/alice-tools {
|
||||
withGUI = false;
|
||||
};
|
||||
@@ -6986,8 +6984,6 @@ with pkgs;
|
||||
|
||||
dupe-krill = callPackage ../tools/filesystems/dupe-krill { };
|
||||
|
||||
duplicacy = callPackage ../tools/backup/duplicacy { };
|
||||
|
||||
duplicity = callPackage ../tools/backup/duplicity { };
|
||||
|
||||
duply = callPackage ../tools/backup/duply { };
|
||||
@@ -12058,9 +12054,6 @@ with pkgs;
|
||||
|
||||
sigil = libsForQt5.callPackage ../applications/editors/sigil { };
|
||||
|
||||
signalbackup-tools = darwin.apple_sdk_11_0.callPackage
|
||||
../applications/networking/instant-messengers/signalbackup-tools { };
|
||||
|
||||
signald = callPackage ../applications/networking/instant-messengers/signald { };
|
||||
|
||||
signaldctl = callPackage ../applications/networking/instant-messengers/signaldctl { };
|
||||
@@ -12316,11 +12309,6 @@ with pkgs;
|
||||
|
||||
somebar = callPackage ../applications/misc/somebar { };
|
||||
|
||||
spacebar = callPackage ../os-specific/darwin/spacebar {
|
||||
inherit (darwin.apple_sdk.frameworks)
|
||||
Carbon Cocoa ScriptingBridge SkyLight;
|
||||
};
|
||||
|
||||
speech-denoiser = callPackage ../applications/audio/speech-denoiser { };
|
||||
|
||||
splot = haskell.lib.compose.justStaticExecutables haskellPackages.splot;
|
||||
@@ -12844,10 +12832,6 @@ with pkgs;
|
||||
|
||||
trezor-suite = callPackage ../applications/blockchains/trezor-suite { };
|
||||
|
||||
trunk = callPackage ../development/tools/trunk {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration;
|
||||
};
|
||||
|
||||
trunk-ng = callPackage ../by-name/tr/trunk-ng/package.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
|
||||
};
|
||||
@@ -22521,8 +22505,6 @@ with pkgs;
|
||||
|
||||
rapidfuzz-cpp = callPackage ../development/libraries/rapidfuzz-cpp { };
|
||||
|
||||
rapidjson = callPackage ../development/libraries/rapidjson { };
|
||||
|
||||
rapidxml = callPackage ../development/libraries/rapidxml { };
|
||||
|
||||
rapidyaml = callPackage ../development/libraries/rapidyaml {};
|
||||
@@ -23349,8 +23331,6 @@ with pkgs;
|
||||
|
||||
x265 = callPackage ../development/libraries/x265 { };
|
||||
|
||||
xandikos = callPackage ../servers/xandikos { };
|
||||
|
||||
inherit (callPackages ../development/libraries/xapian { })
|
||||
xapian_1_4;
|
||||
xapian = xapian_1_4;
|
||||
@@ -23948,8 +23928,6 @@ with pkgs;
|
||||
|
||||
bird-lg = callPackage ../servers/bird-lg { };
|
||||
|
||||
birdwatcher = callPackage ../servers/birdwatcher { };
|
||||
|
||||
bloat = callPackage ../servers/bloat { };
|
||||
|
||||
bosun = callPackage ../servers/monitoring/bosun { };
|
||||
@@ -38222,8 +38200,6 @@ with pkgs;
|
||||
|
||||
sieveshell = with python3.pkgs; toPythonApplication managesieve;
|
||||
|
||||
stayrtr = callPackage ../servers/stayrtr { };
|
||||
|
||||
sunshine = callPackage ../servers/sunshine { };
|
||||
|
||||
sentencepiece = callPackage ../development/libraries/sentencepiece { };
|
||||
|
||||
@@ -642,6 +642,7 @@ mapAliases ({
|
||||
suseapi = throw "suseapi has been removed because it is no longer maintained"; # added 2023-02-27
|
||||
synologydsm-api = py-synologydsm-api; # added 2024-07-29
|
||||
sysv_ipc = sysv-ipc; # added 2024-01-07
|
||||
telegram = throw "telegram has been removed since it is abandoned"; # added 2024-11-06
|
||||
tempita = throw "tempita has been removed because it is unmaintained and the upstream repository is gone"; # added 2024-07-29
|
||||
tensorflow-bin_2 = tensorflow-bin; # added 2021-11-25
|
||||
tensorflow-build_2 = tensorflow-build; # added 2021-11-25
|
||||
|
||||
@@ -4663,6 +4663,8 @@ self: super: with self; {
|
||||
|
||||
flax = callPackage ../development/python-modules/flax { };
|
||||
|
||||
flaxlib = callPackage ../development/python-modules/flaxlib { };
|
||||
|
||||
fleep = callPackage ../development/python-modules/fleep { };
|
||||
|
||||
flet = callPackage ../development/python-modules/flet { };
|
||||
@@ -15470,8 +15472,6 @@ self: super: with self; {
|
||||
|
||||
teamcity-messages = callPackage ../development/python-modules/teamcity-messages { };
|
||||
|
||||
telegram = callPackage ../development/python-modules/telegram { };
|
||||
|
||||
telegraph = callPackage ../development/python-modules/telegraph { };
|
||||
|
||||
telepath = callPackage ../development/python-modules/telepath { };
|
||||
|
||||
@@ -75,6 +75,7 @@ let
|
||||
newScope = true;
|
||||
scope = true;
|
||||
pkgs = true;
|
||||
test-pkgs = true;
|
||||
callPackage = true;
|
||||
mkDerivation = true;
|
||||
overrideDerivation = true;
|
||||
|
||||
@@ -17,8 +17,17 @@
|
||||
}:
|
||||
let
|
||||
inherit (import ./ci { inherit nixpkgs system; }) pkgs;
|
||||
|
||||
# For `nix-shell -A hello`
|
||||
curPkgs = builtins.removeAttrs (import ./. { inherit system; }) [
|
||||
# Although this is what anyone may expect from a `_type = "pkgs"`,
|
||||
# this file is intended to produce a shell in the first place,
|
||||
# and a `_type` tag could confuse some code.
|
||||
"_type"
|
||||
];
|
||||
in
|
||||
pkgs.mkShellNoCC {
|
||||
curPkgs
|
||||
// pkgs.mkShellNoCC {
|
||||
packages = with pkgs; [
|
||||
# The default formatter for Nix code
|
||||
# See https://github.com/NixOS/nixfmt
|
||||
|
||||
Reference in New Issue
Block a user