Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts: pkgs/development/python-modules/symengine/default.nix
This commit is contained in:
zowoq
commit
6431086967
|
|
@ -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`.
|
||||
|
|
|
|||
|
|
@ -7241,6 +7241,12 @@
|
|||
githubId = 918448;
|
||||
name = "Anthony Lodi";
|
||||
};
|
||||
loicreynier = {
|
||||
email = "loic@loireynier.fr";
|
||||
github = "loicreynier";
|
||||
githubId = 88983487;
|
||||
name = "Loïc Reynier";
|
||||
};
|
||||
lopsided98 = {
|
||||
email = "benwolsieffer@gmail.com";
|
||||
github = "lopsided98";
|
||||
|
|
|
|||
|
|
@ -311,6 +311,12 @@
|
|||
with many features.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://clusterlabs.org/pacemaker/">pacemaker</link>
|
||||
cluster resource manager
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-22.05-incompatibilities">
|
||||
|
|
@ -415,6 +421,24 @@
|
|||
in your configuration.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>fonts.fonts</literal> no longer includes ancient
|
||||
bitmap fonts when both
|
||||
<literal>config.services.xserver.enable</literal> and
|
||||
<literal>config.nixpkgs.config.allowUnfree</literal> are
|
||||
enabled. If you still want these fonts, use:
|
||||
</para>
|
||||
<programlisting language="bash">
|
||||
{
|
||||
fonts.fonts = [
|
||||
pkgs.xorg.fontbhlucidatypewriter100dpi
|
||||
pkgs.xorg.fontbhlucidatypewriter75dpi
|
||||
pkgs.xorg.fontbh100dpi
|
||||
];
|
||||
}
|
||||
</programlisting>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The DHCP server (<literal>services.dhcpd4</literal>,
|
||||
|
|
@ -1301,6 +1325,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
|
||||
|
|
@ -1434,6 +1467,46 @@
|
|||
desktop environments as needed.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>hadoop</literal> package has added support for
|
||||
<literal>aarch64-linux</literal> and
|
||||
<literal>aarch64-darwin</literal> as of 3.3.1
|
||||
(<link xlink:href="https://github.com/NixOS/nixpkgs/pull/158613">#158613</link>).
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>R</literal> package now builds again on
|
||||
<literal>aarch64-darwin</literal>
|
||||
(<link xlink:href="https://github.com/NixOS/nixpkgs/pull/158992">#158992</link>).
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>spark3</literal> package has been updated from
|
||||
3.1.2 to 3.2.1
|
||||
(<link xlink:href="https://github.com/NixOS/nixpkgs/pull/160075">#160075</link>):
|
||||
</para>
|
||||
<itemizedlist spacing="compact">
|
||||
<listitem>
|
||||
<para>
|
||||
Testing has been enabled for
|
||||
<literal>aarch64-linux</literal> in addition to
|
||||
<literal>x86_64-linux</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>spark3</literal> package is now usable on
|
||||
<literal>aarch64-darwin</literal> as a result of
|
||||
<link xlink:href="https://github.com/NixOS/nixpkgs/pull/158613">#158613</link>
|
||||
and
|
||||
<link xlink:href="https://github.com/NixOS/nixpkgs/pull/158992">#158992</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -89,6 +89,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- [blocky](https://0xerr0r.github.io/blocky/), fast and lightweight DNS proxy as ad-blocker for local network with many features.
|
||||
|
||||
- [pacemaker](https://clusterlabs.org/pacemaker/) cluster resource manager
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
## Backward Incompatibilities {#sec-release-22.05-incompatibilities}
|
||||
|
|
@ -135,6 +137,19 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
This change may require a reboot to take effect, and k3s may not be able to run if the boot cgroup hierarchy does not match its configuration.
|
||||
The previous behavior may be retained by explicitly setting `systemd.enableUnifiedCgroupHierarchy = false` in your configuration.
|
||||
|
||||
- `fonts.fonts` no longer includes ancient bitmap fonts when both `config.services.xserver.enable` and `config.nixpkgs.config.allowUnfree` are enabled.
|
||||
If you still want these fonts, use:
|
||||
|
||||
```nix
|
||||
{
|
||||
fonts.fonts = [
|
||||
pkgs.xorg.fontbhlucidatypewriter100dpi
|
||||
pkgs.xorg.fontbhlucidatypewriter75dpi
|
||||
pkgs.xorg.fontbh100dpi
|
||||
];
|
||||
}
|
||||
```
|
||||
|
||||
- The DHCP server (`services.dhcpd4`, `services.dhcpd6`) has been hardened.
|
||||
The service is now using the systemd's `DynamicUser` mechanism to run as an unprivileged dynamically-allocated user with limited capabilities.
|
||||
The dhcpd state files are now always stored in `/var/lib/dhcpd{4,6}` and the `services.dhcpd4.stateDir` and `service.dhcpd6.stateDir` options have been removed.
|
||||
|
|
@ -481,6 +496,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.
|
||||
|
|
@ -524,4 +541,13 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- The polkit service, available at `security.polkit.enable`, is now disabled by default. It will automatically be enabled through services and desktop environments as needed.
|
||||
|
||||
- The `hadoop` package has added support for `aarch64-linux` and `aarch64-darwin` as of 3.3.1 ([#158613](https://github.com/NixOS/nixpkgs/pull/158613)).
|
||||
|
||||
- The `R` package now builds again on `aarch64-darwin` ([#158992](https://github.com/NixOS/nixpkgs/pull/158992)).
|
||||
|
||||
- The `spark3` package has been updated from 3.1.2 to 3.2.1 ([#160075](https://github.com/NixOS/nixpkgs/pull/160075)):
|
||||
|
||||
- Testing has been enabled for `aarch64-linux` in addition to `x86_64-linux`.
|
||||
- The `spark3` package is now usable on `aarch64-darwin` as a result of [#158613](https://github.com/NixOS/nixpkgs/pull/158613) and [#158992](https://github.com/NixOS/nixpkgs/pull/158992).
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
|
|
|||
|
|
@ -39,11 +39,6 @@ let
|
|||
defaultXFonts =
|
||||
[ (if hasHidpi then fontcursormisc_hidpi else pkgs.xorg.fontcursormisc)
|
||||
pkgs.xorg.fontmiscmisc
|
||||
] ++ optionals (config.nixpkgs.config.allowUnfree or false)
|
||||
[ # these are unfree, and will make usage with xserver fail
|
||||
pkgs.xorg.fontbhlucidatypewriter100dpi
|
||||
pkgs.xorg.fontbhlucidatypewriter75dpi
|
||||
pkgs.xorg.fontbh100dpi
|
||||
];
|
||||
|
||||
in
|
||||
|
|
|
|||
|
|
@ -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 ]
|
||||
|
|
|
|||
|
|
@ -8,8 +8,12 @@ let
|
|||
concatStringsSep mapAttrsToList toLower
|
||||
literalExpression mkRenamedOptionModule mkDefault mkOption trivial types;
|
||||
|
||||
needsEscaping = s: null != builtins.match "[a-zA-Z0-9]+" s;
|
||||
escapeIfNeccessary = s: if needsEscaping s then s else ''"${lib.escape [ "\$" "\"" "\\" "\`" ] s}"'';
|
||||
attrsToText = attrs:
|
||||
concatStringsSep "\n" (mapAttrsToList (n: v: ''${n}="${toString v}"'') attrs);
|
||||
concatStringsSep "\n" (
|
||||
mapAttrsToList (n: v: ''${n}=${escapeIfNeccessary (toString v)}'') attrs
|
||||
);
|
||||
|
||||
in
|
||||
{
|
||||
|
|
|
|||
|
|
@ -302,6 +302,7 @@
|
|||
./services/backup/znapzend.nix
|
||||
./services/blockchain/ethereum/geth.nix
|
||||
./services/backup/zrepl.nix
|
||||
./services/cluster/corosync/default.nix
|
||||
./services/cluster/hadoop/default.nix
|
||||
./services/cluster/k3s/default.nix
|
||||
./services/cluster/kubernetes/addons/dns.nix
|
||||
|
|
@ -314,6 +315,7 @@
|
|||
./services/cluster/kubernetes/pki.nix
|
||||
./services/cluster/kubernetes/proxy.nix
|
||||
./services/cluster/kubernetes/scheduler.nix
|
||||
./services/cluster/pacemaker/default.nix
|
||||
./services/cluster/spark/default.nix
|
||||
./services/computing/boinc/client.nix
|
||||
./services/computing/foldingathome/client.nix
|
||||
|
|
|
|||
|
|
@ -40,13 +40,15 @@ in
|
|||
KDEDIRS = [ "" ];
|
||||
QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" ];
|
||||
QTWEBKIT_PLUGIN_PATH = [ "/lib/mozilla/plugins/" ];
|
||||
GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" ];
|
||||
GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" "/lib/gtk-4.0" ];
|
||||
XDG_CONFIG_DIRS = [ "/etc/xdg" ];
|
||||
XDG_DATA_DIRS = [ "/share" ];
|
||||
MOZ_PLUGIN_PATH = [ "/lib/mozilla/plugins" ];
|
||||
LIBEXEC_PATH = [ "/lib/libexec" ];
|
||||
};
|
||||
|
||||
environment.pathsToLink = [ "/lib/gtk-2.0" "/lib/gtk-3.0" "/lib/gtk-4.0" ];
|
||||
|
||||
environment.extraInit =
|
||||
''
|
||||
unset ASPELL_CONF
|
||||
|
|
|
|||
112
nixos/modules/services/cluster/corosync/default.nix
Normal file
112
nixos/modules/services/cluster/corosync/default.nix
Normal file
|
|
@ -0,0 +1,112 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.services.corosync;
|
||||
in
|
||||
{
|
||||
# interface
|
||||
options.services.corosync = {
|
||||
enable = mkEnableOption "corosync";
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.corosync;
|
||||
defaultText = literalExpression "pkgs.corosync";
|
||||
description = "Package that should be used for corosync.";
|
||||
};
|
||||
|
||||
clusterName = mkOption {
|
||||
type = types.str;
|
||||
default = "nixcluster";
|
||||
description = "Name of the corosync cluster.";
|
||||
};
|
||||
|
||||
extraOptions = mkOption {
|
||||
type = with types; listOf str;
|
||||
default = [];
|
||||
description = "Additional options with which to start corosync.";
|
||||
};
|
||||
|
||||
nodelist = mkOption {
|
||||
description = "Corosync nodelist: all cluster members.";
|
||||
default = [];
|
||||
type = with types; listOf (submodule {
|
||||
options = {
|
||||
nodeid = mkOption {
|
||||
type = int;
|
||||
description = "Node ID number";
|
||||
};
|
||||
name = mkOption {
|
||||
type = str;
|
||||
description = "Node name";
|
||||
};
|
||||
ring_addrs = mkOption {
|
||||
type = listOf str;
|
||||
description = "List of addresses, one for each ring.";
|
||||
};
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
# implementation
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
environment.etc."corosync/corosync.conf".text = ''
|
||||
totem {
|
||||
version: 2
|
||||
secauth: on
|
||||
cluster_name: ${cfg.clusterName}
|
||||
transport: knet
|
||||
}
|
||||
|
||||
nodelist {
|
||||
${concatMapStrings ({ nodeid, name, ring_addrs }: ''
|
||||
node {
|
||||
nodeid: ${toString nodeid}
|
||||
name: ${name}
|
||||
${concatStrings (imap0 (i: addr: ''
|
||||
ring${toString i}_addr: ${addr}
|
||||
'') ring_addrs)}
|
||||
}
|
||||
'') cfg.nodelist}
|
||||
}
|
||||
|
||||
quorum {
|
||||
# only corosync_votequorum is supported
|
||||
provider: corosync_votequorum
|
||||
wait_for_all: 0
|
||||
${optionalString (builtins.length cfg.nodelist < 3) ''
|
||||
two_node: 1
|
||||
''}
|
||||
}
|
||||
|
||||
logging {
|
||||
to_syslog: yes
|
||||
}
|
||||
'';
|
||||
|
||||
environment.etc."corosync/uidgid.d/root".text = ''
|
||||
# allow pacemaker connection by root
|
||||
uidgid {
|
||||
uid: 0
|
||||
gid: 0
|
||||
}
|
||||
'';
|
||||
|
||||
systemd.packages = [ cfg.package ];
|
||||
systemd.services.corosync = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
StateDirectory = "corosync";
|
||||
StateDirectoryMode = "0700";
|
||||
};
|
||||
};
|
||||
|
||||
environment.etc."sysconfig/corosync".text = lib.optionalString (cfg.extraOptions != []) ''
|
||||
COROSYNC_OPTIONS="${lib.escapeShellArgs cfg.extraOptions}"
|
||||
'';
|
||||
};
|
||||
}
|
||||
52
nixos/modules/services/cluster/pacemaker/default.nix
Normal file
52
nixos/modules/services/cluster/pacemaker/default.nix
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.services.pacemaker;
|
||||
in
|
||||
{
|
||||
# interface
|
||||
options.services.pacemaker = {
|
||||
enable = mkEnableOption "pacemaker";
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.pacemaker;
|
||||
defaultText = literalExpression "pkgs.pacemaker";
|
||||
description = "Package that should be used for pacemaker.";
|
||||
};
|
||||
};
|
||||
|
||||
# implementation
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [ {
|
||||
assertion = config.services.corosync.enable;
|
||||
message = ''
|
||||
Enabling services.pacemaker requires a services.corosync configuration.
|
||||
'';
|
||||
} ];
|
||||
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
# required by pacemaker
|
||||
users.users.hacluster = {
|
||||
isSystemUser = true;
|
||||
group = "pacemaker";
|
||||
home = "/var/lib/pacemaker";
|
||||
};
|
||||
users.groups.pacemaker = {};
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /var/log/pacemaker 0700 hacluster pacemaker -"
|
||||
];
|
||||
|
||||
systemd.packages = [ cfg.package ];
|
||||
systemd.services.pacemaker = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
StateDirectory = "pacemaker";
|
||||
StateDirectoryMode = "0700";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1008,7 +1008,11 @@ in
|
|||
#InaccessiblePaths = [ "-+${runDir}/root" ];
|
||||
UMask = "0066";
|
||||
BindPaths = [ stateDir ];
|
||||
BindReadOnlyPaths = [ storeDir "/etc" ];
|
||||
BindReadOnlyPaths = [ storeDir "/etc" ] ++
|
||||
optionals config.services.resolved.enable [
|
||||
"/run/systemd/resolve/stub-resolv.conf"
|
||||
"/run/systemd/resolve/resolv.conf"
|
||||
];
|
||||
AmbientCapabilities = [""] ++ lib.optional bindsPrivilegedPort "CAP_NET_BIND_SERVICE";
|
||||
CapabilityBoundingSet = [""] ++ lib.optional bindsPrivilegedPort "CAP_NET_BIND_SERVICE";
|
||||
# ProtectClock= adds DeviceAllow=char-rtc r
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -384,6 +384,7 @@ in
|
|||
os-prober = handleTestOn ["x86_64-linux"] ./os-prober.nix {};
|
||||
osrm-backend = handleTest ./osrm-backend.nix {};
|
||||
overlayfs = handleTest ./overlayfs.nix {};
|
||||
pacemaker = handleTest ./pacemaker.nix {};
|
||||
packagekit = handleTest ./packagekit.nix {};
|
||||
pam-file-contents = handleTest ./pam/pam-file-contents.nix {};
|
||||
pam-oath-login = handleTest ./pam/pam-oath-login.nix {};
|
||||
|
|
@ -433,6 +434,7 @@ in
|
|||
prometheus = handleTest ./prometheus.nix {};
|
||||
prometheus-exporters = handleTest ./prometheus-exporters.nix {};
|
||||
prosody = handleTest ./xmpp/prosody.nix {};
|
||||
prosody-mysql = handleTest ./xmpp/prosody-mysql.nix {};
|
||||
proxy = handleTest ./proxy.nix {};
|
||||
prowlarr = handleTest ./prowlarr.nix {};
|
||||
pt2-clone = handleTest ./pt2-clone.nix {};
|
||||
|
|
@ -483,7 +485,7 @@ in
|
|||
sonarr = handleTest ./sonarr.nix {};
|
||||
sourcehut = handleTest ./sourcehut.nix {};
|
||||
spacecookie = handleTest ./spacecookie.nix {};
|
||||
spark = handleTestOn ["x86_64-linux"] ./spark {};
|
||||
spark = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./spark {};
|
||||
sslh = handleTest ./sslh.nix {};
|
||||
sssd = handleTestOn ["x86_64-linux"] ./sssd.nix {};
|
||||
sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {};
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
110
nixos/tests/pacemaker.nix
Normal file
110
nixos/tests/pacemaker.nix
Normal file
|
|
@ -0,0 +1,110 @@
|
|||
import ./make-test-python.nix ({ pkgs, lib, ... }: rec {
|
||||
name = "pacemaker";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ astro ];
|
||||
};
|
||||
|
||||
nodes =
|
||||
let
|
||||
node = i: {
|
||||
networking.interfaces.eth1.ipv4.addresses = [ {
|
||||
address = "192.168.0.${toString i}";
|
||||
prefixLength = 24;
|
||||
} ];
|
||||
|
||||
services.corosync = {
|
||||
enable = true;
|
||||
clusterName = "zentralwerk-network";
|
||||
nodelist = lib.imap (i: name: {
|
||||
nodeid = i;
|
||||
inherit name;
|
||||
ring_addrs = [
|
||||
(builtins.head nodes.${name}.networking.interfaces.eth1.ipv4.addresses).address
|
||||
];
|
||||
}) (builtins.attrNames nodes);
|
||||
};
|
||||
environment.etc."corosync/authkey" = {
|
||||
source = builtins.toFile "authkey"
|
||||
# minimum length: 128 bytes
|
||||
"testtesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttest";
|
||||
mode = "0400";
|
||||
};
|
||||
|
||||
services.pacemaker.enable = true;
|
||||
|
||||
# used for pacemaker resource
|
||||
systemd.services.ha-cat = {
|
||||
description = "Highly available netcat";
|
||||
serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l discard";
|
||||
};
|
||||
};
|
||||
in {
|
||||
node1 = node 1;
|
||||
node2 = node 2;
|
||||
node3 = node 3;
|
||||
};
|
||||
|
||||
# sets up pacemaker with resources configuration, then crashes a
|
||||
# node and waits for service restart on another node
|
||||
testScript =
|
||||
let
|
||||
resources = builtins.toFile "cib-resources.xml" ''
|
||||
<resources>
|
||||
<primitive id="cat" class="systemd" type="ha-cat">
|
||||
<operations>
|
||||
<op id="stop-cat" name="start" interval="0" timeout="1s"/>
|
||||
<op id="start-cat" name="start" interval="0" timeout="1s"/>
|
||||
<op id="monitor-cat" name="monitor" interval="1s" timeout="1s"/>
|
||||
</operations>
|
||||
</primitive>
|
||||
</resources>
|
||||
'';
|
||||
in ''
|
||||
import re
|
||||
import time
|
||||
|
||||
start_all()
|
||||
|
||||
${lib.concatMapStrings (node: ''
|
||||
${node}.wait_until_succeeds("corosync-quorumtool")
|
||||
${node}.wait_for_unit("pacemaker.service")
|
||||
'') (builtins.attrNames nodes)}
|
||||
|
||||
# No STONITH device
|
||||
node1.succeed("crm_attribute -t crm_config -n stonith-enabled -v false")
|
||||
# Configure the cat resource
|
||||
node1.succeed("cibadmin --replace --scope resources --xml-file ${resources}")
|
||||
|
||||
# wait until the service is started
|
||||
while True:
|
||||
output = node1.succeed("crm_resource -r cat --locate")
|
||||
match = re.search("is running on: (.+)", output)
|
||||
if match:
|
||||
for machine in machines:
|
||||
if machine.name == match.group(1):
|
||||
current_node = machine
|
||||
break
|
||||
time.sleep(1)
|
||||
|
||||
current_node.log("Service running here!")
|
||||
current_node.crash()
|
||||
|
||||
# pick another node that's still up
|
||||
for machine in machines:
|
||||
if machine.booted:
|
||||
check_node = machine
|
||||
# find where the service has been started next
|
||||
while True:
|
||||
output = check_node.succeed("crm_resource -r cat --locate")
|
||||
match = re.search("is running on: (.+)", output)
|
||||
# output will remain the old current_node until the crash is detected by pacemaker
|
||||
if match and match.group(1) != current_node.name:
|
||||
for machine in machines:
|
||||
if machine.name == match.group(1):
|
||||
next_node = machine
|
||||
break
|
||||
time.sleep(1)
|
||||
|
||||
next_node.log("Service migrated here!")
|
||||
'';
|
||||
})
|
||||
124
nixos/tests/xmpp/prosody-mysql.nix
Normal file
124
nixos/tests/xmpp/prosody-mysql.nix
Normal file
|
|
@ -0,0 +1,124 @@
|
|||
let
|
||||
cert = pkgs: pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } ''
|
||||
openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=example.com/CN=uploads.example.com/CN=conference.example.com' -days 36500
|
||||
mkdir -p $out
|
||||
cp key.pem cert.pem $out
|
||||
'';
|
||||
createUsers = pkgs: pkgs.writeScriptBin "create-prosody-users" ''
|
||||
#!${pkgs.bash}/bin/bash
|
||||
set -e
|
||||
|
||||
# Creates and set password for the 2 xmpp test users.
|
||||
#
|
||||
# Doing that in a bash script instead of doing that in the test
|
||||
# script allow us to easily provision the users when running that
|
||||
# test interactively.
|
||||
|
||||
prosodyctl register cthon98 example.com nothunter2
|
||||
prosodyctl register azurediamond example.com hunter2
|
||||
'';
|
||||
delUsers = pkgs: pkgs.writeScriptBin "delete-prosody-users" ''
|
||||
#!${pkgs.bash}/bin/bash
|
||||
set -e
|
||||
|
||||
# Deletes the test users.
|
||||
#
|
||||
# Doing that in a bash script instead of doing that in the test
|
||||
# script allow us to easily provision the users when running that
|
||||
# test interactively.
|
||||
|
||||
prosodyctl deluser cthon98@example.com
|
||||
prosodyctl deluser azurediamond@example.com
|
||||
'';
|
||||
in import ../make-test-python.nix {
|
||||
name = "prosody-mysql";
|
||||
nodes = {
|
||||
client = { nodes, pkgs, config, ... }: {
|
||||
security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ];
|
||||
console.keyMap = "fr-bepo";
|
||||
networking.extraHosts = ''
|
||||
${nodes.server.config.networking.primaryIPAddress} example.com
|
||||
${nodes.server.config.networking.primaryIPAddress} conference.example.com
|
||||
${nodes.server.config.networking.primaryIPAddress} uploads.example.com
|
||||
'';
|
||||
environment.systemPackages = [
|
||||
(pkgs.callPackage ./xmpp-sendmessage.nix { connectTo = nodes.server.config.networking.primaryIPAddress; })
|
||||
];
|
||||
};
|
||||
server = { config, pkgs, ... }: {
|
||||
nixpkgs.overlays = [
|
||||
(self: super: {
|
||||
prosody = super.prosody.override {
|
||||
withExtraLuaPackages = p: [ p.luadbi-mysql ];
|
||||
};
|
||||
})
|
||||
];
|
||||
security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ];
|
||||
console.keyMap = "fr-bepo";
|
||||
networking.extraHosts = ''
|
||||
${config.networking.primaryIPAddress} example.com
|
||||
${config.networking.primaryIPAddress} conference.example.com
|
||||
${config.networking.primaryIPAddress} uploads.example.com
|
||||
'';
|
||||
networking.firewall.enable = false;
|
||||
environment.systemPackages = [
|
||||
(createUsers pkgs)
|
||||
(delUsers pkgs)
|
||||
];
|
||||
services.prosody = {
|
||||
enable = true;
|
||||
ssl.cert = "${cert pkgs}/cert.pem";
|
||||
ssl.key = "${cert pkgs}/key.pem";
|
||||
virtualHosts.example = {
|
||||
domain = "example.com";
|
||||
enabled = true;
|
||||
ssl.cert = "${cert pkgs}/cert.pem";
|
||||
ssl.key = "${cert pkgs}/key.pem";
|
||||
};
|
||||
muc = [
|
||||
{
|
||||
domain = "conference.example.com";
|
||||
}
|
||||
];
|
||||
uploadHttp = {
|
||||
domain = "uploads.example.com";
|
||||
};
|
||||
extraConfig = ''
|
||||
storage = "sql"
|
||||
sql = {
|
||||
driver = "MySQL";
|
||||
database = "prosody";
|
||||
host = "mysql";
|
||||
port = 3306;
|
||||
username = "prosody";
|
||||
password = "password123";
|
||||
};
|
||||
'';
|
||||
};
|
||||
};
|
||||
mysql = { config, pkgs, ... }: {
|
||||
networking.firewall.enable = false;
|
||||
services.mysql = {
|
||||
enable = true;
|
||||
initialScript = pkgs.writeText "mysql_init.sql" ''
|
||||
CREATE DATABASE prosody;
|
||||
CREATE USER 'prosody'@'server' IDENTIFIED BY 'password123';
|
||||
GRANT ALL PRIVILEGES ON prosody.* TO 'prosody'@'server';
|
||||
FLUSH PRIVILEGES;
|
||||
'';
|
||||
package = pkgs.mariadb;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = { nodes, ... }: ''
|
||||
# Check with mysql storage
|
||||
mysql.wait_for_unit("mysql.service")
|
||||
server.wait_for_unit("prosody.service")
|
||||
server.succeed('prosodyctl status | grep "Prosody is running"')
|
||||
|
||||
server.succeed("create-prosody-users")
|
||||
client.succeed("send-message")
|
||||
server.succeed("delete-prosody-users")
|
||||
'';
|
||||
}
|
||||
|
|
@ -81,6 +81,7 @@ in import ../make-test-python.nix {
|
|||
};
|
||||
|
||||
testScript = { nodes, ... }: ''
|
||||
# Check with sqlite storage
|
||||
server.wait_for_unit("prosody.service")
|
||||
server.succeed('prosodyctl status | grep "Prosody is running"')
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dolphin-emu";
|
||||
version = "5.0-15993";
|
||||
version = "5.0-16101";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolphin-emu";
|
||||
repo = "dolphin";
|
||||
rev = "5e595616379a694789fe749e40a27ef069f0090e";
|
||||
sha256 = "1kid8qjn8r7dxh2yc1y6yal6qkfxij0ymi3zryxsnym3rjh1jds9";
|
||||
rev = "8ecfa537a242de74d2e372e30d9d79b14584b2fb";
|
||||
sha256 = "3jLGVzTDzEtHWvIb9DFTbJiA9dE9Pm14vYER998Zln0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
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;
|
||||
};
|
||||
}
|
||||
|
|
@ -55,6 +55,10 @@ in buildPythonApplication rec {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/149812
|
||||
# https://nixos.org/manual/nixpkgs/stable/#ssec-gnome-hooks-gobject-introspection
|
||||
strictDeps = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Genealogy software";
|
||||
homepage = "https://gramps-project.org";
|
||||
|
|
|
|||
48
pkgs/applications/misc/kchmviewer/default.nix
Normal file
48
pkgs/applications/misc/kchmviewer/default.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, qmake, wrapQtAppsHook, chmlib, libzip, qtwebengine }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kchmviewer";
|
||||
version = "8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gyunaev";
|
||||
repo = pname;
|
||||
rev = "RELEASE_${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
sha256 = "sha256-YNpiBf6AFBCRbAZRPODvqGbQQedJJJrZFQIQyzIeBlw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# remove unused webkit
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gyunaev/kchmviewer/commit/a4a3984465cb635822953350c571950ae726b539.patch";
|
||||
sha256 = "sha256-nHW18a4SrTG4fETJmKS4ojHXwnX1d1uN1m4H0GIuI28=";
|
||||
})
|
||||
# QtWebengine fixes
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gyunaev/kchmviewer/commit/9ac73e7ad15de08aab6b1198115be2eb44da7afe.patch";
|
||||
sha256 = "sha256-qg2ytqA2On7jg19WZmHIOU7vLQI2hoyqItySLEA64SY=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gyunaev/kchmviewer/commit/99a6d94bdfce9c4578cce82707e71863a71d1453.patch";
|
||||
sha256 = "sha256-o8JkaMmcJObmMt+o/6ooCAPCi+yRAWDAgxV+tR5eHfY=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ chmlib libzip qtwebengine ];
|
||||
|
||||
nativeBuildInputs = [ qmake wrapQtAppsHook ];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm755 bin/kchmviewer -t $out/bin
|
||||
install -Dm644 packages/kchmviewer.png -t $out/share/pixmaps
|
||||
install -Dm644 packages/kchmviewer.desktop -t $out/share/applications
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "CHM (Winhelp) files viewer";
|
||||
homepage = "http://www.ulduzsoft.com/linux/kchmviewer/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "stork";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jameslittle230";
|
||||
repo = "stork";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9fylJcUuModemkBRnXeFfB1b+CD9IvTxW+CnlqaUb60=";
|
||||
sha256 = "sha256-aBsxRLUufVUauySCxZKk/ZfcU/5KR7jOHmnx6mHmsFs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-j7OXl66xuTuP6hWJs+xHrwtaBGAYt02OESCN6FH3KX0=";
|
||||
cargoSha256 = "sha256-oNoWGdXYfp47IpqU1twbORPOYrHjArNf43Zyeyat4Xs=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
|
|||
|
|
@ -50,11 +50,11 @@ let
|
|||
in stdenv.mkDerivation rec {
|
||||
|
||||
pname = "opera";
|
||||
version = "84.0.4316.21";
|
||||
version = "84.0.4316.31";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
|
||||
sha256 = "sha256-CEKUd2QlZQJbpBO1t4oKmyd+uhPiCOY+eXtSrZf75e4=";
|
||||
sha256 = "sha256-ypSnarhtJNQn3yOtydjmf6WmHAYbOfMg3xatCxTfIMY=";
|
||||
};
|
||||
|
||||
unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
|
||||
|
|
|
|||
|
|
@ -19,16 +19,16 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "argo";
|
||||
version = "3.2.9";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lZ6FjWXhVc51BlioDSryeYe5aZeUhMMEde+kk2SwV20=";
|
||||
sha256 = "sha256-BDHbbb3WqQvRJB1A4NInfvujjB3r/AMmVvos8i/CnyU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-hxSr0sNlz93JxOxnE2SnR6/OgCGK8DrJZxqQtSxfbj8=";
|
||||
vendorSha256 = "sha256-YeSeaYOkNRjQgxsK9G7iPbVpfrPs4HRRFwfoUDxoCm0=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -46,30 +46,30 @@ with lib;
|
|||
# Those pieces of software we entirely ignore upstream's handling of, and just
|
||||
# make sure they're in the path if desired.
|
||||
let
|
||||
k3sVersion = "1.23.3+k3s1"; # k3s git tag
|
||||
k3sCommit = "6f4217a3405d16a1a51bbb40872d7dcb87207bb9"; # k3s git commit at the above version
|
||||
k3sRepoSha256 = "sha256-0dRusG1vL+1KbmViIUNCZK1b+FEgV6otcVUyFonHmm4=";
|
||||
k3sVendorSha256 = "sha256-8Yp9csyRNSYi9wo8E8mF8cu92wG1t3l18wJ8Y4L7HEA=";
|
||||
k3sVersion = "1.23.4+k3s1"; # k3s git tag
|
||||
k3sCommit = "43b1cb48200d8f6af85c16ed944d68fcc96b6506"; # k3s git commit at the above version
|
||||
k3sRepoSha256 = "1sn7rd5hqfqvwj036blk0skmq6r8igbmiqk1dnpaqnkkddpzdgmc";
|
||||
k3sVendorSha256 = "sha256-1/kQvNqFUWwch1JH+twWzBdjNYseoZyVObB1+s9WPM4=";
|
||||
|
||||
k3sServerVendorSha256 = "sha256-9+2k/ipAOhc8JJU+L2dwaM01Dkw+0xyrF5kt6mL19G0=";
|
||||
k3sServerVendorSha256 = "sha256-2KIFff43jfqWdxX61aWofrjmc5mMkr5aEJRFdGpLyU8=";
|
||||
|
||||
# taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9
|
||||
# The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know.
|
||||
traefikChartVersion = "10.9.1";
|
||||
traefikChartSha256 = "sha256-XM1DLofU1zEEFeB5bNQ7cgv102gXsToPP7SFh87QuGQ=";
|
||||
traefikChartVersion = "10.14.1";
|
||||
traefikChartSha256 = "09a6cialx7nrh7nwi1gkkh8zcsasxcgb52dyx0r8bjq9ng29simj";
|
||||
|
||||
# taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47
|
||||
k3sRootVersion = "0.9.1";
|
||||
k3sRootSha256 = "0r2cj4l50cxkrvszpzxfk36lvbjf9vcmp6d5lvxg8qsah8lki3x8";
|
||||
k3sRootVersion = "0.11.0";
|
||||
k3sRootSha256 = "016n56vi09xkvjph7wgzb2m86mhd5x65fs4d11pmh20hl249r620";
|
||||
|
||||
# taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L45
|
||||
k3sCNIVersion = "0.9.1-k3s1";
|
||||
k3sCNISha256 = "1327vmfph7b8i14q05c2xdfzk60caflg1zhycx0mrf3d59f4zsz5";
|
||||
k3sCNIVersion = "1.0.1-k3s1";
|
||||
k3sCNISha256 = "11ihlzzdnqf9p21y0a4ckpbxac016nm7746dcykhj26ym9zxyv92";
|
||||
|
||||
# taken from go.mod, the 'github.com/containerd/containerd' line
|
||||
# run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'`
|
||||
containerdVersion = "1.5.9-k3s1";
|
||||
containerdSha256 = "sha256-7xlhBA6KuwFlw+jyThygv4Ow9F3xjjIUtS6x8YHwjic=";
|
||||
containerdSha256 = "09wfy20z3c9fnla353pibpsb10xzl0f4xwp8qdjh3fwa1q2626gg";
|
||||
|
||||
# run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag
|
||||
criCtlVersion = "1.22.0-k3s1";
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "qbec";
|
||||
version = "0.15.1";
|
||||
version = "0.15.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "splunk";
|
||||
repo = "qbec";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cXU+LnOCsGg+iwH5c7cKVi2Htw45AGxyjJFKXKbTkUo=";
|
||||
sha256 = "sha256-js/UjnNYRW7s3b4TeprhmBe4cDLDYDrMeLtpASI9aN4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-CiVAzFN/ygIiyhZKYtJ197TZO3ppL/emWSj4hAlIanc=";
|
||||
vendorSha256 = "sha256-oEbKk9cMbI0ZWXrfM8Y19OF/A75mwHl0C/PJx0oTOBo=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,26 @@
|
|||
{ lib, stdenv, fetchzip, makeWrapper, jdk8, python3Packages, extraPythonPackages ? [], coreutils, hadoop
|
||||
, RSupport? true, R
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchzip
|
||||
, makeWrapper
|
||||
, jdk8
|
||||
, python3Packages
|
||||
, extraPythonPackages ? [ ]
|
||||
, coreutils
|
||||
, hadoop
|
||||
, RSupport ? true
|
||||
, R
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
spark = { pname, version, src }:
|
||||
spark = { pname, version, sha256 }:
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname version src;
|
||||
inherit pname version;
|
||||
src = fetchzip {
|
||||
url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz";
|
||||
sha256 = sha256;
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ jdk8 python3Packages.python ]
|
||||
++ extraPythonPackages
|
||||
|
|
@ -45,31 +58,29 @@ let
|
|||
'';
|
||||
|
||||
meta = {
|
||||
description = "Apache Spark is a fast and general engine for large-scale data processing";
|
||||
homepage = "https://spark.apache.org/";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with maintainers; [ thoughtpolice offline kamilchm illustris ];
|
||||
description = "Apache Spark is a fast and general engine for large-scale data processing";
|
||||
homepage = "https://spark.apache.org/";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with maintainers; [ thoughtpolice offline kamilchm illustris ];
|
||||
repositories.git = "git://git.apache.org/spark.git";
|
||||
};
|
||||
};
|
||||
in {
|
||||
spark3 = spark rec {
|
||||
in
|
||||
{
|
||||
spark_3_2 = spark rec {
|
||||
pname = "spark";
|
||||
version = "3.2.1";
|
||||
sha256 = "0kxdqczwmj6pray0h8h1qhygni9m82jzznw5fbv9hrxrkq1v182d";
|
||||
};
|
||||
spark_3_1 = spark rec {
|
||||
pname = "spark";
|
||||
version = "3.1.2";
|
||||
|
||||
src = fetchzip {
|
||||
url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz";
|
||||
sha256 = "1bgh2y6jm7wqy6yc40rx68xkki31i3jiri2yixb1bm0i9pvsj9yf";
|
||||
};
|
||||
sha256 = "1bgh2y6jm7wqy6yc40rx68xkki31i3jiri2yixb1bm0i9pvsj9yf";
|
||||
};
|
||||
spark2 = spark rec {
|
||||
spark_2_4 = spark rec {
|
||||
pname = "spark";
|
||||
version = "2.4.8";
|
||||
|
||||
src = fetchzip {
|
||||
url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz";
|
||||
sha256 = "1mkyq0gz9fiav25vr0dba5ivp0wh0mh7kswwnx8pvsmb6wbwyfxv";
|
||||
};
|
||||
sha256 = "1mkyq0gz9fiav25vr0dba5ivp0wh0mh7kswwnx8pvsmb6wbwyfxv";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ buildGoModule, lib, fetchFromGitHub }:
|
||||
buildGoModule rec {
|
||||
pname = "tfswitch";
|
||||
version = "0.13.1201";
|
||||
version = "0.13.1218";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "warrensbox";
|
||||
repo = "terraform-switcher";
|
||||
rev = version;
|
||||
sha256 = "sha256-gJa8oVdgerDi0GdTSNus5rHLsFuzg8ZqVeKTMuPXu0o=";
|
||||
sha256 = "sha256-RJdbNXO+6TqFLapWiZ1UeXGS5522ykQvhhNDEHPr8xE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-z3UDrwlMHFFH56U3oylSWE3wqWOCA4RI2smafHHwYkQ=";
|
||||
vendorSha256 = "sha256-Xqgki072Iy+snRriPVJ9oaDNJ/LiKL+AuU+eVw0zlDU=";
|
||||
|
||||
# Disable tests since it requires network access and relies on the
|
||||
# presence of release.hashicorp.com
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ buildGoPackage, lib, fetchFromGitHub }:
|
||||
buildGoPackage rec {
|
||||
pname = "tgswitch";
|
||||
version = "0.5.382";
|
||||
version = "0.5.389";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "warrensbox";
|
||||
repo = "tgswitch";
|
||||
rev = version;
|
||||
sha256 = "sha256-DbPf1o1XlXLpuYSrNMRwHRqi/urQhSfzPW5BPIvZC/Y=";
|
||||
sha256 = "sha256-6hErfI7LEJFgOoJR8IF9jTSBwqbQYeGiwdeJShqxVQ0=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/warrensbox/tgswitch";
|
||||
|
|
|
|||
|
|
@ -11,15 +11,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "1.2.73";
|
||||
version = "1.2.74";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-E16p40Pmr9o2946XlO3TUE/xUueG0NBWux23MgAVLlI=";
|
||||
sha256 = "sha256-Mfgvl6ljmYn9Vu/tWS0JAuH1pzQZ4zoD5+5ejUJF/Lg=";
|
||||
};
|
||||
vendorSha256 = "sha256-NHeUj1JWRqElY2BpQ+7ANqwlOYQ5H2R00LGqktcsoF4=";
|
||||
vendorSha256 = "sha256-MsIbuwsb0sKEh3Z7ArtG/8SWFPaXLu+TGNruhsHhtb4=";
|
||||
proxyVendor = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "alfaview";
|
||||
version = "8.37.0";
|
||||
version = "8.40.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb";
|
||||
sha256 = "sha256-hU4tqDu95ej8ChiWJq3ZPhEwxBcmTQkA/n///pPVa5U=";
|
||||
sha256 = "sha256-meiIDIG7OXxF2aclHA/8FN8aSz5KWJliDbm2p/flD4k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -65,6 +65,7 @@ mkDerivation rec {
|
|||
setuptools
|
||||
watchgod
|
||||
dbus-python
|
||||
matrix-nio
|
||||
];
|
||||
|
||||
qmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20220303";
|
||||
version = "20220314";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-3fT9cHosg/A/JowIARQ46OxmsQWFOBb7tIiRWVNfUo4=";
|
||||
sha256 = "sha256-E3gH4Ym2tmH9qmbfKWybgO6qUW2rpJQyhBh6LPpfFHE=";
|
||||
};
|
||||
|
||||
# Remove when Apple SDK is >= 10.13
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ let
|
|||
in
|
||||
env.mkDerivation rec {
|
||||
pname = "telegram-desktop";
|
||||
version = "3.5.2";
|
||||
version = "3.6.0";
|
||||
# Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py
|
||||
|
||||
# Telegram-Desktop with submodules
|
||||
|
|
@ -79,7 +79,7 @@ env.mkDerivation rec {
|
|||
repo = "tdesktop";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "05324xvb00yz2jfigyy7izk8wnq8phm3sidw62kf7xqyh63qnrzh";
|
||||
sha256 = "0zcjm08nfdlxrsv0fi6dqg3lk52bcvsxnsf6jm5fv6gf5v9ia3hq";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "tg_owt";
|
||||
version = "unstable-2022-02-09";
|
||||
version = "unstable-2022-02-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "desktop-app";
|
||||
repo = "tg_owt";
|
||||
rev = "4cba1acdd718b700bb33945c0258283689d4eac7";
|
||||
sha256 = "0j201x9k38mvcyhf1wlyghyvdpv1l75xwgj9rl2l7r55afrpw4ca";
|
||||
rev = "a264028ec71d9096e0aa629113c49c25db89d260";
|
||||
sha256 = "10p3x8z3ps8s1ivi9y8px2gsg4pvsvz6g9wbgh5w8hilikxqq7r5";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
]
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "juju";
|
||||
version = "2.9.25";
|
||||
version = "2.9.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juju";
|
||||
repo = "juju";
|
||||
rev = "juju-${version}";
|
||||
sha256 = "sha256-h4w12dmGEviV2N0BWXQKt1eUVxdbgwRKLQghnd6bLFI=";
|
||||
sha256 = "sha256-phzjjW9KG0Z5WAzxtYdI7i2Nw4FHVNeEJswQreHga4M=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-AATK4tDg2eW8Bt8gU88tIk6I+qp5ZeUtXzD74/59c7w=";
|
||||
vendorSha256 = "sha256-Jzd6I3a/2Un2a3/T2vzFuHwe9Y3eGEvfpZWSwjWokM0=";
|
||||
|
||||
# Disable tests because it attempts to use a mongodb instance
|
||||
doCheck = false;
|
||||
|
|
|
|||
328
pkgs/applications/networking/n8n/node-packages.nix
generated
328
pkgs/applications/networking/n8n/node-packages.nix
generated
|
|
@ -40,13 +40,13 @@ let
|
|||
sha512 = "QmmJmexXKtPyc3/rsZR/YTLDvMatzbzAypJmLzvlfxgz/SkgnqV/D4f6F2LsK6tBj1qhyp8BoXiOebiej0zz3A==";
|
||||
};
|
||||
};
|
||||
"@azure/core-lro-2.2.3" = {
|
||||
"@azure/core-lro-2.2.4" = {
|
||||
name = "_at_azure_slash_core-lro";
|
||||
packageName = "@azure/core-lro";
|
||||
version = "2.2.3";
|
||||
version = "2.2.4";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.2.3.tgz";
|
||||
sha512 = "UMdlR9NsqDCLTba3EUbRjfMF4gDmWvld196JmUjbz9WWhJ2XT00OR5MXeWiR+vmGT+ETiO4hHFCi2/eGO5YVtg==";
|
||||
url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.2.4.tgz";
|
||||
sha512 = "e1I2v2CZM0mQo8+RSix0x091Av493e4bnT22ds2fcQGslTHzM2oTbswkB65nP4iEpCxBrFxOSDPKExmTmjCVtQ==";
|
||||
};
|
||||
};
|
||||
"@azure/core-paging-1.2.1" = {
|
||||
|
|
@ -103,22 +103,22 @@ let
|
|||
sha512 = "UA/8dgLy3+ZiwJjAZHxL4MUB14fFQPkaAOZ94jsTW/Z6WmoOeny2+cLk0+dyIX/iH6qSrEWKwbStEeB970B9pA==";
|
||||
};
|
||||
};
|
||||
"@azure/storage-blob-12.8.0" = {
|
||||
"@azure/storage-blob-12.9.0" = {
|
||||
name = "_at_azure_slash_storage-blob";
|
||||
packageName = "@azure/storage-blob";
|
||||
version = "12.8.0";
|
||||
version = "12.9.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.8.0.tgz";
|
||||
sha512 = "c8+Wz19xauW0bGkTCoqZH4dYfbtBniPiGiRQOn1ca6G5jsjr4azwaTk9gwjVY8r3vY2Taf95eivLzipfIfiS4A==";
|
||||
url = "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.9.0.tgz";
|
||||
sha512 = "ank38FdCLfJ+EoeMzCz3hkYJuZAd63ARvDKkxZYRDb+beBYf+/+gx8jNTqkq/hfyUl4dJQ/a7tECU0Y0F98CHg==";
|
||||
};
|
||||
};
|
||||
"@babel/runtime-7.17.2" = {
|
||||
"@babel/runtime-7.17.7" = {
|
||||
name = "_at_babel_slash_runtime";
|
||||
packageName = "@babel/runtime";
|
||||
version = "7.17.2";
|
||||
version = "7.17.7";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.2.tgz";
|
||||
sha512 = "hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==";
|
||||
url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.7.tgz";
|
||||
sha512 = "L6rvG9GDxaLgFjg41K+5Yv9OMrU98sWe+Ykmc6FDJW/+vYZMhdOMKkISgzptMaERHvS2Y2lw9MDRm2gHhlQQoA==";
|
||||
};
|
||||
};
|
||||
"@colors/colors-1.5.0" = {
|
||||
|
|
@ -139,13 +139,13 @@ let
|
|||
sha512 = "hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==";
|
||||
};
|
||||
};
|
||||
"@fontsource/open-sans-4.5.5" = {
|
||||
"@fontsource/open-sans-4.5.6" = {
|
||||
name = "_at_fontsource_slash_open-sans";
|
||||
packageName = "@fontsource/open-sans";
|
||||
version = "4.5.5";
|
||||
version = "4.5.6";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.5.tgz";
|
||||
sha512 = "h1oUPSQpoMnDrnzIZTVS9PPBFhWXS87v6/cd9FY2Xc+GKbOVcjPZxcvUDU1TnCie2QSoYY9aifERRV/d8JHtWQ==";
|
||||
url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.6.tgz";
|
||||
sha512 = "bQuNS0H1VL1VLC6FwmReHlpJaICVe/seODU3Q9cpTQbJ5OtRD4TwWMrAjfTxqcFNollA6O0AlE4BnRSWMQLfvw==";
|
||||
};
|
||||
};
|
||||
"@icetee/ftp-0.3.15" = {
|
||||
|
|
@ -445,13 +445,13 @@ let
|
|||
sha512 = "zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A==";
|
||||
};
|
||||
};
|
||||
"@types/lodash-4.14.179" = {
|
||||
"@types/lodash-4.14.180" = {
|
||||
name = "_at_types_slash_lodash";
|
||||
packageName = "@types/lodash";
|
||||
version = "4.14.179";
|
||||
version = "4.14.180";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.179.tgz";
|
||||
sha512 = "uwc1x90yCKqGcIOAT6DwOSuxnrAbpkdPsUOZtwrXb4D/6wZs+6qG7QnIawDuZWg0sWpxl+ltIKCaLoMlna678w==";
|
||||
url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.180.tgz";
|
||||
sha512 = "XOKXa1KIxtNXgASAnwj7cnttJxS4fksBRywK/9LzRV5YxrF80BXZIGeQSuoESQ/VkUj30Ae0+YcuHc15wJCB2g==";
|
||||
};
|
||||
};
|
||||
"@types/lossless-json-1.0.1" = {
|
||||
|
|
@ -472,13 +472,13 @@ let
|
|||
sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==";
|
||||
};
|
||||
};
|
||||
"@types/node-12.20.46" = {
|
||||
"@types/node-12.20.47" = {
|
||||
name = "_at_types_slash_node";
|
||||
packageName = "@types/node";
|
||||
version = "12.20.46";
|
||||
version = "12.20.47";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@types/node/-/node-12.20.46.tgz";
|
||||
sha512 = "cPjLXj8d6anFPzFvOPxS3fvly3Shm5nTfl6g8X5smexixbuGUf7hfr21J5tX9JW+UPStp/5P5R8qrKL5IyVJ+A==";
|
||||
url = "https://registry.npmjs.org/@types/node/-/node-12.20.47.tgz";
|
||||
sha512 = "BzcaRsnFuznzOItW1WpQrDHM7plAa7GIDMZ6b5pnMbkqEtM/6WCOhvZar39oeMQP79gwvFUWjjptE7/KGcNqFg==";
|
||||
};
|
||||
};
|
||||
"@types/node-17.0.21" = {
|
||||
|
|
@ -976,13 +976,13 @@ let
|
|||
sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A==";
|
||||
};
|
||||
};
|
||||
"aws-sdk-2.1087.0" = {
|
||||
"aws-sdk-2.1093.0" = {
|
||||
name = "aws-sdk";
|
||||
packageName = "aws-sdk";
|
||||
version = "2.1087.0";
|
||||
version = "2.1093.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1087.0.tgz";
|
||||
sha512 = "m5EERT29Fwh2cv3SaSdygeAjJBXnjSaXRRERy70bf6PQ7KgmASJouBxY11g5G7LTEPK/yfB0TGshujKh3hEtPA==";
|
||||
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1093.0.tgz";
|
||||
sha512 = "YD6VNemoKkzDMHsUiGP/MwpM0T20ukp3KTSxPY34Xw3Ww0zP19C54CfjaXhn//R27f2c57BtVez+he2RZ5GwyQ==";
|
||||
};
|
||||
};
|
||||
"aws-sign2-0.7.0" = {
|
||||
|
|
@ -1471,6 +1471,15 @@ let
|
|||
sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==";
|
||||
};
|
||||
};
|
||||
"clamp-1.0.1" = {
|
||||
name = "clamp";
|
||||
packageName = "clamp";
|
||||
version = "1.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/clamp/-/clamp-1.0.1.tgz";
|
||||
sha1 = "66a0e64011816e37196828fdc8c8c147312c8634";
|
||||
};
|
||||
};
|
||||
"class-validator-0.13.2" = {
|
||||
name = "class-validator";
|
||||
packageName = "class-validator";
|
||||
|
|
@ -1777,6 +1786,15 @@ let
|
|||
sha512 = "Mn4AJiYkR3TAZH1Xm/RU7gFS/0kM5TBSAQDry8y40Aez0ASY+3boUhv+3QE5XbOXiXM2JjdhkKve3IsBvWCibQ==";
|
||||
};
|
||||
};
|
||||
"cookie-0.4.1" = {
|
||||
name = "cookie";
|
||||
packageName = "cookie";
|
||||
version = "0.4.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz";
|
||||
sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==";
|
||||
};
|
||||
};
|
||||
"cookie-0.4.2" = {
|
||||
name = "cookie";
|
||||
packageName = "cookie";
|
||||
|
|
@ -1786,6 +1804,15 @@ let
|
|||
sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==";
|
||||
};
|
||||
};
|
||||
"cookie-parser-1.4.6" = {
|
||||
name = "cookie-parser";
|
||||
packageName = "cookie-parser";
|
||||
version = "1.4.6";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.6.tgz";
|
||||
sha512 = "z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==";
|
||||
};
|
||||
};
|
||||
"cookie-signature-1.0.6" = {
|
||||
name = "cookie-signature";
|
||||
packageName = "cookie-signature";
|
||||
|
|
@ -3604,13 +3631,13 @@ let
|
|||
sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
|
||||
};
|
||||
};
|
||||
"isbot-3.4.3" = {
|
||||
"isbot-3.4.5" = {
|
||||
name = "isbot";
|
||||
packageName = "isbot";
|
||||
version = "3.4.3";
|
||||
version = "3.4.5";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/isbot/-/isbot-3.4.3.tgz";
|
||||
sha512 = "5hAgiY9ysMIJcVQlGHcXptwgZr1yYbIGNBE36a3sPo7cLZ9eLTLx0qOssekFKaTHiXTwd/ZZMTuOS7w4faOmpw==";
|
||||
url = "https://registry.npmjs.org/isbot/-/isbot-3.4.5.tgz";
|
||||
sha512 = "+KD6q1BBtw0iK9aGBGSfxJ31/ZgizKRjhm8ebgJUBMx0aeeQuIJ1I72beCoIrltIZGrSm4vmrxRxrG5n1aUTtw==";
|
||||
};
|
||||
};
|
||||
"isexe-2.0.0" = {
|
||||
|
|
@ -4045,6 +4072,15 @@ let
|
|||
sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23";
|
||||
};
|
||||
};
|
||||
"lodash.throttle-4.1.1" = {
|
||||
name = "lodash.throttle";
|
||||
packageName = "lodash.throttle";
|
||||
version = "4.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz";
|
||||
sha1 = "c23e91b710242ac70c37f1e1cda9274cc39bf2f4";
|
||||
};
|
||||
};
|
||||
"lodash.uniqby-4.7.0" = {
|
||||
name = "lodash.uniqby";
|
||||
packageName = "lodash.uniqby";
|
||||
|
|
@ -4135,6 +4171,15 @@ let
|
|||
sha512 = "IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ==";
|
||||
};
|
||||
};
|
||||
"luxon-2.3.1" = {
|
||||
name = "luxon";
|
||||
packageName = "luxon";
|
||||
version = "2.3.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/luxon/-/luxon-2.3.1.tgz";
|
||||
sha512 = "I8vnjOmhXsMSlNMZlMkSOvgrxKJl0uOsEzdGgGNZuZPaS9KlefpE9KV95QFftlJSC+1UyCC9/I69R02cz/zcCA==";
|
||||
};
|
||||
};
|
||||
"mailparser-3.4.0" = {
|
||||
name = "mailparser";
|
||||
packageName = "mailparser";
|
||||
|
|
@ -4180,13 +4225,22 @@ let
|
|||
sha512 = "etgt+n4LlOkGSJbBTV9VROHA5R7ekIPS4vfh+bCAoJgRrJWdqJCBbpS3osRJ/HrT7R68MzMiY3L3sDJ/Fd8aBg==";
|
||||
};
|
||||
};
|
||||
"mappersmith-2.37.1" = {
|
||||
"mappersmith-2.38.0" = {
|
||||
name = "mappersmith";
|
||||
packageName = "mappersmith";
|
||||
version = "2.37.1";
|
||||
version = "2.38.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.37.1.tgz";
|
||||
sha512 = "3QiXhRADHTK/it1riJMJm/sHmLlGdw3pfLgZJQu9MfT1CNeiO93keNY0BVLlRmpPBsMER/P7kj3mtcAK2V331Q==";
|
||||
url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.38.0.tgz";
|
||||
sha512 = "D2+ICkvNGnGCz01MADdQQilcHGffwLd1ell4b4uXS9QYvLfrX0r5nl5zb9V+2YDy3142u6VUl1b154pxJAxw3g==";
|
||||
};
|
||||
};
|
||||
"material-colors-1.2.6" = {
|
||||
name = "material-colors";
|
||||
packageName = "material-colors";
|
||||
version = "1.2.6";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz";
|
||||
sha512 = "6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==";
|
||||
};
|
||||
};
|
||||
"md5-2.3.0" = {
|
||||
|
|
@ -4261,22 +4315,22 @@ let
|
|||
sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
|
||||
};
|
||||
};
|
||||
"mime-db-1.51.0" = {
|
||||
"mime-db-1.52.0" = {
|
||||
name = "mime-db";
|
||||
packageName = "mime-db";
|
||||
version = "1.51.0";
|
||||
version = "1.52.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz";
|
||||
sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==";
|
||||
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz";
|
||||
sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==";
|
||||
};
|
||||
};
|
||||
"mime-types-2.1.34" = {
|
||||
"mime-types-2.1.35" = {
|
||||
name = "mime-types";
|
||||
packageName = "mime-types";
|
||||
version = "2.1.34";
|
||||
version = "2.1.35";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz";
|
||||
sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==";
|
||||
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz";
|
||||
sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==";
|
||||
};
|
||||
};
|
||||
"mimic-fn-2.1.0" = {
|
||||
|
|
@ -4486,49 +4540,49 @@ let
|
|||
sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
|
||||
};
|
||||
};
|
||||
"n8n-core-0.107.0" = {
|
||||
"n8n-core-0.109.0" = {
|
||||
name = "n8n-core";
|
||||
packageName = "n8n-core";
|
||||
version = "0.107.0";
|
||||
version = "0.109.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.107.0.tgz";
|
||||
sha512 = "jwlEv67bPCn1Npp5SkZ11MViQgN96B2bUmSdsKPIBkJGkAPdd6BAUNAhF6qlAS53KhkbSqjuZkn71sDwbHv1cg==";
|
||||
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.109.0.tgz";
|
||||
sha512 = "hzimsUZbWHfG9RofSX7czg0DgB7YAIcLi7JRFUVB90HVdasFf1HQFVM2AwFZC/lLVckktuadWSpq2MOKW+lE3Q==";
|
||||
};
|
||||
};
|
||||
"n8n-design-system-0.13.0" = {
|
||||
"n8n-design-system-0.14.0" = {
|
||||
name = "n8n-design-system";
|
||||
packageName = "n8n-design-system";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.13.0.tgz";
|
||||
sha512 = "dnweYfFdU9RLdZhmllAlF35dFp0F8Cxw2YAVPMTYOJ2saTs992kvI+09k5iVHDdRxA92BKRXgRRfvY1p0goXcQ==";
|
||||
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.14.0.tgz";
|
||||
sha512 = "E9Tvnjd9hktVPsqBcX579Fr4Nn/QEVAHQaYZlPGrqxXLVD76mF0WQWJpU6XTZEs/9pKfEftk/TmDihtENLVTxg==";
|
||||
};
|
||||
};
|
||||
"n8n-editor-ui-0.133.0" = {
|
||||
"n8n-editor-ui-0.135.0" = {
|
||||
name = "n8n-editor-ui";
|
||||
packageName = "n8n-editor-ui";
|
||||
version = "0.133.0";
|
||||
version = "0.135.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.133.0.tgz";
|
||||
sha512 = "lKi2eyx5mn5vfo5sArvsnQ+1khdkX7I1Aqml5VFgzTUhHDLZB2Pvupu+czE55l9QSGs6oqaN9a9NRblWOHc0zQ==";
|
||||
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.135.0.tgz";
|
||||
sha512 = "oM+Pnh4ZaUnDy5lj6u71EyXUPGNlbEIn3lpi4+xyO8tYtFyaN1kifS/q/a1sYrgZlwbWaksgUvTqufZ3Te6Yqw==";
|
||||
};
|
||||
};
|
||||
"n8n-nodes-base-0.164.0" = {
|
||||
"n8n-nodes-base-0.166.0" = {
|
||||
name = "n8n-nodes-base";
|
||||
packageName = "n8n-nodes-base";
|
||||
version = "0.164.0";
|
||||
version = "0.166.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.164.0.tgz";
|
||||
sha512 = "5GSd0f1rQZfKt9e0S1zwn5K34TSd1lYkd3MEPKDHjvksxfNOumtZpf0rwEgb/7Uf6azw7ESqk4VXwxiVQu0sgw==";
|
||||
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.166.0.tgz";
|
||||
sha512 = "Iet76bGJrS3rTal5KbuBsJvYzAw3o9xfcLHERpDJyXOxgvrPfZ62A7RpmLMLA3KJLfKevY+VLGLWW5odTSvtEg==";
|
||||
};
|
||||
};
|
||||
"n8n-workflow-0.89.0" = {
|
||||
"n8n-workflow-0.91.0" = {
|
||||
name = "n8n-workflow";
|
||||
packageName = "n8n-workflow";
|
||||
version = "0.89.0";
|
||||
version = "0.91.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.89.0.tgz";
|
||||
sha512 = "hggmmjHsa3VjP5puRssH4Q8hoigqJ3W+KQeY54Qsa1rJoJEjZYy53NGOQ3QMmuPuTUvVMHe4Z/Hb6u4Bbh1wAg==";
|
||||
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.91.0.tgz";
|
||||
sha512 = "a4yqSvcalQs2MEDkOeadQc9cwK/3f6t+EKr/e8rEN5D9djnmuvoRJC+V9v6KPuHy66q1pv6w7fpmnrLRO+2WrA==";
|
||||
};
|
||||
};
|
||||
"named-placeholders-1.1.2" = {
|
||||
|
|
@ -5089,6 +5143,42 @@ let
|
|||
sha512 = "uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==";
|
||||
};
|
||||
};
|
||||
"passport-0.5.2" = {
|
||||
name = "passport";
|
||||
packageName = "passport";
|
||||
version = "0.5.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/passport/-/passport-0.5.2.tgz";
|
||||
sha512 = "w9n/Ot5I7orGD4y+7V3EFJCQEznE5RxHamUxcqLT2QoJY0f2JdN8GyHonYFvN0Vz+L6lUJfVhrk2aZz2LbuREw==";
|
||||
};
|
||||
};
|
||||
"passport-cookie-1.0.9" = {
|
||||
name = "passport-cookie";
|
||||
packageName = "passport-cookie";
|
||||
version = "1.0.9";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/passport-cookie/-/passport-cookie-1.0.9.tgz";
|
||||
sha512 = "8a6foX2bbGoJzup0RAiNcC2tTqzYS46RQEK3Z4u8p86wesPUjgDaji3C7+5j4TGyCq4ZoOV+3YLw1Hy6cV6kyw==";
|
||||
};
|
||||
};
|
||||
"passport-jwt-4.0.0" = {
|
||||
name = "passport-jwt";
|
||||
packageName = "passport-jwt";
|
||||
version = "4.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/passport-jwt/-/passport-jwt-4.0.0.tgz";
|
||||
sha512 = "BwC0n2GP/1hMVjR4QpnvqA61TxenUMlmfNjYNgK0ZAs0HK4SOQkHcSv4L328blNTLtHq7DbmvyNJiH+bn6C5Mg==";
|
||||
};
|
||||
};
|
||||
"passport-strategy-1.0.0" = {
|
||||
name = "passport-strategy";
|
||||
packageName = "passport-strategy";
|
||||
version = "1.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz";
|
||||
sha1 = "b5539aa8fc225a3d1ad179476ddf236b440f52e4";
|
||||
};
|
||||
};
|
||||
"path-case-3.0.4" = {
|
||||
name = "path-case";
|
||||
packageName = "path-case";
|
||||
|
|
@ -5134,6 +5224,15 @@ let
|
|||
sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==";
|
||||
};
|
||||
};
|
||||
"pause-0.0.1" = {
|
||||
name = "pause";
|
||||
packageName = "pause";
|
||||
version = "0.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz";
|
||||
sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d";
|
||||
};
|
||||
};
|
||||
"pdf-parse-1.1.1" = {
|
||||
name = "pdf-parse";
|
||||
packageName = "pdf-parse";
|
||||
|
|
@ -5287,13 +5386,13 @@ let
|
|||
sha512 = "vrlOGvNVELko0+J8NpGC5lHWDGrk8LQJq9nwAMIVEVBfN1Lib3BLxAaLRGDTuUnvl45j5N9dT2H85PULz6IjjQ==";
|
||||
};
|
||||
};
|
||||
"popsicle-redirects-1.1.0" = {
|
||||
"popsicle-redirects-1.1.1" = {
|
||||
name = "popsicle-redirects";
|
||||
packageName = "popsicle-redirects";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/popsicle-redirects/-/popsicle-redirects-1.1.0.tgz";
|
||||
sha512 = "XCpzVjVk7tty+IJnSdqWevmOr1n8HNDhL86v7mZ6T1JIIf2KGybxUk9mm7ZFOhWMkGB0e8XkacHip7BV8AQWQA==";
|
||||
url = "https://registry.npmjs.org/popsicle-redirects/-/popsicle-redirects-1.1.1.tgz";
|
||||
sha512 = "mC2HrKjdTAWDalOjGxlXw9j6Qxrz/Yd2ui6bPxpi2IQDYWpF4gUAMxbA8EpSWJhLi0PuWKDwTHHPrUPGutAoIA==";
|
||||
};
|
||||
};
|
||||
"popsicle-transport-http-1.2.1" = {
|
||||
|
|
@ -6682,6 +6781,15 @@ let
|
|||
sha512 = "a7wPxPdVlQL7lqvitHGGRsofhdwtkoSXPGATFuSOA2i1ZNQEPLrGnj68vOp2sOJTCFAQVXPeNMX/GctBaO9L2w==";
|
||||
};
|
||||
};
|
||||
"tinycolor2-1.4.2" = {
|
||||
name = "tinycolor2";
|
||||
packageName = "tinycolor2";
|
||||
version = "1.4.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz";
|
||||
sha512 = "vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA==";
|
||||
};
|
||||
};
|
||||
"tlds-1.224.0" = {
|
||||
name = "tlds";
|
||||
packageName = "tlds";
|
||||
|
|
@ -7159,6 +7267,24 @@ let
|
|||
sha512 = "xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw==";
|
||||
};
|
||||
};
|
||||
"vue-2.6.14" = {
|
||||
name = "vue";
|
||||
packageName = "vue";
|
||||
version = "2.6.14";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz";
|
||||
sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==";
|
||||
};
|
||||
};
|
||||
"vue-color-2.8.1" = {
|
||||
name = "vue-color";
|
||||
packageName = "vue-color";
|
||||
version = "2.8.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/vue-color/-/vue-color-2.8.1.tgz";
|
||||
sha512 = "BoLCEHisXi2QgwlhZBg9UepvzZZmi4176vbr+31Shen5WWZwSLVgdScEPcB+yrAtuHAz42309C0A4+WiL9lNBw==";
|
||||
};
|
||||
};
|
||||
"vue-fragment-1.5.2" = {
|
||||
name = "vue-fragment";
|
||||
packageName = "vue-fragment";
|
||||
|
|
@ -7177,6 +7303,15 @@ let
|
|||
sha512 = "SX35iJHL5PJ4Gfh0Mo/q0shyHiI2V6Zkh51c+k8E9O1RKv5BQyYrCxRzpvPrsIOJEnLaeiovet3dsUB0e/kDzw==";
|
||||
};
|
||||
};
|
||||
"vue2-boring-avatars-0.3.4" = {
|
||||
name = "vue2-boring-avatars";
|
||||
packageName = "vue2-boring-avatars";
|
||||
version = "0.3.4";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/vue2-boring-avatars/-/vue2-boring-avatars-0.3.4.tgz";
|
||||
sha512 = "N3FYX9Z6rZdTeP3BOBz2LMxlWo9WRmPF6SOsYzz+tEuUH0QjX8UD7c1X95J8pZ7cFvbh9QflVujYQRqRiiwoAg==";
|
||||
};
|
||||
};
|
||||
"webidl-conversions-3.0.1" = {
|
||||
name = "webidl-conversions";
|
||||
packageName = "webidl-conversions";
|
||||
|
|
@ -7480,10 +7615,10 @@ in
|
|||
n8n = nodeEnv.buildNodePackage {
|
||||
name = "n8n";
|
||||
packageName = "n8n";
|
||||
version = "0.166.0";
|
||||
version = "0.168.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n/-/n8n-0.166.0.tgz";
|
||||
sha512 = "t8tRpOyrEIxaIuLzfBajDPjAMygcCapiIqHDjU8YloJalI0MnbuoQ6DgA2RdRDZElN0yew0rQR8ZxZ2nMUk8Fg==";
|
||||
url = "https://registry.npmjs.org/n8n/-/n8n-0.168.1.tgz";
|
||||
sha512 = "bghyOcF+KZmRsmyC9p2ARb+RIlUBDwTKCMLd5eUFW1SKMBCWgQZwG8KCLCRApWjXjP1SYekeyDo1PSl5fa7Hxw==";
|
||||
};
|
||||
dependencies = [
|
||||
(sources."@azure/abort-controller-1.0.5" // {
|
||||
|
|
@ -7503,7 +7638,7 @@ in
|
|||
sources."tslib-2.3.1"
|
||||
];
|
||||
})
|
||||
(sources."@azure/core-lro-2.2.3" // {
|
||||
(sources."@azure/core-lro-2.2.4" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
];
|
||||
|
|
@ -7530,12 +7665,12 @@ in
|
|||
];
|
||||
})
|
||||
sources."@azure/ms-rest-nodeauth-3.1.1"
|
||||
(sources."@azure/storage-blob-12.8.0" // {
|
||||
(sources."@azure/storage-blob-12.9.0" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
];
|
||||
})
|
||||
sources."@babel/runtime-7.17.2"
|
||||
sources."@babel/runtime-7.17.7"
|
||||
sources."@colors/colors-1.5.0"
|
||||
(sources."@dabh/diagnostics-2.0.3" // {
|
||||
dependencies = [
|
||||
|
|
@ -7543,7 +7678,7 @@ in
|
|||
sources."kuler-2.0.0"
|
||||
];
|
||||
})
|
||||
sources."@fontsource/open-sans-4.5.5"
|
||||
sources."@fontsource/open-sans-4.5.6"
|
||||
sources."@icetee/ftp-0.3.15"
|
||||
sources."@kafkajs/confluent-schema-registry-1.0.6"
|
||||
sources."@kwsites/file-exists-1.1.1"
|
||||
|
|
@ -7592,7 +7727,7 @@ in
|
|||
sources."@types/ftp-0.3.33"
|
||||
sources."@types/json-diff-0.5.2"
|
||||
sources."@types/jsonwebtoken-8.5.8"
|
||||
sources."@types/lodash-4.14.179"
|
||||
sources."@types/lodash-4.14.180"
|
||||
sources."@types/lossless-json-1.0.1"
|
||||
sources."@types/mime-1.3.2"
|
||||
sources."@types/node-17.0.21"
|
||||
|
|
@ -7664,7 +7799,7 @@ in
|
|||
];
|
||||
})
|
||||
sources."avsc-5.7.3"
|
||||
(sources."aws-sdk-2.1087.0" // {
|
||||
(sources."aws-sdk-2.1093.0" // {
|
||||
dependencies = [
|
||||
sources."buffer-4.9.2"
|
||||
sources."events-1.1.1"
|
||||
|
|
@ -7774,6 +7909,7 @@ in
|
|||
sources."cheerio-select-1.5.0"
|
||||
sources."chokidar-3.5.2"
|
||||
sources."chownr-1.1.4"
|
||||
sources."clamp-1.0.1"
|
||||
sources."class-validator-0.13.2"
|
||||
sources."clean-stack-3.0.1"
|
||||
sources."cli-color-0.1.7"
|
||||
|
|
@ -7835,7 +7971,8 @@ in
|
|||
sources."content-disposition-0.5.4"
|
||||
sources."content-type-1.0.4"
|
||||
sources."convict-6.2.1"
|
||||
sources."cookie-0.4.2"
|
||||
sources."cookie-0.4.1"
|
||||
sources."cookie-parser-1.4.6"
|
||||
sources."cookie-signature-1.0.6"
|
||||
sources."core-js-3.21.1"
|
||||
sources."core-util-is-1.0.2"
|
||||
|
|
@ -7923,6 +8060,7 @@ in
|
|||
sources."expand-tilde-2.0.2"
|
||||
(sources."express-4.17.3" // {
|
||||
dependencies = [
|
||||
sources."cookie-0.4.2"
|
||||
sources."debug-2.6.9"
|
||||
sources."ms-2.0.0"
|
||||
];
|
||||
|
|
@ -8078,7 +8216,7 @@ in
|
|||
sources."is-windows-1.0.2"
|
||||
sources."is-wsl-2.2.0"
|
||||
sources."isarray-0.0.1"
|
||||
sources."isbot-3.4.3"
|
||||
sources."isbot-3.4.5"
|
||||
sources."isexe-2.0.0"
|
||||
sources."iso-639-1-2.1.13"
|
||||
sources."isstream-0.1.2"
|
||||
|
|
@ -8137,6 +8275,7 @@ in
|
|||
sources."lodash.merge-4.6.2"
|
||||
sources."lodash.once-4.1.1"
|
||||
sources."lodash.set-4.3.2"
|
||||
sources."lodash.throttle-4.1.1"
|
||||
sources."lodash.uniqby-4.7.0"
|
||||
sources."lodash.unset-4.5.2"
|
||||
sources."logform-2.4.0"
|
||||
|
|
@ -8154,6 +8293,7 @@ in
|
|||
sources."yallist-2.1.2"
|
||||
];
|
||||
})
|
||||
sources."luxon-2.3.1"
|
||||
(sources."mailparser-3.4.0" // {
|
||||
dependencies = [
|
||||
sources."iconv-lite-0.6.3"
|
||||
|
|
@ -8168,7 +8308,8 @@ in
|
|||
})
|
||||
sources."make-error-1.3.6"
|
||||
sources."make-error-cause-2.3.0"
|
||||
sources."mappersmith-2.37.1"
|
||||
sources."mappersmith-2.38.0"
|
||||
sources."material-colors-1.2.6"
|
||||
sources."md5-2.3.0"
|
||||
sources."media-typer-0.3.0"
|
||||
sources."merge-descriptors-1.0.1"
|
||||
|
|
@ -8177,8 +8318,8 @@ in
|
|||
sources."micromatch-4.0.4"
|
||||
sources."millisecond-0.1.2"
|
||||
sources."mime-1.6.0"
|
||||
sources."mime-db-1.51.0"
|
||||
sources."mime-types-2.1.34"
|
||||
sources."mime-db-1.52.0"
|
||||
sources."mime-types-2.1.35"
|
||||
sources."mimic-fn-2.1.0"
|
||||
sources."minimalistic-assert-1.0.1"
|
||||
sources."minimatch-3.1.2"
|
||||
|
|
@ -8224,19 +8365,19 @@ in
|
|||
];
|
||||
})
|
||||
sources."mz-2.7.0"
|
||||
(sources."n8n-core-0.107.0" // {
|
||||
(sources."n8n-core-0.109.0" // {
|
||||
dependencies = [
|
||||
sources."qs-6.10.3"
|
||||
];
|
||||
})
|
||||
sources."n8n-design-system-0.13.0"
|
||||
sources."n8n-editor-ui-0.133.0"
|
||||
(sources."n8n-nodes-base-0.164.0" // {
|
||||
sources."n8n-design-system-0.14.0"
|
||||
sources."n8n-editor-ui-0.135.0"
|
||||
(sources."n8n-nodes-base-0.166.0" // {
|
||||
dependencies = [
|
||||
sources."iconv-lite-0.6.3"
|
||||
];
|
||||
})
|
||||
sources."n8n-workflow-0.89.0"
|
||||
sources."n8n-workflow-0.91.0"
|
||||
(sources."named-placeholders-1.1.2" // {
|
||||
dependencies = [
|
||||
sources."lru-cache-4.1.5"
|
||||
|
|
@ -8341,6 +8482,10 @@ in
|
|||
sources."tslib-2.3.1"
|
||||
];
|
||||
})
|
||||
sources."passport-0.5.2"
|
||||
sources."passport-cookie-1.0.9"
|
||||
sources."passport-jwt-4.0.0"
|
||||
sources."passport-strategy-1.0.0"
|
||||
(sources."path-case-3.0.4" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.3.1"
|
||||
|
|
@ -8350,6 +8495,7 @@ in
|
|||
sources."path-is-absolute-1.0.1"
|
||||
sources."path-to-regexp-0.1.7"
|
||||
sources."path-type-4.0.0"
|
||||
sources."pause-0.0.1"
|
||||
(sources."pdf-parse-1.1.1" // {
|
||||
dependencies = [
|
||||
sources."debug-3.2.7"
|
||||
|
|
@ -8378,7 +8524,7 @@ in
|
|||
sources."popsicle-12.1.0"
|
||||
sources."popsicle-content-encoding-1.0.0"
|
||||
sources."popsicle-cookie-jar-1.0.0"
|
||||
sources."popsicle-redirects-1.1.0"
|
||||
sources."popsicle-redirects-1.1.1"
|
||||
sources."popsicle-transport-http-1.2.1"
|
||||
sources."popsicle-transport-xhr-2.0.0"
|
||||
sources."popsicle-user-agent-1.0.0"
|
||||
|
|
@ -8564,7 +8710,7 @@ in
|
|||
sources."tdigest-0.1.1"
|
||||
(sources."tedious-6.7.1" // {
|
||||
dependencies = [
|
||||
sources."@types/node-12.20.46"
|
||||
sources."@types/node-12.20.47"
|
||||
sources."bl-3.0.1"
|
||||
sources."depd-2.0.0"
|
||||
sources."iconv-lite-0.5.2"
|
||||
|
|
@ -8588,6 +8734,7 @@ in
|
|||
sources."through2-filter-3.0.0"
|
||||
sources."throwback-4.1.0"
|
||||
sources."timeago.js-4.0.2"
|
||||
sources."tinycolor2-1.4.2"
|
||||
sources."tlds-1.224.0"
|
||||
sources."tmp-0.0.33"
|
||||
(sources."tmp-promise-3.0.3" // {
|
||||
|
|
@ -8663,8 +8810,11 @@ in
|
|||
sources."vary-1.1.2"
|
||||
sources."verror-1.10.0"
|
||||
sources."vm2-3.9.9"
|
||||
sources."vue-2.6.14"
|
||||
sources."vue-color-2.8.1"
|
||||
sources."vue-fragment-1.5.2"
|
||||
sources."vue-i18n-8.27.0"
|
||||
sources."vue2-boring-avatars-0.3.4"
|
||||
sources."webidl-conversions-3.0.1"
|
||||
sources."whatwg-url-5.0.0"
|
||||
sources."which-1.3.1"
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "remmina";
|
||||
version = "1.4.24";
|
||||
version = "1.4.25";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "Remmina";
|
||||
repo = "Remmina";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rcxgr3HVOWA3mTfX8tka9bPGDRDtKhBRsfQ3hv9XHf0=";
|
||||
sha256 = "sha256-1val/KCClEtw1prVWuXJe8DmmQ7e7oqwAfAnT9G9iHI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "phd2";
|
||||
version = "2.6.10";
|
||||
version = "2.6.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenPHDGuiding";
|
||||
repo = "phd2";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2ZiPjhlguWXFcC53xG1aqAode7twtoHWszFUMQkK5xU=";
|
||||
sha256 = "sha256-iautgHOVzdLWYGOVu3wHBDt30uCbaP58mDz/l7buB1k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "siril";
|
||||
version = "0.99.10.1";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "free-astro";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-gqV+pJNaU+GnYiUo/imofgNdeM+AtDg/pSH7aoqhkYA=";
|
||||
sha256 = "sha256-yqWFEa1fnSwl0ecN9hMI13QCfj0f69CFqTJlEAhTpJI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
25
pkgs/applications/science/logic/nuXmv/default.nix
Normal file
25
pkgs/applications/science/logic/nuXmv/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nuXmv";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://es-static.fbk.eu/tools/nuxmv/downloads/nuXmv-${version}-linux64.tar.gz";
|
||||
sha256 = "0nndrw994clf8lnlcfzdf1mf00vif3fvd4xsiwcjpbyk12091zqr";
|
||||
};
|
||||
|
||||
installPhase= ''
|
||||
runHook preInstall
|
||||
install -Dm755 -t $out/bin ./bin/nuXmv
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Symbolic model checker for analysis of finite and infinite state systems";
|
||||
homepage = "https://nuxmv.fbk.eu/pmwiki.php";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ siraben ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "bada-bib";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
format = "other";
|
||||
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
|
|||
owner = "RogerCrocker";
|
||||
repo = "BadaBib";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tb/720WPqcO4w1EMmidjtEidsjZ0dEhe+/vnJPM6kxo=";
|
||||
sha256 = "sha256-gfZc3R8hrYy4Nco+XwG29lzZd537ByEgd3RL8h7f6DQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -52,7 +52,6 @@ python3Packages.buildPythonApplication rec {
|
|||
pythonPath = with python3Packages; [
|
||||
bibtexparser
|
||||
pygobject3
|
||||
watchgod
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xterm";
|
||||
version = "371";
|
||||
version = "372";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz"
|
||||
"https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz"
|
||||
];
|
||||
sha256 = "MviIJ3sZ4o68CjESv/AAYHwHvtBnnKoL7rs2+crUhPU=";
|
||||
sha256 = "xtCBJ8skCcOgS8rlWbcCUZbtdwu3vyZjCry0XZX2CrE=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.5.2";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-60XEc0V8stbl+JozTqu8yO37K1NXX/X2xFkcO9p/QNY=";
|
||||
sha256 = "sha256-NvVm/deO4LSIl5TSziqsrGt9atCXjt4UZ/VJfmX3i4c=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-aMD4a+jwCINcHV/z5UyTF+o3BzN9wviz+kLwDys9/BI=";
|
||||
vendorSha256 = "sha256-pBjg6WyD61+Bl3ttcpl/b9XoWBCi7cDvE8NPaZGu7Aw=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "f1viewer";
|
||||
version = "2.5.0";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SoMuchForSubtlety";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cTXueIOD+OXx4WikhdNv3v/F2/f5aDicyPP7FgTU6AM=";
|
||||
sha256 = "sha256-MY8xqpAzK1c4XL7w/LR83DyHFCI5X7wldosDDo7pXNI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-47uLx4t0N1T3zqZ9o/su/onJEUdGXpq+iVSUaRnwW3I=";
|
||||
vendorSha256 = "sha256-8c1+t6Lo11Q2kEDy9IWLw9bsZYtJFksE7Om3ysx7fc4=";
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
|
|
|
|||
35
pkgs/applications/video/mpv/scripts/vr-reversal.nix
Normal file
35
pkgs/applications/video/mpv/scripts/vr-reversal.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ lib, stdenvNoCC, fetchFromGitHub, ffmpeg }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "vr-reversal";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dfaker";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1wn2ngcvn7wcsl3kmj782x5q9130qw951lj6ilrkafp6q6zscpqr";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
# reset_rot is only available in ffmpeg 5.0, see 5bcc61ce87922ecccaaa0bd303a7e195929859a8
|
||||
postPatch = lib.optionalString (lib.versionOlder ffmpeg.version "5.0") ''
|
||||
substituteInPlace 360plugin.lua --replace ":reset_rot=1:" ":"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/mpv/scripts
|
||||
cp -r 360plugin.lua $out/share/mpv/scripts/
|
||||
'';
|
||||
|
||||
passthru.scriptName = "360plugin.lua";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Script for mpv to play VR video with optional saving of head tracking data.";
|
||||
homepage = "https://github.com/dfaker/VR-reversal";
|
||||
license = licenses.unlicense;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ schnusch ];
|
||||
};
|
||||
}
|
||||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "smplayer";
|
||||
version = "21.10.0";
|
||||
version = "22.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smplayer-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-p6036c8KX3GCINmkjHZlDLgHhLKri+t2WNWzP4KsSI8=";
|
||||
hash = "sha256-7DMvIqW3vzjVzJPyjbXuHHcf1T6EFcf/a/mVYqa3XS8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -22,7 +22,9 @@ stdenv.mkDerivation rec {
|
|||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [ qtscript ];
|
||||
buildInputs = [
|
||||
qtscript
|
||||
];
|
||||
|
||||
dontUseQmakeConfigure = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "lima";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lima-vm";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jbWz4HVYR3OEze2fFgG6Tg4p50IL0NStmaa8+GUPkNw=";
|
||||
sha256 = "sha256-Y15oYAdq+bsG2qD/ZTqXHgkelAdQF4SnOE79gDhlNGE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-RX8HfeDVvLUX4Ez2ma04gTl+8+lM7WGNSpmFNnf+5Xs=";
|
||||
vendorSha256 = "sha256-66CcLWG45vZwM2LVc1xsjJYyxefGEBW4fY3wo1ESQUM=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -15,16 +15,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "i3status-rust";
|
||||
version = "0.21.6";
|
||||
version = "0.21.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greshake";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2PBGw5LHIOOPXBZ+12wL2ZGH+gfbkXNIItpE6SLT8so=";
|
||||
sha256 = "sha256-2fh1/7/or++AzvkJfwXD07UiyX8U8CIEe+qXc5S82mM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-wtxfdQw5zKCxYu7N2BpcLVTlitQmwY7s8oO4dpK8MjE=";
|
||||
cargoSha256 = "sha256-ERBxY0PBQOvAVeWCRcB7rApTLjtHxa0KMV4qGlU/j/Q=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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 }: ["
|
||||
|
||||
|
|
|
|||
|
|
@ -54,9 +54,9 @@ fetchurl ({
|
|||
"$tmpfile" > "$out"
|
||||
|
||||
if [ ! -s "$out" ]; then
|
||||
echo "error: Filtered patch '$out$' is empty (while the original patch file was not)!" 1>&2
|
||||
echo "error: Filtered patch '$out' is empty (while the original patch file was not)!" 1>&2
|
||||
echo "Check your includes and excludes." 1>&2
|
||||
echo "Normalizd patch file was:" 1>&2
|
||||
echo "Normalized patch file was:" 1>&2
|
||||
cat "$tmpfile" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
12
pkgs/development/compilers/4th/001-install-manual-fixup.diff
Normal file
12
pkgs/development/compilers/4th/001-install-manual-fixup.diff
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff -Naur 4th-3.64.0-old/sources/Makefile 4th-3.64.0-new/sources/Makefile
|
||||
--- 4th-3.64.0-old/sources/Makefile 2022-03-15 12:37:45.925122854 -0300
|
||||
+++ 4th-3.64.0-new/sources/Makefile 2022-03-15 12:38:50.987870211 -0300
|
||||
@@ -125,7 +125,7 @@
|
||||
|
||||
install: mostlyinstall
|
||||
install -Dm644 ../documentation/4th.1 $(MANDIR)/man1/4th.1
|
||||
- install -Dm644 ../documentation/4tHmanual.txt $(DOCDIR)/4th/
|
||||
+ install -Dm644 ../documentation/4tHmanual.pdf $(DOCDIR)/4th/
|
||||
|
||||
uninstall:
|
||||
-rm -f $(LIBRARIES)/lib4th.{a,so*}
|
||||
|
|
@ -2,13 +2,18 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "4th";
|
||||
version = "3.62.5";
|
||||
version = "3.64.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://sourceforge.net/projects/forth-4th/files/${pname}-${version}/${pname}-${version}-unix.tar.gz";
|
||||
sha256 = "sha256-+CL33Yz7CxdEpi1lPG7+kzV4rheJ7GCgiFCaOLyktPw=";
|
||||
hash = "sha256-wJBekjFsFRIkhY/P/yHBQ8he+k+fGyrePGTP2Yjgpqg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix install manual; report this patch to upstream
|
||||
./001-install-manual-fixup.diff
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
makeFlags = [
|
||||
|
|
@ -31,9 +36,11 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A portable Forth compiler";
|
||||
homepage = "https://thebeez.home.xs4all.nl/4tH/index.html";
|
||||
license = licenses.lgpl3;
|
||||
platforms = platforms.all;
|
||||
description = "A portable Forth compiler";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
# TODO: set Makefile according to platform
|
||||
|
|
|
|||
|
|
@ -61,8 +61,6 @@ stdenv.mkDerivation rec {
|
|||
gtk2 glib fontconfig freetype unixODBC alsa-lib
|
||||
];
|
||||
|
||||
rpath = "${lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc.lib}/lib64";
|
||||
|
||||
unpackPhase = ''
|
||||
sh $src --keep --noexec
|
||||
|
||||
|
|
@ -119,6 +117,12 @@ stdenv.mkDerivation rec {
|
|||
fi
|
||||
done
|
||||
mv pkg/builds/cuda_nvcc/nvvm $out/nvvm
|
||||
|
||||
mv pkg/builds/cuda_sanitizer_api $out/cuda_sanitizer_api
|
||||
ln -s $out/cuda_sanitizer_api/compute-sanitizer/compute-sanitizer $out/bin/compute-sanitizer
|
||||
|
||||
mv pkg/builds/nsight_systems/target-linux-x64 $out/target-linux-x64
|
||||
mv pkg/builds/nsight_systems/host-linux-x64 $out/host-linux-x64
|
||||
''}
|
||||
|
||||
rm -f $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why?
|
||||
|
|
@ -184,22 +188,35 @@ stdenv.mkDerivation rec {
|
|||
done
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
while IFS= read -r -d ''$'\0' i; do
|
||||
if ! isELF "$i"; then continue; fi
|
||||
echo "patching $i..."
|
||||
if [[ ! $i =~ \.so ]]; then
|
||||
patchelf \
|
||||
--set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i
|
||||
fi
|
||||
if [[ $i =~ libcudart ]]; then
|
||||
patchelf --remove-rpath $i
|
||||
else
|
||||
rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64
|
||||
patchelf --set-rpath "$rpath2" --force-rpath $i
|
||||
fi
|
||||
done < <(find $out $lib $doc -type f -print0)
|
||||
'';
|
||||
preFixup =
|
||||
let rpath = lib.concatStringsSep ":" [
|
||||
(lib.makeLibraryPath (runtimeDependencies ++ [ "$lib" "$out" "$out/nvvm" ]))
|
||||
"${stdenv.cc.cc.lib}/lib64"
|
||||
"$out/jre/lib/amd64/jli"
|
||||
"$out/lib64"
|
||||
"$out/nvvm/lib64"
|
||||
];
|
||||
in
|
||||
''
|
||||
while IFS= read -r -d $'\0' i; do
|
||||
if ! isELF "$i"; then continue; fi
|
||||
echo "patching $i..."
|
||||
if [[ ! $i =~ \.so ]]; then
|
||||
patchelf \
|
||||
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $i
|
||||
fi
|
||||
if [[ $i =~ libcudart ]]; then
|
||||
patchelf --remove-rpath $i
|
||||
else
|
||||
patchelf --set-rpath "${rpath}" --force-rpath $i
|
||||
fi
|
||||
done < <(find $out $lib $doc -type f -print0)
|
||||
'' + lib.optionalString (lib.versionAtLeast version "11") ''
|
||||
for file in $out/target-linux-x64/*.so; do
|
||||
echo "patching $file..."
|
||||
patchelf --set-rpath "${rpath}:\$ORIGIN" $file
|
||||
done
|
||||
'';
|
||||
|
||||
# Set RPATH so that libcuda and other libraries in
|
||||
# /run/opengl-driver(-32)/lib can be found. See the explanation in
|
||||
|
|
@ -208,6 +225,10 @@ stdenv.mkDerivation rec {
|
|||
# --force-rpath prevents changing RPATH (set above) to RUNPATH.
|
||||
postFixup = ''
|
||||
addOpenGLRunpath --force-rpath {$out,$lib}/lib/lib*.so
|
||||
'' + lib.optionalString (lib.versionAtLeast version "11") ''
|
||||
addOpenGLRunpath $out/cuda_sanitizer_api/compute-sanitizer/*
|
||||
addOpenGLRunpath $out/cuda_sanitizer_api/compute-sanitizer/x86/*
|
||||
addOpenGLRunpath $out/target-linux-x64/*
|
||||
'';
|
||||
|
||||
# cuda-gdb doesn't run correctly when not using sandboxing, so
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -54,11 +54,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "go";
|
||||
version = "1.18rc1";
|
||||
version = "1.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://go.dev/dl/go${version}.src.tar.gz";
|
||||
sha256 = "sha256-XOx6ZlMAj6hfiCGzNmXeN74om3oC8X829wWojEOYC7g=";
|
||||
sha256 = "sha256-OPQj20zINIg/K1I0QoL6ejn7uTZQ3GKhH98L5kCb2tY=";
|
||||
};
|
||||
|
||||
# perl is used for testing go vet
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qbe";
|
||||
version = "unstable-2021-12-05";
|
||||
version = "unstable-2022-03-11";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://c9x.me/qbe.git";
|
||||
rev = "367c8215d99054892740ad74c690b106c45ebf60";
|
||||
sha256 = "sha256-xhTEiFR1RXMHtxmXlRof3O8monXEjstyWP3GClZmMuU=";
|
||||
rev = "c7842d84da65bcaf2d3c82aa69fb3ec930c7369f";
|
||||
sha256 = "sha256-fbxeoMJcVltrIGRLdJtxWykGIop8DVzpfrBatXniDPk=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sdcc";
|
||||
version = "4.1.0";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2";
|
||||
sha256 = "0gskzli17ghnn5qllvn4d56qf9bvvclqjh63nnj63p52smvggvc1";
|
||||
sha256 = "sha256-tJuuHSO81gV6gsT/5WE/nNDLz9HpQOnYTEv+nfCowFM=";
|
||||
};
|
||||
|
||||
buildInputs = [ boost gputils texinfo zlib ];
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stm32cubemx";
|
||||
version = "6.4.0";
|
||||
version = "6.5.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}-lin.zip";
|
||||
sha256 = "sha256-5qotjAyaNFtYUjHlNKwywmBJGAzS/IM9bF+dmONE4bk=";
|
||||
sha256 = "sha256-19RG+bJCmkaytMtDpDLbDvfKo27Z+Mo/sOrs8lOVV44=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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,44 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, python2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clearsilver";
|
||||
version = "0.10.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.clearsilver.net/downloads/clearsilver-${version}.tar.gz";
|
||||
sha256 = "1046m1dpq3nkgxbis2dr2x7hynmy51n64465q78d7pdgvqwa178y";
|
||||
};
|
||||
|
||||
PYTHON_SITE = "${placeholder "out"}/${python2.sitePackages}";
|
||||
|
||||
configureFlags = [
|
||||
"--with-python=${python2.interpreter}"
|
||||
"--disable-apache"
|
||||
"--disable-perl"
|
||||
"--disable-ruby"
|
||||
"--disable-java"
|
||||
"--disable-csharp"
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out
|
||||
mkdir -p $out/${python2.sitePackages}
|
||||
'';
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.net/data/main/c/clearsilver/0.10.5-1.6/debian/patches/clang-gcc5.patch";
|
||||
sha256 = "0d44v9jx0b6k8nvrhknd958i9rs59kdh73z0lb4f1mzi8if16c38";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.net/data/main/c/clearsilver/0.10.5-1.6/debian/patches/CVE-2011-4357.diff";
|
||||
sha256 = "1lfncavxdqckrz03gv97lcliygbpi9lnih944vmdbn9zw6fwcipi";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast, powerful, and language-neutral HTML template system";
|
||||
homepage = "http://www.clearsilver.net/";
|
||||
license = licenses.free;
|
||||
};
|
||||
}
|
||||
|
|
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
|
|||
libassuan
|
||||
libgpg-error
|
||||
pth
|
||||
] ++ lib.optional (qtbase != null) [
|
||||
] ++ lib.optionals (qtbase != null) [
|
||||
qtbase
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgbinder";
|
||||
version = "1.1.16";
|
||||
version = "1.1.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mer-hybris";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-g+3yRRiTv2l7ZpJc5a6tOPsErKjdALomAWmYHErdfIQ=";
|
||||
sha256 = "sha256-HTmNoTGyFtOXRy7Y/ZnEgTa2GW6/+TeZxZo7c7ksNtc=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue