Merge master into haskell-updates
This commit is contained in:
commit
3aa744deb1
|
@ -60,6 +60,13 @@ indent_size = unset
|
|||
[*.md]
|
||||
trim_trailing_whitespace = unset
|
||||
|
||||
# binaries
|
||||
[*.nib]
|
||||
end_of_line = unset
|
||||
insert_final_newline = unset
|
||||
trim_trailing_whitespace = unset
|
||||
charset = unset
|
||||
|
||||
[eggs.nix]
|
||||
trim_trailing_whitespace = unset
|
||||
|
||||
|
|
|
@ -38,4 +38,4 @@ d08ede042b74b8199dc748323768227b88efcf7c
|
|||
d1c1a0c656ccd8bd3b25d3c4287f2d075faf3cf3
|
||||
|
||||
# fix indentation in meteor default.nix
|
||||
f76b359e4a55267ddd4e9e149e7cc13ae5cad98a
|
||||
a37a6de881ec4c6708e6b88fd16256bbc7f26bbd
|
||||
|
|
|
@ -121,6 +121,8 @@ rec {
|
|||
else if final.isAarch64 then "arm64"
|
||||
else if final.isx86_32 then "i386"
|
||||
else if final.isx86_64 then "x86_64"
|
||||
# linux kernel does not distinguish microblaze/microblazeel
|
||||
else if final.isMicroBlaze then "microblaze"
|
||||
else if final.isMips32 then "mips"
|
||||
else if final.isMips64 then "mips" # linux kernel does not distinguish mips32/mips64
|
||||
else if final.isPower then "powerpc"
|
||||
|
|
|
@ -26,9 +26,10 @@ let
|
|||
|
||||
# Linux
|
||||
"aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux"
|
||||
"armv7l-linux" "i686-linux" "m68k-linux" "mipsel-linux" "mips64el-linux"
|
||||
"powerpc64-linux" "powerpc64le-linux" "riscv32-linux"
|
||||
"riscv64-linux" "s390-linux" "s390x-linux" "x86_64-linux"
|
||||
"armv7l-linux" "i686-linux" "m68k-linux" "microblaze-linux"
|
||||
"microblazeel-linux" "mipsel-linux" "mips64el-linux" "powerpc64-linux"
|
||||
"powerpc64le-linux" "riscv32-linux" "riscv64-linux" "s390-linux"
|
||||
"s390x-linux" "x86_64-linux"
|
||||
|
||||
# MMIXware
|
||||
"mmix-mmixware"
|
||||
|
@ -40,9 +41,9 @@ let
|
|||
|
||||
# none
|
||||
"aarch64_be-none" "aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none"
|
||||
"msp430-none" "or1k-none" "m68k-none" "powerpc-none" "powerpcle-none"
|
||||
"riscv32-none" "riscv64-none" "rx-none" "s390-none" "s390x-none" "vc4-none"
|
||||
"x86_64-none"
|
||||
"microblaze-none" "microblazeel-none" "msp430-none" "or1k-none" "m68k-none"
|
||||
"powerpc-none" "powerpcle-none" "riscv32-none" "riscv64-none" "rx-none"
|
||||
"s390-none" "s390x-none" "vc4-none" "x86_64-none"
|
||||
|
||||
# OpenBSD
|
||||
"i686-openbsd" "x86_64-openbsd"
|
||||
|
@ -71,6 +72,7 @@ in {
|
|||
x86 = filterDoubles predicates.isx86;
|
||||
i686 = filterDoubles predicates.isi686;
|
||||
x86_64 = filterDoubles predicates.isx86_64;
|
||||
microblaze = filterDoubles predicates.isMicroBlaze;
|
||||
mips = filterDoubles predicates.isMips;
|
||||
mmix = filterDoubles predicates.isMmix;
|
||||
riscv = filterDoubles predicates.isRiscV;
|
||||
|
|
|
@ -17,6 +17,7 @@ rec {
|
|||
isAarch32 = { cpu = { family = "arm"; bits = 32; }; };
|
||||
isAarch64 = { cpu = { family = "arm"; bits = 64; }; };
|
||||
isAarch = { cpu = { family = "arm"; }; };
|
||||
isMicroBlaze = { cpu = { family = "microblaze"; }; };
|
||||
isMips = { cpu = { family = "mips"; }; };
|
||||
isMips32 = { cpu = { family = "mips"; bits = 32; }; };
|
||||
isMips64 = { cpu = { family = "mips"; bits = 64; }; };
|
||||
|
|
|
@ -88,6 +88,9 @@ rec {
|
|||
i686 = { bits = 32; significantByte = littleEndian; family = "x86"; arch = "i686"; };
|
||||
x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; arch = "x86-64"; };
|
||||
|
||||
microblaze = { bits = 32; significantByte = bigEndian; family = "microblaze"; };
|
||||
microblazeel = { bits = 32; significantByte = littleEndian; family = "microblaze"; };
|
||||
|
||||
mips = { bits = 32; significantByte = bigEndian; family = "mips"; };
|
||||
mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; };
|
||||
mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; };
|
||||
|
|
|
@ -31,7 +31,7 @@ with lib.systems.doubles; lib.runTests {
|
|||
testredox = mseteq redox [ "x86_64-redox" ];
|
||||
testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
|
||||
testillumos = mseteq illumos [ "x86_64-solaris" ];
|
||||
testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mips64el-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" "s390x-linux" ];
|
||||
testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mips64el-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" "s390x-linux" "microblaze-linux" "microblazeel-linux" ];
|
||||
testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "m68k-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ];
|
||||
testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];
|
||||
testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];
|
||||
|
|
|
@ -9686,6 +9686,12 @@
|
|||
githubId = 3359345;
|
||||
name = "obadz";
|
||||
};
|
||||
oberblastmeister = {
|
||||
email = "littlebubu.shu@gmail.com";
|
||||
github = "oberblastmeister";
|
||||
githubId = 61095988;
|
||||
name = "Brian Shu";
|
||||
};
|
||||
obsidian-systems-maintenance = {
|
||||
name = "Obsidian Systems Maintenance";
|
||||
email = "maintainer@obsidian.systems";
|
||||
|
@ -10942,6 +10948,12 @@
|
|||
githubId = 7226587;
|
||||
name = "Théophane Hufschmitt";
|
||||
};
|
||||
rehno-lindeque = {
|
||||
email = "rehno.lindeque+code@gmail.com";
|
||||
github = "rehno-lindeque";
|
||||
githubId = 337811;
|
||||
name = "Rehno Lindeque";
|
||||
};
|
||||
relrod = {
|
||||
email = "ricky@elrod.me";
|
||||
github = "relrod";
|
||||
|
@ -13049,6 +13061,12 @@
|
|||
githubId = 3268082;
|
||||
name = "Thibaut Marty";
|
||||
};
|
||||
thyol = {
|
||||
name = "thyol";
|
||||
email = "thyol@pm.me";
|
||||
github = "thyol";
|
||||
githubId = 81481634;
|
||||
};
|
||||
thmzlt = {
|
||||
email = "git@thomazleite.com";
|
||||
github = "thmzlt";
|
||||
|
@ -13500,6 +13518,15 @@
|
|||
fingerprint = "EE59 5E29 BB5B F2B3 5ED2 3F1C D276 FF74 6700 7335";
|
||||
}];
|
||||
};
|
||||
unhammer = {
|
||||
email = "unhammer@fsfe.org";
|
||||
github = "unhammer";
|
||||
githubId = 56868;
|
||||
name = "Kevin Brubeck Unhammer";
|
||||
keys = [{
|
||||
fingerprint = "50D4 8796 0B86 3F05 4B6A 12F9 7426 06DE 766A C60C";
|
||||
}];
|
||||
};
|
||||
uniquepointer = {
|
||||
email = "uniquepointer@mailbox.org";
|
||||
matrix = "@uniquepointer:matrix.org";
|
||||
|
|
|
@ -74,6 +74,15 @@ with lib.maintainers; {
|
|||
enableFeatureFreezePing = true;
|
||||
};
|
||||
|
||||
bitnomial = {
|
||||
# Verify additions to this team with at least one already existing member of the team.
|
||||
members = [
|
||||
cdepillabout
|
||||
];
|
||||
scope = "Group registration for packages maintained by Bitnomial.";
|
||||
shortName = "Bitnomial employees";
|
||||
};
|
||||
|
||||
blockchains = {
|
||||
members = [
|
||||
mmahut
|
||||
|
|
|
@ -476,6 +476,14 @@
|
|||
and require manual remediation.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>diamond</literal> package has been update from
|
||||
0.8.36 to 2.0.15. See the
|
||||
<link xlink:href="https://github.com/bbuchfink/diamond/releases">upstream
|
||||
release notes</link> for more details.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>dockerTools.buildImage</literal> deprecates the
|
||||
|
|
|
@ -164,6 +164,8 @@ Use `configure.packages` instead.
|
|||
|
||||
- Matrix Synapse now requires entries in the `state_group_edges` table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was restored multiple times). If your Synapse database already has duplicate rows in this table, this could fail with an error and require manual remediation.
|
||||
|
||||
- The `diamond` package has been update from 0.8.36 to 2.0.15. See the [upstream release notes](https://github.com/bbuchfink/diamond/releases) for more details.
|
||||
|
||||
- `dockerTools.buildImage` deprecates the misunderstood `contents` parameter, in favor of `copyToRoot`.
|
||||
Use `copyToRoot = buildEnv { ... };` or similar if you intend to add packages to `/bin`.
|
||||
|
||||
|
|
|
@ -8,14 +8,23 @@ let
|
|||
|
||||
makeColor = i: concatMapStringsSep "," (x: "0x" + substring (2*i) 2 x);
|
||||
|
||||
isUnicode = hasSuffix "UTF-8" (toUpper config.i18n.defaultLocale);
|
||||
isUnicode = '' \
|
||||
LOCALE_ARCHIVE=${config.i18n.glibcLocales}/lib/locale/locale-archive \
|
||||
LANG=${config.i18n.defaultLocale} \
|
||||
LC_IDENTIFICATION=${config.i18n.defaultLocale} \
|
||||
locale -k identification-codeset | grep -i UTF-8 \
|
||||
'';
|
||||
|
||||
optimizedKeymap = pkgs.runCommand "keymap" {
|
||||
nativeBuildInputs = [ pkgs.buildPackages.kbd ];
|
||||
nativeBuildInputs = with pkgs.buildPackages; [ kbd locale ];
|
||||
LOADKEYS_KEYMAP_PATH = "${consoleEnv pkgs.kbd}/share/keymaps/**";
|
||||
preferLocalBuild = true;
|
||||
} ''
|
||||
loadkeys -b ${optionalString isUnicode "-u"} "${cfg.keyMap}" > $out
|
||||
if ${isUnicode} ; then
|
||||
loadkeys -b -u "${cfg.keyMap}" > $out
|
||||
else
|
||||
loadkeys -b "${cfg.keyMap}" > $out
|
||||
fi
|
||||
'';
|
||||
|
||||
# Sadly, systemd-vconsole-setup doesn't support binary keymaps.
|
||||
|
@ -130,7 +139,7 @@ in
|
|||
})
|
||||
|
||||
(mkIf setVconsole (mkMerge [
|
||||
{ environment.systemPackages = [ pkgs.kbd ];
|
||||
{ environment.systemPackages = with pkgs; [ kbd locale ];
|
||||
|
||||
# Let systemd-vconsole-setup.service do the work of setting up the
|
||||
# virtual consoles.
|
||||
|
@ -139,8 +148,13 @@ in
|
|||
environment.etc.kbd.source = "${consoleEnv pkgs.kbd}/share";
|
||||
|
||||
boot.initrd.preLVMCommands = mkIf (!config.boot.initrd.systemd.enable) (mkBefore ''
|
||||
kbd_mode ${if isUnicode then "-u" else "-a"} -C /dev/console
|
||||
printf "\033%%${if isUnicode then "G" else "@"}" >> /dev/console
|
||||
if ${isUnicode} ; then
|
||||
kbd_mode -u -C /dev/console
|
||||
printf "\033%%G" >> /dev/console
|
||||
else
|
||||
kbd_mode -a -C /dev/console
|
||||
printf "\033%%@" >> /dev/console
|
||||
fi
|
||||
loadkmap < ${optimizedKeymap}
|
||||
|
||||
${optionalString cfg.earlySetup ''
|
||||
|
|
|
@ -260,8 +260,6 @@ in
|
|||
# - Configure the display manager to run specific `xrandr` commands which will
|
||||
# configure/enable displays connected to the Intel iGPU / AMD APU.
|
||||
|
||||
services.xserver.useGlamor = mkDefault offloadCfg.enable;
|
||||
|
||||
services.xserver.drivers = let
|
||||
in optional primeEnabled {
|
||||
name = igpuDriver;
|
||||
|
|
|
@ -308,7 +308,6 @@ in
|
|||
StateDirectory = mkIf (cfg.dataDir == "/var/lib/caddy") [ "caddy" ];
|
||||
LogsDirectory = mkIf (cfg.logDir == "/var/log/caddy") [ "caddy" ];
|
||||
Restart = "on-abnormal";
|
||||
SupplementaryGroups = mkIf (length acmeVHosts != 0) [ "acme" ];
|
||||
|
||||
# TODO: attempt to upstream these options
|
||||
NoNewPrivileges = true;
|
||||
|
@ -331,9 +330,12 @@ in
|
|||
|
||||
security.acme.certs =
|
||||
let
|
||||
reloads = map (useACMEHost: nameValuePair useACMEHost { reloadServices = [ "caddy.service" ]; }) acmeHosts;
|
||||
certCfg = map (useACMEHost: nameValuePair useACMEHost {
|
||||
group = mkDefault cfg.group;
|
||||
reloadServices = [ "caddy.service" ];
|
||||
}) acmeHosts;
|
||||
in
|
||||
listToAttrs reloads;
|
||||
listToAttrs certCfg;
|
||||
|
||||
};
|
||||
}
|
||||
|
|
|
@ -40,9 +40,7 @@ in
|
|||
|
||||
<emphasis>Note that this option does not create any certificates, nor
|
||||
does it add subdomains to existing ones – you will need to create them
|
||||
manually using <xref linkend="opt-security.acme.certs"/>. Additionally,
|
||||
you should probably add the <literal>caddy</literal> user to the
|
||||
<literal>acme</literal> group to grant access to the certificates.</emphasis>
|
||||
manually using <xref linkend="opt-security.acme.certs"/>.</emphasis>
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
@ -35,20 +35,20 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
|
|||
|
||||
with subtest("create index"):
|
||||
machine.succeed(
|
||||
"curl -XPOST --header 'Content-Type: application/json' ${apiUrl}/indexes --data @${indexJSON}"
|
||||
"curl -X POST -H 'Content-Type: application/json' ${apiUrl}/indexes --data @${indexJSON}"
|
||||
)
|
||||
indexes = json.loads(machine.succeed("curl ${apiUrl}/indexes"))
|
||||
assert len(indexes) == 1, "index wasn't created"
|
||||
assert indexes["total"] == 1, "index wasn't created"
|
||||
|
||||
with subtest("add documents"):
|
||||
response = json.loads(
|
||||
machine.succeed(
|
||||
"curl -XPOST --header 'Content-Type: application/json' ${apiUrl}/indexes/${uid}/documents --data @${moviesJSON}"
|
||||
"curl -X POST -H 'Content-Type: application/json' ${apiUrl}/indexes/${uid}/documents --data-binary @${moviesJSON}"
|
||||
)
|
||||
)
|
||||
update_id = response["updateId"]
|
||||
task_uid = response["taskUid"]
|
||||
machine.wait_until_succeeds(
|
||||
f"curl ${apiUrl}/indexes/${uid}/updates/{update_id} | jq -e '.status == \"processed\"'"
|
||||
f"curl ${apiUrl}/tasks/{task_uid} | jq -e '.status == \"succeeded\"'"
|
||||
)
|
||||
|
||||
with subtest("search"):
|
||||
|
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocenaudio";
|
||||
version = "3.11.11";
|
||||
version = "3.11.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
|
||||
sha256 = "sha256-S3Fqg5DjhVoYwfF3A/P7WcOUsU1x+IGwLopyNA3FkRQ=";
|
||||
sha256 = "sha256-5HQ64jCM8kyWLqxFqsFN3lJgM/JlWf1/RYKSpAFYTYE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pyradio";
|
||||
version = "0.8.9.22";
|
||||
version = "0.8.9.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coderholic";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-QBgXg2SNEQX1ngY+cEWqStC0zsFZ0Er81tuhTszbHWM=";
|
||||
sha256 = "sha256-bkZ+zgFtENQUjks9HwVcqHIREcKQ5XCt3AEh3QAyiEc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "reaper";
|
||||
version = "6.61";
|
||||
version = "6.66";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${stdenv.hostPlatform.qemuArch}.tar.xz";
|
||||
hash = {
|
||||
x86_64-linux = "sha256-Lp2EVky1+ruc86LdMmvhZIisoYl0OxdkVnN3h/u09IQ=";
|
||||
aarch64-linux = "sha256-sPLCMA//xAdWXjY7++R6eLWS56Zi0u+9ju7JlICGvVc=";
|
||||
x86_64-linux = "sha256-kMXHHd+uIc5tKlDlxKjphZsfNMYvvV/4Zx84eRwPGcs=";
|
||||
aarch64-linux = "sha256-pB3qj9CJbI5iWBNKNX2niIfHrpSz9+qotX/zKGYDwYo=";
|
||||
}.${stdenv.hostPlatform.system};
|
||||
};
|
||||
|
||||
|
|
|
@ -36,11 +36,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tidal-hifi";
|
||||
version = "4.1.0";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb";
|
||||
sha256 = "1lvdym7wcg9042an03zxvckq6kmcd5v5snp2ma54f4knj9kmzwyf";
|
||||
sha256 = "1l8axsf9d7a370fs96j16bnsi8fcdgwq036yxc4r4ykpnnskf1ds";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ];
|
||||
|
|
|
@ -3,12 +3,12 @@
|
|||
, libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "20220327";
|
||||
version = "20220714";
|
||||
pname = "x42-plugins";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-IhuPqTlCbCxExT5B9Au42RQQl4sDEvz6+HhsuT02KVs=";
|
||||
sha256 = "sha256-myrHOfgpCwuW8YX0jZ3RutoqtXysU0ejBNcuxN3stXU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "erigon";
|
||||
version = "2022.07.03";
|
||||
version = "2022.08.02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ledgerwatch";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zWygG06H5+QuG11klRq+7T2v40FNMxmYENdsK3KB+ko=";
|
||||
sha256 = "sha256-JXVVfhR7XQKPLpH9F+78+y5hLBGdq/qSA2wniM/sf5s=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-vxLe8uEjuQ96JiIDxlSrpVATScNl2fscXVUqFKmMPxs=";
|
||||
vendorSha256 = "sha256-Muksput9s0I9AeQNG+QSbfz0/s14EmSERFg8h0rqaJ8=";
|
||||
proxyVendor = true;
|
||||
|
||||
# Build errors in mdbx when format hardening is enabled:
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
let
|
||||
pname = "ledger-live-desktop";
|
||||
version = "2.45.1";
|
||||
version = "2.46.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
|
||||
hash = "sha256-KUp7ZQZ+THjioOSe3A40Zj+5OteWxEv+dnSbTUM8qME=";
|
||||
hash = "sha256-QbCiOzASqicd0Tns1sV9ZVoc/GmuoohB9wB/g0Z6uFA=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
|
|
@ -17,7 +17,8 @@ let
|
|||
inherit (melpaStablePackages) tree-sitter-langs;
|
||||
|
||||
libSuffix = if stdenv.isDarwin then "dylib" else "so";
|
||||
soName = g: lib.removeSuffix "-grammar" (lib.removePrefix "tree-sitter-" g.pname) + "." + libSuffix;
|
||||
langName = g: lib.removeSuffix "-grammar" (lib.removePrefix "tree-sitter-" g.pname);
|
||||
soName = g: langName g + "." + libSuffix;
|
||||
|
||||
grammarDir = runCommand "emacs-tree-sitter-grammars" {
|
||||
# Fake same version number as upstream language bundle to prevent triggering runtime downloads
|
||||
|
@ -28,6 +29,7 @@ let
|
|||
'' + lib.concatStringsSep "\n" (map (
|
||||
g: "ln -s ${g}/parser $out/langs/bin/${soName g}") plugins
|
||||
));
|
||||
siteDir = "$out/share/emacs/site-lisp/elpa/${tree-sitter-langs.pname}-${tree-sitter-langs.version}";
|
||||
|
||||
in
|
||||
melpaStablePackages.tree-sitter-langs.overrideAttrs(old: {
|
||||
|
@ -36,6 +38,19 @@ melpaStablePackages.tree-sitter-langs.overrideAttrs(old: {
|
|||
--replace "tree-sitter-langs-grammar-dir tree-sitter-langs--dir" "tree-sitter-langs-grammar-dir \"${grammarDir}/langs\""
|
||||
'';
|
||||
|
||||
postInstall =
|
||||
old.postInstall or ""
|
||||
+ lib.concatStringsSep "\n"
|
||||
(map
|
||||
(g: ''
|
||||
if [[ -d "${g}/queries" ]]; then
|
||||
mkdir -p ${siteDir}/queries/${langName g}/
|
||||
for f in ${g}/queries/*; do
|
||||
ln -sfn "$f" ${siteDir}/queries/${langName g}/
|
||||
done
|
||||
fi
|
||||
'') plugins);
|
||||
|
||||
passthru = old.passthru or {} // {
|
||||
inherit plugins;
|
||||
withPlugins = fn: final.tree-sitter-langs.override { plugins = fn tree-sitter-grammars; };
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
, libtiff, librsvg, libwebp, gconf, libxml2, imagemagick, gnutls, libselinux
|
||||
, alsa-lib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
|
||||
, sigtool, jansson, harfbuzz, sqlite, nixosTests
|
||||
, dontRecurseIntoAttrs, emacsPackagesFor
|
||||
, recurseIntoAttrs, emacsPackagesFor
|
||||
, libgccjit, targetPlatform, makeWrapper # native-comp params
|
||||
, fetchFromSavannah
|
||||
, systemd ? null
|
||||
|
@ -216,7 +216,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
|
|||
|
||||
passthru = {
|
||||
inherit nativeComp;
|
||||
pkgs = dontRecurseIntoAttrs (emacsPackagesFor emacs);
|
||||
pkgs = recurseIntoAttrs (emacsPackagesFor emacs);
|
||||
tests = { inherit (nixosTests) emacs-daemon; };
|
||||
};
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
{ lib, stdenv, callPackage, fetchurl
|
||||
, jdk, cmake, gdb, zlib, python3
|
||||
, lldb
|
||||
, dotnet-sdk_6
|
||||
, maven
|
||||
, autoPatchelfHook
|
||||
|
@ -45,6 +46,7 @@ let
|
|||
python3
|
||||
stdenv.cc.cc
|
||||
libdbusmenu
|
||||
lldb
|
||||
];
|
||||
dontAutoPatchelf = true;
|
||||
postFixup = (attrs.postFixup or "") + optionalString (stdenv.isLinux) ''
|
||||
|
@ -56,6 +58,9 @@ let
|
|||
# bundled gdb does not find libcrypto 10
|
||||
rm -rf bin/gdb/linux
|
||||
ln -s ${gdb} bin/gdb/linux
|
||||
# bundled lldb does not find libssl
|
||||
rm -rf bin/lldb/linux
|
||||
ln -s ${lldb} bin/lldb/linux
|
||||
|
||||
autoPatchelf $PWD/bin
|
||||
|
||||
|
|
|
@ -3,157 +3,157 @@
|
|||
"clion": {
|
||||
"update-channel": "CLion RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "6f0234d41c4ca1cf8eaa4ea5585ba4cfc17d86c16c78edc59501e0ca05a80d56",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2022.1.3.tar.gz",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "a0d9e77ad4afbb5f7d69e23cf84ccf132eed6ead6c3a7cd442b33924e6931656",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2022.2.1.tar.gz",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.27"
|
||||
"build_number": "222.3739.54"
|
||||
},
|
||||
"datagrip": {
|
||||
"update-channel": "DataGrip RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz",
|
||||
"version": "2022.1.5",
|
||||
"sha256": "688fcb5996d9bdffd0735e14d10171cfefc72bc482dd773102dcc9e28e245ab8",
|
||||
"url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.5.tar.gz",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "4015bfa478f7ee33914975b530f13930bc32eff86223e9256f2610497f95825f",
|
||||
"url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.1.tar.gz",
|
||||
"version-major-minor": "2022.1.1",
|
||||
"build_number": "221.5787.39"
|
||||
"build_number": "222.3345.126"
|
||||
},
|
||||
"goland": {
|
||||
"update-channel": "GoLand RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "b96a1cb1b6be1d1e55c85de551fbd94b9a8c0566193d784f3bc408da60e6904e",
|
||||
"url": "https://download.jetbrains.com/go/goland-2022.1.3.tar.gz",
|
||||
"version": "2022.2.2",
|
||||
"sha256": "c3cfc300f55adc3a52528d13a1133bffd2aa7c2d20ea301cd20e3aff52d87609",
|
||||
"url": "https://download.jetbrains.com/go/goland-2022.2.2.tar.gz",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.26"
|
||||
"build_number": "222.3739.57"
|
||||
},
|
||||
"idea-community": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "f8a14e3ab100cf745dc7e329e13bd31961cd728c6b7676493b9ffb4e290a9543",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2022.1.3.tar.gz",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "93eb9391a898aad164ca47965e0445cbf0f04d7062b6875c4e4a3136799ee6cf",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2022.2.1.tar.gz",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.22"
|
||||
"build_number": "222.3739.54"
|
||||
},
|
||||
"idea-ultimate": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-no-jbr.tar.gz",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "97748cd2dacf74701eb4ec30227d96a9b5ab5c09afc7e59443669ab839d20d02",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2022.1.3-no-jbr.tar.gz",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "43eee4b9ea9aed7601252823689e7232b39829784a9bab5e8b5462f55eecc83a",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2022.2.1-no-jbr.tar.gz",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.22"
|
||||
"build_number": "222.3739.54"
|
||||
},
|
||||
"mps": {
|
||||
"update-channel": "MPS RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
|
||||
"version": "2021.3.1",
|
||||
"sha256": "b7d41c4362e71f30adeaed9f0ec30afd5ac0e6eea9650ee4a19d70a5783db3e6",
|
||||
"url": "https://download.jetbrains.com/mps/2021.3/MPS-2021.3.1.tar.gz",
|
||||
"url": "https://download.jetbrains.com/mps/2021.3.1/MPS-2021.3.1.tar.gz",
|
||||
"version-major-minor": "2021.3",
|
||||
"build_number": "213.7172.958"
|
||||
},
|
||||
"phpstorm": {
|
||||
"update-channel": "PhpStorm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "ea5d005f3aee2588dd725bd3aa87d5e3beb51ac87b1505f34263f9da3babd360",
|
||||
"url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.3.tar.gz",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "dc463578e879f958cae3c5fc775170dd0a6a89347c02aa087126f03cc7a63f79",
|
||||
"url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.1.tar.gz",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.28"
|
||||
"build_number": "222.3739.61"
|
||||
},
|
||||
"pycharm-community": {
|
||||
"update-channel": "PyCharm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "888595caa9510d31fd1b56009b6346fd705e8e7cd36d07205f8bf510b92f26a5",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-community-2022.1.3.tar.gz",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "fc91b134b6899a09ce8cbdc1ebdbdcfe1c1ffb6dbe756b30b24d7ad131bf27c8",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-community-2022.2.1.tar.gz",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.27"
|
||||
"build_number": "222.3739.56"
|
||||
},
|
||||
"pycharm-professional": {
|
||||
"update-channel": "PyCharm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "f8b9a761529358e97d1b77510a8ef81314bccdfb0fa450f2adcd466ba1fd0bf5",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.3.tar.gz",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "a23ffa7b617ab27d3c8abb0689b4d03b5370534193152cd4cfe4196c7d150751",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.1.tar.gz",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.27"
|
||||
"build_number": "222.3739.56"
|
||||
},
|
||||
"rider": {
|
||||
"update-channel": "Rider RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
|
||||
"version": "2022.1.2",
|
||||
"sha256": "4513e55d3db013986bdfda52854f89fb127a153f2588ae456d6e7a182987b741",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.2.tar.gz",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "3f61c5fbdf46b94a5cb772ad51dda5a9cad8a9c7ad78dbcacf01daa2226a5633",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.1.tar.gz",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5787.36"
|
||||
"build_number": "222.3739.37"
|
||||
},
|
||||
"ruby-mine": {
|
||||
"update-channel": "RubyMine RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "9d9c729bd1908a865c72c215b25525e3b82ffee46986b58b747cb502dc6ec2f4",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.3.tar.gz",
|
||||
"version": "2022.2",
|
||||
"sha256": "4300570552fb94932fe4311b6f8c7a071296e0c0c84246039f26f1b37dda9f0a",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.tar.gz",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.22"
|
||||
"build_number": "222.3345.111"
|
||||
},
|
||||
"webstorm": {
|
||||
"update-channel": "WebStorm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "cc32c57753f1846f2679cef27a365aebcdacfbbffaea9f33bef1d0da6032ed6c",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.3.tar.gz",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "508fe7272dd049875d848b52a2908e4d228ce576d4dde5f56f51a8c346b12a2c",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.1.tar.gz",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.27"
|
||||
"build_number": "222.3739.57"
|
||||
}
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"clion": {
|
||||
"update-channel": "CLion RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "6358b42546906c43e46499ea176f901df83ed8c922af65aad068ed048248138d",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2022.1.3.dmg",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "ba2a8fcf9a1f080ca6b2ef832b13104c440077b9e6a2bb6e26bc97bdea373208",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2022.2.1.dmg",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.27"
|
||||
"build_number": "222.3739.54"
|
||||
},
|
||||
"datagrip": {
|
||||
"update-channel": "DataGrip RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg",
|
||||
"version": "2022.1.5",
|
||||
"sha256": "ac96ab12d7b4593df21cd466b3cea26bcce0db2c2eb92b5d31456887f500032b",
|
||||
"url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.5.dmg",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "7cd7bcdc7588a88459dcda5bab0e7c97751b8d7a87a37c5af8e08072fc9beb03",
|
||||
"url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.1.dmg",
|
||||
"version-major-minor": "2022.1.1",
|
||||
"build_number": "221.5787.39"
|
||||
"build_number": "222.3345.126"
|
||||
},
|
||||
"goland": {
|
||||
"update-channel": "GoLand RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "5a6821d54cd8777c937fe4dc1ef1d6cab528a24419ac0c751df6bd877a264610",
|
||||
"url": "https://download.jetbrains.com/go/goland-2022.1.3.dmg",
|
||||
"version": "2022.2.2",
|
||||
"sha256": "e11f07aebf849ed942c4b8658c11c70ce81b4138186a0301c0ec7cd236f1ff51",
|
||||
"url": "https://download.jetbrains.com/go/goland-2022.2.2.dmg",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.26"
|
||||
"build_number": "222.3739.57"
|
||||
},
|
||||
"idea-community": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "63637f764018d50717a54c7088be6038f14fbdc8240b3e84fddecf9747471f01",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2022.1.3.dmg",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "9c1402f8682ecefe84ae9494c65b80da1b763664624a7f6b0104b044b4cb687a",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2022.2.1.dmg",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.22"
|
||||
"build_number": "222.3739.54"
|
||||
},
|
||||
"idea-ultimate": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "7297867bb7c5041015ff2e68415e35537c37bf500c53a5e003c82fc6af9515ab",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2022.1.3.dmg",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "e54a026da11d05d9bb0172f4ef936ba2366f985b5424e7eecf9e9341804d65bf",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2022.2.1.dmg",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.22"
|
||||
"build_number": "222.3739.54"
|
||||
},
|
||||
"mps": {
|
||||
"update-channel": "MPS RELEASE",
|
||||
|
@ -167,103 +167,103 @@
|
|||
"phpstorm": {
|
||||
"update-channel": "PhpStorm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "306e3bb8224bfb538d02fa33c777d744d369814f460fe254150d722507827abf",
|
||||
"url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.3.dmg",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "ba9cc863c2247e6404b015fac085e8b3427b29aba3d7cb07940840f7c5e3b647",
|
||||
"url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.1.dmg",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.28"
|
||||
"build_number": "222.3739.61"
|
||||
},
|
||||
"pycharm-community": {
|
||||
"update-channel": "PyCharm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "d653aaf52be86d7327d566f03a61a5ce4dfd8059948d1d612833215410dde09b",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-community-2022.1.3.dmg",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "8c2b322cab74cbf52dbe33e0fd9be63fe320d1ade2446790c4eec7309b590eea",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-community-2022.2.1.dmg",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.27"
|
||||
"build_number": "222.3739.56"
|
||||
},
|
||||
"pycharm-professional": {
|
||||
"update-channel": "PyCharm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "af7594948effdbe5c9a704185d8abd65a23aab5098059f3fbfef4f29c777fd98",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.3.dmg",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "6636139dc9c0e28b90517e91d1c1924e218b5d33d9418cca888b05c11fbf54d9",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.1.dmg",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.27"
|
||||
"build_number": "222.3739.56"
|
||||
},
|
||||
"rider": {
|
||||
"update-channel": "Rider RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
|
||||
"version": "2022.1.2",
|
||||
"sha256": "ddcf6544e7302632a117ec00cf2e20688b53a47319114418fa55f7304bf49b82",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.2.dmg",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "13cdaa0f83e645a0a08bc3dd05522441e591b247af853b22c8ca5bbce047a125",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.1.dmg",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5787.36"
|
||||
"build_number": "222.3739.37"
|
||||
},
|
||||
"ruby-mine": {
|
||||
"update-channel": "RubyMine RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "1088ef00fef9e63cc3b24c90b4b86e20a473b1d3c72c18b0926e76a41218956f",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.3.dmg",
|
||||
"version": "2022.2",
|
||||
"sha256": "d806254af68425089d40a7a302ce10c87283a25399e7b667e8d261b3958f4fbb",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2022.2.dmg",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.22"
|
||||
"build_number": "222.3345.111"
|
||||
},
|
||||
"webstorm": {
|
||||
"update-channel": "WebStorm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "85c73a9c5415eecb18d11e22e8b6aced4c16908aaec129c5a1a7241e5f354c2a",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.3.dmg",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "7d57692ce83dd6c853c80c457bdb8239dd833cf5535c600154a7ebc0be18a05d",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.1.dmg",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.27"
|
||||
"build_number": "222.3739.57"
|
||||
}
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"clion": {
|
||||
"update-channel": "CLion RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "60f3f83cc1e526f126c89c444928c2ab5dfaf26aab109de5f05baca2fdf20a24",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2022.1.3-aarch64.dmg",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "af36f7f9a98881d37d89757083875494c472e60d14bd70fe0d08533d284dd4e1",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2022.2.1-aarch64.dmg",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.27"
|
||||
"build_number": "222.3739.54"
|
||||
},
|
||||
"datagrip": {
|
||||
"update-channel": "DataGrip RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg",
|
||||
"version": "2022.1.5",
|
||||
"sha256": "31df43a4f1adab562730adade212916091fc7f7090121001840c1453d2037694",
|
||||
"url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.5-aarch64.dmg",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "01d8de1225fb4a74f22752edf74038405f02d27565f01816d8e751d7989a75bb",
|
||||
"url": "https://download.jetbrains.com/datagrip/datagrip-2022.2.1-aarch64.dmg",
|
||||
"version-major-minor": "2022.1.1",
|
||||
"build_number": "221.5787.39"
|
||||
"build_number": "222.3345.126"
|
||||
},
|
||||
"goland": {
|
||||
"update-channel": "GoLand RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "5e29fbd0b2ed2ea06445ee378fd12f8172cfffb122652d26579b7dfea6c774e5",
|
||||
"url": "https://download.jetbrains.com/go/goland-2022.1.3-aarch64.dmg",
|
||||
"version": "2022.2.2",
|
||||
"sha256": "7098f05847c0524bc90b00766c71c2f1cc1442983da956c79ee1445b48da73fd",
|
||||
"url": "https://download.jetbrains.com/go/goland-2022.2.2-aarch64.dmg",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.26"
|
||||
"build_number": "222.3739.57"
|
||||
},
|
||||
"idea-community": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "b436120ee2bb380f30e29582c3958e110d9c85186bde6af6fe5c571c75e99df8",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2022.1.3-aarch64.dmg",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "4bf843152fe009838dbb5e5a1d8e39ebf98df5f6771254cf1f26ff0b299798fd",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIC-2022.2.1-aarch64.dmg",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.22"
|
||||
"build_number": "222.3739.54"
|
||||
},
|
||||
"idea-ultimate": {
|
||||
"update-channel": "IntelliJ IDEA RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "0f0ec167c0394b7d4969cb0b95e08e2b469e811a1aa515971bc84d5ef4d54def",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2022.1.3-aarch64.dmg",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "f7b56525adf96d0ac290eebebd08a53b962a799db65942e07cd437aef655fa0e",
|
||||
"url": "https://download.jetbrains.com/idea/ideaIU-2022.2.1-aarch64.dmg",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.22"
|
||||
"build_number": "222.3739.54"
|
||||
},
|
||||
"mps": {
|
||||
"update-channel": "MPS RELEASE",
|
||||
|
@ -277,56 +277,56 @@
|
|||
"phpstorm": {
|
||||
"update-channel": "PhpStorm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "68c6093701f86b6a31601e159569629ceea87c7db20b8b98089bf8efadb0310e",
|
||||
"url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.3-aarch64.dmg",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "b553e1f0249b4d7f89cacdac7bada758895cd35aec8ddac5f81017f61ddc44fb",
|
||||
"url": "https://download.jetbrains.com/webide/PhpStorm-2022.2.1-aarch64.dmg",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.28"
|
||||
"build_number": "222.3739.61"
|
||||
},
|
||||
"pycharm-community": {
|
||||
"update-channel": "PyCharm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "0d578b5ab3140ac20e6a0250c2733cc2fa6888b8ab478a046181c273ac6a66cb",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-community-2022.1.3-aarch64.dmg",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "c3abc618614be830dbf41479b74ae489aa44290d9bbb11e3c4d2cdffb4d569b6",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-community-2022.2.1-aarch64.dmg",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.27"
|
||||
"build_number": "222.3739.56"
|
||||
},
|
||||
"pycharm-professional": {
|
||||
"update-channel": "PyCharm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "88bcc8acc6bb7bc189466da427cc049df62062e8590108f17b080208a8008a07",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.3-aarch64.dmg",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "416ca961042b9c3ae8b23039cc3b84b64e941c1d82478bca3e327089efa4f4d2",
|
||||
"url": "https://download.jetbrains.com/python/pycharm-professional-2022.2.1-aarch64.dmg",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.27"
|
||||
"build_number": "222.3739.56"
|
||||
},
|
||||
"rider": {
|
||||
"update-channel": "Rider RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
|
||||
"version": "2022.1.2",
|
||||
"sha256": "81ce9020cc2b20f50ce73efe80969b054fce2a62a1736aed877a1141eaf07d4b",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.2-aarch64.dmg",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "96e539ba43d7dcecb9e709c1b1483b4c832fbff4b9fd77f6e91b266a91125a55",
|
||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.2.1-aarch64.dmg",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5787.36"
|
||||
"build_number": "222.3739.37"
|
||||
},
|
||||
"ruby-mine": {
|
||||
"update-channel": "RubyMine RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "ed4b77ad69207872190b3200143c8bca50234c19539fcaaf55bfa4643e7be3b0",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.3-aarch64.dmg",
|
||||
"version": "2022.2",
|
||||
"sha256": "c7650443f16ab9cc0b3f6fc701164633bab079f11eeb7aa93b78f2ddc73640a0",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2022.2-aarch64.dmg",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.22"
|
||||
"build_number": "222.3345.111"
|
||||
},
|
||||
"webstorm": {
|
||||
"update-channel": "WebStorm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
|
||||
"version": "2022.1.3",
|
||||
"sha256": "60de3524c32fbc6dde2989b7ffcfce861c069ce79bded6206dbc587c94f411a2",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.3-aarch64.dmg",
|
||||
"version": "2022.2.1",
|
||||
"sha256": "fa790240b0d00cb134bf0e87c6a85d5a749b73b3f577a9564a890e5819926e53",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2022.2.1-aarch64.dmg",
|
||||
"version-major-minor": "2022.1",
|
||||
"build_number": "221.5921.27"
|
||||
"build_number": "222.3739.57"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,9 +1,11 @@
|
|||
{ callPackage, lowPrio }:
|
||||
{ callPackage, lowPrio, Accelerate, CoreGraphics, CoreVideo}:
|
||||
|
||||
let
|
||||
base3 = callPackage ./tesseract3.nix {};
|
||||
base4 = callPackage ./tesseract4.nix {};
|
||||
base5 = callPackage ./tesseract5.nix {};
|
||||
base5 = callPackage ./tesseract5.nix {
|
||||
inherit Accelerate CoreGraphics CoreVideo;
|
||||
};
|
||||
languages = callPackage ./languages.nix {};
|
||||
in
|
||||
{
|
||||
|
|
|
@ -1,15 +1,17 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkg-config
|
||||
, leptonica, libpng, libtiff, icu, pango, opencl-headers, fetchpatch }:
|
||||
, leptonica, libpng, libtiff, icu, pango, opencl-headers, fetchpatch
|
||||
, Accelerate, CoreGraphics, CoreVideo
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tesseract";
|
||||
version = "5.1.0";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tesseract-ocr";
|
||||
repo = "tesseract";
|
||||
rev = version;
|
||||
sha256 = "sha256-B1x3wxr9Sn2rsG8AHncPTEErhDo7YtpDRxfW9ZOPWoU=";
|
||||
sha256 = "sha256-SvnV6sY+66ozOvgznTE6Gd/GFx/NfugpkpgeANMoUTU=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
@ -27,6 +29,10 @@ stdenv.mkDerivation rec {
|
|||
icu
|
||||
pango
|
||||
opencl-headers
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Accelerate
|
||||
CoreGraphics
|
||||
CoreVideo
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
@ -34,6 +40,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/tesseract-ocr/tesseract";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ anselmschueler ];
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
stdenv.mkDerivation rec{
|
||||
pname = "corectrl";
|
||||
version = "1.2.4";
|
||||
version = "1.2.7";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "corectrl";
|
||||
repo = "corectrl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3WOuPOJEY941JVoF5aQp5LvPeh3shalb6H9FMmmctN4=";
|
||||
sha256 = "sha256-X+S+k9LuZveNOV3X7fulsnk9GfGO1czWEvU41q9/cJI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -3,8 +3,6 @@
|
|||
, binutils
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, copyDesktopItems
|
||||
, makeDesktopItem
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, boost
|
||||
|
@ -54,7 +52,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
copyDesktopItems
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
@ -153,27 +150,6 @@ stdenv.mkDerivation rec {
|
|||
ln -s "$out/share/PrusaSlicer/icons/PrusaSlicer-gcodeviewer_192px.png" "$out/share/pixmaps/PrusaSlicer-gcodeviewer.png"
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "prusa-slicer";
|
||||
exec = "prusa-slicer";
|
||||
icon = "PrusaSlicer";
|
||||
comment = "G-code generator for 3D printers";
|
||||
desktopName = "PrusaSlicer";
|
||||
genericName = "3D printer tool";
|
||||
categories = [ "Development" ];
|
||||
})
|
||||
(makeDesktopItem {
|
||||
name = "prusa-gcodeviewer";
|
||||
exec = "prusa-gcodeviewer";
|
||||
icon = "PrusaSlicer-gcodeviewer";
|
||||
comment = "G-code viewer for 3D printers";
|
||||
desktopName = "PrusaSlicer G-code Viewer";
|
||||
genericName = "G-code Viewer";
|
||||
categories = [ "Development" ];
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "G-code generator for 3D printer";
|
||||
homepage = "https://github.com/prusa3d/PrusaSlicer";
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "psi-notify";
|
||||
version = "1.2.1";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cdown";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0hn37plim1smmlrjjmz8kybyms8pz3wxcgf8vmqjrsqi6bfcym7g";
|
||||
sha256 = "sha256-GhGiSI5r0Ki6+MYNa5jCDyYZEW5R9LDNZ/S8K+6L0jo=";
|
||||
};
|
||||
|
||||
buildInputs = [ systemd libnotify ];
|
||||
|
|
|
@ -50,11 +50,11 @@ let
|
|||
in stdenv.mkDerivation rec {
|
||||
|
||||
pname = "opera";
|
||||
version = "84.0.4316.42";
|
||||
version = "90.0.4480.48";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
|
||||
sha256 = "sha256-ZjVuw30YfHQ69BVxPvIde6VuOcqtnXrGwhZpA26vLpw=";
|
||||
sha256 = "sha256-nFReaBvtIQ1N5lfOJHoayiI4TWlfmGocNWirbvPRbnM=";
|
||||
};
|
||||
|
||||
unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
callPackage ./generic.nix {
|
||||
inherit buildGoModule;
|
||||
version = "1.3.3";
|
||||
sha256 = "sha256-/63QGknivXyBel2MhMzbh/rE+UrfV3mb+zPZzOU15WU=";
|
||||
vendorSha256 = "sha256-5ubJ6hgpdkZd/hwy+u2S6XgQLD5xmgUnaUqJoLdguBQ=";
|
||||
version = "1.3.4";
|
||||
sha256 = "sha256-NeBZVCpylP16dPi68unk3H3/V6gWO/SvJRmjgwwwVts=";
|
||||
vendorSha256 = "sha256-XIHtAB0js55mbVuTTWdLW5BMhQjd6/GUbcBk8DEYZg8=";
|
||||
}
|
||||
|
|
|
@ -23,13 +23,13 @@ let
|
|||
pname = "wire-desktop";
|
||||
|
||||
version = {
|
||||
x86_64-darwin = "3.27.4357";
|
||||
x86_64-linux = "3.27.2944";
|
||||
x86_64-darwin = "3.28.4393";
|
||||
x86_64-linux = "3.28.2946";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
sha256 = {
|
||||
x86_64-darwin = "0xihg9fzsbwib2fmb1yqx9015i9q4k0ph8lna4mzgicmrjkw54g8";
|
||||
x86_64-linux = "1wqnrmp8q84izvqv25fgks5pv6la3vahm5dsn7bc6zxqb0xz2xvy";
|
||||
x86_64-darwin = "03w8hafwxg4v85s8n3ss6bsr7fipksyjax30dnxxj72x947zygxw";
|
||||
x86_64-linux = "03f1qz0mwn6f14w4g1w72sd5idfyvmv18r5y1h279p56x0i919kq";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -3,12 +3,12 @@ electron, libsecret }:
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tutanota-desktop";
|
||||
version = "3.98.17";
|
||||
version = "3.98.20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz";
|
||||
name = "tutanota-desktop-${version}.tar.gz";
|
||||
sha256 = "sha256-rVAiutjFI3/KJZeiTy6H2IdMh+SFz9+NvEoriPTnW2w=";
|
||||
sha256 = "sha256-ddRuIFmsZcyrZ/0T0Sk6pnmxuG5osZVYFw7NCmgvECc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,8 +1,18 @@
|
|||
35cab741af069571cf4c55e0ce1ae96617d5778c nixify
|
||||
diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq
|
||||
index d8b4039..1ab89f8 100755
|
||||
index d8b4039..1f2a7b5 100755
|
||||
--- a/scripts/msmtpq/msmtpq
|
||||
+++ b/scripts/msmtpq/msmtpq
|
||||
@@ -60,8 +60,8 @@ err() { dsp '' "$@" '' ; exit 1 ; }
|
||||
## e.g. ( export MSMTP=/path/to/msmtp )
|
||||
if [ "$MSMTP" = "" ] ; then # If MSMTP is unset or empty...
|
||||
MSMTP=msmtp
|
||||
-elif [ ! -x "$MSMTP" ] ; then
|
||||
- log -e 1 "msmtpq : can't find the msmtp executable [ $MSMTP ]" # if not found - complain ; quit
|
||||
+# elif [ ! -x "$MSMTP" ] ; then
|
||||
+# log -e 1 "msmtpq : can't find the msmtp executable [ $MSMTP ]" # if not found - complain ; quit
|
||||
fi
|
||||
##
|
||||
## set the queue var to the location of the msmtp queue directory
|
||||
@@ -71,7 +71,7 @@ fi
|
||||
## ( chmod 0700 msmtp.queue )
|
||||
##
|
||||
|
|
321
pkgs/applications/networking/n8n/node-packages.nix
generated
321
pkgs/applications/networking/n8n/node-packages.nix
generated
|
@ -220,13 +220,13 @@ let
|
|||
sha512 = "na+FisoARuaOWaHWpmdtk3FeuTWf2VWamdJ9/TJJzj5ZdXPLC3juoDgFs6XVuJIoK30yuBpyFBEDXVRK4pB7Tg==";
|
||||
};
|
||||
};
|
||||
"@babel/parser-7.18.11" = {
|
||||
"@babel/parser-7.18.13" = {
|
||||
name = "_at_babel_slash_parser";
|
||||
packageName = "@babel/parser";
|
||||
version = "7.18.11";
|
||||
version = "7.18.13";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.11.tgz";
|
||||
sha512 = "9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ==";
|
||||
url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.13.tgz";
|
||||
sha512 = "dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg==";
|
||||
};
|
||||
};
|
||||
"@babel/runtime-7.18.9" = {
|
||||
|
@ -292,13 +292,13 @@ let
|
|||
sha512 = "RxSa9VjcDWgWCYsaLdZItdCnJj7p4LxggaEk+Y3MP0dHKoxez8ioG07DVekVbZZqccsrL+oPB/N9AzVPxj4blg==";
|
||||
};
|
||||
};
|
||||
"@js-joda/core-5.3.0" = {
|
||||
"@js-joda/core-5.3.1" = {
|
||||
name = "_at_js-joda_slash_core";
|
||||
packageName = "@js-joda/core";
|
||||
version = "5.3.0";
|
||||
version = "5.3.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@js-joda/core/-/core-5.3.0.tgz";
|
||||
sha512 = "3uObVJ08i0vSbtsTWQ8omy8XUlVDnoest5MOLp6delLUZev8bu++S+3Aua7xWPPWzQt9pcuwDqjEOKslQVDj8g==";
|
||||
url = "https://registry.npmjs.org/@js-joda/core/-/core-5.3.1.tgz";
|
||||
sha512 = "iHHyIRLEfXLqBN+BkyH8u8imMYr4ihRbFDEk8toqTwUECETVQFCTh2U59Sw2oMoRVaS3XRIb7pyCulltq2jFVA==";
|
||||
};
|
||||
};
|
||||
"@jsdevtools/ono-7.1.3" = {
|
||||
|
@ -409,13 +409,13 @@ let
|
|||
sha512 = "sBpko86IrTscc39EvHUhL+c++81BVTsIZ3ETu/vG+cCdi0N6vb2DoahR67A9FI2CGnxRRHjnTfa3m6LulwNATA==";
|
||||
};
|
||||
};
|
||||
"@oclif/core-1.14.1" = {
|
||||
"@oclif/core-1.16.0" = {
|
||||
name = "_at_oclif_slash_core";
|
||||
packageName = "@oclif/core";
|
||||
version = "1.14.1";
|
||||
version = "1.16.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@oclif/core/-/core-1.14.1.tgz";
|
||||
sha512 = "FgAjfY3Cvzj+i8j08WiD/8adJhZvclFESXAE8Kcp7qglErFKUFK9XY9BS2NyIzLN1NCKc52A64pWunVvPv8g3w==";
|
||||
url = "https://registry.npmjs.org/@oclif/core/-/core-1.16.0.tgz";
|
||||
sha512 = "xtqhAbjQHBcz+xQpEHJ3eJEVfRQ4zl41Yw5gw/N+D1jgaIUrHTxCY/sfTvhw93LAQo7B++ozHzSb7DISFXsQFQ==";
|
||||
};
|
||||
};
|
||||
"@oclif/errors-1.3.5" = {
|
||||
|
@ -463,13 +463,13 @@ let
|
|||
sha512 = "S/SF/XYJeevwIgHFmVDAFRUvM3m+OjhvCAYMk78ZJQCYCQ5wS7j+LTt1ZEv2jpEEGg2tx/F6TYYWxddNAYHrFQ==";
|
||||
};
|
||||
};
|
||||
"@opentelemetry/api-1.1.0" = {
|
||||
"@opentelemetry/api-1.2.0" = {
|
||||
name = "_at_opentelemetry_slash_api";
|
||||
packageName = "@opentelemetry/api";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.1.0.tgz";
|
||||
sha512 = "hf+3bwuBwtXsugA2ULBc95qxrOqP2pOekLz34BJhcAKawt94vfeNyUKpYc0lZQ/3sCP6LqRa7UAdHA7i5UODzQ==";
|
||||
url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.2.0.tgz";
|
||||
sha512 = "0nBr+VZNKm9tvNDZFstI3Pq1fCTEDK5OZTnVKNvBNAKgd0yIvmwsP4m61rEv7ZP+tOUjWJhROpxK5MsnlF911g==";
|
||||
};
|
||||
};
|
||||
"@rudderstack/rudder-sdk-node-1.0.6" = {
|
||||
|
@ -688,22 +688,22 @@ let
|
|||
sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==";
|
||||
};
|
||||
};
|
||||
"@types/jsonwebtoken-8.5.8" = {
|
||||
"@types/jsonwebtoken-8.5.9" = {
|
||||
name = "_at_types_slash_jsonwebtoken";
|
||||
packageName = "@types/jsonwebtoken";
|
||||
version = "8.5.8";
|
||||
version = "8.5.9";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.8.tgz";
|
||||
sha512 = "zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A==";
|
||||
url = "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.9.tgz";
|
||||
sha512 = "272FMnFGzAVMGtu9tkr29hRL6bZj4Zs1KZNeHLnKqAvp06tAIcarTMwOh8/8bz4FmKRcMxZhZNeUAQsNLoiPhg==";
|
||||
};
|
||||
};
|
||||
"@types/lodash-4.14.183" = {
|
||||
"@types/lodash-4.14.184" = {
|
||||
name = "_at_types_slash_lodash";
|
||||
packageName = "@types/lodash";
|
||||
version = "4.14.183";
|
||||
version = "4.14.184";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.183.tgz";
|
||||
sha512 = "UXavyuxzXKMqJPEpFPri6Ku5F9af6ZJXUneHhvQJxavrEjuHkFp2YnDWHcxJiG7hk8ZkWqjcyNeW1s/smZv5cw==";
|
||||
url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.184.tgz";
|
||||
sha512 = "RoZphVtHbxPZizt4IcILciSWiC6dcn+eZ8oX9IWEYfDMcocdd42f7NPI6fQj+6zI8y4E0L7gu2pcZKLGTRaV9Q==";
|
||||
};
|
||||
};
|
||||
"@types/lodash.intersection-4.4.7" = {
|
||||
|
@ -733,13 +733,13 @@ let
|
|||
sha512 = "Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==";
|
||||
};
|
||||
};
|
||||
"@types/minimatch-3.0.5" = {
|
||||
"@types/minimatch-5.1.0" = {
|
||||
name = "_at_types_slash_minimatch";
|
||||
packageName = "@types/minimatch";
|
||||
version = "3.0.5";
|
||||
version = "5.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz";
|
||||
sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==";
|
||||
url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.0.tgz";
|
||||
sha512 = "0RJHq5FqDWo17kdHe+SMDJLfxmLaqHbWnqZ6gNKzDvStUlrmx/eKIY17+ifLS1yybo7X86aUshQMlittDOVNnw==";
|
||||
};
|
||||
};
|
||||
"@types/multer-1.4.7" = {
|
||||
|
@ -751,13 +751,13 @@ let
|
|||
sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA==";
|
||||
};
|
||||
};
|
||||
"@types/node-18.7.6" = {
|
||||
"@types/node-18.7.13" = {
|
||||
name = "_at_types_slash_node";
|
||||
packageName = "@types/node";
|
||||
version = "18.7.6";
|
||||
version = "18.7.13";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@types/node/-/node-18.7.6.tgz";
|
||||
sha512 = "EdxgKRXgYsNITy5mjjXjVE/CS8YENSdhiagGrLqjG0pvA2owgJ6i4l7wy/PFZGC0B1/H20lWKN7ONVDNYDZm7A==";
|
||||
url = "https://registry.npmjs.org/@types/node/-/node-18.7.13.tgz";
|
||||
sha512 = "46yIhxSe5xEaJZXWdIBP7GU4HDTG8/eo0qd9atdiL+lFpA03y8KS+lkTN834TWJj5767GbWv4n/P6efyTFt1Dw==";
|
||||
};
|
||||
};
|
||||
"@types/node-fetch-2.6.2" = {
|
||||
|
@ -868,13 +868,13 @@ let
|
|||
sha512 = "QcJ5ZczaXAqbVD3o8mw/mEBhRvO5UAdTtbvgwL/OgoWubvNBh6/MxLBAigtcgIFaq3shon9m3POIxQaLQt4fxQ==";
|
||||
};
|
||||
};
|
||||
"@vue/compiler-sfc-2.7.8" = {
|
||||
"@vue/compiler-sfc-2.7.10" = {
|
||||
name = "_at_vue_slash_compiler-sfc";
|
||||
packageName = "@vue/compiler-sfc";
|
||||
version = "2.7.8";
|
||||
version = "2.7.10";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.8.tgz";
|
||||
sha512 = "2DK4YWKfgLnW9VDR9gnju1gcYRk3flKj8UNsms7fsRmFcg35slVTZEkqwBtX+wJBXaamFfn6NxSsZh3h12Ix/Q==";
|
||||
url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.10.tgz";
|
||||
sha512 = "55Shns6WPxlYsz4WX7q9ZJBL77sKE1ZAYNYStLs6GbhIOMrNtjMvzcob6gu3cGlfpCR4bT7NXgyJ3tly2+Hx8Q==";
|
||||
};
|
||||
};
|
||||
"abbrev-1.1.1" = {
|
||||
|
@ -1264,13 +1264,13 @@ let
|
|||
sha512 = "vkyt1+sj6qaD9oMtqqLE2pZ2IcHI66kFx8lpnVuXp55SnNPjKghfOhVfZpaDwDPpY0oVWP3Qu1uHZWxF3E856A==";
|
||||
};
|
||||
};
|
||||
"aws-sdk-2.1196.0" = {
|
||||
"aws-sdk-2.1202.0" = {
|
||||
name = "aws-sdk";
|
||||
packageName = "aws-sdk";
|
||||
version = "2.1196.0";
|
||||
version = "2.1202.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1196.0.tgz";
|
||||
sha512 = "iOGhCY5IqGfHCJ70p0H/uxkXDh/96KanAMfhnGGbIKbpVliuEV7SYxTfsWORaaUHey+N8FE6OMKfzo7F4X+wQg==";
|
||||
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1202.0.tgz";
|
||||
sha512 = "fFoEX+Id8/h/RIHw/gTZl3GnFF+RaXRmXueF7qCOqHm4g7mFOOgUUbc4BLbZ4gCDYRiyxNlGgija/je8EhLNRw==";
|
||||
};
|
||||
};
|
||||
"aws-sign2-0.7.0" = {
|
||||
|
@ -1300,6 +1300,15 @@ let
|
|||
sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==";
|
||||
};
|
||||
};
|
||||
"axios-0.24.0" = {
|
||||
name = "axios";
|
||||
packageName = "axios";
|
||||
version = "0.24.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz";
|
||||
sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==";
|
||||
};
|
||||
};
|
||||
"axios-0.27.2" = {
|
||||
name = "axios";
|
||||
packageName = "axios";
|
||||
|
@ -2245,13 +2254,13 @@ let
|
|||
sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==";
|
||||
};
|
||||
};
|
||||
"core-js-3.24.1" = {
|
||||
"core-js-3.25.0" = {
|
||||
name = "core-js";
|
||||
packageName = "core-js";
|
||||
version = "3.24.1";
|
||||
version = "3.25.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/core-js/-/core-js-3.24.1.tgz";
|
||||
sha512 = "0QTBSYSUZ6Gq21utGzkfITDylE8jWC9Ne1D2MrhvlsZBI1x39OdDIVbzSqtgMndIy6BlHxBXpMGqzZmnztg2rg==";
|
||||
url = "https://registry.npmjs.org/core-js/-/core-js-3.25.0.tgz";
|
||||
sha512 = "CVU1xvJEfJGhyCpBrzzzU1kjCfgsGUxhEvwUV2e/cOedYWHdmluamx+knDnmhqALddMG16fZvIqvs9aijsHHaA==";
|
||||
};
|
||||
};
|
||||
"core-util-is-1.0.2" = {
|
||||
|
@ -3181,13 +3190,13 @@ let
|
|||
sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==";
|
||||
};
|
||||
};
|
||||
"flatted-3.2.6" = {
|
||||
"flatted-3.2.7" = {
|
||||
name = "flatted";
|
||||
packageName = "flatted";
|
||||
version = "3.2.6";
|
||||
version = "3.2.7";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz";
|
||||
sha512 = "0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==";
|
||||
url = "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz";
|
||||
sha512 = "5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==";
|
||||
};
|
||||
};
|
||||
"fn.name-1.1.0" = {
|
||||
|
@ -4315,13 +4324,13 @@ let
|
|||
sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==";
|
||||
};
|
||||
};
|
||||
"isbot-3.5.0" = {
|
||||
"isbot-3.5.2" = {
|
||||
name = "isbot";
|
||||
packageName = "isbot";
|
||||
version = "3.5.0";
|
||||
version = "3.5.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/isbot/-/isbot-3.5.0.tgz";
|
||||
sha512 = "QOFF7IE7hUdzo8pbhCubeiMzKdLZt+W/UwRZWwg+zghmnqXoMwh2V0bi5UT+oIvoD0IWCWjzAtp30ZrrRwJVCg==";
|
||||
url = "https://registry.npmjs.org/isbot/-/isbot-3.5.2.tgz";
|
||||
sha512 = "7iXQPDK1GBKvWS9N71bNnQ2KMcqwlMhdLkPma/EBn+8ZRkCbhun3yqqS1hmRqysTwJLGvJrUTmRIHibLWrXQQA==";
|
||||
};
|
||||
};
|
||||
"isexe-2.0.0" = {
|
||||
|
@ -4630,13 +4639,13 @@ let
|
|||
sha512 = "xOqorG21Va+3CjpFOfFTU7SWohHH2uIX9ZY4Byz6J+lvpfvc486tOAT/G9GfbrKtJ9O7NCX9o0aC2lxqbnZ9EA==";
|
||||
};
|
||||
};
|
||||
"libphonenumber-js-1.10.12" = {
|
||||
"libphonenumber-js-1.10.13" = {
|
||||
name = "libphonenumber-js";
|
||||
packageName = "libphonenumber-js";
|
||||
version = "1.10.12";
|
||||
version = "1.10.13";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.12.tgz";
|
||||
sha512 = "xTFBs3ipFQNmjCUkDj6ZzRJvs97IyazFHBKWtrQrLiYs0Zk0GANob1hkMRlQUQXbJrpQGwnI+/yU4oyD4ohvpw==";
|
||||
url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.13.tgz";
|
||||
sha512 = "b74iyWmwb4GprAUPjPkJ11GTC7KX4Pd3onpJfKxYyY8y9Rbb4ERY47LvCMEDM09WD3thiLDMXtkfDK/AX+zT7Q==";
|
||||
};
|
||||
};
|
||||
"libqp-1.1.0" = {
|
||||
|
@ -5269,13 +5278,13 @@ let
|
|||
sha512 = "5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==";
|
||||
};
|
||||
};
|
||||
"moment-timezone-0.5.34" = {
|
||||
"moment-timezone-0.5.35" = {
|
||||
name = "moment-timezone";
|
||||
packageName = "moment-timezone";
|
||||
version = "0.5.34";
|
||||
version = "0.5.35";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.34.tgz";
|
||||
sha512 = "3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg==";
|
||||
url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.35.tgz";
|
||||
sha512 = "cY/pBOEXepQvlgli06ttCTKcIf8cD1nmNwOKQQAdHBqYApQSpAqotBMX0RJZNgMp6i0PlZuf1mFtnlyEkwyvFw==";
|
||||
};
|
||||
};
|
||||
"monaco-editor-0.30.1" = {
|
||||
|
@ -5350,13 +5359,13 @@ let
|
|||
sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
|
||||
};
|
||||
};
|
||||
"mssql-8.1.3" = {
|
||||
"mssql-8.1.4" = {
|
||||
name = "mssql";
|
||||
packageName = "mssql";
|
||||
version = "8.1.3";
|
||||
version = "8.1.4";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/mssql/-/mssql-8.1.3.tgz";
|
||||
sha512 = "XGxNNNeKZMMTM71na2M4eLMkPWKckcfZtMiCKR1mLzN887x31NisekNhoBAoRpqizErUZxSW8gSDZc8PVig7Kw==";
|
||||
url = "https://registry.npmjs.org/mssql/-/mssql-8.1.4.tgz";
|
||||
sha512 = "nqkYYehETWVvFLB9zAGJV2kegOsdtLjUnkHA52aFhlE0ZIoOXC3BL8pLERwFicFypM4i3DX1hYeuM726EEIxjQ==";
|
||||
};
|
||||
};
|
||||
"multer-1.4.5-lts.1" = {
|
||||
|
@ -5395,49 +5404,49 @@ let
|
|||
sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
|
||||
};
|
||||
};
|
||||
"n8n-core-0.131.0" = {
|
||||
"n8n-core-0.132.0" = {
|
||||
name = "n8n-core";
|
||||
packageName = "n8n-core";
|
||||
version = "0.131.0";
|
||||
version = "0.132.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.131.0.tgz";
|
||||
sha512 = "XDR0udjVD1t16DZKT3Bx0oFa/qnDjv9KSJRmzUxcTzU2QzcLJ3nv3mi/E7AObUGOvXsKgKRSdsFyWoMcPGb5cQ==";
|
||||
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.132.0.tgz";
|
||||
sha512 = "MfP86+vK7fF7T5Qvq55ej5Uq0Lt1kGlCdvfxhukDDIqM+I5UwRjoyaU+8NIN+BEs5jNrfgJtA9iTKGB7pvx9IQ==";
|
||||
};
|
||||
};
|
||||
"n8n-design-system-0.31.0" = {
|
||||
"n8n-design-system-0.32.0" = {
|
||||
name = "n8n-design-system";
|
||||
packageName = "n8n-design-system";
|
||||
version = "0.31.0";
|
||||
version = "0.32.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.31.0.tgz";
|
||||
sha512 = "RvE18Fv4tzvsuDZwszWuEodzVoHcKVxYdAA57qIKZyxLbwtLYe2MoBtmOeKlQBvYaZBIwxLFbPnm2fZvIfMdsA==";
|
||||
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.32.0.tgz";
|
||||
sha512 = "zyVpImrrIt9KgHn7GTGfAMJD5nD53Y+JYU/m96uoT7QJS3VPoAm22uvPEhn+rhLgFN+4znG24g8cFbt6hX2b7g==";
|
||||
};
|
||||
};
|
||||
"n8n-editor-ui-0.157.0" = {
|
||||
"n8n-editor-ui-0.158.0" = {
|
||||
name = "n8n-editor-ui";
|
||||
packageName = "n8n-editor-ui";
|
||||
version = "0.157.0";
|
||||
version = "0.158.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.157.0.tgz";
|
||||
sha512 = "SzS6xCIa7D1nDnvV0p6OOOc2s9gxuJNkQ3UzWw3VG6C5vtsBhpKDsUZ2BKlCLip2jLZgeNAFHCmttSmXHmm9Lg==";
|
||||
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.158.0.tgz";
|
||||
sha512 = "FN6uzwSR6xA4S270uCxTrDJ/gaHAnA3wnV+l7lBwgwvZC0yRJj5S8ogCoSpj/wJt/uKUJ6ufrfh31zSSnN4QsA==";
|
||||
};
|
||||
};
|
||||
"n8n-nodes-base-0.189.0" = {
|
||||
"n8n-nodes-base-0.190.0" = {
|
||||
name = "n8n-nodes-base";
|
||||
packageName = "n8n-nodes-base";
|
||||
version = "0.189.0";
|
||||
version = "0.190.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.189.0.tgz";
|
||||
sha512 = "8Xdbtz26wpvO5MguARdc/vOflmKyOCazV9rt9OMsT6HJLTFq1U4xgEw85VWB9GQJPbDvXPRPqilTedKgM9POlw==";
|
||||
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.190.0.tgz";
|
||||
sha512 = "jdL3V9FGZA/xQIFtQhdZ5BUCjUyH4IwPDYuTd3epu1wKW0SdnUNjATiBF1AjX0/+axZjTLwm43gSN3JA8ZK+Wg==";
|
||||
};
|
||||
};
|
||||
"n8n-workflow-0.113.0" = {
|
||||
"n8n-workflow-0.114.0" = {
|
||||
name = "n8n-workflow";
|
||||
packageName = "n8n-workflow";
|
||||
version = "0.113.0";
|
||||
version = "0.114.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.113.0.tgz";
|
||||
sha512 = "ajeZR9etpx9Tjy10X/bbmKYEBp8edUMUrUTL5qLmQLEODoua/NV7C7NCZwlVUtsTbIeTq9Osas2tYhDI74Cubw==";
|
||||
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.114.0.tgz";
|
||||
sha512 = "fLYrprWB8P3GyJmKN/St8H7t0DxLQv/ozuVjYeWlXkJoDbKXT7S6OCzAx55YhUF6zf1MSQT1+UR3YVR20m0utw==";
|
||||
};
|
||||
};
|
||||
"named-placeholders-1.1.2" = {
|
||||
|
@ -6268,13 +6277,13 @@ let
|
|||
sha512 = "7bdYcv7V6U3KAtWjpQJJBww0UEsWuh4yQ/EjNf2HeO/NnvKjpvhEIe/A/TleP6wtmSKnUnghs5A9jUoK6iDdkA==";
|
||||
};
|
||||
};
|
||||
"pg-8.7.3" = {
|
||||
"pg-8.8.0" = {
|
||||
name = "pg";
|
||||
packageName = "pg";
|
||||
version = "8.7.3";
|
||||
version = "8.8.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/pg/-/pg-8.7.3.tgz";
|
||||
sha512 = "HPmH4GH4H3AOprDJOazoIcpI49XFsHCe8xlrjHkWiapdbHK+HLtbm/GQzXYAZwmPju/kzKhjaSfMACG+8cgJcw==";
|
||||
url = "https://registry.npmjs.org/pg/-/pg-8.8.0.tgz";
|
||||
sha512 = "UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw==";
|
||||
};
|
||||
};
|
||||
"pg-connection-string-2.5.0" = {
|
||||
|
@ -6304,13 +6313,13 @@ let
|
|||
sha512 = "1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg==";
|
||||
};
|
||||
};
|
||||
"pg-pool-3.5.1" = {
|
||||
"pg-pool-3.5.2" = {
|
||||
name = "pg-pool";
|
||||
packageName = "pg-pool";
|
||||
version = "3.5.1";
|
||||
version = "3.5.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.1.tgz";
|
||||
sha512 = "6iCR0wVrro6OOHFsyavV+i6KYL4lVNyYAB9RD18w66xSzN+d8b66HiwuP30Gp1SH5O9T82fckkzsRjlrhD0ioQ==";
|
||||
url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.2.tgz";
|
||||
sha512 = "His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w==";
|
||||
};
|
||||
};
|
||||
"pg-promise-10.11.1" = {
|
||||
|
@ -6475,6 +6484,15 @@ let
|
|||
sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==";
|
||||
};
|
||||
};
|
||||
"posthog-node-1.3.0" = {
|
||||
name = "posthog-node";
|
||||
packageName = "posthog-node";
|
||||
version = "1.3.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/posthog-node/-/posthog-node-1.3.0.tgz";
|
||||
sha512 = "2+VhqiY/rKIqKIXyvemBFHbeijHE25sP7eKltnqcFqAssUE6+sX6vusN9A4luzToOqHQkUZexiCKxvuGagh7JA==";
|
||||
};
|
||||
};
|
||||
"prelude-ls-1.1.2" = {
|
||||
name = "prelude-ls";
|
||||
packageName = "prelude-ls";
|
||||
|
@ -7411,13 +7429,13 @@ let
|
|||
sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==";
|
||||
};
|
||||
};
|
||||
"simple-git-3.12.0" = {
|
||||
"simple-git-3.13.0" = {
|
||||
name = "simple-git";
|
||||
packageName = "simple-git";
|
||||
version = "3.12.0";
|
||||
version = "3.13.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/simple-git/-/simple-git-3.12.0.tgz";
|
||||
sha512 = "cy1RSRFHGZSrlYa3MnUuNVOXLUdifEZD2X8+AZjg8mKCdRvtCFSga6acq5N2g0ggb8lH3jBi369MrFZ+Y6sfsA==";
|
||||
url = "https://registry.npmjs.org/simple-git/-/simple-git-3.13.0.tgz";
|
||||
sha512 = "VYrs3joeHvWGcN3K135RpGpPjm4AHYeOrclwew6LlfHgq6ozQYIW2yMnmjf4PCgVOuSYCbXkdUjyiFawuJz8MA==";
|
||||
};
|
||||
};
|
||||
"simple-lru-cache-0.0.2" = {
|
||||
|
@ -7465,13 +7483,13 @@ let
|
|||
sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==";
|
||||
};
|
||||
};
|
||||
"snowflake-sdk-1.6.12" = {
|
||||
"snowflake-sdk-1.6.13" = {
|
||||
name = "snowflake-sdk";
|
||||
packageName = "snowflake-sdk";
|
||||
version = "1.6.12";
|
||||
version = "1.6.13";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.12.tgz";
|
||||
sha512 = "nkwtsWsZr4KrloLgpMpLgCnJIxfcuWlD4sqR53kn8BQRmhOi6cSBgnvZmoYcFvW2arVvfHh/Dc3vOQ/4OuRSLg==";
|
||||
url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.13.tgz";
|
||||
sha512 = "X/eiT4v/yw6+aLdEJK85te4lvkB45lkTzad2CtJdofzxWqtfi1CB2hafTJTfXoDKKJTxLTyYVo+zIYhvhcEarA==";
|
||||
};
|
||||
};
|
||||
"socks-2.7.0" = {
|
||||
|
@ -7798,13 +7816,13 @@ let
|
|||
sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==";
|
||||
};
|
||||
};
|
||||
"swagger-ui-dist-4.13.2" = {
|
||||
"swagger-ui-dist-4.14.0" = {
|
||||
name = "swagger-ui-dist";
|
||||
packageName = "swagger-ui-dist";
|
||||
version = "4.13.2";
|
||||
version = "4.14.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.13.2.tgz";
|
||||
sha512 = "jHL6UyIYpvEI7NsuWd0R3hJaPQTg6Oo4qSBo+oVfOEkv6rrQm/475RGSMmZgV6ajp+Sgrp9CqrDjQYAgQqiv1A==";
|
||||
url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.14.0.tgz";
|
||||
sha512 = "TBzhheU15s+o54Cgk9qxuYcZMiqSm/SkvKnapoGHOF66kz0Y5aGjpzj5BT/vpBbn6rTPJ9tUYXQxuDWfsjiGMw==";
|
||||
};
|
||||
};
|
||||
"swagger-ui-express-4.5.0" = {
|
||||
|
@ -8050,13 +8068,13 @@ let
|
|||
sha512 = "yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==";
|
||||
};
|
||||
};
|
||||
"tough-cookie-4.0.0" = {
|
||||
"tough-cookie-4.1.1" = {
|
||||
name = "tough-cookie";
|
||||
packageName = "tough-cookie";
|
||||
version = "4.0.0";
|
||||
version = "4.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz";
|
||||
sha512 = "tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==";
|
||||
url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.1.tgz";
|
||||
sha512 = "Ns3k8QxkEzIfLZbRwLOrMPDqRa1BEAl4BzNNAOYY4BhBmEkf+HvP467F4NrD9loK3NcYflWOpUH3LJg0ehq/rQ==";
|
||||
};
|
||||
};
|
||||
"tr46-0.0.3" = {
|
||||
|
@ -8257,6 +8275,15 @@ let
|
|||
sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==";
|
||||
};
|
||||
};
|
||||
"universalify-0.2.0" = {
|
||||
name = "universalify";
|
||||
packageName = "universalify";
|
||||
version = "0.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz";
|
||||
sha512 = "CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==";
|
||||
};
|
||||
};
|
||||
"universalify-2.0.0" = {
|
||||
name = "universalify";
|
||||
packageName = "universalify";
|
||||
|
@ -8482,13 +8509,13 @@ let
|
|||
sha512 = "AuECTSvwu2OHLAZYhG716YzwodKCIJxB6u1zG7PgSQwIgAlEaoXH52bxdcvT8GkGjnYK7r7yWDW0m0sOsPuBjQ==";
|
||||
};
|
||||
};
|
||||
"vue-2.7.8" = {
|
||||
"vue-2.7.10" = {
|
||||
name = "vue";
|
||||
packageName = "vue";
|
||||
version = "2.7.8";
|
||||
version = "2.7.10";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/vue/-/vue-2.7.8.tgz";
|
||||
sha512 = "ncwlZx5qOcn754bCu5/tS/IWPhXHopfit79cx+uIlLMyt3vCMGcXai5yCG5y+I6cDmEj4ukRYyZail9FTQh7lQ==";
|
||||
url = "https://registry.npmjs.org/vue/-/vue-2.7.10.tgz";
|
||||
sha512 = "HmFC70qarSHPXcKtW8U8fgIkF6JGvjEmDiVInTkKZP0gIlEPhlVlcJJLkdGIDiNkIeA2zJPQTWJUI4iWe+AVfg==";
|
||||
};
|
||||
};
|
||||
"vue-color-2.8.1" = {
|
||||
|
@ -8938,10 +8965,10 @@ in
|
|||
n8n = nodeEnv.buildNodePackage {
|
||||
name = "n8n";
|
||||
packageName = "n8n";
|
||||
version = "0.191.0";
|
||||
version = "0.192.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n/-/n8n-0.191.0.tgz";
|
||||
sha512 = "HnnhsQqWcx4azUB9DZHtdT+nJBr7gWEr5c/sr7PFrcZwLoF1fW8ydxTGj6weyl62GggrE+RBR4MuKRVRNY7hcg==";
|
||||
url = "https://registry.npmjs.org/n8n/-/n8n-0.192.0.tgz";
|
||||
sha512 = "5Rv7u7cMKaThA6py4MSa/nIPmWEmyIa9x2r0xxMhaMFzsfbRWDokXYdsYVW+/ICSi6frZLFFjCmhSP5Evj/YyQ==";
|
||||
};
|
||||
dependencies = [
|
||||
sources."@apidevtools/json-schema-ref-parser-8.0.0"
|
||||
|
@ -8971,9 +8998,9 @@ in
|
|||
(sources."@azure/core-http-2.2.6" // {
|
||||
dependencies = [
|
||||
sources."@azure/core-tracing-1.0.0-preview.13"
|
||||
sources."tough-cookie-4.0.0"
|
||||
sources."tough-cookie-4.1.1"
|
||||
sources."tslib-2.4.0"
|
||||
sources."universalify-0.1.2"
|
||||
sources."universalify-0.2.0"
|
||||
];
|
||||
})
|
||||
sources."@azure/core-http-compat-1.3.0"
|
||||
|
@ -9031,7 +9058,7 @@ in
|
|||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
sources."@babel/parser-7.18.11"
|
||||
sources."@babel/parser-7.18.13"
|
||||
sources."@babel/runtime-7.18.9"
|
||||
sources."@colors/colors-1.5.0"
|
||||
(sources."@dabh/diagnostics-2.0.3" // {
|
||||
|
@ -9050,7 +9077,7 @@ in
|
|||
sources."string_decoder-0.10.31"
|
||||
];
|
||||
})
|
||||
sources."@js-joda/core-5.3.0"
|
||||
sources."@js-joda/core-5.3.1"
|
||||
sources."@jsdevtools/ono-7.1.3"
|
||||
sources."@kafkajs/confluent-schema-registry-1.0.6"
|
||||
sources."@kwsites/file-exists-1.1.1"
|
||||
|
@ -9066,7 +9093,7 @@ in
|
|||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
(sources."@oclif/core-1.14.1" // {
|
||||
(sources."@oclif/core-1.16.0" // {
|
||||
dependencies = [
|
||||
(sources."chalk-4.1.2" // {
|
||||
dependencies = [
|
||||
|
@ -9101,7 +9128,7 @@ in
|
|||
];
|
||||
})
|
||||
sources."@oclif/screen-3.0.2"
|
||||
sources."@opentelemetry/api-1.1.0"
|
||||
sources."@opentelemetry/api-1.2.0"
|
||||
sources."@rudderstack/rudder-sdk-node-1.0.6"
|
||||
sources."@segment/loosely-validate-event-2.0.0"
|
||||
sources."@selderee/plugin-htmlparser2-0.6.0"
|
||||
|
@ -9124,14 +9151,14 @@ in
|
|||
sources."@types/glob-7.2.0"
|
||||
sources."@types/json-diff-0.5.2"
|
||||
sources."@types/json-schema-7.0.11"
|
||||
sources."@types/jsonwebtoken-8.5.8"
|
||||
sources."@types/lodash-4.14.183"
|
||||
sources."@types/jsonwebtoken-8.5.9"
|
||||
sources."@types/lodash-4.14.184"
|
||||
sources."@types/lodash.intersection-4.4.7"
|
||||
sources."@types/lossless-json-1.0.1"
|
||||
sources."@types/mime-3.0.1"
|
||||
sources."@types/minimatch-3.0.5"
|
||||
sources."@types/minimatch-5.1.0"
|
||||
sources."@types/multer-1.4.7"
|
||||
sources."@types/node-18.7.6"
|
||||
sources."@types/node-18.7.13"
|
||||
(sources."@types/node-fetch-2.6.2" // {
|
||||
dependencies = [
|
||||
sources."form-data-3.0.1"
|
||||
|
@ -9148,7 +9175,7 @@ in
|
|||
sources."@types/tough-cookie-2.3.8"
|
||||
sources."@types/tunnel-0.0.3"
|
||||
sources."@types/yamljs-0.2.31"
|
||||
sources."@vue/compiler-sfc-2.7.8"
|
||||
sources."@vue/compiler-sfc-2.7.10"
|
||||
sources."abbrev-1.1.1"
|
||||
sources."accepts-1.3.8"
|
||||
sources."access-control-1.0.1"
|
||||
|
@ -9207,7 +9234,7 @@ in
|
|||
})
|
||||
sources."available-typed-arrays-1.0.5"
|
||||
sources."avsc-5.7.5"
|
||||
(sources."aws-sdk-2.1196.0" // {
|
||||
(sources."aws-sdk-2.1202.0" // {
|
||||
dependencies = [
|
||||
sources."buffer-4.9.2"
|
||||
sources."events-1.1.1"
|
||||
|
@ -9375,7 +9402,7 @@ in
|
|||
sources."cookie-parser-1.4.6"
|
||||
sources."cookie-signature-1.0.6"
|
||||
sources."copy-to-2.0.1"
|
||||
sources."core-js-3.24.1"
|
||||
sources."core-js-3.25.0"
|
||||
sources."core-util-is-1.0.3"
|
||||
sources."crc-32-1.2.2"
|
||||
sources."cron-1.7.2"
|
||||
|
@ -9505,7 +9532,7 @@ in
|
|||
];
|
||||
})
|
||||
sources."find-up-4.1.0"
|
||||
sources."flatted-3.2.6"
|
||||
sources."flatted-3.2.7"
|
||||
sources."fn.name-1.1.0"
|
||||
sources."follow-redirects-1.15.1"
|
||||
sources."for-each-0.3.3"
|
||||
|
@ -9666,7 +9693,7 @@ in
|
|||
sources."is-windows-1.0.2"
|
||||
sources."is-wsl-2.2.0"
|
||||
sources."isarray-1.0.0"
|
||||
sources."isbot-3.5.0"
|
||||
sources."isbot-3.5.2"
|
||||
sources."isexe-2.0.0"
|
||||
sources."iso-639-1-2.1.15"
|
||||
sources."isstream-0.1.2"
|
||||
|
@ -9714,7 +9741,7 @@ in
|
|||
sources."iconv-lite-0.6.3"
|
||||
];
|
||||
})
|
||||
sources."libphonenumber-js-1.10.12"
|
||||
sources."libphonenumber-js-1.10.13"
|
||||
sources."libqp-1.1.0"
|
||||
sources."limiter-1.1.5"
|
||||
sources."linkify-it-4.0.0"
|
||||
|
@ -9814,7 +9841,7 @@ in
|
|||
];
|
||||
})
|
||||
sources."moment-2.29.4"
|
||||
sources."moment-timezone-0.5.34"
|
||||
sources."moment-timezone-0.5.35"
|
||||
sources."monaco-editor-0.30.1"
|
||||
sources."mongodb-3.7.3"
|
||||
sources."moo-0.5.1"
|
||||
|
@ -9831,7 +9858,7 @@ in
|
|||
];
|
||||
})
|
||||
sources."ms-2.1.2"
|
||||
(sources."mssql-8.1.3" // {
|
||||
(sources."mssql-8.1.4" // {
|
||||
dependencies = [
|
||||
sources."commander-9.4.0"
|
||||
];
|
||||
|
@ -9845,15 +9872,15 @@ in
|
|||
];
|
||||
})
|
||||
sources."mz-2.7.0"
|
||||
sources."n8n-core-0.131.0"
|
||||
sources."n8n-design-system-0.31.0"
|
||||
sources."n8n-editor-ui-0.157.0"
|
||||
(sources."n8n-nodes-base-0.189.0" // {
|
||||
sources."n8n-core-0.132.0"
|
||||
sources."n8n-design-system-0.32.0"
|
||||
sources."n8n-editor-ui-0.158.0"
|
||||
(sources."n8n-nodes-base-0.190.0" // {
|
||||
dependencies = [
|
||||
sources."iconv-lite-0.6.3"
|
||||
];
|
||||
})
|
||||
sources."n8n-workflow-0.113.0"
|
||||
sources."n8n-workflow-0.114.0"
|
||||
(sources."named-placeholders-1.1.2" // {
|
||||
dependencies = [
|
||||
sources."lru-cache-4.1.5"
|
||||
|
@ -9972,11 +9999,11 @@ in
|
|||
})
|
||||
sources."peek-readable-4.1.0"
|
||||
sources."performance-now-2.1.0"
|
||||
sources."pg-8.7.3"
|
||||
sources."pg-8.8.0"
|
||||
sources."pg-connection-string-2.5.0"
|
||||
sources."pg-int8-1.0.1"
|
||||
sources."pg-minify-1.6.2"
|
||||
sources."pg-pool-3.5.1"
|
||||
sources."pg-pool-3.5.2"
|
||||
(sources."pg-promise-10.11.1" // {
|
||||
dependencies = [
|
||||
sources."pg-8.7.1"
|
||||
|
@ -10003,6 +10030,12 @@ in
|
|||
sources."postgres-bytea-1.0.0"
|
||||
sources."postgres-date-1.0.7"
|
||||
sources."postgres-interval-1.2.0"
|
||||
(sources."posthog-node-1.3.0" // {
|
||||
dependencies = [
|
||||
sources."axios-0.24.0"
|
||||
sources."ms-2.1.3"
|
||||
];
|
||||
})
|
||||
sources."prelude-ls-1.1.2"
|
||||
sources."printj-1.1.2"
|
||||
sources."process-0.11.10"
|
||||
|
@ -10149,7 +10182,7 @@ in
|
|||
})
|
||||
sources."side-channel-1.0.4"
|
||||
sources."signal-exit-3.0.7"
|
||||
sources."simple-git-3.12.0"
|
||||
sources."simple-git-3.13.0"
|
||||
sources."simple-lru-cache-0.0.2"
|
||||
sources."simple-swizzle-0.2.2"
|
||||
sources."slash-3.0.0"
|
||||
|
@ -10159,7 +10192,7 @@ in
|
|||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
(sources."snowflake-sdk-1.6.12" // {
|
||||
(sources."snowflake-sdk-1.6.13" // {
|
||||
dependencies = [
|
||||
sources."axios-0.27.2"
|
||||
sources."debug-3.2.7"
|
||||
|
@ -10216,7 +10249,7 @@ in
|
|||
sources."supports-color-7.2.0"
|
||||
sources."supports-hyperlinks-2.2.0"
|
||||
sources."supports-preserve-symlinks-flag-1.0.0"
|
||||
sources."swagger-ui-dist-4.13.2"
|
||||
sources."swagger-ui-dist-4.14.0"
|
||||
sources."swagger-ui-express-4.5.0"
|
||||
(sources."tar-6.1.11" // {
|
||||
dependencies = [
|
||||
|
@ -10344,7 +10377,7 @@ in
|
|||
];
|
||||
})
|
||||
sources."vm2-3.9.10"
|
||||
sources."vue-2.7.8"
|
||||
sources."vue-2.7.10"
|
||||
sources."vue-color-2.8.1"
|
||||
sources."vue-fragment-1.5.1"
|
||||
sources."vue-i18n-8.27.2"
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "owncloud-client";
|
||||
version = "2.10.1.7187";
|
||||
version = "2.11.0.8354";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.owncloud.com/desktop/ownCloud/stable/${version}/source/ownCloud-${version}.tar.xz";
|
||||
sha256 = "sha256-SNabKv5z7viDI3XDQ2mWjEgFKAGSR5K9sI3Tu5eZbwU=";
|
||||
sha256 = "sha256-YraWvGgeF5b1+3i5Jlk+bwvAULr7KFOSX8y0ZoPpljI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ];
|
||||
|
|
|
@ -2,18 +2,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "diamond";
|
||||
version = "0.8.36";
|
||||
version = "2.0.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bbuchfink";
|
||||
repo = "diamond";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7uqOQOzkYN0RNwKBGUZ/Ny5NVZMoGByOk+GUvjdBzck=";
|
||||
sha256 = "17z9vwj58i1zc22gv4qscx0dk3nxf5ix443gxsibh3a5zsnc6dkg";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./diamond-0.8.36-no-warning.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ zlib ];
|
||||
|
@ -21,24 +18,17 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Accelerated BLAST compatible local sequence aligner";
|
||||
longDescription = ''
|
||||
A sequence aligner for protein and translated DNA
|
||||
searches and functions as a drop-in replacement for the NCBI BLAST
|
||||
software tools. It is suitable for protein-protein search as well as
|
||||
DNA-protein search on short reads and longer sequences including contigs
|
||||
and assemblies, providing a speedup of BLAST ranging up to x20,000.
|
||||
DIAMOND is a sequence aligner for protein and translated DNA searches, designed for high performance analysis of big sequence data. The key features are:
|
||||
- Pairwise alignment of proteins and translated DNA at 100x-10,000x speed of BLAST.
|
||||
- Frameshift alignments for long read analysis.
|
||||
- Low resource requirements and suitable for running on standard desktops or laptops.
|
||||
- Various output formats, including BLAST pairwise, tabular and XML, as well as taxonomic classification.
|
||||
|
||||
DIAMOND is developed by Benjamin Buchfink. Feel free to contact him for support (Email Twitter).
|
||||
|
||||
If you use DIAMOND in published research, please cite
|
||||
B. Buchfink, Xie C., D. Huson,
|
||||
"Fast and sensitive protein alignment using DIAMOND",
|
||||
Nature Methods 12, 59-60 (2015).
|
||||
When using the tool in published research, please cite:
|
||||
- Buchfink B, Reuter K, Drost HG, "Sensitive protein alignments at tree-of-life scale using DIAMOND", Nature Methods 18, 366–368 (2021). doi:10.1038/s41592-021-01101-x
|
||||
'';
|
||||
homepage = "https://github.com/bbuchfink/diamond";
|
||||
license = {
|
||||
fullName = "University of Tuebingen, Benjamin Buchfink";
|
||||
url = "https://raw.githubusercontent.com/bbuchfink/diamond/master/src/COPYING";
|
||||
};
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ thyol ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,20 +0,0 @@
|
|||
diff -u -r diamond-0.8.36/src/dp/scalar_traceback.h diamond-0.8.36-patched/src/dp/scalar_traceback.h
|
||||
--- diamond-0.8.36/src/dp/scalar_traceback.h 2017-02-06 16:32:05.000000000 +0100
|
||||
+++ diamond-0.8.36-patched/src/dp/scalar_traceback.h 2017-02-23 15:13:24.000000000 +0100
|
||||
@@ -19,6 +19,7 @@
|
||||
#ifndef SCALAR_TRACEBACK_H_
|
||||
#define SCALAR_TRACEBACK_H_
|
||||
|
||||
+#include <cmath>
|
||||
#include <exception>
|
||||
#include "../basic/score_matrix.h"
|
||||
|
||||
@@ -31,7 +32,7 @@
|
||||
template<>
|
||||
inline bool almost_equal<float>(float x, float y)
|
||||
{
|
||||
- return abs(x - y) < 0.001f;
|
||||
+ return std::abs(x - y) < 0.001f;
|
||||
}
|
||||
|
||||
template<typename _score>
|
|
@ -4,12 +4,12 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marvin";
|
||||
version = "22.8.0";
|
||||
version = "22.13.0";
|
||||
|
||||
src = fetchurl {
|
||||
name = "marvin-${version}.deb";
|
||||
url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
|
||||
sha256 = "sha256-dmG2p4KqzjLuuVw+wPWaxVoqOqba8Tx5l44PauWpqv4=";
|
||||
sha256 = "sha256-cZ9SFdKNURhcInM6zZNwoi+WyHAsGCeAgkfpAVi7GYE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg makeWrapper ];
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.14.6";
|
||||
version = "2.14.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lortdE+qp+ejxu/QJKz+wNzaNqxcG83nHZi1txblr7E=";
|
||||
sha256 = "sha256-IOpMq9Oyy51UzaPdkGQJQ15jr1JH6iMlvozurIQy0SY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ZgUU9G9BLjGSDvS15fmSpvGD0POKuX9mTF9+XxYciZI=";
|
||||
|
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gitoxide";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Byron";
|
||||
repo = "gitoxide";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lppg5x2VMzRo4SqAFgtiklc1WfTXi/jty92Z91CxZPM=";
|
||||
sha256 = "sha256-6U2B+L/42okpYJrJ6gjS8tRxstFq1QBFq4ZZtzwOwac=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-j4riS3OzfbEriAlqcjq6GcyTrK5sjFEopMesmWTGxp4=";
|
||||
cargoSha256 = "sha256-cOQ9GRoQxZInoijRW4BtsNPEVipa8YcBo8aj5D2u+u0=";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = if stdenv.isDarwin
|
||||
|
|
|
@ -45,14 +45,14 @@ let
|
|||
in python3.pkgs.buildPythonApplication rec {
|
||||
pname = "manim";
|
||||
format = "pyproject";
|
||||
version = "0.16.0";
|
||||
version = "0.16.0.post0";
|
||||
disabled = python3.pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ManimCommunity";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-NQI+kJV0Mu2O/DlwwLYQw2jjJk/TmR7avBX9Fe7zmdk=";
|
||||
sha256 = "sha256-iXiPnI6lTP51P1X3iLp75ArRP66o8WAANBLoStPrz4M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-vkcapture";
|
||||
version = "1.1.6";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nowrep";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TNXoeNktMde7GfFhZRHXlARdnkJTY4oNZTKA4hu7e3Q=";
|
||||
hash = "sha256-yaN0am24p9gC+s64Rop+jQ3952UOtZund/KttnVxP48=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "OBS Linux Vulkan/OpenGL game capture";
|
||||
homepage = "https://github.com/nowrep/obs-vkcapture";
|
||||
maintainers = with maintainers; [ atila ];
|
||||
maintainers = with maintainers; [ atila pedrohlc ];
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
@ -22,13 +22,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qmplay2";
|
||||
version = "22.06.16";
|
||||
version = "22.08.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zaps166";
|
||||
repo = "QMPlay2";
|
||||
rev = version;
|
||||
sha256 = "sha256-nSlmbBCfN+yZlCcgTujBSkZc1uOO0wYpMPUwgLudJEY=";
|
||||
sha256 = "sha256-UQf1aJGoUlXBo2lejw8A3lF6rFOKK6LUGDxRY9207Dw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "open-vm-tools";
|
||||
version = "12.0.5";
|
||||
version = "12.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware";
|
||||
repo = "open-vm-tools";
|
||||
rev = "stable-${version}";
|
||||
sha256 = "sha256-rjYYRh4ZWAd9iELW2/4PZvMOfQfgwtGcrI2icaed2Eg=";
|
||||
hash = "sha256-PgrLu0Bm9Vom5WNl43312QFWKojdXDAGn3Nvj4hzPrQ=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/open-vm-tools";
|
||||
|
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "runc";
|
||||
version = "1.1.3";
|
||||
version = "1.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencontainers";
|
||||
repo = "runc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-s0VRj/hjevtTZ9rUQsAsI2pg4ygahlrBIfFdETWy9W0=";
|
||||
sha256 = "sha256-ougJHW1Z+qZ324P8WpZqawY1QofKnn8WezP7orzRTdA=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
25
pkgs/applications/window-managers/sway/ws.nix
Normal file
25
pkgs/applications/window-managers/sway/ws.nix
Normal file
|
@ -0,0 +1,25 @@
|
|||
{ lib, fetchFromGitLab, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "swayws";
|
||||
version = "unstable-2022-03-10";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "w0lff";
|
||||
repo = pname;
|
||||
rev = "514f3c664439cf2c11bb9096c7e1d3b8c0b898a2";
|
||||
sha256 = "sha256-vUnbn79v08riYLMBI8BxeBPpe/pHOWlraG7QAaohw3s=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-PvKpcTewajvbzUHPssBahWVcAQB3V/aMmOJ/wA0Nrv4=";
|
||||
|
||||
# swayws does not have any tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A sway workspace tool which allows easy moving of workspaces to and from outputs";
|
||||
homepage = "https://gitlab.com/w0lff/swayws";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.atila ];
|
||||
};
|
||||
}
|
|
@ -496,6 +496,8 @@ stdenv.mkDerivation {
|
|||
hardening_unsupported_flags+=" format"
|
||||
'' + optionalString targetPlatform.isWasm ''
|
||||
hardening_unsupported_flags+=" stackprotector fortify pie pic"
|
||||
'' + optionalString targetPlatform.isMicroBlaze ''
|
||||
hardening_unsupported_flags+=" stackprotector"
|
||||
''
|
||||
|
||||
+ optionalString (libc != null && targetPlatform.isAvr) ''
|
||||
|
|
|
@ -69,7 +69,15 @@
|
|||
|
||||
|
||||
|
||||
${lib.optionalString (lib.length crateBin > 0) (lib.concatMapStringsSep "\n" (bin: ''
|
||||
${lib.optionalString (lib.length crateBin > 0) (lib.concatMapStringsSep "\n" (bin:
|
||||
let
|
||||
haveRequiredFeature = if bin ? requiredFeatures then
|
||||
# Check that all element in requiredFeatures are also present in crateFeatures
|
||||
lib.intersectLists bin.requiredFeatures crateFeatures == bin.requiredFeatures
|
||||
else
|
||||
true;
|
||||
in
|
||||
if haveRequiredFeature then ''
|
||||
mkdir -p target/bin
|
||||
BIN_NAME='${bin.name or crateName}'
|
||||
${if !bin ? path then ''
|
||||
|
@ -79,6 +87,8 @@
|
|||
BIN_PATH='${bin.path}'
|
||||
''}
|
||||
${build_bin} "$BIN_NAME" "$BIN_PATH"
|
||||
'' else ''
|
||||
echo Binary ${bin.name or crateName} not compiled due to not having all of the required features -- ${lib.escapeShellArg (builtins.toJSON bin.requiredFeatures)} -- enabled.
|
||||
'') crateBin)}
|
||||
|
||||
${lib.optionalString buildTests ''
|
||||
|
|
|
@ -5,6 +5,8 @@ rec {
|
|||
toTargetArch = platform:
|
||||
/**/ if platform ? rustc.platform then platform.rustc.platform.arch
|
||||
else if platform.isAarch32 then "arm"
|
||||
else if platform.isMips64 then "mips64" # never add "el" suffix
|
||||
else if platform.isPower64 then "powerpc64" # never add "le" suffix
|
||||
else platform.parsed.cpu.name;
|
||||
|
||||
# https://doc.rust-lang.org/reference/conditional-compilation.html#target_os
|
||||
|
|
|
@ -196,7 +196,7 @@ tempHash=$(printf '%0*d' "$hashLength" 0)
|
|||
if [[ -n "$sri" ]]; then
|
||||
# SRI hashes only support base64
|
||||
# SRI hashes need to declare the hash type as part of the hash
|
||||
tempHash="$(nix hash to-sri --type "$oldHashAlgo" "$tempHash" 2>/dev/null \
|
||||
tempHash="$(nix --extra-experimental-features nix-command hash to-sri --type "$oldHashAlgo" "$tempHash" 2>/dev/null \
|
||||
|| nix to-sri --type "$oldHashAlgo" "$tempHash" 2>/dev/null)" \
|
||||
|| die "Failed to convert hash to SRI representation!"
|
||||
fi
|
||||
|
@ -242,7 +242,7 @@ if [[ -z "$newHash" ]]; then
|
|||
|
||||
if [[ -n "$sri" ]]; then
|
||||
# nix-build preserves the hashing scheme so we can just convert the result to SRI using the old type
|
||||
newHash="$(nix hash to-sri --type "$oldHashAlgo" "$newHash" 2>/dev/null \
|
||||
newHash="$(nix --extra-experimental-features nix-command hash to-sri --type "$oldHashAlgo" "$newHash" 2>/dev/null \
|
||||
|| nix to-sri --type "$oldHashAlgo" "$newHash" 2>/dev/null)" \
|
||||
|| die "Failed to convert hash to SRI representation!"
|
||||
fi
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stdman";
|
||||
version = "2021.12.21";
|
||||
version = "2022.07.30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeaye";
|
||||
repo = "stdman";
|
||||
rev = version;
|
||||
sha256 = "sha256-wOMQzC5w8aDmxNxQ5HK8jMgoow1wXBfHGUwFBw2WiPA=";
|
||||
sha256 = "sha256-ABogxVQS6p3wUV8GuB2tp7vMxe63t51dNoclEnYpa/0=";
|
||||
};
|
||||
|
||||
outputDevdoc = "out";
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"version": "0.10.0",
|
||||
"sha256": "sha256-3/Ndf7cOZZ9H+Oq6LQgoMcbtUNoBaDuiy5YKT40yA3E=",
|
||||
"depsSha256": "sha256-6FghRXKNXgwxwtGeW+ejVsbaCN7rrCDYu3AZgJCYODU="
|
||||
"version": "0.11.0",
|
||||
"sha256": "sha256-z2KkhTjw8AumD1FWbTCxYB6PHZIWmUPnwBnxKbpHfRQ=",
|
||||
"depsSha256": "sha256-BMi9bVnQjbcvfIi1xup3sZ7QrPtHAdHqdcGlzKw+YbE="
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper
|
||||
, stdenv, writeScript, lib }:
|
||||
let
|
||||
version = "0.35.0";
|
||||
version = "0.41.2";
|
||||
owner = "erlang-ls";
|
||||
repo = "erlang_ls";
|
||||
deps = import ./rebar-deps.nix {
|
||||
|
@ -11,6 +11,11 @@ let
|
|||
proper = super.proper.overrideAttrs (_: {
|
||||
configurePhase = "true";
|
||||
});
|
||||
redbug = super.redbug.overrideAttrs (_: {
|
||||
patchPhase = ''
|
||||
substituteInPlace rebar.config --replace ", warnings_as_errors" ""
|
||||
'';
|
||||
});
|
||||
});
|
||||
};
|
||||
in
|
||||
|
@ -19,7 +24,7 @@ rebar3Relx {
|
|||
inherit version;
|
||||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
sha256 = "sha256-5pGFLatcNqxpQZtu/qgwX88C8TZvk+U8ez2IGf+jgRA=";
|
||||
sha256 = "sha256-LUgiQtK0OsdTmg1jEdxJ0x+39U3PXoFYsGlOv4l7/Ig=";
|
||||
rev = version;
|
||||
};
|
||||
releaseType = "escript";
|
||||
|
|
|
@ -19,6 +19,11 @@ stdenv.mkDerivation rec {
|
|||
url = "https://github.com/WebAssembly/binaryen/commit/93b8849d9f98ef7ed812938ff0b3219819c2be77.patch";
|
||||
sha256 = "sha256-Duan/B9A+occ5Lj2SbRX793xIfhzHbdYPI5PyTNCZoU=";
|
||||
})
|
||||
# https://github.com/WebAssembly/binaryen/pull/4913
|
||||
(fetchpatch {
|
||||
url = "https://github.com/WebAssembly/binaryen/commit/b70fe755aa4c90727edfd91dc0a9a51febf0239d.patch";
|
||||
sha256 = "sha256-kjPLbdiMVQepSJ7J1gK6dRSMI/2SsH39k7W5AMOIrkM=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake python3 ];
|
||||
|
|
|
@ -15,22 +15,16 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas";
|
|||
|
||||
llvmPackages.stdenv.mkDerivation rec {
|
||||
pname = "halide";
|
||||
version = "10.0.0";
|
||||
version = "14.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "halide";
|
||||
repo = "Halide";
|
||||
rev = "v${version}";
|
||||
sha256 = "0il71rppjp76m7zd420siidvhs76sqiq26h60ywk812sj9mmgxj6";
|
||||
sha256 = "sha256-/7U2TBcpSAKeEyWncAbtW6Vk/cP+rp1CXtbIjvQMmZA=";
|
||||
};
|
||||
|
||||
# clang fails to compile intermediate code because
|
||||
# of unused "--gcc-toolchain" option
|
||||
postPatch = ''
|
||||
sed -i "s/-Werror//" src/CMakeLists.txt
|
||||
'';
|
||||
|
||||
cmakeFlags = [ "-DWARNINGS_AS_ERRORS=OFF" "-DWITH_PYTHON_BINDINGS=OFF" ];
|
||||
cmakeFlags = [ "-DWARNINGS_AS_ERRORS=OFF" "-DWITH_PYTHON_BINDINGS=OFF" "-DTARGET_WEBASSEMBLY=OFF" ];
|
||||
|
||||
# Note: only openblas and not atlas part of this Nix expression
|
||||
# see pkgs/development/libraries/science/math/liblapack/3.5.0.nix
|
||||
|
@ -54,6 +48,6 @@ llvmPackages.stdenv.mkDerivation rec {
|
|||
homepage = "https://halide-lang.org";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.ck3d ];
|
||||
maintainers = with maintainers; [ ck3d atila ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
arch =
|
||||
if stdenv.isx86_64 then "x86_64"
|
||||
else if stdenv.isAarch64 then "aarch64"
|
||||
else if stdenv.isRiscV64 then "riscv64"
|
||||
else if stdenv.hostPlatform.isRiscV && stdenv.is64bit then "riscv64"
|
||||
else "unsupported";
|
||||
platform =
|
||||
if stdenv.isLinux then "linux"
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper, jre, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.1.0";
|
||||
version = "3.1.3";
|
||||
pname = "scala-bare";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lampepfl/dotty/releases/download/${version}/scala3-${version}.tar.gz";
|
||||
sha256 = "9bsZ2FtIb6AvA3W3r2Vv0dPNicuYjMBz3X48z45Avv8=";
|
||||
sha256 = "sha256-nh7v3Kt3stKpBXs9b3gwFZHpwnUTySQT88NTp3CT8tc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jre ncurses.dev ] ;
|
||||
|
|
|
@ -9,25 +9,19 @@
|
|||
, ninja
|
||||
, pkg-config
|
||||
, sqlite
|
||||
, swig
|
||||
, libxml2
|
||||
, clang_10
|
||||
, clang_13
|
||||
, python3
|
||||
, ncurses
|
||||
, libuuid
|
||||
, libbsd
|
||||
, icu
|
||||
, libgcc
|
||||
, autoconf
|
||||
, libtool
|
||||
, automake
|
||||
, libblocksruntime
|
||||
, curl
|
||||
, rsync
|
||||
, git
|
||||
, libgit2
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, makeWrapper
|
||||
, gnumake
|
||||
, file
|
||||
|
@ -50,11 +44,13 @@ let
|
|||
# - integration-tests
|
||||
|
||||
versions = {
|
||||
swift = "5.5.3";
|
||||
swift = "5.6.2";
|
||||
yams = "4.0.2";
|
||||
argumentParser = "0.4.3";
|
||||
format = "swift-5.5-branch";
|
||||
argumentParser = "1.0.3";
|
||||
format = "release/5.6";
|
||||
crypto = "1.1.5";
|
||||
nio = "2.31.2";
|
||||
nio-ssl = "2.15.0";
|
||||
};
|
||||
|
||||
fetchAppleRepo = { repo, rev, sha256 }:
|
||||
|
@ -77,56 +73,82 @@ let
|
|||
|
||||
swift = fetchSwiftRelease {
|
||||
repo = "swift";
|
||||
sha256 = "0ma96sfvwiv2f4qhzrvcwxi9igzd80930gnaw4r7ra4w190cnag7";
|
||||
sha256 = "sha256-wiRXAXWEksJuy+YQQ+B7tzr2iLkSVkgV6o+wIz7yKJA=";
|
||||
};
|
||||
cmark = fetchSwiftRelease {
|
||||
repo = "swift-cmark";
|
||||
sha256 = "0340j9x2n40yx61ma2pgqfbn3a9ijrh20iwzd1zxqq87rr76hh3z";
|
||||
sha256 = "sha256-f0BoTs4HYdx/aJ9HIGCWMalhl8PvClWD6R4QK3qSgAw=";
|
||||
};
|
||||
llbuild = fetchSwiftRelease {
|
||||
repo = "swift-llbuild";
|
||||
sha256 = "1xmiv7yp9r9iscx3fc3zdp25mriz134k9ny2rchxzi4kifz8h0zc";
|
||||
sha256 = "sha256-SQ6V0zVshIYMjayx+ZpYuLijgQ89tqRnPlXBPf2FYqM=";
|
||||
};
|
||||
driver = fetchSwiftRelease {
|
||||
repo = "swift-driver";
|
||||
sha256 = "1pb7fidgdqxzragqkillkv03vdilrwmcx6x2r4czqvdqj37gy6b6";
|
||||
sha256 = "sha256-D5/C4Rbv5KIsKpy6YbuMxGIGaQkn80PD4Cp0l6bPKzY=";
|
||||
};
|
||||
toolsSupportCore = fetchSwiftRelease {
|
||||
repo = "swift-tools-support-core";
|
||||
sha256 = "0a63193nycir4lffvmb3ky8cfly5kdr2libki2gx4fn6fxmb3a2f";
|
||||
sha256 = "sha256-FbtQCq1sSlzrskCrgzD4iYuo5eGaXrAUUxoNX/BiOfg=";
|
||||
};
|
||||
swiftpm = fetchSwiftRelease {
|
||||
repo = "swift-package-manager";
|
||||
sha256 = "0z90mg837jzwh516pypn48r3wsjf0lqymsyigdhgr7j2sgcckrr1";
|
||||
sha256 = "sha256-esO4Swz3UYngbVgxoV+fkhSC0AU3IaxVjWkgK/s3x68=";
|
||||
};
|
||||
syntax = fetchSwiftRelease {
|
||||
repo = "swift-syntax";
|
||||
sha256 = "0kdgh9a8n28yh12hj8lbz2j66ag83l0lcfyfdg7zdr614zs6i3p1";
|
||||
sha256 = "sha256-C9FPCtq49BvKXtTWWeReYWNrU70pHzT2DhAv3NiTbPU=";
|
||||
};
|
||||
corelibsXctest = fetchSwiftRelease {
|
||||
repo = "swift-corelibs-xctest";
|
||||
sha256 = "12fp3xzsqwcrmyc55h91d3dm64wn3wln47x2fl7sj0s8cn7q12b3";
|
||||
sha256 = "sha256-0hizfnKJaUUA+jXuXzXWk72FmlSyc+UGEf7BTLdJrx4=";
|
||||
};
|
||||
corelibsFoundation = fetchSwiftRelease {
|
||||
repo = "swift-corelibs-foundation";
|
||||
sha256 = "06gkdliihl1l86jx5khzwkjmjk45fq290x033rscramzcdxh7d1b";
|
||||
sha256 = "sha256-8sCL8Ia6yb6bRsJZ52gUJH0jN3lwClM573G8jgUdEhw=";
|
||||
};
|
||||
corelibsLibdispatch = fetchSwiftRelease {
|
||||
repo = "swift-corelibs-libdispatch";
|
||||
sha256 = "1bim5x9z9bqfgs6gdm4nlz1zrwl2x7xh4dn6i5md9ygsplr4ibzf";
|
||||
sha256 = "sha256-1tIskUMnfblnvZaFDQPUMBfWTmBYG98s7rEww7PwZO8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
indexstoreDb = fetchSwiftRelease {
|
||||
repo = "indexstore-db";
|
||||
sha256 = "1l1xlzf5kx7x80kf4b7r36glv0jc64d08d1688kmzjq1cfgn6gm2";
|
||||
sha256 = "sha256-/PO4eMiASZN3pjFjBQ1r8vYwGRn6xm3SWaB2HDZlkPs=";
|
||||
};
|
||||
sourcekitLsp = fetchSwiftRelease {
|
||||
repo = "sourcekit-lsp";
|
||||
sha256 = "00fcmd7x5v62n6ajsc0dmzwz6nzy2p72mcs9w6p90adcx7pffqkn";
|
||||
sha256 = "sha256-ttgUC4ZHD3P/xLHllEbACtHVrJ6HXqeVWccXcoPMkts=";
|
||||
};
|
||||
llvmProject = fetchSwiftRelease {
|
||||
repo = "llvm-project";
|
||||
sha256 = "18rn5xg5hpxxsacs0ygjmjpzpc8pq85898kknzc0s0z5m55h45z8";
|
||||
sha256 = "sha256-YVs3lKV2RlaovpYkdGO+vzypolrmXmbKBBP4+osNMYw=";
|
||||
};
|
||||
docc = fetchSwiftRelease {
|
||||
repo = "swift-docc";
|
||||
sha256 = "sha256-rWiaNamZoHTO1bKpubxuT7m1IBOl7amT5M71mNauilY=";
|
||||
};
|
||||
docc-render-artifact = fetchSwiftRelease {
|
||||
repo = "swift-docc-render-artifact";
|
||||
sha256 = "sha256-AX+rtDLhq8drk7N6/hoH3fQioudmmTCnEhR45bME8uU=";
|
||||
};
|
||||
docc-symbolkit = fetchSwiftRelease {
|
||||
repo = "swift-docc-symbolkit";
|
||||
sha256 = "sha256-Xy1TQ5ucDW+MnkeOvVznsATBmwcQ3p1x+ofQ22ofk+o=";
|
||||
};
|
||||
lmdb = fetchSwiftRelease {
|
||||
repo = "swift-lmdb";
|
||||
sha256 = "sha256-i2GkWRWq1W5j8rF4PiHwWgT4Dur5FCY2o44HvUU3vtQ=";
|
||||
};
|
||||
markdown = fetchSwiftRelease {
|
||||
repo = "swift-markdown";
|
||||
sha256 = "sha256-XtFSBiNHhmULjS4OqSpMgUetLu3peRg7l6HpjwVsTj8=";
|
||||
};
|
||||
|
||||
cmark-gfm = fetchAppleRepo {
|
||||
repo = "swift-cmark";
|
||||
rev = "swift-${versions.swift}-RELEASE-gfm";
|
||||
sha256 = "sha256-g28iKmMR2W0r1urf8Fk1HBxAp5OlonNYSVN3Ril66tQ=";
|
||||
};
|
||||
|
||||
# Projects that have their own versions during each release
|
||||
|
@ -134,23 +156,33 @@ let
|
|||
argumentParser = fetchAppleRepo {
|
||||
repo = "swift-argument-parser";
|
||||
rev = "${versions.argumentParser}";
|
||||
sha256 = "1jkq72fphxzsnynjxk72azp0iz5r2ji7adxrz6w1y2a19pgjdqrp";
|
||||
sha256 = "sha256-vNqkuAwSZNCWvwe6E5BqbXQdIbmIia0dENmmSQ9P8Mo=";
|
||||
};
|
||||
format = fetchAppleRepo {
|
||||
repo = "swift-format";
|
||||
rev = "${versions.format}";
|
||||
sha256 = "1hg888ps3fk23q2zf6djkvxyk6zndqvwypmy0s800hmnyf0hzgv4";
|
||||
sha256 = "sha256-1f5sIrv9IbPB7Vnahq1VwH8gT41dcjWldRwvVEaMdto=";
|
||||
};
|
||||
crypto = fetchAppleRepo {
|
||||
repo = "swift-crypto";
|
||||
rev = "${versions.crypto}";
|
||||
sha256 = "0918pj3x3wgli3bnrjbvpzck2n6qz5n6f4yc5kljky45wd15f34g";
|
||||
sha256 = "sha256-jwxXQuOF+CnpLMwTZ2z52Fgx2b97yWzXiPTx0Ye8KCQ=";
|
||||
};
|
||||
nio = fetchAppleRepo {
|
||||
repo = "swift-nio";
|
||||
rev = versions.nio;
|
||||
sha256 = "sha256-FscOA/S7on31QCR/MZFjg4ZB3FGJ+rdptZ6MRZJXexE=";
|
||||
};
|
||||
nio-ssl = fetchAppleRepo {
|
||||
repo = "swift-nio-ssl";
|
||||
rev = versions.nio-ssl;
|
||||
sha256 = "sha256-5QGkmkCOXhG3uOdf0bd3Fo1MFekB8/WcveBXGhtVZKo=";
|
||||
};
|
||||
yams = fetchFromGitHub {
|
||||
owner = "jpsim";
|
||||
repo = "Yams";
|
||||
rev = versions.yams;
|
||||
sha256 = "1nk9b7l6m3wwjkl81npl2l1iwpsxaxb9za53jpwwsbbi1h1h4fbi";
|
||||
sha256 = "sha256-cTkCAwxxLc35laOon1ZXXV8eAxX02oDolJyPauhZado=";
|
||||
name = "Yams-${versions.yams}-src";
|
||||
};
|
||||
};
|
||||
|
@ -160,14 +192,12 @@ let
|
|||
glibc
|
||||
icu
|
||||
libblocksruntime
|
||||
libbsd
|
||||
libedit
|
||||
libgcc
|
||||
libuuid
|
||||
libxml2
|
||||
ncurses
|
||||
sqlite
|
||||
swig
|
||||
];
|
||||
|
||||
python = (python3.withPackages (ps: [ps.six]));
|
||||
|
@ -184,11 +214,8 @@ stdenv.mkDerivation {
|
|||
version = versions.swift;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
cmake
|
||||
git
|
||||
libtool
|
||||
makeWrapper
|
||||
ninja
|
||||
perl
|
||||
|
@ -198,7 +225,7 @@ stdenv.mkDerivation {
|
|||
which
|
||||
];
|
||||
buildInputs = devInputs ++ [
|
||||
clang_10
|
||||
clang_13
|
||||
];
|
||||
|
||||
# TODO: Revisit what needs to be propagated and how.
|
||||
|
@ -233,6 +260,14 @@ stdenv.mkDerivation {
|
|||
cp -r ${sources.format} swift-format
|
||||
cp -r ${sources.crypto} swift-crypto
|
||||
cp -r ${sources.llvmProject} llvm-project
|
||||
cp -r ${sources.cmark-gfm} swift-cmark-gfm
|
||||
cp -r ${sources.docc} swift-docc
|
||||
cp -r ${sources.docc-render-artifact} swift-docc-render-artifact
|
||||
cp -r ${sources.docc-symbolkit} swift-docc-symbolkit
|
||||
cp -r ${sources.lmdb} swift-lmdb
|
||||
cp -r ${sources.markdown} swift-markdown
|
||||
cp -r ${sources.nio} swift-nio
|
||||
cp -r ${sources.nio-ssl} swift-nio-ssl
|
||||
|
||||
chmod -R u+w .
|
||||
'';
|
||||
|
@ -254,6 +289,7 @@ stdenv.mkDerivation {
|
|||
patch -p1 -d swift -i ${./patches/0002-build-presets-linux-allow-custom-install-prefix.patch}
|
||||
patch -p1 -d swift -i ${./patches/0003-build-presets-linux-don-t-build-extra-libs.patch}
|
||||
patch -p1 -d swift -i ${./patches/0004-build-presets-linux-plumb-extra-cmake-options.patch}
|
||||
patch -p1 -d swift -i ${./patches/0007-build-presets-linux-os-stdlib.patch}
|
||||
substituteInPlace swift/cmake/modules/SwiftConfigureSDK.cmake \
|
||||
--replace '/usr/include' "${stdenv.cc.libc.dev}/include"
|
||||
sed -i swift/utils/build-presets.ini \
|
||||
|
@ -268,7 +304,6 @@ stdenv.mkDerivation {
|
|||
# LLVM toolchain patches.
|
||||
patch -p1 -d llvm-project/clang -i ${./patches/0005-clang-toolchain-dir.patch}
|
||||
patch -p1 -d llvm-project/clang -i ${./patches/0006-clang-purity.patch}
|
||||
patch -p1 -d llvm-project/compiler-rt -i ${../llvm/common/compiler-rt/libsanitizer-no-cyclades-11.patch}
|
||||
substituteInPlace llvm-project/clang/lib/Driver/ToolChains/Linux.cpp \
|
||||
--replace 'SysRoot + "/lib' '"${glibc}/lib" "' \
|
||||
--replace 'SysRoot + "/usr/lib' '"${glibc}/lib" "' \
|
||||
|
@ -295,6 +330,27 @@ stdenv.mkDerivation {
|
|||
"swiftbuild_path = os.path.join(args.toolchain, \"bin\", \"swift-build\")"
|
||||
substituteInPlace swift-corelibs-xctest/build_script.py \
|
||||
--replace usr "$PREFIX"
|
||||
|
||||
# Can be removed in later swift-docc versions, see
|
||||
# https://github.com/apple/swift-docc/commit/bff70b847008f91ac729cfd299a85481eef3f581
|
||||
substituteInPlace swift-docc/build-script-helper.py \
|
||||
--replace \
|
||||
"subprocess.check_output(cmd, env=env).strip(), 'docc')" \
|
||||
"subprocess.check_output(cmd, env=env).strip().decode(), 'docc')"
|
||||
|
||||
# Can be removed in later Swift versions, see
|
||||
# https://github.com/apple/swift/pull/58755
|
||||
substituteInPlace swift/utils/process-stats-dir.py \
|
||||
--replace \
|
||||
"type=argparse.FileType('wb', 0)," \
|
||||
"type=argparse.FileType('w', 0),"
|
||||
|
||||
# Apply Python 3 fix, see
|
||||
# https://github.com/apple/swift/commit/ec6bc595092974628b27b114a472e84162261bbd
|
||||
substituteInPlace swift/utils/swift_build_support/swift_build_support/productpipeline_list_builder.py \
|
||||
--replace \
|
||||
"filter(lambda x: x is not None, pipeline)" \
|
||||
"[p for p in pipeline if p is not None]"
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
|
@ -312,14 +368,14 @@ stdenv.mkDerivation {
|
|||
|
||||
buildPhase = ''
|
||||
# Explicitly include C++ headers to prevent errors where stdlib.h is not found from cstdlib.
|
||||
export NIX_CFLAGS_COMPILE="$(< ${clang_10}/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE"
|
||||
export NIX_CFLAGS_COMPILE="$(< ${clang_13}/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE"
|
||||
|
||||
# During the Swift build, a full local LLVM build is performed and the resulting clang is
|
||||
# invoked. This compiler is not using the Nix wrappers, so it needs some help to find things.
|
||||
export NIX_LDFLAGS_BEFORE="-rpath ${gccForLibs.lib}/lib -L${gccForLibs.lib}/lib $NIX_LDFLAGS_BEFORE"
|
||||
|
||||
# However, we want to use the wrapped compiler whenever possible.
|
||||
export CC="${clang_10}/bin/clang"
|
||||
export CC="${clang_13}/bin/clang"
|
||||
|
||||
$SWIFT_SOURCE_ROOT/swift/utils/build-script \
|
||||
--preset=buildbot_linux \
|
||||
|
@ -353,6 +409,17 @@ stdenv.mkDerivation {
|
|||
# TODO: Fix issue with ld.gold invoked from script finding crtbeginS.o and crtendS.o.
|
||||
rm $SWIFT_SOURCE_ROOT/swift/test/IRGen/ELF-remove-autolink-section.swift
|
||||
|
||||
# The following two tests fail because we use don't use the bundled libicu:
|
||||
# [SOURCE_DIR/utils/build-script] ERROR: can't find source directory for libicu (tried /build/src/icu)
|
||||
rm $SWIFT_SOURCE_ROOT/swift/validation-test/BuildSystem/default_build_still_performs_epilogue_opts_after_split.test
|
||||
rm $SWIFT_SOURCE_ROOT/swift/validation-test/BuildSystem/test_early_swift_driver_and_infer.swift
|
||||
|
||||
# TODO: This test fails for some unknown reason
|
||||
rm $SWIFT_SOURCE_ROOT/swift/test/Serialization/restrict-swiftmodule-to-revision.swift
|
||||
|
||||
# This test was flaky in ofborg, see #186476
|
||||
rm $SWIFT_SOURCE_ROOT/swift/test/AutoDiff/compiler_crashers_fixed/sr14290-missing-debug-scopes-in-pullback-trampoline.swift
|
||||
|
||||
# TODO: consider using stress-tester and integration-test.
|
||||
|
||||
# Match the wrapped version of Swift to be installed.
|
||||
|
@ -379,23 +446,24 @@ stdenv.mkDerivation {
|
|||
--set CC $out/bin/clang \
|
||||
--suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \
|
||||
--suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \
|
||||
--suffix LIBRARY_PATH : ${lib.makeLibraryPath [icu libgcc libuuid]}
|
||||
--suffix LIBRARY_PATH : ${lib.makeLibraryPath [icu libgcc libuuid]} \
|
||||
--suffix PATH : ${lib.makeBinPath [ stdenv.cc.bintools ]}
|
||||
|
||||
wrapProgram $out/bin/swiftc \
|
||||
--set CC $out/bin/clang \
|
||||
--suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \
|
||||
--suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \
|
||||
--suffix LIBRARY_PATH : ${lib.makeLibraryPath [icu libgcc libuuid]}
|
||||
--suffix LIBRARY_PATH : ${lib.makeLibraryPath [icu libgcc libuuid]} \
|
||||
--suffix PATH : ${lib.makeBinPath [ stdenv.cc.bintools ]}
|
||||
'';
|
||||
|
||||
# Hack to avoid build and install directories in RPATHs.
|
||||
preFixup = "rm -rf $SWIFT_BUILD_ROOT $SWIFT_INSTALL_DIR";
|
||||
|
||||
meta = with lib; {
|
||||
broken = true;
|
||||
description = "The Swift Programming Language";
|
||||
homepage = "https://github.com/apple/swift";
|
||||
maintainers = with maintainers; [ dtzWill trepetti dduan ];
|
||||
maintainers = with maintainers; [ dtzWill trepetti dduan trundle ];
|
||||
license = licenses.asl20;
|
||||
# Swift doesn't support 32-bit Linux, unknown on other platforms.
|
||||
platforms = platforms.linux;
|
||||
|
|
|
@ -2,22 +2,22 @@ Disable targets, where we use Nix packages.
|
|||
|
||||
--- a/utils/build-presets.ini
|
||||
+++ b/utils/build-presets.ini
|
||||
@@ -776,8 +776,6 @@
|
||||
llbuild
|
||||
@@ -818,8 +818,6 @@
|
||||
swiftpm
|
||||
swift-driver
|
||||
xctest
|
||||
-libicu
|
||||
-libcxx
|
||||
|
||||
dash-dash
|
||||
|
||||
@@ -785,9 +785,7 @@
|
||||
install-llbuild
|
||||
swiftdocc
|
||||
|
||||
# build-ninja
|
||||
@@ -830,9 +828,7 @@
|
||||
install-swiftpm
|
||||
install-swift-driver
|
||||
install-xctest
|
||||
-install-libicu
|
||||
install-prefix=%(install_prefix)s
|
||||
-install-libcxx
|
||||
install-sourcekit-lsp
|
||||
install-swiftdocc
|
||||
build-swift-static-stdlib
|
||||
build-swift-static-sdk-overlay
|
||||
|
|
|
@ -0,0 +1,13 @@
|
|||
Use os-stdlib in tests.
|
||||
|
||||
--- a/utils/build-presets.ini
|
||||
+++ b/utils/build-presets.ini
|
||||
@@ -872,7 +872,7 @@
|
||||
indexstore-db
|
||||
sourcekit-lsp
|
||||
swiftdocc
|
||||
-lit-args=-v --time-tests
|
||||
+lit-args=-v --time-tests --param use_os_stdlib
|
||||
|
||||
# rdar://problem/31454823
|
||||
lldb-test-swift-only
|
|
@ -21,6 +21,9 @@
|
|||
, haskellLib
|
||||
|
||||
, # hashes for downloading Hackage packages
|
||||
# This is either a directory or a .tar.gz containing the cabal files and
|
||||
# hashes of Hackage as exemplified by this repository:
|
||||
# https://github.com/commercialhaskell/all-cabal-hashes/tree/hackage
|
||||
all-cabal-hashes
|
||||
|
||||
, # compiler to use
|
||||
|
@ -136,10 +139,20 @@ let
|
|||
cabal2nix --compiler=${self.ghc.haskellCompilerName} --system=${hostPlatform.config} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix"
|
||||
'';
|
||||
|
||||
# Given a package name and version, e.g. name = "async", version = "2.2.4",
|
||||
# gives its cabal file and hashes (JSON file) as discovered from the
|
||||
# all-cabal-hashes value. If that's a directory, it will copy the relevant
|
||||
# files to $out; if it's a tarball, it will extract and move them to $out.
|
||||
all-cabal-hashes-component = name: version: buildPackages.runCommand "all-cabal-hashes-component-${name}-${version}" {} ''
|
||||
tar --wildcards -xzvf ${all-cabal-hashes} \*/${name}/${version}/${name}.{json,cabal}
|
||||
mkdir -p $out
|
||||
mv */${name}/${version}/${name}.{json,cabal} $out
|
||||
if [ -d ${all-cabal-hashes} ]
|
||||
then
|
||||
cp ${all-cabal-hashes}/${name}/${version}/${name}.json $out
|
||||
cp ${all-cabal-hashes}/${name}/${version}/${name}.cabal $out
|
||||
else
|
||||
tar --wildcards -xzvf ${all-cabal-hashes} \*/${name}/${version}/${name}.{json,cabal}
|
||||
mv */${name}/${version}/${name}.{json,cabal} $out
|
||||
fi
|
||||
'';
|
||||
|
||||
hackage2nix = name: version: let component = all-cabal-hashes-component name version; in self.haskellSrc2nix {
|
||||
|
|
61
pkgs/development/interpreters/cg3/default.nix
Normal file
61
pkgs/development/interpreters/cg3/default.nix
Normal file
|
@ -0,0 +1,61 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, runCommand
|
||||
, dieHook
|
||||
, cmake
|
||||
, icu
|
||||
, boost
|
||||
}:
|
||||
|
||||
let cg3 = stdenv.mkDerivation rec {
|
||||
pname = "cg3";
|
||||
version = "1.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GrammarSoft";
|
||||
repo = "${pname}";
|
||||
rev = "v${version}";
|
||||
sha256 = "Ena3dGoZsXOIY6mbvnfI0H7QqRifoxWIBKQrK3yQSmY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
icu
|
||||
boost
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.tests.minimal = runCommand "${pname}-test" {
|
||||
buildInputs = [
|
||||
cg3
|
||||
dieHook
|
||||
];
|
||||
} ''
|
||||
echo 'DELIMITERS = "."; ADD (tag) (*);' >grammar.cg3
|
||||
printf '"<a>"\n\t"a" tag\n\n' >want.txt
|
||||
printf '"<a>"\n\t"a"\n\n' | vislcg3 -g grammar.cg3 >got.txt
|
||||
diff -s want.txt got.txt || die "Grammar application did not produce expected parse"
|
||||
touch $out
|
||||
'';
|
||||
|
||||
|
||||
# TODO, consider optionals:
|
||||
# - Enable tcmalloc unless darwin?
|
||||
# - Enable python bindings?
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/GrammarSoft/cg3";
|
||||
description = "Constraint Grammar interpreter, compiler and applicator vislcg3";
|
||||
maintainers = with maintainers; [ unhammer ];
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
};
|
||||
|
||||
in
|
||||
cg3
|
|
@ -2,17 +2,24 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasmtime";
|
||||
version = "0.39.1";
|
||||
version = "0.40.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bytecodealliance";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cU03wm1+V++mV7j7VyMtjAYrPldzTysNzpJ8m0q4Rx8=";
|
||||
sha256 = "sha256-i3dtjKy5YTyNkEaDcGxsrd4lbyUBd25OARESbJVK9uY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-DnThste0SbBdpGAUYhmwbdQFNEB3LozyDf0X8r2A90Q=";
|
||||
cargoSha256 = "sha256-wlcYdZ8Akkpicyw74sh4CNwSstCtUJxf+oSEL/mUtKc=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--package wasmtime-cli"
|
||||
"--package wasmtime-c-api"
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
# We disable tests on x86_64-darwin because Hydra runners do not
|
||||
# support SSE3, SSSE3, SSE4.1 and SSE4.2 at this time. This is
|
||||
|
@ -31,6 +38,18 @@ rustPlatform.buildRustPackage rec {
|
|||
"--skip=traps::parse_dwarf_info"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# move libs from out to dev
|
||||
install -d -m 0755 $dev/lib
|
||||
install -m 0644 ''${!outputLib}/lib/* $dev/lib
|
||||
rm -r ''${!outputLib}/lib
|
||||
|
||||
install -d -m0755 $dev/include/wasmtime
|
||||
install -m0644 $src/crates/c-api/include/*.h $dev/include
|
||||
install -m0644 $src/crates/c-api/include/wasmtime/*.h $dev/include/wasmtime
|
||||
install -m0644 $src/crates/c-api/wasm-c-api/include/* $dev/include
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Standalone JIT-style runtime for WebAssembly, using Cranelift";
|
||||
homepage = "https://github.com/bytecodealliance/wasmtime";
|
||||
|
|
|
@ -22,13 +22,13 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "amdvlk";
|
||||
version = "2022.Q2.2";
|
||||
version = "2022.Q3.3";
|
||||
|
||||
src = fetchRepoProject {
|
||||
name = "${pname}-src";
|
||||
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
|
||||
rev = "refs/tags/v-${version}";
|
||||
sha256 = "4LV6g2snT1usY+Ic9Hb/IwXAJQ97I9DigZCah6mwewA=";
|
||||
sha256 = "jbx6R6tDaVWD5jLVW2IiNaw+VwFkQ9EG2FvpAj/bfZ4=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -27,7 +27,14 @@ stdenv.mkDerivation rec {
|
|||
url = "https://github.com/apache/apr/commit/866e1df66be6704a584feaf5c3d241e3d631d03a.patch";
|
||||
sha256 = "0hhm5v5wx985c28dq6d9ngnyqihpsphq4mw7rwylk39k2p90ppcm";
|
||||
})
|
||||
] ++ lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];
|
||||
|
||||
# Cross fix. Patch the /dev/zero mmapable detection logic. https://bugs.gentoo.org/show_bug.cgi?id=830833
|
||||
(fetchpatch {
|
||||
url = "https://830833.bugs.gentoo.org/attachment.cgi?id=761676";
|
||||
name = "cross-assume-dev-zero-mmappable.patch";
|
||||
sha256 = "sha256-rsouJp1o7p0d+AJ5KvyhUU79vAJOcVHEuwSEKaCEGa8=";
|
||||
})
|
||||
];
|
||||
|
||||
# This test needs the net
|
||||
postPatch = ''
|
||||
|
@ -43,9 +50,27 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
# For cross builds, provide answers to the configure time tests.
|
||||
# These answers are valid on x86_64-linux and aarch64-linux.
|
||||
"ac_cv_file__dev_zero=yes"
|
||||
"ac_cv_func_setpgrp_void=0"
|
||||
"apr_cv_tcp_nodelay_with_cork=1"
|
||||
"ac_cv_func_setpgrp_void=yes"
|
||||
"apr_cv_tcp_nodelay_with_cork=yes"
|
||||
"ac_cv_define_PTHREAD_PROCESS_SHARED=yes"
|
||||
"apr_cv_process_shared_works=yes"
|
||||
"apr_cv_mutex_robust_shared=yes"
|
||||
"ap_cv_atomic_builtins=yes"
|
||||
"apr_cv_mutex_recursive=yes"
|
||||
"apr_cv_epoll=yes"
|
||||
"apr_cv_epoll_create1=yes"
|
||||
"apr_cv_dup3=yes"
|
||||
"apr_cv_accept4=yes"
|
||||
"apr_cv_sock_cloexec=yes"
|
||||
"ac_cv_struct_rlimit=yes"
|
||||
"ac_cv_func_sem_open=yes"
|
||||
"ac_cv_negative_eai=yes"
|
||||
"apr_cv_gai_addrconfig=yes"
|
||||
"ac_cv_o_nonblock_inherited=no"
|
||||
"apr_cv_pthreads_lib=-lpthread"
|
||||
"CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/cc"
|
||||
] ++ lib.optionals (stdenv.hostPlatform.system == "i686-cygwin") [
|
||||
# Including the Windows headers breaks unistd.h.
|
||||
|
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-media-sdk";
|
||||
version = "22.5.1";
|
||||
version = "22.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Intel-Media-SDK";
|
||||
repo = "MediaSDK";
|
||||
rev = "intel-mediasdk-${version}";
|
||||
sha256 = "sha256-HTCqJG//byTTlTRdE8IyFGuUaLiNVDfl9swbH6d5gCk=";
|
||||
sha256 = "sha256-HBG1JsTwAbl7p42Crmx82M7VnIaLk0oBXc4SJoIdEIs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sqlcipher";
|
||||
version = "4.5.1";
|
||||
version = "4.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sqlcipher";
|
||||
repo = "sqlcipher";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cvbR3tav6DjIdJB/x2q5Oq7ju9q63z75b6q1uHYY9bE=";
|
||||
sha256 = "sha256-EUm4akVWUiK8U6Je1uWMo8KLQLsk57kOFCCU5Uajjt8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles tcl ];
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, libxml2, gobject-introspection, gnome, glib }:
|
||||
{ lib, stdenv, fetchpatch, fetchurl, meson, ninja, pkg-config, gettext, libxml2, gobject-introspection, gnome, glib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "totem-pl-parser";
|
||||
|
@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "wN8PaNXPnX2kPIHH8T8RFYNYNo+Ywi1Hci870EvTrBw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Upstream MR: https://gitlab.gnome.org/GNOME/totem-pl-parser/-/merge_requests/46
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/totem-pl-parser/-/commit/f4f69c9b99095416aaed18a73f7486ad9eb04aa9.patch";
|
||||
sha256 = "sha256-Uya5fgFgauv5rIpVK3CDGCieyMus7VjcLMMe/vQ2WWY=";
|
||||
})
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
|
@ -30,6 +38,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Simple GObject-based library to parse and save a host of playlist formats";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.lgpl2;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, asciidoc
|
||||
, docbook-xsl-nons
|
||||
, docbook_xml_dtd_45
|
||||
|
@ -43,6 +44,7 @@
|
|||
, taglib
|
||||
, upower
|
||||
, totem-pl-parser
|
||||
, e2fsprogs
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -54,6 +56,18 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "Pt3G0nLAKWn6TCwV360MSddtAh8aJ+xwi2m+gCU1PJQ=";
|
||||
};
|
||||
|
||||
# TODO: remove me on 3.4.0
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/tracker-miners/-/commit/cc655ba0f95022cf35bc6d44cb5155788fee2e24.patch";
|
||||
sha256 = "sha256-a85ygtabpkruiDgKbseQxYbFIAQlVDhs3eWkbStJjKs=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/tracker-miners/-/commit/9e613ceb37ec41fd1cd88c3d539e3ee03e8f6ba6.patch";
|
||||
sha256 = "sha256-ht7EfZztyl0st0Sv7H92Q37vwXY4T61GQm9WJ8IxTTg=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
asciidoc
|
||||
docbook-xsl-nons
|
||||
|
@ -72,7 +86,6 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
bzip2
|
||||
dbus
|
||||
evolution-data-server
|
||||
exempi
|
||||
giflib
|
||||
glib
|
||||
|
@ -95,16 +108,20 @@ stdenv.mkDerivation rec {
|
|||
libjpeg
|
||||
libosinfo
|
||||
libpng
|
||||
libseccomp
|
||||
libsoup
|
||||
libtiff
|
||||
libuuid
|
||||
libxml2
|
||||
networkmanager
|
||||
poppler
|
||||
systemd
|
||||
taglib
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
evolution-data-server
|
||||
libseccomp
|
||||
networkmanager
|
||||
systemd
|
||||
upower
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
e2fsprogs
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
|
@ -115,6 +132,9 @@ stdenv.mkDerivation rec {
|
|||
# security issue since then. Despite a patch now being availab, we're opting
|
||||
# to be safe due to the general state of the project
|
||||
"-Dminer_rss=false"
|
||||
] ++ lib.optionals (!stdenv.isLinux) [
|
||||
"-Dnetwork_manager=disabled"
|
||||
"-Dsystemd_user_services=false"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
@ -132,6 +152,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Desktop-neutral user information store, search tool and indexer";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, doxygen
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, doxygen
|
||||
, numactl, rdma-core, libbfd, libiberty, perl, zlib, symlinkJoin
|
||||
, enableCuda ? false
|
||||
, cudatoolkit
|
||||
|
@ -22,6 +22,16 @@ in stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-DWiOmqxBAAH8DE7H0teoKyp+m3wYEo652ac7ey43Erg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull upstream fix for binutils-2.39:
|
||||
# https://github.com/openucx/ucx/pull/8450
|
||||
(fetchpatch {
|
||||
name = "binutils-2.39.patch";
|
||||
url = "https://github.com/openucx/ucx/commit/6b6128efd416831cec3a1820f7d1c8e648b79448.patch";
|
||||
sha256 = "sha256-ci00nZG8iOUEFXbmgr/5XkIfiw4eAAdG1wcEYjQSiT8=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook doxygen ];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "camlp-streams";
|
||||
version = "5.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocaml";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256:1wd5k0irzwi841b27pbx0n5fdybbgx97184zm8cjajizd2j8w0g5";
|
||||
sha256 = "sha256-kHuFBqu0mjFv53sOtmFZcX2reo5ToaOpItP7P53bfGQ=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "allure-behave";
|
||||
version = "2.9.45";
|
||||
version = "2.10.0";
|
||||
|
||||
disabled = pythonOlder "3.4";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-aK0SgQIXpuUoSTz8jg5IPKQM2Xvk2EfkSGigsy/GFNo=";
|
||||
sha256 = "sha256-BzDu/LJBstuchkvUAeCDSIDIiFLZmC4y0s3d+1paGxs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -18,13 +18,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "allure-pytest";
|
||||
version = "2.9.45";
|
||||
version = "2.10.0";
|
||||
|
||||
disabled = pythonOlder "3.4";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "18ys5gi64jlfya6a7shj5lqhwc6cplwgyq3s2n5mg5x513g0yqi0";
|
||||
sha256 = "sha256-Oyq2din0y9hher2BfSsiKSxut+/VWE+ZLRr4FDrqbuc=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bthome-ble";
|
||||
version = "0.3.5";
|
||||
version = "0.3.6";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Us7tKFrTVD5q9ukxV83MrbMTYzp6w35RLgjSQ0cl6Dw=";
|
||||
hash = "sha256-Y8BKBi5DZYpUtcJS6lLD+dVPhtL2xavQcPymVhdl7Zw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloup";
|
||||
version = "0.15.1";
|
||||
version = "1.0.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-gAi0gKd9ihEseHAvZGda299Z+tw545HzuovKycTUzYY=";
|
||||
sha256 = "sha256-/DR3evRK1d7Kz9dCp4RzeAD5opsYPZF0ox0HqR9u710=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -0,0 +1,43 @@
|
|||
{ buildPythonPackage
|
||||
, cryptography
|
||||
, django
|
||||
, django-appconf
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, python
|
||||
, pythonOlder }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-cryptography";
|
||||
version = "1.1";
|
||||
disabled = pythonOlder "3.7";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "georgemarshall";
|
||||
repo = "django-cryptography";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-C3E2iT9JdLvF+1g+xhZ8dPDjjh25JUxLAtTMnalIxPk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cryptography
|
||||
django
|
||||
django-appconf
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "django_cryptography" ];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
${python.interpreter} ./runtests.py
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/georgemarshall/django-cryptography";
|
||||
description = "A set of primitives for performing cryptography in Django";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ centromere ];
|
||||
};
|
||||
}
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fjaraskupan";
|
||||
version = "1.0.2";
|
||||
version = "2.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "elupus";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-nUrgV4keJpYRkKZE+udvmPdCW3O3YQTS1ye40IdA7vA=";
|
||||
hash = "sha256-ohadGQxtW8YcSDIF7xZhy84xu0Vi5yj/QEVi8WRRBSI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -30,10 +30,12 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "fjaraskupan" ];
|
||||
pythonImportsCheck = [
|
||||
"fjaraskupan"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for controlling Fjäråskupan kitchen fans";
|
||||
description = "Module for controlling Fjäråskupan kitchen fans";
|
||||
homepage = "https://github.com/elupus/fjaraskupan";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2022.8.13";
|
||||
version = "2022.8.15";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-c2If/ZCbq7wha/wTO9XTOde+UZu+e75mn9zr40xUKm8=";
|
||||
sha256 = "sha256-//qtDLU5wXE0ZrkxYI+rOgIu9cLwCbeuMtM57cE1CxA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -77,5 +77,8 @@ buildPythonPackage rec {
|
|||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ cmcdragonkai rakesh4g ];
|
||||
platforms = platforms.linux;
|
||||
# Scikit-image 0.19 update broke API, see https://github.com/scikit-image/scikit-image/releases/tag/v0.19.0
|
||||
# and https://github.com/scikit-image/scikit-image/issues/6093
|
||||
broken = lib.versionAtLeast scikitimage.version "0.19";
|
||||
};
|
||||
}
|
||||
|
|
66
pkgs/development/python-modules/kanidm/default.nix
Normal file
66
pkgs/development/python-modules/kanidm/default.nix
Normal file
|
@ -0,0 +1,66 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, pythonOlder
|
||||
|
||||
# build
|
||||
, poetry-core
|
||||
|
||||
# propagates
|
||||
, aiohttp
|
||||
, pydantic
|
||||
, toml
|
||||
|
||||
# tests
|
||||
, pytest-asyncio
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "kanidm";
|
||||
version = "0.0.3";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-sTkAKxtJa7CVYKuXC//eMmf3l8ABsrEr2mdf1r2Gf9A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
pydantic
|
||||
toml
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest-asyncio
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"-m 'not network'"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"kanidm"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Kanidm client library";
|
||||
homepage = "https://github.com/kanidm/kanidm/tree/master/pykanidm";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ arianvp hexa ];
|
||||
};
|
||||
}
|
|
@ -1,53 +1,63 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, isPy27
|
||||
, numpy
|
||||
, scipy
|
||||
, pytestCheckHook
|
||||
, pytest-cov
|
||||
, pytest-timeout
|
||||
, h5py
|
||||
, matplotlib
|
||||
, nibabel
|
||||
, pandas
|
||||
, scikit-learn
|
||||
, decorator
|
||||
, jinja2
|
||||
, pooch
|
||||
, tqdm
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mne-python";
|
||||
version = "1.0.3";
|
||||
|
||||
disabled = isPy27;
|
||||
version = "1.1.0";
|
||||
|
||||
# PyPI dist insufficient to run tests
|
||||
src = fetchFromGitHub {
|
||||
owner = "mne-tools";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-6eDS/hKqEQqUxJtnfsPhxw9b4p5CC1ifnxVCRBmVVA8=";
|
||||
sha256 = "sha256-p4brwO6uERM2vJdkJ34GdeAKk07QeVEmQrZMPcDjI2I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy scipy ];
|
||||
|
||||
# all tests pass, but Pytest hangs afterwards - probably some thread hasn't terminated
|
||||
doCheck = false;
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytest-cov
|
||||
pytest-timeout
|
||||
h5py
|
||||
propagatedBuildInputs = [
|
||||
decorator
|
||||
jinja2
|
||||
matplotlib
|
||||
numpy
|
||||
pooch
|
||||
scipy
|
||||
setuptools
|
||||
tqdm
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
h5py
|
||||
nibabel
|
||||
pandas
|
||||
pytestCheckHook
|
||||
scikit-learn
|
||||
pytest-timeout
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TMP
|
||||
export MNE_SKIP_TESTING_DATASET_TESTS=true
|
||||
export MNE_SKIP_NETWORK_TESTS=1
|
||||
'';
|
||||
|
||||
# all tests pass, but Pytest hangs afterwards - probably some thread hasn't terminated
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "mne" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "openai";
|
||||
version = "0.22.1";
|
||||
version = "0.23.0";
|
||||
|
||||
disabled = pythonOlder "3.7.1";
|
||||
|
||||
|
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
|||
owner = "openai";
|
||||
repo = "openai-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QUnsm0ui1BFlLqAlH1bp7uDbhiRigePrAPAkSRjftM4=";
|
||||
sha256 = "sha256-VH1XR2FocRX5AYpCruAKwQUXjXqvdJsVwKdtot5Bo+Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pubnub";
|
||||
version = "6.5.1";
|
||||
version = "7.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -21,8 +21,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+x58aEvemav0Pz2jeICLFG36FTtZCu5dk/arb+j5nmo=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-+uW6fsYsn/3PGK4wTQLKcoq+NFNI8SjJ9cL6Q3Fh2uQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydantic";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
|||
owner = "samuelcolvin";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-jqTtNJQ9lRkxDYGG4vg91qH1jrxRU9orEeUofO+bBpA=";
|
||||
sha256 = "sha256-ZGFxyQ1qD3zZWTdfTeoGj3UcUwAzO8K0DySdVAsMHyI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
41
pkgs/development/python-modules/pyisbn/default.nix
Normal file
41
pkgs/development/python-modules/pyisbn/default.nix
Normal file
|
@ -0,0 +1,41 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, hypothesis
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyisbn";
|
||||
version = "1.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "06fm9rn31cb4b61hzy63cnwfjpppgyy517k8a04gzcv9g60n7xbh";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "--cov pyisbn --cov-report term-missing --no-cov-on-fail" ""
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
hypothesis
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pyisbn"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for working with 10- and 13-digit ISBNs";
|
||||
homepage = "https://github.com/JNRowe/pyisbn";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ eigengrau ];
|
||||
};
|
||||
}
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pypinyin";
|
||||
version = "0.46.0";
|
||||
version = "0.47.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozillazg";
|
||||
repo = "python-pinyin";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KPyFvO6TR0mg09xcraHFaWklJgzF5oqk3d8H+G4gh3I=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-DsSrWbnBFEGQTXP1+C8j5RqSplDitsFl+13YwwE+3pE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -9,12 +9,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-httpserver";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "pytest_httpserver";
|
||||
inherit version;
|
||||
sha256 = "6de464ba5f74628d6182ebbdcb56783edf2c9b0caf598dc35c11f014f24a3f0d";
|
||||
sha256 = "sha256-rjKWYm0KEOg1qfQjxhtFQFR9WCQivgVMP8wIYmuqECQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ werkzeug ];
|
||||
|
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywlroots";
|
||||
version = "0.15.19";
|
||||
version = "0.15.20";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Ch8ddN9J8STw3qjAwP9sAta5YBgEg/2wSYgDyWEAXhU=";
|
||||
sha256 = "sha256-hHZzMK7ge2Hs7tzHo4LV3rumEoEoL2OODRQRM60Vlz0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
@ -5,24 +5,25 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyxdg";
|
||||
version = "0.27";
|
||||
version = "0.28";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "xdg";
|
||||
repo = pname;
|
||||
rev = "rel-${version}";
|
||||
sha256 = "1dg826vrc7ifkk4lnf648h61cqfamaqmngkn9hgmxnf9gqmkbn0k";
|
||||
sha256 = "sha256-TrFQzfkXabmfpGYwhxD1UVY1F645KycfSPPrMJFAe+0=";
|
||||
};
|
||||
|
||||
# Tests failed (errors=4, failures=4) on NixOS
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "xdg" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://freedesktop.org/wiki/Software/pyxdg";
|
||||
description = "Contains implementations of freedesktop.org standards";
|
||||
license = licenses.lgpl2;
|
||||
maintainers = with maintainers; [ domenkozar ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "s3-credentials";
|
||||
version = "0.12.1";
|
||||
version = "0.13";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "simonw";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-w0pwQidSAh/CQPVbv4UocbbETyyOT/rcNFE1ixYz4lY=";
|
||||
hash = "sha256-kzu+ySeAi+nRIJSBSJUQzNHD7KVANlWoi0OWKXkc0/8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
, buildPythonPackage
|
||||
, python
|
||||
, cython
|
||||
, pythran
|
||||
, numpy
|
||||
, scipy
|
||||
, matplotlib
|
||||
|
@ -16,25 +17,24 @@
|
|||
, imageio
|
||||
, tifffile
|
||||
, pytestCheckHook
|
||||
, doCheck ? false
|
||||
}:
|
||||
|
||||
let
|
||||
installedPackageRoot = "${builtins.placeholder "out"}/${python.sitePackages}";
|
||||
self = buildPythonPackage rec {
|
||||
pname = "scikit-image";
|
||||
version = "0.18.3";
|
||||
version = "0.19.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0a2h3bw5rkk23k4r04qc9maccg00nddssd7lfsps8nhp5agk1vyh";
|
||||
sha256 = "sha256-zvXgZdvYycFbbMsBFSqMDzLanEtF9+JuVSQ3AM8/LQk=";
|
||||
};
|
||||
|
||||
patches = [ ./add-testing-data.patch ];
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
nativeBuildInputs = [ cython pythran ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cloudpickle
|
||||
|
@ -51,7 +51,7 @@ let
|
|||
];
|
||||
|
||||
# test suite is very cpu intensive, move to passthru.tests
|
||||
inherit doCheck;
|
||||
doCheck = false;
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
# (1) The package has cythonized modules, whose .so libs will appear only in the wheel, i.e. in nix store;
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sensor-state-data";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "Bluetooth-Devices";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jAg/xz7HqXiQuC/fNtUS1gKHdISduHfiWPaWucGAPMY=";
|
||||
hash = "sha256-aWmcAFBLb8YGmZo5xJl5mwYFg8U30pAyTsqte0BwzVg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "slowapi";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "laurentS";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1wjnlhjfgil86h6i5yij723ncg18rqdprs1q6i68w4msaspwpxg9";
|
||||
sha256 = "sha256-3ZkQnroHMCHuTPH/cvi/iWndvdyQ/ZJQ2Qtu1CZyeGg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "snowflake-sqlalchemy";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-9IooTfzXRmOE22huBSduM4kX8ltI6F50nvkUnXRkAFo=";
|
||||
sha256 = "sha256-dJK1biZ6rEpS4kTncfJzHjBLktDZSsqvSGekbmfhves=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinx-design";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
format = "flit";
|
||||
|
||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "sphinx_design";
|
||||
sha256 = "b148a5258061a46ee826d57ea0729260f29b4e9131d2a681545e0d4f3c0f19ee";
|
||||
sha256 = "sha256-cYP6H65Vs37wG9pRJaIe6EH1u8v1mjU4K+WYGAxM77o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flit-core ];
|
||||
|
|
|
@ -1,31 +1,36 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, isPy3k
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlite-fts4";
|
||||
version = "1.0.1";
|
||||
disabled = !isPy3k;
|
||||
version = "1.0.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simonw";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "15r1mijk306fpm61viry5wjhqyxlbqqdk4nfcd901qarx7vqypgy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Ibiows3DSnzjIUv7U9tYNVnDaecBBxjXzDqxbIlNhhU=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"sqlite_fts4"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Custom Python functions for working with SQLite FTS4";
|
||||
homepage = "https://github.com/simonw/sqlite-fts4";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ meatcar ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue