Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-02-10 18:16:40 +00:00 committed by GitHub
commit bd317c9af1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
45 changed files with 612 additions and 283 deletions

View file

@ -3807,6 +3807,12 @@
githubId = 15371828; githubId = 15371828;
name = "Hugo Lageneste"; name = "Hugo Lageneste";
}; };
hypersw = {
email = "baltic@hypersw.net";
github = "hypersw";
githubId = 2332070;
name = "Serge Baltic";
};
hyphon81 = { hyphon81 = {
email = "zero812n@gmail.com"; email = "zero812n@gmail.com";
github = "hyphon81"; github = "hyphon81";

View file

@ -56,6 +56,7 @@ let
"unifi-poller" "unifi-poller"
"varnish" "varnish"
"wireguard" "wireguard"
"flow"
] (name: ] (name:
import (./. + "/exporters/${name}.nix") { inherit config lib pkgs options; } import (./. + "/exporters/${name}.nix") { inherit config lib pkgs options; }
); );

View file

@ -0,0 +1,50 @@
{ config, lib, pkgs, options }:
with lib;
let
cfg = config.services.prometheus.exporters.flow;
in {
port = 9590;
extraOpts = {
brokers = mkOption {
type = types.listOf types.str;
example = literalExample ''[ "kafka.example.org:19092" ]'';
description = "List of Kafka brokers to connect to.";
};
asn = mkOption {
type = types.ints.positive;
example = 65542;
description = "The ASN being monitored.";
};
partitions = mkOption {
type = types.listOf types.int;
default = [];
description = ''
The number of the partitions to consume, none means all.
'';
};
topic = mkOption {
type = types.str;
example = "pmacct.acct";
description = "The Kafka topic to consume from.";
};
};
serviceOpts = {
serviceConfig = {
DynamicUser = true;
ExecStart = ''
${pkgs.prometheus-flow-exporter}/bin/flow-exporter \
-asn ${toString cfg.asn} \
-topic ${cfg.topic} \
-brokers ${concatStringsSep "," cfg.brokers} \
${optionalString (cfg.partitions != []) "-partitions ${concatStringsSep "," cfg.partitions}"} \
-addr ${cfg.listenAddress}:${toString cfg.port} ${concatStringsSep " " cfg.extraFlags}
'';
};
};
}

View file

@ -14,13 +14,13 @@ let
sha256Hash = "1f9bclvyvm3sg9an7wxlfwd8jwnb9cl726dvggmysa6r7shc7xw9"; sha256Hash = "1f9bclvyvm3sg9an7wxlfwd8jwnb9cl726dvggmysa6r7shc7xw9";
}; };
betaVersion = { betaVersion = {
version = "4.2.0.19"; # "Android Studio 4.2 Beta 3" version = "4.2.0.20"; # "Android Studio 4.2 Beta 4"
build = "202.7033425"; build = "202.7094744";
sha256Hash = "037r99hn16y0fy6z6k90qf6yx5a4vvx6bl9rdyagdm16ry4bpiw4"; sha256Hash = "10c4qfq6d9ggs88s8h3pryhlnzw17m60qci78rjbh32wmm02sciz";
}; };
latestVersion = { # canary & dev latestVersion = { # canary & dev
version = "2020.3.1.4"; # "Android Studio Arctic Fox Canary 4" version = "2020.3.1.5"; # "Android Studio Arctic Fox (2020.3.1) Canary 5"
sha256Hash = "05drh4grq0b37qg5nspf2c6vmvcc9x71al3xwc2ddjhmyj0f9sk4"; sha256Hash = "0x749sbg7qa5ncwwaywcldlhyyyyfh05bms2czz1rv6h7zgq16vq";
}; };
in { in {
# Attributes are named by their corresponding release channels # Attributes are named by their corresponding release channels

View file

@ -1,29 +1,23 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash, { lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash
xdg-utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }: , xdg-utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick
, libuchardet, spdlog, xercesc, fmt, openssl, libssh, samba, neon, libnfs, libarchive }:
let
newer-colorer-schemes = fetchFromGitHub {
owner = "colorer";
repo = "Colorer-schemes";
rev = "7c831f5e94a90530ace8b2bb9916210e3a2fcda6"; # 2019-11-28 (far2l has older Colorer-schemes)
sha256 = "18vaahdz5i7xdf00c9h9kjjswm4jszywm8zkhva4c4ivr4qqnv2c";
};
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "far2l"; pname = "far2l";
version = "2019-12-14.git${builtins.substring 0 7 src.rev}"; version = "2020-12-30.git${builtins.substring 0 7 src.rev}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elfmz"; owner = "elfmz";
repo = "far2l"; repo = "far2l";
rev = "dceaa3918ea2c5e43600bad3fc63f861b8d26fc4"; rev = "52c1372441443aafd1a7dff6f17969a6ec19885d";
sha256 = "1ssd3hwz4b7vl4r858d9whl61cn23pgcamcjmvfa6ysf4x2b7sgi"; sha256 = "0s7427fgxzj5zkyy6mhb4y5hqa6adsr30m0bigycp12b0495ryx0";
}; };
nativeBuildInputs = [ cmake pkg-config m4 makeWrapper imagemagick ]; nativeBuildInputs = [ cmake pkg-config m4 makeWrapper imagemagick ];
buildInputs = [ wxGTK30 glib pcre ] buildInputs = [ wxGTK30 glib pcre libuchardet spdlog xercesc fmt ] # base requirements of the build
++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; ++ [ openssl libssh samba neon libnfs libarchive ]; # optional feature packages, like protocol support for Network panel, or archive formats
#++ lib.optional stdenv.isDarwin Cocoa # Mac support -- disabled, see "meta.broken" below
postPatch = lib.optionalString stdenv.isLinux '' postPatch = lib.optionalString stdenv.isLinux ''
substituteInPlace far2l/bootstrap/trash.sh \ substituteInPlace far2l/bootstrap/trash.sh \
@ -48,10 +42,6 @@ stdenv.mkDerivation rec {
--replace '"gzip ' '"${gzip}/bin/gzip ' \ --replace '"gzip ' '"${gzip}/bin/gzip ' \
--replace '"bzip2 ' '"${bzip2}/bin/bzip2 ' \ --replace '"bzip2 ' '"${bzip2}/bin/bzip2 ' \
--replace '"tar ' '"${gnutar}/bin/tar ' --replace '"tar ' '"${gnutar}/bin/tar '
cp ${newer-colorer-schemes}/hrc/hrc/base/nix.hrc colorer/configs/base/hrc/base/
cp ${newer-colorer-schemes}/hrc/hrc/base/cpp.hrc colorer/configs/base/hrc/base/
cp ${newer-colorer-schemes}/hrc/hrc/inet/jscript.hrc colorer/configs/base/hrc/base/
''; '';
installPhase = '' installPhase = ''
@ -77,10 +67,13 @@ stdenv.mkDerivation rec {
stripDebugList = [ "bin" "share" ]; stripDebugList = [ "bin" "share" ];
meta = with lib; { meta = with lib; {
description = "An orthodox file manager"; description = "Linux port of FAR Manager v2, a program for managing files and archives in Windows operating systems";
homepage = "https://github.com/elfmz/far2l"; homepage = "https://github.com/elfmz/far2l";
license = licenses.gpl2; license = licenses.gpl2Plus; # NOTE: might change in far2l repo soon, check next time
maintainers = [ maintainers.volth ]; maintainers = with maintainers; [ volth hypersw ];
platforms = platforms.all; platforms = platforms.all;
# fails to compile with:
# error: no member named 'st_ctim' in 'stat'
broken = stdenv.isDarwin;
}; };
} }

View file

@ -30,12 +30,12 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "obsidian"; pname = "obsidian";
version = "0.10.11"; version = "0.10.13";
src = fetchurl { src = fetchurl {
url = url =
"https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz";
sha256 = "RQdNTzorFq3W8clNObyOisKWUM/s+bE/CbpJ/8ABbrk="; sha256 = "J4kaNtB6DVivNDhrGwrRZJBvu4Bpzl0jY1ZtlAtQiZE=";
}; };
nativeBuildInputs = [ makeWrapper graphicsmagick ]; nativeBuildInputs = [ makeWrapper graphicsmagick ];

View file

@ -0,0 +1,36 @@
{ stdenv, lib, fetchurl, jre, makeWrapper }:
stdenv.mkDerivation rec {
pname = "tabula-java";
version = "1.0.4";
src = fetchurl {
url = "https://github.com/tabulapdf/tabula-java/releases/download/v${version}/tabula-${version}-jar-with-dependencies.jar";
sha256 = "12d0jcc3j0q8jbqv0gzfiif7c8ig37834vb8yq0jnyr0s72k30xw";
};
buildInputs = [ makeWrapper ];
dontUnpack = true;
dontBuild = true;
installPhase = ''
mkdir -pv $out/share/tabula-java
cp -v $src $out/share/tabula-java/tabula-java.jar
makeWrapper ${jre}/bin/java $out/bin/tabula-java --add-flags "-jar $out/share/tabula-java/tabula-java.jar"
'';
meta = with lib; {
description = "A library for extracting tables from PDF files.";
longDescription = ''
tabula-java is the table extraction engine that powers
Tabula. You can use tabula-java as a command-line tool to
programmatically extract tables from PDFs.
'';
homepage = "https://tabula.technology/";
license = licenses.mit;
maintainers = [ maintainers.jakewaksbaum ];
platforms = platforms.all;
};
}

View file

@ -0,0 +1,52 @@
{ stdenv
, lib
, fetchgit
, meson
, ninja
, pkg-config
, git
, scdoc
, cairo
, fcft
, libpng
, librsvg
, libxkbcommon
, pixman
, tllist
, wayland
, wayland-protocols
, wlroots
}:
stdenv.mkDerivation rec {
pname = "wbg";
version = "unstable-2020-08-01";
src = fetchgit {
url = "https://codeberg.org/dnkl/wbg";
rev = "1b05bd80d0f40e3ba1e977002d0653f532649269";
sha256 = "0i1j7aqvj0vl2ww5cvffqci1kjqjn0sw6sp2j0ljblaif6qk9asc";
};
nativeBuildInputs = [ pkg-config meson ninja scdoc git ];
buildInputs = [
cairo
fcft
libpng
librsvg
libxkbcommon
pixman
tllist
wayland
wayland-protocols
wlroots
];
meta = with lib; {
description = "Wallpaper application for Wayland compositors";
homepage = "https://codeberg.org/dnkl/wbg";
license = licenses.isc;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; linux;
};
}

View file

@ -0,0 +1,86 @@
{ stdenv
, lib
, fetchgit
, pkg-config
, meson
, ninja
, scdoc
, alsaLib
, fcft
, json_c
, libmpdclient
, libxcb
, libyaml
, pixman
, tllist
, udev
, wayland
, wayland-protocols
, xcbutil
, xcbutilcursor
, xcbutilerrors
, xcbutilwm
}:
stdenv.mkDerivation rec {
pname = "yambar";
version = "1.6.1";
src = fetchgit {
url = "https://codeberg.org/dnkl/yambar.git";
rev = version;
sha256 = "p47tFsEWsYNe6IVV65xGG211u6Vm2biRf4pmUDylBOQ=";
};
nativeBuildInputs = [ pkg-config meson ninja scdoc ];
buildInputs = [
alsaLib
fcft
json_c
libmpdclient
libxcb
libyaml
pixman
tllist
udev
wayland
wayland-protocols
xcbutil
xcbutilcursor
xcbutilerrors
xcbutilwm
];
meta = with lib; {
homepage = "https://codeberg.org/dnkl/yambar";
description = "Modular status panel for X11 and Wayland";
longDescription = ''
yambar is a lightweight and configurable status panel (bar, for short) for
X11 and Wayland, that goes to great lengths to be both CPU and battery
efficient - polling is only done when absolutely necessary.
It has a number of modules that provide information in the form of
tags. For example, the clock module has a date tag that contains the
current date.
The modules do not know how to present the information though. This is
instead done by particles. And the user, you, decides which particles (and
thus how to present the data) to use.
Furthermore, each particle can have a decoration - a background color or a
graphical underline, for example.
There is no support for images or icons. use an icon font (e.g. Font
Awesome, or Material Icons) if you want a graphical representation.
There are a number of modules and particles builtin. More can be added as
plugins. You can even write your own!
To summarize: a bar displays information provided by modules, using
particles and decorations. How is configured by you.
'';
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; unix;
};
}

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "terragrunt"; pname = "terragrunt";
version = "0.28.2"; version = "0.28.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gruntwork-io"; owner = "gruntwork-io";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-942PlEoR3ljHecg5RNqqq5cvVzfrIqIbSiV172STiGM="; sha256 = "sha256-ERThySRhTqklZ8sRrlHBiCtPqKMplioOyjuVEN44GvI=";
}; };
vendorSha256 = "sha256-lRJerUYafpkXAGf8MEM8SeG3aB86mlMo7iLpeHFAnd4="; vendorSha256 = "sha256-lRJerUYafpkXAGf8MEM8SeG3aB86mlMo7iLpeHFAnd4=";

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "velero"; pname = "velero";
version = "1.5.2"; version = "1.5.3";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "vmware-tanzu"; owner = "vmware-tanzu";
repo = "velero"; repo = "velero";
sha256 = "1hfi1iipbval0c0c0nnf6fz5n76za0vwczm5lq86sddqnznbvsrz"; sha256 = "sha256-DZ6phJxc8n9LCSsER09K3j+pUJxkYrBZQaI4h+bcV94=";
}; };
buildFlagsArray = '' buildFlagsArray = ''
@ -19,7 +19,7 @@ buildGoModule rec {
-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean
''; '';
vendorSha256 = "1izl7z689jf3i3wax7rfpk0jjly7nsi7vzasy1j9v5cwjy2d5z4v"; vendorSha256 = "sha256-m/zShJeclZ1k8Fr9faK2x1Mpwbwun674iMPJhMw/9Mc=";
excludedPackages = [ "issue-template-gen" ]; excludedPackages = [ "issue-template-gen" ];

View file

@ -43,6 +43,13 @@ mkDerivation rec {
sha256 = "sha256-1CV2lVOc+kDerYq9rwTFHjTU10vK1aLJNNCObp1Dt6s="; sha256 = "sha256-1CV2lVOc+kDerYq9rwTFHjTU10vK1aLJNNCObp1Dt6s=";
}; };
patches = [
(fetchpatch { # fix build with podofo 0.9.7
url = "https://github.com/scribusproject/scribus/commit/c6182ef92820b422d61c904e40e9fed865458eb5.patch";
sha256 = "0vp275xfbd4xnj5s55cgzsihgihby5mmjlbmrc7sa6jbrsm8aa2c";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkg-config pkg-config

View file

@ -13,13 +13,13 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mkvtoolnix"; pname = "mkvtoolnix";
version = "51.0.0"; version = "53.0.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "mbunkus"; owner = "mbunkus";
repo = "mkvtoolnix"; repo = "mkvtoolnix";
rev = "release-${version}"; rev = "release-${version}";
sha256 = "06k2slgac0fhgypmdriwdc5s09mry22vxk316ixfj5sv3irwn7wc"; sha256 = "04wjs3sgb3gn85gl8y1svx177d1213hswx37zdsj80giw1k5df79";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -0,0 +1,26 @@
{ stdenv, lib, fetchFromGitHub
, libyaml
}:
stdenv.mkDerivation rec {
pname = "libcyaml";
version = "1.1.0";
src = fetchFromGitHub {
owner = "tlsa";
repo = "libcyaml";
rev = "v${version}";
sha256 = "0428p0rwq71nhh5nzcbapsbrjxa0x5l6h6ns32nxv7j624f0zd93";
};
buildInputs = [ libyaml ];
makeFlags = [ "VARIANT=release" "PREFIX=$(out)" ];
meta = with lib; {
homepage = "https://github.com/tlsa/libcyaml";
description = "C library for reading and writing YAML";
license = licenses.isc;
platforms = platforms.linux;
};
}

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libebml"; pname = "libebml";
version = "1.4.0"; version = "1.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Matroska-Org"; owner = "Matroska-Org";
repo = "libebml"; repo = "libebml";
rev = "release-${version}"; rev = "release-${version}";
sha256 = "052v4mjynndj9xgfl4lmlsnx9ai0pah0kjyr5fm34l7gj8vhc5s7"; sha256 = "04bn1i7g4vwmkv3hv26rmcb59zkl2rh37qnfjm52j560bjlyd7im";
}; };
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];

View file

@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, cmake }: { lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "metal"; pname = "metal";
version = "2.1.1"; version = "2.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "brunocodutra"; owner = "brunocodutra";
repo = "metal"; repo = "metal";
rev = "v${version}"; rev = "v${version}";
sha256 = "07n1aqyaixbd66l24km5ip3pkmidkx9m3saygf7cfp6vvbgmi42l"; sha256 = "sha256-1I+EZtIz/2y4+dJGBONhTlUQGHgRdvXc1ZAOC9pmStw=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View file

@ -1,25 +1,16 @@
{ lib, stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig { lib, stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig
, openssl, libpng, lua5, pkg-config, libidn, expat, fetchpatch , openssl, libpng, lua5, pkg-config, libidn, expat
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.9.6"; version = "0.9.7";
pname = "podofo"; pname = "podofo";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/podofo/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/podofo/${pname}-${version}.tar.gz";
sha256 = "0wj0y4zcmj4q79wrn3vv3xq4bb0vhhxs8yifafwy9f2sjm83c5p9"; sha256 = "1f0yvkx6nf99fp741w2y706d8bs9824x1z2gqm3rdy5fv8bfgwkw";
}; };
patches = [
# https://sourceforge.net/p/podofo/tickets/24/
(fetchpatch {
url = "https://sourceforge.net/p/podofo/tickets/24/attachment/podofo-cmake-3.12.patch";
extraPrefix = "";
sha256 = "087h51x60zrakzx09baan77hwz99cwb5l1j802r5g4wj7pbjz0mb";
})
];
outputs = [ "out" "dev" "lib" ]; outputs = [ "out" "dev" "lib" ];
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
@ -41,6 +32,6 @@ stdenv.mkDerivation rec {
homepage = "http://podofo.sourceforge.net"; homepage = "http://podofo.sourceforge.net";
description = "A library to work with the PDF file format"; description = "A library to work with the PDF file format";
platforms = platforms.all; platforms = platforms.all;
license = with licenses; [ gpl2 lgpl2 ]; license = with licenses; [ gpl2Plus lgpl2Plus ];
}; };
} }

View file

@ -1,26 +1,41 @@
{ stdenv, lib, fetchgit, meson, ninja }: { stdenv
, lib
, fetchgit
, meson
, ninja
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tllist"; pname = "tllist";
version = "1.0.4"; version = "1.0.5";
src = fetchgit { src = fetchgit {
url = "https://codeberg.org/dnkl/tllist.git"; url = "https://codeberg.org/dnkl/tllist.git";
rev = version; rev = version;
sha256 = "sha256-+u8p/VmI61SGRhZHaJBwgcVNetNOrYzg2NVQehbfRqg="; sha256 = "wJEW7haQBtCR2rffKOFyqH3aq0eBr6H8T6gnBs2bNRg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [ meson ninja ];
meson ninja
];
doCheck = true; doCheck = true;
meta = with lib; { meta = with lib; {
homepage = "https://codeberg.org/dnkl/tllist"; homepage = "https://codeberg.org/dnkl/tllist";
description = "C header file only implementation of a typed linked list"; description = "C header file only implementation of a typed linked list";
maintainers = with maintainers; [ fionera ]; longDescription = ''
Most C implementations of linked list are untyped. That is, their data
carriers are typically void *. This is error prone since your compiler
will not be able to help you correct your mistakes (oh, was it a
pointer-to-a-pointer... I thought it was just a pointer...).
tllist addresses this by using pre-processor macros to implement dynamic
types, where the data carrier is typed to whatever you want; both
primitive data types are supported as well as aggregated ones such as
structs, enums and unions.
'';
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ fionera AndersonTorres ];
platforms = with platforms; linux; platforms = with platforms; linux;
}; };
} }

View file

@ -6,13 +6,13 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.15.0"; version = "1.0.0";
pname = "azure-mgmt-netapp"; pname = "azure-mgmt-netapp";
disabled = isPy27; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "5e98c360609a77b443b2fe431e0337e5cb705b4f02d0204791f9985f7ce68836"; sha256 = "e2c0cecd634c0a106e389f39ad767bfd1d718d90692e4e3c9664b1fe9a792ade";
extension = "zip"; extension = "zip";
}; };

View file

@ -1,30 +1,34 @@
{ lib, buildPythonPackage, fetchPypi, fetchpatch, pyusb }: { lib
, buildPythonPackage
, fetchPypi
, pyusb
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "BlinkStick"; pname = "BlinkStick";
version = "1.1.8"; version = "1.2.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "3edf4b83a3fa1a7bd953b452b76542d54285ff6f1145b6e19f9b5438120fa408"; sha256 = "0rdk3i81s6byw23za0bxvkh7sj5l16qxxgc2c53qjg3klc24wcm9";
}; };
patches = [ # Upstream fix https://github.com/arvydas/blinkstick-python/pull/54
(fetchpatch { # https://github.com/arvydas/blinkstick-python/pull/54/commits/b9bee2cd72f799f1210e5d9e13207f93bbc2d244.patch
url = "https://github.com/arvydas/blinkstick-python/commit/a9227d0.patch"; # has line ending issues after 1.2.0
sha256 = "1mcmxlnkbfxwp84qz32l5rlc7r9anh9yhnqaj1y8rny5s13jb01f"; postPatch = ''
}) substituteInPlace setup.py --replace "pyusb==1.0.0" "pyusb>=1.0.0"
(fetchpatch { '';
url = "https://github.com/arvydas/blinkstick-python/pull/54.patch";
sha256 = "1gjq6xbai794bbdyrv82i96l1a7qkwvlhzd6sa937dy5ivv6s6hl";
})
];
propagatedBuildInputs = [ pyusb ]; propagatedBuildInputs = [ pyusb ];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "blinkstick" ];
meta = with lib; { meta = with lib; {
description = "Python package to control BlinkStick USB devices"; description = "Python package to control BlinkStick USB devices";
homepage = "https://pypi.python.org/pypi/BlinkStick/"; homepage = "https://github.com/arvydas/blinkstick-python";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ np ]; maintainers = with maintainers; [ np ];
}; };

View file

@ -13,11 +13,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "boto3"; pname = "boto3";
version = "1.17.4"; # N.B: if you change this, change botocore too version = "1.17.5"; # N.B: if you change this, change botocore too
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-ZVFEJ/X4SSRcmicvoGpaAUrjlFMz9PQHSJ0DT7mdxh8="; sha256 = "sha256-1qr7gE/KK2fGXdp4rYtK/tkB4AQHEgi4TIBNNFrZ67o=";
}; };
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

View file

@ -12,11 +12,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "botocore"; pname = "botocore";
version = "1.20.4"; # N.B: if you change this, change boto3 and awscli to a matching version version = "1.20.5"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-YWV6Hks83alicIQYS9+dykY3wVI9rq0xo2l0vg1RaG0="; sha256 = "sha256-BKHfdZaB9fFxrMs1TYY7/tB3TWSk6O41/0mDV1VmCk4=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -0,0 +1,52 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytest-runner
, pytestCheckHook
, pythonOlder
, morphys
, six
, varint
}:
buildPythonPackage rec {
pname = "py-multicodec";
version = "0.2.1";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "multiformats";
repo = pname;
rev = "v${version}";
sha256 = "sha256-2aK+bfhqCMqSO+mtrHIfNQmQpQHpwd7yHseI/3O7Sp4=";
};
# Error when not substituting:
# Failed: [pytest] section in setup.cfg files is no longer supported, change to [tool:pytest] instead.
postPatch = ''
substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]"
'';
nativeBuildInputs = [
pytest-runner
];
propagatedBuildInputs = [
varint
six
morphys
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "multicodec" ];
meta = with lib; {
description = "Compact self-describing codecs";
homepage = "https://github.com/multiformats/py-multicodec";
license = licenses.mit;
maintainers = with maintainers; [ Luflosi ];
};
}

View file

