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-02-13 12:33:29 +01:00
parent 7c3588d8dd 563b491ce8
commit 7257dedd7c
197 changed files with 4356 additions and 3415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/tools/admin/certbot/default.nix
View File

@@ -1,34 +1,32 @@
{ stdenv, pythonPackages, fetchFromGitHub, dialog }:
{ stdenv, python3Packages, fetchFromGitHub, dialog }:
# Latest version of certbot supports python3 and python3 version of pythondialog
pythonPackages.buildPythonApplication rec {
name = "certbot-${version}";
version = "0.24.0";
python3Packages.buildPythonApplication rec {
pname = "certbot";
version = "0.31.0";
src = fetchFromGitHub {
owner = "certbot";
repo = "certbot";
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "0gsq4si0bqwzd7ywf87y7bbprqg1m72qdj11h64qmwb5zl4vh444";
sha256 = "0rwjxmkpicyc9a5janvj1lfi430nq6ha94nyfgp11ds9fyydbh1s";
};
propagatedBuildInputs = with pythonPackages; [
propagatedBuildInputs = with python3Packages; [
ConfigArgParse
acme
configobj
cryptography
josepy
parsedatetime
psutil
pyRFC3339
pyopenssl
python2-pythondialog
pytz
six
zope_component
zope_interface
];
buildInputs = [ dialog ] ++ (with pythonPackages; [ nose mock gnureadline ]);
buildInputs = [ dialog ] ++ (with python3Packages; [ mock gnureadline ]);
patchPhase = ''
substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/run/wrappers/bin/sendmail"

4
pkgs/tools/admin/lego/default.nix
View File

@@ -2,14 +2,14 @@
buildGoPackage rec {
name = "lego-${version}";
version = "2.0.1";
version = "2.2.0";
rev = "v${version}";
src = fetchFromGitHub {
inherit rev;
owner = "xenolf";
repo = "lego";
sha256 = "17q5j2zxc2c0xw8pfhnls67dmwrkicjmd2jdyim3fhi5cgxl9h93";
sha256 = "1bb4kjkbphay63z83a4z2859qrlrx2h7n3rgia17fhy38xp5zzqp";
};
goPackagePath = "github.com/xenolf/lego";

27
pkgs/tools/audio/opl3bankeditor/default.nix Normal file
View File

@@ -0,0 +1,27 @@
{ stdenv, fetchFromGitHub, cmake, qttools, alsaLib }:
stdenv.mkDerivation rec {
version = "2019-01-12";
pname = "OPL3BankEditor";
src = fetchFromGitHub {
owner = "Wohlstand";
repo = pname;
rev = "a254c923df5b385e140de6ae42cf4908af8728d3";
sha256 = "181zkr2zkv9xy6zijbzqbqf4z6phg98ramzh9hmwi5zcbw68wkqw";
fetchSubmodules = true;
};
buildInputs = [
alsaLib qttools
];
nativeBuildInputs = [ cmake ];
meta = with stdenv.lib; {
description = "A small cross-platform editor of the OPL3 FM banks of different formats";
homepage = src.meta.homepage;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ gnidorah ];
};
}

19
pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix Normal file
View File

@@ -0,0 +1,19 @@
{ stdenv, opl3bankeditor, fetchFromGitHub, fetchpatch }:
opl3bankeditor.overrideAttrs (oldAttrs: rec {
version = "1.3-beta";
pname = "OPN2BankEditor";
src = fetchFromGitHub {
owner = "Wohlstand";
repo = pname;
rev = version;
sha256 = "0blcvqfj1yj6cmm079aw4jdzv3066jxqy9krp268i6cl2b3bmwvw";
fetchSubmodules = true;
};
# to be removed with next release
postInstall = ''
install -Dm755 opn2_bank_editor $out/bin/opn2_bank_editor
'';
})

4
pkgs/tools/backup/borg/default.nix
View File

@@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "borgbackup";
version = "1.1.8";
version = "1.1.9";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "0b4370480ca0114cb0bb534286241af8a35c6ffb71404dfa409ed06099661b63";
sha256 = "7d0ff84e64c4be35c43ae2c047bb521a94f15b278c2fe63b43950c4836b42575";
};
nativeBuildInputs = with python3Packages; [

19
pkgs/tools/backup/rdedup/default.nix
View File

@@ -1,21 +1,27 @@
{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, libsodium
, llvmPackages, clang_39, lzma }:
, llvmPackages, clang_39, lzma
, Security }:
rustPlatform.buildRustPackage rec {
name = "rdedup-${version}";
version = "3.0.1";
version = "3.1.1";
src = fetchFromGitHub {
owner = "dpc";
repo = "rdedup";
rev = "e0f26f379a434f76d238c7a5fa6ddd8ae8b32f19";
sha256 = "1nhf8ap0w99aa1h0l599cx90lcvfvjaj67nw9flq9bmmzpn53kp9";
rev = "rdedup-v${version}";
sha256 = "0y34a3mpghdmcb2rx4z62q0s351bfmy1287d75mm07ryfgglgsd7";
};
cargoSha256 = "1x6wchlcxb1frww6y04gfx4idxv9h0g9qfxrhgb6g5qy3bqhqq3p";
cargoSha256 = "0p19qcz2ph6axfccjwc6z72hrlb48l7sf1n0hc1gfq8hj2s3k2s1";
patches = [
./v3.1.1-fix-Cargo.lock.patch
];
nativeBuildInputs = [ pkgconfig llvmPackages.libclang clang_39 ];
buildInputs = [ openssl libsodium lzma ];
buildInputs = [ openssl libsodium lzma ]
++ (stdenv.lib.optional stdenv.isDarwin Security);
configurePhase = ''
export LIBCLANG_PATH="${llvmPackages.libclang}/lib"
@@ -27,5 +33,6 @@ rustPlatform.buildRustPackage rec {
license = licenses.mpl20;
maintainers = with maintainers; [ dywedir ];
platforms = platforms.all;
broken = stdenv.isDarwin;
};
}

28
pkgs/tools/backup/rdedup/v3.1.1-fix-Cargo.lock.patch Normal file
View File

@@ -0,0 +1,28 @@
diff --git a/Cargo.lock b/Cargo.lock
index 96be83a..fe07471 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -880,12 +880,12 @@ dependencies = [
[[package]]
name = "rdedup"
-version = "3.1.0"
+version = "3.1.1"
dependencies = [
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "rdedup-lib 3.0.0",
+ "rdedup-lib 3.1.0",
"rpassword 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"slog 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -900,7 +900,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "rdedup-lib"
-version = "3.0.0"
+version = "3.1.0"
dependencies = [
"backblaze-b2 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"base64 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",

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

@@ -4,17 +4,17 @@
rustPlatform.buildRustPackage rec {
name = "bat-${version}";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "bat";
rev = "v${version}";
sha256 = "13c88h1m9flmx3x2h7xrnb1wy4vgdxsqahw8cqa0x61ay0019a7s";
sha256 = "1q22lbyrwh58vhznpjpkiaa8v4qv6a3a8lrxzaypd8wg78p9dca6";
fetchSubmodules = true;
};
cargoSha256 = "1clng4rl7mq50z8d5ipmr9fapjj4qmpf4gmdnfl6vs35pq3wp9j4";
cargoSha256 = "0npj2rf4vr45gq3qwqq6kqnv9dh58v5lpx0gsmy2qrq44dxb75rq";
nativeBuildInputs = [ cmake pkgconfig zlib ];

37
pkgs/tools/misc/kalibrate-hackrf/default.nix
View File

@@ -1,37 +0,0 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fftw, hackrf, libusb1 }:
stdenv.mkDerivation rec {
name = "kalibrate-hackrf-unstable-20160827";
# There are no tags/releases, so use the latest commit from git master.
# Currently, the latest commit is from 2016-07-03.
src = fetchFromGitHub {
owner = "scateu";
repo = "kalibrate-hackrf";
rev = "2492c20822ca6a49dce97967caf394b1d4b2c43e";
sha256 = "1jvn1qx7csgycxpx1k804sm9gk5a0c65z9gh8ybp9awq3pziv0nx";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ fftw hackrf libusb1 ];
postInstall = ''
mv $out/bin/kal $out/bin/kal-hackrf
'';
meta = with stdenv.lib; {
description = "Calculate local oscillator frequency offset in hackrf devices";
longDescription = ''
Kalibrate, or kal, can scan for GSM base stations in a given frequency
band and can use those GSM base stations to calculate the local
oscillator frequency offset.
This package is for hackrf devices.
'';
homepage = https://github.com/scateu/kalibrate-hackrf;
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = [ maintainers.mog ];
};
}

31
pkgs/tools/misc/kalibrate-rtl/default.nix
View File

@@ -1,31 +0,0 @@
{ stdenv, fetchgit, autoreconfHook, pkgconfig, fftw, rtl-sdr, libusb1 }:
stdenv.mkDerivation rec {
name = "kalibrate-rtl-20131214";
# There are no tags/releases, so use the latest commit from git master.
# Currently, the latest commit is from 2013-12-14.
src = fetchgit {
url = "https://github.com/steve-m/kalibrate-rtl.git";
rev = "aae11c8a8dc79692a94ccfee39ba01e8c8c05d38";
sha256 = "1spbfflkqnw9s8317ppsf7b1nnkicqsmaqsnz1zf8i49ix70i6kn";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ fftw rtl-sdr libusb1 ];
meta = with stdenv.lib; {
description = "Calculate local oscillator frequency offset in RTL-SDR devices";
longDescription = ''
Kalibrate, or kal, can scan for GSM base stations in a given frequency
band and can use those GSM base stations to calculate the local
oscillator frequency offset.
This package is for RTL-SDR devices.
'';
homepage = https://github.com/steve-m/kalibrate-rtl;
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}

4
pkgs/tools/misc/lf/default.nix
View File

@@ -2,13 +2,13 @@
buildGoPackage rec {
name = "lf-${version}";
version = "9";
version = "10";
src = fetchFromGitHub {
owner = "gokcehan";
repo = "lf";
rev = "r${version}";
sha256 = "08dwnlgw1dcnd2hl5ma6qqzcyjn9wjp28mjbnidyvc5dmmxc87dq";
sha256 = "14wddjm6g5smb0s549nd7l2r3fcdd6k5p2cqq94j02n2jhlv0k6h";
};
goPackagePath = "github.com/gokcehan/lf";

8
pkgs/tools/misc/papis/default.nix
View File

@@ -1,8 +1,8 @@
{ lib, fetchFromGitHub, fetchpatch
, python36, xdg_utils
, python3, xdg_utils
}:
python36.pkgs.buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "papis";
version = "0.7.5";
@@ -20,7 +20,7 @@ python36.pkgs.buildPythonApplication rec {
sha256 = "0cmagfdaaml1pxhnxggifpb47z5g1p231qywnvnqpd3dm93382w1";
};
propagatedBuildInputs = with python36.pkgs; [
propagatedBuildInputs = with python3.pkgs; [
click requests filetype pyparsing configparser
arxiv2bib pyyaml chardet beautifulsoup4 prompt_toolkit
bibtexparser python-slugify pyparser pylibgen
@@ -33,7 +33,7 @@ python36.pkgs.buildPythonApplication rec {
install -Dt "$out/etc/bash_completion.d" scripts/shell_completion/build/bash/papis
'';
checkInputs = (with python36.pkgs; [
checkInputs = (with python3.pkgs; [
pytest
]) ++ [
xdg_utils

2
pkgs/tools/misc/snapper/default.nix
View File

@@ -62,6 +62,6 @@ stdenv.mkDerivation rec {
homepage = http://snapper.io;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ tstrobel ];
maintainers = with maintainers; [ tstrobel markuskowa ];
};
}

4
pkgs/tools/misc/txr/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "txr-${version}";
version = "208";
version = "209";
src = fetchurl {
url = "http://www.kylheku.com/cgit/txr/snapshot/${name}.tar.bz2";
sha256 = "091yki3a24pscwd0lg2ymy86r223amjnz9c71z4a2kxz5brhl5my";
sha256 = "1g236bk5ygh3car4kki3w6n0pwny8q4awg8p86fh2khj52qz6mdl";
};
nativeBuildInputs = [ bison flex ];

4
pkgs/tools/networking/curl/default.nix
View File

@@ -24,14 +24,14 @@ assert brotliSupport -> brotli != null;
assert gssSupport -> libkrb5 != null;
stdenv.mkDerivation rec {
name = "curl-7.63.0";
name = "curl-7.64.0";
src = fetchurl {
urls = [
"https://curl.haxx.se/download/${name}.tar.bz2"
"https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2"
];
sha256 = "1n4dzlbllwks8xkz466j362da0pbnxgwr11d64504xzzxka7xawv";
sha256 = "1szj9ia1snbfqzfcsk6hx1j7jhbqsy0f9k5d7x9xiy8w5lfblwym";
};
outputs = [ "bin" "dev" "out" "man" "devdoc" ];

6
pkgs/tools/networking/flannel/default.nix
View File

@@ -4,7 +4,7 @@ with lib;
buildGoPackage rec {
name = "flannel-${version}";
version = "0.6.2";
version = "0.11.0";
rev = "v${version}";
goPackagePath = "github.com/coreos/flannel";
@@ -15,14 +15,14 @@ buildGoPackage rec {
inherit rev;
owner = "coreos";
repo = "flannel";
sha256 = "03l0zyv9ajda70zw7jgwlmilw26h849jbb9f4slbycphhvbmpvb9";
sha256 = "0akxlrrsm2w51g0qd7dnsdy0hdajx98sdhxw4iknjr2kn7j3gph9";
};
meta = {
description = "Network fabric for containers, designed for Kubernetes";
license = licenses.asl20;
homepage = https://github.com/coreos/flannel;
maintainers = with maintainers; [offline];
maintainers = with maintainers; [johanot offline];
platforms = with platforms; linux;
};
}

34
pkgs/tools/nix/nix-script/default.nix Normal file
View File

@@ -0,0 +1,34 @@
{ stdenv, haskellPackages, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "nix-script-${version}";
version = "2015-09-22";
src = fetchFromGitHub {
owner = "bennofs";
repo = "nix-script";
rev = "83064dc557b642f6748d4f2372b2c88b2a82c4e7";
sha256 = "0iwclyd2zz8lv012yghfr4696kdnsq6xvc91wv00jpwk2c09xl7a";
};
buildInputs = [
(haskellPackages.ghcWithPackages (hs: with hs; [ posix-escape ]))
];
phases = [ "buildPhase" "installPhase" "fixupPhase" ];
buildPhase = ''
mkdir -p $out/bin
ghc -O2 $src/nix-script.hs -o $out/bin/nix-script -odir . -hidir .
'';
installPhase = ''
ln -s $out/bin/nix-script $out/bin/nix-scripti
'';
meta = with stdenv.lib; {
description = "A shebang for running inside nix-shell.";
homepage = https://github.com/bennofs/nix-script;
license = licenses.bsd3;
maintainers = with maintainers; [ bennofs rnhmjoj ];
platforms = haskellPackages.ghc.meta.platforms;
};
}