mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-02 02:27:33 +03:00
Merge master into haskell-updates
This commit is contained in:
commit
c0804e6f21
@ -683,6 +683,13 @@
|
||||
githubId = 2626481;
|
||||
name = "Ambroz Bizjak";
|
||||
};
|
||||
amesgen = {
|
||||
email = "amesgen@amesgen.de";
|
||||
github = "amesgen";
|
||||
githubId = 15369874;
|
||||
name = "Alexander Esgen";
|
||||
matrix = "@amesgen:amesgen.de";
|
||||
};
|
||||
ametrine = {
|
||||
name = "Matilde Ametrine";
|
||||
email = "matilde@diffyq.xyz";
|
||||
@ -9796,6 +9803,12 @@
|
||||
githubId = 25278;
|
||||
name = "Otavio Salvador";
|
||||
};
|
||||
otini = {
|
||||
name = "Olivier Nicole";
|
||||
email = "olivier@chnik.fr";
|
||||
github = "OlivierNicole";
|
||||
githubId = 14031333;
|
||||
};
|
||||
otwieracz = {
|
||||
email = "slawek@otwiera.cz";
|
||||
github = "otwieracz";
|
||||
|
@ -256,12 +256,8 @@ with lib.maintainers; {
|
||||
golang = {
|
||||
members = [
|
||||
c00w
|
||||
cstrahan
|
||||
Frostman
|
||||
kalbasit
|
||||
mic92
|
||||
orivej
|
||||
rvolosatovs
|
||||
zowoq
|
||||
];
|
||||
scope = "Maintain Golang compilers.";
|
||||
|
@ -406,6 +406,12 @@
|
||||
application tries to talk to the libsecret D-Bus API.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
There is a new module for AMD SEV CPU functionality, which
|
||||
grants access to the hardware.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
There is a new module for the <literal>thunar</literal>
|
||||
|
@ -149,6 +149,8 @@ Use `configure.packages` instead.
|
||||
|
||||
- The `pass-secret-service` package now includes systemd units from upstream, so adding it to the NixOS `services.dbus.packages` option will make it start automatically as a systemd user service when an application tries to talk to the libsecret D-Bus API.
|
||||
|
||||
- There is a new module for AMD SEV CPU functionality, which grants access to the hardware.
|
||||
|
||||
- There is a new module for the `thunar` program (the Xfce file manager), which depends on the `xfconf` dbus service, and also has a dbus service and a systemd unit. The option `services.xserver.desktopManager.xfce.thunarPlugins` has been renamed to `programs.thunar.plugins`, and in a future release it may be removed.
|
||||
|
||||
- There is a new module for the `xfconf` program (the Xfce configuration storage system), which has a dbus service.
|
||||
|
51
nixos/modules/hardware/cpu/amd-sev.nix
Normal file
51
nixos/modules/hardware/cpu/amd-sev.nix
Normal file
@ -0,0 +1,51 @@
|
||||
{ config, lib, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.hardware.cpu.amd.sev;
|
||||
defaultGroup = "sev";
|
||||
in
|
||||
with lib; {
|
||||
options.hardware.cpu.amd.sev = {
|
||||
enable = mkEnableOption "access to the AMD SEV device";
|
||||
user = mkOption {
|
||||
description = "Owner to assign to the SEV device.";
|
||||
type = types.str;
|
||||
default = "root";
|
||||
};
|
||||
group = mkOption {
|
||||
description = "Group to assign to the SEV device.";
|
||||
type = types.str;
|
||||
default = defaultGroup;
|
||||
};
|
||||
mode = mkOption {
|
||||
description = "Mode to set for the SEV device.";
|
||||
type = types.str;
|
||||
default = "0660";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = hasAttr cfg.user config.users.users;
|
||||
message = "Given user does not exist";
|
||||
}
|
||||
{
|
||||
assertion = (cfg.group == defaultGroup) || (hasAttr cfg.group config.users.groups);
|
||||
message = "Given group does not exist";
|
||||
}
|
||||
];
|
||||
|
||||
boot.extraModprobeConfig = ''
|
||||
options kvm_amd sev=1
|
||||
'';
|
||||
|
||||
users.groups = optionalAttrs (cfg.group == defaultGroup) {
|
||||
"${cfg.group}" = {};
|
||||
};
|
||||
|
||||
services.udev.extraRules = with cfg; ''
|
||||
KERNEL=="sev", OWNER="${user}", GROUP="${group}", MODE="${mode}"
|
||||
'';
|
||||
};
|
||||
}
|
@ -216,6 +216,7 @@ in
|
||||
# we can't be part of a system service, and the agent should
|
||||
# be okay with the main service coming and going
|
||||
wantedBy = [ "default.target" ];
|
||||
after = lib.optionals cfg.enableWifi [ "network-online.target" ];
|
||||
unitConfig.ConditionUser = "!@system";
|
||||
serviceConfig = {
|
||||
Type = "exec";
|
||||
|
@ -347,8 +347,9 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
services.redis = lib.mkIf (cfg.redisCreateLocally) {
|
||||
services.redis.servers.nitter = lib.mkIf (cfg.redisCreateLocally) {
|
||||
enable = true;
|
||||
port = cfg.cache.redisPort;
|
||||
};
|
||||
|
||||
networking.firewall = mkIf cfg.openFirewall {
|
||||
|
@ -11,6 +11,7 @@ let
|
||||
NODE_CONFIG_DIR = "/var/lib/peertube/config";
|
||||
NODE_ENV = "production";
|
||||
NODE_EXTRA_CA_CERTS = "/etc/ssl/certs/ca-certificates.crt";
|
||||
NPM_CONFIG_CACHE = "/var/cache/peertube/.npm";
|
||||
NPM_CONFIG_PREFIX = cfg.package;
|
||||
HOME = cfg.package;
|
||||
};
|
||||
@ -425,6 +426,9 @@ in {
|
||||
# State directory and mode
|
||||
StateDirectory = "peertube";
|
||||
StateDirectoryMode = "0750";
|
||||
# Cache directory and mode
|
||||
CacheDirectory = "peertube";
|
||||
CacheDirectoryMode = "0750";
|
||||
# Access write directories
|
||||
ReadWritePaths = cfg.dataDirs;
|
||||
# Environment
|
||||
|
@ -767,10 +767,10 @@ in
|
||||
description = "ZFS pools scrubbing";
|
||||
after = [ "zfs-import.target" ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
Type = "simple";
|
||||
};
|
||||
script = ''
|
||||
${cfgZfs.package}/bin/zpool scrub ${
|
||||
${cfgZfs.package}/bin/zpool scrub -w ${
|
||||
if cfgScrub.pools != [] then
|
||||
(concatStringsSep " " cfgScrub.pools)
|
||||
else
|
||||
|
@ -742,12 +742,6 @@ in
|
||||
|
||||
config = mkIf (config.boot.enableContainers) (let
|
||||
|
||||
warnings = flatten [
|
||||
(optional (config.virtualisation.containers.enable && versionOlder config.system.stateVersion "22.05") ''
|
||||
Enabling both boot.enableContainers & virtualisation.containers on system.stateVersion < 22.05 is unsupported.
|
||||
'')
|
||||
];
|
||||
|
||||
unit = {
|
||||
description = "Container '%i'";
|
||||
|
||||
@ -771,6 +765,11 @@ in
|
||||
serviceConfig = serviceDirectives dummyConfig;
|
||||
};
|
||||
in {
|
||||
warnings =
|
||||
(optional (config.virtualisation.containers.enable && versionOlder config.system.stateVersion "22.05") ''
|
||||
Enabling both boot.enableContainers & virtualisation.containers on system.stateVersion < 22.05 is unsupported.
|
||||
'');
|
||||
|
||||
systemd.targets.multi-user.wants = [ "machines.target" ];
|
||||
|
||||
systemd.services = listToAttrs (filter (x: x.value != null) (
|
||||
|
@ -335,16 +335,16 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
beacon = callPackage ({ elpaBuild, fetchurl, lib, seq }:
|
||||
beacon = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "beacon";
|
||||
ename = "beacon";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/beacon-1.3.3.el";
|
||||
sha256 = "10r4fpf8pcf1qn5ncpm5g7skzba749mrc1ggykq92jlha3q98s02";
|
||||
url = "https://elpa.gnu.org/packages/beacon-1.3.4.tar";
|
||||
sha256 = "1fy76c2x0xpnx7wfpsxfawdlrspan4dbj2157k9sa62i6a1c8f21";
|
||||
};
|
||||
packageRequires = [ seq ];
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/beacon.html";
|
||||
license = lib.licenses.free;
|
||||
@ -399,10 +399,10 @@
|
||||
elpaBuild {
|
||||
pname = "boxy";
|
||||
ename = "boxy";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/boxy-1.1.0.tar";
|
||||
sha256 = "17z0amn1klbzvq0z5g20a5gjq5agrrhnkp8amqlqzj7p0p31nbns";
|
||||
url = "https://elpa.gnu.org/packages/boxy-1.1.1.tar";
|
||||
sha256 = "08jb5v93l3y9cx48qhpv20i7kdxvl5dinxj3z0pxkx0ckvml7cvd";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -440,16 +440,16 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
buffer-env = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
buffer-env = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "buffer-env";
|
||||
ename = "buffer-env";
|
||||
version = "0.3";
|
||||
version = "0.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/buffer-env-0.3.tar";
|
||||
sha256 = "0h92pia258fndihnwmnak10ix00dmfanadnsnzbdah3q64416qhz";
|
||||
url = "https://elpa.gnu.org/packages/buffer-env-0.4.tar";
|
||||
sha256 = "0y8ik87dqldhn6q631zp2ln9z5byqgm9icrvr4xrdx6g8mr9c56z";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/buffer-env.html";
|
||||
license = lib.licenses.free;
|
||||
@ -771,10 +771,10 @@
|
||||
elpaBuild {
|
||||
pname = "compat";
|
||||
ename = "compat";
|
||||
version = "28.1.1.3";
|
||||
version = "28.1.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/compat-28.1.1.3.tar";
|
||||
sha256 = "11g27n0103j1xmj1s3m49jcqxn4n4wd9pm69i2g3ikijxs1qw18n";
|
||||
url = "https://elpa.gnu.org/packages/compat-28.1.2.0.tar";
|
||||
sha256 = "0gm2drvxdlmc3fjlapb5z8k1ymr6q7mrj9z7mb686jfy931b9mwr";
|
||||
};
|
||||
packageRequires = [ emacs nadvice ];
|
||||
meta = {
|
||||
@ -797,6 +797,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
consult-recoll = callPackage ({ consult, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "consult-recoll";
|
||||
ename = "consult-recoll";
|
||||
version = "0.6.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/consult-recoll-0.6.2.tar";
|
||||
sha256 = "0ngisaxdsfmjcincxdjrpgj6q6vh4dav7b2bpfls9a7107rb2ycp";
|
||||
};
|
||||
packageRequires = [ consult emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/consult-recoll.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
context-coloring = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "context-coloring";
|
||||
@ -1056,10 +1071,10 @@
|
||||
elpaBuild {
|
||||
pname = "denote";
|
||||
ename = "denote";
|
||||
version = "0.3.1";
|
||||
version = "0.4.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/denote-0.3.1.tar";
|
||||
sha256 = "0zdxflmm62gkg6nbrpaxinwb60ghr19pvr3jbgnvbca3bd5yg5wk";
|
||||
url = "https://elpa.gnu.org/packages/denote-0.4.0.tar";
|
||||
sha256 = "031ia1k5fqzq154jhi4icvivhdg8yn7zfkwy81yf0ivcsivri54s";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1086,10 +1101,10 @@
|
||||
elpaBuild {
|
||||
pname = "devdocs";
|
||||
ename = "devdocs";
|
||||
version = "0.4";
|
||||
version = "0.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/devdocs-0.4.tar";
|
||||
sha256 = "05xmxqpp1cpf03y7idpqdsmbj30cissscy80ng5hqc3028kr2jqm";
|
||||
url = "https://elpa.gnu.org/packages/devdocs-0.5.tar";
|
||||
sha256 = "0qyp8lhf76yv2ym7cryvygvf2m9jah5nsl1g79gqjrsin6vlhqka";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1429,10 +1444,10 @@
|
||||
elpaBuild {
|
||||
pname = "eldoc";
|
||||
ename = "eldoc";
|
||||
version = "1.12.0";
|
||||
version = "1.13.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/eldoc-1.12.0.tar";
|
||||
sha256 = "1npggpisqnfkc3gx7dr3pjnif7gf571z7s9g7n6vnb213353qskk";
|
||||
url = "https://elpa.gnu.org/packages/eldoc-1.13.0.tar";
|
||||
sha256 = "0c05dzrs7vrhibj46jpz625482ah6xywji7way6wcvwc711y74fz";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2333,10 +2348,10 @@
|
||||
elpaBuild {
|
||||
pname = "javaimp";
|
||||
ename = "javaimp";
|
||||
version = "0.8";
|
||||
version = "0.9.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/javaimp-0.8.tar";
|
||||
sha256 = "1i6k0yz6r7v774qgnkzinia783fwx73y3brxr31sbip3b5dbpmsn";
|
||||
url = "https://elpa.gnu.org/packages/javaimp-0.9.1.tar";
|
||||
sha256 = "106wn53z39fcna3sv4p0idmjg9lg5lijm5hyb4lbibp4s5yh2y3b";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -2764,6 +2779,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
minibuffer-header = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "minibuffer-header";
|
||||
ename = "minibuffer-header";
|
||||
version = "0.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/minibuffer-header-0.5.tar";
|
||||
sha256 = "1nw53h34izm0z8njsf6jacc40fhg4x5l8r403ysmw2ps89i80p36";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/minibuffer-header.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
minibuffer-line = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "minibuffer-line";
|
||||
@ -2832,10 +2862,10 @@
|
||||
elpaBuild {
|
||||
pname = "modus-themes";
|
||||
ename = "modus-themes";
|
||||
version = "2.4.1";
|
||||
version = "2.5.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/modus-themes-2.4.1.tar";
|
||||
sha256 = "0wm4wj2dsv93p8yq7byrwni079caxny9cgn8d5xz0a6g1igqzx4q";
|
||||
url = "https://elpa.gnu.org/packages/modus-themes-2.5.0.tar";
|
||||
sha256 = "0j2mx47fpbqvpwhkdskgrnyj5nzg25sqgxwsdvrvw22c7gxhirxn";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3100,10 +3130,10 @@
|
||||
elpaBuild {
|
||||
pname = "num3-mode";
|
||||
ename = "num3-mode";
|
||||
version = "1.3";
|
||||
version = "1.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/num3-mode-1.3.el";
|
||||
sha256 = "0x2jpnzvpbj03pbmhsny5gygh63c4dbl4g3k0cfs3vh4qmp2dg6w";
|
||||
url = "https://elpa.gnu.org/packages/num3-mode-1.4.tar";
|
||||
sha256 = "01cl5wc5xzf4milq6r5ps2f4ikpkdbdidk880svby9mhiw6agydh";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -3246,6 +3276,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
org-notify = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "org-notify";
|
||||
ename = "org-notify";
|
||||
version = "0.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-notify-0.1.0.tar";
|
||||
sha256 = "1ijwlv8493g19cascv7fl23sjljvdcak6pg4y1wbs595mmsmh409";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/org-notify.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
org-real = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib, org }:
|
||||
elpaBuild {
|
||||
pname = "org-real";
|
||||
@ -3370,10 +3415,10 @@
|
||||
elpaBuild {
|
||||
pname = "pabbrev";
|
||||
ename = "pabbrev";
|
||||
version = "4.2.1";
|
||||
version = "4.2.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/pabbrev-4.2.1.el";
|
||||
sha256 = "19v5adk61y8fpigw7k6wz6dj79jwr450hnbi7fj0jvb21cvjmfxh";
|
||||
url = "https://elpa.gnu.org/packages/pabbrev-4.2.2.tar";
|
||||
sha256 = "0iydz8yz866krxv1qv32k88w4464xpymh0wxgrxv6nvniwvhvd0s";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -3456,6 +3501,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
perl-doc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "perl-doc";
|
||||
ename = "perl-doc";
|
||||
version = "0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/perl-doc-0.2.tar";
|
||||
sha256 = "1p5bbkwllh91a0vg5aisqa9kbms7l9vxk14lm09bav952xxn6gdl";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/perl-doc.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
persist = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "persist";
|
||||
@ -3475,10 +3535,10 @@
|
||||
elpaBuild {
|
||||
pname = "phps-mode";
|
||||
ename = "phps-mode";
|
||||
version = "0.4.22";
|
||||
version = "0.4.25";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/phps-mode-0.4.22.tar";
|
||||
sha256 = "1094dmvihx0ff7fyjldd2zfn47nq89p6bjp90ma0xf01hf6ggn6c";
|
||||
url = "https://elpa.gnu.org/packages/phps-mode-0.4.25.tar";
|
||||
sha256 = "1sqwh7lkpgwc8m7vrbzjk8vc2p3b9gq6smyz6zx8pq4pf1rqkzrd";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3505,10 +3565,10 @@
|
||||
elpaBuild {
|
||||
pname = "plz";
|
||||
ename = "plz";
|
||||
version = "0.1";
|
||||
version = "0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/plz-0.1.tar";
|
||||
sha256 = "083qz6kfg4q8xy3vsfwlk2g9vbg8iym2axmyhh54naivrc096ghc";
|
||||
url = "https://elpa.gnu.org/packages/plz-0.2.tar";
|
||||
sha256 = "1b45m9b9gzx5ylpxcppkiikk5lfya7ngiqsap4a7m1b2cr8rqxcj";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3595,10 +3655,10 @@
|
||||
elpaBuild {
|
||||
pname = "pulsar";
|
||||
ename = "pulsar";
|
||||
version = "0.3.1";
|
||||
version = "0.4.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/pulsar-0.3.1.tar";
|
||||
sha256 = "0v3bdw0sgic98b7xj19g37hw1vinanagsbhyf5qpajx3gm2im9wx";
|
||||
url = "https://elpa.gnu.org/packages/pulsar-0.4.0.tar";
|
||||
sha256 = "027kpywdjfd1xm1fxkprbc04iq96lnyzw2f3499wyrfj4vxk2dn2";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4530,10 +4590,10 @@
|
||||
elpaBuild {
|
||||
pname = "taxy";
|
||||
ename = "taxy";
|
||||
version = "0.9";
|
||||
version = "0.10";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/taxy-0.9.tar";
|
||||
sha256 = "1nzafs3yvcnmg07zi345n2yvjsw9wixlybzibnhf5k6jnd0vvpjh";
|
||||
url = "https://elpa.gnu.org/packages/taxy-0.10.tar";
|
||||
sha256 = "1jamry2p3qhswq8prd2g7ljh4yqk0wwblyd9fhnaclakahrn5vi3";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4545,16 +4605,17 @@
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib
|
||||
, magit-section }:
|
||||
, magit-section
|
||||
, taxy }:
|
||||
elpaBuild {
|
||||
pname = "taxy-magit-section";
|
||||
ename = "taxy-magit-section";
|
||||
version = "0.9.1";
|
||||
version = "0.10";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/taxy-magit-section-0.9.1.tar";
|
||||
sha256 = "0ybkz5nqjdrg2z9bfd07xg4k49hrl26vsrwz2vqpfbsqqg5vr4pr";
|
||||
url = "https://elpa.gnu.org/packages/taxy-magit-section-0.10.tar";
|
||||
sha256 = "1g58nvpb04ldhn5qnjw2q5idrv6vhlfa0qmb46cvis6bkz46cxkw";
|
||||
};
|
||||
packageRequires = [ emacs magit-section ];
|
||||
packageRequires = [ emacs magit-section taxy ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/taxy-magit-section.html";
|
||||
license = lib.licenses.free;
|
||||
@ -4673,10 +4734,10 @@
|
||||
elpaBuild {
|
||||
pname = "tramp";
|
||||
ename = "tramp";
|
||||
version = "2.5.3";
|
||||
version = "2.5.3.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.5.3.tar";
|
||||
sha256 = "16bs90h7b1d188v6glhfp0y4wgxvwn3dl6l4sbswlf1zq3y61zy7";
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.5.3.1.tar";
|
||||
sha256 = "0dqc5gmp20isrlanccvj6nhalmmsfg7bmm690gxfgrbqcc2vj69a";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4892,10 +4953,10 @@
|
||||
elpaBuild {
|
||||
pname = "vc-got";
|
||||
ename = "vc-got";
|
||||
version = "1.1.2";
|
||||
version = "1.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/vc-got-1.1.2.tar";
|
||||
sha256 = "1824d5c217qimsg4aw8adjvv06gkhv5f3918fi0lkhya1jsvfrx9";
|
||||
url = "https://elpa.gnu.org/packages/vc-got-1.2.tar";
|
||||
sha256 = "074di4bchhnpfixkjdis8dwxx6r32j1qypxk647q1z7lvd92j39s";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -5327,10 +5388,10 @@
|
||||
elpaBuild {
|
||||
pname = "xref";
|
||||
ename = "xref";
|
||||
version = "1.4.1";
|
||||
version = "1.5.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/xref-1.4.1.tar";
|
||||
sha256 = "1vbpplw0sngymmawi940nlqmncqznb5vp7zi0ib8v66g3y33ijrf";
|
||||
url = "https://elpa.gnu.org/packages/xref-1.5.0.tar";
|
||||
sha256 = "0xl6aiwkjbgs44c3wxk6s85diydm3y5lsd7znb0dhbqb7milid2d";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
@ -49,10 +49,10 @@
|
||||
elpaBuild {
|
||||
pname = "annotate";
|
||||
ename = "annotate";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/annotate-1.7.0.tar";
|
||||
sha256 = "0bpicd0m9h1n56ywinfa0wykhx86sxn8i1f2j5vwhwcidap42qaa";
|
||||
url = "https://elpa.nongnu.org/nongnu/annotate-1.7.1.tar";
|
||||
sha256 = "0jyzx5z10mv9b134jz4hkp1mbc9f1ki794cr5na9zwvpd9q3j9iy";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -144,10 +144,10 @@
|
||||
elpaBuild {
|
||||
pname = "autothemer";
|
||||
ename = "autothemer";
|
||||
version = "0.2.3";
|
||||
version = "0.2.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/autothemer-0.2.3.tar";
|
||||
sha256 = "10r4lf3nl7mk6yzfcyld5k0njslw8ly2sd0iz1zkzywnv31lsxnd";
|
||||
url = "https://elpa.nongnu.org/nongnu/autothemer-0.2.5.tar";
|
||||
sha256 = "1g07j8fmyqhhas0ci2f9l7i5l238cpb02vr93gyn2a3r3lq6wn4d";
|
||||
};
|
||||
packageRequires = [ cl-lib dash emacs ];
|
||||
meta = {
|
||||
@ -296,10 +296,10 @@
|
||||
elpaBuild {
|
||||
pname = "clojure-mode";
|
||||
ename = "clojure-mode";
|
||||
version = "5.14.0";
|
||||
version = "5.15.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.14.0.tar";
|
||||
sha256 = "1lirhp6m5r050dm73nrslgzdgy6rdbxn02wal8n52q37m2armra2";
|
||||
url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.15.1.tar";
|
||||
sha256 = "14j6v32cbj52n91f7ckbjlam60rszh05r09bwv579p1xs2m7s7q3";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -473,10 +473,10 @@
|
||||
elpaBuild {
|
||||
pname = "dockerfile-mode";
|
||||
ename = "dockerfile-mode";
|
||||
version = "1.5";
|
||||
version = "1.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/dockerfile-mode-1.5.tar";
|
||||
sha256 = "0dz91i4ak3v0x1v75ibhjjz211k9g6qimz4lxn3x424j7dlpa9f3";
|
||||
url = "https://elpa.nongnu.org/nongnu/dockerfile-mode-1.7.tar";
|
||||
sha256 = "1kb768kv48ypw7fm5xcvkw4pq9mfkvv0bg1inlhfifkb4i9kmz3l";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1123,10 +1123,10 @@
|
||||
elpaBuild {
|
||||
pname = "gruvbox-theme";
|
||||
ename = "gruvbox-theme";
|
||||
version = "1.26.0";
|
||||
version = "1.27.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/gruvbox-theme-1.26.0.tar";
|
||||
sha256 = "19q5i0jz01hdn09wwg929yva6278fhyvk68id5p9dyi8h2n73djn";
|
||||
url = "https://elpa.nongnu.org/nongnu/gruvbox-theme-1.27.0.tar";
|
||||
sha256 = "0p36b2rrhizfrj8i86zm810bh0w7qikb5cwpyn106yfvgcv39jl8";
|
||||
};
|
||||
packageRequires = [ autothemer ];
|
||||
meta = {
|
||||
@ -1198,10 +1198,10 @@
|
||||
elpaBuild {
|
||||
pname = "helm";
|
||||
ename = "helm";
|
||||
version = "3.8.6";
|
||||
version = "3.8.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-3.8.6.tar";
|
||||
sha256 = "0h0l36wmzxi03viy0jd3zri84big0syiilvjm639nqhzsr1lbvy2";
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-3.8.7.tar";
|
||||
sha256 = "1n0m061amrzm0xpgqy2mp9vrk2960gqhl5hi6c1smcmm7nxqwz12";
|
||||
};
|
||||
packageRequires = [ helm-core popup ];
|
||||
meta = {
|
||||
@ -1213,10 +1213,10 @@
|
||||
elpaBuild {
|
||||
pname = "helm-core";
|
||||
ename = "helm-core";
|
||||
version = "3.8.6";
|
||||
version = "3.8.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.6.tar";
|
||||
sha256 = "0yzzwdggd37m7kv0gh4amc7l5x0r5x2pxi3lfs36hq2hfsqlfkza";
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.7.tar";
|
||||
sha256 = "1sak74v3gg34zzlbbgvlzvg7gw32fhcbxp5kigigmwvvbj5imgs7";
|
||||
};
|
||||
packageRequires = [ async emacs ];
|
||||
meta = {
|
||||
@ -1330,10 +1330,10 @@
|
||||
elpaBuild {
|
||||
pname = "inf-clojure";
|
||||
ename = "inf-clojure";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/inf-clojure-3.2.0.tar";
|
||||
sha256 = "1a9hr28l8cxf5j9b5z0mwds4jd36bhdqz9r86c85rylgaibx5ky7";
|
||||
url = "https://elpa.nongnu.org/nongnu/inf-clojure-3.2.1.tar";
|
||||
sha256 = "0p1q51wn67abwhn6qa01f190czaq33nmy4ir1jrcxsny4vnbxvx4";
|
||||
};
|
||||
packageRequires = [ clojure-mode emacs ];
|
||||
meta = {
|
||||
@ -1959,10 +1959,10 @@
|
||||
elpaBuild {
|
||||
pname = "popon";
|
||||
ename = "popon";
|
||||
version = "0.7";
|
||||
version = "0.9";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/popon-0.7.tar";
|
||||
sha256 = "0sr0cv9jlaj83sgk1cb7wd6r12g6gmzdjzm077gxa6jy9p4qrv0q";
|
||||
url = "https://elpa.nongnu.org/nongnu/popon-0.9.tar";
|
||||
sha256 = "1vnrdjg63fcpgzzc45l9cx67yb2lnk5prfp5js4dpdhz93d14qck";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2338,10 +2338,10 @@
|
||||
elpaBuild {
|
||||
pname = "subed";
|
||||
ename = "subed";
|
||||
version = "1.0.5";
|
||||
version = "1.0.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/subed-1.0.5.tar";
|
||||
sha256 = "1wpkwab6scmc9d3bzp5161d8agmcjacpijs8xqb1mpbyvl1jvavc";
|
||||
url = "https://elpa.nongnu.org/nongnu/subed-1.0.7.tar";
|
||||
sha256 = "0js48yar8xgj3wjmlkv3k5208q1zvv74sg4lhk6asiy4cq3pqjia";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2712,10 +2712,10 @@
|
||||
elpaBuild {
|
||||
pname = "xah-fly-keys";
|
||||
ename = "xah-fly-keys";
|
||||
version = "17.17.20220709145456";
|
||||
version = "17.19.20220806194323";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.17.20220709145456.tar";
|
||||
sha256 = "1npgdc9f1vj1d9nyfh30vskybqs2lwhd31b2a7i79ifrxs48kqr4";
|
||||
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.19.20220806194323.tar";
|
||||
sha256 = "1cflsvp1cpyr3zsj2dij3mc36lprwjdhrvxx2k8ilavhzi4dn64v";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1959,8 +1959,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "adwaita-theme";
|
||||
publisher = "piousdeer";
|
||||
version = "1.0.7";
|
||||
sha256 = "zfG9ktxOCUOJaNrWtblq+ktSMppwp1SaB/39F1qfQew=";
|
||||
version = "1.0.8";
|
||||
sha256 = "XyzxiwKQGDUIXp6rnt1BmPzfpd1WrG8HnEqYEOJV6P8=";
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "Theme for the GNOME desktop";
|
||||
|
@ -22,20 +22,20 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rnote";
|
||||
version = "0.5.3";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flxzt";
|
||||
repo = "rnote";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-v4cca4tSv//VFUvOfemkueELxlez2TdtynqbzjCTlB4=";
|
||||
hash = "sha256-CZLZblC10k5ynzDDXi/bOe6Rc6M94eywXjyu0ABOVq4=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-sK8GOLxNG4mu45oQSaFi467DHYt00Pxu3vMM6Po/YqI=";
|
||||
hash = "sha256-Udat35KqrMWR0Ckx34BWoF0HiJHZ5CP2CGFD6FNCWRA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -2,17 +2,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "logseq";
|
||||
version = "0.7.9";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
|
||||
sha256 = "sha256-tca9jWMlBT+r1CFyGKe8xMA6O0T/tnbmU7uVk+3o87o=";
|
||||
sha256 = "sha256-eHSZqWQWPX5gavzUwsI3VMsD2Ov0h/fVPqnA92dzKH4=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
name = "${pname}-${version}";
|
||||
inherit src;
|
||||
inherit pname src version;
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
@ -1,59 +0,0 @@
|
||||
{ lib
|
||||
, buildPythonApplication
|
||||
, fetchPypi
|
||||
, mercurial
|
||||
# build inputs
|
||||
, distro
|
||||
, glean-sdk
|
||||
, pip
|
||||
, python-hglib
|
||||
, sentry-sdk
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "moz-phab";
|
||||
version = "0.1.99";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "MozPhab";
|
||||
inherit version;
|
||||
sha256 = "sha256-uKoMMSp5AIvB1qTRYAh7n1+2dDLneFbssfkfTTshfcs=";
|
||||
};
|
||||
|
||||
# Relax python-hglib requirement
|
||||
# https://phabricator.services.mozilla.com/D131618
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "==" ">="
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
distro
|
||||
glean-sdk
|
||||
pip
|
||||
python-hglib
|
||||
sentry-sdk
|
||||
setuptools
|
||||
];
|
||||
checkInputs = [
|
||||
mercurial
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Phabricator CLI from Mozilla to support submission of a series of commits";
|
||||
longDescription = ''
|
||||
moz-phab is a custom command-line tool, which communicates to
|
||||
Phabricator’s API, providing several conveniences, including support for
|
||||
submitting series of commits.
|
||||
'';
|
||||
homepage = "https://moz-conduit.readthedocs.io/en/latest/phabricator-user.html";
|
||||
license = licenses.mpl20;
|
||||
maintainers = [];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
78
pkgs/applications/misc/mozphab/default.nix
Normal file
78
pkgs/applications/misc/mozphab/default.nix
Normal file
@ -0,0 +1,78 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
|
||||
# tests
|
||||
, git
|
||||
, mercurial
|
||||
, patch
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "mozphab";
|
||||
version = "1.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla-conduit";
|
||||
repo = "review";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-vLHikGjTYOeXd6jDRsoCkq3i0eh6Ttd4KdvlixjzdZ4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "glean-sdk>=50.0.1,==50.*" "glean-sdk"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
distro
|
||||
glean-sdk
|
||||
packaging
|
||||
python-hglib
|
||||
sentry-sdk
|
||||
setuptools
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
git
|
||||
mercurial
|
||||
patch
|
||||
]
|
||||
++ (with python3.pkgs; [
|
||||
callee
|
||||
immutabledict
|
||||
hg-evolve
|
||||
mock
|
||||
pytestCheckHook
|
||||
]);
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
disabledTestPaths = [
|
||||
# codestyle doesn't matter to us
|
||||
"tests/test_style.py"
|
||||
# integration tests try to submit changes, which requires network access
|
||||
"tests/test_integration_git.py"
|
||||
"tests/test_integration_hg.py"
|
||||
"tests/test_integration_hg_dag.py"
|
||||
"tests/test_integration_patch.py"
|
||||
"tests/test_integration_reorganise.py"
|
||||
"tests/test_sentry.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Phabricator CLI from Mozilla to support submission of a series of commits";
|
||||
longDescription = ''
|
||||
moz-phab is a custom command-line tool, which communicates to
|
||||
Phabricator’s API, providing several conveniences, including support for
|
||||
submitting series of commits.
|
||||
'';
|
||||
homepage = "https://moz-conduit.readthedocs.io/en/latest/phabricator-user.html";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
@ -32,9 +32,9 @@
|
||||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "105.0.5195.19",
|
||||
"sha256": "08wap1v2qjx8nzd8sbiv24vx0vdc2dhlzrlv3g4zpm2qj7l4mki7",
|
||||
"sha256bin64": "1alj49ysqdr5w1q42ww36kxfx60df2z5jxj39lza4vxm9b8r6ij2",
|
||||
"version": "106.0.5216.6",
|
||||
"sha256": "1mgdzm5iw0ml9w68wszcscw0d3l2rlsanhznyz2ll2qv412wxgci",
|
||||
"sha256bin64": "02kj2swqfvcvn27x22i98g7r0fj4p20bqcabagigxs1bhxw56akc",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-07-11",
|
||||
|
@ -169,8 +169,8 @@ rec {
|
||||
mkTerraform = attrs: pluggable (generic attrs);
|
||||
|
||||
terraform_1 = mkTerraform {
|
||||
version = "1.2.6";
|
||||
sha256 = "sha256-IUm08/zoL6Tw36vQrCl+kvQ6q8qArBh8LvbFf2QPn7M=";
|
||||
version = "1.2.7";
|
||||
sha256 = "sha256-0AGONBurlm0cSM4HyAmUxLt8GdnqNPh146A8ibyfe+k=";
|
||||
vendorSha256 = "sha256-Whe1prBGsE0q0QdNkzAKwvAP7EVlnD/985gjngh+VI4=";
|
||||
patches = [ ./provider-path-0_15.patch ];
|
||||
passthru = {
|
||||
|
@ -32,10 +32,6 @@ let
|
||||
hash = "sha256-4rpoDQ3o0WdWg/TmazTI+J0hL/MxwHcNMXWMq7GE7Tk=";
|
||||
};
|
||||
});
|
||||
electronExec = if stdenv.isDarwin then
|
||||
"${electron_18}/Applications/Electron.app/Contents/MacOS/Electron"
|
||||
else
|
||||
"${electron_18}/bin/electron";
|
||||
esbuild' = esbuild.override {
|
||||
buildGoModule = args: buildGoModule (args // rec {
|
||||
version = "0.12.29";
|
||||
@ -102,7 +98,7 @@ in nodePackages.deltachat-desktop.override rec {
|
||||
$out/lib/node_modules/deltachat-desktop/html-dist/fonts
|
||||
done
|
||||
|
||||
makeWrapper ${electronExec} $out/bin/deltachat \
|
||||
makeWrapper ${electron_18}/bin/electron $out/bin/deltachat \
|
||||
--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \
|
||||
--add-flags $out/lib/node_modules/deltachat-desktop
|
||||
'';
|
||||
|
@ -19,7 +19,6 @@
|
||||
let
|
||||
pinData = lib.importJSON ./pin.json;
|
||||
executableName = "element-desktop";
|
||||
electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron";
|
||||
keytar = callPackage ./keytar { inherit Security AppKit; };
|
||||
seshat = callPackage ./seshat { inherit CoreServices; };
|
||||
in
|
||||
@ -83,7 +82,7 @@ mkYarnPackage rec {
|
||||
|
||||
# executable wrapper
|
||||
# LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102
|
||||
makeWrapper '${electron_exec}' "$out/bin/${executableName}" \
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
|
||||
--set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \
|
||||
--add-flags "$out/share/element/electron" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
|
||||
|
@ -19,7 +19,6 @@
|
||||
let
|
||||
pinData = lib.importJSON ./pin.json;
|
||||
executableName = "schildichat-desktop";
|
||||
electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "schildichat-desktop";
|
||||
@ -88,7 +87,7 @@ stdenv.mkDerivation rec {
|
||||
done
|
||||
|
||||
# executable wrapper
|
||||
makeWrapper '${electron_exec}' "$out/bin/${executableName}" \
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
|
||||
--add-flags "$out/share/element/electron" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "5.53.0"; # Please backport all updates to the stable channel.
|
||||
version = "5.54.0"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "sha256-31IIjeaziXyH+RFEDTutghj8iq8ogANbxvssJUj9HpM=";
|
||||
sha256 = "sha256-dGxbsSNvBT0KFukSNXyii69hMN246IYFbb0CzrDh7IU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
257
pkgs/applications/networking/n8n/node-packages.nix
generated
257
pkgs/applications/networking/n8n/node-packages.nix
generated
@ -67,40 +67,40 @@ let
|
||||
sha512 = "TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==";
|
||||
};
|
||||
};
|
||||
"@azure/core-auth-1.3.2" = {
|
||||
"@azure/core-auth-1.4.0" = {
|
||||
name = "_at_azure_slash_core-auth";
|
||||
packageName = "@azure/core-auth";
|
||||
version = "1.3.2";
|
||||
version = "1.4.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.3.2.tgz";
|
||||
sha512 = "7CU6DmCHIZp5ZPiZ9r3J17lTKMmYsm/zGvNkjArQwPkrLlZ1TZ+EUYfGgh2X31OLMVAQCTJZW4cXHJi02EbJnA==";
|
||||
url = "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.4.0.tgz";
|
||||
sha512 = "HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ==";
|
||||
};
|
||||
};
|
||||
"@azure/core-client-1.6.0" = {
|
||||
"@azure/core-client-1.6.1" = {
|
||||
name = "_at_azure_slash_core-client";
|
||||
packageName = "@azure/core-client";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.6.0.tgz";
|
||||
sha512 = "YhSf4cb61ApSjItscp9XoaLq8KRnacPDAhmjAZSMnn/gs6FhFbZNfOBOErG2dDj7JRknVtCmJ5mLmfR2sLa11A==";
|
||||
url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.6.1.tgz";
|
||||
sha512 = "mZ1MSKhZBYoV8GAWceA+PEJFWV2VpdNSpxxcj1wjIAOi00ykRuIQChT99xlQGZWLY3/NApWhSImlFwsmCEs4vA==";
|
||||
};
|
||||
};
|
||||
"@azure/core-http-2.2.5" = {
|
||||
"@azure/core-http-2.2.6" = {
|
||||
name = "_at_azure_slash_core-http";
|
||||
packageName = "@azure/core-http";
|
||||
version = "2.2.5";
|
||||
version = "2.2.6";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.5.tgz";
|
||||
sha512 = "kctMqSQ6zfnlFpuYzfUKadeTyOQYbIQ+3Rj7dzVC3Dk1dOnHroTwR9hLYKX8/n85iJpkyaksaXpuh5L7GJRYuQ==";
|
||||
url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.6.tgz";
|
||||
sha512 = "Lx7A3k2JIXpIbixfUaOOG79WNSo/Y7dhZ0LaLhaayyZ6PwQdVsEQXAR+oIPqPSfgPzv7RtwPSVviJ2APrsQKvQ==";
|
||||
};
|
||||
};
|
||||
"@azure/core-lro-2.2.4" = {
|
||||
"@azure/core-lro-2.2.5" = {
|
||||
name = "_at_azure_slash_core-lro";
|
||||
packageName = "@azure/core-lro";
|
||||
version = "2.2.4";
|
||||
version = "2.2.5";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.2.4.tgz";
|
||||
sha512 = "e1I2v2CZM0mQo8+RSix0x091Av493e4bnT22ds2fcQGslTHzM2oTbswkB65nP4iEpCxBrFxOSDPKExmTmjCVtQ==";
|
||||
url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.2.5.tgz";
|
||||
sha512 = "/7LKDHNd2Q6gGCrg7zV4va/N90w250pE4vaQUfFt+hTd/dyycgJWCqQ6EljQr8hrIFiH93C8Apk97tsnl7Czkg==";
|
||||
};
|
||||
};
|
||||
"@azure/core-paging-1.3.0" = {
|
||||
@ -112,13 +112,13 @@ let
|
||||
sha512 = "H6Tg9eBm0brHqLy0OSAGzxIh1t4UL8eZVrSUMJ60Ra9cwq2pOskFqVpz2pYoHDsBY1jZ4V/P8LRGb5D5pmC6rg==";
|
||||
};
|
||||
};
|
||||
"@azure/core-rest-pipeline-1.9.0" = {
|
||||
"@azure/core-rest-pipeline-1.9.1" = {
|
||||
name = "_at_azure_slash_core-rest-pipeline";
|
||||
packageName = "@azure/core-rest-pipeline";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.9.0.tgz";
|
||||
sha512 = "uvM3mY+Vegk0F2r4Eh0yPdsXTUyafTQkeX0USnz1Eyangxm2Bib0w0wkJVZW8fpks7Lcv0ztIdCFTrN7H8uptg==";
|
||||
url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.9.1.tgz";
|
||||
sha512 = "OVtt0LP0K5ktsKTmh6/695P0mPFmngjdCJPr4V0uvrkhHTkARSQ3VYRnxRc0LC9g3mHcH90C+8a6iF7ApMAZKg==";
|
||||
};
|
||||
};
|
||||
"@azure/core-tracing-1.0.0-preview.13" = {
|
||||
@ -211,13 +211,13 @@ let
|
||||
sha512 = "na+FisoARuaOWaHWpmdtk3FeuTWf2VWamdJ9/TJJzj5ZdXPLC3juoDgFs6XVuJIoK30yuBpyFBEDXVRK4pB7Tg==";
|
||||
};
|
||||
};
|
||||
"@babel/parser-7.18.10" = {
|
||||
"@babel/parser-7.18.11" = {
|
||||
name = "_at_babel_slash_parser";
|
||||
packageName = "@babel/parser";
|
||||
version = "7.18.10";
|
||||
version = "7.18.11";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.10.tgz";
|
||||
sha512 = "TYk3OA0HKL6qNryUayb5UUEhM/rkOQozIBEA5ITXh5DWrSp0TlUQXMyZmnWxG/DizSWBeeQ0Zbc5z8UGaaqoeg==";
|
||||
url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.11.tgz";
|
||||
sha512 = "9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ==";
|
||||
};
|
||||
};
|
||||
"@babel/runtime-7.18.9" = {
|
||||
@ -247,13 +247,13 @@ let
|
||||
sha512 = "hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==";
|
||||
};
|
||||
};
|
||||
"@fontsource/open-sans-4.5.10" = {
|
||||
"@fontsource/open-sans-4.5.11" = {
|
||||
name = "_at_fontsource_slash_open-sans";
|
||||
packageName = "@fontsource/open-sans";
|
||||
version = "4.5.10";
|
||||
version = "4.5.11";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.10.tgz";
|
||||
sha512 = "MrtTDfWb1Tu9YxVh2KaKmsKBn6O3KL/lHZS0KRKK58jgqvdwuiDt4QW4udmW4FQf0XOWgnZ+4vKUF80F3SqBAA==";
|
||||
url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.11.tgz";
|
||||
sha512 = "nG0gmbx4pSr8wltdG/ZdlS6OrsMK40Wt6iyuLTKHEf0TQfzKRMlWaskZHdeuWCwS6WUgqHKMf9KSwGdxPfapOg==";
|
||||
};
|
||||
};
|
||||
"@fortawesome/fontawesome-common-types-6.1.2" = {
|
||||
@ -400,13 +400,13 @@ let
|
||||
sha512 = "sBpko86IrTscc39EvHUhL+c++81BVTsIZ3ETu/vG+cCdi0N6vb2DoahR67A9FI2CGnxRRHjnTfa3m6LulwNATA==";
|
||||
};
|
||||
};
|
||||
"@oclif/core-1.13.1" = {
|
||||
"@oclif/core-1.13.10" = {
|
||||
name = "_at_oclif_slash_core";
|
||||
packageName = "@oclif/core";
|
||||
version = "1.13.1";
|
||||
version = "1.13.10";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@oclif/core/-/core-1.13.1.tgz";
|
||||
sha512 = "vIrk0qJllAu+q/nzxXWx8QHN4/+hmkYqh0Qx1V2x3Nkun18wF7HfkIzgy1Ml0ZxDv1WA9AfL4MXvgbaQxVXQ+Q==";
|
||||
url = "https://registry.npmjs.org/@oclif/core/-/core-1.13.10.tgz";
|
||||
sha512 = "nwpjXwWscETdvO+/z94V1zd95vnzmCB6VRaobR4BdBllwWU6jHF/eCi1Ud2Tk9RSedChoLneZuDCkKnRCmxyng==";
|
||||
};
|
||||
};
|
||||
"@oclif/errors-1.3.5" = {
|
||||
@ -553,6 +553,15 @@ let
|
||||
sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==";
|
||||
};
|
||||
};
|
||||
"@tootallnate/once-2.0.0" = {
|
||||
name = "_at_tootallnate_slash_once";
|
||||
packageName = "@tootallnate/once";
|
||||
version = "2.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz";
|
||||
sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==";
|
||||
};
|
||||
};
|
||||
"@types/bluebird-3.5.36" = {
|
||||
name = "_at_types_slash_bluebird";
|
||||
packageName = "@types/bluebird";
|
||||
@ -706,13 +715,13 @@ let
|
||||
sha512 = "zPE8kmpeL5/6L5gtTQHSOkAW/OSYYNTDRt6/2oEgLO1Zd3Rj5WVDoMloTtLJxQJhZGLGbL4pktKSh3NbzdaWdw==";
|
||||
};
|
||||
};
|
||||
"@types/mime-3.0.0" = {
|
||||
"@types/mime-3.0.1" = {
|
||||
name = "_at_types_slash_mime";
|
||||
packageName = "@types/mime";
|
||||
version = "3.0.0";
|
||||
version = "3.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@types/mime/-/mime-3.0.0.tgz";
|
||||
sha512 = "fccbsHKqFDXClBZTDLA43zl0+TbxyIwyzIzwwhvoJvhNjOErCdeX2xJbURimv2EbSVUGav001PaCJg4mZxMl4w==";
|
||||
url = "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz";
|
||||
sha512 = "Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==";
|
||||
};
|
||||
};
|
||||
"@types/minimatch-3.0.5" = {
|
||||
@ -733,13 +742,13 @@ let
|
||||
sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA==";
|
||||
};
|
||||
};
|
||||
"@types/node-18.6.3" = {
|
||||
"@types/node-18.6.5" = {
|
||||
name = "_at_types_slash_node";
|
||||
packageName = "@types/node";
|
||||
version = "18.6.3";
|
||||
version = "18.6.5";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@types/node/-/node-18.6.3.tgz";
|
||||
sha512 = "6qKpDtoaYLM+5+AFChLhHermMQxc3TOEFIDzrZLPRGHPrLEwqFkkT5Kx3ju05g6X7uDPazz3jHbKPX0KzCjntg==";
|
||||
url = "https://registry.npmjs.org/@types/node/-/node-18.6.5.tgz";
|
||||
sha512 = "Xjt5ZGUa5WusGZJ4WJPbOT8QOqp6nDynVFRKcUt32bOgvXEoc6o085WNkYTMO7ifAj2isEfQQ2cseE+wT6jsRw==";
|
||||
};
|
||||
};
|
||||
"@types/node-fetch-2.6.2" = {
|
||||
@ -1246,13 +1255,13 @@ let
|
||||
sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w==";
|
||||
};
|
||||
};
|
||||
"aws-sdk-2.1187.0" = {
|
||||
"aws-sdk-2.1191.0" = {
|
||||
name = "aws-sdk";
|
||||
packageName = "aws-sdk";
|
||||
version = "2.1187.0";
|
||||
version = "2.1191.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1187.0.tgz";
|
||||
sha512 = "QcxQ3asIhH9QQnN/5JO3MaHRjwcy3/AsBzcAjPU+lHZGV0drnuDmg3ZkZuAa/mOgQ3MEi68G3gYD+481QJgnMg==";
|
||||
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1191.0.tgz";
|
||||
sha512 = "G8hWvuc+3rxTfHqsnUwGx/fy8zlnVPtlNesXMHlwU/l4oBx3+Weg0Nhng6HvLGzUJifzlnSKDXrOsWVkHtuZ1w==";
|
||||
};
|
||||
};
|
||||
"aws-sign2-0.7.0" = {
|
||||
@ -3721,6 +3730,15 @@ let
|
||||
sha512 = "k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==";
|
||||
};
|
||||
};
|
||||
"http-proxy-agent-5.0.0" = {
|
||||
name = "http-proxy-agent";
|
||||
packageName = "http-proxy-agent";
|
||||
version = "5.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz";
|
||||
sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==";
|
||||
};
|
||||
};
|
||||
"http-signature-1.2.0" = {
|
||||
name = "http-signature";
|
||||
packageName = "http-signature";
|
||||
@ -4000,13 +4018,13 @@ let
|
||||
sha512 = "nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==";
|
||||
};
|
||||
};
|
||||
"is-core-module-2.9.0" = {
|
||||
"is-core-module-2.10.0" = {
|
||||
name = "is-core-module";
|
||||
packageName = "is-core-module";
|
||||
version = "2.9.0";
|
||||
version = "2.10.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz";
|
||||
sha512 = "+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==";
|
||||
url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz";
|
||||
sha512 = "Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==";
|
||||
};
|
||||
};
|
||||
"is-date-object-1.0.5" = {
|
||||
@ -5323,13 +5341,13 @@ let
|
||||
sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
|
||||
};
|
||||
};
|
||||
"mssql-8.1.2" = {
|
||||
"mssql-8.1.3" = {
|
||||
name = "mssql";
|
||||
packageName = "mssql";
|
||||
version = "8.1.2";
|
||||
version = "8.1.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/mssql/-/mssql-8.1.2.tgz";
|
||||
sha512 = "xkTw3Sp1Jpq2f7CG3rFQn6YK4XZbnL8HfZhaB/KRC/hjDZlJB3pSWYN2Cp/WwxIeA1iUJkdFa6GTfdMY8+DAjg==";
|
||||
url = "https://registry.npmjs.org/mssql/-/mssql-8.1.3.tgz";
|
||||
sha512 = "XGxNNNeKZMMTM71na2M4eLMkPWKckcfZtMiCKR1mLzN887x31NisekNhoBAoRpqizErUZxSW8gSDZc8PVig7Kw==";
|
||||
};
|
||||
};
|
||||
"multer-1.4.5-lts.1" = {
|
||||
@ -5368,49 +5386,49 @@ let
|
||||
sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
|
||||
};
|
||||
};
|
||||
"n8n-core-0.129.0" = {
|
||||
"n8n-core-0.130.0" = {
|
||||
name = "n8n-core";
|
||||
packageName = "n8n-core";
|
||||
version = "0.129.0";
|
||||
version = "0.130.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.129.0.tgz";
|
||||
sha512 = "YHFEKx+K0FpI5AaFlN2dskb7Ub8uyh5HNH63D4DJO7gsJjS0U1OQO9vMsaThm4w9KGOs3faPpJu5ZBGumkmX3Q==";
|
||||
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.130.0.tgz";
|
||||
sha512 = "fWqLRMOZ2aXuMrVns6kVX5eWTJVbrrslgQA9aZESMysR/P6eVVnBAcB948YMDHAZB9EeFGBzxCJCdCGdF3VVUQ==";
|
||||
};
|
||||
};
|
||||
"n8n-design-system-0.29.0" = {
|
||||
"n8n-design-system-0.30.0" = {
|
||||
name = "n8n-design-system";
|
||||
packageName = "n8n-design-system";
|
||||
version = "0.29.0";
|
||||
version = "0.30.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.29.0.tgz";
|
||||
sha512 = "R0FoLuGksBdd95fKVyKR4WTvFf1VjHD8fXrTPim4kq7QYlnT+44UQTZjmMAY6eN9b8PUk2/39TZMByyc/6YALQ==";
|
||||
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.30.0.tgz";
|
||||
sha512 = "ZZRGms10PjTGzw7W8UPe5MXKuJ9eMZr+z9+mO7jywQg1ADzG+JCIgAcdad2II/V46nM4hkilGk0EI+IaBg0R/g==";
|
||||
};
|
||||
};
|
||||
"n8n-editor-ui-0.155.0" = {
|
||||
"n8n-editor-ui-0.156.0" = {
|
||||
name = "n8n-editor-ui";
|
||||
packageName = "n8n-editor-ui";
|
||||
version = "0.155.0";
|
||||
version = "0.156.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.155.0.tgz";
|
||||
sha512 = "4Q/T5W6Rl9EFbHlQvLInQTcIMT8pPf3q20OjoUMbWINiakBPs8wxNDH53P80igdI2nM1ruqF4uI3Zk4etVcfYA==";
|
||||
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.156.0.tgz";
|
||||
sha512 = "otgW18usDm9pD4Zz6JADNFhb3iMRjcHHcgv897uvk7oZC9nHr9VAQry0bOCMvO4bm3oJug37KkM6eNm02EY+tg==";
|
||||
};
|
||||
};
|
||||
"n8n-nodes-base-0.187.0" = {
|
||||
"n8n-nodes-base-0.188.0" = {
|
||||
name = "n8n-nodes-base";
|
||||
packageName = "n8n-nodes-base";
|
||||
version = "0.187.0";
|
||||
version = "0.188.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.187.0.tgz";
|
||||
sha512 = "wSqP7dMp8NxgnxFh1Qz/sIr09ONDm5CrpVZOPLA1QIeTbYsVlBEOgTIVCR4fHahcvkqV5KvX9gZJbSoU3F9byQ==";
|
||||
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.188.0.tgz";
|
||||
sha512 = "+R15NaRM9H767h7D/kwsQCpXhxmNQDMr3LMwhwPrUAXKGTZbk9YLZWhMlQaewhjGgQV69qo94OS9/Wb2FkvzMg==";
|
||||
};
|
||||
};
|
||||
"n8n-workflow-0.111.0" = {
|
||||
"n8n-workflow-0.112.0" = {
|
||||
name = "n8n-workflow";
|
||||
packageName = "n8n-workflow";
|
||||
version = "0.111.0";
|
||||
version = "0.112.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.111.0.tgz";
|
||||
sha512 = "/4Zy2Kcw54l0r0Clhco+k5fw26/d8b/8hz/FoGYKJ9TaleEaI0JmiMjJP/yxd2D5Ehgy1pZQUCaQE2/Y44lhnQ==";
|
||||
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.112.0.tgz";
|
||||
sha512 = "6HE3WP4kMdifNJ0plmcye1VU4PKbxlUXr5wIF/74M5M+yLusoMJn2kSLEQ4KO50WYwByl8qttXBbBIjrkM8lNw==";
|
||||
};
|
||||
};
|
||||
"named-placeholders-1.1.2" = {
|
||||
@ -5557,13 +5575,13 @@ let
|
||||
sha512 = "mGA53bSqo7j62PjmMuFPdO0efNT9pqiGYhQTNVCWkY7PdduRIECJF7n7NOrr5cb+d/js1GdYRLpoTYDwawRk6A==";
|
||||
};
|
||||
};
|
||||
"node-html-parser-5.3.3" = {
|
||||
"node-html-parser-5.4.1" = {
|
||||
name = "node-html-parser";
|
||||
packageName = "node-html-parser";
|
||||
version = "5.3.3";
|
||||
version = "5.4.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-5.3.3.tgz";
|
||||
sha512 = "ncg1033CaX9UexbyA7e1N0aAoAYRDiV8jkTvzEnfd1GDvzFdrsXLzR4p4ik8mwLgnaKP/jyUFWDy9q3jvRT2Jw==";
|
||||
url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-5.4.1.tgz";
|
||||
sha512 = "xy/O2wOEBJsIRLs4avwa1lVY7tIpXXOoHHUJLa0GvnoPPqMG1hgBVl1tNI3GHOwRktTVZy+Y6rjghk4B9/NLyg==";
|
||||
};
|
||||
};
|
||||
"node-ssh-12.0.5" = {
|
||||
@ -5710,13 +5728,13 @@ let
|
||||
sha512 = "EFVjAYfzWqWsBMRHPMAXLCDIJnpMhdWAqR7xG6M6a2cs6PMFpl/+Z20w9zDW4vkxOFfddegBKq9Rehd0bxWE7A==";
|
||||
};
|
||||
};
|
||||
"object.assign-4.1.2" = {
|
||||
"object.assign-4.1.3" = {
|
||||
name = "object.assign";
|
||||
packageName = "object.assign";
|
||||
version = "4.1.2";
|
||||
version = "4.1.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz";
|
||||
sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==";
|
||||
url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.3.tgz";
|
||||
sha512 = "ZFJnX3zltyjcYJL0RoCJuzb+11zWGyaDbjgxZbdV7rFEcHQuYxrZqhow67aA7xpes6LhojyFDaBKAFfogQrikA==";
|
||||
};
|
||||
};
|
||||
"object.getownpropertydescriptors-2.1.4" = {
|
||||
@ -6403,13 +6421,13 @@ let
|
||||
sha512 = "epKaq3TTfTzXcxBxjpoKYMcTTcAX8Rykus6QZu77XNhJuRHSRxMd+JJrbX/3PFI0opFGSN0BabbAYCbGxbu0mA==";
|
||||
};
|
||||
};
|
||||
"postcss-8.4.14" = {
|
||||
"postcss-8.4.16" = {
|
||||
name = "postcss";
|
||||
packageName = "postcss";
|
||||
version = "8.4.14";
|
||||
version = "8.4.16";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz";
|
||||
sha512 = "E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==";
|
||||
url = "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz";
|
||||
sha512 = "ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==";
|
||||
};
|
||||
};
|
||||
"postgres-array-2.0.0" = {
|
||||
@ -7384,13 +7402,13 @@ let
|
||||
sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==";
|
||||
};
|
||||
};
|
||||
"simple-git-3.11.0" = {
|
||||
"simple-git-3.12.0" = {
|
||||
name = "simple-git";
|
||||
packageName = "simple-git";
|
||||
version = "3.11.0";
|
||||
version = "3.12.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/simple-git/-/simple-git-3.11.0.tgz";
|
||||
sha512 = "XULamN/hxviH/ABjDbxJqUTpH59Pn3fHRtwZZZ6v7KWTLE3wKl6CLB0SPXFfzjalQ5hUp+R5DWX2X8rKm4crvw==";
|
||||
url = "https://registry.npmjs.org/simple-git/-/simple-git-3.12.0.tgz";
|
||||
sha512 = "cy1RSRFHGZSrlYa3MnUuNVOXLUdifEZD2X8+AZjg8mKCdRvtCFSga6acq5N2g0ggb8lH3jBi369MrFZ+Y6sfsA==";
|
||||
};
|
||||
};
|
||||
"simple-lru-cache-0.0.2" = {
|
||||
@ -8860,13 +8878,13 @@ let
|
||||
sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==";
|
||||
};
|
||||
};
|
||||
"yargs-parser-21.0.1" = {
|
||||
"yargs-parser-21.1.1" = {
|
||||
name = "yargs-parser";
|
||||
packageName = "yargs-parser";
|
||||
version = "21.0.1";
|
||||
version = "21.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz";
|
||||
sha512 = "9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==";
|
||||
url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz";
|
||||
sha512 = "tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==";
|
||||
};
|
||||
};
|
||||
"yup-0.32.11" = {
|
||||
@ -8911,10 +8929,10 @@ in
|
||||
n8n = nodeEnv.buildNodePackage {
|
||||
name = "n8n";
|
||||
packageName = "n8n";
|
||||
version = "0.189.0";
|
||||
version = "0.190.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n/-/n8n-0.189.0.tgz";
|
||||
sha512 = "6s0KJFpqs2E7qSHuU+db0usc7yStuLpDnJMP3dUH7fiGsew7iRoLvoFThtg7DNPPTaLyLs9eyWEDj2VGWKJBsw==";
|
||||
url = "https://registry.npmjs.org/n8n/-/n8n-0.190.0.tgz";
|
||||
sha512 = "FsvOBZL1FsFuZp9ut6+s97t/Oz5MAIpqNsS/Pdh4ZmJz5XoiTYn1UchlGF4NziUYzvWmdEV96uxo1IU/i8VtSw==";
|
||||
};
|
||||
dependencies = [
|
||||
sources."@apidevtools/json-schema-ref-parser-8.0.0"
|
||||
@ -8931,17 +8949,17 @@ in
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
(sources."@azure/core-auth-1.3.2" // {
|
||||
(sources."@azure/core-auth-1.4.0" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
(sources."@azure/core-client-1.6.0" // {
|
||||
(sources."@azure/core-client-1.6.1" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
(sources."@azure/core-http-2.2.5" // {
|
||||
(sources."@azure/core-http-2.2.6" // {
|
||||
dependencies = [
|
||||
sources."@azure/core-tracing-1.0.0-preview.13"
|
||||
sources."tough-cookie-4.0.0"
|
||||
@ -8949,9 +8967,8 @@ in
|
||||
sources."universalify-0.1.2"
|
||||
];
|
||||
})
|
||||
(sources."@azure/core-lro-2.2.4" // {
|
||||
(sources."@azure/core-lro-2.2.5" // {
|
||||
dependencies = [
|
||||
sources."@azure/core-tracing-1.0.0-preview.13"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
@ -8960,8 +8977,10 @@ in
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
(sources."@azure/core-rest-pipeline-1.9.0" // {
|
||||
(sources."@azure/core-rest-pipeline-1.9.1" // {
|
||||
dependencies = [
|
||||
sources."@tootallnate/once-2.0.0"
|
||||
sources."http-proxy-agent-5.0.0"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
@ -9003,7 +9022,7 @@ in
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
sources."@babel/parser-7.18.10"
|
||||
sources."@babel/parser-7.18.11"
|
||||
sources."@babel/runtime-7.18.9"
|
||||
sources."@colors/colors-1.5.0"
|
||||
(sources."@dabh/diagnostics-2.0.3" // {
|
||||
@ -9012,7 +9031,7 @@ in
|
||||
sources."kuler-2.0.0"
|
||||
];
|
||||
})
|
||||
sources."@fontsource/open-sans-4.5.10"
|
||||
sources."@fontsource/open-sans-4.5.11"
|
||||
sources."@fortawesome/fontawesome-common-types-6.1.2"
|
||||
sources."@fortawesome/free-regular-svg-icons-6.1.2"
|
||||
(sources."@icetee/ftp-0.3.15" // {
|
||||
@ -9038,7 +9057,7 @@ in
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
(sources."@oclif/core-1.13.1" // {
|
||||
(sources."@oclif/core-1.13.10" // {
|
||||
dependencies = [
|
||||
(sources."chalk-4.1.2" // {
|
||||
dependencies = [
|
||||
@ -9100,10 +9119,10 @@ in
|
||||
sources."@types/lodash-4.14.182"
|
||||
sources."@types/lodash.intersection-4.4.7"
|
||||
sources."@types/lossless-json-1.0.1"
|
||||
sources."@types/mime-3.0.0"
|
||||
sources."@types/mime-3.0.1"
|
||||
sources."@types/minimatch-3.0.5"
|
||||
sources."@types/multer-1.4.7"
|
||||
sources."@types/node-18.6.3"
|
||||
sources."@types/node-18.6.5"
|
||||
(sources."@types/node-fetch-2.6.2" // {
|
||||
dependencies = [
|
||||
sources."form-data-3.0.1"
|
||||
@ -9179,7 +9198,7 @@ in
|
||||
})
|
||||
sources."available-typed-arrays-1.0.5"
|
||||
sources."avsc-5.7.4"
|
||||
(sources."aws-sdk-2.1187.0" // {
|
||||
(sources."aws-sdk-2.1191.0" // {
|
||||
dependencies = [
|
||||
sources."buffer-4.9.2"
|
||||
sources."events-1.1.1"
|
||||
@ -9608,7 +9627,7 @@ in
|
||||
sources."is-boolean-object-1.1.2"
|
||||
sources."is-buffer-1.1.6"
|
||||
sources."is-callable-1.2.4"
|
||||
sources."is-core-module-2.9.0"
|
||||
sources."is-core-module-2.10.0"
|
||||
sources."is-date-object-1.0.5"
|
||||
sources."is-docker-2.2.1"
|
||||
sources."is-extendable-0.1.1"
|
||||
@ -9803,7 +9822,7 @@ in
|
||||
];
|
||||
})
|
||||
sources."ms-2.1.2"
|
||||
(sources."mssql-8.1.2" // {
|
||||
(sources."mssql-8.1.3" // {
|
||||
dependencies = [
|
||||
sources."commander-9.4.0"
|
||||
];
|
||||
@ -9817,15 +9836,15 @@ in
|
||||
];
|
||||
})
|
||||
sources."mz-2.7.0"
|
||||
sources."n8n-core-0.129.0"
|
||||
sources."n8n-design-system-0.29.0"
|
||||
sources."n8n-editor-ui-0.155.0"
|
||||
(sources."n8n-nodes-base-0.187.0" // {
|
||||
sources."n8n-core-0.130.0"
|
||||
sources."n8n-design-system-0.30.0"
|
||||
sources."n8n-editor-ui-0.156.0"
|
||||
(sources."n8n-nodes-base-0.188.0" // {
|
||||
dependencies = [
|
||||
sources."iconv-lite-0.6.3"
|
||||
];
|
||||
})
|
||||
sources."n8n-workflow-0.111.0"
|
||||
sources."n8n-workflow-0.112.0"
|
||||
(sources."named-placeholders-1.1.2" // {
|
||||
dependencies = [
|
||||
sources."lru-cache-4.1.5"
|
||||
@ -9855,7 +9874,7 @@ in
|
||||
sources."node-ensure-0.0.0"
|
||||
sources."node-fetch-2.6.7"
|
||||
sources."node-html-markdown-1.2.0"
|
||||
sources."node-html-parser-5.3.3"
|
||||
sources."node-html-parser-5.4.1"
|
||||
sources."node-ssh-12.0.5"
|
||||
sources."nodeify-1.0.1"
|
||||
sources."nodemailer-6.7.7"
|
||||
@ -9870,7 +9889,7 @@ in
|
||||
sources."object-inspect-1.12.2"
|
||||
sources."object-keys-1.1.1"
|
||||
sources."object-treeify-1.1.33"
|
||||
sources."object.assign-4.1.2"
|
||||
sources."object.assign-4.1.3"
|
||||
sources."object.getownpropertydescriptors-2.1.4"
|
||||
sources."on-finished-2.4.1"
|
||||
sources."on-headers-1.0.2"
|
||||
@ -9970,7 +9989,7 @@ in
|
||||
sources."popsicle-transport-http-1.2.1"
|
||||
sources."popsicle-transport-xhr-2.0.0"
|
||||
sources."popsicle-user-agent-1.0.0"
|
||||
sources."postcss-8.4.14"
|
||||
sources."postcss-8.4.16"
|
||||
sources."postgres-array-2.0.0"
|
||||
sources."postgres-bytea-1.0.0"
|
||||
sources."postgres-date-1.0.7"
|
||||
@ -10121,7 +10140,7 @@ in
|
||||
})
|
||||
sources."side-channel-1.0.4"
|
||||
sources."signal-exit-3.0.7"
|
||||
sources."simple-git-3.11.0"
|
||||
sources."simple-git-3.12.0"
|
||||
sources."simple-lru-cache-0.0.2"
|
||||
sources."simple-swizzle-0.2.2"
|
||||
sources."slash-3.0.0"
|
||||
@ -10259,7 +10278,7 @@ in
|
||||
sources."wrap-ansi-7.0.0"
|
||||
sources."y18n-5.0.8"
|
||||
sources."yargs-17.5.1"
|
||||
sources."yargs-parser-21.0.1"
|
||||
sources."yargs-parser-21.1.1"
|
||||
];
|
||||
})
|
||||
sources."uc.micro-1.0.6"
|
||||
|
@ -11,10 +11,6 @@
|
||||
}:
|
||||
let
|
||||
executableName = "micropad";
|
||||
electron_exec =
|
||||
if stdenv.isDarwin
|
||||
then "${electron}/Applications/Electron.app/Contents/MacOS/Electron"
|
||||
else "${electron}/bin/electron";
|
||||
in
|
||||
mkYarnPackage rec {
|
||||
pname = "micropad";
|
||||
@ -64,7 +60,7 @@ in
|
||||
done
|
||||
|
||||
# executable wrapper
|
||||
makeWrapper '${electron_exec}' "$out/bin/${executableName}" \
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
|
||||
--add-flags "$out/share/micropad" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
|
||||
|
||||
|
@ -11,6 +11,7 @@
|
||||
, tesseract4
|
||||
, unpaper
|
||||
, liberation_ttf
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
let
|
||||
@ -19,6 +20,20 @@ let
|
||||
packageOverrides = self: super: {
|
||||
django = super.django_4;
|
||||
|
||||
# use paperless-ngx version of django-q
|
||||
# see https://github.com/paperless-ngx/paperless-ngx/pull/1014
|
||||
django-q = super.django-q.overridePythonAttrs (oldAttrs: rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "paperless-ngx";
|
||||
repo = "django-q";
|
||||
sha256 = "sha256-aoDuPig8Nf8fLzn7GjBn69aF2zH2l8gxascAu9lIG3U=";
|
||||
rev = "71abc78fdaec029cf71e9849a3b0fa084a1678f7";
|
||||
};
|
||||
# due to paperless-ngx modification of the pyproject.toml file
|
||||
# the patch is not needed any more
|
||||
patches = [];
|
||||
});
|
||||
|
||||
# django-extensions 3.1.5 is required, but its tests are incompatible with Django 4
|
||||
django-extensions = super.django-extensions.overridePythonAttrs (_: {
|
||||
doCheck = false;
|
||||
@ -38,12 +53,12 @@ let
|
||||
in
|
||||
py.pkgs.pythonPackages.buildPythonApplication rec {
|
||||
pname = "paperless-ngx";
|
||||
version = "1.7.1";
|
||||
version = "1.8.0";
|
||||
|
||||
# Fetch the release tarball instead of a git ref because it contains the prebuilt fontend
|
||||
src = fetchurl {
|
||||
url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v${version}/${pname}-v${version}.tar.xz";
|
||||
hash = "sha256-8vx4hvbIqaChjPyS8Q0ar2bz/pLzEdxoF7P2gBEeFzc=";
|
||||
hash = "sha256-BLfhh04RvBJFRQiPXkMl8XlWqZOWKmjjl+6lZ326stU=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
@ -144,6 +159,13 @@ py.pkgs.pythonPackages.buildPythonApplication rec {
|
||||
zope_interface
|
||||
];
|
||||
|
||||
# paperless-ngx includes the bundled django-q version. This will
|
||||
# conflict with the tests and is not needed since we overrode the
|
||||
# django-q version with the paperless-ngx version
|
||||
postPatch = ''
|
||||
rm -rf src/django-q
|
||||
'';
|
||||
|
||||
# Compile manually because `pythonRecompileBytecodeHook` only works for
|
||||
# files in `python.sitePackages`
|
||||
postBuild = ''
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "metis-prover";
|
||||
version = "2.3.20160713";
|
||||
version = "2.4.20200713";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gilith";
|
||||
repo = "metis";
|
||||
rev = "f0b1a17cd57eb098077e963ab092477aee9fb340";
|
||||
sha256 = "1i7paax7b4byk8110f5zk4071mh5603r82bq7hbprqzljvsiipk7";
|
||||
rev = "d17c3a8cf6537212c5c4bfdadcf865bd25723132";
|
||||
sha256 = "phu1x0yahK/B2bSOCvlze7UJw8smX9zw6dJTpDD9chM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.14.3";
|
||||
version = "2.14.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-03XB88Z3v0a9Wi1xF+TaVsiRml6JAdEOeKuMxAbybw4=";
|
||||
sha256 = "sha256-vg91YnwtbD2j6zue5g5j+iyHRDrW83GQKEi/n9nDHBw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-HCOSc6GevbvNuC1zgzaCSfewF13SY1sBV+grsSF1+Fk=";
|
||||
vendorSha256 = "sha256-xyrz+oN9DLDh4jSVFM5gVZFJW+yJKrhYOtQs38URAjM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
@ -15,16 +15,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-branchless";
|
||||
version = "0.3.12";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arxanas";
|
||||
repo = "git-branchless";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1bUHltONLfJumkxPnzGJFMMyS02LVqjpDL+KgiewyoQ=";
|
||||
sha256 = "sha256-WFrN5TRFr9xHBUawTfvri0qlTiWCfAeC5SL+T6mwlU0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-3+ULHqtKAhf4AdoLPK/3IqnfOcskoh6ctlQnY1oTHJ8=";
|
||||
cargoSha256 = "sha256-AGW1jUKPc5iiuDlgIDHG1sOn1flAB3UdxJJNKPH5+f8=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -48,15 +48,6 @@ rustPlatform.buildRustPackage rec {
|
||||
"--skip=test_next_ambiguous_interactive"
|
||||
];
|
||||
|
||||
# Fixed in next release
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/arxanas/git-branchless/commit/8bed1e83495a448f479103d2d4b75745aa512667.patch";
|
||||
sha256 = "sha256-bFfXBYxfgx1TxlJ+/2Gh9WsgL2vCJKwwbq4JD8/2c1w=";
|
||||
name = "fix-tests-for-latest-git";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A suite of tools to help you visualize, navigate, manipulate, and repair your commit history";
|
||||
homepage = "https://github.com/arxanas/git-branchless";
|
||||
|
@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "containerd";
|
||||
version = "1.6.7";
|
||||
version = "1.6.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = "containerd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JrpsASeDz6sUpYdBlkTvPdsl4LQ7PcUwFss5uWFEO84=";
|
||||
sha256 = "sha256-0UiPhkTWV61DnAF5kWd1FctX8i0sXaJ1p/xCMznY/A8=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
@ -15,13 +15,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cri-o";
|
||||
version = "1.24.1";
|
||||
version = "1.24.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cri-o";
|
||||
repo = "cri-o";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/AoZKeUcYF1fyYtllXpB7GNWR/6SWEOy2ffDLYbTp9E=";
|
||||
sha256 = "sha256-7nQI6zaWSWML2suPn1A+RJZ0iPJu6JD/4ion5zxlnJ8=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "arc-kde-theme";
|
||||
version = "20220706";
|
||||
version = "20220810";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PapirusDevelopmentTeam";
|
||||
repo = "arc-kde";
|
||||
rev = version;
|
||||
sha256 = "sha256-k/+VhqvOg3wkqal7q7nSVpubK/yHnNoTUUWhnxwcIjM=";
|
||||
sha256 = "sha256-atL0sW3AedQl7PabOQOjeJ5U8a4/J4x0rxFCbxJ4ONA=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
@ -30,6 +30,11 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "EyOdIgMiAaIr0pgzxXW2hIFnANLeFooVMCI1d8XAddw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix pkexec detection on NixOS.
|
||||
./fix-paths.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gettext
|
||||
|
@ -0,0 +1,13 @@
|
||||
diff --git a/src/gsm_pkexec.cpp b/src/gsm_pkexec.cpp
|
||||
index 868969ba..51eb93b5 100644
|
||||
--- a/src/gsm_pkexec.cpp
|
||||
+++ b/src/gsm_pkexec.cpp
|
||||
@@ -33,6 +33,7 @@ gboolean gsm_pkexec_create_root_password_dialog(const char *command)
|
||||
gboolean
|
||||
procman_has_pkexec(void)
|
||||
{
|
||||
- return g_file_test("/usr/bin/pkexec", G_FILE_TEST_EXISTS);
|
||||
+ return g_file_test("/run/wrappers/bin/pkexec", G_FILE_TEST_EXISTS)
|
||||
+ || g_file_test("/usr/bin/pkexec", G_FILE_TEST_EXISTS);
|
||||
}
|
||||
|
@ -41,6 +41,7 @@ let
|
||||
./currency-date-range-jdk10.patch
|
||||
./increase-javadoc-heap-jdk13.patch
|
||||
./ignore-LegalNoticeFilePlugin.patch
|
||||
./fix-library-path-jdk17.patch
|
||||
|
||||
# -Wformat etc. are stricter in newer gccs, per
|
||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
|
||||
|
@ -0,0 +1,60 @@
|
||||
--- a/src/hotspot/os/linux/os_linux.cpp
|
||||
+++ b/src/hotspot/os/linux/os_linux.cpp
|
||||
@@ -412,18 +412,8 @@ void os::init_system_properties_values() {
|
||||
// 1: ...
|
||||
// ...
|
||||
// 7: The default directories, normally /lib and /usr/lib.
|
||||
-#ifndef OVERRIDE_LIBPATH
|
||||
- #if defined(_LP64)
|
||||
- #define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib"
|
||||
- #else
|
||||
- #define DEFAULT_LIBPATH "/lib:/usr/lib"
|
||||
- #endif
|
||||
-#else
|
||||
- #define DEFAULT_LIBPATH OVERRIDE_LIBPATH
|
||||
-#endif
|
||||
|
||||
// Base path of extensions installed on the system.
|
||||
-#define SYS_EXT_DIR "/usr/java/packages"
|
||||
#define EXTENSIONS_DIR "/lib/ext"
|
||||
|
||||
// Buffer that fits several sprintfs.
|
||||
@@ -431,7 +421,7 @@ void os::init_system_properties_values() {
|
||||
// by the nulls included by the sizeof operator.
|
||||
const size_t bufsize =
|
||||
MAX2((size_t)MAXPATHLEN, // For dll_dir & friends.
|
||||
- (size_t)MAXPATHLEN + sizeof(EXTENSIONS_DIR) + sizeof(SYS_EXT_DIR) + sizeof(EXTENSIONS_DIR)); // extensions dir
|
||||
+ (size_t)MAXPATHLEN + sizeof(EXTENSIONS_DIR) + sizeof(EXTENSIONS_DIR)); // extensions dir
|
||||
char *buf = NEW_C_HEAP_ARRAY(char, bufsize, mtInternal);
|
||||
|
||||
// sysclasspath, java_home, dll_dir
|
||||
@@ -478,26 +468,22 @@ void os::init_system_properties_values() {
|
||||
// should always exist (until the legacy problem cited above is
|
||||
// addressed).
|
||||
const char *v = ::getenv("LD_LIBRARY_PATH");
|
||||
- const char *v_colon = ":";
|
||||
- if (v == NULL) { v = ""; v_colon = ""; }
|
||||
+ if (v == NULL) { v = ""; }
|
||||
// That's +1 for the colon and +1 for the trailing '\0'.
|
||||
char *ld_library_path = NEW_C_HEAP_ARRAY(char,
|
||||
- strlen(v) + 1 +
|
||||
- sizeof(SYS_EXT_DIR) + sizeof("/lib/") + sizeof(DEFAULT_LIBPATH) + 1,
|
||||
+ strlen(v) + 1,
|
||||
mtInternal);
|
||||
- sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib:" DEFAULT_LIBPATH, v, v_colon);
|
||||
+ sprintf(ld_library_path, "%s", v);
|
||||
Arguments::set_library_path(ld_library_path);
|
||||
FREE_C_HEAP_ARRAY(char, ld_library_path);
|
||||
}
|
||||
|
||||
// Extensions directories.
|
||||
- sprintf(buf, "%s" EXTENSIONS_DIR ":" SYS_EXT_DIR EXTENSIONS_DIR, Arguments::get_java_home());
|
||||
+ sprintf(buf, "%s" EXTENSIONS_DIR, Arguments::get_java_home());
|
||||
Arguments::set_ext_dirs(buf);
|
||||
|
||||
FREE_C_HEAP_ARRAY(char, buf);
|
||||
|
||||
-#undef DEFAULT_LIBPATH
|
||||
-#undef SYS_EXT_DIR
|
||||
#undef EXTENSIONS_DIR
|
||||
}
|
@ -1,20 +1,22 @@
|
||||
{ lib, rustPlatform, fetchFromGitHub, cmake }:
|
||||
{ lib, rustPlatform, fetchFromGitHub, cmake, stdenv, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lunatic";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lunatic-solutions";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gHG8jk23qTANbLNPH4Q+YusEkDZ/G33SARAsLVLrVPs=";
|
||||
sha256 = "sha256-MfN4NZIkzQji+bIfpgDdVyGXiD291ULGT2JslSevr/w=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-keu9lNYuOruU58YBPyqtDqBS/jjruK9GcYrKv7dGmlQ=";
|
||||
cargoSha256 = "sha256-Qpu6FKIrDZyEbcv/uRjInz6lmMeTSZvY/JGLJe+My+U=";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
meta = with lib; {
|
||||
description = "An Erlang inspired runtime for WebAssembly";
|
||||
homepage = "https://lunatic.solutions";
|
||||
|
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nickel";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tweag";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}"; # because pure ${version} doesn't work
|
||||
hash = "sha256-Bh83qn+ECZnlCH/A34G5G5MdcAHPow24RMCVQXR5Awg=";
|
||||
hash = "sha256-Sf0UJAfUtP7oU31VkVqCtdRmfjaHV34gYeUPNsTmQvo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-vI+SaVyRJjLNqenUsYtaSTyOZRT0zZJ1OZHekcb5LjY=";
|
||||
cargoSha256 = "sha256-oY4PYMZBN5+nsARHV+A5D7a6fUt9UMHBn83ONgaQp8E=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://nickel-lang.org/";
|
||||
|
4
pkgs/development/interpreters/spidermonkey/102.nix
Normal file
4
pkgs/development/interpreters/spidermonkey/102.nix
Normal file
@ -0,0 +1,4 @@
|
||||
import ./common.nix {
|
||||
version = "102.1.0";
|
||||
hash = "sha512-JQW4fOQRVEVWjra32K9BZ4vXh/0H8/eenwoi2QzfdSrl1DcYVs+cVuLZ2n1bfDk53CqrV1P8wBc5jn1lJg9vAw==";
|
||||
}
|
@ -1,139 +1,4 @@
|
||||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, autoconf213
|
||||
, pkg-config
|
||||
, perl
|
||||
, python39
|
||||
, zip
|
||||
, buildPackages
|
||||
, which
|
||||
, readline
|
||||
, zlib
|
||||
, icu67
|
||||
, cargo
|
||||
, rustc
|
||||
, rust-cbindgen
|
||||
, yasm
|
||||
, nspr
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spidermonkey";
|
||||
import ./common.nix {
|
||||
version = "78.15.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
|
||||
sha256 = "0l91cxdc5v9fps79ckb1kid4gw6v5qng1jd9zvaacwaiv628shx4";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build failure on armv7l using Debian patch
|
||||
# Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1526653
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/mozilla-team/firefox/commit/fd6847c9416f9eebde636e21d794d25d1be8791d.patch";
|
||||
sha256 = "02b7zwm6vxmk61aj79a6m32s1k5sr0hwm3q1j4v6np9jfyd10g1j";
|
||||
})
|
||||
|
||||
# Remove this when updating to 79 - The patches are already applied upstream
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1318905
|
||||
|
||||
# Combination of 3 changesets, modified to apply on 78:
|
||||
# - https://hg.mozilla.org/mozilla-central/rev/06d7e1b6b7e7
|
||||
# - https://hg.mozilla.org/mozilla-central/rev/ec48f15d085c
|
||||
# - https://hg.mozilla.org/mozilla-central/rev/6803dda74d33
|
||||
./add-riscv64-support.patch
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
setOutputFlags = false; # Configure script only understands --includedir
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf213
|
||||
cargo
|
||||
rustc.llvmPackages.llvm # for llvm-objdump
|
||||
perl
|
||||
pkg-config
|
||||
python39
|
||||
rust-cbindgen
|
||||
rustc
|
||||
which
|
||||
yasm # to buid icu? seems weird
|
||||
zip
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
icu67
|
||||
nspr
|
||||
readline
|
||||
zlib
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export CXXFLAGS="-fpermissive"
|
||||
export LIBXUL_DIST=$out
|
||||
export PYTHON="${buildPackages.python3.interpreter}"
|
||||
|
||||
# We can't build in js/src/, so create a build dir
|
||||
mkdir obj
|
||||
cd obj/
|
||||
configureScript=../js/src/configure
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-system-zlib"
|
||||
"--with-system-nspr"
|
||||
"--with-system-icu"
|
||||
"--with-intl-api"
|
||||
"--enable-readline"
|
||||
"--enable-shared-js"
|
||||
"--disable-jemalloc"
|
||||
# Fedora and Arch disable optimize, but it doesn't seme to be necessary
|
||||
# It turns on -O3 which some gcc version had a problem with:
|
||||
# https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e
|
||||
"--enable-optimize"
|
||||
"--enable-release"
|
||||
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
# Spidermonkey seems to use different host/build terminology for cross
|
||||
# compilation here.
|
||||
"--host=${stdenv.buildPlatform.config}"
|
||||
"--target=${stdenv.hostPlatform.config}"
|
||||
];
|
||||
|
||||
# mkDerivation by default appends --build/--host to configureFlags when cross compiling
|
||||
# These defaults are bogus for Spidermonkey - avoid passing them by providing an empty list
|
||||
configurePlatforms = [ ];
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
# cc-rs insists on using -mabi=lp64 (soft-float) for riscv64,
|
||||
# while we have a double-float toolchain
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString (with stdenv.hostPlatform; isRiscV && is64bit) "-mabi=lp64d";
|
||||
|
||||
# Remove unnecessary static lib
|
||||
preFixup = ''
|
||||
moveToOutput bin/js78-config "$dev"
|
||||
rm $out/lib/libjs_static.ajs
|
||||
ln -s $out/bin/js78 $out/bin/js
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postPatch = ''
|
||||
# This patch is a manually applied fix of
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1644600
|
||||
# Once that bug is fixed, this can be removed.
|
||||
# This is needed in, for example, `zeroad`.
|
||||
substituteInPlace js/public/StructuredClone.h \
|
||||
--replace "class SharedArrayRawBufferRefs {" \
|
||||
"class JS_PUBLIC_API SharedArrayRawBufferRefs {"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Mozilla's JavaScript engine written in C/C++";
|
||||
homepage = "https://spidermonkey.dev/";
|
||||
license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license.
|
||||
maintainers = with maintainers; [ abbradar lostnet ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
hash = "sha512-rD3nNbJGzk8OFhnNJmQyH/o3QkDOaEPnhdeaNQ3DDJZ5lrvMXjswHLPYIsqYHL6hFnWPxBIvFzjXXd/RFltjeA===";
|
||||
}
|
||||
|
@ -1,125 +1,4 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
|
||||
# build time
|
||||
, buildPackages
|
||||
, cargo
|
||||
, m4
|
||||
, perl
|
||||
, pkg-config
|
||||
, python3
|
||||
, rust-cbindgen
|
||||
, rustc
|
||||
, which
|
||||
, zip
|
||||
|
||||
# runtime
|
||||
, icu
|
||||
, nspr
|
||||
, readline
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spidermonkey";
|
||||
import ./common.nix {
|
||||
version = "91.12.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
|
||||
sha512 = "323fb752488b45872b40f0b0ee1d8c1dffa16874dbff2afde19a54286c824ef48177233e029faeafa5946184e71c31c6bc5ba7ec17a571e21af64fc5f7334042";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
setOutputFlags = false; # Configure script only understands --includedir
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo
|
||||
m4
|
||||
perl
|
||||
pkg-config
|
||||
python3
|
||||
rust-cbindgen
|
||||
rustc
|
||||
rustc.llvmPackages.llvm # for llvm-objdump
|
||||
which
|
||||
zip
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
icu
|
||||
nspr
|
||||
readline
|
||||
zlib
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export LIBXUL_DIST=$out
|
||||
export PYTHON="${buildPackages.python3.interpreter}"
|
||||
export M4=m4
|
||||
export AWK=awk
|
||||
export AC_MACRODIR=$PWD/build/autoconf/
|
||||
|
||||
pushd js/src
|
||||
sh ../../build/autoconf/autoconf.sh --localdir=$PWD configure.in > configure
|
||||
chmod +x configure
|
||||
popd
|
||||
# We can't build in js/src/, so create a build dir
|
||||
mkdir obj
|
||||
cd obj/
|
||||
configureScript=../js/src/configure
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-intl-api"
|
||||
"--with-system-icu"
|
||||
"--with-system-nspr"
|
||||
"--with-system-zlib"
|
||||
"--enable-optimize"
|
||||
"--enable-readline"
|
||||
"--enable-release"
|
||||
"--enable-shared-js"
|
||||
"--disable-debug"
|
||||
"--disable-jemalloc"
|
||||
"--disable-strip"
|
||||
"--disable-tests"
|
||||
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
# Spidermonkey seems to use different host/build terminology for cross
|
||||
# compilation here.
|
||||
"--host=${stdenv.buildPlatform.config}"
|
||||
"--target=${stdenv.hostPlatform.config}"
|
||||
];
|
||||
|
||||
# mkDerivation by default appends --build/--host to configureFlags when cross compiling
|
||||
# These defaults are bogus for Spidermonkey - avoid passing them by providing an empty list
|
||||
configurePlatforms = [ ];
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
# Remove unnecessary static lib
|
||||
preFixup = ''
|
||||
moveToOutput bin/js91-config "$dev"
|
||||
rm $out/lib/libjs_static.ajs
|
||||
ln -s $out/bin/js91 $out/bin/js
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postPatch = ''
|
||||
# This patch is a manually applied fix of
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1644600
|
||||
# Once that bug is fixed, this can be removed.
|
||||
# This is needed in, for example, `zeroad`.
|
||||
substituteInPlace js/public/StructuredClone.h \
|
||||
--replace "class SharedArrayRawBufferRefs {" \
|
||||
"class JS_PUBLIC_API SharedArrayRawBufferRefs {"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Mozilla's JavaScript engine written in C/C++";
|
||||
homepage = "https://spidermonkey.dev/";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ lostnet ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
hash = "sha512-Mj+3UkiLRYcrQPCw7h2MHf+haHTb/yr94ZpUKGyCTvSBdyM+Ap+ur6WUYYTnHDHGvFun7BelceIa9k/F9zNAQg==";
|
||||
}
|
||||
|
@ -0,0 +1,40 @@
|
||||
From a26bb162d9403138d64b84e8fa4f0471084c45b2 Mon Sep 17 00:00:00 2001
|
||||
From: "Kirill A. Korinsky" <kirill@korins.ky>
|
||||
Date: Fri, 8 Jul 2022 21:21:25 +0200
|
||||
Subject: [PATCH] Allow system's nspr and icu on bootstrapped sysroot
|
||||
|
||||
This patch partially reverts https://github.com/mozilla/gecko-dev/commit/9aa3587bbf0416dd2eb5b614f7b301c71c64286b
|
||||
---
|
||||
build/moz.configure/nspr.configure | 2 +-
|
||||
js/moz.configure | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/build/moz.configure/nspr.configure b/build/moz.configure/nspr.configure
|
||||
index 06f03d9bc72d..9687c84a7290 100644
|
||||
--- a/build/moz.configure/nspr.configure
|
||||
+++ b/build/moz.configure/nspr.configure
|
||||
@@ -19,7 +19,7 @@ def enable_nspr_build(enable):
|
||||
return enable
|
||||
|
||||
|
||||
-system_lib_option("--with-system-nspr", help="Use system NSPR")
|
||||
+option("--with-system-nspr", help="Use system NSPR")
|
||||
|
||||
|
||||
@depends(enable_nspr_build, "--with-system-nspr", js_standalone)
|
||||
diff --git a/js/moz.configure b/js/moz.configure
|
||||
index b7ba9790425d..5ff5cb2da266 100644
|
||||
--- a/js/moz.configure
|
||||
+++ b/js/moz.configure
|
||||
@@ -1129,7 +1129,7 @@ set_define(
|
||||
|
||||
# ECMAScript Internationalization API Support (uses ICU)
|
||||
# ======================================================
|
||||
-system_lib_option("--with-system-icu", help="Use system ICU")
|
||||
+option("--with-system-icu", help="Use system ICU")
|
||||
|
||||
system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 71.1", when="--with-system-icu")
|
||||
|
||||
--
|
||||
2.37.0
|
||||
|
@ -0,0 +1,23 @@
|
||||
From 9d3f6e9ff5e66af90a5d187d902f7893fb91c24b Mon Sep 17 00:00:00 2001
|
||||
From: "Kirill A. Korinsky" <kirill@korins.ky>
|
||||
Date: Fri, 1 Jul 2022 12:23:37 +0200
|
||||
Subject: [PATCH] Always check for pkg-config
|
||||
|
||||
---
|
||||
build/moz.configure/pkg.configure | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/build/moz.configure/pkg.configure b/build/moz.configure/pkg.configure
|
||||
index 6b460ae174eed..0056ecd7ae2d8 100644
|
||||
--- a/build/moz.configure/pkg.configure
|
||||
+++ b/build/moz.configure/pkg.configure
|
||||
@@ -15,8 +15,7 @@ pkg_config = check_prog(
|
||||
pkg_config,
|
||||
bootstrap=depends(when=target_sysroot.bootstrapped)(lambda: "pkgconf"),
|
||||
allow_missing=True,
|
||||
- when=compile_environment
|
||||
- & depends(target.os)(lambda os: os not in ("WINNT", "OSX", "Android")),
|
||||
+ when=compile_environment,
|
||||
)
|
||||
|
||||
|
199
pkgs/development/interpreters/spidermonkey/common.nix
Normal file
199
pkgs/development/interpreters/spidermonkey/common.nix
Normal file
@ -0,0 +1,199 @@
|
||||
{ version, hash }:
|
||||
|
||||
{ callPackage
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
|
||||
# build time
|
||||
, buildPackages
|
||||
, cargo
|
||||
, m4
|
||||
, perl
|
||||
, pkg-config
|
||||
, python3
|
||||
, python39
|
||||
, rustc
|
||||
, which
|
||||
, zip
|
||||
, autoconf213
|
||||
, yasm
|
||||
, xcbuild
|
||||
|
||||
# runtime
|
||||
, icu
|
||||
, icu67
|
||||
, nspr
|
||||
, readline
|
||||
, zlib
|
||||
, libobjc
|
||||
, libiconv
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: rec {
|
||||
pname = "spidermonkey";
|
||||
inherit version;
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
patches = lib.optional (lib.versionOlder version "91") [
|
||||
# Fix build failure on armv7l using Debian patch
|
||||
# Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1526653
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/mozilla-team/firefox/commit/fd6847c9416f9eebde636e21d794d25d1be8791d.patch";
|
||||
hash = "sha512-K8U3Qyo7g4si2r/8kJdXyRoTrDHAY48x/YJ7YL+YBwlpfNQcHxX+EZvhRzW8FHYW+f7kOnJu9QykhE8PhSQ9zQ==";
|
||||
})
|
||||
|
||||
# Remove this when updating to 79 - The patches are already applied upstream
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1318905
|
||||
|
||||
# Combination of 3 changesets, modified to apply on 78:
|
||||
# - https://hg.mozilla.org/mozilla-central/rev/06d7e1b6b7e7
|
||||
# - https://hg.mozilla.org/mozilla-central/rev/ec48f15d085c
|
||||
# - https://hg.mozilla.org/mozilla-central/rev/6803dda74d33
|
||||
./add-riscv64-support.patch
|
||||
] ++ lib.optionals (lib.versionAtLeast version "102") [
|
||||
# use pkg-config at all systems
|
||||
./always-check-for-pkg-config.patch
|
||||
./allow-system-s-nspr-and-icu-on-bootstrapped-sysroot.patch
|
||||
|
||||
# Patches required by GJS
|
||||
# https://discourse.gnome.org/t/gnome-43-to-depend-on-spidermonkey-102/10658
|
||||
# Install ProfilingCategoryList.h
|
||||
(fetchpatch {
|
||||
url = "https://hg.mozilla.org/releases/mozilla-esr102/raw-rev/33147b91e42b79f4c6dd3ec11cce96746018407a";
|
||||
sha256 = "sha256-xJFJZMYJ6P11HQDZbr48GFgybpAeVcu3oLIFEyyMjBI=";
|
||||
})
|
||||
# Fix embeder build
|
||||
(fetchpatch {
|
||||
url = "https://hg.mozilla.org/releases/mozilla-esr102/raw-rev/1fa20fb474f5d149cc32d98df169dee5e6e6861b";
|
||||
sha256 = "sha256-eCisKjNxy9SLr9KoEE2UB26BflUknnR7PIvnpezsZeA=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo
|
||||
m4
|
||||
perl
|
||||
pkg-config
|
||||
# 78 requires python up to 3.9
|
||||
(if lib.versionOlder version "91" then python39 else python3)
|
||||
rustc
|
||||
rustc.llvmPackages.llvm # for llvm-objdump
|
||||
which
|
||||
zip
|
||||
] ++ lib.optionals (lib.versionOlder version "91") [
|
||||
autoconf213
|
||||
yasm # to buid icu? seems weird
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
xcbuild
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
(if lib.versionOlder version "91" then icu67 else icu)
|
||||
nspr
|
||||
readline
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
libobjc
|
||||
libiconv
|
||||
];
|
||||
|
||||
depsBuildBuild = [
|
||||
buildPackages.stdenv.cc
|
||||
];
|
||||
|
||||
setOutputFlags = false; # Configure script only understands --includedir
|
||||
|
||||
configureFlags = [
|
||||
"--with-intl-api"
|
||||
"--with-system-icu"
|
||||
"--with-system-nspr"
|
||||
"--with-system-zlib"
|
||||
# Fedora and Arch disable optimize, but it doesn't seme to be necessary
|
||||
# It turns on -O3 which some gcc version had a problem with:
|
||||
# https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e
|
||||
"--enable-optimize"
|
||||
"--enable-readline"
|
||||
"--enable-release"
|
||||
"--enable-shared-js"
|
||||
] ++ lib.optionals (lib.versionAtLeast version "91") [
|
||||
"--disable-debug"
|
||||
] ++ [
|
||||
"--disable-jemalloc"
|
||||
"--disable-strip"
|
||||
"--disable-tests"
|
||||
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
# Spidermonkey seems to use different host/build terminology for cross
|
||||
# compilation here.
|
||||
"--host=${stdenv.buildPlatform.config}"
|
||||
"--target=${stdenv.hostPlatform.config}"
|
||||
];
|
||||
|
||||
# mkDerivation by default appends --build/--host to configureFlags when cross compiling
|
||||
# These defaults are bogus for Spidermonkey - avoid passing them by providing an empty list
|
||||
configurePlatforms = [ ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# cc-rs insists on using -mabi=lp64 (soft-float) for riscv64,
|
||||
# while we have a double-float toolchain
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString (with stdenv.hostPlatform; isRiscV && is64bit && lib.versionOlder version "91") "-mabi=lp64d";
|
||||
|
||||
postPatch = lib.optionalString (lib.versionOlder version "102") ''
|
||||
# This patch is a manually applied fix of
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1644600
|
||||
# Once that bug is fixed, this can be removed.
|
||||
# This is needed in, for example, `zeroad`.
|
||||
substituteInPlace js/public/StructuredClone.h \
|
||||
--replace "class SharedArrayRawBufferRefs {" \
|
||||
"class JS_PUBLIC_API SharedArrayRawBufferRefs {"
|
||||
'';
|
||||
|
||||
preConfigure = lib.optionalString (lib.versionOlder version "91") ''
|
||||
export CXXFLAGS="-fpermissive"
|
||||
'' + ''
|
||||
export LIBXUL_DIST=$out
|
||||
export PYTHON="${buildPackages.python3.interpreter}"
|
||||
'' + lib.optionalString (lib.versionAtLeast version "91") ''
|
||||
export M4=m4
|
||||
export AWK=awk
|
||||
export AS=$CC
|
||||
export AC_MACRODIR=$PWD/build/autoconf/
|
||||
|
||||
pushd js/src
|
||||
sh ../../build/autoconf/autoconf.sh --localdir=$PWD configure.in > configure
|
||||
chmod +x configure
|
||||
popd
|
||||
'' + ''
|
||||
# We can't build in js/src/, so create a build dir
|
||||
mkdir obj
|
||||
cd obj/
|
||||
configureScript=../js/src/configure
|
||||
'';
|
||||
|
||||
# Remove unnecessary static lib
|
||||
preFixup = ''
|
||||
moveToOutput bin/js${lib.versions.major version}-config "$dev"
|
||||
rm $out/lib/libjs_static.ajs
|
||||
ln -s $out/bin/js${lib.versions.major version} $out/bin/js
|
||||
'';
|
||||
|
||||
passthru.tests.run = callPackage ./test.nix {
|
||||
spidermonkey = finalAttrs.finalPackage;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Mozilla's JavaScript engine written in C/C++";
|
||||
homepage = "https://spidermonkey.dev/";
|
||||
license = licenses.mpl20; # TODO: MPL/GPL/LGPL tri-license for 78.
|
||||
maintainers = with maintainers; [ abbradar lostnet catap ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
})
|
10
pkgs/development/interpreters/spidermonkey/test.nix
Normal file
10
pkgs/development/interpreters/spidermonkey/test.nix
Normal file
@ -0,0 +1,10 @@
|
||||
{ runCommand, spidermonkey }:
|
||||
|
||||
runCommand "spidermonkey-test-run" {
|
||||
nativeBuildInputs = [
|
||||
spidermonkey
|
||||
];
|
||||
} ''
|
||||
diff -U3 --color=auto <(js <(echo "console.log('Hello, world\!')")) <(echo 'Hello, world!')
|
||||
touch $out
|
||||
''
|
@ -18,7 +18,6 @@
|
||||
, google-cloud-cpp
|
||||
, grpc
|
||||
, gtest
|
||||
, jemalloc
|
||||
, libbacktrace
|
||||
, lz4
|
||||
, minio
|
||||
@ -56,55 +55,58 @@ let
|
||||
arrow-testing = fetchFromGitHub {
|
||||
owner = "apache";
|
||||
repo = "arrow-testing";
|
||||
rev = "634739c664433cec366b4b9a81d1e1044a8c5eda";
|
||||
hash = "sha256-r1WVgJJsI7v485L6Qb+5i7kFO4Tvxyk1T0JBb4og6pg=";
|
||||
rev = "5bab2f264a23f5af68f69ea93d24ef1e8e77fc88";
|
||||
hash = "sha256-Pxx8ohUpXb5u1995IvXmxQMqWiDJ+7LAll/AjQP7ph8=";
|
||||
};
|
||||
|
||||
parquet-testing = fetchFromGitHub {
|
||||
owner = "apache";
|
||||
repo = "parquet-testing";
|
||||
rev = "acd375eb86a81cd856476fca0f52ba6036a067ff";
|
||||
hash = "sha256-z/kmi+4dBO/dsVkJA4NgUoxl0pXi8RWIGvI8MGu/gcc=";
|
||||
rev = "aafd3fc9df431c2625a514fb46626e5614f1d199";
|
||||
hash = "sha256-cO5t/mgsbBhbSefx8EMGTyxmgTjhZ8mFujkFQ3p/JS0=";
|
||||
};
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "arrow-cpp";
|
||||
version = "8.0.0";
|
||||
version = "9.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
|
||||
hash = "sha256-rZoFcFEXyYnBFrrprHBJL+AVBQ4bgPsOOP3ktdhjqqM=";
|
||||
hash = "sha256-qaAz8KNJAomZj0WGgNGVec8HkRcXumWv3my4AHD3qbU=";
|
||||
};
|
||||
sourceRoot = "apache-arrow-${version}/cpp";
|
||||
|
||||
# versions are all taken from
|
||||
# https://github.com/apache/arrow/blob/apache-arrow-8.0.0/cpp/thirdparty/versions.txt
|
||||
# https://github.com/apache/arrow/blob/apache-arrow-${version}/cpp/thirdparty/versions.txt
|
||||
|
||||
# jemalloc: arrow uses a custom prefix to prevent default allocator symbol
|
||||
# collisions as well as custom build flags
|
||||
${if enableJemalloc then "ARROW_JEMALLOC_URL" else null} = fetchurl {
|
||||
url = "https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2";
|
||||
hash = "sha256-NDMOXOJ2CZ4uiVDZM121qHVomkxqVnUe87HYxTf4h/Y=";
|
||||
url = "https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2";
|
||||
hash = "sha256-LbgtHnEZ3z5xt2QCGbbf6EeJvAU3mDw7esT3GJrs/qo=";
|
||||
};
|
||||
|
||||
# mimalloc: arrow uses custom build flags for mimalloc
|
||||
ARROW_MIMALLOC_URL = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "mimalloc";
|
||||
rev = "v1.7.3";
|
||||
hash = "sha256-Ca877VitpWyKmZNHavqgewk/P+tyd2xHDNVqveKh87M=";
|
||||
rev = "v2.0.6";
|
||||
hash = "sha256-u2ITXABBN/dwU+mCIbL3tN1f4c17aBuSdNTV+Adtohc=";
|
||||
};
|
||||
|
||||
ARROW_XSIMD_URL = fetchFromGitHub {
|
||||
owner = "xtensor-stack";
|
||||
repo = "xsimd";
|
||||
rev = "7d1778c3b38d63db7cec7145d939f40bc5d859d1";
|
||||
hash = "sha256-89AysBUVnTdWyMPazeJegnQ6WEH90Ns7qQInZLMSXY4=";
|
||||
rev = "8.1.0";
|
||||
hash = "sha256-Aqs6XJkGjAjGAp0PprabSM4m+32M/UXpSHppCHdzaZk=";
|
||||
};
|
||||
|
||||
ARROW_SUBSTRAIT_URL = fetchFromGitHub {
|
||||
owner = "substrait-io";
|
||||
repo = "substrait";
|
||||
rev = "e1b4c04a1b518912f4c4065b16a1b2c0ac8e14cf";
|
||||
hash = "sha256-56FSjDngsROSHLjMv+OYAIYqphEu3GzgIMHbgh/ZQw0=";
|
||||
rev = "v0.6.0";
|
||||
hash = "sha256-hxCBomL4Qg9cHLRg9ZiO9k+JVOZXn6f4ikPtK+V9tno=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -159,7 +161,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON"
|
||||
"-DARROW_BUILD_SHARED=${if enableShared then "ON" else "OFF"}"
|
||||
"-DARROW_BUILD_STATIC=${if enableShared then "OFF" else "ON"}"
|
||||
"-DARROW_BUILD_TESTS=ON"
|
||||
@ -168,7 +169,7 @@ stdenv.mkDerivation rec {
|
||||
"-DARROW_EXTRA_ERROR_CONTEXT=ON"
|
||||
"-DARROW_VERBOSE_THIRDPARTY_BUILD=ON"
|
||||
"-DARROW_DEPENDENCY_SOURCE=SYSTEM"
|
||||
"-DThrift_SOURCE=AUTO" # search for Thrift using pkg-config (ThriftConfig.cmake requires OpenSSL and libevent)
|
||||
"-Dxsimd_SOURCE=AUTO"
|
||||
"-DARROW_DEPENDENCY_USE_SHARED=${if enableShared then "ON" else "OFF"}"
|
||||
"-DARROW_COMPUTE=ON"
|
||||
"-DARROW_CSV=ON"
|
||||
@ -229,6 +230,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
in
|
||||
lib.optionalString doInstallCheck "-${builtins.concatStringsSep ":" filteredTests}";
|
||||
__darwinAllowLocalNetworking = true;
|
||||
installCheckInputs = [ perl which sqlite ] ++ lib.optional enableS3 minio;
|
||||
installCheckPhase =
|
||||
let
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "avro-c";
|
||||
version = "1.11.0";
|
||||
version = "1.11.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz";
|
||||
sha256 = "sha256-BlJZClStjkqliiuf8fTOcaZKQbCgXEUp0cUYxh52BkM=";
|
||||
sha256 = "sha256-EliMTjED5/RKHgWrWD8d0Era9qEKov1z4cz1kEVTX5I=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -25,13 +25,17 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
# Adapted from running a cmake build
|
||||
passthru.cmake-config = writeTextDir "c-ares-config.cmake"
|
||||
passthru.cmake-config = let
|
||||
extension = if stdenv.hostPlatform.isStatic then ".a" else stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
buildType = if stdenv.hostPlatform.isStatic then "STATIC" else "SHARED";
|
||||
buildTypeLower = if stdenv.hostPlatform.isStatic then "static" else "shared";
|
||||
in writeTextDir "c-ares-config.cmake"
|
||||
''
|
||||
set(c-ares_INCLUDE_DIR "${self}/include")
|
||||
|
||||
set(c-ares_LIBRARY c-ares::cares)
|
||||
|
||||
add_library(c-ares::cares SHARED IMPORTED)
|
||||
add_library(c-ares::cares ${buildType} IMPORTED)
|
||||
|
||||
set_target_properties(c-ares::cares PROPERTIES
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${self}/include"
|
||||
@ -39,12 +43,12 @@ stdenv.mkDerivation rec {
|
||||
)
|
||||
set_property(TARGET c-ares::cares APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
||||
set_target_properties(c-ares::cares PROPERTIES
|
||||
IMPORTED_LOCATION_RELEASE "${self}/lib/libcares${stdenv.targetPlatform.extensions.sharedLibrary}"
|
||||
IMPORTED_SONAME_RELEASE "libcares${stdenv.targetPlatform.extensions.sharedLibrary}"
|
||||
IMPORTED_LOCATION_RELEASE "${self}/lib/libcares${extension}"
|
||||
IMPORTED_SONAME_RELEASE "libcares${extension}"
|
||||
)
|
||||
add_library(c-ares::cares_shared INTERFACE IMPORTED)
|
||||
set_target_properties(c-ares::cares_shared PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares")
|
||||
set(c-ares_SHARED_LIBRARY c-ares::cares_shared)
|
||||
add_library(c-ares::cares_${buildTypeLower} INTERFACE IMPORTED)
|
||||
set_target_properties(c-ares::cares_${buildTypeLower} PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares")
|
||||
set(c-ares_${buildType}_LIBRARY c-ares::cares_${buildTypeLower})
|
||||
'';
|
||||
|
||||
}; in self
|
||||
|
@ -124,7 +124,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
homepage = "https://gnutls.org/";
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ eelco ];
|
||||
maintainers = with maintainers; [ vcunat ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
@ -1,5 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, cmake
|
||||
, zlib
|
||||
@ -28,6 +30,14 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-pqj1LwRdOK2CUu3hYIsogQIXxWzShDuKEbDTbtWkgnQ=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isDarwin [
|
||||
# https://github.com/libproxy/libproxy/pull/189
|
||||
(fetchpatch {
|
||||
url = "https://github.com/libproxy/libproxy/commit/4331b9db427ce2c25ff5eeb597bec4bc35ed1a0b.patch";
|
||||
sha256 = "sha256-uTh3rYVvEke1iWVHsT3Zj2H1F+gyLrffcmyt0JEKaCA=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" "py3" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libstrophe";
|
||||
version = "0.12.1";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "strophe";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-hNUpHuLwnq66w/VbVAv3QqBFOXDOzd/xPtGGX+j9K2U=";
|
||||
sha256 = "sha256-jT4VIqqUldCj3Rsb5MC74WXYQyTqOZxzFADf47TBV8c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
@ -5,16 +5,16 @@
|
||||
, ninja
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tllist";
|
||||
version = "1.0.5";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "dnkl";
|
||||
repo = "tllist";
|
||||
rev = version;
|
||||
sha256 = "wJEW7haQBtCR2rffKOFyqH3aq0eBr6H8T6gnBs2bNRg=";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-4WW0jGavdFO3LX9wtMPzz3Z1APCPgUQOktpmwAM0SQw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja ];
|
||||
@ -38,9 +38,8 @@ stdenv.mkDerivation rec {
|
||||
primitive data types are supported as well as aggregated ones such as
|
||||
structs, enums and unions.
|
||||
'';
|
||||
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fionera AndersonTorres ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
@ -67,7 +67,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "webkitgtk";
|
||||
version = "2.36.5";
|
||||
version = "2.36.6";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-1VMvqITJQ9xI8ZEUc91mOrpAejs1yqewS6wUGbQeWQg=";
|
||||
sha256 = "sha256-EZO8ghlGM2d28N+l4NylZR8eVxV+2hLaRyHSRB8kpho=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isLinux [
|
||||
|
41
pkgs/development/lua-modules/nfd/default.nix
Normal file
41
pkgs/development/lua-modules/nfd/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ fetchFromGitHub, buildLuarocksPackage, lua, maintainers, pkg-config
|
||||
, substituteAll, zenity }:
|
||||
|
||||
buildLuarocksPackage {
|
||||
pname = "nfd";
|
||||
version = "scm-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Vexatos";
|
||||
repo = "nativefiledialog";
|
||||
rev = "2f74a5758e8df9b27158d444953697bc13fe90d8";
|
||||
sha256 = "1f52mb0s9zrpsqjp10bx92wzqmy1lq7fg1fk1nd6xmv57kc3b1qv";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# use zenity because default gtk impl just crashes
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./zenity.patch;
|
||||
inherit zenity;
|
||||
})
|
||||
];
|
||||
rockspecDir = "lua";
|
||||
|
||||
extraVariables.LUA_LIBDIR = "${lua}/lib";
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
fixupPhase = ''
|
||||
find $out -name nfd_zenity.so -execdir mv {} nfd.so \;
|
||||
'';
|
||||
|
||||
disabled = with lua; (luaversion != "5.1");
|
||||
|
||||
meta = {
|
||||
description =
|
||||
"A tiny, neat lua library that portably invokes native file open and save dialogs.";
|
||||
homepage = "https://github.com/Alloyed/nativefiledialog/tree/master/lua";
|
||||
license.fullName = "zlib";
|
||||
maintainers = [ maintainers.scoder12 ];
|
||||
};
|
||||
}
|
47
pkgs/development/lua-modules/nfd/zenity.patch
Normal file
47
pkgs/development/lua-modules/nfd/zenity.patch
Normal file
@ -0,0 +1,47 @@
|
||||
diff --git a/lua/Makefile.linux b/lua/Makefile.linux
|
||||
index 9f5aa68..77660d4 100644
|
||||
--- a/lua/Makefile.linux
|
||||
+++ b/lua/Makefile.linux
|
||||
@@ -37,5 +37,5 @@ nfd_zenity.o: src/nfd_zenity.c
|
||||
clean:
|
||||
rm nfd_common.o nfd_gtk.o nfd_wrap_lua.o nfd.so
|
||||
|
||||
-install: nfd.so
|
||||
- cp nfd.so $(INST_LIBDIR)
|
||||
+install:
|
||||
+ cp nfd*.so $(INST_LIBDIR)
|
||||
diff --git a/lua/nfd-scm-1.rockspec b/lua/nfd-scm-1.rockspec
|
||||
index 503399d..2d0a7da 100644
|
||||
--- a/lua/nfd-scm-1.rockspec
|
||||
+++ b/lua/nfd-scm-1.rockspec
|
||||
@@ -17,9 +17,6 @@ supported_platforms = { "linux", "macosx", "windows" }
|
||||
external_dependencies = {
|
||||
platforms = {
|
||||
linux = {
|
||||
- gtk3 = {
|
||||
- library = "gtk-3",
|
||||
- }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -28,6 +25,7 @@ build = {
|
||||
linux = {
|
||||
type = "make",
|
||||
makefile = "lua/Makefile.linux",
|
||||
+ build_target = "nfd_zenity.so",
|
||||
build_variables = {
|
||||
CFLAGS="$(CFLAGS)",
|
||||
LIBFLAG="$(LIBFLAG)",
|
||||
diff --git a/src/nfd_zenity.c b/src/nfd_zenity.c
|
||||
index 43ccc6d..3fcdea0 100644
|
||||
--- a/src/nfd_zenity.c
|
||||
+++ b/src/nfd_zenity.c
|
||||
@@ -109,6 +109,8 @@ ZenityCommon(char** command,
|
||||
command[i] = tmp;
|
||||
}
|
||||
|
||||
+ // caller always sets command[0] to "zenity"
|
||||
+ command[0] = strdup("@zenity@/bin/zenity");
|
||||
AddFiltersToCommandArgs(command, commandLen, filterList);
|
||||
|
||||
int byteCount = 0;
|
@ -5,8 +5,7 @@ buildDunePackage rec {
|
||||
|
||||
inherit (tls) src meta version;
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
useDune2 = true;
|
||||
minimalOCamlVersion = "4.11";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohomekit";
|
||||
version = "1.2.6";
|
||||
version = "1.2.9";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "Jc2k";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-69Lg+sw/USNrqtjk8VlsyFydu8Rz9duaoZ1d7KJ2Dfk=";
|
||||
hash = "sha256-9ejha07hYwB/BZ7hmJHhmLb313ZrTvEXBylswJMlBmU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -55,7 +55,9 @@ buildPythonPackage rec {
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "dill>=0.3.1.1,<0.3.2" "dill" \
|
||||
--replace "pyarrow>=0.15.1,<8.0.0" "pyarrow"
|
||||
--replace "pyarrow>=0.15.1,<8.0.0" "pyarrow" \
|
||||
--replace "numpy>=1.14.3,<1.23.0" "numpy" \
|
||||
--replace "pymongo>=3.8.0,<4.0.0" "pymongo"
|
||||
'';
|
||||
|
||||
sourceRoot = "source/sdks/python";
|
||||
@ -90,6 +92,8 @@ buildPythonPackage rec {
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"apache_beam"
|
||||
];
|
||||
|
@ -0,0 +1,53 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, home-assistant-bluetooth
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, sensor-state-data
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bluetooth-sensor-state-data";
|
||||
version = "1.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Xr9MCTcEnO5bMk9AdBTwBCXwm33UUTP7FYZyjDYrMNA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
home-assistant-bluetooth
|
||||
sensor-state-data
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace " --cov=bluetooth_sensor_state_data --cov-report=term-missing:skip-covered" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"bluetooth_sensor_state_data"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Models for storing and converting Bluetooth Sensor State Data";
|
||||
homepage = "https://github.com/bluetooth-devices/bluetooth-sensor-state-data";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
36
pkgs/development/python-modules/callee/default.nix
Normal file
36
pkgs/development/python-modules/callee/default.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "callee";
|
||||
version = "0.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Xion";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-dsXMY3bW/70CmTfCuy5KjxPa+NLCzxzWv5e1aV2NEWE=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
"callee"
|
||||
];
|
||||
|
||||
doCheck = false; # missing dependency
|
||||
|
||||
checkInputs = [
|
||||
# taipan missing, unmaintained, not python3.10 compatible
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Argument matchers for unittest.mock";
|
||||
homepage = "https://github.com/Xion/callee";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, aiohttp
|
||||
, dask
|
||||
, distributed
|
||||
@ -10,12 +10,17 @@ buildPythonPackage rec {
|
||||
pname = "dask-gateway";
|
||||
# update dask-gateway lock step with dask-gateway-server
|
||||
version = "2022.6.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-i0OFXjvDg+D4Sdyg6rluP0k6/Ecr+VZn+RiIEQONQX0=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dask";
|
||||
repo = "dask-gateway";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-PsagZdEPpeuZH9hFL98xB5z6zOdd4Cx/skGQ0eOYkCA=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/dask-gateway";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
dask
|
||||
@ -31,6 +36,6 @@ buildPythonPackage rec {
|
||||
description = "A client library for interacting with a dask-gateway server";
|
||||
homepage = "https://gateway.dask.org/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "databases";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "encode";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-5+x735EFX9B25HgXiqzUJm0nbF7tDF5FOQVnbYQyomE=";
|
||||
hash = "sha256-kHsA9XpolGmtuAGzRTj61igooLG9/LBQyv7TtuqiJ/A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -23,6 +23,11 @@ buildPythonPackage rec {
|
||||
hash = "sha256-LLKhYLzGUQRx4ciWv1TilYvTOO0sj6rdkPlJLPZ8VXA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'pyarrow>=3.0.0, <9.0dev' 'pyarrow>=3.0.0, <10.0dev'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
packaging
|
||||
|
@ -18,14 +18,14 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "deepwave";
|
||||
version = "0.0.12";
|
||||
version = "0.0.14";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ar4";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WWu0LyHlOwWMVPUy+LAszKF3VlgcqlcMlDi4oon4Dl8=";
|
||||
sha256 = "sha256-k1MUrnIkllxGIpkEScTZBEDBBNHgJHxau1e/L8TOEKc=";
|
||||
};
|
||||
|
||||
# unable to find ninja although it is available, most likely because it looks for its pip version
|
||||
|
@ -43,6 +43,8 @@ buildPythonPackage rec {
|
||||
"test_incr_version"
|
||||
"test_get_or_set"
|
||||
"test_get_many"
|
||||
# see https://github.com/grantjenks/python-diskcache/issues/260
|
||||
"test_cache_write_unpicklable_object"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-js-asset";
|
||||
version = "unstable-2021-06-07";
|
||||
version = "2.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matthiask";
|
||||
repo = pname;
|
||||
rev = "a186aa0b5721ca95da6cc032a2fb780a152f581b";
|
||||
sha256 = "141zxng0wwxalsi905cs8pdppy3ad717y3g4fkdxw4n3pd0fjp8r";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-YDOmbqB0xDBAlOSO1UBYJ8VfRjJ8Z6Hw1i24DNSrnjw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -1,24 +1,82 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, django-picklefield, arrow
|
||||
, blessed, django, future }:
|
||||
{ arrow
|
||||
, blessed
|
||||
, buildPythonPackage
|
||||
, croniter
|
||||
, django
|
||||
, django-redis
|
||||
, django-picklefield
|
||||
, fetchFromGitHub
|
||||
, future
|
||||
, lib
|
||||
, poetry-core
|
||||
, pytest-django
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, pkgs
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-q";
|
||||
version = "1.3.9";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5c6b4d530aa3aabf9c6aa57376da1ca2abf89a1562b77038b7a04e52a4a0a91b";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Koed00";
|
||||
repo = "django-q";
|
||||
sha256 = "sha256-gFSrAl3QGoJEJfvTTvLQgViPPjeJ6BfvgEwgLLo+uAA=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
django-picklefield arrow blessed django future
|
||||
django-picklefield
|
||||
arrow
|
||||
blessed
|
||||
django
|
||||
future
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
# fixes empty version string
|
||||
# analog to https://github.com/NixOS/nixpkgs/pull/171200
|
||||
patches = [
|
||||
./pep-621.patch
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"django_q"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
${pkgs.redis}/bin/redis-server &
|
||||
REDIS_PID=$!
|
||||
'';
|
||||
|
||||
postCheck = ''
|
||||
kill $REDIS_PID
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
croniter
|
||||
django-redis
|
||||
pytest-django
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# don't bother with two more servers to test
|
||||
disabledTests = [
|
||||
"test_disque"
|
||||
"test_mongo"
|
||||
];
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A multiprocessing distributed task queue for Django";
|
||||
homepage = "https://django-q.readthedocs.org";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ gador ];
|
||||
};
|
||||
}
|
||||
|
32
pkgs/development/python-modules/django-q/pep-621.patch
Normal file
32
pkgs/development/python-modules/django-q/pep-621.patch
Normal file
@ -0,0 +1,32 @@
|
||||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index 9a83e90..0cdffaf 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -1,16 +1,12 @@
|
||||
-[tool.poetry]
|
||||
+[project]
|
||||
name = "django-q"
|
||||
version = "1.3.9"
|
||||
description = "A multiprocessing distributed task queue for Django"
|
||||
-authors = ["Ilan Steemers <koed00@gmail.com>"]
|
||||
-maintainers = ["Ilan Steemers <koed00@gmail.com>"]
|
||||
-license = "MIT"
|
||||
+authors = [ { name = "Ilan Steemers", email = "koed00@gmail.com"} ]
|
||||
+maintainers = [ { name = "Ilan Steemers", email = "koed00@gmail.com"} ]
|
||||
+license.text = "MIT"
|
||||
readme = 'README.rst'
|
||||
|
||||
-repository = "https://github.com/koed00/django-q"
|
||||
-homepage = "https://django-q.readthedocs.org"
|
||||
-documentation = "https://django-q.readthedocs.org"
|
||||
-
|
||||
keywords = ["django", "distributed", "multiprocessing", "queue", "scheduler"]
|
||||
|
||||
classifiers = [
|
||||
@@ -31,7 +27,6 @@ classifiers = [
|
||||
'Topic :: System :: Distributed Computing',
|
||||
'Topic :: Software Development :: Libraries :: Python Modules',
|
||||
]
|
||||
-include = ['CHANGELOG.md']
|
||||
|
||||
[tool.poetry.plugins] # Optional super table
|
@ -6,6 +6,7 @@
|
||||
, substituteAll
|
||||
|
||||
# patched in
|
||||
, fetchpatch
|
||||
, geos
|
||||
, gdal
|
||||
, withGdal ? false
|
||||
@ -39,23 +40,32 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Django";
|
||||
version = "4.0.7";
|
||||
version = "4.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-nG1a02vnmOVi3cqmsXscP/LTxPUppHQytp+5ow+EdGE=";
|
||||
hash = "sha256-Ay+Kb8fPBczRIU5KLiHfzWojudV1xlc8rMjGeCjb5kI=";
|
||||
};
|
||||
|
||||
patches = lib.optional withGdal
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Fix regression in sqlite backend introduced in 4.1.
|
||||
# https://github.com/django/django/pull/15925
|
||||
url = "https://github.com/django/django/commit/c0beff21239e70cbdcc9597e5be09e505bb8f76c.patch";
|
||||
hash = "sha256-QE7QnfYAK74wvK8gDJ15FtQ+BCIWRQKAVvM7v1FzwlE=";
|
||||
excludes = [ "docs/releases/4.1.1.txt" ];
|
||||
})
|
||||
] ++ lib.optionals withGdal [
|
||||
(substituteAll {
|
||||
src = ./django_4_set_geos_gdal_lib.patch;
|
||||
geos = geos;
|
||||
gdal = gdal;
|
||||
extension = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
});
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asgiref
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "elkm1-lib";
|
||||
version = "2.0.2";
|
||||
version = "2.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "gwww";
|
||||
repo = "elkm1";
|
||||
rev = version;
|
||||
hash = "sha256-2UneQL8LT/zm0iusKay9SxeJClGrDi6yL0lRA8ugUms=";
|
||||
hash = "sha256-uc+hU4RyF6IXUbdpZHozbF6vO2NE2hrfgxAnmmB27lw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gcovr";
|
||||
version = "5.1";
|
||||
version = "5.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-d4CEQ1m/8LlsBBR9r/8l5uWF4FWFvVQjabvDd9ad4SE=";
|
||||
hash = "sha256-IXGVCF7JQ0YpGoe3sebZz97u5WKz4PmjKyXJUws7zo8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -16,19 +16,19 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "glean-sdk";
|
||||
version = "50.1.2";
|
||||
version = "51.1.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-avTIinFBSoCHeCiX7EoS4ucBK6FyFC1SuAFpSdxwPUk=";
|
||||
hash = "sha256-Rt+N/sqX7IyoXbytzF9UkyXsx0vQXbGs+XJkaMhevE0=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256:10k8684665iawf1yswx39s4cj6c5d37j4d7jgbn0fcm08qlkfzxi";
|
||||
hash = "sha256-oY94YVs6I+/klogyajBoCrYexp9oUSrQ6znWVbigf2E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -49,6 +49,11 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# RuntimeError: No ping received.
|
||||
"test_client_activity_api"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace glean-core/python/setup.py \
|
||||
--replace "glean_parser==5.0.1" "glean_parser>=5.0.1"
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "goodwe";
|
||||
version = "0.2.18";
|
||||
version = "0.2.19";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
owner = "marcelblijleven";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-2AbEX/dYwcMIlp27umBcSGgPboGu5y0mmndefXCjkJg=";
|
||||
sha256 = "sha256-H3N0hAJsjBX3pQ2i03r4MRBQQLCXjLhftokZQx0bF80=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'pyarrow >= 3.0.0, < 8.0dev' 'pyarrow >= 3.0.0, < 9.0dev'
|
||||
--replace 'pyarrow >= 3.0.0, < 9.0dev' 'pyarrow >= 3.0.0, < 10.0dev'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -84,6 +84,7 @@ buildPythonPackage rec {
|
||||
"test__initiate_resumable_upload"
|
||||
"test__initiate_resumable_upload_mtls"
|
||||
"test__initiate_resumable_upload_with_retry"
|
||||
"test_table_clones"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
55
pkgs/development/python-modules/govee-ble/default.nix
Normal file
55
pkgs/development/python-modules/govee-ble/default.nix
Normal file
@ -0,0 +1,55 @@
|
||||
{ lib
|
||||
, bluetooth-sensor-state-data
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, home-assistant-bluetooth
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, sensor-state-data
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "govee-ble";
|
||||
version = "0.14.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iJ3fvbQBIk2fpCfz9/uvxk6WcGaL8OVDsNQux+pTBhM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bluetooth-sensor-state-data
|
||||
home-assistant-bluetooth
|
||||
sensor-state-data
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace " --cov=govee_ble --cov-report=term-missing:skip-covered" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"govee_ble"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for Govee BLE devices";
|
||||
homepage = "https://github.com/Bluetooth-Devices/govee-ble";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
55
pkgs/development/python-modules/inkbird-ble/default.nix
Normal file
55
pkgs/development/python-modules/inkbird-ble/default.nix
Normal file
@ -0,0 +1,55 @@
|
||||
{ lib
|
||||
, bluetooth-sensor-state-data
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, home-assistant-bluetooth
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, sensor-state-data
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "inkbird-ble";
|
||||
version = "0.5.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ieVjgNCkU6AJDTgLzmn2YPCNm+kId65QW3SNu2Xou1Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bluetooth-sensor-state-data
|
||||
home-assistant-bluetooth
|
||||
sensor-state-data
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace " --cov=inkbird_ble --cov-report=term-missing:skip-covered" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"inkbird_ble"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for Inkbird BLE devices";
|
||||
homepage = "https://github.com/Bluetooth-Devices/inkbird-ble";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mariadb";
|
||||
version = "1.0.11";
|
||||
version = "1.1.4";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-dpFsiSvJNsWw824loUEfZRp7fOl4mSrjqN5+KD79rL8=";
|
||||
hash = "sha256-c6CsvSrOOB7BvPxhztenmlGeZsAsJOEq5tJ7qgNxeHY=";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mcstatus";
|
||||
version = "9.2.0";
|
||||
version = "9.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "py-mine";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-poq/8+gRlKtrYpuLHmkPgS6OTTMTMaQw9rS1V2sfd6w=";
|
||||
hash = "sha256-kNThVElEDqhbCitktBv5tQkjMaU4IsX0dJk63hvLhb0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
55
pkgs/development/python-modules/moat-ble/default.nix
Normal file
55
pkgs/development/python-modules/moat-ble/default.nix
Normal file
@ -0,0 +1,55 @@
|
||||
{ lib
|
||||
, bluetooth-sensor-state-data
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, home-assistant-bluetooth
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, sensor-state-data
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "moat-ble";
|
||||
version = "0.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dy1Fm0Z1PUsPY8QTiXUcWSi+csFnTUsobSkA92m06QI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bluetooth-sensor-state-data
|
||||
home-assistant-bluetooth
|
||||
sensor-state-data
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace " --cov=moat_ble --cov-report=term-missing:skip-covered" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"moat_ble"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for Moat BLE devices";
|
||||
homepage = "https://github.com/Bluetooth-Devices/moat-ble";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
@ -79,6 +79,8 @@ buildPythonPackage rec {
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
preBuild = ''
|
||||
export PYARROW_PARALLEL=$NIX_BUILD_CORES
|
||||
'';
|
||||
@ -111,8 +113,10 @@ buildPythonPackage rec {
|
||||
|
||||
preCheck = ''
|
||||
shopt -s extglob
|
||||
rm -r pyarrow/!(tests)
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
rm -r pyarrow/!(conftest.py|tests)
|
||||
mv pyarrow/conftest.py pyarrow/tests/parent_conftest.py
|
||||
substituteInPlace pyarrow/tests/conftest.py --replace ..conftest .parent_conftest
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
# OSError: [Errno 24] Too many open files
|
||||
ulimit -n 1024
|
||||
'';
|
||||
|
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyotgw";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mvn23";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-2mO8/qBG01zR0LHS4ajaNHrPsM//4i4gKnviy2aGeRs=";
|
||||
hash = "sha256-lmhFQ1HhRuiS++NsELA53YafrJ9uX2UDBQ9Kgyq0N0o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -34,7 +34,7 @@ buildPythonPackage rec {
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
${python.interpreter} setup.py install --prefix=$out
|
||||
${python.interpreter} setup.py install --prefix=$out --single-version-externally-managed
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
@ -0,0 +1,48 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, home-assistant-bluetooth
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, sensor-state-data
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sensor-state-data";
|
||||
version = "2.0.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EywNH6REtopJoowsKQNNyJNYYyBR7L2pcrvmZAr5PZg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace " --cov=sensor_state_data --cov-report=term-missing:skip-covered" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"sensor_state_data"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Models for storing and converting Sensor Data state";
|
||||
homepage = "https://github.com/bluetooth-devices/sensor-state-data";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
55
pkgs/development/python-modules/sensorpush-ble/default.nix
Normal file
55
pkgs/development/python-modules/sensorpush-ble/default.nix
Normal file
@ -0,0 +1,55 @@
|
||||
{ lib
|
||||
, bluetooth-sensor-state-data
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, home-assistant-bluetooth
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, sensor-state-data
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sensorpush-ble";
|
||||
version = "1.5.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2Q56fXMgw1Al3l6WKI1cdGXfLmZ1qkidkoWKmvEXRaI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bluetooth-sensor-state-data
|
||||
home-assistant-bluetooth
|
||||
sensor-state-data
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace " --cov=sensorpush_ble --cov-report=term-missing:skip-covered" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"sensorpush_ble"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for SensorPush BLE devices";
|
||||
homepage = "https://github.com/Bluetooth-Devices/sensorpush-ble";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, bazel_4, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin
|
||||
{ stdenv, bazel_5, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin
|
||||
, addOpenGLRunpath, fetchpatch, patchelfUnstable
|
||||
# Python deps
|
||||
, buildPythonPackage, pythonOlder, python
|
||||
@ -76,7 +76,7 @@ let
|
||||
|
||||
tfFeature = x: if x then "1" else "0";
|
||||
|
||||
version = "2.9.1";
|
||||
version = "2.10.0-rc0";
|
||||
variant = if cudaSupport then "-gpu" else "";
|
||||
pname = "tensorflow${variant}";
|
||||
|
||||
@ -184,13 +184,13 @@ let
|
||||
stdenv = llvmPackages_11.stdenv;
|
||||
})) {
|
||||
name = "${pname}-${version}";
|
||||
bazel = bazel_4;
|
||||
bazel = bazel_5;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tensorflow";
|
||||
repo = "tensorflow";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kILNvwHi29F8BClYsZw+7RT2t6x57AsAHURVTfs5uOE=";
|
||||
hash = "sha256-zN8I0wxKrxWcI0RuOqDz6srdW0Q+kgaZhJdXM46N1e8=";
|
||||
};
|
||||
|
||||
# On update, it can be useful to steal the changes from gentoo
|
||||
@ -369,12 +369,13 @@ let
|
||||
fetchAttrs = {
|
||||
# cudaSupport causes fetch of ncclArchive, resulting in different hashes
|
||||
sha256 = if cudaSupport then
|
||||
"sha256-mcK60pLz70tOAu1+THUXweiO2SCSFUdFdT91HaUokzA="
|
||||
"sha256-KtVReqHL3zxE8TPrqIerSOt59Mgke/ftoFZKMzgX/u8="
|
||||
else
|
||||
if stdenv.isDarwin then
|
||||
"sha256-j2k9Q+k41nq5nP1VjjkkNjXRov1uAda4RCMDMAthjrk="
|
||||
# FIXME: this checksum is currently wrong, since the tensorflow dependency fetch is broken on darwin
|
||||
"sha256-j2k9Q+k41nq5nP1VjjkkNjXRov1uAda4RCMDMAthjr0="
|
||||
else
|
||||
"sha256-teW6o9Fb4hUxmaHpQU2F+5ihE/DA+MIY8QaMEKMnFiE=";
|
||||
"sha256-zH3xNFEU2JR0Ww8bpD4mCiorGtao0WVPP4vklVMgS4A=";
|
||||
};
|
||||
|
||||
buildAttrs = {
|
||||
|
@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tubeup";
|
||||
version = "0.0.32";
|
||||
version = "0.0.33";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-YWBp6qXz4hNTBzywBGTXDQSzbWfoEEvJLQL5wy8DQ1g=";
|
||||
sha256 = "sha256-RFM0vZeA5PDXf9KzlJ8RTSfM7bz50bpwwszU0gjV1DY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
59
pkgs/development/python-modules/xiaomi-ble/default.nix
Normal file
59
pkgs/development/python-modules/xiaomi-ble/default.nix
Normal file
@ -0,0 +1,59 @@
|
||||
{ lib
|
||||
, bleak-retry-connector
|
||||
, bluetooth-sensor-state-data
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, home-assistant-bluetooth
|
||||
, poetry-core
|
||||
, pycryptodomex
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, sensor-state-data
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xiaomi-ble";
|
||||
version = "0.8.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HwA2NKsrqXBsC5/rUZUNfHDk8QA7I+zQmwqt0SVhw38=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bleak-retry-connector
|
||||
bluetooth-sensor-state-data
|
||||
home-assistant-bluetooth
|
||||
pycryptodomex
|
||||
sensor-state-data
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace " --cov=xiaomi_ble --cov-report=term-missing:skip-covered" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"xiaomi_ble"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for Xiaomi BLE devices";
|
||||
homepage = "https://github.com/Bluetooth-Devices/xiaomi-ble";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
@ -1,12 +1,12 @@
|
||||
{ lib, stdenv, fetchurl, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.3.0";
|
||||
version = "4.3.1";
|
||||
pname = "randoop";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip";
|
||||
sha256 = "sha256-3svBmXcRvscaK8YD4qm/geQSJ6cAm0en/d7H09h41PQ=";
|
||||
sha256 = "sha256-GWg3W/jjDKH6BcvjGt215J03NiDVWihU/m+2kejPVPA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
@ -14,13 +14,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "buildah";
|
||||
version = "1.26.4";
|
||||
version = "1.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "buildah";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9cTV1CEf1784oEPns5QULFtcC+w3yU4uafnMCCgpVqQ=";
|
||||
sha256 = "sha256-xaUOCinP46aSKcxkpvDKollRRBYlrLql737YaOkQPzc=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cuelsp";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dagger";
|
||||
repo = "cuelsp";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-78snbfxm6nSNDQRhj7cC4FSkKeOEUw+wfjhJtP/CpwY=";
|
||||
sha256 = "sha256-+E49TR2D26HSTwgwO1XFkIwXr5lmvv9l3KtR8dVT/cQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-zg4aXPY2InY5VEX1GLJkGhMlfa5EezObAjIuX/bGvlc=";
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dyff";
|
||||
version = "1.5.4";
|
||||
version = "1.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "homeport";
|
||||
repo = "dyff";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6r7e35hJrrkBaDHMUJGVOP7b0OwekJzedTs/P5E8Ykc=";
|
||||
sha256 = "sha256-sEzS7pRjpCZNZSK1VVL628SNjIn9Di0eNOvvM/29WMM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-nam/so7ylbGVhEjGKZzeYZyHz90rq5XEZelHkjcIeh8=";
|
||||
vendorSha256 = "sha256-kanoe3cIvLROxqKZvdwFRnORv5I3eFLqOBZazvCnj48=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/dyff"
|
||||
|
@ -104,14 +104,17 @@ let
|
||||
};
|
||||
|
||||
darwin = {
|
||||
nativeBuildInputs = [ unzip ];
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
unzip
|
||||
];
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p $out/Applications
|
||||
unzip $src
|
||||
mv Electron.app $out/Applications
|
||||
mkdir -p $out/bin
|
||||
ln -s $out/Applications/Electron.app/Contents/MacOS/Electron $out/bin/electron
|
||||
makeWrapper $out/Applications/Electron.app/Contents/MacOS/Electron $out/bin/electron
|
||||
'';
|
||||
};
|
||||
in
|
||||
|
@ -9,13 +9,13 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "faas-cli";
|
||||
version = "0.14.4";
|
||||
version = "0.14.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openfaas";
|
||||
repo = "faas-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-hpQn1lEJP0FmU1jhmXDgV/11RbMdEqblLPIrTQLKLOc=";
|
||||
sha256 = "sha256-nHpsScpVQhSoqvNZ+xTv2cA3lV1MyPZAgNLZRuyvksE=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
@ -6,16 +6,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "garble";
|
||||
version = "0.6.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "burrowers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-VeqF1MB8knM+NtG9Y+x1g2OF7LFZRC8/c8jicGP3vpo=";
|
||||
sha256 = "sha256-QQRnnH/lbleZYkmHj4XUj2uMB9h/mwolhqWfaWMk2ys=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-FQMeA6VUDQa6wpvMoYsigkzukQ0dArAkysiksJWq+iY=";
|
||||
vendorSha256 = "sha256-Xax8KfNcFCLKqcLBNtRUNaneVCW4eUMFe4Ml+D4wLNA=";
|
||||
|
||||
# Used for some of the tests.
|
||||
checkInputs = [git];
|
||||
|
@ -2,17 +2,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gomplate";
|
||||
version = "3.10.0";
|
||||
version = "3.11.2";
|
||||
owner = "hairyhenderson";
|
||||
rev = "v${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner rev;
|
||||
repo = pname;
|
||||
sha256 = "0dbi9saxbwcvypxc0s656ln9zq2vysx8dhrcz488nmy6rcpqiiah";
|
||||
sha256 = "sha256-NIepoz1JToaX2EJCL/kqkpBJigJVy2Tkz0jGn4ukfvI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0rvki8ghlbbaqgnjfsbs1jswj08jfzmnz9ilynv2c6kfkx9zs108";
|
||||
vendorSha256 = "sha256-fXbwNX+GoujciZVxxe7Tl21MxWhyAD4cW/p8PCAAElw=";
|
||||
|
||||
postPatch = ''
|
||||
# some tests require network access
|
||||
@ -24,6 +24,11 @@ buildGoModule rec {
|
||||
internal/tests/integration/datasources_vault*_test.go
|
||||
'';
|
||||
|
||||
# TestInputDir_RespectsUlimit
|
||||
preCheck = ''
|
||||
ulimit -n 1024
|
||||
'';
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hcloud";
|
||||
version = "1.30.1";
|
||||
version = "1.30.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hetznercloud";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0zVbk8NuPGYyEcYV1F1if8VdKa4MnW2v+VQcvgM9bZ8=";
|
||||
sha256 = "sha256-1ay0cW1zBCfaLIWvJGW7A/OeDc4l7OldnQHvrGeqXjE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-++uvg/vXRX2lPU4CmqAcLWbsWBXZHXaXO4qXEaq90T4=";
|
||||
vendorSha256 = "sha256-DoCiyaEPh+QyKgC3PJ5oivJTlcKzscaphXET9et8T1g=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jql";
|
||||
version = "4.0.6";
|
||||
version = "4.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yamafaktory";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1bwgG3VkIPU6lVl4OQNIaHNj7OXhTeMfAjQK2SMypZ8=";
|
||||
sha256 = "sha256-5QVktJpGpHzwRUN8oIFoLydnA+ELhUprcQASeGzgLG8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-VUrDrPVL2KkK1HA/iq8VBzEJSDzRvUfQ+9C8MuSfvkQ=";
|
||||
cargoSha256 = "sha256-qmLmkWFP8T886uR8kJKCqB0G5XIfk+r+kubamKryktc=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A JSON Query Language CLI tool built with Rust";
|
||||
|
@ -11,19 +11,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-deny";
|
||||
version = "0.12.1";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EmbarkStudios";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-w64fdjKXiCaM+U28Hte+I0LPqmGKxbCVRUyhNWcVyTc=";
|
||||
sha256 = "sha256-2NfM1Gd+I9+XGuTyKXxoxH63mqR/G4YcvAjMU2Evhb0=";
|
||||
};
|
||||
|
||||
# enable pkg-config feature of zstd
|
||||
cargoPatches = [ ./zstd-pkg-config.patch ];
|
||||
|
||||
cargoSha256 = "sha256-K9Ab4L/wnpUqe+gLKhtHX4fOgWXv6ZL9faa58hzdq/0=";
|
||||
cargoSha256 = "sha256-6k35fv0HwHuu2k7V2GBjvdAajLVuXuFzVSpVSFF8y+s=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
@ -13,11 +13,11 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-make";
|
||||
version = "0.35.15";
|
||||
version = "0.35.16";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-fHW3ypi/BlfDybhnHOmPoBlyMdf3ZK7pOnH35cvhhRU=";
|
||||
sha256 = "sha256-QRsJoQ2lUOnSkQYwCgUI1su0avQLqEYn56Y0H1hOaVw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ];
|
||||
|
||||
cargoSha256 = "sha256-Az7A0VMlWv34uUeM0TH7tT5FPja/j0x6aoF7qDw8JCs=";
|
||||
cargoSha256 = "sha256-ppg+UksukKQLRncZYlvI7Qi9bdQn07dFPrNn8nQRCsI=";
|
||||
|
||||
# Some tests fail because they need network access.
|
||||
# However, Travis ensures a proper build.
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user