@ -9,11 +9,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-snappy"; pname = "python-snappy";
version = "0.5.4"; version = "0.6.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "d9c26532cfa510f45e8d135cde140e8a5603d3fb254cfec273ebc0ecf9f668e2"; sha256 = "06l9my361ig4x5ycyrmq33q83zcdib3y2zxfxv7k7dlpyp9ri2hn";
}; };
buildInputs = [ snappy ]; buildInputs = [ snappy ];

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison }: { lib, stdenv, fetchFromGitHub, cmake, flex, bison }:
let let
version = "2.4.3"; version = "2.5.3";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "minizinc"; pname = "minizinc";
@ -12,28 +12,9 @@ stdenv.mkDerivation {
owner = "MiniZinc"; owner = "MiniZinc";
repo = "libminizinc"; repo = "libminizinc";
rev = version; rev = version;
sha256 = "0mahf621zwwywimly5nd6j39j7qr48k5p7zwpfqnjq4wn010mbf8"; sha256 = "1kc65sxkc64pr560qaaznc44jnlvq7pbpzwijad410lpcnna5byg";
}; };
patches = [
# Fix build with newer Bison versions:
# https://github.com/MiniZinc/libminizinc/issues/389
(fetchpatch {
url = "https://github.com/MiniZinc/libminizinc/commit/d3136f6f198d3081943c17ac6890dbe14a81d112.diff";
sha256 = "1f4wxn9422ndgq6dd0vqdxm2313srm7gn9nh82aas2xijdxlmz2c";
})
(fetchpatch {
name = "bison-3.7-compat-1.patch";
url = "https://github.com/MiniZinc/libminizinc/commit/8d4dcf302e78231f7c2665150e8178cacd06f91c.patch";
sha256 = "1wgciyrqijv7b4wqha94is5skji8j7b9wq6fkdsnsimfd3xpxhqw";
})
(fetchpatch {
name = "bison-3.7-compat-2.patch";
url = "https://github.com/MiniZinc/libminizinc/commit/952ffda0bd23dc21f83d3e3f080ea5b3a414e8e0.patch";
sha256 = "0cnsfqw0hwm7rmazqnb99725rm2vdwab75vdpr5x5l3kjwsn76rj";
})
];
meta = with lib; { meta = with lib; {
homepage = "https://www.minizinc.org/"; homepage = "https://www.minizinc.org/";
description = "A medium-level constraint modelling language"; description = "A medium-level constraint modelling language";

View file

@ -1,19 +1,20 @@
{ lib, stdenv, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, makeWrapper, minizinc }: { lib, mkDerivation, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, minizinc }:
let let
version = "2.4.3"; version = "2.5.3";
in in
stdenv.mkDerivation { mkDerivation {
pname = "minizinc-ide"; pname = "minizinc-ide";
inherit version; inherit version;
nativeBuildInputs = [ qmake makeWrapper ]; nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase qtwebengine qtwebkit ]; buildInputs = [ qtbase qtwebengine qtwebkit ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "MiniZinc"; owner = "MiniZinc";
repo = "MiniZincIDE"; repo = "MiniZincIDE";
rev = version; rev = version;
sha256 = "0dfqh73rnp00336pyr1hlgl1wb4m2kh28zvdkamjgml60gmg6wdr"; sha256 = "1c80ilb1xbgzfadgal668h2zsaiv62il1jnljizrisgb7pszzyzw";
fetchSubmodules = true;
}; };
sourceRoot = "source/MiniZincIDE"; sourceRoot = "source/MiniZincIDE";

View file

@ -1,39 +1,38 @@
{ lib, stdenv { lib
, buildGoPackage , buildGoModule
, fetchFromGitHub , fetchFromGitHub
, makeWrapper , makeWrapper
, mercurial , mercurial
, git , git
}: }:
buildGoPackage rec { buildGoModule rec {
pname = "hound-unstable"; pname = "hound";
version = "2018-11-02"; version = "unstable-2021-01-26";
rev = "74ec7448a234d8d09e800b92e52c92e378c07742";
src = fetchFromGitHub {
owner = "hound-search";
repo = "hound";
rev = "b88fc1f79d668e6671a478ddf4fb3e73a63067b9";
sha256 = "00xc3cj7d3klvhsh9hivvjwgzb6lycw3r3w7nch98nv2j8iljc44";
};
vendorSha256 = "0x1nhhhvqmz3qssd2d44zaxbahj8lh9r4m5jxdvzqk6m3ly7y0b6";
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
goPackagePath = "github.com/etsy/hound"; # requires network access
doCheck = false;
src = fetchFromGitHub { postInstall = ''
inherit rev; wrapProgram $out/bin/houndd --prefix PATH : ${lib.makeBinPath [ mercurial git ]}
owner = "etsy";
repo = "hound";
sha256 = "0g6nvgqjabprcl9z5ci5frhbam1dzq978h1d6aanf8vvzslfgdpq";
};
postInstall = with stdenv; let
binPath = lib.makeBinPath [ mercurial git ];
in ''
wrapProgram $out/bin/houndd --prefix PATH : ${binPath}
''; '';
meta = { meta = with lib; {
inherit (src.meta) homepage; inherit (src.meta) homepage;
description = "Lightning fast code searching made easy"; description = "Lightning fast code searching made easy";
license = lib.licenses.mit; license = licenses.mit;
maintainers = with lib.maintainers; [ grahamc ]; maintainers = with maintainers; [ grahamc SuperSandro2000 ];
platforms = lib.platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "vitetris"; pname = "vitetris";
version = "0.58.0"; version = "0.59.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vicgeralds"; owner = "vicgeralds";
repo = "vitetris"; repo = "vitetris";
rev = "v${version}"; rev = "v${version}";
sha256 = "1fvw9yqg1q25x6dlfi4bl3hrrcdgl6wwq29j89aycxwdfxrxs09w"; sha256 = "sha256-Rbfa2hD67RGmInfWwYD4SthL8lm5bGSBi3oudV5hAao=";
}; };
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lightspark"; pname = "lightspark";
version = "0.8.2"; version = "0.8.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lightspark"; owner = "lightspark";
repo = "lightspark"; repo = "lightspark";
rev = version; rev = version;
sha256 = "04wn6d6gmpf848x0yghw26m9syv0hm6q5dwqiw3fxhs155jjqfgv"; sha256 = "sha256-Z1wJIoHb/+pSPN8sOfSbrl1CQk3BtK22zqTjJnOVe9Y=";
}; };
patchPhase = '' patchPhase = ''

View file

@ -129,12 +129,12 @@ in rec {
dracula = mkDerivation rec { dracula = mkDerivation rec {
pluginName = "dracula"; pluginName = "dracula";
version = "unstable-2020-12-28"; version = "unstable-2021-02-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dracula"; owner = "dracula";
repo = "tmux"; repo = "tmux";
rev = "6757a5329948f00addd66b02ea94f61dd94456f5"; rev = "d1678a5834679d98ffac1dd7a0eaecff7868ab8e";
sha256 = "0wwwzg3bwcrbr2nmf84prz7k4i79yq0960vs6zjp0x8nqn2fvziy"; sha256 = "rdy5NFkh5Yl2YOTnuMKZQGRqVb2Pk8Bpq3nbJp2rCtE=";
}; };
meta = with lib; { meta = with lib; {
homepage = "https://draculatheme.com/tmux"; homepage = "https://draculatheme.com/tmux";

View file

@ -389,12 +389,12 @@ let
chadtree = buildVimPluginFrom2Nix { chadtree = buildVimPluginFrom2Nix {
pname = "chadtree"; pname = "chadtree";
version = "2021-02-09"; version = "2021-02-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ms-jpq"; owner = "ms-jpq";
repo = "chadtree"; repo = "chadtree";
rev = "fb65c78edbc6a4bfaa8c7a9df45b2a955497247e"; rev = "62e7bff3c4a29869423b88be2dff1314e1a34986";
sha256 = "1g1jhfn2nzx9g03kv5n8kwqsh3icf6s9ldkhsv5w1k1ang56zpn1"; sha256 = "07dqd2z9xjc89b9p8hp2pwfbrimva3yp5493gwcpfnqsncxshm37";
}; };
meta.homepage = "https://github.com/ms-jpq/chadtree/"; meta.homepage = "https://github.com/ms-jpq/chadtree/";
}; };
@ -618,12 +618,12 @@ let
compe-tabnine = buildVimPluginFrom2Nix { compe-tabnine = buildVimPluginFrom2Nix {
pname = "compe-tabnine"; pname = "compe-tabnine";
version = "2021-02-08"; version = "2021-02-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tzachar"; owner = "tzachar";
repo = "compe-tabnine"; repo = "compe-tabnine";
rev = "0b884f2b0bc965826e69d4377cd06a48a36995ec"; rev = "bdd7ea6c4c542aa606090d512e97eb422402045c";
sha256 = "0mwqk9ixirjybv9b2f1n08052iv6hcdr5l73f7jij35nc5anclad"; sha256 = "17r4d1hg8wcbv4wqdqzm3y7xmpn18cvx4kv1kaspxncrppzj06mp";
}; };
meta.homepage = "https://github.com/tzachar/compe-tabnine/"; meta.homepage = "https://github.com/tzachar/compe-tabnine/";
}; };
@ -726,12 +726,12 @@ let
Coqtail = buildVimPluginFrom2Nix { Coqtail = buildVimPluginFrom2Nix {
pname = "Coqtail"; pname = "Coqtail";
version = "2021-01-26"; version = "2021-02-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "whonore"; owner = "whonore";
repo = "Coqtail"; repo = "Coqtail";
rev = "c4d5c58771dd854671bd26b94693ecc1ffa21e39"; rev = "f1deefb084b28197eaf988bbebff70dd86a99e03";
sha256 = "1r66h030f1952cl1bgynwb3r80zjh5imxwm87gnyjk6rg9kpjqnd"; sha256 = "1461h9qlfvvcvig4zrbylm4j11xkxmbnha1nk5829xm50pjkmca2";
}; };
meta.homepage = "https://github.com/whonore/Coqtail/"; meta.homepage = "https://github.com/whonore/Coqtail/";
}; };
@ -918,24 +918,24 @@ let
denite-nvim = buildVimPluginFrom2Nix { denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim"; pname = "denite-nvim";
version = "2021-02-08"; version = "2021-02-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Shougo"; owner = "Shougo";
repo = "denite.nvim"; repo = "denite.nvim";
rev = "fcf4415c701cb9e05d1f2c3dee4afeeba1d625fc"; rev = "8de12f27d51e2574217148191f607a00b1575ec7";
sha256 = "0kfb41k3gimjnqv9l288clwbqwznrgqqy3xanaw8306sgsjg7rs1"; sha256 = "0skn2fjlazm4bfmimb8qmyn6bjq01kqxaf88qggxwfk5l2sv3krj";
}; };
meta.homepage = "https://github.com/Shougo/denite.nvim/"; meta.homepage = "https://github.com/Shougo/denite.nvim/";
}; };
deol-nvim = buildVimPluginFrom2Nix { deol-nvim = buildVimPluginFrom2Nix {
pname = "deol-nvim"; pname = "deol-nvim";
version = "2021-01-27"; version = "2021-02-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Shougo"; owner = "Shougo";
repo = "deol.nvim"; repo = "deol.nvim";
rev = "0c6e1653f0d0a904efa8da01e470ffe0bd1bf594"; rev = "907cf91cc491348bf383f3eb447c1be2a9330cb4";
sha256 = "1jfwzvblcfx7yx0lhwps0smgsblrc0azncv1bzliyx27in3gn59s"; sha256 = "1xsri4chlzfr0zc93wl96fpy381maygc3dlvy58nz2yswdr0g103";
}; };
meta.homepage = "https://github.com/Shougo/deol.nvim/"; meta.homepage = "https://github.com/Shougo/deol.nvim/";
}; };
@ -1571,12 +1571,12 @@ let
git-messenger-vim = buildVimPluginFrom2Nix { git-messenger-vim = buildVimPluginFrom2Nix {
pname = "git-messenger-vim"; pname = "git-messenger-vim";
version = "2021-02-02"; version = "2021-02-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rhysd"; owner = "rhysd";
repo = "git-messenger.vim"; repo = "git-messenger.vim";
rev = "1a67c3426541c88e570096b1e6dc954eac0047fd"; rev = "04beaee235cca4304c4b655820c83d3661610220";
sha256 = "03gyic6qf59sl166sp9pw2rg73fxhghkm4cpfyyssm7npvlgckni"; sha256 = "0pjw17z76yq873jh74pr01r3ay4blzb4j0ghax553fb0d8ni4lkl";
}; };
meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; meta.homepage = "https://github.com/rhysd/git-messenger.vim/";
}; };
@ -1595,12 +1595,12 @@ let
gitsigns-nvim = buildVimPluginFrom2Nix { gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim"; pname = "gitsigns-nvim";
version = "2021-02-07"; version = "2021-02-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lewis6991"; owner = "lewis6991";
repo = "gitsigns.nvim"; repo = "gitsigns.nvim";
rev = "3ab17a8e829b1c6c0d53f6a22e35c185bf7360de"; rev = "317750d66a572588eef9a23fefce4aff1cbcad94";
sha256 = "0c73382ighhv18nn3zrdq09ayyh8pq0adcy6icgmx71qlszc5572"; sha256 = "0nc52f0hkb701scvnas6my9i92ys1i9c5y9h4h42yk00ph83k2k1";
}; };
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
}; };
@ -2136,12 +2136,12 @@ let
lf-vim = buildVimPluginFrom2Nix { lf-vim = buildVimPluginFrom2Nix {
pname = "lf-vim"; pname = "lf-vim";
version = "2021-02-04"; version = "2021-02-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ptzz"; owner = "ptzz";
repo = "lf.vim"; repo = "lf.vim";
rev = "018f28d495f58ba99c952df75926481e1b5667f4"; rev = "cf3a56e126a6bf21f9004565d9b5043f1e9a093b";
sha256 = "058f3rjdwfl8p63l5bf7csixl0714dy2dbrbzwig8if4bxn3dkp9"; sha256 = "0vnh5xa5vwchsaz1a215pf0jyfc70sj31kvl1xmi867xks53jdgz";
}; };
meta.homepage = "https://github.com/ptzz/lf.vim/"; meta.homepage = "https://github.com/ptzz/lf.vim/";
}; };
@ -2268,24 +2268,24 @@ let
lspsaga-nvim = buildVimPluginFrom2Nix { lspsaga-nvim = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim"; pname = "lspsaga-nvim";
version = "2021-02-09"; version = "2021-02-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "glepnir"; owner = "glepnir";
repo = "lspsaga.nvim"; repo = "lspsaga.nvim";
rev = "c2fb66a23659349b9c36d21892e5c8f67ed65d62"; rev = "985bcf31ad7b4fe955b02ce17bb844efb712aa22";
sha256 = "1mrajhf7jnjgp68dqcrghhgf21shylili6sis8svfp7ls7x87wk2"; sha256 = "00zi3yjkfpsza5bzc0i2pwsz7jsfsnvwcawb4pxfndn5v77jb050";
}; };
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
}; };
lualine-nvim = buildVimPluginFrom2Nix { lualine-nvim = buildVimPluginFrom2Nix {
pname = "lualine-nvim"; pname = "lualine-nvim";
version = "2021-02-07"; version = "2021-02-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hoob3rt"; owner = "hoob3rt";
repo = "lualine.nvim"; repo = "lualine.nvim";
rev = "0325203fa9c522fbe4297acc6992778ae3b41391"; rev = "8a4baa804b7b2906eb8b9c325546dceabffdfcfd";
sha256 = "0ykrz9yhxxc428d39bg1j9xvlxikzd0xr6zh7hci2apvv96a6mh3"; sha256 = "1fq5aa4yg5r1dr2g18xnywg7pyid6s9vzm71zy3anmdp4g24amgx";
}; };
meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
}; };
@ -2352,12 +2352,12 @@ let
minimap-vim = buildVimPluginFrom2Nix { minimap-vim = buildVimPluginFrom2Nix {
pname = "minimap-vim"; pname = "minimap-vim";
version = "2021-02-08"; version = "2021-02-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wfxr"; owner = "wfxr";
repo = "minimap.vim"; repo = "minimap.vim";
rev = "551a13f9677dde911bd4436c038a1fa64e814cc4"; rev = "a05a32d70a043cc342d5e6e0a46432e294df7d8e";
sha256 = "17ni56fs94x60qpd0ikwi2hz9nsh0icwm7438i84kswmysfx3gn8"; sha256 = "16fqqp1di9abcvignz5d09hlc9qzafaa1d2v97lks28jjcri5616";
}; };
meta.homepage = "https://github.com/wfxr/minimap.vim/"; meta.homepage = "https://github.com/wfxr/minimap.vim/";
}; };
@ -2808,12 +2808,12 @@ let
nerdtree = buildVimPluginFrom2Nix { nerdtree = buildVimPluginFrom2Nix {
pname = "nerdtree"; pname = "nerdtree";
version = "2021-01-31"; version = "2021-02-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "preservim"; owner = "preservim";
repo = "nerdtree"; repo = "nerdtree";
rev = "1b19089917cc3e0a81d3294fead2424c419d545c"; rev = "1d46d6df3e581984d4b31d30d362cb94bc993e1d";
sha256 = "0zm60spnz4nsn0g9zsdiapygr2nwnkrqcz0w2pr37sp9i91nxxvb"; sha256 = "1zm08jrc2grd7fbcsxwspsj4jlv92s45wa54x404vijxyvgis9bz";
}; };
meta.homepage = "https://github.com/preservim/nerdtree/"; meta.homepage = "https://github.com/preservim/nerdtree/";
}; };
@ -2916,12 +2916,12 @@ let
nvim-compe = buildVimPluginFrom2Nix { nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe"; pname = "nvim-compe";
version = "2021-02-09"; version = "2021-02-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hrsh7th"; owner = "hrsh7th";
repo = "nvim-compe"; repo = "nvim-compe";
rev = "a85c6461ddf73fbe307a73b06855e336e298b152"; rev = "3ec1e8c72a77b6c541751ce7b7718642d9528795";
sha256 = "1kqw6ynhl36mwkghgs3yjw0q4yp578hb03hb1nwiyxdjh72v6a2v"; sha256 = "09j7salzbxmkqjvvilnhx8jysvf796bkx9f1an0p0vkn1slcfi7n";
}; };
meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
}; };
@ -3276,12 +3276,12 @@ let
packer-nvim = buildVimPluginFrom2Nix { packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim"; pname = "packer-nvim";
version = "2021-02-08"; version = "2021-02-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wbthomason"; owner = "wbthomason";
repo = "packer.nvim"; repo = "packer.nvim";
rev = "5c43fcc1496112bf6fd569c3b5c7dda7f501b0ac"; rev = "b57a0f2f02ffd3e5f1604fdea6b76d4f67502814";
sha256 = "0ghnnv2wyg3simvwxghlx3gafgnbm0qr48chfr89c2z4xsvn8rqc"; sha256 = "06414cik0iqb6jwksqikin328mylfwxl6215036bb7rl2lc8cs99";
}; };
meta.homepage = "https://github.com/wbthomason/packer.nvim/"; meta.homepage = "https://github.com/wbthomason/packer.nvim/";
}; };
@ -3372,12 +3372,12 @@ let
plenary-nvim = buildVimPluginFrom2Nix { plenary-nvim = buildVimPluginFrom2Nix {
pname = "plenary-nvim"; pname = "plenary-nvim";
version = "2021-02-08"; version = "2021-02-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-lua"; owner = "nvim-lua";
repo = "plenary.nvim"; repo = "plenary.nvim";
rev = "2ea0101080985ec34019a79e7a4b30f6c45b0f3c"; rev = "b77fc46c5f35978c03277cd7261c07a36dafc8a4";
sha256 = "0ijvib9ngydfifbzywxiac9xxvpjyp3jvym9mw3jf6hp4k4dh9sw"; sha256 = "0a38ma4kn6s75s286bdl5mhqlnbzzpir29gzjq7kxqi4y4zh9spc";
}; };
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
}; };
@ -3902,12 +3902,12 @@ let
sql-nvim = buildVimPluginFrom2Nix { sql-nvim = buildVimPluginFrom2Nix {
pname = "sql-nvim"; pname = "sql-nvim";
version = "2021-02-02"; version = "2021-02-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tami5"; owner = "tami5";
repo = "sql.nvim"; repo = "sql.nvim";
rev = "9e0303c615445d6699a8c775f38e0e0fc457a5c3"; rev = "96d000d9eff0165c7e0496f73787cc56d7c1581c";
sha256 = "0z1awkvz6vl5zci4qzibfb6nkk1c56rg5d4rqrhm5l1dh31pwjy3"; sha256 = "1n9j3wv5xifs7ppgjnnbvx9p4h4llshbzgrly5b7lx0nnb91yqg0";
}; };
meta.homepage = "https://github.com/tami5/sql.nvim/"; meta.homepage = "https://github.com/tami5/sql.nvim/";
}; };
@ -4082,12 +4082,12 @@ let
telescope-frecency-nvim = buildVimPluginFrom2Nix { telescope-frecency-nvim = buildVimPluginFrom2Nix {
pname = "telescope-frecency-nvim"; pname = "telescope-frecency-nvim";
version = "2021-02-03"; version = "2021-02-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-telescope"; owner = "nvim-telescope";
repo = "telescope-frecency.nvim"; repo = "telescope-frecency.nvim";
rev = "a5803b6755b3499aeabecb90f834aa060a2a8835"; rev = "ffa2027102f75e28dd8d8c2a97f3b9163dd80b56";
sha256 = "1fwcfxw9v6962pbf79s5hn75jcbfmsy6nig2z3s7s746pkfkjw9j"; sha256 = "1ipxqkfaqc75qzpj7vg3gr44r8fcx979pyf84wibxic3kby9qp7y";
}; };
meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
}; };
@ -4123,8 +4123,8 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-telescope"; owner = "nvim-telescope";
repo = "telescope.nvim"; repo = "telescope.nvim";
rev = "993e383dd5356bf10c5cf2b5d0ac88f9c7746181"; rev = "3a7fa41857394cd2d90d00891413c12fada039c3";
sha256 = "1db21n32y6hib3r0ncci3920wyb631yi57q3s58swlcqpjf20wli"; sha256 = "0bn7jvwwaxfhcqd4l3wi9bshabbrcd4aws7d564kh1js8bklwx1b";
}; };
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
}; };
@ -4276,12 +4276,12 @@ let
ultisnips = buildVimPluginFrom2Nix { ultisnips = buildVimPluginFrom2Nix {
pname = "ultisnips"; pname = "ultisnips";
version = "2021-02-02"; version = "2021-02-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SirVer"; owner = "SirVer";
repo = "ultisnips"; repo = "ultisnips";
rev = "0e84f61b8184981012a32642f78ad88aafcf4258"; rev = "66d81fc2c0bda30be69fffa46da0932ee8d5ddd5";
sha256 = "183y7bzc9lix536wla1p6niyl1w17jpjm2ild6pc593pl194qjm5"; sha256 = "0fzpl2fj5kig8kbcn65ph6y3h412ryx5mfa15822lnsf8cmkr5db";
}; };
meta.homepage = "https://github.com/SirVer/ultisnips/"; meta.homepage = "https://github.com/SirVer/ultisnips/";
}; };
@ -4720,12 +4720,12 @@ let
vim-autoformat = buildVimPluginFrom2Nix { vim-autoformat = buildVimPluginFrom2Nix {
pname = "vim-autoformat"; pname = "vim-autoformat";
version = "2020-10-28"; version = "2021-02-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Chiel92"; owner = "Chiel92";
repo = "vim-autoformat"; repo = "vim-autoformat";
rev = "ff16950ba5e07353f25ee33732982a67af451eb2"; rev = "2a6f931987c1cc5e5bc0c4c44f21ac9bd4c72f3b";
sha256 = "12h6dznfwpifyr6ahk1b45pb59nlm6wkrfhgh65g1clnpzvchkiw"; sha256 = "17w0cjzppx9zxrqxaa975xazcnps4v1b93bmy19dccvc7z1gipby";
}; };
meta.homepage = "https://github.com/Chiel92/vim-autoformat/"; meta.homepage = "https://github.com/Chiel92/vim-autoformat/";
}; };
@ -5692,12 +5692,12 @@ let
vim-go = buildVimPluginFrom2Nix { vim-go = buildVimPluginFrom2Nix {
pname = "vim-go"; pname = "vim-go";
version = "2021-01-22"; version = "2021-02-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fatih"; owner = "fatih";
repo = "vim-go"; repo = "vim-go";
rev = "007d9bc7786d703dc778de7b69895b8c1907dde7"; rev = "cb4c622c97a39652151748c4dec70a46e93a9117";
sha256 = "1r7jv3cbawh9n2d6nd3iwga6bgj8z0nx94c3dhn5286si1s3857c"; sha256 = "0pfd6vizjrynz4azx3fkz5nwm7k08jjhvy6ypkjzhhw2ql37l7i9";
}; };
meta.homepage = "https://github.com/fatih/vim-go/"; meta.homepage = "https://github.com/fatih/vim-go/";
}; };
@ -7447,12 +7447,12 @@ let
vim-snippets = buildVimPluginFrom2Nix { vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets"; pname = "vim-snippets";
version = "2021-02-07"; version = "2021-02-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "honza"; owner = "honza";
repo = "vim-snippets"; repo = "vim-snippets";
rev = "1b687b29ecf97125becae8f3fcce0c77c48951d6"; rev = "8426857c1b8d1c00bbe0faa6dfff99acb1521042";
sha256 = "154a06p1hkg42f1imsw5swbm78xx7v5x7v4yivpva9lg23bccqhh"; sha256 = "16lvwd22813k38dbkfx4w46gmvbkfla4a0zyklpz7qa658phfprw";
}; };
meta.homepage = "https://github.com/honza/vim-snippets/"; meta.homepage = "https://github.com/honza/vim-snippets/";
}; };
@ -8012,12 +8012,12 @@ let
vim-which-key = buildVimPluginFrom2Nix { vim-which-key = buildVimPluginFrom2Nix {
pname = "vim-which-key"; pname = "vim-which-key";
version = "2020-12-21"; version = "2021-02-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "liuchengxu"; owner = "liuchengxu";
repo = "vim-which-key"; repo = "vim-which-key";
rev = "c5322b2f67bc627d467e527a530ff6695ccd3dbd"; rev = "68bd1775277ad5677ebf5cdc774ca3ba4755d457";
sha256 = "0j3pnbg0a2rcjfp691v7wzcp9bqan24qvdl4fxzljipl2lyim0qb"; sha256 = "1pg179iz0xvd6r7xks7qrn1c7vh7zmp39s9axhdgp7jisqbhaaqx";
}; };
meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; meta.homepage = "https://github.com/liuchengxu/vim-which-key/";
}; };
@ -8229,12 +8229,12 @@ let
vimtex = buildVimPluginFrom2Nix { vimtex = buildVimPluginFrom2Nix {
pname = "vimtex"; pname = "vimtex";
version = "2021-02-08"; version = "2021-02-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lervag"; owner = "lervag";
repo = "vimtex"; repo = "vimtex";
rev = "5ac1abada4f931f2440476ad5d99a6d7600baca0"; rev = "3e76c81f329cb13b563b9092fb0e5097151bb08b";
sha256 = "1d9whpvs29mmjq5v3w2qgv370grak993lwka8k54anjxary9q4wz"; sha256 = "12rrnscqk9s8b6pr7aacjppypd3sl6b10qqyqfl5b9kgc2kic4mp";
}; };
meta.homepage = "https://github.com/lervag/vimtex/"; meta.homepage = "https://github.com/lervag/vimtex/";
}; };

