forked from mirrors/nixpkgs
Merge branch 'master' into nixos-tests-missing
This commit is contained in:
Patrick Hilhorst
GitHub
commit
4ed7bed68d
6
.github/CODEOWNERS
vendored
6
.github/CODEOWNERS
vendored
|
|
@ -280,6 +280,12 @@
|
|||
# terraform providers
|
||||
/pkgs/applications/networking/cluster/terraform-providers @zowoq
|
||||
|
||||
# kubernetes
|
||||
/nixos/doc/manual/configuration/kubernetes.chapter.md @zowoq
|
||||
/nixos/modules/services/cluster/kubernetes @zowoq
|
||||
/nixos/tests/kubernetes @zowoq
|
||||
/pkgs/applications/networking/cluster/kubernetes @zowoq
|
||||
|
||||
# Matrix
|
||||
/pkgs/servers/heisenbridge @piegamesde
|
||||
/pkgs/servers/matrix-conduit @piegamesde @pstn
|
||||
|
|
|
|||
|
|
@ -67,6 +67,11 @@ in mkLicense lset) ({
|
|||
free = false;
|
||||
};
|
||||
|
||||
aom = {
|
||||
fullName = "Alliance for Open Media Patent License 1.0";
|
||||
url = "https://aomedia.org/license/patent-license/";
|
||||
};
|
||||
|
||||
apsl20 = {
|
||||
spdxId = "APSL-2.0";
|
||||
fullName = "Apple Public Source License 2.0";
|
||||
|
|
|
|||
|
|
@ -4571,6 +4571,12 @@
|
|||
githubId = 343415;
|
||||
name = "Greg Roodt";
|
||||
};
|
||||
gruve-p = {
|
||||
email = "groestlcoin@gmail.com";
|
||||
github = "gruve-p";
|
||||
githubId = 11212268;
|
||||
name = "gruve-p";
|
||||
};
|
||||
gschwartz = {
|
||||
email = "gsch@pennmedicine.upenn.edu";
|
||||
github = "GregorySchwartz";
|
||||
|
|
@ -5709,6 +5715,24 @@
|
|||
githubId = 8900;
|
||||
name = "Johan Magnus Jonsson";
|
||||
};
|
||||
jmc-figueira = {
|
||||
email = "business+nixos@jmc-figueira.dev";
|
||||
github = "jmc-figueira";
|
||||
githubId = 6634716;
|
||||
name = "João Figueira";
|
||||
keys = [
|
||||
# GitHub signing key
|
||||
{
|
||||
longkeyid = "rsa4096/0xDC7AE56AE98E02D7";
|
||||
fingerprint = "EC08 7AA3 DEAD A972 F015 6371 DC7A E56A E98E 02D7";
|
||||
}
|
||||
# Email encryption
|
||||
{
|
||||
longkeyid = "ed25519/0x197F9A632D139E30";
|
||||
fingerprint = "816D 23F5 E672 EC58 7674 4A73 197F 9A63 2D13 9E30";
|
||||
}
|
||||
];
|
||||
};
|
||||
jmettes = {
|
||||
email = "jonathan@jmettes.com";
|
||||
github = "jmettes";
|
||||
|
|
@ -11016,7 +11040,7 @@
|
|||
name = "Yann Hodique";
|
||||
};
|
||||
sikmir = {
|
||||
email = "sikmir@gmail.com";
|
||||
email = "sikmir@disroot.org";
|
||||
github = "sikmir";
|
||||
githubId = 688044;
|
||||
name = "Nikolay Korotkiy";
|
||||
|
|
@ -11848,6 +11872,12 @@
|
|||
githubId = 378734;
|
||||
name = "TG ⊗ Θ";
|
||||
};
|
||||
tgunnoe = {
|
||||
email = "t@gvno.net";
|
||||
github = "tgunnoe";
|
||||
githubId = 7254833;
|
||||
name = "Taylor Gunnoe";
|
||||
};
|
||||
th0rgal = {
|
||||
email = "thomas.marchand@tuta.io";
|
||||
github = "Th0rgal";
|
||||
|
|
|
|||
|
|
@ -166,6 +166,17 @@ with lib.maintainers; {
|
|||
scope = "Maintain Jitsi.";
|
||||
};
|
||||
|
||||
kubernetes = {
|
||||
members = [
|
||||
johanot
|
||||
offline
|
||||
saschagrunert
|
||||
srhb
|
||||
zowoq
|
||||
];
|
||||
scope = "Maintain the Kubernetes package and module";
|
||||
};
|
||||
|
||||
kodi = {
|
||||
members = [
|
||||
aanderse
|
||||
|
|
@ -229,6 +240,7 @@ with lib.maintainers; {
|
|||
php = {
|
||||
members = [
|
||||
aanderse
|
||||
drupol
|
||||
etu
|
||||
globin
|
||||
ma27
|
||||
|
|
|
|||
|
|
@ -279,6 +279,14 @@
|
|||
<literal>virtualisation.docker.daemon.settings</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The backward compatibility in
|
||||
<literal>services.wordpress</literal> to configure sites with
|
||||
the old interface has been removed. Please use
|
||||
<literal>services.wordpress.sites</literal> instead.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The backward compatibility in
|
||||
|
|
|
|||
|
|
@ -92,6 +92,10 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- If you previously used `/etc/docker/daemon.json`, you need to incorporate the changes into the new option `virtualisation.docker.daemon.settings`.
|
||||
|
||||
- The backward compatibility in `services.wordpress` to configure sites with
|
||||
the old interface has been removed. Please use `services.wordpress.sites`
|
||||
instead.
|
||||
|
||||
- The backward compatibility in `services.dokuwiki` to configure sites with the
|
||||
old interface has been removed. Please use `services.dokuwiki.sites` instead.
|
||||
|
||||
|
|
|
|||
|
|
@ -105,6 +105,7 @@ mkdir -p $out/iso
|
|||
# version-5 UUID's work)
|
||||
xorriso="xorriso
|
||||
-boot_image any gpt_disk_guid=$(uuid -v 5 daed2280-b91e-42c0-aed6-82c825ca41f3 $out | tr -d -)
|
||||
-volume_date all_file_dates =$SOURCE_DATE_EPOCH
|
||||
-as mkisofs
|
||||
-iso-level 3
|
||||
-volid ${volumeID}
|
||||
|
|
|
|||
|
|
@ -734,13 +734,13 @@ in
|
|||
{ source = config.system.build.squashfsStore;
|
||||
target = "/nix-store.squashfs";
|
||||
}
|
||||
{ source = config.isoImage.splashImage;
|
||||
target = "/isolinux/background.png";
|
||||
}
|
||||
{ source = pkgs.writeText "version" config.system.nixos.label;
|
||||
target = "/version.txt";
|
||||
}
|
||||
] ++ optionals canx86BiosBoot [
|
||||
{ source = config.isoImage.splashImage;
|
||||
target = "/isolinux/background.png";
|
||||
}
|
||||
{ source = pkgs.substituteAll {
|
||||
name = "isolinux.cfg";
|
||||
src = pkgs.writeText "isolinux.cfg-in" isolinuxCfg;
|
||||
|
|
@ -761,6 +761,9 @@ in
|
|||
{ source = (pkgs.writeTextDir "grub/loopback.cfg" "source /EFI/boot/grub.cfg") + "/grub";
|
||||
target = "/boot/grub";
|
||||
}
|
||||
{ source = config.isoImage.efiSplashImage;
|
||||
target = "/EFI/boot/efi-background.png";
|
||||
}
|
||||
] ++ optionals (config.boot.loader.grub.memtest86.enable && canx86BiosBoot) [
|
||||
{ source = "${pkgs.memtest86plus}/memtest.bin";
|
||||
target = "/boot/memtest.bin";
|
||||
|
|
@ -769,10 +772,6 @@ in
|
|||
{ source = config.isoImage.grubTheme;
|
||||
target = "/EFI/boot/grub-theme";
|
||||
}
|
||||
] ++ [
|
||||
{ source = config.isoImage.efiSplashImage;
|
||||
target = "/EFI/boot/efi-background.png";
|
||||
}
|
||||
];
|
||||
|
||||
boot.loader.timeout = 10;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
{
|
||||
imports = [
|
||||
../../profiles/installation-device.nix
|
||||
./sd-image-riscv64-qemu.nix
|
||||
];
|
||||
|
||||
# the installation media is also the installation target,
|
||||
# so we don't want to provide the installation configuration.nix.
|
||||
installer.cloneConfig = false;
|
||||
}
|
||||
|
|
@ -5,11 +5,14 @@ with lib;
|
|||
let
|
||||
cfg = config.services.locate;
|
||||
isMLocate = hasPrefix "mlocate" cfg.locate.name;
|
||||
isPLocate = hasPrefix "plocate" cfg.locate.name;
|
||||
isMorPLocate = (isMLocate || isPLocate);
|
||||
isFindutils = hasPrefix "findutils" cfg.locate.name;
|
||||
in {
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(mkRenamedOptionModule [ "services" "locate" "period" ] [ "services" "locate" "interval" ])
|
||||
(mkRemovedOptionModule [ "services" "locate" "includeStore" ] "Use services.locate.prunePaths" )
|
||||
(mkRemovedOptionModule [ "services" "locate" "includeStore" ] "Use services.locate.prunePaths")
|
||||
];
|
||||
|
||||
options.services.locate = with types; {
|
||||
|
|
@ -163,7 +166,16 @@ in {
|
|||
|
||||
prunePaths = mkOption {
|
||||
type = listOf path;
|
||||
default = [ "/tmp" "/var/tmp" "/var/cache" "/var/lock" "/var/run" "/var/spool" "/nix/store" "/nix/var/log/nix" ];
|
||||
default = [
|
||||
"/tmp"
|
||||
"/var/tmp"
|
||||
"/var/cache"
|
||||
"/var/lock"
|
||||
"/var/run"
|
||||
"/var/spool"
|
||||
"/nix/store"
|
||||
"/nix/var/log/nix"
|
||||
];
|
||||
description = ''
|
||||
Which paths to exclude from indexing
|
||||
'';
|
||||
|
|
@ -188,26 +200,38 @@ in {
|
|||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
users.groups = mkIf isMLocate { mlocate = {}; };
|
||||
users.groups = mkMerge [
|
||||
(mkIf isMLocate { mlocate = { }; })
|
||||
(mkIf isPLocate { plocate = { }; })
|
||||
];
|
||||
|
||||
security.wrappers = mkIf isMLocate {
|
||||
locate = {
|
||||
group = "mlocate";
|
||||
owner = "root";
|
||||
permissions = "u+rx,g+x,o+x";
|
||||
setgid = true;
|
||||
setuid = false;
|
||||
source = "${cfg.locate}/bin/locate";
|
||||
security.wrappers =
|
||||
let
|
||||
common = {
|
||||
owner = "root";
|
||||
permissions = "u+rx,g+x,o+x";
|
||||
setgid = true;
|
||||
setuid = false;
|
||||
};
|
||||
mlocate = (mkIf isMLocate {
|
||||
group = "mlocate";
|
||||
source = "${cfg.locate}/bin/locate";
|
||||
});
|
||||
plocate = (mkIf isPLocate {
|
||||
group = "plocate";
|
||||
source = "${cfg.locate}/bin/plocate";
|
||||
});
|
||||
in
|
||||
mkIf isMorPLocate {
|
||||
locate = mkMerge [ common mlocate plocate ];
|
||||
plocate = (mkIf isPLocate (mkMerge [ common plocate ]));
|
||||
};
|
||||
};
|
||||
|
||||
nixpkgs.config = { locate.dbfile = cfg.output; };
|
||||
|
||||
environment.systemPackages = [ cfg.locate ];
|
||||
|
||||
environment.variables = mkIf (!isMLocate)
|
||||
{ LOCATE_PATH = cfg.output;
|
||||
};
|
||||
environment.variables = mkIf (!isMorPLocate) { LOCATE_PATH = cfg.output; };
|
||||
|
||||
environment.etc = {
|
||||
# write /etc/updatedb.conf for manual calls to `updatedb`
|
||||
|
|
@ -221,57 +245,65 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
warnings = optional (isMLocate && cfg.localuser != null) "mlocate does not support the services.locate.localuser option; updatedb will run as root. (Silence with services.locate.localuser = null.)"
|
||||
++ optional (isFindutils && cfg.pruneNames != []) "findutils locate does not support pruning by directory component"
|
||||
++ optional (isFindutils && cfg.pruneBindMounts) "findutils locate does not support skipping bind mounts";
|
||||
warnings = optional (isMorPLocate && cfg.localuser != null)
|
||||
"mlocate does not support the services.locate.localuser option; updatedb will run as root. (Silence with services.locate.localuser = null.)"
|
||||
++ optional (isFindutils && cfg.pruneNames != [ ])
|
||||
"findutils locate does not support pruning by directory component"
|
||||
++ optional (isFindutils && cfg.pruneBindMounts)
|
||||
"findutils locate does not support skipping bind mounts";
|
||||
|
||||
systemd.services.update-locatedb =
|
||||
{ description = "Update Locate Database";
|
||||
path = mkIf (!isMLocate) [ pkgs.su ];
|
||||
systemd.services.update-locatedb = {
|
||||
description = "Update Locate Database";
|
||||
path = mkIf (!isMorPLocate) [ pkgs.su ];
|
||||
|
||||
# mlocate's updatedb takes flags via a configuration file or
|
||||
# on the command line, but not by environment variable.
|
||||
script =
|
||||
if isMLocate
|
||||
then let toFlags = x: optional (cfg.${x} != [])
|
||||
"--${lib.toLower x} '${concatStringsSep " " cfg.${x}}'";
|
||||
args = concatLists (map toFlags ["pruneFS" "pruneNames" "prunePaths"]);
|
||||
in ''
|
||||
# mlocate's updatedb takes flags via a configuration file or
|
||||
# on the command line, but not by environment variable.
|
||||
script =
|
||||
if isMorPLocate then
|
||||
let
|
||||
toFlags = x:
|
||||
optional (cfg.${x} != [ ])
|
||||
"--${lib.toLower x} '${concatStringsSep " " cfg.${x}}'";
|
||||
args = concatLists (map toFlags [ "pruneFS" "pruneNames" "prunePaths" ]);
|
||||
in
|
||||
''
|
||||
exec ${cfg.locate}/bin/updatedb \
|
||||
--output ${toString cfg.output} ${concatStringsSep " " args} \
|
||||
--prune-bind-mounts ${if cfg.pruneBindMounts then "yes" else "no"} \
|
||||
${concatStringsSep " " cfg.extraFlags}
|
||||
''
|
||||
else ''
|
||||
exec ${cfg.locate}/bin/updatedb \
|
||||
${optionalString (cfg.localuser != null && ! isMLocate) "--localuser=${cfg.localuser}"} \
|
||||
--output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}
|
||||
'';
|
||||
environment = optionalAttrs (!isMLocate) {
|
||||
PRUNEFS = concatStringsSep " " cfg.pruneFS;
|
||||
PRUNEPATHS = concatStringsSep " " cfg.prunePaths;
|
||||
PRUNENAMES = concatStringsSep " " cfg.pruneNames;
|
||||
PRUNE_BIND_MOUNTS = if cfg.pruneBindMounts then "yes" else "no";
|
||||
};
|
||||
serviceConfig.Nice = 19;
|
||||
serviceConfig.IOSchedulingClass = "idle";
|
||||
serviceConfig.PrivateTmp = "yes";
|
||||
serviceConfig.PrivateNetwork = "yes";
|
||||
serviceConfig.NoNewPrivileges = "yes";
|
||||
serviceConfig.ReadOnlyPaths = "/";
|
||||
# Use dirOf cfg.output because mlocate creates temporary files next to
|
||||
# the actual database. We could specify and create them as well,
|
||||
# but that would make this quite brittle when they change something.
|
||||
# NOTE: If /var/cache does not exist, this leads to the misleading error message:
|
||||
# update-locatedb.service: Failed at step NAMESPACE spawning …/update-locatedb-start: No such file or directory
|
||||
serviceConfig.ReadWritePaths = dirOf cfg.output;
|
||||
else ''
|
||||
exec ${cfg.locate}/bin/updatedb \
|
||||
${optionalString (cfg.localuser != null && !isMorPLocate) "--localuser=${cfg.localuser}"} \
|
||||
--output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}
|
||||
'';
|
||||
environment = optionalAttrs (!isMorPLocate) {
|
||||
PRUNEFS = concatStringsSep " " cfg.pruneFS;
|
||||
PRUNEPATHS = concatStringsSep " " cfg.prunePaths;
|
||||
PRUNENAMES = concatStringsSep " " cfg.pruneNames;
|
||||
PRUNE_BIND_MOUNTS = if cfg.pruneBindMounts then "yes" else "no";
|
||||
};
|
||||
serviceConfig.Nice = 19;
|
||||
serviceConfig.IOSchedulingClass = "idle";
|
||||
serviceConfig.PrivateTmp = "yes";
|
||||
serviceConfig.PrivateNetwork = "yes";
|
||||
serviceConfig.NoNewPrivileges = "yes";
|
||||
serviceConfig.ReadOnlyPaths = "/";
|
||||
# Use dirOf cfg.output because mlocate creates temporary files next to
|
||||
# the actual database. We could specify and create them as well,
|
||||
# but that would make this quite brittle when they change something.
|
||||
# NOTE: If /var/cache does not exist, this leads to the misleading error message:
|
||||
# update-locatedb.service: Failed at step NAMESPACE spawning …/update-locatedb-start: No such file or directory
|
||||
serviceConfig.ReadWritePaths = dirOf cfg.output;
|
||||
};
|
||||
|
||||
systemd.timers.update-locatedb = mkIf (cfg.interval != "never")
|
||||
{ description = "Update timer for locate database";
|
||||
partOf = [ "update-locatedb.service" ];
|
||||
wantedBy = [ "timers.target" ];
|
||||
timerConfig.OnCalendar = cfg.interval;
|
||||
};
|
||||
systemd.timers.update-locatedb = mkIf (cfg.interval != "never") {
|
||||
description = "Update timer for locate database";
|
||||
partOf = [ "update-locatedb.service" ];
|
||||
wantedBy = [ "timers.target" ];
|
||||
timerConfig.OnCalendar = cfg.interval;
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ SuperSandro2000 ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -90,10 +90,10 @@ in {
|
|||
extraPackages = mkOption {
|
||||
type = with types; listOf package;
|
||||
default = with pkgs; [
|
||||
swaylock swayidle alacritty dmenu
|
||||
swaylock swayidle foot dmenu
|
||||
];
|
||||
defaultText = literalExpression ''
|
||||
with pkgs; [ swaylock swayidle alacritty dmenu ];
|
||||
with pkgs; [ swaylock swayidle foot dmenu ];
|
||||
'';
|
||||
example = literalExpression ''
|
||||
with pkgs; [
|
||||
|
|
|
|||
|
|
@ -51,7 +51,10 @@ in {
|
|||
};
|
||||
|
||||
networking.firewall = mkIf cfg.openFirewall {
|
||||
allowedTCPPortRanges = [{ from = 9100; to = 9200; }];
|
||||
allowedTCPPortRanges = [
|
||||
{ from = 9100; to = 9200; }
|
||||
{ from = 9330; to = 9332; }
|
||||
];
|
||||
allowedUDPPorts = [ 9003 ];
|
||||
extraCommands = ''
|
||||
iptables -A INPUT -s 224.0.0.0/4 -j ACCEPT
|
||||
|
|
|
|||
|
|
@ -1,20 +1,14 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption types;
|
||||
inherit (lib) any attrValues concatMapStringsSep flatten literalExpression;
|
||||
inherit (lib) filterAttrs mapAttrs mapAttrs' mapAttrsToList nameValuePair optional optionalAttrs optionalString;
|
||||
with lib;
|
||||
|
||||
cfg = migrateOldAttrs config.services.wordpress;
|
||||
let
|
||||
cfg = config.services.wordpress;
|
||||
eachSite = cfg.sites;
|
||||
user = "wordpress";
|
||||
webserver = config.services.${cfg.webserver};
|
||||
stateDir = hostName: "/var/lib/wordpress/${hostName}";
|
||||
|
||||
# Migrate config.services.wordpress.<hostName> to config.services.wordpress.sites.<hostName>
|
||||
oldSites = filterAttrs (o: _: o != "sites" && o != "webserver");
|
||||
migrateOldAttrs = cfg: cfg // { sites = cfg.sites // oldSites cfg; };
|
||||
|
||||
pkg = hostName: cfg: pkgs.stdenv.mkDerivation rec {
|
||||
pname = "wordpress-${hostName}";
|
||||
version = src.version;
|
||||
|
|
@ -266,36 +260,29 @@ in
|
|||
{
|
||||
# interface
|
||||
options = {
|
||||
services.wordpress = mkOption {
|
||||
type = types.submodule {
|
||||
# Used to support old interface
|
||||
freeformType = types.attrsOf (types.submodule siteOpts);
|
||||
services.wordpress = {
|
||||
|
||||
# New interface
|
||||
options.sites = mkOption {
|
||||
type = types.attrsOf (types.submodule siteOpts);
|
||||
default = {};
|
||||
description = "Specification of one or more WordPress sites to serve";
|
||||
};
|
||||
|
||||
options.webserver = mkOption {
|
||||
type = types.enum [ "httpd" "nginx" "caddy" ];
|
||||
default = "httpd";
|
||||
description = ''
|
||||
Whether to use apache2 or nginx for virtual host management.
|
||||
|
||||
Further nginx configuration can be done by adapting <literal>services.nginx.virtualHosts.<name></literal>.
|
||||
See <xref linkend="opt-services.nginx.virtualHosts"/> for further information.
|
||||
|
||||
Further apache2 configuration can be done by adapting <literal>services.httpd.virtualHosts.<name></literal>.
|
||||
See <xref linkend="opt-services.httpd.virtualHosts"/> for further information.
|
||||
'';
|
||||
};
|
||||
sites = mkOption {
|
||||
type = types.attrsOf (types.submodule siteOpts);
|
||||
default = {};
|
||||
description = "Specification of one or more WordPress sites to serve";
|
||||
};
|
||||
default = {};
|
||||
description = "Wordpress configuration";
|
||||
};
|
||||
|
||||
webserver = mkOption {
|
||||
type = types.enum [ "httpd" "nginx" "caddy" ];
|
||||
default = "httpd";
|
||||
description = ''
|
||||
Whether to use apache2 or nginx for virtual host management.
|
||||
|
||||
Further nginx configuration can be done by adapting <literal>services.nginx.virtualHosts.<name></literal>.
|
||||
See <xref linkend="opt-services.nginx.virtualHosts"/> for further information.
|
||||
|
||||
Further apache2 configuration can be done by adapting <literal>services.httpd.virtualHosts.<name></literal>.
|
||||
See <xref linkend="opt-services.httpd.virtualHosts"/> for further information.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
# implementation
|
||||
|
|
@ -312,8 +299,6 @@ in
|
|||
}) eachSite);
|
||||
|
||||
|
||||
warnings = mapAttrsToList (hostName: _: ''services.wordpress."${hostName}" is deprecated use services.wordpress.sites."${hostName}"'') (oldSites cfg);
|
||||
|
||||
services.mysql = mkIf (any (v: v.database.createLocally) (attrValues eachSite)) {
|
||||
enable = true;
|
||||
package = mkDefault pkgs.mariadb;
|
||||
|
|
|
|||
|
|
@ -271,7 +271,7 @@ def main() -> None:
|
|||
if os.readlink(system_dir(*gen)) == args.default_config:
|
||||
write_loader_conf(*gen)
|
||||
except OSError as e:
|
||||
print("ignoring profile '{}' in the list of boot entries because of the following error:\n{}".format(profile, e), file=sys.stderr)
|
||||
print("ignoring generation '{}' in the list of boot entries because of the following error:\n{}".format(*gen, e), file=sys.stderr)
|
||||
|
||||
for root, _, files in os.walk('@efiSysMountPoint@/efi/nixos/.extra-files', topdown=False):
|
||||
relative_root = root.removeprefix("@efiSysMountPoint@/efi/nixos/.extra-files").removeprefix("/")
|
||||
|
|
|
|||
|
|
@ -187,7 +187,6 @@ in
|
|||
hadoop.hdfs = handleTestOn [ "x86_64-linux" ] ./hadoop/hdfs.nix {};
|
||||
hadoop.yarn = handleTestOn [ "x86_64-linux" ] ./hadoop/yarn.nix {};
|
||||
haka = handleTest ./haka.nix {};
|
||||
handbrake = handleTestOn ["x86_64-linux"] ./handbrake.nix {};
|
||||
haproxy = handleTest ./haproxy.nix {};
|
||||
hardened = handleTest ./hardened.nix {};
|
||||
hedgedoc = handleTest ./hedgedoc.nix {};
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }:
|
||||
|
||||
let
|
||||
# Download Big Buck Bunny example, licensed under CC Attribution 3.0.
|
||||
testMkv = pkgs.fetchurl {
|
||||
url = "https://github.com/Matroska-Org/matroska-test-files/blob/cf0792be144ac470c4b8052cfe19bb691993e3a2/test_files/test1.mkv?raw=true";
|
||||
sha256 = "1hfxbbgxwfkzv85pvpvx55a72qsd0hxjbm9hkl5r3590zw4s75h9";
|
||||
name = "test1.mkv";
|
||||
};
|
||||
|
||||
in
|
||||
{
|
||||
name = "handbrake";
|
||||
|
||||
meta = {
|
||||
maintainers = with pkgs.lib.maintainers; [ ];
|
||||
};
|
||||
|
||||
machine = { pkgs, ... }: {
|
||||
environment.systemPackages = with pkgs; [ handbrake ];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
# Test MP4 and MKV transcoding. Since this is a short clip, transcoding typically
|
||||
# only takes a few seconds.
|
||||
start_all()
|
||||
|
||||
machine.succeed("HandBrakeCLI -i ${testMkv} -o test.mp4 -e x264 -q 20 -B 160")
|
||||
machine.succeed("test -e test.mp4")
|
||||
machine.succeed("HandBrakeCLI -i ${testMkv} -o test.mkv -e x264 -q 20 -B 160")
|
||||
machine.succeed("test -e test.mkv")
|
||||
'';
|
||||
})
|
||||
|
|
@ -671,8 +671,6 @@ in {
|
|||
"modprobe bcache",
|
||||
"udevadm settle",
|
||||
"make-bcache -B /dev/vda4 -C /dev/vda3",
|
||||
"echo /dev/vda3 > /sys/fs/bcache/register",
|
||||
"echo /dev/vda4 > /sys/fs/bcache/register",
|
||||
"udevadm settle",
|
||||
"mkfs.ext3 -L nixos /dev/bcache0",
|
||||
"mount LABEL=nixos /mnt",
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
"""sleep 15 && curl -H "Content-Type: application/json" -X POST http://localhost:2222/jibri/api/v1.0/stopService -d '{"sessionId": "RecordTest","callParams":{"callUrlInfo":{"baseUrl": "https://machine","callName": "TestCall"}},"callLoginParams":{"domain": "recorder.machine", "username": "recorder", "password": "'"$(cat /var/lib/jitsi-meet/jibri-recorder-secret)"'" },"sinkType": "file"}'"""
|
||||
)
|
||||
machine.wait_until_succeeds(
|
||||
"cat /var/log/jitsi/jibri/log.0.txt | grep -q 'Recording finalize script finished with exit value 0'", timeout=36
|
||||
"cat /var/log/jitsi/jibri/log.0.txt | grep -q 'Finalize script finished with exit value 0'", timeout=36
|
||||
)
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import ./make-test-python.nix ({ pkgs, lib, ...} :
|
||||
import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
name = "sway";
|
||||
|
|
@ -13,19 +13,38 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
|
|||
|
||||
environment = {
|
||||
# For glinfo and wayland-info:
|
||||
systemPackages = with pkgs; [ mesa-demos wayland-utils ];
|
||||
systemPackages = with pkgs; [ mesa-demos wayland-utils alacritty ];
|
||||
# Use a fixed SWAYSOCK path (for swaymsg):
|
||||
variables = {
|
||||
"SWAYSOCK" = "/tmp/sway-ipc.sock";
|
||||
"WLR_RENDERER_ALLOW_SOFTWARE" = "1";
|
||||
# TODO: Investigate if we can get hardware acceleration to work (via
|
||||
# virtio-gpu and Virgil). We currently have to use the Pixman software
|
||||
# renderer since the GLES2 renderer doesn't work inside the VM (even
|
||||
# with WLR_RENDERER_ALLOW_SOFTWARE):
|
||||
# "WLR_RENDERER_ALLOW_SOFTWARE" = "1";
|
||||
"WLR_RENDERER" = "pixman";
|
||||
};
|
||||
# For convenience:
|
||||
shellAliases = {
|
||||
test-x11 = "glinfo | head -n 3 | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok";
|
||||
test-x11 = "glinfo | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok";
|
||||
test-wayland = "wayland-info | tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok";
|
||||
};
|
||||
|
||||
# To help with OCR:
|
||||
etc."xdg/foot/foot.ini".text = lib.generators.toINI { } {
|
||||
main = {
|
||||
font = "inconsolata:size=14";
|
||||
};
|
||||
colors = rec {
|
||||
foreground = "000000";
|
||||
background = "ffffff";
|
||||
regular2 = foreground;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
fonts.fonts = [ pkgs.inconsolata ];
|
||||
|
||||
# Automatically configure and start Sway when logging in on tty1:
|
||||
programs.bash.loginShellInit = ''
|
||||
if [ "$(tty)" = "/dev/tty1" ]; then
|
||||
|
|
@ -61,7 +80,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
|
|||
machine.wait_for_file("/run/user/1000/wayland-1")
|
||||
machine.wait_for_file("/tmp/sway-ipc.sock")
|
||||
|
||||
# Test XWayland:
|
||||
# Test XWayland (foot does not support X):
|
||||
machine.succeed(
|
||||
"su - alice -c 'swaymsg exec WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY=invalid alacritty'"
|
||||
)
|
||||
|
|
@ -69,21 +88,22 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
|
|||
machine.send_chars("test-x11\n")
|
||||
machine.wait_for_file("/tmp/test-x11-exit-ok")
|
||||
print(machine.succeed("cat /tmp/test-x11.out"))
|
||||
machine.copy_from_vm("/tmp/test-x11.out")
|
||||
machine.screenshot("alacritty_glinfo")
|
||||
machine.succeed("pkill alacritty")
|
||||
|
||||
# Start a terminal (Alacritty) on workspace 3:
|
||||
# Start a terminal (foot) on workspace 3:
|
||||
machine.send_key("alt-3")
|
||||
machine.succeed(
|
||||
"su - alice -c 'swaymsg exec WINIT_UNIX_BACKEND=wayland DISPLAY=invalid alacritty'"
|
||||
)
|
||||
machine.sleep(3)
|
||||
machine.send_key("alt-ret")
|
||||
machine.wait_for_text("alice@machine")
|
||||
machine.send_chars("test-wayland\n")
|
||||
machine.wait_for_file("/tmp/test-wayland-exit-ok")
|
||||
print(machine.succeed("cat /tmp/test-wayland.out"))
|
||||
machine.screenshot("alacritty_wayland_info")
|
||||
machine.copy_from_vm("/tmp/test-wayland.out")
|
||||
machine.screenshot("foot_wayland_info")
|
||||
machine.send_key("alt-shift-q")
|
||||
machine.wait_until_fails("pgrep alacritty")
|
||||
machine.wait_until_fails("pgrep foot")
|
||||
|
||||
# Test gpg-agent starting pinentry-gnome3 via D-Bus (tests if
|
||||
# $WAYLAND_DISPLAY is correctly imported into the D-Bus user env):
|
||||
|
|
@ -104,9 +124,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
|
|||
# Exit Sway and verify process exit status 0:
|
||||
machine.succeed("su - alice -c 'swaymsg exit || true'")
|
||||
machine.wait_until_fails("pgrep -x sway")
|
||||
|
||||
# TODO: Sway currently segfaults after "swaymsg exit" but only in this VM test:
|
||||
# machine # [ 104.090032] sway[921]: segfault at 3f800008 ip 00007f7dbdc25f10 sp 00007ffe282182f8 error 4 in libwayland-server.so.0.1.0[7f7dbdc1f000+8000]
|
||||
# machine.wait_for_file("/tmp/sway-exit-ok")
|
||||
machine.wait_for_file("/tmp/sway-exit-ok")
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -15,15 +15,12 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||
services.httpd.adminAddr = "webmaster@site.local";
|
||||
services.httpd.logPerVirtualHost = true;
|
||||
|
||||
services.wordpress = {
|
||||
# Test support for old interface
|
||||
services.wordpress.sites = {
|
||||
"site1.local" = {
|
||||
database.tablePrefix = "site1_";
|
||||
};
|
||||
sites = {
|
||||
"site2.local" = {
|
||||
database.tablePrefix = "site2_";
|
||||
};
|
||||
"site2.local" = {
|
||||
database.tablePrefix = "site2_";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
62
pkgs/applications/audio/indicator-sound-switcher/default.nix
Normal file
62
pkgs/applications/audio/indicator-sound-switcher/default.nix
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
{ python3Packages
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, perlPackages
|
||||
, gettext
|
||||
, gtk3
|
||||
, gobject-introspection
|
||||
, intltool, wrapGAppsHook, glib
|
||||
, librsvg
|
||||
, libayatana-appindicator-gtk3
|
||||
, libpulseaudio
|
||||
, keybinder3
|
||||
, gdk-pixbuf
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "indicator-sound-switcher";
|
||||
version = "2.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yktoo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "APU8Y0xUhRd9RbMSG9TD0TBvFLu/VlLGauf56z8gZDw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace lib/indicator_sound_switcher/lib_pulseaudio.py \
|
||||
--replace "CDLL('libpulse.so.0')" "CDLL('${libpulseaudio}/lib/libpulse.so')"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
intltool
|
||||
wrapGAppsHook
|
||||
glib
|
||||
gdk-pixbuf
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
librsvg
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python3Packages.setuptools
|
||||
python3Packages.pygobject3
|
||||
gtk3
|
||||
gobject-introspection
|
||||
librsvg
|
||||
libayatana-appindicator-gtk3
|
||||
libpulseaudio
|
||||
keybinder3
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sound input/output selector indicator for Linux";
|
||||
homepage = "https://yktoo.com/en/software/sound-switcher-indicator/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ alexnortung ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
93
pkgs/applications/blockchains/groestlcoin/default.nix
Normal file
93
pkgs/applications/blockchains/groestlcoin/default.nix
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, util-linux
|
||||
, hexdump
|
||||
, autoSignDarwinBinariesHook
|
||||
, wrapQtAppsHook ? null
|
||||
, boost
|
||||
, libevent
|
||||
, miniupnpc_2
|
||||
, zeromq
|
||||
, zlib
|
||||
, db53
|
||||
, sqlite
|
||||
, qrencode
|
||||
, qtbase ? null
|
||||
, qttools ? null
|
||||
, python3
|
||||
, withGui ? false
|
||||
, withWallet ? true
|
||||
}:
|
||||
|
||||
let
|
||||
version = "22.0";
|
||||
desktop = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/Groestlcoin/packaging/${version}/debian/groestlcoin-qt.desktop";
|
||||
sha256 = "0mxwq4jvcip44a796iwz7n1ljkhl3a4p47z7qlsxcfxw3zmm0k0k";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = if withGui then "groestlcoin" else "groestlcoind";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Groestlcoin";
|
||||
repo = "groestlcoin";
|
||||
rev = "v${version}";
|
||||
sha256 = "104zzcigpk976iqyinjn6mw3l36zb1if7249iz44ds1zaxv3g1v1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ]
|
||||
++ lib.optionals stdenv.isLinux [ util-linux ]
|
||||
++ lib.optionals stdenv.isDarwin [ hexdump ]
|
||||
++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]
|
||||
++ lib.optionals withGui [ wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ boost libevent miniupnpc_2 zeromq zlib ]
|
||||
++ lib.optionals withWallet [ db53 sqlite ]
|
||||
++ lib.optionals withGui [ qrencode qtbase qttools ];
|
||||
|
||||
postInstall = lib.optionalString withGui ''
|
||||
install -Dm644 ${desktop} $out/share/applications/groestlcoin-qt.desktop
|
||||
substituteInPlace $out/share/applications/groestlcoin-qt.desktop --replace "Icon=groestlcoin128" "Icon=groestlcoin"
|
||||
install -Dm644 share/pixmaps/groestlcoin256.png $out/share/pixmaps/groestlcoin.png
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-boost-libdir=${boost.out}/lib"
|
||||
"--disable-bench"
|
||||
] ++ lib.optionals (!withWallet) [
|
||||
"--disable-wallet"
|
||||
] ++ lib.optionals withGui [
|
||||
"--with-gui=qt5"
|
||||
"--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
|
||||
];
|
||||
|
||||
checkInputs = [ python3 ];
|
||||
|
||||
checkFlags = [ "LC_ALL=en_US.UTF-8" ]
|
||||
# QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Groestlcoin's GUI.
|
||||
# See also https://github.com/NixOS/nixpkgs/issues/24256
|
||||
++ lib.optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Peer-to-peer electronic cash system";
|
||||
longDescription = ''
|
||||
Groestlcoin is a free open source peer-to-peer electronic cash system that is
|
||||
completely decentralized, without the need for a central server or trusted
|
||||
parties. Users hold the crypto keys to their own money and transact directly
|
||||
with each other, with the help of a P2P network to check for double-spending.
|
||||
'';
|
||||
homepage = "https://groestlcoin.org/";
|
||||
downloadPage = "https://github.com/Groestlcoin/groestlcoin/releases/tag/v{version}/";
|
||||
maintainers = with maintainers; [ gruve-p ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
61
pkgs/applications/blockchains/snarkos/default.nix
Normal file
61
pkgs/applications/blockchains/snarkos/default.nix
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, rustPlatform
|
||||
, Security
|
||||
, curl
|
||||
, pkg-config
|
||||
, openssl
|
||||
, llvmPackages
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "snarkos";
|
||||
version = "unstable-2021-01-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AleoHQ";
|
||||
repo = "snarkOS";
|
||||
rev = "7068dc0394139c887f5187288ca2af54bc729614";
|
||||
sha256 = "sha256-fgdIJX/Ep3amPAjo00BtNGSXhaItw41S1XliDXk6b7k=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-bax7cnqVY49rdcWs73+KqW+dzPebKLlsbPvOM1d25zA=";
|
||||
|
||||
# buildAndTestSubdir = "cli";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config llvmPackages.clang ];
|
||||
|
||||
# Needed to get openssl-sys to use pkg-config.
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
OPENSSL_LIB_DIR = "${openssl.out}/lib";
|
||||
OPENSSL_DIR="${lib.getDev openssl}";
|
||||
|
||||
LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib";
|
||||
|
||||
# TODO check why rust compilation fails by including the rocksdb from nixpkgs
|
||||
# Used by build.rs in the rocksdb-sys crate. If we don't set these, it would
|
||||
# try to build RocksDB from source.
|
||||
# ROCKSDB_INCLUDE_DIR="${rocksdb}/include";
|
||||
# ROCKSDB_LIB_DIR="${rocksdb}/lib";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security curl ];
|
||||
|
||||
# some tests are flaky and some need network access
|
||||
# TODO finish filtering the tests to enable them
|
||||
doCheck = !stdenv.isLinux;
|
||||
# checkFlags = [
|
||||
# # tries to make a network access
|
||||
# "--skip=rpc::rpc::tests::test_send_transaction_large"
|
||||
# # flaky test
|
||||
# "--skip=helpers::block_requests::tests::test_block_requests_case_2ca"
|
||||
# ];
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Decentralized Operating System for Zero-Knowledge Applications";
|
||||
homepage = "https://snarkos.org";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,8 +2,10 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, which
|
||||
, capstone
|
||||
, jansson
|
||||
, libunistring
|
||||
, lua5_3
|
||||
, wxGTK31
|
||||
, Carbon
|
||||
|
|
@ -15,30 +17,33 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rehex";
|
||||
version = "0.3.92";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solemnwarning";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-yZvJlomUpJwDJOBVSl49lU+JE1YMMs/BSzHepXoFlIY=";
|
||||
hash = "sha256-NuWWaYABQDaS9wkwmXkBJWHzLFJbUUCiePNQNo4yZrk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile.osx --replace 'iconutil -c icns -o $@ $(ICONSET)' \
|
||||
'png2icns $@ $(ICONSET)/icon_16x16.png $(ICONSET)/icon_32x32.png $(ICONSET)/icon_128x128.png $(ICONSET)/icon_256x256.png $(ICONSET)/icon_512x512.png'
|
||||
# See https://github.com/solemnwarning/rehex/pull/148
|
||||
substituteInPlace Makefile.osx \
|
||||
--replace '$(filter-out %@2x.png,$(wildcard $(ICONSET)/*.png))' 'res/icon{16,32,128,256,512}.png'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
nativeBuildInputs = [ pkg-config which ]
|
||||
++ lib.optionals stdenv.isDarwin [ libicns ];
|
||||
|
||||
buildInputs = [ capstone jansson lua5_3 ]
|
||||
buildInputs = [ capstone jansson libunistring lua5_3 ]
|
||||
++ lib.optionals (!stdenv.isDarwin) [ wxGTK31 ]
|
||||
++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit wxmac ];
|
||||
|
||||
makeFlags = [ "prefix=$(out)" ]
|
||||
makeFlags = [ "prefix=${placeholder "out"}" ]
|
||||
++ lib.optionals stdenv.isDarwin [ "-f Makefile.osx" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Reverse Engineers' Hex Editor";
|
||||
longDescription = ''
|
||||
|
|
@ -46,7 +51,8 @@ stdenv.mkDerivation rec {
|
|||
engineering, and everything else.
|
||||
'';
|
||||
homepage = "https://github.com/solemnwarning/rehex";
|
||||
license = licenses.gpl2;
|
||||
changelog = "https://github.com/solemnwarning/rehex/raw/${version}/CHANGES.txt";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ markus1189 SuperSandro2000 ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, libtool
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, libtool
|
||||
, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre
|
||||
, lcms2, openexr, libjxl, libpng, liblqr1, libraw, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif
|
||||
, ApplicationServices
|
||||
|
|
@ -18,11 +18,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.0-19";
|
||||
version = "7.1.0-20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.imagemagick.org/ImageMagick/download/releases/ImageMagick-${version}.tar.xz";
|
||||
hash = "sha256-P9eRdKsPMLwWQ68+ZU8dL/zDqVVCY5gRVWiLT0n3/Xc=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
rev = version;
|
||||
sha256 = "0r8zmk2cfmf09l94hqzfz4aspnzn178ggdbgm7w4hr0p864cbvc3";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
|
|
|
|||
|
|
@ -1,21 +1,17 @@
|
|||
{ lib, stdenv, autoreconfHook, fetchurl, dbus-glib, gtk2, pkg-config, wordnet }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "artha";
|
||||
version = "1.0.3";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/artha/1.0.3/artha-1.0.3.tar.bz2";
|
||||
sha256 = "0qr4ihl7ma3cq82xi1fpzvf74mm9vsg0j035xvmcp3r6rmw2fycx";
|
||||
url = "mirror://sourceforge/artha/${version}/artha-${version}.tar.bz2";
|
||||
sha256 = "034r7vfk5y7705k068cdlq52ikp6ip10w6047a5zjdakbn55c3as";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ dbus-glib gtk2 wordnet ];
|
||||
|
||||
patches = [
|
||||
./gio-underlink.patch
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An offline thesaurus based on WordNet";
|
||||
homepage = "http://artha.sourceforge.net";
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index 0236d72..bcc1182 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -38,7 +38,7 @@ artha_LDADD = libwni.a $(WORDNET_LIB)
|
||||
|
||||
if POSIX
|
||||
AM_CFLAGS += @libdbus_CFLAGS@
|
||||
-artha_LDADD += -lX11 -ldbus-1 -ldbus-glib-1 -lgtk-x11-2.0 \
|
||||
+artha_LDADD += -lX11 -ldbus-1 -ldbus-glib-1 -lgio-2.0 -lgtk-x11-2.0 \
|
||||
-lgdk-x11-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0
|
||||
else
|
||||
artha_LDADD += @GTK_LIBS@
|
||||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "AusweisApp2";
|
||||
version = "1.22.2";
|
||||
version = "1.22.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Governikus";
|
||||
repo = "AusweisApp2";
|
||||
rev = version;
|
||||
sha256 = "sha256-Oci1y6//45Gep4IS6Ym+v9MPCP5mOswAiWPkXqd+zR0=";
|
||||
sha256 = "sha256-Zh1rWMdRXPj/+80Sqvp9cbV5sDrNVBebPRGTTWM1DLk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, python3, fetchFromGitHub }:
|
||||
{ lib, python3, fetchFromGitHub, withServer ? false }:
|
||||
|
||||
let
|
||||
python3' = python3.override {
|
||||
|
|
@ -19,6 +19,21 @@ let
|
|||
});
|
||||
};
|
||||
};
|
||||
serverRequire = with python3'.pkgs; [
|
||||
requests
|
||||
flask
|
||||
flask-admin
|
||||
flask-api
|
||||
flask-bootstrap
|
||||
flask-paginate
|
||||
flask-reverse-proxy-fix
|
||||
flask_wtf
|
||||
arrow
|
||||
werkzeug
|
||||
click
|
||||
vcrpy
|
||||
toml
|
||||
];
|
||||
in
|
||||
with python3'.pkgs; buildPythonApplication rec {
|
||||
version = "4.6";
|
||||
|
|
@ -32,40 +47,29 @@ with python3'.pkgs; buildPythonApplication rec {
|
|||
};
|
||||
|
||||
checkInputs = [
|
||||
pytest-cov
|
||||
hypothesis
|
||||
pytest
|
||||
pytest-vcr
|
||||
pylint
|
||||
flake8
|
||||
pyyaml
|
||||
mypy-extensions
|
||||
click
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cryptography
|
||||
beautifulsoup4
|
||||
requests
|
||||
certifi
|
||||
urllib3
|
||||
flask
|
||||
flask-admin
|
||||
flask-api
|
||||
flask-bootstrap
|
||||
flask-paginate
|
||||
flask-reverse-proxy-fix
|
||||
flask_wtf
|
||||
arrow
|
||||
werkzeug
|
||||
click
|
||||
html5lib
|
||||
vcrpy
|
||||
toml
|
||||
];
|
||||
] ++ lib.optionals withServer serverRequire;
|
||||
|
||||
postPatch = ''
|
||||
# Jailbreak problematic dependencies
|
||||
sed -i \
|
||||
-e "s,'PyYAML.*','PyYAML',g" \
|
||||
-e "/'pytest-cov/d" \
|
||||
-e "/'pylint/d" \
|
||||
-e "/'flake8/d" \
|
||||
setup.py
|
||||
'';
|
||||
|
||||
|
|
@ -80,6 +84,8 @@ with python3'.pkgs; buildPythonApplication rec {
|
|||
--replace "self.assertEqual(url, \"https://www.google.com\")" ""
|
||||
substituteInPlace setup.py \
|
||||
--replace mypy-extensions==0.4.1 mypy-extensions>=0.4.1
|
||||
'' + lib.optionalString (!withServer) ''
|
||||
rm tests/test_{server,views}.py
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
|
@ -89,6 +95,8 @@ with python3'.pkgs; buildPythonApplication rec {
|
|||
cp auto-completion/zsh/* $out/share/zsh/site-functions
|
||||
cp auto-completion/bash/* $out/share/bash-completion/completions
|
||||
cp auto-completion/fish/* $out/share/fish/vendor_completions.d
|
||||
'' + lib.optionalString (!withServer) ''
|
||||
rm $out/bin/bukuserver
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -99,4 +107,3 @@ with python3'.pkgs; buildPythonApplication rec {
|
|||
maintainers = with maintainers; [ matthiasbeyer infinisil ma27 ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clifm";
|
||||
version = "1.3";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leo-arch";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nYBGM3gUj1NGrxNLt0xpNl00cgS2Ecs3kYjZapiJT48=";
|
||||
sha256 = "sha256-62WxvJsXkzvDqFGFpid9VDB1mARgllkKnb6mFC5pdl8=";
|
||||
};
|
||||
|
||||
buildInputs = [ libcap acl file readline ];
|
||||
|
|
|
|||
34
pkgs/applications/misc/firefly-desktop/default.nix
Normal file
34
pkgs/applications/misc/firefly-desktop/default.nix
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
{ lib, fetchurl, appimageTools }:
|
||||
|
||||
let
|
||||
pname = "firefly-desktop";
|
||||
version = "1.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/iotaledger/firefly/releases/download/desktop-${version}/${pname}-${version}.AppImage";
|
||||
sha256 = "f3162efcf0407614fd1351af50e95ef180400b747a5cc6b82bc840828a15548d";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
|
||||
in appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
|
||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
mkdir -p $out/share/applications $out/share/pixmaps
|
||||
mv $out/bin/${pname}-${version} $out/bin/firefly-desktop
|
||||
cp ${appimageContents}/desktop.desktop $out/share/applications/firefly-desktop.desktop
|
||||
substituteInPlace $out/share/applications/firefly-desktop.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=firefly-desktop' \
|
||||
--replace 'Icon=desktop' 'Icon=firefly-desktop'
|
||||
cp ${appimageContents}/desktop.png $out/share/pixmaps/firefly-desktop.png
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "IOTA's New Wallet";
|
||||
homepage = "https://firefly.iota.org";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "qcad";
|
||||
version = "3.27.1.0";
|
||||
version = "3.27.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qcad";
|
||||
repo = "qcad";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tydgSfS1MF322sgWULMEZ8P6YIaN1QoeJiia0wbsgjo=";
|
||||
sha256 = "sha256-DHDfDwGrYMRd5gxFaPL06B/wssQho9420MxUg8fI2r0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
51
pkgs/applications/misc/rivercarro/default.nix
Normal file
51
pkgs/applications/misc/rivercarro/default.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromSourcehut
|
||||
, zig
|
||||
, river
|
||||
, wayland
|
||||
, pkg-config
|
||||
, scdoc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rivercarro";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~novakane";
|
||||
repo = pname;
|
||||
fetchSubmodules = true;
|
||||
rev = "v${version}";
|
||||
sha256 = "0h1wvl6rlrpr67zl51x71hy7nwkfd5kfv5p2mql6w5fybxxyqnpm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
river
|
||||
scdoc
|
||||
wayland
|
||||
zig
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
preBuild = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
zig build -Drelease-safe -Dcpu=baseline -Dman-pages --prefix $out install
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://git.sr.ht/~novakane/rivercarro";
|
||||
description = "A layout generator for river Wayland compositor, fork of rivertile";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ kraem ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ttyper";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "max-niederman";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UptjgFGp4QNG8eLuqBzg/Kd5p5Rms3yT172hbf/2hi4=";
|
||||
sha256 = "sha256-e001uftwIwnCpjf4OH89QWaYyT99aMZhCPqDxyAsHyU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-N10X5eJlpDKmCEffEXpkAejS32Lz183Lup0mmLMwOSU=";
|
||||
cargoSha256 = "sha256-RvqktyPZtdKC8RVtLWpT1YYsdgyfHaL7W3+vO8RgG/8=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Terminal-based typing test";
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
|
||||
let
|
||||
pname = "zettlr";
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
name = "${pname}-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage";
|
||||
sha256 = "sha256-neqgUXvCxjKQii3uOwXed0S/2FhWly/1tiHY2snyHrc=";
|
||||
sha256 = "sha256-gfq5eXSoEfOb3FVAv/iDDSGeEeZxFRp4BFtwf87WQGE=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit name src;
|
||||
|
|
|
|||
|
|
@ -15,16 +15,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zola";
|
||||
version = "0.15.2";
|
||||
version = "0.15.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getzola";
|
||||
repo = "zola";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-X4J3T/ob0NfCFxddadBtsPsDhfvesg6/sBJybWeubMM=";
|
||||
sha256 = "sha256-LK8twqWaS+SQ3oqvMGE7oP/IJNLvQ45Pu92pkbSKzDs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-0tynm/DTX2oiqZOdWjRBGPk8IPIN07x2+FCXQmQ4Fzo=";
|
||||
cargoSha256 = "sha256-7W0vjbAWZl/eKBZvUWWWolEOh8aQeKegt823EebcKMQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Production-Grade Container Scheduling and Management";
|
||||
license = licenses.asl20;
|
||||
homepage = "https://kubernetes.io";
|
||||
maintainers = with maintainers; [ johanot offline saschagrunert ];
|
||||
maintainers = with maintainers; [ ] ++ teams.kubernetes.members;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -40,10 +40,10 @@
|
|||
"owner": "aliyun",
|
||||
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
|
||||
"repo": "terraform-provider-alicloud",
|
||||
"rev": "v1.152.0",
|
||||
"sha256": "1childp3dkdi6raya1865inkky2qx1jav95yq9c57gz20zs27x8a",
|
||||
"rev": "v1.153.0",
|
||||
"sha256": "1h37sxzkngmikvmyj9isx45vcpd31ml47f4r6ii1h2l69182hsqs",
|
||||
"vendorSha256": "18chs2723i2cxhhm649mz52pp6wrfqzxgk12zxq9idrhicchqnzg",
|
||||
"version": "1.152.0"
|
||||
"version": "1.153.0"
|
||||
},
|
||||
"ansible": {
|
||||
"owner": "nbering",
|
||||
|
|
@ -67,10 +67,10 @@
|
|||
"owner": "alexkappa",
|
||||
"provider-source-address": "registry.terraform.io/alexkappa/auth0",
|
||||
"repo": "terraform-provider-auth0",
|
||||
"rev": "v0.25.0",
|
||||
"sha256": "0ibscxhwj92k8p43apnxyl9sly7pldv0lgcikjfjj352084q4k62",
|
||||
"rev": "v0.26.1",
|
||||
"sha256": "03nzwsda6n1nycpk2w87b8fj6aqzid8i2fa29qd9skwplm7hyjfk",
|
||||
"vendorSha256": "0k6lylkcdvm0piaic8hdbhg1jf1vzc897w1sq7v57brx7586h3sc",
|
||||
"version": "0.25.0"
|
||||
"version": "0.26.1"
|
||||
},
|
||||
"avi": {
|
||||
"owner": "vmware",
|
||||
|
|
@ -94,10 +94,10 @@
|
|||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/aws",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v3.72.0",
|
||||
"sha256": "0xkwqh7akc7rf047w6by4368n2bpn4lijk9j6j3wsgbaffw0xjlb",
|
||||
"vendorSha256": "0apvp3vb3qx2l6698x4ai3spz40l6mb3z8gn45ms2vlxcwp2wf7y",
|
||||
"version": "3.72.0"
|
||||
"rev": "v3.73.0",
|
||||
"sha256": "0la188dljw15l09j2farlhgri0vhrlbmsay7q1ar2y4ralqlsgl8",
|
||||
"vendorSha256": "1h2x1318ax4qdy261wm8pqxq21ra50hymcykhw6mhj5lqxcb5r5z",
|
||||
"version": "3.73.0"
|
||||
},
|
||||
"azuread": {
|
||||
"owner": "hashicorp",
|
||||
|
|
@ -112,10 +112,10 @@
|
|||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v2.92.0",
|
||||
"sha256": "0p4vxda4n7895xp7aqg4zqddynjn7hnzsc8am83y8hf9hbfaji8q",
|
||||
"rev": "v2.93.0",
|
||||
"sha256": "0akacaih0smdjxh9ssdir1j248m5bpcc4wpwhykb7922yvj581ds",
|
||||
"vendorSha256": null,
|
||||
"version": "2.92.0"
|
||||
"version": "2.93.0"
|
||||
},
|
||||
"azurestack": {
|
||||
"owner": "hashicorp",
|
||||
|
|
@ -139,10 +139,10 @@
|
|||
"owner": "F5Networks",
|
||||
"provider-source-address": "registry.terraform.io/F5Networks/bigip",
|
||||
"repo": "terraform-provider-bigip",
|
||||
"rev": "v1.12.1",
|
||||
"sha256": "0dpgxcdcpv6y25ffs0gp2pvq8z9yfh7hdqll25d0b09z0pqgb61q",
|
||||
"rev": "v1.12.2",
|
||||
"sha256": "08qs8psr4wy5f9qiv7chkmmsls19dwj2p2k6fqxdrd6pj2154rcg",
|
||||
"vendorSha256": null,
|
||||
"version": "1.12.1"
|
||||
"version": "1.12.2"
|
||||
},
|
||||
"brightbox": {
|
||||
"owner": "brightbox",
|
||||
|
|
@ -248,10 +248,10 @@
|
|||
"owner": "DataDog",
|
||||
"provider-source-address": "registry.terraform.io/DataDog/datadog",
|
||||
"repo": "terraform-provider-datadog",
|
||||
"rev": "v3.7.0",
|
||||
"sha256": "0fynbn0zbplslbvqz0jij4gm8q6ydg697x7nh5rzw89dy26l2f8g",
|
||||
"vendorSha256": "0ngvbc9h3csl811g40q707flf4dl1hal95hpkxsvz7p71s3371q8",
|
||||
"version": "3.7.0"
|
||||
"rev": "v3.8.1",
|
||||
"sha256": "0mvl80dsqzab1r3p5n446737dadzfbsyfbdy2w2xvmz4fgx6aklh",
|
||||
"vendorSha256": "0p8czqb4hn5z9bfgsfajdpx46hwil0ax75j8xljlh1ccvpp2rvyz",
|
||||
"version": "3.8.1"
|
||||
},
|
||||
"dhall": {
|
||||
"owner": "awakesecurity",
|
||||
|
|
@ -347,10 +347,10 @@
|
|||
"owner": "fastly",
|
||||
"provider-source-address": "registry.terraform.io/fastly/fastly",
|
||||
"repo": "terraform-provider-fastly",
|
||||
"rev": "v0.40.0",
|
||||
"sha256": "11gf1xmj0qgn3hfw4hviqnfc23rrfd3qxz82idff4f1i7c5kym1i",
|
||||
"rev": "v0.41.0",
|
||||
"sha256": "096dwysa1awyb4a1fay9sw1i784cki8q4x141f9gan5w1qwns89y",
|
||||
"vendorSha256": null,
|
||||
"version": "0.40.0"
|
||||
"version": "0.41.0"
|
||||
},
|
||||
"flexibleengine": {
|
||||
"owner": "FlexibleEngineCloud",
|
||||
|
|
@ -383,10 +383,10 @@
|
|||
"owner": "integrations",
|
||||
"provider-source-address": "registry.terraform.io/integrations/github",
|
||||
"repo": "terraform-provider-github",
|
||||
"rev": "v4.19.1",
|
||||
"sha256": "0dixdw0215ksa76871mac60k7y0vm111f3jay9njsa1ljz8rwhnd",
|
||||
"rev": "v4.19.2",
|
||||
"sha256": "0k6w1wxx9a67wkgh4j4aswbpcnlnjcvqnfi0gy2rw9kqbyxb9j0m",
|
||||
"vendorSha256": null,
|
||||
"version": "4.19.1"
|
||||
"version": "4.19.2"
|
||||
},
|
||||
"gitlab": {
|
||||
"owner": "gitlabhq",
|
||||
|
|
@ -402,20 +402,20 @@
|
|||
"provider-source-address": "registry.terraform.io/hashicorp/google",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google",
|
||||
"rev": "v4.6.0",
|
||||
"sha256": "0vi0crc4i5myzw17knvb3zz0yjpg7v1qvp9rjrb0q6v89nafr30c",
|
||||
"vendorSha256": "17rlq86zl83cav8pinr8am3wkmva4slab2izmxddhiw3na60a4la",
|
||||
"version": "4.6.0"
|
||||
"rev": "v4.7.0",
|
||||
"sha256": "15w69dyr0s818as7v8pwzdbfs82l23qn846a7xlihw2g49xk0cah",
|
||||
"vendorSha256": "144kv885w2gfsljj8vx7q9pgrpyshpn392162ljzpjb6qx3qzzxj",
|
||||
"version": "4.7.0"
|
||||
},
|
||||
"google-beta": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google-beta",
|
||||
"rev": "v4.6.0",
|
||||
"sha256": "0kbdpyln8yy3128g43y134v5li9k5a6mb2fwa0jl8zffmhfc209k",
|
||||
"vendorSha256": "17rlq86zl83cav8pinr8am3wkmva4slab2izmxddhiw3na60a4la",
|
||||
"version": "4.6.0"
|
||||
"rev": "v4.7.0",
|
||||
"sha256": "0jnz05yvhlawgc188xazv1fvqsqvpm867xf3i93xpl248pr1vqlf",
|
||||
"vendorSha256": "144kv885w2gfsljj8vx7q9pgrpyshpn392162ljzpjb6qx3qzzxj",
|
||||
"version": "4.7.0"
|
||||
},
|
||||
"grafana": {
|
||||
"owner": "grafana",
|
||||
|
|
@ -430,10 +430,10 @@
|
|||
"owner": "gridscale",
|
||||
"provider-source-address": "registry.terraform.io/gridscale/gridscale",
|
||||
"repo": "terraform-provider-gridscale",
|
||||
"rev": "v1.13.0",
|
||||
"sha256": "0m4n1ih7fzwxrnd3b70i4xl0nrwbpw8f6hh1fpa02jv7znpdp7l8",
|
||||
"rev": "v1.14.0",
|
||||
"sha256": "1syi3hvmff8dkbh538r4acbr5r72nmd073fvr52zcn0a9bc3q9np",
|
||||
"vendorSha256": null,
|
||||
"version": "1.13.0"
|
||||
"version": "1.14.0"
|
||||
},
|
||||
"hcloud": {
|
||||
"owner": "hetznercloud",
|
||||
|
|
@ -583,19 +583,19 @@
|
|||
"owner": "launchdarkly",
|
||||
"provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly",
|
||||
"repo": "terraform-provider-launchdarkly",
|
||||
"rev": "v2.3.0",
|
||||
"sha256": "1yvxzhwx5nm53gjaqxzsfkc8khgyi2va1a9kjwmkhzqghzl4w5nw",
|
||||
"vendorSha256": "0pmnhlfmi9i6xblz62ysnw02p4i8iz6naqpna99gbgyllnj5asdg",
|
||||
"version": "2.3.0"
|
||||
"rev": "v2.4.1",
|
||||
"sha256": "1smrdhg6fn9lzrlh0mz822zibnvd1487w5qn38l71ark9dadahqv",
|
||||
"vendorSha256": "13vcxvw56bn7mdz917lvdryd2d7mcvi83ykbzjfbpxr4lzrrm9qw",
|
||||
"version": "2.4.1"
|
||||
},
|
||||
"libvirt": {
|
||||
"owner": "dmacvicar",
|
||||
"provider-source-address": "registry.terraform.io/dmacvicar/libvirt",
|
||||
"repo": "terraform-provider-libvirt",
|
||||
"rev": "v0.6.12",
|
||||
"sha256": "1kqpy1cr7vg4iclxwd7wa4fmhw63l3z5gn07knfx9in7nm380pyn",
|
||||
"vendorSha256": "0l9wr4g77chmshcfibdbl23rs8y8bxgiar4n152gkr0z12jvr5iq",
|
||||
"version": "0.6.12"
|
||||
"rev": "v0.6.13",
|
||||
"sha256": "1fvxvijl5vjx7gb4w19pf4gcq97pisiznr2n72ybpma46c2clx2h",
|
||||
"vendorSha256": "0rck411b4dh2zh4m4m6h2d03zlv5wm94li9dq5ggr0lspfx6nv1i",
|
||||
"version": "0.6.13"
|
||||
},
|
||||
"linode": {
|
||||
"owner": "linode",
|
||||
|
|
@ -638,10 +638,10 @@
|
|||
"owner": "terraform-lxd",
|
||||
"provider-source-address": "registry.terraform.io/terraform-lxd/lxd",
|
||||
"repo": "terraform-provider-lxd",
|
||||
"rev": "v1.6.0",
|
||||
"sha256": "07h159mjbddkf3ishhdknqn10pyb2wh9yavjps5mwmdbiii6qpvy",
|
||||
"rev": "v1.7.0",
|
||||
"sha256": "1fg9ad6zmkkg8j4sqfan3ibjjb73digg10k5h8xaii778r9bh311",
|
||||
"vendorSha256": "11x12jxh4q99hinpljqfchysgkhch93sgv0mz065ws20y0dxzfvs",
|
||||
"version": "1.6.0"
|
||||
"version": "1.7.0"
|
||||
},
|
||||
"mailgun": {
|
||||
"owner": "wgebis",
|
||||
|
|
@ -766,10 +766,10 @@
|
|||
"owner": "terraform-providers",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/oci",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v4.59.0",
|
||||
"sha256": "12i4j95g08c887xxplc90hcxwsrpwcn5qjyy5inazr21vqscjx2h",
|
||||
"rev": "v4.60.0",
|
||||
"sha256": "02wxisy2c9g6kkg6wrgv99qfrds26xwqfj2m3v97y0ldpi2fhbpa",
|
||||
"vendorSha256": null,
|
||||
"version": "4.59.0"
|
||||
"version": "4.60.0"
|
||||
},
|
||||
"okta": {
|
||||
"owner": "okta",
|
||||
|
|
@ -803,10 +803,10 @@
|
|||
"owner": "OpenNebula",
|
||||
"provider-source-address": "registry.terraform.io/OpenNebula/opennebula",
|
||||
"repo": "terraform-provider-opennebula",
|
||||
"rev": "v0.3.0",
|
||||
"sha256": "110mzxr2mk9hzw7nfisyl4in7r7q4m280szzgc3bzlp9sjvqgg3y",
|
||||
"vendorSha256": "1wp9dk5kcrkmcx7mh5inbq3zd7qwp8sbl9hc0svaf44mf1p9446w",
|
||||
"version": "0.3.0"
|
||||
"rev": "v0.4.0",
|
||||
"sha256": "1r6v1ksis0h9mairvn9mwk49dkn6s6ixi8j0jaz9w173lx5si917",
|
||||
"vendorSha256": "0qyzavig8wnnjzm63pny5azywqyrnjm978yg5y0sr6zw8wghjd15",
|
||||
"version": "0.4.0"
|
||||
},
|
||||
"openstack": {
|
||||
"owner": "terraform-provider-openstack",
|
||||
|
|
@ -821,10 +821,10 @@
|
|||
"owner": "opentelekomcloud",
|
||||
"provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud",
|
||||
"repo": "terraform-provider-opentelekomcloud",
|
||||
"rev": "v1.27.2",
|
||||
"sha256": "1icfsjpch6plp9qbx0snn55kvkba0kvnd0skwdhzxi66xcdw0s9b",
|
||||
"vendorSha256": "0dc4l5swfw666mpm5q67gm45abkm9zsvibqrja910h6rrp387576",
|
||||
"version": "1.27.2"
|
||||
"rev": "v1.27.3",
|
||||
"sha256": "17n1vy9h2blw9k3p82sbcz9zbj4hilg33qga5n09nq2ngafagazg",
|
||||
"vendorSha256": "12ahdbb83gxb9dcax635ngr54cqvnydr7l65h5dvv7b2gfldb1ki",
|
||||
"version": "1.27.3"
|
||||
},
|
||||
"opsgenie": {
|
||||
"owner": "opsgenie",
|
||||
|
|
@ -1055,10 +1055,10 @@
|
|||
"owner": "tencentcloudstack",
|
||||
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.61.1",
|
||||
"sha256": "1v6b8ldg6pkphqy5aphdhig1q3iizzfrj611k39lyk1q3q914yf4",
|
||||
"rev": "v1.61.2",
|
||||
"sha256": "1i9jyz4r344swdvnnpgz2s1ds5b5s2hif3bjr82mmfd7gshyagnq",
|
||||
"vendorSha256": null,
|
||||
"version": "1.61.1"
|
||||
"version": "1.61.2"
|
||||
},
|
||||
"tfe": {
|
||||
"owner": "hashicorp",
|
||||
|
|
@ -1128,10 +1128,10 @@
|
|||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/vault",
|
||||
"repo": "terraform-provider-vault",
|
||||
"rev": "v3.1.1",
|
||||
"sha256": "15fwc0sfdpcl85194gq6r97y18ggh61wbyh6lq7nrprwn2xvjch9",
|
||||
"vendorSha256": "1q2yfmg6g3bl6h0vzanz7874xc4g7ggmysh2dqryijvr4kccnari",
|
||||
"version": "3.1.1"
|
||||
"rev": "v3.2.1",
|
||||
"sha256": "0y8vvc5mckzjs24x36rihl1vdvh9k2kazn5lsqvq6apv36kg5vw4",
|
||||
"vendorSha256": "0j5kz5jvyds701gq89v8dcsvm67kbfxxgzjvmn74ms3nrkx8hr84",
|
||||
"version": "3.2.1"
|
||||
},
|
||||
"vcd": {
|
||||
"owner": "vmware",
|
||||
|
|
@ -1192,10 +1192,10 @@
|
|||
"owner": "vultr",
|
||||
"provider-source-address": "registry.terraform.io/vultr/vultr",
|
||||
"repo": "terraform-provider-vultr",
|
||||
"rev": "v2.8.1",
|
||||
"sha256": "1dhfxr6a4kj1llalfw76w36iw6vcdk1p0nb90kfkpg2sh58a6rid",
|
||||
"rev": "v2.9.0",
|
||||
"sha256": "0hx1n1wcjx40s94bysr14j0w4bc1xzkrrmkpjcwwbqywn75p6ggw",
|
||||
"vendorSha256": null,
|
||||
"version": "2.8.1"
|
||||
"version": "2.9.0"
|
||||
},
|
||||
"wavefront": {
|
||||
"owner": "vmware",
|
||||
|
|
@ -1210,9 +1210,9 @@
|
|||
"owner": "yandex-cloud",
|
||||
"provider-source-address": "registry.terraform.io/yandex-cloud/yandex",
|
||||
"repo": "terraform-provider-yandex",
|
||||
"rev": "v0.69.0",
|
||||
"sha256": "0k4py0asibcpfl9w8q0bn3rfjxhxf6cs3g53j35qij3gakqf1w2i",
|
||||
"rev": "v0.70.0",
|
||||
"sha256": "0dmhzjwcd0j7rfczxahami23yjcc0pr10m12iig3z4hj9kgikzvy",
|
||||
"vendorSha256": "0zx2lq9va0llrjlf3lk8pnx6f5knmi4jjxrnll89kp01imydjqv8",
|
||||
"version": "0.69.0"
|
||||
"version": "0.70.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.35.20";
|
||||
version = "0.36.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iSD036rDZvvMUGMHnjKh69eVUVQakI8muSCCq2ytODM=";
|
||||
sha256 = "sha256-HUhV6FcLd75ZOPKw9Fl+7KUsSVG7HpQ6X2JZo9C9eeA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-tNgEepKqwiqXhmoRCIEg7VJw7Y0TGt+R+6dZzd8aECg=";
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.2.11";
|
||||
version = "3.2.13";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
src = fetchFromGitHub {
|
||||
owner = "flexget";
|
||||
repo = "flexget";
|
||||
rev = "v${version}";
|
||||
sha256 = "1l9xy8k0imfdg4r03k659f85z945bksx672gqhkchf2svi2vnvql";
|
||||
sha256 = "0pk6f9vrj01a91h86d5mvngwvxq9r6idbrfax1nfsissvssy6p07";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,22 +1,24 @@
|
|||
{ lib
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, meson
|
||||
, gobject-introspection
|
||||
, pkg-config
|
||||
, ninja
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
, gtk3
|
||||
, wrapGAppsHook4
|
||||
, gtk4
|
||||
, gdk-pixbuf
|
||||
, webkitgtk
|
||||
, gtksourceview4
|
||||
, libhandy
|
||||
, gtksourceview5
|
||||
, glib-networking
|
||||
, libadwaita
|
||||
, appstream
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "giara";
|
||||
version = "0.3";
|
||||
version = "1.0";
|
||||
|
||||
format = "other";
|
||||
|
||||
|
|
@ -25,24 +27,25 @@ python3.pkgs.buildPythonApplication rec {
|
|||
owner = "World";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "004qmkfrgd37axv0b6hfh6v7nx4pvy987k5yv4bmlmkj9sbqm6f9";
|
||||
hash = "sha256-xDIzgr8zYal0r0sASWqiSZANCMC52LrVmLjlnGAd2Mg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
appstream
|
||||
meson
|
||||
gobject-introspection
|
||||
pkg-config
|
||||
ninja
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
gtk4
|
||||
gdk-pixbuf
|
||||
webkitgtk
|
||||
gtksourceview4
|
||||
libhandy
|
||||
gtksourceview5
|
||||
glib-networking
|
||||
libadwaita
|
||||
];
|
||||
|
||||
pythonPath = with python3.pkgs; [
|
||||
|
|
@ -55,6 +58,21 @@ python3.pkgs.buildPythonApplication rec {
|
|||
beautifulsoup4
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Proper support for gtk4 and libadwaita
|
||||
# @TODO: Remove when bumping the version.
|
||||
(fetchpatch {
|
||||
name = "giara-gtk4-libadwaita.patch";
|
||||
url = "https://gitlab.gnome.org/World/giara/-/commit/6204427f8b8e3d8c72b669717a3f129ffae401d9.patch";
|
||||
sha256 = "sha256-E8kbVsACPD2gkfNrzYUy0+1U7+/pIkUu4rCkX+xY0us=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace meson_post_install.py \
|
||||
--replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
|
||||
'';
|
||||
|
||||
# Fix setup-hooks https://github.com/NixOS/nixpkgs/issues/56943
|
||||
strictDeps = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "deltachat-cursed";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adbenitez";
|
||||
repo = "deltachat-cursed";
|
||||
rev = "v${version}";
|
||||
sha256 = "0zzzrzc8yxw6ffwfirbrr5ahbidbvlwdvgdg82zjsdjjbarxph8c";
|
||||
hash = "sha256-IZrTPnj6eX1qgEPnEiD9qmVkwn1SMK38gVKAJFgZNfw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ let
|
|||
|
||||
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
|
||||
# source of the latter disappears much faster.
|
||||
version = "8.79.0.95";
|
||||
version = "8.80.0.143";
|
||||
|
||||
rpath = lib.makeLibraryPath [
|
||||
alsa-lib
|
||||
|
|
@ -69,7 +69,7 @@ let
|
|||
"https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
|
||||
"https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
|
||||
];
|
||||
sha256 = "sha256-a6ZtgA0cMAuNVQWAeiIDJ2noPhXjV8KPE8ibkGR7Dns=";
|
||||
sha256 = "sha256-SLypP+ZRHMWeB3KuvmmYb0Y1T3ipSpWNiYYQIzMCDDY=";
|
||||
}
|
||||
else
|
||||
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution-ews";
|
||||
version = "3.42.1";
|
||||
version = "3.42.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "nCvGMSfDS0GUQfF8zomVq+gKf9H72X896zptRy9/Xy0=";
|
||||
sha256 = "qgi2ycWlzY4PaiEMHu0Rd3bN2aqFcLtxkII1MzZXls4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake gettext intltool pkg-config ];
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
, flask
|
||||
, flask-httpauth
|
||||
, flask-socketio
|
||||
, stem
|
||||
, cepa
|
||||
, psutil
|
||||
, pyqt5
|
||||
, pycrypto
|
||||
|
|
@ -21,15 +21,16 @@
|
|||
, unidecode
|
||||
, tor
|
||||
, obfs4
|
||||
, snowflake
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.4";
|
||||
version = "2.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "onionshare";
|
||||
repo = "onionshare";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Lclm7mIkaAkQpWcNILTRJtLA43dpiyHtWAeHS2r3+ZQ=";
|
||||
sha256 = "xCAM+tjjyDg/gqAXr4YNPhM8R3n9r895jktisAGlpZo=";
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "Securely and anonymously send and receive files";
|
||||
|
|
@ -55,16 +56,9 @@ let
|
|||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ lourkeur ];
|
||||
};
|
||||
stem' = stem.overridePythonAttrs (_: rec {
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onionshare";
|
||||
repo = "stem";
|
||||
rev = version;
|
||||
sha256 = "Dzpvx7CgAr5OtGmfubWAYDLqq5LkGqcwjr3bxpfL/3A=";
|
||||
};
|
||||
});
|
||||
# TODO: package meek https://support.torproject.org/glossary/meek/
|
||||
meek = "/meek-not-available";
|
||||
|
||||
in
|
||||
rec {
|
||||
|
|
@ -76,7 +70,7 @@ rec {
|
|||
# hardcode store paths of dependencies
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
inherit tor obfs4;
|
||||
inherit tor meek obfs4 snowflake;
|
||||
inherit (tor) geoip;
|
||||
})
|
||||
];
|
||||
|
|
@ -86,7 +80,7 @@ rec {
|
|||
flask
|
||||
flask-httpauth
|
||||
flask-socketio
|
||||
stem'
|
||||
cepa
|
||||
psutil
|
||||
pycrypto
|
||||
pynacl
|
||||
|
|
@ -109,8 +103,6 @@ rec {
|
|||
'';
|
||||
|
||||
disabledTests = [
|
||||
"test_firefox_like_behavior"
|
||||
"test_if_unmodified_since"
|
||||
"test_get_tor_paths_linux" # expects /usr instead of /nix/store
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# on darwin (and only on darwin) onionshare attempts to discover
|
||||
|
|
@ -123,12 +115,12 @@ rec {
|
|||
onionshare-gui = buildPythonApplication {
|
||||
pname = "onionshare";
|
||||
inherit version meta;
|
||||
src = "${src}/desktop/src";
|
||||
src = "${src}/desktop";
|
||||
patches = [
|
||||
# hardcode store paths of dependencies
|
||||
(substituteAll {
|
||||
src = ./fix-paths-gui.patch;
|
||||
inherit tor obfs4;
|
||||
inherit tor meek obfs4 snowflake;
|
||||
inherit (tor) geoip;
|
||||
})
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,25 +1,46 @@
|
|||
--- a/onionshare/gui_common.py
|
||||
+++ b/onionshare/gui_common.py
|
||||
@@ -391,29 +391,10 @@ class GuiCommon:
|
||||
@@ -410,52 +410,12 @@ class GuiCommon:
|
||||
}
|
||||
|
||||
def get_tor_paths(self):
|
||||
- if self.common.platform == "Linux":
|
||||
- tor_path = shutil.which("tor")
|
||||
- obfs4proxy_file_path = shutil.which("obfs4proxy")
|
||||
- prefix = os.path.dirname(os.path.dirname(tor_path))
|
||||
- tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip")
|
||||
- tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6")
|
||||
- elif self.common.platform == "Windows":
|
||||
- base_path = self.get_resource_path("tor")
|
||||
- if base_path and os.path.isdir(base_path):
|
||||
- self.common.log(
|
||||
- "GuiCommon", "get_tor_paths", "using paths in resources"
|
||||
- )
|
||||
- tor_path = os.path.join(base_path, "tor")
|
||||
- tor_geo_ip_file_path = os.path.join(base_path, "geoip")
|
||||
- tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6")
|
||||
- obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy")
|
||||
- snowflake_file_path = os.path.join(base_path, "snowflake-client")
|
||||
- meek_client_file_path = os.path.join(base_path, "meek-client")
|
||||
- else:
|
||||
- # Fallback to looking in the path
|
||||
- self.common.log("GuiCommon", "get_tor_paths", "using paths from PATH")
|
||||
- tor_path = shutil.which("tor")
|
||||
- obfs4proxy_file_path = shutil.which("obfs4proxy")
|
||||
- snowflake_file_path = shutil.which("snowflake-client")
|
||||
- meek_client_file_path = shutil.which("meek-client")
|
||||
- prefix = os.path.dirname(os.path.dirname(tor_path))
|
||||
- tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip")
|
||||
- tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6")
|
||||
-
|
||||
- if self.common.platform == "Windows":
|
||||
- base_path = self.get_resource_path("tor")
|
||||
- tor_path = os.path.join(base_path, "Tor", "tor.exe")
|
||||
- obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe")
|
||||
- snowflake_file_path = os.path.join(base_path, "Tor", "snowflake-client.exe")
|
||||
- meek_client_file_path = os.path.join(base_path, "Tor", "meek-client.exe")
|
||||
- tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip")
|
||||
- tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6")
|
||||
- elif self.common.platform == "Darwin":
|
||||
- base_path = self.get_resource_path("tor")
|
||||
- tor_path = os.path.join(base_path, "tor")
|
||||
- obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy")
|
||||
- snowflake_file_path = os.path.join(base_path, "snowflake-client")
|
||||
- meek_client_file_path = os.path.join(base_path, "meek-client")
|
||||
- tor_geo_ip_file_path = os.path.join(base_path, "geoip")
|
||||
- tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6")
|
||||
- elif self.common.platform == "BSD":
|
||||
|
|
@ -27,10 +48,14 @@
|
|||
- tor_geo_ip_file_path = "/usr/local/share/tor/geoip"
|
||||
- tor_geo_ipv6_file_path = "/usr/local/share/tor/geoip6"
|
||||
- obfs4proxy_file_path = "/usr/local/bin/obfs4proxy"
|
||||
- meek_client_file_path = "/usr/local/bin/meek-client"
|
||||
- snowflake_file_path = "/usr/local/bin/snowflake-client"
|
||||
+ tor_path = "@tor@/bin/tor"
|
||||
+ tor_geo_ip_file_path = "@geoip@/share/tor/geoip"
|
||||
+ tor_geo_ipv6_file_path = "@geoip@/share/tor/geoip6"
|
||||
+ obfs4proxy_file_path = "@obfs4@/bin/obfs4proxy"
|
||||
+ meek_client_file_path = "@meek@/bin/meek-client"
|
||||
+ snowflake_file_path = "@snowflake@/bin/snowflake-client"
|
||||
|
||||
return (
|
||||
tor_path,
|
||||
|
|
|
|||
|
|
@ -1,41 +1,76 @@
|
|||
--- a/onionshare_cli/common.py
|
||||
+++ b/onionshare_cli/common.py
|
||||
@@ -308,33 +308,10 @@ class Common:
|
||||
@@ -318,67 +318,12 @@ class Common:
|
||||
return path
|
||||
|
||||
|
||||
def get_tor_paths(self):
|
||||
- if self.platform == "Linux":
|
||||
- tor_path = shutil.which("tor")
|
||||
- if not tor_path:
|
||||
- raise CannotFindTor()
|
||||
- obfs4proxy_file_path = shutil.which("obfs4proxy")
|
||||
- snowflake_file_path = shutil.which("snowflake-client")
|
||||
- meek_client_file_path = shutil.which("meek-client")
|
||||
- prefix = os.path.dirname(os.path.dirname(tor_path))
|
||||
- tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip")
|
||||
- tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6")
|
||||
- elif self.platform == "Windows":
|
||||
- # In Windows, the Tor binaries are in the onionshare package, not the onionshare_cli package
|
||||
- base_path = self.get_resource_path("tor")
|
||||
- base_path = base_path.replace("onionshare_cli", "onionshare")
|
||||
- tor_path = os.path.join(base_path, "Tor", "tor.exe")
|
||||
-
|
||||
- # If tor.exe isn't there, mayber we're running from the source tree
|
||||
- if not os.path.exists(tor_path):
|
||||
- base_path = os.path.join(os.getcwd(), "onionshare", "resources", "tor")
|
||||
-
|
||||
- tor_path = os.path.join(base_path, "Tor", "tor.exe")
|
||||
- if not os.path.exists(tor_path):
|
||||
- raise CannotFindTor()
|
||||
-
|
||||
- obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe")
|
||||
- snowflake_file_path = os.path.join(base_path, "Tor", "snowflake-client.exe")
|
||||
- meek_client_file_path = os.path.join(base_path, "Tor", "meek-client.exe")
|
||||
- tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip")
|
||||
- tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6")
|
||||
-
|
||||
- elif self.platform == "Darwin":
|
||||
- tor_path = shutil.which("tor")
|
||||
- if not tor_path:
|
||||
- raise CannotFindTor()
|
||||
- obfs4proxy_file_path = shutil.which("obfs4proxy")
|
||||
- prefix = os.path.dirname(os.path.dirname(tor_path))
|
||||
- tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip")
|
||||
- tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6")
|
||||
- # Let's see if we have tor binaries in the onionshare GUI package
|
||||
- base_path = self.get_resource_path("tor")
|
||||
- base_path = base_path.replace("onionshare_cli", "onionshare")
|
||||
- tor_path = os.path.join(base_path, "tor")
|
||||
- if os.path.exists(tor_path):
|
||||
- obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy")
|
||||
- snowflake_file_path = os.path.join(base_path, "snowflake-client")
|
||||
- meek_client_file_path = os.path.join(base_path, "meek-client")
|
||||
- tor_geo_ip_file_path = os.path.join(base_path, "geoip")
|
||||
- tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6")
|
||||
- else:
|
||||
- # Fallback to looking in the path
|
||||
- tor_path = shutil.which("tor")
|
||||
- if not os.path.exists(tor_path):
|
||||
- raise CannotFindTor()
|
||||
-
|
||||
- obfs4proxy_file_path = shutil.which("obfs4proxy")
|
||||
- snowflake_file_path = shutil.which("snowflake-client")
|
||||
- meek_client_file_path = shutil.which("meek-client")
|
||||
- prefix = os.path.dirname(os.path.dirname(tor_path))
|
||||
- tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip")
|
||||
- tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6")
|
||||
-
|
||||
- elif self.platform == "BSD":
|
||||
- tor_path = "/usr/local/bin/tor"
|
||||
- tor_geo_ip_file_path = "/usr/local/share/tor/geoip"
|
||||
- tor_geo_ipv6_file_path = "/usr/local/share/tor/geoip6"
|
||||
- obfs4proxy_file_path = "/usr/local/bin/obfs4proxy"
|
||||
- snowflake_file_path = "/usr/local/bin/snowflake-client"
|
||||
- meek_client_file_path = "/usr/local/bin/meek-client"
|
||||
+ tor_path = "@tor@/bin/tor"
|
||||
+ tor_geo_ip_file_path = "@geoip@/share/tor/geoip"
|
||||
+ tor_geo_ipv6_file_path = "@geoip@/share/tor/geoip6"
|
||||
+ obfs4proxy_file_path = "@obfs4@/bin/obfs4proxy"
|
||||
|
||||
+ snowflake_file_path = "@snowflake@/bin/snowflake-client"
|
||||
+ meek_client_file_path = "@meek@/bin/meek-client"
|
||||
|
||||
return (
|
||||
tor_path,
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "owncloud-client";
|
||||
version = "2.9.2.6206";
|
||||
version = "2.10.0.6519";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.owncloud.com/desktop/ownCloud/stable/${version}/source/ownCloud-${version}.tar.xz";
|
||||
sha256 = "sha256-i6TmJFEuH4A1jTyoKiJoVU7yC+AXZIH4miYSk3XzVEo=";
|
||||
sha256 = "sha256-HDH8s/VPeOAbkyrfE7hbhePhtWcx1IUdlhDCnodomh8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ];
|
||||
|
|
|
|||
|
|
@ -1,9 +1,42 @@
|
|||
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, alsa-lib, ffmpeg, glib, openssl
|
||||
, pcre, zlib, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama
|
||||
, libXrandr, libXrender, libXv, libXtst, libxkbcommon, libxkbfile, wayland
|
||||
, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc, libxslt, cairo
|
||||
, libusb1, libpulseaudio, cups, pcsclite, systemd, libjpeg_turbo
|
||||
, buildServer ? true, nocaps ? false
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, alsa-lib
|
||||
, ffmpeg
|
||||
, glib
|
||||
, openssl
|
||||
, pcre
|
||||
, zlib
|
||||
, libX11
|
||||
, libXcursor
|
||||
, libXdamage
|
||||
, libXext
|
||||
, libXi
|
||||
, libXinerama
|
||||
, libXrandr
|
||||
, libXrender
|
||||
, libXv
|
||||
, libXtst
|
||||
, libxkbcommon
|
||||
, libxkbfile
|
||||
, wayland
|
||||
, gstreamer
|
||||
, gst-plugins-base
|
||||
, gst-plugins-good
|
||||
, libunwind
|
||||
, orc
|
||||
, libxslt
|
||||
, cairo
|
||||
, libusb1
|
||||
, libpulseaudio
|
||||
, cups
|
||||
, pcsclite
|
||||
, systemd
|
||||
, libjpeg_turbo
|
||||
, buildServer ? true
|
||||
, nocaps ? false
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -16,15 +49,16 @@ let
|
|||
}
|
||||
];
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freerdp";
|
||||
version = "2.4.1";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeRDP";
|
||||
repo = "FreeRDP";
|
||||
rev = version;
|
||||
sha256 = "sha256-0wwIuE6Gv8khhLAbWSHOBfHGrTUjR4f/C5bzYJpvWIQ=";
|
||||
sha256 = "sha256-OLz/f4E+Haumw5Jaw+F1hiHz0jfcywhfK3fEUgLorao=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -47,40 +81,39 @@ in stdenv.mkDerivation rec {
|
|||
--replace "RDP_SCANCODE_CAPSLOCK" "RDP_SCANCODE_LCONTROL"
|
||||
'';
|
||||
|
||||
buildInputs = with lib;
|
||||
[
|
||||
alsa-lib
|
||||
cairo
|
||||
cups
|
||||
ffmpeg
|
||||
glib
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gstreamer
|
||||
libX11
|
||||
libXcursor
|
||||
libXdamage
|
||||
libXext
|
||||
libXi
|
||||
libXinerama
|
||||
libXrandr
|
||||
libXrender
|
||||
libXtst
|
||||
libXv
|
||||
libjpeg_turbo
|
||||
libpulseaudio
|
||||
libunwind
|
||||
libusb1
|
||||
libxkbcommon
|
||||
libxkbfile
|
||||
libxslt
|
||||
openssl
|
||||
orc
|
||||
pcre
|
||||
pcsclite
|
||||
wayland
|
||||
zlib
|
||||
] ++ optional stdenv.isLinux systemd;
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
cairo
|
||||
cups
|
||||
ffmpeg
|
||||
glib
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gstreamer
|
||||
libX11
|
||||
libXcursor
|
||||
libXdamage
|
||||
libXext
|
||||
libXi
|
||||
libXinerama
|
||||
libXrandr
|
||||
libXrender
|
||||
libXtst
|
||||
libXv
|
||||
libjpeg_turbo
|
||||
libpulseaudio
|
||||
libunwind
|
||||
libusb1
|
||||
libxkbcommon
|
||||
libxkbfile
|
||||
libxslt
|
||||
openssl
|
||||
orc
|
||||
pcre
|
||||
pcsclite
|
||||
wayland
|
||||
zlib
|
||||
] ++ lib.optional stdenv.isLinux systemd;
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
|
|
@ -88,18 +121,18 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]
|
||||
++ lib.mapAttrsToList (k: v: "-D${k}=${if v then "ON" else "OFF"}") {
|
||||
BUILD_TESTING = doCheck;
|
||||
WITH_CUNIT = doCheck;
|
||||
WITH_CUPS = (cups != null);
|
||||
WITH_OSS = false;
|
||||
WITH_PCSC = (pcsclite != null);
|
||||
WITH_PULSE = (libpulseaudio != null);
|
||||
WITH_SERVER = buildServer;
|
||||
WITH_SSE2 = stdenv.isx86_64;
|
||||
WITH_VAAPI = true;
|
||||
WITH_JPEG = (libjpeg_turbo != null);
|
||||
WITH_CAIRO = (cairo != null);
|
||||
};
|
||||
BUILD_TESTING = doCheck;
|
||||
WITH_CUNIT = doCheck;
|
||||
WITH_CUPS = (cups != null);
|
||||
WITH_OSS = false;
|
||||
WITH_PCSC = (pcsclite != null);
|
||||
WITH_PULSE = (libpulseaudio != null);
|
||||
WITH_SERVER = buildServer;
|
||||
WITH_SSE2 = stdenv.isx86_64;
|
||||
WITH_VAAPI = true;
|
||||
WITH_JPEG = (libjpeg_turbo != null);
|
||||
WITH_CAIRO = (cairo != null);
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Remote Desktop Protocol Client";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "qownnotes";
|
||||
version = "22.1.7";
|
||||
version = "22.1.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
|
||||
# Fetch the checksum of current version with curl:
|
||||
# curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256
|
||||
sha256 = "7ac13816e47e23e8469f47b6d48a29f7e98416de0fa9ef77eb3da63b191829f3";
|
||||
sha256 = "sha256-vUYfZpqOe7cZJxrNPXN2gCyNRNqC2/NA83+UCL9+mq0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake qttools ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "super-productivity";
|
||||
version = "7.9.2";
|
||||
version = "7.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage";
|
||||
sha256 = "sha256-qeHFFG1Y8qZwFvo3CFIs1+BKQo287HJfOnKKguUOlu8=";
|
||||
sha256 = "sha256-Aa0orJpsin7XntUVpW6VLcbGiTSeyySDCGNFOERtgvg=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -54,16 +54,16 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "alacritty";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alacritty";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kgZEbOGmO+uRKaWR+oQBiGkBzDSuCznUyWNUoMICHhk=";
|
||||
sha256 = "sha256-eVPy47T2wcsN7NxtwMoyuC6loBVXsoJjJ/2q31i3vxQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-JqnYMDkagWNGliUxi5eqJN92ULsvT7Fwmah8um1xaRw=";
|
||||
cargoSha256 = "sha256-RY+qidm7NZFKq6P8qVaMpxYfTfHpZac2YJwuNbOJwoM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
|
@ -88,19 +88,13 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
outputs = [ "out" "terminfo" ];
|
||||
|
||||
patches = [
|
||||
# Handle PTY EIO error for Rust 1.55+
|
||||
(fetchpatch {
|
||||
url = "https://github.com/alacritty/alacritty/commit/58985a4dcbe464230b5d2566ee68e2d34a1788c8.patch";
|
||||
sha256 = "sha256-Z6589yRrQtpx3/vNqkMiGgGsLysd/QyfaX7trqX+k5c=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace alacritty/src/config/ui_config.rs \
|
||||
--replace xdg-open ${xdg-utils}/bin/xdg-open
|
||||
'';
|
||||
|
||||
checkFlags = [ "--skip=term::test::mock_term" ]; # broken on aarch64
|
||||
|
||||
postInstall = (
|
||||
if stdenv.isDarwin then ''
|
||||
mkdir $out/Applications
|
||||
|
|
@ -126,6 +120,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
install -dm 755 "$out/share/man/man1"
|
||||
gzip -c extra/alacritty.man > "$out/share/man/man1/alacritty.1.gz"
|
||||
gzip -c extra/alacritty-msg.man > "$out/share/man/man1/alacritty-msg.1.gz"
|
||||
|
||||
install -Dm 644 alacritty.yml $out/share/doc/alacritty.yml
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
"version": "14.6.2",
|
||||
"repo_hash": "0n7l1f1w70nqb9ackcmi1yhx69a32zlkxa962v67782nn2vdcbiz",
|
||||
"version": "14.6.3",
|
||||
"repo_hash": "sha256-M8A6ZF1t+N48OTBhVwvOweITmavrl9+Z1Yqw4lxLk38=",
|
||||
"yarn_hash": "1kcjbf8xn3bwac2s9i2i7dpgbkwcjh09wvgbgysm5yffpdswg6nl",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v14.6.2-ee",
|
||||
"rev": "v14.6.3-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "14.6.2",
|
||||
"GITALY_SERVER_VERSION": "14.6.3",
|
||||
"GITLAB_PAGES_VERSION": "1.49.0",
|
||||
"GITLAB_SHELL_VERSION": "13.22.1",
|
||||
"GITLAB_WORKHORSE_VERSION": "14.6.2"
|
||||
"GITLAB_WORKHORSE_VERSION": "14.6.3"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
version = "14.6.2";
|
||||
version = "14.6.3";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
|
||||
in
|
||||
|
||||
|
|
@ -45,7 +45,7 @@ buildGoModule {
|
|||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-a9qFAtQP5QtI+E6V3LBYAMYQbvhgOcn75l+6pSQPZ+0=";
|
||||
sha256 = "sha256-b4gNIYMtwsV2qv3mjKYDnCCGGmQseoqaTGN7k9mR1B8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ZLd4E3+e25Hqmd6ZyF3X6BveMEg7OF0FX9IvNBWn3v0=";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ in
|
|||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "14.6.2";
|
||||
version = "14.6.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = data.owner;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,10 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, nixosTests
|
||||
# For tests
|
||||
, testVersion
|
||||
, runCommand
|
||||
, fetchurl
|
||||
# Main build tools
|
||||
, pkg-config
|
||||
, autoconf
|
||||
|
|
@ -103,7 +106,7 @@ let
|
|||
inherit (lib) optional optionals optionalString versions;
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
let self = stdenv.mkDerivation rec {
|
||||
pname = "handbrake";
|
||||
inherit version src;
|
||||
|
||||
|
|
@ -211,7 +214,23 @@ stdenv.mkDerivation rec {
|
|||
makeFlags = [ "--directory=build" ];
|
||||
|
||||
passthru.tests = {
|
||||
basic-conversion = nixosTests.handbrake;
|
||||
basic-conversion =
|
||||
let
|
||||
# Big Buck Bunny example, licensed under CC Attribution 3.0.
|
||||
testMkv = fetchurl {
|
||||
url = "https://github.com/Matroska-Org/matroska-test-files/blob/cf0792be144ac470c4b8052cfe19bb691993e3a2/test_files/test1.mkv?raw=true";
|
||||
sha256 = "1hfxbbgxwfkzv85pvpvx55a72qsd0hxjbm9hkl5r3590zw4s75h9";
|
||||
};
|
||||
in
|
||||
runCommand "${pname}-${version}-basic-conversion" { nativeBuildInputs = [ self ]; } ''
|
||||
mkdir -p $out
|
||||
cd $out
|
||||
HandBrakeCLI -i ${testMkv} -o test.mp4 -e x264 -q 20 -B 160
|
||||
test -e test.mp4
|
||||
HandBrakeCLI -i ${testMkv} -o test.mkv -e x264 -q 20 -B 160
|
||||
test -e test.mkv
|
||||
'';
|
||||
version = testVersion { package = self; command = "HandBrakeCLI --version"; };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -230,4 +249,5 @@ stdenv.mkDerivation rec {
|
|||
platforms = with platforms; unix;
|
||||
broken = stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13";
|
||||
};
|
||||
}
|
||||
};
|
||||
in self
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "streamlink";
|
||||
version = "3.0.3";
|
||||
version = "3.1.0";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-oEK9p6OuqGSm2JdgfnJ+N0sJtRq6wCoVCGcU0GNEMLI=";
|
||||
sha256 = "sha256-T2M0vg+BYIdr21CcdrrBf7bVVlZU+tKJWG2xfBMoMlg=";
|
||||
};
|
||||
|
||||
checkInputs = with python3Packages; [
|
||||
|
|
@ -32,10 +32,6 @@ python3Packages.buildPythonApplication rec {
|
|||
ffmpeg
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg --replace 'lxml >=4.6.4,<5.0' 'lxml'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://streamlink.github.io/";
|
||||
description = "CLI for extracting streams from various websites to video player of your choosing";
|
||||
|
|
|
|||
|
|
@ -62,16 +62,14 @@
|
|||
, systemd
|
||||
, taglib
|
||||
, unzip
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, xorg
|
||||
, zlib
|
||||
|
||||
, chromecastSupport ? true, libmicrodns, protobuf
|
||||
, jackSupport ? false
|
||||
, onlyLibVLC ? false
|
||||
, skins2Support ? !onlyLibVLC, freetype
|
||||
, withQt5 ? true, qtbase, qtsvg, qtx11extras, wrapQtAppsHook
|
||||
, waylandSupport ? true, wayland, wayland-protocols
|
||||
, withQt5 ? true, qtbase, qtsvg, qtwayland, qtx11extras, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
# chromecastSupport requires TCP port 8010 to be open for it to work.
|
||||
|
|
@ -148,8 +146,6 @@ stdenv.mkDerivation rec {
|
|||
srt
|
||||
systemd
|
||||
taglib
|
||||
wayland
|
||||
wayland-protocols
|
||||
zlib
|
||||
]
|
||||
++ (with xorg; [
|
||||
|
|
@ -162,8 +158,15 @@ stdenv.mkDerivation rec {
|
|||
++ optional (!hostIsAarch) live555
|
||||
++ optional jackSupport libjack2
|
||||
++ optionals chromecastSupport [ libmicrodns protobuf ]
|
||||
++ optionals skins2Support (with xorg; [ freetype libXext libXinerama libXpm ])
|
||||
++ optionals withQt5 [ qtbase qtsvg qtx11extras ];
|
||||
++ optionals skins2Support (with xorg; [
|
||||
freetype
|
||||
libXext
|
||||
libXinerama
|
||||
libXpm
|
||||
])
|
||||
++ optionals waylandSupport [ wayland wayland-protocols ]
|
||||
++ optionals withQt5 [ qtbase qtsvg qtx11extras ]
|
||||
++ optional (waylandSupport && withQt5) qtwayland;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
|
|
@ -172,7 +175,8 @@ stdenv.mkDerivation rec {
|
|||
removeReferencesTo
|
||||
unzip
|
||||
]
|
||||
++ optionals withQt5 [ wrapQtAppsHook ];
|
||||
++ optionals withQt5 [ wrapQtAppsHook ]
|
||||
++ optionals waylandSupport [ wayland wayland-protocols ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
@ -210,9 +214,11 @@ stdenv.mkDerivation rec {
|
|||
configureFlags = [
|
||||
"--enable-srt" # Explicit enable srt to ensure the patch is applied.
|
||||
"--with-kde-solid=$out/share/apps/solid/actions"
|
||||
] ++ optional onlyLibVLC "--disable-vlc"
|
||||
++ optional skins2Support "--enable-skins2"
|
||||
++ optionals chromecastSupport [
|
||||
]
|
||||
++ optional onlyLibVLC "--disable-vlc"
|
||||
++ optional skins2Support "--enable-skins2"
|
||||
++ optional waylandSupport "--enable-wayland"
|
||||
++ optionals chromecastSupport [
|
||||
"--enable-sout"
|
||||
"--enable-chromecast"
|
||||
"--enable-microdns"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchFromGitHub, substituteAll, swaybg
|
||||
, meson, ninja, pkg-config, wayland-scanner, scdoc
|
||||
, meson_0_60, ninja, pkg-config, wayland-scanner, scdoc
|
||||
, wayland, libxkbcommon, pcre, json_c, dbus, libevdev
|
||||
, pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg
|
||||
, wlroots, wayland-protocols, libdrm
|
||||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sway-unwrapped";
|
||||
version = "1.6.1";
|
||||
version = "1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "swaywm";
|
||||
repo = "sway";
|
||||
rev = version;
|
||||
sha256 = "0j4sdbsrlvky1agacc0pcz9bwmaxjmrapjnzscbd2i0cria2fc5j";
|
||||
sha256 = "0ss3l258blyf2d0lwd7pi7ga1fxfj8pxhag058k7cmjhs3y30y5l";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja pkg-config wayland-scanner scdoc
|
||||
meson_0_60 ninja pkg-config wayland-scanner scdoc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -24,6 +24,10 @@
|
|||
"ShutdownTimer@neumann",
|
||||
"ShutdownTimer@deminder"
|
||||
],
|
||||
"bottompanel": [
|
||||
"bottompanel@tmoer93",
|
||||
"bottom-panel@sulincix"
|
||||
],
|
||||
"noannoyance": [
|
||||
"noannoyance@sindex.com",
|
||||
"noannoyance@daase.net"
|
||||
|
|
@ -71,6 +75,10 @@
|
|||
"noannoyance@sindex.com",
|
||||
"noannoyance@daase.net"
|
||||
],
|
||||
"fuzzy-clock": [
|
||||
"fuzzy-clock@keepawayfromfire.co.uk",
|
||||
"FuzzyClock@johngoetz"
|
||||
],
|
||||
"panel-date-format": [
|
||||
"panel-date-format@keiii.github.com",
|
||||
"panel-date-format@atareao.es"
|
||||
|
|
@ -105,6 +113,14 @@
|
|||
"lockkeys@vaina.lt",
|
||||
"lockkeys@fawtytoo"
|
||||
],
|
||||
"shutdowntimer": [
|
||||
"ShutdownTimer@neumann",
|
||||
"ShutdownTimer@deminder"
|
||||
],
|
||||
"fuzzy-clock": [
|
||||
"fuzzy-clock@keepawayfromfire.co.uk",
|
||||
"FuzzyClock@johngoetz"
|
||||
],
|
||||
"disable-unredirect-fullscreen-windows": [
|
||||
"unredirect@vaina.lt",
|
||||
"unredirect@aunetx"
|
||||
|
|
|
|||
|
|
@ -21,6 +21,16 @@
|
|||
"unredirect@vaina.lt" = "disable-unredirect-fullscreen-windows";
|
||||
"unredirect@aunetx" = "disable-unredirect-fullscreen-windows-2";
|
||||
|
||||
"fuzzy-clock@keepawayfromfire.co.uk" = "fuzzy-clock-2";
|
||||
"FuzzyClock@johngoetz" = "fuzzy-clock";
|
||||
|
||||
# At the moment, ShutdownTimer@deminder is a fork of ShutdownTimer@neumann which adds new features
|
||||
# there seem to be upstream plans, so this should be checked periodically:
|
||||
# https://github.com/Deminder/ShutdownTimer https://github.com/neumann-d/ShutdownTimer/pull/46
|
||||
"ShutdownTimer@neumann" = null;
|
||||
"shutdown-timer-gnome-shell-extension" = "shutdowntimer-2";
|
||||
"ShutdownTimer@deminder" = "shutdowntimer";
|
||||
|
||||
# ############################################################################
|
||||
# These are conflicts for older extensions (i.e. they don't support the latest GNOME version).
|
||||
# Make sure to move them up once they are updated
|
||||
|
|
@ -33,13 +43,6 @@
|
|||
"Hide_Activities@shay.shayel.org" = "hide-activities-button";
|
||||
"hide-activities-button@nmingori.gnome-shell-extensions.org" = "hide-activities-button-2";
|
||||
|
||||
# At the moment, ShutdownTimer@deminder is a fork of ShutdownTimer@neumann which adds new features
|
||||
# there seem to be upstream plans, so this should be checked periodically:
|
||||
# https://github.com/Deminder/ShutdownTimer https://github.com/neumann-d/ShutdownTimer/pull/46
|
||||
"ShutdownTimer@neumann" = null;
|
||||
"shutdown-timer-gnome-shell-extension" = "shutdowntimer-2";
|
||||
"ShutdownTimer@deminder" = "shutdowntimer";
|
||||
|
||||
"noannoyance@sindex.com" = "noannoyance";
|
||||
"noannoyance@daase.net" = "noannoyance-2";
|
||||
|
||||
|
|
@ -54,6 +57,9 @@
|
|||
|
||||
# ####### GNOME 3.38 #######
|
||||
|
||||
"bottompanel@tmoer93" = "bottompanel";
|
||||
"bottom-panel@sulincix" = "bottompanel-2";
|
||||
|
||||
# See https://github.com/pbxqdown/gnome-shell-extension-transparent-window/issues/12#issuecomment-800765381
|
||||
"transparent-window@pbxqdown.github.com" = "transparent-window";
|
||||
"transparentwindows.mdirshad07" = null;
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-pop-shell";
|
||||
version = "unstable-2021-11-30";
|
||||
version = "unstable-2022-01-14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "shell";
|
||||
rev = "4b65ee865d01436ec75a239a0586a2fa6051b8c3";
|
||||
sha256 = "DHmp3kzBgbyxRe0TjER/CAqyUmD9LeRqAFQ9apQDzfk=";
|
||||
rev = "21745c4a8076ad52c9ccc77ca5726f5c7b83de6c";
|
||||
sha256 = "sha256-d6NRNbTimwtGVLhcpdFD1AuignVii/xi3YtMWzkS/v0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ glib nodePackages.typescript gjs ];
|
||||
|
|
|
|||
|
|
@ -8,10 +8,10 @@ in rebar3Relx rec {
|
|||
releaseType = "escript";
|
||||
# The package name "elvis" is already taken
|
||||
pname = "elvis-erlang";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
sha256 = "139mgd4cwc0vazxfnssyym61jd9g45wn1nc53mjfzx5dkrrn4dc5";
|
||||
sha256 = "6vNxr3AYpFuXaIVH9bWw7K5KiF1swfI+CSI43RoMQEA=";
|
||||
rev = version;
|
||||
};
|
||||
beamDeps = builtins.attrValues (import ./rebar-deps.nix {
|
||||
|
|
|
|||
|
|
@ -26,11 +26,11 @@ let
|
|||
};
|
||||
parse_trans = builder {
|
||||
name = "parse_trans";
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
src = fetchHex {
|
||||
pkg = "parse_trans";
|
||||
version = "3.4.0";
|
||||
sha256 = "sha256-+Z42iDC+pEVSIk434ElDpUh08IuFkEhd6NE4MrY6LcM=";
|
||||
version = "3.4.1";
|
||||
sha256 = "sha256-YgpAbOddragnuC5FPBnPBndr4mb1pnz/NOHvLLtg5Jo=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
|
|
@ -66,11 +66,11 @@ let
|
|||
};
|
||||
certifi = builder {
|
||||
name = "certifi";
|
||||
version = "2.6.1";
|
||||
version = "2.8.0";
|
||||
src = fetchHex {
|
||||
pkg = "certifi";
|
||||
version = "2.6.1";
|
||||
sha256 = "sha256-UkyXtJkbOEndXBemMSI4licsawr0RneLpGdaHf9Tu34=";
|
||||
version = "2.8.0";
|
||||
sha256 = "sha256-asfvwcb4YAsI1iUpLUu/WE4UhHzhtrXETZg9Jz4Ql+o=";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
|
|
@ -146,11 +146,11 @@ let
|
|||
};
|
||||
elvis_core = builder {
|
||||
name = "elvis_core";
|
||||
version = "1.1.2";
|
||||
version = "1.3.1";
|
||||
src = fetchHex {
|
||||
pkg = "elvis_core";
|
||||
version = "1.1.2";
|
||||
sha256 = "sha256-xO5Cp6fC/FZ/Pqa1FQFkzWgpDxEA6bGaTPiG2Kocpzw=";
|
||||
version = "1.3.1";
|
||||
sha256 = "sha256-eoiQv4GFoyUs1OvYJv5fita5MCTt+IV26yeunl3BnWk=";
|
||||
};
|
||||
beamDeps = [ katana_code zipper ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, version
|
||||
, src
|
||||
, nativeBuildInputs ? [ ]
|
||||
, buildInputs ? [ ]
|
||||
, meta ? { }
|
||||
, enableDebugInfo ? false
|
||||
, mixEnv ? "prod"
|
||||
|
|
@ -27,7 +28,7 @@ assert mixNixDeps != { } -> mixFodDeps == null;
|
|||
stdenv.mkDerivation (overridable // {
|
||||
# rg is used as a better grep to search for erlang references in the final release
|
||||
nativeBuildInputs = nativeBuildInputs ++ [ erlang hex elixir makeWrapper git ripgrep ];
|
||||
buildInputs = builtins.attrValues mixNixDeps;
|
||||
buildInputs = buildInputs ++ builtins.attrValues mixNixDeps;
|
||||
|
||||
MIX_ENV = mixEnv;
|
||||
MIX_DEBUG = if enableDebugInfo then 1 else 0;
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
coq.ocamlPackages.buildDunePackage rec {
|
||||
pname = "ligo";
|
||||
version = "0.27.0";
|
||||
version = "0.34.0";
|
||||
src = fetchFromGitLab {
|
||||
owner = "ligolang";
|
||||
repo = "ligo";
|
||||
rev = version;
|
||||
sha256 = "sha256-OUrjMlAWxTPs56ltMt0I/XR9GScD6upXU2arT99u8hk=";
|
||||
sha256 = "sha256-MHkIr+XkW/zrRt+Cg48q4fOWTkNGH0hbf+oU7cAivNE=";
|
||||
};
|
||||
|
||||
# The build picks this up for ligo --version
|
||||
|
|
@ -31,6 +31,7 @@ coq.ocamlPackages.buildDunePackage rec {
|
|||
tezos-base
|
||||
tezos-shell-services
|
||||
tezos-010-PtGRANAD-test-helpers
|
||||
tezos-011-PtHangz2-test-helpers
|
||||
tezos-protocol-010-PtGRANAD-parameters
|
||||
tezos-protocol-010-PtGRANAD
|
||||
tezos-protocol-environment
|
||||
|
|
@ -42,6 +43,8 @@ coq.ocamlPackages.buildDunePackage rec {
|
|||
data-encoding
|
||||
bisect_ppx
|
||||
cmdliner
|
||||
core
|
||||
ocaml-recovery-parser
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
|
|
@ -49,7 +52,7 @@ coq.ocamlPackages.buildDunePackage rec {
|
|||
coq.ocamlPackages.ca-certs
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
doCheck = false; # Tests fail, but could not determine the reason
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://ligolang.org/";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, fetchFromGitHub
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, glib
|
||||
, db
|
||||
|
|
@ -7,32 +10,37 @@
|
|||
|
||||
let
|
||||
modelData = fetchurl {
|
||||
url = "mirror://sourceforge/libpinyin/models/model17.text.tar.gz";
|
||||
sha256 = "1kb2nswpsqlk2qm5jr7vqcp97f2dx7nvpk24lxjs1g12n252f5z0";
|
||||
url = "mirror://sourceforge/libpinyin/models/model19.text.tar.gz";
|
||||
sha256 = "02zml6m8sj5q97ibpvaj9s9yz3gfj0jnjrfhkn02qv4nwm72lhjn";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libpinyin";
|
||||
version = "2.3.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libpinyin";
|
||||
repo = "libpinyin";
|
||||
rev = version;
|
||||
sha256 = "14fkpp16s5k0pbw5wwd24pqr0qbdjgbl90n9aqwx72m03n7an40l";
|
||||
owner = "libpinyin";
|
||||
repo = "libpinyin";
|
||||
rev = version;
|
||||
sha256 = "0izisma5g9a7mxfxs177pi1d7v9dklm0ar4z404nf2s8x4wcg3ib";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
tar -xzf ${modelData} -C $sourceRoot/data
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook glib db pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
glib
|
||||
db
|
||||
pkg-config
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for intelligent sentence-based Chinese pinyin input method";
|
||||
homepage = "https://sourceforge.net/projects/libpinyin";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ ericsagnes ];
|
||||
platforms = platforms.linux;
|
||||
homepage = "https://sourceforge.net/projects/libpinyin";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ linsui ericsagnes ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/librep.x86_64-darwin
|
||||
};
|
||||
}
|
||||
# TODO: investigate fetchFromGithub
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libxc";
|
||||
version = "5.1.7";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "libxc";
|
||||
repo = "libxc";
|
||||
rev = version;
|
||||
sha256 = "0s01q5sh50544s7q2q7kahcqydlyzk1lx3kg1zwl76y90942bjd1";
|
||||
sha256 = "1zfhfiwk8cnfbmkagaia4xhsc133icl1pryzync28kzsjxzlwfzc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl cmake gfortran ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, lib, fetchurl, perl, gfortran
|
||||
, openssh, hwloc
|
||||
, openssh, hwloc, python3
|
||||
# either libfabric or ucx work for ch4backend on linux. On darwin, neither of
|
||||
# these libraries currently build so this argument is ignored on Darwin.
|
||||
, ch4backend
|
||||
|
|
@ -11,11 +11,11 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric");
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mpich";
|
||||
version = "3.4.3";
|
||||
version = "4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz";
|
||||
sha256 = "1msg5i2mcmjix5pvpa84dwmlqpqm3206frl1060k342i62gxhm41";
|
||||
sha256 = "0r7zzcj8b9dbf5lp2d81wcvffi38c1zchkgzyxckk51adv4ijx6z";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ gfortran ];
|
||||
nativeBuildInputs = [ gfortran python3 ];
|
||||
buildInputs = [ perl openssh hwloc ]
|
||||
++ lib.optional (!stdenv.isDarwin) ch4backend;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apfel";
|
||||
version = "3.0.5";
|
||||
version = "3.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scarrazza";
|
||||
repo = "apfel";
|
||||
rev = version;
|
||||
sha256 = "sha256-szEtSC/NouYlHSjVoX9Hoh7yQ0W82rVccYEF1L2tXoU=";
|
||||
sha256 = "sha256-fRdJ+C92tEC75iUwP9Tmm/EswrlA52eUo5fBjfieH9o=";
|
||||
};
|
||||
|
||||
buildInputs = [ gfortran lhapdf python3 zlib ];
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "stellarsolver";
|
||||
version = "1.8";
|
||||
version = "1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rlancaste";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-eC45V0aqFSUVJrxhaEXFzgzaXkHVwA5Yj8YyGvii0QI=";
|
||||
sha256 = "sha256-PiRXNiemJ+UjVhmd2KPcTKJoDW9K9QBf62nkP1LlOfw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
@ -25,6 +25,6 @@ mkDerivation rec {
|
|||
description = "Astrometric plate solving library";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ hjones2199 ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ with lib;
|
|||
|
||||
gnustep.stdenv.mkDerivation rec {
|
||||
pname = "sope";
|
||||
version = "5.4.0";
|
||||
version = "5.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inverse-inc";
|
||||
repo = pname;
|
||||
rev = "SOPE-${version}";
|
||||
sha256 = "sha256-jOF429Gaf1Qo3bx9mUogBQ0u/tBUxnX7VZxJjxF24Rg=";
|
||||
sha256 = "sha256-M5PF15Ok+rJLWlfHsC8F8JXJonAR0wwTUbWxegBZ/qQ=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@ assert ncclSupport -> cudaSupport;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xgboost";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmlc";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-WvYMfJYDF4azXkz2tBI9R9EpSOhFxpEja4RLuAfYAtE=";
|
||||
sha256 = "sha256-h7zcHCOxe1h7HRB6idtjf4HUBEoHC4V2pqbN9hpe00g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
}:
|
||||
|
||||
rec {
|
||||
version = "0.6.8";
|
||||
version = "0.6.9";
|
||||
rSrc =
|
||||
# local build -> `make ci`; `make clean` to restore
|
||||
# return to remote source
|
||||
|
|
@ -14,6 +14,6 @@ rec {
|
|||
owner = "abathur";
|
||||
repo = "resholve";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1bb22GcOIzmQ31ULZuNNCJ8Vcz4Y0+qAhsJ9PhbqnDM=";
|
||||
hash = "sha256-y9O5w4wA/kR8zoPay9pGs3vwxNqq3JEeZmX0wBJq4UQ=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -199,6 +199,19 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
manta = super.manta.override {
|
||||
nativeBuildInputs = with pkgs; [ nodejs-12_x installShellFiles ];
|
||||
postInstall = ''
|
||||
# create completions, following upstream procedure https://github.com/joyent/node-manta/blob/v5.2.3/Makefile#L85-L91
|
||||
completion_cmds=$(find ./bin -type f -printf "%f\n")
|
||||
|
||||
node ./lib/create_client.js
|
||||
for cmd in $completion_cmds; do
|
||||
installShellCompletion --cmd $cmd --bash <(./bin/$cmd --completion)
|
||||
done
|
||||
'';
|
||||
};
|
||||
|
||||
markdownlint-cli = super.markdownlint-cli.override {
|
||||
meta.mainProgram = "markdownlint";
|
||||
};
|
||||
|
|
@ -459,6 +472,13 @@ let
|
|||
meta = super.thelounge.meta // { maintainers = with lib.maintainers; [ winter ]; };
|
||||
};
|
||||
|
||||
triton = super.triton.override {
|
||||
nativeBuildInputs = [ pkgs.installShellFiles ];
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd triton --bash <($out/bin/triton completion)
|
||||
'';
|
||||
};
|
||||
|
||||
yaml-language-server = super.yaml-language-server.override {
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "arp";
|
||||
version = "2.3.2";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
|
||||
sha256 = "1s09ibj9v6pp2ckn96wxmn3mjifcj97asls5xc4zg75pflk0grgz";
|
||||
sha256 = "1x3l8v96ywc3wrcwbf0j04b8agap4fif0fz6ki2ndzx57yqcjszn";
|
||||
};
|
||||
|
||||
minimumOCamlVersion = "4.06";
|
||||
|
|
|
|||
|
|
@ -1,21 +1,26 @@
|
|||
{ lib, buildDunePackage, bls12-381-gen, ff-sig, zarith, ctypes, alcotest }:
|
||||
{ lib, buildDunePackage, fetchFromGitLab, ff-sig, zarith }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "bls12-381";
|
||||
version = "1.1.0";
|
||||
|
||||
inherit (bls12-381-gen) version src useDune2 doCheck;
|
||||
src = fetchFromGitLab {
|
||||
owner = "dannywillems";
|
||||
repo = "ocaml-bls12-381";
|
||||
rev = "22247018c0651ea62ae898c8ffcc388cc73f758f";
|
||||
sha256 = "ku6Rc+/lwFDoHTZTxgkhiF+kLkagi7944ntcu9vXWgI=";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ff-sig
|
||||
zarith
|
||||
ctypes
|
||||
bls12-381-gen
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
alcotest
|
||||
];
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://gitlab.com/dannywillems/ocaml-bls12-381";
|
||||
|
|
|
|||
|
|
@ -2,14 +2,15 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "bls12-381-gen";
|
||||
version = "0.4.2";
|
||||
version = "0.4.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "dannywillems";
|
||||
repo = "ocaml-bls12-381";
|
||||
rev = version;
|
||||
sha256 = "0jxc8qrdn74brmzjns1xycv3cb257kx5pa3ripgl9ci4njkv87n2";
|
||||
owner = "dannywillems";
|
||||
repo = "ocaml-bls12-381";
|
||||
rev = "${version}-legacy";
|
||||
sha256 = "qocIfQdv9rniOUykRulu2zWsqkzT0OrsGczgVKALRuk=";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
|
|
|||
38
pkgs/development/ocaml-modules/bls12-381/legacy.nix
Normal file
38
pkgs/development/ocaml-modules/bls12-381/legacy.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, buildDunePackage
|
||||
, fetchFromGitLab
|
||||
, bls12-381-gen
|
||||
, ctypes
|
||||
, ff-pbt
|
||||
, ff-sig
|
||||
, tezos-rust-libs
|
||||
, zarith
|
||||
, alcotest
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "bls12-381-legacy";
|
||||
|
||||
inherit (bls12-381-gen) version src useDune2 doCheck;
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bls12-381-gen
|
||||
ctypes
|
||||
ff-pbt
|
||||
ff-sig
|
||||
tezos-rust-libs
|
||||
zarith
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
alcotest
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://gitlab.com/dannywillems/ocaml-bls12-381";
|
||||
description = "UNIX version of BLS12-381 primitives, not implementating the virtual package bls12-381";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,46 +1,32 @@
|
|||
{ lib
|
||||
, buildDunePackage
|
||||
, rustc
|
||||
, cargo
|
||||
, dune-configurator
|
||||
, bls12-381
|
||||
, bls12-381-gen
|
||||
, ff-pbt
|
||||
, ff-sig
|
||||
, hex
|
||||
, integers
|
||||
, zarith
|
||||
, ctypes
|
||||
, tezos-rust-libs
|
||||
, alcotest
|
||||
, bisect_ppx
|
||||
, ff-pbt
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "bls12-381-unix";
|
||||
|
||||
inherit (bls12-381-gen) version src useDune2 doCheck;
|
||||
inherit (bls12-381) version src useDune2 doCheck;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bls12-381
|
||||
hex
|
||||
integers
|
||||
zarith
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
alcotest
|
||||
bisect_ppx
|
||||
ff-pbt
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
rustc
|
||||
cargo
|
||||
dune-configurator
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ff-sig
|
||||
zarith
|
||||
ctypes
|
||||
bls12-381-gen
|
||||
bls12-381
|
||||
tezos-rust-libs
|
||||
];
|
||||
|
||||
# This is a hack to work around the hack used in the dune files
|
||||
OPAM_SWITCH_PREFIX = "${tezos-rust-libs}";
|
||||
|
||||
meta = {
|
||||
description = "UNIX version of BLS12-381 primitives implementing the virtual package bls12-381";
|
||||
license = lib.licenses.mit;
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
{ lib, stdenv, fetchFromGitHub, which, ocaml, findlib }:
|
||||
|
||||
if !lib.versionAtLeast ocaml.version "4.02"
|
||||
if !lib.versionAtLeast ocaml.version "4.10"
|
||||
then throw "camlpdf is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.4";
|
||||
version = "2.5";
|
||||
name = "ocaml${ocaml.version}-camlpdf-${version}";
|
||||
src = fetchFromGitHub {
|
||||
owner = "johnwhitington";
|
||||
repo = "camlpdf";
|
||||
rev = "v${version}";
|
||||
sha256 = "09kzrgmlxb567315p3fy59ba0kv7xhp548n9i3l4wf9n06p0ww9m";
|
||||
sha256 = "sha256:1qmsa0xgi960y7r20mvf8hxiiml7l1908s4dm7nq262f19w51gsl";
|
||||
};
|
||||
|
||||
buildInputs = [ which ocaml findlib ];
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ if !lib.versionAtLeast ocaml.version "4.10"
|
|||
then throw "cpdf is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
let version = "2.4"; in
|
||||
let version = "2.5"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ocaml${ocaml.version}-cpdf-${version}";
|
||||
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation {
|
|||
owner = "johnwhitington";
|
||||
repo = "cpdf-source";
|
||||
rev = "v${version}";
|
||||
sha256 = "1a8lmfc76dr8x6pxgm4aypbys02pfma9yh4z3l1qxp2q1909na5l";
|
||||
sha256 = "sha256:0ps6d78i5mp1gcigxfp9rxmjr1k00nkr37vllhr0rdyph97w41s1";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib ncurses ];
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "digestif";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/digestif/releases/download/v${version}/digestif-v${version}.tbz";
|
||||
sha256 = "11188ya6ksb0p0zvs6saz3qxv4a8pyy8m3sq35f3qfxrxhghqi99";
|
||||
sha256 = "01gwkbrznci4xdcbww4ysgsciz2qs0r8jsmhp0siwbcgcrf1jjv5";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ bigarray-compat eqaf stdlib-shims ];
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "ethernet";
|
||||
version = "2.2.0";
|
||||
version = "3.0.0";
|
||||
|
||||
minimumOCamlVersion = "4.06";
|
||||
minimumOCamlVersion = "4.08";
|
||||
|
||||
# necessary due to cstruct
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
|
||||
sha256 = "0qzisqibx2gd8rh330n642mk5wz229199rnlrs7x8cr5pnymif7z";
|
||||
sha256 = "0a898vp9dw42majsvzzvs8pc6x4ns01wlwhwbacixliv6vv78ng9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-hacl-star-raw";
|
||||
version = "0.3.2";
|
||||
version = "0.4.5";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/project-everest/hacl-star/releases/download/ocaml-v${version}/hacl-star.${version}.tar.gz";
|
||||
sha256 = "1wp27vf0g43ggs7cv85hpa62jjvzkwzzg5rfznbwac6j6yr17zc7";
|
||||
sha256 = "1330vgbf5krlkvifby96kyk13xhmihajk2w5hgf2761jrljmnnrs";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
sourceRoot = "./source/raw";
|
||||
|
||||
minimalOCamlVersion = "4.05";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "httpaf";
|
||||
version = "0.6.6";
|
||||
version = "0.7.1";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
|
|
@ -12,17 +12,9 @@ buildDunePackage rec {
|
|||
owner = "inhabitedtype";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "065ikryv8zw9cbk6ddcjcind88ckk0inz9m3sqj9nwyfw4v4scm6";
|
||||
sha256 = "0zk78af3qyvf6w66mg8sxygr6ndayzqw5s3zfxibvn121xwni26z";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix tests with angstrom ≥ 0.14
|
||||
(fetchpatch {
|
||||
url = "https://github.com/inhabitedtype/httpaf/commit/fc0de5f2f1bd8df953ae4d4c9a61032392436c84.patch";
|
||||
sha256 = "1a8ca76ifbgyaq1bqfyq18mmxinjjparzkrr7ljbj0y1z1rl748z";
|
||||
})
|
||||
];
|
||||
|
||||
checkInputs = [ alcotest ];
|
||||
propagatedBuildInputs = [ angstrom faraday ];
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ lib, fetchurl, buildDunePackage
|
||||
, repr, ppx_repr, fmt, logs, mtime, stdlib-shims
|
||||
, cmdliner, progress, semaphore-compat, optint
|
||||
, alcotest, crowbar, re
|
||||
, alcotest, crowbar, re, lru
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "index";
|
||||
version = "1.4.1";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz";
|
||||
sha256 = "sha256:01i24m1xh7vn44sq7gsxg1z0jxa6rg80bpjcp3cvg6zfjpsl7sfx";
|
||||
sha256 = "1q1lv960dk1br8nz8gkibdywl2wv64ywib7b9jn33f6mpb81qc9f";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
|
@ -29,6 +29,7 @@ buildDunePackage rec {
|
|||
repr
|
||||
semaphore-compat
|
||||
optint
|
||||
lru
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, buildDunePackage
|
||||
, astring, digestif, fmt, jsonm, logs, ocaml_lwt, ocamlgraph, uri
|
||||
, repr, ppx_irmin, bheap
|
||||
, repr, ppx_irmin, bheap, uutf
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
|
|
@ -9,7 +9,7 @@ buildDunePackage {
|
|||
inherit (ppx_irmin) src version;
|
||||
|
||||
useDune2 = true;
|
||||
minimumOCamlVersion = "4.07";
|
||||
minimumOCamlVersion = "4.08";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
astring
|
||||
|
|
@ -23,6 +23,7 @@ buildDunePackage {
|
|||
repr
|
||||
bheap
|
||||
ppx_irmin
|
||||
uutf
|
||||
];
|
||||
|
||||
# circular dependency on irmin-mem
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "ppx_irmin";
|
||||
version = "2.7.2";
|
||||
version = "2.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz";
|
||||
sha256 = "29c68c5001a727aaa7a6842d6204ffa3e24b3544fa4f6af2234cdbfa032f7fdf";
|
||||
sha256 = "10r7j4z4gx3dp48lavjhpb1cam27n6ch751amslb0drphy53l00n";
|
||||
};
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, buildDunePackage, fetchurl
|
||||
, ipaddr, cstruct, lwt, rresult, logs, lru
|
||||
, ipaddr, cstruct, lwt, logs, lru
|
||||
, tcpip, ethernet, stdlib-shims
|
||||
, alcotest, mirage-clock-unix
|
||||
, ppxlib, ppx_deriving
|
||||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "mirage-nat";
|
||||
version = "2.2.3";
|
||||
version = "2.2.5";
|
||||
|
||||
minimumOCamlVersion = "4.06";
|
||||
minimumOCamlVersion = "4.08";
|
||||
|
||||
# due to cstruct
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
|
||||
sha256 = "0cy95j184hi8fm1h6z6x1brjfrmbq3zjy2mqz99m8ys9vwkb63ma";
|
||||
sha256 = "01xp0z4mywhawz7rxizi9ph342mqqwyfa5hqgvs8lhqzcym5d104";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -27,7 +27,6 @@ buildDunePackage rec {
|
|||
ipaddr
|
||||
cstruct
|
||||
lwt
|
||||
rresult
|
||||
logs
|
||||
lru
|
||||
tcpip
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
, tcpip
|
||||
, uri
|
||||
, lwt
|
||||
, astring
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
|
|
@ -33,7 +34,7 @@ buildDunePackage {
|
|||
ipaddr
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
doCheck = false; # tests fail
|
||||
checkInputs = [
|
||||
alcotest-lwt
|
||||
fmt
|
||||
|
|
@ -43,6 +44,7 @@ buildDunePackage {
|
|||
tcpip
|
||||
uri
|
||||
lwt
|
||||
astring
|
||||
];
|
||||
|
||||
meta = paf.meta // {
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "paf";
|
||||
version = "0.0.6";
|
||||
version = "0.0.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz";
|
||||
sha256 = "21adbe0f7f9c0242354fa996468d01bf21d5cbcbdd978c911df8e2e299e8f9ae";
|
||||
sha256 = "CyIIV11G7oUPPHuhov52LP4Ih4pY6bcUApD23/9q39k=";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
|
|
@ -46,15 +46,15 @@ buildDunePackage rec {
|
|||
faraday
|
||||
tls
|
||||
cstruct
|
||||
tcpip
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
doCheck = false;
|
||||
checkInputs = [
|
||||
lwt
|
||||
logs
|
||||
fmt
|
||||
mirage-crypto-rng
|
||||
tcpip
|
||||
mirage-time-unix
|
||||
ptime
|
||||
uri
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, version ?
|
||||
if lib.versionAtLeast ocaml.version "4.07"
|
||||
then if lib.versionAtLeast ocaml.version "4.08"
|
||||
then "0.23.0" else "0.15.0" else "0.13.0"
|
||||
then "0.24.0" else "0.15.0" else "0.13.0"
|
||||
, ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio
|
||||
, stdlib-shims, ocaml-migrate-parsetree-2
|
||||
}:
|
||||
|
|
@ -42,6 +42,10 @@ let param = {
|
|||
sha256 = "0jg5v4pssbl66hn5davpin1i57a0r3r54l96vpz5y99xk5w70xi1";
|
||||
min_version = "4.07";
|
||||
};
|
||||
"0.24.0" = {
|
||||
sha256 = "sha256-wuG7cUZiVP2PdM+nZloip7lGGiWn6Wpkh2YoF/Fuc9o=";
|
||||
min_version = "4.07";
|
||||
};
|
||||
}."${version}"; in
|
||||
|
||||
if param ? max_version && lib.versionAtLeast ocaml.version param.max_version
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, buildDunePackage, fetchurl, base64, either, fmt, jsonm, uutf }:
|
||||
{ lib, buildDunePackage, fetchurl, base64, either, fmt, jsonm, uutf, optint }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "repr";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/${pname}/releases/download/${version}/${pname}-fuzz-${version}.tbz";
|
||||
sha256 = "1kpwgncyxcrq90dn7ilja7c5i88whc3fz4fmq1lwr0ar95d7d48p";
|
||||
sha256 = "1y9qnbaxcyxz7bzkkq5lwjrv715mvp2vphzcrd8vbvjhp7df3l1f";
|
||||
};
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
|
|
@ -18,6 +18,7 @@ buildDunePackage rec {
|
|||
fmt
|
||||
jsonm
|
||||
uutf
|
||||
optint
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ buildDunePackage {
|
|||
repr
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
doCheck = false; # tests fail with ppxlib >= 0.23.0
|
||||
checkInputs = [
|
||||
alcotest
|
||||
hex
|
||||
|
|
|
|||
|
|
@ -6,20 +6,20 @@
|
|||
, lwt, lwt-dllist, logs, duration, randomconv, ethernet
|
||||
, alcotest, mirage-flow, mirage-vnetif, pcap-format
|
||||
, mirage-clock-unix, arp, ipaddr-cstruct, mirage-random-test
|
||||
, lru
|
||||
, lru, metrics
|
||||
, withFreestanding ? false
|
||||
, ocaml-freestanding
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "tcpip";
|
||||
version = "6.2.0";
|
||||
version = "7.0.1";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
|
||||
sha256 = "d0f6e643ce04da808d5f977c5ab2422cdb4f67e7abdc46dd6776ceada7151e1b";
|
||||
url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
|
||||
sha256 = "0gqj2s9sk3a7f4yavx423a569fvxsrgm0wg58biiv16v37xjaymp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -51,18 +51,19 @@ buildDunePackage rec {
|
|||
randomconv
|
||||
ethernet
|
||||
lru
|
||||
metrics
|
||||
arp
|
||||
] ++ lib.optionals withFreestanding [
|
||||
ocaml-freestanding
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
doCheck = false;
|
||||
checkInputs = [
|
||||
alcotest
|
||||
mirage-flow
|
||||
mirage-vnetif
|
||||
pcap-format
|
||||
mirage-clock-unix
|
||||
arp
|
||||
ipaddr-cstruct
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,35 @@
|
|||
{ lib
|
||||
, buildDunePackage
|
||||
, tezos-stdlib
|
||||
, tezos-base
|
||||
, tezos-client-011-PtHangz2
|
||||
, tezos-protocol-011-PtHangz2
|
||||
, tezos-protocol-011-PtHangz2-parameters
|
||||
, tezos-protocol-environment
|
||||
, tezos-shell-services
|
||||
, tezos-stdlib-unix
|
||||
, tezos-test-helpers
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "tezos-011-PtHangz2-test-helpers";
|
||||
inherit (tezos-stdlib) version useDune2;
|
||||
src = "${tezos-stdlib.base_src}/src";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
tezos-base
|
||||
tezos-client-011-PtHangz2
|
||||
tezos-protocol-011-PtHangz2
|
||||
tezos-protocol-011-PtHangz2-parameters
|
||||
tezos-protocol-environment
|
||||
tezos-shell-services
|
||||
tezos-stdlib-unix
|
||||
tezos-test-helpers
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = tezos-stdlib.meta // {
|
||||
description = "Tezos/Protocol: protocol testing framework";
|
||||
};
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue