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

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2019-10-20 16:49:29 +02:00
parent baf5494330 d892487598
commit f849554226
194 changed files with 2032 additions and 1872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/build-managers/rebar3/default.nix
View File

@@ -3,7 +3,7 @@
tree, hexRegistrySnapshot }:
let
version = "3.11.1";
version = "3.12.0";
bootstrapper = ./rebar3-nix-bootstrap;
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
owner = "erlang";
repo = pname;
rev = version;
sha256 = "124l1alf7wx4hqjpf63l0nx70q68lilmgh582c1d413fz5ip0byd";
sha256 = "0936ix7lfwsamssap58b265zid7x2m97azrr2qpjcln3xysd16lg";
};
inherit bootstrapper;

12
pkgs/development/tools/documentation/gtk-doc/default.nix
View File

@@ -13,15 +13,6 @@
, withDblatex ? false, dblatex
}:
let
# Needed for https://gitlab.gnome.org/GNOME/gtk-doc/blob/GTK_DOC_1_32/meson.build#L42
python = python3.withPackages (p: with p; [
pygments
]);
in
stdenv.mkDerivation rec {
pname = "gtk-doc";
version = "1.32";
@@ -51,7 +42,8 @@ stdenv.mkDerivation rec {
docbook_xsl
libxslt
pkgconfig
python
python3
python3.pkgs.pygments # Needed for https://gitlab.gnome.org/GNOME/gtk-doc/blob/GTK_DOC_1_32/meson.build#L42
libxml2Python
]
++ stdenv.lib.optional withDblatex dblatex

6
pkgs/development/tools/documentation/mdsh/default.nix
View File

@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "mdsh";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "zimbatm";
repo = "mdsh";
rev = "v${version}";
sha256 = "1751lll93cimyj7bxxdwdxn5w0zb2mzjpbnk1c93jfsvzlz1wzbl";
sha256 = "1a9i6h8fzrrfzjyfxaps73lxgkz92k0bnmwbjbwdmiwci4qgi9ms";
};
cargoSha256 = "0b8rg4pz4mpm60iwwmfw4l1p1g9sh1fwf693aqxi8g4vrjf0zniv";
cargoSha256 = "0rarpzfigyxr6s0ba13z00kvnms29qkjfbfjkay72mb6xn7f1059";
verifyCargoDeps = true;
meta = with stdenv.lib; {

30
pkgs/development/tools/git-series/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, openssl_1_0_2, cmake, perl, pkgconfig, zlib }:
{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, openssl, cmake, perl, pkgconfig, zlib, curl, libgit2 }:
with rustPlatform;
@@ -13,21 +13,23 @@ buildRustPackage rec {
sha256 = "07mgq5h6r1gf3jflbv2khcz32bdazw7z1s8xcsafdarnm13ps014";
};
cargoSha256 = "07b25pcndhwvpwa5khdh8y1fl44hdv6ff2pfj1mjc0wchbspqm6q";
cargoSha256 = "09y4fvv279cm5sgbpmskascb7rrwqgya5w5wkpz1bgx6pzw3mc7y";
cargoDepsHook = ''
(
cd */
# see https://github.com/git-series/git-series/pull/56
patch -p1 < ${fetchpatch {
url = "https://github.com/Mic92/git-series/commit/3aa30a47d74ebf90b444dccdf8c153f07f119483.patch";
sha256 = "06v8br9skvy75kcw2zgbswxyk82sqzc8smkbqpzmivxlc2i9rnh0";
}}
)
'';
cargoPatches = [
(fetchpatch {
url = "https://github.com/Mic92/git-series/commit/3aa30a47d74ebf90b444dccdf8c153f07f119483.patch";
sha256 = "06v8br9skvy75kcw2zgbswxyk82sqzc8smkbqpzmivxlc2i9rnh0";
})
# Update Cargo.lock to allow using OpenSSL 1.1
(fetchpatch {
url = "https://github.com/edef1c/git-series/commit/11fe70ffcc18200e5f2a159c36aab070e8ff4228.patch";
sha256 = "0clwllf9mrhq86dhzyyhkw1q2ggpgqpw7s05dvp3gj9zhfsyya4s";
})
];
LIBGIT2_SYS_USE_PKG_CONFIG = true;
nativeBuildInputs = [ cmake pkgconfig perl ];
buildInputs = [ openssl_1_0_2 zlib ];
buildInputs = [ openssl zlib curl libgit2 ];
postBuild = ''
install -D "$src/git-series.1" "$out/man/man1/git-series.1"
@@ -43,6 +45,6 @@ buildRustPackage rec {
homepage = https://github.com/git-series/git-series;
license = licenses.mit;
maintainers = [ maintainers.vmandela ];
maintainers = with maintainers; [ edef vmandela ];
};
}