View file

@ -0,0 +1,23 @@
{ stdenv, buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
pname = "flow-exporter";
version = "1.1.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "neptune-networks";
repo = pname;
sha256 = "sha256-6FqupoYWRvex7XhM7ly8f7ICnuS9JvCRIVEBIJe+64k=";
};
vendorSha256 = "sha256-2raOUOPiMUMydIsfSsnwUAAiM7WyMio1NgL1EoADr2s=";
meta = with lib; {
description = "Export network flows from kafka to Prometheus";
homepage = "https://github.com/neptune-networks/flow-exporter";
license = licenses.mit;
maintainers = with maintainers; [ kloenk ];
platforms = platforms.linux;
};
}

View file

@ -1,12 +1,18 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, fixDarwinDylibNames }: { lib
, stdenv
, fetchFromGitHub
, meson
, ninja
, fixDarwinDylibNames
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.19";
pname = "libmpdclient"; pname = "libmpdclient";
version = "2.19";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "MusicPlayerDaemon"; owner = "MusicPlayerDaemon";
repo = "libmpdclient"; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "01agvjscdxagw6jcfx0wg81c4b6p8rh0hp3slycmjs2b835kvmq2"; sha256 = "01agvjscdxagw6jcfx0wg81c4b6p8rh0hp3slycmjs2b835kvmq2";
}; };
@ -17,8 +23,8 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Client library for MPD (music player daemon)"; description = "Client library for MPD (music player daemon)";
homepage = "https://www.musicpd.org/libs/libmpdclient/"; homepage = "https://www.musicpd.org/libs/libmpdclient/";
license = licenses.gpl2; license = licenses.bsd2;
maintainers = with maintainers; [ ehmry AndersonTorres ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ ehmry ];
}; };
} }

View file

@ -5,15 +5,15 @@
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2021-01-31"; version = "2021-02-09";
pname = "oh-my-zsh"; pname = "oh-my-zsh";
rev = "c52e646bb7b109e15f6dc4047b29ca8c8e029433"; rev = "f21e646ce6c09198f7f625c597f08af49551fdb0";
src = fetchFromGitHub { src = fetchFromGitHub {
inherit rev; inherit rev;
owner = "ohmyzsh"; owner = "ohmyzsh";
repo = "ohmyzsh"; repo = "ohmyzsh";
sha256 = "0yfpahn9a6aby8ym1slcn8kvric26xy14fk1jjj3f07xvh7xg2y9"; sha256 = "14m932zbzdbwyfqkn882jarpw4dbmxkfna5pakd4n5b123drjz46";
}; };
installPhase = '' installPhase = ''

View file

@ -1,13 +0,0 @@
diff --git a/SConstruct b/SConstruct
index bebc82e..3e0127b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -59,6 +59,8 @@ srcs = Split('''\
''')
libxsettingsd = env.Library('xsettingsd', srcs)
env['LIBS'] = libxsettingsd
+env['ENV']['PATH'] = os.environ.get('PATH', '')
+env['ENV']['PKG_CONFIG_PATH'] = os.environ.get('PKG_CONFIG_PATH', '')
env.ParseConfig('pkg-config --cflags --libs x11')
xsettingsd = env.Program('xsettingsd', 'xsettingsd.cc')

