nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 16:03:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-03-09 06:01:18 +00:00 committed by GitHub
commit d362e7c238
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 96 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/window-managers/sway/default.nix
View File

@ -11,7 +11,7 @@
, systemdSupport ? stdenv.isLinux
, dbusSupport ? true
, dbus
, trayEnabled ? dbusSupport
, trayEnabled ? systemdSupport && dbusSupport
}:
# The "sd-bus-provider" meson option does not include a "none" option,

4
pkgs/data/themes/yaru/default.nix
View File

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "yaru";
version = "21.10.2";
version = "22.04.1";
src = fetchFromGitHub {
owner = "ubuntu";
repo = "yaru";
rev = version;
sha256 = "sha256-VN/jgKGM2Th+2nv91vEz47kmQiBx8xAiEVbtXwhZg6U=";
sha256 = "sha256-5mB5eTIPw4CqYSQm675MKbRwsYLpg+5WJrLDkbc6nKs=";
};
nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];

4
pkgs/development/python-modules/censys/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "censys";
version = "2.1.2";
version = "2.1.3";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "censys";
repo = "censys-python";
rev = "v${version}";
sha256 = "0qxqd5ip98d6q1d48vcprpr38sa47ky3cr6lprd01nzibdmf2r2d";
sha256 = "sha256-Zv3ViOrdQby+7UQrHy6174W2qh1vx21R0yOA7ecr0lU=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/google-cloud-asset/default.nix
View File

@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "google-cloud-asset";
version = "3.8.0";
version = "3.8.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-4r1F7OgMS3TZdmEgXf5TtY4xv/YWInS6NyY6Ay4l8Ig=";
sha256 = "sha256-DvbHQV71hTsWtjN/D1+bHGLSss+UidCZRi3J0zTa07U=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
View File

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery-logging";
version = "1.0.1";
version = "1.0.2";
src = fetchPypi {
inherit pname version;
sha256 = "3cdbf4f82199d2ee0d07fa2c75527661fe034130e27e5c05fd070ed615cd7e23";
sha256 = "sha256-i8Bh39MnQRQtE4WwDNhHdxFX2bGL6txT+sV8RcvXiZw=";
};
propagatedBuildInputs = [

20
pkgs/development/python-modules/google-cloud-dataproc/default.nix
View File

@ -7,20 +7,32 @@
, proto-plus
, pytestCheckHook
, pytest-asyncio
, pythonOlder
}:
buildPythonPackage rec {
pname = "google-cloud-dataproc";
version = "4.0.0";
version = "4.0.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-x4ejr6qj5z4yKOx0pIqK13oVzsKj+uQ43Q5VN48jaFQ=";
sha256 = "sha256-IAnsz7UxMf3GqaPYPltis0WWPM+IIWwpK1iTSV7Kl5c=";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
propagatedBuildInputs = [
google-api-core
libcst
proto-plus
];
checkInputs = [ mock pytestCheckHook pytest-asyncio ];
checkInputs = [
mock
pytestCheckHook
pytest-asyncio
];
disabledTests = [
# requires credentials

20
pkgs/development/python-modules/google-cloud-language/default.nix
View File

@ -7,20 +7,32 @@
, proto-plus
, pytestCheckHook
, pytest-asyncio
, pythonOlder
}:
buildPythonPackage rec {
pname = "google-cloud-language";
version = "2.4.0";
version = "2.4.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-ZqnwvpXfWGEc+yiImNGRGUXVJGiNzGFeMSmjn7MzuQE=";
sha256 = "sha256-BhQQ4QZ7GbacjpLLg5LXm1g5IhIMk3tJdDrHZLquuTk=";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
propagatedBuildInputs = [
google-api-core
libcst
proto-plus
];
checkInputs = [ mock pytestCheckHook pytest-asyncio ];
checkInputs = [
mock
pytestCheckHook
pytest-asyncio
];
pythonImportsCheck = [
"google.cloud.language"

4
pkgs/development/python-modules/google-cloud-org-policy/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "google-cloud-org-policy";
version = "1.3.0";
version = "1.3.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-IbQP2/XMdwzmY3UgINiUvdd1Y1ABJkhh7x7x3kiR4Is=";
sha256 = "sha256-r9qz2/HjDYHXu9jY03rt0QC1BofzQ/HrKVjGCtvXzsU=";
};
propagatedBuildInputs = [ google-api-core proto-plus ];

4
pkgs/development/python-modules/google-cloud-trace/default.nix
View File

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-trace";
version = "1.6.0";
version = "1.6.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-MXbuSWVezxsXGrRgGqhLWFF5iByiYRKA1/qbqYawPRQ=";
sha256 = "sha256-JkKW9vJAAkw3sHYDapRvu5jjunV8oWSg/ykDmd1wpyA=";
};
propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ];

