Merge master into staging-next

Changed files
+5 -5
pkgs
by-name
ec
ecapture
pa
paperjam
+3 -3
pkgs/by-name/ec/ecapture/package.nix
···
buildGoModule rec {
pname = "ecapture";
-
version = "1.3.1";
src = fetchFromGitHub {
owner = "gojue";
repo = "ecapture";
tag = "v${version}";
-
hash = "sha256-SY7Q8WlxE473An6/MntjPaIT3mFE/u9JJS6nb8BWiuQ=";
fetchSubmodules = true;
};
···
in
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
-
vendorHash = "sha256-B2Jq6v1PibZ1P9OylFsVp/ULZa/ne5T+vCsBWWrjW/4=";
passthru.updateScript = nix-update-script { };
···
buildGoModule rec {
pname = "ecapture";
+
version = "1.4.0";
src = fetchFromGitHub {
owner = "gojue";
repo = "ecapture";
tag = "v${version}";
+
hash = "sha256-2YuBgN7KUH8pgFSvvk0gpkAc1YCL8NLrU/UtQ9ykyqw=";
fetchSubmodules = true;
};
···
in
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+
vendorHash = "sha256-cN6pCfc9LEItASCoZ4+BU1AOtwMmFaUEzOM/BZ13jcI=";
passthru.updateScript = nix-update-script { };
+2 -2
pkgs/by-name/pa/paperjam/package.nix
···
stdenv.mkDerivation (finalAttrs: {
pname = "paperjam";
-
version = "1.2.1";
src = fetchurl {
url = "https://mj.ucw.cz/download/linux/paperjam-${finalAttrs.version}.tar.gz";
-
hash = "sha256-vTjtNTkBHwfoRDshmFu1zZfGVuEtk2NXH5JdA5Ekg5s=";
};
buildInputs = [
···
stdenv.mkDerivation (finalAttrs: {
pname = "paperjam";
+
version = "1.2.2";
src = fetchurl {
url = "https://mj.ucw.cz/download/linux/paperjam-${finalAttrs.version}.tar.gz";
+
hash = "sha256-ooGRLQCpNfSQziCHPoe4LVIDu2GAMmvhvsYBhKyrMPw=";
};
buildInputs = [