mirror of
https://github.com/CHN-beta/nixpkgs.git
synced 2026-01-13 11:30:35 +08:00
Merge release-21.11 into staging-next-21.11
This commit is contained in:
@@ -14,16 +14,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "alfis";
|
||||
version = "0.6.11";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Revertron";
|
||||
repo = "Alfis";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vm/JBJh58UaSem18RpJuPUzM2GCy4RfCb6Hr1B7KWQA=";
|
||||
sha256 = "sha256-lamobXaDY+v8NpoI+TuuBO5Cdol9+7VPhdmLEH6sZIo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-8ijGO8up0qVQ/kVX5/DveKyovYLh7jm+d7vooS1waAA=";
|
||||
cargoSha256 = "sha256-C5MCT4EG/lI4s2rVGSm9DgBu43FKpp3iTBbCf7N1jOA=";
|
||||
|
||||
checkFlags = [
|
||||
# these want internet access, disable them
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sigi";
|
||||
version = "3.2.1";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-1eZ6i0CvjNyYlWb7c0OPlGtvVSFpi8hiOl/7qeeE9wA=";
|
||||
sha256 = "sha256-dcfzCac4dT2X1hgTSh30G7h2XtvVj1jMUmrUzqZ11y8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Tyrcu/BYt9k4igiEIiZ2I7VIGiBZ3D2i6XfT/XGlU+U=";
|
||||
cargoSha256 = "sha256-CQofC9Y0y8XASLpjk9B6mMlSQqiXnoGZ8kJh16txiPA=";
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
# In case anything goes wrong.
|
||||
|
||||
@@ -1,4 +1,15 @@
|
||||
{ stdenv, lib, crystal, shards, git, pkg-config, which, linkFarm, fetchFromGitHub, installShellFiles }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, crystal
|
||||
, shards
|
||||
, git
|
||||
, pkg-config
|
||||
, which
|
||||
, linkFarm
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, removeReferencesTo
|
||||
}:
|
||||
|
||||
{
|
||||
# Some projects do not include a lock file, so you can pass one
|
||||
@@ -60,7 +71,13 @@ stdenv.mkDerivation (mkDerivationArgs // {
|
||||
buildInputs = args.buildInputs or [ ] ++ [ crystal ]
|
||||
++ lib.optional (format != "crystal") shards;
|
||||
|
||||
nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ git installShellFiles pkg-config which ];
|
||||
nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [
|
||||
git
|
||||
installShellFiles
|
||||
removeReferencesTo
|
||||
pkg-config
|
||||
which
|
||||
];
|
||||
|
||||
buildPhase = args.buildPhase or (lib.concatStringsSep "\n" ([
|
||||
"runHook preBuild"
|
||||
@@ -102,6 +119,7 @@ stdenv.mkDerivation (mkDerivationArgs // {
|
||||
installManPage man/*.?
|
||||
fi
|
||||
'') ++ [
|
||||
"remove-references-to -t ${lib.getLib crystal} $out/bin/*"
|
||||
"runHook postInstall"
|
||||
]));
|
||||
|
||||
|
||||
@@ -97,10 +97,10 @@ let
|
||||
|
||||
unwrapped = stdenv.mkDerivation rec {
|
||||
name = "tsm-client-${version}-unwrapped";
|
||||
version = "8.1.13.3";
|
||||
version = "8.1.14.0";
|
||||
src = fetchurl {
|
||||
url = mkSrcUrl version;
|
||||
sha256 = "1dwczf236drdaf4jcfzz5154vdwvxf5zraxhrhiddl6n80hnvbcd";
|
||||
sha256 = "1iczc4w8rwzqnw01r89kwxcdr7pnwh3nqr3a0q8ncrxrhsy3qwn0";
|
||||
};
|
||||
inherit meta;
|
||||
|
||||
|
||||
@@ -8,23 +8,24 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "recutils";
|
||||
version = "1.8";
|
||||
version = "1.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/recutils/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-346uaVk/26U+Jky/SyMH37ghIMCbb6sj4trVGomlsZM=";
|
||||
hash = "sha256-YwFZKwAgwUtFZ1fvXUNNSfYCe45fOkmdEzYvIFxIbg4=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
hardeningDisable = lib.optional stdenv.cc.isClang "format";
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
check
|
||||
bc
|
||||
check
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
Reference in New Issue
Block a user