View file

@ -1,38 +1,31 @@
{ lib, stdenv, fetchFromGitHub, scons, pkg-config, libX11 }: { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xsettingsd"; pname = "xsettingsd";
version = "1.0.0"; version = "1.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "derat"; owner = "derat";
repo = "xsettingsd"; repo = "xsettingsd";
rev = "v${version}"; rev = "v${version}";
sha256 = "05m4jlw0mgwp24cvyklncpziq1prr2lg0cq9c055sh4n9d93d07v"; sha256 = "sha256-CIYshZqJICuL8adKHIN4R6nudaqWOCK2UPrGhsKf9pE=";
}; };
patches = [ nativeBuildInputs = [ cmake pkg-config ];
./SConstruct.patch
];
nativeBuildInputs = [ scons pkg-config ];
buildInputs = [ libX11 ]; buildInputs = [ libX11 ];
buildPhase = '' # we end up with symlinked unit files if we don't move them around ourselves
scons -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES postFixup = ''
''; rm -r $out/lib/systemd
mv $out/share/systemd $out/lib
installPhase = ''
install -D -t "$out"/bin xsettingsd dump_xsettings
install -D -t "$out"/usr/share/man/man1 xsettingsd.1 dump_xsettings.1
''; '';
meta = with lib; { meta = with lib; {
description = "Provides settings to X11 applications via the XSETTINGS specification"; description = "Provides settings to X11 applications via the XSETTINGS specification";
homepage = "https://github.com/derat/xsettingsd"; homepage = "https://github.com/derat/xsettingsd";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ romildo ];
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.romildo ];
}; };
} }

View file

@ -28,11 +28,11 @@ let
in with py.pkgs; buildPythonApplication rec { in with py.pkgs; buildPythonApplication rec {
pname = "awscli"; pname = "awscli";
version = "1.19.4"; # N.B: if you change this, change botocore to a matching version too version = "1.19.5"; # N.B: if you change this, change botocore to a matching version too
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-fXQ6In3BBMvy1Jz6+OO8CXYVefIVrsVAUQHbNEroSII="; sha256 = "sha256-SwYL2ViwazP2MDZbW9cRThvg6jVOMlkfsbpY6QDsjQY=";
}; };
# https://github.com/aws/aws-cli/issues/4837 # https://github.com/aws/aws-cli/issues/4837

View file

@ -1,7 +1,7 @@
{lib, stdenv, fetchurl}: {lib, stdenv, fetchurl}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ncompress-4.2.4.5"; name = "ncompress-4.2.4.6";
builder = ./builder.sh; builder = ./builder.sh;
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/ncompress/${name}.tar.gz"; url = "mirror://sourceforge/project/ncompress/${name}.tar.gz";
sha256 = "0fwhfijnzggqpbmln82zq7zp6sra7p9arfakswicwi7qsp6vnxgm"; sha256 = "0sw3c7h80v9pagfqfx16ws9w2y3yrajrdk54bgiwdm0b0q06lyzv";
}; };
meta = { meta = {

View file

@ -1,25 +1,6 @@
diff -Naur ncompress-4.2.4.2.orig/Makefile.def ncompress-4.2.4.2/Makefile.def diff -Naur ncompress-4.2.4.2.orig/Makefile.def ncompress-4.2.4.2/Makefile.def
--- ncompress-4.2.4.2.orig/Makefile.def 2007-09-06 22:28:42.000000000 -0500 --- ncompress-4.2.4.2.orig/Makefile.def 2007-09-06 22:28:42.000000000 -0500
+++ ncompress-4.2.4.2/Makefile.def 2009-08-18 12:30:53.000000000 -0500 +++ ncompress-4.2.4.2/Makefile.def 2009-08-18 12:30:53.000000000 -0500
@@ -3,14 +3,16 @@
# C complier
#CC=cc
+PREFIX=/usr/local
+
# Install prefix
DESTDIR=
# Install directory for binarys
-BINDIR=/usr/local/bin
+BINDIR=$(PREFIX)/bin
# Install directory for manual
-MANDIR=/usr/local/man/man1
+MANDIR=$(PREFIX)/man/man1
# compiler options:
# options is a collection of:
@@ -31,7 +33,7 @@ @@ -31,7 +33,7 @@
# -DDEF_ERRNO=1 Define error (not defined in errno.h). # -DDEF_ERRNO=1 Define error (not defined in errno.h).
# -DMAXSEG_64K=1 -BITS=16 Support segment processsor like 80286. # -DMAXSEG_64K=1 -BITS=16 Support segment processsor like 80286.

View file

@ -2,20 +2,21 @@
buildGoPackage rec { buildGoPackage rec {
pname = "lnch"; pname = "lnch";
version = "2017-02-16"; version = "unstable-2021-02-10";
goPackagePath = "github.com/oem/${pname}"; goPackagePath = "github.com/oem/${pname}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "oem"; owner = "oem";
repo = pname; repo = pname;
rev = "f24eed5392f01d2c8a9cfe9cdf70dcfbbf4b6b36"; rev = "6ed336dd893afa071178b8ac6f6297d23fc55514";
sha256 = "0skzrjnbxq1yj7y64cq7angp4wqnrgw1xp9v8vw9zp8f8zwmpy0y"; sha256 = "K2TV+mx6C3/REJyDpC6a/Zn/ZZFxkDMC3EnkveH6YNQ=";
}; };
meta = with lib; { meta = with lib; {
homepage = "https://github.com/oem/lnch"; homepage = "https://github.com/oem/lnch";
description = "A small go app that launches a process and moves it out of the process group"; description = "Launches a process and moves it out of the process group";
license = licenses.publicDomain; # really I don't know license = licenses.mit;
platforms = with platforms; all;
}; };
} }

View file

@ -0,0 +1,24 @@
{ lib, python3Packages }:
python3Packages.buildPythonPackage rec {
pname = "piston-cli";
version = "1.2.1";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "bf0hhKb+6+07HhrkFrsWCnUQfsQWOdK/dPTlt9iZTno=";
};
propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments ];
checkPhase = ''
$out/bin/piston --help > /dev/null
'';
meta = with lib; {
description = "Piston api tool";
homepage = "https://github.com/Shivansh-007/piston-cli";
license = licenses.mit;
maintainers = with maintainers; [ ethancedwards8 ];
};
}

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "swaks"; pname = "swaks";
version = "20190914.0"; version = "20201014.0";
src = fetchurl { src = fetchurl {
url = "https://www.jetmore.org/john/code/swaks/files/${pname}-${version}.tar.gz"; url = "https://www.jetmore.org/john/code/swaks/files/${pname}-${version}.tar.gz";
sha256 = "12awq5z4sdd54cxprj834zajxhkpy4jwhzf1fhigcx1zbhdaacsp"; sha256 = "0c2sx4nrh4whsqzj6m5ay8d7yqan3aqgg436p8jb25bs91ykn2pv";
}; };
buildInputs = [ perl makeWrapper ]; buildInputs = [ perl makeWrapper ];
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
homepage = "http://www.jetmore.org/john/code/swaks/"; homepage = "http://www.jetmore.org/john/code/swaks/";
description = "A featureful, flexible, scriptable, transaction-oriented SMTP test tool"; description = "A featureful, flexible, scriptable, transaction-oriented SMTP test tool";
license = licenses.gpl2; license = licenses.gpl2Plus;
maintainers = with maintainers; []; maintainers = with maintainers; [];
platforms = platforms.all; platforms = platforms.all;
}; };

View file

@ -1,18 +1,18 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }: { lib, stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "4.6.5"; version = "4.10.1";
pname = "sleuthkit"; pname = "sleuthkit";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sleuthkit"; owner = "sleuthkit";
repo = "sleuthkit"; repo = "sleuthkit";
rev = "${pname}-${version}"; rev = "${pname}-${version}";
sha256 = "1q1cdixnfv9v4qlzza8xwdsyvq1vdw6gjgkd41yc1d57ldp1qm0c"; sha256 = "142kkpkpawpqyc88pr6xdvlagw6djaah1schyjxq9qdq9cnqx0dw";
}; };
postPatch = '' postPatch = ''
substituteInPlace tsk/img/ewf.c --replace libewf_handle_read_random libewf_handle_read_buffer_at_offset substituteInPlace tsk/img/ewf.cpp --replace libewf_handle_read_random libewf_handle_read_buffer_at_offset
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -15662,6 +15662,8 @@ in
libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; libyamlcpp = callPackage ../development/libraries/libyaml-cpp { };
libcyaml = callPackage ../development/libraries/libcyaml { };
rang = callPackage ../development/libraries/rang { }; rang = callPackage ../development/libraries/rang { };
libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: { libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: {
@ -16192,7 +16194,7 @@ in
poco = callPackage ../development/libraries/poco { }; poco = callPackage ../development/libraries/poco { };
podofo = callPackage ../development/libraries/podofo { lua5 = lua5_1; }; podofo = callPackage ../development/libraries/podofo { };
polkit = callPackage ../development/libraries/polkit { }; polkit = callPackage ../development/libraries/polkit { };
@ -17914,7 +17916,8 @@ in
inherit (callPackages ../servers/mpd { }) inherit (callPackages ../servers/mpd { })
mpd mpd-small mpdWithFeatures; mpd mpd-small mpdWithFeatures;
mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { }; mpd_clientlib = libmpdclient;
libmpdclient = callPackage ../servers/mpd/libmpdclient.nix { };
mpdscribble = callPackage ../tools/misc/mpdscribble { }; mpdscribble = callPackage ../tools/misc/mpdscribble { };
@ -18271,6 +18274,7 @@ in
prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { }; prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { };
prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { }; prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { };
prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { }; prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { };
prometheus-flow-exporter = callPackage ../servers/monitoring/prometheus/flow-exporter.nix { };
prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { }; prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { };
prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { }; prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { };
prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { };
@ -22790,6 +22794,8 @@ in
waybar = callPackage ../applications/misc/waybar {}; waybar = callPackage ../applications/misc/waybar {};
wbg = callPackage ../applications/misc/wbg { };
hikari = callPackage ../applications/window-managers/hikari { }; hikari = callPackage ../applications/window-managers/hikari { };
i3 = callPackage ../applications/window-managers/i3 { i3 = callPackage ../applications/window-managers/i3 {
@ -23849,6 +23855,8 @@ in
i3GapsSupport = false; i3GapsSupport = false;
}; };
yambar = callPackage ../applications/misc/yambar { };
polyphone = libsForQt514.callPackage ../applications/audio/polyphone { }; polyphone = libsForQt514.callPackage ../applications/audio/polyphone { };
portfolio = callPackage ../applications/office/portfolio { portfolio = callPackage ../applications/office/portfolio {
@ -24340,6 +24348,8 @@ in
pistol = callPackage ../tools/misc/pistol { }; pistol = callPackage ../tools/misc/pistol { };
piston-cli = callPackage ../tools/misc/piston-cli { };
plater = libsForQt5.callPackage ../applications/misc/plater { }; plater = libsForQt5.callPackage ../applications/misc/plater { };
plexamp = callPackage ../applications/audio/plexamp { }; plexamp = callPackage ../applications/audio/plexamp { };
@ -25112,6 +25122,8 @@ in
tabula = callPackage ../applications/misc/tabula { }; tabula = callPackage ../applications/misc/tabula { };
tabula-java = callPackage ../applications/misc/tabula-java { };
tasknc = callPackage ../applications/misc/tasknc { }; tasknc = callPackage ../applications/misc/tasknc { };
taskwarrior = callPackage ../applications/misc/taskwarrior { }; taskwarrior = callPackage ../applications/misc/taskwarrior { };

View file

@ -5671,6 +5671,8 @@ in {
py-multibase = callPackage ../development/python-modules/py-multibase { }; py-multibase = callPackage ../development/python-modules/py-multibase { };
py-multicodec = callPackage ../development/python-modules/py-multicodec { };
py-multihash = callPackage ../development/python-modules/py-multihash { }; py-multihash = callPackage ../development/python-modules/py-multihash { };
pymumble = callPackage ../development/python-modules/pymumble { }; pymumble = callPackage ../development/python-modules/pymumble { };