Merge branch 'master' into staging-next
Conflict in pkgs/development/libraries/libvirt/default.nix required manual adjustments. The fetched patch is already in src. I checked that libvirt builds.
This commit is contained in:
commit
f48c1fda6b
@ -45,3 +45,5 @@ One can create a simple environment using a `shell.nix` like that:
|
||||
```
|
||||
|
||||
Running `nix-shell` would then drop you into a shell with these libraries and binaries available. You can use this to run closed-source applications which expect FHS structure without hassles: simply change `runScript` to the application path, e.g. `./bin/start.sh` -- relative paths are supported.
|
||||
|
||||
Additionally, the FHS builder links all relocated gsettings-schemas (the glib setup-hook moves them to `share/gsettings-schemas/${name}/glib-2.0/schemas`) to their standard FHS location. This means you don't need to wrap binaries with `wrapGAppsHook`.
|
||||
|
@ -1290,6 +1290,15 @@
|
||||
<literal>pkgs.theLoungePlugins.themes</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The option
|
||||
<literal>services.xserver.videoDriver = [ "nvidia" ];</literal>
|
||||
will now also install
|
||||
<link xlink:href="https://github.com/elFarto/nvidia-vaapi-driver">nvidia
|
||||
VA-API drivers</link> by default.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>firmwareLinuxNonfree</literal> package has been
|
||||
|
@ -477,6 +477,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- The option `services.thelounge.plugins` has been added to allow installing plugins for The Lounge. Plugins can be found in `pkgs.theLoungePlugins.plugins` and `pkgs.theLoungePlugins.themes`.
|
||||
|
||||
- The option `services.xserver.videoDriver = [ "nvidia" ];` will now also install [nvidia VA-API drivers](https://github.com/elFarto/nvidia-vaapi-driver) by default.
|
||||
|
||||
- The `firmwareLinuxNonfree` package has been renamed to `linux-firmware`.
|
||||
|
||||
- It is now possible to specify wordlists to include as handy to access environment variables using the `config.environment.wordlist` configuration options.
|
||||
|
@ -285,8 +285,12 @@ in
|
||||
|
||||
hardware.opengl.package = mkIf (!offloadCfg.enable) nvidia_x11.out;
|
||||
hardware.opengl.package32 = mkIf (!offloadCfg.enable) nvidia_x11.lib32;
|
||||
hardware.opengl.extraPackages = optional offloadCfg.enable nvidia_x11.out;
|
||||
hardware.opengl.extraPackages32 = optional offloadCfg.enable nvidia_x11.lib32;
|
||||
hardware.opengl.extraPackages = [
|
||||
pkgs.nvidia-vaapi-driver
|
||||
] ++ optional offloadCfg.enable nvidia_x11.out;
|
||||
hardware.opengl.extraPackages32 = [
|
||||
pkgs.pkgsi686Linux.nvidia-vaapi-driver
|
||||
] ++ optional offloadCfg.enable nvidia_x11.lib32;
|
||||
|
||||
environment.systemPackages = [ nvidia_x11.bin ]
|
||||
++ optionals cfg.nvidiaSettings [ nvidia_x11.settings ]
|
||||
|
@ -20,6 +20,21 @@ in
|
||||
description = "PlantUML server package to use";
|
||||
};
|
||||
|
||||
packages = {
|
||||
jdk = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.jdk;
|
||||
defaultText = literalExpression "pkgs.jdk";
|
||||
description = "JDK package to use for the server";
|
||||
};
|
||||
jetty = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.jetty;
|
||||
defaultText = literalExpression "pkgs.jetty";
|
||||
description = "Jetty package to use for the server";
|
||||
};
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
default = "plantuml";
|
||||
@ -105,10 +120,10 @@ in
|
||||
ALLOW_PLANTUML_INCLUDE = if cfg.allowPlantumlInclude then "true" else "false";
|
||||
};
|
||||
script = ''
|
||||
${pkgs.jre}/bin/java \
|
||||
-jar ${pkgs.jetty}/start.jar \
|
||||
${cfg.packages.jdk}/bin/java \
|
||||
-jar ${cfg.packages.jetty}/start.jar \
|
||||
--module=deploy,http,jsp \
|
||||
jetty.home=${pkgs.jetty} \
|
||||
jetty.home=${cfg.packages.jetty} \
|
||||
jetty.base=${cfg.package} \
|
||||
jetty.http.host=${cfg.listenHost} \
|
||||
jetty.http.port=${builtins.toString cfg.listenPort}
|
||||
|
@ -74,11 +74,9 @@ in
|
||||
# Debugging
|
||||
environment.sessionVariables.MATE_SESSION_DEBUG = mkIf cfg.debug "1";
|
||||
|
||||
environment.systemPackages =
|
||||
pkgs.mate.basePackages ++
|
||||
(pkgs.gnome.removePackagesByName
|
||||
pkgs.mate.extraPackages
|
||||
config.environment.mate.excludePackages) ++
|
||||
environment.systemPackages = pkgs.gnome.removePackagesByName
|
||||
(pkgs.mate.basePackages ++
|
||||
pkgs.mate.extraPackages ++
|
||||
[
|
||||
pkgs.desktop-file-utils
|
||||
pkgs.glib
|
||||
@ -87,7 +85,8 @@ in
|
||||
pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
|
||||
pkgs.mate.mate-settings-daemon
|
||||
pkgs.yelp # for 'Contents' in 'Help' menus
|
||||
];
|
||||
])
|
||||
config.environment.mate.excludePackages;
|
||||
|
||||
programs.dconf.enable = true;
|
||||
# Shell integration for VTE terminals
|
||||
|
@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
virtualisation.emptyDiskImages = [ 4096 ];
|
||||
networking.hostId = "deadbeef";
|
||||
boot.supportedFilesystems = [ "bcachefs" ];
|
||||
environment.systemPackages = with pkgs; [ parted ];
|
||||
environment.systemPackages = with pkgs; [ parted keyutils ];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
@ -20,10 +20,9 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
"parted --script /dev/vdb mklabel msdos",
|
||||
"parted --script /dev/vdb -- mkpart primary 1024M 50% mkpart primary 50% -1s",
|
||||
"udevadm settle",
|
||||
# Due to #32279, we cannot use encryption for this test yet
|
||||
# "echo password | bcachefs format --encrypted --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2",
|
||||
# "echo password | bcachefs unlock /dev/vdb1",
|
||||
"bcachefs format --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2",
|
||||
"keyctl link @u @s",
|
||||
"echo password | bcachefs format --encrypted --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2",
|
||||
"echo password | bcachefs unlock /dev/vdb1",
|
||||
"mount -t bcachefs /dev/vdb1:/dev/vdb2 /tmp/mnt",
|
||||
"udevadm settle",
|
||||
"bcachefs fs usage /tmp/mnt",
|
||||
|
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pt2-clone";
|
||||
version = "1.41";
|
||||
version = "1.42";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8bitbubsy";
|
||||
repo = "pt2-clone";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FnGtUoA6ol4lqp5HXjoJ3CHjdRs8eML0WI917ruid84=";
|
||||
sha256 = "sha256-CwnEvQsxrYStJ4RxnE0lHt1fBHQEZrjSldnQnTOPaE0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux";
|
||||
if stdenv.hostPlatform.system == "i686-linux" then
|
||||
{ arch = "x86"; sha256 = "afa4b1116aee18e3ddd93132467809d0bcf03715cf9ad55b895f021a13e1cb8a"; }
|
||||
{ arch = "x86"; sha256 = "sha256-k4FQrt72VNb5FdYMzxskcVhKlvx8MZelUlLCItxDB7c="; }
|
||||
else
|
||||
{ arch = "x86_64"; sha256 = "55ab653c601727a2077080e7ea4d76fe7a897379934ed9a5b544e20d490f53f9"; };
|
||||
{ arch = "x86_64"; sha256 = "sha256-mj5wVQlY2xFzdulvMdb5Qb5HGwr7RElzIkpOLjaAfGA="; };
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "1.5.4";
|
||||
version = "1.5.5";
|
||||
pname = "tuxguitar";
|
||||
|
||||
src = fetchurl {
|
||||
|
@ -697,8 +697,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "gitlens";
|
||||
publisher = "eamodio";
|
||||
version = "12.0.1";
|
||||
sha256 = "1xv1vzx643qa8jhjpnpv2wrymz38w130vm0idkcl77lh209r5i8x";
|
||||
version = "12.0.3";
|
||||
sha256 = "sha256-PHQXfk0JggkEBRflHp+OAUOCVuymCubaszfDCYbpfG0=";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
|
||||
@ -789,8 +789,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "prettier-vscode";
|
||||
publisher = "esbenp";
|
||||
version = "9.2.0";
|
||||
sha256 = "sha256-ROI312MPMUY1q6IV4qVCW8DD0MQPA/hVW7rfamo/IbI=";
|
||||
version = "9.3.0";
|
||||
sha256 = "sha256-hJgPjWf7a8+ltjmXTK8U/MwqgIZqBjmcCfHsAk2G3PA=";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog";
|
||||
@ -887,8 +887,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "auto-close-tag";
|
||||
publisher = "formulahendry";
|
||||
version = "0.5.13";
|
||||
sha256 = "0swyxhcibv6cl54gmfpnbz6bqidjzc77nx369wndhlq264idnwkw";
|
||||
version = "0.5.14";
|
||||
sha256 = "sha256-XYYHS2QTy8WYjtUYYWsIESzmH4dRQLlXQpJq78BolMw=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
@ -899,8 +899,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "auto-rename-tag";
|
||||
publisher = "formulahendry";
|
||||
version = "0.1.9";
|
||||
sha256 = "1xk8rzda16qgdxhq8bz6f8w09fd9044qczx1wfhszd6w3r4q9262";
|
||||
version = "0.1.10";
|
||||
sha256 = "sha256-uXqWebxnDwaUVLFG6MUh4bZ7jw5d2rTHRm5NoR2n0Vs=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
@ -1229,8 +1229,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "svg";
|
||||
publisher = "jock";
|
||||
version = "1.4.15";
|
||||
sha256 = "0a5w6qxvsdzcmgc0yfiagpmz25y90pmzgrxz9899na5qy3pjcbmz";
|
||||
version = "1.4.17";
|
||||
sha256 = "sha256-CDxh/YRyDGocxG4qOcyLXA0zHCg0YJ7XUu3OjFFjleI=";
|
||||
};
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
@ -1426,8 +1426,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-docker";
|
||||
publisher = "ms-azuretools";
|
||||
version = "1.19.0";
|
||||
sha256 = "sha256-buIAbsyKUvX3blO1AbCq/tJ1KAcqaFpciqQovmOZ5GE=";
|
||||
version = "1.20.0";
|
||||
sha256 = "sha256-i3gYTP76YEDItG2oXR9pEXuGv0qmyf1Xv6HQvDBEOyg=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
@ -1590,8 +1590,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "java";
|
||||
publisher = "redhat";
|
||||
version = "1.3.0";
|
||||
sha256 = "sha256-Y5hP/Rq9BsFwbCRQWOfiLHKoYkKBpZx8blg9o74obfk=";
|
||||
version = "1.4.0";
|
||||
sha256 = "sha256-9q3ilNukx3sQ6Fr1LhuQdjHHS251SDoHxC33w+qrfAI=";
|
||||
};
|
||||
buildInputs = [ jdk ];
|
||||
meta = {
|
||||
@ -1604,8 +1604,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-yaml";
|
||||
publisher = "redhat";
|
||||
version = "1.3.0";
|
||||
sha256 = "sha256-Tz6bLcBUATn8cYIzGoLJwgaJZGbBVr1CISmJHz+iM60=";
|
||||
version = "1.5.1";
|
||||
sha256 = "sha256-JXhmgBFZdKNjgX6K7U+M/T7HEmIOBQOzQEJ5957TUuM=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
@ -1659,8 +1659,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "material-icon-theme";
|
||||
publisher = "PKief";
|
||||
version = "4.12.1";
|
||||
sha256 = "sha256-pmWnnZrdk6zb8YFG5ESgK4k875hgeseWyzkA9YUjg7A=";
|
||||
version = "4.14.1";
|
||||
sha256 = "sha256-OHXi0EfeyKMeFiMU5yg0aDoWds4ED0lb+l6T12XZ3LQ=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
66
pkgs/applications/finance/irpf/default.nix
Normal file
66
pkgs/applications/finance/irpf/default.nix
Normal file
@ -0,0 +1,66 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchzip
|
||||
, copyDesktopItems
|
||||
, jdk11
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, unzip
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "irpf";
|
||||
version = "2022-1.0";
|
||||
|
||||
src = let
|
||||
year = lib.head (lib.splitVersion version);
|
||||
in fetchzip {
|
||||
url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${version}.zip";
|
||||
sha256 = "0h8f51ilvg7m6hlx0y5mpxhac90p32ksbrffw0hxdqbilgjz1s68";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip makeWrapper copyDesktopItems ];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem rec {
|
||||
name = pname;
|
||||
exec = pname;
|
||||
icon = "rfb64";
|
||||
desktopName = "Imposto de Renda Pessoa Física";
|
||||
comment = "Programa Oficial da Receita para elaboração do IRPF";
|
||||
categories = [ "Office" ];
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
BASEDIR="$out/share/${pname}"
|
||||
mkdir -p "$BASEDIR"
|
||||
|
||||
cp -r help lib lib-modulos "$BASEDIR"
|
||||
|
||||
install -Dm755 irpf.jar "$BASEDIR/${pname}.jar"
|
||||
install -Dm644 Leia-me.htm offline.png online.png pgd-updater.jar "$BASEDIR"
|
||||
|
||||
makeWrapper ${jdk11}/bin/java $out/bin/${pname} \
|
||||
--add-flags "-Dawt.useSystemAAFontSettings=on" \
|
||||
--add-flags "-Dswing.aatext=true" \
|
||||
--add-flags "-jar $BASEDIR/${pname}.jar" \
|
||||
--set _JAVA_AWT_WM_NONREPARENTING 1 \
|
||||
--set AWT_TOOLKIT MToolkit
|
||||
|
||||
mkdir -p $out/share/pixmaps
|
||||
unzip -j lib/ppgd-icones-4.0.jar icones/rfb64.png -d $out/share/pixmaps
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Programa Oficial da Receita para elaboração do IRPF";
|
||||
homepage = "https://www.gov.br/receitafederal/pt-br";
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ atila ];
|
||||
};
|
||||
}
|
70
pkgs/applications/graphics/gnome-obfuscate/default.nix
Normal file
70
pkgs/applications/graphics/gnome-obfuscate/default.nix
Normal file
@ -0,0 +1,70 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitLab
|
||||
|
||||
, gettext
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, rustPlatform
|
||||
, wrapGAppsHook
|
||||
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, glib
|
||||
, gtk4
|
||||
, libadwaita
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-obfuscate";
|
||||
version = "0.0.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "Obfuscate";
|
||||
rev = version;
|
||||
sha256 = "sha256-P8Y2Eizn1BMZXuFjGMXF/3oAUzI8ZNTrnbLyU+V6uk4=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
sha256 = "sha256-5MzWz5NH2sViIfaP8xOQLreEal5TYkji11VaUgieT3U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
glib
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
rustPlatform.cargoSetupHook
|
||||
rustPlatform.rust.cargo
|
||||
rustPlatform.rust.rustc
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
glib
|
||||
gtk4
|
||||
libadwaita
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs build-aux/meson_post_install.py
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Censor private information";
|
||||
homepage = "https://gitlab.gnome.org/World/obfuscate";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ fgaz ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
@ -1,25 +1,21 @@
|
||||
{ lib, stdenv, fetchurl, wrapGAppsHook
|
||||
, cargo, desktop-file-utils, meson, ninja, pkg-config, python3, rustc
|
||||
, dbus, gdk-pixbuf, glib, gtk3, gtksourceview4, libhandy
|
||||
, cargo, desktop-file-utils, meson, ninja, pkg-config, rustc
|
||||
, gdk-pixbuf, glib, gtk4, gtksourceview5, libadwaita
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "icon-library";
|
||||
version = "0.0.8";
|
||||
version = "0.0.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.gnome.org/World/design/icon-library/uploads/fdf890706e0eef2458a5285e3bf65dd5/icon-library-${version}.tar.xz";
|
||||
sha256 = "0807b56bgm8j1gpq4nf8x31gq9wqhcmpzpkqw6s4wissw3cb7q96";
|
||||
url = "https://gitlab.gnome.org/World/design/icon-library/uploads/93d183b17d216bbed7b03b2f3698059c/icon-library-${version}.tar.xz";
|
||||
sha256 = "1zrcnc5dn5fgcl3vklfpbp3m0qzi2n2viw59vw5fhwkysvp670y7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo desktop-file-utils meson ninja pkg-config python3 rustc wrapGAppsHook
|
||||
cargo desktop-file-utils meson ninja pkg-config rustc wrapGAppsHook
|
||||
];
|
||||
buildInputs = [ dbus gdk-pixbuf glib gtk3 gtksourceview4 libhandy ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs build-aux/meson_post_install.py
|
||||
'';
|
||||
buildInputs = [ gdk-pixbuf glib gtk4 gtksourceview5 libadwaita ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.gnome.org/World/design/icon-library";
|
||||
|
48
pkgs/applications/misc/eos-installer/default.nix
Normal file
48
pkgs/applications/misc/eos-installer/default.nix
Normal file
@ -0,0 +1,48 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, autoconf, autoconf-archive, automake, glib, intltool, libtool, pkg-config
|
||||
, gnome, gnupg, gtk3, udisks
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eos-installer";
|
||||
version = "4.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "endlessm";
|
||||
repo = "eos-installer";
|
||||
rev = "Release_${version}";
|
||||
sha256 = "1nl6vim5dd83kvskmf13xp9d6zx39fayz4z0wqwf7xf4nwl07gwz";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [
|
||||
autoconf autoconf-archive automake glib intltool libtool pkg-config
|
||||
];
|
||||
buildInputs = [ gnome.gnome-desktop gtk3 udisks ];
|
||||
|
||||
preConfigure = ''
|
||||
./autogen.sh
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--libexecdir=${placeholder "out"}/bin"
|
||||
"--localstatedir=/var"
|
||||
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
|
||||
];
|
||||
|
||||
# These are for runtime, so can't be discovered from PATH, which
|
||||
# is constructed from nativeBuildInputs.
|
||||
GPG_PATH = "${gnupg}/bin/gpg";
|
||||
GPGCONF_PATH = "${gnupg}/bin/gpgconf";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/endlessm/eos-installer";
|
||||
description = "Installer UI which writes images to disk";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ qyliss ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
@ -32,10 +32,10 @@ rec {
|
||||
|
||||
firefox-esr-91 = common rec {
|
||||
pname = "firefox-esr";
|
||||
version = "91.7.0esr";
|
||||
version = "91.7.1esr";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "925811989d8a91d826ba356bd46ac54be8153288ec0319c28d2bfbe89191e62e107691159dd7ca247253e2a4952eb59a5b9613e3feea3f5351238d4822e26301";
|
||||
sha512 = "c56aa38e9d706ff1f1838d2639dac82109dcffb54a7ea17326ae306604d78967ac32da13676756999bc1aa0bf50dc4e7072936ceb16e2e834bea48382ae4b48c";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
@ -5,8 +5,8 @@ self: super: {
|
||||
_: {
|
||||
src = pkgs.fetchgit {
|
||||
url = "https://github.com/NixOS/nixops.git";
|
||||
rev = "d939c9bcae184d10583bf48211739b5b6521fc64";
|
||||
sha256 = "111wfph4c737xxs717pz8bnksp8zw0b6zv1il4zzq3fshv2ckd5c";
|
||||
rev = "7220cbdc8a1cf2db5b3ad75b525faf145a5560a3";
|
||||
sha256 = "199cw25cvjb8gxs56nc8ilq7v4560c6vgi1sh1vqrsqxayq1g4cs";
|
||||
};
|
||||
}
|
||||
);
|
||||
@ -74,9 +74,9 @@ self: super: {
|
||||
nixops-virtd = super.nixops-virtd.overridePythonAttrs (
|
||||
_: {
|
||||
src = pkgs.fetchgit {
|
||||
url = "https://github.com/nix-community/nixops-libvirtd.git";
|
||||
rev = "1245280d97e0adc4643d02d1cf62ddd582c73e49";
|
||||
sha256 = "1z3zsx54585rcyabj6hrbwbd1c783rrlfj53np1sa3i7m93vmxzc";
|
||||
url = "https://github.com/lovesegfault/nixops-libvirtd.git";
|
||||
rev = "84d1688ee06afff136738b3eaf51f9cc3c08c350";
|
||||
sha256 = "1f3q9bwmdjr3qac7fh9b9hgw7l43hmiixbsmqm2zrnhb7xcyfmfg";
|
||||
};
|
||||
}
|
||||
);
|
||||
|
@ -8,14 +8,14 @@ python-versions = "*"
|
||||
|
||||
[[package]]
|
||||
name = "apache-libcloud"
|
||||
version = "3.4.1"
|
||||
version = "3.5.0"
|
||||
description = "A standard Python library that abstracts away differences among multiple cloud provider APIs. For more information and documentation, please see https://libcloud.apache.org"
|
||||
category = "main"
|
||||
optional = false
|
||||
python-versions = ">=3.5, <4"
|
||||
python-versions = ">=3.6, <4"
|
||||
|
||||
[package.dependencies]
|
||||
requests = ">=2.5.0"
|
||||
requests = ">=2.26.0"
|
||||
|
||||
[[package]]
|
||||
name = "babel"
|
||||
@ -38,14 +38,14 @@ python-versions = "*"
|
||||
|
||||
[[package]]
|
||||
name = "boto3"
|
||||
version = "1.21.11"
|
||||
version = "1.21.18"
|
||||
description = "The AWS SDK for Python"
|
||||
category = "main"
|
||||
optional = false
|
||||
python-versions = ">= 3.6"
|
||||
|
||||
[package.dependencies]
|
||||
botocore = ">=1.24.11,<1.25.0"
|
||||
botocore = ">=1.24.18,<1.25.0"
|
||||
jmespath = ">=0.7.1,<1.0.0"
|
||||
s3transfer = ">=0.5.0,<0.6.0"
|
||||
|
||||
@ -54,7 +54,7 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"]
|
||||
|
||||
[[package]]
|
||||
name = "botocore"
|
||||
version = "1.24.11"
|
||||
version = "1.24.18"
|
||||
description = "Low-level, data-driven core of boto 3."
|
||||
category = "main"
|
||||
optional = false
|
||||
@ -194,7 +194,7 @@ testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake
|
||||
|
||||
[[package]]
|
||||
name = "libvirt-python"
|
||||
version = "7.10.0"
|
||||
version = "8.1.0"
|
||||
description = "The libvirt virtualization API python binding"
|
||||
category = "main"
|
||||
optional = false
|
||||
@ -227,7 +227,7 @@ typing-extensions = "^3.7.4"
|
||||
type = "git"
|
||||
url = "https://github.com/NixOS/nixops.git"
|
||||
reference = "master"
|
||||
resolved_reference = "d939c9bcae184d10583bf48211739b5b6521fc64"
|
||||
resolved_reference = "7220cbdc8a1cf2db5b3ad75b525faf145a5560a3"
|
||||
|
||||
[[package]]
|
||||
name = "nixops-aws"
|
||||
@ -358,14 +358,14 @@ python-versions = "^3.7"
|
||||
develop = false
|
||||
|
||||
[package.dependencies]
|
||||
libvirt-python = "^7.0"
|
||||
libvirt-python = "^8.0"
|
||||
nixops = {git = "https://github.com/NixOS/nixops.git", branch = "master"}
|
||||
|
||||
[package.source]
|
||||
type = "git"
|
||||
url = "https://github.com/nix-community/nixops-libvirtd.git"
|
||||
reference = "master"
|
||||
resolved_reference = "1245280d97e0adc4643d02d1cf62ddd582c73e49"
|
||||
url = "https://github.com/lovesegfault/nixops-libvirtd.git"
|
||||
reference = "update-libvirt"
|
||||
resolved_reference = "84d1688ee06afff136738b3eaf51f9cc3c08c350"
|
||||
|
||||
[[package]]
|
||||
name = "nixopsvbox"
|
||||
@ -677,7 +677,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
|
||||
[metadata]
|
||||
lock-version = "1.1"
|
||||
python-versions = "^3.8"
|
||||
content-hash = "e75c6429aa8989659a345f903e2e67d87514b5864751e33890d90aa2d20ef3e2"
|
||||
content-hash = "63b68a38ca6f7b9189d2403c2c6d1ec7af29cc1ccdeab2fbc970b5dbd766c3c6"
|
||||
|
||||
[metadata.files]
|
||||
alabaster = [
|
||||
@ -685,8 +685,8 @@ alabaster = [
|
||||
{file = "alabaster-0.7.12.tar.gz", hash = "sha256:a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02"},
|
||||
]
|
||||
apache-libcloud = [
|
||||
{file = "apache-libcloud-3.4.1.tar.gz", hash = "sha256:88f18da0cf3fac0af723e743fb741d9d1be251881edab7a5a0d1629955b5011b"},
|
||||
{file = "apache_libcloud-3.4.1-py2.py3-none-any.whl", hash = "sha256:af1a5b3cda7bc3220093726ff67dbb70928521e2ec19d0e33a31b1e22fde1850"},
|
||||
{file = "apache-libcloud-3.5.0.tar.gz", hash = "sha256:073f10492976faa383a22b13b82c249827cfe90a083c71620e8316e815a6db3b"},
|
||||
{file = "apache_libcloud-3.5.0-py2.py3-none-any.whl", hash = "sha256:3789f4f2464fe18e317cdd3a03eff363268e096bc47f1f5770ee82d6ffe28c40"},
|
||||
]
|
||||
babel = [
|
||||
{file = "Babel-2.9.1-py2.py3-none-any.whl", hash = "sha256:ab49e12b91d937cd11f0b67cb259a57ab4ad2b59ac7a3b41d6c06c0ac5b0def9"},
|
||||
@ -697,12 +697,12 @@ boto = [
|
||||
{file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"},
|
||||
]
|
||||
boto3 = [
|
||||
{file = "boto3-1.21.11-py3-none-any.whl", hash = "sha256:bf5f6a8997ed11a66280ace67cc25ec31c28525940da91d309c3976a9955d4cf"},
|
||||
{file = "boto3-1.21.11.tar.gz", hash = "sha256:f2cecf5d176f398a39bfde0008df83c03f2142b2be5eabe32bf104961df68810"},
|
||||
{file = "boto3-1.21.18-py3-none-any.whl", hash = "sha256:d857feb6af9932e1ee3a748060a2cd9fd6043dbbccf66976eda54586597efdc0"},
|
||||
{file = "boto3-1.21.18.tar.gz", hash = "sha256:8d6f3c548f0ee03d742f404c96515e7579fc6968135aaa50dd855a046698ff79"},
|
||||
]
|
||||
botocore = [
|
||||
{file = "botocore-1.24.11-py3-none-any.whl", hash = "sha256:b29c2b5906d7f70782634bb8713c77e39f23aafc994bb2f7dccbeb2b36712adc"},
|
||||
{file = "botocore-1.24.11.tar.gz", hash = "sha256:2af93de704f3122878a3233e7cf5de0b02f6c4c9fa993ca853b583f597bb1c38"},
|
||||
{file = "botocore-1.24.18-py3-none-any.whl", hash = "sha256:7ea8ef1ff7c4882ab59b337662f90ddf5ea860e95e7e209dca593a34ea585b1b"},
|
||||
{file = "botocore-1.24.18.tar.gz", hash = "sha256:d2da7ccbc5ddd61fe3cd45fcbd3de380d9e3a15bfa8fbfd2d9259a93dcc60c56"},
|
||||
]
|
||||
certifi = [
|
||||
{file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"},
|
||||
@ -775,6 +775,8 @@ cryptography = [
|
||||
{file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34dae04a0dce5730d8eb7894eab617d8a70d0c97da76b905de9efb7128ad7085"},
|
||||
{file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1eb7bb0df6f6f583dd8e054689def236255161ebbcf62b226454ab9ec663746b"},
|
||||
{file = "cryptography-3.4.8-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:9965c46c674ba8cc572bc09a03f4c649292ee73e1b683adb1ce81e82e9a6a0fb"},
|
||||
{file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:3c4129fc3fdc0fa8e40861b5ac0c673315b3c902bbdc05fc176764815b43dd1d"},
|
||||
{file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:695104a9223a7239d155d7627ad912953b540929ef97ae0c34c7b8bf30857e89"},
|
||||
{file = "cryptography-3.4.8-cp36-abi3-win32.whl", hash = "sha256:21ca464b3a4b8d8e86ba0ee5045e103a1fcfac3b39319727bc0fc58c09c6aff7"},
|
||||
{file = "cryptography-3.4.8-cp36-abi3-win_amd64.whl", hash = "sha256:3520667fda779eb788ea00080124875be18f2d8f0848ec00733c0ec3bb8219fc"},
|
||||
{file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d2a6e5ef66503da51d2110edf6c403dc6b494cc0082f85db12f54e9c5d4c3ec5"},
|
||||
@ -815,7 +817,7 @@ jsonpickle = [
|
||||
{file = "jsonpickle-2.1.0.tar.gz", hash = "sha256:84684cfc5338a534173c8dd69809e40f2865d0be1f8a2b7af8465e5b968dcfa9"},
|
||||
]
|
||||
libvirt-python = [
|
||||
{file = "libvirt-python-7.10.0.tar.gz", hash = "sha256:267774bbdf99d47515274542880499437dc94ae291771f5663c62020a62da975"},
|
||||
{file = "libvirt-python-8.1.0.tar.gz", hash = "sha256:a21ecfab6d29ac1bdd1bfd4aa3ef58447f9f70919aefecd03774613f65914e43"},
|
||||
]
|
||||
markupsafe = [
|
||||
{file = "MarkupSafe-2.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:3028252424c72b2602a323f70fbf50aa80a5d3aa616ea6add4ba21ae9cc9da4c"},
|
||||
|
@ -14,7 +14,10 @@ nixops-gcp = {git = "https://github.com/nix-community/nixops-gce.git"}
|
||||
nixops-hercules-ci = {git = "https://github.com/hercules-ci/nixops-hercules-ci.git"}
|
||||
nixops-hetzner = {git = "https://github.com/NixOS/nixops-hetzner"}
|
||||
nixopsvbox = {git = "https://github.com/nix-community/nixops-vbox.git"}
|
||||
nixops-virtd = {git = "https://github.com/nix-community/nixops-libvirtd.git"}
|
||||
# FIXME: Once #30 lands this can be replaced
|
||||
# https://github.com/nix-community/nixops-libvirtd/pull/30
|
||||
# nixops-virtd = {git = "https://github.com/nix-community/nixops-libvirtd.git"}
|
||||
nixops-virtd = { git = "https://github.com/lovesegfault/nixops-libvirtd.git", branch = "update-libvirt" }
|
||||
|
||||
[tool.poetry.dev-dependencies]
|
||||
sphinx = "^3.1.2"
|
||||
|
@ -65,6 +65,7 @@ mkDerivation rec {
|
||||
setuptools
|
||||
watchgod
|
||||
dbus-python
|
||||
matrix-nio
|
||||
];
|
||||
|
||||
qmakeFlags = [
|
||||
|
@ -28,21 +28,21 @@ let
|
||||
in
|
||||
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.3";
|
||||
version = "3.4.1";
|
||||
pname = "weechat";
|
||||
|
||||
hardeningEnable = [ "pie" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
|
||||
sha256 = "sha256-GnSi7uMxiyWSQau75q07NlX1ikaBeWOdrzOf9f0jnBM=";
|
||||
sha256 = "sha256-TJ4JI97WiobkBxgnkUGh/XQAIlDV+PDgIxCzTqefiMw=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
|
||||
|
||||
cmakeFlags = with lib; [
|
||||
"-DENABLE_MAN=ON"
|
||||
"-DENABLE_DOC=ON"
|
||||
"-DENABLE_DOC=OFF" # TODO: Documentation fails to build, was deactivated to push through security update
|
||||
"-DENABLE_JAVASCRIPT=OFF" # Requires v8 <= 3.24.3, https://github.com/weechat/weechat/issues/360
|
||||
"-DENABLE_PHP=OFF"
|
||||
]
|
||||
|
@ -8,22 +8,20 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "timeline";
|
||||
version = "2.4.0";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/thetimelineproj/${pname}-${version}.zip";
|
||||
sha256 = "1pa0whqci6c2p20xf7gbndrrpr1xg42ixhql595ibdd4p3l37v23";
|
||||
sha256 = "sha256-qwH2mt3Va62QJKJGOpt5WV3QksqQaRGEif4CcPC5F2E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems ];
|
||||
|
||||
pythonPath = with python3.pkgs; [
|
||||
wxPython_4_1
|
||||
wxPython_4_0
|
||||
humblewx
|
||||
icalendar
|
||||
markdown
|
||||
pysvg-py3
|
||||
pillow
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
|
@ -1,41 +1,39 @@
|
||||
{ lib, stdenv, fetchFromGitHub, wxGTK, makeWrapper }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, wxGTK
|
||||
, cmake
|
||||
, ninja
|
||||
, wrapGAppsHook
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "treesheets";
|
||||
version = "1.0.1";
|
||||
version = "unstable-2022-03-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aardappel";
|
||||
repo = "treesheets";
|
||||
rev = "v${version}";
|
||||
sha256 = "0krsj7i5yr76imf83krz2lmlmpbsvpwqg2d4r0jwxiydjfyj4qr4";
|
||||
owner = "aardappel";
|
||||
repo = "treesheets";
|
||||
rev = "120c10d4d9ea1ce76db5c1bbd6f5d705b397b57d";
|
||||
sha256 = "oXgOvvRoZpueEeWnD3jsc6y5RIAzkXzLeEe7BSErBpw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ wxGTK ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
preConfigure = "cd src";
|
||||
buildInputs = [
|
||||
wxGTK
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir "$out/share" -p
|
||||
cp -av ../TS "$out/share/libexec"
|
||||
NIX_CFLAGS_COMPILE = "-DPACKAGE_VERSION=\"${builtins.replaceStrings [ "unstable-" ] [ "" ] version}\"";
|
||||
|
||||
mkdir "$out/bin" -p
|
||||
makeWrapper "$out/share/libexec/treesheets" "$out/bin/treesheets"
|
||||
|
||||
mkdir "$out/share/doc" -p
|
||||
|
||||
for f in readme.html docs examples
|
||||
do
|
||||
mv -v "$out/share/libexec/$f" "$out/share/doc"
|
||||
ln -sv "$out/share/doc/$f" "$out/share/libexec/$f"
|
||||
done
|
||||
|
||||
mkdir "$out/share/applications" -p
|
||||
mv -v "$out/share/libexec/treesheets.desktop" "$out/share/applications"
|
||||
substituteInPlace "$out/share/applications/treesheets.desktop" \
|
||||
--replace "Icon=images/treesheets.svg" "Icon=$out/share/libexec/images/treesheets.svg"
|
||||
'';
|
||||
passthru = {
|
||||
updateScript = unstableGitUpdater { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free Form Data Organizer";
|
||||
@ -49,9 +47,9 @@ stdenv.mkDerivation rec {
|
||||
planning, requirements gathering, presentation of information, etc.
|
||||
'';
|
||||
|
||||
homepage = "https://strlen.com/treesheets/";
|
||||
homepage = "https://strlen.com/treesheets/";
|
||||
maintainers = with maintainers; [ obadz avery ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.zlib;
|
||||
platforms = platforms.linux;
|
||||
license = licenses.zlib;
|
||||
};
|
||||
}
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-cliff";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orhun";
|
||||
repo = "git-cliff";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cctgZz65BliOePal4zrPpTbxMkz4GJj6gIh2YzEg+Do=";
|
||||
sha256 = "sha256-CJ/2Cv/XoLq9U7u5mexH8iCCHbGtV6xohP3FapqO3+g=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-M/BNqLZnLthaBONwn5XMmulmqyZTWv5LQFvxASDrBCI=";
|
||||
cargoSha256 = "sha256-pYStKDgvvV/Z96TAonpDW7DIs1YSO6gAoiUCieVa9QY=";
|
||||
|
||||
# attempts to run the program on .git in src which is not deterministic
|
||||
doCheck = false;
|
||||
|
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lab";
|
||||
version = "0.23.0";
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zaquestion";
|
||||
repo = "lab";
|
||||
rev = "v${version}";
|
||||
sha256 = "0g8v3cli8rvr0zsxiv4w0afzqmh0d85a832c4hc75b3f9amkr0dl";
|
||||
sha256 = "sha256-sw00D/PJaLAPHoPdJC2WYUNklIzMbc/bXt2jlQZ7E90=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = "09xn5vycb9shygs13pfwxlb89j6rhrbplm10mfgxi4kzlvm7agl6";
|
||||
vendorSha256 = "sha256-FwnVMH//GwFbi+llFF6XNqrZX2hRB4r51p8TRz2vN+g=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
60
pkgs/applications/version-management/jujutsu/default.nix
Normal file
60
pkgs/applications/version-management/jujutsu/default.nix
Normal file
@ -0,0 +1,60 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, openssl
|
||||
, stdenv
|
||||
, dbus
|
||||
, sqlite
|
||||
, Security
|
||||
, SystemConfiguration
|
||||
, libiconv
|
||||
, testVersion
|
||||
, jujutsu
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jujutsu";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "martinvonz";
|
||||
repo = "jj";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BOT2pKcOSOha28fba62X+GgILcplhkMWhZo7Q0gGTQ8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-uvR+WXX2iIWFhcPYpOoOS1WBvOXuhTmgVVT2446c6XE=";
|
||||
|
||||
# Needed to get openssl-sys to use pkg-config.
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
dbus
|
||||
sqlite
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
SystemConfiguration
|
||||
libiconv
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
version = testVersion {
|
||||
package = jujutsu;
|
||||
command = "jj --version";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Git-compatible DVCS that is both simple and powerful";
|
||||
homepage = "https://github.com/martinvonz/jj";
|
||||
changelog = "https://github.com/martinvonz/jj/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ _0x4A6F ];
|
||||
};
|
||||
}
|
@ -28,6 +28,11 @@ let
|
||||
sha256 = "sha256-hvmGReRWWpJWmR3N4it3uOfSLKb7tgwfTNvYRpo4zB8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix the type of libc buffer for aarch64-linux
|
||||
./fix-rhg-type-aarch64.patch
|
||||
];
|
||||
|
||||
format = "other";
|
||||
|
||||
passthru = { inherit python; }; # pass it so that the same version can be used in hg2git
|
||||
|
@ -0,0 +1,12 @@
|
||||
diff --git a/rust/hg-core/src/lock.rs b/rust/hg-core/src/lock.rs
|
||||
--- a/rust/hg-core/src/lock.rs
|
||||
+++ b/rust/hg-core/src/lock.rs
|
||||
@@ -145,7 +145,7 @@ lazy_static::lazy_static! {
|
||||
|
||||
/// Same as https://github.com/python/cpython/blob/v3.10.0/Modules/socketmodule.c#L5414
|
||||
const BUFFER_SIZE: usize = 1024;
|
||||
- let mut buffer = [0_i8; BUFFER_SIZE];
|
||||
+ let mut buffer = [0 as libc::c_char; BUFFER_SIZE];
|
||||
let hostname_bytes = unsafe {
|
||||
let result = libc::gethostname(buffer.as_mut_ptr(), BUFFER_SIZE);
|
||||
if result != 0 {
|
@ -1,18 +1,21 @@
|
||||
{ lib, stdenv, fetchurl, tcl, tk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tkcvs";
|
||||
version = "8.2.1";
|
||||
pname = "tkrev";
|
||||
version = "9.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/tkcvs/tkcvs_${lib.replaceStrings ["."] ["_"] version}.tar.gz";
|
||||
sha256 = "0kvj6rcx1153wq0n1lmd8imbrki6xy5wxghwzlb9i15l65sclg3i";
|
||||
url = "mirror://sourceforge/tkcvs/tkrev_${version}.tar.gz";
|
||||
sha256 = "sha256-WHDZPShEB9Q+Bjbb37mogJLUZk2GuWoO8bz+Zydc7i4=";
|
||||
};
|
||||
|
||||
buildInputs = [ tcl tk ];
|
||||
|
||||
patchPhase = ''
|
||||
sed -e 's@exec wish@exec ${tk}/bin/wish@' -i tkcvs/tkcvs.tcl tkdiff/tkdiff
|
||||
for file in tkrev/tkrev.tcl tkdiff/tkdiff; do
|
||||
substituteInPlace "$file" \
|
||||
--replace "exec wish" "exec ${tk}/bin/wish"
|
||||
done
|
||||
'';
|
||||
|
||||
installPhase = ''
|
@ -2,19 +2,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cloud-hypervisor";
|
||||
version = "22.0";
|
||||
version = "22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-hypervisor";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1n4i7rgx8rkif2naw429fnkhv0888sfxmnky67fd42mlv1lhz9w8";
|
||||
sha256 = "sha256-KWCGcGB4HCpV7uSM4otQhSGEzQ+1jQip2fiAysNN54k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc;
|
||||
|
||||
cargoSha256 = "0kc6lcwlqg9l19l4psakgkc5jf28nw1riz85adci897yha1dsnh0";
|
||||
cargoSha256 = "sha256-R70H1R9jFnQyOLI4UNuRzpOAAnGSBGpiHFKbxP2472o=";
|
||||
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
|
||||
|
@ -1,49 +0,0 @@
|
||||
From 9e4932ae99946b1a08ab5b5345fd2bc3486e54a5 Mon Sep 17 00:00:00 2001
|
||||
From: aszlig <aszlig@nix.build>
|
||||
Date: Mon, 18 Mar 2019 13:21:01 +0100
|
||||
Subject: [PATCH] 9pfs: Ignore O_NOATIME open flag
|
||||
|
||||
Since Linux 4.19, overlayfs uses the O_NOATIME flag on its lowerdir,
|
||||
which in turn causes errors when the Nix store is mounted in the guest
|
||||
because the file owner of the store paths typically don't match the
|
||||
owner of the QEMU process.
|
||||
|
||||
After submitting a patch to the overlayfs mailing list[1], it turns out
|
||||
that my patch was incomplete[2] and needs a bit more rework.
|
||||
|
||||
So instead of using an incomplete kernel patch in nixpkgs, which affects
|
||||
*all* users of overlayfs, not just NixOS VM tests, I decided that for
|
||||
now it's better to patch QEMU instead.
|
||||
|
||||
The change here really only ignores the O_NOATIME flag so that the
|
||||
behaviour is similar to what NFS does. From open(2):
|
||||
|
||||
This flag may not be effective on all filesystems. One example is NFS,
|
||||
where the server maintains the access time.
|
||||
|
||||
This change is therefore only temporary until the final fix lands in the
|
||||
stable kernel releases.
|
||||
|
||||
[1]: https://www.spinics.net/lists/linux-unionfs/msg06755.html
|
||||
[2]: https://www.spinics.net/lists/linux-unionfs/msg06756.html
|
||||
|
||||
Signed-off-by: aszlig <aszlig@nix.build>
|
||||
---
|
||||
hw/9pfs/9p.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
|
||||
index a6d6b3f835..4eb26e2294 100644
|
||||
--- a/hw/9pfs/9p.c
|
||||
+++ b/hw/9pfs/9p.c
|
||||
@@ -139,7 +139,6 @@ static int dotl_to_open_flags(int flags)
|
||||
{ P9_DOTL_DSYNC, O_DSYNC },
|
||||
{ P9_DOTL_FASYNC, FASYNC },
|
||||
#ifndef CONFIG_DARWIN
|
||||
- { P9_DOTL_NOATIME, O_NOATIME },
|
||||
/*
|
||||
* On Darwin, we could map to F_NOCACHE, which is
|
||||
* similar, but doesn't quite have the same
|
||||
--
|
||||
2.35.1
|
||||
|
@ -142,8 +142,6 @@ stdenv.mkDerivation rec {
|
||||
# set was removed during the process of upstreaming this functionality, and
|
||||
# will still be needed in nix until the macOS SDK reaches 10.13+.
|
||||
./provide-fallback-for-utimensat.patch
|
||||
# Still needed indefinitely
|
||||
./9p-ignore-noatime.patch
|
||||
]
|
||||
++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch;
|
||||
|
||||
|
@ -66,8 +66,8 @@ python3.pkgs.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"testCLI0001virt_install_many_devices"
|
||||
"test_disk_dir_searchable"
|
||||
"testAlterDisk"
|
||||
"test_misc_nonpredicatble_generate"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
|
@ -68,6 +68,8 @@ rec {
|
||||
xdg-utils
|
||||
iana-etc
|
||||
krb5
|
||||
gsettings-desktop-schemas
|
||||
hicolor-icon-theme # dont show a gtk warning about hicolor not being installed
|
||||
];
|
||||
|
||||
# list of libraries expected in an appimage environment:
|
||||
|
@ -93,6 +93,32 @@ let
|
||||
paths = [ etcPkg ldconfig ] ++ basePkgs ++ targetPaths;
|
||||
extraOutputsToInstall = [ "out" "lib" "bin" ] ++ extraOutputsToInstall;
|
||||
ignoreCollisions = true;
|
||||
postBuild = ''
|
||||
if [[ -d $out/share/gsettings-schemas/ ]]; then
|
||||
# Recreate the standard schemas directory if its a symlink to make it writable
|
||||
if [[ -L $out/share/glib-2.0 ]]; then
|
||||
ln -s $(readlink $out/share/glib-2.0) $out/share/glib-2.0.old
|
||||
rm -rf $out/share/glib-2.0
|
||||
fi
|
||||
|
||||
mkdir -p $out/share/glib-2.0/schemas
|
||||
|
||||
# symlink any schema files or overrides to the standard schema directory
|
||||
if [[ -e $out/share/glib-2.0.old/schemas ]]; then
|
||||
ln -fs $out/share/glib-2.0.old/schemas/*.xml $out/share/glib-2.0/schemas
|
||||
ln -fs $out/share/glib-2.0.old/schemas/*.gsettings-schemas.override $out/share/glib-2.0/schemas
|
||||
fi
|
||||
|
||||
for d in $out/share/gsettings-schemas/*; do
|
||||
# Force symlink, in case there are duplicates
|
||||
ln -fs $d/glib-2.0/schemas/*.xml $out/share/glib-2.0/schemas
|
||||
ln -fs $d/glib-2.0/schemas/*.gschema.override $out/share/glib-2.0/schemas
|
||||
done
|
||||
|
||||
# and compile them
|
||||
${pkgs.glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
staticUsrProfileMulti = buildEnv {
|
||||
|
@ -134,6 +134,32 @@ let
|
||||
paths = [ etcPkg ] ++ basePkgs ++ targetPaths;
|
||||
extraOutputsToInstall = [ "out" "lib" "bin" ] ++ extraOutputsToInstall;
|
||||
ignoreCollisions = true;
|
||||
postBuild = ''
|
||||
if [[ -d $out/share/gsettings-schemas/ ]]; then
|
||||
# Recreate the standard schemas directory if its a symlink to make it writable
|
||||
if [[ -L $out/share/glib-2.0 ]]; then
|
||||
ln -s $(readlink $out/share/glib-2.0) $out/share/glib-2.0.old
|
||||
rm -rf $out/share/glib-2.0
|
||||
fi
|
||||
|
||||
mkdir -p $out/share/glib-2.0/schemas
|
||||
|
||||
# symlink any schema files or overrides to the standard schema directory
|
||||
if [[ -e $out/share/glib-2.0.old/schemas ]]; then
|
||||
ln -fs $out/share/glib-2.0.old/schemas/*.xml $out/share/glib-2.0/schemas
|
||||
ln -fs $out/share/glib-2.0.old/schemas/*.gsettings-schemas.override $out/share/glib-2.0/schemas
|
||||
fi
|
||||
|
||||
for d in $out/share/gsettings-schemas/*; do
|
||||
# Force symlink, in case there are duplicates
|
||||
ln -fs $d/glib-2.0/schemas/*.xml $out/share/glib-2.0/schemas
|
||||
ln -fs $d/glib-2.0/schemas/*.gschema.override $out/share/glib-2.0/schemas
|
||||
done
|
||||
|
||||
# and compile them
|
||||
${pkgs.glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
staticUsrProfileMulti = buildEnv {
|
||||
|
@ -9,7 +9,7 @@ fi
|
||||
|
||||
pkgs=$1
|
||||
tmpfile=$(mktemp /tmp/nuget-to-nix.XXXXXX)
|
||||
trap 'rm -f "$tmpfile" EXIT
|
||||
trap "rm -f ${tmpfile}" EXIT
|
||||
|
||||
echo "{ fetchNuGet }: ["
|
||||
|
||||
|
@ -130,6 +130,8 @@ stdenv.mkDerivation rec {
|
||||
"-Dps=enabled"
|
||||
] ++ lib.optionals (!withLibsecret) [
|
||||
"-Dkeyring=disabled"
|
||||
] ++ lib.optionals (!supportMultimedia) [
|
||||
"-Dmultimedia=disabled"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
|
||||
|
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pkg-config
|
||||
, meson
|
||||
@ -34,6 +35,15 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-ooqVNMgeAqGlFcfachPPfhSiKTEEcNGv5oWdM7VLWOc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with vala 0.56
|
||||
# https://github.com/elementary/mail/pull/765
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/mail/commit/c3aa61d226f49147d7685cc00013469ff4df369a.patch";
|
||||
sha256 = "sha256-OxNBGIC1hrEaFSufQ59Wb0AMfdzqPt6diL4g3hbL/Ig=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream
|
||||
desktop-file-utils
|
||||
|
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, meson
|
||||
, ninja
|
||||
@ -41,6 +42,15 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-NhF/WgS6IOwgALSCNyFNxz8ROVTb+mUX+lBtnWEyhEI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with vala 0.56
|
||||
# https://github.com/elementary/photos/pull/711
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/photos/commit/6594f1323726fb0d38519a7bdafe16f9170353cb.patch";
|
||||
sha256 = "sha256-Ie9ULC8Xw4KLQJANPXh4LDywMjWfniPX/P76eHW8LHc=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream
|
||||
desktop-file-utils
|
||||
|
@ -13,13 +13,13 @@ assert enableLTO -> stdenv.cc.isGNU;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dictu";
|
||||
version = "0.23.0";
|
||||
version = "0.24.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dictu-lang";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-K/RbkRK8nCkmaNwWplWe2nWtULhn/GCNPXYStfMeUPg=";
|
||||
sha256 = "sha256-EYoLEyK8jh4z3/9aMuUBt0pCwks7NIevsK2mOh8x6bQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -282,9 +282,9 @@ in {
|
||||
sourceVersion = {
|
||||
major = "7";
|
||||
minor = "3";
|
||||
patch = "6";
|
||||
patch = "8";
|
||||
};
|
||||
sha256 = "sha256-ghJ/Q/rmznXUfWxFOfjB6jcunC2/pA+ui1g1HVInk6Q="; # linux64
|
||||
sha256 = "0h493q0lhpz035afi4g09f4mz5a72vqx4sa7qcry5z4zagxq8bhz"; # linux64
|
||||
pythonVersion = "2.7";
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
@ -7,7 +7,6 @@
|
||||
# Dependencies
|
||||
, bzip2
|
||||
, zlib
|
||||
, openssl_1_0_2
|
||||
, expat
|
||||
, ncurses6
|
||||
, tcl-8_5
|
||||
@ -50,7 +49,6 @@ let
|
||||
deps = [
|
||||
bzip2
|
||||
zlib
|
||||
openssl_1_0_2
|
||||
expat
|
||||
ncurses6
|
||||
tcl-8_5
|
||||
|
@ -1,33 +0,0 @@
|
||||
diff -u a/Makefile b/Makefile
|
||||
--- a/Makefile 2020-12-27 18:48:53.934098765 +0100
|
||||
+++ b/Makefile 2020-12-27 18:50:44.022674117 +0100
|
||||
@@ -19,13 +19,13 @@
|
||||
# http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
|
||||
PREFIX ?= /usr/local
|
||||
EXEC_PREFIX = $(PREFIX)
|
||||
-BINDIR = $(EXEC_PREFIX)/bin
|
||||
+BINDIR ?= $(EXEC_PREFIX)/bin
|
||||
DATAROOTDIR = $(PREFIX)/share
|
||||
DOCDIR = $(DATAROOTDIR)/doc/$(CPROG)
|
||||
SYSCONFDIR ?= $(PREFIX)/etc
|
||||
HTMLDIR = $(DOCDIR)
|
||||
-INCLUDEDIR = $(DESTDIR)$(PREFIX)/include
|
||||
-LIBDIR = $(DESTDIR)$(EXEC_PREFIX)/lib
|
||||
+INCLUDEDIR ?= $(DESTDIR)$(PREFIX)/include
|
||||
+LIBDIR ?= $(DESTDIR)$(EXEC_PREFIX)/lib
|
||||
PID_FILE ?= /var/run/$(CPROG).pid
|
||||
|
||||
# build tools
|
||||
@@ -337,10 +337,10 @@
|
||||
install -m 755 $(CPROG) "$(BINDIR)/"
|
||||
|
||||
install-headers:
|
||||
- install -m 644 $(HEADERS) "$(INCLUDEDIR)"
|
||||
+ install -m 644 $(HEADERS) "$(INCLUDEDIR)/"
|
||||
|
||||
install-lib: lib$(CPROG).a
|
||||
- install -m 644 $< "$(LIBDIR)"
|
||||
+ install -m 644 $< "$(LIBDIR)/"
|
||||
|
||||
install-slib: lib$(CPROG).so
|
||||
$(eval version=$(shell grep -w "define CIVETWEB_VERSION" include/civetweb.h | sed 's|.*VERSION "\(.*\)"|\1|g'))
|
@ -1,5 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -13,33 +15,28 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-Qh6BGPk7a01YzCeX42+Og9M+fjXRs7kzNUCyT4mYab4=";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
"WITH_CPP=1"
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"LIBDIR=${placeholder "out"}/lib"
|
||||
"INCLUDEDIR=${placeholder "dev"}/include"
|
||||
];
|
||||
|
||||
patches = [
|
||||
./0001-allow-setting-paths-in-makefile.patch
|
||||
];
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
installTargets = [
|
||||
"install-headers"
|
||||
"install-lib"
|
||||
"install-slib"
|
||||
"install"
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $dev/include
|
||||
mkdir -p $out/lib
|
||||
# The existence of the "build" script causes `mkdir -p build` to fail:
|
||||
# mkdir: cannot create directory 'build': File exists
|
||||
preConfigure = ''
|
||||
rm build
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCIVETWEB_ENABLE_CXX=ON"
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
|
||||
# The civetweb unit tests rely on downloading their fork of libcheck.
|
||||
"-DCIVETWEB_BUILD_TESTING=OFF"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Embedded C/C++ web server";
|
||||
homepage = "https://github.com/civetweb/civetweb";
|
||||
|
@ -1,4 +1,4 @@
|
||||
From a896b0be849455edb83a9305dfec9b41447ef3e4 Mon Sep 17 00:00:00 2001
|
||||
From ad42041cfedcf25716429d2aad16641e0e2a012f Mon Sep 17 00:00:00 2001
|
||||
From: Euan Kemp <euank@euank.com>
|
||||
Date: Thu, 14 Jan 2021 00:32:00 -0800
|
||||
Subject: [PATCH] meson: patch in an install prefix for building on nix
|
||||
@ -6,22 +6,28 @@ Subject: [PATCH] meson: patch in an install prefix for building on nix
|
||||
Used in the nixpkgs version of libvirt so that we can install things in
|
||||
the nix store, but read them from the root filesystem.
|
||||
---
|
||||
meson.build | 9 +++++++++
|
||||
meson.build | 9 ++++++++
|
||||
meson_options.txt | 2 ++
|
||||
src/libxl/meson.build | 6 +++---
|
||||
src/locking/meson.build | 8 ++++----
|
||||
src/lxc/meson.build | 6 +++---
|
||||
src/meson.build | 18 +++++++++---------
|
||||
src/network/meson.build | 12 ++++++------
|
||||
src/ch/meson.build | 6 ++---
|
||||
src/interface/meson.build | 2 +-
|
||||
src/libxl/meson.build | 18 +++++++--------
|
||||
src/locking/meson.build | 8 +++----
|
||||
src/lxc/meson.build | 10 ++++----
|
||||
src/meson.build | 18 +++++++--------
|
||||
src/network/meson.build | 14 ++++++------
|
||||
src/node_device/meson.build | 2 +-
|
||||
src/nwfilter/meson.build | 6 ++---
|
||||
src/nwfilter/xml/meson.build | 2 +-
|
||||
src/qemu/meson.build | 14 +++++++-------
|
||||
src/remote/meson.build | 6 +++---
|
||||
src/security/apparmor/meson.build | 8 ++++----
|
||||
tools/meson.build | 4 ++--
|
||||
12 files changed, 53 insertions(+), 42 deletions(-)
|
||||
src/qemu/meson.build | 38 +++++++++++++++----------------
|
||||
src/remote/meson.build | 10 ++++----
|
||||
src/secret/meson.build | 4 ++--
|
||||
src/security/apparmor/meson.build | 8 +++----
|
||||
src/storage/meson.build | 6 ++---
|
||||
tools/meson.build | 2 +-
|
||||
18 files changed, 88 insertions(+), 77 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index b5164f6..33719f1 100644
|
||||
index 9016c0458a..b26e690194 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -39,6 +39,8 @@ if host_machine.system() == 'windows'
|
||||
@ -48,7 +54,7 @@ index b5164f6..33719f1 100644
|
||||
# sysconfdir as this makes a lot of things break in testing situations
|
||||
if prefix == '/usr'
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index e5d79c2..081cd32 100644
|
||||
index 5b43cdbd6b..e9dff18441 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -1,3 +1,5 @@
|
||||
@ -57,27 +63,67 @@ index e5d79c2..081cd32 100644
|
||||
option('no_git', type: 'boolean', value: false, description: 'Disable git submodule update')
|
||||
option('packager', type: 'string', value: '', description: 'Extra packager name')
|
||||
option('packager_version', type: 'string', value: '', description: 'Extra packager version')
|
||||
diff --git a/src/libxl/meson.build b/src/libxl/meson.build
|
||||
index 3bb6cc5..78d7be0 100644
|
||||
--- a/src/libxl/meson.build
|
||||
+++ b/src/libxl/meson.build
|
||||
@@ -84,8 +84,8 @@ if conf.has('WITH_LIBXL')
|
||||
diff --git a/src/ch/meson.build b/src/ch/meson.build
|
||||
index 66b77907b0..6aa9bbc548 100644
|
||||
--- a/src/ch/meson.build
|
||||
+++ b/src/ch/meson.build
|
||||
@@ -64,8 +64,8 @@ if conf.has('WITH_CH')
|
||||
}
|
||||
|
||||
virt_install_dirs += [
|
||||
- localstatedir / 'lib' / 'libvirt' / 'ch',
|
||||
- localstatedir / 'log' / 'libvirt' / 'ch',
|
||||
- runstatedir / 'libvirt' / 'ch',
|
||||
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'ch',
|
||||
+ install_prefix + localstatedir / 'log' / 'libvirt' / 'ch',
|
||||
+ install_prefix + runstatedir / 'libvirt' / 'ch',
|
||||
]
|
||||
endif
|
||||
diff --git a/src/interface/meson.build b/src/interface/meson.build
|
||||
index 828f274422..2a6b1f8c5e 100644
|
||||
--- a/src/interface/meson.build
|
||||
+++ b/src/interface/meson.build
|
||||
@@ -56,6 +56,6 @@ if conf.has('WITH_INTERFACE')
|
||||
}
|
||||
|
||||
virt_install_dirs += [
|
||||
- runstatedir / 'libvirt' / 'interface',
|
||||
+ install_prefix + runstatedir / 'libvirt' / 'interface',
|
||||
]
|
||||
endif
|
||||
diff --git a/src/libxl/meson.build b/src/libxl/meson.build
|
||||
index 0cc277db82..48d8c5b962 100644
|
||||
--- a/src/libxl/meson.build
|
||||
+++ b/src/libxl/meson.build
|
||||
@@ -79,14 +79,14 @@ if conf.has('WITH_LIBXL')
|
||||
}
|
||||
|
||||
virt_install_dirs += [
|
||||
- confdir / 'libxl',
|
||||
- confdir / 'libxl' / 'autostart',
|
||||
- localstatedir / 'lib' / 'libvirt' / 'libxl',
|
||||
- runstatedir / 'libvirt' / 'libxl',
|
||||
- localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel',
|
||||
- localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel' / 'target',
|
||||
- localstatedir / 'lib' / 'libvirt' / 'libxl' / 'dump',
|
||||
- localstatedir / 'lib' / 'libvirt' / 'libxl' / 'save',
|
||||
- localstatedir / 'log' / 'libvirt' / 'libxl',
|
||||
- runstatedir / 'libvirt' / 'libxl',
|
||||
+ install_prefix + confdir / 'libxl',
|
||||
+ install_prefix + confdir / 'libxl' / 'autostart',
|
||||
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl',
|
||||
+ install_prefix + runstatedir / 'libvirt' / 'libxl',
|
||||
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel',
|
||||
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel' / 'target',
|
||||
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'dump',
|
||||
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'save',
|
||||
+ install_prefix + localstatedir / 'log' / 'libvirt' / 'libxl',
|
||||
+ install_prefix + runstatedir / 'libvirt' / 'libxl',
|
||||
]
|
||||
endif
|
||||
diff --git a/src/locking/meson.build b/src/locking/meson.build
|
||||
index 8a28310..9da81cc 100644
|
||||
index 72f7780438..abe70d20d5 100644
|
||||
--- a/src/locking/meson.build
|
||||
+++ b/src/locking/meson.build
|
||||
@@ -243,14 +243,14 @@ if conf.has('WITH_LIBVIRTD')
|
||||
@@ -238,14 +238,14 @@ if conf.has('WITH_LIBVIRTD')
|
||||
}
|
||||
|
||||
virt_install_dirs += [
|
||||
@ -97,26 +143,39 @@ index 8a28310..9da81cc 100644
|
||||
endif
|
||||
endif
|
||||
diff --git a/src/lxc/meson.build b/src/lxc/meson.build
|
||||
index f8e2a88..96d6687 100644
|
||||
index 99d4a34213..aae477c1ee 100644
|
||||
--- a/src/lxc/meson.build
|
||||
+++ b/src/lxc/meson.build
|
||||
@@ -182,8 +182,8 @@ if conf.has('WITH_LXC')
|
||||
@@ -176,10 +176,10 @@ if conf.has('WITH_LXC')
|
||||
}
|
||||
|
||||
virt_install_dirs += [
|
||||
- confdir / 'lxc',
|
||||
- confdir / 'lxc' / 'autostart',
|
||||
- localstatedir / 'lib' / 'libvirt' / 'lxc',
|
||||
- runstatedir / 'libvirt' / 'lxc',
|
||||
- localstatedir / 'log' / 'libvirt' / 'lxc',
|
||||
- runstatedir / 'libvirt' / 'lxc',
|
||||
+ install_prefix + confdir / 'lxc',
|
||||
+ install_prefix + confdir / 'lxc' / 'autostart',
|
||||
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'lxc',
|
||||
+ install_prefix + runstatedir / 'libvirt' / 'lxc',
|
||||
+ install_prefix + localstatedir / 'log' / 'libvirt' / 'lxc',
|
||||
+ install_prefix + runstatedir / 'libvirt' / 'lxc',
|
||||
]
|
||||
endif
|
||||
diff --git a/src/meson.build b/src/meson.build
|
||||
index 7c47821..d33d16a 100644
|
||||
index b2d951d36c..305716010f 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -669,7 +669,7 @@ endforeach
|
||||
@@ -210,7 +210,7 @@ openrc_init_files = []
|
||||
|
||||
# virt_install_dirs:
|
||||
# list of directories to create during installation
|
||||
-virt_install_dirs = [ confdir ]
|
||||
+virt_install_dirs = [ install_prefix + confdir ]
|
||||
|
||||
# driver_source_files:
|
||||
# driver source files to check
|
||||
@@ -663,7 +663,7 @@ endforeach
|
||||
|
||||
virt_conf_files += 'libvirt.conf'
|
||||
|
||||
@ -125,7 +184,7 @@ index 7c47821..d33d16a 100644
|
||||
install_data(virt_aug_files, install_dir: virt_aug_dir)
|
||||
|
||||
# augeas_test_data:
|
||||
@@ -729,7 +729,7 @@ foreach data : virt_daemon_confs
|
||||
@@ -723,7 +723,7 @@ foreach data : virt_daemon_confs
|
||||
output: '@0@.conf'.format(data['name']),
|
||||
configuration: daemon_conf,
|
||||
install: true,
|
||||
@ -134,15 +193,16 @@ index 7c47821..d33d16a 100644
|
||||
)
|
||||
|
||||
if data.get('with_ip', false)
|
||||
@@ -853,14 +853,14 @@ if conf.has('WITH_LIBVIRTD')
|
||||
@@ -847,7 +847,7 @@ if conf.has('WITH_LIBVIRTD')
|
||||
|
||||
install_data(
|
||||
init_file,
|
||||
- install_dir: sysconfdir / 'init.d',
|
||||
+ install_dir: install_prefix + sysconfdir / 'init.d',
|
||||
install_mode: 'rwxr-xr-x',
|
||||
rename: [ init['name'] ],
|
||||
)
|
||||
|
||||
@@ -855,7 +855,7 @@ if conf.has('WITH_LIBVIRTD')
|
||||
if init.has_key('confd')
|
||||
install_data(
|
||||
init['confd'],
|
||||
@ -151,16 +211,7 @@ index 7c47821..d33d16a 100644
|
||||
rename: [ init['name'] ],
|
||||
)
|
||||
endif
|
||||
@@ -872,7 +872,7 @@ if init_script != 'none'
|
||||
foreach sysconf : sysconf_files
|
||||
install_data(
|
||||
sysconf['file'],
|
||||
- install_dir: sysconfdir / 'sysconfig',
|
||||
+ install_dir: install_prefix + sysconfdir / 'sysconfig',
|
||||
rename: [ sysconf['name'] ],
|
||||
)
|
||||
endforeach
|
||||
@@ -897,10 +897,10 @@ endif
|
||||
@@ -882,10 +882,10 @@ endif
|
||||
# Install empty directories
|
||||
|
||||
virt_install_dirs += [
|
||||
@ -176,23 +227,27 @@ index 7c47821..d33d16a 100644
|
||||
|
||||
meson.add_install_script(
|
||||
diff --git a/src/network/meson.build b/src/network/meson.build
|
||||
index 3ec598c..b02040b 100644
|
||||
index b5eff0c3ab..a0f26d624e 100644
|
||||
--- a/src/network/meson.build
|
||||
+++ b/src/network/meson.build
|
||||
@@ -79,9 +79,9 @@ if conf.has('WITH_NETWORK')
|
||||
@@ -73,11 +73,11 @@ if conf.has('WITH_NETWORK')
|
||||
}
|
||||
|
||||
virt_install_dirs += [
|
||||
- confdir / 'qemu' / 'networks',
|
||||
- confdir / 'qemu' / 'networks' / 'autostart',
|
||||
- localstatedir / 'lib' / 'libvirt' / 'network',
|
||||
- localstatedir / 'lib' / 'libvirt' / 'dnsmasq',
|
||||
- runstatedir / 'libvirt' / 'network',
|
||||
+ install_prefix + confdir / 'qemu' / 'networks',
|
||||
+ install_prefix + confdir / 'qemu' / 'networks' / 'autostart',
|
||||
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'network',
|
||||
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'dnsmasq',
|
||||
+ install_prefix + runstatedir / 'libvirt' / 'network',
|
||||
]
|
||||
|
||||
configure_file(
|
||||
@@ -89,12 +89,12 @@ if conf.has('WITH_NETWORK')
|
||||
@@ -85,12 +85,12 @@ if conf.has('WITH_NETWORK')
|
||||
output: '@BASENAME@',
|
||||
copy: true,
|
||||
install: true,
|
||||
@ -207,8 +262,37 @@ index 3ec598c..b02040b 100644
|
||||
'../default.xml', 'default.xml',
|
||||
)
|
||||
|
||||
diff --git a/src/node_device/meson.build b/src/node_device/meson.build
|
||||
index 1c95975c37..a7831242db 100644
|
||||
--- a/src/node_device/meson.build
|
||||
+++ b/src/node_device/meson.build
|
||||
@@ -64,6 +64,6 @@ if conf.has('WITH_NODE_DEVICES')
|
||||
}
|
||||
|
||||
virt_install_dirs += [
|
||||
- runstatedir / 'libvirt' / 'nodedev',
|
||||
+ install_prefix + runstatedir / 'libvirt' / 'nodedev',
|
||||
]
|
||||
endif
|
||||
diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build
|
||||
index 55cf8fcce4..d331086f2e 100644
|
||||
--- a/src/nwfilter/meson.build
|
||||
+++ b/src/nwfilter/meson.build
|
||||
@@ -62,9 +62,9 @@ if conf.has('WITH_NWFILTER')
|
||||
}
|
||||
|
||||
virt_install_dirs += [
|
||||
- confdir / 'nwfilter',
|
||||
- runstatedir / 'libvirt' / 'nwfilter-binding',
|
||||
- runstatedir / 'libvirt' / 'nwfilter',
|
||||
+ install_prefix + confdir / 'nwfilter',
|
||||
+ install_prefix + runstatedir / 'libvirt' / 'nwfilter-binding',
|
||||
+ install_prefix + runstatedir / 'libvirt' / 'nwfilter',
|
||||
]
|
||||
|
||||
subdir('xml')
|
||||
diff --git a/src/nwfilter/xml/meson.build b/src/nwfilter/xml/meson.build
|
||||
index 0d96c54..66c92a1 100644
|
||||
index 0d96c54ebe..66c92a1016 100644
|
||||
--- a/src/nwfilter/xml/meson.build
|
||||
+++ b/src/nwfilter/xml/meson.build
|
||||
@@ -25,4 +25,4 @@ nwfilter_xml_files = [
|
||||
@ -218,43 +302,71 @@ index 0d96c54..66c92a1 100644
|
||||
-install_data(nwfilter_xml_files, install_dir: sysconfdir / 'libvirt' / 'nwfilter')
|
||||
+install_data(nwfilter_xml_files, install_dir: install_prefix + sysconfdir / 'libvirt' / 'nwfilter')
|
||||
diff --git a/src/qemu/meson.build b/src/qemu/meson.build
|
||||
index 90640b0..8802cec 100644
|
||||
index 39f0f615cc..5f6f30f82b 100644
|
||||
--- a/src/qemu/meson.build
|
||||
+++ b/src/qemu/meson.build
|
||||
@@ -171,12 +171,12 @@ if conf.has('WITH_QEMU')
|
||||
}
|
||||
@@ -175,24 +175,24 @@ if conf.has('WITH_QEMU')
|
||||
endif
|
||||
|
||||
virt_install_dirs += [
|
||||
- localstatedir / 'lib' / 'libvirt' / 'qemu',
|
||||
- runstatedir / 'libvirt' / 'qemu',
|
||||
- confdir / 'qemu',
|
||||
- confdir / 'qemu' / 'autostart',
|
||||
- localstatedir / 'cache' / 'libvirt' / 'qemu',
|
||||
- localstatedir / 'log' / 'libvirt' / 'qemu',
|
||||
- localstatedir / 'lib' / 'libvirt' / 'qemu',
|
||||
- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel',
|
||||
- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel' / 'target',
|
||||
- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'checkpoint',
|
||||
- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'dump',
|
||||
- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'nvram',
|
||||
- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'ram',
|
||||
- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'save',
|
||||
- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'snapshot',
|
||||
- localstatedir / 'lib' / 'libvirt' / 'swtpm',
|
||||
- runstatedir / 'libvirt' / 'qemu' / 'swtpm',
|
||||
- localstatedir / 'log' / 'libvirt' / 'qemu',
|
||||
- localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu',
|
||||
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu',
|
||||
+ install_prefix + runstatedir / 'libvirt' / 'qemu',
|
||||
- runstatedir / 'libvirt' / 'qemu',
|
||||
- runstatedir / 'libvirt' / 'qemu' / 'dbus',
|
||||
- runstatedir / 'libvirt' / 'qemu' / 'slirp',
|
||||
- runstatedir / 'libvirt' / 'qemu' / 'swtpm',
|
||||
+ install_prefix + confdir / 'qemu',
|
||||
+ install_prefix + confdir / 'qemu' / 'autostart',
|
||||
+ install_prefix + localstatedir / 'cache' / 'libvirt' / 'qemu',
|
||||
+ install_prefix + localstatedir / 'log' / 'libvirt' / 'qemu',
|
||||
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu',
|
||||
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel',
|
||||
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel' / 'target',
|
||||
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'checkpoint',
|
||||
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'dump',
|
||||
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'nvram',
|
||||
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'ram',
|
||||
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'save',
|
||||
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'snapshot',
|
||||
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'swtpm',
|
||||
+ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm',
|
||||
+ install_prefix + localstatedir / 'log' / 'libvirt' / 'qemu',
|
||||
+ install_prefix + localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu',
|
||||
+ install_prefix + runstatedir / 'libvirt' / 'qemu',
|
||||
+ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'dbus',
|
||||
+ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'slirp',
|
||||
+ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm',
|
||||
]
|
||||
endif
|
||||
diff --git a/src/remote/meson.build b/src/remote/meson.build
|
||||
index 9ad2f6a..429a15b 100644
|
||||
index b2aafe6320..6972d254ca 100644
|
||||
--- a/src/remote/meson.build
|
||||
+++ b/src/remote/meson.build
|
||||
@@ -245,7 +245,7 @@ if conf.has('WITH_REMOTE')
|
||||
@@ -235,9 +235,9 @@ if conf.has('WITH_REMOTE')
|
||||
}
|
||||
|
||||
virt_install_dirs += [
|
||||
- localstatedir / 'log' / 'libvirt',
|
||||
- runstatedir / 'libvirt',
|
||||
- runstatedir / 'libvirt' / 'common',
|
||||
+ install_prefix + localstatedir / 'log' / 'libvirt',
|
||||
+ install_prefix + runstatedir / 'libvirt',
|
||||
+ install_prefix + runstatedir / 'libvirt' / 'common',
|
||||
]
|
||||
|
||||
logrotate_conf = configuration_data()
|
||||
@@ -259,7 +259,7 @@ if conf.has('WITH_REMOTE')
|
||||
@@ -251,7 +251,7 @@ if conf.has('WITH_REMOTE')
|
||||
)
|
||||
install_data(
|
||||
log_file,
|
||||
@ -263,7 +375,7 @@ index 9ad2f6a..429a15b 100644
|
||||
rename: [ name ],
|
||||
)
|
||||
endforeach
|
||||
@@ -309,7 +309,7 @@ endif
|
||||
@@ -301,7 +301,7 @@ endif
|
||||
if conf.has('WITH_SASL')
|
||||
install_data(
|
||||
'libvirtd.sasl',
|
||||
@ -272,11 +384,25 @@ index 9ad2f6a..429a15b 100644
|
||||
rename: [ 'libvirt.conf' ],
|
||||
)
|
||||
endif
|
||||
diff --git a/src/secret/meson.build b/src/secret/meson.build
|
||||
index 1bda59849b..392bc2cb2e 100644
|
||||
--- a/src/secret/meson.build
|
||||
+++ b/src/secret/meson.build
|
||||
@@ -45,7 +45,7 @@ if conf.has('WITH_SECRETS')
|
||||
}
|
||||
|
||||
virt_install_dirs += [
|
||||
- confdir / 'secrets',
|
||||
- runstatedir / 'libvirt' / 'secrets',
|
||||
+ install_prefix + confdir / 'secrets',
|
||||
+ install_prefix + runstatedir / 'libvirt' / 'secrets',
|
||||
]
|
||||
endif
|
||||
diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build
|
||||
index af43780..e2d6c81 100644
|
||||
index 990f00b4f3..e5a7a14e1d 100644
|
||||
--- a/src/security/apparmor/meson.build
|
||||
+++ b/src/security/apparmor/meson.build
|
||||
@@ -17,22 +17,22 @@ foreach name : apparmor_gen_profiles
|
||||
@@ -19,22 +19,22 @@ foreach name : apparmor_gen_profiles
|
||||
output: name,
|
||||
configuration: apparmor_gen_profiles_conf,
|
||||
install: true,
|
||||
@ -303,11 +429,28 @@ index af43780..e2d6c81 100644
|
||||
+ install_dir: install_prefix + apparmor_dir / 'local',
|
||||
rename: 'usr.lib.libvirt.virt-aa-helper',
|
||||
)
|
||||
diff --git a/src/storage/meson.build b/src/storage/meson.build
|
||||
index 26e7ff1a1a..ad5c6eddc3 100644
|
||||
--- a/src/storage/meson.build
|
||||
+++ b/src/storage/meson.build
|
||||
@@ -127,9 +127,9 @@ if conf.has('WITH_STORAGE')
|
||||
}
|
||||
|
||||
virt_install_dirs += [
|
||||
- confdir / 'storage',
|
||||
- confdir / 'storage' / 'autostart',
|
||||
- runstatedir / 'libvirt' / 'storage',
|
||||
+ install_prefix + confdir / 'storage',
|
||||
+ install_prefix + confdir / 'storage' / 'autostart',
|
||||
+ install_prefix + runstatedir / 'libvirt' / 'storage',
|
||||
]
|
||||
endif
|
||||
|
||||
diff --git a/tools/meson.build b/tools/meson.build
|
||||
index b8c6802..dacd0ff 100644
|
||||
index f4b4a16c29..059c73a955 100644
|
||||
--- a/tools/meson.build
|
||||
+++ b/tools/meson.build
|
||||
@@ -115,7 +115,7 @@ if conf.has('WITH_LOGIN_SHELL')
|
||||
@@ -120,7 +120,7 @@ if conf.has('WITH_LOGIN_SHELL')
|
||||
install_rpath: libvirt_rpath,
|
||||
)
|
||||
|
||||
@ -316,11 +459,6 @@ index b8c6802..dacd0ff 100644
|
||||
endif
|
||||
|
||||
if host_machine.system() == 'windows'
|
||||
@@ -274,7 +274,7 @@ configure_file(
|
||||
if init_script == 'systemd'
|
||||
install_data(
|
||||
'libvirt-guests.sysconf',
|
||||
- install_dir: sysconfdir / 'sysconfig',
|
||||
+ install_dir: install_prefix + sysconfdir / 'sysconfig',
|
||||
rename: 'libvirt-guests',
|
||||
)
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
@ -1,14 +0,0 @@
|
||||
diff --git a/src/ch/meson.build b/src/ch/meson.build
|
||||
index e34974d56c..4767763c2c 100644
|
||||
--- a/src/ch/meson.build
|
||||
+++ b/src/ch/meson.build
|
||||
@@ -68,7 +68,7 @@ if conf.has('WITH_CH')
|
||||
}
|
||||
|
||||
virt_install_dirs += [
|
||||
- localstatedir / 'lib' / 'libvirt' / 'ch',
|
||||
- runstatedir / 'libvirt' / 'ch',
|
||||
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'ch',
|
||||
+ install_prefix + runstatedir / 'libvirt' / 'ch',
|
||||
]
|
||||
endif
|
@ -1,85 +1,122 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitLab
|
||||
, makeWrapper
|
||||
, autoreconfHook
|
||||
, fetchpatch
|
||||
, bash-completion
|
||||
, bridge-utils
|
||||
, cmake
|
||||
, coreutils
|
||||
, libxml2
|
||||
, gnutls
|
||||
, perl
|
||||
, python3
|
||||
, attr
|
||||
, glib
|
||||
, curl
|
||||
, darwin
|
||||
, dbus
|
||||
, dnsmasq
|
||||
, docutils
|
||||
, iproute2
|
||||
, readline
|
||||
, lvm2
|
||||
, util-linux
|
||||
, systemd
|
||||
, libpciaccess
|
||||
, fetchFromGitLab
|
||||
, fetchurl
|
||||
, gettext
|
||||
, libtasn1
|
||||
, glib
|
||||
, gnutls
|
||||
, iproute2
|
||||
, iptables
|
||||
, libgcrypt
|
||||
, yajl
|
||||
, pmutils
|
||||
, libcap_ng
|
||||
, libapparmor
|
||||
, dnsmasq
|
||||
, libnl
|
||||
, libpcap
|
||||
, libtasn1
|
||||
, libxml2
|
||||
, libxslt
|
||||
, xhtml1
|
||||
, numad
|
||||
, numactl
|
||||
, perlPackages
|
||||
, curl
|
||||
, libiconv
|
||||
, gmp
|
||||
, zfs
|
||||
, parted
|
||||
, bridge-utils
|
||||
, dmidecode
|
||||
, dbus
|
||||
, libtirpc
|
||||
, rpcsvc-proto
|
||||
, darwin
|
||||
, makeWrapper
|
||||
, meson
|
||||
, ninja
|
||||
, audit
|
||||
, cmake
|
||||
, bash-completion
|
||||
, perl
|
||||
, perlPackages
|
||||
, pkg-config
|
||||
, pmutils
|
||||
, python3
|
||||
, readline
|
||||
, rpcsvc-proto
|
||||
, stdenv
|
||||
, xhtml1
|
||||
, yajl
|
||||
|
||||
# Linux
|
||||
, acl ? null
|
||||
, attr ? null
|
||||
, audit ? null
|
||||
, dmidecode ? null
|
||||
, fuse ? null
|
||||
, kmod ? null
|
||||
, libapparmor ? null
|
||||
, libcap_ng ? null
|
||||
, libnl ? null
|
||||
, libpciaccess ? null
|
||||
, libtirpc ? null
|
||||
, lvm2 ? null
|
||||
, numactl ? null
|
||||
, numad ? null
|
||||
, parted ? null
|
||||
, systemd ? null
|
||||
, util-linux ? null
|
||||
|
||||
# Darwin
|
||||
, gmp ? null
|
||||
, libiconv ? null
|
||||
, Carbon ? null
|
||||
, AppKit ? null
|
||||
|
||||
# Options
|
||||
, enableCeph ? false
|
||||
, ceph ? null
|
||||
, enableGlusterfs ? false
|
||||
, glusterfs ? null
|
||||
, enableIscsi ? false
|
||||
, openiscsi ? null
|
||||
, libiscsi ? null
|
||||
, enableXen ? false
|
||||
, xen ? null
|
||||
, enableIscsi ? false
|
||||
, openiscsi
|
||||
, enableCeph ? false
|
||||
, ceph
|
||||
, enableGlusterfs ? false
|
||||
, glusterfs
|
||||
, Carbon
|
||||
, AppKit
|
||||
, enableZfs ? stdenv.isLinux
|
||||
, zfs ? null
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
# if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
|
||||
let
|
||||
buildFromTarball = stdenv.isDarwin;
|
||||
inherit (stdenv) isDarwin isLinux isx86_64;
|
||||
binPath = makeBinPath ([
|
||||
dnsmasq
|
||||
] ++ optionals isLinux [
|
||||
bridge-utils
|
||||
dmidecode
|
||||
dnsmasq
|
||||
iproute2
|
||||
iptables
|
||||
kmod
|
||||
lvm2
|
||||
numactl
|
||||
numad
|
||||
pmutils
|
||||
systemd
|
||||
] ++ optionals enableIscsi [
|
||||
libiscsi
|
||||
openiscsi
|
||||
]);
|
||||
in
|
||||
|
||||
assert enableXen -> isLinux && isx86_64;
|
||||
assert enableCeph -> isLinux;
|
||||
assert enableGlusterfs -> isLinux;
|
||||
assert enableZfs -> isLinux;
|
||||
|
||||
# if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libvirt";
|
||||
version = "7.10.0";
|
||||
# NOTE: You must also bump:
|
||||
# <nixpkgs/pkgs/development/python-modules/libvirt/default.nix>
|
||||
# SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
|
||||
version = "8.1.0";
|
||||
|
||||
src =
|
||||
if buildFromTarball then
|
||||
if isDarwin then
|
||||
fetchurl
|
||||
{
|
||||
url = "https://libvirt.org/sources/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-yzGAFK8JcyeSjG49cpIuO+AqPmQBJHsqpS2auOC0gPk=";
|
||||
sha256 = "sha256-PGxDvs/+s0o/OXxhYgaqaaiT/4v16CCDk8hOjnU1KTQ=";
|
||||
}
|
||||
else
|
||||
fetchFromGitLab
|
||||
@ -87,82 +124,84 @@ stdenv.mkDerivation rec {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bB8LsjZFeJbMmmC0YRPyMag2MBhwagUFC7aB1KhZEkA=";
|
||||
sha256 = "sha256-nk8pBlss+g4EMy+RnAOyz6YlGGvlBvl5aBpcytsK1wY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
|
||||
./0002-meson-patch-ch-install-prefix.patch
|
||||
|
||||
# Fix building docs with latest libxslt.
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/libvirt/libvirt/-/commit/54814c87f3706cc8eb894634ebef0f9cf7dabae6.patch";
|
||||
sha256 = "1k1mGyxyofYzXr3cVtM8ZYsb6tDCzidCRKwKoNS0ocA=";
|
||||
})
|
||||
];
|
||||
|
||||
# remove some broken tests
|
||||
postPatch = ''
|
||||
sed -i '/commandtest/d' tests/meson.build
|
||||
sed -i '/virnetsockettest/d' tests/meson.build
|
||||
# delete only the first occurrence of this
|
||||
sed -i '0,/qemuxml2argvtest/{/qemuxml2argvtest/d;}' tests/meson.build
|
||||
'' + optionalString isDarwin ''
|
||||
sed -i '/qemucapabilitiestest/d' tests/meson.build
|
||||
'';
|
||||
|
||||
|
||||
nativeBuildInputs = [
|
||||
ninja
|
||||
meson
|
||||
|
||||
cmake
|
||||
makeWrapper
|
||||
pkg-config
|
||||
docutils
|
||||
] ++ optional (!stdenv.isDarwin) [
|
||||
rpcsvc-proto
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
darwin.developer_cmds # needed for rpcgen
|
||||
];
|
||||
makeWrapper
|
||||
ninja
|
||||
pkg-config
|
||||
]
|
||||
++ optional (!isDarwin) rpcsvc-proto
|
||||
# NOTE: needed for rpcgen
|
||||
++ optional isDarwin darwin.developer_cmds;
|
||||
|
||||
buildInputs = [
|
||||
bash-completion
|
||||
pkg-config
|
||||
libxml2
|
||||
curl
|
||||
dbus
|
||||
gettext
|
||||
glib
|
||||
gnutls
|
||||
libgcrypt
|
||||
libpcap
|
||||
libtasn1
|
||||
libxml2
|
||||
libxslt
|
||||
perl
|
||||
perlPackages.XMLXPath
|
||||
pkg-config
|
||||
python3
|
||||
readline
|
||||
gettext
|
||||
libtasn1
|
||||
libgcrypt
|
||||
yajl
|
||||
libxslt
|
||||
xhtml1
|
||||
perlPackages.XMLXPath
|
||||
curl
|
||||
libpcap
|
||||
glib
|
||||
dbus
|
||||
] ++ optionals stdenv.isLinux [
|
||||
yajl
|
||||
] ++ optionals isLinux [
|
||||
acl
|
||||
attr
|
||||
audit
|
||||
libpciaccess
|
||||
lvm2
|
||||
util-linux
|
||||
systemd
|
||||
libnl
|
||||
numad
|
||||
zfs
|
||||
fuse
|
||||
libapparmor
|
||||
libcap_ng
|
||||
numactl
|
||||
attr
|
||||
parted
|
||||
libnl
|
||||
libpciaccess
|
||||
libtirpc
|
||||
] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [
|
||||
xen
|
||||
] ++ optionals enableIscsi [
|
||||
openiscsi
|
||||
] ++ optionals enableCeph [
|
||||
ceph
|
||||
] ++ optionals enableGlusterfs [
|
||||
glusterfs
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
gmp
|
||||
Carbon
|
||||
lvm2
|
||||
numactl
|
||||
numad
|
||||
parted
|
||||
systemd
|
||||
util-linux
|
||||
] ++ optionals isDarwin [
|
||||
AppKit
|
||||
];
|
||||
Carbon
|
||||
gmp
|
||||
libiconv
|
||||
]
|
||||
++ optionals enableCeph [ ceph ]
|
||||
++ optionals enableGlusterfs [ glusterfs ]
|
||||
++ optionals enableIscsi [ libiscsi openiscsi ]
|
||||
++ optionals enableXen [ xen ]
|
||||
++ optionals enableZfs [ zfs ];
|
||||
|
||||
preConfigure =
|
||||
let
|
||||
@ -170,80 +209,124 @@ stdenv.mkDerivation rec {
|
||||
QEMU_BRIDGE_HELPER = "/run/wrappers/bin/qemu-bridge-helper";
|
||||
QEMU_PR_HELPER = "/run/libvirt/nix-helpers/qemu-pr-helper";
|
||||
};
|
||||
|
||||
patchBuilder = var: value: ''
|
||||
sed -i meson.build -e "s|conf.set_quoted('${var}',.*|conf.set_quoted('${var}','${value}')|"
|
||||
'';
|
||||
in
|
||||
''
|
||||
PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute2 iptables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH
|
||||
PATH="${binPath}:$PATH"
|
||||
# the path to qemu-kvm will be stored in VM's .xml and .save files
|
||||
# do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations
|
||||
substituteInPlace src/lxc/lxc_conf.c \
|
||||
--replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",'
|
||||
|
||||
substituteInPlace build-aux/meson.build \
|
||||
--replace "gsed" "sed" \
|
||||
--replace "gmake" "make" \
|
||||
--replace "ggrep" "grep"
|
||||
|
||||
patchShebangs .
|
||||
''
|
||||
+ (lib.concatStringsSep "\n" (lib.mapAttrsToList patchBuilder overrides));
|
||||
|
||||
mesonAutoFeatures = "auto";
|
||||
mesonAutoFeatures = "disabled";
|
||||
|
||||
mesonFlags =
|
||||
let
|
||||
opt = option: enable: "-D${option}=${if enable then "enabled" else "disabled"}";
|
||||
cfg = option: val: "-D${option}=${val}";
|
||||
feat = option: enable: cfg option (if enable then "enabled" else "disabled");
|
||||
driver = name: feat "driver_${name}";
|
||||
storage = name: feat "storage_${name}";
|
||||
in
|
||||
[
|
||||
"--sysconfdir=/var/lib"
|
||||
"-Dinstall_prefix=${placeholder "out"}"
|
||||
"-Dlocalstatedir=/var"
|
||||
"-Drunstatedir=/run"
|
||||
"-Dlibpcap=enabled"
|
||||
"-Ddriver_qemu=enabled"
|
||||
"-Ddriver_vmware=enabled"
|
||||
"-Ddriver_vbox=enabled"
|
||||
"-Ddriver_test=enabled"
|
||||
"-Ddriver_esx=enabled"
|
||||
"-Ddriver_remote=enabled"
|
||||
"-Dpolkit=enabled"
|
||||
(opt "storage_iscsi" enableIscsi)
|
||||
] ++ optionals stdenv.isLinux [
|
||||
(opt "storage_zfs" (zfs != null))
|
||||
"-Dattr=enabled"
|
||||
"-Dapparmor=enabled"
|
||||
"-Dsecdriver_apparmor=enabled"
|
||||
"-Dnumad=enabled"
|
||||
"-Dstorage_disk=enabled"
|
||||
(opt "glusterfs" enableGlusterfs)
|
||||
(opt "storage_rbd" enableCeph)
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
"-Dinit_script=none"
|
||||
(cfg "install_prefix" (placeholder "out"))
|
||||
(cfg "localstatedir" "/var")
|
||||
(cfg "runstatedir" "/run")
|
||||
|
||||
(cfg "init_script" (if isDarwin then "none" else "systemd"))
|
||||
|
||||
(feat "apparmor" isLinux)
|
||||
(feat "attr" isLinux)
|
||||
(feat "audit" isLinux)
|
||||
(feat "bash_completion" true)
|
||||
(feat "blkid" isLinux)
|
||||
(feat "capng" isLinux)
|
||||
(feat "curl" true)
|
||||
(feat "docs" true)
|
||||
(feat "expensive_tests" true)
|
||||
(feat "firewalld" isLinux)
|
||||
(feat "firewalld_zone" isLinux)
|
||||
(feat "fuse" isLinux)
|
||||
(feat "glusterfs" enableGlusterfs)
|
||||
(feat "host_validate" true)
|
||||
(feat "libiscsi" enableIscsi)
|
||||
(feat "libnl" isLinux)
|
||||
(feat "libpcap" true)
|
||||
(feat "libssh2" true)
|
||||
(feat "login_shell" isLinux)
|
||||
(feat "nss" isLinux)
|
||||
(feat "numactl" isLinux)
|
||||
(feat "numad" isLinux)
|
||||
(feat "pciaccess" isLinux)
|
||||
(feat "polkit" true)
|
||||
(feat "readline" true)
|
||||
(feat "secdriver_apparmor" isLinux)
|
||||
(feat "tests" true)
|
||||
(feat "udev" isLinux)
|
||||
(feat "yajl" true)
|
||||
|
||||
(driver "ch" isLinux)
|
||||
(driver "esx" true)
|
||||
(driver "interface" isLinux)
|
||||
(driver "libvirtd" true)
|
||||
(driver "libxl" enableXen)
|
||||
(driver "lxc" isLinux)
|
||||
(driver "network" true)
|
||||
(driver "openvz" isLinux)
|
||||
(driver "qemu" true)
|
||||
(driver "remote" true)
|
||||
(driver "secrets" true)
|
||||
(driver "test" true)
|
||||
(driver "vbox" true)
|
||||
(driver "vmware" true)
|
||||
|
||||
(storage "dir" true)
|
||||
(storage "disk" isLinux)
|
||||
(storage "fs" isLinux)
|
||||
(storage "gluster" enableGlusterfs)
|
||||
(storage "iscsi" enableIscsi)
|
||||
(storage "iscsi_direct" enableIscsi)
|
||||
(storage "lvm" isLinux)
|
||||
(storage "mpath" isLinux)
|
||||
(storage "rbd" enableCeph)
|
||||
(storage "scsi" true)
|
||||
(storage "vstorage" isLinux)
|
||||
(storage "zfs" enableZfs)
|
||||
];
|
||||
|
||||
postInstall =
|
||||
let
|
||||
binPath = [ iptables iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ];
|
||||
in
|
||||
''
|
||||
substituteInPlace $out/bin/virt-xml-validate \
|
||||
--replace xmllint ${libxml2}/bin/xmllint
|
||||
doCheck = true;
|
||||
|
||||
substituteInPlace $out/libexec/libvirt-guests.sh \
|
||||
--replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \
|
||||
--replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \
|
||||
--replace "$out/bin" '${gettext}/bin' \
|
||||
--replace 'lock/subsys' 'lock' \
|
||||
--replace 'gettext.sh' 'gettext.sh
|
||||
# Added in nixpkgs:
|
||||
gettext() { "${gettext}/bin/gettext" "$@"; }
|
||||
'
|
||||
'' + optionalString stdenv.isLinux ''
|
||||
substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill
|
||||
rm $out/lib/systemd/system/{virtlockd,virtlogd}.*
|
||||
wrapProgram $out/sbin/libvirtd \
|
||||
--prefix PATH : /run/libvirt/nix-emulators:${makeBinPath binPath}
|
||||
'';
|
||||
postInstall = ''
|
||||
substituteInPlace $out/bin/virt-xml-validate \
|
||||
--replace xmllint ${libxml2}/bin/xmllint
|
||||
|
||||
substituteInPlace $out/libexec/libvirt-guests.sh \
|
||||
--replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \
|
||||
--replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \
|
||||
--replace "$out/bin" '${gettext}/bin' \
|
||||
--replace 'lock/subsys' 'lock' \
|
||||
--replace 'gettext.sh' 'gettext.sh
|
||||
# Added in nixpkgs:
|
||||
gettext() { "${gettext}/bin/gettext" "$@"; }
|
||||
'
|
||||
'' + optionalString isLinux ''
|
||||
substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill
|
||||
rm $out/lib/systemd/system/{virtlockd,virtlogd}.*
|
||||
wrapProgram $out/sbin/libvirtd \
|
||||
--prefix PATH : /run/libvirt/nix-emulators:${binPath}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://libvirt.org/";
|
||||
@ -254,6 +337,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ fpletz globin ];
|
||||
maintainers = with maintainers; [ fpletz globin lovesegfault ];
|
||||
};
|
||||
}
|
||||
|
@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, gbenchmark
|
||||
@ -10,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "prometheus-cpp";
|
||||
version = "0.9.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jupp0r";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1pjz29ywzfg3blhg2v8fn7gjvq46k3bqn7y0xvmn468ixxhv21fi";
|
||||
sha256 = "L6CXRup3kU1lY5UnwPbaOwEtCeAySNmFCPmHwsk6cRE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-device-libs";
|
||||
version = "5.0.0";
|
||||
version = "5.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "ROCm-Device-Libs";
|
||||
rev = "rocm-${version}";
|
||||
hash = "sha256-CEpI0vX5kUbSmpe/ZTCFnfDuy6i9D+UsCZiX4/U0X8g=";
|
||||
hash = "sha256-eZdy9+BfuUVzPO6huvqcwCog96qMVTYoY3l6J0YMUZQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -24,13 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-opencl-runtime";
|
||||
version = "4.5.2";
|
||||
version = "5.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "ROCm-OpenCL-Runtime";
|
||||
rev = "rocm-${version}";
|
||||
hash = "sha256-0OGYF4urlscr8tMkQwo2yATXwN0DjB092KQ+CBEhfIA=";
|
||||
hash = "sha256-ovYwElZGRKySH1mWFIISxuNNxCjaqoe9oCvqYZGdfq0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake rocm-cmake ];
|
||||
|
@ -1,9 +1,9 @@
|
||||
{ lib, stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib, cppo }:
|
||||
|
||||
let param =
|
||||
let v6_4 = {
|
||||
version = "6.4";
|
||||
sha256 = "15v7yfv6gyp8lzlgwi9garz10wpg34dk4072jdv19n6v20zfg7n1";
|
||||
let v6_5 = {
|
||||
version = "6.5";
|
||||
sha256 = "sha256:0fwibah2hgllrnbdrmfqil5gr5raf6pb5h2zx6zs1h3d4ykvy8k8";
|
||||
useDune2 = true;
|
||||
nativeBuildInputs = [cppo];
|
||||
buildInputs = [cppo];
|
||||
@ -28,12 +28,13 @@ let param =
|
||||
"4.07" = {
|
||||
version = "5.1+4.06.0";
|
||||
sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; };
|
||||
"4.08" = v6_4;
|
||||
"4.09" = v6_4;
|
||||
"4.10" = v6_4;
|
||||
"4.11" = v6_4;
|
||||
"4.12" = v6_4;
|
||||
"4.13" = v6_4;
|
||||
"4.08" = v6_5;
|
||||
"4.09" = v6_5;
|
||||
"4.10" = v6_5;
|
||||
"4.11" = v6_5;
|
||||
"4.12" = v6_5;
|
||||
"4.13" = v6_5;
|
||||
"4.14" = v6_5;
|
||||
}.${ocaml.meta.branch};
|
||||
in
|
||||
|
||||
|
@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "amcrest";
|
||||
version = "1.9.4";
|
||||
version = "1.9.7";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tchellomello";
|
||||
repo = "python-amcrest";
|
||||
rev = version;
|
||||
sha256 = "sha256-smwPKZLevolNvpkLxoFR3NGL9YFPlBk3WYQqJXBaS7s=";
|
||||
sha256 = "sha256-An7MnGtZsmEZU/y6E0sivdexFD6HJRTB1juXqHfbDzE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -4,16 +4,19 @@
|
||||
, nose
|
||||
, parts
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bitlist";
|
||||
version = "0.6.2";
|
||||
version = "0.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "69cf632ca61b5fb5d2fd7587ddf023bcab8f327302f15070ec9079b68df9082a";
|
||||
sha256 = "sha256-p3Gws48u1/AzltbtPyWvSX4O0u4MgSXiVq4GstpPCCg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -29,6 +32,11 @@ buildPythonPackage rec {
|
||||
"bitlist"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace " --cov=bitlist --cov-report term-missing" ""
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for working with little-endian list representation of bit strings";
|
||||
homepage = "https://github.com/lapets/bitlist";
|
||||
|
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "channels-redis";
|
||||
version = "3.3.1";
|
||||
version = "3.4.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "channels_redis";
|
||||
sha256 = "899dc6433f5416cf8ad74505baaf2acb5461efac3cad40751a41119e3f68421b";
|
||||
sha256 = "sha256-Xf/UzBYXQSW9QEP8j+dGLKdAPPgB1Zqfp0EO0QH6alc=";
|
||||
};
|
||||
|
||||
buildInputs = [ redis hiredis ];
|
||||
|
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "chart-studio";
|
||||
version = "5.5.0";
|
||||
version = "5.6.0";
|
||||
|
||||
# chart-studio was split from plotly
|
||||
src = fetchFromGitHub {
|
||||
owner = "plotly";
|
||||
repo = "plotly.py";
|
||||
rev = "v${version}";
|
||||
sha256 = "04hsh1z2ngfslmvi8fdzfccssg6i0ziksil84j129f049m96wd51";
|
||||
sha256 = "sha256-mf4QASdvO7doV5pKAAEzaKJP66w29osBlbLrJuopUvA=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/packages/python/chart-studio";
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dash";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "plotly";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ul3j1BJd3lKzGCEhPFYxZG0CcAqAZqmOEDi8vGPFItw=";
|
||||
sha256 = "sha256-iH56c2PO1G/NlLmYC+6sdAMZ+kXvUkpkqxfnl9EmDsQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "deep-translator";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-2u4ZmLUEOwbN2sbPgLu9R1VdNevXBP4lBFuGw2aiRMg=";
|
||||
sha256 = "sha256-Oi5dzrC19PnlExCOgu+bT5n3/XwgJkDirzl8ra8w7Nw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -6,16 +6,19 @@
|
||||
, parts
|
||||
, nose
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fe25519";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-3WFpbt4bA7zPlK+mp5DJXdgk44MBimCbpIMhRjZ5p0o=";
|
||||
hash = "sha256-Hzdt8932WonJAaQPtL346JFPqxFXkNW4XQvbQlSoJJE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -29,6 +32,11 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace " --cov=fe25519 --cov-report term-missing" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"fe25519"
|
||||
];
|
||||
|
@ -2,16 +2,19 @@
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, bitlist
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fountains";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6de6bc117c376f40a26e111111d638159a2e8a25cfe32f946db0d779decbb70a";
|
||||
sha256 = "sha256-c6nw22UtAREYZp0XCEZE6p7GpRvSLukq5y0c9KvVf9w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -7,16 +7,19 @@
|
||||
, nose
|
||||
, parts
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ge25519";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-0M9RF8tlEoLyduvY3RvltGAnsus3HF6FEy22b6w6aUs=";
|
||||
hash = "sha256-8GsNY62SusUmQcaqlhKOPHbd0jvZulCaxMxeob37JJM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -31,6 +34,12 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace " --cov=ge25519 --cov-report term-missing" ""
|
||||
'';
|
||||
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ge25519"
|
||||
];
|
||||
|
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "apache-libcloud";
|
||||
version = "3.4.1";
|
||||
version = "3.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-iPGNoM8/rAr3I+dD+3QdnRviUYge2reloNFimVW1ARs=";
|
||||
sha256 = "sha256-Bz8QSSl2+qODoisTuCwkmCfP6QoIPHFiDoMW6BWm2zs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libvirt";
|
||||
version = "7.10.0";
|
||||
version = "8.1.0";
|
||||
|
||||
src = assert version == libvirt.version; fetchFromGitLab {
|
||||
owner = "libvirt";
|
||||
repo = "libvirt-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-I1FNjNwWRyDAUSq2Co9EnjAbzKQtS0Rx8vHgPsFzSYw=";
|
||||
sha256 = "sha256-/uGxjptiqm5B823z4mcjredj9ZLZC2WTTqhQrQPVfDU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -8,6 +9,8 @@ buildPythonPackage rec {
|
||||
version = "1.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-NrhNpWyzqwn1bNnuqmcyKcUED0A4v7VJE4ZlTHFafJY=";
|
||||
|
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plaid-python";
|
||||
version = "9.1.0";
|
||||
version = "9.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-jvg/2dL+W4N7rbbBcIUZUrSt0BCV15k4QgYST2lEA5U=";
|
||||
hash = "sha256-vHJ35MvMw3G1k/A2gifaE97GayoVEOQ9lR6yG6ZkzS4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -24,11 +24,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "py3status";
|
||||
version = "3.41";
|
||||
version = "3.42";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-2G+5lKkLtgZ/2ghU0xVTDqIXbTNykYIKRiwZiagusoc=";
|
||||
sha256 = "sha256-2/YT36X4UvmmhiaxyJBtCKA3QuibYtReTS6MQ3YGV+c=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
@ -8,22 +8,29 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyftdi";
|
||||
version = "0.53.3";
|
||||
disabled = pythonOlder "3.5";
|
||||
version = "0.54.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eblot";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-t4rFsuhcpYdgmQeog+DRFxHk0wpMc+aukQi981vH/44=";
|
||||
hash = "sha256-vL8jSgTtDvaHuCvaCYmFixILQFasTl82yINL5yRtOwU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyusb pyserial ];
|
||||
propagatedBuildInputs = [
|
||||
pyserial
|
||||
pyusb
|
||||
];
|
||||
|
||||
# tests requires access to the serial port
|
||||
# Tests require access to the serial port
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "pyftdi" ];
|
||||
pythonImportsCheck = [
|
||||
"pyftdi"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "User-space driver for modern FTDI devices";
|
||||
|
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyramid_exclog";
|
||||
version = "1.0";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d05ced5c12407507154de6750036bc83861b85c11be70b3ec3098c929652c14b";
|
||||
sha256 = "sha256-Tl2rYH/GifNfB9w4nG9UIqAQz0O6kujCED/4iZnPKDw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyramid ];
|
||||
|
@ -0,0 +1,46 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pysigma
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysigma-backend-splunk";
|
||||
version = "0.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SigmaHQ";
|
||||
repo = "pySigma-backend-splunk";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AGT+7BKtINe2ukmomYyoUa5PHYAH1N0tUTtbyjMD+kw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pysigma
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"sigma.backends.splunk"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to support Splunk for pySigma";
|
||||
homepage = "https://github.com/SigmaHQ/pySigma-backend-splunk";
|
||||
license = with licenses; [ lgpl21Only ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
@ -0,0 +1,46 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pysigma
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysigma-pipeline-crowdstrike";
|
||||
version = "0.1.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SigmaHQ";
|
||||
repo = "pySigma-pipeline-crowdstrike";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JNJHKydMzKreN+6liLlGMT1CFBUr/IX8Ah+exddKR3g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pysigma
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"sigma.pipelines.crowdstrike"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to support CrowdStrike pipeline for pySigma";
|
||||
homepage = "https://github.com/SigmaHQ/pySigma-pipeline-crowdstrike";
|
||||
license = with licenses; [ lgpl21Only ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
@ -0,0 +1,46 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pysigma
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysigma-pipeline-sysmon";
|
||||
version = "0.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SigmaHQ";
|
||||
repo = "pySigma-pipeline-sysmon";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BBJt2SAbnPEzIwJ+tXW4NmA4Nrb/glIaPlnmYHLoMD0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pysigma
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"sigma.pipelines.sysmon"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to support Sysmon pipeline for pySigma";
|
||||
homepage = "https://github.com/SigmaHQ/pySigma-pipeline-sysmon";
|
||||
license = with licenses; [ lgpl21Only ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
66
pkgs/development/python-modules/pysigma/default.nix
Normal file
66
pkgs/development/python-modules/pysigma/default.nix
Normal file
@ -0,0 +1,66 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, pyparsing
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysigma";
|
||||
version = "0.3.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SigmaHQ";
|
||||
repo = "pySigma";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-V/E2rZqVrk0kIvk+hPhNcAifhMM/rN3mk3pB+CGd43w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyparsing
|
||||
pyyaml
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Switch to poetry-core, https://github.com/SigmaHQ/pySigma/pull/31
|
||||
(fetchpatch {
|
||||
name = "switch-to-poetry-core.patch";
|
||||
url = "https://github.com/SigmaHQ/pySigma/commit/b7a852d18852007da90c2ec35bff347c97b36f07.patch";
|
||||
sha256 = "sha256-zgg8Bsc37W2uuQluFpIZT4jHCQaitY2ZgS93Wk6Hxt0=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/SigmaHQ/pySigma/issues/32
|
||||
# https://github.com/SigmaHQ/pySigma/issues/33
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'pyparsing = "^2.4.7"' 'pyparsing = "*"' \
|
||||
--replace 'pyyaml = "^5.3.1"' 'pyyaml = "*"'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"sigma"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to parse and convert Sigma rules into queries";
|
||||
homepage = "https://github.com/SigmaHQ/pySigma";
|
||||
license = with licenses; [ lgpl21Only ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-cases";
|
||||
version = "3.6.9";
|
||||
version = "3.6.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Bf9favhlHcGj8nf1JxTkMjpo8hMyfBHgMCilOcIL2Sk=";
|
||||
sha256 = "sha256-W8Syxgl/lPqDX2zdzvpk3Q/0aNBWM8JeUOXGDBYyamM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyupgrade";
|
||||
version = "2.31.0";
|
||||
version = "2.31.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "asottile";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nuYWJ4nilbXa/1KOuGhc6rB7uXDE4+lcESNud4Ug+3Y=";
|
||||
sha256 = "sha256-l4wF/I3wsA9nowIdLjNPUxCaTPBu5v5oPQ3oNbLh+/o=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
@ -1,17 +1,18 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchgit
|
||||
, fetchFromGitHub
|
||||
, cython
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
buildPythonPackage rec {
|
||||
pname = "rencode";
|
||||
version = "git20150810";
|
||||
version = "1.0.6";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/aresch/rencode";
|
||||
rev = "b45e04abdca0dea36e383a8199783269f186c99e";
|
||||
sha256 = "b4bd82852d4220e8a9493d3cfaecbc57b1325708a2d48c0f8acf262edb10dc40";
|
||||
src = fetchFromGitHub {
|
||||
owner = "aresch";
|
||||
repo = "rencode";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PGjjrZuoGYSPMNqXG1KXoZnOoWIe4g6s056jFhqrJ60=";
|
||||
};
|
||||
|
||||
buildInputs = [ cython ];
|
||||
|
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sabyenc3";
|
||||
version = "5.1.0";
|
||||
version = "5.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-y2I/kSyPIPSz7PrwW/AbP4BsEXHWQgXRb1VT0nTHQcE=";
|
||||
hash = "sha256-muqJCn5FcSp5KNZqfW433NCOxfj1DvFvlZPClmNkPR0=";
|
||||
};
|
||||
|
||||
# Tests are not included in pypi distribution
|
||||
|
@ -11,13 +11,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "symengine";
|
||||
version = "0.9.0";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "symengine";
|
||||
repo = "symengine.py";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kz4M4ghR9Mi8Ig5K+pZC4zHt8XxoP3vU4ATImejqbgg=";
|
||||
sha256 = "sha256-ZHplYEG97foy/unOdSokFFkDl4LK5TI4kypHSLpcCM4=";
|
||||
};
|
||||
|
||||
postConfigure = ''
|
||||
|
@ -5,7 +5,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tatsu";
|
||||
version = "5.7.3";
|
||||
version = "5.8.0";
|
||||
# upstream only supports 3.10+
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
@ -13,7 +13,7 @@ buildPythonPackage rec {
|
||||
owner = "neogeny";
|
||||
repo = "TatSu";
|
||||
rev = "v${version}";
|
||||
sha256 = "1d6rnlybj971b5j5glvq288hd4r204nkmssqb0k8rm6cqcwhz292";
|
||||
sha256 = "sha256-spTIHiyspjrIV8DKR7YNpNTNO9SlcLOROuABhmu3ckA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytest-runner ];
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vt-py";
|
||||
version = "0.13.1";
|
||||
version = "0.13.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "VirusTotal";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-85ohhynXHWjuwKB18DciB48tNGZcHzafobMDaGoTkoc=";
|
||||
sha256 = "sha256-ULzMz81s/C5wjIUtZ+Rz5o1Uump1FV0rTcNW9keERDk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -32,13 +32,13 @@ with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.938";
|
||||
version = "2.0.941";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-N8jEEtO2fRFtNS3lInEa/9IwtqBb9yDkg7hHp7bhH+s=";
|
||||
hash = "sha256-hNmIJmxzKEaKQzqLl9LSqtMj1dTpFDeztUo2ESCHIw0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-cmake";
|
||||
version = "4.5.2";
|
||||
version = "5.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "rocm-cmake";
|
||||
rev = "rocm-${version}";
|
||||
hash = "sha256-5RwhIIOtqeMl/Gyufl5U1gTEpoCjdPJP5MbVnhEKYMM=";
|
||||
hash = "sha256-4PtLe864MQ9wUn+l1fshiiTQvP06ewD39TDYZl70Hgg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
@ -3,14 +3,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sbt-extras";
|
||||
rev = "8ccccd8a1d7efa097b7f30e0ec76e39b3aa0f3df";
|
||||
version = "2021-11-08";
|
||||
rev = "ef403f4ce126441f126dfc61ca6357a7b42539af";
|
||||
version = "2022-02-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paulp";
|
||||
repo = "sbt-extras";
|
||||
inherit rev;
|
||||
sha256 = "376yaucqzoe36VKaJmCz+5vQHc+KNQG4iamAdOb/YQU=";
|
||||
sha256 = "G7nR2wV0Wv019bCA+ecfYhmFh/DDHFjihKGFKNQ5dgM=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
@ -2,19 +2,17 @@
|
||||
, lambda-term, cppo, makeWrapper, buildDunePackage
|
||||
}:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.03"
|
||||
then throw "utop is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "utop";
|
||||
version = "2.8.0";
|
||||
version = "2.9.0";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
minimalOCamlVersion = "4.03";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz";
|
||||
sha256 = "0mi571ifjzq4wcjarn8q1b7yl8nxjm1jfx3afac224lqwn6bhb2d";
|
||||
sha256 = "sha256:17jd61bc6pva5wqmnc9xq70ysyjplrzf1p25sq1s7wgrfq2vlyyd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper cppo ];
|
||||
|
@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "open-policy-agent";
|
||||
version = "0.38.0";
|
||||
version = "0.38.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-policy-agent";
|
||||
repo = "opa";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RGGxqmQ0mZ5iSAzDvUU6mAlCve3MknuNr2wAzHcV3RQ=";
|
||||
sha256 = "sha256-x8mSlZ2X0DdkhaW5QXs5axERJkwARu8tHueQHXfamXM=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
@ -16,16 +16,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "airshipper";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "Veloren";
|
||||
repo = "airshipper";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-m3H2FE1DoV/uk9PGgf9PCagwmWWSQO/gCi7zpS02/WY=";
|
||||
sha256 = "sha256-nOE9ZNHxLEAnMkuBSpxmeq3DxkRIlcoase6AxU+eFug=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-ddy4TjT/ia+sLBnpwcXBVUzAS07ar+Jjc04KS5/arlU=";
|
||||
cargoSha256 = "sha256-s3seKVEhXyOVlt3a8cubzRWoB4SVQpdCmq12y0FpDUw=";
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
|
@ -2,23 +2,31 @@
|
||||
, fetchurl
|
||||
, makeWrapper
|
||||
, curl
|
||||
, espeak
|
||||
, file
|
||||
, gtk3
|
||||
, gtkdatabox
|
||||
, intltool
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "klavaro";
|
||||
version = "3.11";
|
||||
version = "3.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/klavaro/${pname}-${version}.tar.bz2";
|
||||
sha256 = "1rkxaqb62w4mv86fcnmr32lq6y0h4hh92wmsy5ddb9a8jnzx6r7w";
|
||||
sha256 = "0z6c3lqikk50mkz3ipm93l48qj7b98lxyip8y6ndg9y9k0z0n878";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ intltool makeWrapper pkg-config ];
|
||||
buildInputs = [ curl gtk3 ];
|
||||
buildInputs = [ curl gtk3 gtkdatabox ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/tutor.c --replace '"espeak ' '"${espeak}/bin/espeak '
|
||||
'';
|
||||
|
||||
patches = [ ./icons.patch ./trans_lang_get_similar.patch ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/klavaro \
|
||||
|
146
pkgs/games/klavaro/icons.patch
Normal file
146
pkgs/games/klavaro/icons.patch
Normal file
@ -0,0 +1,146 @@
|
||||
--- a/data/klavaro.glade (revision 137)
|
||||
+++ b/data/klavaro.glade (working copy)
|
||||
@@ -311,7 +311,7 @@
|
||||
<object class="GtkImage" id="image24">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-delete</property>
|
||||
+ <property name="icon-name">edit-delete</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
@@ -708,7 +708,7 @@
|
||||
<property name="can-default">True</property>
|
||||
<property name="has-default">True</property>
|
||||
<property name="tooltip-text" translatable="yes">Drag and drop text here to practice with it.</property>
|
||||
- <property name="secondary-icon-name">gtk-clear</property>
|
||||
+ <property name="secondary-icon-name">edit-clear</property>
|
||||
<property name="secondary-icon-tooltip-text" translatable="yes">Press here to restart the exercise. Hotkey: [Ctrl-R]</property>
|
||||
<property name="secondary-icon-tooltip-markup" translatable="yes">Press here to restart the exercise. Hotkey: [Ctrl-R]</property>
|
||||
<signal name="activate" handler="on_entry_mesg_activate" after="yes" swapped="no"/>
|
||||
@@ -1232,7 +1232,7 @@
|
||||
<object class="GtkImage" id="image27">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-delete</property>
|
||||
+ <property name="icon-name">edit-delete</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
@@ -1352,7 +1352,7 @@
|
||||
<object class="GtkImage" id="image23">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-open</property>
|
||||
+ <property name="icon-name">document-open</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">True</property>
|
||||
@@ -1510,7 +1510,7 @@
|
||||
<object class="GtkImage" id="image11">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-open</property>
|
||||
+ <property name="icon-name">document-open</property>
|
||||
<property name="icon_size">2</property>
|
||||
</object>
|
||||
<packing>
|
||||
@@ -1557,7 +1557,7 @@
|
||||
<object class="GtkImage" id="image6">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-paste</property>
|
||||
+ <property name="icon-name">edit-paste</property>
|
||||
<property name="icon_size">2</property>
|
||||
</object>
|
||||
<packing>
|
||||
@@ -1604,7 +1604,7 @@
|
||||
<object class="GtkImage" id="image19">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-delete</property>
|
||||
+ <property name="icon-name">edit-delete</property>
|
||||
<property name="icon_size">2</property>
|
||||
</object>
|
||||
<packing>
|
||||
@@ -2051,7 +2051,7 @@
|
||||
<object class="GtkImage" id="image14">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-delete</property>
|
||||
+ <property name="icon-name">edit-delete</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
@@ -2343,7 +2343,7 @@
|
||||
<object class="GtkImage" id="image3">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-media-rewind</property>
|
||||
+ <property name="icon-name">media-seek-backward</property>
|
||||
<property name="icon_size">1</property>
|
||||
</object>
|
||||
</child>
|
||||
@@ -2418,7 +2418,7 @@
|
||||
<object class="GtkImage" id="image20">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-go-back</property>
|
||||
+ <property name="icon-name">go-previous</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
@@ -2469,7 +2469,7 @@
|
||||
<object class="GtkImage" id="image18">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-go-forward</property>
|
||||
+ <property name="icon-name">go-next</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
@@ -2577,7 +2577,7 @@
|
||||
<object class="GtkImage" id="image13">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-save</property>
|
||||
+ <property name="icon-name">document-save</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
@@ -2825,7 +2825,7 @@
|
||||
<object class="GtkImage" id="image_basic">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-strikethrough</property>
|
||||
+ <property name="icon-name">format-text-strikethrough</property>
|
||||
<property name="icon_size">6</property>
|
||||
</object>
|
||||
<packing>
|
||||
@@ -2901,7 +2901,7 @@
|
||||
<object class="GtkImage" id="image_adapt">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-bold</property>
|
||||
+ <property name="icon-name">format-text-bold</property>
|
||||
<property name="icon_size">6</property>
|
||||
</object>
|
||||
<packing>
|
||||
@@ -3630,7 +3630,7 @@
|
||||
<object class="GtkImage" id="image_top10_publish">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-goto-top</property>
|
||||
+ <property name="icon-name">go-top</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
@@ -3678,7 +3678,7 @@
|
||||
<object class="GtkImage" id="image_top10_update">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-goto-bottom</property>
|
||||
+ <property name="icon-name">go-bottom</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
71
pkgs/games/klavaro/trans_lang_get_similar.patch
Normal file
71
pkgs/games/klavaro/trans_lang_get_similar.patch
Normal file
@ -0,0 +1,71 @@
|
||||
--- a/src/translation.c (revision 137)
|
||||
+++ b/src/translation.c (working copy)
|
||||
@@ -257,23 +257,23 @@
|
||||
* Private auxiliar function
|
||||
*/
|
||||
static gboolean
|
||||
-trans_lang_get_similar (gchar * test)
|
||||
+trans_lang_get_similar (gchar ** test)
|
||||
{
|
||||
gint i;
|
||||
gchar aux_code_2[3];
|
||||
|
||||
/* Prefer C over en_GB for English variants other than en_GB. (Debian patch 02) */
|
||||
- if (g_str_has_prefix (test, "en"))
|
||||
+ if (g_str_has_prefix (*test, "en"))
|
||||
{
|
||||
- g_free (test);
|
||||
- test = g_strdup ("C");
|
||||
+ g_free (*test);
|
||||
+ *test = g_strdup ("C");
|
||||
return (TRUE);
|
||||
}
|
||||
|
||||
- if (g_str_equal (test, "C"))
|
||||
+ if (g_str_equal (*test, "C"))
|
||||
return TRUE;
|
||||
|
||||
- strncpy (aux_code_2, test, 2);
|
||||
+ strncpy (aux_code_2, *test, 2);
|
||||
aux_code_2[2] = '\0';
|
||||
|
||||
for (i = 0; i < lang_num; i++)
|
||||
@@ -280,15 +280,15 @@
|
||||
{
|
||||
if (strstr (lang[i].code, aux_code_2))
|
||||
{
|
||||
- g_free (test);
|
||||
- test = g_strdup (lang[i].code);
|
||||
+ g_free (*test);
|
||||
+ *test = g_strdup (lang[i].code);
|
||||
break;
|
||||
}
|
||||
}
|
||||
- if (i == lang_num && g_str_has_prefix (test, "en"))
|
||||
+ if (i == lang_num && g_str_has_prefix (*test, "en"))
|
||||
{
|
||||
- g_free (test);
|
||||
- test = g_strdup ("C");
|
||||
+ g_free (*test);
|
||||
+ *test = g_strdup ("C");
|
||||
return (TRUE);
|
||||
}
|
||||
return (i == lang_num ? FALSE : TRUE);
|
||||
@@ -356,7 +356,7 @@
|
||||
lang_ok = (i == 0 ? TRUE : FALSE);
|
||||
break;
|
||||
}
|
||||
- lang_ok = trans_lang_get_similar (tmp_code);
|
||||
+ lang_ok = trans_lang_get_similar (&tmp_code);
|
||||
if (lang_ok == TRUE)
|
||||
break;
|
||||
g_free (tmp_code);
|
||||
@@ -368,7 +368,7 @@
|
||||
tmp_code = g_win32_getlocale ();
|
||||
lang_ok = trans_lang_is_available (tmp_code);
|
||||
if (lang_ok == FALSE)
|
||||
- lang_ok = trans_lang_get_similar (tmp_code);
|
||||
+ lang_ok = trans_lang_get_similar (&tmp_code);
|
||||
#endif
|
||||
}
|
||||
if (tmp_code == NULL)
|
@ -49,6 +49,7 @@ let
|
||||
# Zachtronics and a few other studios expect STEAM_LD_LIBRARY_PATH to be present
|
||||
exportLDPath = ''
|
||||
export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
|
||||
export STEAM_LD_LIBRARY_PATH="$STEAM_LD_LIBRARY_PATH''${STEAM_LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
|
||||
'';
|
||||
|
||||
# bootstrap.tar.xz has 444 permissions, which means that simple deletes fail
|
||||
@ -252,7 +253,7 @@ in buildFHSUserEnv rec {
|
||||
fi
|
||||
fi
|
||||
|
||||
export STEAM_LD_LIBRARY_PATH="$STEAM_LD_LIBRARY_PATH''${STEAM_LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
|
||||
${exportLDPath}
|
||||
${fixBootstrap}
|
||||
exec steam "$@"
|
||||
'';
|
||||
@ -284,7 +285,8 @@ in buildFHSUserEnv rec {
|
||||
exit 1
|
||||
fi
|
||||
shift
|
||||
export STEAM_LD_LIBRARY_PATH="$STEAM_LD_LIBRARY_PATH''${STEAM_LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
|
||||
|
||||
${exportLDPath}
|
||||
${fixBootstrap}
|
||||
exec -- "$run" "$@"
|
||||
'';
|
||||
|
@ -1,17 +1,21 @@
|
||||
{ lib, stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer, libpng,
|
||||
cairo, librsvg, gettext, libpaper, fribidi, pkg-config, gperf, imagemagick }:
|
||||
{ lib, stdenv, fetchurl, SDL, SDL_gfx, SDL_image, SDL_ttf, SDL_mixer, libpng
|
||||
, libimagequant, cairo, librsvg, gettext, libpaper, fribidi, pkg-config, gperf
|
||||
, imagemagick
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.9.24";
|
||||
version = "0.9.27";
|
||||
pname = "tuxpaint";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/tuxpaint/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "06m1lg2pikfkmassfvvrbwqffwgixcmjh1li6akaldgkalpmfql7";
|
||||
sha256 = "sha256-qyuA6J34gijNDsCmyQtJ1UPLFXqjj7kMvTop8AFAVXo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ SDL SDL_image SDL_ttf SDL_mixer libpng cairo
|
||||
librsvg gettext libpaper fribidi pkg-config gperf imagemagick ];
|
||||
nativeBuildInputs = [
|
||||
SDL SDL_gfx SDL_image SDL_ttf SDL_mixer libpng cairo libimagequant librsvg
|
||||
gettext libpaper fribidi pkg-config gperf imagemagick
|
||||
];
|
||||
hardeningDisable = [ "format" ];
|
||||
makeFlags = [ "GPERF=${gperf}/bin/gperf"
|
||||
"PREFIX=$$out"
|
||||
@ -25,8 +29,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# stamps
|
||||
stamps = fetchurl {
|
||||
url = "mirror://sourceforge/project/tuxpaint/tuxpaint-stamps/2014-08-23/tuxpaint-stamps-2014.08.23.tar.gz";
|
||||
sha256 = "0rhlwrjz44wp269v3rid4p8pi0i615pzifm1ym6va64gn1bms06q";
|
||||
url = "mirror://sourceforge/project/tuxpaint/tuxpaint-stamps/2021-11-25/tuxpaint-stamps-2021.11.25.tar.gz";
|
||||
sha256 = "sha256-y1XuIbLSW0QO4has+rC7jZBq8cma28d+jbEe7DBYnVI=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
@ -37,15 +41,17 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# Install stamps
|
||||
tar xzf $stamps
|
||||
cd tuxpaint-stamps-2014.08.23
|
||||
cd tuxpaint-stamps-*
|
||||
make install-all PREFIX=$out
|
||||
rm -rf $out/share/tuxpaint/stamps/military
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "Open Source Drawing Software for Children";
|
||||
homepage = "http://www.tuxpaint.org/";
|
||||
license = lib.licenses.gpl3;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ woffs ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xsnow";
|
||||
version = "3.3.6";
|
||||
version = "3.4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ratrabbit.nl/downloads/xsnow/xsnow-${version}.tar.gz";
|
||||
sha256 = "sha256-rTJO1btS1VBHatj9Yr2R6vZBUPQtCB1Aa6AD6IzwuLg=";
|
||||
sha256 = "sha256-fPMy5AxKspFkcWphf/IjMc/ZQtayljThKxbcMtvOjRc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
@ -1,9 +1,9 @@
|
||||
{ lib
|
||||
, fetchpatch
|
||||
, kernel
|
||||
, date ? "2022-01-12"
|
||||
, commit ? "0e6eb60f8be14b02e0a76cb330f4b22c80ec82e9"
|
||||
, diffHash ? "091w4r7h93s5rv8hk65aix7l0rr4bd504mv998j7x360bqlb7vpi"
|
||||
, date ? "2022-03-09"
|
||||
, commit ? "2280551cebc1735f74eef75d650dd5e175461657"
|
||||
, diffHash ? "1mrrydidbapdq0fs0vpqhs88k6ghdrvmjpk2zi7xlwj7j32h0nwp"
|
||||
, kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage
|
||||
, argsOverride ? {}
|
||||
, ...
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
extraMeta = {
|
||||
branch = "master";
|
||||
maintainers = with lib.maintainers; [ davidak chiiruno ];
|
||||
maintainers = with lib.maintainers; [ davidak Madouura ];
|
||||
};
|
||||
} // argsOverride;
|
||||
|
||||
|
@ -1,26 +0,0 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
# !!! Duplication: this package is almost exactly the same as `bsd-fingerd'.
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bsd-fingerd";
|
||||
version = "0.17";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://ibiblioPubLinux/system/network/finger/bsd-finger-${version}.tar.gz";
|
||||
sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE";
|
||||
|
||||
patches = [ ./ubuntu-0.17-9.patch ];
|
||||
|
||||
preBuild = "cd fingerd";
|
||||
|
||||
preInstall = "mkdir -p $out/man/man8 $out/sbin ";
|
||||
|
||||
meta = with lib; {
|
||||
platforms = platforms.linux;
|
||||
license = licenses.bsdOriginal;
|
||||
};
|
||||
}
|
@ -1,67 +0,0 @@
|
||||
--- bsd-finger-0.17.orig/fingerd/fingerd.8
|
||||
+++ bsd-finger-0.17/fingerd/fingerd.8
|
||||
@@ -36,10 +36,10 @@
|
||||
.Dt FINGERD 8
|
||||
.Os "Linux NetKit (0.17)"
|
||||
.Sh NAME
|
||||
-.Nm fingerd
|
||||
+.Nm in.fingerd
|
||||
.Nd remote user information server
|
||||
.Sh SYNOPSIS
|
||||
-.Nm fingerd
|
||||
+.Nm in.fingerd
|
||||
.Op Fl wulf
|
||||
.Op Fl pL Ar path
|
||||
.Op Fl t Ar timeout
|
||||
@@ -61,7 +61,7 @@
|
||||
banner
|
||||
which also shows some informations (e.g. uptime, operating system name and
|
||||
release) about the system the
|
||||
-.Nm fingerd
|
||||
+.Nm in.fingerd
|
||||
is running on. Some sites may consider this a security risk as it
|
||||
gives out information that may be useful to crackers.
|
||||
.Pp
|
||||
@@ -85,7 +85,7 @@
|
||||
.Pp
|
||||
The
|
||||
.Fl p
|
||||
-option allows specification of an alternate location for fingerd to find
|
||||
+option allows specification of an alternate location for in.fingerd to find
|
||||
the
|
||||
.Dq finger
|
||||
program. The
|
||||
@@ -97,7 +97,7 @@
|
||||
option specifies the time to wait for a request before closing the
|
||||
connection. A value of 0 waits forever. The default is 60 seconds.
|
||||
.Pp
|
||||
-Options to fingerd should be specified in
|
||||
+Options to in.fingerd should be specified in
|
||||
.Pa /etc/inetd.conf .
|
||||
.Pp
|
||||
The finger protocol consists mostly of specifying command arguments.
|
||||
@@ -105,12 +105,12 @@
|
||||
.Xr inetd 8
|
||||
.Dq super-server
|
||||
runs
|
||||
-.Nm fingerd
|
||||
+.Nm in.fingerd
|
||||
for
|
||||
.Tn TCP
|
||||
requests received on port 79.
|
||||
Once connected
|
||||
-.Nm fingerd
|
||||
+.Nm in.fingerd
|
||||
reads a single command line
|
||||
terminated by a
|
||||
.Aq Tn CRLF
|
||||
--- bsd-finger-0.17.orig/fingerd/fingerd.c
|
||||
+++ bsd-finger-0.17/fingerd/fingerd.c
|
||||
@@ -55,6 +55,7 @@
|
||||
#include <netinet/in.h>
|
||||
#include <sys/utsname.h>
|
||||
#include <sys/wait.h>
|
||||
+#include <sys/socket.h>
|
||||
|
||||
#include "pathnames.h"
|
||||
#include "../version.h"
|
@ -1,28 +1,23 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, talloc, finger_bsd, perl
|
||||
, openssl
|
||||
, linkOpenssl? true
|
||||
, openldap
|
||||
, withLdap ? true
|
||||
, sqlite
|
||||
, withSqlite ? true
|
||||
, libpcap
|
||||
, withPcap ? true
|
||||
, libcap
|
||||
, withCap ? true
|
||||
, libmemcached
|
||||
, withMemcached ? false
|
||||
, hiredis
|
||||
, withRedis ? false
|
||||
, libmysqlclient
|
||||
, withMysql ? false
|
||||
, json_c
|
||||
, withJson ? false
|
||||
, libyubikey
|
||||
, withYubikey ? false
|
||||
, collectd
|
||||
, withCollectd ? false
|
||||
, curl
|
||||
, withRest ? false
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, bsd-finger
|
||||
, perl
|
||||
, talloc
|
||||
, linkOpenssl? true, openssl
|
||||
, withCap ? true, libcap
|
||||
, withCollectd ? false, collectd
|
||||
, withJson ? false, json_c
|
||||
, withLdap ? true, openldap
|
||||
, withMemcached ? false, libmemcached
|
||||
, withMysql ? false, libmysqlclient
|
||||
, withPcap ? true, libpcap
|
||||
, withRedis ? false, hiredis
|
||||
, withRest ? false, curl
|
||||
, withSqlite ? true, sqlite
|
||||
, withYubikey ? false, libyubikey
|
||||
}:
|
||||
|
||||
assert withSqlite -> sqlite != null;
|
||||
@ -36,43 +31,38 @@ assert withYubikey -> libyubikey != null;
|
||||
assert withCollectd -> collectd != null;
|
||||
assert withRest -> curl != null && withJson;
|
||||
|
||||
## TODO: include windbind optionally (via samba?)
|
||||
## TODO: include oracle optionally
|
||||
## TODO: include ykclient optionally
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freeradius";
|
||||
version = "3.0.25";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz";
|
||||
sha256 = "SIOmi7PO5GAlNZqXwWkc5lXour/W3DwCHQDhCaL/TBA=";
|
||||
hash = "sha256-SIOmi7PO5GAlNZqXwWkc5lXour/W3DwCHQDhCaL/TBA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
buildInputs = [ openssl talloc finger_bsd perl ]
|
||||
++ optional withLdap openldap
|
||||
++ optional withSqlite sqlite
|
||||
++ optional withPcap libpcap
|
||||
++ optional withCap libcap
|
||||
++ optional withMemcached libmemcached
|
||||
++ optional withRedis hiredis
|
||||
++ optional withMysql libmysqlclient
|
||||
++ optional withJson json_c
|
||||
++ optional withYubikey libyubikey
|
||||
++ optional withCollectd collectd
|
||||
++ optional withRest curl;
|
||||
|
||||
buildInputs = [ openssl talloc bsd-finger perl ]
|
||||
++ lib.optional withCap libcap
|
||||
++ lib.optional withCollectd collectd
|
||||
++ lib.optional withJson json_c
|
||||
++ lib.optional withLdap openldap
|
||||
++ lib.optional withMemcached libmemcached
|
||||
++ lib.optional withMysql libmysqlclient
|
||||
++ lib.optional withPcap libpcap
|
||||
++ lib.optional withRedis hiredis
|
||||
++ lib.optional withRest curl
|
||||
++ lib.optional withSqlite sqlite
|
||||
++ lib.optional withYubikey libyubikey;
|
||||
|
||||
configureFlags = [
|
||||
"--sysconfdir=/etc"
|
||||
"--localstatedir=/var"
|
||||
] ++ optional (!linkOpenssl) "--with-openssl=no";
|
||||
] ++ lib.optional (!linkOpenssl) "--with-openssl=no";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/main/checkrad.in --replace "/usr/bin/finger" "${finger_bsd}/bin/finger"
|
||||
substituteInPlace src/main/checkrad.in \
|
||||
--replace "/usr/bin/finger" "${bsd-finger}/bin/finger"
|
||||
'';
|
||||
|
||||
# By default, freeradius will generate Diffie-Hellman parameters and
|
||||
@ -99,6 +89,7 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ sheenobu willibutz fpletz lheckemann elseym ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
## TODO: include windbind optionally (via samba?)
|
||||
## TODO: include oracle optionally
|
||||
## TODO: include ykclient optionally
|
||||
|
@ -2,17 +2,17 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jetty";
|
||||
version = "9.4.45.v20220203";
|
||||
version = "11.0.8";
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
|
||||
sha256 = "sha256-wmM03qAnNsiEDsLkWyJKZIb3SPCRGCxTsgKBWwopMAw=";
|
||||
url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz";
|
||||
sha256 = "sha256-fHd0o5f+WLdbDK1nmSnHNKjDO0mV7+vkPs4zVEaqeyw=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
mv etc lib modules start.ini start.jar $out
|
||||
mv etc lib modules start.jar $out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -24,7 +24,6 @@
|
||||
, openssl
|
||||
, pcre
|
||||
, perl
|
||||
, prometheus-cpp
|
||||
, python2
|
||||
, re2
|
||||
, zlib
|
||||
@ -109,7 +108,6 @@ stdenv.mkDerivation rec {
|
||||
{ f = "libssl"; p = openssl; }
|
||||
{ f = "lz4"; p = lz4; }
|
||||
{ f = "pcre"; p = pcre; }
|
||||
{ f = "prometheus-cpp"; p = prometheus-cpp; }
|
||||
{ f = "re2"; p = re2; }
|
||||
]}
|
||||
|
||||
@ -123,8 +121,9 @@ stdenv.mkDerivation rec {
|
||||
ln -s ${nlohmann_json.src}/single_include/nlohmann/json.hpp .
|
||||
popd
|
||||
|
||||
pushd prometheus-cpp/prometheus-cpp/3rdparty
|
||||
replace_dep . "${civetweb.src}" civetweb
|
||||
pushd prometheus-cpp
|
||||
tar xf v0.9.0.tar.gz
|
||||
replace_dep prometheus-cpp/3rdparty "${civetweb.src}" civetweb
|
||||
popd
|
||||
|
||||
sed -i s_/usr/bin/env_${coreutils}/bin/env_g libssl/openssl/config
|
||||
|
@ -13,7 +13,7 @@
|
||||
, buildPackages }:
|
||||
|
||||
let
|
||||
version = "5.8";
|
||||
version = "5.8.1";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -22,19 +22,12 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz";
|
||||
sha256 = "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w";
|
||||
sha256 = "sha256-tpc1ILrOYAtHeSACabHl155fUFrElSBYwRrVu/DdmRk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix location of timezone data for TZ= completion
|
||||
./tz_completion.patch
|
||||
# This commit will be released with the next version of zsh
|
||||
(fetchpatch {
|
||||
name = "fix-git-stash-drop-completions.patch";
|
||||
url = "https://github.com/zsh-users/zsh/commit/754658aff38e1bdf487c58bec6174cbecd019d11.patch";
|
||||
sha256 = "sha256-ud/rLD+SqvyTzT6vwOr+MWH+LY5o5KACrU1TpmL15Lo=";
|
||||
excludes = [ "ChangeLog" ];
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook perl groff texinfo ]
|
||||
|
@ -5,15 +5,15 @@
|
||||
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2022-03-10";
|
||||
version = "2022-03-14";
|
||||
pname = "oh-my-zsh";
|
||||
rev = "c10241f3d1d7bf77d483e11869a6a00f1d2e5e88";
|
||||
rev = "345976874550efa09fa7e9cdbe1215ce27d1541b";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
sha256 = "HVV3zhEZ4NU4Dk7zHv+NeatTJUbzxqOvM4cYNzjuTfo=";
|
||||
sha256 = "AxKt84XDqmkwBlUeWsE6Tm0aRxvv0HXRdBf/OXjIyHo=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
@ -1,20 +1,20 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildDotnetModule
|
||||
, fetchFromGitHub
|
||||
, autoPatchelfHook
|
||||
, dotnetCorePackages
|
||||
, testVersion
|
||||
, discordchatexporter-cli
|
||||
}:
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "discordchatexporter-cli";
|
||||
version = "2.32";
|
||||
version = "2.33.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tyrrrz";
|
||||
repo = "discordchatexporter";
|
||||
rev = version;
|
||||
sha256 = "xRoF/HJ4ekHL/Uk6ISQP+65nChRT+n9xLTYcZMJxyvo=";
|
||||
sha256 = "wOSa6O3O4QlGL5ecnR14ldXPYV5mDoPDlJjcwN5Lrek=";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_6_0;
|
||||
@ -23,15 +23,24 @@ buildDotnetModule rec {
|
||||
projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj";
|
||||
nugetDeps = ./deps.nix;
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
buildInputs = [ stdenv.cc.cc.lib ];
|
||||
postFixup = ''
|
||||
ln -s $out/bin/DiscordChatExporter.Cli $out/bin/discordchatexporter-cli
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = ./updater.sh;
|
||||
tests.version = testVersion {
|
||||
package = discordchatexporter-cli;
|
||||
version = "v${version}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to export Discord chat logs to a file";
|
||||
homepage = "https://github.com/Tyrrrz/DiscordChatExporter";
|
||||
license = licenses.gpl3Plus;
|
||||
changelog = "https://github.com/Tyrrrz/DiscordChatExporter/blob/${version}/Changelog.md";
|
||||
maintainers = [ maintainers.ivar ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
passthru.updateScript = ./updater.sh;
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ fetchNuGet }: [
|
||||
(fetchNuGet { pname = "CliFx"; version = "2.2.1"; sha256 = "1yxxl3jgl6sadar1g9175s62fag5f30lqpgrf58djll3509rbgw5"; })
|
||||
(fetchNuGet { pname = "Gress"; version = "1.2.0"; sha256 = "0aidc9whi0718gh896j7xkyndki9x7rifd8n1n681afb2zbxw4bn"; })
|
||||
(fetchNuGet { pname = "CliFx"; version = "2.2.2"; sha256 = "13g5xlrbyhnbwkyzic5jlhxl0kpvkfrdmb5h2rdf9yp4gp5p9mwg"; })
|
||||
(fetchNuGet { pname = "Gress"; version = "2.0.1"; sha256 = "00xhyfkrlc38nbl6aymr7zwxc3kj0rxvx5gwk6fkfrvi1pzgq0wc"; })
|
||||
(fetchNuGet { pname = "JsonExtensions"; version = "1.2.0"; sha256 = "0g54hibabbqqfhxjlnxwv1rxagpali5agvnpymp2w3dk8h6q66xy"; })
|
||||
(fetchNuGet { pname = "MiniRazor.CodeGen"; version = "2.2.0"; sha256 = "1rbgkm1hsamqhviw2c62g6iafiwkxcnz66qbybpd32qgz1124cx4"; })
|
||||
(fetchNuGet { pname = "MiniRazor.Runtime"; version = "2.2.0"; sha256 = "0zm0l97jfbfy90zj0cbi7v3qbhxhfay1g8f2cw0gp829xz4yk9jr"; })
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user