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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-12-31 12:00:36 +01:00
parent ec1f78d1cb 42575040fc
commit 070290bda7
172 changed files with 2734 additions and 2541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/tools/build-managers/tup/default.nix
View File

@@ -1,21 +1,22 @@
{ stdenv, fetchFromGitHub, fuse, pkgconfig }:
{ stdenv, fetchFromGitHub, fuse, pkgconfig, pcre }:
stdenv.mkDerivation rec {
name = "tup-${version}";
version = "0.7.5";
version = "0.7.8";
src = fetchFromGitHub {
owner = "gittup";
repo = "tup";
rev = "v${version}";
sha256 = "0jzp1llq6635ldb7j9qb29j2k0x5mblimdqg3179dvva1hv0ia23";
sha256 = "07dmz712zbs5kayf98kywp7blssgh0y2gc1623jbsynmqwi77mcb";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ fuse ];
buildInputs = [ fuse pcre ];
configurePhase = ''
sed -i 's/`git describe`/v${version}/g' Tupfile
sed -i 's/`git describe`/v${version}/g' src/tup/link.sh
sed -i 's/pcre-confg/pkg-config pcre/g' Tupfile Tuprules.tup
'';
# Regular tup builds require fusermount to have suid, which nix cannot
@@ -23,6 +24,7 @@ stdenv.mkDerivation rec {
# generate' instead
buildPhase = ''
./build.sh
./build/tup init
./build/tup generate script.sh
./script.sh
'';

34
pkgs/development/tools/detect-secrets/default.nix Normal file
View File

@@ -0,0 +1,34 @@
{ lib, buildPythonApplication, fetchFromGitHub, isPy27, pyyaml, unidiff, configparser, enum34, future, functools32, mock, pytest }:
buildPythonApplication rec {
pname = "detect-secrets";
version = "0.11.0";
# PyPI tarball doesn't ship tests
src = fetchFromGitHub {
owner = "Yelp";
repo = "detect-secrets";
rev = "v${version}";
sha256 = "11r11q6d8aajqqnhhz4lsa93qf1x745331kl9jd3z4y4w91l4gdz";
};
propagatedBuildInputs = [ pyyaml unidiff ]
++ lib.optionals isPy27 [ configparser enum34 future functools32 ];
checkInputs = [ mock pytest ];
# deselect tests which require git setup
checkPhase = ''
PYTHONPATH=$PWD:$PYTHONPATH pytest \
--deselect tests/main_test.py::TestMain \
--deselect tests/pre_commit_hook_test.py::TestPreCommitHook \
--deselect tests/core/baseline_test.py::TestInitializeBaseline
'';
meta = with lib; {
description = "An enterprise friendly way of detecting and preventing secrets in code";
homepage = https://github.com/Yelp/detect-secrets;
license = licenses.asl20;
maintainers = [ maintainers.marsam ];
};
}

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

@@ -4,8 +4,8 @@ buildGoPackage rec {
name = "doctl-${version}";
version = "${major}.${minor}.${patch}";
major = "1";
minor = "8";
patch = "0";
minor = "12";
patch = "2";
goPackagePath = "github.com/digitalocean/doctl";
excludedPackages = ''\(doctl-gen-doc\|install-doctl\|release-doctl\)'';
@@ -21,7 +21,7 @@ buildGoPackage rec {
owner = "digitalocean";
repo = "doctl";
rev = "v${version}";
sha256 = "1h94qagbni8cvzdparmgx3m9qcnbwbk0kjlvy9jzxfd3vcpbg38j";
sha256 = "01li9ywzvmzmhqgk9a5li2wkqmdn7jl8pqz2rn7dnay4fr2259fv";
};
meta = {

296
pkgs/development/tools/egg2nix/chicken-eggs.nix
View File

@@ -1,296 +0,0 @@
{ pkgs }:
rec {
inherit (pkgs) eggDerivation fetchegg;
base64 = eggDerivation {
name = "base64-3.3.1";
src = fetchegg {
name = "base64";
version = "3.3.1";
sha256 = "0wmldiwwg1jpcn07wb906nc53si5j7sa83wgyq643xzqcx4v4x1d";
};
buildInputs = [
];
};
blob-utils = eggDerivation {
name = "blob-utils-1.0.3";
src = fetchegg {
name = "blob-utils";
version = "1.0.3";
sha256 = "17vdn02fnxnjx5ixgqimln93lqvzyq4y9w02fw7xnbdcjzqm0xml";
};
buildInputs = [
setup-helper
string-utils
];
};
check-errors = eggDerivation {
name = "check-errors-1.13.0";
src = fetchegg {
name = "check-errors";
version = "1.13.0";
sha256 = "12a0sn82n98jybh72zb39fdddmr5k4785xglxb16750fhy8rmjwi";
};
buildInputs = [
setup-helper
];
};
defstruct = eggDerivation {
name = "defstruct-1.6";
src = fetchegg {
name = "defstruct";
version = "1.6";
sha256 = "0lsgl32nmb5hxqiii4r3292cx5vqh50kp6v062nfiyid9lhrj0li";
};
buildInputs = [
];
};
http-client = eggDerivation {
name = "http-client-0.7.1";
src = fetchegg {
name = "http-client";
version = "0.7.1";
sha256 = "1s03zgmb7kb99ld0f2ylqgicrab9qgza53fkgsqvg7bh5njmzhxr";
};
buildInputs = [
intarweb
uri-common
message-digest
md5
string-utils
sendfile
];
};
intarweb = eggDerivation {
name = "intarweb-1.3";
src = fetchegg {
name = "intarweb";
version = "1.3";
sha256 = "0izlby78c25py29bdcbc0vapb6h7xgchqrzi6i51d0rb3mnwy88h";
};
buildInputs = [
defstruct
uri-common
base64
];
};
lookup-table = eggDerivation {
name = "lookup-table-1.13.5";
src = fetchegg {
name = "lookup-table";
version = "1.13.5";
sha256 = "1nzly6rhynawlvzlyilk8z8cxz57cf9n5iv20glkhh28pz2izmrb";
};
buildInputs = [
setup-helper
check-errors
miscmacros
record-variants
synch
];
};
matchable = eggDerivation {
name = "matchable-3.3";
src = fetchegg {
name = "matchable";
version = "3.3";
sha256 = "07y3lpzgm4djiwi9y2adc796f9kwkmdr28fkfkw65syahdax8990";
};
buildInputs = [
];
};
md5 = eggDerivation {
name = "md5-3.1.0";
src = fetchegg {
name = "md5";
version = "3.1.0";
sha256 = "0bka43nx8x9b0b079qpvml2fl20km19ny0qjmhwzlh6rwmzazj2a";
};
buildInputs = [
message-digest
];
};
message-digest = eggDerivation {
name = "message-digest-3.1.0";
src = fetchegg {
name = "message-digest";
version = "3.1.0";
sha256 = "1w6bax19dwgih78vcimiws0rja7qsd8hmbm6qqg2hf9cw3vab21s";
};
buildInputs = [
setup-helper
miscmacros
check-errors
variable-item
blob-utils
string-utils
];
};
miscmacros = eggDerivation {
name = "miscmacros-2.96";
src = fetchegg {
name = "miscmacros";
version = "2.96";
sha256 = "1ajdgjrni10i2hmhcp4rawnxajjxry3kmq1krdmah4sf0kjrgajc";
};
buildInputs = [
];
};
record-variants = eggDerivation {
name = "record-variants-0.5.1";
src = fetchegg {
name = "record-variants";
version = "0.5.1";
sha256 = "15wgysxkm8m4hx9nhhw9akchzipdnqc7yj3qd3zn0z7sxg4sld1h";
};
buildInputs = [
];
};
sendfile = eggDerivation {
name = "sendfile-1.7.29";
src = fetchegg {
name = "sendfile";
version = "1.7.29";
sha256 = "1dc02cbkx5kixhbqjy26g6gs680vy7krc9qis1p1v4aa0b2lgj7k";
};
buildInputs = [
];
};
setup-helper = eggDerivation {
name = "setup-helper-1.5.4";
src = fetchegg {
name = "setup-helper";
version = "1.5.4";
sha256 = "1k644y0md2isdcvazqfm4nyc8rh3dby6b0j3r4na4w8ryspqp6gj";
};
buildInputs = [
];
};
string-utils = eggDerivation {
name = "string-utils-1.2.4";
src = fetchegg {
name = "string-utils";
version = "1.2.4";
sha256 = "07alvghg0dahilrm4jg44bndl0x69sv1zbna9l20cbdvi35i0jp1";
};
buildInputs = [
setup-helper
miscmacros
lookup-table
check-errors
];
};
synch = eggDerivation {
name = "synch-2.1.2";
src = fetchegg {
name = "synch";
version = "2.1.2";
sha256 = "1m9mnbq0m5jsxmd1a3rqpwpxj0l1b7vn1fknvxycc047pmlcyl00";
};
buildInputs = [
setup-helper
check-errors
];
};
uri-common = eggDerivation {
name = "uri-common-1.4";
src = fetchegg {
name = "uri-common";
version = "1.4";
sha256 = "01ds1gixcn4rz657x3hr4rhw2496hsjff42ninw0k39l8i1cbh7c";
};
buildInputs = [
uri-generic
defstruct
matchable
];
};
uri-generic = eggDerivation {
name = "uri-generic-2.41";
src = fetchegg {
name = "uri-generic";
version = "2.41";
sha256 = "1r5jbzjllbnmhm5n0m3fcx0g6dc2c2jzp1dcndkfmxz0cl99zxac";
};
buildInputs = [
matchable
defstruct
];
};
variable-item = eggDerivation {
name = "variable-item-1.3.1";
src = fetchegg {
name = "variable-item";
version = "1.3.1";
sha256 = "19b3mhb8kr892sz9yyzq79l0vv28dgilw9cf415kj6aq16yp4d5n";
};
buildInputs = [
setup-helper
check-errors
];
};
}

5
pkgs/development/tools/egg2nix/chicken-eggs.scm
View File

@@ -1,5 +0,0 @@
;; Eggs used by egg2nix
http-client
intarweb
matchable
uri-common

27
pkgs/development/tools/egg2nix/default.nix
View File

@@ -1,27 +0,0 @@
{ stdenv, eggDerivation, fetchurl, chickenEggs }:
# Note: This mostly reimplements the default.nix already contained in
# the tarball. Is there a nicer way than duplicating code?
let
version = "0.5";
in
eggDerivation {
src = fetchurl {
url = "https://github.com/the-kenny/egg2nix/archive/${version}.tar.gz";
sha256 = "0adal428v4i7h9lzs7sfq75q2mxhsbf1qqwzrsjv8j41paars20y";
};
name = "egg2nix-${version}";
buildInputs = with chickenEggs; [
matchable http-client
];
meta = {
description = "Generate nix-expression from CHICKEN scheme eggs";
homepage = https://github.com/the-kenny/egg2nix;
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.the-kenny ];
};
}

24
pkgs/development/tools/elm2nix/default.nix Normal file
View File

@@ -0,0 +1,24 @@
{ mkDerivation, aeson, ansi-wl-pprint, async, base, binary
, bytestring, containers, data-default, directory, filepath, here
, mtl, optparse-applicative, process, req, stdenv, text
, transformers, unordered-containers
}:
mkDerivation {
pname = "elm2nix";
version = "0.1.0";
sha256 = "9ec1f1f694a38b466ebd03aaa1a035bbdb9bdae390be5b9a030611bcbfd91890";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson async base binary bytestring containers data-default
directory filepath here mtl process req text transformers
unordered-containers
];
executableHaskellDepends = [
ansi-wl-pprint base directory here optparse-applicative
];
testHaskellDepends = [ base ];
homepage = "https://github.com/domenkozar/elm2nix#readme";
description = "Turn your Elm project into buildable Nix project";
license = stdenv.lib.licenses.bsd3;
}

4
pkgs/development/tools/misc/lit/default.nix
View File

@@ -2,11 +2,11 @@
python2.pkgs.buildPythonApplication rec {
pname = "lit";
version = "0.6.0";
version = "0.7.1";
src = python2.pkgs.fetchPypi {
inherit pname version;
sha256 = "1png3jgbhrw8a602gy6rnzvjcrj8w2p2kk6szdg9lz42zr090lgb";
sha256 = "ecef2833aef7f411cb923dac109c7c9dcc7dbe7cafce0650c1e8d19c243d955f";
};
# Non-standard test suite. Needs custom checkPhase.

6
pkgs/development/tools/misc/strace/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "strace-${version}";
version = "4.25";
version = "4.26";
src = fetchurl {
url = "https://strace.io/files/${version}/${name}.tar.xz";
sha256 = "00f7zagfh3np5gwi0z7hi7zjd7s5nixcaq7z78n87dvhakkgi1fn";
sha256 = "070yz8xii8gnb4psiz628zwm5srh266sfb06f7f1qzagxzz2ykbw";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://strace.io/;
description = "A system call tracer for Linux";
license = licenses.bsd3;
license = with licenses; [ lgpl21Plus gpl2Plus ]; # gpl2Plus is for the test suite
platforms = platforms.linux;
maintainers = with maintainers; [ jgeerds globin ];
};

23
pkgs/development/tools/solarus-quest-editor/default.nix
View File

@@ -1,36 +1,23 @@
{ stdenv, fetchFromGitLab, cmake, luajit,
SDL2, SDL2_image, SDL2_ttf, physfs,
openal, libmodplug, libvorbis, solarus,
qtbase, qttools, fetchpatch }:
qtbase, qttools, fetchpatch, glm }:
stdenv.mkDerivation rec {
name = "solarus-quest-editor-${version}";
version = "1.5.3";
version = "1.6.0";
src = fetchFromGitLab {
owner = "solarus-games";
repo = "solarus-quest-editor";
rev = "v1.5.3";
sha256 = "1b9mg04yy4pnrl745hbc82rz79k0f8ci3wv7gvsm3a998q8m98si";
rev = "v${version}";
sha256 = "1a7816kaljfh9ynzy9g36mqzzv2p800nnbrja73q6vjfrsv3vq4c";
};
buildInputs = [ cmake luajit SDL2
SDL2_image SDL2_ttf physfs
openal libmodplug libvorbis
solarus qtbase qttools ];
patches = [
./patches/fix-install.patch
# Next two patches should be fine to remove for next release.
# This commit fixes issues AND adds features *sighs*
./patches/partial-f285beab62594f73e57190c49848c848487214cf.patch
(fetchpatch {
url = https://gitlab.com/solarus-games/solarus-quest-editor/commit/8f308463030c18cd4f7c8a6052028fff3b7ca35a.patch;
sha256 = "1jq48ghhznrp47q9lq2rhh48a1z4aylyy4qaniaqyfyq3vihrchr";
})
];
solarus qtbase qttools glm ];
meta = with stdenv.lib; {
description = "The editor for the Zelda-like ARPG game engine, Solarus";

16
pkgs/development/tools/solarus-quest-editor/patches/fix-install.patch
View File

@@ -1,16 +0,0 @@
# Description Fix CMakeLists.txt to install binaries. Fixed in 1.5 upstream.
# Author "Nathan R. Moore <natedevv@gmail.com>"
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -359,6 +359,11 @@
"${MODPLUG_LIBRARY}"
)
+# Set files to install
+install(TARGETS solarus-quest-editor
+ RUNTIME DESTINATION bin
+)
+
# Platform specific.
# Windows: disable the console.

33
pkgs/development/tools/solarus-quest-editor/patches/partial-f285beab62594f73e57190c49848c848487214cf.patch
View File

@@ -1,33 +0,0 @@
From f285beab62594f73e57190c49848c848487214cf Mon Sep 17 00:00:00 2001
From: stdgregwar <gregoirehirt@gmail.com>
Date: Sun, 1 Jul 2018 00:00:41 +0200
Subject: [PATCH] Shader previewer base
diff --git a/include/widgets/tileset_view.h b/include/widgets/tileset_view.h
index 615f432..799a4c6 100644
--- a/include/widgets/tileset_view.h
+++ b/include/widgets/tileset_view.h
@@ -23,6 +23,7 @@
#include "pattern_separation.h"
#include <QGraphicsView>
#include <QPointer>
+#include <QMenu>
class QAction;
diff --git a/src/widgets/text_editor.cpp b/src/widgets/text_editor.cpp
index 4f2ff68..90080a9 100644
--- a/src/widgets/text_editor.cpp
+++ b/src/widgets/text_editor.cpp
@@ -26,6 +26,7 @@
#include <QList>
#include <QPlainTextEdit>
#include <QScrollBar>
+#include <QAction>
#include <QTextStream>
#include <QUndoStack>
--
2.18.0