gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts were caused by 2043dbb6fa
interacting with b2767b69dd.
This commit is contained in:
sternenseemann
2021-11-13 12:35:55 +01:00
parent c0c7fbda14 126db930e3
commit 1a1e32f023
402 changed files with 6986 additions and 1032 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/python-modules/construct/2.10.54.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
, six, pytestCheckHook, pytest-benchmark, enum34, numpy, arrow, ruamel-yaml
{ lib, stdenv, buildPythonPackage, fetchFromGitHub
, pytestCheckHook, pytest-benchmark, enum34, numpy, arrow, ruamel-yaml
}:
buildPythonPackage rec {
pkgs/development/python-modules/construct/default.nix
+1 -1
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
, six, pytestCheckHook, pytest-benchmark, numpy, arrow, ruamel-yaml
, pytestCheckHook, pytest-benchmark, numpy, arrow, ruamel-yaml
, lz4, cloudpickle
}: