nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-25 17:55:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
 pkgs/shells/ion/default.nix
 pkgs/tools/misc/cicero-tui/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-20 22:11:42 -07:00
parent 34a05e29f1 788deaad9d
commit 6b15fdce86
79 changed files with 17575 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,14 +28,14 @@
buildPythonPackage rec {
pname = "matrix-nio";
version = "0.18.0";
version = "0.18.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "poljar";
repo = "matrix-nio";
rev = version;
sha256 = "1rn5lz81y4bvgjhxzd57qhr0lmkm5xljl4bj9w10lnm4f7ls0xdi";
sha256 = "QHNirglqSxGMmbST96LUp9MHoGj0yAwLoTRlsbMqwaM=";
};
nativeBuildInputs = [

8
pkgs/development/python-modules/pysmf/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, pkg-config, libsmf, glib, pytest }:
{ lib, buildPythonPackage, fetchPypi, pkg-config, libsmf, glib, pytest, cython }:
buildPythonPackage rec {
pname = "pysmf";
@@ -9,7 +9,11 @@ buildPythonPackage rec {
sha256 = "10i7vvvdx6c3gl4afsgnpdanwgzzag087zs0fxvfipnqknazj806";
};
nativeBuildInputs = [ pkg-config pytest ];
postUnpack = ''
rm $sourceRoot/src/smf.c
'';
nativeBuildInputs = [ pkg-config pytest cython ];
buildInputs = [ libsmf glib ];
meta = with lib; {

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

@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "zulip";
version = "0.7.1";
version = "0.8.0";
disabled = !isPy3k;
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "zulip";
repo = "python-zulip-api";
rev = version;
sha256 = "0da1ki1v252avy27j6d7snnc0gyq0xa9fypm3qdmxhw2w79d6q36";
sha256 = "sha256-gJ+YRJC6wmQzPakApOqytyPy34cS/jjzEZhRIvWUBIQ=";
};
sourceRoot = "source/zulip";