movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-09-30 18:03:29 +00:00 • committed by GitHub
commit e1d2f74dee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
224 changed files with 871 additions and 556 deletions
Download patch file Download diff file Expand all files Collapse all files

7
nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
View file

@ -767,6 +767,13 @@
grants access to the hardware. grants access to the hardware.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The Wordpress module got support for installing language packs
through
<literal>services.wordpress.sites.&lt;site&gt;.languages</literal>.
</para>
</listitem>
<listitem> <listitem>
<para> <para>
There is a new module for the <literal>thunar</literal> There is a new module for the <literal>thunar</literal>

2
nixos/doc/manual/release-notes/rl-2211.section.md
View file

@ -254,6 +254,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
- There is a new module for AMD SEV CPU functionality, which grants access to the hardware. - There is a new module for AMD SEV CPU functionality, which grants access to the hardware.
- The Wordpress module got support for installing language packs through `services.wordpress.sites.<site>.languages`.
- There is a new module for the `thunar` program (the Xfce file manager), which depends on the `xfconf` dbus service, and also has a dbus service and a systemd unit. The option `services.xserver.desktopManager.xfce.thunarPlugins` has been renamed to `programs.thunar.plugins`, and in a future release it may be removed. - There is a new module for the `thunar` program (the Xfce file manager), which depends on the `xfconf` dbus service, and also has a dbus service and a systemd unit. The option `services.xserver.desktopManager.xfce.thunarPlugins` has been renamed to `programs.thunar.plugins`, and in a future release it may be removed.
- There is a new module for the `xfconf` program (the Xfce configuration storage system), which has a dbus service. - There is a new module for the `xfconf` program (the Xfce configuration storage system), which has a dbus service.

29
nixos/modules/services/home-automation/home-assistant.nix
View file

