Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
2d211c7a3a
10 changed files with 35 additions and 32 deletions
|
|
@ -12,6 +12,10 @@ stdenv.mkDerivation {
|
|||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
# -Wnarrowing is enabled by default in recent GCC versions,
|
||||
# causing compilation to fail.
|
||||
NIX_CFLAGS_COMPILE = "-Wno-narrowing";
|
||||
|
||||
postPatch = ''
|
||||
(
|
||||
cd mp4v2
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "delta";
|
||||
version = "0.6.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dandavison";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-cEVYU7vMgVxVIKztL6LHcvQjrNRRMrB5XMP/7gPCr5A=";
|
||||
sha256 = "02gm3fxqq91gn1hffy9kc6dkc0y7p09sl6f8njfpsaficij4bs7a";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-iD3Cr1vo0FNyWvAN5m6ND+8sGyekgbkYmIxGTJkPEYE=";
|
||||
cargoSha256 = "1crz7410xfixx2vb1c060fnygwkkp2k2lgh7y1mjjxjzhpybniw5";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "4.27.0";
|
||||
version = "4.28.0";
|
||||
pname = "breathe";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5b21f86d0cc99d3168f0d9730e07c1438057083ccc9a9c54de322e59e1f4e740";
|
||||
sha256 = "11e35a5fed7545554be51b70eea4578643d8c08972bea43774f413943006b17a";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ docutils six sphinx ];
|
||||
|
|
|
|||
|
|
@ -8,15 +8,20 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pg8000";
|
||||
version = "1.18.0";
|
||||
version = "1.19.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1nkjxf95ldda41mkmahbikhd1fvxai5lfjb4a5gyhialpz4g5fim";
|
||||
sha256 = "sha256-EexwwLIOpECAfiyGmUDxSE7qk9cbQ1gHtjhW3YK3RN0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ passlib scramp ];
|
||||
propagatedBuildInputs = [passlib scramp ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "scramp==1.3.0" "scramp>=1.3.0"
|
||||
'';
|
||||
|
||||
# Tests require a running PostgreSQL instance
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "scramp";
|
||||
version = "1.2.2";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tlocke";
|
||||
repo = "scramp";
|
||||
rev = version;
|
||||
sha256 = "sha256-d/kfrhvU96eH8TQX7n1hVRclEFWLseEvOxiR6VaOdrg=";
|
||||
sha256 = "sha256-aXuRIW/3qBzan8z3EzSSxqaZfa3WnPhlviNa2ugIjik=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ asn1crypto ];
|
||||
|
|
|
|||
|
|
@ -44,9 +44,9 @@ in rec {
|
|||
|
||||
unstable = fetchurl rec {
|
||||
# NOTE: Don't forget to change the SHA256 for staging as well.
|
||||
version = "6.4";
|
||||
version = "6.5";
|
||||
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
|
||||
sha256 = "sha256-Gy0rRT2Q1sLXEk5H+urlDlxUwl9pvuHQZTGEMmECTI8=";
|
||||
sha256 = "sha256-BgD9IIwGkl1mNNKfVDu6CmQ2HDTpvXYJwvDiCWEK00c=";
|
||||
inherit (stable) mono gecko32 gecko64;
|
||||
|
||||
patches = [
|
||||
|
|
@ -58,7 +58,7 @@ in rec {
|
|||
staging = fetchFromGitHub rec {
|
||||
# https://github.com/wine-staging/wine-staging/releases
|
||||
inherit (unstable) version;
|
||||
sha256 = "sha256-gTt75rRoP/HTeD5k/8bW3jjnn8M5atmP9RFqmBQaAfk=";
|
||||
sha256 = "sha256-u6wDavrFirN1e0fFra4ui3i4PnJF0gcENYoIyNwhIYc=";
|
||||
owner = "wine-staging";
|
||||
repo = "wine-staging";
|
||||
rev = "v${version}";
|
||||
|
|
|
|||
|
|
@ -10,9 +10,11 @@ import ./versions.nix ({ version, sha256 }:
|
|||
inherit sha256;
|
||||
};
|
||||
|
||||
modRoot = "src/go";
|
||||
|
||||
vendorSha256 = "1ral3xg58x0lf5vl839nlabf443yzqnbrlzm0q127mvv412f5ajc";
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config];
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ libiconv openssl pcre zlib ];
|
||||
|
||||
inherit (buildGoModule.go) GOOS GOARCH;
|
||||
|
|
@ -37,10 +39,9 @@ import ./versions.nix ({ version, sha256 }:
|
|||
'';
|
||||
|
||||
# zabbix build process is complex to get right in nix...
|
||||
# we need to manipulate a number of things for their build
|
||||
# system to properly work
|
||||
# use automake to build the go project ensuring proper access to the go vendor directory
|
||||
buildPhase = ''
|
||||
cp -r vendor src/go/vendor
|
||||
cd ../..
|
||||
make
|
||||
'';
|
||||
|
||||
|
|
@ -49,13 +50,6 @@ import ./versions.nix ({ version, sha256 }:
|
|||
install -Dm0755 src/go/bin/zabbix_agent2 $out/bin/zabbix_agent2
|
||||
'';
|
||||
|
||||
# run `go mod vendor` from the correct directory
|
||||
overrideModAttrs = (_oldAttrs : {
|
||||
preConfigure = ''
|
||||
cd src/go
|
||||
'';
|
||||
});
|
||||
|
||||
meta = with lib; {
|
||||
description = "An enterprise-class open source distributed monitoring solution (client-side agent)";
|
||||
homepage = "https://www.zabbix.com/";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jdupes";
|
||||
version = "1.19.1";
|
||||
version = "1.19.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jbruchon";
|
||||
repo = "jdupes";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1gx3rStqIxLt/iRgpdp5z7tX1/wA0miZ1y5WTeGQ1Vs=";
|
||||
sha256 = "sha256-3lWrSybYp3RrUnydosgsNkGQjrk7JvxuxjMslN4cGfk=";
|
||||
# Unicode file names lead to different checksums on HFS+ vs. other
|
||||
# filesystems because of unicode normalisation. The testdir
|
||||
# directories have such files and will be removed.
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "parallel";
|
||||
version = "20210222";
|
||||
version = "20210322";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-TmmwCuti906i/cZXnTHStKTMCmT+dc9hkmMSQC8b5ys=";
|
||||
sha256 = "sha256-mPcbRFojoYu06bzk83S5PmptnezfiSvo0iRZ8iS4VpQ=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "vale";
|
||||
version = "2.9.1";
|
||||
version = "2.10.2";
|
||||
|
||||
subPackages = [ "cmd/vale" ];
|
||||
outputs = [ "out" "data" ];
|
||||
|
|
@ -11,10 +11,10 @@ buildGoModule rec {
|
|||
owner = "errata-ai";
|
||||
repo = "vale";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ItkWmBq1mBVZfHcnqDp8koEAWBH3k9Et2bFA2mNYjVY=";
|
||||
sha256 = "0cpq2pv6d67fdnm2qbb7p9amk0as8bm4knkywak8fsqadxfadx80";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorSha256 = "14zimsl0f7sxqqka00krix3q2mxdcpk8n2zh7bz8awjwzn4kg8m3";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $data/share/vale
|
||||
|
|
@ -24,7 +24,7 @@ buildGoModule rec {
|
|||
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://errata-ai.gitbook.io/vale/";
|
||||
homepage = "https://docs.errata.ai/vale/about";
|
||||
description = "A syntax-aware linter for prose built with speed and extensibility in mind";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
|
|
|
|||
Loading…
Reference in a new issue