Merge staging-next into staging
This commit is contained in:
commit
335de1a880
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "geany";
|
||||
version = "1.37.1";
|
||||
version = "1.38";
|
||||
|
||||
outputs = [ "out" "dev" "doc" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.geany.org/${pname}-${version}.tar.bz2";
|
||||
sha256 = "060sachn33xpx3a609f09y97qq5ky17gvv686zbvrn618ij7bi8q";
|
||||
sha256 = "abff176e4d48bea35ee53037c49c82f90b6d4c23e69aed6e4a5ca8ccd3aad546";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -22,16 +22,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "neovide";
|
||||
version = "unstable-2021-08-08";
|
||||
version = "unstable-2021-10-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kethku";
|
||||
repo = "neovide";
|
||||
rev = "725f12cafd4a26babd0d6bbcbca9a99c181991ac";
|
||||
sha256 = "sha256-ThMobWKe3wHhR15TmmKrI6Gp1wvGVfJ52MzibK0ubkc=";
|
||||
rev = "7f76ad4764197ba75bb9263d25b265d801563ccf";
|
||||
sha256 = "sha256-kcP0WSk3quTaWCGQYN4zYlDQ9jhx/Vu6AamSLGFszwQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-5lOGncnyA8DwetY5bU6k2KXNClFgp+xIBEeA0/iwGF0=";
|
||||
cargoSha256 = "sha256-TQEhz9FtvIb/6Qtyz018dPle0+nub1oMZMFtKAqYcoI=";
|
||||
|
||||
SKIA_SOURCE_DIR =
|
||||
let
|
||||
|
|
|
@ -768,11 +768,13 @@
|
|||
"version": "0.1.1"
|
||||
},
|
||||
"openstack": {
|
||||
"owner": "terraform-providers",
|
||||
"owner": "terraform-provider-openstack",
|
||||
"provider-source-address": "registry.terraform.io/terraform-provider-openstack/openstack",
|
||||
"repo": "terraform-provider-openstack",
|
||||
"rev": "v1.28.0",
|
||||
"sha256": "1g2nxv312ddvkgpph17m9sh4zmy5ddj8gqwnfb3frbfbbamrgar6",
|
||||
"version": "1.28.0"
|
||||
"rev": "v1.43.1",
|
||||
"sha256": "0n6r88p3a6p8p0gjys2r1kcgkwq450jmyd741g45lxmaf3jz2ynb",
|
||||
"vendorSha256": "0k4srszs8xgf8gz4fa7ysqyww52d7kvqy6zf22f1gkcjyiks9pl7",
|
||||
"version": "1.43.1"
|
||||
},
|
||||
"opentelekomcloud": {
|
||||
"owner": "terraform-providers",
|
||||
|
|
|
@ -279,3 +279,17 @@ int system(const char *command)
|
|||
rewriteSystemCall(command, newCommand);
|
||||
return _system(newCommand);
|
||||
}
|
||||
|
||||
int mkdir(const char *path, mode_t mode)
|
||||
{
|
||||
int (*mkdir_real) (const char *path, mode_t mode) = dlsym(RTLD_NEXT, "mkdir");
|
||||
char buf[PATH_MAX];
|
||||
return mkdir_real(rewrite(path, buf), mode);
|
||||
}
|
||||
|
||||
int mkdirat(int dirfd, const char *path, mode_t mode)
|
||||
{
|
||||
int (*mkdirat_real) (int dirfd, const char *path, mode_t mode) = dlsym(RTLD_NEXT, "mkdirat");
|
||||
char buf[PATH_MAX];
|
||||
return mkdirat_real(dirfd, rewrite(path, buf), mode);
|
||||
}
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "deezer-python";
|
||||
version = "2.4.0";
|
||||
version = "3.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "browniebroke";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4Jjkhlv3wK4j2uU8dT11WYuBttlFtg+/ZBrc57UVeao=";
|
||||
sha256 = "1ln9hlix6rbyajgvwd2lk0i7nshvrbkvj9xx1i0q1z1caly9yl0g";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -65,11 +65,6 @@ buildPythonPackage rec {
|
|||
pytest-dependency
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"docker"
|
||||
"sshmanager"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Embedded control & testing library";
|
||||
homepage = "https://labgrid.org";
|
||||
|
|
41
pkgs/development/python-modules/smbus2/default.nix
Normal file
41
pkgs/development/python-modules/smbus2/default.nix
Normal file
|
@ -0,0 +1,41 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, nose
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "smbus2";
|
||||
version = "0.4.1";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kplindegaard";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0xgqs7bzhr8y3irc9gq3dnw1l3f5gc1yv4r2v4qxj95i3vvzpg5s";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
nose
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
nosetests
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"smbus2"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Drop-in replacement for smbus-cffi/smbus-python";
|
||||
homepage = "https://smbus2.readthedocs.io/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
|
@ -6,6 +6,7 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, httpx
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
|
@ -14,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "teslajsonpy";
|
||||
version = "0.21.0";
|
||||
version = "1.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zabuldon";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1rwp3aag21hdkis2wx680ckja0203grm7naldaj8d2kpy4697m54";
|
||||
sha256 = "1xkr0pmz458vh8b90ydykmgddhisay347vp48j50d1v0a55xvqsa";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -33,6 +34,7 @@ buildPythonPackage rec {
|
|||
aiohttp
|
||||
backoff
|
||||
beautifulsoup4
|
||||
httpx
|
||||
wrapt
|
||||
];
|
||||
|
||||
|
|
|
@ -45,11 +45,13 @@ function fetchgit(fileName, url, rev, branch, builtinFetchGit) {
|
|||
name = "${fileName}";
|
||||
path =
|
||||
let${builtinFetchGit ? `
|
||||
repo = builtins.fetchGit {
|
||||
repo = builtins.fetchGit ({
|
||||
url = "${url}";
|
||||
ref = "${branch}";
|
||||
rev = "${rev}";
|
||||
};
|
||||
} // (if builtins.substring 0 3 builtins.nixVersion == "2.4" then {
|
||||
allRefs = true;
|
||||
} else {}));
|
||||
` : `
|
||||
repo = fetchgit {
|
||||
url = "${url}";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, lndir, symlinkJoin, makeWrapper
|
||||
{ lib, symlinkJoin, makeWrapper
|
||||
, lilypond, openlilylib-fonts
|
||||
}:
|
||||
|
||||
|
@ -8,11 +8,10 @@ lib.appendToName "with-fonts" (symlinkJoin {
|
|||
paths = [ lilypond ] ++ openlilylib-fonts.all;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ lndir ];
|
||||
|
||||
postBuild = ''
|
||||
for p in $out/bin/*; do
|
||||
wrapProgram "$p" --set LILYPOND_DATADIR "$datadir"
|
||||
wrapProgram "$p" --set LILYPOND_DATADIR "$out/share/lilypond/${lilypond.version}"
|
||||
done
|
||||
'';
|
||||
})
|
||||
|
|
|
@ -116,13 +116,13 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "mpd";
|
||||
version = "0.22.10";
|
||||
version = "0.22.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MusicPlayerDaemon";
|
||||
repo = "MPD";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-h9dmi8AI8ZCjF4nlTi07uOWKs+8gly2HhSbPRB3Jl0g=";
|
||||
sha256 = "sha256-X+FnZ5W1p9GuOSIxTSp1Yok+kKsLjNPOKZkJSCYk8kM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
39
pkgs/tools/compression/crabz/default.nix
Normal file
39
pkgs/tools/compression/crabz/default.nix
Normal file
|
@ -0,0 +1,39 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, stdenv
|
||||
, libiconv
|
||||
, CoreFoundation
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "crabz";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sstadick";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0ch9cqarsakihg9ymbdm0ka6wz77z84n4g6cdlcskczc5g3b9gp9";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-nrCYlhq/f8gk3NmltAg+xppRJ533ooEpetWvaF2vmP0=";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
CoreFoundation
|
||||
Security
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A cross platform, fast, compression and decompression tool";
|
||||
homepage = "https://github.com/sstadick/crabz";
|
||||
changelog = "https://github.com/sstadick/crabz/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ unlicense /* or */ mit ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
36
pkgs/tools/networking/suckit/default.nix
Normal file
36
pkgs/tools/networking/suckit/default.nix
Normal file
|
@ -0,0 +1,36 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, openssl
|
||||
, stdenv
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "suckit";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skallwar";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0wr03yvrqa9p6m127fl4hcf9057i11zld898qz4kbdyiynpi0166";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-6otIWAAf9pI4A8kxK3dyOVpkw+SJ3/YAvTahDSXMWNc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
|
||||
|
||||
# requires internet access
|
||||
checkFlags = [ "--skip=test_download_url" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Recursively visit and download a website's content to your disk";
|
||||
homepage = "https://github.com/skallwar/suckit";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
41
pkgs/tools/package-management/nix-eval-jobs/default.nix
Normal file
41
pkgs/tools/package-management/nix-eval-jobs/default.nix
Normal file
|
@ -0,0 +1,41 @@
|
|||
{ lib
|
||||
, boost
|
||||
, cmake
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, nixUnstable
|
||||
, nlohmann_json
|
||||
, pkg-config
|
||||
, stdenv
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nix-eval-jobs";
|
||||
version = "0.0.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LTMW4356f8pvIyfYdOyZbF9yzU8MH9mryQgB4LrwZMI=";
|
||||
};
|
||||
buildInputs = [
|
||||
boost
|
||||
nixUnstable
|
||||
nlohmann_json
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
# nlohmann_json can be only discovered via cmake files
|
||||
cmake
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Hydra's builtin hydra-eval-jobs as a standalone";
|
||||
homepage = "https://github.com/nix-community/nix-eval-jobs";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ adisbladis mic92 ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
|
@ -3914,6 +3914,10 @@ with pkgs;
|
|||
|
||||
cpuminer-multi = callPackage ../tools/misc/cpuminer-multi { };
|
||||
|
||||
crabz = callPackage ../tools/compression/crabz {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
|
||||
};
|
||||
|
||||
cryptpad = callPackage ../servers/web-apps/cryptpad {
|
||||
nodejs = nodejs-12_x;
|
||||
};
|
||||
|
@ -9535,6 +9539,10 @@ with pkgs;
|
|||
|
||||
subfinder = callPackage ../tools/networking/subfinder { };
|
||||
|
||||
suckit = callPackage ../tools/networking/suckit {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
surfraw = callPackage ../tools/networking/surfraw { };
|
||||
|
||||
swagger-codegen = callPackage ../tools/networking/swagger-codegen { };
|
||||
|
@ -32035,6 +32043,8 @@ with pkgs;
|
|||
|
||||
dnadd = callPackage ../tools/nix/dnadd { };
|
||||
|
||||
nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { };
|
||||
|
||||
nix-doc = callPackage ../tools/package-management/nix-doc { };
|
||||
|
||||
nix-bundle = callPackage ../tools/package-management/nix-bundle { };
|
||||
|
|
|
@ -8459,6 +8459,8 @@ in {
|
|||
|
||||
smbus-cffi = callPackage ../development/python-modules/smbus-cffi { };
|
||||
|
||||
smbus2 = callPackage ../development/python-modules/smbus2 { };
|
||||
|
||||
smdebug-rulesconfig = callPackage ../development/python-modules/smdebug-rulesconfig { };
|
||||
|
||||
smhi-pkg = callPackage ../development/python-modules/smhi-pkg { };
|
||||
|
|
Loading…
Reference in a new issue