Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -1,31 +1,37 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.shellhub-agent;
|
||||
in {
|
||||
|
||||
in
|
||||
{
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.shellhub-agent = {
|
||||
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
enable = mkEnableOption "ShellHub Agent daemon";
|
||||
|
||||
package = mkPackageOption pkgs "shellhub-agent" { };
|
||||
|
||||
preferredHostname = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
description = ''
|
||||
Whether to enable the ShellHub Agent daemon, which allows
|
||||
secure remote logins.
|
||||
Set the device preferred hostname. This provides a hint to
|
||||
the server to use this as hostname if it is available.
|
||||
'';
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.shellhub-agent;
|
||||
defaultText = literalExpression "pkgs.shellhub-agent";
|
||||
keepAliveInterval = mkOption {
|
||||
type = types.int;
|
||||
default = 30;
|
||||
description = ''
|
||||
Which ShellHub Agent package to use.
|
||||
Determine the interval to send the keep alive message to
|
||||
the server. This has a direct impact of the bandwidth
|
||||
used by the device.
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -74,9 +80,13 @@ in {
|
||||
"time-sync.target"
|
||||
];
|
||||
|
||||
environment.SERVER_ADDRESS = cfg.server;
|
||||
environment.PRIVATE_KEY = cfg.privateKey;
|
||||
environment.TENANT_ID = cfg.tenantId;
|
||||
environment = {
|
||||
SHELLHUB_SERVER_ADDRESS = cfg.server;
|
||||
SHELLHUB_PRIVATE_KEY = cfg.privateKey;
|
||||
SHELLHUB_TENANT_ID = cfg.tenantId;
|
||||
SHELLHUB_KEEPALIVE_INTERVAL = toString cfg.keepAliveInterval;
|
||||
SHELLHUB_PREFERRED_HOSTNAME = cfg.preferredHostname;
|
||||
};
|
||||
|
||||
serviceConfig = {
|
||||
# The service starts sessions for different users.
|
||||
@@ -85,7 +95,6 @@ in {
|
||||
ExecStart = "${cfg.package}/bin/agent";
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -42,7 +42,8 @@ let
|
||||
chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides
|
||||
cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF
|
||||
[org.gnome.desktop.background]
|
||||
picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}'
|
||||
picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-blue.gnomeFilePath}'
|
||||
picture-uri-dark='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}'
|
||||
|
||||
[org.gnome.desktop.screensaver]
|
||||
picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath}'
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "lollypop";
|
||||
version = "1.4.26";
|
||||
version = "1.4.31";
|
||||
|
||||
format = "other";
|
||||
doCheck = false;
|
||||
@@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
url = "https://gitlab.gnome.org/World/lollypop";
|
||||
rev = "refs/tags/${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-Q/z9oET06DimMRZl03TgjEeheoVHtIkH+Z69qWZetcI=";
|
||||
sha256 = "sha256-kWqTDhk7QDmN0yr6x8ER5oHkUAkP3i5yOabnNXSHSqA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -956,6 +956,7 @@ https://github.com/tpope/vim-vinegar/,,
|
||||
https://github.com/triglav/vim-visual-increment/,,
|
||||
https://github.com/mg979/vim-visual-multi/,,
|
||||
https://github.com/thinca/vim-visualstar/,,
|
||||
https://github.com/ngemily/vim-vp4/,HEAD,
|
||||
https://github.com/hrsh7th/vim-vsnip/,,
|
||||
https://github.com/hrsh7th/vim-vsnip-integ/,,
|
||||
https://github.com/posva/vim-vue/,,
|
||||
|
||||
@@ -79,7 +79,7 @@ in mkDerivationWith python3Packages.buildPythonApplication rec {
|
||||
postPatch = ''
|
||||
substituteInPlace qutebrowser/misc/quitter.py --subst-var-by qutebrowser "$out/bin/qutebrowser"
|
||||
|
||||
sed -i "s,/usr/share/,$out/share/,g" qutebrowser/utils/standarddir.py
|
||||
sed -i "s,/usr,$out,g" qutebrowser/utils/standarddir.py
|
||||
'' + lib.optionalString withPdfReader ''
|
||||
sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py
|
||||
'';
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
, knotifications
|
||||
, zxing-cpp
|
||||
, qxmpp
|
||||
, sonnet
|
||||
, gst_all_1
|
||||
}:
|
||||
|
||||
@@ -38,6 +39,7 @@ mkDerivation rec {
|
||||
knotifications
|
||||
zxing-cpp
|
||||
qxmpp
|
||||
sonnet
|
||||
gstreamer
|
||||
gst-plugins-bad
|
||||
gst-plugins-base
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.7.0";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-edlGJD+80k1ySpyNcKc5c2O0MX+S4fQgH5mwHQUxXM8=";
|
||||
sha256 = "sha256-oPLnc3Fv8oGbfQMujcVIwKJrQ3vCV9yIB4rUtjeVOV0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-YLkNua0Pz0gVIYnWOzOlV5RuLBaoZ4l7l1Pf4QIfUVQ=";
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "celluloid";
|
||||
version = "0.22";
|
||||
version = "0.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "celluloid-player";
|
||||
repo = "celluloid";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QGN8YLtyb9YVNDK2ZDQwHJVg6UTIQssfNK9lQqxMNKQ=";
|
||||
hash = "sha256-YKDud/UJJx9ko5k+Oux8mUUme0MXaRMngESE14Hhxv8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -46,8 +46,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs meson-post-install.py src/generate-authors.py
|
||||
# Remove this for next release
|
||||
substituteInPlace meson-post-install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@@ -459,6 +459,14 @@ let
|
||||
'';
|
||||
});
|
||||
|
||||
ts-node = super.ts-node.overrideAttrs (oldAttrs: {
|
||||
buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/ts-node" \
|
||||
--prefix NODE_PATH : ${self.typescript}/lib/node_modules
|
||||
'';
|
||||
});
|
||||
|
||||
typescript = super.typescript.overrideAttrs (oldAttrs: {
|
||||
meta = oldAttrs.meta // { mainProgram = "tsc"; };
|
||||
});
|
||||
|
||||
@@ -347,6 +347,7 @@
|
||||
, "titanium"
|
||||
, "triton"
|
||||
, "tsun"
|
||||
, "ts-node"
|
||||
, "ttf2eot"
|
||||
, "typescript"
|
||||
, "typescript-language-server"
|
||||
|
||||
+1790
-1823
File diff suppressed because it is too large
Load Diff
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "appthreat-vulnerability-db";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -22,8 +22,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "AppThreat";
|
||||
repo = "vulnerability-db";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fqpBnxcRBBXsjJepxDuoDbT3hk5rXAvky11sIvQS9XI=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-Ozf3qmD9JRH19N/eERhDHz4LUoWwCVepLbSRCg6lWnQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -3,19 +3,23 @@
|
||||
, backoff
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
, yarl
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "geocachingapi";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Sholofly";
|
||||
repo = "geocachingapi-python";
|
||||
rev = version;
|
||||
sha256 = "1vdknsxd7rvw6g5lwxlxj97l9ic8cch8rdki3aczs6xzw5adxhcs";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-Aj1fZ0dGlV7ynoZ7QwGrbku+IpOCx85wE19JDJaaYmc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -33,7 +37,9 @@ buildPythonPackage rec {
|
||||
# Tests require a token and network access
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "geocachingapi" ];
|
||||
pythonImportsCheck = [
|
||||
"geocachingapi"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python API to control the Geocaching API";
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "openai";
|
||||
version = "0.16.0";
|
||||
version = "0.18.0";
|
||||
|
||||
disabled = pythonOlder "3.7.1";
|
||||
|
||||
@@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "openai";
|
||||
repo = "openai-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9BxFOiGIf3Cy7OU0as6onV5ltECInM9wwCr+qCMuPbU=";
|
||||
sha256 = "sha256-MC3xTiQJrUyfRbnv7jigIal3/paK08bzy+mJI/j7fxo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tldextract";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-PUtqIQVgC30CkOoje/MLaw3HY+UPy+QOhJoBm9bby/8=";
|
||||
sha256 = "sha256-rJMEzfgLCcN+6pZXmeDZrAqhzLZTH65Uiqvgm68aJUk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -26,12 +26,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "5.0.0";
|
||||
version = "5.1.1";
|
||||
sourceRoot = ".";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
|
||||
sha256 = "By3WLSN9vBHgusAuEY2MLbTQujugnxoOseKkYPuEGds=";
|
||||
sha256 = "f107wdNEaSskAPN2X9S1wLY26056insXkjCVx7VqT3g=";
|
||||
};
|
||||
|
||||
# Update with `eval $(nix-build -A bazel.updater)`,
|
||||
|
||||
@@ -15,6 +15,14 @@
|
||||
"https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz"
|
||||
]
|
||||
},
|
||||
"20211102.0.tar.gz": {
|
||||
"name": "20211102.0.tar.gz",
|
||||
"sha256": "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",
|
||||
"https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz"
|
||||
]
|
||||
},
|
||||
"2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz": {
|
||||
"name": "2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz",
|
||||
"sha256": "6a5f67874af66b239b709c572ac1a5a00fdb1b29beaf13c3e6f79b1ba10dc7c4",
|
||||
@@ -47,14 +55,6 @@
|
||||
"https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz"
|
||||
]
|
||||
},
|
||||
"997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz": {
|
||||
"name": "997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz",
|
||||
"sha256": "35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz",
|
||||
"https://github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz"
|
||||
]
|
||||
},
|
||||
"aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz": {
|
||||
"name": "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz",
|
||||
"sha256": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e",
|
||||
@@ -282,7 +282,8 @@
|
||||
"-p1"
|
||||
],
|
||||
"patches": [
|
||||
"//third_party/grpc:grpc_1.41.0.patch"
|
||||
"//third_party/grpc:grpc_1.41.0.patch",
|
||||
"//third_party/grpc:grpc_1.41.0.win_arm64.patch"
|
||||
],
|
||||
"sha256": "e5fb30aae1fa1cffa4ce00aa0bbfab908c0b899fcf0bbc30e268367d660d8656",
|
||||
"strip_prefix": "grpc-1.41.0",
|
||||
@@ -292,14 +293,14 @@
|
||||
]
|
||||
},
|
||||
"com_google_absl": {
|
||||
"generator_function": "grpc_deps",
|
||||
"generator_function": "dist_http_archive",
|
||||
"generator_name": "com_google_absl",
|
||||
"name": "com_google_absl",
|
||||
"sha256": "35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee",
|
||||
"strip_prefix": "abseil-cpp-997aaf3a28308eba1b9156aa35ab7bca9688e9f6",
|
||||
"sha256": "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4",
|
||||
"strip_prefix": "abseil-cpp-20211102.0",
|
||||
"urls": [
|
||||
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz",
|
||||
"https://github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz"
|
||||
"https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",
|
||||
"https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz"
|
||||
]
|
||||
},
|
||||
"com_google_googleapis": {
|
||||
@@ -772,6 +773,13 @@
|
||||
"https://mirror.bazel.build/bazel_versioned_docs/jekyll-tree-4.2.1.tar"
|
||||
]
|
||||
},
|
||||
"microsoft-jdk-11.0.13.8.1-windows-aarch64.zip": {
|
||||
"name": "microsoft-jdk-11.0.13.8.1-windows-aarch64.zip",
|
||||
"sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip"
|
||||
]
|
||||
},
|
||||
"opencensus_proto": {
|
||||
"generator_function": "grpc_deps",
|
||||
"generator_name": "opencensus_proto",
|
||||
@@ -820,6 +828,15 @@
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-win_x64.zip"
|
||||
]
|
||||
},
|
||||
"openjdk11_windows_arm64_archive": {
|
||||
"build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
|
||||
"name": "openjdk11_windows_arm64_archive",
|
||||
"sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2",
|
||||
"strip_prefix": "jdk-11.0.13+8",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip"
|
||||
]
|
||||
},
|
||||
"openjdk15_darwin_aarch64_archive": {
|
||||
"build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
|
||||
"name": "openjdk15_darwin_aarch64_archive",
|
||||
@@ -940,6 +957,18 @@
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-win_x64.zip"
|
||||
]
|
||||
},
|
||||
"openjdk17_windows_arm64_archive": {
|
||||
"build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
|
||||
"generator_function": "dist_http_archive",
|
||||
"generator_name": "openjdk17_windows_arm64_archive",
|
||||
"name": "openjdk17_windows_arm64_archive",
|
||||
"sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877",
|
||||
"strip_prefix": "zulu17.30.15-ca-jdk17.0.1-win_aarch64",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip"
|
||||
]
|
||||
},
|
||||
"openjdk_linux": {
|
||||
"downloaded_file_path": "zulu-linux.tar.gz",
|
||||
"name": "openjdk_linux",
|
||||
@@ -1063,6 +1092,14 @@
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip"
|
||||
]
|
||||
},
|
||||
"openjdk_win_arm64_vanilla": {
|
||||
"downloaded_file_path": "zulu-win-arm64.zip",
|
||||
"name": "openjdk_win_arm64_vanilla",
|
||||
"sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip"
|
||||
]
|
||||
},
|
||||
"openjdk_win_minimal": {
|
||||
"downloaded_file_path": "zulu-win-minimal.zip",
|
||||
"name": "openjdk_win_minimal",
|
||||
@@ -1472,6 +1509,25 @@
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip"
|
||||
]
|
||||
},
|
||||
"remotejdk11_win_arm64_for_testing": {
|
||||
"build_file": "@local_jdk//:BUILD.bazel",
|
||||
"generator_function": "dist_http_archive",
|
||||
"generator_name": "remotejdk11_win_arm64_for_testing",
|
||||
"name": "remotejdk11_win_arm64_for_testing",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
|
||||
"echo >> BUILD.bazel",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2",
|
||||
"strip_prefix": "jdk-11.0.13+8",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip"
|
||||
]
|
||||
},
|
||||
"remotejdk11_win_for_testing": {
|
||||
"build_file": "@local_jdk//:BUILD.bazel",
|
||||
"name": "remotejdk11_win_for_testing",
|
||||
@@ -1768,6 +1824,26 @@
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.28.13-ca-jdk17.0.0-macosx_x64.tar.gz"
|
||||
]
|
||||
},
|
||||
"remotejdk17_win_arm64_for_testing": {
|
||||
"build_file": "@local_jdk//:BUILD.bazel",
|
||||
"generator_function": "dist_http_archive",
|
||||
"generator_name": "remotejdk17_win_arm64_for_testing",
|
||||
"name": "remotejdk17_win_arm64_for_testing",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
|
||||
"echo >> BUILD.bazel",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877",
|
||||
"strip_prefix": "zulu17.30.15-ca-jdk17.0.1-win_aarch64",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip"
|
||||
]
|
||||
},
|
||||
"remotejdk17_win_for_testing": {
|
||||
"build_file": "@local_jdk//:BUILD.bazel",
|
||||
"name": "remotejdk17_win_for_testing",
|
||||
@@ -1986,5 +2062,13 @@
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.50.19-ca-jdk11.0.12/zulu11.50.19-ca-jdk11.0.12-win_x64.zip"
|
||||
]
|
||||
},
|
||||
"zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip": {
|
||||
"name": "zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip",
|
||||
"sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dagger";
|
||||
version = "0.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dagger";
|
||||
repo = "dagger";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3rkHWWpZGUL+7DoUtwY3v2tlcNXdbfVqs+u1wq3jNVI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-DKjVY2G+sG5CjwN262aZkH90fosuBCKHlB8sRbILjaI=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/dagger"
|
||||
];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X go.dagger.io/dagger/version.Revision=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A portable devkit for CICD pipelines";
|
||||
homepage = "https://dagger.io";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jfroche ];
|
||||
};
|
||||
}
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "syft";
|
||||
version = "0.43.2";
|
||||
version = "0.44.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vGzS5Tpg+3f+ydsNbYza4FnCLBv6hMT3RGdlHrKjtfE=";
|
||||
sha256 = "sha256-w5/lTGkwH6cLzbj6/ZUJyFtwx9EyA5Q7hs/CwtsdsJA=";
|
||||
# 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;
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "calamares";
|
||||
version = "3.2.54";
|
||||
version = "3.2.55";
|
||||
|
||||
# release including submodule
|
||||
src = fetchurl {
|
||||
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-TfdLbDsjjPC/8BoEVm4mXePxQ8KX+9jgwKqUR1lcyOk=";
|
||||
sha256 = "sha256-1xf02rjy6+83zbU2yxGUGjcIGJfYS8ryqi4CBzrh7kI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules ];
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "telepresence2";
|
||||
version = "2.4.10";
|
||||
version = "2.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "telepresenceio";
|
||||
repo = "telepresence";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OM0kMQYYHjk17x4VmrIXyTq/DxXnTrt6oRHEdV+1+Ns=";
|
||||
sha256 = "sha256-v6E1v89cVL4N8eKJ5pKU6BwQWZF5lLs4VLGhUS5J1rA=";
|
||||
};
|
||||
|
||||
# The Helm chart is go:embed'ed as a tarball in the binary.
|
||||
@@ -21,7 +21,7 @@ buildGoModule rec {
|
||||
go run ./build-aux/package_embedded_chart/main.go ${src.rev}
|
||||
'';
|
||||
|
||||
vendorSha256 = "sha256-J7Qj0g479K6k0pXmZzQ3T4VG4Vdj7Sc9Xhuy4Ke/xkU=";
|
||||
vendorSha256 = "sha256-RDXP7faijMujAV19l9NmI4xk0Js6DE5YZoHRo2GHyoU=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}"
|
||||
|
||||
@@ -2858,6 +2858,8 @@ with pkgs;
|
||||
|
||||
daemontools = callPackage ../tools/admin/daemontools { };
|
||||
|
||||
dagger = callPackage ../development/tools/continuous-integration/dagger { };
|
||||
|
||||
dale = callPackage ../development/compilers/dale { };
|
||||
|
||||
damon = callPackage ../tools/admin/damon { };
|
||||
|
||||
Reference in New Issue
Block a user