Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
260ccf163b
47 changed files with 466 additions and 148 deletions
|
|
@ -3728,6 +3728,13 @@
|
|||
githubId = 541748;
|
||||
name = "Felipe Espinoza";
|
||||
};
|
||||
fedx-sudo = {
|
||||
email = "fedx-sudo@pm.me";
|
||||
github = "Fedx-sudo";
|
||||
githubId = 66258975;
|
||||
name = "Fedx sudo";
|
||||
matrix = "fedx:matrix.org";
|
||||
};
|
||||
fehnomenal = {
|
||||
email = "fehnomenal@fehn.systems";
|
||||
github = "fehnomenal";
|
||||
|
|
|
|||
18
nixos/modules/hardware/gkraken.nix
Normal file
18
nixos/modules/hardware/gkraken.nix
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.hardware.gkraken;
|
||||
in
|
||||
{
|
||||
options.hardware.gkraken = {
|
||||
enable = mkEnableOption "gkraken's udev rules for NZXT AIO liquid coolers";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.udev.packages = with pkgs; [
|
||||
gkraken
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -48,6 +48,7 @@
|
|||
./hardware/corectrl.nix
|
||||
./hardware/digitalbitbox.nix
|
||||
./hardware/device-tree.nix
|
||||
./hardware/gkraken.nix
|
||||
./hardware/i2c.nix
|
||||
./hardware/sensor/hddtemp.nix
|
||||
./hardware/sensor/iio.nix
|
||||
|
|
|
|||
|
|
@ -889,7 +889,7 @@ in
|
|||
RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
|
||||
RestrictNamespaces = true;
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = !(builtins.any (mod: (mod.allowMemoryWriteExecute or false)) cfg.package.modules);
|
||||
MemoryDenyWriteExecute = !((builtins.any (mod: (mod.allowMemoryWriteExecute or false)) cfg.package.modules) || (cfg.package == pkgs.openresty));
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
RemoveIPC = true;
|
||||
|
|
|
|||
|
|
@ -323,6 +323,7 @@ in
|
|||
ombi = handleTest ./ombi.nix {};
|
||||
openarena = handleTest ./openarena.nix {};
|
||||
openldap = handleTest ./openldap.nix {};
|
||||
openresty-lua = handleTest ./openresty-lua.nix {};
|
||||
opensmtpd = handleTest ./opensmtpd.nix {};
|
||||
opensmtpd-rspamd = handleTest ./opensmtpd-rspamd.nix {};
|
||||
openssh = handleTest ./openssh.nix {};
|
||||
|
|
|
|||
55
nixos/tests/openresty-lua.nix
Normal file
55
nixos/tests/openresty-lua.nix
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
let
|
||||
lualibs = [
|
||||
pkgs.lua.pkgs.markdown
|
||||
];
|
||||
|
||||
getPath = lib: type: "${lib}/share/lua/${pkgs.lua.luaversion}/?.${type}";
|
||||
getLuaPath = lib: getPath lib "lua";
|
||||
luaPath = lib.concatStringsSep ";" (map getLuaPath lualibs);
|
||||
in
|
||||
{
|
||||
name = "openresty-lua";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ bbigras ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
webserver = { pkgs, lib, ... }: {
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
package = pkgs.openresty;
|
||||
|
||||
commonHttpConfig = ''
|
||||
lua_package_path '${luaPath};;';
|
||||
'';
|
||||
|
||||
virtualHosts."default" = {
|
||||
default = true;
|
||||
locations."/" = {
|
||||
extraConfig = ''
|
||||
default_type text/html;
|
||||
access_by_lua '
|
||||
local markdown = require "markdown"
|
||||
markdown("source")
|
||||
';
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = { nodes, ... }:
|
||||
''
|
||||
url = "http://localhost"
|
||||
|
||||
webserver.wait_for_unit("nginx")
|
||||
webserver.wait_for_open_port(80)
|
||||
|
||||
http_code = webserver.succeed(
|
||||
f"curl -w '%{{http_code}}' --head --fail {url}"
|
||||
)
|
||||
assert http_code.split("\n")[-1] == "200"
|
||||
'';
|
||||
})
|
||||
23
pkgs/applications/backup/urbackup-client/default.nix
Normal file
23
pkgs/applications/backup/urbackup-client/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ stdenv, lib, fetchzip, wxGTK30, zlib, zstd }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "urbackup-client";
|
||||
version = "2.4.11";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://hndl.urbackup.org/Client/${version}/urbackup-client-${version}.tar.gz";
|
||||
sha256 = "0cciy9v1pxj9qaklpbhp2d5rdbkmfm74vhpqx6b4phww0f10wvzh";
|
||||
};
|
||||
|
||||
configureFlags = [ "--enable-embedded-cryptopp" ];
|
||||
buildInputs = [ wxGTK30 zlib zstd ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An easy to setup Open Source client/server backup system";
|
||||
longDescription = "An easy to setup Open Source client/server backup system, that through a combination of image and file backups accomplishes both data safety and a fast restoration time";
|
||||
homepage = "https://www.urbackup.org/index.html";
|
||||
license = licenses.agpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.mgttlinger ];
|
||||
};
|
||||
}
|
||||
|
|
@ -81,25 +81,25 @@ let
|
|||
installPhase = ''
|
||||
runHook preInstall
|
||||
'' + (if stdenv.isDarwin then ''
|
||||
mkdir -p "$out/Applications/${longName}.app" $out/bin
|
||||
mkdir -p "$out/Applications/${longName}.app" "$out/bin"
|
||||
cp -r ./* "$out/Applications/${longName}.app"
|
||||
ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/${sourceExecutableName}" $out/bin/${executableName}
|
||||
ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/${sourceExecutableName}" "$out/bin/${executableName}"
|
||||
'' else ''
|
||||
mkdir -p $out/lib/vscode $out/bin
|
||||
cp -r ./* $out/lib/vscode
|
||||
mkdir -p "$out/lib/vscode" "$out/bin"
|
||||
cp -r ./* "$out/lib/vscode"
|
||||
|
||||
ln -s $out/lib/vscode/bin/${sourceExecutableName} $out/bin/${executableName}
|
||||
ln -s "$out/lib/vscode/bin/${sourceExecutableName}" "$out/bin/${executableName}"
|
||||
|
||||
mkdir -p $out/share/applications
|
||||
ln -s $desktopItem/share/applications/${executableName}.desktop $out/share/applications/${executableName}.desktop
|
||||
ln -s $urlHandlerDesktopItem/share/applications/${executableName}-url-handler.desktop $out/share/applications/${executableName}-url-handler.desktop
|
||||
mkdir -p "$out/share/applications"
|
||||
ln -s "$desktopItem/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop"
|
||||
ln -s "$urlHandlerDesktopItem/share/applications/${executableName}-url-handler.desktop" "$out/share/applications/${executableName}-url-handler.desktop"
|
||||
|
||||
mkdir -p $out/share/pixmaps
|
||||
cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png
|
||||
mkdir -p "$out/share/pixmaps"
|
||||
cp "$out/lib/vscode/resources/app/resources/linux/code.png" "$out/share/pixmaps/code.png"
|
||||
|
||||
# Override the previously determined VSCODE_PATH with the one we know to be correct
|
||||
sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/vscode'" $out/bin/${executableName}
|
||||
grep -q "VSCODE_PATH='$out/lib/vscode'" $out/bin/${executableName} # check if sed succeeded
|
||||
sed -i "/ELECTRON=/iVSCODE_PATH='$out/lib/vscode'" "$out/bin/${executableName}"
|
||||
grep -q "VSCODE_PATH='$out/lib/vscode'" "$out/bin/${executableName}" # check if sed succeeded
|
||||
'') + ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
@ -162,9 +162,9 @@ let
|
|||
|
||||
# restore desktop item icons
|
||||
extraInstallCommands = ''
|
||||
mkdir -p $out/share/applications
|
||||
mkdir -p "$out/share/applications"
|
||||
for item in ${unwrapped}/share/applications/*.desktop; do
|
||||
ln -s $item $out/share/applications/
|
||||
ln -s "$item" "$out/share/applications/"
|
||||
done
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +1,27 @@
|
|||
{ stdenv, lib, fetchzip, freeglut, libXmu, libXi, libX11, libICE, libGLU, libGL, libSM, libXext, dialog, makeWrapper }:
|
||||
{ stdenv, lib, fetchzip, freeglut, libXmu, libXi, libX11, libICE, libGLU, libGL, libSM
|
||||
, libXext, glibc, lua, luabind, glfw, libgccjit, dialog, makeWrapper
|
||||
}:
|
||||
let
|
||||
lpath = lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU libGL libSM libXext ];
|
||||
lpath = lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU libGL libSM libXext glibc lua glfw luabind libgccjit ];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iceSL";
|
||||
version = "2.1.10";
|
||||
version = "2.4.1";
|
||||
|
||||
src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip {
|
||||
url = "https://gforge.inria.fr/frs/download.php/file/37268/icesl${version}-amd64.zip";
|
||||
sha256 = "0dv3mq6wy46xk9blzzmgbdxpsjdaxid3zadfrysxlhmgl7zb2cn2";
|
||||
url = "https://icesl.loria.fr/assets/other/download.php?build=${version}&os=amd64";
|
||||
extension = "zip";
|
||||
sha256 = "0rrnkqkhlsjclif5cjbf17qz64vs95ja49xarxjvq54wb4jhbs4l";
|
||||
} else if stdenv.hostPlatform.system == "i686-linux" then fetchzip {
|
||||
url = "https://gforge.inria.fr/frs/download.php/file/37267/icesl${version}-i386.zip";
|
||||
sha256 = "0sl54fsb2gz6dy0bwdscpdq1ab6ph5b7zald3bwzgkqsvna7p1jr";
|
||||
url = "https://icesl.loria.fr/assets/other/download.php?build=${version}&os=i386";
|
||||
extension = "zip";
|
||||
sha256 = "0n2yyxzw0arkc70f0qli4n5chdlh9vc7aqizk4v7825mcglhwlyh";
|
||||
} else throw "Unsupported architecture";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
installPhase = ''
|
||||
cp -r ./ $out
|
||||
rm $out/bin/*.so
|
||||
mkdir $out/oldbin
|
||||
mv $out/bin/IceSL-slicer $out/oldbin/IceSL-slicer
|
||||
runHook postInstall
|
||||
|
|
@ -31,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "GPU-accelerated procedural modeler and slicer for 3D printing";
|
||||
homepage = "http://shapeforge.loria.fr/icesl/index.html";
|
||||
homepage = "https://icesl.loria.fr/";
|
||||
license = licenses.inria-icesl;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ mgttlinger ];
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jquake";
|
||||
version = "1.6.1";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://fleneindre.github.io/downloads/JQuake_${version}_linux.zip";
|
||||
sha256 = "0nw6xjc3i1b8rk15arc5d0ji2bycc40rz044qd03vzxvh0h8yvgl";
|
||||
sha256 = "1k12yw9fwq1z3gg0d38dxs4mmyn912zfcm6zsbjkv27q6lvhvwng";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip copyDesktopItems ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "taskwarrior";
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GothenburgBitFactory";
|
||||
repo = "taskwarrior";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2wVjRecfIlNFAxXFaiKfxy9zArDIYDTfDdrnSM7H8fM=";
|
||||
sha256 = "sha256-jMZzo2cegoapEHTvfD6ThU1IsXru3iOcpyDbZxkSXzQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,19 @@
|
|||
{ lib, stdenv, rustPlatform, fetchCrate, libiconv }:
|
||||
{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "xplr";
|
||||
version = "0.14.7";
|
||||
version = "0.15.2";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-rGU9Jf+MHDs3pnuddqxLaWc8YqL+Ka7Rex+fTuU62sM=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sayanarijit";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1znb6n9xbzbi9sif76xlwnqrzkh50g9yz6k36m0hm5iacd1fapab";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
cargoSha256 = "sha256-GwepsY7PcWjKZpJ7H4D9vtXwd2XGFgG1c+QvinMAG4Q=";
|
||||
cargoSha256 = "0gbhkpha02ymr861av0fmyz6h007ajwkqcajq8hrnfzjk8rii47m";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A hackable, minimal, fast TUI file explorer";
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "notmuch";
|
||||
version = "0.33.2";
|
||||
version = "0.34";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz";
|
||||
hash = "sha256:1bic1f2va136aygfy53bsgziwiidcpb7qf1v05mlza2jmgv94j14";
|
||||
sha256 = "1dk16xa9q7adp1jaswxvw4p92f4h5mg0zkrh3zv8gqxn88amisc3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,18 +6,18 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unison-code-manager";
|
||||
milestone_id = "M2g";
|
||||
milestone_id = "M2j";
|
||||
version = "1.0.${milestone_id}-alpha";
|
||||
|
||||
src = if (stdenv.isDarwin) then
|
||||
fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-macos.tar.gz";
|
||||
sha256 = "1ib9pdzrfpzbi35fpwm9ym621nlydplvzgbhnyd86dbwbv3i9sga";
|
||||
sha256 = "0lrj37mfqzwg9n757ymjb440jx51kj1s8g6qv9vis9pxckmy0m08";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-linux.tar.gz";
|
||||
sha256 = "004jx7q657mkcrvilk4lfkp8xcpl2bjflpn9m2p7jzlrlk97v9nj";
|
||||
sha256 = "0qvin1rlkjwijchsijq3vbnn4injawchh2w97kyq7i3idh8ccl59";
|
||||
};
|
||||
|
||||
# The tarball is just the prebuilt binary, in the archive root.
|
||||
|
|
@ -31,7 +31,10 @@ stdenv.mkDerivation rec {
|
|||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mv ucm $out/bin
|
||||
wrapProgram $out/bin/ucm --prefix PATH ":" "${lib.makeBinPath [ less ]}";
|
||||
mv ui $out/ui
|
||||
wrapProgram $out/bin/ucm \
|
||||
--prefix PATH ":" "${lib.makeBinPath [ less ]}" \
|
||||
--set UCM_WEB_UI "$out/ui"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
strictDeps = true;
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook bison cdrkit cpio flex getopt gperf makeWrapper pkg-config qemu
|
||||
] ++ (with perlPackages; [ perl libintl_perl GetoptLong SysVirt ])
|
||||
] ++ (with perlPackages; [ perl libintl-perl GetoptLong SysVirt ])
|
||||
++ (with ocamlPackages; [ ocaml findlib ]);
|
||||
buildInputs = [
|
||||
ncurses jansson
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioymaps";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-YkSoxYf/Ti/gc1BFSYR24P3OzDrmcGWKhcOcrGpkRjU=";
|
||||
sha256 = "sha256-8U8I2pqvvm87IW1hhR4CGyIWdM/jsRPRP6u2yYGXdBw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bidict";
|
||||
version = "0.21.3";
|
||||
version = "0.21.4";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-1QvYH65140GY/8lJeaDrCTn/mts+8yvMk6kT2LPj7R0=";
|
||||
sha256 = "sha256-QshP++b43omK9gc7S+nqfM7c1400dKqETFTknVoHn28=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -31,6 +31,12 @@ buildPythonPackage rec {
|
|||
typing-extensions
|
||||
];
|
||||
|
||||
# make compatible with libusb1 2.x
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'libusb1>=1.7,<2.0' 'libusb1>=1.7'
|
||||
'';
|
||||
|
||||
# tests require to clone quite a few firmwares
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-s3";
|
||||
version = "1.19.1";
|
||||
version = "1.19.2";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Ov3JVCYa+3VU26VYtPYcqwSUMdDowSk8GWGt4PX/DKk=";
|
||||
sha256 = "sha256-wRJ5pY3zrWDEAm30xvBfiMpCxQKHWgcEemNiQ+v0+9o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "venstarcolortouch";
|
||||
version = "0.14";
|
||||
version = "0.15";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-wrsu1SffD4/RvDiE6yABfZN/oSDH8Ao/RJK7yL2QKy8=";
|
||||
sha256 = "sha256-7JUqXHk/yL+/EvfQoGLaKmPPy4DkljT9olqK0a/Nmkk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
72
pkgs/development/quickemu/default.nix
Normal file
72
pkgs/development/quickemu/default.nix
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, makeWrapper
|
||||
, qemu
|
||||
, gnugrep
|
||||
, lsb-release
|
||||
, jq
|
||||
, procps
|
||||
, python3
|
||||
, cdrtools
|
||||
, usbutils
|
||||
, util-linux
|
||||
, spicy
|
||||
, swtpm
|
||||
, wget
|
||||
, xdg-user-dirs
|
||||
, xrandr
|
||||
, zsync
|
||||
}:
|
||||
let
|
||||
runtimePaths = [
|
||||
qemu
|
||||
gnugrep
|
||||
jq
|
||||
lsb-release
|
||||
procps
|
||||
python3
|
||||
cdrtools
|
||||
usbutils
|
||||
util-linux
|
||||
spicy
|
||||
swtpm
|
||||
wget
|
||||
xdg-user-dirs
|
||||
xrandr
|
||||
zsync
|
||||
];
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "quickemu";
|
||||
version = "2.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wimpysworld";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-gextBOWxJafwdWzkp89thhRgcy1XBTDh2VyseHQM1G0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 -t "$out/bin" quickemu quickget macrecovery
|
||||
|
||||
for f in quickget macrecovery quickemu; do
|
||||
wrapProgram $out/bin/$f --prefix PATH : "${lib.makeBinPath runtimePaths}"
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Quickly create and run optimised Windows, macOS and Linux desktop virtual machines";
|
||||
homepage = "https://github.com/wimpysworld/quickemu";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fedx-sudo ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
let
|
||||
pname = "altair";
|
||||
version = "4.0.2";
|
||||
version = "4.1.0";
|
||||
name = "${pname}-v${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";
|
||||
sha256 = "sha256-HCoK+ljcTmyBZSCDe6u2x2urqrQfi3DIlXfCqGWvl3E=";
|
||||
sha256 = "sha256-YuG7H+7FXYGbNNhM5vxps72dqltcj3bA325e7ZbW8aI=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract { inherit name src; };
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "postman";
|
||||
version = "9.0.5";
|
||||
version = "9.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.pstmn.io/download/version/${version}/linux64";
|
||||
sha256 = "1z28v5vrjld99ydai66k8hw01x54647324ax459bvblw989lzp7v";
|
||||
sha256 = "QqlA/8fEOwucs+nU6ahDh3GB64PdhY8JFWPiyEBxGsE=";
|
||||
name = "${pname}.tar.gz";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -44,9 +44,9 @@ in rec {
|
|||
|
||||
unstable = fetchurl rec {
|
||||
# NOTE: Don't forget to change the SHA256 for staging as well.
|
||||
version = "6.19";
|
||||
version = "6.20";
|
||||
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
|
||||
sha256 = "sha256-QYLi2WJ3BMw3b0b8MQlYDqkHd5b0T17oPgjj6Wvwq2Y=";
|
||||
sha256 = "0wc4a8slb3k859sdw9wwy92zc4pq7xw1kbq4frnxbzbvkiz26a20";
|
||||
inherit (stable) gecko32 gecko64;
|
||||
|
||||
## see http://wiki.winehq.org/Mono
|
||||
|
|
@ -65,7 +65,7 @@ in rec {
|
|||
staging = fetchFromGitHub rec {
|
||||
# https://github.com/wine-staging/wine-staging/releases
|
||||
inherit (unstable) version;
|
||||
sha256 = "sha256-1Ng+kFFnqEndlCvI0eG1YmyqPdcolD3cVJ2KU5GU7Z4=";
|
||||
sha256 = "12fvfn77rsqwdprkxiylq09jc81lq34bm8p1zhhn85q6yawpjlbn";
|
||||
owner = "wine-staging";
|
||||
repo = "wine-staging";
|
||||
rev = "v${version}";
|
||||
|
|
|
|||
|
|
@ -4,25 +4,25 @@ let
|
|||
in {
|
||||
mainline = libsForQt5.callPackage ./base.nix rec {
|
||||
pname = "yuzu-mainline";
|
||||
version = "679";
|
||||
version = "788";
|
||||
branchName = branch;
|
||||
src = fetchFromGitHub {
|
||||
owner = "yuzu-emu";
|
||||
repo = "yuzu-mainline";
|
||||
rev = "mainline-0-${version}";
|
||||
sha256 = "1wkxkgfff5nn30mn2pqcrlsr7fja6bgaallsx1ainlcbamfyspcz";
|
||||
sha256 = "0vgj1jvbc1ylrzvbl7njdwpajhmp8l39i2k6hgh4az34ry4iaayy";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
};
|
||||
early-access = libsForQt5.callPackage ./base.nix rec {
|
||||
pname = "yuzu-ea";
|
||||
version = "1874";
|
||||
version = "2156";
|
||||
branchName = branch;
|
||||
src = fetchFromGitHub {
|
||||
owner = "pineappleEA";
|
||||
repo = "pineapple-src";
|
||||
rev = "EA-${version}";
|
||||
sha256 = "0ryrz7dl1sg30vvd7wrf05pjj8swah86055fn7qm6mr2bfslww0h";
|
||||
sha256 = "1x8x808x3i8jr9zghx01vakb6q6hkwnarawr9arxvqnd9x79j8ga";
|
||||
};
|
||||
};
|
||||
}.${branch}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
, preConfigure ? ""
|
||||
, postInstall ? null
|
||||
, meta ? null
|
||||
, passthru ? { tests = {}; }
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
|
@ -146,7 +147,7 @@ stdenv.mkDerivation {
|
|||
inherit (nixosTests) nginx nginx-auth nginx-etag nginx-pubhtml nginx-sandbox nginx-sso;
|
||||
variants = lib.recurseIntoAttrs nixosTests.nginx-variants;
|
||||
acme-integration = nixosTests.acme;
|
||||
};
|
||||
} // passthru.tests;
|
||||
};
|
||||
|
||||
meta = if meta != null then meta else {
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, lib
|
||||
, fetchurl
|
||||
, postgresql
|
||||
, nixosTests
|
||||
, ...
|
||||
}@args:
|
||||
|
||||
|
|
@ -42,6 +43,10 @@ callPackage ../nginx/generic.nix args rec {
|
|||
ln -s $out/nginx/html $out/html
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) openresty-lua;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A fast web application server built on Nginx";
|
||||
homepage = "https://openresty.org";
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ let
|
|||
IO
|
||||
IOStringy
|
||||
LWP
|
||||
libintl_perl
|
||||
libintl-perl
|
||||
|
||||
MHonArc
|
||||
MIMECharset
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ perlPackages.buildPerlPackage {
|
|||
buildInputs = [ perl openssl gettext python3Packages.sphinx ];
|
||||
propagatedBuildInputs = with perlPackages;
|
||||
[ # dependencies from Makefile.PL
|
||||
libintl_perl ConfigVersioned LWP ClassAccessorChained IOSocketSSL ClassStd
|
||||
libintl-perl ConfigVersioned LWP ClassAccessorChained IOSocketSSL ClassStd
|
||||
CGISession ConfigStd ConfigMerge Connector CryptCBC CryptOpenSSLAES CryptPKCS10
|
||||
DBDMock DataPassword DataSerializer DateTimeFormatDateParse IOPrompt
|
||||
IPCShareLite JSON LogLog4perl LWPProtocolConnect LWPProtocolHttps MailRFC822Address
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
|
|||
(fetchbower "tweetnacl" "0.12.2" "0.12.2" "1lfzbfrdaly3zyzbcp1p53yhxlrx56k8x04q924kg7l52gblm65g")
|
||||
(fetchbower "components-font-awesome" "4.7.0" "^4.6.3" "1w27im6ayjrbgjqa0i49ml5d3wy4ld40h9b29hz9myv77bpx4lg1")
|
||||
(fetchbower "ckeditor" "4.14.0" "4.14.0" "0lw9q0k8c0jlxvf35vrccab9c3c8rgpc6x66czj9si8yy2lyliyp")
|
||||
(fetchbower "codemirror" "5.61.1" "^5.19.0" "1abm1fcps86y2qm033wa96pd6ixf9w01vlhly5i51j0j94arnz4g")
|
||||
(fetchbower "codemirror" "5.63.3" "^5.19.0" "09di53sfsgpd328fvz1qjlmybk5mmnb2p9r38xw329bi9b21rq0r")
|
||||
(fetchbower "requirejs" "2.3.5" "2.3.5" "05lyvgz914h2w08r24rk0vkk3yxmqrvlg7j3i5av9ffkg9lpzsli")
|
||||
(fetchbower "marked" "1.1.0" "1.1.0" "1sdgqw9iki9c1pfm4c5h6c956mchbip2jywjrcmrlb75k53flsjz")
|
||||
(fetchbower "rangy" "rangy-release#1.3.0" "rangy-release#~1.3.0" "13x3wci003p8jyv2ncir0k23bxckx99b3555r0zvgmlwycg7w0zv")
|
||||
|
|
@ -13,19 +13,18 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
|
|||
(fetchbower "secure-fabric.js" "secure-v1.7.9" "secure-v1.7.9" "1l56mk7hbnsm9cdg5zdcmg95p7a9w96dq0bbl8fp11vs0awjil7a")
|
||||
(fetchbower "hyperjson" "1.4.0" "~1.4.0" "1n68ls3x4lyhg1yy8i4q3xkgh5xqpyakf45sny4x91mkr68x4bd9")
|
||||
(fetchbower "chainpad-crypto" "0.2.6" "^0.2.0" "0h6ibv6gcym7mm080swdw4l6l159xjmxgqnahyxw3aydha5cj1z0")
|
||||
(fetchbower "chainpad-listmap" "0.10.2" "^0.10.0" "03j3qws0icam4c0yqrz7f6maf1dxhlc56hc6csr2d9dx0wshd57s")
|
||||
(fetchbower "chainpad-listmap" "1.0.0" "^1.0.0" "0qzqblw67y1p69xc9n734srfhjviwwb2jbqxgxs0rf4vdyspwvcb")
|
||||
(fetchbower "chainpad" "5.2.4" "^5.2.0" "1f4nap0r8w50qpmjdfhhjhpz5xcl0n4zaxxnav1qaxi5j6dyg8h6")
|
||||
(fetchbower "file-saver" "1.3.1" "1.3.1" "065nzkvdiicxnw06z1sjz1sbp9nyis8z839hv6ng1fk25dc5kvkg")
|
||||
(fetchbower "alertifyjs" "1.0.11" "1.0.11" "0v7323bzq90k35shm3h6azj4wd9la3kbi1va1pw4qyvndkwma69l")
|
||||
(fetchbower "scrypt-async" "1.2.0" "1.2.0" "0d076ax708p9b8hcmk4f82j925nlnm0hmp0ni45ql37g7iirfpyv")
|
||||
(fetchbower "require-css" "0.1.10" "0.1.10" "106gz9i76v71q9zx2pnqkkj342m630lvssnw54023a0ljc0gqcwq")
|
||||
(fetchbower "less" "3.7.1" "3.7.1" "1n7ps4xlbrc9m63b3q62mg3p6i7d5hwchhpjshb0drzj5crvz556")
|
||||
(fetchbower "bootstrap" "4.6.0" "^v4.0.0" "1pp2n88pkms25p7mbna7vxxl5mkpdn8nvnfzwcwpp6b0871njmr6")
|
||||
(fetchbower "diff-dom" "2.1.1" "2.1.1" "0nrn6xqlhp0p5ixjxdk8qg3939crkggh1l8swd20d7bsz186l5f1")
|
||||
(fetchbower "nthen" "0.1.7" "0.1.7" "03yap5ildigaw4rwxmxs37pcwhq415iham8w39zd56ka98gpfxa5")
|
||||
(fetchbower "open-sans-fontface" "1.4.2" "^1.4.2" "0ksav1fcq640fmdz49ra4prwsrrfj35y2p4shx1jh1j7zxd044nf")
|
||||
(fetchbower "bootstrap-tokenfield" "0.12.1" "0.12.1" "1dh791s6ih8bf9ihck9n39h68c273jb3lg4mqk94bvqraz45fvwx")
|
||||
(fetchbower "localforage" "1.9.0" "^1.5.2" "18ds5427gaschld5afwi128hqy8kysa1b1ckbrzbmqz8xnlshmc2")
|
||||
(fetchbower "localforage" "1.10.0" "^1.5.2" "019rh006v2w5x63mgk78qhw59kf8czbkwdvfngmac8fs6gz88lc8")
|
||||
(fetchbower "html2canvas" "0.4.1" "^0.4.1" "0yg7y90nav068q0i5afc2c221zkddpf28hi0hwc46cawx4180c69")
|
||||
(fetchbower "croppie" "2.6.5" "^2.5.0" "1j1v5620zi13ad42r358i4ay891abwn6nz357484kgq2bgjj6ccx")
|
||||
(fetchbower "sortablejs" "1.14.0" "^1.6.0" "104d688lrbwxi3hnfr4q169850ffyfv1s8qnycqxhx0zfh3887m0")
|
||||
|
|
@ -34,7 +33,6 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
|
|||
(fetchbower "requirejs-plugins" "1.0.3" "^1.0.3" "00s3sdz1ykygx5shldwhhhybwgw7c99vkqd94i5i5x0gl97ifxf5")
|
||||
(fetchbower "dragula.js" "3.7.2" "3.7.2" "0dbkmrl8bcxiplprmmp9fj96ri5nahb2ql8cc7zwawncv0drvlh0")
|
||||
(fetchbower "MathJax" "3.0.5" "3.0.5" "087a9av15qj43m8pr3b9g59ncmydhmg40m6dfzsac62ykianh2a0")
|
||||
(fetchbower "chainpad-netflux" "0.12.9" "^0.12.0" "1b2jkfl354gs9iy05i6db9g0hnngacxd2wdv59lc0icbmx62fpvi")
|
||||
(fetchbower "netflux-websocket" "0.1.21" "^0.1.20" "13ia8cqipq1jnyzzxwf9yy91gzwnwb2g5kzb6l8id5gdr415q5yn")
|
||||
(fetchbower "es6-promise" "3.3.1" "^3.2.2" "0ai6z5admfs84fdx6663ips49kqgz4x68ays78cic0xfb7pp6vcz")
|
||||
(fetchbower "chainpad-netflux" "1.0.0" "^1.0.0" "08rpc73x1vyvd6zkb7w0m1smzjhq3b7cwb30nlmg93x873zjlsl6")
|
||||
(fetchbower "netflux-websocket" "1.0.0" "^1.0.0" "10hgc5ra3ll7qc2r8aal6p03gx6dgz06l2b54lh995pvf901wzi6")
|
||||
]; }
|
||||
|
|
|
|||
|
|
@ -346,22 +346,22 @@ let
|
|||
sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==";
|
||||
};
|
||||
};
|
||||
"mime-db-1.49.0" = {
|
||||
"mime-db-1.50.0" = {
|
||||
name = "mime-db";
|
||||
packageName = "mime-db";
|
||||
version = "1.49.0";
|
||||
version = "1.50.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz";
|
||||
sha512 = "CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==";
|
||||
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz";
|
||||
sha512 = "9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==";
|
||||
};
|
||||
};
|
||||
"mime-types-2.1.32" = {
|
||||
"mime-types-2.1.33" = {
|
||||
name = "mime-types";
|
||||
packageName = "mime-types";
|
||||
version = "2.1.32";
|
||||
version = "2.1.33";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz";
|
||||
sha512 = "hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==";
|
||||
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz";
|
||||
sha512 = "plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==";
|
||||
};
|
||||
};
|
||||
"ms-2.0.0" = {
|
||||
|
|
@ -656,14 +656,14 @@ let
|
|||
};
|
||||
in
|
||||
{
|
||||
"cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#4.9.0" = nodeEnv.buildNodePackage {
|
||||
"cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#4.11.0" = nodeEnv.buildNodePackage {
|
||||
name = "cryptpad";
|
||||
packageName = "cryptpad";
|
||||
version = "4.9.0";
|
||||
version = "4.11.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/xwiki-labs/cryptpad.git";
|
||||
rev = "b1281fb4abd14e9758d58df4801e0a00eda7bc44";
|
||||
sha256 = "ed2d0e2520645fccdada7fa5f25bb878c0ee0e61d6c81a98c18906c12750578c";
|
||||
rev = "390e38acf63a9d7ae581eaa926ea678a519fcc14";
|
||||
sha256 = "d75f0568fd146da6512646d9516138f94b0bbbd9a4691eef11d370bf5810176a";
|
||||
};
|
||||
dependencies = [
|
||||
sources."@mcrowe/minibloom-0.2.0"
|
||||
|
|
@ -708,8 +708,8 @@ in
|
|||
sources."merge-descriptors-1.0.1"
|
||||
sources."methods-1.1.2"
|
||||
sources."mime-1.4.1"
|
||||
sources."mime-db-1.49.0"
|
||||
sources."mime-types-2.1.32"
|
||||
sources."mime-db-1.50.0"
|
||||
sources."mime-types-2.1.33"
|
||||
sources."ms-2.0.0"
|
||||
sources."negotiator-0.6.2"
|
||||
sources."netflux-websocket-0.1.21"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
[
|
||||
{ "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#4.9.0" }
|
||||
{ "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#4.11.0" }
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,13 +1,15 @@
|
|||
{lib, stdenv, fetchurl, pkg-config, libX11, libXinerama, imlib2}:
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, libX11, libXinerama, imlib2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "bgs";
|
||||
version = "0.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Gottox/bgs/archive/v${version}.tar.gz";
|
||||
sha256 = "1rw9ingkkpvvr2dixx126ziim67a54r8k49918h1mbph0fjj08n5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Gottox";
|
||||
repo = "bgs";
|
||||
rev = "v${version}";
|
||||
sha256 = "V8GP+xLSiCvaYZt8Bi3/3KlTBaGnMYQUeNCHwH6Ejzo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
{ lib, stdenv, fetchurl, libxcb, xcbutil, xcb-util-cursor }:
|
||||
{ lib, stdenv, fetchFromGitHub, libxcb, xcbutil, xcb-util-cursor }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wmutils-core";
|
||||
version = "1.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/wmutils/core/archive/v${version}.tar.gz";
|
||||
sha256 = "0wk39aq2lrnc0wjs8pv3cigw3lwy2qzaw0v61bwknd5wabm25bvj";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wmutils";
|
||||
repo = "core";
|
||||
rev = "v${version}";
|
||||
sha256 = "XPVH7vXlpmUsvNyGKMxLSZnWLnH/J5nGkXizcVqDwzM=";
|
||||
};
|
||||
|
||||
buildInputs = [ libxcb xcbutil xcb-util-cursor ];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,14 @@
|
|||
{ lib, stdenv, fetchurl, libXi, xorgproto, autoconf, automake, libtool, m4, xlibsWrapper, pkg-config }:
|
||||
{ lib, stdenv, fetchFromGitHub, libXi, xorgproto, autoconf, automake, libtool, m4, xlibsWrapper, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xinput_calibrator";
|
||||
version = "0.7.5";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tias/${pname}/archive/v${version}.tar.gz";
|
||||
sha256 = "d8edbf84523d60f52311d086a1e3ad0f3536f448360063dd8029bf6290aa65e9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tias";
|
||||
repo = "xinput_calibrator";
|
||||
rev = "v${version}";
|
||||
sha256 = "5ZkNw+CKNUcPt1PY5PLzB/OT2wcf5n3UcaQlmMcwRVE=";
|
||||
};
|
||||
|
||||
preConfigure = "./autogen.sh --with-gui=X11";
|
||||
|
|
|
|||
|
|
@ -1,29 +1,38 @@
|
|||
{ buildPythonApplication, fetchurl, lib
|
||||
, python-dateutil, argcomplete, argh, psycopg2, boto3
|
||||
{ fetchFromGitHub
|
||||
, lib
|
||||
, python3Packages
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "barman";
|
||||
version = "2.12";
|
||||
version = "2.15";
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/pgbarman/${version}/barman-${version}.tar.gz";
|
||||
sha256 = "Ts8I6tlP2GRp90OIIKXy+cRWWvUO3Sm86zq2dtVP5YE=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "EnterpriseDB";
|
||||
repo = pname;
|
||||
rev = "release/${version}";
|
||||
sha256 = "127cqndg0405rad9jzba1mfhpqmyfa3kx16w345kd4n822w17ak9";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ python-dateutil argh psycopg2 boto3 argcomplete ];
|
||||
checkInputs = with python3Packages; [
|
||||
mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Tests are not present in tarball
|
||||
checkPhase = ''
|
||||
$out/bin/barman --help > /dev/null
|
||||
'';
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
argcomplete
|
||||
argh
|
||||
azure-identity
|
||||
azure-storage-blob
|
||||
boto3
|
||||
psycopg2
|
||||
python-dateutil
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.2ndquadrant.com/en/resources/barman/";
|
||||
description = "Backup and Disaster Recovery Manager for PostgreSQL";
|
||||
homepage = "https://www.pgbarman.org/";
|
||||
description = "Backup and Recovery Manager for PostgreSQL";
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fclones";
|
||||
version = "0.16.1";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pkolaczk";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7rwiqjjXB1+R+/kauGjiJOX/UtMmQW3U3xGL/rsSiQ0=";
|
||||
sha256 = "sha256-JygW1Ri9BA4Qssu6MlQCCjnAok9OD2pcGdavOyHxbIo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-g4z+05jiVaH3KCPVwJmvQbi0OCYtuafyZyVZDRRyPRA=";
|
||||
cargoSha256 = "sha256-sDHsj0qxKW5JJCI9H0WytgugtEmLaLU2EIgCcXdfQH0=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
AppKit
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
|
|||
ExporterTiny
|
||||
ListMoreUtils
|
||||
PDFAPI2
|
||||
libintl_perl
|
||||
libintl-perl
|
||||
];
|
||||
in ''
|
||||
for cmd in pdfoutline pdf-extract-outline; do
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchzip, openmp ? null }:
|
||||
{ lib, stdenv, fetchFromGitHub, openmp ? null }:
|
||||
|
||||
with lib;
|
||||
|
||||
|
|
@ -6,9 +6,11 @@ stdenv.mkDerivation {
|
|||
pname = "b2sum";
|
||||
version = "unstable-2018-06-11";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/BLAKE2/BLAKE2/archive/320c325437539ae91091ce62efec1913cd8093c2.tar.gz";
|
||||
sha256 = "0agmc515avdpr64bsgv87wby2idm0d3wbndxzkhdfjgzhgv0rb8k";
|
||||
src = fetchFromGitHub {
|
||||
owner = "BLAKE2";
|
||||
repo = "BLAKE2";
|
||||
rev = "320c325437539ae91091ce62efec1913cd8093c2";
|
||||
sha256 = "E60M9oP/Sdfg/L3ZxUcDtUXhFz9oP72IybdtVUJh9Sk=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/b2sum";
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "daemonize";
|
||||
version = "1.7.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/bmc/daemonize/archive/release-${version}.tar.gz";
|
||||
sha256 = "0q2c3i3si3k7wfhl6fyckkmkc81yp67pz52p3ggis79p4nczri10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "bmc";
|
||||
repo = "daemonize";
|
||||
rev = "release-${version}";
|
||||
sha256 = "1e6LZXf/lK7sB2CbXwOg7LOi0Q8IBQNAa4d7rX0Ej3A=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
86
pkgs/tools/system/gkraken/default.nix
Normal file
86
pkgs/tools/system/gkraken/default.nix
Normal file
|
|
@ -0,0 +1,86 @@
|
|||
{ python3Packages
|
||||
, lib
|
||||
, fetchFromGitLab
|
||||
, meson
|
||||
, pkg-config
|
||||
, glib
|
||||
, ninja
|
||||
, desktop-file-utils
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, libnotify
|
||||
, dbus
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gkraken";
|
||||
version = "1.1.6";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "leinardi";
|
||||
repo = "gkraken";
|
||||
rev = version;
|
||||
sha256 = "085zz6m7c3xzsrvkw50gbbz8l9fmswxj2hjya2f52dvgs8daijdy";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs scripts/meson_post_install.py
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
pkg-config
|
||||
glib
|
||||
ninja
|
||||
gtk3
|
||||
desktop-file-utils
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gobject-introspection
|
||||
glib
|
||||
gtk3
|
||||
libnotify
|
||||
dbus
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pygobject3
|
||||
peewee
|
||||
rx
|
||||
injector
|
||||
liquidctl
|
||||
pyxdg
|
||||
requests
|
||||
matplotlib
|
||||
dbus-python
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
# Extract udev rules from python code
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib/udev/rules.d
|
||||
sed -e '/\s*\(from\|@singleton\|@inject\)/d' $src/gkraken/interactor/udev_interactor.py > udev_interactor.py
|
||||
python -c 'from udev_interactor import _UDEV_RULE; print(_UDEV_RULE)' > $out/lib/udev/rules.d/60-gkraken.rules
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=(
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "GUI that allows to control the cooling (fan and/or pump profiles) of NZXT Kraken AIO liquid coolers from Linux";
|
||||
homepage = "https://gitlab.com/leinardi/gkraken";
|
||||
changelog = "https://gitlab.com/leinardi/gkraken/-/tags/${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ OPNA2608 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,12 +1,14 @@
|
|||
{ fetchurl, lib, stdenv }:
|
||||
{ fetchFromGitHub, lib, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "symlinks";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brandt/symlinks/archive/v${version}.tar.gz";
|
||||
sha256 = "1cihrd3dap52z1msdhhgda7b7wy1l5ysfvyba8yxb3zjk0l5n417";
|
||||
src = fetchFromGitHub {
|
||||
owner = "brandt";
|
||||
repo = "symlinks";
|
||||
rev = "v${version}";
|
||||
sha256 = "EMWd7T/k4v1uvXe2QxhyPoQKUpKIUANE9AOwX461FgU=";
|
||||
};
|
||||
|
||||
buildFlags = [ "CC=${stdenv.cc}/bin/cc" ];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
{ lib, stdenv, fetchurl, autoreconfHook, libiconv }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, libiconv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cconv";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/xiaoyjy/cconv/archive/v${version}.tar.gz";
|
||||
sha256 = "82f46a94829f5a8157d6f686e302ff5710108931973e133d6e19593061b81d84";
|
||||
src = fetchFromGitHub {
|
||||
owner = "xiaoyjy";
|
||||
repo = "cconv";
|
||||
rev = "v${version}";
|
||||
sha256 = "RAFl/+I+usUfeG/l17F3ltThK7G4+TekyQGwzQIgeH8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
{lib, stdenv, fetchurl, qt4, perl, pkg-config }:
|
||||
{ lib, stdenv, fetchFromGitHub, qt4, perl, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qshowdiff";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/danfis/qshowdiff/archive/v${version}.tar.gz";
|
||||
sha256 = "027959xbzvi5c2w9y1x122sr5i26k9mvp43banz2wln6gd860n1a";
|
||||
src = fetchFromGitHub {
|
||||
owner = "danfis";
|
||||
repo = "qshowdiff";
|
||||
rev = "v${version}";
|
||||
sha256 = "g3AWQ6/LSF59ztzdgNuLi+8d6fFTPiC9z0yXMdPdB5U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,13 +1,15 @@
|
|||
{ lib, fetchurl, pythonPackages, libreoffice }:
|
||||
{ lib, fetchFromGitHub, pythonPackages, libreoffice }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
|
||||
pname = "odpdown";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/thorstenb/odpdown/archive/v${version}.tar.gz";
|
||||
sha256 = "005eecc73c65b9d4c09532547940718a7b308cd565f62a213dfa040827d4d565";
|
||||
src = fetchFromGitHub {
|
||||
owner = "thorstenb";
|
||||
repo = "odpdown";
|
||||
rev = "v${version}";
|
||||
sha256 = "r2qbgD9PAalbypt+vjp2YcYggUGPQMEG2FDxMtohqG4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [ libreoffice lpod lxml mistune pillow pygments ];
|
||||
|
|
|
|||
|
|
@ -164,6 +164,8 @@ with pkgs;
|
|||
|
||||
addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { };
|
||||
|
||||
quickemu = callPackage ../development/quickemu { };
|
||||
|
||||
aether = callPackage ../applications/networking/aether { };
|
||||
|
||||
alda = callPackage ../development/interpreters/alda { };
|
||||
|
|
@ -1432,7 +1434,7 @@ with pkgs;
|
|||
|
||||
automirror = callPackage ../tools/misc/automirror { };
|
||||
|
||||
barman = python3Packages.callPackage ../tools/misc/barman { };
|
||||
barman = callPackage ../tools/misc/barman { };
|
||||
|
||||
base16-universal-manager = callPackage ../applications/misc/base16-universal-manager { };
|
||||
|
||||
|
|
@ -5974,6 +5976,8 @@ with pkgs;
|
|||
|
||||
gbenchmark = callPackage ../development/libraries/gbenchmark {};
|
||||
|
||||
gkraken = callPackage ../tools/system/gkraken { };
|
||||
|
||||
gtkdatabox = callPackage ../development/libraries/gtkdatabox {};
|
||||
|
||||
gtklick = callPackage ../applications/audio/gtklick {};
|
||||
|
|
@ -12953,6 +12957,8 @@ with pkgs;
|
|||
icu = icu67;
|
||||
};
|
||||
|
||||
urbackup-client = callPackage ../applications/backup/urbackup-client { };
|
||||
|
||||
vlang = callPackage ../development/compilers/vlang { };
|
||||
|
||||
vala-lint = callPackage ../development/tools/vala-lint { };
|
||||
|
|
|
|||
|
|
@ -852,7 +852,7 @@ let
|
|||
sha256 = "ee146cd75d6300837e6ca559bb0bde247d42123c96b2c5d4b2800f38d3e3d1ab";
|
||||
};
|
||||
buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestMockObject TestNoWarnings TestWarn ];
|
||||
propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict PodParser StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ];
|
||||
propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict PodParser StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl-perl ];
|
||||
doCheck = false; # Can't find home directory.
|
||||
meta = {
|
||||
homepage = "https://sqitch.org/";
|
||||
|
|
@ -11760,7 +11760,7 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
libintl_perl = buildPerlPackage {
|
||||
libintl-perl = buildPerlPackage {
|
||||
pname = "libintl-perl";
|
||||
version = "1.32";
|
||||
src = fetchurl {
|
||||
|
|
@ -18612,7 +18612,7 @@ let
|
|||
url = "mirror://cpan/authors/id/K/KR/KRYDE/podlinkcheck-15.tar.gz";
|
||||
sha256 = "4e3bebec1bf82dbf850a94ae26a253644cf5806ec41afc74e43e1710a37321db";
|
||||
};
|
||||
propagatedBuildInputs = [ FileFindIterator FileHomeDir IPCRun PodParser constant-defer libintl_perl ];
|
||||
propagatedBuildInputs = [ FileFindIterator FileHomeDir IPCRun PodParser constant-defer libintl-perl ];
|
||||
meta = {
|
||||
homepage = "http://user42.tuxfamily.org/podlinkcheck/index.html";
|
||||
description = "Check POD L<> link references";
|
||||
|
|
@ -25222,7 +25222,8 @@ let
|
|||
EmailMIMEModifier = self.EmailMIME;
|
||||
ExtUtilsCommand = self.ExtUtilsMakeMaker;
|
||||
IOstringy = self.IOStringy;
|
||||
libintlperl = self.libintl_perl;
|
||||
libintl_perl = self.libintl-perl;
|
||||
libintlperl = self.libintl-perl;
|
||||
LWPProtocolconnect = self.LWPProtocolConnect;
|
||||
LWPProtocolhttps = self.LWPProtocolHttps;
|
||||
LWPUserAgent = self.LWP;
|
||||
|
|
|
|||
Loading…
Reference in a new issue