Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
647c8d800f
47 changed files with 374 additions and 224 deletions
|
|
@ -7,7 +7,6 @@ let
|
|||
@${cfg.jrePackage}/bin/java java \
|
||||
${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \
|
||||
${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \
|
||||
${optionalString (lib.versionOlder cfg.unifiPackage.version "6.5.54") "-Dlog4j2.formatMsgNoLookups=true"} \
|
||||
-jar ${stateDir}/lib/ace.jar
|
||||
'';
|
||||
in
|
||||
|
|
|
|||
|
|
@ -227,9 +227,9 @@ in
|
|||
environment.sessionVariables.GTK_CSD = "1";
|
||||
environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini";
|
||||
|
||||
xdg.portal.extraPortals = with pkgs; [
|
||||
pantheon.elementary-files
|
||||
pantheon.elementary-settings-daemon
|
||||
xdg.portal.extraPortals = with pkgs.pantheon; [
|
||||
elementary-files
|
||||
elementary-settings-daemon
|
||||
xdg-desktop-portal-pantheon
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -485,6 +485,7 @@ in
|
|||
ucarp = handleTest ./ucarp.nix {};
|
||||
udisks2 = handleTest ./udisks2.nix {};
|
||||
unbound = handleTest ./unbound.nix {};
|
||||
unifi = handleTest ./unifi.nix {};
|
||||
unit-php = handleTest ./web-servers/unit-php.nix {};
|
||||
upnp = handleTest ./upnp.nix {};
|
||||
usbguard = handleTest ./usbguard.nix {};
|
||||
|
|
|
|||
|
|
@ -215,6 +215,12 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
f"docker run --rm ${examples.layersOrder.imageName} cat /tmp/layer{index}"
|
||||
)
|
||||
|
||||
with subtest("Ensure layers unpacked in correct order before runAsRoot runs"):
|
||||
assert "abc" in docker.succeed(
|
||||
"docker load --input='${examples.layersUnpackOrder}'",
|
||||
"docker run --rm ${examples.layersUnpackOrder.imageName} cat /layer-order"
|
||||
)
|
||||
|
||||
with subtest("Ensure environment variables are correctly inherited"):
|
||||
docker.succeed(
|
||||
"docker load --input='${examples.environmentVariables}'"
|
||||
|
|
|
|||
35
nixos/tests/unifi.nix
Normal file
35
nixos/tests/unifi.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
# Test UniFi controller
|
||||
|
||||
{ system ? builtins.currentSystem
|
||||
, config ? { allowUnfree = true; }
|
||||
, pkgs ? import ../.. { inherit system config; }
|
||||
}:
|
||||
|
||||
with import ../lib/testing-python.nix { inherit system pkgs; };
|
||||
with pkgs.lib;
|
||||
|
||||
let
|
||||
makeAppTest = unifi: makeTest {
|
||||
name = "unifi-controller-${unifi.version}";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ zhaofengli ];
|
||||
};
|
||||
|
||||
nodes.server = {
|
||||
services.unifi = {
|
||||
enable = true;
|
||||
unifiPackage = unifi;
|
||||
openFirewall = false;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
server.wait_for_unit("unifi.service")
|
||||
server.wait_until_succeeds("curl -Lk https://localhost:8443 >&2", timeout=300)
|
||||
'';
|
||||
};
|
||||
in with pkgs; {
|
||||
unifiLTS = makeAppTest unifiLTS;
|
||||
unifi5 = makeAppTest unifi5;
|
||||
unifi6 = makeAppTest unifi6;
|
||||
}
|
||||
|
|
@ -46,6 +46,7 @@
|
|||
, stdenv
|
||||
, systemd
|
||||
, unzip
|
||||
, usbutils
|
||||
, which
|
||||
, runCommand
|
||||
, xkeyboard_config
|
||||
|
|
@ -102,6 +103,7 @@ let
|
|||
# Runtime stuff
|
||||
git
|
||||
ps
|
||||
usbutils
|
||||
]}" \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [
|
||||
|
||||
|
|
|
|||
|
|
@ -14,17 +14,17 @@ let
|
|||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "0xn2gcvqjbj2adfwq2s0pz1n4yxg6spq4hifhvwavb34pn9yc9p9";
|
||||
x86_64-darwin = "13kgsxhjdfcdgz8xbhzpd7x1xh6am255dwxpbr03cg4p8iwfd3ig";
|
||||
aarch64-linux = "166ag0k0j8wixm3arl1ld4a4qi92ff1zvb6whhqshzdv0s39pys3";
|
||||
aarch64-darwin = "08g8qjbvlp27i37z7jcsvzgg6vm0grppnlh0jyji6lz31ksib6pz";
|
||||
armv7l-linux = "15l9kr01f0jxfi0a9dnldsjrwzv9x60ljgvmlh0zhx4h0q1x0n7l";
|
||||
x86_64-linux = "1bglf1a8b5whv9pk811fdnx0mvfcfasjxbik73p67msp4yy68lm4";
|
||||
x86_64-darwin = "0cv6i2i69xf6hn0vrfl3gk3ky7r5yvp4k7zx2k695gzck5s9bx8y";
|
||||
aarch64-linux = "1jggspj5q4vfgs4xdvx5p8qsfm98wf17jmxqzs68lmlhmhadyh22";
|
||||
aarch64-darwin = "0c1nz7a54xq20a2a4fqcmlhry6gqwz5f1ys7dx0x5whaxbybh8my";
|
||||
armv7l-linux = "0p2rdxbqpzk79ra7br7wfs8kr0hnh3l022mqb7y16gc426xjlfn4";
|
||||
}.${system};
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.63.1";
|
||||
version = "1.63.2";
|
||||
pname = "vscode";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
|
|
|
|||
|
|
@ -13,10 +13,10 @@ let
|
|||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "1p7rbpvmllpdvghk3avg8f0xrbfhgyyj7l0ajjp0pcx24g3ijdwq";
|
||||
x86_64-darwin = "1ggcvdvciq5dkiknlxsrxkx96gj0g8vw0h2v1bj1xvv1mqjv0kwk";
|
||||
aarch64-linux = "0ypi7n99c6s99vxl78j5zw4l8jysgnz3bzch3l9yqpp1faq2zim5";
|
||||
armv7l-linux = "1rb1b4ixvm98y5s40i6qhzl6c5rv1jkbvcbwrv4s2g122j002dwn";
|
||||
x86_64-linux = "0pczrbifjgm905371i8c6bk90ka291cmny6hr1nzfix7bn5psjx0";
|
||||
x86_64-darwin = "12g2jlrhng3i56a4v9jf7nrj045jivnfdx4dhka1fiv60nn4gc46";
|
||||
aarch64-linux = "1bhhz4yvmk3zqljy3b77hlsxbwm2l675pslhwr44p6fb4hmn8fai";
|
||||
armv7l-linux = "15nbskq92b85zdyg7pgagi9mqhnbyisfkipqb3brc2rvmyxpzclb";
|
||||
}.${system};
|
||||
|
||||
sourceRoot = {
|
||||
|
|
@ -31,7 +31,7 @@ in
|
|||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.63.1";
|
||||
version = "1.63.2";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@ let
|
|||
};
|
||||
in mkDerivation rec {
|
||||
pname = "golden-cheetah";
|
||||
version = "3.6-DEV2107";
|
||||
version = "3.6-DEV2111";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoldenCheetah";
|
||||
repo = "GoldenCheetah";
|
||||
rev = "v${version}";
|
||||
sha256 = "1d54x3pv27w1ys2f5l7gnfhyijhgcgdjnq1c1mj7hvg35dmh054d";
|
||||
sha256 = "17sk89szvaq31bcv6rgfn1bbw132k7w8zlalfb3ayflavdxbk6sa";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -31,15 +31,15 @@
|
|||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "98.0.4750.0",
|
||||
"sha256": "0qygnmb1wlbarni2pdfs1xl50ggvf0211c6mj7341wwsbd0bpkgr",
|
||||
"sha256bin64": "1psbh5xwlgr4ain4s9vk7d0kdbbd14v29f95ai5i4d2d3cpj2319",
|
||||
"version": "98.0.4758.9",
|
||||
"sha256": "1sq6v2hdhpk12w37sz7jf5vwkn72ydcqzcxysf7hs2flcfgscydj",
|
||||
"sha256bin64": "1jfj08jpxji2q890zbvpvmgf5bjqgvigkr1hg8ch8vaaybs5wr04",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-12-03",
|
||||
"version": "2021-12-07",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "e0afadf7a743d5b14737bd454df45d5f1caf0d23",
|
||||
"sha256": "00pxhfikscghgm79zckh9j00jgjmdy6hixkpfq5vmgc0xpxif78v"
|
||||
"rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f",
|
||||
"sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dnscontrol";
|
||||
version = "3.13.0";
|
||||
version = "3.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StackExchange";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XBpdNQHG90rJWGfXpJgXsj5AR2VhK/3+1U7Zl8XDlsw=";
|
||||
sha256 = "sha256-S3/uxtrCFU9HbNhYKqOYy1ytSVi2DU/lXIlhBgNnaPg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Ob4ZPtP14TsNOnGVfR5lFAKpJsjoJDKmiE++DqY32QA=";
|
||||
vendorSha256 = "sha256-OwiZL+MBmAFtV8Vg2Wl9yAeTG3AzMSmCjefxObU7lfQ=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,40 +2,42 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, vala
|
||||
, cmake
|
||||
, desktop-file-utils
|
||||
, meson
|
||||
, ninja
|
||||
, gtk3
|
||||
, gtksourceview3
|
||||
, webkitgtk
|
||||
, gtkspell3
|
||||
, glib
|
||||
, libgee
|
||||
, pcre
|
||||
, sqlite
|
||||
, discount
|
||||
, pkg-config
|
||||
, python3
|
||||
, vala
|
||||
, wrapGAppsHook
|
||||
, withPantheon ? false
|
||||
, discount
|
||||
, glib
|
||||
, gtk3
|
||||
, gtksourceview4
|
||||
, gtkspell3
|
||||
, libgee
|
||||
, pantheon
|
||||
, sqlite
|
||||
, webkitgtk
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "notes-up";
|
||||
version = "unstable-2020-12-29";
|
||||
version = "2.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Philip-Scott";
|
||||
repo = "Notes-up";
|
||||
rev = "2ea9f35f588769758f5d2d4436d71c4059141a6f";
|
||||
sha256 = "sha256-lKOM9+s34xYB9bF9pgip9DFu+6AaxSE4HjFVhoWtttk=";
|
||||
rev = version;
|
||||
sha256 = "sha256-t9BCtdWd2JLrKTcmri1Lgl5RLBYD2xWCtMxoVXz0XPk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
desktop-file-utils
|
||||
meson
|
||||
ninja
|
||||
vala
|
||||
pkg-config
|
||||
python3
|
||||
vala
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
|
|
@ -43,17 +45,18 @@ stdenv.mkDerivation rec {
|
|||
discount
|
||||
glib
|
||||
gtk3
|
||||
gtksourceview3
|
||||
gtksourceview4
|
||||
gtkspell3
|
||||
libgee
|
||||
pantheon.granite
|
||||
pcre
|
||||
sqlite
|
||||
webkitgtk
|
||||
];
|
||||
|
||||
# Whether to build with contractor support (Pantheon specific)
|
||||
cmakeFlags = lib.optional (!withPantheon) "-Dnoele=yes";
|
||||
postPatch = ''
|
||||
chmod +x meson/post_install.py
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
|
|
@ -62,12 +65,11 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Markdown notes editor and manager designed for elementary OS"
|
||||
+ lib.optionalString withPantheon " - built with Contractor support";
|
||||
description = "Markdown notes editor and manager designed for elementary OS";
|
||||
homepage = "https://github.com/Philip-Scott/Notes-up";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ ] ++ teams.pantheon.members;
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "com.github.philip-scott.notes-up";
|
||||
mainProgram = "com.github.philip_scott.notes-up";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,16 +19,16 @@ let
|
|||
maintainers = with maintainers; [ fliegendewurst ];
|
||||
};
|
||||
|
||||
version = "0.48.7";
|
||||
version = "0.48.8";
|
||||
|
||||
desktopSource = {
|
||||
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
|
||||
sha256 = "16clrn89mq2n30hb50y45s6qn5l7n1hj4b124wjxrkmmwpdbjwad";
|
||||
sha256 = "1dz4wdx3d1pmm3yrvipqa929f6gqilhfc3sp6xcgbn9faypp6qra";
|
||||
};
|
||||
|
||||
serverSource = {
|
||||
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
|
||||
sha256 = "18zwplcai4s82pdy3l30862jdl22311qh78anrjz29fm6srx1y9l";
|
||||
sha256 = "0jp1hj51x5wz27f7739nwwli119pzpskg269cxk4i04xxbhr145j";
|
||||
};
|
||||
|
||||
in {
|
||||
|
|
@ -40,15 +40,6 @@ in {
|
|||
|
||||
src = fetchurl desktopSource;
|
||||
|
||||
# Fetch from source repo, no longer included in release.
|
||||
# (they did special-case icon.png but we want the scalable svg)
|
||||
# Use the version here to ensure we get any changes.
|
||||
trilium_svg = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/images/icon.svg";
|
||||
sha256 = "0sz3piskdlx267whx8r6afrdadn25bf0zmxplj1599zqkf7w7n0x";
|
||||
};
|
||||
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
makeWrapper
|
||||
|
|
@ -61,12 +52,12 @@ in {
|
|||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share/trilium
|
||||
mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
|
||||
mkdir -p $out/share/{applications,icons/hicolor/128x128/apps}
|
||||
|
||||
cp -r ./* $out/share/trilium
|
||||
ln -s $out/share/trilium/trilium $out/bin/trilium
|
||||
|
||||
ln -s ${trilium_svg} $out/share/icons/hicolor/scalable/apps/trilium.svg
|
||||
ln -s $out/share/trilium/icon.png $out/share/icons/hicolor/128x128/apps/trilium.png
|
||||
cp ${desktopItem}/share/applications/* $out/share/applications
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -11,19 +11,19 @@ with lib;
|
|||
let
|
||||
curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; };
|
||||
pname = "gitkraken";
|
||||
version = "8.1.1";
|
||||
version = "8.2.0";
|
||||
|
||||
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
|
||||
|
||||
srcs = {
|
||||
x86_64-linux = fetchzip {
|
||||
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
|
||||
sha256 = "sha256-C6R7/ucQhMsugg7qT+B8OG77AMOx2nmZlVAQcxAfpmc=";
|
||||
sha256 = "sha256-id8pdkTphi3J0ZG88K7oc/O6OwAvmWyFEs9kMbleSFs=";
|
||||
};
|
||||
|
||||
x86_64-darwin = fetchzip {
|
||||
url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
|
||||
sha256 = "sha256-l0K9Ha+0KqVqNQOSouT2rwRRi4YoIjMNnZnmBY8Loa8=";
|
||||
sha256 = "sha256-dwPKIXOQB3lixvMBJJRrRSamYRoC9n1rjcqi542dA44=";
|
||||
};
|
||||
|
||||
aarch64-darwin = srcs.x86_64-darwin;
|
||||
|
|
|
|||
|
|
@ -240,7 +240,7 @@ rec {
|
|||
# Unpack all of the parent layers into the image.
|
||||
lowerdir=""
|
||||
extractionID=0
|
||||
for layerTar in $(tac layer-list); do
|
||||
for layerTar in $(cat layer-list); do
|
||||
echo "Unpacking layer $layerTar"
|
||||
extractionID=$((extractionID + 1))
|
||||
|
||||
|
|
|
|||
|
|
@ -405,6 +405,29 @@ rec {
|
|||
created = "now";
|
||||
};
|
||||
|
||||
# 23. Ensure that layers are unpacked in the correct order before the
|
||||
# runAsRoot script is executed.
|
||||
layersUnpackOrder =
|
||||
let
|
||||
layerOnTopOf = parent: layerName:
|
||||
pkgs.dockerTools.buildImage {
|
||||
name = "layers-unpack-order-${layerName}";
|
||||
tag = "latest";
|
||||
fromImage = parent;
|
||||
contents = [ pkgs.coreutils ];
|
||||
runAsRoot = ''
|
||||
#!${pkgs.runtimeShell}
|
||||
echo -n "${layerName}" >> /layer-order
|
||||
'';
|
||||
};
|
||||
# When executing the runAsRoot script when building layer C, if layer B is
|
||||
# not unpacked on top of layer A, the contents of /layer-order will not be
|
||||
# "ABC".
|
||||
layerA = layerOnTopOf null "a";
|
||||
layerB = layerOnTopOf layerA "b";
|
||||
layerC = layerOnTopOf layerB "c";
|
||||
in layerC;
|
||||
|
||||
# buildImage without explicit tag
|
||||
bashNoTag = pkgs.dockerTools.buildImage {
|
||||
name = "bash-no-tag";
|
||||
|
|
|
|||
|
|
@ -21,15 +21,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-videos";
|
||||
version = "2.8.0";
|
||||
|
||||
repoName = "videos";
|
||||
version = "2.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = repoName;
|
||||
repo = "videos";
|
||||
rev = version;
|
||||
sha256 = "sha256-FFCtQ42LygfjowehwZcISWTfv8PBZTH0X8mPrpiG8Ug=";
|
||||
sha256 = "sha256-Ki6i9u+oXOBTH+dVJ9RgBxszD7Wvdrfahd9abyjFYJY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,23 +4,37 @@
|
|||
lib.makeScope pkgs.newScope (self: with self; {
|
||||
|
||||
switchboardPlugs = [
|
||||
switchboard-plug-a11y switchboard-plug-about
|
||||
switchboard-plug-applications switchboard-plug-bluetooth
|
||||
switchboard-plug-datetime switchboard-plug-display
|
||||
switchboard-plug-keyboard switchboard-plug-mouse-touchpad
|
||||
switchboard-plug-network switchboard-plug-notifications
|
||||
switchboard-plug-onlineaccounts switchboard-plug-pantheon-shell
|
||||
switchboard-plug-power switchboard-plug-printers
|
||||
switchboard-plug-security-privacy switchboard-plug-sharing
|
||||
switchboard-plug-sound switchboard-plug-wacom
|
||||
switchboard-plug-a11y
|
||||
switchboard-plug-about
|
||||
switchboard-plug-applications
|
||||
switchboard-plug-bluetooth
|
||||
switchboard-plug-datetime
|
||||
switchboard-plug-display
|
||||
switchboard-plug-keyboard
|
||||
switchboard-plug-mouse-touchpad
|
||||
switchboard-plug-network
|
||||
switchboard-plug-notifications
|
||||
switchboard-plug-onlineaccounts
|
||||
switchboard-plug-pantheon-shell
|
||||
switchboard-plug-power
|
||||
switchboard-plug-printers
|
||||
switchboard-plug-security-privacy
|
||||
switchboard-plug-sharing
|
||||
switchboard-plug-sound
|
||||
switchboard-plug-wacom
|
||||
];
|
||||
|
||||
wingpanelIndicators = [
|
||||
wingpanel-applications-menu wingpanel-indicator-a11y
|
||||
wingpanel-indicator-bluetooth wingpanel-indicator-datetime
|
||||
wingpanel-indicator-keyboard wingpanel-indicator-network
|
||||
wingpanel-indicator-nightlight wingpanel-indicator-notifications
|
||||
wingpanel-indicator-power wingpanel-indicator-session
|
||||
wingpanel-applications-menu
|
||||
wingpanel-indicator-a11y
|
||||
wingpanel-indicator-bluetooth
|
||||
wingpanel-indicator-datetime
|
||||
wingpanel-indicator-keyboard
|
||||
wingpanel-indicator-network
|
||||
wingpanel-indicator-nightlight
|
||||
wingpanel-indicator-notifications
|
||||
wingpanel-indicator-power
|
||||
wingpanel-indicator-session
|
||||
wingpanel-indicator-sound
|
||||
];
|
||||
|
||||
|
|
@ -33,8 +47,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
|
||||
elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { };
|
||||
|
||||
notes-up = pkgs.notes-up.override { withPantheon = true; };
|
||||
|
||||
touchegg = pkgs.touchegg.override { withPantheon = true; };
|
||||
|
||||
#### APPS
|
||||
|
|
@ -129,6 +141,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
|
||||
pantheon-agent-polkit = callPackage ./services/pantheon-agent-polkit { };
|
||||
|
||||
xdg-desktop-portal-pantheon = callPackage ./services/xdg-desktop-portal-pantheon { };
|
||||
|
||||
#### WINGPANEL INDICATORS
|
||||
|
||||
wingpanel-applications-menu = callPackage ./desktop/wingpanel-indicators/applications-menu { };
|
||||
|
|
@ -211,6 +225,13 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
|
||||
elementary-wallpapers = callPackage ./artwork/elementary-wallpapers { };
|
||||
|
||||
### THIRD-PARTY
|
||||
|
||||
# Put packages that ONLY works with Pantheon in pkgs/desktops/pantheon/third-party,
|
||||
# specfically third party switchboard plugins and wingpanel indicators.
|
||||
# Please call these packages in pkgs/top-level/all-packages.nix instead of this file.
|
||||
# https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654
|
||||
|
||||
} // lib.optionalAttrs (config.allowAliases or true) {
|
||||
|
||||
### ALIASES
|
||||
|
|
@ -223,4 +244,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
|
||||
extra-elementary-contracts = throw "extra-elementary-contracts has been removed as all contracts have been upstreamed."; # added 2021-12-01
|
||||
|
||||
inherit (pkgs) notes-up; # added 2021-12-18
|
||||
|
||||
})
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wingpanel-indicator-notifications";
|
||||
version = "6.0.3";
|
||||
version = "6.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-iHhZJwaomQgH1Sal8uejl4QlavOQ75UKZ9xchTi1X3U=";
|
||||
sha256 = "sha256-tIpR/WIhE0Mmt2EploNNDVlAX4OUNI3VnEflTLVkfSo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@
|
|||
, vala
|
||||
, wrapGAppsHook
|
||||
, glib
|
||||
, granite
|
||||
, gtk3
|
||||
, libhandy
|
||||
, pantheon
|
||||
, systemd
|
||||
, vte
|
||||
}:
|
||||
|
|
@ -36,9 +36,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
glib
|
||||
granite
|
||||
gtk3
|
||||
libhandy
|
||||
pantheon.granite
|
||||
systemd
|
||||
vte
|
||||
];
|
||||
|
|
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
58
pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix
vendored
Normal file
58
pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix
vendored
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, substituteAll
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, vala
|
||||
, gtk3
|
||||
, libindicator-gtk3
|
||||
, pantheon
|
||||
, indicator-application-gtk3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wingpanel-indicator-ayatana";
|
||||
version = "unstable-2021-12-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lafydev";
|
||||
repo = pname;
|
||||
rev = "53dc05919cdba772c787620a4bee5821e38c53cd";
|
||||
sha256 = "sha256-T0OHzqENyeAr0pvXUaRMwF1RpwKVyDAF5P5G9S28COU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes install path for wingpanel indicator
|
||||
# https://github.com/Lafydev/wingpanel-indicator-ayatana/pull/30
|
||||
./fix-indicator-dir.patch
|
||||
# Tells the indicator the path for libapplication.so
|
||||
(substituteAll {
|
||||
src = ./fix-libapplication-dir.patch;
|
||||
indicator_application = indicator-application-gtk3;
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
vala
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
libindicator-gtk3
|
||||
pantheon.granite
|
||||
pantheon.wingpanel
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Ayatana Compatibility Indicator for Wingpanel";
|
||||
homepage = "https://github.com/Lafydev/wingpanel-indicator-ayatana";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.pantheon.members;
|
||||
};
|
||||
}
|
||||
16
pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-indicator-dir.patch
vendored
Normal file
16
pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-indicator-dir.patch
vendored
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
diff --git a/meson.build b/meson.build
|
||||
index 4aeab2b..dc44e6c 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -25,8 +25,10 @@ dependencies = {
|
||||
'wingpanel': wingpanel
|
||||
}
|
||||
|
||||
+libdir = join_paths(get_option('prefix'), get_option('libdir'))
|
||||
+
|
||||
indicator_name = 'ayatana'
|
||||
-indicator_dir = dependencies['wingpanel'].get_pkgconfig_variable('indicatorsdir')
|
||||
+indicator_dir = dependencies['wingpanel'].get_pkgconfig_variable('indicatorsdir', define_variable: ['libdir', libdir])
|
||||
|
||||
# ----------------------------------------------------------------------------------------------------------------------
|
||||
# Bindings:
|
||||
13
pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-libapplication-dir.patch
vendored
Normal file
13
pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-libapplication-dir.patch
vendored
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/src/IndicatorFactory.vala b/src/IndicatorFactory.vala
|
||||
index 9411de0..632d83b 100644
|
||||
--- a/src/IndicatorFactory.vala
|
||||
+++ b/src/IndicatorFactory.vala
|
||||
@@ -24,7 +24,7 @@ public class AyatanaCompatibility.IndicatorFactory : Object, IndicatorLoader {
|
||||
public Gee.Collection<IndicatorIface> get_indicators () {
|
||||
if (indicators == null) {
|
||||
indicators = new Gee.LinkedList<IndicatorIface> ();
|
||||
- load_indicator (File.new_for_path (Constants.AYATANA_INDICATOR_DIR), "libapplication.so");
|
||||
+ load_indicator (File.new_for_path ("@indicator_application@/lib/indicators3/7/"), "libapplication.so");
|
||||
}
|
||||
|
||||
return indicators.read_only_view;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, giflib, libXpm }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, SDL, libpng, libjpeg, libtiff, giflib, libXpm, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "SDL_image";
|
||||
|
|
@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
|
|||
"--disable-tif-shared"
|
||||
] ++ lib.optional stdenv.isDarwin "--disable-sdltest";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ SDL libpng libjpeg libtiff giflib libXpm ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, lib, fetchurl
|
||||
, SDL, libogg, libvorbis, smpeg, libmikmod
|
||||
, fluidsynth
|
||||
, fluidsynth, pkg-config
|
||||
, enableNativeMidi ? false
|
||||
}:
|
||||
|
||||
|
|
@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ SDL libogg libvorbis fluidsynth smpeg libmikmod ];
|
||||
|
||||
configureFlags = [ "--disable-music-ogg-shared" "--disable-music-mod-shared" ]
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, SDL }:
|
||||
{ lib, stdenv, fetchurl, SDL, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "SDL_net";
|
||||
|
|
@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
propagatedBuildInputs = [ SDL ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
, docutils
|
||||
, doxygen
|
||||
, graphviz
|
||||
, valgrind
|
||||
, glib
|
||||
, dbus
|
||||
, alsa-lib
|
||||
|
|
@ -28,28 +27,30 @@
|
|||
, makeFontsConf
|
||||
, callPackage
|
||||
, nixosTests
|
||||
, withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind
|
||||
, valgrind
|
||||
, withMediaSession ? true
|
||||
, libcameraSupport ? true
|
||||
, libcamera
|
||||
, libdrm
|
||||
, gstreamerSupport ? true
|
||||
, gst_all_1 ? null
|
||||
, gst_all_1
|
||||
, ffmpegSupport ? true
|
||||
, ffmpeg ? null
|
||||
, ffmpeg
|
||||
, bluezSupport ? true
|
||||
, bluez ? null
|
||||
, sbc ? null
|
||||
, libfreeaptx ? null
|
||||
, ldacbt ? null
|
||||
, fdk_aac ? null
|
||||
, bluez
|
||||
, sbc
|
||||
, libfreeaptx
|
||||
, ldacbt
|
||||
, fdk_aac
|
||||
, nativeHspSupport ? true
|
||||
, nativeHfpSupport ? true
|
||||
, ofonoSupport ? true
|
||||
, hsphfpdSupport ? true
|
||||
, pulseTunnelSupport ? true
|
||||
, libpulseaudio ? null
|
||||
, libpulseaudio
|
||||
, zeroconfSupport ? true
|
||||
, avahi ? null
|
||||
, avahi
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -121,7 +122,6 @@ let
|
|||
vulkan-headers
|
||||
vulkan-loader
|
||||
webrtc-audio-processing
|
||||
valgrind
|
||||
SDL2
|
||||
systemd
|
||||
] ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ]
|
||||
|
|
@ -131,6 +131,9 @@ let
|
|||
++ lib.optional pulseTunnelSupport libpulseaudio
|
||||
++ lib.optional zeroconfSupport avahi;
|
||||
|
||||
# Valgrind binary is required for running one optional test.
|
||||
checkInputs = lib.optional withValgrind valgrind;
|
||||
|
||||
mesonFlags = [
|
||||
"-Ddocs=enabled"
|
||||
"-Dudevrulesdir=lib/udev/rules.d"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, setuptools-scm
|
||||
, substituteAll
|
||||
, cmake
|
||||
|
|
@ -14,12 +13,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "blspy";
|
||||
version = "1.0.6";
|
||||
version = "1.0.8";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-sULXnecEs8VI687pR9EK9jjYWlrB4tV4dt7Kzekaxb4=";
|
||||
hash = "sha256-yKLirwWWeUTs5BFXZfqfuNJUXtQW40EiNPxuP+FeHso=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -40,12 +39,12 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-lGz7o6DQVAuEc7yTp8bYS2kwjzHwGaNjugDi1ruRJOA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
})
|
||||
|
||||
# avoid dynamic linking error at import time
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Chia-Network/bls-signatures/pull/287/commits/797241e9dae1c164c862cbdb38c865d4b124a601.patch";
|
||||
sha256 = "sha256-tlc4aA75gUxt5OaSNZqIlO//PXjmddVgVLYuVEFNmkE=";
|
||||
catch2_src = fetchFromGitHub {
|
||||
owner = "catchorg";
|
||||
repo = "Catch2";
|
||||
rev = "v2.13.7"; # pinned by blspy
|
||||
sha256 = "NhZ8Hh7dka7KggEKKZyEbIZahuuTYeCT7cYYSUvkPzI=";
|
||||
};
|
||||
})
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -48,3 +48,17 @@ index 5a8c381..d9aa940 100644
|
|||
)
|
||||
FetchContent_MakeAvailable(pybind11 relic)
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 449164a..15a955e 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -37,8 +37,7 @@ install(FILES $<TARGET_FILE:bls> DESTINATION lib)
|
||||
if(BUILD_BLS_TESTS)
|
||||
FetchContent_Declare(
|
||||
Catch2
|
||||
- GIT_REPOSITORY https://github.com/catchorg/Catch2.git
|
||||
- GIT_TAG v2.13.7
|
||||
+ URL @catch2_src@
|
||||
)
|
||||
FetchContent_MakeAvailable(Catch2)
|
||||
add_executable(runtest test.cpp)
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "casbin";
|
||||
version = "1.15.1";
|
||||
version = "1.15.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = "pycasbin";
|
||||
rev = "v${version}";
|
||||
sha256 = "1majsbpldsch3wgg7pdm87vk9dhqll9nk2pjjvqp8rvg93x2kkww";
|
||||
sha256 = "0mrk6b16f4ds666qa4884kjjbmb55kpfvvqsznfmyg9iii6dir50";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-requests";
|
||||
version = "2.26.1";
|
||||
version = "2.26.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-CJPhEuFRC7tn9TeUHJIZLedHLlG/fyNuDlg4ZvDtkz4=";
|
||||
sha256 = "0e22d9cdeff4c3eb068eb883d59b127c98d80525f3d0412a1c4499c6ae1f711e";
|
||||
};
|
||||
|
||||
# Module doesn't have tests
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-script";
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fornwall";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-B/xh0eYRJxjjIEXdxmLz6usQvo4v/HQK5VNnnjcDBjM=";
|
||||
sha256 = "sha256-CYeTt6PzVGu62/GJB+gUlOXG2bs4RV0LWECF4CN3Uic=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-7qMrrs6K+mJVDHNkGQDb6abM18RyBPToseTNM7ogdQ0=";
|
||||
cargoSha256 = "sha256-IUzaVeOTBAOo/jkDytk6qc7VatKX75l1yZy99iSIqyE=";
|
||||
|
||||
# tests require network access
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub }:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "treefmt";
|
||||
version = "0.2.6";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numtide";
|
||||
repo = "treefmt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hnrMy8iYoaeWxZlhO9L1kQW3OgL6jHL1MxJpbNFLHZk=";
|
||||
sha256 = "sha256-PTT87Na4KpyN6a7T49vHHhSqSOF6JSWr5/jiys1Uzko=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-O7Ma6+Vniil5hIDd5JCWecTvkAjq7wMuuyfrzePDDq4=";
|
||||
cargoSha256 = "sha256-Gvr6Zjd9Gvn2CyjNHlJaKPFYUViPezRwoDBeVelRlkU=";
|
||||
|
||||
meta = {
|
||||
description = "one CLI to format the code tree";
|
||||
|
|
|
|||
|
|
@ -4,8 +4,7 @@
|
|||
, autoreconfHook
|
||||
, pkg-config
|
||||
, mednafen
|
||||
, gtk2 ? null
|
||||
, gtk3 ? null
|
||||
, gtk3
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
|
|
@ -21,16 +20,11 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ];
|
||||
buildInputs = [ gtk2 gtk3 mednafen ];
|
||||
|
||||
configureFlags = [ (lib.enableFeature (gtk3 != null) "gtk3") ];
|
||||
|
||||
dontWrapGApps = true;
|
||||
buildInputs = [ gtk3 mednafen ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/mednaffe \
|
||||
--prefix PATH ':' "${mednafen}/bin" \
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
--prefix PATH ':' "${mednafen}/bin"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -135,8 +135,8 @@ let
|
|||
mktplcRef = {
|
||||
publisher = "antfu";
|
||||
name = "slidev";
|
||||
version = "0.3.2";
|
||||
sha256 = "sha256-vzmByEiKZIkd707Bs4RGQrMII5sghYlkQI6aAJOHFcY=";
|
||||
version = "0.3.3";
|
||||
sha256 = "0pqiwcvn5c8kwqlmz4ribwwra69gbiqvz41ig4fh29hkyh078rfk";
|
||||
};
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
{ lib, stdenv, dpkg, fetchurl }:
|
||||
{ lib, stdenv, dpkg, fetchurl, zip, nixosTests }:
|
||||
|
||||
let
|
||||
generic = { version, sha256, suffix ? "" }:
|
||||
stdenv.mkDerivation {
|
||||
generic = { version, sha256, suffix ? "", ... } @ args:
|
||||
stdenv.mkDerivation (args // {
|
||||
pname = "unifi-controller";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.ubnt.com/unifi/${version}${suffix}/unifi_sysvinit_all.deb";
|
||||
|
|
@ -29,6 +28,10 @@ let
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
unifi = nixosTests.unifi;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.ubnt.com/";
|
||||
description = "Controller for Ubiquiti UniFi access points";
|
||||
|
|
@ -36,7 +39,7 @@ let
|
|||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ erictapen globin patryk27 pennae ];
|
||||
};
|
||||
};
|
||||
});
|
||||
|
||||
in rec {
|
||||
# see https://community.ui.com/releases / https://www.ui.com/download/unifi
|
||||
|
|
@ -49,6 +52,11 @@ in rec {
|
|||
unifi5 = generic {
|
||||
version = "5.14.23";
|
||||
sha256 = "1aar05yjm3z5a30x505w4kakbyz35i7mk7xyg0wm4ml6h94d84pv";
|
||||
|
||||
postInstall = ''
|
||||
# Remove when log4j is updated to 2.12.2 or 2.16.0.
|
||||
${zip}/bin/zip -q -d $out/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class
|
||||
'';
|
||||
};
|
||||
|
||||
unifi6 = generic {
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
#TODO:doc output
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/zdharma/zinit";
|
||||
homepage = "https://github.com/zdharma-continuum/zinit";
|
||||
description = "Flexible zsh plugin manager";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ pasqui23 sei40kr ];
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
, fpc
|
||||
, lazarus-qt
|
||||
, wrapQtAppsHook
|
||||
, breeze-qt5
|
||||
, libGL
|
||||
, libGLU
|
||||
, libqt5pas
|
||||
|
|
@ -37,13 +38,13 @@ let
|
|||
'';
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "goverlay";
|
||||
version = "0.7";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "benjamimgois";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-LdpgEfCNbf0/sY8v8D3KiapYEd23tVy4nQ7RuGwl7jM=";
|
||||
sha256 = "sha256-oXkGrMHjs8uui0pzGYW8jnttet/5IX0r8eat0n5saFk=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
|
@ -68,6 +69,7 @@ in stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
breeze-qt5
|
||||
libGL
|
||||
libGLU
|
||||
libqt5pas
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/overlayunit.pas b/overlayunit.pas
|
||||
index 537491b..744f604 100644
|
||||
index 97a088d..4c42414 100644
|
||||
--- a/overlayunit.pas
|
||||
+++ b/overlayunit.pas
|
||||
@@ -5011,7 +5011,7 @@ begin
|
||||
@@ -5007,7 +5007,7 @@ begin
|
||||
//Determine Mangohud dependency status
|
||||
|
||||
//locate MangoHud and store result in tmp folder
|
||||
|
|
@ -11,7 +11,7 @@ index 537491b..744f604 100644
|
|||
|
||||
// Assign Text file dependency_mangohud to variable mangohudVAR
|
||||
AssignFile(mangohudVAR, '/tmp/goverlay/dependency_mangohud');
|
||||
@@ -5020,7 +5020,7 @@ begin
|
||||
@@ -5016,7 +5016,7 @@ begin
|
||||
CloseFile(mangohudVAR);
|
||||
|
||||
// Read String and store value on mangohuddependencyVALUE based on result
|
||||
|
|
@ -20,7 +20,7 @@ index 537491b..744f604 100644
|
|||
mangohuddependencyVALUE := 1
|
||||
else
|
||||
mangohuddependencyVALUE := 0;
|
||||
@@ -5029,7 +5029,7 @@ begin
|
||||
@@ -5025,7 +5025,7 @@ begin
|
||||
//Determine vkBasalt dependency staus
|
||||
|
||||
//locate vkBasalt and store result in tmp folder
|
||||
|
|
@ -29,7 +29,7 @@ index 537491b..744f604 100644
|
|||
|
||||
// Assign Text file dependency_mangohud to variable mangohudVAR
|
||||
AssignFile(vkbasaltVAR, '/tmp/goverlay/dependency_vkbasalt');
|
||||
@@ -5038,7 +5038,7 @@ begin
|
||||
@@ -5034,7 +5034,7 @@ begin
|
||||
CloseFile(vkbasaltVAR);
|
||||
|
||||
// Read String and store value on vkbasaltdependencyVALUE based on result
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ lib, stdenv, fetchFromGitHub } :
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, netpbm
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fbcat";
|
||||
|
|
@ -11,17 +15,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-ORzcd8XGy2BfwuPK5UX+K5Z+FYkb+tdg/gHl3zHjvbk=";
|
||||
};
|
||||
|
||||
# hardcoded because makefile target "install" depends on libxslt dependencies from network
|
||||
# that are just too hard to monkeypatch here
|
||||
# so this is the simple fix.
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
install -d $out/bin
|
||||
install -m755 fbcat $out/bin/
|
||||
install -m755 fbgrab $out/bin/
|
||||
install -d $out/share/man/man1
|
||||
postPatch = ''
|
||||
substituteInPlace fbgrab \
|
||||
--replace 'pnmtopng' '${netpbm}/bin/pnmtopng' \
|
||||
--replace 'fbcat' "$out/bin/fbcat"
|
||||
'';
|
||||
|
||||
installFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://jwilk.net/software/fbcat";
|
||||
description = "Framebuffer screenshot tool";
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenv, fetchFromGitHub, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.9.18";
|
||||
version = "0.9.19";
|
||||
pname = "smenu";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "p-gen";
|
||||
repo = "smenu";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8ALY3dsUEJxGsDnYTOxNAmJbwmmZIV8GuHjNg0vPFUQ=";
|
||||
sha256 = "sha256-0ZA8Op1IMZMJ7g1waK2uOYOCDfqPfiqnnjopGtBW1w8=";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, fetchFromGitHub, fetchurl, linkFarm, buildGoModule, runCommand, makeWrapper, nixosTests
|
||||
, assetOverrides ? {}
|
||||
{ lib, fetchFromGitHub, fetchurl, symlinkJoin, buildGoModule, runCommand, makeWrapper, nixosTests
|
||||
, v2ray-geoip, v2ray-domain-list-community, assets ? [ v2ray-geoip v2ray-domain-list-community ]
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -14,30 +14,10 @@ let
|
|||
|
||||
vendorSha256 = "sha256-7zSIAKcMwtaTvokKuLJ8orqJc2jGuaw5FglEJadeZ9I=";
|
||||
|
||||
assets = {
|
||||
# MIT licensed
|
||||
"geoip.dat" = let
|
||||
geoipRev = "202109300030";
|
||||
geoipSha256 = "1d2z3ljs0v9rd10cfj8cpiijz3ikkplsymr44f7y90g4dmniwqh0";
|
||||
in fetchurl {
|
||||
url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat";
|
||||
sha256 = geoipSha256;
|
||||
};
|
||||
|
||||
# MIT licensed
|
||||
"geosite.dat" = let
|
||||
geositeRev = "20211001023210";
|
||||
geositeSha256 = "02d55i1pdndwvmi4v42hnncjng517s0k06gr3yn5krnj2qfjli2w";
|
||||
in fetchurl {
|
||||
url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat";
|
||||
sha256 = geositeSha256;
|
||||
};
|
||||
|
||||
} // assetOverrides;
|
||||
|
||||
assetsDrv = linkFarm "v2ray-assets" (lib.mapAttrsToList (name: path: {
|
||||
inherit name path;
|
||||
}) assets);
|
||||
assetsDrv = symlinkJoin {
|
||||
name = "v2ray-assets";
|
||||
paths = assets;
|
||||
};
|
||||
|
||||
core = buildGoModule rec {
|
||||
pname = "v2ray-core";
|
||||
|
|
@ -84,6 +64,6 @@ in runCommand "v2ray-${version}" {
|
|||
} ''
|
||||
for file in ${core}/bin/*; do
|
||||
makeWrapper "$file" "$out/bin/$(basename "$file")" \
|
||||
--set-default V2RAY_LOCATION_ASSET ${assetsDrv}
|
||||
--set-default V2RAY_LOCATION_ASSET ${assetsDrv}/share/v2ray
|
||||
done
|
||||
''
|
||||
|
|
|
|||
|
|
@ -8,10 +8,8 @@ deps_nix=./deps.nix
|
|||
nixpkgs=../../../..
|
||||
|
||||
old_core_rev=$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$version_nix")
|
||||
old_geoip_rev=$(sed -En 's/.*\bgeoipRev = "(.*?)".*/\1/p' "$version_nix")
|
||||
old_geosite_rev=$(sed -En 's/.*\bgeositeRev = "(.*?)".*/\1/p' "$version_nix")
|
||||
echo "Current version:" >&2
|
||||
echo "core: $old_core_rev, geoip: $old_geoip_rev, geosite: $old_geosite_rev" >&2
|
||||
echo "core: $old_core_rev" >&2
|
||||
|
||||
function fetch_latest_rev {
|
||||
curl "https://api.github.com/repos/v2fly/$1/releases" |
|
||||
|
|
@ -20,10 +18,8 @@ function fetch_latest_rev {
|
|||
|
||||
core_rev=$(fetch_latest_rev 'v2ray-core')
|
||||
core_rev=${core_rev:1}
|
||||
geoip_rev=$(fetch_latest_rev 'geoip')
|
||||
geosite_rev=$(fetch_latest_rev 'domain-list-community')
|
||||
echo "Latest version:" >&2
|
||||
echo "core: $core_rev, geoip: $geoip_rev, geosite: $geosite_rev" >&2
|
||||
echo "core: $core_rev" >&2
|
||||
|
||||
if [[ $core_rev != $old_core_rev ]]; then
|
||||
echo "Prefetching core..." >&2
|
||||
|
|
@ -38,24 +34,6 @@ if [[ $core_rev != $old_core_rev ]]; then
|
|||
"$version_nix"
|
||||
fi
|
||||
|
||||
if [[ $geoip_rev != $old_geoip_rev ]]; then
|
||||
echo "Prefetching geoip..." >&2
|
||||
hash=$(nix-prefetch-url "https://github.com/v2fly/geoip/releases/download/$geoip_rev/geoip.dat")
|
||||
sed --in-place \
|
||||
-e "s/\bgeoipRev = \".*\"/geoipRev = \"$geoip_rev\"/" \
|
||||
-e "s/\bgeoipSha256 = \".*\"/geoipSha256 = \"$hash\"/" \
|
||||
"$version_nix"
|
||||
fi
|
||||
|
||||
if [[ $geosite_rev != $old_geosite_rev ]]; then
|
||||
echo "Prefetching geosite..." >&2
|
||||
hash=$(nix-prefetch-url "https://github.com/v2fly/domain-list-community/releases/download/$geosite_rev/dlc.dat")
|
||||
sed --in-place \
|
||||
-e "s/\bgeositeRev = \".*\"/geositeRev = \"$geosite_rev\"/" \
|
||||
-e "s/\bgeositeSha256 = \".*\"/geositeSha256 = \"$hash\"/" \
|
||||
"$version_nix"
|
||||
fi
|
||||
|
||||
echo "Prebuilding..." >&2
|
||||
set +o pipefail
|
||||
vendorSha256=$(
|
||||
|
|
|
|||
|
|
@ -30,11 +30,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tor";
|
||||
version = "0.4.6.8";
|
||||
version = "0.4.6.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dist.torproject.org/${pname}-${version}.tar.gz";
|
||||
sha256 = "0sj7qn6d6js6gk4vjfkc7p9g021czbfaq00yfq3mn5ycnhvimkhm";
|
||||
sha256 = "1ad99k4wysxrnlaprv7brxr2nc0h5zdnrh0rma10pqlck2037sf7";
|
||||
};
|
||||
|
||||
outputs = [ "out" "geoip" ];
|
||||
|
|
|
|||
|
|
@ -6010,6 +6010,7 @@ with pkgs;
|
|||
|
||||
goverlay = callPackage ../tools/graphics/goverlay {
|
||||
inherit (qt5) wrapQtAppsHook;
|
||||
inherit (plasma5Packages) breeze-qt5;
|
||||
};
|
||||
|
||||
gpart = callPackage ../tools/filesystems/gpart { };
|
||||
|
|
@ -7680,9 +7681,7 @@ with pkgs;
|
|||
|
||||
mednafen-server = callPackage ../misc/emulators/mednafen/server.nix { };
|
||||
|
||||
mednaffe = callPackage ../misc/emulators/mednaffe {
|
||||
gtk2 = null;
|
||||
};
|
||||
mednaffe = callPackage ../misc/emulators/mednaffe { };
|
||||
|
||||
megacli = callPackage ../tools/misc/megacli { };
|
||||
|
||||
|
|
@ -8519,7 +8518,7 @@ with pkgs;
|
|||
|
||||
pamtester = callPackage ../tools/security/pamtester { };
|
||||
|
||||
pantheon-tweaks = callPackage ../applications/system/pantheon-tweaks { };
|
||||
pantheon-tweaks = callPackage ../desktops/pantheon/third-party/pantheon-tweaks { };
|
||||
|
||||
paperless-ng = callPackage ../applications/office/paperless-ng { };
|
||||
|
||||
|
|
@ -11003,6 +11002,8 @@ with pkgs;
|
|||
|
||||
chase = callPackage ../tools/system/chase { };
|
||||
|
||||
wingpanel-indicator-ayatana = callPackage ../desktops/pantheon/third-party/wingpanel-indicator-ayatana { };
|
||||
|
||||
wimlib = callPackage ../tools/archivers/wimlib { };
|
||||
|
||||
wipe = callPackage ../tools/security/wipe { };
|
||||
|
|
@ -29517,8 +29518,6 @@ with pkgs;
|
|||
|
||||
xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { };
|
||||
|
||||
xdg-desktop-portal-pantheon = callPackage ../development/libraries/xdg-desktop-portal-pantheon { };
|
||||
|
||||
xdg-desktop-portal-wlr = callPackage ../development/libraries/xdg-desktop-portal-wlr { };
|
||||
|
||||
xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue