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

Merge branch 'master' into staging

Browse Source 
* master: (36 commits)
  libipt: set platforms to unix
  licenses: refer to curl using spdx
  qhull: specify spdx license
  ocamlPackages.spacetime_lib: 0.1.0 -> 0.3.0
  ocamlPackages.owee: 0.2 -> 0.3
  nixFlakes: 2.4pre20190913_a25c022 -> 2.4pre20190922_382aa05
  daemon: init at 0.6.4
  k9s: 0.7.13 -> 0.8.4
  cask: Use generated src/version from Melpa
  python.pkgs.flask_oauthlib: remove
  radeon-profile: 20170714 -> 20190903
  radeon-profile: use Qt mkDerivation
  afew: propagate setuptools
  pythonPackages.flask-jwt-extended: 3.17.0 -> 3.23.0
  mutt: 1.12.1 -> 1.12.2
  unit: 1.10.0 -> 1.11.0
  emacsPackages: Update elpa
  emacsPackages: Update melpa
  cask: Fix cask usage
  git-lfs: use buildGoPackage
  ...
This commit is contained in:
Orivej Desh 2019-09-22 21:33:00 +00:00
commit dc4224bc54
37 changed files with 2208 additions and 1508 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/licenses.nix
View File

@ -218,9 +218,9 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
fullName = "Common Public License 1.0";
};
curl = {
fullName = "MIT/X11 derivate";
url = "https://curl.haxx.se/docs/copyright.html";
curl = spdx {
spdxId = "curl";
fullName = "curl License";
};
doc = spdx {
@ -613,6 +613,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
url = https://enterprise.dejacode.com/licenses/public/purdue-bsd;
};
qhull = spdx {
spdxId = "Qhull";
fullName = "Qhull License";
};
qpl = spdx {
spdxId = "QPL-1.0";
fullName = "Q Public License 1.0";

58
pkgs/applications/editors/emacs-modes/elpa-generated.nix generated
View File

@ -636,16 +636,16 @@
license = lib.licenses.free;
};
}) {};
csv-mode = callPackage ({ elpaBuild, fetchurl, lib }:
csv-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "csv-mode";
ename = "csv-mode";
version = "1.7";
version = "1.8";
src = fetchurl {
url = "https://elpa.gnu.org/packages/csv-mode-1.7.el";
sha256 = "0r4bip0w3h55i8h6sxh06czf294mrhavybz0zypzrjw91m1bi7z6";
url = "https://elpa.gnu.org/packages/csv-mode-1.8.el";
sha256 = "1ywgc61pnawiwfpjgxavfpfxqd3dm9niq6srbc70pd54ca6yqby6";
};
packageRequires = [];
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/csv-mode.html";
license = lib.licenses.free;
@ -975,10 +975,10 @@
elpaBuild {
pname = "eev";
ename = "eev";
version = "20190517";
version = "20190902";
src = fetchurl {
url = "https://elpa.gnu.org/packages/eev-20190517.tar";
sha256 = "0hgjdax0kg2w7bf3idl6mw6m8j2wkh1253px42v2lbaxp6897m07";
url = "https://elpa.gnu.org/packages/eev-20190902.tar";
sha256 = "09rk01ykvvmmzadkz8y064iil2sm6ql6qz0rj0jjlnyymi58lj69";
};
packageRequires = [ emacs ];
meta = {
@ -1132,10 +1132,10 @@
elpaBuild {
pname = "exwm";
ename = "exwm";
version = "0.22.1";
version = "0.23";
src = fetchurl {
url = "https://elpa.gnu.org/packages/exwm-0.22.1.tar";
sha256 = "1ggb8vgxxml8c5bvamv9jgz80gs6h9xirjgphq8gwkywwd5xyiq4";
url = "https://elpa.gnu.org/packages/exwm-0.23.tar";
sha256 = "05w1v3wrp1lzz20zd9lcvr5nhk809kgy6svvkbs15xhnr6x55ad5";
};
packageRequires = [ xelb ];
meta = {
@ -1282,10 +1282,10 @@
elpaBuild {
pname = "gited";
ename = "gited";
version = "0.5.4";
version = "0.6.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/gited-0.5.4.tar";
sha256 = "07ckknggkqd733bnps21r46bacgyhd0v9wc0spid22hn0dnrfp12";
url = "https://elpa.gnu.org/packages/gited-0.6.0.tar";
sha256 = "187asqrxfpxv53hhnrcid1sy46vcy07qx5yqgnrczi54jpcc57j5";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -1327,10 +1327,10 @@
elpaBuild {
pname = "gnorb";
ename = "gnorb";
version = "1.6.1";
version = "1.6.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/gnorb-1.6.1.tar";
sha256 = "0n4460hsmcc3l0y3nb3fysvh33cjwgv0a3mkc26xcx8v85zl7m63";
url = "https://elpa.gnu.org/packages/gnorb-1.6.3.tar";
sha256 = "14cdldlvq2fx0j9g1bbzb6dq7yp9rw6bv39sls67i2p35h3gc2gd";
};
packageRequires = [ cl-lib ];
meta = {
@ -2220,10 +2220,10 @@
elpaBuild {
pname = "org";
ename = "org";
version = "9.2.5";
version = "9.2.6";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-9.2.5.tar";
sha256 = "1pid1sykgz83i4ry5n8f270finag6sm7ckqxn5lkikyya43wlzx1";
url = "https://elpa.gnu.org/packages/org-9.2.6.tar";
sha256 = "0ikd78k4yw4sm5x7l3dsbvfcmvnv5qna2mxirr560gvcnzhr0zg4";
};
packageRequires = [];
meta = {
@ -2385,10 +2385,10 @@
elpaBuild {
pname = "phps-mode";
ename = "phps-mode";
version = "0.2.8";
version = "0.3.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/phps-mode-0.2.8.tar";
sha256 = "16sdqh93d2i9dxjibbhx4afakn150qc6xy2ifd83kx85c67y95kl";
url = "https://elpa.gnu.org/packages/phps-mode-0.3.1.tar";
sha256 = "1h6s5k156mbbkaysb07vcb13k3izs91pwigzcfh6jvv3lak4azg5";
};
packageRequires = [ emacs ];
meta = {
@ -3001,10 +3001,10 @@
elpaBuild {
pname = "ssh-deploy";
ename = "ssh-deploy";
version = "3.1";
version = "3.1.10";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.tar";
sha256 = "09m1ljp68rribypls5mzffmdv86jkg9wq4bdb7d1qkdjyr3f2hgn";
url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.10.tar";
sha256 = "0gckc6yhgi8pn3s8vdyzz8x1s2d4wmsw6yjwsaqcr5nra50glbpg";
};
packageRequires = [ emacs ];
meta = {
@ -3590,10 +3590,10 @@
elpaBuild {
pname = "xelb";
ename = "xelb";
version = "0.17";
version = "0.18";
src = fetchurl {
url = "https://elpa.gnu.org/packages/xelb-0.17.tar";
sha256 = "0k98580vq253fjdgklgqlwl450saninfw39fbq8lv3xsnp3dcgml";
url = "https://elpa.gnu.org/packages/xelb-0.18.tar";
sha256 = "1fp5mzl63sh0h3ws4l5p4qgvi7ny8a3fj6k4dhqa98xgw2bx03v7";
};
packageRequires = [ cl-generic emacs ];
meta = {

3098
pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
View File

File diff suppressed because one or more lines are too long

6
pkgs/applications/misc/cointop/default.nix
View File

@ -1,6 +1,6 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoModule rec {
buildGoPackage rec {
pname = "cointop";
version = "1.3.4";
@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0nw6vzp0c5r8bwnlvgzj4hzdah44p5pp03d2bcr1lkw8np8fy65n";
};
modSha256 = "1fg5h689s6r79qa9qsmd8hcvyihfyzlvqrhhk0qyfl528ipi1zwg";
goPackagePath = "github.com/miguelmota/cointop";
meta = with lib; {
description = "The fastest and most interactive terminal based UI application for tracking cryptocurrencies";

210
pkgs/applications/networking/cluster/cni/plugins-deps.nix Normal file
View File

@ -0,0 +1,210 @@
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
[
{
goPackagePath = "github.com/Microsoft/go-winio";
fetch = {
type = "git";
url = "https://github.com/Microsoft/go-winio";
rev = "v0.4.11";
sha256 = "14y1gryr3pb3zy09v2g8dh89m363rfd9sch0wgbabh531hfx72vn";
};
}
{
goPackagePath = "github.com/Microsoft/hcsshim";
fetch = {
type = "git";
url = "https://github.com/Microsoft/hcsshim";
rev = "v0.7.4";
sha256 = "0hky9p6xvkkx2jfkd4fy2d6iaikvlzalyw67gypyqyxygf2hsshg";
};
}
{
goPackagePath = "github.com/alexflint/go-filemutex";
fetch = {
type = "git";
url = "https://github.com/alexflint/go-filemutex";
rev = "72bdc8eae2ae";
sha256 = "082y6y9zv40q3kaqvsv6fyaw2fc42j0sn9z0dl9rbiz4szixj3c4";
};
}
{
goPackagePath = "github.com/buger/jsonparser";
fetch = {
type = "git";
url = "https://github.com/buger/jsonparser";
rev = "f4dd9f5a6b44";
sha256 = "12qa2n33s7yz88ywpr3k9kg3b4gm6rqgnv28iyikyxw8h5jascz5";
};
}
{
goPackagePath = "github.com/containernetworking/cni";
fetch = {
type = "git";
url = "https://github.com/containernetworking/cni";
rev = "v0.7.0";
sha256 = "15ad323dw44k82bfx9r8w5q2kn7jix60p9v4ciyzx2p5pip36wp8";
};
}
{
goPackagePath = "github.com/coreos/go-iptables";
fetch = {
type = "git";
url = "https://github.com/coreos/go-iptables";
rev = "v0.4.1";
sha256 = "0id1npqw3rd5rrkslf6i9yy6lpmd7l5qcglln38g85ylq7inysyi";
};
}
{
goPackagePath = "github.com/coreos/go-systemd";
fetch = {
type = "git";
url = "https://github.com/coreos/go-systemd";
rev = "39ca1b05acc7";
sha256 = "1kzqrrzqspa5qm7kwslxl3m16lqzns23c24rv474ajzwmj3ixmx1";
};
}
{
goPackagePath = "github.com/d2g/dhcp4";
fetch = {
type = "git";
url = "https://github.com/d2g/dhcp4";
rev = "f0e4d29ff023";
sha256 = "07gn9bjvnlfz2jv9wdq3gxxxm9lpwgrwk8z65072jdrz9rs9izpr";
};
}
{
goPackagePath = "github.com/d2g/dhcp4client";
fetch = {
type = "git";
url = "https://github.com/d2g/dhcp4client";
rev = "bed07e1bc5b8";
sha256 = "0kyjalv1kah7sk3i96abg71cgy5s9kzpff2zc7mwj69vicbj7mi3";
};
}
{
goPackagePath = "github.com/d2g/dhcp4server";
fetch = {
type = "git";
url = "https://github.com/d2g/dhcp4server";
rev = "477b11cea4dc";
sha256 = "010dpw6cxrsm6dm49w1q6qpz5xz3lbi5viz6wywxk49fxvnzmx9l";
};
}
{
goPackagePath = "github.com/godbus/dbus";
fetch = {
type = "git";
url = "https://github.com/godbus/dbus";
rev = "885f9cc04c9c";
sha256 = "0wjpaj4vr5lvpnwc5faf3qizd7zd2v9yq0fm0558wap1hiyqb8x8";
};
}
{
goPackagePath = "github.com/j-keck/arping";
fetch = {
type = "git";
url = "https://github.com/j-keck/arping";
rev = "2cf9dc699c56";
sha256 = "1bid8mpx3j4546ni0a6q5xyz7hb854g95qnxqmg5jzs9vrcird3c";
};
}
{
goPackagePath = "github.com/juju/errors";
fetch = {
type = "git";
url = "https://github.com/juju/errors";
rev = "22422dad46e1";
sha256 = "1766ys24y9qgngaqbx0g84lmh54b3369v8hk5fa1k8si2d34fxas";
};
}
{
goPackagePath = "github.com/mattn/go-shellwords";
fetch = {
type = "git";
url = "https://github.com/mattn/go-shellwords";
rev = "v1.0.3";
sha256 = "1pg7pl25wvpl2dbpyrv9p1r7prnqimxlf6136vn0dfm54j2x4mnr";
};
}
{
goPackagePath = "github.com/onsi/ginkgo";
fetch = {
type = "git";
url = "https://github.com/onsi/ginkgo";
rev = "7f8ab55aaf3b";
sha256 = "0nas6wqdym4jx42kw9wj80b58r69k9qhnvglz009lj34g5gba7rw";
};
}
{
goPackagePath = "github.com/onsi/gomega";
fetch = {
type = "git";
url = "https://github.com/onsi/gomega";
rev = "2152b45fa28a";
sha256 = "0amjlkawp84mmdqjgdamf93p1546cla6h4wwrx7hf5r862r2qcw2";
};
}
{
goPackagePath = "github.com/safchain/ethtool";
fetch = {
type = "git";
url = "https://github.com/safchain/ethtool";
rev = "42ed695e3de8";
sha256 = "0n5hkrzc1bh46nidcssx4539kvcmgj501v3kzh2pljpg27509daj";
};
}
{
goPackagePath = "github.com/sirupsen/logrus";
fetch = {
type = "git";
url = "https://github.com/sirupsen/logrus";
rev = "v1.0.6";
sha256 = "029irw2lsbqi944gdrbkwdw0m2794sqni4g21gsnmz142hbzds8c";
};
}
{
goPackagePath = "github.com/vishvananda/netlink";
fetch = {
type = "git";
url = "https://github.com/vishvananda/netlink";
rev = "023a6dafdcdf";
sha256 = "1i5q8r8rg7lxzvq2vhbf25lrkzdlgficfv0bxg9rf7cgg6z819sn";
};
}
{
goPackagePath = "github.com/vishvananda/netns";
fetch = {
type = "git";
url = "https://github.com/vishvananda/netns";
rev = "13995c7128cc";
sha256 = "1zk6w8158qi4niva5rijchbv9ixgmijsgqshh54wdaav4xrhjshn";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "7c1a557ab941";
sha256 = "1f1q9mby8m7ws3gbj90v0prhnf4g2sgf74azmw31kzwd6azlar3m";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "49bb7cea24b1";
sha256 = "111q4qm3hcjvzvyv9y5rz8ydnyg48rckcygxqy6gv63q618wz6gn";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "66b7b1311ac8";
sha256 = "00ny4r2bbj6rz939iy9g699acqydq7rfi6r6awn25w9i2dld9m13";
};
}
]

44
pkgs/applications/networking/cluster/cni/plugins.nix
View File

@ -1,6 +1,5 @@
{ stdenv, lib, fetchFromGitHub, go, removeReferencesTo }:
stdenv.mkDerivation rec {
{ stdenv, lib, fetchFromGitHub, go, removeReferencesTo, buildGoPackage }:
buildGoPackage rec {
pname = "cni-plugins";
version = "0.8.2";
@ -11,28 +10,31 @@ stdenv.mkDerivation rec {
sha256 = "0gyxa6mhiyxqw4wpn6r7wgr2kyvflzbdcqsk5ch0b6zih98144ia";
};
buildInputs = [ removeReferencesTo go ];
buildPhase = ''
patchShebangs build_linux.sh
export "GOCACHE=$TMPDIR/go-cache"
./build_linux.sh
'';
installPhase = ''
mkdir -p $out/bin
mv bin/* $out/bin
'';
preFixup = ''
find $out/bin -type f -exec remove-references-to -t ${go} '{}' +
'';
goDeps = ./plugins-deps.nix;
goPackagePath = "github.com/containernetworking/plugins";
subPackages = [
"plugins/meta/bandwidth"
"plugins/meta/firewall"
"plugins/meta/flannel"
"plugins/meta/portmap"
"plugins/meta/sbr"
"plugins/meta/tuning"
"plugins/main/bridge"
"plugins/main/host-device"
"plugins/main/ipvlan"
"plugins/main/loopback"
"plugins/main/macvlan"
"plugins/main/ptp"
"plugins/main/vlan"
"plugins/ipam/dhcp"
"plugins/ipam/host-local"
"plugins/ipam/static"
];
meta = with lib; {
description = "Some standard networking plugins, maintained by the CNI team";
homepage = https://github.com/containernetworking/plugins;
license = licenses.asl20;
platforms = [ "x86_64-linux" ];
platforms = platforms.linux;
maintainers = with maintainers; [ cstrahan ];
};
}

9
pkgs/applications/networking/cluster/k9s/default.nix
View File

@ -2,18 +2,17 @@
buildGoModule rec {
pname = "k9s";
version = "0.7.13";
version = "0.8.4";
src = fetchFromGitHub {
owner = "derailed";
repo = "k9s";
rev = version;
owner = "derailed";
repo = "k9s";
rev = version;
sha256 = "0wsj6wc2qi5708cg47l2qblq1cg8fcwxdygpkayib9hapx6lc6f8";
};
modSha256 = "1ia9wx6yd9mdr981lcw58xv39iqzz25r03bmn1c6byxmq2xpcjq8";
meta = with stdenv.lib; {
description = "Kubernetes CLI To Manage Your Clusters In Style.";
homepage = https://github.com/derailed/k9s;

7
pkgs/applications/networking/cluster/kubeless/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoModule rec {
buildGoPackage rec {
pname = "kubeless";
version = "1.0.4";
@ -10,7 +10,8 @@ buildGoModule rec {
rev = "v${version}";
sha256 = "1f5w6kn9rsaxx9nf6kzyjkzm3s9ycy1c8h78hb61v4x915xd3040";
};
modSha256 = "1pw4pwb8z2kq474jjipjdivlrin5zvw8d2if4317b0w0wyp6isgd";
goPackagePath = "github.com/kubeless/kubeless";
subPackages = [ "cmd/kubeless" ];

2
pkgs/applications/networking/mailreaders/afew/default.nix
View File

@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {
nativeBuildInputs = with pythonPackages; [ sphinx setuptools_scm ];
propagatedBuildInputs = with pythonPackages; [
pythonPackages.notmuch chardet dkimpy
pythonPackages.setuptools pythonPackages.notmuch chardet dkimpy
] ++ stdenv.lib.optional (!pythonPackages.isPy3k) subprocess32;
makeWrapperArgs = [

4
pkgs/applications/networking/mailreaders/mutt/default.nix
View File

@ -27,11 +27,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "mutt";
version = "1.12.1";
version = "1.12.2";
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
sha256 = "0311sip2q90aqaxn7h3cck1zl98b4vifqi8bp5fsizy4dr06bi81";
sha256 = "10k8352s0z7yan6d4z2am80qd3bsaky4h89g72wl4xr3x067ahmw";
};
patches = optional smimeSupport (fetchpatch {

8
pkgs/applications/networking/sync/rclone/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoModule rec {
buildGoPackage rec {
pname = "rclone";
version = "1.49.3";
@ -11,11 +11,11 @@ buildGoModule rec {
sha256 = "0dd5xrbf62n4y77zzaai1rc069ism1ikvcw43hzja3mzwfa0sqqa";
};
modSha256 = "158mpmy8q67dk1ks9p926n1670gsk7rhd0vpjh44f4g64ddnhk03";
goPackagePath = "github.com/rclone/rclone";
subPackages = [ "." ];
outputs = [ "out" "man" ];
outputs = [ "bin" "out" "man" ];
postInstall = ''
install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1

17
pkgs/applications/version-management/git-lfs/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch }:
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoModule rec {
buildGoPackage rec {
pname = "git-lfs";
version = "2.8.0";
@ -11,21 +11,12 @@ buildGoModule rec {
sha256 = "17x9q4g1acf51bxr9lfmd2ym7w740n4ghdi0ncmma77kwabw9d3x";
};
modSha256 = "1rjscc52rh8kxa64canw3baljllp1c639nsn89hs5b86c8v1jav7";
patches = [
(fetchpatch {
# Build fails on v2.8.0 with go 1.13 due to invalid dependency version:
# go: github.com/git-lfs/go-ntlm@v0.0.0-20190307203151-c5056e7fa066: invalid pseudo-version: does not match version-control timestamp (2019-04-01T17:57:52Z)
# TODO: Remove once https://github.com/git-lfs/git-lfs/commit/cd83f4224ce02398bdbf8b05830d92220d9b8e01 lands in a release.
url = "https://github.com/git-lfs/git-lfs/commit/cd83f4224ce02398bdbf8b05830d92220d9b8e01.patch";
sha256 = "17nmnlkknglqhzrky5caskbscrjp7kp9b5mfqznh1jx2hbxzlpbj";
})
];
goPackagePath = "github.com/git-lfs/git-lfs";
subPackages = [ "." ];
preBuild = ''
cd go/src/${goPackagePath}
go generate ./commands
'';

2
pkgs/development/libraries/libipt/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
description = "Intel Processor Trace decoder library";
homepage = https://github.com/intel/libipt;
license = licenses.bsd3;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ orivej ];
};
}

2
pkgs/development/libraries/qhull/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
homepage = http://www.qhull.org/;
description = "Compute the convex hull, Delaunay triangulation, Voronoi diagram and more";
license = licenses.free;
license = licenses.qhull;
platforms = platforms.unix;
maintainers = with maintainers; [ orivej ];
};

20
pkgs/development/ocaml-modules/owee/default.nix
View File

@ -1,25 +1,21 @@
{ stdenv, fetchFromGitHub, ocaml, findlib }:
{ lib, buildDunePackage, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-owee-${version}";
version = "0.2";
buildDunePackage rec {
minimumOCamlVersion = "4.06";
pname = "owee";
version = "0.3";
src = fetchFromGitHub {
owner = "let-def";
repo = "owee";
rev = "v${version}";
sha256 = "025a8sm03mm9qr7grdmdhzx7pyrd0dr7ndr5mbj5baalc0al132z";
sha256 = "0jp8ca57488d7sj2nqy4yxcdpda6sxx51yyi8k6888hbinhyqp0j";
};
buildInputs = [ ocaml findlib ];
createFindlibDestdir = true;
meta = {
description = "An experimental OCaml library to work with DWARF format";
inherit (src.meta) homepage;
inherit (ocaml.meta) platforms;
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.vbgl ];
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
};
}

22
pkgs/development/ocaml-modules/spacetime_lib/default.nix
View File

@ -1,30 +1,22 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, owee }:
{ lib, fetchFromGitHub, buildDunePackage, owee }:
if !stdenv.lib.versionAtLeast ocaml.version "4.04"
then throw "spacetime_lib is not available for OCaml ${ocaml.version}" else
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-spacetime_lib-${version}";
version = "0.1.0";
buildDunePackage rec {
pname = "spacetime_lib";
version = "0.3.0";
src = fetchFromGitHub {
owner = "lpw25";
repo = "spacetime_lib";
rev = version;
sha256 = "1g91y6wl3z18jhaz2q03wn54zj6xk1qcjidr1nc6nq9a8906lcq5";
sha256 = "0biisgbycr5v3nm5jp8i0h6vq76vzasdjkcgh8yr7fhxc81jgv3p";
};
buildInputs = [ ocaml findlib ];
propagatedBuildInputs = [ owee ];
createFindlibDestdir = true;
meta = {
description = "An OCaml library providing some simple operations for handling OCaml “spacetime” profiles";
inherit (src.meta) homepage;
inherit (ocaml.meta) platforms;
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.vbgl ];
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
};
}

8
pkgs/development/python-modules/flask-jwt-extended/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, buildPythonPackage, fetchPypi, flask, pyjwt, werkzeug, pytest }:
{ stdenv, buildPythonPackage, fetchPypi, dateutil, flask, pyjwt, werkzeug, pytest }:
buildPythonPackage rec {
pname = "Flask-JWT-Extended";
version = "3.17.0";
version = "3.23.0";
src = fetchPypi {
inherit pname version;
sha256 = "97c66f197b4b175173bf955b9a845d03d62e521e512e88f6abff707e6859e7c3";
sha256 = "05nf94dp80i68gs61pf67qj1y6i56jgdxmibqmns5wz6z33fi7wj";
};
propagatedBuildInputs = [ flask pyjwt werkzeug ];
propagatedBuildInputs = [ dateutil flask pyjwt werkzeug ];
checkInputs = [ pytest ];
checkPhase = ''

29
pkgs/development/python-modules/flask-oauthlib/default.nix
View File

@ -1,29 +0,0 @@
{ stdenv, buildPythonPackage, fetchFromGitHub
, flask, oauthlib, requests_oauthlib, flask_sqlalchemy
, mock, nose}:
buildPythonPackage rec {
pname = "Flask-OAuthlib";
version = "0.9.5";
src = fetchFromGitHub {
owner = "lepture";
repo = "flask-oauthlib";
rev = "v${version}";
sha256 = "1l82niwrpm7411xvwh65bj263si90kcbrbfg5fa52mpixhxcp40f";
};
buildInputs = [ mock nose ];
propagatedBuildInputs = [
flask flask_sqlalchemy oauthlib requests_oauthlib
];
checkPhase = "nosetests -d";
doCheck = false; # request mocking fails
meta = with stdenv.lib; {
description = "OAuthlib implementation for Flask";
license = licenses.mit;
maintainers = [ maintainers.mic92 ];
homepage = https://github.com/lepture/flask-oauthlib;
};
}

15
pkgs/development/tools/cask/default.nix
View File

@ -2,18 +2,19 @@
stdenv.mkDerivation rec {
pname = "cask";
version = "0.8.4";
src = fetchurl {
url = "https://github.com/cask/cask/archive/v${version}.tar.gz";
sha256 = "02f8bb20b33b23fb11e7d2a1d282519dfdb8b3090b9672448b8c2c2cacd3e478";
};
inherit (emacsPackages.melpaStablePackages.cask) src version;
doCheck = true;
nativeBuildInputs = [ emacsPackages.emacs ];
buildInputs = with emacsPackages; [
s f dash ansi ecukes servant ert-runner el-mock
noflet ert-async shell-split-string git package-build
] ++ [
python
];
buildPhase = ''
emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el
'';
@ -38,11 +39,9 @@ stdenv.mkDerivation rec {
Cask can also be used to manage dependencies for your local Emacs configuration.
'';
homepage = https://cask.readthedocs.io/en/latest/index.html;
homepage = "https://cask.readthedocs.io/en/latest/index.html";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.flexw ];
};
nativeBuildInputs = [ emacsPackages.emacs python ];
}

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

@ -1,6 +1,6 @@
{ buildGoModule, fetchFromGitHub, lib }:
{ buildGoPackage, fetchFromGitHub, lib }:
buildGoModule rec {
buildGoPackage rec {
pname = "golangci-lint";
version = "1.17.1";
goPackagePath = "github.com/golangci/golangci-lint";
@ -14,8 +14,6 @@ buildGoModule rec {
sha256 = "1hs24nimv11c63a90ds8ps1lli16m3apsbrd9vpbq2rmxdbpwqac";
};
modSha256 = "0k0831rg6ygjffrq5y9488aiacskky7g6bvsfrgfz0g7i0mig1n6";
meta = with lib; {
description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output.";
homepage = https://golangci.com/;

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

@ -1,6 +1,6 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoModule rec {
buildGoPackage rec {
pname = "elfinfo";
version = "0.7.6";
@ -12,8 +12,6 @@ buildGoModule rec {
sha256 = "0f6ik4d157assxdfslnyc91mg70kfh396rapikfv473znx2v2pg9";
};
modSha256 = "1xr0pylaqcb4f4g862120cgqdxp0bpwsk77zd6g7kk91lqdcvsdf";
meta = with stdenv.lib; {
description = "Small utility for showing information about ELF files";
homepage = https://elfinfo.roboticoverlords.org/;

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

@ -1,6 +1,6 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoModule rec {
buildGoPackage rec {
pname = "mkcert";
version = "1.4.0";
@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0xcmvzh5lq8vs3b0f1zw645fxdr8471v7prl1656q02v38f58ly7";
};
modSha256 = "0an12l15a82mks6gipczdpcf2vklk14wjjnk0ccl3kdjwiw7f4wd";
goPackagePath = "github.com/FiloSottile/mkcert";
meta = with lib; {
homepage = https://github.com/FiloSottile/mkcert;

6
pkgs/misc/cups/drivers/cnijfilter2/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation {
pname = "cnijfilter2";
version = "5.30";
version = "5.70";
src = fetchzip {
url = "http://gdlp01.c-wss.com/gds/9/0100007129/01/cnijfilter2-source-5.30-1.tar.gz";
sha256 = "0gnl9arwmkblljsczspcgggx85a19vcmhmbjfyv1bq236yqixv5c";
url = "http://gdlp01.c-wss.com/gds/0/0100009930/01/cnijfilter2-source-5.70-1.tar.gz";
sha256 = "045zjsmaidn1m44ki6m1018gjzbj77gm234n5i2lshxpbzpyh0is";
};
buildInputs = [

10
pkgs/servers/dex/default.nix
View File

@ -1,6 +1,6 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoModule rec {
buildGoPackage rec {
pname = "dex";
version = "2.17.0";
@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "1z94svpiwrs64m83gpfnniv0ac1fnmvywvl05f20ind1wlf8bvwn";
};
modSha256 = "043sjq547nwg5v8708nhij0g7d2j28pyn676fgbnpps35ymnywfi";
goPackagePath = "github.com/dexidp/dex";
subPackages = [
"cmd/dex"
@ -22,8 +22,8 @@ buildGoModule rec {
];
postInstall = ''
mkdir -p $out/share
cp -r $src/web $out/share/web
mkdir -p $bin/share
cp -r $src/web $bin/share/web
'';
meta = with lib; {

4
pkgs/servers/http/unit/default.nix
View File

@ -14,14 +14,14 @@
with stdenv.lib;
stdenv.mkDerivation rec {
version = "1.10.0";
version = "1.11.0";
pname = "unit";
src = fetchFromGitHub {
owner = "nginx";
repo = "unit";
rev = version;
sha256 = "00y7hc6bzn38f9mcqxnzddnwwsiba4ss9vwd9vgc95sj0yvv885a";
sha256 = "05qplbwki8kcj0xy9d39gf8lhwwg2cx24waxd1q5cb0fq9a5hprm";
};
nativeBuildInputs = [ which ];

8
pkgs/servers/miniflux/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoModule rec {
buildGoPackage rec {
pname = "miniflux";
version = "2.0.17";
@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0bvlsa3ymhdl35bkv2v8lzkbjanyg7y474kbpbabmhwh5lvzgxlm";
};
modSha256 = "0060px0av7l9x4xgmkci9d8yl4lgxzqrikqagnz0f17a944p9xdr";
goPackagePath = "miniflux.app";
doCheck = true;
@ -20,7 +20,7 @@ buildGoModule rec {
'';
postInstall = ''
mv $out/bin/miniflux.app $out/bin/miniflux
mv $bin/bin/miniflux.app $bin/bin/miniflux
'';
meta = with stdenv.lib; {

6
pkgs/tools/admin/certigo/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoModule rec {
buildGoPackage rec {
pname = "certigo";
version = "1.11.0";
@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "1vi4gn484kc7vyxnm2nislzy587h2h4gc8d197vslhyfygac9y7b";
};
modSha256 = "0x0iq3w5310dg8lp2kkw82iryfhs9p4707538f5dcxjsllpqvcvj";
goPackagePath = "github.com/square/certigo";
meta = with stdenv.lib; {
description = "A utility to examine and validate certificates in a variety of formats";

6
pkgs/tools/graphics/wallutils/default.nix
View File

@ -1,8 +1,8 @@
{ buildGoModule, fetchFromGitHub, lib
{ buildGoPackage, fetchFromGitHub, lib
, wayland, libX11, xbitmaps, libXcursor, libXmu, libXpm
}:
buildGoModule rec {
buildGoPackage rec {
pname = "wallutils";
version = "5.8.2";
@ -13,7 +13,7 @@ buildGoModule rec {
sha256 = "1ghvcxsy5prj8l38r4lg39imsqbwmvn1zmiv7004j6skmgpaaawh";
};
modSha256 = "0siw1g3fsk1xjri9k1pb03filax8an5sfza5db52krh80g9xasah";
goPackagePath = "github.com/xyproto/wallutils";
patches = [ ./lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch ];

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

@ -1,6 +1,6 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoModule rec {
buildGoPackage rec {
pname = "lazydocker";
version = "0.7.4";
@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "03l6gs4p9p8g0ai6wqg9024rp0pd13m0b9y3sy1ww5afwxb82br6";
};
modSha256 = "1hzrin8dfsfnxpc37szc1449s235w0dr24albswz06fjnl4bbs5y";
goPackagePath = "github.com/jesseduffield/lazydocker";
subPackages = [ "." ];

18
pkgs/tools/misc/radeon-profile/default.nix
View File

@ -1,9 +1,11 @@
{ stdenv, fetchFromGitHub, qtbase, qtcharts, qmake, libXrandr, libdrm }:
{ lib, mkDerivation, fetchFromGitHub
, qtbase, qtcharts, qmake, libXrandr, libdrm
}:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "radeon-profile";
version = "20170714";
version = "20190903";
nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase qtcharts libXrandr libdrm ];
@ -12,15 +14,15 @@ stdenv.mkDerivation rec {
owner = "marazmista";
repo = "radeon-profile";
rev = version;
sha256 = "08fv824iq00zbl9xk9zsfs8gkk8rsy6jlxbmszrjfx7ji28hansd";
sha256 = "0ax5417q03xjwi3pn7yyjdb90ssaygdprfgb1pz9nkyk6773ckx5";
}) + "/radeon-profile";
postInstall = ''
mkdir -p $out/bin
cp ./radeon-profile $out/bin/radeon-profile
preConfigure = ''
substituteInPlace radeon-profile.pro \
--replace "/usr/" "$out/"
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Application to read current clocks of AMD Radeon cards";
homepage = https://github.com/marazmista/radeon-profile;
license = licenses.gpl2Plus;

6
pkgs/tools/package-management/nix/default.nix
View File

@ -201,12 +201,12 @@ in rec {
nixFlakes = lib.lowPrio (callPackage common rec {
name = "nix-2.4${suffix}";
suffix = "pre20190913_a25c022";
suffix = "pre20190922_382aa05";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "a25c022af3fa0a35be406942869edae1bdff2cf8";
hash = "sha256-HIvgrkXxQ57TPcf2pn9PkSDzM4XOCwXa1zYyIvcAdpg=";
rev = "382aa05ff71b61379f5c2792eaf517bdf4a5c5bf";
hash = "sha256-k4vV3Q1YVmLd+49AETnsSGetpDjD6sdd9yBrnpi8Q3g=";
};
fromGit = true;

12
pkgs/tools/security/vault/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, buildGoModule }:
{ stdenv, fetchFromGitHub, buildGoPackage }:
buildGoModule rec {
buildGoPackage rec {
pname = "vault";
version = "1.2.3";
@ -11,7 +11,9 @@ buildGoModule rec {
sha256 = "11zi12j09vi6j112a1n8f7sxwp15pbh0801bzh27ihcy01hlzdf8";
};
modSha256 = "10pr3piv6hrsc562qagpn1h5wckiziyfqraj13172hdglz3n2i7q";
goPackagePath = "github.com/hashicorp/vault";
subPackages = [ "." ];
buildFlagsArray = [
"-tags='vault'"
@ -19,8 +21,8 @@ buildGoModule rec {
];
postInstall = ''
mkdir -p $out/share/bash-completion/completions
echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault
mkdir -p $bin/share/bash-completion/completions
echo "complete -C $bin/bin/vault vault" > $bin/share/bash-completion/completions/vault
'';
meta = with stdenv.lib; {

25
pkgs/tools/system/daemon/default.nix Normal file
View File

@ -0,0 +1,25 @@
{stdenv, fetchurl, perl}:
stdenv.mkDerivation {
name = "daemon-0.6.4";
src = fetchurl {
url = http://libslack.org/daemon/download/daemon-0.6.4.tar.gz;
sha256 = "18aw0f8k3j30xqwv4z03962kdpqd10nf1w9liihylmadlx5fmff4";
};
makeFlags = "PREFIX=$(out)";
buildInputs = [ perl ];
meta = {
description = "Daemon turns other process into daemons";
longDescription = ''
Daemon turns other process into daemons. There are many tasks that need
to be performed to correctly set up a daemon process. This can be tedious.
Daemon performs these tasks for other processes. This is useful for
writing daemons in languages other than C, C++ or Perl (e.g. /bin/sh,
Java).
'';
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.sander ];
platforms = stdenv.lib.platforms.unix;
};
}

9
pkgs/tools/system/systemd-journal2gelf/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoModule {
buildGoPackage rec {
pname = "SystemdJournal2Gelf-unstable";
version = "20190702";
@ -8,10 +8,11 @@ buildGoModule {
rev = "b1aa5ff31307d11a3c9b4dd08c3cd6230d935ec5";
owner = "parse-nl";
repo = "SystemdJournal2Gelf";
sha256 = "0i2pv817fjm2xazxb01dk2gg1xb4d9b6743gqrbsyghbkm7krx29";
sha256 = "13jyh34wprjixinmh6l7wj7lr1f6qy6nrjcf8l29a74mczbphnvv";
fetchSubmodules = true;
};
modSha256 = "0f66bjij3bkjs09xhhp26arivlqrd66z1j5ziy4lq4krg82krsdp";
goPackagePath = "github.com/parse-nl/SystemdJournal2Gelf";
meta = with stdenv.lib; {
description = "Export entries from systemd's journal and send them to a graylog server using gelf";

6
pkgs/tools/text/vale/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoModule rec {
buildGoPackage rec {
pname = "vale";
version = "1.7.1";
@ -13,7 +13,7 @@ buildGoModule rec {
sha256 = "1qi3brjppiymk6as0xic2n3bhq8g8qw1z8d9a24w60x9gp52yq5m";
};
modSha256 = "0av728w22rrlw2030d09q5dz9ks58p3n4g1hx4xcs0gi33sdsdb8";
goPackagePath = "github.com/errata-ai/vale";
meta = with stdenv.lib; {
homepage = https://errata-ai.github.io/vale/;

2
pkgs/top-level/all-packages.nix
View File

@ -2520,6 +2520,8 @@ in
dadadodo = callPackage ../tools/text/dadadodo { };
daemon = callPackage ../tools/system/daemon { };
daemonize = callPackage ../tools/system/daemonize { };
daq = callPackage ../applications/networking/ids/daq { };

2
pkgs/top-level/python-packages.nix
View File

@ -3110,8 +3110,6 @@ in {
flask_migrate = callPackage ../development/python-modules/flask-migrate { };
flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib { };
flask-paginate = callPackage ../development/python-modules/flask-paginate { };
flask_principal = callPackage ../development/python-modules/flask-principal { };