Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
e064950cb7
|
|
@ -1,5 +1,3 @@
|
|||
{ pkgs ? import ../. {} }:
|
||||
(import ./default.nix {}).overrideAttrs (x: {
|
||||
buildInputs = x.buildInputs ++ [ pkgs.xmloscopy pkgs.ruby ];
|
||||
|
||||
})
|
||||
{ pkgs ? import ../. { } }:
|
||||
(import ./default.nix { }).overrideAttrs
|
||||
(x: { buildInputs = (x.buildInputs or [ ]) ++ [ pkgs.xmloscopy pkgs.ruby ]; })
|
||||
|
|
|
|||
|
|
@ -5144,6 +5144,12 @@
|
|||
githubId = 480920;
|
||||
name = "Luca Bruno";
|
||||
};
|
||||
leungbk = {
|
||||
email = "leungbk@mailfence.com";
|
||||
github = "leungbk";
|
||||
githubId = 29217594;
|
||||
name = "Brian Leung";
|
||||
};
|
||||
lewo = {
|
||||
email = "lewo@abesis.fr";
|
||||
github = "nlewo";
|
||||
|
|
|
|||
|
|
@ -19,23 +19,9 @@ in
|
|||
nitrokey-app package, depending on your device and needs.
|
||||
'';
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
type = types.str;
|
||||
default = "nitrokey";
|
||||
example = "wheel";
|
||||
description = ''
|
||||
Grant access to Nitrokey devices to users in this group.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.udev.packages = [
|
||||
(pkgs.nitrokey-udev-rules.override (attrs:
|
||||
{ inherit (cfg) group; }
|
||||
))
|
||||
];
|
||||
users.groups.${cfg.group} = {};
|
||||
services.udev.packages = [ pkgs.nitrokey-udev-rules ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "jamulus";
|
||||
version = "3.6.1";
|
||||
version = "3.6.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "corrados";
|
||||
repo = "jamulus";
|
||||
rev = "r${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
sha256 = "11rwgd2car7ziqa0vancb363m4ca94pj480jfxywd6d81139jl15";
|
||||
sha256 = "sha256-b187Q8KXcU32C2hGFqs6R2CqWgmieq6ewQDx+elEgP4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ fetchurl, stdenv, emacs, python }:
|
||||
{ lib, fetchurl, stdenv, emacs, python }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cedet-1.1";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchgit }:
|
||||
{ lib, stdenv, fetchgit }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ess-R-object-popup-20130302";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchgit }:
|
||||
{ lib, stdenv, fetchgit }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "helm-words-20190917";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, emacs }:
|
||||
{ lib, stdenv, fetchurl, emacs }:
|
||||
|
||||
# this package installs the emacs-mode which
|
||||
# resides in the hsc3 sources.
|
||||
|
|
|
|||
|
|
@ -341,6 +341,7 @@ let
|
|||
# Telega has a server portion for it's network protocol
|
||||
telega = super.telega.overrideAttrs (old: {
|
||||
buildInputs = old.buildInputs ++ [ pkgs.tdlib ];
|
||||
nativeBuildInputs = [ external.pkg-config ];
|
||||
|
||||
postBuild = ''
|
||||
cd source/server
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchurl, emacs}:
|
||||
{ lib, stdenv, fetchurl, emacs }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "org-mac-link-1.2";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchurl}:
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "perl-completion";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl }:
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "prolog-mode";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchgit }:
|
||||
{ lib, stdenv, fetchgit }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "railgun-2012-10-17";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchurl, emacs}:
|
||||
{ lib, stdenv, fetchurl, emacs }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "rect-mark-1.4";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchgit, emacs}:
|
||||
{ lib, stdenv, fetchgit, emacs }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "sunrise-commander-6r435";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, emacs, texinfo }:
|
||||
{ lib, stdenv, fetchurl, emacs, texinfo }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tramp-2.4.2";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, emacs }:
|
||||
{ lib, stdenv, fetchurl, emacs }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "zeitgeist-20120221";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchgit, lua5_3 }:
|
||||
{ lib, stdenv, fetchgit, lua5_3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "quickscope-kak";
|
||||
|
|
|
|||
|
|
@ -1,37 +1,47 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
, ncurses }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, ncurses
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "tecoc-git";
|
||||
version = "20150606";
|
||||
pname = "tecoc";
|
||||
version = "unstable-2020-11-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blakemcbride";
|
||||
repo = "TECOC";
|
||||
rev = "d7dffdeb1dfb812e579d6d3b518545b23e1b50cb";
|
||||
sha256 = "11zfa73dlx71c0hmjz5n3wqcvk6082rpb4sss877nfiayisc0njj";
|
||||
rev = "79fcb6cfd6c5f9759f6ec46aeaf86d5806b13a0b";
|
||||
sha256 = "sha256-JooLvoh9CxLHLOXXxE7zA7R9yglr9BGUwX4nrw2/vIw=";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
makefile = if stdenv.hostPlatform.isDarwin
|
||||
then "makefile.osx"
|
||||
else if stdenv.hostPlatform.isFreeBSD
|
||||
then "makefile.bsd"
|
||||
else if stdenv.hostPlatform.isOpenBSD
|
||||
then "makefile.bsd"
|
||||
else if stdenv.hostPlatform.isWindows
|
||||
then "makefile.win"
|
||||
else "makefile.linux"; # I think Linux is a safe default...
|
||||
then "makefile.osx"
|
||||
else if stdenv.hostPlatform.isFreeBSD
|
||||
then "makefile.bsd"
|
||||
else if stdenv.hostPlatform.isOpenBSD
|
||||
then "makefile.bsd"
|
||||
else if stdenv.hostPlatform.isWindows
|
||||
then "makefile.win"
|
||||
else "makefile.linux"; # I think Linux is a safe default...
|
||||
|
||||
makeFlags = [ "CC=${stdenv.cc}/bin/cc" "-C src/" ];
|
||||
|
||||
preInstall = ''
|
||||
install -d $out/bin $out/share/doc/${pname}-${version} $out/lib/teco/macros
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/share/doc/${pname}-${version} $out/lib/teco/macros
|
||||
cp src/tecoc $out/bin
|
||||
cp src/aaout.txt doc/* $out/share/doc/${pname}-${version}
|
||||
cp lib/* lib2/* $out/lib/teco/macros
|
||||
runHook preInstall
|
||||
install -m755 src/tecoc $out/bin
|
||||
install -m644 src/aaout.txt doc/* $out/share/doc/${pname}-${version}
|
||||
install -m644 lib/* lib2/* $out/lib/teco/macros
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
(cd $out/bin
|
||||
ln -s tecoc Make
|
||||
ln -s tecoc mung
|
||||
|
|
@ -54,9 +64,11 @@ stdenv.mkDerivation rec {
|
|||
of Editor MACroS for TECO.
|
||||
|
||||
TECOC is a portable C implementation of TECO-11.
|
||||
'';
|
||||
'';
|
||||
homepage = "https://github.com/blakemcbride/TECOC";
|
||||
license = { url = "https://github.com/blakemcbride/TECOC/tree/master/doc/readme-1st.txt"; };
|
||||
license = {
|
||||
url = "https://github.com/blakemcbride/TECOC/tree/master/doc/readme-1st.txt";
|
||||
};
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
|
|
|||
48
pkgs/applications/graphics/pikopixel/default.nix
Normal file
48
pkgs/applications/graphics/pikopixel/default.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{ lib
|
||||
, fetchurl
|
||||
, gnustep
|
||||
, gcc
|
||||
, llvmPackages_9
|
||||
}:
|
||||
|
||||
let
|
||||
# Earlier llvm than 9 segfaults
|
||||
gnustep' = gnustep.override { llvmPackages = llvmPackages_9; };
|
||||
|
||||
in gnustep'.gsmakeDerivation rec {
|
||||
pname = "pikopixel";
|
||||
version = "1.0-b9e";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://twilightedge.com/downloads/PikoPixel.Sources.${version}.tar.gz";
|
||||
sha256 = "1gmgb5ch7s6fwvg85l6pl6fsx0maqwd8yvg7sz3r9lj32g2pz5wn";
|
||||
};
|
||||
|
||||
sourceRoot = "PikoPixel.Sources.${version}/PikoPixel";
|
||||
|
||||
buildInputs = [
|
||||
gnustep'.base
|
||||
gnustep'.gui
|
||||
gnustep'.back
|
||||
];
|
||||
|
||||
# Fix the Exec and Icon paths in the .desktop file, and save the file in the
|
||||
# correct place.
|
||||
# postInstall gets redefined in gnustep.make's builder.sh, so we use preFixup
|
||||
preFixup = ''
|
||||
mkdir -p $out/share/applications
|
||||
sed \
|
||||
-e "s@^Exec=.*\$@Exec=$out/bin/PikoPixel %F@" \
|
||||
-e "s@^Icon=.*/local@Icon=$out@" \
|
||||
PikoPixel.app/Resources/PikoPixel.desktop > $out/share/applications/PikoPixel.desktop
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Application for drawing and editing pixel-art images";
|
||||
homepage = "http://twilightedge.com/mac/pikopixel/";
|
||||
downloadPage = "http://twilightedge.com/mac/pikopixel/";
|
||||
license = licenses.agpl3;
|
||||
maintainers = with maintainers; [ fgaz ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "heimer";
|
||||
version = "2.0.0";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juzzlin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0lxypgwgl64d4sw9kn0ncyik3whpq8iif0sbvi4r5kasx6wgs4qz";
|
||||
sha256 = "sha256-upsOmf46bCO8sVp5dBHPLUBZYZP3JyXa7H5KXbd76qo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "k4dirstat";
|
||||
version = "3.2.1";
|
||||
version = "3.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jeromerobert";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "15xjb80jq6vhzvzx4l341f40d8a23w1334qh6cczqm9adfnzycp7";
|
||||
sha256 = "sha256-U5p/gW5GPxRoM9XknP8G7iVhLDoqmvgspeRsmCRdxDg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kanboard";
|
||||
version = "1.2.16";
|
||||
version = "1.2.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kanboard";
|
||||
repo = "kanboard";
|
||||
rev = "v${version}";
|
||||
sha256 = "1nps7xcw1gp7kfdp13wyj2sprc8hn5iamdb0xj4202qygpzm63wq";
|
||||
sha256 = "sha256-raXPRoydd3CfciF7S0cZiuY7EPFKfE8IU3qj2dOztHU=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "helmfile";
|
||||
version = "0.135.0";
|
||||
version = "0.137.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "roboll";
|
||||
repo = "helmfile";
|
||||
rev = "v${version}";
|
||||
sha256 = "1ky9mh5n6n84g77ax1dn1cisgxjwyrhnapaikyj4q53zcbyai3ng";
|
||||
sha256 = "sha256-HrVQS09lllUC4HClWahMV72j2TiQnzEUkV16YKm6984=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0dycngvk4nymcrkn6pn2q2h2zfvhc69m1zs2pspl58sa0mkakk2p";
|
||||
vendorSha256 = "sha256-dL36mcYCs92USf18BMB6vXd+qLsk2BYmAEm1bwx+o5k=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "helmsman";
|
||||
version = "3.6.2";
|
||||
version = "3.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Praqma";
|
||||
repo = "helmsman";
|
||||
rev = "v${version}";
|
||||
sha256 = "0a9f6745f17sws7fyhz0d8wnriv69d6nrci9j5nhysnzg97ky1np";
|
||||
sha256 = "sha256-CvepOpAI40eTS5p5gjtbzahn0tX/z4CId1DDqlaMSMw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "04csmw5zpansb30amr3i6vlwxc3z38q4g69cklh44cr37glm04sm";
|
||||
vendorSha256 = "sha256-VRNQ6TsjM0IgnSyZRzAaf7DO6TZx5KrAWNqq+wuvmhE=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "istioctl";
|
||||
version = "1.8.1";
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "istio";
|
||||
repo = "istio";
|
||||
rev = version;
|
||||
sha256 = "1m97hszmw0hfzj3jvd1is7fa3mpqkm7jbq3ik337rb9yq1f0gasv";
|
||||
sha256 = "sha256-9mQYJvZU/Ra+LyzfDbWGfopkdGBD7DpS9/yvRvGHDKg=";
|
||||
};
|
||||
vendorSha256 = "0ividxxmil69vpvyjlgyzb2jzipmh9rpvk19kv7266d29ky3q7s6";
|
||||
vendorSha256 = "sha256-7LQY32hNXLxg/IUBbzzgb67yrbPGLCTNtmNvjE9tUno=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "jx";
|
||||
version = "2.1.149";
|
||||
version = "2.1.155";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jenkins-x";
|
||||
repo = "jx";
|
||||
rev = "v${version}";
|
||||
sha256 = "0jgny09wpfab8mkxkhv9swp1baqx3lxsx75a5i78cypkj6xadc69";
|
||||
sha256 = "sha256-kwcmZSOA26XuSgNSHitGaMohalnLobabXf4z3ybSJtk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1fswrf14nwjm0z8qqgdx236w7w1m451lyfinhx9pyp89fw2h5mv6";
|
||||
vendorSha256 = "sha256-ZtcCBXcJXX9ThzY6T0MhNfDDzRC9PYzRB1VyS4LLXLs=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, lib, fetchFromGitHub, appstream-glib, desktop-file-utils, gdk-pixbuf
|
||||
, gettext, gjs, glib, gobject-introspection, gsettings-desktop-schemas, gtk3
|
||||
, hicolor-icon-theme, meson, ninja, pkgconfig, python3, webkitgtk, wrapGAppsHook
|
||||
, hicolor-icon-theme, meson, ninja, pkg-config, python3, webkitgtk, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
hicolor-icon-theme
|
||||
meson
|
||||
ninja
|
||||
pkgconfig
|
||||
pkg-config
|
||||
python3
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jmeter";
|
||||
version = "5.1.1";
|
||||
version = "5.4";
|
||||
src = fetchurl {
|
||||
url = "https://archive.apache.org/dist/jmeter/binaries/apache-${pname}-${version}.tgz";
|
||||
sha256 = "1bmlxnlcias781mwf3wzpd4935awswbq3w8ijck65bsaw07m2kc4";
|
||||
sha256 = "1hbyvh0hrvfvrsf7wpnwqsry5gaziac632s0bwb5zbq6y5b0z41a";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper jre ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
wrapProgram $out/bin/jmeter.sh --set JAVA_HOME "${jre}"
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
doInstallCheck = false; #NoClassDefFoundError: org/apache/logging/log4j/Level for tests
|
||||
|
||||
checkInputs = [ coreutils ];
|
||||
|
||||
|
|
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
|||
Applications but has since expanded to other test functions.
|
||||
'';
|
||||
license = licenses.asl20;
|
||||
maintainers = [ ];
|
||||
maintainers = [ maintainers.bryanasdev000 ];
|
||||
priority = 1;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.12.c.5";
|
||||
version = "2.13.c.1";
|
||||
pname = "i3lock-color";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PandorasFox";
|
||||
repo = "i3lock-color";
|
||||
rev = version;
|
||||
sha256 = "10h50a6p9ivqjz8hd5pn9l03vz6y9dxdx68bprqssfzdkzqnzaiv";
|
||||
sha256 = "sha256-E+ejc26eyCJ0PnMpDgQrouaBIaUH0SWlzB08fQs8lDw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -172,7 +172,9 @@ in stdenv.mkDerivation (fBuildAttrs // {
|
|||
|
||||
chmod -R +w $bazelOut
|
||||
find $bazelOut -type l | while read symlink; do
|
||||
ln -sf $(readlink "$symlink" | sed "s,NIX_BUILD_TOP,$NIX_BUILD_TOP,") "$symlink"
|
||||
if [[ $(readlink "$symlink") == *NIX_BUILD_TOP* ]]; then
|
||||
ln -sf $(readlink "$symlink" | sed "s,NIX_BUILD_TOP,$NIX_BUILD_TOP,") "$symlink"
|
||||
fi
|
||||
done
|
||||
'' + fBuildAttrs.preConfigure or "";
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evisum";
|
||||
version = "0.5.8";
|
||||
version = "0.5.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0cg4vqd069h89k3wrvl550p29y3yzbdnvii58gwc8rghwym621jx";
|
||||
sha256 = "sha256-ao5b4Mhr+fhY19X1g0gupcU8LayR55/kgHSwhGUAfys=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,21 +1,22 @@
|
|||
{ pkgs, newScope, llvmPackages_6 }:
|
||||
{ newScope
|
||||
, llvmPackages
|
||||
, giflib_4_1
|
||||
}:
|
||||
|
||||
let
|
||||
callPackage = newScope self;
|
||||
|
||||
self = rec {
|
||||
stdenv = pkgs.clangStdenv;
|
||||
stdenv = llvmPackages.stdenv;
|
||||
|
||||
gsmakeDerivation = callPackage ./make/gsmakeDerivation.nix {};
|
||||
gorm = callPackage ./gorm {};
|
||||
projectcenter = callPackage ./projectcenter {};
|
||||
system_preferences = callPackage ./systempreferences {};
|
||||
libobjc = callPackage ./libobjc2 {
|
||||
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
|
||||
};
|
||||
libobjc = callPackage ./libobjc2 {};
|
||||
make = callPackage ./make {};
|
||||
back = callPackage ./back {};
|
||||
base = callPackage ./base { giflib = pkgs.giflib_4_1; };
|
||||
base = callPackage ./base { giflib = giflib_4_1; };
|
||||
gui = callPackage ./gui {};
|
||||
gworkspace = callPackage ./gworkspace {};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
let
|
||||
|
||||
version = "3.0";
|
||||
version = "3.1";
|
||||
|
||||
fullMaude = fetchurl {
|
||||
url = "http://maude.cs.illinois.edu/w/images/0/04/Full-Maude-${version}.zip";
|
||||
sha256 = "0gf36wlkkl343vlxgryqdhxmgyn8z0cc2zayccd7ac3inmj1iayw";
|
||||
url = "http://maude.cs.illinois.edu/w/images/0/0a/Full-Maude-${version}.zip";
|
||||
sha256 = "8b13af02c6243116c2ef9592622ecaa06d05dbe1dd6b1e595551ff33855948f2";
|
||||
};
|
||||
|
||||
in
|
||||
|
|
@ -18,8 +18,8 @@ stdenv.mkDerivation {
|
|||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://maude.cs.illinois.edu/w/images/9/92/Maude-${version}.tar.gz";
|
||||
sha256 = "0vhn3lsck6ji9skrgm67hqrn3k4f6y442q73jbw65qqznm321k5a";
|
||||
url = "http://maude.cs.illinois.edu/w/images/d/d3/Maude-${version}.tar.gz";
|
||||
sha256 = "b112d7843f65217e3b5a9d40461698ef8dab7cbbe830af21216dfb924dc88a2f";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -43,7 +43,7 @@ stdenv.mkDerivation {
|
|||
postInstall = ''
|
||||
for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done
|
||||
unzip ${fullMaude}
|
||||
install -D -m 444 full-maude3.maude $out/share/maude/full-maude.maude
|
||||
install -D -m 444 full-maude31.maude $out/share/maude/full-maude.maude
|
||||
'';
|
||||
|
||||
# bison -dv surface.yy -o surface.c
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "alkimia";
|
||||
version = "8.0.2";
|
||||
version = "8.0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/alkimia/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0al5k9irmg9gsjc234qxjsqfzgzsavl18pspqk78mkp8zlv7fvv1";
|
||||
sha256 = "sha256-AASnBo3/CqLLb0f3DSHBKQc74R8u2yHxRRK8RHBIfR8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-common";
|
||||
version = "0.4.63";
|
||||
version = "0.4.64";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "16bc6fn1gq3nqcrzgpi2kjphq7xkkr73aljakrg89ysm6hyzyim9";
|
||||
sha256 = "sha256-izEZMOPHj/9EL78b/t3M0Tki6eA8eRrpG7DO2tkpf1A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-io";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0wagc1205r57llqd39wqjasq3bgc8h1mfdqk4r5lcrnn4jbpcill";
|
||||
sha256 = "sha256-dDvq5clOUaPR7lOCJ/1g0lrCzVOmzwCnqHrBZfBewO4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-sdk-cpp";
|
||||
version = "1.8.113";
|
||||
version = "1.8.121";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-sdk-cpp";
|
||||
rev = version;
|
||||
sha256 = "0y784cjrxgrin3ck5f2lk0riyy9kv928kcb9y0gzka65imgma48c";
|
||||
sha256 = "sha256-uita3HPcerxH/bnSIL3ZNUp68QXtKJLYi0pcnV7OBkQ=";
|
||||
};
|
||||
|
||||
# FIXME: might be nice to put different APIs in different outputs
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "babl";
|
||||
version = "0.1.82";
|
||||
version = "0.1.84";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1iddkwdfw1bmfl6n8y1d4kkm3rb15rzvrfri6a7cnx37mpa96bf6";
|
||||
sha256 = "sha256-5+OLhEH3f+udyCMctDSoYZCiHy82ksKBRX6Z016cNOo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "belcard";
|
||||
version = "4.4.13";
|
||||
version = "4.4.24";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.linphone.org";
|
||||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "16x2xp8d0a115132zhy1kpxkyj86ia7vrsnpjdg78fnbvmvysc8m";
|
||||
sha256 = "sha256-FTHtd93LOnRek9fqvI+KBkk/+53Bwy9GKCEo0NDtops=";
|
||||
};
|
||||
|
||||
buildInputs = [ bctoolbox belr ];
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtk-layer-shell";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "wmww";
|
||||
repo = "gtk-layer-shell";
|
||||
rev = "v${version}";
|
||||
sha256 = "1yfqfv3hn92cy9y5zgvz7qhq2ypill2z5857ki5snjimhjdz0cnw";
|
||||
sha256 = "sha256-516N45q5EZTq5eLCqH/T/VV/AxgBsQhJ+yZdLOEeDUk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "indilib";
|
||||
version = "1.8.7";
|
||||
version = "1.8.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "indilib";
|
||||
repo = "indi";
|
||||
rev = "v${version}";
|
||||
sha256 = "0cy9l1vpsnfilxslvmn88hhq8iw8cnx3xpbnl78c0dgjyfv5xmhz";
|
||||
sha256 = "sha256-WTRfV6f764tDGKnQVd1jeYN/qXa/VRTFK0mMalc+9aU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -273,5 +273,13 @@ let
|
|||
echo /var/lib/thelounge > $out/lib/node_modules/thelounge/.thelounge_home
|
||||
'';
|
||||
};
|
||||
|
||||
yaml-language-server = super.yaml-language-server.override {
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/yaml-language-server" \
|
||||
--prefix NODE_PATH : ${self.prettier}/lib/node_modules
|
||||
'';
|
||||
};
|
||||
};
|
||||
in self
|
||||
|
|
|
|||
45
pkgs/development/python-modules/aioflo/default.nix
Normal file
45
pkgs/development/python-modules/aioflo/default.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pytest-aiohttp
|
||||
, pytest-asyncio
|
||||
, pytest-cov
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioflo";
|
||||
version = "0.4.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1ppsinmjph6snj7s4hg28p3qa67kpkadc98ikjjg6w65vcm3dlaz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [ aiohttp ];
|
||||
|
||||
checkInputs = [
|
||||
aresponses
|
||||
pytest-aiohttp
|
||||
pytest-asyncio
|
||||
pytest-cov
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "aioflo" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for Flo by Moen Smart Water Detectors";
|
||||
homepage = "https://github.com/bachya/aioflo";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -19,5 +19,6 @@ buildPythonPackage rec {
|
|||
description = "HTTP/2 implementation with hyper-h2 on Python 3 asyncio";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.qyliss ];
|
||||
broken = true; # requires h2<4
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "csvw";
|
||||
version = "1.8.1";
|
||||
version = "1.10.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cldf";
|
||||
repo = "csvw";
|
||||
rev = "v${version}";
|
||||
sha256 = "1cafwgkspkc299shsa5x8wfzkx1d63p9rvslj9jwr68fipd1830w";
|
||||
sha256 = "0cvfzfi1a2m1xqpm34mwp9r3bhgsnfz4pmslvgn81i42n5grbnis";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
|
|
@ -0,0 +1,49 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pytest-cov
|
||||
, pytest-mock
|
||||
, requests
|
||||
, zeroconf
|
||||
, websocket_client
|
||||
, pytest-runner
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "devolo-home-control-api";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "2Fake";
|
||||
repo = "devolo_home_control_api";
|
||||
rev = "v${version}";
|
||||
sha256 = "19zzdbx0dxlm8pq0yk00nn9gqqblgpp16fgl7z6a98hsa6459zzb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytest-runner ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
zeroconf
|
||||
websocket_client
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytest-cov
|
||||
pytest-mock
|
||||
];
|
||||
|
||||
# Disable test that requires network access
|
||||
disabledTests = [ "test__on_pong" ];
|
||||
pythonImportsCheck = [ "devolo_home_control_api" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to work with devolo Home Control";
|
||||
homepage = "https://github.com/2Fake/devolo_home_control_api";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jenkins-job-builder";
|
||||
version = "3.7.0";
|
||||
version = "3.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "bca1f458206fc8be82d790685b603d4158e2034a651f2e148e31526984b9d551";
|
||||
sha256 = "sha256-uRyeRP1y3GS7tXb0kHLBi7+trJRme/Ke3xgOY+LqZ6k=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -5,23 +5,25 @@
|
|||
, python
|
||||
, python_magic
|
||||
, six
|
||||
, urllib3 }:
|
||||
, urllib3
|
||||
, pytestCheckHook
|
||||
, pytest-mock
|
||||
, aiohttp
|
||||
, gevent
|
||||
, redis
|
||||
, requests
|
||||
, sure
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mocket";
|
||||
version = "3.9.35";
|
||||
version = "3.9.39";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d822a2adfd8e028a2856785fbfe78e7dd8c7a3b623516298aef6d42a4c9149d1";
|
||||
sha256 = "1mbcgfy1vfwwzn54vkq8xmfzdyc28brfpqk4d55r3a6abwwsn6a4";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
sed -iE "s,python-magic==.*,python-magic," requirements.txt
|
||||
sed -iE "s,urllib3==.*,urllib3," requirements.txt
|
||||
substituteInPlace setup.py --replace 'setup_requires=["pipenv"]' "setup_requires=[]"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
decorator
|
||||
http-parser
|
||||
|
|
@ -30,8 +32,36 @@ buildPythonPackage rec {
|
|||
six
|
||||
] ++ lib.optionals (isPy27) [ six ];
|
||||
|
||||
# Pypi has no runtests.py, github has no requirements.txt. No way to test, no way to install.
|
||||
doCheck = false;
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytest-mock
|
||||
aiohttp
|
||||
gevent
|
||||
redis
|
||||
requests
|
||||
sure
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"--ignore=tests/main/test_pook.py" # pook is not packaged
|
||||
"--ignore=tests/main/test_redis.py" # requires a live redis instance
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
# uses IsolatedAsyncioTestCase which is only available >= 3.8
|
||||
"--ignore=tests/tests38/test_http_aiohttp.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# tests that require network access (like DNS lookups)
|
||||
"test_truesendall"
|
||||
"test_truesendall_with_chunk_recording"
|
||||
"test_truesendall_with_gzip_recording"
|
||||
"test_truesendall_with_recording"
|
||||
"test_wrongpath_truesendall"
|
||||
"test_truesendall_with_dump_from_recording"
|
||||
"test_truesendall_with_recording_https"
|
||||
"test_truesendall_after_mocket_session"
|
||||
"test_real_request_session"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "mocket" ];
|
||||
|
||||
|
|
|
|||
38
pkgs/development/python-modules/pymata-express/default.nix
Normal file
38
pkgs/development/python-modules/pymata-express/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pyserial
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymata-express";
|
||||
version = "1.19";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MrYsLab";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0gfjmqcxwsnfjgll6ql5xd1n3xp4klf4fcaajaivh053i02p0a79";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyserial ];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "pymata_express" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python Asyncio Arduino Firmata Client";
|
||||
longDescription = ''
|
||||
Pymata-Express is a Python Firmata Protocol client. When used in conjunction
|
||||
with an Arduino Firmata sketch, it permits you to control and monitor Arduino
|
||||
hardware remotely over a serial link.
|
||||
'';
|
||||
homepage = "https://mryslab.github.io/pymata-express/";
|
||||
license = with licenses; [ agpl3Plus ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,18 +5,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "samsungtvws";
|
||||
version = "1.5.3";
|
||||
version = "1.6.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "054rr8hiacdjfxqssnxnd3xp9hh8350zjzzjvh1199bpps4l1l6n";
|
||||
sha256 = "09nls4n0lbnr8nj8105lagr9h2my8lb1s2k285kmsbli36ywd8lj";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace setup.py --replace "websocket-client==" "websocket-client>="
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
websocket_client
|
||||
requests
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "segments";
|
||||
version = "2.1.3";
|
||||
version = "2.2.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cldf";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "12lnpk834r3y7hw5x7nvswa60ddh69ylvr44k46gqcfba160hhb0";
|
||||
sha256 = "04yc8q79zk09xj0wnal0vdg5azi9jlarfmf2iyljqyr80p79gwvv";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,27 +1,35 @@
|
|||
{ buildPythonPackage
|
||||
, fetchPypi
|
||||
, lib
|
||||
, stdenv
|
||||
, pythonOlder
|
||||
, isPy27
|
||||
, appdirs
|
||||
, contextlib2
|
||||
, cython
|
||||
, distlib
|
||||
, fetchPypi
|
||||
, filelock
|
||||
, fish
|
||||
, flaky
|
||||
, importlib-metadata
|
||||
, importlib-resources
|
||||
, isPy27
|
||||
, lib
|
||||
, pathlib2
|
||||
, pytest-freezegun
|
||||
, pytest-mock
|
||||
, pytest-timeout
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools_scm
|
||||
, six
|
||||
, stdenv
|
||||
, xonsh
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "virtualenv";
|
||||
version = "20.2.1";
|
||||
version = "20.3.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e0aac7525e880a429764cefd3aaaff54afb5d9f25c82627563603f5d7de5a6e5";
|
||||
sha256 = "sha256-DBEaIjaxkUIrN/6MKLjIKM7TmqtL9WJ/pcMxrv+1cNk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -47,10 +55,33 @@ buildPythonPackage rec {
|
|||
./0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch
|
||||
];
|
||||
|
||||
meta = {
|
||||
checkInputs = [
|
||||
cython
|
||||
fish
|
||||
flaky
|
||||
pytest-freezegun
|
||||
pytest-mock
|
||||
pytest-timeout
|
||||
pytestCheckHook
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
xonsh
|
||||
];
|
||||
|
||||
preCheck = "export HOME=$(mktemp -d)";
|
||||
|
||||
# Ignore tests which requires network access
|
||||
pytestFlagsArray = [
|
||||
"--ignore tests/unit/create/test_creator.py"
|
||||
"--ignore tests/unit/seed/embed/test_bootstrap_link_via_app_data.py"
|
||||
];
|
||||
|
||||
disabledTests = [ "test_can_build_c_extensions" ];
|
||||
pythonImportsCheck = [ "virtualenv" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to create isolated Python environments";
|
||||
homepage = "http://www.virtualenv.org";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ goibhniu ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ goibhniu ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, coreutils, git, gnused, nix, nixfmt }:
|
||||
|
||||
let
|
||||
version = "2.0.8";
|
||||
version = "2.0.9";
|
||||
|
||||
zshCompletion = fetchurl {
|
||||
url =
|
||||
|
|
@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
|
|||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/coursier/coursier/releases/download/v${version}/coursier";
|
||||
sha256 = "sha256-7dNJUMZu6YY3076cnjWHRisJZVn1NPRH1VC+cJjfI/8=";
|
||||
sha256 = "sha256-jqSv9VBLotl6YVWgWNznvTThRIiMUStQ0WbN6u01b1c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
with lib;
|
||||
let
|
||||
pVersion = "1.10.0.20200225";
|
||||
pVersion = "1.11.0.20201202";
|
||||
pVersionTriple = splitVersion pVersion;
|
||||
majorVersion = elemAt pVersionTriple 0;
|
||||
minorVersion = elemAt pVersionTriple 1;
|
||||
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.halifax.rwth-aachen.de/eclipse//mat/${baseVersion}/rcp/MemoryAnalyzer-${version}-linux.gtk.x86_64.zip";
|
||||
sha256 = "11cg01gjjvlm6lr6z6rwqs1r31xx5pxddnz55ca0s33lrnywf9fx";
|
||||
sha256 = "sha256-HtIKcGfdjb2wovGGSxv16ud7y1cPQFBn77pkhiekAkI=";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "halfempty";
|
||||
version = "0.30";
|
||||
version = "0.40";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googleprojectzero";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0838pw0ccjvlxmjygzrnppz1fx1a10vjzdgjbxgb4wgpqjr8v6vc";
|
||||
sha256 = "sha256-YGq6fneAMo2jCpLPrjzRJ0eeOsStKaK5L+lwQfqcfpY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config util-linux ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, ocaml, findlib, fetchpatch }:
|
||||
{ stdenv, fetchurl, ocaml, findlib }:
|
||||
|
||||
if stdenv.lib.versionOlder ocaml.version "4.08"
|
||||
then throw "dune is not available for OCaml ${ocaml.version}"
|
||||
|
|
@ -6,25 +6,17 @@ else
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dune";
|
||||
version = "2.7.1";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
|
||||
sha256 = "0pcjf209gynjwipnpplaqyvyivnawqiwhvqnivhkybisicpqyln3";
|
||||
sha256 = "12yly2lp93ijhy7b72p6y2q3cr3yy3hk7rlmrh072py8a6d4s407";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib ];
|
||||
|
||||
buildFlags = "release";
|
||||
|
||||
patches = [
|
||||
# Fix setup.ml configure path. Remove with the next release.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ocaml/dune/commit/8a3d7f2f2015b71384caa07226d1a89dba9d6c25.patch";
|
||||
sha256 = "0dw4q10030h9xcdlxw2vp7qm0hd2qpkb98rir5d55m9vn65w8j28";
|
||||
})
|
||||
];
|
||||
|
||||
dontAddPrefix = true;
|
||||
|
||||
installFlags = [ "PREFIX=${placeholder "out"}" "LIBDIR=$(OCAMLFIND_DESTDIR)" ];
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
{
|
||||
rust-analyzer-unwrapped = callPackage ./generic.nix rec {
|
||||
rev = "2021-01-04";
|
||||
rev = "2021-01-18";
|
||||
version = "unstable-${rev}";
|
||||
sha256 = "sha256-VRnmx5SfmdMIVQjixWBSaMioqFUlo9VOIKsPvC5t3t4=";
|
||||
cargoSha256 = "sha256-X63FjFpfwjvQayw4X6Sqfyh4FHsc3flE3OtQpzqowjc=";
|
||||
sha256 = "sha256-eFiZdFBJZuBfwH8tqZTayNaWiq8fWUzlzBRRvdPbmW8=";
|
||||
cargoSha256 = "sha256-rRoo0TrXa03okJ8wktzVSAn8tRO1d9kcDprotZ1hZ6w=";
|
||||
};
|
||||
|
||||
rust-analyzer = callPackage ./wrapper.nix {} {
|
||||
|
|
|
|||
|
|
@ -88,11 +88,11 @@ in
|
|||
stdenv.mkDerivation rec {
|
||||
pname = "minecraft-launcher";
|
||||
|
||||
version = "2.2.909";
|
||||
version = "2.2.1262";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz";
|
||||
sha256 = "15x2imr8c4m2bjfs9y1l34fpvixxdf09gqls4bqb4rdvj1vhdrh2";
|
||||
sha256 = "09fklcnqmpvwykbfwg4lgwl82khr2wimvgyz7ssficm802xkicnc";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
|
|
|
|||
44
pkgs/misc/cups/drivers/carps-cups/default.nix
Normal file
44
pkgs/misc/cups/drivers/carps-cups/default.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cups
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "carps-cups";
|
||||
version = "unstable-2018-03-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ondrej-zary";
|
||||
repo = "carps-cups";
|
||||
rev = "18d80d1d6f473dd9132e4b6d8b5c592c74982f17";
|
||||
sha256 = "0mjj9hs5lqxi0qamgb4sxfz4fvf7ggi66bxd37bkz3fl0g9xff70";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
export CUPS_DATADIR="${cups}/share/cups"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
CUPSDIR="$out/lib/cups"
|
||||
CUPSDATADIR="$out/share/cups"
|
||||
|
||||
mkdir -p "$CUPSDIR/filter" "$CUPSDATADIR/drv" "$CUPSDATADIR/usb"
|
||||
|
||||
install -s rastertocarps $CUPSDIR/filter
|
||||
install -m 644 carps.drv $CUPSDATADIR/drv/
|
||||
install -m 644 carps.usb-quirks $CUPSDATADIR/usb/
|
||||
'';
|
||||
|
||||
buildInputs = [ cups ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "CUPS Linux drivers for Canon printers";
|
||||
homepage = "https://www.canon.com/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [
|
||||
ewok
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -461,12 +461,12 @@ let
|
|||
|
||||
coc-explorer = buildVimPluginFrom2Nix {
|
||||
pname = "coc-explorer";
|
||||
version = "2021-01-16";
|
||||
version = "2021-01-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "weirongxu";
|
||||
repo = "coc-explorer";
|
||||
rev = "2dc88ca328de4e00b37586aaf532b2cd90b5c3a0";
|
||||
sha256 = "0zjryprw2qdshshw7f8dkk7jf515sq11gc1w0lvssimkqdi47zaj";
|
||||
rev = "272d783f338107426cf75fa48b6f0a30860a8ac4";
|
||||
sha256 = "07dyy8v0j07w6gi89p08l0vcc0ba6d3qnz4wpsfj4hzf6cgifsw4";
|
||||
};
|
||||
meta.homepage = "https://github.com/weirongxu/coc-explorer/";
|
||||
};
|
||||
|
|
@ -521,12 +521,12 @@ let
|
|||
|
||||
coc-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "coc-nvim";
|
||||
version = "2021-01-15";
|
||||
version = "2021-01-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neoclide";
|
||||
repo = "coc.nvim";
|
||||
rev = "a150d49a46ea85b4c78813e6ba0fcf9a2b0d86ea";
|
||||
sha256 = "067fhgvfnrvzw67hyag0fxv61m1fbl8160klgy5l0kjy7nx6hwiw";
|
||||
rev = "a9b682ad79cc4b7b836fc7e31f7d01ecd88d7c51";
|
||||
sha256 = "1gpz1d6cy4pmaqzgp5bq8dndpzq9qiwq0794vgi58hnk65sbjai9";
|
||||
};
|
||||
meta.homepage = "https://github.com/neoclide/coc.nvim/";
|
||||
};
|
||||
|
|
@ -594,12 +594,12 @@ let
|
|||
|
||||
completion-buffers = buildVimPluginFrom2Nix {
|
||||
pname = "completion-buffers";
|
||||
version = "2020-09-26";
|
||||
version = "2021-01-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "steelsojka";
|
||||
repo = "completion-buffers";
|
||||
rev = "441a58b77c04409e8ccb35fd4970598ae551462f";
|
||||
sha256 = "14q5n7h5kaqf71cfd9mlhwb0xsihm6d3kizrxhlfnzxk6zkn8p0s";
|
||||
rev = "c36871b2a44b59761387f4972c617b44dcec5e75";
|
||||
sha256 = "14rxmy3cjrl7lr4yvrk7nkhc5h8rlpj7xjixzgr0vmnbsl885kyh";
|
||||
};
|
||||
meta.homepage = "https://github.com/steelsojka/completion-buffers/";
|
||||
};
|
||||
|
|
@ -690,12 +690,12 @@ let
|
|||
|
||||
Coqtail = buildVimPluginFrom2Nix {
|
||||
pname = "Coqtail";
|
||||
version = "2021-01-15";
|
||||
version = "2021-01-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "whonore";
|
||||
repo = "Coqtail";
|
||||
rev = "50c34a24bb6638fdf8f604f75cd036ec5252864d";
|
||||
sha256 = "1b5cs4yznz8vcmba6vk67kpd6071cz1m5jbfjpvyinvld5ipnapn";
|
||||
rev = "c58071ff5ad86baad107f43737c64a18b574cd3a";
|
||||
sha256 = "1pbkvxcwzvyy47bfv1r1ldzcf0qqkbbx2bq4jl93di5bg7kl57qb";
|
||||
};
|
||||
meta.homepage = "https://github.com/whonore/Coqtail/";
|
||||
};
|
||||
|
|
@ -894,12 +894,12 @@ let
|
|||
|
||||
deol-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "deol-nvim";
|
||||
version = "2021-01-14";
|
||||
version = "2021-01-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shougo";
|
||||
repo = "deol.nvim";
|
||||
rev = "f1bf4b1dc68d441936019f97a2f306327c52f5c4";
|
||||
sha256 = "0gd23blp723gybzp0g466kkf3rf9d0bd2zs76hadmw7w7992im2z";
|
||||
rev = "bd8d4d03d81d03db13d4b6eeb40c8a5c422c3ce6";
|
||||
sha256 = "19kk5mpisbil3jarl93sjq97jxb29sxbw5s2zsh1gih6dfp659d5";
|
||||
};
|
||||
meta.homepage = "https://github.com/Shougo/deol.nvim/";
|
||||
};
|
||||
|
|
@ -1030,12 +1030,12 @@ let
|
|||
pname = "deoplete-lsp";
|
||||
version = "2020-12-26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shougo";
|
||||
owner = "deoplete-plugins";
|
||||
repo = "deoplete-lsp";
|
||||
rev = "760eb2f647a518144ca1dc1091cc449c0dbee71e";
|
||||
sha256 = "0dcq79xqfb5qnjinwni0bi3vn2sfsri8wmc75wgvw2114vyf2k9a";
|
||||
};
|
||||
meta.homepage = "https://github.com/Shougo/deoplete-lsp/";
|
||||
meta.homepage = "https://github.com/deoplete-plugins/deoplete-lsp/";
|
||||
};
|
||||
|
||||
deoplete-notmuch = buildVimPluginFrom2Nix {
|
||||
|
|
@ -1475,12 +1475,12 @@ let
|
|||
|
||||
galaxyline-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "galaxyline-nvim";
|
||||
version = "2020-12-14";
|
||||
version = "2021-01-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "glepnir";
|
||||
repo = "galaxyline.nvim";
|
||||
rev = "528bb65b00f9ef5081cb524638b3337c4e5f26b5";
|
||||
sha256 = "069ksz4nfhlr5zlkpawh1yak4yk3vc2cd9mgy5f0r6in3wh0iypc";
|
||||
rev = "64d6b8e31459057ba4f9b03a977fce0d2cc3d748";
|
||||
sha256 = "1w5cggvxvmnm3zparnsgb3iz1pkw7d8bwvflcxaxg4pilgsniqsa";
|
||||
};
|
||||
meta.homepage = "https://github.com/glepnir/galaxyline.nvim/";
|
||||
};
|
||||
|
|
@ -1557,6 +1557,18 @@ let
|
|||
meta.homepage = "https://github.com/vim-scripts/gitignore.vim/";
|
||||
};
|
||||
|
||||
gitsigns-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "gitsigns-nvim";
|
||||
version = "2021-19-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lewis6991";
|
||||
repo = "gitsigns.nvim";
|
||||
rev = "4440a0f716b76132f365f5ef5c7f7cdad4b7c98c";
|
||||
sha256 = "19hyqga7xj3dc7p629gih80c72a04z1my8qav37myz0jq3bllg2v";
|
||||
};
|
||||
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim";
|
||||
};
|
||||
|
||||
gitv = buildVimPluginFrom2Nix {
|
||||
pname = "gitv";
|
||||
version = "2019-08-22";
|
||||
|
|
@ -1631,12 +1643,12 @@ let
|
|||
|
||||
gruvbox-community = buildVimPluginFrom2Nix {
|
||||
pname = "gruvbox-community";
|
||||
version = "2020-11-13";
|
||||
version = "2021-01-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruvbox-community";
|
||||
repo = "gruvbox";
|
||||
rev = "2636a0344d3fbacc62d9d914a456fcfdba8ca4cb";
|
||||
sha256 = "1w9j97g3dzadwnqyal1zw12ia61b512hz8mhywqy5xq6v9f6zkw6";
|
||||
rev = "c73e63203f76ab8e39b2b05369c0a8877a981435";
|
||||
sha256 = "0lwvv5chxq0fb9k1y73g5zr8v54xghlqnq64k0vx2v2ravp3313r";
|
||||
};
|
||||
meta.homepage = "https://github.com/gruvbox-community/gruvbox/";
|
||||
};
|
||||
|
|
@ -1667,12 +1679,12 @@ let
|
|||
|
||||
haskell-vim = buildVimPluginFrom2Nix {
|
||||
pname = "haskell-vim";
|
||||
version = "2018-05-22";
|
||||
version = "2021-01-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovimhaskell";
|
||||
repo = "haskell-vim";
|
||||
rev = "b1ac46807835423c4a4dd063df6d5b613d89c731";
|
||||
sha256 = "1vqj3r2v8skffywwgv4093ww7fm540437j5qz7n8q8787bs5w0br";
|
||||
rev = "f35d02204b4813d1dbe8b0e98cc39701a4b8e15e";
|
||||
sha256 = "1q3hf0vr5gpmymmvm208sl0r8nb69m7f3bdrkqrp7fwc2v1ylnz0";
|
||||
};
|
||||
meta.homepage = "https://github.com/neovimhaskell/haskell-vim/";
|
||||
};
|
||||
|
|
@ -2688,24 +2700,24 @@ let
|
|||
|
||||
nerdcommenter = buildVimPluginFrom2Nix {
|
||||
pname = "nerdcommenter";
|
||||
version = "2021-01-12";
|
||||
version = "2021-01-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "preservim";
|
||||
repo = "nerdcommenter";
|
||||
rev = "7d2fb974a36b3c7773a90a749fcb92a40669e444";
|
||||
sha256 = "1vq4wkywidmjr2g8z9js5173b15lr6zawxb0z12fmvaiwxpbli4z";
|
||||
rev = "7be3292b8de5127a386bf20f1198704e90cf24e9";
|
||||
sha256 = "0bz6q80bbq1pl45ch37rcnnakljv6877qasqvdzb09w3jn6hz2vl";
|
||||
};
|
||||
meta.homepage = "https://github.com/preservim/nerdcommenter/";
|
||||
};
|
||||
|
||||
nerdtree = buildVimPluginFrom2Nix {
|
||||
pname = "nerdtree";
|
||||
version = "2020-12-20";
|
||||
version = "2021-01-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "preservim";
|
||||
repo = "nerdtree";
|
||||
rev = "aaa946fb6bd79b9af86fbaf4b6b63fd81d839bd9";
|
||||
sha256 = "1fhwfwqlvz0pm5qdpjbmjx4dqlnchbp170jw63dc5fxin90h4ivh";
|
||||
rev = "7099f638edd3eda5cd5687b4e13d342bb7f9949d";
|
||||
sha256 = "1109acmcxwr6kfrw6ganpqwwarsf5l9vd3vxmmafz3c86ha6kkvw";
|
||||
};
|
||||
meta.homepage = "https://github.com/preservim/nerdtree/";
|
||||
};
|
||||
|
|
@ -2878,14 +2890,26 @@ let
|
|||
meta.homepage = "https://github.com/neovimhaskell/nvim-hs.vim/";
|
||||
};
|
||||
|
||||
nvim-jdtls = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-jdtls";
|
||||
version = "2021-01-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfussenegger";
|
||||
repo = "nvim-jdtls";
|
||||
rev = "357d0b405235e3dfb0b15450f33ad6d10cbf2122";
|
||||
sha256 = "1gd4kjxpb73d6ixxgg4qyzj5alca590whx1i905j3m8j4sjb7vib";
|
||||
};
|
||||
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
|
||||
};
|
||||
|
||||
nvim-lspconfig = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lspconfig";
|
||||
version = "2021-01-15";
|
||||
version = "2021-01-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "nvim-lspconfig";
|
||||
rev = "87900ffcccd47bb6a09483ccf0d6840dc1d0d0d6";
|
||||
sha256 = "18qj8ql48fnncghm0p6wnbjggmkvs9gdf6lgffhdqinlrnrja9ry";
|
||||
rev = "1f88798c0efe9331e83243ce05605fbac0433e9d";
|
||||
sha256 = "042bgy356v7yy4zm76mngp55n53rnqrlclpm4lafjvl788fny7k4";
|
||||
};
|
||||
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
||||
};
|
||||
|
|
@ -2928,12 +2952,12 @@ let
|
|||
|
||||
nvim-tree-lua = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-tree-lua";
|
||||
version = "2021-01-15";
|
||||
version = "2021-01-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyazdani42";
|
||||
repo = "nvim-tree.lua";
|
||||
rev = "787cef2a1d4ccdd1058cd1486dfea509fab1d291";
|
||||
sha256 = "1n1cvrfz2vfx5rjslx4brv3rfqjmxymy9yxyvzhi5p3vwn0phr6f";
|
||||
rev = "bf59dd4a86f13eeb32ac04d7d1fadadd48662647";
|
||||
sha256 = "19kjxdspiylp5ww2h1xnhzd57fhlpzdbkyglg79a86xlsf1r1c7x";
|
||||
};
|
||||
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
|
||||
};
|
||||
|
|
@ -3168,24 +3192,24 @@ let
|
|||
|
||||
playground = buildVimPluginFrom2Nix {
|
||||
pname = "playground";
|
||||
version = "2020-12-17";
|
||||
version = "2021-01-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "playground";
|
||||
rev = "0cba1b99cd6cfcd0379e57c317ea1df0c1c82b3a";
|
||||
sha256 = "1xs2g7inlmcjchzzmsa4qh1mf61xz6gdn96mzfkr8fs65g78861b";
|
||||
rev = "4a11cf237a6e505feb747f6097d48bf0195888b3";
|
||||
sha256 = "0d9xm63spsaa580n2nyqiiq2p81ilmm0dwzqg6jhw9c020r5rzg1";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-treesitter/playground/";
|
||||
};
|
||||
|
||||
plenary-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "plenary-nvim";
|
||||
version = "2021-01-11";
|
||||
version = "2021-01-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-lua";
|
||||
repo = "plenary.nvim";
|
||||
rev = "e9b81e2bb98e00e9f6ca2b6a698cc8452fe2943e";
|
||||
sha256 = "00j5gnx5jgrx7qmbxhrjsrdzp9krc5c7zij9a25jhz3l2j98xpdg";
|
||||
rev = "fecbbd23e425db8cc60b85d8298f02935d69940d";
|
||||
sha256 = "0q5hsg2rlzhldr221krvxppspdl04rj5qbiq3nk1a25nf5r24d0z";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
|
||||
};
|
||||
|
|
@ -3876,14 +3900,26 @@ let
|
|||
meta.homepage = "https://github.com/tomtom/tcomment_vim/";
|
||||
};
|
||||
|
||||
telescope-fzf-writer-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope-fzf-writer-nvim";
|
||||
version = "2021-01-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope-fzf-writer.nvim";
|
||||
rev = "9535863f519be3d5e57fd50916f96594241bfe16";
|
||||
sha256 = "0jmkzjqlcz47hzp44407xwkmirgprzkwrz6x8ax771gpk8cghfrx";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-writer.nvim/";
|
||||
};
|
||||
|
||||
telescope-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope-nvim";
|
||||
version = "2021-01-17";
|
||||
version = "2021-01-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope.nvim";
|
||||
rev = "c2039ca78d261392b0ab7bef85b3c5f1c8f507b9";
|
||||
sha256 = "0ca93m1nl14js4wgbqhgc786mr9is0zkiwkzp4fv5ny03nhd025w";
|
||||
rev = "7d4d3462e990e2af489eb285aa7041d0b787c560";
|
||||
sha256 = "013m8k7s5d2ix83q1d7x6nqi7s9vn5g221wnbngd41ywbdn61a9a";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
|
||||
};
|
||||
|
|
@ -4611,12 +4647,12 @@ let
|
|||
|
||||
vim-clap = buildVimPluginFrom2Nix {
|
||||
pname = "vim-clap";
|
||||
version = "2021-01-17";
|
||||
version = "2021-01-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "liuchengxu";
|
||||
repo = "vim-clap";
|
||||
rev = "a9d1ccd9a3e9807d600abccab706634594ed0d2e";
|
||||
sha256 = "0smmgbsrqm757hgijq76y4yra0b68qhnxnyswfs37vrarcrqkfq3";
|
||||
rev = "7442976f0c5dea79f8cfb342e7abb25cea9a8daa";
|
||||
sha256 = "1gzc800i4zsxav4h7smqgapnrallarbgrq9arfhydrq41hy2h6wr";
|
||||
};
|
||||
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
|
||||
};
|
||||
|
|
@ -5079,48 +5115,48 @@ let
|
|||
|
||||
vim-erlang-compiler = buildVimPluginFrom2Nix {
|
||||
pname = "vim-erlang-compiler";
|
||||
version = "2020-11-16";
|
||||
version = "2021-01-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim-erlang";
|
||||
repo = "vim-erlang-compiler";
|
||||
rev = "17e47d28141c961e567b39d8d9956cbdb6e720d0";
|
||||
sha256 = "1j27zk2gfig3zv7cg7dwg5x0c3nsik5blcci8a16wq050pi8bsr1";
|
||||
rev = "a99e75f792650c8dae86d9a44c7af2411ea2ead7";
|
||||
sha256 = "13400kjf90sxlpx1pqs379ihdn65i3gpck3dwkjnf1xiv1p9rzvz";
|
||||
};
|
||||
meta.homepage = "https://github.com/vim-erlang/vim-erlang-compiler/";
|
||||
};
|
||||
|
||||
vim-erlang-omnicomplete = buildVimPluginFrom2Nix {
|
||||
pname = "vim-erlang-omnicomplete";
|
||||
version = "2020-08-29";
|
||||
version = "2021-01-16";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim-erlang";
|
||||
repo = "vim-erlang-omnicomplete";
|
||||
rev = "2f980dd8f1861e00ea14dcd5ecc370e71af695fb";
|
||||
sha256 = "1i3c7ybahmb4az2njzvfnvx39bqiyqhf43n32rhpc3xg05y3bk7d";
|
||||
rev = "924a50ed0ad93141063d0f27c9f62b1bea991baf";
|
||||
sha256 = "0zh730wsb0n9nk1x5qdbx78zgzhamd2a6fa5gxl4milvr5ddvdy9";
|
||||
};
|
||||
meta.homepage = "https://github.com/vim-erlang/vim-erlang-omnicomplete/";
|
||||
};
|
||||
|
||||
vim-erlang-runtime = buildVimPluginFrom2Nix {
|
||||
pname = "vim-erlang-runtime";
|
||||
version = "2020-11-22";
|
||||
version = "2021-01-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim-erlang";
|
||||
repo = "vim-erlang-runtime";
|
||||
rev = "8a8ec7cb54d52be5fc5dce2a028888c2a2f50e35";
|
||||
sha256 = "13qfyl9v0a82hn574x6h7rq9kl3rhg6ivlpj69n2jn0lf33ij8qq";
|
||||
rev = "47c643f51e4480541fc81e352ec5b2a361544d0b";
|
||||
sha256 = "0xlxkdqjq8fp9fpkhqv5nd2ipiq8nw1bdzd7hqibizwcdsisf91s";
|
||||
};
|
||||
meta.homepage = "https://github.com/vim-erlang/vim-erlang-runtime/";
|
||||
};
|
||||
|
||||
vim-erlang-tags = buildVimPluginFrom2Nix {
|
||||
pname = "vim-erlang-tags";
|
||||
version = "2020-10-16";
|
||||
version = "2021-01-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vim-erlang";
|
||||
repo = "vim-erlang-tags";
|
||||
rev = "a5bc6a90a166073d74e5103f40735740ae40a3cb";
|
||||
sha256 = "02d3y2296nh8qv0kgx119c1niim6ci2bahi7q3k0jsl2f86fl7dy";
|
||||
rev = "22f7fbf1e4b669a305d93cedd85baf63253f3b78";
|
||||
sha256 = "1dvk0dim8vam8xsqlz9pjky22mhqi9ca5criyz7zvgj46hqj1wy3";
|
||||
};
|
||||
meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/";
|
||||
};
|
||||
|
|
@ -5415,12 +5451,12 @@ let
|
|||
|
||||
vim-go = buildVimPluginFrom2Nix {
|
||||
pname = "vim-go";
|
||||
version = "2021-01-10";
|
||||
version = "2021-01-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fatih";
|
||||
repo = "vim-go";
|
||||
rev = "d68fc4d71d7c254c8fbd666a470b2d92c8a6d610";
|
||||
sha256 = "04py4c52hlb8adkgywkn4hnibrsiczvmmf8b82wfr2sa1k5b9hbx";
|
||||
rev = "3a8e3f6ded412b25fb3c13eecf76d5809fa175e8";
|
||||
sha256 = "0vj6wcvx87kkykmlxjdwnbnfiq8bbqjnki8x3qaiv4gx028m778d";
|
||||
};
|
||||
meta.homepage = "https://github.com/fatih/vim-go/";
|
||||
};
|
||||
|
|
@ -6041,24 +6077,24 @@ let
|
|||
|
||||
vim-lsc = buildVimPluginFrom2Nix {
|
||||
pname = "vim-lsc";
|
||||
version = "2021-01-16";
|
||||
version = "2021-01-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "natebosch";
|
||||
repo = "vim-lsc";
|
||||
rev = "104813da45c5bb620b9c6ce48cb918872f968dab";
|
||||
sha256 = "1x06zb9xa9v9ycg3vq1il45ylm7p2d3vflv347hpssmwcjzd6xyv";
|
||||
rev = "3012f39ce120ffdc5b89a85f074fc66d6f4905bf";
|
||||
sha256 = "157jm2wwvp4dp7rzilhrb4040paldjx7qkp116v4q5kj699w42i7";
|
||||
};
|
||||
meta.homepage = "https://github.com/natebosch/vim-lsc/";
|
||||
};
|
||||
|
||||
vim-lsp = buildVimPluginFrom2Nix {
|
||||
pname = "vim-lsp";
|
||||
version = "2021-01-16";
|
||||
version = "2021-01-18";
|
||||
src = fetchFromGitHub {
|
||||
owner = "prabirshrestha";
|
||||
repo = "vim-lsp";
|
||||
rev = "90d61f11149ffb380eabcb66f66a160f4fc31a5d";
|
||||
sha256 = "1gr9y12fjw89ym6kdzjki12j21bhwy4ch4gpsy4gzb04xhjqllgf";
|
||||
rev = "7380d31c4f49d76ce3895c386e2a7a40b2b2df08";
|
||||
sha256 = "082il6bk7rnqvxqqy1070y3182kqk34i1bgcczj4k43llnghskx9";
|
||||
};
|
||||
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
|
||||
};
|
||||
|
|
@ -7110,12 +7146,12 @@ let
|
|||
|
||||
vim-smoothie = buildVimPluginFrom2Nix {
|
||||
pname = "vim-smoothie";
|
||||
version = "2020-12-25";
|
||||
version = "2021-01-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "psliwka";
|
||||
repo = "vim-smoothie";
|
||||
rev = "1f5ee84b789384a273b3e27b6a5a7e2f54dbc30e";
|
||||
sha256 = "0977qb31hgss38g01m7ikx3qdqial3c7zw9cv72k7rnmcgy761wz";
|
||||
rev = "f83a157552a3bf393a7c034df1d21e3555123a4c";
|
||||
sha256 = "090rl4mfww5rmv04v25f58jfv3yx23bwi0pijkwxr442yhbg3rg2";
|
||||
};
|
||||
meta.homepage = "https://github.com/psliwka/vim-smoothie/";
|
||||
};
|
||||
|
|
@ -7940,12 +7976,12 @@ let
|
|||
|
||||
vimtex = buildVimPluginFrom2Nix {
|
||||
pname = "vimtex";
|
||||
version = "2021-01-16";
|
||||
version = "2021-01-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lervag";
|
||||
repo = "vimtex";
|
||||
rev = "7c7d6020f848864e091ac437e55f72139f9a59b4";
|
||||
sha256 = "10fl44xpjfsrfqr3sz2mbxhigmkz5ivky96smxp4yp9av0zvvcm4";
|
||||
rev = "5d3d96dcdf0f87273978c482e9c1b39201f4516f";
|
||||
sha256 = "04rn9w17mmf2ka4wqdl8x4nzwg5imnb0q1mnsm1hx8bvlr8zs0h6";
|
||||
};
|
||||
meta.homepage = "https://github.com/lervag/vimtex/";
|
||||
};
|
||||
|
|
@ -8170,12 +8206,12 @@ let
|
|||
|
||||
zig-vim = buildVimPluginFrom2Nix {
|
||||
pname = "zig-vim";
|
||||
version = "2020-12-31";
|
||||
version = "2021-01-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ziglang";
|
||||
repo = "zig.vim";
|
||||
rev = "ef331a76f0d660a67504e1cd0d981c345db3607f";
|
||||
sha256 = "0976539h1zsxrnihp5x5lvra12iwvjbbrl5nw6f914yh09jqbgjf";
|
||||
rev = "17170fd1c31f00132a91fb1598d0f3df5927e28d";
|
||||
sha256 = "0k8s5via1frpgdb94kgsk29g7h6fjq3cazyfa8zww7vra418acsh";
|
||||
};
|
||||
meta.homepage = "https://github.com/ziglang/zig.vim/";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -654,7 +654,7 @@ self: super: {
|
|||
libiconv
|
||||
];
|
||||
|
||||
cargoSha256 = "6tgSdIC9ThKvyiX1Unihwozhez6+HsQiqebugzNrKVc=";
|
||||
cargoSha256 = "mq5q+cIWXDMeoZfumX1benulrP/AWKZnd8aI0OzY55c=";
|
||||
};
|
||||
in ''
|
||||
ln -s ${maple-bin}/bin/maple $target/bin/maple
|
||||
|
|
|
|||
|
|
@ -79,6 +79,7 @@ deoplete-plugins/deoplete-clang
|
|||
deoplete-plugins/deoplete-dictionary
|
||||
deoplete-plugins/deoplete-go
|
||||
deoplete-plugins/deoplete-jedi
|
||||
deoplete-plugins/deoplete-lsp
|
||||
deoplete-plugins/deoplete-zsh
|
||||
derekelkins/agda-vim
|
||||
derekwyatt/vim-scala
|
||||
|
|
@ -132,7 +133,7 @@ gentoo/gentoo-syntax
|
|||
GEverding/vim-hocon
|
||||
gfanto/fzf-lsp.nvim@main
|
||||
gibiansky/vim-textobj-haskell
|
||||
glepnir/galaxyline.nvim
|
||||
glepnir/galaxyline.nvim@main
|
||||
glts/vim-textobj-comment
|
||||
godlygeek/csapprox
|
||||
godlygeek/tabular
|
||||
|
|
@ -274,6 +275,7 @@ leanprover/lean.vim
|
|||
ledger/vim-ledger
|
||||
lepture/vim-jinja
|
||||
lervag/vimtex
|
||||
lewis6991/gitsigns.nvim
|
||||
lfilho/cosco.vim
|
||||
lifepillar/vim-mucomplete
|
||||
lighttiger2505/deoplete-vim-lsp
|
||||
|
|
@ -332,6 +334,7 @@ mengelbrecht/lightline-bufferline
|
|||
metakirby5/codi.vim
|
||||
mfukar/robotframework-vim
|
||||
mfussenegger/nvim-dap
|
||||
mfussenegger/nvim-jdtls
|
||||
mg979/vim-visual-multi
|
||||
mhartington/oceanic-next
|
||||
mhinz/vim-crates
|
||||
|
|
@ -403,6 +406,7 @@ nvim-lua/lsp-status.nvim
|
|||
nvim-lua/lsp_extensions.nvim
|
||||
nvim-lua/plenary.nvim
|
||||
nvim-lua/popup.nvim
|
||||
nvim-telescope/telescope-fzf-writer.nvim
|
||||
nvim-telescope/telescope.nvim
|
||||
nvim-treesitter/completion-treesitter
|
||||
nvim-treesitter/nvim-treesitter
|
||||
|
|
@ -494,7 +498,6 @@ Shougo/context_filetype.vim
|
|||
Shougo/defx.nvim
|
||||
Shougo/denite.nvim
|
||||
Shougo/deol.nvim
|
||||
Shougo/deoplete-lsp
|
||||
Shougo/deoplete.nvim
|
||||
Shougo/echodoc.vim
|
||||
Shougo/neco-syntax
|
||||
|
|
|
|||
|
|
@ -1,21 +1,36 @@
|
|||
{ lib, stdenv, fetchurl, python2Packages }:
|
||||
{ lib, fetchFromGitHub, fetchpatch, python3Packages }:
|
||||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "dstat";
|
||||
format = "other";
|
||||
version = "0.7.3";
|
||||
version = "0.7.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/dagwieers/dstat/archive/${version}.tar.gz";
|
||||
sha256 = "16286z3y2lc9nsq8njzjkv6k2vyxrj9xiixj1k3gnsbvhlhkirj6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dstat-real";
|
||||
repo = "dstat";
|
||||
rev = "v${version}";
|
||||
sha256 = "1qnmkhqmjd1m3if05jj29dvr5hn6kayq9bkkkh881w472c0zhp8v";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python2Packages; [ python-wifi ];
|
||||
propagatedBuildInputs = with python3Packages; [ six ];
|
||||
|
||||
patches = [ ./fix_pluginpath.patch ];
|
||||
patches = [
|
||||
./fix_pluginpath.patch
|
||||
# this fixes another bug with python3
|
||||
(fetchpatch {
|
||||
url = https://github.com/efexgee/dstat/commit/220a785321b13b6df92a536080aca6ef1cb644ad.patch ;
|
||||
sha256 = "08kcz3yxvl35m55y7g1pr73x3bjcqnv0qlswxqyq8cqxg9zd64cn";
|
||||
})
|
||||
];
|
||||
|
||||
makeFlags = [ "prefix=$(out)" ];
|
||||
|
||||
# remove deprecation warnings
|
||||
preFixup = ''
|
||||
sed -i "s/import collections/import collections.abc/g" $out/share/dstat/dstat.py $out/bin/dstat
|
||||
sed -i "s/collections.Sequence/collections.abc.Sequence/g" "$out"/bin/dstat
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://dag.wieers.com/home-made/dstat/";
|
||||
description = "Versatile resource statistics tool";
|
||||
|
|
|
|||
|
|
@ -20,9 +20,6 @@ stdenv.mkDerivation rec {
|
|||
url = "https://git.alpinelinux.org/aports/plain/main/linux-pam/libpam-fix-build-with-eglibc-2.16.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc";
|
||||
sha256 = "1ib6shhvgzinjsc603k2x1lxh9dic6qq449fnk110gc359m23j81";
|
||||
})
|
||||
# From adelie's package repo, using local copy since it seems to be currently offline.
|
||||
# (we previously used similar patch from void, but stopped working with update to 1.3.1)
|
||||
./musl-fix-pam_exec.patch
|
||||
];
|
||||
|
||||
outputs = [ "out" "doc" "man" /* "modules" */ ];
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
--- ./modules/pam_exec/pam_exec.c.orig
|
||||
+++ ./modules/pam_exec/pam_exec.c
|
||||
@@ -103,11 +103,14 @@
|
||||
int optargc;
|
||||
const char *logfile = NULL;
|
||||
const char *authtok = NULL;
|
||||
+ char authtok_buf[PAM_MAX_RESP_SIZE+1];
|
||||
+
|
||||
pid_t pid;
|
||||
int fds[2];
|
||||
int stdout_fds[2];
|
||||
FILE *stdout_file = NULL;
|
||||
|
||||
+ memset(authtok_buf, 0, sizeof(authtok_buf));
|
||||
if (argc < 1) {
|
||||
pam_syslog (pamh, LOG_ERR,
|
||||
"This module needs at least one argument");
|
||||
@@ -180,12 +183,12 @@
|
||||
if (resp)
|
||||
{
|
||||
pam_set_item (pamh, PAM_AUTHTOK, resp);
|
||||
- authtok = strndupa (resp, PAM_MAX_RESP_SIZE);
|
||||
+ authtok = strncpy(authtok_buf, resp, sizeof(authtok_buf));
|
||||
_pam_drop (resp);
|
||||
}
|
||||
}
|
||||
else
|
||||
- authtok = strndupa (void_pass, PAM_MAX_RESP_SIZE);
|
||||
+ authtok = strncpy(authtok_buf, void_pass, sizeof(authtok_buf));
|
||||
|
||||
if (pipe(fds) != 0)
|
||||
{
|
||||
|
||||
|
|
@ -164,7 +164,7 @@
|
|||
"device_automation" = ps: with ps; [ ];
|
||||
"device_sun_light_trigger" = ps: with ps; [ aiohttp-cors pillow ];
|
||||
"device_tracker" = ps: with ps; [ ];
|
||||
"devolo_home_control" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: devolo-home-control-api
|
||||
"devolo_home_control" = ps: with ps; [ aiohttp-cors devolo-home-control-api zeroconf ];
|
||||
"dexcom" = ps: with ps; [ pydexcom ];
|
||||
"dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT
|
||||
"dialogflow" = ps: with ps; [ aiohttp-cors ];
|
||||
|
|
@ -253,14 +253,14 @@
|
|||
"filter" = ps: with ps; [ aiohttp-cors sqlalchemy ];
|
||||
"fints" = ps: with ps; [ fints ];
|
||||
"fireservicerota" = ps: with ps; [ ]; # missing inputs: pyfireservicerota
|
||||
"firmata" = ps: with ps; [ ]; # missing inputs: pymata-express
|
||||
"firmata" = ps: with ps; [ pymata-express ];
|
||||
"fitbit" = ps: with ps; [ aiohttp-cors fitbit ];
|
||||
"fixer" = ps: with ps; [ fixerio ];
|
||||
"fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist
|
||||
"flexit" = ps: with ps; [ pymodbus ]; # missing inputs: pyflexit
|
||||
"flic" = ps: with ps; [ ]; # missing inputs: pyflic-homeassistant
|
||||
"flick_electric" = ps: with ps; [ ]; # missing inputs: PyFlick
|
||||
"flo" = ps: with ps; [ ]; # missing inputs: aioflo
|
||||
"flo" = ps: with ps; [ aioflo ];
|
||||
"flock" = ps: with ps; [ ];
|
||||
"flume" = ps: with ps; [ ]; # missing inputs: pyflume
|
||||
"flunearyou" = ps: with ps; [ ]; # missing inputs: pyflunearyou
|
||||
|
|
|
|||
2980
pkgs/servers/http/envoy/0001-quiche-update-QUICHE-tar-13949.patch
Normal file
2980
pkgs/servers/http/envoy/0001-quiche-update-QUICHE-tar-13949.patch
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,91 @@
|
|||
From 8b531c41f956b27e4be32b430db2e7a44e0cdd3e Mon Sep 17 00:00:00 2001
|
||||
From: Luke Granger-Brown <git@lukegb.com>
|
||||
Date: Thu, 7 Jan 2021 11:09:18 +0000
|
||||
Subject: [PATCH] Add upb patch to make it compile under GCC10
|
||||
|
||||
---
|
||||
bazel/repositories.bzl | 5 +++-
|
||||
bazel/upb2.patch | 55 ++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 59 insertions(+), 1 deletion(-)
|
||||
create mode 100644 bazel/upb2.patch
|
||||
|
||||
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
|
||||
index 64d61ea49..c6cadc9df 100644
|
||||
--- a/bazel/repositories.bzl
|
||||
+++ b/bazel/repositories.bzl
|
||||
@@ -811,7 +811,10 @@ def _com_github_grpc_grpc():
|
||||
def _upb():
|
||||
_repository_impl(
|
||||
name = "upb",
|
||||
- patches = ["@envoy//bazel:upb.patch"],
|
||||
+ patches = [
|
||||
+ "@envoy//bazel:upb.patch",
|
||||
+ "@envoy//bazel:upb2.patch",
|
||||
+ ],
|
||||
patch_args = ["-p1"],
|
||||
)
|
||||
|
||||
diff --git a/bazel/upb2.patch b/bazel/upb2.patch
|
||||
new file mode 100644
|
||||
index 000000000..6e436c61b
|
||||
--- /dev/null
|
||||
+++ b/bazel/upb2.patch
|
||||
@@ -0,0 +1,55 @@
|
||||
+From 9bd23dab4240b015321a53c45b3c9e4847fbf020 Mon Sep 17 00:00:00 2001
|
||||
+From: Joshua Haberman <jhaberman@gmail.com>
|
||||
+Date: Tue, 7 Apr 2020 15:22:11 -0700
|
||||
+Subject: [PATCH] Changed upb status to suit GCC10's warning about strncpy().
|
||||
+ (#268)
|
||||
+
|
||||
+Added tests for all cases. Also removed ellipses from truncated
|
||||
+messages, they were more trouble than they are worth.
|
||||
+---
|
||||
+ tests/test_generated_code.c | 33 +++++++++++++++++++++++++++++++++
|
||||
+ upb/upb.c | 17 +++--------------
|
||||
+ 2 files changed, 36 insertions(+), 14 deletions(-)
|
||||
+
|
||||
+diff --git a/upb/upb.c b/upb/upb.c
|
||||
+index cb2cdfd9d..258192d79 100644
|
||||
+--- a/upb/upb.c
|
||||
++++ b/upb/upb.c
|
||||
+@@ -11,17 +11,6 @@
|
||||
+
|
||||
+ #include "upb/port_def.inc"
|
||||
+
|
||||
+-/* Guarantee null-termination and provide ellipsis truncation.
|
||||
+- * It may be tempting to "optimize" this by initializing these final
|
||||
+- * four bytes up-front and then being careful never to overwrite them,
|
||||
+- * this is safer and simpler. */
|
||||
+-static void nullz(upb_status *status) {
|
||||
+- const char *ellipsis = "...";
|
||||
+- size_t len = strlen(ellipsis);
|
||||
+- UPB_ASSERT(sizeof(status->msg) > len);
|
||||
+- memcpy(status->msg + sizeof(status->msg) - len, ellipsis, len);
|
||||
+-}
|
||||
+-
|
||||
+ /* upb_status *****************************************************************/
|
||||
+
|
||||
+ void upb_status_clear(upb_status *status) {
|
||||
+@@ -37,8 +26,8 @@ const char *upb_status_errmsg(const upb_status *status) { return status->msg; }
|
||||
+ void upb_status_seterrmsg(upb_status *status, const char *msg) {
|
||||
+ if (!status) return;
|
||||
+ status->ok = false;
|
||||
+- strncpy(status->msg, msg, sizeof(status->msg));
|
||||
+- nullz(status);
|
||||
++ strncpy(status->msg, msg, UPB_STATUS_MAX_MESSAGE - 1);
|
||||
++ status->msg[UPB_STATUS_MAX_MESSAGE - 1] = '\0';
|
||||
+ }
|
||||
+
|
||||
+ void upb_status_seterrf(upb_status *status, const char *fmt, ...) {
|
||||
+@@ -52,7 +41,7 @@ void upb_status_vseterrf(upb_status *status, const char *fmt, va_list args) {
|
||||
+ if (!status) return;
|
||||
+ status->ok = false;
|
||||
+ _upb_vsnprintf(status->msg, sizeof(status->msg), fmt, args);
|
||||
+- nullz(status);
|
||||
++ status->msg[UPB_STATUS_MAX_MESSAGE - 1] = '\0';
|
||||
+ }
|
||||
+
|
||||
+ /* upb_alloc ******************************************************************/
|
||||
--
|
||||
2.29.2
|
||||
|
||||
119
pkgs/servers/http/envoy/default.nix
Normal file
119
pkgs/servers/http/envoy/default.nix
Normal file
|
|
@ -0,0 +1,119 @@
|
|||
{ buildBazelPackage
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, cmake
|
||||
, go
|
||||
, ninja
|
||||
, python3
|
||||
}:
|
||||
|
||||
let
|
||||
srcVer = {
|
||||
# We need the commit hash, since Bazel stamps the build with it.
|
||||
# However, the version string is more useful for end-users.
|
||||
# These are contained in a attrset of their own to make it obvious that
|
||||
# people should update both.
|
||||
version = "1.16.2";
|
||||
commit = "e98e41a8e168af7acae8079fc0cd68155f699aa3";
|
||||
};
|
||||
in
|
||||
buildBazelPackage rec {
|
||||
pname = "envoy";
|
||||
version = srcVer.version;
|
||||
src = fetchFromGitHub {
|
||||
owner = "envoyproxy";
|
||||
repo = "envoy";
|
||||
rev = srcVer.commit;
|
||||
hash = "sha256-aWVMRKFCZzf9/96NRPCP4jiW38DJhXyi0gEqW7uIpnQ=";
|
||||
|
||||
extraPostFetch = ''
|
||||
chmod -R +w $out
|
||||
rm $out/.bazelversion
|
||||
echo ${srcVer.commit} > $out/SOURCE_VERSION
|
||||
sed -i 's/GO_VERSION = ".*"/GO_VERSION = "host"/g' $out/bazel/dependency_imports.bzl
|
||||
'';
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Quiche needs to be updated to compile under newer GCC.
|
||||
# This is a manual backport of http://github.com/envoyproxy/envoy/pull/13949.
|
||||
./0001-quiche-update-QUICHE-tar-13949.patch
|
||||
|
||||
# upb needs to be updated to compile under newer GCC.
|
||||
# This is a manual backport of https://github.com/protocolbuffers/upb/commit/9bd23dab4240b015321a53c45b3c9e4847fbf020.
|
||||
./0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch
|
||||
];
|
||||
postPatch = ''
|
||||
sed -i 's,#!/usr/bin/env python3,#!${python3}/bin/python,' bazel/foreign_cc/luajit.patch
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
python3
|
||||
go
|
||||
ninja
|
||||
];
|
||||
|
||||
fetchAttrs = {
|
||||
sha256 = "sha256-mct7anzErY9eSujZyGORfRJqzAO9XuFAv04DS8VRZKM=";
|
||||
dontUseCmakeConfigure = true;
|
||||
preInstall = ''
|
||||
# Strip out the path to the build location (by deleting the comment line).
|
||||
find $bazelOut/external -name requirements.bzl | while read requirements; do
|
||||
sed -i '/# Generated from /d' "$requirements"
|
||||
done
|
||||
|
||||
# Remove references to paths in the Nix store.
|
||||
sed -i \
|
||||
-e 's,${python3},__NIXPYTHON__,' \
|
||||
-e 's,${stdenv.shellPackage},__NIXSHELL__,' \
|
||||
$bazelOut/external/com_github_luajit_luajit/build.py \
|
||||
$bazelOut/external/local_config_sh/BUILD
|
||||
rm -r $bazelOut/external/go_sdk
|
||||
|
||||
# Replace some wheels which are only used for tests with empty files;
|
||||
# they're nondeterministically built and packed.
|
||||
>$bazelOut/external/config_validation_pip3/PyYAML-5.3.1-cp38-cp38-linux_x86_64.whl
|
||||
>$bazelOut/external/protodoc_pip3/PyYAML-5.3.1-cp38-cp38-linux_x86_64.whl
|
||||
>$bazelOut/external/thrift_pip3/thrift-0.13.0-cp38-cp38-linux_x86_64.whl
|
||||
'';
|
||||
};
|
||||
buildAttrs = {
|
||||
dontUseCmakeConfigure = true;
|
||||
dontUseNinjaInstall = true;
|
||||
preConfigure = ''
|
||||
sed -i 's,#!/usr/bin/env bash,#!${stdenv.shell},' $bazelOut/external/rules_foreign_cc/tools/build_defs/framework.bzl
|
||||
|
||||
# Add paths to Nix store back.
|
||||
sed -i \
|
||||
-e 's,__NIXPYTHON__,${python3},' \
|
||||
-e 's,__NIXSHELL__,${stdenv.shellPackage},' \
|
||||
$bazelOut/external/com_github_luajit_luajit/build.py \
|
||||
$bazelOut/external/local_config_sh/BUILD
|
||||
'';
|
||||
installPhase = ''
|
||||
install -Dm0755 bazel-bin/source/exe/envoy-static $out/bin/envoy
|
||||
'';
|
||||
};
|
||||
|
||||
fetchConfigured = true;
|
||||
removeRulesCC = false;
|
||||
removeLocalConfigCc = true;
|
||||
removeLocal = false;
|
||||
bazelTarget = "//source/exe:envoy-static";
|
||||
bazelBuildFlags = [
|
||||
"-c opt"
|
||||
"--spawn_strategy=standalone"
|
||||
"--noexperimental_strict_action_env"
|
||||
"--cxxopt=-Wno-maybe-uninitialized"
|
||||
"--cxxopt=-Wno-uninitialized"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://envoyproxy.io";
|
||||
description = "Cloud-native edge and service proxy";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ lukegb ];
|
||||
platforms = [ "x86_64-linux" ]; # Other platforms will generate different fetch hashes.
|
||||
};
|
||||
}
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kapowbang";
|
||||
version = "0.5.4";
|
||||
version = "0.6.0";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
@ -10,10 +10,10 @@ buildGoModule rec {
|
|||
owner = "BBVA";
|
||||
repo = "kapow";
|
||||
rev = "v${version}";
|
||||
sha256 = "09qr631vzlgibz6q64f35lqzz9h1g3gxqfbapkrci5i0n3h04yr4";
|
||||
sha256 = "sha256-+GZarnG+SlxynoXYTvI1f9eki3DobiDt7vUdWlC0ECk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "159s46rhg67mgglaxgddx3k8kssl0cqiq8yjdqgjhhxppf16r7dy";
|
||||
vendorSha256 = "sha256-vXu64o/MTmw9oZL4MIHB+PEfYLcKVh5A5iGZ1RW1Xd4=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
assert par2Support -> par2cmdline != null;
|
||||
|
||||
let version = "0.31"; in
|
||||
let version = "0.32"; in
|
||||
|
||||
with lib;
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
|||
repo = "bup";
|
||||
owner = "bup";
|
||||
rev = version;
|
||||
sha256 = "03kmmdlgg0p5z39bhckkf91mmq55wghb93ghqvv9f9gaby1diw4z";
|
||||
sha256 = "sha256-SWnEJ5jwu/Jr2NLsTS8ajWay0WX/gYbOc3J6w00DndI=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "blueberry";
|
||||
version = "1.4.0";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "19kmjp686h7lwmw5n7fc9giqbqm757pkbn42nfwlmasvzqsqlnz6";
|
||||
sha256 = "sha256-YwJQryIK92/Tc1s49jM3pCs7dmO3l+RbbFBtuXvhYbQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
31
pkgs/tools/graphics/graph-cli/default.nix
Normal file
31
pkgs/tools/graphics/graph-cli/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib
|
||||
, python3Packages
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "graph-cli";
|
||||
version = "0.1.7";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit version;
|
||||
pname = "graph_cli";
|
||||
sha256 = "sha256-/v9COgAjuunJ06HHl55J0moV1p4uO+N+w2QwE8tgebQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
numpy
|
||||
pandas
|
||||
matplotlib
|
||||
];
|
||||
|
||||
# does not contain tests despite reference in Makefile
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "graph_cli" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI to create graphs from CSV files";
|
||||
homepage = "https://github.com/mcastorina/graph-cli/";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
maintainers = with maintainers; [ leungbk ];
|
||||
};
|
||||
}
|
||||
|
|
@ -7,6 +7,7 @@
|
|||
, qtx11extras
|
||||
, libxcb
|
||||
, libXdmcp
|
||||
, qtbase
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
|
|
@ -20,8 +21,14 @@ mkDerivation rec {
|
|||
sha256 = "BVOumk2xj3vmwmm4KwiktQhWyTuUA2OFwYXNR6HgwyM=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace qt5/platforminputcontext/CMakeLists.txt \
|
||||
--replace \$"{CMAKE_INSTALL_QT5PLUGINDIR}" $out/${qtbase.qtPluginPrefix}
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_QT4=0"
|
||||
"-DENABLE_QT6=0"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,6 +12,14 @@ symlinkJoin {
|
|||
--prefix FCITX_ADDON_DIRS : "$out/lib/fcitx5" \
|
||||
--suffix XDG_DATA_DIRS : "$out/share" \
|
||||
--suffix PATH : "$out/bin"
|
||||
|
||||
desktop=share/applications/org.fcitx.Fcitx5.desktop
|
||||
autostart=etc/xdg/autostart/org.fcitx.Fcitx5.desktop
|
||||
rm $out/$desktop
|
||||
rm $out/$autostart
|
||||
cp ${fcitx5}/$desktop $out/$desktop
|
||||
sed -i $out/$desktop -e "s|^Exec=.*|Exec=$out/bin/fcitx5|g"
|
||||
ln -s $out/$desktop $out/$autostart
|
||||
'';
|
||||
|
||||
meta = fcitx5.meta;
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.22";
|
||||
version = "4.24";
|
||||
pname = "hebcal";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hebcal";
|
||||
repo = "hebcal";
|
||||
rev = "v${version}";
|
||||
sha256 = "0bm29n51qi9q4vx4qsz3l9l1wvpvsk138zixfl5f5yz4kngzbx24";
|
||||
sha256 = "sha256-iWp2S3s8z/y4dZ66Ogqu7Yf4gTUvSS1J5F7d0ifRbcY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
|
|
|||
55
pkgs/tools/misc/rpi-imager/default.nix
Normal file
55
pkgs/tools/misc/rpi-imager/default.nix
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
{ mkDerivation,
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
curl,
|
||||
libarchive,
|
||||
util-linux,
|
||||
qtbase,
|
||||
qtdeclarative,
|
||||
qtsvg,
|
||||
qttools,
|
||||
qtquickcontrols2,
|
||||
qtgraphicaleffects
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "rpi-imager";
|
||||
version = "1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raspberrypi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0596c7rpkykmjr3gsz9yczqsj7fzq04kc97s0rqkygjnwiqh2rwz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
curl
|
||||
libarchive
|
||||
util-linux
|
||||
qtbase
|
||||
qtdeclarative
|
||||
qtsvg
|
||||
qttools
|
||||
qtquickcontrols2
|
||||
qtgraphicaleffects
|
||||
];
|
||||
|
||||
/* By default, the builder checks for JSON support in lsblk by running "lsblk --json",
|
||||
but that throws an error, as /sys/dev doesn't exist in the sandbox.
|
||||
This patch removes the check. */
|
||||
patches = [ ./lsblkCheckFix.patch ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Raspberry Pi Imaging Utility";
|
||||
homepage = "https://www.raspberrypi.org/software/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ymarkus ];
|
||||
platforms = platforms.all;
|
||||
# does not build on darwin
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
16
pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch
Normal file
16
pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 3d7fc79..8ce72b9 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -229,11 +229,6 @@ else()
|
||||
if (NOT LSBLK)
|
||||
message(FATAL_ERROR "Unable to locate lsblk (used for disk enumeration)")
|
||||
endif()
|
||||
-
|
||||
- execute_process(COMMAND "${LSBLK}" "--json" RESULT_VARIABLE ret)
|
||||
- if (ret EQUAL "1")
|
||||
- message(FATAL_ERROR "util-linux package too old. lsblk does not support --json (used for disk enumeration)")
|
||||
- endif()
|
||||
endif()
|
||||
|
||||
configure_file(
|
||||
|
|
@ -1,21 +1,33 @@
|
|||
{ lib, stdenv, python3Packages, fetchFromGitHub }:
|
||||
|
||||
with python3Packages;
|
||||
{ lib
|
||||
, buildPythonApplication
|
||||
, click
|
||||
, fetchFromGitHub
|
||||
, ipy
|
||||
, pyyaml
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "gandi-cli";
|
||||
version = "1.5";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Gandi";
|
||||
repo = "gandi.cli";
|
||||
rev = version;
|
||||
sha256 = "1jcabpphlm6qajw8dz0h4gynm03g1mxi0cn900i3v7wdfww1gfab";
|
||||
sha256 = "sha256-KLeEbbzgqpmBjeTc5RYsFScym8xtMqVjU+H0lyDM0+o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ click ipy pyyaml requests ];
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
ipy
|
||||
pyyaml
|
||||
requests
|
||||
];
|
||||
|
||||
doCheck = false; # Tests try to contact the actual remote API
|
||||
# Tests try to contact the actual remote API
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "gandi" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command-line interface to the public Gandi.net API";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "igmpproxy";
|
||||
version = "0.2.1";
|
||||
version = "0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pali";
|
||||
repo = "igmpproxy";
|
||||
rev = version;
|
||||
sha256 = "13zn4q24drbhpqmcmqh1jg7ind5iqn11wj3xvczlc8w35vyqssyf";
|
||||
sha256 = "sha256-B7mq+5pKWMO4dJeFPB7tiyjDQjj90g/kmYB2ApBE3Ic=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
|
|
|||
41
pkgs/tools/security/enum4linux-ng/default.nix
Normal file
41
pkgs/tools/security/enum4linux-ng/default.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ lib
|
||||
, buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, impacket
|
||||
, ldap3
|
||||
, pyyaml
|
||||
, samba
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "enum4linux-ng";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cddmp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0dhg8cwbdn0vlnchhscx31ay4mgj5p6rf73wzgs8nvqg0shsawmy";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
impacket
|
||||
ldap3
|
||||
pyyaml
|
||||
samba
|
||||
];
|
||||
|
||||
# It's only a script and not a Python module. Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Windows/Samba enumeration tool";
|
||||
longDescription = ''
|
||||
enum4linux-ng.py is a rewrite of Mark Lowe's enum4linux.pl, a tool for
|
||||
enumerating information from Windows and Samba systems.
|
||||
'';
|
||||
homepage = "https://github.com/cddmp/enum4linux-ng";
|
||||
license = with licenses; [ gpl3Plus ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -3,21 +3,16 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nitrokey-app";
|
||||
version = "1.3.2";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nitrokey";
|
||||
repo = "nitrokey-app";
|
||||
rev = "v${version}";
|
||||
sha256 = "193kzlz3qn9il56h78faiqkgv749hdils1nn1iw6g3wphgx5fjs2";
|
||||
sha256 = "1k0w921hfrya4q2r7bqn7kgmwvwb7c15k9ymlbnksmfc9yyjyfcv";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace libnitrokey/CMakeLists.txt \
|
||||
--replace '/data/41-nitrokey.rules' '/libnitrokey/data/41-nitrokey.rules'
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
bash-completion
|
||||
hidapi
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ lib, stdenv, nitrokey-app
|
||||
, group ? "nitrokey"
|
||||
}:
|
||||
{ lib, stdenv, nitrokey-app }:
|
||||
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "nitrokey-udev-rules-${lib.getVersion nitrokey-app}";
|
||||
|
|
@ -9,10 +8,6 @@ stdenv.mkDerivation {
|
|||
|
||||
dontBuild = true;
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace libnitrokey/data/41-nitrokey.rules --replace plugdev "${group}"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/etc/udev/rules.d
|
||||
cp libnitrokey/data/41-nitrokey.rules $out/etc/udev/rules.d
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bpytop";
|
||||
version = "1.0.50";
|
||||
version = "1.0.59";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aristocratos";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "10j2g19sh2hl5lzbcllr862hkzr0mc1z8n24afzaycn1sphri8fc";
|
||||
sha256 = "sha256-RlrUUIbZRNTvxU8LVW0/ZcARlKDVvSMlkN0+6BgAink=";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "java-service-wrapper";
|
||||
version = "3.5.43";
|
||||
version = "3.5.45";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
|
||||
sha256 = "19cx3854rk7b2056z8pvxnf4simsg5js7czsy2bys7jl6vh2x02b";
|
||||
sha256 = "sha256-rnlloa0DicWT1RlP2szDvBINvT5/RZ17GOarUzvX1AI=";
|
||||
};
|
||||
|
||||
buildInputs = [ jdk ];
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "angle-grinder";
|
||||
version = "0.15.0";
|
||||
version = "0.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rcoh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1m5yj9412kjlnqi1nwh44i627ip0kqcbhvwgh87gl5vgd2a0m091";
|
||||
sha256 = "sha256-cGYhGcNalmc/Gr7mY1Fycs8cZYaIy622DFIL64LT+gE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "0y4c1gja0i3h2whjpm74yf3z1y85pkwmpmrl2fjsyy0mn493hzv8";
|
||||
cargoSha256 = "sha256-NkghuZHNT3Rq2wqiyKzjP+u9ZpeHU5H6oBLS0oQ7LcU=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Slice and dice logs on the command line";
|
||||
|
|
|
|||
|
|
@ -242,6 +242,8 @@ in
|
|||
|
||||
enum4linux = callPackage ../tools/security/enum4linux {};
|
||||
|
||||
enum4linux-ng = python3Packages.callPackage ../tools/security/enum4linux-ng { };
|
||||
|
||||
onesixtyone = callPackage ../tools/security/onesixtyone {};
|
||||
|
||||
creddump = callPackage ../tools/security/creddump {};
|
||||
|
|
@ -4277,7 +4279,7 @@ in
|
|||
|
||||
gallery-dl = python3Packages.callPackage ../applications/misc/gallery-dl { };
|
||||
|
||||
gandi-cli = callPackage ../tools/networking/gandi-cli { };
|
||||
gandi-cli = python3Packages.callPackage ../tools/networking/gandi-cli { };
|
||||
|
||||
gandom-fonts = callPackage ../data/fonts/gandom-fonts { };
|
||||
|
||||
|
|
@ -7454,6 +7456,8 @@ in
|
|||
|
||||
rpPPPoE = callPackage ../tools/networking/rp-pppoe { };
|
||||
|
||||
rpi-imager = libsForQt5.callPackage ../tools/misc/rpi-imager { };
|
||||
|
||||
rpiboot-unstable = callPackage ../development/misc/rpiboot/unstable.nix { };
|
||||
|
||||
rpm = callPackage ../tools/package-management/rpm {
|
||||
|
|
@ -17496,6 +17500,8 @@ in
|
|||
|
||||
engelsystem = callPackage ../servers/web-apps/engelsystem { };
|
||||
|
||||
envoy = callPackage ../servers/http/envoy { };
|
||||
|
||||
etcd = callPackage ../servers/etcd { };
|
||||
etcd_3_4 = callPackage ../servers/etcd/3.4.nix { };
|
||||
|
||||
|
|
@ -17569,6 +17575,8 @@ in
|
|||
|
||||
gobetween = callPackage ../servers/gobetween { };
|
||||
|
||||
graph-cli = callPackage ../tools/graphics/graph-cli { };
|
||||
|
||||
h2o = callPackage ../servers/http/h2o { };
|
||||
|
||||
haka = callPackage ../tools/security/haka { };
|
||||
|
|
@ -24081,6 +24089,8 @@ in
|
|||
|
||||
purple-facebook = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-facebook { };
|
||||
|
||||
pikopixel = callPackage ../applications/graphics/pikopixel { };
|
||||
|
||||
pithos = callPackage ../applications/audio/pithos {
|
||||
pythonPackages = python3Packages;
|
||||
};
|
||||
|
|
@ -28260,6 +28270,8 @@ in
|
|||
|
||||
gutenprintBin = callPackage ../misc/drivers/gutenprint/bin.nix { };
|
||||
|
||||
carps-cups = callPackage ../misc/cups/drivers/carps-cups { };
|
||||
|
||||
cups-bjnp = callPackage ../misc/cups/drivers/cups-bjnp { };
|
||||
|
||||
cups-brother-hl1110 = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1110 { };
|
||||
|
|
|
|||
|
|
@ -214,6 +214,8 @@ in {
|
|||
|
||||
aiofiles = callPackage ../development/python-modules/aiofiles { };
|
||||
|
||||
aioflo = callPackage ../development/python-modules/aioflo { };
|
||||
|
||||
aioftp = callPackage ../development/python-modules/aioftp { };
|
||||
|
||||
aioguardian = callPackage ../development/python-modules/aioguardian { };
|
||||
|
|
@ -1669,6 +1671,8 @@ in {
|
|||
|
||||
detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04
|
||||
|
||||
devolo-home-control-api = callPackage ../development/python-modules/devolo-home-control-api { };
|
||||
|
||||
devpi-common = callPackage ../development/python-modules/devpi-common { };
|
||||
|
||||
dftfit = callPackage ../development/python-modules/dftfit { };
|
||||
|
|
@ -5538,6 +5542,8 @@ in {
|
|||
|
||||
pymaging_png = callPackage ../development/python-modules/pymaging_png { };
|
||||
|
||||
pymata-express = callPackage ../development/python-modules/pymata-express { };
|
||||
|
||||
pymatgen = callPackage ../development/python-modules/pymatgen { };
|
||||
|
||||
pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue