Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-10-27 18:01:08 +00:00 committed by GitHub
commit 4c838ddf14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
89 changed files with 1302 additions and 745 deletions

View File

@ -2769,6 +2769,12 @@
githubId = 7435854;
name = "Victor Calvert";
};
camelpunch = {
email = "me@andrewbruce.net";
github = "camelpunch";
githubId = 141733;
name = "Andrew Bruce";
};
cameronfyfe = {
email = "cameron.j.fyfe@gmail.com";
github = "cameronfyfe";

View File

@ -430,6 +430,7 @@ with lib.maintainers; {
members = [
cleeyv
ryantm
lassulus
];
scope = "Maintain Jitsi.";
shortName = "Jitsi";

View File

@ -238,8 +238,6 @@
- `baloo`, the file indexer/search engine used by KDE now has a patch to prevent files from constantly being reindexed when the device ids of the their underlying storage changes. This happens frequently when using btrfs or LVM. The patch has not yet been accepted upstream but it provides a significantly improved experience. When upgrading, reset baloo to get a clean index: `balooctl disable ; balooctl purge ; balooctl enable`.
- `services.ddclient` has been removed on the request of the upstream maintainer because it is unmaintained and has bugs. Please switch to a different software like `inadyn` or `knsupdate`.
- The `vlock` program from the `kbd` package has been moved into its own package output and should now be referenced explicitly as `kbd.vlock` or replaced with an alternative such as the standalone `vlock` package or `physlock`.
- `fileSystems.<name>.autoFormat` now uses `systemd-makefs`, which does not accept formatting options. Therefore, `fileSystems.<name>.formatOptions` has been removed.

View File

@ -53,6 +53,19 @@ in {
dbus.packages = [ pkgs.cdemu-daemon ];
};
users.groups.${config.programs.cdemu.group} = {};
# Systemd User service
# manually adapted from example in source package:
# https://sourceforge.net/p/cdemu/code/ci/master/tree/cdemu-daemon/service-example/cdemu-daemon.service
systemd.user.services.cdemu-daemon.description = "CDEmu daemon";
systemd.user.services.cdemu-daemon.serviceConfig = {
Type = "dbus";
BusName = "net.sf.cdemu.CDEmuDaemon";
ExecStart = "${pkgs.cdemu-daemon}/bin/cdemu-daemon --config-file \"%h/.config/cdemu-daemon\"";
Restart = "no";
};
environment.systemPackages =
[ pkgs.cdemu-daemon pkgs.cdemu-client ]
++ optional cfg.gui pkgs.gcdemu

View File

@ -23,25 +23,13 @@ in
environmentFile = mkOption {
type = with types; nullOr str;
# added on 2021-08-28, s3CredentialsFile should
# be removed in the future (+ remember the warning)
default = config.s3CredentialsFile;
default = null;
description = lib.mdDoc ''
file containing the credentials to access the repository, in the
format of an EnvironmentFile as described by systemd.exec(5)
'';
};
s3CredentialsFile = mkOption {
type = with types; nullOr str;
default = null;
description = lib.mdDoc ''
file containing the AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY
for an S3-hosted repository, in the format of an EnvironmentFile
as described by systemd.exec(5)
'';
};
rcloneOptions = mkOption {
type = with types; nullOr (attrsOf (oneOf [ str bool ]));
default = null;
@ -300,7 +288,6 @@ in
};
config = {
warnings = mapAttrsToList (n: v: "services.restic.backups.${n}.s3CredentialsFile is deprecated, please use services.restic.backups.${n}.environmentFile instead.") (filterAttrs (n: v: v.s3CredentialsFile != null) config.services.restic.backups);
assertions = mapAttrsToList (n: v: {
assertion = (v.repository == null) != (v.repositoryFile == null);
message = "services.restic.backups.${n}: exactly one of repository or repositoryFile should be set";

View File

@ -29,6 +29,13 @@ in {
default = 8080;
description = lib.mdDoc "The port of the Shiori web application";
};
webRoot = mkOption {
type = types.str;
default = "/";
example = "/shiori";
description = lib.mdDoc "The root of the Shiori web application";
};
};
};
@ -40,7 +47,7 @@ in {
environment.SHIORI_DIR = "/var/lib/shiori";
serviceConfig = {
ExecStart = "${package}/bin/shiori serve --address '${address}' --port '${toString port}'";
ExecStart = "${package}/bin/shiori serve --address '${address}' --port '${toString port}' --webroot '${webRoot}'";
DynamicUser = true;
StateDirectory = "shiori";

View File

@ -86,7 +86,7 @@ in
serviceConfig = {
ExecStart = "${cfg.package}/bin/garage server";
StateDirectory = mkIf (hasPrefix "/var/lib/garage" cfg.settings.data_dir && hasPrefix "/var/lib/garage" cfg.settings.metadata_dir) "garage";
StateDirectory = mkIf (hasPrefix "/var/lib/garage" cfg.settings.data_dir || hasPrefix "/var/lib/garage" cfg.settings.metadata_dir) "garage";
DynamicUser = lib.mkDefault true;
ProtectHome = true;
NoNewPrivileges = true;

View File

@ -849,6 +849,7 @@ in {
trezord = handleTest ./trezord.nix {};
trickster = handleTest ./trickster.nix {};
trilium-server = handleTestOn ["x86_64-linux"] ./trilium-server.nix {};
tsja = handleTest ./tsja.nix {};
tsm-client-gui = handleTest ./tsm-client-gui.nix {};
txredisapi = handleTest ./txredisapi.nix {};
tuptime = handleTest ./tuptime.nix {};

View File

@ -148,7 +148,7 @@ in
)
# Bring down the initial seeder.
# tracker.stop_job("transmission")
tracker.stop_job("transmission")
# Now download from the second client. This can only succeed if
# the first client created a NAT hole in the router.

32
nixos/tests/tsja.nix Normal file
View File

@ -0,0 +1,32 @@
import ./make-test-python.nix ({ pkgs, lib, ...} : {
name = "tsja";
meta = {
maintainers = with lib.maintainers; [ chayleaf ];
};
nodes = {
master =
{ config, ... }:
{
services.postgresql = {
enable = true;
extraPlugins = with config.services.postgresql.package.pkgs; [
tsja
];
};
};
};
testScript = ''
start_all()
master.wait_for_unit("postgresql")
master.succeed("sudo -u postgres psql -f /run/current-system/sw/share/postgresql/extension/libtsja_dbinit.sql")
# make sure "日本語" is parsed as a separate lexeme
master.succeed("""
sudo -u postgres \\
psql -c "SELECT * FROM ts_debug('japanese', 'PostgreSQL')" \\
| grep "{}"
""")
'';
})

View File

@ -14,15 +14,19 @@
, fftw
, fftwSinglePrec
, flac
, fluidsynth
, glibc
, glibmm
, graphviz
, gtkmm2
, harvid
, hidapi
, itstool
, kissfft
, libarchive
, libjack2
, liblo
, libltc
, libogg
, libpulseaudio
, librdf_raptor
@ -43,6 +47,7 @@
, perl
, pkg-config
, python3
, qm-dsp
, readline
, rubberband
, serd
@ -59,14 +64,14 @@
}:
stdenv.mkDerivation rec {
pname = "ardour";
version = "8.0";
version = "8.1";
# We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org
# result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info.
src = fetchgit {
url = "git://git.ardour.org/ardour/ardour.git";
rev = version;
hash = "sha256-ZL8aTq2OsCWwLUUx5XYbH4eRN+Xz+oMAj9IS07RfTag=";
hash = "sha256-T1o1E5+974dNUwEFW/Pw0RzbGifva2FdJPrCusWMk0E=";
};
bundledContent = fetchzip {
@ -116,12 +121,16 @@ stdenv.mkDerivation rec {
fftw
fftwSinglePrec
flac
fluidsynth
glibmm
gtkmm2
hidapi
itstool
kissfft
libarchive
libjack2
liblo
libltc
libogg
libpulseaudio
librdf_raptor
@ -140,6 +149,7 @@ stdenv.mkDerivation rec {
pango
perl
python3
qm-dsp
readline
rubberband
serd
@ -159,9 +169,8 @@ stdenv.mkDerivation rec {
"--ptformat"
"--run-tests"
"--test"
"--use-external-libs"
] ++ lib.optional optimize "--optimize";
# removed because it fixes https://tracker.ardour.org/view.php?id=8161 and https://tracker.ardour.org/view.php?id=8437
# "--use-external-libs"
postInstall = ''
# wscript does not install these for some reason
@ -198,7 +207,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://ardour.org/";
license = licenses.gpl2Plus;
mainProgram = "ardour7";
mainProgram = "ardour8";
platforms = platforms.linux;
maintainers = with maintainers; [ goibhniu magnetophon mitchmindtree ];
};

View File

@ -0,0 +1,53 @@
{ alsa-lib
, autoreconfHook
, fetchFromGitHub
, gtk3
, json-glib
, lib
, libpulseaudio
, libsamplerate
, libsndfile
, libzip
, pkg-config
, stdenv
, zlib
}:
let
version = "2.5.2";
in
stdenv.mkDerivation {
inherit version;
pname = "elektroid";
src = fetchFromGitHub {
owner = "dagargo";
repo = "elektroid";
rev = version;
sha256 = "sha256-wpPHcrlCX7RD/TGH2Xrth+oCg98gMm035tfTBV70P+Y=";
};
nativeBuildInputs = [
autoreconfHook
pkg-config
];
buildInputs = [
alsa-lib
gtk3
json-glib
libpulseaudio
libsamplerate
libsndfile
libzip
zlib
];
meta = with lib; {
description = "Sample and MIDI device manager";
homepage = "https://github.com/dagargo/elektroid";
license = licenses.gpl3Only;
maintainers = with maintainers; [ camelpunch ];
};
}

View File

@ -5,12 +5,12 @@
stdenv.mkDerivation rec {
pname = "faustlive";
version = "2.5.13";
version = "2.5.16";
src = fetchFromGitHub {
owner = "grame-cncm";
repo = "faustlive";
rev = version;
sha256 = "sha256-Tgb9UYj8mI4JsxA/PaTokm2NzQ14P8cOdKK8KCcnSIQ=";
sha256 = "sha256-O3IWx6Ht/xcb8NFxI7Biwck3dIHbxyof/zDgYDdzozY=";
fetchSubmodules = true;
};

View File

@ -2,7 +2,7 @@
let
pname = "erigon";
version = "2.50.0";
version = "2.53.1";
in
buildGoModule {
inherit pname version;
@ -11,11 +11,11 @@ buildGoModule {
owner = "ledgerwatch";
repo = pname;
rev = "v${version}";
hash = "sha256-gZ01nmxzXRK8YRwnl5qGkU6dqBYKPUkNZmbClwgsuL0=";
hash = "sha256-Gsrt/+6fhpwg3DzPtXPj9T9VPaMIaRcYBdWuFOotsbA=";
fetchSubmodules = true;
};
vendorHash = "sha256-4s5dXTfYlgzYQ2h30F6kxEF626iKYFRoZlNXeFDbn8s=";
vendorHash = "sha256-zsLPqcLCZSnhlFWvNXZJwlfS+NsaTS07TmWd+x4ZPXA=";
proxyVendor = true;
# Build errors in mdbx when format hardening is enabled:

View File

@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
};
src = [ ftesrc ftecommon ];
env.NIX_CFLAGS_COMPILE = "-DHAVE_STRLCAT -DHAVE_STRLCPY";
buildFlags = [ "PREFIX=$(out)" ];
installFlags = [ "PREFIX=$(out)" "INSTALL_NONROOT=1" ];

View File

@ -1,4 +1,4 @@
{ callPackage, glib, libao, intltool, libmirage }:
{ callPackage, glib, libao, intltool, libmirage, coreutils }:
let pkg = import ./base.nix {
version = "3.2.5";
pname = "cdemu-daemon";
@ -7,4 +7,12 @@ let pkg = import ./base.nix {
in callPackage pkg {
nativeBuildInputs = [ intltool ];
buildInputs = [ glib libao libmirage ];
drvParams.postInstall = ''
mkdir -p $out/share/dbus-1/services
cp -R ../$pname-$version/service-example $out/share/cdemu
substitute \
$out/share/cdemu/net.sf.cdemu.CDEmuDaemon.service \
$out/share/dbus-1/services/net.sf.cdemu.CDEmuDaemon.service \
--replace /bin/true ${coreutils}/bin/true
'';
}

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation {
pname = "hello-wayland";
version = "unstable-2023-04-23";
version = "unstable-2023-10-26";
src = fetchFromGitHub {
owner = "emersion";
repo = "hello-wayland";
rev = "77e270c19672f3ad863e466093f429cde8eb1f16";
sha256 = "NMQE2zU858b6OZhdS2oZnGvLK+eb7yU0nFaMAcpNw04=";
rev = "b631afa4f6fd86560ccbdb8c7b6fe42851c06a57";
sha256 = "MaBzGZ05uCoeeiglFYHC40hQlPvtDw5sQhqXgtVDySc=";
};
separateDebugInfo = true;

View File

@ -88,7 +88,14 @@ stdenv.mkDerivation rec {
runHook postCheck
'';
nativeBuildInputs = [ asciidoctor cmake wrapGAppsHook wrapQtAppsHook qttools pkg-config ];
nativeBuildInputs = [
asciidoctor
cmake
wrapQtAppsHook
qttools
pkg-config
]
++ lib.optional (!stdenv.isDarwin) wrapGAppsHook;
dontWrapGApps = true;
preFixup = ''

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "spicetify-cli";
version = "2.24.2";
version = "2.25.0";
src = fetchFromGitHub {
owner = "spicetify";
repo = "spicetify-cli";
rev = "v${version}";
hash = "sha256-jzEtXmlpt6foldLW57ZcpevX8CDc+c8iIynT5nOD9qY=";
hash = "sha256-unw+MtV1SKkDSXbLFLAa0+Xtm/k1Cx8V0bb9NJrFuxU=";
};
vendorHash = "sha256-rMMTUT7HIgYvxGcqR02VmxOh1ihE6xuIboDsnuOo09g=";
vendorHash = "sha256-VktAO3yKCdm5yz/RRLeLv6zzyGrwuHC/i8WdJtqZoYc=";
ldflags = [
"-s -w"

View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "glooctl";
version = "1.15.9";
version = "1.15.14";
src = fetchFromGitHub {
owner = "solo-io";
repo = "gloo";
rev = "v${version}";
hash = "sha256-P3NC1/ZujqSO2C4ToNLpxgbxqACXYYsAFQh1Xbbu7x4=";
hash = "sha256-rQZOGM97mXKFFMQRw6+iiaDLugu0CM7OW2V7w0fgpDM=";
};
vendorHash = "sha256-KaBq1VCGWv3K50DDelS0hOQkXnK1ufBiXBtbPQFzwMY=";
vendorHash = "sha256-51s+C4P8xKp52qjr6LK3zWKWzwnuEQyKxi/Wzpha9Fs=";
subPackages = [ "projects/gloo/cli/cmd" ];

View File

@ -3,16 +3,16 @@
buildGoModule rec {
pname = "discordo";
version = "unstable-2023-09-16";
version = "unstable-2023-10-22";
src = fetchFromGitHub {
owner = "ayn2op";
repo = pname;
rev = "d3cdbe480392dbab6ddc099d7d880378f6a13f26";
hash = "sha256-noCwPhp5/wYt28TM1vvsXb0ewRMV/cMzu/zUD2b0YV4=";
rev = "afaa155b510881efae8a9c27d3453cedc3fbb3b5";
hash = "sha256-9Ls8IF6DoLUbUqdwqD5ncp9p/HUnAl8eaYYjnIAJcw0=";
};
vendorHash = "sha256-5Y+SP374Bd8F2ABKEKRhTcGNhsFM77N5oC5wRN6AzKk=";
vendorHash = "sha256-11dbOoajCXMonNy9bXy4RiT9FLH/Sga4+eH5mUFDlNA=";
CGO_ENABLED = 0;

View File

@ -3,21 +3,32 @@
, stdenv
, fetchFromGitHub
, rustPlatform
, installShellFiles
}:
rustPlatform.buildRustPackage rec {
pname = "notmuch-mailmover";
version = "0.1.0";
version = "0.2.0";
src = fetchFromGitHub {
owner = "michaeladler";
repo = pname;
rev = "v${version}";
sha256 = "sha256-b2Q1JcXIp56Niv5kdPgQSM91e8hPPdyhWIG4f7kQn78=";
hash = "sha256-12eDCqer13GJS0YjJDleJbkP4o7kZfof6HlLG06qZW0=";
};
cargoHash = "sha256-B5VSkhY4nNXSG2SeCl22pSkl6SXEEoYj99wEsNhs/bQ=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = [ notmuch ];
cargoSha256 = "sha256-AW0mCdQN3WJhSErJ/MqnNIsRX+C6Pb/zHCQh7v/70MU=";
postInstall = ''
installManPage share/notmuch-mailmover.1
installShellCompletion --cmd notmuch-mailmover \
--bash share/notmuch-mailmover.bash \
--fish share/notmuch-mailmover.fish \
--zsh share/_notmuch-mailmover
'';
meta = with lib; {
description = "Application to assign notmuch tagged mails to IMAP folders";

View File

@ -23,6 +23,10 @@ mkDerivation rec {
substituteInPlace app/src/views/mainWindow/MainWindow.cpp \
--replace ":/resource/pic/logo.svg" "$out/share/icons/hicolor/48x48/apps/mytetra.png"
# https://github.com/xintrea/mytetra_dev/issues/164
substituteInPlace thirdParty/mimetex/mimetex.c \
--replace "const char *strcasestr" "char *strcasestr"
'';
postFixup = ''

View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "eigenmath";
version = "unstable-2023-08-03";
version = "unstable-2023-10-26";
src = fetchFromGitHub {
owner = "georgeweigt";
repo = pname;
rev = "f202cf0c342e54e994c4d416daecc1b1dc8b9c98";
hash = "sha256-kp4zWTPYt2DiuPgTK+ib8NbKg2BJVxJDDCvIlWNuwgs=";
rev = "043895fbaed27a4baace7c7c0c1f69ea5a9f3d1a";
hash = "sha256-roPyRaT89I3HbyvBK/owiigMus1EeKEhhKHFsgfzp10=";
};
checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in ''

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "git-nomad";
version = "0.6.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "rraval";
repo = pname;
rev = "v${version}";
sha256 = "sha256-1PXAdXafkPOIVzaWjW/RlWHwYhMqPoj0Hj5JmOMUj8A=";
sha256 = "sha256-N+iPr389l9PDfJIhvRL6ziGSPI6pgvfdGX6wxmapLhA=";
};
cargoHash = "sha256-ULcdJRla1JwI0y6ngW9xQXjNw2wO48HuAczsNIsJJK0=";
cargoHash = "sha256-7CZC29y9dLpyanolO+epKd0KwmRc1iGY+sPM9f/j5hk=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.SystemConfiguration

View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "git-repo";
version = "2.38";
version = "2.39";
src = fetchFromGitHub {
owner = "android";
repo = "tools_repo";
rev = "v${version}";
hash = "sha256-o3uNFGnccFU3ZSc8BZLh8JTc8517bho/qX6otC5oC5s=";
hash = "sha256-Qw0x/YiXMDrlTy6boembfqVRvEYiMWOALJtaMrr7/WI=";
};
# Fix 'NameError: name 'ssl' is not defined'

View File

@ -1,24 +1,34 @@
{ lib
, python3
, fetchFromGitHub
, mpv
}:
python3.pkgs.buildPythonPackage rec {
pname = "mov-cli";
version = "unstable-2022-06-30";
version = "1.5.4";
format = "pyproject";
src = fetchFromGitHub {
owner = "mov-cli";
repo = "mov-cli";
rev = "b89e807e8ffc830b0b18c8e98712441c03774b8e";
sha256 = "sha256-D+OeXcLdkbG4ASbPQYIWf7J1CRZ9jH3UXxfTL4WleY0=";
rev = version;
sha256 = "sha256-WhoP4FcoO9+O9rfpC3oDQkVIpVOqxfdLRygHgf1O01g=";
};
makeWrapperArgs = [
"--prefix" "PATH" ":" "${lib.getBin mpv}/bin"
];
propagatedBuildInputs = with python3.pkgs; [ setuptools httpx click beautifulsoup4 colorama ];
postPatch = ''
substituteInPlace setup.py --replace "bs4" "beautifulsoup4"
'';
propagatedBuildInputs = with python3.pkgs; [
poetry-core
krfzf-py
pycrypto
setuptools
httpx
click
beautifulsoup4
colorama
];
meta = with lib; {
homepage = "https://github.com/mov-cli/mov-cli";

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ddev";
version = "1.22.3";
version = "1.22.4";
src = fetchFromGitHub {
owner = "ddev";
repo = "ddev";
rev = "v${version}";
hash = "sha256-KxBnnNs7dmNGZR048FSDoCZ7+P1IXnhH6iy7e0y+2f8=";
hash = "sha256-ml7SrUmpZubKeDChmNOCHzboR/OBQsr6R8H9peqABek=";
};
vendorHash = null;

View File

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "c2FmZQ";
version = "0.4.8";
version = "0.4.9";
src = fetchFromGitHub {
owner = "c2FmZQ";
repo = "c2FmZQ";
rev = "v${version}";
hash = "sha256-IYSmGzjTDMBgEMVZsi6CuUz6L7BzpmbrJYVPUhFr7rw=";
hash = "sha256-xrQBL/Xjzsg0jZ7cFuDfjCQhmt/dTD8FoCSlw0sX5MQ=";
};
ldflags = [ "-s" "-w" ];

View File

@ -17,16 +17,16 @@
rustPlatform.buildRustPackage rec {
pname = "eza";
version = "0.15.0";
version = "0.15.1";
src = fetchFromGitHub {
owner = "eza-community";
repo = "eza";
rev = "v${version}";
hash = "sha256-52vBN/EdO0R2Lt/Iv33Odl437I8kgUhxXwtUuiaAcAU=";
hash = "sha256-GovkmMjxHWP9nl0z1LwQrIgT6TkMaYY1wEwAABAYNK0=";
};
cargoHash = "sha256-j6FsI6FpBXtaNcVDY84UBcqifXuJxBRW5Gdln8pq7Iw=";
cargoHash = "sha256-7mhGAXfrHfOKdcnCPtYNbNGRVCfVHni80zEAUATPRLk=";
nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
buildInputs = [ zlib ]

View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "fortune-kind";
version = "0.1.5";
version = "0.1.6";
src = fetchFromGitHub {
owner = "cafkafk";
repo = "fortune-kind";
rev = "v${version}";
hash = "sha256-bpQ1cPsgKgOU3stnUwGrMnY9RZGZnuoR6B05LyARtVY=";
hash = "sha256-GWsDauFPyiZA6gY7yuEkAeIZrmrvZyJQnP6+ZkdaQSw=";
};
cargoHash = "sha256-2hL4vbbfvzJk73cvMU+eau+UHDFtokt4v8GBXyNkjbw=";
cargoHash = "sha256-1swDHofUuVQx5J7jwmEyRC9REgv4Jg0r0BHBKmkt5Wc=";
nativeBuildInputs = [ makeBinaryWrapper installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];

View File

@ -3,6 +3,7 @@
, fetchgit
, avahi
, gmp
, buildPackages
, autoreconfHook
, pkg-config
, texinfo
@ -20,6 +21,7 @@ stdenv.mkDerivation rec {
};
strictDeps = true;
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ autoreconfHook guile pkg-config texinfo ];
buildInputs = [ guile ];
propagatedBuildInputs = [ avahi gmp ];

View File

@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook
guile
guile-lzma
pkg-config
];

View File

@ -0,0 +1,27 @@
{ lib
, fetchFromGitHub
, php
}:
php.buildComposerProject (finalAttrs: {
pname = "phel";
version = "0.11.0-dev";
src = fetchFromGitHub {
owner = "phel-lang";
repo = "phel-lang";
rev = "83d9d81b6c7daae361c0f1f68462083027b81581";
hash = "sha256-B2IozL/nJE4C1Gq54/64TJEySC1STroG1poCBzd3j3I=";
};
vendorHash = "sha256-83GX/dxHa6w1E34wnJshg7yxlVyRkDT5jmAPCCqPdtA=";
meta = {
changelog = "https://github.com/phel-lang/phel-lang/releases/tag/v${finalAttrs.version}";
description = "Phel is a functional programming language that compiles to PHP. A Lisp dialect inspired by Clojure and Janet.";
homepage = "https://github.com/phel-lang/phel-lang";
license = lib.licenses.mit;
mainProgram = "phel";
maintainers = with lib.maintainers; [ drupol ];
};
})

View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "clash-geoip";
version = "20230912";
version = "20231012";
src = fetchurl {
url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb";
sha256 = "sha256-MyNlgsa+8OS7vkMq74KKmUVzBhmDpF4ED2Xdgl3GIS4=";
sha256 = "sha256-KXmHaoIZ01M6Nu2LlVgTZarUp+5VPpLfnkc7d/Xl4z0=";
};
dontUnpack = true;

View File

@ -7,7 +7,7 @@
# reference ./shas.nix for available themes
selected_themes ? [],
}: let
version = "2020-12-28";
version = "1.0";
# this file is generated via ./update.sh
# borrowed from pkgs/data/fonts/nerdfonts
themeShas = import ./shas.nix;

View File

@ -1,322 +1,322 @@
{
"abstract_ring" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/abstract_ring.tar.gz";
sha = "133gifr4571b14ci44jmm49j91yhq785yx4b3h6yvx0188liibr2";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/abstract_ring.tar.gz";
sha = "0hfrzm974nm8f237vzlyjjh4pikva3n7fqr1p7jmx04g857g4rjq";
};
"abstract_ring_alt" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/abstract_ring_alt.tar.gz";
sha = "157yg2y4vfwjfly2paq2xn1p6h2wrbvvzwy4lbpbhlmhyhrymjvj";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/abstract_ring_alt.tar.gz";
sha = "0gx6l6w9d9z6am3x99igp6v1kykpwd39sjhalfsl21x1ah2cfmbh";
};
"alienware" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/alienware.tar.gz";
sha = "1i3i0gj927drbgivcx3fqj6fqdwm2gqy0wrwfkdqdjyqzq1286a5";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/alienware.tar.gz";
sha = "0pq9zdhdz5vg97zfzsj9kh63szsm9qww2j7bgp2w4z6pg42xcswh";
};
"angular" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/angular.tar.gz";
sha = "06n3ix7k8zpraqc75wy4fnk1bzcyhfajjxjq9kyy470wgsjrw6p4";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/angular.tar.gz";
sha = "15rsljiv1nhgcsgjiwsb2jiwah1ghxa95dbj3hlddx8d337nxljc";
};
"angular_alt" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/angular_alt.tar.gz";
sha = "1l1iy9p0k4a8mcdps30avscjp6wfv20m9zy376r18y7xwcz19qbj";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/angular_alt.tar.gz";
sha = "12v4d7yjd81vch6cm2jphkb24gnc5d2kncfi4lsan6vhamija49f";
};
"black_hud" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/black_hud.tar.gz";
sha = "13y32zxcshnfyjxs0r7f1sz010sr6brsaap90im2cb4rlvp0ajsz";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/black_hud.tar.gz";
sha = "07iy216xij19m6jy76z2rafmjm8mv4k7mwpp145xayz52zhs66s8";
};
"blockchain" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/blockchain.tar.gz";
sha = "1f60nvrk506bqw47g90wzbvn3bp5h1gbi0ll5f3bd6wj77qfk05i";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/blockchain.tar.gz";
sha = "1w0hz1fyj4p9qxwdhib9c7gxx582wb9fz2dyd77l9xqjkps78fjx";
};
"circle" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle.tar.gz";
sha = "04085lkh4i5diszpr1w5xnhnngp8ba1ckalcjj5s8hm8lk6wd4nc";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/circle.tar.gz";
sha = "16xrz3v85kpxc4palm8flc7lhscfl6psm1dz999r802yivxl5ikg";
};
"circle_alt" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle_alt.tar.gz";
sha = "0awbjrd31fv2cb0q7n58h5iji29di8n550bmpz5qdg6xn55baqqx";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/circle_alt.tar.gz";
sha = "0hsia8rq059kyxrnikr6brwmg7pa5kbm3j9gj4ky1a83dwpx18lg";
};
"circle_flow" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle_flow.tar.gz";
sha = "0ffxgjmx5la55dn3nyqgxi8fyd1ci4wckmvfaa6s1kyd7xsk8785";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/circle_flow.tar.gz";
sha = "109m9hdirrr9a6gxgqpq80yz0lx4s7bv7nihdfjzg7rhl0icgw93";
};
"circle_hud" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle_hud.tar.gz";
sha = "0sd28d0ac7wvkwmbrnvg42bccz6y4iyl2wp1pg7awwjxvag0azlf";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/circle_hud.tar.gz";
sha = "1xmc30z5k583zrknx2g7rmq41vw9chyxhdacpxvxzyvnp0828z0j";
};
"circuit" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circuit.tar.gz";
sha = "1jzlr6c47n3zs0f1cafgjy92sks5060d1gs0774kxc0c96bysypg";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/circuit.tar.gz";
sha = "0linpkxhx01v7q2s3c7z8py0h697z7a4jhwbs2gp47p2923xggij";
};
"colorful" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/colorful.tar.gz";
sha = "18lbyffvhdav5cjh0xnidf09amryf5dcj5rizl9z7ghxpz2z57pr";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/colorful.tar.gz";
sha = "0m89prph31a0r0rxax989n72wdk3d5ywl8h3lygas8k7g908xr3p";
};
"colorful_loop" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/colorful_loop.tar.gz";
sha = "0qcn19gxl9w2q0w7lihi8wnlwlh8h3k0ddbp3ww9wcw1q0wsy1vi";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/colorful_loop.tar.gz";
sha = "0nbdh6v8zn1xxm44sgr1904wik8pv0yrqjg84dym10k7hvfnb1af";
};
"colorful_sliced" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/colorful_sliced.tar.gz";
sha = "0d9lafg76w2y77ywj1f1p5n1ci2q9jnfqfd16akf6f28h0iz1f9r";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/colorful_sliced.tar.gz";
sha = "1yadpyiwiixxily7wzhd8myxnrvhzdc9m6lj7g4ll3hlwygw7rz1";
};
"connect" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/connect.tar.gz";
sha = "1a0z59l391xv795d8mhcwa816wlmzyl75pwiizvvra2a0i8g6wz0";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/connect.tar.gz";
sha = "0gwd27vlr23zbf0mw34gd55f3s32a70q1s03z36dsf01bbyrvwz5";
};
"cross_hud" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cross_hud.tar.gz";
sha = "188wj6hkvryawmw4r3bwcsvqxx52h10jb4ddq3jx7sh2rz1kpvwa";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cross_hud.tar.gz";
sha = "1j79c99n3r94vrf6f8n2a42jjfywaf7vf6q34awdqcl188hc3qzi";
};
"cubes" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cubes.tar.gz";
sha = "0bydagjwfkvbhgr7sv903a7pjkrmrdz6vh22i4qjx5rhzw2wvvsk";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cubes.tar.gz";
sha = "11r6q9f4vz64rxz8wshhhpyp7knwn2klw50z98bn3qbmwl3zfh8c";
};
"cuts" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cuts.tar.gz";
sha = "0znz82zzgyqkfprvzhkzv974amcnxqdg38ajsm4d7wlagc52zs0d";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cuts.tar.gz";
sha = "1bf8yrwha2bibnpf8abc0bxsj0g9sg3m1fpagxcpr61m0cl4i3vq";
};
"cuts_alt" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cuts_alt.tar.gz";
sha = "1bgs4v5kkh96m1xh29wjmdxinfsxh4g7lg9fk1nqj87igdg7wwss";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cuts_alt.tar.gz";
sha = "00yrhfnfnmirzij5wd592cfn90crw3774a6wdxq4s538wrpmzhik";
};
"cyanide" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/cyanide.tar.gz";
sha = "04aklg9il310iv7zjpan6z4ha7gvh1b0yzgwi91679vm38cg0593";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cyanide.tar.gz";
sha = "0bbrqg77m0655l9x90334b8yn60kni062p17h4rf6kp9qbi86gg0";
};
"cybernetic" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/cybernetic.tar.gz";
sha = "0ad75fcra24bjzs4pqn89l19wb4rcjph63j71lv60m0rz75vgjfb";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cybernetic.tar.gz";
sha = "0chk52pfl81npffda6hy1pag6n8l5ssq61mc0qaa4nqfwpyvqqvw";
};
"dark_planet" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/dark_planet.tar.gz";
sha = "03i2knrfi56f8lbc8hs8rqa4jg432nsmjn74wibb04ppmvm8f47j";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/dark_planet.tar.gz";
sha = "1bbwdzgmvrdxkd379r1w2rkl0r5ixlh56xn59c47bmfbjl19927d";
};
"darth_vader" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/darth_vader.tar.gz";
sha = "0mlxy17l1hjf3nq390wc26n4x3c45n5hmks75zkzjz3l5ac1fah6";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/darth_vader.tar.gz";
sha = "1czq929j87zila0v49kikjqdw8bmssmn5cp573i3qb9kry5xdlm7";
};
"deus_ex" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/deus_ex.tar.gz";
sha = "1mllj0xj9g1nn01vcq0xsfcwd0qnmk1s3vj5d03f9qp513k8qzdl";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/deus_ex.tar.gz";
sha = "1la8rlvy9gh593vx2w9wjq2hmsp58fd2gx9l9g2222mmzpk1hmcc";
};
"dna" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/dna.tar.gz";
sha = "0xcf4vxd99w3d44bhrdk1yqsfcakix6cd7hdpjsgccgs1jd02hi1";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/dna.tar.gz";
sha = "1mkq23khwsbnz8spf00amk48fx5vnk3rpzapx37rpx1klgxpm89q";
};
"double" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/double.tar.gz";
sha = "07gxkzqrp0cfisdkq0wqfiai37m2yr2fhcpdpazmzkkxnm4qf25y";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/double.tar.gz";
sha = "11grxa2wblii4yxxrwfbbmwlwk26sm6mw9y00wfadijx2iyx30i1";
};
"dragon" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/dragon.tar.gz";
sha = "0ypr1vyl6zilfzncymlh2s1ivxr7n88kfaygmz2y83l332asjs66";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/dragon.tar.gz";
sha = "1hlvr2s8zhlf8mg9pskwby94kh15g8icxn3833cdqqhmgvc0d7l5";
};
"flame" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/flame.tar.gz";
sha = "0kvly5rgp47a4lby3blb1dird9xwy9y9c8a0wg17qfvz3zr69r0g";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/flame.tar.gz";
sha = "1yszmhmmjgdkjvqpij3gjwz8vxjhmklf7clbpz947254zgwxyn5g";
};
"glitch" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/glitch.tar.gz";
sha = "0s0kmrw01wj9i7qd7zbwvmfbbh7r3jfkc4522jv44m4rl6r4h84c";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/glitch.tar.gz";
sha = "15gwhfnrn0p80wdaymnlvrcig5cjb4m5qz56hbhg4jdwcjdlppbd";
};
"glowing" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/glowing.tar.gz";
sha = "19nkbk2cw6j763idz5z7l71lx529xcgyx1dcd9qd356x9ifdw206";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/glowing.tar.gz";
sha = "09h7dn805lrg04j5lp30l3qc6kb8xxilibdg0pxfadwyljblwl1f";
};
"green_blocks" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/green_blocks.tar.gz";
sha = "0x8pgsyfbchy7z6d4rijsk2nml6fl1xwba0f0h3lw9i6359k7j3j";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/green_blocks.tar.gz";
sha = "09xx5fbnby567s9s8hmryalm9k9vs520lymiprw06nig49rmy4v2";
};
"green_loader" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/green_loader.tar.gz";
sha = "00rdpy1gbc4ikxx487w3k27z622z2rjcsi0d18i23s5p3xqd1l3a";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/green_loader.tar.gz";
sha = "09vw6c9albsv28y4bdlp54csq5bl0vrd20yjph00jxhvhizffk3k";
};
"hexagon" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon.tar.gz";
sha = "0yk47hs5qfv09q5df4x6j82ivrxfxh1bxsw8p8x7hcmlb08dh6g6";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon.tar.gz";
sha = "17api8ndiqjxyj7prxz0bv1dpq0h0wvphnll4lb2dlhxp61bjmj3";
};
"hexagon_2" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_2.tar.gz";
sha = "175im23q769s2if3xi8j669r0b5y0dagz8rsbvq7kghznzw4abc2";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_2.tar.gz";
sha = "030yr5nb6q7bw1f1dh9kcdmd87x25f1fn60v45vmk7k07y1s10c8";
};
"hexagon_alt" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_alt.tar.gz";
sha = "1ayhw1gzrb98hf7f77b6ka5wi19ymp3mljhhgm5lx8w8pwawsxnb";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_alt.tar.gz";
sha = "1f6i8signlscp0av3kcmdw0xm13pf2dy2lz3c6wq9d9203ibry1p";
};
"hexagon_dots" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_dots.tar.gz";
sha = "0pdw9ih9fsxvv394yc5vfj7nlq7mca9w05y0s631gnsdzgqxsyd6";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_dots.tar.gz";
sha = "13mi9f8saw9zk8zdxp003ipigyd4y26iydn0pd1c0vr5fbz483rq";
};
"hexagon_dots_alt" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_dots_alt.tar.gz";
sha = "0aff3bgpva41b4jk4mp0fxdvli286x4pk3q9ysvps7z7srw4fvvn";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_dots_alt.tar.gz";
sha = "1gkzh5i84cwv64f3r8rgpzyj8h1kpn92m4syf67kn5sdhqykvqkz";
};
"hexagon_hud" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_hud.tar.gz";
sha = "0wpmsffdp59dy2g5ggprgr7l50rf131c7v8pbgpir230lpn10xzi";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_hud.tar.gz";
sha = "17k5378fsydvcps9rxd117rfqlijnrsj1ggyqx445a5yrwy6rx55";
};
"hexagon_red" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_red.tar.gz";
sha = "0fgmma5j6fnjykpwplji4rm57d07l9shfpay079gz1nhbhnq3rkl";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_red.tar.gz";
sha = "0x8i1k54qff7agwq9gqi2z59lww8qglck105bv87ylgy5z6150sx";
};
"hexa_retro" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hexa_retro.tar.gz";
sha = "1cbyhqhv2ysx9w8cpbfidrm0w70wssp4fld0q1g01fgcbg93b7mf";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexa_retro.tar.gz";
sha = "0bwx2nvvr6bkqnmnv2kh9slbi11lv0h3hnzql99d9llr3vlid5ip";
};
"hud" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud.tar.gz";
sha = "0s01p1n75ckwa69iy5v2z2cg85ipzgx356n4yvdyi1jh9pnl22k9";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hud.tar.gz";
sha = "0zng0rn4lacxf9v1azndzv5v7pl84f0amschccdlnymilyy564ck";
};
"hud_2" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud_2.tar.gz";
sha = "1bvkl5f0fwi7xzy23pj3p7c98fbz2zk8abz7frxr0pp0xj3ql87i";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hud_2.tar.gz";
sha = "14ldw37gpysnw3k1cssh8q1hgxnrh954pgq5x5xhrlv2w6rsbfzq";
};
"hud_3" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud_3.tar.gz";
sha = "1n5qqkp0qb4mlpp7g20hpvazgwxw4gjb2p0ys0q2bglb3amzc2xr";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hud_3.tar.gz";
sha = "0lc3x51gjfc58y45yzfnpy2i07vk9vdzbjl5yawv3wh97jy5x6x7";
};
"hud_space" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud_space.tar.gz";
sha = "0dhajnica048smn5wpwc13ij0n9g6c10a0qxgi4rwiczr7p9vajj";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hud_space.tar.gz";
sha = "13ipj1l737bs9rnhh5vviq6bm5hdghpyq6s5hc1fhg2cgldfnq0i";
};
"ibm" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/ibm.tar.gz";
sha = "0xri6x716ma3y7d59yn9vm7skw5y53kn6s2ivfrvlfsac9n1zj4m";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/ibm.tar.gz";
sha = "0acs1f468xfpsvzy400f8ba7890n3pp69c9b20lb8slamm9l4swd";
};
"infinite_seal" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/infinite_seal.tar.gz";
sha = "0r9plydfdc35s2is1zi3pbx3s0bs5hqkim3laiav8fv3rzq0f3lq";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/infinite_seal.tar.gz";
sha = "07g4qmkfc9yqjpbs0yr277ij3pbhc1p51gzpnnbc3viwm1zzrs6p";
};
"ironman" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/ironman.tar.gz";
sha = "0af6qfdqj0n5qgsxg6nnrs2k8xas6cd18jw96mrwfcckpfz091cm";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/ironman.tar.gz";
sha = "0w5z22529jrgd2ab7fqibm2sd57740qxyqqrzhyvgd4l5axn1yzd";
};
"liquid" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/liquid.tar.gz";
sha = "0ghavh6nj68kwcgvrnwbabkzn44zq0m2ic1b2cl278d2vffzqv87";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/liquid.tar.gz";
sha = "01lwzb2yid7hb1f2nc0jycll9kvq89jcz7s7w81vqirx4by8p8n8";
};
"loader" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/loader.tar.gz";
sha = "1zlba3mra45ii0gahlw8v1vq1j7nbfjq62pcjn43vb40zcc1j873";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/loader.tar.gz";
sha = "0vx66kb56n6dy74k6yjk5w8apc8q1hmr8mrpgl420lzdqm4ggrgz";
};
"loader_2" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/loader_2.tar.gz";
sha = "1yw4n9bw483pl7m3ks2ajgfldslgyc4gb1kw61fszfp5x4l3k4rg";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/loader_2.tar.gz";
sha = "0rir3gfi8bq4m8s0xhbd2ppny6q60b42wq9vs826axk2g58jczrw";
};
"loader_alt" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/loader_alt.tar.gz";
sha = "1pi97pfhg13wq5s8hai4fd31s6bcfq09r969fl216yxksj8h69wj";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/loader_alt.tar.gz";
sha = "0pfg304xmgc46ai9d5m51p05i7zbvhfzfsscn7yk6kiw09b21fpz";
};
"lone" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/lone.tar.gz";
sha = "0413mxr8lqlznbps5c4qgbhm0zpz8dlkbdj67r9gvzi9v020qjgl";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/lone.tar.gz";
sha = "0xx959215w8qcpbzn9w3ip4shq3ib7dcni43z4m9jwa28aa3v7y8";
};
"metal_ball" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/metal_ball.tar.gz";
sha = "129q23q992fxfi976px5r68sf8wqbac3zby4yjh97s48zm83rzb5";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/metal_ball.tar.gz";
sha = "18nbikv736yd1q4qf9nq0fzspmxlkq1z6kl0jzady8ifkny1kvlw";
};
"motion" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/motion.tar.gz";
sha = "0g84ac8ps69ihic2z7gr4nlwib9ra86il2fdl7rl7w5nc8xzhx1y";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/motion.tar.gz";
sha = "0nbvgsgkpkdx83v45fb4z6ywiz3cpdmbsx8jcxhaa0cpywvq40bh";
};
"optimus" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/optimus.tar.gz";
sha = "1l4bmbiqqypwqvyhcd561nnxhrq5zif8pmkyk2hdwscbq6rlbc7r";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/optimus.tar.gz";
sha = "0zxv3b21mxkl0dvhs6nzd94vlsphc8h1zzvkcgng6cqg9n1c206p";
};
"owl" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/owl.tar.gz";
sha = "03gqqcvp4320qy1d3az1k2a8rj97alk8qzgkz6xg4akz9ccd731y";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/owl.tar.gz";
sha = "1ylkpydmy65xilqzkdps18kr0yyqggkxaysmmik3sz01qs6xjrz6";
};
"pie" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/pie.tar.gz";
sha = "1j479l428gq1b2g0g2ybkf81jzad69n59kphm0ns5gfv6khx10ga";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/pie.tar.gz";
sha = "1x834k0qsa8c7z3ds0vk6cw2r1f4ydmyk8yz1hdw8lxys17n9rj8";
};
"pixels" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/pixels.tar.gz";
sha = "13rfdd9v7h0k2wbwr428h2w8dv5vhhbw03wvirlmafsbhmgjz5xs";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/pixels.tar.gz";
sha = "072ag60r2n3jjj64r1nzsj5p97gjcfrvd72axm1z741rz5xaigki";
};
"polaroid" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/polaroid.tar.gz";
sha = "096iz34hpmicixrdrqaxmx8m83vggm90xqz4zyy5vkpcy3vl60mf";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/polaroid.tar.gz";
sha = "0m748kj5qps9vwwww44i1lj64r0mg0hqnfkg7dhqrf7nl0saw4da";
};
"red_loader" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/red_loader.tar.gz";
sha = "0n2jmfy558rma6knraskb7rgccvnayxh7csl0jaarx2xl9zxzzay";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/red_loader.tar.gz";
sha = "18vvlknnp3kiviacmp0cbmagrqzbhli6qv6vbzw362cv2mxhid85";
};
"rings" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rings.tar.gz";
sha = "1g9p2cdn1w7dmy2z017xdkv6rm50gdb5qqd8a0y0662fzph5adg0";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/rings.tar.gz";
sha = "0xhwnxr5hcxqr64vr45lkvwzbbcpzxfbdlad006r16m480ncripw";
};
"rings_2" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rings_2.tar.gz";
sha = "07v4mq1lpw9vfzg0rfxmkyfhyhz3nv5zab5kf10bjjgpjq8c9fi3";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/rings_2.tar.gz";
sha = "0vdjby6kyazxy042ljyv59pg4zfsvzzssf20w4r7ircfyiqypajs";
};
"rog" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rog.tar.gz";
sha = "13lcrsdk1v1xn7fxn54xbk1jkh55kmsf813q1v7x8a2l8p9pl0hp";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/rog.tar.gz";
sha = "0az3vxndzym39w7357mmr6zyzfy32pg036v6jim895z10093b0y0";
};
"rog_2" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rog_2.tar.gz";
sha = "0cgc1y1jrb689h9wd7jf3wvf9r996k4ik965v4wclmp9wra5gflk";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/rog_2.tar.gz";
sha = "13yfqb06ihzma80lfsb0mlsaq0j6qakqx607pr5rmhl6765bz116";
};
"seal" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/seal.tar.gz";
sha = "0ip23x69ljdj1bwxlhvz3fbg3ia47m2aw6d122v2rqhwqasmy40n";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/seal.tar.gz";
sha = "14k98v41ng3had7n6q1z513yc53zzkji7gm4n2jpjj5rd1jd2xr8";
};
"seal_2" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/seal_2.tar.gz";
sha = "1fc91n6ys2fl8xbzdj0ywck87xnyn1gp4jvjk307w49jmkpdzs15";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/seal_2.tar.gz";
sha = "0kwn7njj7anci9ihf8aqs7k7qv2vsnqc81sj5db672qn4hxpy50v";
};
"seal_3" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/seal_3.tar.gz";
sha = "1l2jlxhhaf5whbvbdf31ypcasalx4fsd4yn90xybmjq7b27bz5b2";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/seal_3.tar.gz";
sha = "0pjqq7qlmb0mf0xnm001b1f5jcbfzd3a3hzsf0jysacb5wmpzspp";
};
"sliced" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/sliced.tar.gz";
sha = "0363lwq3rwdcz3fg47f6kch150vxspvpjdqzg87aahli30kkjfdi";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/sliced.tar.gz";
sha = "1xrlhg1glykj73x9spq609y4ygfy3xw4azk3npjfh3ky5l0jqxjg";
};
"sphere" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/sphere.tar.gz";
sha = "1zjlwign7f2zd70qkg25adbbmq8ndm9b44gc4pa0ls64i6yfd6fz";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/sphere.tar.gz";
sha = "1nav61fr7wba1vbas8wci3fpyx0pidgiv9wm4zxdrw7hqw8akkpn";
};
"spin" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/spin.tar.gz";
sha = "0hwjc4i69zmzw7cpmsrhmx00w5k5y46m317m1imw2ycmhm0jicm5";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/spin.tar.gz";
sha = "1yb39jmvifb1ijh5i804d06c97samhf8w4p0w1xwxq29j6ihsvw9";
};
"spinner_alt" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/spinner_alt.tar.gz";
sha = "1ifs9xxd1cxvgjcnqjfw2zxkcapssv10hvchjrlf9nl60ayyp4m4";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/spinner_alt.tar.gz";
sha = "136nhpxlc2kar9jwz4pdxpg30b66n7bqy5mk9lm4v90pwf5m3kbs";
};
"splash" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/splash.tar.gz";
sha = "12l8hwzmi68mjqgl384wf1fscvnzwp4a3vmlsb2zcbfwhrs5q717";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/splash.tar.gz";
sha = "1wnmqqm07yrbd5ha31dd2iihmrjr555hd8fgra9fy9zh2pw9wgf2";
};
"square" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/square.tar.gz";
sha = "1mpyrivchsj2gr8flwj0g45vb792fvjjb5jmkn9xz1glrxxs7zww";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/square.tar.gz";
sha = "1wkixypxchsi11d8qfackcbvcjhifys9xlsc61rd7hfgz2nwjmww";
};
"square_hud" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/square_hud.tar.gz";
sha = "1lvv00r5rg8yjwibfqncka1s0p59fnpklhz3v6ifbs7ynlyp0kag";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/square_hud.tar.gz";
sha = "13bbzxv4gq66z0h801m8fi3n2rk41212nhapa5xb3xgh7v23my04";
};
"target" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/target.tar.gz";
sha = "1ipsd3rjclmwzg2l4bxpj0mgfl5bwxs1ihf498660zhm0bqqpgpr";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/target.tar.gz";
sha = "0vk8abdxhs93bj9l21db2ai7w945z472rwwn1m4070vrhs2fvzn4";
};
"target_2" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/target_2.tar.gz";
sha = "16lipy5c0pyyb1idwj1zchfr8g0cy6qr46c87b8g1kv2g96n5cn6";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/target_2.tar.gz";
sha = "0n6f1lnmry5zv3y592gp0r2rn297h806zhcgd7yfp0z2zgay67nz";
};
"tech_a" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/tech_a.tar.gz";
sha = "0fn8aib05kmjxnp7j2bmgrs3avaj6bn06kxz55bw8fdg8ihxnxg0";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/tech_a.tar.gz";
sha = "13gdq6h3m7skryr95vi0a30ylrapxg1nkc8cv8vn025gj6bafa83";
};
"tech_b" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/tech_b.tar.gz";
sha = "03i8jcvql76mhcq0dqaj2wygfza72fc7c22vfcyp38cx1lm6ilbv";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/tech_b.tar.gz";
sha = "1l383plabzlkccqjhf8x02jskykr4wkj2wy6knk9kg6qrq8w870l";
};
"unrap" = {
url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/unrap.tar.gz";
sha = "08gqwb11539kz5178ga6f96jv82xmyyzv44q6d05ajcw3pxk5j4c";
url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/unrap.tar.gz";
sha = "0571pvnhmny9642rfg7sw6csrz7bka2424zfryg858c0hg6aqrnk";
};
}

View File

@ -8,27 +8,21 @@ curl_args=( '--silent' )
# optionally takes a GITHUB_TOKEN to overcome api rate limiting.
if [ -n "$GITHUB_TOKEN" ]; then curl_args+=( --header "authorization: Bearer ${GITHUB_TOKEN}" ); fi
# get last master ref
curl_args+=( --url https://api.github.com/repos/adi1090x/files/commits/master )
last_ref=$(curl "${curl_args[@]}" | jq -r '.sha' )
unset curl_args[-1]
curl_args+=( https://api.github.com/repos/adi1090x/files/git/trees/$last_ref\?recursive=1 )
theme_archives=$(curl "${curl_args[@]}" \
| jq '.tree | map(select(.path| test("^plymouth-themes/themes/pack_.*tar.gz$"))| .path)')
# get latest release assets
curl_args+=( --url https://api.github.com/repos/adi1090x/plymouth-themes/releases/latest )
theme_archives=$(curl "${curl_args[@]}" | jq -r '.assets' )
dirname="$(dirname "$0")"
printf '{\n' > "$dirname/shas.nix"
repo_url="https://github.com/adi1090x/files/raw/$last_ref"
while
read -r file_path
do
name=$(basename $file_path)
printf ' "%s" = {\n url = "%s";\n sha = "%s";\n };\n' "${name%%.*}" "$repo_url/$file_path" "$(nix-prefetch-url "$repo_url/$file_path")" >>"$dirname/shas.nix"
done < <(jq -r '.[]' <<<"$theme_archives")
name="$(basename $file_path)"
name="${name/.tar.gz/}"
printf ' "%s" = {\n url = "%s";\n sha = "%s";\n };\n' "${name}" "$file_path" "$(nix-prefetch-url "$file_path")" >>"$dirname/shas.nix"
done < <(jq -r '.[].browser_download_url' <<<"$theme_archives")
printf '}\n' >> "$dirname/shas.nix"

View File

@ -197,6 +197,15 @@ in lib.makeScope pkgs.newScope (self: with self; {
};
};
elm-graphql =
nodePkgs."@dillonkearns/elm-graphql" // {
meta = with lib; nodePkgs."@dillonkearns/elm-graphql".meta // {
description = " Autogenerate type-safe GraphQL queries in Elm.";
license = licenses.bsd3;
maintainers = [ maintainers.pedrohlc ];
};
};
elm-review =
nodePkgs.elm-review // {
meta = with lib; nodePkgs.elm-review.meta // {

View File

@ -13,5 +13,6 @@
"elm-optimize-level-2",
"elm-pages",
"elm-review",
"elm-git-install"
"elm-git-install",
"@dillonkearns/elm-graphql"
]