4
pkgs/development/tools/golangci-lint/default.nix
View File

@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "golangci-lint";
version = "1.20.0";
version = "1.21.0";
goPackagePath = "github.com/golangci/golangci-lint";
subPackages = [ "cmd/golangci-lint" ];
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "golangci";
repo = "golangci-lint";
rev = "v${version}";
sha256 = "1ca7l8smi1hx2sk6sq1cac9bvij4wnxxmwldbk8r1ih8ja5i6vdk";
sha256 = "0knvb59mg9jrzmfs5nzglz4nv047ayq1xz6dkis74wl1g9xi6yr5";
};
meta = with lib; {

26
pkgs/development/tools/misc/scc/default.nix Normal file
View File

@@ -0,0 +1,26 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "scc";
version = "2.8.0";
src = fetchFromGitHub {
owner = "boyter";
repo = "scc";
rev = "v${version}";
sha256 = "1g55aahr8j93jc1k2zgpnyxgp7ddn5137vjf8dafsmqp4m2qjq6g";
};
goPackagePath = "github.com/boyter/scc";
# scc has a scripts/ sub-package that's for testing.
subPackages = [ "./" ];
meta = with stdenv.lib; {
homepage = https://github.com/boyter/scc;
description = "A very fast accurate code counter with complexity calculations and COCOMO estimates written in pure Go";
maintainers = with maintainers; [ sigma ];
license = with licenses; [ unlicense /* or */ mit ];
platforms = platforms.unix;
};
}

6
pkgs/development/tools/prototool/default.nix
View File

@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "prototool";
version = "1.8.0";
version = "1.9.0";
src = fetchFromGitHub {
owner = "uber";
repo = pname;
rev = "v${version}";
sha256 = "0m6g5p3jyf0ja5j9rqmw8mhipdqxk7rcxm0plmh65bxk1n22fzjc";
sha256 = "1ssgvhcnqffhhdx8hnk4lmklip2f6g9i7ifblywfjylb08y7iqgd";
};
nativeBuildInputs = [ makeWrapper ];
modSha256 = "0l4nqb1c1lqqk70l9qwib1azavxlwghi2fv5siwrr5zw4jysz5ml";
modSha256 = "1gc8kc9mbi3mlh48zx4lcgpsrf8z879f1qj9wfyr66s7wd1ljazg";
postInstall = ''
wrapProgram "$out/bin/prototool" \

2
pkgs/development/tools/pypi2nix/default.nix
View File

@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
requests
];
buildInputs = [
pythonPackages.python pythonPackages.flake8
pythonPackages.python pythonPackages.flake8 pythonPackages.setuptools
zip makeWrapper nix.out nix-prefetch-git nix-prefetch-hg
];

18
pkgs/development/tools/trellis/default.nix
View File

@@ -8,25 +8,25 @@ let
in
stdenv.mkDerivation rec {
pname = "trellis";
version = "2019.09.27";
version = "2019.10.13";
# git describe --tags
realVersion = with stdenv.lib; with builtins;
"1.0-71-g${substring 0 7 (elemAt srcs 0).rev}";
"1.0-95-g${substring 0 7 (elemAt srcs 0).rev}";
srcs = [
(fetchFromGitHub {
owner = "symbiflow";
owner = "SymbiFlow";
repo = "prjtrellis";
rev = "06904938dfe8f52392e73f7c8b1e034327887c27";
sha256 = "1yk13pipj7wp2mma0qcss4sa0wx8h60x0l0x9awh8g2iyk1y8nfw";
rev = "e2e10bfdfaa29fed5d19e83dc7460be9880f5af4";
sha256 = "0l59nliv75rdxnajl2plilib0r0bzbr3qqzc88cdal841x1m0izs";
name = "trellis";
})
(fetchFromGitHub {
owner = "symbiflow";
owner = "SymbiFlow";
repo = "prjtrellis-db";
rev = "b4d626b6402c131e9a035470ffe4cf33ccbe7986";
sha256 = "0k26lq6c049ja8hhqcljwjb1y5k4gcici23l2n86gyp83jr03ilx";
name = "database";
rev = "5b5bb70bae13e6b8c971b4b2d26931f4a64b51bc";
sha256 = "1fi963zdny3gxdvq564037qs22i7b4y7mxc3yij2a1ww8rzrnpdj";
name = "trellis-database";
})
];
sourceRoot = "trellis";