Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
08c6aef915
23 changed files with 4222 additions and 1982 deletions
|
|
@ -4,7 +4,7 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nearcore";
|
||||
version = "1.28.0";
|
||||
version = "1.28.1";
|
||||
|
||||
# https://github.com/near/nearcore/tags
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec {
|
|||
# there is also a branch for this version number, so we need to be explicit
|
||||
rev = "refs/tags/${version}";
|
||||
|
||||
sha256 = "sha256-DRVlD74XTYgy3GeUd/7OIl2aie8nEJLmrmmkwPRkrA8=";
|
||||
sha256 = "sha256-lAbVcmr8StAZAII++21xiBd4tRcdprefvcGzPLIjl74=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-hTqje17EdVkgqReuLnizaK3cBJuqXJXC6x5NuoKJLbs=";
|
||||
cargoSha256 = "sha256-1aoL5fbKZ4XZ1ELVDWNDFHDL2FyNuoX/DVb0h8RWBxI=";
|
||||
cargoPatches = [ ./0001-make-near-test-contracts-optional.patch ];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oed";
|
||||
version = "6.7";
|
||||
version = "7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ibara";
|
||||
repo = "oed";
|
||||
rev = "oed-${version}";
|
||||
hash = "sha256-Z8B1RIFve3UPj+9G/WJX0BNc2ynG/qtoGfoesarYGz8=";
|
||||
hash = "sha256-ySfw8Xo/dCBd3K3dxWsdPz8gQ+KeXyReIlUo4q5SFCc=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
|
||||
|
|
|
|||
|
|
@ -51,11 +51,11 @@ python3Packages.buildPythonApplication rec {
|
|||
pkg-config
|
||||
glib
|
||||
wrapGAppsHook4
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
librsvg
|
||||
gobject-introspection
|
||||
libnotify
|
||||
libadwaita
|
||||
libportal
|
||||
|
|
|
|||
16
pkgs/applications/misc/sigal/copytree-permissions.patch
Normal file
16
pkgs/applications/misc/sigal/copytree-permissions.patch
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
diff -Nurp sigal-2.3.orig/sigal/writer.py sigal-2.3/sigal/writer.py
|
||||
--- sigal-2.3.orig/sigal/writer.py 2022-08-08 19:43:10.934707194 +0200
|
||||
+++ sigal-2.3/sigal/writer.py 2022-08-08 19:44:57.542382532 +0200
|
||||
@@ -103,7 +103,11 @@ class AbstractWriter:
|
||||
os.path.join(THEMES_PATH, 'default', 'static'),
|
||||
os.path.join(self.theme, 'static'),
|
||||
):
|
||||
- shutil.copytree(static_path, self.theme_path, dirs_exist_ok=True)
|
||||
+ # https://stackoverflow.com/a/17022146/4935114
|
||||
+ orig_copystat = shutil.copystat
|
||||
+ shutil.copystat = lambda x, y: x
|
||||
+ shutil.copytree(static_path, self.theme_path, dirs_exist_ok=True, copy_function=shutil.copy)
|
||||
+ shutil.copystat = orig_copystat
|
||||
|
||||
if self.settings["user_css"]:
|
||||
if not os.path.exists(self.settings["user_css"]):
|
||||
|
|
@ -14,6 +14,8 @@ python3.pkgs.buildPythonApplication rec {
|
|||
hash = "sha256-4Zsb/OBtU/jV0gThEYe8bcrb+6hW+hnzQS19q1H409Q=";
|
||||
};
|
||||
|
||||
patches = [ ./copytree-permissions.patch ];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
# install_requires
|
||||
jinja2
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "glooctl";
|
||||
version = "1.12.9";
|
||||
version = "1.12.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solo-io";
|
||||
repo = "gloo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FSZTonoMojBsp+6K4gID2X92wcOE009hTPNqONxRbps=";
|
||||
hash = "sha256-ez98npQDkRmtE+Bh9O/bAOePwMQCvc0UZRcw5R2hAPY=";
|
||||
};
|
||||
|
||||
subPackages = [ "projects/gloo/cli/cmd" ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lean";
|
||||
version = "3.47.0";
|
||||
version = "3.48.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leanprover-community";
|
||||
|
|
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
|
|||
# from. this is then used to check whether an olean file should be
|
||||
# rebuilt. don't use a tag as rev because this will get replaced into
|
||||
# src/githash.h.in in preConfigure.
|
||||
rev = "4f9b974353ea684c98ec938f91f3a526218503ed";
|
||||
sha256 = "sha256-e/MnyYtkBLVU2MHGHhyAnYRFpVDhrykbKDphhGz48OE=";
|
||||
rev = "283f6ed8083ab4dd7c36300f31816c5cb793f2f7";
|
||||
sha256 = "sha256-0Ogv/24KNp1ZBDqiYTsGv5vDKD4fJBtoX7LWLu4QZe0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, fetchurl, libarchive }:
|
||||
|
||||
let
|
||||
version = "0.36.8";
|
||||
version = "0.37.0";
|
||||
in fetchurl {
|
||||
name = "sarasa-gothic-${version}";
|
||||
|
||||
# Use the 'ttc' files here for a smaller closure size.
|
||||
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
|
||||
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
|
||||
sha256 = "sha256-lKrpaTVYmV3wr1Uj5Yqj1p1t0CYF0ApX7j+QFNfpdz0=";
|
||||
sha256 = "sha256-R1vU17PSfOe2w9PutA7zYrNsa4mejbXqWlWQVV5KXqs=";
|
||||
|
||||
recursiveHash = true;
|
||||
downloadToTemp = true;
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ let mca = mkCoqDerivation {
|
|||
pname = "analysis";
|
||||
owner = "math-comp";
|
||||
|
||||
release."0.5.3".sha256 = "sha256-1NjFsi5TITF8ZWx1NyppRmi8g6YaoUtTdS9bU/sUe5k=";
|
||||
release."0.3.13".sha256 = "sha256-Yaztew79KWRC933kGFOAUIIoqukaZOdNOdw4XszR1Hg=";
|
||||
release."0.3.10".sha256 = "sha256-FBH2c8QRibq5Ycw/ieB8mZl0fDiPrYdIzZ6W/A3pIhI=";
|
||||
release."0.3.9".sha256 = "sha256-uUU9diBwUqBrNRLiDc0kz0CGkwTZCUmigPwLbpDOeg4=";
|
||||
|
|
@ -19,6 +20,7 @@ let mca = mkCoqDerivation {
|
|||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch [ coq.version mathcomp.version ] [
|
||||
{ cases = [ (isGe "8.14") (isGe "1.13.0") ]; out = "0.5.3"; }
|
||||
{ cases = [ (isGe "8.13") (isGe "1.12.0") ]; out = "0.3.13"; }
|
||||
{ cases = [ (range "8.11" "8.14") (isGe "1.12.0") ]; out = "0.3.10"; }
|
||||
{ cases = [ (range "8.11" "8.13") "1.11.0" ]; out = "0.3.4"; }
|
||||
|
|
|
|||
|
|
@ -31,17 +31,19 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-sdk-cpp";
|
||||
version = if stdenv.system == "i686-linux" then "1.9.150"
|
||||
else "1.9.294";
|
||||
version = "1.9.294";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-sdk-cpp";
|
||||
rev = version;
|
||||
sha256 = if version == "1.9.150" then "fgLdXWQKHaCwulrw9KV3vpQ71DjnQAL4heIRW7Rk7UY="
|
||||
else "sha256-Z1eRKW+8nVD53GkNyYlZjCcT74MqFqqRMeMc33eIQ9g=";
|
||||
sha256 = "sha256-Z1eRKW+8nVD53GkNyYlZjCcT74MqFqqRMeMc33eIQ9g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./cmake-dirs.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Missing includes for GCC11
|
||||
sed '5i#include <thread>' -i \
|
||||
|
|
@ -65,6 +67,9 @@ stdenv.mkDerivation rec {
|
|||
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
# TestRandomURLMultiThreaded fails
|
||||
rm aws-cpp-sdk-core-tests/http/HttpClientTest.cpp
|
||||
'' + lib.optionalString stdenv.isi686 ''
|
||||
# EPSILON is exceeded
|
||||
rm aws-cpp-sdk-core-tests/aws/client/AdaptiveRetryStrategyTest.cpp
|
||||
'';
|
||||
|
||||
# FIXME: might be nice to put different APIs in different outputs
|
||||
|
|
@ -94,9 +99,6 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optional (apis != ["*"])
|
||||
"-DBUILD_ONLY=${lib.concatStringsSep ";" apis}";
|
||||
|
||||
# fix build with gcc9, can be removed after bumping to current version
|
||||
NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
|
||||
|
||||
# aws-cpp-sdk-core-tests/aws/client/AWSClientTest.cpp
|
||||
# seem to have a datarace
|
||||
enableParallelChecking = false;
|
||||
|
|
@ -109,15 +111,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
patches = [
|
||||
./cmake-dirs.patch
|
||||
]
|
||||
++ lib.optional (lib.versionOlder version "1.9.163")
|
||||
(fetchpatch {
|
||||
url = "https://github.com/aws/aws-sdk-cpp/commit/b102aaf5693c4165c84b616ab9ffb9edfb705239.diff";
|
||||
sha256 = "sha256-38QBo3MEFpyHPb8jZEURRPkoeu4DqWhVeErJayiHKF0=";
|
||||
});
|
||||
|
||||
# Builds in 2+h with 2 cores, and ~10m with a big-parallel builder.
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
|
||||
|
|
@ -127,5 +120,7 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ eelco orivej ];
|
||||
# building ec2 runs out of memory: cc1plus: out of memory allocating 33554372 bytes after a total of 74424320 bytes
|
||||
broken = stdenv.buildPlatform.is32bit && ((builtins.elem "ec2" apis) || (builtins.elem "*" apis));
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "neatvnc";
|
||||
version = "0.5.1";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "any1";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hdfiF3CUosOksx+Fze54kPfDqS9hvXWmCBB1VQ4uyiQ=";
|
||||
sha256 = "sha256-Y+qFTSvMX/iop+5UOm+4NqMSAZesFIJeTR+CRnlZTYo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson pkg-config ninja ];
|
||||
|
|
|
|||
|
|
@ -46,6 +46,12 @@ stdenv.mkDerivation rec {
|
|||
url = "https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/c16e637c329bc9dda8544b18f5bd47a8d63ee253.patch";
|
||||
sha256 = "sha256-xhhAlhOovwIjwAxXxvHRTG4GzpIPYvKQE2F4ZP1Udq8=";
|
||||
})
|
||||
# fix bluetooth rescan loops
|
||||
# FIXME: drop in next release
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/pipewire/wireplumber/-/merge_requests/398.patch";
|
||||
sha256 = "sha256-rEp/3fjBRbkFuw4rBW6h8O5hcy/oBP3DW7bPu5rVfNY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "deepmind";
|
||||
repo = pname;
|
||||
rev = "4b94370b8de29b79d6f840b09d1990b91c1afddd";
|
||||
sha256 = "0hh4cmp93wjyidj48gh07vhx2kjvpwd23xvy79bsjn5qaaf6q4cm";
|
||||
rev = "260e5ba01f46b10c579a61393e6c7e546aeae93e";
|
||||
sha256 = "sha256-BTHy/jNf6LeV+x3GTI9MDBWLK6A5z2Z1TQyBkHMTeuE=";
|
||||
};
|
||||
|
||||
# Wheel requires only `numpy`, but the import needs `jax`.
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lightspark";
|
||||
version = "0.8.6";
|
||||
version = "0.8.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lightspark";
|
||||
repo = "lightspark";
|
||||
rev = version;
|
||||
sha256 = "sha256-/Nd69YFctLDJ8SM9WvYp6okyPQd6+ob2mBN3sPg+7Ww=";
|
||||
sha256 = "sha256-/w0cqPIeQC1Oz1teSjMpeiQEI6bIpnyOOu0GoGyi6Kg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
mkYarnPackage rec {
|
||||
pname = "grafana-image-renderer";
|
||||
version = "3.4.0";
|
||||
version = "3.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "grafana-image-renderer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6yw+zp83T6VVa4A9KYX6rzMKG5GoyJ7M8Z+cEHE4uts=";
|
||||
sha256 = "sha256-x+kGouF/7ltKdYfNO2EI8F4FKWYClcyigcUVfZlud00=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
|
|
|||
|
|
@ -16,7 +16,8 @@
|
|||
"watch": "tsc-watch --onSuccess \"node build/app.js server --config=dev.json\"",
|
||||
"watch:debug": "tsc-watch --onSuccess \"cross-env DEBUG=puppeteer-cluster:* node build/app.js server --config=dev.json\"",
|
||||
"build": "tsc",
|
||||
"start": "node build/app.js --config=dev.json"
|
||||
"start": "node build/app.js --config=dev.json",
|
||||
"create-gcom-plugin-json": "ts-node scripts/createGcomPluginJson.ts ./scripts/tmp"
|
||||
},
|
||||
"dependencies": {
|
||||
"@grpc/grpc-js": "^1.0",
|
||||
|
|
@ -26,42 +27,45 @@
|
|||
"express": "^4.16.3",
|
||||
"express-prom-bundle": "^5.1.5",
|
||||
"google-protobuf": "3.5.0",
|
||||
"jimp": "0.16.1",
|
||||
"lodash": "^4.17.21",
|
||||
"minimist": "^1.2.0",
|
||||
"minimist": "^1.2.6",
|
||||
"morgan": "^1.9.0",
|
||||
"on-finished": "^2.3.0",
|
||||
"poolpeteer": "^0.23.0",
|
||||
"prom-client": "^11.5.3",
|
||||
"puppeteer": "^13.1.3",
|
||||
"puppeteer-cluster": "^0.22.0",
|
||||
"poolpeteer": "^0.22.0",
|
||||
"sharp": "0.29.3",
|
||||
"puppeteer-cluster": "^0.23.0",
|
||||
"unique-filename": "^1.1.0",
|
||||
"winston": "^3.2.1"
|
||||
"winston": "^3.2.1",
|
||||
"jsdom": "19.0.0",
|
||||
"dompurify": "^2.3.8",
|
||||
"multer": "^1.4.5-lts.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@grafana/eslint-config": "^2.5.0",
|
||||
"@grafana/eslint-config": "5.0.0",
|
||||
"@types/multer": "1.4.7",
|
||||
"@types/express": "^4.11.1",
|
||||
"@types/node": "^14.14.41",
|
||||
"@types/dompurify": "2.3.4",
|
||||
"@types/jsdom": "20.0.0",
|
||||
"@typescript-eslint/eslint-plugin": "5.16.0",
|
||||
"@typescript-eslint/parser": "5.31.0",
|
||||
"axios": "0.26.0",
|
||||
"cross-env": "7.0.3",
|
||||
"@typescript-eslint/eslint-plugin": "^4.32.0",
|
||||
"@typescript-eslint/parser": "^4.32.0",
|
||||
"eslint": "^7.32.0",
|
||||
"eslint-config-prettier": "^8.3.0",
|
||||
"eslint-plugin-jsdoc": "^36.1.0",
|
||||
"eslint-plugin-prettier": "^4.0.0",
|
||||
"eslint-plugin-react": "^7.26.1",
|
||||
"eslint-plugin-react-hooks": "^4.2.0",
|
||||
"husky": "^4.3.8",
|
||||
"lint-staged": "^11.2.0",
|
||||
"pkg": "5.5.2",
|
||||
"eslint": "8.22.0",
|
||||
"eslint-config-prettier": "8.5.0",
|
||||
"eslint-plugin-jsdoc": "39.3.3",
|
||||
"eslint-plugin-prettier": "4.2.1",
|
||||
"eslint-plugin-react": "7.31.0",
|
||||
"eslint-plugin-react-hooks": "4.6.0",
|
||||
"husky": "4.3.8",
|
||||
"lint-staged": "13.0.3",
|
||||
"pkg": "5.8.0",
|
||||
"prettier": "2.2.1",
|
||||
"tsc-watch": "^4.2.3",
|
||||
"typescript": "^4.3.2"
|
||||
},
|
||||
"husky": {
|
||||
"hooks": {
|
||||
"pre-commit": "lint-staged && npm run precommit"
|
||||
}
|
||||
"ts-node": "10.5.0",
|
||||
"tsc-watch": "5.0.3",
|
||||
"typescript": "4.7.4"
|
||||
},
|
||||
"lint-staged": {
|
||||
"*.ts": [
|
||||
|
|
@ -73,9 +77,6 @@
|
|||
},
|
||||
"bin": "build/app.js",
|
||||
"engines": {
|
||||
"node": ">=14 <=16"
|
||||
},
|
||||
"volta": {
|
||||
"node": "14.16.1"
|
||||
"node": ">= 16"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grafana";
|
||||
version = "9.1.1";
|
||||
version = "9.1.2";
|
||||
|
||||
excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ];
|
||||
|
||||
|
|
@ -10,12 +10,12 @@ buildGoModule rec {
|
|||
rev = "v${version}";
|
||||
owner = "grafana";
|
||||
repo = "grafana";
|
||||
sha256 = "sha256-u79mbhrEpRAPZrmn4rhswMVdOmDBBM8EJvpy2AlXzrw=";
|
||||
sha256 = "sha256-Xj9pbOmAqlEwxmEPfwC9Seoqh7HLXAhsa2ux7hIRgos=";
|
||||
};
|
||||
|
||||
srcStatic = fetchurl {
|
||||
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
|
||||
sha256 = "sha256-w1alo57NPsJtoM+7QnbeU8HCBubi9gDmTJlbxdnafnQ=";
|
||||
sha256 = "0bnm4v5ca01lsbygv9zlmvhambyxvsvhw4wp1inr3svjqdf2l21v";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-6mf49PWp3htCDvXIQuc/mmqqFXFJcP8jDoDSQGi4rKc=";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "trash-cli";
|
||||
version = "0.22.8.21";
|
||||
version = "0.22.8.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andreafrancia";
|
||||
repo = "trash-cli";
|
||||
rev = version;
|
||||
hash = "sha256-jNjM84xl+gS3l11XgYidLKZskQxx55kw051FIsJQExs=";
|
||||
hash = "sha256-ym6Z1qZihqw7lIS1GXsExZK5hRsss/aqgMNldV8kUDk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ python3Packages.psutil ];
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "btop";
|
||||
version = "1.2.8";
|
||||
hash = "sha256-X+JJXv+8EIh0hjYnKkeQ3+XQ6CerHrEvPCok5DYxcwc=";
|
||||
version = "1.2.9";
|
||||
hash = "sha256-YCVRWmBZmzAAFxMIWMBb8NPCRp8NeBtMqEbkgXYS9M4=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aristocratos";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "mmark";
|
||||
version = "2.2.26";
|
||||
version = "2.2.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mmarkdown";
|
||||
repo = "mmark";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DiT2MkVM2DWp8dVr8I3Qt6iymHJPW3VEIaX+ACrDVo8=";
|
||||
sha256 = "sha256-3+Wocaoma3dQnrqBcEWcTC+LNmDxssvmiDrir0gANyo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-vhSrHh1wmIK3H5p5Q5QznSVainkZByrW+Nz81J9Va88=";
|
||||
vendorSha256 = "sha256-W1MOjV1P6jV9K6mdj8a+T2UiffgpiOpBKo9BI07UOz0=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "rootlesskit";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rootless-containers";
|
||||
repo = "rootlesskit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Tml6zTc9l3O8qB+NSKlClWl5lj1rkiDHwI5exxBL83A=";
|
||||
hash = "sha256-wdg3pYsWHAEzQHy5LZYp0q9sOn7dmtcwOn94/0wYDa0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-CpDPa1LAinvXCnVYbn9ZXuEjyHHlDU4bzZ2R+ctoCzQ=";
|
||||
vendorSha256 = "sha256-OKqF9EutZP+6CFtANpNt21hGsz6GxuXcoaEqPKnoqeo=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { attrPath = pname; };
|
||||
|
|
|
|||
Loading…
Reference in a new issue