File diff suppressed because it is too large Load Diff

View File

@ -1,66 +0,0 @@
diff --git a/Makefile b/Makefile
index 4c96ae7..9e1a2e3 100755
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
# Setup make itself.
.ONESHELL:
-override SHELL := /bin/bash
+SHELL := bash
override .SHELLFLAGS := -e -u -o pipefail -O nullglob -O extglob -O globstar -c
# Unset all default build- and recipe-related variables.
@@ -315,7 +315,6 @@ endif
GetTargetStructName = target[${1}]
makefiles_to_include := \
- third_party/Build.*.mk \
frontends/*/Build.mk \
tests/*/Build.mk \
lib/*/Build.mk
diff --git a/frontends/systemverilog/Build.mk b/frontends/systemverilog/Build.mk
index acd9cb6..c039994 100644
--- a/frontends/systemverilog/Build.mk
+++ b/frontends/systemverilog/Build.mk
@@ -1,6 +1,7 @@
t := systemverilog-plugin
ts := $(call GetTargetStructName,${t})
out_dir := $(call GetTargetBuildDir,${t})
+mod_dir := third_party/yosys_mod
cxx_is_clang := $(findstring clang,$(notdir ${CXX}))
@@ -13,9 +14,9 @@ ${ts}.sources := \
${${ts}.src_dir}uhdm_ast_frontend.cc \
${${ts}.src_dir}uhdm_common_frontend.cc \
${${ts}.src_dir}uhdm_surelog_ast_frontend.cc \
- ${$(call GetTargetStructName,yosys).mod_dir}const2ast.cc \
- ${$(call GetTargetStructName,yosys).mod_dir}edif.cc \
- ${$(call GetTargetStructName,yosys).mod_dir}simplify.cc
+ $(mod_dir)/const2ast.cc \
+ $(mod_dir)/edif.cc \
+ $(mod_dir)/simplify.cc
define ${ts}.env =
export PKG_CONFIG_PATH=$(call ShQuote,${$(call GetTargetStructName,surelog).output_vars.PKG_CONFIG_PATH}$(if ${PKG_CONFIG_PATH},:${PKG_CONFIG_PATH}))
@@ -35,8 +36,8 @@ endif
endif
${ts}.cxxflags = \
- -I${$(call GetTargetStructName,yosys).src_dir} \
- -I${$(call GetTargetStructName,yosys).mod_dir} \
+ -I$(shell yosys-config --cxxflags) \
+ -I$(mod_dir) \
-D_YOSYS_ \
-DYOSYS_ENABLE_PLUGINS \
$(shell ${${ts}.env}; pkg-config --cflags Surelog) \
@@ -55,7 +56,7 @@ ${ts}.ldflags = \
$(shell ${${ts}.env}; pkg-config --libs-only-L Surelog) \
${build_type_ldflags} \
${LDFLAGS} \
- -Wl,--export-dynamic
+ $(shell yosys-config --ldflags --ldlibs)
${ts}.ldlibs = \
$(shell ${${ts}.env}; pkg-config --libs-only-l --libs-only-other Surelog) \

View File

@ -12,21 +12,23 @@
stdenv.mkDerivation (finalAttrs: {
pname = "yosys-synlig";
version = "2023.10.12"; # Currently no tagged versions upstream
plugin = "synlig";
# The module has automatic regular releases, with date + short git hash
GIT_VERSION = "2023-10-26-f0252f6";
# Derive our package version from GIT_VERSION, remove hash, just keep date.
version = builtins.concatStringsSep "-" (
lib.take 3 (builtins.splitVersion finalAttrs.GIT_VERSION));
src = fetchFromGitHub {
owner = "chipsalliance";
repo = "synlig";
rev = "c5bd73595151212c61709d69a382917e96877a14";
sha256 = "sha256-WJhf5gdZTCs3EeNocP9aZAh6EZquHgYOG/xiTo8l0ao=";
owner = "chipsalliance";
repo = "synlig";
rev = "${finalAttrs.GIT_VERSION}";
hash = "sha256-BGZQbUcIImpz3SjFvMq3Pr1lseNLZnsMvpHy0IsICe4=";
fetchSubmodules = false; # we use all dependencies from nix
};
patches = [
./synlig-makefile-for-nix.patch # Remove assumption submodules available.
];
nativeBuildInputs = [
pkg-config
];
@ -42,16 +44,32 @@ stdenv.mkDerivation (finalAttrs: {
buildPhase = ''
runHook preBuild
make -j $NIX_BUILD_CORES build@systemverilog-plugin
# Remove assumptions that submodules are available.
rm -f third_party/Build.*.mk
# Create a stub makefile include that delegates the parameter-gathering
# to yosys-config
cat > third_party/Build.yosys.mk << "EOF"
t := yosys
ts := ''$(call GetTargetStructName,''${t})
''${ts}.src_dir := ''$(shell yosys-config --datdir/include)
''${ts}.mod_dir := ''${TOP_DIR}third_party/yosys_mod/
EOF
make -j $NIX_BUILD_CORES build@systemverilog-plugin \
LDFLAGS="''$(yosys-config --ldflags --ldlibs)"
runHook postBuild
'';
# Very simple litmus test that the plugin can be loaded successfully.
# Check that the plugin can be loaded successfully and parse simple file.
doCheck = true;
checkPhase = ''
runHook preCheck
echo "module litmustest(); endmodule;" > litmustest.sv
yosys -p "plugin -i build/release/systemverilog-plugin/systemverilog.so;\
help read_systemverilog" | grep "Read SystemVerilog files using"
read_systemverilog litmustest.sv"
runHook postCheck
'';

View File

@ -7,15 +7,15 @@ mkCoqDerivation rec {
useDune = true;
release."0.1.7+8.16".sha256 = "sha256-ZBxwrnnCmT5q4C7ocQ+M+aSJQNnEjeN2HFw4bzPozYs=";
release."0.1.7+8.17".sha256 = "sha256-f671wzGQannGjRbmBRHFKXz24BTPX7oVeHUxnv4Vd6Y=";
release."0.1.7+8.18".sha256 = "sha256-J+bRIzjdIPRu7DvAGVBKB43O3UJliTo8XQ87OTzsFyc=";
release."0.1.8+8.16".sha256 = "sha256-dEEAK5IXGjHB8D/fYJRQG/oCotoXJuWLxXB0GQlY2eo=";
release."0.1.8+8.17".sha256 = "sha256-TmaE+osn/yAPU1Dyni/UTd5w/L2+qyPE3H/g6IWvHLQ=";
release."0.1.8+8.18".sha256 = "sha256-UYmiDdbax4wxp5dLia/1t1gFyK6UELtJJvDMd5Hd14s=";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = isEq "8.16"; out = "0.1.7+8.16"; }
{ case = isEq "8.17"; out = "0.1.7+8.17"; }
{ case = isEq "8.18"; out = "0.1.7+8.18"; }
{ case = isEq "8.16"; out = "0.1.8+8.16"; }
{ case = isEq "8.17"; out = "0.1.8+8.17"; }
{ case = isEq "8.18"; out = "0.1.8+8.18"; }
] null;
nativeBuildInputs = [ makeWrapper ];

View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, buildPackages
, gnutls
, guile
, libtool
@ -19,16 +20,21 @@ stdenv.mkDerivation rec {
strictDeps = true;
depsBuildBuild = [
buildPackages.stdenv.cc
];
nativeBuildInputs = [
gnutls
guile
libtool
texinfo
pkg-config
];
buildInputs = [
gnutls
guile
libtool
texinfo
];
configureFlags = [

View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "apache-activemq";
version = "5.18.2";
version = "5.18.3";
src = fetchurl {
sha256 = "sha256-zT3z7C95HUf0NRvA5dX5iAwiCkUaMYIO2/g5li7IQwo=";
sha256 = "sha256-lDOBqm00BwfebELq2/e0G3/fk99gQVbZctUMTaeDVE8=";
url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz";
};

View File

@ -41,6 +41,11 @@ stdenv.mkDerivation rec {
"LIBDIR=${placeholder "out"}/lib"
];
postInstall = ''
mv $out/include/qm-dsp/* $out/include
rmdir $out/include/qm-dsp
'';
env.NIX_CFLAGS_COMPILE = "-I${kissfft}/include/kissfft";
meta = with lib; {

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gl3w";
version = "unstable-2022-03-24";
version = "unstable-2023-10-10";
src = fetchFromGitHub {
owner = "skaslev";
repo = pname;
rev = "5f8d7fd191ba22ff2b60c1106d7135bb9a335533";
hash = "sha256-qV/PZmaP5iCHhIzTA2bE4d1RMB6LzRbTsB5gWVvi9bU=";
rev = "3a33275633ce4be433332dc776e6a5b3bdea6506";
hash = "sha256-kEm5QItpasSFJQ32YBHPpc+itz/nQ8bQMCavbOTGT/w=";
};
nativeBuildInputs = [ python3 cmake ];

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libcotp";
version = "2.0.1";
version = "2.0.2";
src = fetchFromGitHub {
owner = "paolostivanin";
repo = pname;
rev = "v${version}";
sha256 = "sha256-w0DxZLEuR9m7udmlBQ7TyCoQvGVmJCffKHsxynQV+oo=";
sha256 = "sha256-QvDYdplPhivG4a2otT4MuSY546a2Dw/amWly5aheabQ=";
};
postPatch = lib.optionalString stdenv.cc.isClang ''

View File

@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, meson
, ninja
, json-glib
@ -21,6 +22,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-YSG4Vk3hrmtaJkK1WAlQcdgiDdgC4Un0t6UdaoIcUes=";
};
patches = [
# Fixes build with newer versions of clang
(fetchpatch {
url = "https://github.com/mjakeman/text-engine/commit/749c94d853c0b0e29e79a1b270ec61947b65c319.patch";
hash = "sha256-vs/a8IBovArw8tc1ZLUsaDHRVyA71KMB1NGENOKNOdk=";
})
];
nativeBuildInputs = [ gobject-introspection gtk4 meson ninja pkg-config ];
buildInputs = [ libadwaita json-glib libxml2 ];

View File

@ -50,13 +50,13 @@ let
in
stdenv.mkDerivation rec {
pname = "wxwidgets";
version = "3.2.2.1";
version = "3.2.3";
src = fetchFromGitHub {
owner = "wxWidgets";
repo = "wxWidgets";
rev = "v${version}";
hash = "sha256-u+INjo9EkW433OYoCDZpw5pcW1DyF/t/J5ntLZX+6aA=";
hash = "sha256-tuLNNhQA9HGax1aueZHQ+eB2dyIQnKjlmarp7e6Jplc=";
};
nativeBuildInputs = [ pkg-config ];

View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "bellows";
version = "0.36.7";
version = "0.36.8";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "bellows";
rev = "refs/tags/${version}";
hash = "sha256-j7Awqt14/J0BbYcKwIR10UtVeqt9BpQkzT8dqGRVEOU=";
hash = "sha256-+p3As+fi6mw9i5q2klFTM9QQ2JoQarwrphc6tB6C94M=";
};
propagatedBuildInputs = [

View File

@ -9,21 +9,21 @@
buildPythonPackage rec {
pname = "camel-converter";
version = "3.0.3";
format = "pyproject";
version = "3.1.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "sanders41";
repo = pname;
repo = "camel-converter";
rev = "refs/tags/v${version}";
hash = "sha256-0sNb1zg8cnDjQQnStfe1k8uB1GpmNtd/VwqSqTcLmj0=";
hash = "sha256-ASUwSA63iUgeRfYdO6InZ8YzEbifQh1hr3fUbE3FYac=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace "--cov=camel_converter --cov-report term-missing" ""
--replace "--cov=camel_converter --cov-report term-missing --no-cov-on-fail" ""
'';
nativeBuildInputs = [

View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "edk2-pytool-library";
version = "0.19.1";
version = "0.19.2";
pyproject = true;
disabled = pythonOlder "3.10";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "tianocore";
repo = "edk2-pytool-library";
rev = "v${version}";
hash = "sha256-xSW9ZeE2+vo2m2KaCW8lyotkHy7WVvNX16TDQEeQbQ4=";
hash = "sha256-EoBv7mxdT6G1n9as0V8Ad5QckMkqgC2GvcjRDc1+RzA=";
};
nativeBuildInputs = [

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "goodwe";
version = "0.2.31";
version = "0.2.32";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "marcelblijleven";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-h5FXb8abSpyCDnaRox3J0XFLvl6V9IMcePtTZ3wbTPM=";
hash = "sha256-Uj4f3OcPRqbMaM0ADP6OlPQAXFfCYZS0/qbz9eXGLv0=";
};
postPatch = ''

View File

@ -0,0 +1,31 @@
{ lib
, buildPythonPackage
, fetchPypi
, poetry-core
}:
buildPythonPackage rec {
pname = "krfzf-py";
version = "0.0.6";
format = "pyproject";
src = fetchPypi {
pname = "krfzf_py";
inherit version;
hash = "sha256-/M9Atu9MLAGmnEdx6tknMJAit2o4Xt971uQ7pb0CBCk=";
};
nativeBuildInputs = [
poetry-core
];
pythonImportsCheck = [ "fzf" ];
meta = with lib; {
description = "A Pythonic Fzf Wrapper";
downloadPage = "https://github.com/justfoolingaround/fzf.py";
homepage = "https://pypi.org/project/krfzf-py/";
license = licenses.gpl3Only;
maintainers = with maintainers; [ doronbehar ];
};
}

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "neo4j";
version = "5.13.0";
version = "5.14.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "neo4j";
repo = "neo4j-python-driver";
rev = "refs/tags/${version}";
hash = "sha256-ykbKNLMnbAGUavyfRtF3q97FRLaeuKOt0pcWHtJ9mCY=";
hash = "sha256-HNgH01ZoQLuZ3K9sSYAYa6/ZTbVYsOUFhOqgP7y2F3Q=";
};
propagatedBuildInputs = [

View File

@ -12,16 +12,16 @@
buildPythonPackage rec {
pname = "nextdns";
version = "1.4.0";
version = "2.0.0";
format = "setuptools";
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "bieniu";
repo = pname;
repo = "nextdns";
rev = "refs/tags/${version}";
hash = "sha256-fW/fLbL4IMLN6LmFijH4+ew+cDdJY9tOha+010YEfNs=";
hash = "sha256-AgxBJXPBYkJR8W8tGKcHJaAP52guNVvm190ZlZ9BhA4=";
};
propagatedBuildInputs = [
@ -41,9 +41,9 @@ buildPythonPackage rec {
];
meta = with lib; {
changelog = "https://github.com/bieniu/nextdns/releases/tag/${version}";
description = "Module for the NextDNS API";
homepage = "https://github.com/bieniu/nextdns";
changelog = "https://github.com/bieniu/nextdns/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};

View File

@ -1,6 +1,6 @@
{ lib
, buildPythonPackage
, fetchFromGitLab
, fetchPypi
, pkg-config
, rustPlatform
, cargo
@ -11,24 +11,23 @@
, pcsclite
, stdenv
, darwin
, libiconv
}:
buildPythonPackage rec {
pname = "pysequoia";
version = "0.1.14";
version = "0.1.20";
format = "pyproject";
src = fetchFromGitLab {
owner = "sequoia-pgp";
repo = "pysequoia";
rev = "v${version}";
hash = "sha256-63kUUxZTG33cB/IiD4AiDpLOI6Uew/fETgqhaGc7zp0=";
src = fetchPypi {
inherit pname version;
hash = "sha256-KavsLp17e4ckX11B0pefiQ1Hma/O9x0VY/uVPiJm4Fs=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-S/j3bGgU46nvVQFs35ih05teVEIJrFN4Ryq4B7rLFDE=";
hash = "sha256-7Lw6gR6o2HJ/zyG4b0wz4nmU2AIIAhyK9zaQ6w+/RgE=";
};
nativeBuildInputs = [
@ -48,14 +47,18 @@ buildPythonPackage rec {
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.Security
libiconv
];
pythonImportsCheck = [ "pysequoia" ];
meta = with lib; {
description = "This library provides OpenPGP facilities in Python through the Sequoia PGP library";
downloadPage = "https://codeberg.org/wiktor/pysequoia";
homepage = "https://sequoia-pgp.gitlab.io/pysequoia";
license = licenses.asl20;
maintainers = with maintainers; [ doronbehar ];
# Broken since the 0.1.20 update according to ofborg. The errors are not clear...
broken = stdenv.isDarwin;
};
}

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "scooby";
version = "0.7.4";
version = "0.9.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "banesullivan";
repo = "scooby";
rev = "refs/tags/v${version}";
hash = "sha256-BgQwsgAYtRgxxjo7NHbgNME1maoZQpocGGBW7Vddr+o=";
hash = "sha256-x6GPRo0OuXJtN41urviY0joZKzq0SQjUdRBpIylgcXY=";
};
nativeBuildInputs = [
@ -54,6 +54,8 @@ buildPythonPackage rec {
"test_tracking"
"test_import_os_error"
"test_import_time"
# TypeError: expected str, bytes or os.PathLike object, not list
"test_cli"
];
meta = with lib; {

View File

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "types-beautifulsoup4";
version = "4.12.0.6";
version = "4.12.0.7";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-BFqyhdPlQBhuFhM2EvQ/Z+MfkQ5tdXiQa0OgrY+BE0c=";
hash = "sha256-WZgAKNKb9V0Ns1nvowW3W6zwy5Lj8/az/UCPJTHfJ0w=";
};
propagatedBuildInputs = [

View File

@ -5,13 +5,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "cpm-cmake";
version = "0.38.5";
version = "0.38.6";
src = fetchFromGitHub {
owner = "cpm-cmake";
repo = "cpm.cmake";
rev = "v${finalAttrs.version}";
hash = "sha256-PpfOpfEb8wxqaFFh8h0H4nn8bbBr7s0dWcRiREGddQ4=";
hash = "sha256-6y3kZyhY1WKHLw3ekZMQeoSGUgxhBu8dPl58ZnCDa+E=";
};
dontConfigure = true;

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "dbmate";
version = "2.6.0";
version = "2.7.0";
src = fetchFromGitHub {
owner = "amacneil";
repo = "dbmate";
rev = "refs/tags/v${version}";
hash = "sha256-5dYWCcCQymwzWGY67lds5QQzHHkKt3OGkvqXDLwt/q8=";
hash = "sha256-gT+1ptQUZNobUG2etknCuyV2xxct5F6+P2J6/6yQkTk=";
};
vendorHash = "sha256-1sfIwawsWefh+nj4auqRjU4dWuDbgpvhAc8cF8DhICg=";
vendorHash = "sha256-2HY5eqiVRKvP1YrlNtbEj7QvDfoMV6DF+WgQOwo9VuQ=";
doCheck = false;

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "go-mockery";
version = "2.35.2";
version = "2.36.0";
src = fetchFromGitHub {
owner = "vektra";
repo = "mockery";
rev = "v${version}";
sha256 = "sha256-MsaAITGFDnAylxMU+PGbSl+H/W/Y7pghBbfQyqp31AM=";
sha256 = "sha256-lJkxN0FtwfuOMCMGEISkZMMKULE5X5kTltIgDm7Ta0Y=";
};
preCheck = ''

View File

@ -17,17 +17,17 @@ buildBazelPackage rec {
# These environment variables are read in bazel/build-version.py to create
# a build string shown in the tools --version output.
# If env variables not set, it would attempt to extract it from .git/.
GIT_DATE = "2023-08-29";
GIT_VERSION = "v0.0-3410-g398a8505";
GIT_DATE = "2023-10-26";
GIT_VERSION = "v0.0-3428-gcfcbb82b";
# Derive nix package version from GIT_VERSION: "v1.2-345-abcde" -> "1.2.345"
version = builtins.concatStringsSep "." (lib.take 3 (lib.drop 1 (builtins.splitVersion GIT_VERSION)));
src = fetchFromGitHub {
owner = "chipsalliance";
repo = "verible";
rev = "${GIT_VERSION}";
sha256 = "sha256-qi//Dssgg5ITrL5jCpZXpSrhSm2xCqe53D9ctK7SQoU=";
repo = "verible";
rev = "${GIT_VERSION}";
hash = "sha256-snWhOuGyAdtdJDMttcbEjlkwPUO1mdR9vuro0tZt+Z8=";
};
patches = [

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "mod";
version = "0.5.0";
version = "0.7.0";
src = fetchFromGitHub {
owner = "marwan-at-work";
repo = "mod";
rev = "v${version}";
sha256 = "sha256-+xgh/al6954I+DseSHk9k7Rbj0TzQxCtX4X3pbQmoG0=";
sha256 = "sha256-ZFAjiTCmx9o/rUa1vK1Fmz6sE695zzlexTyWJO05M6k=";
};
vendorHash = "sha256-NvTbQcYGMyQ/bfNTJ3eC28n9TIU4HkcD3ij2o9EBX3Y=";
vendorHash = "sha256-5A4W99wcuXMWH0s+uykBWuKCxo8wr3GbTpUKj+Ql0os=";
doCheck = false;

View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "quick-lint-js";
version = "2.16.0";
version = "2.17.0";
src = fetchFromGitHub {
owner = "quick-lint";
repo = "quick-lint-js";
rev = version;
sha256 = "sha256-IfcX7DLRAsBMXitEgsEOjKtiXnX4bX03Md8/14gv3aY=";
sha256 = "sha256-5+Cyw1cLgBkTePNNFoNAF2oHnLQDHr4vHiaZHJrewug=";
};
nativeBuildInputs = [ cmake ninja ];

View File

@ -7,21 +7,21 @@
let
pname = "osu-lazer-bin";
version = "2023.1008.1";
version = "2023.1026.0";
name = "${pname}-${version}";
osu-lazer-bin-src = {
aarch64-darwin = {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
sha256 = "sha256-eL5UVZqAH7Ta442xIDjaOPu3NXJmck+lS+BoD/qnOMs=";
sha256 = "sha256-6IaN189cV/ORP77zrjdcCPwPzNR/W6JmrZXVasCx8MQ=";
};
x86_64-darwin = {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
sha256 = "sha256-x/HL73Fao11GVj7uMFpx4uOKv8Gmiy1PEgee2sP1fvg=";
sha256 = "sha256-XrlajKT3GLjfj800mULj9iwkF9Bvx9Rlz56K6welq2U=";
};
x86_64-linux = {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
sha256 = "sha256-QqyymPkeRcedK75O9S0zO8DrUmPKuC7Mp4SbXT+QM9I=";
sha256 = "sha256-yr7PtBUBE0tB0giAE8aQCNJvxS/tMzlLWpJ3NyosQZk=";
};
}.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported.");

View File

@ -23,8 +23,8 @@
assert region == "Global" || region == "EU";
let
kyodialog_version = "9.2";
date = "20220928";
kyodialog_version = "9.3";
date = "20230720";
in
stdenv.mkDerivation rec {
pname = "cups-kyodialog";
@ -33,11 +33,15 @@ stdenv.mkDerivation rec {
dontStrip = true;
src = fetchzip {
# Steps to find the release download URL:
# 1. Go to https://www.kyoceradocumentsolutions.us/en/support/downloads.html
# 2. Search for printer model, e.g. "TASKalfa 6053ci"
# 3. Locate e.g. "Linux Print Driver (9.3)" in the list
urls = [
"https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/KyoceraLinuxPackages_${date}_tar_gz.download.gz"
"https://web.archive.org/web/20221122230412/https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/KyoceraLinuxPackages_${date}_tar_gz.download.gz"
"https://web.archive.org/web/20231021143259/https://www.kyoceradocumentsolutions.us/content/download-center-americas/us/drivers/drivers/KyoceraLinuxPackages_${date}_tar_gz.download.gz"
];
sha256 = "sha256-WCHuAQO2T6S8JtRsI2Yf/ypeCLMH365Ax/qX+Ah2s3k=";
hash = "sha256-3h2acOmaQIiqe2Fd9QiqEfre5TrxzRrll6UlUruwj1o=";
extension = "tar.gz";
stripRoot = false;
postFetch = ''

View File

@ -5,8 +5,8 @@
, buildWebExtension ? false
}:
let
version = "1.5.8";
gitHash = "544edce";
version = "1.6.0";
gitHash = "ffe6bb1";
in
buildNpmPackage rec {
pname = "vencord";
@ -16,7 +16,7 @@ buildNpmPackage rec {
owner = "Vendicated";
repo = "Vencord";
rev = "v${version}";
hash = "sha256-cJ+8CKCET7Z2MebyrW5OQr50tvbDM3mkvEQQm3zSbdU=";
hash = "sha256-t4+8ybPzqcCtTSukBBgvbD7HiKG4K51WPVnJg0RQbs8=";
};
ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: {
@ -34,7 +34,7 @@ buildNpmPackage rec {
npmRebuildFlags = [ "|| true" ];
makeCacheWritable = true;
npmDepsHash = "sha256-JeJjjrCfJMuxP9sVVkKJQ7bRCGu0jbGfiw78jS0r2Sg=";
npmDepsHash = "sha256-H2f6xdAa7fNETbQhIv+InCB7+O4nq0bx+RILjGjqXdY=";
npmFlags = [ "--legacy-peer-deps" ];
npmBuildScript = if buildWebExtension then "buildWeb" else "build";
npmBuildFlags = [ "--" "--standalone" "--disable-updater" ];

View File

@ -1,12 +1,12 @@
{
"name": "vencord",
"version": "1.5.8",
"version": "1.6.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "vencord",
"version": "1.5.8",
"version": "1.6.0",
"license": "GPL-3.0-or-later",
"dependencies": {
"@sapphi-red/web-noise-suppressor": "0.3.3",
@ -694,9 +694,9 @@
}
},
"node_modules/@eslint-community/regexpp": {
"version": "4.9.1",
"resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.1.tgz",
"integrity": "sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==",
"version": "4.10.0",
"resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
"integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",
"dev": true,
"engines": {
"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@ -893,10 +893,13 @@
"dev": true
},
"node_modules/@types/node": {
"version": "18.18.6",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.6.tgz",
"integrity": "sha512-wf3Vz+jCmOQ2HV1YUJuCWdL64adYxumkrxtc+H1VUQlnQI04+5HtH+qZCOE21lBE7gIrt+CwX2Wv8Acrw5Ak6w==",
"dev": true
"version": "18.18.7",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.7.tgz",
"integrity": "sha512-bw+lEsxis6eqJYW8Ql6+yTqkE6RuFtsQPSe5JxXbqYRFQEER5aJA9a5UH9igqDWm3X4iLHIKOHlnAXLM4mi7uQ==",
"dev": true,
"dependencies": {
"undici-types": "~5.26.4"
}
},
"node_modules/@types/normalize-package-data": {
"version": "2.4.3",
@ -911,9 +914,9 @@
"dev": true
},
"node_modules/@types/react": {
"version": "18.2.31",
"resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.31.tgz",
"integrity": "sha512-c2UnPv548q+5DFh03y8lEDeMfDwBn9G3dRwfkrxQMo/dOtRHUUO57k6pHvBIfH/VF4Nh+98mZ5aaSe+2echD5g==",
"version": "18.2.33",
"resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.33.tgz",
"integrity": "sha512-v+I7S+hu3PIBoVkKGpSYYpiBT1ijqEzWpzQD62/jm4K74hPpSP7FF9BnKG6+fg2+62weJYkkBWDJlZt5JO/9hg==",
"dev": true,
"dependencies": {
"@types/prop-types": "*",
@ -5549,6 +5552,12 @@
"through": "^2.3.8"
}
},
"node_modules/undici-types": {
"version": "5.26.5",
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
"integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
"dev": true
},
"node_modules/union-value": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "elasticmq-server";
version = "1.4.4";
version = "1.4.5";
src = fetchurl {
url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${finalAttrs.pname}-${finalAttrs.version}.jar";
sha256 = "sha256-qqMYmAIi+lWR6LHnwk4u6qqjhNStLRzXG7cWu3XknLM=";
sha256 = "sha256-ep/Je83rUE2mcRqIBbgNH+7uFYf0EoHuRo7JOgT2aIs=";
};
# don't do anything?

View File

@ -6,13 +6,13 @@
buildGo121Module rec {
pname = "ferretdb";
version = "1.12.1";
version = "1.13.0";
src = fetchFromGitHub {
owner = "FerretDB";
repo = "FerretDB";
rev = "v${version}";
hash = "sha256-3fLTiI13Mm+G6EEEOzCuJ9KVebCq5O54hyH6JiCRRL8=";
hash = "sha256-D1iMYh76a9H38tiZWByuJZrABWfjQFCkyxtbtLM/DMw=";
};
postPatch = ''
@ -20,7 +20,7 @@ buildGo121Module rec {
echo nixpkgs > build/version/package.txt
'';
vendorHash = "sha256-l45KFDpqprBWnsVRhOJkCWolZapArRvjUb52R5hc5zs=";
vendorHash = "sha256-WrnACseWo+bLn0IJhGY/DFsrMFAyy7J02cjO4FvE2xA=";
CGO_ENABLED = 0;

View File

@ -8,19 +8,15 @@
, libosmo-netif
}:
let
inherit (stdenv) isLinux;
in
stdenv.mkDerivation rec {
pname = "osmo-bts";
version = "1.7.0";
version = "1.7.1";
src = fetchFromGitHub {
owner = "osmocom";
repo = "osmo-bts";
rev = version;
hash = "sha256-tg6SxTSmPAkmoWsA0U69/EESlziR4cnq/+PWLavS3mk=";
hash = "sha256-Y972aa98bNU3IhuGMV80nh4ZjQKUdK6of1Q8H75Ips8=";
};
postPatch = ''

View File

@ -0,0 +1,45 @@
{ lib
, fetchzip
, nixosTests
, stdenv
, mecab
, postgresql
}:
stdenv.mkDerivation rec {
pname = "tsja";
version = "0.5.0";
src = fetchzip {
url = "https://www.amris.jp/tsja/tsja-${version}.tar.xz";
hash = "sha256-h59UhUG/7biN8NaDiGK6kXDqfhR9uMzt8CpwbJ+PpEM=";
};
postPatch = ''
substituteInPlace Makefile \
--replace /usr/local/pgsql ${postgresql} \
--replace -L/usr/local/lib "" \
--replace -I/usr/local/include ""
substituteInPlace tsja.c --replace /usr/local/lib/mecab ${mecab}/lib/mecab
'';
buildInputs = [ mecab postgresql ];
installPhase = ''
mkdir -p $out/lib $out/share/postgresql/extension
mv libtsja.so $out/lib
mv dbinit_libtsja.txt $out/share/postgresql/extension/libtsja_dbinit.sql
'';
passthru.tests.tsja = nixosTests.tsja;
meta = with lib; {
description = "PostgreSQL extension implementing Japanese text search";
homepage = "https://www.amris.jp/tsja/index.html";
maintainers = with maintainers; [ chayleaf ];
# GNU-specific linker options are used
platforms = platforms.gnu;
license = licenses.gpl2Only;
};
}

View File

@ -87,5 +87,7 @@ self: super: {
rum = super.callPackage ./ext/rum.nix { };
tsja = super.callPackage ./ext/tsja.nix { };
wal2json = super.callPackage ./ext/wal2json.nix { };
}

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "exoscale-cli";
version = "1.74.2";
version = "1.74.3";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-Xssc8T4y8ZaFqOukAJkrKPSUBM0uTlGkI3M92XNLalk=";
sha256 = "sha256-upnwaY++tUg4LcuD/BMSvvM2bo/95OP+SUK/aOiq1Oo=";
};
vendorHash = null;

View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "qovery-cli";
version = "0.73.0";
version = "0.74.2";
src = fetchFromGitHub {
owner = "Qovery";
repo = "qovery-cli";
rev = "refs/tags/v${version}";
hash = "sha256-Iu1ZgcjNDIYbgQMzt88vOyYKrKujMY196MV6O//Pg6E=";
hash = "sha256-9cC+T9jIRqD/omUUZrrRLu6FIo/oz8wCx9D76G94saE=";
};
vendorHash = "sha256-QMuaM4u8y90WCbC/V6StPGK9uOm52LVQrLakgm3viP8=";
vendorHash = "sha256-ilEG1relXYEFPR++oq35qcvnIcXkP4HRAjqxYr3U3XM=";
nativeBuildInputs = [
installShellFiles

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "gcsfuse";
version = "1.1.0";
version = "1.2.0";
src = fetchFromGitHub {
owner = "googlecloudplatform";
repo = "gcsfuse";
rev = "v${version}";
hash = "sha256-fMKFQheFlSwz4ik1tgLheZGkS55LHq3nncOmvgY/TqM=";
hash = "sha256-tc3+OHDjsA2OC9YvuOXZMaysKot8O3+qNoymzF2PnwA=";
};
vendorHash = "sha256-bgZgYbQN6Dg4uHp29tazJ9un9fR1o9mYp8R8ZHtAs9Q=";
vendorHash = "sha256-9pVdoeRyhhxOX3jLZVlx+5eHfP5iu0x40wnpV0xq3Z0=";
subPackages = [ "." "tools/mount_gcsfuse" ];

View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "fuc";
version = "1.1.8";
version = "1.1.9";
src = fetchFromGitHub {
owner = "SUPERCILEX";
repo = "fuc";
rev = version;
hash = "sha256-jVJhV9uy49hWmBw8LVmrid/DswbdD/SOtDc1tZgBQnk=";
hash = "sha256-4yksr2gilR7Ec2sRzGsGmOgbRSQJR/5fDofZM4sRxDg=";
};
cargoHash = "sha256-94NdaJfIcTB6o4+iZXvuqm0OlAQrChGZEy2E7/yMxqE=";
cargoHash = "sha256-U/LABtCtpop+MXAceE93FKtf1FfgLuVIYqqXtd0NckQ=";
RUSTC_BOOTSTRAP = 1;

View File

@ -14,6 +14,7 @@
, libsmartcols
, libsolv
, libxml2
, pcre2
, rpm
, sdbus-cpp
, sqlite
@ -24,13 +25,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dnf5";
version = "5.1.4";
version = "5.1.6";
src = fetchFromGitHub {
owner = "rpm-software-management";
repo = "dnf5";
rev = finalAttrs.version;
hash = "sha256-zQK7RRn2C/6Avu5oPqSW7KVv6JT3s2hrcgBRkP6055U=";
hash = "sha256-yIv29mwCBk2H1HjJr2IYm/1eZU379jTNEuTuaoIu4TA=";
};
nativeBuildInputs = [ cmake createrepo_c gettext help2man pkg-config ];
@ -43,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
libsmartcols
libsolv
libxml2
pcre2.dev
rpm
sdbus-cpp
sqlite
@ -61,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
"-DWITH_TESTS=OFF"
# TODO: fix man installation paths
"-DWITH_MAN=OFF"
"-DWITH_PLUGIN_RHSM=OFF" # Red Hat Subscription Manager plugin
# the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly
# (setting it to an absolute path causes include files to go to $out/$out/include,
# because the absolute path is interpreted with root at $out).
@ -83,8 +86,10 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "Next-generation RPM package management system";
homepage = "https://github.com/rpm-software-management/dnf5";
changelog = "https://github.com/rpm-software-management/dnf5/releases/tag/${version}";
license = licenses.gpl2Plus;
maintainers = with lib.maintainers; [ malt3 ];
mainProgram = "dnf5";
platforms = platforms.linux ++ platforms.darwin;
};
})

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2023-10-24";
version = "2023-10-26";
src = fetchFromGitLab {
owner = "exploit-database";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-F3UPg7wBpm1iK2hZ9YOC4bRsvGHn7j4U5y4w7qpF+tM=";
hash = "sha256-P+T3TM2MeHaN+ApgOMEFmyWv+AzQshVUfhbI+n/vozs=";
};
nativeBuildInputs = [

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "nuclei";
version = "3.0.1";
version = "3.0.2";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-5Z40wc8ihN2UR3DyMCaD0MOKpgbUQX0OJMyZw2gVNYM=";
hash = "sha256-vttAIkQzZKkqKer/rnX9irNev3i7y8kfTqO4LH1xANo=";
};
vendorHash = "sha256-CaeYAw7QU/KySFDSkUr4oHrG3wyPHxty3KCZ6zlPqIk=";
vendorHash = "sha256-cEp/bMOWoAfpFoi9zVcSoYyPwL9hVnoOzRzCPacrSiM=";
subPackages = [
"cmd/nuclei/"

View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "trufflehog";
version = "3.60.3";
version = "3.60.4";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
rev = "refs/tags/v${version}";
hash = "sha256-864bq0LK2lRWmbQ7JTGc9gtMsTnoKMLkjyEdTNUBFRg=";
hash = "sha256-c+25Bnc3Fi0tq5CSACUxhio3llfJlMSm51eYiGajOfo=";
};
vendorHash = "sha256-TNxZatI9l+dX2WI7SnTH975yrgyuB4VjTJOkaSr5mxc=";

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kmon";
version = "1.6.3";
version = "1.6.4";
src = fetchFromGitHub {
owner = "orhun";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lB6vJqb6/Qwj3odCJzyQ0+xEl5V/ZPj9cAJGNfiYAOY=";
sha256 = "sha256-61HLWSGACnonjp/n14sVo8DdVOUbOpIQHpPL0PmKmpI=";
};
cargoSha256 = "sha256-Ff5vGc90VxmyKQSsjUfoI1NL95DmD1SJx3eC1SP6rt4=";
cargoSha256 = "sha256-yxpM4aUPVfaMuYwj50C/Uwh/diraJLON1mNjuYJR6Ck=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -7,7 +7,8 @@ stdenv.mkDerivation (finalAttrs: ((mecab-base finalAttrs) // {
pname = "mecab";
postInstall = ''
sed -i 's|^dicdir = .*$|dicdir = ${mecab-ipadic}|' "$out/etc/mecabrc"
mkdir -p $out/lib/mecab/dic
ln -s ${mecab-ipadic} $out/lib/mecab/dic/ipadic
'';
meta = with lib; {

View File

@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ugrep";
version = "4.3.0";
version = "4.3.1";
src = fetchFromGitHub {
owner = "Genivia";
repo = "ugrep";
rev = "v${finalAttrs.version}";
hash = "sha256-X2tRjQ948fnyCn7vQbpmDqktMfP4A/s7bVfrKDed5nw=";
hash = "sha256-Us1HZ2MXYgJcEyhdE9tFoVcuqirgVDi5Qbu+I35ItpU=";
};
buildInputs = [

View File

@ -642,6 +642,8 @@ with pkgs;
efficient-compression-tool = callPackage ../tools/compression/efficient-compression-tool { };
elektroid = callPackage ../applications/audio/elektroid { };
eludris = callPackage ../tools/misc/eludris {
inherit (darwin.apple_sdk.frameworks) Security;
};

View File

@ -5980,6 +5980,8 @@ self: super: with self; {
krakenex = callPackage ../development/python-modules/krakenex { };
krfzf-py = callPackage ../development/python-modules/krfzf-py { };
kubernetes = callPackage ../development/python-modules/kubernetes { };
l18n = callPackage ../development/python-modules/l18n { };