@ -415,7 +415,7 @@ in {
# Empty string first, so we will never accidentally have an empty capability bounding set # Empty string first, so we will never accidentally have an empty capability bounding set
# https://github.com/NixOS/nixpkgs/issues/120617#issuecomment-830685115 # https://github.com/NixOS/nixpkgs/issues/120617#issuecomment-830685115
"" ""
] ++ lib.optionals (builtins.any useComponent [ "bluetooth" "bluetooth_le_tracker" "bluetooth_tracker" "eq3btsmart" "fjaraskupan" "govee_ble" "homekit_controller" "inkbird" "moat" "sensorpush" "switchbot" "xiaomi_ble" ]) [ ] ++ lib.optionals (builtins.any useComponent componentsUsingBluetooth) [
# Required for interaction with hci devices and bluetooth sockets, identified by bluetooth-adapters dependency # Required for interaction with hci devices and bluetooth sockets, identified by bluetooth-adapters dependency
# https://www.home-assistant.io/integrations/bluetooth_le_tracker/#rootless-setup-on-core-installs # https://www.home-assistant.io/integrations/bluetooth_le_tracker/#rootless-setup-on-core-installs
"CAP_NET_ADMIN" "CAP_NET_ADMIN"
@ -432,8 +432,30 @@ in {
]); ]);
componentsUsingBluetooth = [ componentsUsingBluetooth = [
# Components that require the AF_BLUETOOTH address family # Components that require the AF_BLUETOOTH address family
"bluetooth_tracker" "august"
"bluemaestro"
"bluetooth"
"bluetooth_le_tracker" "bluetooth_le_tracker"
"bluetooth_tracker"
"bthome"
"default_config"
"eq3btsmart"
"esphome"
"fjaraskupan"
"govee_ble"
"homekit_controller"
"inkbird"
"led_ble"
"melnor"
"moat"
"qingping"
"sensorpro"
"sensorpush"
"switchbot"
"thermobeacon"
"thermopro"
"xiaomi_ble"
"yalexs_ble"
]; ];
componentsUsingPing = [ componentsUsingPing = [
# Components that require the capset syscall for the ping wrapper # Components that require the capset syscall for the ping wrapper
@ -450,7 +472,6 @@ in {
# mostly the ones using config flows already. # mostly the ones using config flows already.
"acer_projector" "acer_projector"
"alarmdecoder" "alarmdecoder"
"arduino"
"blackbird" "blackbird"
"deconz" "deconz"
"dsmr" "dsmr"
@ -464,7 +485,6 @@ in {
"insteon" "insteon"
"kwb" "kwb"
"lacrosse" "lacrosse"
"mhz19"
"modbus" "modbus"
"modem_callerid" "modem_callerid"
"mysensors" "mysensors"
@ -480,7 +500,6 @@ in {
"usb" "usb"
"velbus" "velbus"
"w800rf32" "w800rf32"
"xbee"
"zha" "zha"
"zwave" "zwave"
"zwave_js" "zwave_js"

29
nixos/modules/services/web-apps/wordpress.nix
View file

@ -30,9 +30,10 @@ let
# requests that look like: https://example.com/wp-content//nix/store/...plugin/path/some-file.js # requests that look like: https://example.com/wp-content//nix/store/...plugin/path/some-file.js
# Since hard linking directories is not allowed, copying is the next best thing. # Since hard linking directories is not allowed, copying is the next best thing.
# copy additional plugin(s) and theme(s) # copy additional plugin(s), theme(s) and language(s)
${concatMapStringsSep "\n" (theme: "cp -r ${theme} $out/share/wordpress/wp-content/themes/${theme.name}") cfg.themes} ${concatMapStringsSep "\n" (theme: "cp -r ${theme} $out/share/wordpress/wp-content/themes/${theme.name}") cfg.themes}
${concatMapStringsSep "\n" (plugin: "cp -r ${plugin} $out/share/wordpress/wp-content/plugins/${plugin.name}") cfg.plugins} ${concatMapStringsSep "\n" (plugin: "cp -r ${plugin} $out/share/wordpress/wp-content/plugins/${plugin.name}") cfg.plugins}
${concatMapStringsSep "\n" (language: "cp -r ${language} $out/share/wordpress/wp-content/languages/") cfg.languages}
''; '';
}; };
@ -154,6 +155,32 @@ let
''; '';
}; };
languages = mkOption {
type = types.listOf types.path;
default = [];
description = lib.mdDoc ''
List of path(s) to respective language(s) which are copied from the 'languages' directory.
'';
example = literalExpression ''
[(
# Let's package the German language.
# For other languages try to replace language and country code in the download URL with your desired one.
# Reference https://translate.wordpress.org for available translations and
# codes.
language-de = pkgs.stdenv.mkDerivation {
name = "language-de";
src = pkgs.fetchurl {
url = "https://de.wordpress.org/wordpress-''${pkgs.wordpress.version}-de_DE.tar.gz";
# Name is required to invalidate the hash when wordpress is updated
name = "wordpress-''${pkgs.wordpress.version}-language-de"
sha256 = "sha256-dlas0rXTSV4JAl8f/UyMbig57yURRYRhTMtJwF9g8h0=";
};
installPhase = "mkdir -p $out; cp -r ./wp-content/languages/* $out/";
};
)];
'';
};
database = { database = {
host = mkOption { host = mkOption {
type = types.str; type = types.str;

1
nixos/tests/all-tests.nix
View file

@ -317,6 +317,7 @@ in {
ksm = handleTest ./ksm.nix {}; ksm = handleTest ./ksm.nix {};
kthxbye = handleTest ./kthxbye.nix {}; kthxbye = handleTest ./kthxbye.nix {};
kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {}; kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {};
ladybird = handleTest ./ladybird.nix {};
languagetool = handleTest ./languagetool.nix {}; languagetool = handleTest ./languagetool.nix {};
latestKernel.login = handleTest ./login.nix { latestKernel = true; }; latestKernel.login = handleTest ./login.nix { latestKernel = true; };
leaps = handleTest ./leaps.nix {}; leaps = handleTest ./leaps.nix {};

30
nixos/tests/ladybird.nix Normal file
View file

@ -0,0 +1,30 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "ladybird";
meta = with pkgs.lib.maintainers; {
maintainers = [ fgaz ];
};
nodes.machine = { config, pkgs, ... }: {
imports = [
./common/x11.nix
];
services.xserver.enable = true;
environment.systemPackages = [
pkgs.ladybird
];
};
enableOCR = true;
testScript =
''
machine.wait_for_x()
machine.succeed("echo '<!DOCTYPE html><html><body><h1>Hello world</h1></body></html>' > page.html")
machine.execute("ladybird file://$(pwd)/page.html >&2 &")
machine.wait_for_window("Ladybird")
machine.sleep(5)
machine.wait_for_text("Hello world")
machine.screenshot("screen")
'';
})

1
pkgs/applications/audio/furnace/default.nix
View file

@ -81,7 +81,6 @@ stdenv.mkDerivation rec {
passthru = { passthru = {
updateScript = gitUpdater { updateScript = gitUpdater {
inherit pname version;
rev-prefix = "v"; rev-prefix = "v";
}; };
tests.version = testers.testVersion { tests.version = testers.testVersion {

2
pkgs/applications/audio/r128gain/default.nix
View file

@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec {
# sandbox to be disabled. # sandbox to be disabled.
doCheck = false; doCheck = false;
passthru.updateScript = gitUpdater { inherit pname version; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
description = "Fast audio loudness scanner & tagger (ReplayGain v2 / R128)"; description = "Fast audio loudness scanner & tagger (ReplayGain v2 / R128)";

4
pkgs/applications/blockchains/ergo/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ergo"; pname = "ergo";
version = "4.0.45"; version = "4.0.103";
src = fetchurl { src = fetchurl {
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
sha256 = "sha256-YUcBNGUs7oBiY7zkRSQxT4/t3DfvamcQPVI3h/sonHM="; sha256 = "sha256-9vGPHNq76BSdqN1z0KzDOzeMOHAUKnA3Jpx+I5+FOFM=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

4
pkgs/applications/editors/notepad-next/default.nix
View file

@ -2,13 +2,13 @@
mkDerivation rec { mkDerivation rec {
pname = "notepad-next"; pname = "notepad-next";
version = "0.5.4"; version = "0.5.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dail8859"; owner = "dail8859";
repo = "NotepadNext"; repo = "NotepadNext";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-kEqoL4S/eHsbFoYxNlrv+Wq6acrHQm/qMfrARzl+BYA="; sha256 = "sha256-ZjDvAN/NNz1GY7/0eKlxogYPg2Ba7Ncg6TXyKQEdWrU=";
# External dependencies - https://github.com/dail8859/NotepadNext/issues/135 # External dependencies - https://github.com/dail8859/NotepadNext/issues/135
fetchSubmodules = true; fetchSubmodules = true;
}; };

4
pkgs/applications/misc/bottles/default.nix
View file

@ -96,9 +96,7 @@ python3Packages.buildPythonApplication rec {
makeWrapperArgs+=("''${gappsWrapperArgs[@]}") makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
''; '';
passthru.updateScript = gitUpdater { passthru.updateScript = gitUpdater { };
inherit pname version;
};
meta = with lib; { meta = with lib; {
description = "An easy-to-use wineprefix manager"; description = "An easy-to-use wineprefix manager";

4
pkgs/applications/misc/dasel/default.nix
View file

@ -5,13 +5,13 @@
buildGoModule rec { buildGoModule rec {
pname = "dasel"; pname = "dasel";
version = "1.27.0"; version = "1.27.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TomWright"; owner = "TomWright";
repo = "dasel"; repo = "dasel";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-bVAW8DrLqZKm9/iLleFxIMVkxaqhgdKwQUSEPpYhwt8="; sha256 = "sha256-ebz6JUifkw0FQ88dKvIYwC83zuzGsXFaN9PdGDxHmJc=";
}; };
vendorSha256 = "sha256-zli9SEBU6n0JusAquqb9+O2W4yPZS7zmC5PCebVSeIA="; vendorSha256 = "sha256-zli9SEBU6n0JusAquqb9+O2W4yPZS7zmC5PCebVSeIA=";

1
pkgs/applications/misc/diffuse/default.nix
View file

@ -53,7 +53,6 @@ python3.pkgs.buildPythonApplication rec {
passthru = { passthru = {
updateScript = gitUpdater { updateScript = gitUpdater {
inherit pname version;
rev-prefix = "v"; rev-prefix = "v";
}; };
}; };

2
pkgs/applications/misc/fbmenugen/default.nix
View file

@ -66,7 +66,7 @@ perlPackages.buildPerlPackage rec {
wrapProgram "$out/bin/${pname}" --prefix PERL5LIB : "$PERL5LIB" wrapProgram "$out/bin/${pname}" --prefix PERL5LIB : "$PERL5LIB"
''; '';
passthru.updateScript = gitUpdater { inherit pname version; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/trizen/fbmenugen"; homepage = "https://github.com/trizen/fbmenugen";

4
pkgs/applications/misc/fluidd/default.nix
View file

@ -2,12 +2,12 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "fluidd"; pname = "fluidd";
version = "1.20.0"; version = "1.20.1";
src = fetchurl { src = fetchurl {
name = "fluidd-v${version}.zip"; name = "fluidd-v${version}.zip";
url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip";
sha256 = "sha256-zDCvRwAtjBbBOa5D1k7khZGXeql5COMlWMi/dpwiiYM="; sha256 = "sha256-CA0C3yERT6r33GdtCZ7UZheEhDL4uzjAvcuhZeZQLvg=";
}; };
nativeBuildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];

1
pkgs/applications/misc/gnome-firmware/default.nix
View file

@ -55,7 +55,6 @@ stdenv.mkDerivation rec {
]; ];
passthru.updateScript = gitUpdater { passthru.updateScript = gitUpdater {
inherit pname version;
ignoredVersions = "(alpha|beta|rc).*"; ignoredVersions = "(alpha|beta|rc).*";
}; };

1
pkgs/applications/misc/pwsafe/default.nix
View file

@ -53,7 +53,6 @@ stdenv.mkDerivation rec {
installFlags = [ "PREFIX=${placeholder "out"}" ]; installFlags = [ "PREFIX=${placeholder "out"}" ];
passthru.updateScript = gitUpdater { passthru.updateScript = gitUpdater {
inherit pname version;
ignoredVersions = "^([^1]|1[^.])"; # ignore anything other than 1.x ignoredVersions = "^([^1]|1[^.])"; # ignore anything other than 1.x
url = src.gitRepoUrl; url = src.gitRepoUrl;
}; };

6
pkgs/applications/misc/rusty-psn/default.nix
View file

@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rusty-psn"; pname = "rusty-psn";
version = "0.1.2"; version = "0.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RainbowCookie32"; owner = "RainbowCookie32";
repo = "rusty-psn"; repo = "rusty-psn";
rev = "v${version}"; rev = "v${version}";
sha256 = "14li5fsaj4l5al6lcxy07g3gzmi0l3cyiczq44q7clq4myhykhhb"; sha256 = "sha256-BsbuEsW6cQbWg8BLtEBnjoCfcUCy1xWz9u0wBa8BKtA=";
}; };
cargoSha256 = "0kjaq3ik3lwaz7rjb5jaxavpahzp33j7vln3zyifql7j7sbr300f"; cargoSha256 = "sha256-TD5du7I6Hw1PC8s9NI19jYCXlaZMnsdVj/a0q+M8Raw=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

1
pkgs/applications/misc/sticky/default.nix
View file

@ -76,7 +76,6 @@ python3.pkgs.buildPythonApplication rec {
passthru = { passthru = {
updateScript = gitUpdater { updateScript = gitUpdater {
inherit pname version;
ignoredVersions = ''master.*''; ignoredVersions = ''master.*'';
}; };
}; };

2
pkgs/applications/misc/xdgmenumaker/default.nix
View file

@ -52,7 +52,7 @@ python3Packages.buildPythonApplication rec {
makeWrapperArgs+=("''${gappsWrapperArgs[@]}") makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
''; '';
passthru.updateScript = gitUpdater {inherit pname version; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
description = "Command line tool that generates XDG menus for several window managers"; description = "Command line tool that generates XDG menus for several window managers";

54
pkgs/applications/networking/browsers/ladybird/default.nix
View file

@ -5,28 +5,28 @@
, ninja , ninja
, unzip , unzip
, wrapQtAppsHook , wrapQtAppsHook
, makeWrapper
, qtbase , qtbase
, qttools , qttools
, nixosTests
}: }:
let serenity = fetchFromGitHub { let serenity = fetchFromGitHub {
owner = "SerenityOS"; owner = "SerenityOS";
repo = "serenity"; repo = "serenity";
rev = "094ba6525f0217f3b8d5e467cef326caeb659e8a"; rev = "a0f3e2c9a2b82117aa7c1a3444ad0d31baa070d5";
hash = "sha256-IHXe2Td9iRSL1oQVwL2gZHxEM2ID4SghZwK6ewjFV1Y="; hash = "sha256-8Xde59ZfdkTD39mYSv0lfFjBHFDWTUwfozE+Q9Yq6C8=";
}; };
in gcc11Stdenv.mkDerivation { in gcc11Stdenv.mkDerivation {
pname = "ladybird"; pname = "ladybird";
version = "unstable-2022-07-20"; version = "unstable-2022-09-29";
# Remember to update `serenity` too! # Remember to update `serenity` too!
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "awesomekling"; owner = "SerenityOS";
repo = "ladybird"; repo = "ladybird";
rev = "9e3a1f47d484cee6f23c4dae6c51750af155a8fc"; rev = "d69ad7332477de33bfd1963026e057d55c6f222d";
hash = "sha256-1cPWpPvjM/VcVUEf2k+MvGvTgZ3Fc4LFHZCLh1wU78Y="; hash = "sha256-XQj2Bohk8F6dGCAManOmmDP5b/SqEeZXZbLDYPfvi2E=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -34,7 +34,6 @@ in gcc11Stdenv.mkDerivation {
ninja ninja
unzip unzip
wrapQtAppsHook wrapQtAppsHook
makeWrapper
]; ];
buildInputs = [ buildInputs = [
@ -48,39 +47,9 @@ in gcc11Stdenv.mkDerivation {
"-DENABLE_UNICODE_DATABASE_DOWNLOAD=false" "-DENABLE_UNICODE_DATABASE_DOWNLOAD=false"
]; ];
NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; passthru.tests = {
nixosTest = nixosTests.ladybird;
# Upstream install rules are missing };
# https://github.com/awesomekling/ladybird/issues/36
installPhase = ''
runHook preInstall
install -Dm755 ladybird $out/bin/ladybird
mkdir -p $out/lib/ladybird
cp -d _deps/lagom-build/*.so* $out/lib/ladybird/
runHook postInstall
'';
# Patch rpaths
# https://github.com/awesomekling/ladybird/issues/36
preFixup = ''
for f in $out/bin/ladybird $out/lib/ladybird/*.so; do
old_rpath=$(patchelf --print-rpath "$f")
# Remove reference to libraries from build directory
rpath_without_build=$(sed -e 's@[^:]*/_deps/lagom-build:@@g' <<< $old_rpath)
# Add directory where we install those libraries
new_rpath=$out/lib/ladybird:$rpath_without_build
patchelf --set-rpath "$new_rpath" "$f"
done
'';
# According to the readme, the program needs access to the serenity sources
# at runtime
postFixup = ''
wrapProgram $out/bin/ladybird --set SERENITY_SOURCE_DIR "${serenity}"
'';
# Stripping results in a symbol lookup error
dontStrip = true;
meta = with lib; { meta = with lib; {
description = "A browser using the SerenityOS LibWeb engine with a Qt GUI"; description = "A browser using the SerenityOS LibWeb engine with a Qt GUI";
@ -88,7 +57,6 @@ in gcc11Stdenv.mkDerivation {
license = licenses.bsd2; license = licenses.bsd2;
maintainers = with maintainers; [ fgaz ]; maintainers = with maintainers; [ fgaz ];
# SerenityOS only works on x86, and can only be built on unix systems. # SerenityOS only works on x86, and can only be built on unix systems.
# We also use patchelf in preFixup, so we restrict that to linux only. platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
platforms = [ "x86_64-linux" "i686-linux" ];
}; };
} }

10
pkgs/applications/networking/browsers/librewolf/src.json
View file

@ -1,11 +1,11 @@
{ {
"packageVersion": "105.0-1", "packageVersion": "105.0.1-1",
"source": { "source": {
"rev": "105.0-1", "rev": "105.0.1-1",
"sha256": "0p3bcyyap8yjxha064klpjkhca6hdis3qgx15c4dh8wc3gr581f6" "sha256": "0a6vvf62xqxnqn0f87971nsnrr0xzakgjl4d655qhq9xn0apj8wg"
}, },
"firefox": { "firefox": {
"version": "105.0", "version": "105.0.1",
"sha512": "a48f323f874b538402630a9094daa83189b3ca319feddc80fd66d087eca13f21c8b2d85be9c29e948c18cb7c524adac44e135adcde4d4592738e104ae9c1a734" "sha512": "66ef7cd5028953e7da9d55e127135739c9d85be68ec633b71c52d6c9427edb0bd8a38504148484cd322adcefb57bfefe6e57cb15855f195508fe438864f4322b"
} }
} }

6
pkgs/applications/networking/cluster/kubeseal/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "kubeseal"; pname = "kubeseal";
version = "0.18.2"; version = "0.18.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bitnami-labs"; owner = "bitnami-labs";
repo = "sealed-secrets"; repo = "sealed-secrets";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-+5g51doZBJqNwsIvAZ7rsq6QhAMaWFjygzr+eAE+R8w="; sha256 = "sha256-Ij+NNaAq3woHze7o14WT3cqKYLD99dU8C6TUsdG2U54=";
}; };
vendorSha256 = "sha256-YC4ZSeObkilNvAu3StMDrnZQexVUFwVtX7ee/EPLTsE="; vendorSha256 = "sha256-Iry8ZE/HwZEnro7p36KTdy3phydA+fjM4EFg8DneSuA=";
subPackages = [ "cmd/kubeseal" ]; subPackages = [ "cmd/kubeseal" ];

6
pkgs/applications/networking/cluster/starboard/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "starboard"; pname = "starboard";
version = "0.15.8"; version = "0.15.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aquasecurity"; owner = "aquasecurity";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-AgAcN1KtMW7yHi12Gg1M3hu7DQA7WdWtY3qf4K7c1YA="; sha256 = "sha256-SuOfRLCEASgiLsy0xeuA1z55+vSMb4VGZuk+OVLSWJA=";
# populate values that require us to use git. By doing this in postFetch we # populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src. # can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true; leaveDotGit = true;
@ -20,7 +20,7 @@ buildGoModule rec {
find "$out" -name .git -print0 | xargs -0 rm -rf find "$out" -name .git -print0 | xargs -0 rm -rf
''; '';
}; };
vendorSha256 = "sha256-aQrKppIJOCTIDrKvtE6WTkQY8mfYzUh7mBKUd6z19E0="; vendorSha256 = "sha256-uTDeYzq8XyjHHXfPQzN/ipHfqsPweedKhQQ8CkvqKIM=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

4
pkgs/applications/networking/cluster/tilt/default.nix
View file

@ -5,13 +5,13 @@ buildGoModule rec {
/* Do not use "dev" as a version. If you do, Tilt will consider itself /* Do not use "dev" as a version. If you do, Tilt will consider itself
running in development environment and try to serve assets from the running in development environment and try to serve assets from the
source tree, which is not there once build completes. */ source tree, which is not there once build completes. */
version = "0.30.7"; version = "0.30.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tilt-dev"; owner = "tilt-dev";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-zYP9bn3wC5FJwCdDJEBunaEHoFhRKlH7Mec/Stvp76A="; sha256 = "sha256-dVaLeooTEiKYWp9CmEcSFOunLyJecB8jR9LIKRO8b9g=";
}; };
vendorSha256 = null; vendorSha256 = null;

1
pkgs/applications/networking/newsreaders/liferea/default.nix
View file

@ -71,7 +71,6 @@ stdenv.mkDerivation rec {
''; '';
passthru.updateScript = gitUpdater { passthru.updateScript = gitUpdater {
inherit pname version;
url = "https://github.com/lwindolf/${pname}"; url = "https://github.com/lwindolf/${pname}";
rev-prefix = "v"; rev-prefix = "v";
}; };

2
pkgs/applications/networking/remote/anydesk/default.nix
View file

@ -30,9 +30,7 @@ in stdenv.mkDerivation rec {
passthru = { passthru = {
updateScript = genericUpdater { updateScript = genericUpdater {
inherit pname version;
versionLister = writeShellScript "anydesk-versionLister" '' versionLister = writeShellScript "anydesk-versionLister" ''
echo "# Versions for $1:" >> "$2"
curl -s https://anydesk.com/en/downloads/linux \ curl -s https://anydesk.com/en/downloads/linux \
| grep "https://[a-z0-9._/-]*-amd64.tar.gz" -o \ | grep "https://[a-z0-9._/-]*-amd64.tar.gz" -o \
| uniq \ | uniq \

1
pkgs/applications/networking/shellhub-agent/default.nix
View file

@ -25,7 +25,6 @@ buildGoModule rec {
passthru = { passthru = {
updateScript = gitUpdater { updateScript = gitUpdater {
inherit pname version;
rev-prefix = "v"; rev-prefix = "v";
ignoredVersions = ".(rc|beta).*"; ignoredVersions = ".(rc|beta).*";
}; };

1
pkgs/applications/science/electronics/openboardview/default.nix
View file

@ -43,7 +43,6 @@ stdenv.mkDerivation rec {
''; '';
passthru.updateScript = gitUpdater { passthru.updateScript = gitUpdater {
inherit pname version;
ignoredVersions = ''.*\.90\..*''; ignoredVersions = ''.*\.90\..*'';
}; };

1
pkgs/applications/system/monitor/default.nix
View file

@ -76,7 +76,6 @@ stdenv.mkDerivation rec {
passthru = { passthru = {
updateScript = gitUpdater { updateScript = gitUpdater {
inherit pname version;
ignoredVersions = "ci.*"; ignoredVersions = "ci.*";
}; };
}; };

4
pkgs/applications/version-management/git-and-tools/fast-export/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fast-export"; pname = "fast-export";
version = "210917"; version = "220921";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "frej"; owner = "frej";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0xg8r9rbqv7mriraqxdks2mgj7j4c9gap3kc05y1kxi3nniywyd3"; sha256 = "sha256-8tAh17Cp1L0kyV5+HoFnh9mINCBNCNBv1gqsMd6U3FQ=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

2
pkgs/applications/version-management/git-review/default.nix
View file

@ -41,7 +41,7 @@ buildPythonApplication rec {
pythonImportsCheck = [ "git_review" ]; pythonImportsCheck = [ "git_review" ];
passthru.updateScript = gitUpdater { inherit pname version; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
description = "Tool to submit code to Gerrit"; description = "Tool to submit code to Gerrit";

1
pkgs/applications/version-management/gitqlient/default.nix
View file

@ -69,7 +69,6 @@ mkDerivation rec {
]; ];
passthru.updateScript = gitUpdater { passthru.updateScript = gitUpdater {
inherit pname version;
rev-prefix = "v"; rev-prefix = "v";
}; };

3
pkgs/applications/video/epgstation/default.nix
View file

@ -54,6 +54,9 @@ let
# Workaround for https://github.com/svanderburg/node2nix/issues/275 # Workaround for https://github.com/svanderburg/node2nix/issues/275
sed -i -e "s|#!/usr/bin/env node|#! ${nodejs}/bin/node|" node_modules/node-gyp-build/bin.js sed -i -e "s|#!/usr/bin/env node|#! ${nodejs}/bin/node|" node_modules/node-gyp-build/bin.js
# Optional typeorm dependency that does not build on aarch64-linux
rm -r node_modules/oracledb
find . -name package-lock.json -delete find . -name package-lock.json -delete
''; '';

4
pkgs/applications/video/epgstation/update.nix
View file

@ -15,8 +15,8 @@ let
attrPath = lib.toLower pname; attrPath = lib.toLower pname;
rev-prefix = "v"; rev-prefix = "v";
}; };
updateScript = builtins.elemAt updater 0; updateScript = builtins.elemAt updater.command 0;
updateArgs = map (lib.escapeShellArg) (builtins.tail updater); updateArgs = map (lib.escapeShellArg) (builtins.tail updater.command);
in writers.writeBash "update-epgstation" '' in writers.writeBash "update-epgstation" ''
set -euxo pipefail set -euxo pipefail

4
pkgs/applications/video/mirakurun/update.nix
View file

@ -17,8 +17,8 @@ let
# exclude prerelease versions # exclude prerelease versions
ignoredVersions = "-"; ignoredVersions = "-";
}; };
updateScript = builtins.elemAt updater 0; updateScript = builtins.elemAt updater.command 0;
updateArgs = map (lib.escapeShellArg) (builtins.tail updater); updateArgs = map (lib.escapeShellArg) (builtins.tail updater.command);
in writers.writeBash "update-mirakurun" '' in writers.writeBash "update-mirakurun" ''
set -euxo pipefail set -euxo pipefail

1
pkgs/applications/video/shotcut/default.nix
View file

@ -76,7 +76,6 @@ mkDerivation rec {
''; '';
passthru.updateScript = gitUpdater { passthru.updateScript = gitUpdater {
inherit pname version;
rev-prefix = "v"; rev-prefix = "v";
}; };

7
pkgs/applications/virtualization/lkl/default.nix
View file

@ -1,5 +1,8 @@
{ lib, stdenv, fetchFromGitHub, bc, python3, bison, flex, fuse, libarchive { lib, stdenv, fetchFromGitHub, bc, python3, bison, flex, fuse, libarchive
, buildPackages }: , buildPackages
, firewallSupport ? false
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lkl"; pname = "lkl";
@ -26,6 +29,8 @@ stdenv.mkDerivation rec {
# Fixup build with newer Linux headers: https://github.com/lkl/linux/pull/484 # Fixup build with newer Linux headers: https://github.com/lkl/linux/pull/484
sed '1i#include <linux/sockios.h>' -i tools/lkl/lib/hijack/xlate.c sed '1i#include <linux/sockios.h>' -i tools/lkl/lib/hijack/xlate.c
'' + lib.optionalString firewallSupport ''
cat ${./lkl-defconfig-enable-nftables} >> arch/lkl/configs/defconfig
''; '';
installPhase = '' installPhase = ''

155
pkgs/applications/virtualization/lkl/lkl-defconfig-enable-nftables Normal file
View file

@ -0,0 +1,155 @@
CONFIG_NETFILTER=y
CONFIG_NF_CONNTRACK=y
CONFIG_NF_LOG_NETDEV=y
CONFIG_NF_CONNTRACK_ZONES=y
CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CONNTRACK_TIMEOUT=y
CONFIG_NF_CONNTRACK_TIMESTAMP=y
CONFIG_NF_CONNTRACK_AMANDA=y
CONFIG_NF_CONNTRACK_FTP=y
CONFIG_NF_CONNTRACK_H323=y
CONFIG_NF_CONNTRACK_IRC=y
CONFIG_NF_CONNTRACK_NETBIOS_NS=y
CONFIG_NF_CONNTRACK_SNMP=y
CONFIG_NF_CONNTRACK_PPTP=y
CONFIG_NF_CONNTRACK_SANE=y
CONFIG_NF_CONNTRACK_SIP=y
CONFIG_NF_CONNTRACK_TFTP=y
CONFIG_NF_CT_NETLINK=y
CONFIG_NF_CT_NETLINK_TIMEOUT=y
CONFIG_NF_CT_NETLINK_HELPER=y
CONFIG_NETFILTER_NETLINK_GLUE_CT=y
CONFIG_NF_TABLES=y
CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_NUMGEN=y
CONFIG_NFT_CT=y
CONFIG_NFT_COUNTER=y
CONFIG_NFT_CONNLIMIT=y
CONFIG_NFT_LOG=y
CONFIG_NFT_LIMIT=y
CONFIG_NFT_MASQ=y
CONFIG_NFT_REDIR=y
CONFIG_NFT_NAT=y
CONFIG_NFT_TUNNEL=y
CONFIG_NFT_OBJREF=y
CONFIG_NFT_QUEUE=y
CONFIG_NFT_QUOTA=y
CONFIG_NFT_REJECT=y
CONFIG_NFT_COMPAT=y
CONFIG_NFT_HASH=y
CONFIG_NFT_FIB_INET=y
CONFIG_NFT_SOCKET=y
CONFIG_NFT_OSF=y
CONFIG_NFT_TPROXY=y
CONFIG_NFT_SYNPROXY=y
CONFIG_NFT_DUP_NETDEV=y
CONFIG_NFT_FWD_NETDEV=y
CONFIG_NFT_FIB_NETDEV=y
CONFIG_NF_FLOW_TABLE_INET=y
CONFIG_NF_FLOW_TABLE=y
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=y
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
CONFIG_NETFILTER_XT_TARGET_DSCP=y
CONFIG_NETFILTER_XT_TARGET_HMARK=y
CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
CONFIG_NETFILTER_XT_TARGET_LOG=y
CONFIG_NETFILTER_XT_TARGET_MARK=y
CONFIG_NETFILTER_XT_TARGET_NFLOG=y
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
CONFIG_NETFILTER_XT_TARGET_NOTRACK=y
CONFIG_NETFILTER_XT_TARGET_TEE=y
CONFIG_NETFILTER_XT_TARGET_TPROXY=y
CONFIG_NETFILTER_XT_TARGET_TRACE=y
CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=y
CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
CONFIG_NETFILTER_XT_MATCH_BPF=y
CONFIG_NETFILTER_XT_MATCH_CLUSTER=y
CONFIG_NETFILTER_XT_MATCH_COMMENT=y
CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y
CONFIG_NETFILTER_XT_MATCH_CONNLABEL=y
CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
CONFIG_NETFILTER_XT_MATCH_CPU=y
CONFIG_NETFILTER_XT_MATCH_DCCP=y
CONFIG_NETFILTER_XT_MATCH_DEVGROUP=y
CONFIG_NETFILTER_XT_MATCH_DSCP=y
CONFIG_NETFILTER_XT_MATCH_ESP=y
CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
CONFIG_NETFILTER_XT_MATCH_HELPER=y
CONFIG_NETFILTER_XT_MATCH_IPCOMP=y
CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
CONFIG_NETFILTER_XT_MATCH_L2TP=y
CONFIG_NETFILTER_XT_MATCH_LENGTH=y
CONFIG_NETFILTER_XT_MATCH_LIMIT=y
CONFIG_NETFILTER_XT_MATCH_MAC=y
CONFIG_NETFILTER_XT_MATCH_MARK=y
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
CONFIG_NETFILTER_XT_MATCH_NFACCT=y
CONFIG_NETFILTER_XT_MATCH_OSF=y
CONFIG_NETFILTER_XT_MATCH_OWNER=y
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
CONFIG_NETFILTER_XT_MATCH_QUOTA=y
CONFIG_NETFILTER_XT_MATCH_RATEEST=y
CONFIG_NETFILTER_XT_MATCH_REALM=y
CONFIG_NETFILTER_XT_MATCH_RECENT=y
CONFIG_NETFILTER_XT_MATCH_SCTP=y
CONFIG_NETFILTER_XT_MATCH_SOCKET=y
CONFIG_NETFILTER_XT_MATCH_STATE=y
CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
CONFIG_NETFILTER_XT_MATCH_STRING=y
CONFIG_NETFILTER_XT_MATCH_TCPMSS=y
CONFIG_NETFILTER_XT_MATCH_TIME=y
CONFIG_NETFILTER_XT_MATCH_U32=y
CONFIG_NFT_DUP_IPV4=y
CONFIG_NFT_FIB_IPV4=y
CONFIG_NF_TABLES_ARP=y
CONFIG_NF_FLOW_TABLE_IPV4=y
CONFIG_NF_LOG_ARP=y
CONFIG_IP_NF_IPTABLES=y
CONFIG_IP_NF_MATCH_AH=y
CONFIG_IP_NF_MATCH_ECN=y
CONFIG_IP_NF_MATCH_RPFILTER=y
CONFIG_IP_NF_MATCH_TTL=y
CONFIG_IP_NF_FILTER=y
CONFIG_IP_NF_TARGET_REJECT=y
CONFIG_IP_NF_TARGET_SYNPROXY=y
CONFIG_IP_NF_NAT=y
CONFIG_IP_NF_TARGET_MASQUERADE=y
CONFIG_IP_NF_TARGET_NETMAP=y
CONFIG_IP_NF_TARGET_REDIRECT=y
CONFIG_IP_NF_MANGLE=y
CONFIG_IP_NF_TARGET_CLUSTERIP=y
CONFIG_IP_NF_TARGET_ECN=y
CONFIG_IP_NF_TARGET_TTL=y
CONFIG_IP_NF_RAW=y
CONFIG_IP_NF_ARPTABLES=y
CONFIG_IP_NF_ARPFILTER=y
CONFIG_IP_NF_ARP_MANGLE=y
CONFIG_NFT_DUP_IPV6=y
CONFIG_NFT_FIB_IPV6=y
CONFIG_NF_FLOW_TABLE_IPV6=y
CONFIG_IP6_NF_IPTABLES=y
CONFIG_IP6_NF_MATCH_AH=y
CONFIG_IP6_NF_MATCH_EUI64=y
CONFIG_IP6_NF_MATCH_FRAG=y
CONFIG_IP6_NF_MATCH_OPTS=y
CONFIG_IP6_NF_MATCH_HL=y
CONFIG_IP6_NF_MATCH_IPV6HEADER=y
CONFIG_IP6_NF_MATCH_MH=y
CONFIG_IP6_NF_MATCH_RPFILTER=y
CONFIG_IP6_NF_MATCH_RT=y
CONFIG_IP6_NF_MATCH_SRH=y
CONFIG_IP6_NF_TARGET_HL=y
CONFIG_IP6_NF_FILTER=y
CONFIG_IP6_NF_TARGET_REJECT=y
CONFIG_IP6_NF_TARGET_SYNPROXY=y
CONFIG_IP6_NF_MANGLE=y
CONFIG_IP6_NF_RAW=y
CONFIG_IP6_NF_NAT=y
CONFIG_IP6_NF_TARGET_MASQUERADE=y
CONFIG_IP6_NF_TARGET_NPT=y
CONFIG_NF_CONNTRACK_BRIDGE=y

1
pkgs/applications/window-managers/e16/default.nix
View file

@ -54,7 +54,6 @@ stdenv.mkDerivation rec {
''; '';
passthru.updateScript = gitUpdater { passthru.updateScript = gitUpdater {
inherit pname version;
url = "https://git.enlightenment.org/e16/e16"; url = "https://git.enlightenment.org/e16/e16";
rev-prefix = "v"; rev-prefix = "v";
}; };

1
pkgs/applications/window-managers/jwm/default.nix
View file

@ -70,7 +70,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru.updateScript = gitUpdater { passthru.updateScript = gitUpdater {
inherit pname version;
rev-prefix = "v"; rev-prefix = "v";
}; };

41
pkgs/common-updater/generic-updater.nix
View file

@ -1,8 +1,9 @@
{ stdenv, writeScript, coreutils, gnugrep, gnused, common-updater-scripts, nix }: { stdenv, writeScript, coreutils, gnugrep, gnused, common-updater-scripts, nix }:
{ pname { name ? null
, version , pname ? null
, attrPath ? pname , version ? null
, attrPath ? null
, versionLister , versionLister
, ignoredVersions ? "" , ignoredVersions ? ""
, rev-prefix ? "" , rev-prefix ? ""
@ -15,22 +16,28 @@ let
fileForGitCommands = "update-git-commits.txt"; fileForGitCommands = "update-git-commits.txt";
# shell script to update package # shell script to update package
updateScript = writeScript "update-script.sh" '' updateScript = writeScript "generic-update-script.sh" ''
#! ${stdenv.shell} #! ${stdenv.shell}
set -o errexit set -o errexit
set -x set -x
pname="$1" name="$1"
version="$2" pname="$2"
attr_path="$3" version="$3"
version_lister="$4" attr_path="$4"
ignored_versions="$5" version_lister="$5"
rev_prefix="$6" ignored_versions="$6"
odd_unstable="$7" rev_prefix="$7"
patchlevel_unstable="$8" odd_unstable="$8"
patchlevel_unstable="$9"
[[ -n "$name" ]] || name="$UPDATE_NIX_NAME"
[[ -n "$pname" ]] || pname="$UPDATE_NIX_PNAME"
[[ -n "$version" ]] || version="$UPDATE_NIX_OLD_VERSION"
[[ -n "$attr_path" ]] || attr_path="$UPDATE_NIX_ATTR_PATH"
# print header # print header
echo "# $pname-$version" >> ${fileForGitCommands} echo "# $name" >> ${fileForGitCommands}
function version_is_ignored() { function version_is_ignored() {
local tag="$1" local tag="$1"
@ -55,7 +62,7 @@ let
return 1 return 1
} }
tags=$($version_lister --pname=${pname} --file="${fileForGitCommands}") || exit 1 tags=$($version_lister --pname=$pname --attr-path=$attr_path --file="${fileForGitCommands}") || exit 1
# print available tags # print available tags
for tag in $tags; do for tag in $tags; do
@ -104,5 +111,7 @@ let
echo "" >> ${fileForGitCommands} echo "" >> ${fileForGitCommands}
''; '';
in in {
[ updateScript pname version attrPath versionLister ignoredVersions rev-prefix odd-unstable patchlevel-unstable ] name = "generic-update-script";
command = [ updateScript name pname version attrPath versionLister ignoredVersions rev-prefix odd-unstable patchlevel-unstable ];
}

6
pkgs/common-updater/git-updater.nix
View file

@ -3,9 +3,9 @@
, common-updater-scripts , common-updater-scripts
}: }:
{ pname { pname ? null
, version , version ? null
, attrPath ? pname , attrPath ? null
, ignoredVersions ? "" , ignoredVersions ? ""
, rev-prefix ? "" , rev-prefix ? ""
, odd-unstable ? false , odd-unstable ? false

6
pkgs/common-updater/http-two-levels-updater.nix
View file

@ -3,9 +3,9 @@
, common-updater-scripts , common-updater-scripts
}: }:
{ pname { pname ? null
, version , version ? null
, attrPath ? pname , attrPath ? null
, ignoredVersions ? "" , ignoredVersions ? ""
, rev-prefix ? "" , rev-prefix ? ""
, odd-unstable ? false , odd-unstable ? false

38
pkgs/common-updater/scripts/list-archive-two-levels-versions
View file

@ -2,20 +2,24 @@
# lists all available versions listed for a package in a site (http) # lists all available versions listed for a package in a site (http)
archive="" # archive url
pname="" # package name pname="" # package name
attr_path="" # package attribute path
url="" # directory list url
file="" # file for writing debugging information file="" # file for writing debugging information
while (( $# > 0 )); do while (( $# > 0 )); do
flag="$1" flag="$1"
shift 1 shift 1
case "$flag" in case "$flag" in
--url=*)
archive="${flag#*=}"
;;
--pname=*) --pname=*)
pname="${flag#*=}" pname="${flag#*=}"
;; ;;
--attr-path=*)
attr_path="${flag#*=}"
;;
--url=*)
url="${flag#*=}"
;;
--file=*) --file=*)
file="${flag#*=}" file="${flag#*=}"
;; ;;
@ -26,29 +30,33 @@ while (( $# > 0 )); do
esac esac
done done
# by default set url to the base dir of the first url in src.urls if [[ -z "$pname" ]]; then
if [[ -z "$archive" ]]; then pname="$UPDATE_NIX_NAME"
archive="$(nix-instantiate $systemArg --eval -E \
"with import ./. {}; dirOf (dirOf (lib.head $UPDATE_NIX_ATTR_PATH.src.urls))" \
| tr -d '"')"
fi fi
if [[ -z "$pname" ]]; then if [[ -z "$attr_path" ]]; then
pname="$UPDATE_NIX_ATTR_PATH" attr_path="$UPDATE_NIX_ATTR_PATH"
fi
# by default set url to the base dir of the first url in src.urls
if [[ -z "$url" ]]; then
url="$(nix-instantiate $systemArg --eval -E \
"with import ./. {}; dirOf (dirOf (lib.head $attr_path.src.urls))" \
| tr -d '"')"
fi fi
# print a debugging message # print a debugging message
if [[ -n "$file" ]]; then if [[ -n "$file" ]]; then
echo "# Listing versions for '$pname' at $archive" >> $file echo "# Listing versions for '$pname' at $url" >> $file
fi fi
# list all major-minor versions from archive # list all major-minor versions from url
tags1=$(curl -sS "$archive/") tags1=$(curl -sS "$url/")
tags1=$(echo "$tags1" | sed -rne 's,^<a href="([0-9]+\.[0-9]+)/">.*,\1,p') tags1=$(echo "$tags1" | sed -rne 's,^<a href="([0-9]+\.[0-9]+)/">.*,\1,p')
# print available versions # print available versions
for tag in $tags1; do for tag in $tags1; do
tags2=$(curl -sS "$archive/$tag/") tags2=$(curl -sS "$url/$tag/")
tags2=$(echo "$tags2" | sed -rne "s,^<a href=\"$pname-([0-9.]+)\\.[^0-9].*\">.*,\\1,p") tags2=$(echo "$tags2" | sed -rne "s,^<a href=\"$pname-([0-9.]+)\\.[^0-9].*\">.*,\\1,p")
echo "$tags2" echo "$tags2"
done done

28
pkgs/common-updater/scripts/list-git-tags
View file

@ -2,22 +2,24 @@
# lists all available tags from a git repository # lists all available tags from a git repository
echo "# pname=$UPDATE_NIX_ATTR_PATH" > /tmp/test.txt
url="" # git repository url
pname="" # package name pname="" # package name
attr_path="" # package attribute path
url="" # git repository url
file="" # file for writing debugging information file="" # file for writing debugging information
while (( $# > 0 )); do while (( $# > 0 )); do
flag="$1" flag="$1"
shift 1 shift 1
case "$flag" in case "$flag" in
--url=*)
url="${flag#*=}"
;;
--pname=*) --pname=*)
pname="${flag#*=}" pname="${flag#*=}"
;; ;;
--attr-path=*)
attr_path="${flag#*=}"
;;
--url=*)
url="${flag#*=}"
;;
--file=*) --file=*)
file="${flag#*=}" file="${flag#*=}"
;; ;;
@ -28,17 +30,21 @@ while (( $# > 0 )); do
esac esac
done done
if [[ -z "$pname" ]]; then
pname="$UPDATE_NIX_NAME"
fi
if [[ -z "$attr_path" ]]; then
attr_path="$UPDATE_NIX_ATTR_PATH"
fi
# By default we set url to src.url or src.meta.homepage # By default we set url to src.url or src.meta.homepage
if [[ -z "$url" ]]; then if [[ -z "$url" ]]; then
url="$(nix-instantiate $systemArg --eval -E \ url="$(nix-instantiate $systemArg --eval -E \
"with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.meta.homepage or $UPDATE_NIX_ATTR_PATH.src.url" \ "with import ./. {}; $attr_path.src.meta.homepage or $attr_path.src.url" \
| tr -d '"')" | tr -d '"')"
fi fi
if [[ -z "$pname" ]]; then
pname="$UPDATE_NIX_ATTR_PATH"
fi
# print a debugging message # print a debugging message
if [[ -n "$file" ]]; then if [[ -n "$file" ]]; then
echo "# Listing tags for '$pname' at $url" >> $file echo "# Listing tags for '$pname' at $url" >> $file

2
pkgs/data/icons/colloid-icon-theme/default.nix
View file

@ -60,7 +60,7 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
passthru.updateScript = gitUpdater { inherit pname version; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
description = "Colloid icon theme"; description = "Colloid icon theme";

1
pkgs/data/icons/kora-icon-theme/default.nix
View file

@ -46,7 +46,6 @@ stdenvNoCC.mkDerivation rec {
''; '';
passthru.updateScript = gitUpdater { passthru.updateScript = gitUpdater {
inherit pname version;
rev-prefix = "v"; rev-prefix = "v";
}; };

2
pkgs/data/icons/luna-icons/default.nix
View file

@ -44,7 +44,7 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
passthru.updateScript = gitUpdater {inherit pname version; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
description = "Icon pack based on marwaita and papirus icons"; description = "Icon pack based on marwaita and papirus icons";

2
pkgs/data/icons/numix-icon-theme-circle/default.nix
View file

@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
passthru.updateScript = gitUpdater {inherit pname version; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
description = "Numix icon theme (circle version)"; description = "Numix icon theme (circle version)";

2
pkgs/data/icons/numix-icon-theme-square/default.nix
View file

@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
passthru.updateScript = gitUpdater {inherit pname version; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
description = "Numix icon theme (square version)"; description = "Numix icon theme (square version)";

2
pkgs/data/icons/numix-icon-theme/default.nix
View file

@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
passthru.updateScript = gitUpdater { inherit pname version; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
description = "Numix icon theme"; description = "Numix icon theme";

2
pkgs/data/icons/qogir-icon-theme/default.nix
View file

@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
passthru.updateScript = gitUpdater { inherit pname version; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
description = "Flat colorful design icon theme"; description = "Flat colorful design icon theme";

2
pkgs/data/icons/tela-circle-icon-theme/default.nix
View file

@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
passthru.updateScript = gitUpdater {inherit pname version; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
description = "Flat and colorful personality icon theme"; description = "Flat and colorful personality icon theme";

2
pkgs/data/icons/zafiro-icons/default.nix
View file

@ -64,7 +64,7 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
passthru.updateScript = gitUpdater { inherit pname version; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
description = "Icon pack flat with light colors"; description = "Icon pack flat with light colors";

2
pkgs/data/themes/colloid-gtk-theme/default.nix
View file

@ -64,7 +64,7 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
passthru.updateScript = gitUpdater { inherit pname version; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
description = "A modern and clean Gtk theme"; description = "A modern and clean Gtk theme";

2
pkgs/data/themes/colloid-kde/default.nix
View file

@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
passthru.updateScript = gitUpdater { inherit pname version; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
description = "A clean and concise theme for KDE Plasma desktop"; description = "A clean and concise theme for KDE Plasma desktop";

2
pkgs/data/themes/graphite-gtk-theme/default.nix
View file

@ -86,7 +86,7 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
passthru.updateScript = gitUpdater { inherit pname version; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
description = "Flat Gtk+ theme based on Elegant Design"; description = "Flat Gtk+ theme based on Elegant Design";

2
pkgs/data/themes/greybird/default.nix
View file

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
gtk-engine-murrine gtk-engine-murrine
]; ];
passthru.updateScript = gitUpdater { inherit pname version; rev-prefix = "v"; }; passthru.updateScript = gitUpdater { rev-prefix = "v"; };
meta = with lib; { meta = with lib; {
description = "Grey and blue theme from the Shimmer Project for GTK-based environments"; description = "Grey and blue theme from the Shimmer Project for GTK-based environments";

2
pkgs/data/themes/layan-kde/default.nix
View file

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
passthru.updateScript = gitUpdater {inherit pname version; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
description = "A flat Design theme for KDE Plasma desktop"; description = "A flat Design theme for KDE Plasma desktop";

2
pkgs/data/themes/marwaita/default.nix
View file

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
passthru.updateScript = gitUpdater { inherit pname version; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
description = "GTK theme supporting Budgie, Pantheon, Mate, Xfce4 and GNOME desktops"; description = "GTK theme supporting Budgie, Pantheon, Mate, Xfce4 and GNOME desktops";

2
pkgs/data/themes/matcha/default.nix
View file

@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
passthru.updateScript = gitUpdater {inherit pname version; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
description = "A stylish flat Design theme for GTK based desktop environments"; description = "A stylish flat Design theme for GTK based desktop environments";

2
pkgs/data/themes/mojave/default.nix
View file

@ -121,7 +121,7 @@ stdenv.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
passthru.updateScript = gitUpdater {inherit pname version; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
description = "Mac OSX Mojave like theme for GTK based desktop environments"; description = "Mac OSX Mojave like theme for GTK based desktop environments";

2
pkgs/data/themes/qogir-kde/default.nix
View file

@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
passthru.updateScript = gitUpdater { inherit pname version; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
description = "A flat Design theme for KDE Plasma desktop"; description = "A flat Design theme for KDE Plasma desktop";

2
pkgs/data/themes/qogir/default.nix
View file

@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
passthru.updateScript = gitUpdater { inherit pname version; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
description = "Flat Design theme for GTK based desktop environments"; description = "Flat Design theme for GTK based desktop environments";

2
pkgs/data/themes/vimix/default.nix
View file

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
passthru.updateScript = gitUpdater {inherit pname version; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
description = "Flat Material Design theme for GTK based desktop environments"; description = "Flat Material Design theme for GTK based desktop environments";

2
pkgs/desktops/cinnamon/warpinator/default.nix
View file

@ -74,8 +74,6 @@ python3.pkgs.buildPythonApplication rec {
''; '';
passthru.updateScript = gitUpdater { passthru.updateScript = gitUpdater {
inherit pname version;
attrPath = "cinnamon.warpinator";
ignoredVersions = "^master.*"; ignoredVersions = "^master.*";
}; };

2
pkgs/desktops/gnome/extensions/dash-to-dock/default.nix
View file

@ -34,8 +34,6 @@ stdenv.mkDerivation rec {
extensionPortalSlug = "dash-to-dock"; extensionPortalSlug = "dash-to-dock";
updateScript = gitUpdater { updateScript = gitUpdater {
pname = "gnomeExtensions.dash-to-dock";
inherit version;
rev-prefix = "extensions.gnome.org-v"; rev-prefix = "extensions.gnome.org-v";
}; };
}; };

77
pkgs/desktops/gnome/extensions/extensions.json
View file

File diff suppressed because one or more lines are too long

3
pkgs/desktops/lxqt/compton-conf/default.nix
View file

@ -8,6 +8,7 @@
, qttools , qttools
, lxqt , lxqt
, libconfig , libconfig
, gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -38,7 +39,7 @@ mkDerivation rec {
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \ --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \
''; '';
passthru.updateScript = lxqt.lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
broken = stdenv.isDarwin; broken = stdenv.isDarwin;

7
pkgs/desktops/lxqt/default.nix
View file

@ -2,13 +2,6 @@
let let
packages = self: with self; { packages = self: with self; {
# Update script tailored to LXQt packages from git repository
lxqtUpdateScript = { pname, version, src }:
pkgs.gitUpdater {
inherit pname version;
attrPath = "lxqt.${pname}";
};
# For compiling information, see: # For compiling information, see:
# - https://github.com/lxqt/lxqt/wiki/Building-from-source # - https://github.com/lxqt/lxqt/wiki/Building-from-source

4
pkgs/desktops/lxqt/libfm-qt/default.nix
View file

@ -11,7 +11,7 @@
, menu-cache , menu-cache
, qtx11extras , qtx11extras
, qttools , qttools
, lxqtUpdateScript , gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -43,7 +43,7 @@ mkDerivation rec {
menu-cache menu-cache
]; ];
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/lxqt/libfm-qt"; homepage = "https://github.com/lxqt/libfm-qt";

4
pkgs/desktops/lxqt/liblxqt/default.nix
View file

@ -10,7 +10,7 @@
, polkit-qt , polkit-qt
, kwindowsystem , kwindowsystem
, xorg , xorg
, lxqtUpdateScript , gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -50,7 +50,7 @@ mkDerivation rec {
sed -i "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" CMakeLists.txt sed -i "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" CMakeLists.txt
''; '';
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
description = "Core utility library for all LXQt components"; description = "Core utility library for all LXQt components";

4
pkgs/desktops/lxqt/libqtxdg/default.nix
View file

@ -5,7 +5,7 @@
, qtbase , qtbase
, qtsvg , qtsvg
, lxqt-build-tools , lxqt-build-tools
, lxqtUpdateScript , gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -37,7 +37,7 @@ mkDerivation rec {
) )
''; '';
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/lxqt/libqtxdg"; homepage = "https://github.com/lxqt/libqtxdg";

4
pkgs/desktops/lxqt/libsysstat/default.nix
View file

@ -5,7 +5,7 @@
, cmake , cmake
, qtbase , qtbase
, lxqt-build-tools , lxqt-build-tools
, lxqtUpdateScript , gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -28,7 +28,7 @@ mkDerivation rec {
qtbase qtbase
]; ];
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
broken = stdenv.isDarwin; broken = stdenv.isDarwin;

4
pkgs/desktops/lxqt/lximage-qt/default.nix
View file

@ -13,7 +13,7 @@
, libfm-qt , libfm-qt
, libexif , libexif
, menu-cache , menu-cache
, lxqtUpdateScript , gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -46,7 +46,7 @@ mkDerivation rec {
menu-cache menu-cache
]; ];
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/lxqt/lximage-qt"; homepage = "https://github.com/lxqt/lximage-qt";

4
pkgs/desktops/lxqt/lxqt-about/default.nix
View file

@ -9,7 +9,7 @@
, kwindowsystem , kwindowsystem
, liblxqt , liblxqt
, libqtxdg , libqtxdg
, lxqtUpdateScript , gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -37,7 +37,7 @@ mkDerivation rec {
libqtxdg libqtxdg
]; ];
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/lxqt/lxqt-about"; homepage = "https://github.com/lxqt/lxqt-about";

4
pkgs/desktops/lxqt/lxqt-admin/default.nix
View file

@ -10,7 +10,7 @@
, liblxqt , liblxqt
, libqtxdg , libqtxdg
, polkit-qt , polkit-qt
, lxqtUpdateScript , gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -47,7 +47,7 @@ mkDerivation rec {
done done
''; '';
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/lxqt/lxqt-admin"; homepage = "https://github.com/lxqt/lxqt-admin";

4
pkgs/desktops/lxqt/lxqt-archiver/default.nix
View file

@ -11,7 +11,7 @@
, qtbase , qtbase
, qttools , qttools
, qtx11extras , qtx11extras
, lxqtUpdateScript , gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -43,7 +43,7 @@ mkDerivation rec {
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/lxqt/lxqt-archiver/"; homepage = "https://github.com/lxqt/lxqt-archiver/";

4
pkgs/desktops/lxqt/lxqt-build-tools/default.nix
View file

@ -9,7 +9,7 @@
, qtbase , qtbase
, glib , glib
, perl , perl
, lxqtUpdateScript , gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -69,7 +69,7 @@ mkDerivation rec {
cp ${./LXQtConfigVars.cmake} $out/share/cmake/lxqt-build-tools/modules/LXQtConfigVars.cmake cp ${./LXQtConfigVars.cmake} $out/share/cmake/lxqt-build-tools/modules/LXQtConfigVars.cmake
''; '';
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/lxqt/lxqt-build-tools"; homepage = "https://github.com/lxqt/lxqt-build-tools";

4
pkgs/desktops/lxqt/lxqt-config/default.nix
View file

@ -15,7 +15,7 @@
, libqtxdg , libqtxdg
, xkeyboard_config , xkeyboard_config
, xorg , xorg
, lxqtUpdateScript , gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -64,7 +64,7 @@ mkDerivation rec {
'${xkeyboard_config}/share/X11/xkb/rules/base.lst' '${xkeyboard_config}/share/X11/xkb/rules/base.lst'
''; '';
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/lxqt/lxqt-config"; homepage = "https://github.com/lxqt/lxqt-config";

4
pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
View file

@ -10,7 +10,7 @@
, kwindowsystem , kwindowsystem
, liblxqt , liblxqt
, libqtxdg , libqtxdg
, lxqtUpdateScript , gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -39,7 +39,7 @@ mkDerivation rec {
libqtxdg libqtxdg
]; ];
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/lxqt/lxqt-globalkeys"; homepage = "https://github.com/lxqt/lxqt-globalkeys";

4
pkgs/desktops/lxqt/lxqt-notificationd/default.nix
View file

@ -10,7 +10,7 @@
, liblxqt , liblxqt
, libqtxdg , libqtxdg
, qtx11extras , qtx11extras
, lxqtUpdateScript , gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -39,7 +39,7 @@ mkDerivation rec {
qtx11extras qtx11extras
]; ];
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/lxqt/lxqt-notificationd"; homepage = "https://github.com/lxqt/lxqt-notificationd";

4
pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
View file

@ -10,7 +10,7 @@
, kwindowsystem , kwindowsystem
, liblxqt , liblxqt
, libqtxdg , libqtxdg
, lxqtUpdateScript , gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -39,7 +39,7 @@ mkDerivation rec {
libqtxdg libqtxdg
]; ];
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/lxqt/lxqt-openssh-askpass"; homepage = "https://github.com/lxqt/lxqt-openssh-askpass";

4
pkgs/desktops/lxqt/lxqt-panel/default.nix
View file

@ -17,7 +17,7 @@
, lxmenu-data , lxmenu-data
, lxqt-build-tools , lxqt-build-tools
, lxqt-globalkeys , lxqt-globalkeys
, lxqtUpdateScript , gitUpdater
, menu-cache , menu-cache
, pcre , pcre
, qtbase , qtbase
@ -71,7 +71,7 @@ mkDerivation rec {
xorg.libpthreadstubs xorg.libpthreadstubs
]; ];
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/lxqt/lxqt-panel"; homepage = "https://github.com/lxqt/lxqt-panel";

4
pkgs/desktops/lxqt/lxqt-policykit/default.nix
View file

@ -14,7 +14,7 @@
, liblxqt , liblxqt
, libqtxdg , libqtxdg
, pcre , pcre
, lxqtUpdateScript , gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -47,7 +47,7 @@ mkDerivation rec {
pcre pcre
]; ];
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/lxqt/lxqt-policykit"; homepage = "https://github.com/lxqt/lxqt-policykit";

4
pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
View file

@ -13,7 +13,7 @@
, liblxqt , liblxqt
, libqtxdg , libqtxdg
, lxqt-globalkeys , lxqt-globalkeys
, lxqtUpdateScript , gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -45,7 +45,7 @@ mkDerivation rec {
lxqt-globalkeys lxqt-globalkeys
]; ];
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/lxqt/lxqt-powermanagement"; homepage = "https://github.com/lxqt/lxqt-powermanagement";

4
pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
View file

@ -6,7 +6,7 @@
, libfm-qt , libfm-qt
, libqtxdg , libqtxdg
, lxqt-build-tools , lxqt-build-tools
, lxqtUpdateScript , gitUpdater
, qtbase , qtbase
, qtsvg , qtsvg
, qttools , qttools
@ -44,7 +44,7 @@ mkDerivation rec {
--replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix" --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix"
''; '';
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/lxqt/lxqt-qtplugin"; homepage = "https://github.com/lxqt/lxqt-qtplugin";

4
pkgs/desktops/lxqt/lxqt-runner/default.nix
View file

@ -15,7 +15,7 @@
, menu-cache , menu-cache
, muparser , muparser
, pcre , pcre
, lxqtUpdateScript , gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -49,7 +49,7 @@ mkDerivation rec {
pcre pcre
]; ];
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/lxqt/lxqt-runner"; homepage = "https://github.com/lxqt/lxqt-runner";

4
pkgs/desktops/lxqt/lxqt-session/default.nix
View file

@ -15,7 +15,7 @@
, procps , procps
, xorg , xorg
, xdg-user-dirs , xdg-user-dirs
, lxqtUpdateScript , gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -50,7 +50,7 @@ mkDerivation rec {
xdg-user-dirs xdg-user-dirs
]; ];
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/lxqt/lxqt-session"; homepage = "https://github.com/lxqt/lxqt-session";

4
pkgs/desktops/lxqt/lxqt-sudo/default.nix
View file

@ -11,7 +11,7 @@
, liblxqt , liblxqt
, libqtxdg , libqtxdg
, sudo , sudo
, lxqtUpdateScript , gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -41,7 +41,7 @@ mkDerivation rec {
sudo sudo
]; ];
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/lxqt/lxqt-sudo"; homepage = "https://github.com/lxqt/lxqt-sudo";

4
pkgs/desktops/lxqt/lxqt-themes/default.nix
View file

@ -3,7 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, lxqt-build-tools , lxqt-build-tools
, lxqtUpdateScript , gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -22,7 +22,7 @@ mkDerivation rec {
lxqt-build-tools lxqt-build-tools
]; ];
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/lxqt/lxqt-themes"; homepage = "https://github.com/lxqt/lxqt-themes";

4
pkgs/desktops/lxqt/obconf-qt/default.nix
View file

@ -10,7 +10,7 @@
, xorg , xorg
, lxqt-build-tools , lxqt-build-tools
, openbox , openbox
, lxqtUpdateScript , gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -41,7 +41,7 @@ mkDerivation rec {
openbox openbox
]; ];
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/lxqt/obconf-qt"; homepage = "https://github.com/lxqt/obconf-qt";

3
pkgs/desktops/lxqt/pavucontrol-qt/default.nix
View file

@ -9,6 +9,7 @@
, qtbase , qtbase
, qttools , qttools
, qtx11extras , qtx11extras
, gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -36,7 +37,7 @@ mkDerivation rec {
pcre pcre
]; ];
passthru.updateScript = lxqt.lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/lxqt/pavucontrol-qt"; homepage = "https://github.com/lxqt/pavucontrol-qt";

4
pkgs/desktops/lxqt/pcmanfm-qt/default.nix
View file

@ -12,7 +12,7 @@
, libfm-qt , libfm-qt
, menu-cache , menu-cache
, lxmenu-data , lxmenu-data
, lxqtUpdateScript , gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -44,7 +44,7 @@ mkDerivation rec {
lxmenu-data lxmenu-data
]; ];
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
postPatch = '' postPatch = ''
substituteInPlace config/pcmanfm-qt/lxqt/settings.conf.in --replace @LXQT_SHARE_DIR@ /run/current-system/sw/share/lxqt substituteInPlace config/pcmanfm-qt/lxqt/settings.conf.in --replace @LXQT_SHARE_DIR@ /run/current-system/sw/share/lxqt

4
pkgs/desktops/lxqt/qlipper/default.nix
View file

@ -4,7 +4,7 @@
, cmake , cmake
, qtbase , qtbase
, qttools , qttools
, lxqtUpdateScript , gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -27,7 +27,7 @@ mkDerivation rec {
qttools qttools
]; ];
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
description = "Cross-platform clipboard history applet"; description = "Cross-platform clipboard history applet";

4
pkgs/desktops/lxqt/qps/default.nix
View file

@ -6,7 +6,7 @@
, liblxqt , liblxqt
, libqtxdg , libqtxdg
, lxqt-build-tools , lxqt-build-tools
, lxqtUpdateScript , gitUpdater
, qtbase , qtbase
, qttools , qttools
, qtx11extras , qtx11extras
@ -37,7 +37,7 @@ mkDerivation rec {
qtx11extras qtx11extras
]; ];
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/lxqt/qps"; homepage = "https://github.com/lxqt/qps";

4
pkgs/desktops/lxqt/qterminal/default.nix
View file

@ -7,7 +7,7 @@
, qtbase , qtbase
, qttools , qttools
, qtx11extras , qtx11extras
, lxqtUpdateScript , gitUpdater
, nixosTests , nixosTests
}: }:
@ -34,7 +34,7 @@ mkDerivation rec {
qtermwidget qtermwidget
]; ];
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
passthru.tests.test = nixosTests.terminal-emulators.qterminal; passthru.tests.test = nixosTests.terminal-emulators.qterminal;

4
pkgs/desktops/lxqt/qtermwidget/default.nix
View file

@ -6,7 +6,7 @@
, qtbase , qtbase
, qttools , qttools
, lxqt-build-tools , lxqt-build-tools
, lxqtUpdateScript , gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -30,7 +30,7 @@ mkDerivation rec {
qttools qttools
]; ];
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
broken = stdenv.isDarwin; broken = stdenv.isDarwin;

4
pkgs/desktops/lxqt/qtxdg-tools/default.nix
View file

@ -5,7 +5,7 @@
, qtbase , qtbase
, libqtxdg , libqtxdg
, lxqt-build-tools , lxqt-build-tools
, lxqtUpdateScript , gitUpdater
}: }:
mkDerivation rec { mkDerivation rec {
@ -29,7 +29,7 @@ mkDerivation rec {
libqtxdg libqtxdg
]; ];
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = gitUpdater { };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/lxqt/qtxdg-tools"; homepage = "https://github.com/lxqt/qtxdg-tools";

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