Merge master into staging-next
This commit is contained in:
commit
0b8aa77df1
71 changed files with 8008 additions and 617 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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" ];
|
||||
|
|
|
@ -13055,6 +13055,12 @@
|
|||
githubId = 3268082;
|
||||
name = "Thibaut Marty";
|
||||
};
|
||||
thyol = {
|
||||
name = "thyol";
|
||||
email = "thyol@pm.me";
|
||||
github = "thyol";
|
||||
githubId = 81481634;
|
||||
};
|
||||
thmzlt = {
|
||||
email = "git@thomazleite.com";
|
||||
github = "thmzlt";
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -481,6 +481,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
|
||||
|
|
|
@ -166,6 +166,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`.
|
||||
|
||||
|
|
|
@ -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>
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
@ -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; };
|
||||
|
|
|
@ -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"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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; {
|
||||
|
|
|
@ -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>
|
|
@ -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;
|
||||
};
|
||||
|
|
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) ''
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
|
@ -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 = [
|
||||
|
|
|
@ -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 = [
|
||||
|
|
|
@ -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 = [
|
||||
|
|
|
@ -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; {
|
||||
|
|
|
@ -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 = [
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "weconnect-mqtt";
|
||||
version = "0.39.1";
|
||||
version = "0.39.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "tillsteinbach";
|
||||
repo = "WeConnect-mqtt";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Mmv4rIABg8jlk7a2VYn3lozCdZtAy3w5tK+3z8bwqZA=";
|
||||
hash = "sha256-htLyf7ouy/psG/BJr3nATQjd+bTFETjGEWQYs2uMtSM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "weconnect";
|
||||
version = "0.47.0";
|
||||
version = "0.47.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "tillsteinbach";
|
||||
repo = "WeConnect-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-wQBl8oxU+Dfsgs+udxcb01hquny+AFKnu4J7AULYOdc=";
|
||||
hash = "sha256-qxE8hX6HBmP6s+NivwSgbrPWzUDr8RW9HAyQ21WTiZE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -8,7 +8,9 @@
|
|||
, elfutils
|
||||
, python3
|
||||
, libiberty
|
||||
, libopcodes
|
||||
# TODO: switch back to latest versions when upstream ports
|
||||
# to binutils-2.39: https://github.com/SimonKagstrom/kcov/issues/381
|
||||
, libopcodes_2_38
|
||||
, runCommand
|
||||
, gcc
|
||||
, rustc
|
||||
|
@ -30,7 +32,7 @@ let
|
|||
preConfigure = "patchShebangs src/bin-to-c-source.py";
|
||||
nativeBuildInputs = [ cmake pkg-config python3 ];
|
||||
|
||||
buildInputs = [ curl zlib elfutils libiberty libopcodes ];
|
||||
buildInputs = [ curl zlib elfutils libiberty libopcodes_2_38 ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mill";
|
||||
version = "0.10.6";
|
||||
version = "0.10.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly";
|
||||
hash = "sha256-4lbW755RLgWyihjeb/KB5CwQsBwXBzDT4PUSyBQiSpE=";
|
||||
hash = "sha256-pRyuTxQWRnGBTasdskIZ0F1LGgwE+Y5ksHsE1Rmp1Bg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
@ -50,6 +50,9 @@ stdenv.mkDerivation rec {
|
|||
runHook preInstall
|
||||
mkdir $out
|
||||
mv parser $out/
|
||||
if [[ -d "$src/queries" ]]; then
|
||||
cp -r $src/queries $out/
|
||||
fi
|
||||
runHook postInstall
|
||||
'';
|
||||
}
|
||||
|
|
|
@ -12,23 +12,22 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-analyzer-unwrapped";
|
||||
version = "2022-08-01";
|
||||
cargoSha256 = "sha256-7ZYrIFSIOlL1JojtaQBIvvlfvjZGlR40PKVjmEtMBMo=";
|
||||
version = "2022-08-22";
|
||||
cargoSha256 = "sha256-A1oH2He1nEmVmBBTfMsZpJNKNtIQpmNx3AE56e9Z1qk=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "rust-analyzer";
|
||||
rev = version;
|
||||
sha256 = "sha256-OUezy1BkIoqpkTE5wOtsjJ/Gy48Ql8EL1/t6MZzRkWw=";
|
||||
sha256 = "sha256-G/IElEE6eetQcLpESXCQtuYED/uTrsdeZj8fkqC3FSM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Code format check requires more dependencies but don't really matter for packaging.
|
||||
# So just ignore it.
|
||||
./ignore-rustfmt-test.patch
|
||||
];
|
||||
cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ];
|
||||
cargoTestFlags = [ "--package" "rust-analyzer" "--package" "proc-macro-srv-cli" ];
|
||||
|
||||
buildAndTestSubdir = "crates/rust-analyzer";
|
||||
# Code format check requires more dependencies but don't really matter for packaging.
|
||||
# So just ignore it.
|
||||
checkFlags = ["--skip=tidy::check_code_formatting"];
|
||||
|
||||
nativeBuildInputs = lib.optional useMimalloc cmake;
|
||||
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
--- a/crates/rust-analyzer/tests/slow-tests/tidy.rs
|
||||
+++ b/crates/rust-analyzer/tests/slow-tests/tidy.rs
|
||||
@@ -6,6 +6,7 @@ use std::{
|
||||
use xshell::{cmd, pushd, pushenv, read_file};
|
||||
|
||||
#[test]
|
||||
+#[ignore]
|
||||
fn check_code_formatting() {
|
||||
let _dir = pushd(sourcegen::project_root()).unwrap();
|
||||
let _e = pushenv("RUSTUP_TOOLCHAIN", "stable");
|
|
@ -2,19 +2,19 @@
|
|||
let
|
||||
# You can check the latest version with `curl -sS https://update.tabnine.com/bundles/version`
|
||||
# There's a handy prefetch script in ./fetch-latest.sh
|
||||
version = "4.4.98";
|
||||
version = "4.4.123";
|
||||
supportedPlatforms = {
|
||||
"x86_64-linux" = {
|
||||
name = "x86_64-unknown-linux-musl";
|
||||
hash = "sha256-AYgv/XrHjEOhtyx8QeOhssdsc/fssShZcA+15fFgI1g=";
|
||||
hash = "sha256-mkG7Fd82L5vnS/K1UQF/JZCdQYsnPZ1iTISqFjXXnq0=";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
name = "x86_64-apple-darwin";
|
||||
hash = "sha256-XUd97ZUUb8XqMrlnSBER68fU3+58zpwKnzZ+i3dlWIs=";
|
||||
hash = "sha256-+B9Oobhh1TmDoRhNlObn5jYrDgsjvpTKguwj3wbkaO0=";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
name = "aarch64-apple-darwin";
|
||||
hash = "sha256-L2r4fB4OtJJUvwnFP7zYAm8RLf8b7r6kDNGlwZRkLnw=";
|
||||
hash = "sha256-HNZSQaVd8530sM4JpUTWfo7aTfKaJHg00u+M/x/pKdQ=";
|
||||
};
|
||||
};
|
||||
platform =
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch
|
||||
, cmake, pkg-config, flex, bison
|
||||
, llvmPackages, elfutils
|
||||
, libbfd, libbpf, libopcodes, bcc
|
||||
|
@ -36,6 +36,17 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-9adZAKSn00W2yNwVDbVB1/O5Y+10c4EkVJGCHyd4Tgg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull upstream fix for binutils-2.39:
|
||||
# https://github.com/iovisor/bpftrace/pull/2328
|
||||
(fetchpatch {
|
||||
name = "binutils-2.39.patch";
|
||||
url = "https://github.com/iovisor/bpftrace/commit/3be6e708d514d3378a4fe985ab907643ecbc77ee.patch";
|
||||
sha256 = "sha256-WWEh8ViGw8053nEG/29KeKEHV5ossWPtL/AAV/l+pnY=";
|
||||
excludes = [ "CHANGELOG.md" ];
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = with llvmPackages;
|
||||
[ llvm libclang
|
||||
elfutils bcc
|
||||
|
|
|
@ -10,11 +10,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nfs-utils";
|
||||
version = "2.5.1";
|
||||
version = "2.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1i1h3n2m35q9ixs1i2qf1rpjp10cipa3c25zdf1xj1vaw5q8270g";
|
||||
url = "mirror://kernel/linux/utils/nfs-utils/${version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-UgCHPoHE1hDiRi/CYv4YE18tvni3l5+VrM0VmuZNUBE=";
|
||||
};
|
||||
|
||||
# libnfsidmap is built together with nfs-utils from the same source,
|
||||
|
@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
|
|||
"--enable-libmount-mount"
|
||||
"--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap
|
||||
"--with-rpcgen=${buildPackages.rpcsvc-proto}/bin/rpcgen"
|
||||
"--with-modprobedir=${placeholder "out"}/etc/modprobe.d"
|
||||
];
|
||||
|
||||
patches = lib.optionals stdenv.hostPlatform.isMusl [
|
||||
|
@ -71,6 +72,9 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace systemd/nfs-utils.service \
|
||||
--replace "/bin/true" "${coreutils}/bin/true"
|
||||
|
||||
substituteInPlace tools/nfsrahead/Makefile.in \
|
||||
--replace "/usr/lib/udev/rules.d/" "$out/lib/udev/rules.d/"
|
||||
|
||||
substituteInPlace utils/mount/Makefile.in \
|
||||
--replace "chmod 4511" "chmod 0511"
|
||||
|
||||
|
|
|
@ -13,6 +13,8 @@ let
|
|||
kernel = callPackage # a hacky way of extracting parameters from callPackage
|
||||
({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { };
|
||||
|
||||
kernelModVersion = lib.versions.majorMinor kernel.modDirVersion;
|
||||
|
||||
selectHighestVersion = a: b: if lib.versionOlder a.version b.version
|
||||
then b
|
||||
else a;
|
||||
|
@ -30,6 +32,8 @@ rec {
|
|||
openSha256 = "sha256-GCCDnaDsbXTmbCYZBCM3fpHmOSWti/DkBJwYrRGAMPI=";
|
||||
settingsSha256 = "sha256-kBELMJCIWD9peZba14wfCoxsi3UXO3ehFYcVh4nvzVg=";
|
||||
persistencedSha256 = "sha256-P8oT7g944HvNk2Ot/0T0sJM7dZs+e0d+KwbwRrmsuDY=";
|
||||
|
||||
brokenOpen = kernelModVersion == "5.4" && kernel.isHardened;
|
||||
};
|
||||
|
||||
latest = selectHighestVersion production (generic {
|
||||
|
@ -50,14 +54,16 @@ rec {
|
|||
# Vulkan developer beta driver
|
||||
# See here for more information: https://developer.nvidia.com/vulkan-driver
|
||||
vulkan_beta = generic rec {
|
||||
version = "470.62.13";
|
||||
persistencedVersion = "470.86";
|
||||
settingsVersion = "470.86";
|
||||
sha256_64bit = "sha256-itBFNPMy+Nn0g8V8qdkRb+ELHj57GRso1lXhPHUxKVI=";
|
||||
settingsSha256 = "sha256-fq6RlD6g3uylvvTjE4MmaQwxPJYU0u6IMfpPVzks0tI=";
|
||||
persistencedSha256 = "sha256-eHvauvh8Wd+b8DK6B3ZWNjoWGztupWrR8iog9ok58io=";
|
||||
version = "515.49.14";
|
||||
persistencedVersion = "515.48.07";
|
||||
settingsVersion = "515.48.07";
|
||||
sha256_64bit = "sha256-xNaqTeIfYQIdCxo841rQ87RQc+br5OhP6K12o4V3I18=";
|
||||
openSha256 = "sha256-4KvOOAR0RQkHTFJkkG32y6uOSHB85Lh6PyVSgRjU1l4=";
|
||||
settingsSha256 = "sha256-XwdMsAAu5132x2ZHqjtFvcBJk6Dao7I86UksxrOkknU=";
|
||||
persistencedSha256 = "sha256-BTfYNDJKe4tOvV71/1JJSPltJua0Mx/RvDcWT5ccRRY=";
|
||||
url = "https://developer.nvidia.com/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux";
|
||||
broken = kernel.kernelAtLeast "5.17";
|
||||
|
||||
broken = kernelModVersion == "5.4" && kernel.isHardened;
|
||||
};
|
||||
|
||||
# Update note:
|
||||
|
@ -84,7 +90,7 @@ rec {
|
|||
|
||||
patches =
|
||||
let patch390 = o:
|
||||
(lib.optional ((lib.versions.majorMinor kernel.modDirVersion) == o.version) (fetchpatch {
|
||||
(lib.optional (kernelModVersion == o.version) (fetchpatch {
|
||||
inherit (o) sha256;
|
||||
url = "https://gitlab.com/herecura/packages/nvidia-390xx-dkms/-/raw/herecura/kernel-${o.version}.patch";
|
||||
}));
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
, prePatch ? ""
|
||||
, patches ? []
|
||||
, broken ? false
|
||||
, brokenOpen ? broken
|
||||
}@args:
|
||||
|
||||
{ lib, stdenv, callPackage, pkgs, pkgsi686Linux, fetchurl
|
||||
|
@ -104,8 +105,9 @@ let
|
|||
|
||||
passthru = {
|
||||
open = mapNullable (hash: callPackage ./open.nix {
|
||||
inherit hash broken;
|
||||
inherit hash;
|
||||
nvidia_x11 = self;
|
||||
broken = brokenOpen;
|
||||
}) openSha256;
|
||||
settings = (if settings32Bit then pkgsi686Linux.callPackage else callPackage) (import ./settings.nix self settingsSha256) {
|
||||
withGtk2 = preferGtk2;
|
||||
|
|
|
@ -3,13 +3,13 @@
|
|||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "raspberrypi-eeprom";
|
||||
version = "unstable-2022-03-10";
|
||||
version = "2022.04.26-138a1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raspberrypi";
|
||||
repo = "rpi-eeprom";
|
||||
rev = "e8927007e3800db3a72100ee6cd38b0d9b687c16";
|
||||
hash = "sha256-/hn6l5gheh6E3zoANwU1SXYgdry2IjOT9Muw2jkrtCU=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/Y+EaAxJQofDRE67HY8AVqAdOPdFI01/EhYCAT5qlSM=";
|
||||
};
|
||||
|
||||
buildInputs = [ python3 ];
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
, enableLinode ? true
|
||||
, enableMarathon ? true
|
||||
, enableMoby ? true
|
||||
, enableNomad ? true
|
||||
, enableOpenstack ? true
|
||||
, enablePuppetDB ? true
|
||||
, enableScaleway ? true
|
||||
|
@ -30,10 +31,10 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "2.36.0";
|
||||
version = "2.38.0";
|
||||
webUiStatic = fetchurl {
|
||||
url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz";
|
||||
sha256 = "sha256-C+Np2mqAYQ1RUqYmql0eudPD/SpWmxdMQLe85SenIA4=";
|
||||
sha256 = "sha256-0CcWHJYso9iI1isCa2ZKYtNpfqcUt5sj23xkufxv6rw=";
|
||||
};
|
||||
in
|
||||
buildGoModule rec {
|
||||
|
@ -44,10 +45,10 @@ buildGoModule rec {
|
|||
rev = "v${version}";
|
||||
owner = "prometheus";
|
||||
repo = "prometheus";
|
||||
sha256 = "sha256-FJXNCGIVj1OVWXwbXY6k65lXJCe1MqiqK7tw8nGWrEg=";
|
||||
sha256 = "sha256-5s2Q3xjublHAQSB6MaxZTMOPS0T6/Bn5Ki8NCkBYM2E=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-kmAQGRFmGRJ3LuGLMcSc0bJuwMsKhYVUIqQ9vDSH0Cc=";
|
||||
vendorSha256 = "sha256-wfHdfW4D4ESbglUUjAl5a93aJqLuQkqKHMChHGnCmCg=";
|
||||
|
||||
excludedPackages = [ "documentation/prometheus-mixin" ];
|
||||
|
||||
|
@ -85,6 +86,8 @@ buildGoModule rec {
|
|||
"echo - github.com/prometheus/prometheus/discovery/marathon"}
|
||||
${lib.optionalString (enableMoby)
|
||||
"echo - github.com/prometheus/prometheus/discovery/moby"}
|
||||
${lib.optionalString (enableNomad)
|
||||
"echo - github.com/prometheus/prometheus/discovery/nomad"}
|
||||
${lib.optionalString (enableOpenstack)
|
||||
"echo - github.com/prometheus/prometheus/discovery/openstack"}
|
||||
${lib.optionalString (enablePuppetDB)
|
||||
|
|
|
@ -1,25 +1,25 @@
|
|||
#
|
||||
# Files came from this Hydra build:
|
||||
#
|
||||
# https://hydra.nixos.org/build/172142499
|
||||
# https://hydra.nixos.org/build/186237511
|
||||
#
|
||||
# Which used nixpkgs revision 49a83445c28c4ffb8a1a90a1f68e6150ea48893b
|
||||
# Which used nixpkgs revision ac43c444780a80e789fd14fe2114acd4a3b5cf9d
|
||||
# to instantiate:
|
||||
#
|
||||
# /nix/store/gj272sd56gsj6qpyzh4njpfzwdhviliz-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu.drv
|
||||
# /nix/store/nhjbza9vlcyhp9zxfz6lwpc3m2ghrpzj-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu.drv
|
||||
#
|
||||
# and then built:
|
||||
#
|
||||
# /nix/store/n81pljbd8m0xgypm84krc2bnvqgjrfxx-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu
|
||||
# /nix/store/fklpm7fy6cp5wz55w0gd8wakyqvzapjx-stdenv-bootstrap-tools-powerpc64le-unknown-linux-gnu
|
||||
#
|
||||
{
|
||||
busybox = import <nix/fetchurl.nix> {
|
||||
url = "http://tarballs.nixos.org/stdenv-linux/powerpc64le/49a83445c28c4ffb8a1a90a1f68e6150ea48893b/busybox";
|
||||
sha256 = "sha256-UscnfGKOZAKLkPcRtwrbT5Uj8m3Kj9jhkKp9MUc1eCY=";
|
||||
url = "http://tarballs.nixos.org/stdenv-linux/powerpc64le/ac43c444780a80e789fd14fe2114acd4a3b5cf9d/busybox";
|
||||
sha256 = "sha256-jtPEAsht4AUAG4MLK8xocQSfveUR4ppU1lS4bGI1VN4=";
|
||||
executable = true;
|
||||
};
|
||||
bootstrapTools =import <nix/fetchurl.nix> {
|
||||
url = "http://tarballs.nixos.org/stdenv-linux/powerpc64le/49a83445c28c4ffb8a1a90a1f68e6150ea48893b/bootstrap-tools.tar.xz";
|
||||
sha256 = "sha256-A20GKGn3rM8K2JcU0SApRp3+avUE+bIm1h632AitRzU=";
|
||||
bootstrapTools = import <nix/fetchurl.nix> {
|
||||
url = "http://tarballs.nixos.org/stdenv-linux/powerpc64le/ac43c444780a80e789fd14fe2114acd4a3b5cf9d/bootstrap-tools.tar.xz";
|
||||
sha256 = "sha256-MpIDnpZUK3M17qlnuoxfnK0EgxRosm3TMW1WfPZ1+jU=";
|
||||
};
|
||||
}
|
||||
|
|
6910
pkgs/tools/admin/google-cloud-sdk/components.json
Normal file
6910
pkgs/tools/admin/google-cloud-sdk/components.json
Normal file
File diff suppressed because it is too large
Load diff
173
pkgs/tools/admin/google-cloud-sdk/components.nix
Normal file
173
pkgs/tools/admin/google-cloud-sdk/components.nix
Normal file
|
@ -0,0 +1,173 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, google-cloud-sdk
|
||||
, system
|
||||
, snapshotPath
|
||||
, ...
|
||||
}:
|
||||
|
||||
let
|
||||
# Mapping from GCS component architecture names to Nix archictecture names
|
||||
arches = {
|
||||
x86 = "i686";
|
||||
x86_64 = "x86_64";
|
||||
# TODO arm
|
||||
};
|
||||
|
||||
# Mapping from GCS component operating systems to Nix operating systems
|
||||
oses = {
|
||||
LINUX = "linux";
|
||||
MACOSX = "darwin";
|
||||
WINDOWS = "windows";
|
||||
CYGWIN = "cygwin";
|
||||
};
|
||||
|
||||
# Convert an archicecture + OS to a Nix platform
|
||||
toNixPlatform = arch: os:
|
||||
let
|
||||
arch' = arches.${arch} or (throw "unsupported architecture '${arch}'");
|
||||
os' = oses.${os} or (throw "unsupported OS '${os}'");
|
||||
in
|
||||
"${arch'}-${os'}";
|
||||
|
||||
# All architectures that are supported
|
||||
allArches = builtins.attrValues arches;
|
||||
|
||||
# A description of all available google-cloud-sdk components.
|
||||
# It's a JSON file with a list of components, along with some metadata
|
||||
snapshot = builtins.fromJSON (builtins.readFile snapshotPath);
|
||||
|
||||
# Generate a snapshot file for a single component. It has the same format as
|
||||
# `snapshot`, but only contains a single component. These files are
|
||||
# installed with google-cloud-sdk to let it know which components are
|
||||
# available.
|
||||
snapshotFromComponent =
|
||||
{ component
|
||||
, revision
|
||||
, schema_version
|
||||
, version
|
||||
}:
|
||||
builtins.toJSON {
|
||||
components = [ component ];
|
||||
inherit revision schema_version version;
|
||||
};
|
||||
|
||||
# Generate a set of components from a JSON file describing these components
|
||||
componentsFromSnapshot =
|
||||
{ components
|
||||
, revision
|
||||
, schema_version
|
||||
, version
|
||||
, ...
|
||||
}:
|
||||
lib.fix (
|
||||
self:
|
||||
builtins.listToAttrs (
|
||||
builtins.map
|
||||
(component: {
|
||||
name = component.id;
|
||||
value = componentFromSnapshot self { inherit component revision schema_version version; };
|
||||
})
|
||||
components
|
||||
)
|
||||
);
|
||||
|
||||
# Generate a single component from its snapshot, along with a set of
|
||||
# available dependencies to choose from.
|
||||
componentFromSnapshot =
|
||||
# Component derivations that can be used as dependencies
|
||||
components:
|
||||
# This component's snapshot
|
||||
{ component
|
||||
, revision
|
||||
, schema_version
|
||||
, version
|
||||
} @ attrs:
|
||||
let
|
||||
baseUrl = builtins.dirOf schema_version.url;
|
||||
# Architectures supported by this component. Defaults to all available
|
||||
# architectures.
|
||||
architectures = builtins.filter
|
||||
(arch: builtins.elem arch (builtins.attrNames arches))
|
||||
(lib.attrByPath [ "platform" "architectures" ] allArches component);
|
||||
# Operating systems supported by this component
|
||||
operating_systems = builtins.filter
|
||||
(os: builtins.elem os (builtins.attrNames oses))
|
||||
component.platform.operating_systems;
|
||||
in
|
||||
mkComponent
|
||||
{
|
||||
name = component.id;
|
||||
version = component.version.version_string;
|
||||
src =
|
||||
if lib.hasAttrByPath [ "data" "source" ] component
|
||||
then "${baseUrl}/${component.data.source}"
|
||||
else "";
|
||||
sha256 = lib.attrByPath [ "data" "checksum" ] "" component;
|
||||
dependencies = builtins.map (dep: builtins.getAttr dep components) component.dependencies;
|
||||
platforms =
|
||||
if component.platform == { }
|
||||
then lib.platforms.all
|
||||
else
|
||||
builtins.concatMap
|
||||
(arch: builtins.map (os: toNixPlatform arch os) operating_systems)
|
||||
architectures;
|
||||
snapshot = snapshotFromComponent attrs;
|
||||
};
|
||||
|
||||
# Filter out dependencies not supported by current system
|
||||
filterForSystem = builtins.filter (drv: builtins.elem system drv.meta.platforms);
|
||||
|
||||
# Make a google-cloud-sdk component
|
||||
mkComponent =
|
||||
{ name
|
||||
, version
|
||||
# Source tarball, if any
|
||||
, src ? ""
|
||||
# Checksum for the source tarball, if there is a source
|
||||
, sha256 ? ""
|
||||
# Other components this one depends on
|
||||
, dependencies ? [ ]
|
||||
# Short text describing the component
|
||||
, description ? ""
|
||||
# Platforms supported
|
||||
, platforms ? lib.platforms.all
|
||||
# The snapshot corresponding to this component
|
||||
, snapshot
|
||||
}: stdenv.mkDerivation {
|
||||
inherit name version snapshot;
|
||||
src =
|
||||
if src != "" then
|
||||
builtins.fetchurl
|
||||
{
|
||||
url = src;
|
||||
inherit sha256;
|
||||
} else "";
|
||||
phases = [ "installPhase" "fixupPhase" ];
|
||||
installPhase = ''
|
||||
mkdir -p $out/google-cloud-sdk/.install
|
||||
|
||||
# If there is a source, unpack it
|
||||
if [ ! -z "$src" ]; then
|
||||
tar -xf $src -C $out/google-cloud-sdk/
|
||||
|
||||
# If the source has binaries, link them to `$out/bin`
|
||||
if [ -d "$out/google-cloud-sdk/bin" ]; then
|
||||
mkdir $out/bin
|
||||
find $out/google-cloud-sdk/bin/ -type f -exec ln -s {} $out/bin/ \;
|
||||
fi
|
||||
fi
|
||||
|
||||
# Write the snapshot file to the `.install` folder
|
||||
cp $snapshotPath $out/google-cloud-sdk/.install/${name}.snapshot.json
|
||||
'';
|
||||
passthru = {
|
||||
dependencies = filterForSystem dependencies;
|
||||
};
|
||||
passAsFile = [ "snapshot" ];
|
||||
meta = {
|
||||
inherit description platforms;
|
||||
};
|
||||
};
|
||||
in
|
||||
componentsFromSnapshot snapshot
|
|
@ -7,7 +7,7 @@
|
|||
# 3) used by `google-cloud-sdk` only on GCE guests
|
||||
#
|
||||
|
||||
{ stdenv, lib, fetchurl, makeWrapper, nixosTests, python, openssl, jq, with-gce ? false }:
|
||||
{ stdenv, lib, fetchurl, makeWrapper, nixosTests, python, openssl, jq, callPackage, with-gce ? false }:
|
||||
|
||||
let
|
||||
pythonEnv = python.withPackages (p: with p; [
|
||||
|
@ -21,6 +21,12 @@ let
|
|||
sources = system:
|
||||
data.googleCloudSdkPkgs.${system} or (throw "Unsupported system: ${system}");
|
||||
|
||||
components = callPackage ./components.nix {
|
||||
snapshotPath = ./components.json;
|
||||
};
|
||||
|
||||
withExtraComponents = callPackage ./withExtraComponents.nix { inherit components; };
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "google-cloud-sdk";
|
||||
inherit (data) version;
|
||||
|
@ -105,6 +111,10 @@ in stdenv.mkDerivation rec {
|
|||
$out/bin/gcloud version --format json | jq '."Google Cloud SDK"' | grep "${version}"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit components withExtraComponents;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tools for the google cloud platform";
|
||||
longDescription = "The Google Cloud SDK. This package has the programs: gcloud, gsutil, and bq";
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p nix
|
||||
|
||||
BASE_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk"
|
||||
CHANNEL_URL="https://dl.google.com/dl/cloudsdk/channels/rapid"
|
||||
BASE_URL="$CHANNEL_URL/downloads/google-cloud-sdk"
|
||||
|
||||
# Version of Google Cloud SDK from
|
||||
# https://cloud.google.com/sdk/docs/release-notes
|
||||
|
@ -45,3 +46,5 @@ EOF
|
|||
echo "}"
|
||||
|
||||
} >data.nix
|
||||
|
||||
curl "${CHANNEL_URL}/components-v${VERSION}.json" > components.json
|
||||
|
|
61
pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix
Normal file
61
pkgs/tools/admin/google-cloud-sdk/withExtraComponents.nix
Normal file
|
@ -0,0 +1,61 @@
|
|||
{ lib, google-cloud-sdk, callPackage, runCommand, components }:
|
||||
|
||||
comps_:
|
||||
|
||||
let
|
||||
# Remove components which are already installed by default
|
||||
filterPreInstalled =
|
||||
let
|
||||
preInstalledComponents = with components; [ bq bq-nix core core-nix gcloud-deps gcloud gsutil gsutil-nix ];
|
||||
in
|
||||
builtins.filter (drv: !(builtins.elem drv preInstalledComponents));
|
||||
|
||||
# Recursively build a list of components with their dependencies
|
||||
# TODO this could be made faster, it checks the dependencies too many times
|
||||
findDepsRecursive = lib.converge
|
||||
(drvs: lib.unique (drvs ++ (builtins.concatMap (drv: drv.dependencies) drvs)));
|
||||
|
||||
# Components to install by default
|
||||
defaultComponents = with components; [ alpha beta ];
|
||||
|
||||
comps = [ google-cloud-sdk ] ++ filterPreInstalled (findDepsRecursive (defaultComponents ++ comps_));
|
||||
in
|
||||
# Components are installed by copying the `google-cloud-sdk` package, along
|
||||
# with each component, over to a new location, and then patching that location
|
||||
# with `sed` to ensure the proper paths are used.
|
||||
# For some reason, this does not work properly with a `symlinkJoin`: the
|
||||
# `gcloud` binary doesn't seem able to find the installed components.
|
||||
runCommand "google-cloud-sdk-${google-cloud-sdk.version}"
|
||||
{
|
||||
inherit (google-cloud-sdk) meta;
|
||||
inherit comps;
|
||||
passAsFile = [ "comps" ];
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase =
|
||||
let
|
||||
compNames = builtins.map (drv: drv.name) comps_;
|
||||
in
|
||||
''
|
||||
$out/bin/gcloud components list > component_list.txt
|
||||
for comp in ${builtins.toString compNames}; do
|
||||
if [ ! grep ... component_list.txt | grep "Not Installed" ]; then
|
||||
echo "Failed to install component '$comp'"
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
'';
|
||||
}
|
||||
''
|
||||
mkdir -p $out
|
||||
|
||||
# Install each component
|
||||
for comp in $(cat $compsPath); do
|
||||
echo "installing component $comp"
|
||||
cp -dRf $comp/. $out
|
||||
find $out -type d -exec chmod 744 {} +
|
||||
done
|
||||
|
||||
# Replace references to the original google-cloud-sdk with this one
|
||||
find $out/google-cloud-sdk/bin/ -type f -exec sed -i -e "s#${google-cloud-sdk}#$out#" {} \;
|
||||
''
|
|
@ -1,49 +1,49 @@
|
|||
# DO NOT EDIT! This file is generated automatically by update.sh
|
||||
{ }:
|
||||
{
|
||||
version = "3.37.2";
|
||||
version = "3.38.0";
|
||||
pulumiPkgs = {
|
||||
x86_64-linux = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.37.2-linux-x64.tar.gz";
|
||||
sha256 = "0zdln1zw92brg17dbcwms3ak3sigj1s3x52vk41maqikxcjza1k5";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.38.0-linux-x64.tar.gz";
|
||||
sha256 = "1335rb4aki9pj5m8v6c90mg8wwj8afnzj8mk5q2hj5p48fhzv1ry";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.2.0-linux-amd64.tar.gz";
|
||||
sha256 = "1zyd967mgk2bk7kazj6ds4yqmnpc3nh3j40a4zlrjpj03njjmv9i";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.3.1-linux-amd64.tar.gz";
|
||||
sha256 = "025573virxpcak26blq5l40dqznaipkbgdmibxkkzhb8jhzwy8rp";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.0.0-linux-amd64.tar.gz";
|
||||
sha256 = "0anmkwqwwnk44069d01crrj3y73nrwa5hknxc8fh3x1vwc2jzvfc";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.26.0-linux-amd64.tar.gz";
|
||||
sha256 = "1by8qg9yrm2l0i7hkmgan26hhcjjvbyifyhfcq69d32n20i32ksv";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-linux-amd64.tar.gz";
|
||||
sha256 = "1hbjni74gqyfsp4amn1mimz53v89fhrmpq3aa46a6mgvv47215ks";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.5.0-linux-amd64.tar.gz";
|
||||
sha256 = "1wjk0033xh1nhq2b76nsxb43jfraf1jm257m3z1gqzyqpjnpc2cp";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.6.1-linux-amd64.tar.gz";
|
||||
sha256 = "10bckr3lr4yxfhd41wlhngskmz56kfsscjjjkvnbijg7g6ijxz2z";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.11.0-linux-amd64.tar.gz";
|
||||
sha256 = "18ds6znrr96qhg01c3ldk5l5a16d6f09gn1h2ln3lhxygxjjjzda";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.12.0-linux-amd64.tar.gz";
|
||||
sha256 = "1hydlkbqxx7wn2dmzgnb7j7pshsy3mp4klmr8nn2qc8w8g0b4f2w";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.10.0-linux-amd64.tar.gz";
|
||||
sha256 = "1fcvi8ms400qlmgzcniw5pvj46si2rk4jzn57vr5a96qyy1qrpsy";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.11.0-linux-amd64.tar.gz";
|
||||
sha256 = "1ggqrmdrhs2rj9vzxghb0900w1mw93cygxiididnrq6774wna19v";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.14.0-linux-amd64.tar.gz";
|
||||
sha256 = "0ail3jy9msc8ximkm1i47zca36vrrw99p9qsnp37gp9y6nr2z65y";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.26.1-linux-amd64.tar.gz";
|
||||
sha256 = "01i43wi9h5693px5mvg55xim6hbf85nzi1maz0p7ys5sicglzng4";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.27.0-linux-amd64.tar.gz";
|
||||
sha256 = "04ya7a9gfng3vlfxd0536a44gc0dvpvdmpf81n0c5rc09w96q77a";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-linux-amd64.tar.gz";
|
||||
sha256 = "12sxvvjzf9761cag1kah7sdvjg98mi05jrfy0g06xf7lghlyxpcr";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.16.0-linux-amd64.tar.gz";
|
||||
sha256 = "1xlb55nk9sm149qf8lbgnkvdygw9bzz2637j8rh3psijknj9m7m4";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.9.0-linux-amd64.tar.gz";
|
||||
sha256 = "0fhbp72nr3pjzkw3iq495h1p7lp6h02rw8hbnm0jqlz32i68z07b";
|
||||
|
@ -57,12 +57,12 @@
|
|||
sha256 = "1y9kpr1kafjp8hvrvpx0mp6i23sf2m5f229kw5hr1h718pnkymwc";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.14.0-linux-amd64.tar.gz";
|
||||
sha256 = "1s20aknj8vlfp5zh9n959xjhyb106aldiw25yzhj77zp598n7rql";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.15.1-linux-amd64.tar.gz";
|
||||
sha256 = "0g1msaiirzwz5cz2hmid53lj9a5a82psxmv7fskfmhsv2w0zy4k4";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.2.0-linux-amd64.tar.gz";
|
||||
sha256 = "08hy3qcf8dg36s3p9jm1mbknqp139izjdnr5ic4i8c3vycid0r1i";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.4.1-linux-amd64.tar.gz";
|
||||
sha256 = "0nxbbkk98w35dxsibfc67m6y5b2h48kckk62i2qw0ix2v8qgmcks";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-amd64.tar.gz";
|
||||
|
@ -73,32 +73,32 @@
|
|||
sha256 = "1f2ivpqd6vhwq6pz1gh69fdzh7qh4sicnlwmmqspvw5wl1zxi42p";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.32.0-linux-amd64.tar.gz";
|
||||
sha256 = "0y07fifkgnxdl9fqvx9y5mm19fkkp7gfv9z7mspn7s9qf1c9bjzz";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.34.0-linux-amd64.tar.gz";
|
||||
sha256 = "10skfvwhbs1zaa37849ba5798f2jn2cccz27ivvhkbk14yihgnw9";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.14.0-linux-amd64.tar.gz";
|
||||
sha256 = "0ckwvnidp6n7rvccs36966fab0mg6rk5y0ip7l806r7bx7w61aaj";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.16.0-linux-amd64.tar.gz";
|
||||
sha256 = "13sdprhj4wi49cfgabaf2w171bqc97as592wrzsbda546przxk1c";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.1-linux-amd64.tar.gz";
|
||||
sha256 = "0fhwi0d136zmppcq1mbf8hnsk9l28vk1qs30fs2p045qdadbzjg9";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.8.0-linux-amd64.tar.gz";
|
||||
sha256 = "08kal2cwbaaxif0hxzxylrqkg0msz1jw1l65dzp3r903jclwc1zx";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.22.0-linux-amd64.tar.gz";
|
||||
sha256 = "17lr9cf0fgw063y9zx87m54h8fzq0iiagm8b90264csdk2gppqdq";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.23.0-linux-amd64.tar.gz";
|
||||
sha256 = "16cigqfls82z80a43sx3q71qchr0wnww5ryw0vqiqjb8kkzfb8lx";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.0-linux-amd64.tar.gz";
|
||||
sha256 = "1af284q58vvrzny91f0x3cmam5nwipvcpn6m4sxvyb8a35h08w4d";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.1-linux-amd64.tar.gz";
|
||||
sha256 = "09i6lh9wfsfpa5jkj2nb80f3gvmpg3m3flfgfcc794khlrikqmib";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.20.2-linux-amd64.tar.gz";
|
||||
sha256 = "192f1nn5xyfld26llcg11708bgc1dfq0nsl90cgywy05fx65p1py";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.20.5-linux-amd64.tar.gz";
|
||||
sha256 = "1kg57mhm8yhrxipznhlvv1wa2mg0jxybsv5y97sh42zz2ybf60w6";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.9.0-linux-amd64.tar.gz";
|
||||
sha256 = "18x4pyn4riscg3cfb1n7nylm1q8rmm82g1kchx6nys26jqcllp7a";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.0-linux-amd64.tar.gz";
|
||||
sha256 = "1w47s1bkjn4xj12b6ygj7qhawd4svycwq7f5lj3l2dsyf1q17ynd";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.0-linux-amd64.tar.gz";
|
||||
|
@ -109,28 +109,28 @@
|
|||
sha256 = "0lj01hyjyq3qazkryvvxkx6nwai3bac9shqxb6hcqv4pfdjzzxhr";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.8.0-linux-amd64.tar.gz";
|
||||
sha256 = "111q7jxkjni1091m3kp9c2n1zqlkiy7lrfsrqk4bzpcf67krk9vj";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.9.0-linux-amd64.tar.gz";
|
||||
sha256 = "1yva7q0xbgz03807cmk0p7glzw6amsr259r230hhkx1iyx4mdj1m";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.5.0-linux-amd64.tar.gz";
|
||||
sha256 = "08wyx9j5q9pn1jya849wg35v2d7kagzj77h8qr94j8w7agf6ds2a";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.1-linux-amd64.tar.gz";
|
||||
sha256 = "1jk6kjqkm1x1jmx3bfsskirk6if97c5pg0b0jxn0v36j09x6k3as";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.2-linux-amd64.tar.gz";
|
||||
sha256 = "0vxspn9rjb928ax4755086kil6j3616ga5zn3d6xrwm9cvmal0kb";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.12.0-linux-amd64.tar.gz";
|
||||
sha256 = "0n1chk9dnr8yrbfgcvhgfd6cl7yqh8cvwflwrcr5k7lym6hnd06b";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.13.0-linux-amd64.tar.gz";
|
||||
sha256 = "1ymcbqb2rx8g1nsvppasqlc2ws00jzrx33k6cghy14yjkd82n6pv";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-linux-amd64.tar.gz";
|
||||
sha256 = "0rdvz6ibk41dhyfsqblfj56ib5hrr6vsx0z9kgzz5qamyjd1580h";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.7.1-linux-amd64.tar.gz";
|
||||
sha256 = "0p1vh1hp90niqdr3scmh4pwb177lv6d3nqp6apcjabsg5w5nmim9";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.9.0-linux-amd64.tar.gz";
|
||||
sha256 = "1i5y1kqyc84v90c7lh5gaydk5qvvs62gc6xxd6n8zzmn9ygkr0c4";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.2-linux-amd64.tar.gz";
|
||||
|
@ -141,8 +141,8 @@
|
|||
sha256 = "1jx1h7p72wacplnqdvjqrzkgfc6fsrpjx6xl4f6dyvnvc9sgv7l9";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.5.0-linux-amd64.tar.gz";
|
||||
sha256 = "1rif5ilxh84qzp2p19wal8k3xczppwv9rqk2ynhh82pp316hwf0a";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.6.0-linux-amd64.tar.gz";
|
||||
sha256 = "10irh4gfljyiqhf1dw2v3g129yxp9lfglwz1lbwxba8ql9m40vcd";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-linux-amd64.tar.gz";
|
||||
|
@ -163,45 +163,45 @@
|
|||
];
|
||||
x86_64-darwin = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.37.2-darwin-x64.tar.gz";
|
||||
sha256 = "1z0s2wnspfgcn5qhfi40mrjlw59cv1kq5a86nrf4lg42rr04kk43";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.38.0-darwin-x64.tar.gz";
|
||||
sha256 = "1g4hs6f3xri5z2cr8rf7hl91bzr2snpny12rngw27ilw4r7fw3k0";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.2.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0pd34fs95vml7a87zvdb2ap476bd8mh0qgy0p0ppcv50yv3jwp79";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.3.1-darwin-amd64.tar.gz";
|
||||
sha256 = "1q0ij0cib2n58yjfkq7sdjha8i5230pfw8rsdsr4rcsjcyw2mk67";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.0.0-darwin-amd64.tar.gz";
|
||||
sha256 = "156qwg2isv1dflij4y1w3kb31wkn3g0q0ajcy753d7vn8dmwycxr";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.26.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0yp1akw598c6p3997d0j7c7a1qc1qczjd0r5lr2krkqdak4vzfzn";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-darwin-amd64.tar.gz";
|
||||
sha256 = "127b62pznybyp4scv1avwpw4ni540496yki0h0k4blm5gnrvr600";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.5.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0cmnwx65s345775zwkmnkl8wr9cjc9iwmylsmjxn4jyqvy22jhj5";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.6.1-darwin-amd64.tar.gz";
|
||||
sha256 = "1i17a1s2ixnpvc3lmyy0kpr1ljw0dwl79yzkzm81x6kfq54l94sz";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.11.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1vxmvfdybi6pp3czqwkhcvr63n5pym4x44sbzhhs4i8mj3m5sfrr";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.12.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0ppkpbhl6l875rcfsr3hgsg61ambk7j3lyrqcbyn490xvv8xv407";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.10.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1vmvqr07k865wizw4z9zcrs40s3rfa46nk0imisg51hyajp7gf9b";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.11.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0jj09ng5ksr36ipjmlnyn34jjd27mlmvhc27457bh7jyd5pvsxhw";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.14.0-darwin-amd64.tar.gz";
|
||||
sha256 = "14j2xn6kaw5rm3fcxb6v29b78sgfq7drqi2clnag6b3iggq4spji";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.26.1-darwin-amd64.tar.gz";
|
||||
sha256 = "0575vcgz00i72ip45y98ikrvqlry8rchwypdiynd0bagfpj297jz";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.27.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0gvycn3dx6r7f4qzdhlf2p166q7lpsfmnqh098gq1l2zq0vrw5zb";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-darwin-amd64.tar.gz";
|
||||
sha256 = "026i7hxa80b7mipw792anv1wplmz2w23irfy26bsh77an36hk46y";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.16.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1wlqwm0661ksslzkn345qznqqj4acdawrwq30nkdf4xn998hnvx7";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.9.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0ipfaq8bv4z63krrbday20nv5968k3gs8srkj9vfaw8nmzf6p4n5";
|
||||
|
@ -215,12 +215,12 @@
|
|||
sha256 = "097357wf3bcywyy46y6prl2q4dcfdhm299hhfjvn3vv610a04c3d";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.14.0-darwin-amd64.tar.gz";
|
||||
sha256 = "11rg0z3mhaikwkjx3xz8j5smxs45kqw5q80ixczrj1hbysijfrq4";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.15.1-darwin-amd64.tar.gz";
|
||||
sha256 = "0y569cycmdgwapis05n1509krbihi00r9iqlxqpd8iaw9n07myry";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.2.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1s5zkdf6zf1l4nkmd8pl1mvr2sjj4bw3vcqnr4y9xmmxicjz9d0d";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.4.1-darwin-amd64.tar.gz";
|
||||
sha256 = "17qxlhqnxnkvgsym4cgymnpg38pgg83xq6jcjk28ap7d31ginzmg";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz";
|
||||
|
@ -231,32 +231,32 @@
|
|||
sha256 = "0mq9xak9m6qw6wzd33b20dapqandi23hid79ysry179p8hjg0dgy";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.32.0-darwin-amd64.tar.gz";
|
||||
sha256 = "00hcah3rjd4x7xi2alpxd1f1bx380ipcmqdwvig81cr6bq3mpfr3";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.34.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0h0p796qdx5ghbjslh0yzjlncrky0kx3xf1x19j0cd5xpqzakdp1";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.14.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0nfa7ygc39g7ayl1gl3kazmhdxmjq8g41ql8vxqcxv6zp5d6b32l";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.16.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0bdz83vz8acad39fqcws26qm8wzr7pc1wwclh79vp8caav3hnbza";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.1-darwin-amd64.tar.gz";
|
||||
sha256 = "1s8mk8v5x3z6szdqn9c74cpgfqx46whj2nm78mjbqbs7rh9vgw1f";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.8.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1z9kg9h1gw4s9k1qypir62hv4flx4njrxbxfkknawx29dps3wkff";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.22.0-darwin-amd64.tar.gz";
|
||||
sha256 = "084qvn4lwn7ss84sb9c7bxpxal4x65d6y3vgn4hbnvvarsmvn6zs";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.23.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0cagqdbg8gpihfy3qx31w0hgj96mv33paycwsgi53ra96vsz63hx";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0gswf93qapcwc3dv617gjdyhn9w5hhzdcs3w31sqrlzfa2sb790p";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.1-darwin-amd64.tar.gz";
|
||||
sha256 = "1jp9cfw8jj1wms73b5d1xhkmnylly061fxilxzvnpd49glam7da6";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.20.2-darwin-amd64.tar.gz";
|
||||
sha256 = "1ii5sjilczp6bdrz050prg5chbpd49znk1hjzzp2kbsxcf319rsq";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.20.5-darwin-amd64.tar.gz";
|
||||
sha256 = "058rbm195zdm8x5757r2i07ilayx5wbd0zfm0kxhqp3c4lrhz7a5";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.9.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1ick0q427dv8hqwfng0g6kv2praa67cl9qz1zi23aa998yn4dg1z";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.0-darwin-amd64.tar.gz";
|
||||
sha256 = "11p3qa49nqaz2s30izhs9dbqz668fx36y88hs1llk59z0crj8x75";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.0-darwin-amd64.tar.gz";
|
||||
|
@ -267,28 +267,28 @@
|
|||
sha256 = "0fhhc2k0g8mpxzcgci4jl3m59q3n8w3nka94l0n7r9cvs81099n6";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.8.0-darwin-amd64.tar.gz";
|
||||
sha256 = "13qxwzfsy0hmvgazry0q3qna0jk7llharcvdwz302fj4ad98s71j";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.9.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0a42rdjzircqkmhmw1m7qbs30vn1if48j4440daw5sr1r8gamcmf";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.5.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0d1w1zak2ma701w26va74ahi3lmsjywsk2x84ds4l4mj8ckpl2va";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.1-darwin-amd64.tar.gz";
|
||||
sha256 = "0s4jpy4csjvqk9l7xjypbnpbnlx53p1sm6pyw5drddah8aaj47vx";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.2-darwin-amd64.tar.gz";
|
||||
sha256 = "0086l2ch5wdhdilwipln9clq09lnj2njgpp2wn8mxvd69xjccsz0";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.12.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0nfpqp6yyhyckhz38z4g07g4znj3c738rgd1daprmdyl6yifvi72";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.13.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1imgmpn2n9daghpaca6qlww7bp3dmw894fv54j43cpxkm6z29kjk";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-darwin-amd64.tar.gz";
|
||||
sha256 = "1p27dsar8jl7krqz2vrzics45g8s85l4xx3216207x2hq7qbdfb5";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.7.1-darwin-amd64.tar.gz";
|
||||
sha256 = "0y1lcafl477ja9kib00zprz7gamfx821mdj5nyiyjkggwylp0lwl";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.9.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0yv03kh209cwzi1b47bhsbxslmnk454qkx5lqcn6qnjyc7ij7k6x";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.2-darwin-amd64.tar.gz";
|
||||
|
@ -299,8 +299,8 @@
|
|||
sha256 = "16dxc4pkb5arb8qb6gg45m59jn20is3fcn0d1lc66d6sh35z7lsb";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.5.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0w8s908ny5zdn0i8j0klaq2ig7f8vnzx88cm5r110573ya3l9b1m";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.6.0-darwin-amd64.tar.gz";
|
||||
sha256 = "0z06di24mdzdkv8zvpxbzcvp9k8w5yqkskc2gigxl2iv608glmn6";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-darwin-amd64.tar.gz";
|
||||
|
@ -321,45 +321,45 @@
|
|||
];
|
||||
aarch64-linux = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.37.2-linux-arm64.tar.gz";
|
||||
sha256 = "10ll8axayljsjkq9lzr34dgii5fjckvdm7pp0wmwdhx2xfh9kmcg";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.38.0-linux-arm64.tar.gz";
|
||||
sha256 = "11nikfjvpc95cn4250wb19d4cvbr94mhi2fjhcafcha6xddyzpkl";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.2.0-linux-arm64.tar.gz";
|
||||
sha256 = "0ps22ngimrbgh24gm66h0jgs1bfafbizknxbpxrwavyrc26nhgy9";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.3.1-linux-arm64.tar.gz";
|
||||
sha256 = "0qyk51xrfdvlhj2fqyx1b8zsg68i0pvsv85ms34nhgiwzavgga0x";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.0.0-linux-arm64.tar.gz";
|
||||
sha256 = "16jkz0qrp2pvz60388n97bf59idmfv5j0hg0dzp78j1dhpy1aqnn";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.26.0-linux-arm64.tar.gz";
|
||||
sha256 = "1bnsfbqq6gcdkxfz83x7chhi4z760zslvqw1a9nikcsdl54qk5bc";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-linux-arm64.tar.gz";
|
||||
sha256 = "1qrg5sq8fqyn9vq92xmdx0pql7hy4dhha3lxjp5ka386bf6jmamc";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.5.0-linux-arm64.tar.gz";
|
||||
sha256 = "062f4f6n7x83gi4hzd0ixnqm7yar93hhg53lw4wkmad8c9cq93kv";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.6.1-linux-arm64.tar.gz";
|
||||
sha256 = "1584q22a6k5idvcya8a40xsaqj2r1yqwi9wq170l0ra05c716y5y";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.11.0-linux-arm64.tar.gz";
|
||||
sha256 = "1vmf5fdv3n6cgwhb4i2mgv445bk4zhzcwxgivpgdnddc5dfy3ixj";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.12.0-linux-arm64.tar.gz";
|
||||
sha256 = "0kzcham4g6hymjkmmk0gidj5516fi01hw8apks6cqw98ms7wijj2";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.10.0-linux-arm64.tar.gz";
|
||||
sha256 = "0ar7kbxsfn64bx5n8hf11vx3779jklc75c4fy39c2j552k03444m";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.11.0-linux-arm64.tar.gz";
|
||||
sha256 = "17ifmpxpn900rd95s22h77dvvwzgiilpwgkqywfpd4mbg5v1n2fr";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.14.0-linux-arm64.tar.gz";
|
||||
sha256 = "01x3milrkkfa8yrbzbh0pild7qn73q6ayr0i4908b9na8ia247dz";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.26.1-linux-arm64.tar.gz";
|
||||
sha256 = "1cxnwqkzz725i03pdmxqhlfasja1z5hjf9cxkbwyyhli8zpy3grb";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.27.0-linux-arm64.tar.gz";
|
||||
sha256 = "1qwrd49dwvalc08l9sbdxv6qy4m9y2v5cmpa2xrvbiab68azw3q8";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-linux-arm64.tar.gz";
|
||||
sha256 = "1bxrh89hkw9b0g20d4apwhswl1dxb4v4nn5rkkkjd91ykin5idp2";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.16.0-linux-arm64.tar.gz";
|
||||
sha256 = "0yzzch8mr8xfaymsjgvmvdn7dwmzpvc1cjqv83d1x7wqgjj241kx";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.9.0-linux-arm64.tar.gz";
|
||||
sha256 = "0ikjbbhfb84b2zwm3wi6ffav5dfhgdkr9ks58i3xicrbc3swarfc";
|
||||
|
@ -373,12 +373,12 @@
|
|||
sha256 = "0ykrfa4r7xhjbpbm8mnc2ry58a3h7zynbn8gxnspg0493znx1lva";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.14.0-linux-arm64.tar.gz";
|
||||
sha256 = "19hy6hpf3440ys3gs5a0zyza23i1dcgmz3gx19sj258qw01vsr5k";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.15.1-linux-arm64.tar.gz";
|
||||
sha256 = "1hz0hm3prwklkj8gjmkqvljjwcn7wrrsqga6mc53p6ljd370kn4k";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.2.0-linux-arm64.tar.gz";
|
||||
sha256 = "1a935hi2zdd7bis2d1y818l1gl2dcq9dclbakvzczabksjdf731q";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.4.1-linux-arm64.tar.gz";
|
||||
sha256 = "1bh1ikp9dvs1akc9qqs65mdcakkmxcx2ki5pvh7sc0zdgp6ppm76";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-arm64.tar.gz";
|
||||
|
@ -389,32 +389,32 @@
|
|||
sha256 = "0i32s062nmayj5dxl4ridblkz8h7rrvxdid16880m8x992apdrrs";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.32.0-linux-arm64.tar.gz";
|
||||
sha256 = "1cw37b2kwjvnjmaxdn0k0i8dqhl1kksm1nhp3k70349mz3lvrksc";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.34.0-linux-arm64.tar.gz";
|
||||
sha256 = "10cf1ki69ps21z905xd05rsvb42y4dp71g3rz5r3qibdsqc9rd8x";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.14.0-linux-arm64.tar.gz";
|
||||
sha256 = "0z94s45rbm42x89dp7a70p2l646sqwvm5wkhaz19mggd8p5d4p01";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.16.0-linux-arm64.tar.gz";
|
||||
sha256 = "0hxbv264rp9iv5xng1q5wqwddazk9jqxll7as4pnlm9wcmf0inf6";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.1-linux-arm64.tar.gz";
|
||||
sha256 = "1ih70j8qsq8wamj9zdf1fvqj7laadpl2i79gr74k5f3xsf2rgsim";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.8.0-linux-arm64.tar.gz";
|
||||
sha256 = "1w0azz06rhj04gs0bvfxn0a37z16jywhsyiyhimimynwpawh2amn";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.22.0-linux-arm64.tar.gz";
|
||||
sha256 = "18kkxjgm0ivrbgypk34jajlidslbf1bvlnhlcgjxjwbgl7f48krs";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.23.0-linux-arm64.tar.gz";
|
||||
sha256 = "1vx4gchka3kzrzwasmil180ji3756pakaha6fm85h49skgiwk59f";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.0-linux-arm64.tar.gz";
|
||||
sha256 = "02hmd5kdg34xrvmximxza5n9bb7i14c2d19pr0gf4gx6f6hg8yw2";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.1-linux-arm64.tar.gz";
|
||||
sha256 = "0gis39k5kgdxl0i4afy78hkcmwpzm1shh4x713p7dg6h8w0afdmi";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.20.2-linux-arm64.tar.gz";
|
||||
sha256 = "07gssf982y6plabw951cycwyfi42swkpv8h5044j8avg764fnmpy";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.20.5-linux-arm64.tar.gz";
|
||||
sha256 = "1df84xy6b13k9injjg11zxad8jn2xk66cizv2qphlwa1xripz7xw";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.9.0-linux-arm64.tar.gz";
|
||||
sha256 = "0akw7fb0la3v5zwcnnpvs6p41qrpgq83lf12rb7vr311blzhzl4c";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.0-linux-arm64.tar.gz";
|
||||
sha256 = "1sj7bxd415j1gr0p6rwg8k4z9vhjc1kc6vw4gj2cbnaby6mv43mr";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.0-linux-arm64.tar.gz";
|
||||
|
@ -425,28 +425,28 @@
|
|||
sha256 = "17iaf72dzy108v1njan21n72a5gzxbycq396hjh293a141kppn1m";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.8.0-linux-arm64.tar.gz";
|
||||
sha256 = "0dh28hhg2lbvbgw2yadw0ig68z2pcg51h38v74yczblm24k97jvq";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.9.0-linux-arm64.tar.gz";
|
||||
sha256 = "1kqwb8i0gra5as5bd9r1swp1fwrfrr7x3vyag5xb0lmyljlcm4cb";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.5.0-linux-arm64.tar.gz";
|
||||
sha256 = "0lky1gchcmjn6nxlasjqviq89hi2k9fi8lx7ac7hy6x6b7wl40sf";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.1-linux-arm64.tar.gz";
|
||||
sha256 = "0v5kqps6p6b9j8sv9f01i1dx8hsv8mshn45y1km8vm4i6vkcanqc";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.2-linux-arm64.tar.gz";
|
||||
sha256 = "1djc9ar4x6rmi49grl4nxhycc2fbfvk9h1g2xnzl67adxh2cbgj9";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.12.0-linux-arm64.tar.gz";
|
||||
sha256 = "0vkik9dghpk8jn07w57023vgfllw9zszl6j5szjfbxd15idq4ihs";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.13.0-linux-arm64.tar.gz";
|
||||
sha256 = "0bpmmfgmi0061xrfadpijskw1hsgxk64l4kl4vrvc9l9iwjnbk64";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-linux-arm64.tar.gz";
|
||||
sha256 = "0nn7xj38injiwla8vss4nj25r53ddj0p0mplwqrk1r92l2vcihix";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.7.1-linux-arm64.tar.gz";
|
||||
sha256 = "1fdg6sl2rchmzcsxyfbml33cq34slpf6bbr4s2cx7k2bwfvc8wwl";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.9.0-linux-arm64.tar.gz";
|
||||
sha256 = "1b9nw8q5m30csgxq0mg6npzwbsna4nwkwh7b33gax6fimalbcpal";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.2-linux-arm64.tar.gz";
|
||||
|
@ -457,8 +457,8 @@
|
|||
sha256 = "0mnw1cbi789c9iqnxg67pw1v6rgp6s0g2w3yvnbllbdafvd6pp3b";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.5.0-linux-arm64.tar.gz";
|
||||
sha256 = "09jbs7mvbf3bbrf6b4m1nfj52zybxawza2ccsvz99yc4g5r2ixj8";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.6.0-linux-arm64.tar.gz";
|
||||
sha256 = "0lc6394fvqs62rxmf4ryrvj9v5237wdrmypyyqjibk5rd72n8xfg";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-linux-arm64.tar.gz";
|
||||
|
@ -479,45 +479,45 @@
|
|||
];
|
||||
aarch64-darwin = [
|
||||
{
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.37.2-darwin-arm64.tar.gz";
|
||||
sha256 = "1727qhjcpjjbdi9bz1ja3npzkmwrgvl2gpzfky158ywzhjdk7a1b";
|
||||
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.38.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1h2l13x40iqdxdiys5714pb8l2vscwmc5c2gcyvdf2zhm2rwasv2";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.2.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0pk2ql1pcnypl3w6ypiq1pz5rxbc8b1h1gsgq0rkz7hf2y4k40m0";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.3.1-darwin-arm64.tar.gz";
|
||||
sha256 = "16hkkcrv25xa74dz7sh5fppvz68smm6c70a8cph01pbxxr7gyamy";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.0.0-darwin-arm64.tar.gz";
|
||||
sha256 = "050p3lizllnszdf9w55wq9dsn8acbvfn5gh0qpyw7kknf67xjz77";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.26.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0dc6iwzkvlpr64qbmhym477pwrq6zqg8bh9ln4z17vyx6x3apg7n";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-darwin-arm64.tar.gz";
|
||||
sha256 = "10wjnyrwrmg1qjsqlizf9g85wadss3nxmdsh87cjvdbkfb3crp3b";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.5.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1w62rxxjy2f9c7kjqmnlhmahji31ikg8rd89qyfxz07bc55r1cq5";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.6.1-darwin-arm64.tar.gz";
|
||||
sha256 = "1qkbmig8831iwgnmygaj1055np49m6gl59lfvwd2yj6dz12fqxdi";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.11.0-darwin-arm64.tar.gz";
|
||||
sha256 = "11xzhm0qpm3xm5qja2vpzn4q782bcc31lqs2jl48rwrh9nhs0crz";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.12.0-darwin-arm64.tar.gz";
|
||||
sha256 = "04jjxdlsywps3d03l4g37s5b7rlk97w35qjpnsf60nygxzxmvjk2";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.10.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0m3m5z3ldnxf44lz0ywjrhkf22hq0bxldrdhm4gpr8kfc2dy354a";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.11.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1b3m5ndabhyh6fklbb9flgl07zqy3c82skfjd94021q7slp6hwaf";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.14.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1jgffcn8cpz9zvzqgylqkj7m5rybxcn9njp440iag403i8hmb34x";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.26.1-darwin-arm64.tar.gz";
|
||||
sha256 = "0ib3a6y3c4hlyicv4v2vg5cs88bb34w58yxjffw00ljyxb66csy2";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.27.0-darwin-arm64.tar.gz";
|
||||
sha256 = "011ryplg6ca1a5xal3bcv36rgwxgzf89h36k9nvwd8dsjq1qwrik";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-darwin-arm64.tar.gz";
|
||||
sha256 = "030fyfj5yd4p0f7ffwdsqvkjwxihz96vgy2qqibhyyv3p6ymdpym";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.16.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0ilfxh9wghhyb62si2saxanb5gm2yipr4fh7zrjr1cl3qsh3qrsl";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.9.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0z1c0di0p35hn30di2vv93rzdfzqrswy4gg35ngqq4h1bwn7lszi";
|
||||
|
@ -531,12 +531,12 @@
|
|||
sha256 = "1vgck2nwargd7rrmfgxd2j9qahhalas5fsad8szwj83anxi6r1jn";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.14.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0d6zbzs3qlzrwvyjrhsr1xbd3w7w144fa2jjjlr19b4rjh6blf80";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.15.1-darwin-arm64.tar.gz";
|
||||
sha256 = "0vg38pn14h9sw7mcylbwnk78kz7yvnl78a0za11lybgl6qqybc8b";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.2.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0ayg0w61lqv22nln95vd02kjhhqi5k3ncpdcxbh2rd09b74bbxvf";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.4.1-darwin-arm64.tar.gz";
|
||||
sha256 = "1ph2vnx5ayzckgbdgmjzbs0i9qf1bkmp29794v82582f0hdmz97q";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-arm64.tar.gz";
|
||||
|
@ -547,32 +547,32 @@
|
|||
sha256 = "11frjymm7k2lgrdiwjsa5hcak1z3mdjjfmzdz6a0sv84bqlxjj0j";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.32.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0mzw1vgl5c9f1m03j813n68ffmy95hzc27kxslb51cghxgld1pbj";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.34.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0clsx0bsprqbv3rs3d960w1l40b9i8md9hqf7fm5k9dwjs0330by";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.14.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1g6zdcdwzpg2xwa275j9alj3vhip2s4sznr79yswgl0hzfmv8xsr";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.16.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0l1jwmiscfwbh61q22gjx9yhng7dc5rvnln8licvih48193hqvbw";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.1-darwin-arm64.tar.gz";
|
||||
sha256 = "0nz0frfnrpancc2vd9i263ck0h29p5fs04gjp4lfxcb7hwij8idg";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.8.0-darwin-arm64.tar.gz";
|
||||
sha256 = "02jkpzz7kyb9i8mqis4ckqz5mwpwcgas1br7vmiipk8mw1pzwhyw";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.22.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0wbpz9yljwsj4bhi6n39klrpkmirdixi04yhr58m7crmj0if9bki";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.23.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0gp6a9rbnlvi1g5ms7m7pd8g97lsi1rwp95p4rb3yv3fzypx5gh8";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0zsr560dc4wz4vhc8nbkd9171l0n926rv80gicg2x54bab1kmd9g";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.1-darwin-arm64.tar.gz";
|
||||
sha256 = "1679zpv2r3i2acjmx2a6i7dc47p73gf3jw1k1aclasd5cyjf46jf";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.20.2-darwin-arm64.tar.gz";
|
||||
sha256 = "03yw4lkb818nanjrjd9k0n12fgrx8nj0cqjr6c0sw0xkv1lbfcgb";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.20.5-darwin-arm64.tar.gz";
|
||||
sha256 = "151i1733ab4v93zm61kbzqj76h87vx6pgmysf7vjmzbpxjg1dida";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.9.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1ii48p9g20518374q0pbrv2yq8xjfgizhr3v0ib8769sry2nndf3";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1gqmpy46w49hi3d71qkvmps3mq1wkdrcfbcb04x0sjdhirbyapq9";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.0-darwin-arm64.tar.gz";
|
||||
|
@ -583,28 +583,28 @@
|
|||
sha256 = "0kym9f36h8b7s1smlmgazbzv8jjfpwxk6wv036bhx2xm3ysc7rgp";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.8.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0xqxk9xp49s0l5cxxz9wg26fg4fj57h4yjpvs4xs8fpaqa1saynd";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.9.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0kgakfslwy4pz5k74d9ciywapdw7a2zq9y9cs8rigyq97m4vphwf";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.5.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0im3ydgkm4vjia17c03szv1i77jq7abczq0a023k0kw8r3dgd8xc";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.1-darwin-arm64.tar.gz";
|
||||
sha256 = "0gc9zjf41l44d33jj1y4py1m7l6rgs21w1v0a8kjamdxvfabyzv3";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.2-darwin-arm64.tar.gz";
|
||||
sha256 = "1j6c83xvcanyzp1q8zwa952dplvvi0f4psfdscpplbsgzmq5v54n";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.12.0-darwin-arm64.tar.gz";
|
||||
sha256 = "1jmc5d4arkh6x6nc4j0qkms9p9l4vawz1ajwil51xshaj82k2vwg";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.13.0-darwin-arm64.tar.gz";
|
||||
sha256 = "0pvfnycvnz3ram5lpvaggbhfn7lxbi74rbcndw5xw0ihpk31kjim";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-darwin-arm64.tar.gz";
|
||||
sha256 = "149isdz4fs052z1r7jfhx1mq18j8s4wrfgvbabil3wchfkgcqr8f";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.7.1-darwin-arm64.tar.gz";
|
||||
sha256 = "1k52qh6z068s2np1gcg7wp8vvw5rig8c877m8x9qq5xy72w3mzgg";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.9.0-darwin-arm64.tar.gz";
|
||||
sha256 = "09vg056rjzrp8zqh4kjjlq4dnkkzxz32kzawmaj8fxi6ds1s9y9i";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.2-darwin-arm64.tar.gz";
|
||||
|
@ -615,8 +615,8 @@
|
|||
sha256 = "143qpa51q6fl2s759fjhfq6z2fqwkqcwfpzmzsxdjh74mfqz5xpz";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.5.0-darwin-arm64.tar.gz";
|
||||
sha256 = "170iwzg3dnr8ysj882ws6c7vwkziw5a04bsddkrmy7j7d37r8gla";
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.6.0-darwin-arm64.tar.gz";
|
||||
sha256 = "02n0crpb2vf8b3ih658f6576r13ly4v02a4kwbrpifmk3c27yhv6";
|
||||
}
|
||||
{
|
||||
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-darwin-arm64.tar.gz";
|
||||
|
|
|
@ -12,7 +12,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
|
|||
|
||||
# Version of Pulumi from
|
||||
# https://www.pulumi.com/docs/get-started/install/versions/
|
||||
VERSION="3.37.2"
|
||||
VERSION="3.38.0"
|
||||
|
||||
# An array of plugin names. The respective repository inside Pulumi's
|
||||
# Github organization is called pulumi-$name by convention.
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kopia";
|
||||
version = "0.11.2";
|
||||
version = "0.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WxbD68KTO9hYhwwSSj7wwDGOiJdaLFdqJR+xw3dLfio=";
|
||||
sha256 = "sha256-BdWxNJr5RofpblvKKQXtdA49pLD6MKlEi3XViIpt4Ww=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-i3hK1567KrxBSS3iGeNnKfsFuHsukRI6l9jG+UztY+c=";
|
||||
vendorSha256 = "sha256-ZLVBYosPvININQsqU2hy25vtUfW1mRjipm7VykVLV7w=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -1,19 +1,27 @@
|
|||
{ lib, stdenv, fetchurl, freeglut, glew, libGL, libGLU, libX11, libXext, mesa, pkg-config, wayland }:
|
||||
{ lib, stdenv, fetchurl, freeglut, glew, libGL, libGLU, libX11, libXext, mesa
|
||||
, meson, ninja, pkg-config, wayland, wayland-protocols }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mesa-demos";
|
||||
version = "8.4.0";
|
||||
version = "8.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.freedesktop.org/pub/mesa/demos/${pname}-${version}.tar.bz2";
|
||||
sha256 = "0zgzbz55a14hz83gbmm0n9gpjnf5zadzi2kjjvkn6khql2a9rs81";
|
||||
url = "https://archive.mesa3d.org/demos/${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-zqLfCoDwmjD2NcTrGmcr+Qxd3uC4539NcAQWaO9xqsE=";
|
||||
};
|
||||
|
||||
buildInputs = [ freeglut glew libX11 libXext libGL libGLU mesa mesa.osmesa wayland ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
patches = [
|
||||
# https://gitlab.freedesktop.org/mesa/demos/-/merge_requests/83
|
||||
./demos-data-dir.patch
|
||||
];
|
||||
|
||||
configureFlags = [ "--with-system-data-files" ];
|
||||
enableParallelBuilding = true;
|
||||
buildInputs = [
|
||||
freeglut glew libX11 libXext libGL libGLU mesa mesa.osmesa wayland
|
||||
wayland-protocols
|
||||
];
|
||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||
|
||||
mesonFlags = [ "-Dwith-system-data-files=true" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Collection of demos and test programs for OpenGL and Mesa";
|
||||
|
|
13
pkgs/tools/graphics/mesa-demos/demos-data-dir.patch
Normal file
13
pkgs/tools/graphics/mesa-demos/demos-data-dir.patch
Normal file
|
@ -0,0 +1,13 @@
|
|||
diff --git a/meson.build b/meson.build
|
||||
index 282c39629da54ba6d7e1e380ffcf70da15e48d83..0c15274bff62b43f95ca7d7c5e29cc2dbd3cc42f 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -29,7 +29,7 @@ null_dep = dependency('', required : false)
|
||||
|
||||
demos_data_dir = '../data/'
|
||||
if get_option('with-system-data-files')
|
||||
- demos_data_dir = get_option('datadir') / 'mesa-demos'
|
||||
+ demos_data_dir = get_option('prefix') / get_option('datadir') / 'mesa-demos/'
|
||||
endif
|
||||
add_project_arguments(
|
||||
'-DDEMOS_DATA_DIR="@0@"'.format(demos_data_dir),
|
|
@ -1,47 +1,43 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub, installShellFiles, makeWrapper, gnupg, bzip2, xz, graphviz }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, makeWrapper, gnupg, bzip2, xz, graphviz, testers, aptly }:
|
||||
|
||||
let
|
||||
buildGoModule rec {
|
||||
pname = "aptly";
|
||||
version = "1.5.0";
|
||||
|
||||
version = "1.4.0";
|
||||
rev = "v${version}";
|
||||
|
||||
aptlySrc = fetchFromGitHub {
|
||||
inherit rev;
|
||||
src = fetchFromGitHub {
|
||||
owner = "aptly-dev";
|
||||
repo = "aptly";
|
||||
sha256 = "06cq761r3bxybb9xn58jii0ggp79mcp3810z1r2z3xcvplwhwnhy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LqGOLXXaGfQfoj2r+aY9SdOKUDI9+22EsHKBhHMidyk=";
|
||||
};
|
||||
|
||||
aptlyCompletionSrc = fetchFromGitHub {
|
||||
rev = "1.0.1";
|
||||
owner = "aptly-dev";
|
||||
repo = "aptly-bash-completion";
|
||||
sha256 = "0dkc4z687yk912lpv8rirv0nby7iny1zgdvnhdm5b47qmjr1sm5q";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
buildGoPackage {
|
||||
pname = "aptly";
|
||||
inherit version;
|
||||
|
||||
src = aptlySrc;
|
||||
|
||||
goPackagePath = "github.com/aptly-dev/aptly";
|
||||
vendorSha256 = "sha256-6l3OFKFTtFWT68Ylav6woczBlMhD75C9ZoQ6OeLz0Cs=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.Version=${version}" ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --bash ${aptlyCompletionSrc}/aptly
|
||||
installShellCompletion --bash --name aptly completion.d/aptly
|
||||
installShellCompletion --zsh --name _aptly completion.d/_aptly
|
||||
wrapProgram "$out/bin/aptly" \
|
||||
--prefix PATH ":" "${lib.makeBinPath [ gnupg bzip2 xz graphviz ]}"
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = aptly;
|
||||
command = "aptly version";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.aptly.info";
|
||||
description = "Debian repository management tool";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.montag451 ];
|
||||
maintainers = with maintainers; [ montag451 ] ++ teams.bitnomial.members;
|
||||
changelog =
|
||||
"https://github.com/aptly-dev/aptly/releases/tag/v${version}";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fulcio";
|
||||
version = "0.5.2";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigstore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jNsW4eUpqa1a1itEnY1932ta3UpjLxhbHz9byM6/Rxo=";
|
||||
sha256 = "sha256-X943wqbgFX4Y15kCf+bxQP7OOTWksmmYghlAWPC2zVs=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
@ -20,7 +20,7 @@ buildGoModule rec {
|
|||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
vendorSha256 = "sha256-L+20HvkRAs00tbD5q1ATeLrKoa7VFQlrXChh7AtK0PI=";
|
||||
vendorSha256 = "sha256-1BsnNDZAIdLj13e/qL//bPrhYKrTIBvtC1C65WmGHY0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
@ -1,5 +1,15 @@
|
|||
{ lib, stdenv, fetchFromGitHub, callPackage, makeWrapper, clang, llvm, libbfd
|
||||
, libopcodes, libunwind, libblocksruntime }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, callPackage
|
||||
, makeWrapper
|
||||
, clang
|
||||
, llvm
|
||||
# TODO: switch to latest versions when 2.6 release is out to include
|
||||
# https://github.com/google/honggfuzz/commit/90fdf81006614664ef05e5e3c6f94d91610f11b2
|
||||
, libbfd_2_38, libopcodes_2_38
|
||||
, libunwind
|
||||
, libblocksruntime }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "honggfuzz";
|
||||
|
@ -21,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ llvm ];
|
||||
propagatedBuildInputs = [ libbfd libopcodes libunwind libblocksruntime ];
|
||||
propagatedBuildInputs = [ libbfd_2_38 libopcodes_2_38 libunwind libblocksruntime ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
|
|
|
@ -1,32 +1,78 @@
|
|||
{ lib, stdenv, fetchFromGitHub, xcbuildHook, libiconv, ncurses, Cocoa }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, libassuan
|
||||
, libgpg-error
|
||||
, libiconv
|
||||
, texinfo
|
||||
, common-updater-scripts
|
||||
, writers
|
||||
, Cocoa
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pinentry-mac";
|
||||
version = "0.9.4";
|
||||
|
||||
# NOTE: Don't update manually. Use passthru.updateScript on a Mac with XCode
|
||||
# installed.
|
||||
version = "1.1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matthewbauer";
|
||||
repo = "pinentry-mac";
|
||||
rev = "6dfef256c8ea32d642fea847f27d800f024cf51e";
|
||||
sha256 = "0g75302697gqcxyf2hyqzvcbd5pyss1bl2xvfd40wqav7dlyvj83";
|
||||
owner = "GPGTools";
|
||||
repo = "pinentry";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QnDuqFrI/U7aZ5WcOCp5vLE+w59LVvDGOFNQy9fSy70=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ xcbuildHook ];
|
||||
buildInputs = [ libiconv ncurses Cocoa ];
|
||||
|
||||
preBuild = ''
|
||||
# Only build for what we care about (also allows arm64)
|
||||
substituteInPlace pinentry-mac.xcodeproj/project.pbxproj \
|
||||
--replace "i386 x86_64 ppc" "${stdenv.targetPlatform.darwinArch}"
|
||||
# use pregenerated nib files because generating them requires XCode
|
||||
postPatch = ''
|
||||
cp -r ${./mac/Main.nib} macosx/Main.nib
|
||||
cp -r ${./mac/Pinentry.nib} macosx/Pinentry.nib
|
||||
chmod -R u+w macosx/*.nib
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook texinfo ];
|
||||
buildInputs = [ libassuan libgpg-error libiconv Cocoa ];
|
||||
|
||||
configureFlags = [ "--enable-maintainer-mode" "--disable-ncurses" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/Applications
|
||||
mv Products/Release/pinentry-mac.app $out/Applications
|
||||
mv macosx/pinentry-mac.app $out/Applications
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru = {
|
||||
binaryPath = "Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac";
|
||||
updateScript = writers.writeBash "update-pinentry-mac" ''
|
||||
set -euxo pipefail
|
||||
|
||||
main() {
|
||||
tag="$(queryLatestTag)"
|
||||
ver="$(expr "$tag" : 'v\(.*\)')"
|
||||
|
||||
${common-updater-scripts}/bin/update-source-version pinentry_mac "$ver"
|
||||
|
||||
cd ${lib.escapeShellArg ./.}
|
||||
rm -rf mac
|
||||
mkdir mac
|
||||
|
||||
srcDir="$(nix-build ../../../.. --no-out-link -A pinentry_mac.src)"
|
||||
for path in "$srcDir"/macosx/*.xib; do
|
||||
filename="''${path##*/}"
|
||||
/usr/bin/ibtool --compile "mac/''${filename%.*}.nib" "$path"
|
||||
done
|
||||
}
|
||||
|
||||
queryLatestTag() {
|
||||
curl -sS https://api.github.com/repos/GPGTools/pinentry/tags \
|
||||
| jq -r '.[] | .name' | sort --version-sort | tail -1
|
||||
}
|
||||
|
||||
main
|
||||
'';
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
BIN
pkgs/tools/security/pinentry/mac/Main.nib/keyedobjects-101300.nib
generated
Normal file
BIN
pkgs/tools/security/pinentry/mac/Main.nib/keyedobjects-101300.nib
generated
Normal file
Binary file not shown.
BIN
pkgs/tools/security/pinentry/mac/Main.nib/keyedobjects.nib
generated
Normal file
BIN
pkgs/tools/security/pinentry/mac/Main.nib/keyedobjects.nib
generated
Normal file
Binary file not shown.
BIN
pkgs/tools/security/pinentry/mac/Pinentry.nib/keyedobjects-101300.nib
generated
Normal file
BIN
pkgs/tools/security/pinentry/mac/Pinentry.nib/keyedobjects-101300.nib
generated
Normal file
Binary file not shown.
BIN
pkgs/tools/security/pinentry/mac/Pinentry.nib/keyedobjects.nib
generated
Normal file
BIN
pkgs/tools/security/pinentry/mac/Pinentry.nib/keyedobjects.nib
generated
Normal file
Binary file not shown.
|
@ -1,24 +1,36 @@
|
|||
{ lib, buildPythonApplication, fetchPypi
|
||||
, python-slugify, requests, urllib3, six, setuptools, GitPython }:
|
||||
{ lib
|
||||
, buildPythonApplication
|
||||
, fetchPypi
|
||||
, python-slugify
|
||||
, requests
|
||||
, urllib3
|
||||
, six
|
||||
, setuptools
|
||||
, GitPython
|
||||
, pythonRelaxDepsHook
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "transifex-client";
|
||||
version = "0.14.4";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
urllib3 requests python-slugify six setuptools GitPython
|
||||
];
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "11dc95cefe90ebf0cef3749c8c7d85b9d389c05bd0e3389bf117685df562bd5c";
|
||||
};
|
||||
|
||||
# https://github.com/transifex/transifex-client/issues/323
|
||||
prePatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "python-slugify<5.0.0" "python-slugify"
|
||||
'';
|
||||
nativeBuildInputs = [ pythonRelaxDepsHook ];
|
||||
pythonRelaxDeps = [ "python-slugify" ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
GitPython
|
||||
python-slugify
|
||||
requests
|
||||
setuptools
|
||||
six
|
||||
urllib3
|
||||
];
|
||||
|
||||
# Requires external resources
|
||||
doCheck = false;
|
||||
|
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ugrep";
|
||||
version = "3.9.1";
|
||||
version = "3.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Genivia";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KDAuGFoUJxaa0noW739+gxeHKZeouu14EDla0lWwaIQ=";
|
||||
sha256 = "sha256-9c4PoDJLfUH6ySNIxJDg5m2M2WFxNtuqCVKF6FvOHzY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -9864,7 +9864,6 @@ with pkgs;
|
|||
|
||||
pinentry_mac = callPackage ../tools/security/pinentry/mac.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa;
|
||||
xcbuildHook = if stdenv.targetPlatform.isAarch64 then xcbuildHook else xcbuild6Hook;
|
||||
};
|
||||
|
||||
pinentry-bemenu = callPackage ../tools/security/pinentry-bemenu { };
|
||||
|
@ -11620,7 +11619,7 @@ with pkgs;
|
|||
|
||||
transcrypt = callPackage ../applications/version-management/git-and-tools/transcrypt { };
|
||||
|
||||
transifex-client = python3.pkgs.callPackage ../tools/text/transifex-client { };
|
||||
transifex-client = python39.pkgs.callPackage ../tools/text/transifex-client { };
|
||||
|
||||
translate-shell = callPackage ../applications/misc/translate-shell { };
|
||||
|
||||
|
@ -28328,6 +28327,7 @@ with pkgs;
|
|||
swaybg = callPackage ../applications/window-managers/sway/bg.nix { };
|
||||
swayidle = callPackage ../applications/window-managers/sway/idle.nix { };
|
||||
swaylock = callPackage ../applications/window-managers/sway/lock.nix { };
|
||||
swayws = callPackage ../applications/window-managers/sway/ws.nix { };
|
||||
swaywsr = callPackage ../applications/window-managers/sway/wsr.nix { };
|
||||
sway-contrib = recurseIntoAttrs (callPackages ../applications/window-managers/sway/contrib.nix { });
|
||||
|
||||
|
|
|
@ -364,9 +364,12 @@ in {
|
|||
nvidia_x11_production = nvidiaPackages.production;
|
||||
nvidia_x11_vulkan_beta = nvidiaPackages.vulkan_beta;
|
||||
|
||||
# this is not a replacement for nvidia_x11
|
||||
# this is not a replacement for nvidia_x11*
|
||||
# only the opensource kernel driver exposed for hydra to build
|
||||
nvidia_x11_beta_open = nvidiaPackages.beta.open;
|
||||
nvidia_x11_beta_open = nvidiaPackages.beta.open;
|
||||
nvidia_x11_production_open = nvidiaPackages.production.open;
|
||||
nvidia_x11_stable_open = nvidiaPackages.stable.open;
|
||||
nvidia_x11_vulkan_beta_open = nvidiaPackages.vulkan_beta.open;
|
||||
|
||||
openrazer = callPackage ../os-specific/linux/openrazer/driver.nix { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue