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
2019-09-08 14:49:25 +02:00
parent 9fcdb3bd16 362c2f67f9
commit e73f871285
71 changed files with 1834 additions and 797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/misc/html-proofer/Gemfile.lock
View File

@@ -6,13 +6,12 @@ GEM
ethon (0.12.0)
ffi (>= 1.3.0)
ffi (1.11.1)
html-proofer (3.12.0)
html-proofer (3.12.2)
addressable (~> 2.3)
mercenary (~> 0.3)
nokogiri (~> 1.10)
parallel (~> 1.3)
rainbow (~> 3.0)
timerizer (~> 0.3)
typhoeus (~> 1.3)
yell (~> 2.0)
mercenary (0.3.6)
@@ -22,7 +21,6 @@ GEM
parallel (1.17.0)
public_suffix (4.0.1)
rainbow (3.0.0)
timerizer (0.3.2)
typhoeus (1.3.1)
ethon (>= 0.9.0)
yell (2.2.0)

16
pkgs/tools/misc/html-proofer/gemset.nix
View File

@@ -32,15 +32,15 @@
version = "1.11.1";
};
html-proofer = {
dependencies = ["addressable" "mercenary" "nokogiri" "parallel" "rainbow" "timerizer" "typhoeus" "yell"];
dependencies = ["addressable" "mercenary" "nokogiri" "parallel" "rainbow" "typhoeus" "yell"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1a5h5ijrngfd4ri36g7bs5lcg4001i5xx7nlk35rsg34xpy8mp04";
sha256 = "0xkcchgvlqkk3xgn11vw8n42bhavj6nn6vqsbycbx1rqxgiljlhy";
type = "gem";
};
version = "3.12.0";
version = "3.12.2";
};
mercenary = {
groups = ["default"];
@@ -103,16 +103,6 @@
};
version = "3.0.0";
};
timerizer = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06zk04kprgj0abws15wqrk4q29f3wcx7z2jj3v25nnb2517lk66c";
type = "gem";
};
version = "0.3.2";
};
typhoeus = {
dependencies = ["ethon"];
groups = ["default"];

4
pkgs/tools/misc/logstash/6.x.nix
View File

@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz";
sha256 =
if enableUnfree
then "178shgxwc9kw9w9vwsvwxp8m8r6lssaw1i32vvmx9na01b4w5m4p"
else "0gyq97qsg7fys9cc5yj4kpcf3xxvdd5qgzal368yg9swps37g5yj";
then "00pwi7clgdflzzg15bh3y30gzikvvy7p5fl88fww7xhhy47q8053"
else "0spxgqsyh72n0l0xh6rljp0lbqz46xmr02sqz25ybycr4qkxdhgk";
};
dontBuild = true;

4
pkgs/tools/misc/logstash/7.x.nix
View File

@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz";
sha256 =
if enableUnfree
then "0ls7ia4ldyb7kslmjqhszb30bkammdm5nydc5y7r41zl1zjlhfgc"
else "1mpmfnc57vpjk8x3vibamz8lgq163msf20m1bail4hbwhwsmms9i";
then "1mw053bx2zh5320p545ax8fnydzqj28r239l7a4m1d2shi89w6s8"
else "0d57ahak4chxmd0pmgkbmig2wacprv120pwmjlx63sxf5vw72yap";
};
dontBuild = true;

6
pkgs/tools/misc/starship/default.nix
View File

@@ -2,19 +2,19 @@
rustPlatform.buildRustPackage rec {
pname = "starship";
version = "0.13.1";
version = "0.15.0";
src = fetchFromGitHub {
owner = "starship";
repo = "starship";
rev = "v${version}";
sha256 = "0y6ixl3i1brak226hh02da1zzlcv41f0kb648dqii6dzyhrwhrld";
sha256 = "164qxbzlzg53xicp2n5kg9qbmvlckc6rk78n69s82d2d09mbq1ks";
};
buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
nativeBuildInputs = [ pkgconfig ];
cargoSha256 = "1xk4ngxhgww921fk40d4ziprnzgp927lhdwwzcifcb0hdyl0854p";
cargoSha256 = "192lq0wf8c2p3s4n6c0xr02hwyswypxypimbghi4m8f3fgj2l3ig";
checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root";
meta = with stdenv.lib; {

6
pkgs/tools/nix/nixpkgs-fmt/default.nix
View File

@@ -1,16 +1,16 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "nixpkgs-fmt";
version = "0.3.1";
version = "0.5.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = pname;
rev = "v${version}";
sha256 = "0nz4njmrwacizz9z89ligxr2gyggk65vq9cmd6s4hn133gajf2n1";
sha256 = "07hnyx616dk03md00pmgpb5c2sp9w0n5l94s82arair0kpi0ncy0";
};
cargoSha256 = "0p3qa1asdvw2npav4281lzndjczrzac6fr8z4y61m7rbn363s8sa";
cargoSha256 = "0wfx7shsdqrwbnzr2a0fnly1kd93mxbm96zjq5pzrq94lphkhqhz";
meta = with lib; {
description = "Nix code formatter for nixpkgs";

73
pkgs/tools/security/gnome-keysign/default.nix Normal file
View File

@@ -0,0 +1,73 @@
{ stdenv
, fetchFromGitLab
, python3
, wrapGAppsHook
, gobject-introspection
, gtk3
, glib
, gnome3
, gst_all_1
}:
python3.pkgs.buildPythonApplication rec {
pname = "gnome-keysign";
version = "1.0.1";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = pname;
rev = version;
sha256 = "0iy70dskd7wly37lpb2ypd9phhyml5j3c7rzajii4f2s7zgb3abg";
};
nativeBuildInputs = [
wrapGAppsHook
gobject-introspection
] ++ (with python3.pkgs; [
Babel
lxml
]);
buildInputs = [
# TODO: add avahi support
gtk3
glib
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
(gst_all_1.gst-plugins-good.override { gtkSupport = true; })
gst_all_1.gst-plugins-bad # for zbar plug-in
];
propagatedBuildInputs = with python3.pkgs; [
dbus-python
future
gpgme
magic-wormhole
pygobject3
pybluez
qrcode
requests
twisted
];
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
};
};
# https://github.com/NixOS/nixpkgs/issues/56943
strictDeps = false;
# bunch of linting
doCheck = false;
meta = with stdenv.lib; {
description = "GTK/GNOME application to use GnuPG for signing other peoples’ keys";
homepage = https://wiki.gnome.org/Apps/Keysign;
license = licenses.gpl3Plus;
maintainers = gnome3.maintainers;
platforms = platforms.linux;
};
}

6
pkgs/tools/security/sequoia/default.nix
View File

@@ -9,16 +9,16 @@ assert pythonSupport -> pythonPackages != null;
rustPlatform.buildRustPackage rec {
pname = "sequoia";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitLab {
owner = "sequoia-pgp";
repo = pname;
rev = "v${version}";
sha256 = "13dzwdzz33dy2lgnznsv8wqnw2501f2ggrkfwpqy5x6d1kgms8rj";
sha256 = "0gvczghyik56jlnb8cz7jg2l3nbm519gf19g7l5blxci3009v23d";
};
cargoSha256 = "1zcnkpzcar3a2fk2rn3i3nb70b59ds9fpfa44f15r3aaxajsdhdi";
cargoSha256 = "0dk9sjcbmygbdpwqnah5krli1p9j5hahgiqrca9c0kfpfiwgx62q";
nativeBuildInputs = [
pkgconfig