4
pkgs/development/python-modules/google-cloud-translate/default.nix
View File

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "google-cloud-translate";
version = "3.7.1";
version = "3.7.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-x4gSLVNo2uk93GWpvcPM20f0gJ1S3x/BVe13oNIpa0Y=";
hash = "sha256-icZG33G/noii9V0rsHTG/Qe8cKDVDfASRKy2XRYM5Yg=";
};
propagatedBuildInputs = [

6
pkgs/tools/admin/colmena/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "colmena";
version = "0.2.1";
version = "0.2.2";
src = fetchFromGitHub {
owner = "zhaofengli";
repo = "colmena";
rev = "v${version}";
sha256 = "sha256-5UU8iBzwO7xM8B+LulnFkJFv5j5lu7mfq0XMmOCaKcQ=";
sha256 = "sha256-VsqFiqZUjGpDZfw6ws1rvqm/NGUfFBXHa0N8ZkBaMh8=";
};
cargoSha256 = "sha256-wMC2GAVVxkwrgJtOIJL0P+Uxh+ouW4VwLDrXJlD10AA=";
cargoSha256 = "sha256-NVvPh0+53YIm5Kb/lNyXb7M3bbADBVdsTaPptyb37lw=";
nativeBuildInputs = [ installShellFiles ];

23
pkgs/tools/misc/pridecat/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation {
pname = "pridecat";
version = "unstable-2020-06-19";
src = fetchFromGitHub {
owner = "lunasorcery";
repo = "pridecat";
rev = "92396b11459e7a4b5e8ff511e99d18d7a1589c96";
sha256 = "sha256-PyGLbbsh9lFXhzB1Xn8VQ9zilivycGFEIc7i8KXOxj8=";
};
# fixes the install path in the Makefile
patches = [ ./fix_install.patch ];
meta = with lib; {
description = "Like cat, but more colorful";
homepage = "https://github.com/lunasorcery/pridecat";
license = licenses.cc-by-nc-sa-40;
maintainers = with maintainers; [ lunarequest ];
};
}

20
pkgs/tools/misc/pridecat/fix_install.patch Normal file
View File

@ -0,0 +1,20 @@
diff --git a/Makefile b/Makefile
index 815c27e..1556807 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
CXX ?= clang
+out ?= /usr/local
all: pridecat
@@ -6,7 +7,8 @@ pridecat: main.cpp
$(CXX) main.cpp -o pridecat -std=c++11 -lstdc++ -Wall -Wextra -O3
install: pridecat
- cp pridecat /usr/local/bin/pridecat
+ mkdir -p ${out}/bin
+ cp pridecat ${out}/bin/pridecat
uninstall:
rm -f /usr/local/bin/pridecat

4
pkgs/top-level/all-packages.nix
View File

@ -373,9 +373,11 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
pridecat = callPackage ../tools/misc/pridecat { };
proto-contrib = callPackage ../development/tools/proto-contrib { };
protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {};
protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc { };
protoc-gen-go = callPackage ../development/tools/protoc-gen-go { };