Merge master into staging-next
This commit is contained in:
commit
6620842e30
|
@ -102,17 +102,19 @@ in
|
|||
# Taken from: https://github.com/oauth2-proxy/oauth2-proxy/blob/master/providers/providers.go
|
||||
provider = mkOption {
|
||||
type = types.enum [
|
||||
"google"
|
||||
"adfs"
|
||||
"azure"
|
||||
"bitbucket"
|
||||
"digitalocean"
|
||||
"facebook"
|
||||
"github"
|
||||
"keycloak"
|
||||
"gitlab"
|
||||
"google"
|
||||
"keycloak"
|
||||
"keycloak-oidc"
|
||||
"linkedin"
|
||||
"login.gov"
|
||||
"bitbucket"
|
||||
"nextcloud"
|
||||
"digitalocean"
|
||||
"oidc"
|
||||
];
|
||||
default = "google";
|
||||
|
|
|
@ -521,6 +521,7 @@ in
|
|||
telegraf = handleTest ./telegraf.nix {};
|
||||
teleport = handleTest ./teleport.nix {};
|
||||
thelounge = handleTest ./thelounge.nix {};
|
||||
terminal-emulators = handleTest ./terminal-emulators.nix {};
|
||||
tiddlywiki = handleTest ./tiddlywiki.nix {};
|
||||
tigervnc = handleTest ./tigervnc.nix {};
|
||||
timezone = handleTest ./timezone.nix {};
|
||||
|
|
207
nixos/tests/terminal-emulators.nix
Normal file
207
nixos/tests/terminal-emulators.nix
Normal file
|
@ -0,0 +1,207 @@
|
|||
# Terminal emulators all present a pretty similar interface.
|
||||
# That gives us an opportunity to easily test their basic functionality with a single codebase.
|
||||
#
|
||||
# There are two tests run on each terminal emulator
|
||||
# - can it successfully execute a command passed on the cmdline?
|
||||
# - can it successfully display a colour?
|
||||
# the latter is used as a proxy for "can it display text?", without going through all the intricacies of OCR.
|
||||
#
|
||||
# 256-colour terminal mode is used to display the test colour, since it has a universally-applicable palette (unlike 8- and 16- colour, where the colours are implementation-defined), and it is widely supported (unlike 24-bit colour).
|
||||
#
|
||||
# Future work:
|
||||
# - Wayland support (both for testing the existing terminals, and for testing wayland-only terminals like foot and havoc)
|
||||
# - Test keyboard input? (skipped for now, to eliminate the possibility of race conditions and focus issues)
|
||||
|
||||
{ system ? builtins.currentSystem,
|
||||
config ? {},
|
||||
pkgs ? import ../.. { inherit system config; }
|
||||
}:
|
||||
|
||||
with import ../lib/testing-python.nix { inherit system pkgs; };
|
||||
with pkgs.lib;
|
||||
|
||||
let tests = {
|
||||
alacritty.pkg = p: p.alacritty;
|
||||
|
||||
contour.pkg = p: p.contour;
|
||||
contour.cmd = "contour $command";
|
||||
|
||||
cool-retro-term.pkg = p: p.cool-retro-term;
|
||||
cool-retro-term.colourTest = false; # broken by gloss effect
|
||||
|
||||
ctx.pkg = p: p.ctx;
|
||||
ctx.pinkValue = "#FE0065";
|
||||
|
||||
darktile.pkg = p: p.darktile;
|
||||
|
||||
eterm.pkg = p: p.eterm;
|
||||
eterm.executable = "Eterm";
|
||||
eterm.pinkValue = "#D40055";
|
||||
|
||||
germinal.pkg = p: p.germinal;
|
||||
|
||||
gnome-terminal.pkg = p: p.gnome.gnome-terminal;
|
||||
|
||||
guake.pkg = p: p.guake;
|
||||
guake.cmd = "SHELL=$command guake --show";
|
||||
guake.kill = true;
|
||||
|
||||
hyper.pkg = p: p.hyper;
|
||||
|
||||
kermit.pkg = p: p.kermit-terminal;
|
||||
|
||||
kgx.pkg = p: p.kgx;
|
||||
kgx.cmd = "kgx -e $command";
|
||||
kgx.kill = true;
|
||||
|
||||
kitty.pkg = p: p.kitty;
|
||||
kitty.cmd = "kitty $command";
|
||||
|
||||
konsole.pkg = p: p.plasma5Packages.konsole;
|
||||
|
||||
lxterminal.pkg = p: p.lxterminal;
|
||||
|
||||
mate-terminal.pkg = p: p.mate.mate-terminal;
|
||||
mate-terminal.cmd = "SHELL=$command mate-terminal --disable-factory"; # factory mode uses dbus, and we don't have a proper dbus session set up
|
||||
|
||||
mlterm.pkg = p: p.mlterm;
|
||||
|
||||
mrxvt.pkg = p: p.mrxvt;
|
||||
|
||||
qterminal.pkg = p: p.lxqt.qterminal;
|
||||
qterminal.kill = true;
|
||||
|
||||
roxterm.pkg = p: p.roxterm;
|
||||
roxterm.cmd = "roxterm -e $command";
|
||||
|
||||
sakura.pkg = p: p.sakura;
|
||||
|
||||
st.pkg = p: p.st;
|
||||
st.kill = true;
|
||||
|
||||
stupidterm.pkg = p: p.stupidterm;
|
||||
stupidterm.cmd = "stupidterm -- $command";
|
||||
|
||||
terminator.pkg = p: p.terminator;
|
||||
terminator.cmd = "terminator -e $command";
|
||||
|
||||
terminology.pkg = p: p.enlightenment.terminology;
|
||||
terminology.cmd = "SHELL=$command terminology --no-wizard=true";
|
||||
terminology.colourTest = false; # broken by gloss effect
|
||||
|
||||
termite.pkg = p: p.termite;
|
||||
|
||||
termonad.pkg = p: p.termonad;
|
||||
|
||||
tilda.pkg = p: p.tilda;
|
||||
|
||||
tilix.pkg = p: p.tilix;
|
||||
tilix.cmd = "tilix -e $command";
|
||||
|
||||
urxvt.pkg = p: p.rxvt-unicode;
|
||||
|
||||
wayst.pkg = p: p.wayst;
|
||||
wayst.pinkValue = "#FF0066";
|
||||
|
||||
wezterm.pkg = p: p.wezterm;
|
||||
|
||||
xfce4-terminal.pkg = p: p.xfce.xfce4-terminal;
|
||||
|
||||
xterm.pkg = p: p.xterm;
|
||||
};
|
||||
in mapAttrs (name: { pkg, executable ? name, cmd ? "SHELL=$command ${executable}", colourTest ? true, pinkValue ? "#FF0087", kill ? false }: makeTest
|
||||
{
|
||||
name = "terminal-emulator-${name}";
|
||||
meta = with pkgs.stdenv.lib.maintainers; {
|
||||
maintainers = [ jjjollyjim ];
|
||||
};
|
||||
|
||||
machine = { pkgsInner, ... }:
|
||||
|
||||
{
|
||||
imports = [ ./common/x11.nix ./common/user-account.nix ];
|
||||
|
||||
# Hyper (and any other electron-based terminals) won't run as root
|
||||
test-support.displayManager.auto.user = "alice";
|
||||
|
||||
environment.systemPackages = [
|
||||
(pkg pkgs)
|
||||
(pkgs.writeShellScriptBin "report-success" ''
|
||||
echo 1 > /tmp/term-ran-successfully
|
||||
${optionalString kill "pkill ${executable}"}
|
||||
'')
|
||||
(pkgs.writeShellScriptBin "display-colour" ''
|
||||
# A 256-colour background colour code for pink, then spaces.
|
||||
#
|
||||
# Background is used rather than foreground to minimize the effect of anti-aliasing.
|
||||
#
|
||||
# Keep adding more in case the window is partially offscreen to the left or requires
|
||||
# a change to correctly redraw after initialising the window (as with ctx).
|
||||
|
||||
while :
|
||||
do
|
||||
echo -ne "\e[48;5;198m "
|
||||
sleep 0.5
|
||||
done
|
||||
sleep infinity
|
||||
'')
|
||||
(pkgs.writeShellScriptBin "run-in-this-term" "sudo -u alice run-in-this-term-wrapped $1")
|
||||
|
||||
(pkgs.writeShellScriptBin "run-in-this-term-wrapped" "command=\"$(which \"$1\")\"; ${cmd}")
|
||||
];
|
||||
|
||||
# Helpful reminder to add this test to passthru.tests
|
||||
warnings = if !((pkg pkgs) ? "passthru" && (pkg pkgs).passthru ? "tests") then [ "The package for ${name} doesn't have a passthru.tests" ] else [ ];
|
||||
};
|
||||
|
||||
# We need imagemagick, though not tesseract
|
||||
enableOCR = true;
|
||||
|
||||
testScript = { nodes, ... }: let
|
||||
in ''
|
||||
with subtest("wait for x"):
|
||||
start_all()
|
||||
machine.wait_for_x()
|
||||
|
||||
with subtest("have the terminal run a command"):
|
||||
# We run this command synchronously, so we can be certain the exit codes are happy
|
||||
machine.${if kill then "execute" else "succeed"}("run-in-this-term report-success")
|
||||
machine.wait_for_file("/tmp/term-ran-successfully")
|
||||
${optionalString colourTest ''
|
||||
|
||||
import tempfile
|
||||
import subprocess
|
||||
|
||||
|
||||
def check_for_pink(final=False) -> bool:
|
||||
with tempfile.NamedTemporaryFile() as tmpin:
|
||||
machine.send_monitor_command("screendump {}".format(tmpin.name))
|
||||
|
||||
cmd = 'convert {} -define histogram:unique-colors=true -format "%c" histogram:info:'.format(
|
||||
tmpin.name
|
||||
)
|
||||
ret = subprocess.run(cmd, shell=True, capture_output=True)
|
||||
if ret.returncode != 0:
|
||||
raise Exception(
|
||||
"image analysis failed with exit code {}".format(ret.returncode)
|
||||
)
|
||||
|
||||
text = ret.stdout.decode("utf-8")
|
||||
return "${pinkValue}" in text
|
||||
|
||||
|
||||
with subtest("ensuring no pink is present without the terminal"):
|
||||
assert (
|
||||
check_for_pink() == False
|
||||
), "Pink was present on the screen before we even launched a terminal!"
|
||||
|
||||
with subtest("have the terminal display a colour"):
|
||||
# We run this command in the background
|
||||
machine.shell.send(b"(run-in-this-term display-colour |& systemd-cat -t terminal) &\n")
|
||||
|
||||
with machine.nested("Waiting for the screen to have pink on it:"):
|
||||
retry(check_for_pink)
|
||||
''}'';
|
||||
}
|
||||
|
||||
) tests
|
|
@ -3,7 +3,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
inherit (pkgs.lib) concatMapStrings listToAttrs;
|
||||
inherit (pkgs.lib) concatMapStrings listToAttrs optionals optionalString;
|
||||
inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
|
||||
|
||||
hello32 = "${pkgs.pkgsCross.mingw32.hello}/bin/hello.exe";
|
||||
|
@ -27,6 +27,9 @@ let
|
|||
"bash -c 'wine ${exe} 2> >(tee wine-stderr >&2)'"
|
||||
)
|
||||
assert 'Hello, world!' in greeting
|
||||
''
|
||||
# only the full version contains Gecko, but the error is not printed reliably in other variants
|
||||
+ optionalString (variant == "full") ''
|
||||
machine.fail(
|
||||
"fgrep 'Could not find Wine Gecko. HTML rendering will be disabled.' wine-stderr"
|
||||
)
|
||||
|
@ -37,5 +40,9 @@ let
|
|||
|
||||
variants = [ "base" "full" "minimal" "staging" "unstable" "wayland" ];
|
||||
|
||||
in listToAttrs (map (makeWineTest "winePackages" [ hello32 ]) variants
|
||||
++ map (makeWineTest "wineWowPackages" [ hello32 hello64 ]) variants)
|
||||
in
|
||||
listToAttrs (
|
||||
map (makeWineTest "winePackages" [ hello32 ]) variants
|
||||
++ optionals pkgs.stdenv.is64bit
|
||||
(map (makeWineTest "wineWowPackages" [ hello32 hello64 ]) variants)
|
||||
)
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pyradio";
|
||||
version = "0.8.9.14";
|
||||
version = "0.8.9.15";
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
requests
|
||||
|
@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
|
|||
owner = "coderholic";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-9q+YsQPFB7Ql5WnXvPj100cD7pGkmr1hHztqbpZStt8=";
|
||||
sha256 = "sha256-r4T7t8Q46N59jqTkvdKBo6tffkrOYhoO/CZWvkBHOAQ=";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
|
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
let chia = python3Packages.buildPythonApplication rec {
|
||||
pname = "chia";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Chia-Network";
|
||||
repo = "chia-blockchain";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-eUvZc/7gqGkCB2tNKdwqKOmOgEcG9a/7TSvvyQzhNcQ=";
|
||||
hash = "sha256-nH6rCzIQu5oWsdEHa+UkvbWeUGjrtpEKVEcLmSoor5k=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -50,6 +50,7 @@ let chia = python3Packages.buildPythonApplication rec {
|
|||
dnslib
|
||||
dnspythonchia
|
||||
fasteners
|
||||
filelock
|
||||
keyrings-cryptfile
|
||||
pyyaml
|
||||
setproctitle
|
||||
|
|
|
@ -38,13 +38,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cudatext";
|
||||
version = "1.156.2";
|
||||
version = "1.158.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexey-T";
|
||||
repo = "CudaText";
|
||||
rev = version;
|
||||
sha256 = "sha256-waVTNyK3OHpOvBJrXio+Xjn9q3WmUczbx3E26ChsuKo=";
|
||||
sha256 = "sha256-YrRG+LaG39q/6Ry3cXo9XUwtvokkBl96XuQfE22QxZI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -1,23 +1,23 @@
|
|||
{
|
||||
"EncConv": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2021.01.01",
|
||||
"sha256": "18fp7yz2rl80a6xw7v4bgc4092l74fb6p6z4yf312r7gw7b8naq6"
|
||||
"rev": "2022.03.02",
|
||||
"sha256": "sha256-fBN6Ix5CqhzMbNrWGn6nw6+JRDmEfqe6o8JGHERkiPE="
|
||||
},
|
||||
"ATBinHex-Lazarus": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2021.07.02",
|
||||
"sha256": "sha256-XSt2XfHMiF/ZIf07M65u+k5FjacyToL0rWbpcflKcuY="
|
||||
"rev": "2021.11.17",
|
||||
"sha256": "sha256-wdYH0sISFNx42zt07gLn9ANxcyrq3WrbRhWfTFgPQWw="
|
||||
},
|
||||
"ATFlatControls": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2021.11.11",
|
||||
"sha256": "sha256-lbRRiA8CHWmosJefTHrP2cTgU8nlK1SmNcppG6Bl54I="
|
||||
"rev": "2022.03.17",
|
||||
"sha256": "sha256-zpirFZcqIT53tZhgxQGdwVB6pA98SQLr1o3f+Lhq2QY="
|
||||
},
|
||||
"ATSynEdit": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.02.19",
|
||||
"sha256": "sha256-cq2dirFNPaWRmZJu0F+CFA//+SuFOOpTH3Q5zL4oPQo="
|
||||
"rev": "2022.03.17",
|
||||
"sha256": "sha256-aJZGHodydkqfe2BJLKWUzIX6vbdiGKs4z5ZqtteM6NU="
|
||||
},
|
||||
"ATSynEdit_Cmp": {
|
||||
"owner": "Alexey-T",
|
||||
|
@ -26,13 +26,13 @@
|
|||
},
|
||||
"EControl": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.02.02",
|
||||
"sha256": "sha256-T/6SQJHKzbv/PlObDyc9bcpC14krHgcLDQn0v2fNkLM="
|
||||
"rev": "2022.03.17",
|
||||
"sha256": "sha256-sWRKRhUYf07TIrVWRqtpsYPZu0dPm0EhSIqoDLmkG0Y="
|
||||
},
|
||||
"ATSynEdit_Ex": {
|
||||
"owner": "Alexey-T",
|
||||
"rev": "2022.02.01",
|
||||
"sha256": "sha256-FAcq6ixmFPQFBAGG2gqB4T+YGYT+Rh/OlKdGcH/iL3g="
|
||||
"rev": "2022.03.17",
|
||||
"sha256": "sha256-FndLHJuCOyFr0IGUL4zFRjkEvTyNF3tHUO/Wx5IaV2Y="
|
||||
},
|
||||
"Python-for-Lazarus": {
|
||||
"owner": "Alexey-T",
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
mkDerivation, lib,
|
||||
mkDerivation, lib, nixosTests,
|
||||
extra-cmake-modules, kdoctools,
|
||||
kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
|
||||
ki18n, kiconthemes, kinit, kio, knotifications,
|
||||
|
@ -22,5 +22,7 @@ mkDerivation {
|
|||
kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff
|
||||
];
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.konsole;
|
||||
|
||||
propagatedUserEnvPkgs = [ (lib.getBin kinit) ];
|
||||
}
|
||||
|
|
|
@ -23,14 +23,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.4.2";
|
||||
version = "1.5";
|
||||
pname = "cawbird";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IBBoard";
|
||||
repo = "cawbird";
|
||||
rev = "v${version}";
|
||||
sha256 = "17575cp5qcgsqf37y3xqg3vr6l2j8bbbkmy2c1l185rxghfacida";
|
||||
sha256 = "sha256-XFN9gfCoQDmYYysg1yrUoPPE0Ow40LttvV5Ltu0DTfI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fn";
|
||||
version = "0.6.15";
|
||||
version = "0.6.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fnproject";
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-Gf4YxxyNALicb9GPpOW+Kzb2xrwcAU1XYOzXochH0LI=";
|
||||
sha256 = "sha256-u/YISLlZFYlAUejSlaH7POA2WwKURPN8phFU86/caXU=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
@ -11,15 +11,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "1.2.76";
|
||||
version = "1.2.77";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OdMY7M9HCYtQ5v3yTjS1CJXDmg9bLA5LdcIxT7C3rcw=";
|
||||
sha256 = "sha256-JmadwNERjexnJN+fBUjgMkvPtAaTbb7GITPsZlx2vik=";
|
||||
};
|
||||
vendorSha256 = "sha256-q2blcmh1mHCfjDbeR3KQevjeDtBm0TwhhBIAvF55X00=";
|
||||
vendorSha256 = "sha256-IPQiS1GgNP+k/INv3f3VitoHActC3MrRys905nTSXyI=";
|
||||
proxyVendor = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
@ -1,4 +1,8 @@
|
|||
{ lib, stdenv, fetchurl, wrapGAppsHook, makeDesktopItem
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, wrapGAppsHook
|
||||
, makeDesktopItem
|
||||
, atk
|
||||
, cairo
|
||||
, coreutils
|
||||
|
@ -27,7 +31,8 @@
|
|||
, libXt
|
||||
, libnotify
|
||||
, gnome
|
||||
, libGLU, libGL
|
||||
, libGLU
|
||||
, libGL
|
||||
, nspr
|
||||
, nss
|
||||
, pango
|
||||
|
@ -36,55 +41,56 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zotero";
|
||||
version = "5.0.96.3";
|
||||
version = "6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
|
||||
sha256 = "sha256-eqSNzmkGNopGJ7VByvUffFEPJz3WHS7b5+jgUAW/hU4=";
|
||||
url =
|
||||
"https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
|
||||
sha256 = "0zkgmmflcj6vbyv8rs51jf3vx1zq8pl7b5d5asgayhrdlwi0qgff";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
buildInputs= [ gsettings-desktop-schemas glib gtk3 gnome.adwaita-icon-theme dconf ];
|
||||
buildInputs =
|
||||
[ gsettings-desktop-schemas glib gtk3 gnome.adwaita-icon-theme dconf ];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
|
||||
libPath = lib.makeLibraryPath
|
||||
[ stdenv.cc.cc
|
||||
atk
|
||||
cairo
|
||||
curl
|
||||
cups
|
||||
dbus-glib
|
||||
dbus
|
||||
fontconfig
|
||||
freetype
|
||||
gdk-pixbuf
|
||||
glib
|
||||
glibc
|
||||
gtk3
|
||||
libX11
|
||||
libXScrnSaver
|
||||
libXcomposite
|
||||
libXcursor
|
||||
libxcb
|
||||
libXdamage
|
||||
libXext
|
||||
libXfixes
|
||||
libXi
|
||||
libXinerama
|
||||
libXrender
|
||||
libXt
|
||||
libnotify
|
||||
libGLU libGL
|
||||
nspr
|
||||
nss
|
||||
pango
|
||||
] + ":" + lib.makeSearchPathOutput "lib" "lib64" [
|
||||
stdenv.cc.cc
|
||||
];
|
||||
libPath = lib.makeLibraryPath [
|
||||
stdenv.cc.cc
|
||||
atk
|
||||
cairo
|
||||
curl
|
||||
cups
|
||||
dbus-glib
|
||||
dbus
|
||||
fontconfig
|
||||
freetype
|
||||
gdk-pixbuf
|
||||
glib
|
||||
glibc
|
||||
gtk3
|
||||
libX11
|
||||
libXScrnSaver
|
||||
libXcomposite
|
||||
libXcursor
|
||||
libxcb
|
||||
libXdamage
|
||||
libXext
|
||||
libXfixes
|
||||
libXi
|
||||
libXinerama
|
||||
libXrender
|
||||
libXt
|
||||
libnotify
|
||||
libGLU
|
||||
libGL
|
||||
nspr
|
||||
nss
|
||||
pango
|
||||
] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/pref("app.update.enabled", true);/c\pref("app.update.enabled", false);' defaults/preferences/prefs.js
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, coreutils, nettools, java, scala, polyml, z3, veriT, vampire, eprover-ho, rlwrap, perl, makeDesktopItem }:
|
||||
{ lib, stdenv, fetchurl, coreutils, nettools, java, scala, polyml, z3, veriT, vampire, eprover-ho, naproche, rlwrap, perl, makeDesktopItem }:
|
||||
# nettools needed for hostname
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -66,7 +66,8 @@ stdenv.mkDerivation rec {
|
|||
ISABELLE_JDK_HOME=${java}
|
||||
EOF
|
||||
|
||||
sed -i -e 's/naproche_server : bool = true/naproche_server : bool = false/' contrib/naproche-*/etc/options
|
||||
rm contrib/naproche-*/x86*/Naproche-SAD
|
||||
ln -s ${naproche}/bin/Naproche-SAD contrib/naproche-*/x86*/
|
||||
|
||||
echo ISABELLE_LINE_EDITOR=${rlwrap}/bin/rlwrap >>etc/settings
|
||||
|
||||
|
|
38
pkgs/applications/science/logic/naproche/default.nix
Normal file
38
pkgs/applications/science/logic/naproche/default.nix
Normal file
|
@ -0,0 +1,38 @@
|
|||
{ lib, fetchFromGitHub, haskellPackages, makeWrapper, eprover }:
|
||||
|
||||
with haskellPackages; mkDerivation {
|
||||
pname = "Naproche-SAD";
|
||||
version = "0.1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "naproche";
|
||||
repo = "naproche";
|
||||
rev = "d39cea85ace04d5b3775fde9972a33886799bfe6";
|
||||
sha256 = "1zqrldmxkzbyg9bssrbwb00zic29904igcipaz1m9al0456yjnkf";
|
||||
};
|
||||
|
||||
isExecutable = true;
|
||||
|
||||
buildTools = [ hpack makeWrapper ];
|
||||
executableHaskellDepends = [
|
||||
base array bytestring containers ghc-prim megaparsec mtl network process
|
||||
split temporary text threads time transformers uuid
|
||||
];
|
||||
|
||||
prePatch = "hpack";
|
||||
|
||||
checkPhase = ''
|
||||
export NAPROCHE_EPROVER=${eprover}/bin/eprover
|
||||
dist/build/Naproche-SAD/Naproche-SAD examples/cantor.ftl.tex -t 60 --tex=on
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/Naproche-SAD \
|
||||
--set-default NAPROCHE_EPROVER ${eprover}/bin/eprover
|
||||
'';
|
||||
|
||||
homepage = "https://github.com/naproche/naproche#readme";
|
||||
description = "Write formal proofs in natural language and LaTeX";
|
||||
maintainers = with lib.maintainers; [ jvanbruegge ];
|
||||
license = lib.licenses.gpl3Only;
|
||||
}
|
|
@ -3,6 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, rustPlatform
|
||||
, nixosTests
|
||||
|
||||
, cmake
|
||||
, gzip
|
||||
|
@ -132,6 +133,8 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
dontPatchELF = true;
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.alacritty;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A cross-platform, GPU-accelerated terminal emulator";
|
||||
homepage = "https://github.com/alacritty/alacritty";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, freetype, libGL, pcre }:
|
||||
{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, freetype, libGL, pcre, nixosTests }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "contour";
|
||||
|
@ -16,6 +16,8 @@ mkDerivation rec {
|
|||
|
||||
buildInputs = [ freetype libGL pcre ];
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.contour;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Modern C++ Terminal Emulator";
|
||||
homepage = "https://github.com/christianparpart/contour";
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchFromGitHub, mkDerivation, qtbase, qtquick1, qmltermwidget
|
||||
, qtquickcontrols, qtgraphicaleffects, qmake }:
|
||||
, qtquickcontrols, qtgraphicaleffects, qmake, nixosTests }:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "1.1.1";
|
||||
|
@ -29,6 +29,8 @@ mkDerivation rec {
|
|||
ln -s $out/bin/cool-retro-term.app/Contents/MacOS/cool-retro-term $out/bin/cool-retro-term
|
||||
'';
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.cool-retro-term;
|
||||
|
||||
meta = {
|
||||
description = "Terminal emulator which mimics the old cathode display";
|
||||
longDescription = ''
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
, libdrm # Not documented
|
||||
, pkg-config
|
||||
, enableFb ? false
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -43,6 +44,8 @@ stdenv.mkDerivation rec {
|
|||
"PREFIX=${placeholder "out"}"
|
||||
];
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.ctx;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://ctx.graphics/";
|
||||
description = "Vector graphics terminal";
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
, libXext
|
||||
, libXxf86vm
|
||||
, libGL
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -57,6 +58,8 @@ stdenv.mkDerivation rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.darktile;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A GPU rendered terminal emulator designed for tiling window managers";
|
||||
homepage = "https://github.com/liamg/darktile";
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
, libXext
|
||||
, libast
|
||||
, pkg-config
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -33,6 +34,8 @@ stdenv.mkDerivation rec {
|
|||
libast
|
||||
];
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.eterm;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/mej/Eterm"; # http://www.eterm.org is gone
|
||||
description = "Terminal emulator";
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
, tmux
|
||||
, vte
|
||||
, wrapGAppsHook
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -45,6 +46,8 @@ stdenv.mkDerivation rec {
|
|||
runHook postFixup
|
||||
'';
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.germinal;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A minimal terminal emulator";
|
||||
homepage = "https://github.com/Keruspe/Germinal";
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
, libutempter
|
||||
, vte
|
||||
, libwnck
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
|
@ -66,6 +67,8 @@ python3.pkgs.buildPythonApplication rec {
|
|||
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libutempter ]}")
|
||||
'';
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.guake;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Drop-down terminal for GNOME";
|
||||
homepage = "http://guake-project.org";
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr, libXcomposite
|
||||
, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver, libxcb, nss, nspr
|
||||
, alsa-lib, cups, expat, udev, libpulseaudio, at-spi2-atk, at-spi2-core, libxshmfence
|
||||
, libdrm, libxkbcommon, mesa }:
|
||||
, libdrm, libxkbcommon, mesa, nixosTests}:
|
||||
|
||||
let
|
||||
libPath = lib.makeLibraryPath [
|
||||
|
@ -43,6 +43,8 @@ stdenv.mkDerivation rec {
|
|||
--replace "/opt/Hyper/hyper" "hyper"
|
||||
'';
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.hyper;
|
||||
|
||||
dontPatchELF = true;
|
||||
meta = with lib; {
|
||||
description = "A terminal built on web technologies";
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
, pcre
|
||||
, pkg-config
|
||||
, vte
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -31,6 +32,8 @@ stdenv.mkDerivation rec {
|
|||
vte
|
||||
];
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.kermit;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/orhun/kermit";
|
||||
description = "A VTE-based, simple and froggy terminal emulator";
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
, python3
|
||||
, sassc
|
||||
, wrapGAppsHook
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
@ -66,6 +67,8 @@ stdenv.mkDerivation {
|
|||
--replace "Exec=kgx" "Exec=$out/bin/kgx"
|
||||
'';
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.kgx;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple user-friendly terminal emulator for the GNOME desktop";
|
||||
homepage = "https://gitlab.gnome.org/ZanderBrown/kgx";
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
, zsh
|
||||
, fish
|
||||
, fetchpatch
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
with python3Packages;
|
||||
|
@ -176,6 +177,8 @@ buildPythonApplication rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.kitty;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/kovidgoyal/kitty";
|
||||
description = "A modern, hackable, featureful, OpenGL based terminal emulator";
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchFromGitHub, automake, autoconf, intltool, pkg-config, gtk3, vte, wrapGAppsHook
|
||||
, libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs
|
||||
, libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -35,6 +35,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.lxterminal;
|
||||
|
||||
meta = {
|
||||
description = "The standard terminal emulator of LXDE";
|
||||
longDescription = ''
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchFromGitHub, pkg-config, autoconf, makeDesktopItem
|
||||
{ stdenv, lib, fetchFromGitHub, pkg-config, autoconf, makeDesktopItem, nixosTests
|
||||
, libX11, gdk-pixbuf, cairo, libXft, gtk3, vte
|
||||
, harfbuzz #substituting glyphs with opentype fonts
|
||||
, fribidi, m17n_lib #bidi and encoding
|
||||
|
@ -110,6 +110,8 @@ stdenv.mkDerivation rec {
|
|||
startupNotify = false;
|
||||
};
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.mlterm;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Multi Lingual TERMinal emulator";
|
||||
homepage = "http://mlterm.sourceforge.net/";
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
, freetype
|
||||
, pkg-config
|
||||
, which
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -38,6 +39,8 @@ stdenv.mkDerivation rec {
|
|||
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype.dev}/include/freetype2";
|
||||
'';
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.mrxvt;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lightweight multitabbed feature-rich X11 terminal emulator";
|
||||
longDescription = "
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, libepoxy, fetchFromGitHub
|
||||
, glib, gtk3, harfbuzz, libXdmcp, libXtst, libpthreadstubs
|
||||
, libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2
|
||||
, pkg-config, lib, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto
|
||||
, pkg-config, lib, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
|
|||
libsepol libxkbcommon libepoxy at-spi2-core libXtst libtasn1 p11-kit
|
||||
];
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.roxterm;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/realh/roxterm";
|
||||
license = licenses.gpl3;
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
, gdkPixbufSupport ? true
|
||||
, unicode3Support ? true
|
||||
, emojiSupport ? false
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -102,6 +103,8 @@ stdenv.mkDerivation {
|
|||
cp -r ${desktopItem}/share/applications/ $out/share/
|
||||
'';
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.urxvt;
|
||||
|
||||
meta = {
|
||||
inherit description;
|
||||
homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html";
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
, rxvt-unicode-unwrapped
|
||||
, rxvt-unicode-plugins
|
||||
, perlPackages
|
||||
, nixosTests
|
||||
, configure ? { availablePlugins, ... }:
|
||||
{ plugins = builtins.attrValues availablePlugins;
|
||||
extraDeps = [ ];
|
||||
|
@ -51,7 +52,10 @@ let
|
|||
--suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl"
|
||||
'';
|
||||
|
||||
passthru.plugins = plugins;
|
||||
passthru = {
|
||||
plugins = plugins;
|
||||
tests.test = nixosTests.terminal-emulators.urxvt;
|
||||
};
|
||||
};
|
||||
|
||||
in
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
, perl
|
||||
, pkg-config
|
||||
, vte
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -43,6 +44,8 @@ stdenv.mkDerivation rec {
|
|||
--suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/
|
||||
'';
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.sakura;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.pleyades.net/david/projects/sakura";
|
||||
description = "A terminal emulator based on GTK and VTE";
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
, conf ? null
|
||||
, patches ? [ ]
|
||||
, extraLibs ? [ ]
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -55,6 +56,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.st;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://st.suckless.org/";
|
||||
description = "Simple Terminal for X from Suckless.org Community";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, vte, gtk, pcre2 }:
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, vte, gtk, pcre2, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "stupidterm";
|
||||
|
@ -26,6 +26,8 @@ stdenv.mkDerivation {
|
|||
--replace "Exec=st" "Exec=$out/bin/stupidterm"
|
||||
'';
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.stupidterm;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple wrapper around the VTE terminal emulator widget for GTK";
|
||||
homepage = "https://github.com/esmil/stupidterm";
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
, libnotify
|
||||
, wrapGAppsHook
|
||||
, vte
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
|
@ -62,6 +63,8 @@ python3.pkgs.buildPythonApplication rec {
|
|||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.terminator;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Terminal emulator with support for tiling and tabs";
|
||||
longDescription = ''
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, vte, gtk3, ncurses, pcre2, wrapGAppsHook }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, vte, gtk3, ncurses, pcre2, wrapGAppsHook, nixosTests }:
|
||||
|
||||
let
|
||||
|
||||
|
@ -57,7 +57,10 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
outputs = [ "out" "terminfo" ];
|
||||
|
||||
passthru = { inherit vte-ng; };
|
||||
passthru = {
|
||||
inherit vte-ng;
|
||||
tests = nixosTests.terminal-emulators.termite;
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $terminfo/share
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, haskellPackages, makeWrapper, packages ? (pkgSet: []) }:
|
||||
{ stdenv, haskellPackages, makeWrapper, packages ? (pkgSet: []), nixosTests }:
|
||||
|
||||
let
|
||||
termonadEnv = haskellPackages.ghcWithPackages (self: [ self.termonad ] ++ packages self);
|
||||
|
@ -17,6 +17,8 @@ in stdenv.mkDerivation {
|
|||
preferLocalBuild = true;
|
||||
allowSubstitutes = false;
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.termonad;
|
||||
|
||||
meta = haskellPackages.termonad.meta // {
|
||||
mainProgram = "termonad";
|
||||
};
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
, pcre2
|
||||
, vte
|
||||
, makeWrapper
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -42,6 +43,8 @@ stdenv.mkDerivation rec {
|
|||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
|
||||
'';
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.tilda;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Gtk based drop down terminal for Linux and Unix";
|
||||
homepage = "https://github.com/lanoxx/tilda/";
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
, wrapGAppsHook
|
||||
, libunwind
|
||||
, appstream
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -66,6 +67,8 @@ stdenv.mkDerivation rec {
|
|||
--replace "Exec=tilix" "Exec=$out/bin/tilix"
|
||||
'';
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.tilix;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tiling terminal emulator following the Gnome Human Interface Guidelines";
|
||||
homepage = "https://gnunn1.github.io/tilix-web";
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
, lib
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, nixosTests
|
||||
, freetype
|
||||
, fontconfig
|
||||
, libGL
|
||||
|
@ -78,6 +79,8 @@ stdenv.mkDerivation rec {
|
|||
install -D icons/wayst.svg $out/share/icons/hicolor/scalable/apps/wayst.svg
|
||||
'';
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.wayst;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple terminal emulator";
|
||||
mainProgram = "wayst";
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
, Cocoa
|
||||
, Foundation
|
||||
, libiconv
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
@ -99,6 +100,8 @@ rustPlatform.buildRustPackage rec {
|
|||
ln -s $out/bin/{wezterm,wezterm-mux-server,wezterm-gui,strip-ansi-escapes} "$OUT_APP"
|
||||
'';
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.wezterm;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust";
|
||||
homepage = "https://wezfurlong.org/wezterm";
|
||||
|
|
|
@ -76,7 +76,10 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
passthru = {
|
||||
tests = { inherit (nixosTests) xterm; };
|
||||
tests = {
|
||||
customTest = nixosTests.xterm;
|
||||
standardTest = nixosTests.terminal-emulators.xterm;
|
||||
};
|
||||
|
||||
updateScript = let
|
||||
# Tags that end in letters are unstable
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
"version": "14.8.2",
|
||||
"repo_hash": "1pl528qxsbg75l5nny7cw8hcsd0zs50hhn0ngdrf3gjpd6y7pzcc",
|
||||
"yarn_hash": "0dlhslkhiha4jyfzm0k8i9cgwdk12r5m67i2rznxbrkl38gk9c1x",
|
||||
"version": "14.8.4",
|
||||
"repo_hash": "0ra4d324all26crz84iys9xb40ykpiaqj4z2790zaw1s45wakmgj",
|
||||
"yarn_hash": "106js1j6wii2axh1dxvlfr7mqhvsnsb5qs0danp9c3h1ihd4nz91",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v14.8.2-ee",
|
||||
"rev": "v14.8.4-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "14.8.2",
|
||||
"GITALY_SERVER_VERSION": "14.8.4",
|
||||
"GITLAB_PAGES_VERSION": "1.54.0",
|
||||
"GITLAB_SHELL_VERSION": "13.23.2",
|
||||
"GITLAB_WORKHORSE_VERSION": "14.8.2"
|
||||
"GITLAB_WORKHORSE_VERSION": "14.8.4"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -11,7 +11,7 @@ let
|
|||
gemdir = ./.;
|
||||
};
|
||||
|
||||
version = "14.8.2";
|
||||
version = "14.8.4";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
|
||||
in
|
||||
|
||||
|
@ -23,7 +23,7 @@ buildGoModule {
|
|||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GgQscKxxYpvzU2M99gmvGj0HM/oD+2Ke24FRzUxv6HM=";
|
||||
sha256 = "sha256-3doXqYj1XsOifAr78ds5ioa6gUfw8uyUwn7JzqlMVSE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Qw9/nlo1eB5dPcldXe9doy4QA4DDVUDad3o4kbdNu34=";
|
||||
|
|
|
@ -5,7 +5,7 @@ in
|
|||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "14.8.2";
|
||||
version = "14.8.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = data.owner;
|
||||
|
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yaru";
|
||||
version = "22.04.1";
|
||||
version = "22.04.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ubuntu";
|
||||
repo = "yaru";
|
||||
rev = version;
|
||||
sha256 = "sha256-5mB5eTIPw4CqYSQm675MKbRwsYLpg+5WJrLDkbc6nKs=";
|
||||
sha256 = "sha256-oW5OOJPhC3OB3GIQWTQxPgqE7p4bAO1TyVbyKUHnyD0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3, efl }:
|
||||
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3, efl, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "terminology";
|
||||
|
@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
|
|||
patchShebangs data/colorschemes/*.py
|
||||
'';
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.terminology;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Powerful terminal emulator based on EFL";
|
||||
homepage = "https://www.enlightenment.org/about-terminology";
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
, pcre2
|
||||
, libxslt
|
||||
, docbook-xsl-nons
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -82,6 +83,8 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
};
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.gnome-terminal;
|
||||
|
||||
meta = with lib; {
|
||||
description = "The GNOME Terminal Emulator";
|
||||
homepage = "https://wiki.gnome.org/Apps/Terminal";
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
, qttools
|
||||
, qtx11extras
|
||||
, lxqtUpdateScript
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
|
@ -35,6 +36,8 @@ mkDerivation rec {
|
|||
|
||||
passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.qterminal;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/lxqt/qterminal";
|
||||
description = "A lightweight Qt-based terminal emulator";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, mate-desktop, dconf, vte, pcre2, wrapGAppsHook, mateUpdateScript }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, mate-desktop, dconf, vte, pcre2, wrapGAppsHook, mateUpdateScript, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mate-terminal";
|
||||
|
@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
passthru.updateScript = mateUpdateScript { inherit pname version; };
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.mate-terminal;
|
||||
|
||||
meta = with lib; {
|
||||
description = "MATE desktop terminal emulator";
|
||||
homepage = "https://mate-desktop.org";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf, pcre2, libxslt, docbook_xml_dtd_45, docbook_xsl }:
|
||||
{ lib, mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf, pcre2, libxslt, docbook_xml_dtd_45, docbook_xsl, nixosTests }:
|
||||
|
||||
mkXfceDerivation {
|
||||
category = "apps";
|
||||
|
@ -11,6 +11,8 @@ mkXfceDerivation {
|
|||
|
||||
buildInputs = [ gtk3 libxfce4ui vte xfconf pcre2 ];
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.xfce4-terminal;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A modern terminal emulator";
|
||||
maintainers = with maintainers; [ ] ++ teams.xfce.members;
|
||||
|
|
|
@ -7,13 +7,13 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gdal";
|
||||
version = "3.4.1";
|
||||
version = "3.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "gdal";
|
||||
rev = "v${version}";
|
||||
sha256 = "11rjdaxmsp9n3r9xhmgd7ksy8bh5fazwsxdj0xvl4hsy6bcn4n97";
|
||||
sha256 = "sha256-bE55VV0SrG8nxCLdpODRalnuAkn+olRdMLUjduavj6M=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/gdal";
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
, icu
|
||||
, systemd
|
||||
, systemdSupport ? stdenv.hostPlatform.isLinux
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -91,6 +92,9 @@ stdenv.mkDerivation rec {
|
|||
packageName = pname;
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
tests = {
|
||||
inherit (nixosTests.terminal-emulators) gnome-terminal lxterminal mlterm roxterm sakura stupidterm terminator termite xfce4-terminal;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yder";
|
||||
version = "1.4.14";
|
||||
version = "1.4.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "babelouest";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4FSUBFqrxTbqg2EKYuXv4gUeE40ViNZRk5gHv+C2p9o=";
|
||||
sha256 = "sha256-hPAL1UngodNbQCCdKulaF5faI0JOjmWdz3q8oyPH7C4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "discogs-client";
|
||||
version = "2.3.13";
|
||||
version = "2.3.14";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "joalla";
|
||||
repo = "discogs_client";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TOja0pCJv8TAI0ns8M/tamZ5Pp8k5sSKDnvN4SeKtW8=";
|
||||
sha256 = "sha256-HJxqTwZ9byjZxdftQPTkVo0Ufio9gNGH69q5Q2gYR00=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ocrmypdf";
|
||||
version = "13.4.0";
|
||||
version = "13.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jbarlow83";
|
||||
|
@ -39,7 +39,7 @@ buildPythonPackage rec {
|
|||
extraPostFetch = ''
|
||||
rm "$out/.git_archival.txt"
|
||||
'';
|
||||
sha256 = "sha256-LgHhF+vztXPCn71d87OMn0umLvps7We6vyjdRJZw+3E=";
|
||||
sha256 = "sha256-gxgeEwm3cYNllcmRTZhdyIWWGKXTewyVW314k732swE=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
, pefile
|
||||
, pyelftools
|
||||
, python-registry
|
||||
, pyyaml
|
||||
, unicorn
|
||||
}:
|
||||
|
||||
|
@ -30,6 +31,7 @@ buildPythonPackage rec {
|
|||
pefile
|
||||
pyelftools
|
||||
python-registry
|
||||
pyyaml
|
||||
unicorn
|
||||
];
|
||||
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ lib
|
||||
, buildPythonApplication
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, capstone
|
||||
, filebytes
|
||||
, pytest
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
buildPythonPackage rec {
|
||||
pname = "ropper";
|
||||
version = "1.13.6";
|
||||
|
||||
|
|
|
@ -43,17 +43,16 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "quickemu";
|
||||
version = "3.11";
|
||||
version = "3.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "quickemu-project";
|
||||
repo = "quickemu";
|
||||
rev = version;
|
||||
sha256 = "1xwf9vwbr57wmyxfcqzl1jnmfx3ffh7sfqf0zcdq41wqkm8s106n";
|
||||
sha256="sha256-7zaXazGzb36Nwk/meJ3lGD+l+fylWZYnhttDL1CXN9s=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./efi_vars_ensure_writable.patch
|
||||
./input_overrides.patch
|
||||
];
|
||||
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/quickemu b/quickemu
|
||||
index a9a60a5..1a932ac 100755
|
||||
--- a/quickemu
|
||||
+++ b/quickemu
|
||||
@@ -197,7 +197,7 @@ function efi_vars() {
|
||||
|
||||
if [ ! -e "${VARS_OUT}" ]; then
|
||||
if [ -e "${VARS_IN}" ]; then
|
||||
- cp "${VARS_IN}" "${VARS_OUT}"
|
||||
+ cp "${VARS_IN}" "${VARS_OUT}" && chmod +w "${VARS_OUT}"
|
||||
else
|
||||
echo "ERROR! ${VARS_IN} was not found. Please install edk2."
|
||||
exit 1
|
|
@ -1,20 +1,29 @@
|
|||
diff --git a/quickemu b/quickemu
|
||||
index 1a932ac..ab2f752 100755
|
||||
index 24e1007..39cd5e4 100755
|
||||
--- a/quickemu
|
||||
+++ b/quickemu
|
||||
@@ -196,7 +196,7 @@ function efi_vars() {
|
||||
|
||||
if [ ! -e "${VARS_OUT}" ]; then
|
||||
if [ -e "${VARS_IN}" ]; then
|
||||
- cp "${VARS_IN}" "${VARS_OUT}"
|
||||
+ cp "${VARS_IN}" "${VARS_OUT}" && chmod +w "${VARS_OUT}"
|
||||
else
|
||||
echo "ERROR! ${VARS_IN} was not found. Please install edk2."
|
||||
exit 1
|
||||
@@ -383,7 +383,10 @@ function vm_boot() {
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1929357#c5
|
||||
case ${secureboot} in
|
||||
on)
|
||||
- if [ -e "/usr/share/OVMF/OVMF_CODE_4M.secboot.fd" ]; then
|
||||
- if [ -e "/usr/share/OVMF/OVMF_CODE_4M.secboot.fd" ]; then
|
||||
+ if [[ ${ENV_EFI_CODE_SECURE} && ${ENV_EFI_CODE_SECURE-x} ]] && [[ ${ENV_EFI_VARS_SECURE} && ${ENV_EFI_VARS_SECURE-x} ]]; then
|
||||
+ EFI_CODE="${ENV_EFI_CODE_SECURE}"
|
||||
+ efi_vars "${ENV_EFI_VARS_SECURE}" "${EFI_VARS}"
|
||||
+ EFI_CODE="${ENV_EFI_CODE_SECURE}"
|
||||
+ efi_vars "${ENV_EFI_VARS_SECURE}" "${EFI_VARS}"
|
||||
+ elif [ -e "/usr/share/OVMF/OVMF_CODE_4M.secboot.fd" ]; then
|
||||
EFI_CODE="/usr/share/OVMF/OVMF_CODE_4M.secboot.fd"
|
||||
efi_vars "/usr/share/OVMF/OVMF_VARS_4M.fd" "${EFI_VARS}"
|
||||
elif [ -e "/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd" ]; then
|
||||
@@ -402,7 +405,10 @@ function vm_boot() {
|
||||
@@ -408,7 +411,10 @@ function vm_boot() {
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.174.0";
|
||||
version = "0.174.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-s4wu7UW3OKz2xQpNpZZeDjyDdNbRw9w0kauiPWo/SMA=";
|
||||
sha256 = "sha256-lfj6KyB9QYvUy4Ybo8f30omAg4K/jT5MEERJPm0aJ7U=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cloud-nuke";
|
||||
version = "0.11.1";
|
||||
version = "0.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BYrJ0I8ZARppy+7CJPfAm/4SIEupGZh1qd1ghZWOD/8=";
|
||||
sha256 = "sha256-iMPTRPsULrwXbx1xQ9db1s0p9a6YejXkwp7sqZ1ayYU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-McCbogZvgm9pnVjay9O2CxAh+653JnDMcU4CHD0PTPI=";
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ktlint";
|
||||
version = "0.44.0";
|
||||
version = "0.45.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint";
|
||||
sha256 = "1l2pmvqw8rjl2xmsdp31j8015clshab6p81i3i05h40rjjz57mvr";
|
||||
sha256 = "sha256-M6M1hYA13QTcX4btcni+GB1NEJYEEeuITIpmY2qS9CM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pulumictl";
|
||||
version = "0.0.29";
|
||||
version = "0.0.30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pulumi";
|
||||
repo = "pulumictl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2jTxtgEg+x/NY/LTWT5+9K9bilOw2bLTUIctjd+qwLE=";
|
||||
sha256 = "sha256-xAlc6dYD73JZqV0QDhvqPmtGF99mqhvdBbDhWlY/4PI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-xalfnLc6bPBvm2B42+FzpgrOH541HMWmNHChveI792s=";
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yarn";
|
||||
version = "1.22.17";
|
||||
version = "1.22.18";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
|
||||
sha256 = "1skzlyv2976bl1063f94422jbjy4ns1nxl622biizq31z4821yvj";
|
||||
sha256 = "sha256-gI4v/WPWrNa2i2oct8Ns7bpDzmDCy+c86pGKpNznhh0=";
|
||||
};
|
||||
|
||||
buildInputs = [ nodejs ];
|
||||
|
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "atlassian-jira";
|
||||
version = "8.21.0";
|
||||
version = "8.22.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
|
||||
sha256 = "sha256-AJWEm6JBHINca9l0R6dILLMkPGzFVuVjOqD/4AaO5nI=";
|
||||
sha256 = "sha256-swEq8g/A1Ok1P7JtceUDId7kG0GRtBPGblY09xt81Ys=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "jackett";
|
||||
version = "0.20.671";
|
||||
version = "0.20.709";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "AoOaBryZHkqp5SabfKeW5E1YoJCwGhg2luK8SQvabow=";
|
||||
sha256 = "Gx1VHjs37XBcvw20pQNrA/meLuVmogdGIzroRXvTv5Q=";
|
||||
};
|
||||
|
||||
projectFile = "src/Jackett.Server/Jackett.Server.csproj";
|
||||
|
|
8
pkgs/servers/jackett/deps.nix
generated
8
pkgs/servers/jackett/deps.nix
generated
|
@ -152,6 +152,9 @@
|
|||
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.WebEncoders"; version = "2.2.0"; sha256 = "1mhnichccw6mjf37d38q2i1kr7qp485m7apa1b872ji0q16yy1y3"; })
|
||||
(fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.1.0"; sha256 = "1a02bll0flsin9grd3jxbi76ycl42qamynalbp7qbqcsprabw3ai"; })
|
||||
(fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.2.0"; sha256 = "0w6lrk9z67bcirq2cj2ldfhnizc6id77ba6i30hjzgqjlyhh1gx5"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
|
||||
|
@ -159,9 +162,6 @@
|
|||
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.0"; sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.0"; sha256 = "00vkn4c6i0rn1l9pv912y0wgb9h6ks76qah8hvk441nari8fqbm1"; })
|
||||
(fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.1.0"; sha256 = "1a02bll0flsin9grd3jxbi76ycl42qamynalbp7qbqcsprabw3ai"; })
|
||||
(fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.2.0"; sha256 = "0w6lrk9z67bcirq2cj2ldfhnizc6id77ba6i30hjzgqjlyhh1gx5"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.0.0"; sha256 = "1bh5scbvl6ndldqv20sl34h4y257irm9ziv2wyfc3hka6912fhn7"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.0.0"; sha256 = "06mn31cgpp7d8lwdyjanh89prc66j37dchn74vrd9s588rq0y70r"; })
|
||||
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; })
|
||||
|
@ -185,8 +185,8 @@
|
|||
(fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "4.14.0"; sha256 = "1q2v44inp4xjynncxpv432k2qjkfara1bpipmv3p3in0yv14l3wg"; })
|
||||
(fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; })
|
||||
(fetchNuGet { pname = "NUnit"; version = "3.13.2"; sha256 = "00bkjgarkwbj497da9d7lajala1ns67h1kx53w4bapwkf32jlcvn"; })
|
||||
(fetchNuGet { pname = "NUnit3TestAdapter"; version = "4.1.0"; sha256 = "1z5g15npmsjszhfmkrdmp4ds7jpxzhxblss2rjl5mfn5sihy4cww"; })
|
||||
(fetchNuGet { pname = "NUnit.ConsoleRunner"; version = "3.12.0"; sha256 = "00ihk6i3wzqndrn6yyh1csh4b3h226x5kwdp3716p75p4nljs1ik"; })
|
||||
(fetchNuGet { pname = "NUnit3TestAdapter"; version = "4.1.0"; sha256 = "1z5g15npmsjszhfmkrdmp4ds7jpxzhxblss2rjl5mfn5sihy4cww"; })
|
||||
(fetchNuGet { pname = "Polly"; version = "7.2.2"; sha256 = "0s15n5zwj44i6sw3v40ca8l6j0ijydxcakvad49j52rp49iwrmkn"; })
|
||||
(fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; })
|
||||
(fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; })
|
||||
|
|
|
@ -24,14 +24,14 @@ let
|
|||
]);
|
||||
path = lib.makeBinPath [ par2cmdline unrar unzip p7zip ];
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "3.5.2";
|
||||
version = "3.5.3";
|
||||
pname = "sabnzbd";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-dGmZxnrxuUj6HwFI5QkSy9FnGYQpsNPFbUKXoJWpDfM=";
|
||||
sha256 = "sha256-pdYTTahdn9YVFreU5KhMGlUzQxHviN5G4TxWKKRBxOc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "exoscale-cli";
|
||||
version = "1.51.2";
|
||||
version = "1.52.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exoscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Nx9lASZOEetkADVEs2JxPRi9SCrb4SLnEpLpzcpp/Is=";
|
||||
sha256 = "sha256-uaJt1QS4nDVliIFo11OhQYvOxJMeda0QGuaGZCPRoWk=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/exoscale/cli";
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "trinsic-cli";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/trinsic-id/sdk/releases/download/v${version}/trinsic-cli-vendor-${version}.tar.gz";
|
||||
sha256 = "4ec8a02cf7cd31822668e97befe96f0a7a32b1103abfe27c1bff643d3bf16588";
|
||||
sha256 = "sha256-Dxmjbd1Q2JNeET22Fte7bygd+oH3ZfovRTJh5xforuw=";
|
||||
};
|
||||
|
||||
cargoVendorDir = "vendor";
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "steampipe";
|
||||
version = "0.13.0";
|
||||
version = "0.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "turbot";
|
||||
repo = "steampipe";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+QtZmrPE3R98UVSwrC8xoehNKwd0Exg+AZ2BJxBIrfY=";
|
||||
sha256 = "sha256-Ty8yCcxdPa/z1k9xMv8iCybRXfvJKRJIT+oH7MbLWmw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-rRp8pR2cpW88o0KPwuvgSkE263S5oGK/4df4CQSOlRo=";
|
||||
vendorSha256 = "sha256-0jixQcgSXQJAd899EWOUKde5OXZcSZwQfH7LRdQlm7c=";
|
||||
proxyVendor = true;
|
||||
|
||||
# tests are failing for no obvious reasons
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGo118Module rec {
|
||||
pname = "corerad";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mdlayher";
|
||||
repo = "corerad";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-i7TvXP8aKW5izWv1AATvc5aP5qO3WxM09AiN5NRRylY=";
|
||||
sha256 = "sha256-2XPWexpr3xGwnvjT08BVq6uf1haPuZGwKswiy/1Z8vE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-+9KjgbKuAJexdGEKu9hIsHfHsVbKeB5ZtSgFzM2/bOI=";
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ callPackage, lib, stdenv, fetchurl, jre, makeWrapper }:
|
||||
|
||||
let this = stdenv.mkDerivation rec {
|
||||
version = "6.0.0-2021-01-18"; # Also update the fetchurl link
|
||||
version = "6.0.0-2022-03-18"; # Also update the fetchurl link
|
||||
pname = "openapi-generator-cli";
|
||||
|
||||
jarfilename = "${pname}-${version}.jar";
|
||||
|
@ -11,8 +11,8 @@ let this = stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/6.0.0-SNAPSHOT/openapi-generator-cli-6.0.0-20210118.082537-4.jar";
|
||||
sha256 = "1ji3yw9dp4srlgqxvb21vrcp2bzj4himxsmp8l8zid9nxsc1m71x";
|
||||
url = "https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/6.0.0-SNAPSHOT/openapi-generator-cli-6.0.0-20220318.042704-93.jar";
|
||||
sha256 = "1h126kpbnpbrsnjrxb09hzb796dwl4g58d6wrh1hhv8svwy5p0bl";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tinyssh";
|
||||
version = "20220305";
|
||||
version = "20220311";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janmojzis";
|
||||
repo = "tinyssh";
|
||||
rev = version;
|
||||
sha256 = "sha256-d49saN0I22DZixx5AdvQmx3WM7yzQH5lOKnKbzhlls0=";
|
||||
sha256 = "sha256-+lmPPc2UsNtOfuheWEZHAzmKBilNQ3kNh8ixzDnRjRc=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "vale";
|
||||
version = "2.15.2";
|
||||
version = "2.15.3";
|
||||
|
||||
subPackages = [ "cmd/vale" ];
|
||||
outputs = [ "out" "data" ];
|
||||
|
@ -11,10 +11,10 @@ buildGoModule rec {
|
|||
owner = "errata-ai";
|
||||
repo = "vale";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4KP4/mfuHTYxOwWqHOa2RNHgElOg6YNAEFmiuF/sHa8=";
|
||||
sha256 = "sha256-vhsn72xCe1wC4YRdo2m49iUj/3nVl0cyfeSmWRfESaY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-2vYe943HHybOLcP8nDJe7RimMRIJdND2UPwtwB2mttE=";
|
||||
vendorSha256 = "sha256-/0H35PGFFPch4jDnQ/ggctyHZJ5W/C1PNlkT5zzvI3M=";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $data/share/vale
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "swaykbdd";
|
||||
version = "1.0";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "artemsen";
|
||||
repo = "swaykbdd";
|
||||
rev = "v${version}";
|
||||
sha256 = "101mbf7pvm4ykmkh29g5xswrzdhdwq0rslzxqqfd5ksf1fphzgxd";
|
||||
sha256 = "sha256-umYPVkkYeu6TyVkjDsVBsRZLYh8WyseCPdih85kTz6A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||
|
|
|
@ -3594,6 +3594,8 @@ with pkgs;
|
|||
|
||||
mrkd = with python3Packages; toPythonApplication mrkd;
|
||||
|
||||
naproche = callPackage ../applications/science/logic/naproche { };
|
||||
|
||||
nautilus-open-any-terminal = callPackage ../tools/misc/nautilus-open-any-terminal { };
|
||||
|
||||
n2n = callPackage ../tools/networking/n2n { };
|
||||
|
|
Loading…
Reference in a new issue