Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
d9ebeccb40
@ -85,18 +85,18 @@ in
|
||||
|
||||
programs.captive-browser.dhcp-dns =
|
||||
let
|
||||
iface = prefix:
|
||||
optionalString cfg.bindInterface (concatStringsSep " " (map escapeShellArg [ prefix cfg.interface ]));
|
||||
iface = prefixes:
|
||||
optionalString cfg.bindInterface (escapeShellArgs (prefixes ++ [ cfg.interface ]));
|
||||
in
|
||||
mkOptionDefault (
|
||||
if config.networking.networkmanager.enable then
|
||||
"${pkgs.networkmanager}/bin/nmcli dev show ${iface ""} | ${pkgs.gnugrep}/bin/fgrep IP4.DNS"
|
||||
"${pkgs.networkmanager}/bin/nmcli dev show ${iface []} | ${pkgs.gnugrep}/bin/fgrep IP4.DNS"
|
||||
else if config.networking.dhcpcd.enable then
|
||||
"${pkgs.dhcpcd}/bin/dhcpcd ${iface "-U"} | ${pkgs.gnugrep}/bin/fgrep domain_name_servers"
|
||||
"${pkgs.dhcpcd}/bin/dhcpcd ${iface ["-U"]} | ${pkgs.gnugrep}/bin/fgrep domain_name_servers"
|
||||
else if config.networking.useNetworkd then
|
||||
"${cfg.package}/bin/systemd-networkd-dns ${iface ""}"
|
||||
"${cfg.package}/bin/systemd-networkd-dns ${iface []}"
|
||||
else
|
||||
"${config.security.wrapperDir}/udhcpc --quit --now -f ${iface "-i"} -O dns --script ${
|
||||
"${config.security.wrapperDir}/udhcpc --quit --now -f ${iface ["-i"]} -O dns --script ${
|
||||
pkgs.writeShellScript "udhcp-script" ''
|
||||
if [ "$1" = bound ]; then
|
||||
echo "$dns"
|
||||
|
||||
@ -429,6 +429,7 @@ in
|
||||
|
||||
startLimitIntervalSec = 60; # 1 min
|
||||
serviceConfig = {
|
||||
Type = "notify";
|
||||
ExecStart = "${dovecotPkg}/sbin/dovecot -F";
|
||||
ExecReload = "${dovecotPkg}/sbin/doveadm reload";
|
||||
Restart = "on-failure";
|
||||
|
||||
@ -371,8 +371,9 @@ in
|
||||
};
|
||||
services.postfix.config = mkIf cfg.postfix.enable cfg.postfix.config;
|
||||
|
||||
systemd.services.postfix.serviceConfig.SupplementaryGroups =
|
||||
mkIf cfg.postfix.enable [ postfixCfg.group ];
|
||||
systemd.services.postfix = mkIf cfg.postfix.enable {
|
||||
serviceConfig.SupplementaryGroups = [ postfixCfg.group ];
|
||||
};
|
||||
|
||||
# Allow users to run 'rspamc' and 'rspamadm'.
|
||||
environment.systemPackages = [ pkgs.rspamd ];
|
||||
|
||||
@ -10,6 +10,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
testScript = ''
|
||||
command = "${pkgs.kbd}/bin/setfont ter-112n 2>&1"
|
||||
(status, out) = machine.execute(command)
|
||||
import re
|
||||
pattern = re.compile(r".*Unable to find file:.*")
|
||||
match = pattern.match(out)
|
||||
if match:
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "mopidy";
|
||||
version = "3.1.1";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mopidy";
|
||||
repo = "mopidy";
|
||||
rev = "v${version}";
|
||||
sha256 = "14m80z9spi2vhfs2bbff7ky80mr6bksl4550y17hwd7zpkid60za";
|
||||
sha256 = "1l1rya48ykiq156spm8pfsm6li8apz66ppz7gs4s91fv7g7l5x2f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "ptcollab";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yuxshao";
|
||||
repo = "ptcollab";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-98v9it9M5FXCsOpWvO10uKYmEH15v1FEH1hH73XHa7w=";
|
||||
sha256 = "sha256-AeIjc+FoFsTcyWl261GvyySIHP107rL4JkuMXFhnPbk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake pkg-config ];
|
||||
|
||||
@ -2,17 +2,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "helix";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helix-editor";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-iCNA+gZer6BycWnhosDFRuxfS6QAb06XTix/vFsaey0=";
|
||||
sha256 = "sha256-lScMHZ/pLcHkuvv8kSKnYK5AFVxyhOUMFdsu3nlDVD0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-sqXPgtLMXa3kMQlnw2xDBEsVfjeRXO6Zp6NEFS/0h20=";
|
||||
cargoSha256 = "sha256-N5vlPoYyksHEZsyia8u8qtoEBY6qsXqO9CRBFaTQmiw=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
mkDerivation {
|
||||
pname = "bomber";
|
||||
meta = with lib; {
|
||||
homepage = "https://kde.org/applications/en/games/org.kde.bomber";
|
||||
homepage = "https://apps.kde.org/bomber/";
|
||||
description = "A single player arcade game";
|
||||
longDescription = ''
|
||||
Bomber is a single player arcade game. The player is invading various
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "cointop";
|
||||
version = "1.6.5";
|
||||
version = "1.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "miguelmota";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pnh4z7vk8xazdBPNbwR5BrKFbi8df8UTM2SOU+KDvsk=";
|
||||
sha256 = "sha256-cn2TtXIxBnEZyWAdtf9ING9I/53z6D8UPVxnFVSkGgo=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/miguelmota/cointop";
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "mob";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
goPackagePath = "github.com/remotemobprogramming/mob";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "remotemobprogramming";
|
||||
repo = pname;
|
||||
sha256 = "sha256-GA+MmZU1KEg3HIU225Llr5W4dHGFGiMr/j0N/CslBC4=";
|
||||
sha256 = "sha256-PvFECy5wgpdOdToeYsW+NiVC2LXkBCMBorIl8m++Lic=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ticker";
|
||||
version = "4.2.0";
|
||||
version = "4.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "achannarasappa";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FavbBGmChWQ3xySPHlw5HisZwVaNe/NaxA6+InN8fL8=";
|
||||
sha256 = "sha256-T9pApuzATohiOUmWa+GBlLrlTNgKNMwtW6fSPO/NS6Y=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-XBfTVd3X3IDxLCAaNnijf6E5bw+AZ94UdOG9w7BOdBU=";
|
||||
vendorSha256 = "sha256-vTB1RPg1LN44bkWrdGEXR6WRlM/Q2EITUO0yt5ar/zg=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w" "-X github.com/achannarasappa/ticker/cmd.Version=v${version}"
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
xmrig.overrideAttrs (oldAttrs: rec {
|
||||
pname = "xmrig-mo";
|
||||
version = "6.14.1-mo1";
|
||||
version = "6.14.1-mo2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MoneroOcean";
|
||||
repo = "xmrig";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1YG0llNv1VR8ocNFxYLZFXMzowNNqpqSyIu7iCr/rfM=";
|
||||
sha256 = "sha256-bfD/zxUo4ZDLRDpFbD/FCAvBISHvhRaYXwwiYFd10No=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -68,7 +68,7 @@ buildGoModule rec {
|
||||
meta = with lib; {
|
||||
description = "Declarative continuous deployment for Kubernetes";
|
||||
downloadPage = "https://github.com/argoproj/argo-cd";
|
||||
homepage = "https://argoproj.github.io/projects/argo-cd";
|
||||
homepage = "https://argo-cd.readthedocs.io/en/stable/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ shahrukh330 superherointj ];
|
||||
};
|
||||
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "An ultrafast memory-efficient short read aligner";
|
||||
license = licenses.artistic2;
|
||||
homepage = "http://bowtie-bio.sf.net/bowtie";
|
||||
homepage = "http://bowtie-bio.sourceforge.net";
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
||||
@ -66,8 +66,8 @@ let
|
||||
# Make desktop item
|
||||
mkdir -p "$out"/share/applications
|
||||
cp "$desktopItem"/share/applications/* "$out"/share/applications/
|
||||
mkdir -p "$out"/share/icons
|
||||
ln -s "$out/eagle-${version}/bin/eagle-logo.png" "$out"/share/icons/eagle.png
|
||||
mkdir -p "$out"/share/pixmaps
|
||||
ln -s "$out/eagle-${version}/bin/eagle-logo.png" "$out"/share/pixmaps/eagle.png
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"commit": "dfb0b040033334d2e676906786c7a90805310e7d",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/dfb0b040033334d2e676906786c7a90805310e7d.tar.gz",
|
||||
"sha256": "0x53gkkpxlcm6qa38yksx8cws9phl2zxvdys5imjpg8dl1sal3pg",
|
||||
"msg": "Update from Hackage at 2021-08-10T19:15:27Z"
|
||||
"commit": "23315eb3220b0748c3aa71a9027dc39e5416ce9e",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/23315eb3220b0748c3aa71a9027dc39e5416ce9e.tar.gz",
|
||||
"sha256": "0pgcyfb3lnl7kxpj87sbj50ljlg2l05v4kgcdwy568pcf24bh764",
|
||||
"msg": "Update from Hackage at 2021-08-17T22:21:14Z"
|
||||
}
|
||||
|
||||
@ -20,11 +20,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tali";
|
||||
version = "40.1";
|
||||
version = "40.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1xhp30c70bi8p4sm6v8zmxi1p55fs56dqgfbhfnsda5g1cxwir7h";
|
||||
sha256 = "9SHsnW1SKA/Pfi1IerbVqIw54yx6n5XrqwKdUsAj4Cs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
, autoconf, automake, libtool, jdk, perl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "aldor-1.2.0";
|
||||
pname = "aldor";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/pippijn/aldor";
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
{lib, stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkg-config, perl, gnome2, gtk2, pango, sqlite, libxml2, zlib, gmp, smlnj }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "aliceml-1.4-7d44dc8e";
|
||||
pname = "aliceml";
|
||||
version = "1.4-7d44dc8e";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/aliceml/aliceml";
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
{ lib, stdenv, fetchurl, autoconf, automake }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "avra-1.3.0";
|
||||
pname = "avra";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/avra/${name}.tar.bz2";
|
||||
url = "mirror://sourceforge/avra/avra-${version}.tar.bz2";
|
||||
sha256 = "04lp0k0h540l5pmnaai07637f0p4zi766v6sfm7cryfaca3byb56";
|
||||
};
|
||||
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
{ lib, stdenv, fetchurl, perl, coreutils }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "berkeley_upc-2.22.0";
|
||||
pname = "berkeley_upc";
|
||||
version = "2.22.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://upc.lbl.gov/download/release/${name}.tar.gz";
|
||||
url = "http://upc.lbl.gov/download/release/berkeley_upc-${version}.tar.gz";
|
||||
sha256 = "041l215x8z1cvjcx7kwjdgiaf9rl2d778k6kiv8q09bc68nwd44m";
|
||||
};
|
||||
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
{ lib, stdenv, fetchurl, python3, runtimeShell }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "cmdstan-2.17.1";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cmdstan";
|
||||
version = "2.17.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/stan-dev/cmdstan/releases/download/v2.17.1/cmdstan-2.17.1.tar.gz";
|
||||
url = "https://github.com/stan-dev/cmdstan/releases/download/v${version}/cmdstan-${version}.tar.gz";
|
||||
sha256 = "1vq1cnrkvrvbfl40j6ajc60jdrjcxag1fi6kff5pqmadfdz9564j";
|
||||
};
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
# build-tools
|
||||
, bootPkgs
|
||||
, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx
|
||||
, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx, xattr
|
||||
, bash
|
||||
|
||||
, libiconv ? null, ncurses
|
||||
@ -135,12 +135,12 @@ let
|
||||
|
||||
in
|
||||
stdenv.mkDerivation (rec {
|
||||
version = "8.10.4";
|
||||
version = "8.10.6";
|
||||
name = "${targetPrefix}ghc-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
|
||||
sha256 = "03li4k10hxgyxcdyyz2092wx09spr1599hi0sxbh4m889qdqgbsj";
|
||||
sha256 = "43afba72a533408b42c1492bd047b5e37e5f7204e41a5cedd3182cc841610ce9";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@ -155,9 +155,6 @@ stdenv.mkDerivation (rec {
|
||||
# upstream patch. Don't forget to check backport status of the upstream patch
|
||||
# when adding new GHC releases in nixpkgs.
|
||||
./respect-ar-path.patch
|
||||
# Fix documentation configuration which causes a syntax error with sphinx 4.*
|
||||
# See https://gitlab.haskell.org/ghc/ghc/-/issues/19962, remove at 8.10.6.
|
||||
./sphinx-4-configuration.patch
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# Make Block.h compile with c++ compilers. Remove with the next release
|
||||
(fetchpatch {
|
||||
@ -192,6 +189,9 @@ stdenv.mkDerivation (rec {
|
||||
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
export NIX_LDFLAGS+=" -no_dtrace_dof"
|
||||
|
||||
# GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7
|
||||
export XATTR=${lib.getBin xattr}/bin/xattr
|
||||
'' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
|
||||
sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
|
||||
'' + lib.optionalString targetPlatform.isMusl ''
|
||||
@ -1,9 +1,11 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "meta-build-env-0.1";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "meta-build-env";
|
||||
version = "0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.meta-environment.org/releases/meta-build-env-0.1.tar.gz";
|
||||
url = "http://www.meta-environment.org/releases/meta-build-env-${version}.tar.gz";
|
||||
sha256 = "1imn1gaan4fv73v8w3k3lgyjzkcn7bdp69k6hlz0vqdg17ysd1x3";
|
||||
};
|
||||
|
||||
|
||||
@ -12,7 +12,8 @@ assert check-ocaml-version "4";
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
name = "mezzo-0.0.m8";
|
||||
pname = "mezzo";
|
||||
version = "0.0.m8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "protz";
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
{lib, stdenv, fetchgit, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "opendylan-2016.1pre";
|
||||
pname = "opendylan";
|
||||
version = "2016.1pre";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/dylan-lang/opendylan";
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
{ fetchurl, lib, stdenv, ncompress, libX11 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "stalin-0.11";
|
||||
pname = "stalin";
|
||||
version = "0.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.ecn.purdue.edu/qobi/stalin.tar.Z";
|
||||
@ -22,16 +23,16 @@ stdenv.mkDerivation rec {
|
||||
mkdir -p "$out/share/emacs/site-lisp"
|
||||
cp stalin.el "$out/share/emacs/site-lisp"
|
||||
|
||||
mkdir -p "$out/doc/${name}"
|
||||
cp README "$out/doc/${name}"
|
||||
mkdir -p "$out/doc/stalin-${version}"
|
||||
cp README "$out/doc/stalin-${version}"
|
||||
|
||||
mkdir -p "$out/share/${name}/include"
|
||||
cp "include/"* "$out/share/${name}/include"
|
||||
mkdir -p "$out/share/stalin-${version}/include"
|
||||
cp "include/"* "$out/share/stalin-${version}/include"
|
||||
|
||||
substituteInPlace "$out/bin/stalin" \
|
||||
--replace "$PWD/include/stalin" "$out/share/${name}/include/stalin"
|
||||
--replace "$PWD/include/stalin" "$out/share/stalin-${version}/include/stalin"
|
||||
substituteInPlace "$out/bin/stalin" \
|
||||
--replace "$PWD/include" "$out/share/${name}/include"
|
||||
--replace "$PWD/include" "$out/share/stalin-${version}/include"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
, avrdude, arduino-core }:
|
||||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
name = "ino-0.3.6";
|
||||
namePrefix = "";
|
||||
pname = "ino";
|
||||
version = "0.3.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/i/ino/${name}.tar.gz";
|
||||
url = "mirror://pypi/i/ino/ino-${version}.tar.gz";
|
||||
sha256 = "0k6lzfcn55favbj0w4afrvnmwyskf7bgzg9javv2ycvskp35srwv";
|
||||
};
|
||||
|
||||
|
||||
@ -8,10 +8,10 @@
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "cabal2nix";
|
||||
version = "unstable-2021-07-29";
|
||||
version = "unstable-2021-08-21";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/614852fa4be21ffc283046b92ed9e5b75c7e38af.tar.gz";
|
||||
sha256 = "00p6vmy5s016nkgjk5zf0hqym8y2glgwga81lm6xc1vc3zzkidmc";
|
||||
url = "https://github.com/NixOS/cabal2nix/archive/51a4082fefad4642af67a0ae4bf3bb3a7d9b45e0.tar.gz";
|
||||
sha256 = "1qd991ziv54drb0n655dg4ymknlfa0ndx9nq9wb5v00a15i4c04x";
|
||||
};
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
|
||||
@ -1149,14 +1149,8 @@ self: super: {
|
||||
# $HOME, which we don't have in our build sandbox.
|
||||
cabal-install-parsers = dontCheck super.cabal-install-parsers;
|
||||
|
||||
# jailbreak and patch (for pandoc >= 2.12) ensure compilation with newer dependencies.
|
||||
# can both be removed at the next release (current is 0.13.0.0)
|
||||
gitit = doJailbreak (appendPatch super.gitit
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://github.com/jgm/gitit/commit/e8c9d94be332e2f73de9b0eee222a2a09f191faf.patch";
|
||||
sha256 = "1rl2c3sz8cd2c3qwv9b640853s4bblcknvfv29k472wqhs62mwz1";
|
||||
includes = [ "src/**" ];
|
||||
}));
|
||||
# 2021-08-18: Erroneously claims that it needs a newer HStringTemplate (>= 0.8.8) than stackage.
|
||||
gitit = doJailbreak super.gitit;
|
||||
|
||||
# Test suite requires database
|
||||
persistent-mysql = dontCheck super.persistent-mysql;
|
||||
@ -1293,23 +1287,39 @@ self: super: {
|
||||
# Fails with "supports custom headers"
|
||||
Spock-core = dontCheck super.Spock-core;
|
||||
|
||||
# Needed by Hasura 1.3.1
|
||||
dependent-map_0_2_4_0 = super.dependent-map_0_2_4_0.override {
|
||||
dependent-sum = self.dependent-sum_0_4;
|
||||
};
|
||||
|
||||
# Hasura 1.3.1
|
||||
# Because of ghc-heap-view, profiling needs to be disabled.
|
||||
graphql-engine = disableLibraryProfiling( overrideCabal (super.graphql-engine.override {
|
||||
immortal = self.immortal_0_2_2_1;
|
||||
dependent-map = self.dependent-map_0_2_4_0;
|
||||
dependent-sum = self.dependent-sum_0_4;
|
||||
# hasura packages need some extra care
|
||||
graphql-engine = overrideCabal (super.graphql-engine.overrideScope (self: super: {
|
||||
immortal = self.immortal_0_2_2_1;
|
||||
resource-pool = self.hasura-resource-pool;
|
||||
ekg-core = self.hasura-ekg-core;
|
||||
ekg-json = self.hasura-ekg-json;
|
||||
hspec = dontCheck self.hspec_2_8_3;
|
||||
hspec-core = dontCheck self.hspec-core_2_8_3;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_8_3;
|
||||
tasty-hspec = self.tasty-hspec_1_2;
|
||||
})) (drv: {
|
||||
patches = [ ./patches/graphql-engine-mapkeys.patch ];
|
||||
doHaddock = false;
|
||||
version = "2.0.7";
|
||||
});
|
||||
hasura-ekg-core = super.hasura-ekg-core.overrideScope (self: super: {
|
||||
hspec = dontCheck self.hspec_2_8_3;
|
||||
hspec-core = dontCheck self.hspec-core_2_8_3;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_8_3;
|
||||
});
|
||||
hasura-ekg-json = super.hasura-ekg-json.overrideScope (self: super: {
|
||||
ekg-core = self.hasura-ekg-core;
|
||||
hspec = dontCheck self.hspec_2_8_3;
|
||||
hspec-core = dontCheck self.hspec-core_2_8_3;
|
||||
hspec-discover = dontCheck super.hspec-discover_2_8_3;
|
||||
});
|
||||
pg-client = overrideCabal (super.pg-client.override {
|
||||
resource-pool = self.hasura-resource-pool;
|
||||
}) (drv: {
|
||||
# version in cabal file is invalid
|
||||
version = "1.3.1-beta1";
|
||||
# hasura needs VERSION env exported during build
|
||||
preBuild = "export VERSION=1.3.1-beta1";
|
||||
}));
|
||||
librarySystemDepends = with pkgs; [ postgresql krb5.dev openssl.dev ];
|
||||
# wants a running DB to check against
|
||||
doCheck = false;
|
||||
});
|
||||
|
||||
# https://github.com/bos/statistics/issues/170
|
||||
statistics = dontCheck super.statistics;
|
||||
@ -1889,10 +1899,6 @@ EOT
|
||||
# https://github.com/google/proto-lens/issues/413
|
||||
proto-lens = doJailbreak super.proto-lens;
|
||||
|
||||
# Too strict bounds on profunctors
|
||||
# https://github.com/jcranch/tophat/issues/1
|
||||
tophat = doJailbreak super.tophat;
|
||||
|
||||
# 2021-06-20: Outdated upper bounds
|
||||
# https://github.com/Porges/email-validate-hs/issues/58
|
||||
email-validate = doJailbreak super.email-validate;
|
||||
@ -1946,4 +1952,10 @@ EOT
|
||||
Cabal = self.Cabal_3_6_0_0;
|
||||
};
|
||||
|
||||
# ghc-api-compat needlessly requires 8.10.5 exactly, but we have 8.10.6
|
||||
ghc-api-compat = doJailbreak super.ghc-api-compat;
|
||||
|
||||
# 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too.
|
||||
streamly-posix = doJailbreak super.streamly-posix;
|
||||
|
||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||
|
||||
@ -194,6 +194,8 @@ self: super: {
|
||||
hls-module-name-plugin = dontCheck super.hls-module-name-plugin;
|
||||
hls-splice-plugin = dontCheck super.hls-splice-plugin;
|
||||
hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin;
|
||||
hls-pragmas-plugin = dontCheck super.hls-pragmas-plugin;
|
||||
hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin;
|
||||
|
||||
# We are lacking pure pgrep at the moment for tests to work
|
||||
tmp-postgres = dontCheck super.tmp-postgres;
|
||||
|
||||
@ -41,13 +41,6 @@ self: super: {
|
||||
unix = null;
|
||||
xhtml = null;
|
||||
|
||||
# Hasura 1.3.1
|
||||
# Because of ghc-heap-view, profiling needs to be disabled.
|
||||
graphql-engine = overrideCabal (super.graphql-engine) (drv: {
|
||||
# GHC 8.8.x needs a revert of https://github.com/hasura/graphql-engine/commit/a77bb0570f4210fb826985e17a84ddcc4c95d3ea
|
||||
patches = [ ./patches/hasura-884-compat.patch ];
|
||||
});
|
||||
|
||||
# GHC 8.8.x can build haddock version 2.23.*
|
||||
haddock = self.haddock_2_23_1;
|
||||
haddock-api = self.haddock-api_2_23_1;
|
||||
@ -136,4 +129,5 @@ self: super: {
|
||||
# vector 0.12.2 indroduced doctest checks that don‘t work on older compilers
|
||||
vector = dontCheck super.vector;
|
||||
|
||||
ghc-api-compat = super.ghc-api-compat_8_6;
|
||||
}
|
||||
|
||||
@ -121,6 +121,7 @@ broken-packages:
|
||||
- alto
|
||||
- alure
|
||||
- amazon-emailer
|
||||
- amazonka-contrib-rds-utils
|
||||
- amazonka-s3-streaming
|
||||
- amazon-products
|
||||
- amby
|
||||
@ -180,6 +181,7 @@ broken-packages:
|
||||
- argparser
|
||||
- arguedit
|
||||
- arion
|
||||
- arith-encode
|
||||
- armada
|
||||
- arpa
|
||||
- arpack
|
||||
@ -467,6 +469,7 @@ broken-packages:
|
||||
- butter
|
||||
- buttplug-hs-core
|
||||
- bv-sized
|
||||
- byline
|
||||
- bytable
|
||||
- bytearray-parsing
|
||||
- bytestring-arbitrary
|
||||
@ -793,12 +796,14 @@ broken-packages:
|
||||
- consul-haskell
|
||||
- Consumer
|
||||
- containers-benchmark
|
||||
- containers-unicode-symbols
|
||||
- containers-verified
|
||||
- ContArrow
|
||||
- content-store
|
||||
- ContextAlgebra
|
||||
- context-free-grammar
|
||||
- context-stack
|
||||
- contiguous
|
||||
- contiguous-checked
|
||||
- continue
|
||||
- Contract
|
||||
@ -2183,6 +2188,7 @@ broken-packages:
|
||||
- HOpenCV
|
||||
- hopfield
|
||||
- hops
|
||||
- hoq
|
||||
- ho-rewriting
|
||||
- horizon
|
||||
- horname
|
||||
@ -2276,6 +2282,7 @@ broken-packages:
|
||||
- hsmodetweaks
|
||||
- Hsmtlib
|
||||
- hsmtpclient
|
||||
- hsnock
|
||||
- hs-nombre-generator
|
||||
- hsns
|
||||
- hsnsq
|
||||
@ -2388,6 +2395,7 @@ broken-packages:
|
||||
- hunspell-hs
|
||||
- hup
|
||||
- hurriyet
|
||||
- husky
|
||||
- hutton
|
||||
- huttons-razor
|
||||
- hVOIDP
|
||||
@ -2654,6 +2662,7 @@ broken-packages:
|
||||
- lagrangian
|
||||
- lambda2js
|
||||
- lambdaBase
|
||||
- lambdabot-social-plugins
|
||||
- lambdabot-utils
|
||||
- lambda-bridge
|
||||
- lambda-canvas
|
||||
@ -3009,6 +3018,7 @@ broken-packages:
|
||||
- miku
|
||||
- milena
|
||||
- mime-directory
|
||||
- miniforth
|
||||
- minilens
|
||||
- minilight
|
||||
- minions
|
||||
@ -3025,6 +3035,7 @@ broken-packages:
|
||||
- mit-3qvpPyAi6mH
|
||||
- mix-arrows
|
||||
- mixpanel-client
|
||||
- mkcabal
|
||||
- mltool
|
||||
- ml-w
|
||||
- mm2
|
||||
@ -3324,14 +3335,12 @@ broken-packages:
|
||||
- oblivious-transfer
|
||||
- ocaml-export
|
||||
- Octree
|
||||
- odbc
|
||||
- OddWord
|
||||
- oden-go-packages
|
||||
- oeis2
|
||||
- OGL
|
||||
- ogmarkup
|
||||
- oi
|
||||
- oidc-client
|
||||
- om-actor
|
||||
- omaketex
|
||||
- ombra
|
||||
@ -3664,6 +3673,7 @@ broken-packages:
|
||||
- polysemy
|
||||
- polysemy-zoo
|
||||
- polytypeable
|
||||
- pomaps
|
||||
- pomohoro
|
||||
- ponder
|
||||
- pong-server
|
||||
@ -3832,6 +3842,7 @@ broken-packages:
|
||||
- quarantimer
|
||||
- qudb
|
||||
- quenya-verb
|
||||
- questioner
|
||||
- QuickAnnotate
|
||||
- quickbooks
|
||||
- quickcheck-property-comb
|
||||
@ -3900,6 +3911,7 @@ broken-packages:
|
||||
- read-bounded
|
||||
- read-ctags
|
||||
- read-io
|
||||
- readline-statevar
|
||||
- readme-lhs
|
||||
- readshp
|
||||
- really-simple-xml-parser
|
||||
@ -4249,6 +4261,7 @@ broken-packages:
|
||||
- shadower
|
||||
- shake-bindist
|
||||
- shakebook
|
||||
- shake-cabal
|
||||
- shake-cabal-build
|
||||
- shake-dhall
|
||||
- shake-extras
|
||||
@ -4606,6 +4619,7 @@ broken-packages:
|
||||
- svndump
|
||||
- swagger-petstore
|
||||
- swagger-test
|
||||
- swearjure
|
||||
- swf
|
||||
- swift-lda
|
||||
- swiss-ephemeris
|
||||
@ -4920,6 +4934,7 @@ broken-packages:
|
||||
- twilio
|
||||
- twine
|
||||
- twirp
|
||||
- twitter
|
||||
- twitter-feed
|
||||
- tx
|
||||
- txtblk
|
||||
@ -5378,6 +5393,7 @@ broken-packages:
|
||||
- yi-solarized
|
||||
- yi-spolsky
|
||||
- yoda
|
||||
- Yogurt
|
||||
- yst
|
||||
- yu-core
|
||||
- yu-tool
|
||||
|
||||
@ -118,6 +118,7 @@ extra-packages:
|
||||
- sbv == 7.13 # required for pkgs.petrinizer
|
||||
- crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses
|
||||
- ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version
|
||||
- ghc-api-compat < 8.10.5 # 2021-08-18: ghc-api-compat 8.10.5 is only compatible with ghc 8.10.5
|
||||
|
||||
package-maintainers:
|
||||
abbradar:
|
||||
|
||||
@ -370,6 +370,7 @@ dont-distribute-packages:
|
||||
- XSaiga
|
||||
- YACPong
|
||||
- Yablog
|
||||
- Yogurt-Standalone
|
||||
- Z-Botan
|
||||
- Z-IO
|
||||
- Z-MessagePack
|
||||
@ -467,8 +468,10 @@ dont-distribute-packages:
|
||||
- atomic-primops-foreign
|
||||
- atp
|
||||
- attoparsec-enumerator
|
||||
- attoparsec-ip
|
||||
- attoparsec-iteratee
|
||||
- attoparsec-text-enumerator
|
||||
- attoparsec-uri
|
||||
- atuin
|
||||
- audiovisual
|
||||
- aura
|
||||
@ -626,6 +629,7 @@ dont-distribute-packages:
|
||||
- bv-sized-lens
|
||||
- bytehash
|
||||
- bytelog
|
||||
- bytesmith
|
||||
- bytestring-read
|
||||
- c0check
|
||||
- cabal-bounds
|
||||
@ -708,7 +712,9 @@ dont-distribute-packages:
|
||||
- claferwiki
|
||||
- clash
|
||||
- clash-ghc
|
||||
- clash-ghc_1_4_3
|
||||
- clash-lib
|
||||
- clash-lib_1_4_3
|
||||
- clash-multisignal
|
||||
- clash-prelude-quickcheck
|
||||
- clash-systemverilog
|
||||
@ -790,6 +796,7 @@ dont-distribute-packages:
|
||||
- consumers
|
||||
- container
|
||||
- containers-accelerate
|
||||
- contiguous-fft
|
||||
- continuum
|
||||
- continuum-client
|
||||
- control
|
||||
@ -1011,6 +1018,7 @@ dont-distribute-packages:
|
||||
- entangle
|
||||
- enumerate
|
||||
- enumerate-function
|
||||
- enumeration
|
||||
- enumerator-fd
|
||||
- enumerator-tf
|
||||
- ephemeral
|
||||
@ -1732,6 +1740,7 @@ dont-distribute-packages:
|
||||
- intset
|
||||
- invertible-hlist
|
||||
- ion
|
||||
- ip
|
||||
- ipatch
|
||||
- ipc
|
||||
- ipld-cid
|
||||
@ -1858,6 +1867,8 @@ dont-distribute-packages:
|
||||
- lambda-options
|
||||
- lambdaFeed
|
||||
- lambdaLit
|
||||
- lambdabot
|
||||
- lambdabot-xmpp
|
||||
- lambdabot-zulip
|
||||
- lambdacms-media
|
||||
- lambdacube
|
||||
@ -1885,6 +1896,7 @@ dont-distribute-packages:
|
||||
- lapack-carray
|
||||
- lapack-comfort-array
|
||||
- lapack-comfort-array_0_0_1
|
||||
- lapack-hmatrix
|
||||
- lapack_0_4
|
||||
- lat
|
||||
- latex-formulae-hakyll
|
||||
@ -2038,6 +2050,7 @@ dont-distribute-packages:
|
||||
- markdown-pap
|
||||
- markdown2svg
|
||||
- markov-processes
|
||||
- markup
|
||||
- marmalade-upload
|
||||
- marquise
|
||||
- marvin
|
||||
@ -2395,6 +2408,8 @@ dont-distribute-packages:
|
||||
- prednote-test
|
||||
- presto-hdbc
|
||||
- preview
|
||||
- primitive-containers
|
||||
- primitive-sort
|
||||
- primula-board
|
||||
- primula-bot
|
||||
- proc
|
||||
@ -2589,6 +2604,7 @@ dont-distribute-packages:
|
||||
- ribosome-root
|
||||
- ribosome-test
|
||||
- ridley-extras
|
||||
- ring-buffers
|
||||
- rio-process-pool
|
||||
- riot
|
||||
- ripple
|
||||
@ -2662,6 +2678,7 @@ dont-distribute-packages:
|
||||
- scholdoc
|
||||
- scholdoc-citeproc
|
||||
- scholdoc-texmath
|
||||
- scientific-notation
|
||||
- scion
|
||||
- scion-browser
|
||||
- scope
|
||||
@ -2722,6 +2739,7 @@ dont-distribute-packages:
|
||||
- sgf
|
||||
- sgrep
|
||||
- sha1
|
||||
- shake-ats
|
||||
- shake-minify-css
|
||||
- shaker
|
||||
- shapefile
|
||||
@ -2760,6 +2778,7 @@ dont-distribute-packages:
|
||||
- smallstring
|
||||
- smartword
|
||||
- smcdel
|
||||
- smith
|
||||
- smith-cli
|
||||
- smith-client
|
||||
- smtlib2-debug
|
||||
@ -3088,6 +3107,8 @@ dont-distribute-packages:
|
||||
- urembed
|
||||
- uri-enumerator
|
||||
- uri-enumerator-file
|
||||
- url-bytes
|
||||
- urlpath
|
||||
- usb
|
||||
- usb-enumerator
|
||||
- usb-hid
|
||||
@ -3099,6 +3120,7 @@ dont-distribute-packages:
|
||||
- uu-cco-examples
|
||||
- uu-cco-hut-parsing
|
||||
- uu-cco-uu-parsinglib
|
||||
- uuid-bytes
|
||||
- uuid-crypto
|
||||
- uvector-algorithms
|
||||
- v4l2
|
||||
@ -3146,6 +3168,7 @@ dont-distribute-packages:
|
||||
- wai-middleware-cache
|
||||
- wai-middleware-cache-redis
|
||||
- wai-middleware-consul
|
||||
- wai-middleware-content-type
|
||||
- wai-middleware-rollbar
|
||||
- wai-middleware-route
|
||||
- wai-session-tokyocabinet
|
||||
@ -3187,6 +3210,7 @@ dont-distribute-packages:
|
||||
- wrecker-ui
|
||||
- wright
|
||||
- writer-cps-full
|
||||
- ws
|
||||
- wss-client
|
||||
- wtk-gtk
|
||||
- wu-wei
|
||||
|
||||
@ -167,6 +167,7 @@ self: super: builtins.intersectAttrs super {
|
||||
mongoDB = dontCheck super.mongoDB;
|
||||
network-transport-tcp = dontCheck super.network-transport-tcp;
|
||||
network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30
|
||||
oidc-client = dontCheck super.oidc-client; # the spec runs openid against google.com
|
||||
pipes-mongodb = dontCheck super.pipes-mongodb; # http://hydra.cryp.to/build/926195/log/raw
|
||||
pixiv = dontCheck super.pixiv;
|
||||
raven-haskell = dontCheck super.raven-haskell; # http://hydra.cryp.to/build/502053/log/raw
|
||||
@ -224,6 +225,9 @@ self: super: builtins.intersectAttrs super {
|
||||
# Test suite wants to connect to $DISPLAY.
|
||||
hsqml = dontCheck (addExtraLibraries (super.hsqml.override { qt5 = pkgs.qt5Full; }) [pkgs.libGLU pkgs.libGL]);
|
||||
|
||||
# Wants to check against a real DB, Needs freetds
|
||||
odbc = dontCheck (addExtraLibraries super.odbc [ pkgs.freetds ]);
|
||||
|
||||
# Tests attempt to use NPM to install from the network into
|
||||
# /homeless-shelter. Disabled.
|
||||
purescript = dontCheck super.purescript;
|
||||
|
||||
1377
pkgs/development/haskell-modules/hackage-packages.nix
generated
1377
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -26,14 +26,15 @@ self: super: {
|
||||
|
||||
nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { };
|
||||
|
||||
# cabal2nix --revision <rev> https://github.com/hasura/ci-info-hs.git
|
||||
ci-info = self.callPackage ../misc/haskell/hasura/ci-info {};
|
||||
# cabal2nix --revision <rev> https://github.com/hasura/pg-client-hs.git
|
||||
pg-client = self.callPackage ../misc/haskell/hasura/pg-client {};
|
||||
# cabal2nix --revision <rev> https://github.com/hasura/graphql-parser-hs.git
|
||||
graphql-parser = self.callPackage ../misc/haskell/hasura/graphql-parser {};
|
||||
# cabal2nix --subpath server --maintainer offline --no-check --revision 1.2.1 https://github.com/hasura/graphql-engine.git
|
||||
graphql-engine = self.callPackage ../misc/haskell/hasura/graphql-engine {};
|
||||
# hasura graphql-engine is not released to hackage.
|
||||
# https://github.com/hasura/graphql-engine/issues/7391
|
||||
ci-info = self.callPackage ../misc/haskell/hasura/ci-info.nix {};
|
||||
pg-client = self.callPackage ../misc/haskell/hasura/pg-client.nix {};
|
||||
graphql-parser = self.callPackage ../misc/haskell/hasura/graphql-parser.nix {};
|
||||
graphql-engine = self.callPackage ../misc/haskell/hasura/graphql-engine.nix {};
|
||||
hasura-resource-pool = self.callPackage ../misc/haskell/hasura/pool.nix {};
|
||||
hasura-ekg-core = self.callPackage ../misc/haskell/hasura/ekg-core.nix {};
|
||||
hasura-ekg-json = self.callPackage ../misc/haskell/hasura/ekg-json.nix {};
|
||||
|
||||
# Unofficial fork until PRs are merged https://github.com/pcapriotti/optparse-applicative/pulls/roberth
|
||||
# cabal2nix --maintainer roberth https://github.com/hercules-ci/optparse-applicative.git > pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
diff --git a/server/src-lib/Data/HashMap/Strict/Extended.hs b/server/src-lib/Data/HashMap/Strict/Extended.hs
|
||||
index eaff0dfba..9902cadd0 100644
|
||||
--- a/src-lib/Data/HashMap/Strict/Extended.hs
|
||||
+++ b/src-lib/Data/HashMap/Strict/Extended.hs
|
||||
@@ -7,7 +7,6 @@ module Data.HashMap.Strict.Extended
|
||||
, groupOnNE
|
||||
, differenceOn
|
||||
, lpadZip
|
||||
- , mapKeys
|
||||
, unionsWith
|
||||
) where
|
||||
|
||||
@@ -54,20 +53,6 @@ lpadZip left = catMaybes . flip A.alignWith left \case
|
||||
That b -> Just (Nothing, b)
|
||||
These a b -> Just (Just a, b)
|
||||
|
||||
--- | @'mapKeys' f s@ is the map obtained by applying @f@ to each key of @s@.
|
||||
---
|
||||
--- The size of the result may be smaller if @f@ maps two or more distinct
|
||||
--- keys to the same new key. In this case the value at the greatest of the
|
||||
--- original keys is retained.
|
||||
---
|
||||
--- > mapKeys (+ 1) (fromList [(5,"a"), (3,"b")]) == fromList [(4, "b"), (6, "a")]
|
||||
--- > mapKeys (\ _ -> 1) (fromList [(1,"b"), (2,"a"), (3,"d"), (4,"c")]) == singleton 1 "c"
|
||||
--- > mapKeys (\ _ -> 3) (fromList [(1,"b"), (2,"a"), (3,"d"), (4,"c")]) == singleton 3 "c"
|
||||
---
|
||||
--- copied from https://hackage.haskell.org/package/containers-0.6.4.1/docs/src/Data.Map.Internal.html#mapKeys
|
||||
-mapKeys :: (Ord k2, Hashable k2) => (k1 -> k2) -> HashMap k1 a -> HashMap k2 a
|
||||
-mapKeys f = fromList . foldrWithKey (\k x xs -> (f k, x) : xs) []
|
||||
-
|
||||
-- | The union of a list of maps, with a combining operation:
|
||||
-- (@'unionsWith' f == 'Prelude.foldl' ('unionWith' f) 'empty'@).
|
||||
--
|
||||
@ -1,26 +0,0 @@
|
||||
diff --git server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs
|
||||
index 6cb70cf0..0c3789cd 100644
|
||||
--- server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs
|
||||
+++ server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs
|
||||
@@ -45,7 +45,7 @@ import GHC.AssertNF
|
||||
import qualified ListT
|
||||
import qualified Network.WebSockets as WS
|
||||
import qualified StmContainers.Map as STMMap
|
||||
-import qualified System.IO.Error as E
|
||||
+--import qualified System.IO.Error as E
|
||||
|
||||
import qualified Hasura.Logging as L
|
||||
|
||||
@@ -287,12 +287,6 @@ createServerApp (WSServer logger@(L.Logger writeLog) serverStatus) wsHandlers !p
|
||||
let rcv = forever $ do
|
||||
-- Process all messages serially (important!), in a separate thread:
|
||||
msg <- liftIO $
|
||||
- -- Re-throw "receiveloop: resource vanished (Connection reset by peer)" :
|
||||
- -- https://github.com/yesodweb/wai/blob/master/warp/Network/Wai/Handler/Warp/Recv.hs#L112
|
||||
- -- as WS exception signaling cleanup below. It's not clear why exactly this gets
|
||||
- -- raised occasionally; I suspect an equivalent handler is missing from WS itself.
|
||||
- -- Regardless this should be safe:
|
||||
- handleJust (guard . E.isResourceVanishedError) (\()-> throw WS.ConnectionClosed) $
|
||||
WS.receiveData conn
|
||||
writeLog $ WSLog wsId (EMessageReceived $ TBS.fromLBS msg) Nothing
|
||||
_hOnMessage wsHandlers wsConn msg
|
||||
@ -1,7 +1,8 @@
|
||||
{ lib, stdenv, fetchgit, mlton }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ceptre-2016-11-27";
|
||||
pname = "ceptre";
|
||||
version = "unstable-2016-11-27";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/chrisamaphone/interactive-lp";
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
{ lib, stdenv, fetchgit, autoreconfHook, scheme48 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "scsh-0.7pre";
|
||||
pname = "scsh";
|
||||
version = "0.7pre";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://github.com/scheme/scsh.git";
|
||||
|
||||
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "ATSC A/52 stream decoder";
|
||||
homepage = "https://liba52.sourceforge.net/";
|
||||
homepage = "https://liba52.sourceforge.io/";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "A utility library to help manage common tasks with OpenAL applications";
|
||||
homepage = "https://kcat.strangesoft.net/alure.html";
|
||||
homepage = "https://github.com/kcat/alure";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "Library for operations on boolean expression binary trees";
|
||||
homepage = "https://perso.b2b2c.ca/~sarrazip/dev/boolstuff.html";
|
||||
homepage = "http://perso.b2b2c.ca/~sarrazip/dev/boolstuff.html";
|
||||
license = "GPL";
|
||||
maintainers = [ lib.maintainers.marcweber ];
|
||||
platforms = lib.platforms.all;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "capnproto";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://capnproto.org/capnproto-c++-${version}.tar.gz";
|
||||
sha256 = "03f1862ljdshg7d0rg3j7jzgm3ip55kzd2y91q7p0racax3hxx6i";
|
||||
sha256 = "sha256-soBUp6K/6kK/w5LI0AljDZTXLozoaiOtbxi15yV0Bk8=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libupnp";
|
||||
version = "1.14.6";
|
||||
version = "1.14.8";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "pupnp";
|
||||
repo = "pupnp";
|
||||
rev = "release-${version}";
|
||||
sha256 = "1f9861q5dicp6rx3jnp1j788xfjfaf3k4620p9r0b0k0lj2gk38c";
|
||||
sha256 = "sha256-Ipgb7fpIT+P/LwcF8ZmW4C1lj57f5rOQXwUl1Kh/oD8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# This has been automatically generated by the script
|
||||
# ./update.sh. This should not be changed by hand.
|
||||
{ mkDerivation, aeson, aeson-casing, base, fetchgit, hashable
|
||||
, hpack, lib, template-haskell, text, th-lift-instances
|
||||
, unordered-containers
|
||||
@ -7,8 +9,8 @@ mkDerivation {
|
||||
version = "0.1.0.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hasura/ci-info-hs.git";
|
||||
sha256 = "0rn1799z4y7z1c6ijrr0gscarg25zmnfq0z9rrmk4ad727vf1ppc";
|
||||
rev = "6af5a68450347a02295a9cd050d05a8b2f5c06ab";
|
||||
sha256 = "018vfyg0y2sn497nigjrcs6b1v3i9bna06dsbvgr6wjikcl6dhh4";
|
||||
rev = "68247a83738ac4bb9f719f0e4213aeb7be9565cf";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
libraryHaskellDepends = [
|
||||
@ -19,4 +21,5 @@ mkDerivation {
|
||||
prePatch = "hpack";
|
||||
homepage = "https://github.com/hasura/ci-info-hs#readme";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ lassulus ];
|
||||
}
|
||||
34
pkgs/development/misc/haskell/hasura/ekg-core.nix
Normal file
34
pkgs/development/misc/haskell/hasura/ekg-core.nix
Normal file
@ -0,0 +1,34 @@
|
||||
# This has been automatically generated by the script
|
||||
# ./update.sh. This should not be changed by hand.
|
||||
{ mkDerivation, async, atomic-primops, base, containers, criterion
|
||||
, fetchgit, generic-random, ghc-prim, hashable, hspec
|
||||
, hspec-smallcheck, HUnit, inspection-testing, lib, markdown-unlit
|
||||
, primitive, QuickCheck, smallcheck, text, unordered-containers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "ekg-core";
|
||||
version = "0.1.1.7";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hasura/ekg-core.git";
|
||||
sha256 = "1s58kjg1kbhsyfyj0zwhnnws9hg9zwj9jylpwicg54yi78w962ys";
|
||||
rev = "9fc8f94685c149a909b66bad4167455d8ae1002c";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
libraryHaskellDepends = [
|
||||
atomic-primops base containers ghc-prim hashable inspection-testing
|
||||
primitive text unordered-containers
|
||||
];
|
||||
testHaskellDepends = [
|
||||
async atomic-primops base containers generic-random ghc-prim
|
||||
hashable hspec hspec-smallcheck HUnit inspection-testing
|
||||
markdown-unlit primitive QuickCheck smallcheck text
|
||||
unordered-containers
|
||||
];
|
||||
testToolDepends = [ markdown-unlit ];
|
||||
benchmarkHaskellDepends = [ base criterion ];
|
||||
doHaddock = false;
|
||||
homepage = "https://github.com/tibbe/ekg-core";
|
||||
description = "Tracking of system metrics";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ lassulus ];
|
||||
}
|
||||
22
pkgs/development/misc/haskell/hasura/ekg-json.nix
Normal file
22
pkgs/development/misc/haskell/hasura/ekg-json.nix
Normal file
@ -0,0 +1,22 @@
|
||||
# This has been automatically generated by the script
|
||||
# ./update.sh. This should not be changed by hand.
|
||||
{ mkDerivation, aeson, base, ekg-core, fetchgit, lib, text
|
||||
, unordered-containers, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "ekg-json";
|
||||
version = "0.1.0.7";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hasura/ekg-json.git";
|
||||
sha256 = "1yf9x7gh66q27c3wv5m00ijf2qpiwm53jjlhrj2yc1glv684wf4v";
|
||||
rev = "f25b9ddb7aae18059ef707a5ce30d6a54a63db13";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
libraryHaskellDepends = [
|
||||
aeson base ekg-core text unordered-containers vector
|
||||
];
|
||||
homepage = "https://github.com/tibbe/ekg-json";
|
||||
description = "JSON encoding of ekg metrics";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ lassulus ];
|
||||
}
|
||||
81
pkgs/development/misc/haskell/hasura/graphql-engine.nix
Normal file
81
pkgs/development/misc/haskell/hasura/graphql-engine.nix
Normal file
@ -0,0 +1,81 @@
|
||||
# This has been automatically generated by the script
|
||||
# ./update.sh. This should not be changed by hand.
|
||||
{ mkDerivation, aeson, aeson-casing, ansi-wl-pprint, asn1-encoding
|
||||
, asn1-types, async, attoparsec, attoparsec-iso8601, auto-update
|
||||
, base, base16-bytestring, base64-bytestring, binary, byteorder
|
||||
, bytestring, case-insensitive, ci-info, containers, cron
|
||||
, cryptonite, data-has, deepseq, dependent-map, dependent-sum
|
||||
, directory, ekg-core, ekg-json, exceptions, fast-logger, fetchgit
|
||||
, file-embed, filepath, ghc-heap-view, graphql-parser, hashable
|
||||
, hashable-time, hspec, hspec-core, hspec-expectations
|
||||
, hspec-expectations-lifted, http-api-data, http-client
|
||||
, http-client-tls, http-conduit, http-types, immortal
|
||||
, insert-ordered-containers, jose, kan-extensions, lens, lens-aeson
|
||||
, lib, lifted-async, lifted-base, list-t, memory, mime-types
|
||||
, mmorph, monad-control, monad-loops, monad-validate, mtl, mustache
|
||||
, mysql, mysql-simple, natural-transformation, network, network-uri
|
||||
, odbc, optparse-applicative, pem, pg-client, postgresql-binary
|
||||
, postgresql-libpq, pretty-simple, process, profunctors, psqueues
|
||||
, QuickCheck, quickcheck-instances, random, regex-tdfa
|
||||
, resource-pool, retry, safe, safe-exceptions, scientific
|
||||
, semialign, semigroups, semver, shakespeare, some, split
|
||||
, Spock-core, stm, stm-containers, tagged, template-haskell, text
|
||||
, text-builder, text-conversions, these, time, transformers
|
||||
, transformers-base, unix, unordered-containers, uri-encode
|
||||
, utf8-string, uuid, validation, vector, vector-instances, wai
|
||||
, warp, websockets, wreq, x509, x509-store, yaml, zlib
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "graphql-engine";
|
||||
version = "1.0.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hasura/graphql-engine.git";
|
||||
sha256 = "04s8rczvm0l5dbh14g2vav2wbqb4fg51471fncqf36s59img14b7";
|
||||
rev = "cf6f3edc1f6df7843dfb91be6dcb0fd7cc94d133";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
aeson aeson-casing ansi-wl-pprint asn1-encoding asn1-types async
|
||||
attoparsec attoparsec-iso8601 auto-update base base16-bytestring
|
||||
base64-bytestring binary byteorder bytestring case-insensitive
|
||||
ci-info containers cron cryptonite data-has deepseq dependent-map
|
||||
dependent-sum directory ekg-core ekg-json exceptions fast-logger
|
||||
file-embed filepath ghc-heap-view graphql-parser hashable
|
||||
hashable-time http-api-data http-client http-client-tls
|
||||
http-conduit http-types immortal insert-ordered-containers jose
|
||||
kan-extensions lens lens-aeson lifted-async lifted-base list-t
|
||||
memory mime-types mmorph monad-control monad-loops monad-validate
|
||||
mtl mustache mysql mysql-simple network network-uri odbc
|
||||
optparse-applicative pem pg-client postgresql-binary
|
||||
postgresql-libpq pretty-simple process profunctors psqueues
|
||||
QuickCheck quickcheck-instances random regex-tdfa resource-pool
|
||||
retry safe-exceptions scientific semialign semigroups semver
|
||||
shakespeare some split Spock-core stm stm-containers tagged
|
||||
template-haskell text text-builder text-conversions these time
|
||||
transformers transformers-base unix unordered-containers uri-encode
|
||||
utf8-string uuid validation vector vector-instances wai warp
|
||||
websockets wreq x509 x509-store yaml zlib
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
base bytestring ekg-core kan-extensions pg-client text
|
||||
text-conversions time unix
|
||||
];
|
||||
testHaskellDepends = [
|
||||
aeson base bytestring containers cron dependent-map dependent-sum
|
||||
graphql-parser hspec hspec-core hspec-expectations
|
||||
hspec-expectations-lifted http-client http-client-tls http-types
|
||||
insert-ordered-containers jose kan-extensions lens lifted-base
|
||||
mmorph monad-control mtl natural-transformation network-uri
|
||||
optparse-applicative pg-client process QuickCheck safe scientific
|
||||
split template-haskell text time transformers-base
|
||||
unordered-containers vector
|
||||
];
|
||||
doCheck = false;
|
||||
homepage = "https://www.hasura.io";
|
||||
description = "GraphQL API over Postgres";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ lassulus ];
|
||||
}
|
||||
@ -1,75 +0,0 @@
|
||||
{ mkDerivation, aeson, aeson-casing, ansi-wl-pprint, asn1-encoding
|
||||
, asn1-types, async, attoparsec, attoparsec-iso8601, auto-update
|
||||
, base, base64-bytestring, byteorder, bytestring, case-insensitive
|
||||
, ci-info, containers, criterion, cryptonite, data-has, deepseq
|
||||
, dependent-map, dependent-sum, directory, ekg-core, ekg-json
|
||||
, fast-logger, fetchgit, file-embed, filepath, generic-arbitrary
|
||||
, ghc-heap-view, graphql-parser, hashable, hspec, hspec-core
|
||||
, hspec-expectations-lifted, http-client, http-client-tls
|
||||
, http-types, immortal, insert-ordered-containers, jose, lens
|
||||
, lifted-async, lifted-base, list-t, mime-types, monad-control
|
||||
, monad-time, monad-validate, mtl, mustache, mwc-probability
|
||||
, mwc-random, natural-transformation, network, network-uri
|
||||
, optparse-applicative, pem, pg-client, postgresql-binary
|
||||
, postgresql-libpq, process, profunctors, psqueues, QuickCheck
|
||||
, regex-tdfa, safe, scientific, semver, shakespeare, split
|
||||
, Spock-core, lib, stm, stm-containers, template-haskell, text
|
||||
, text-builder, text-conversions, th-lift-instances, these, time
|
||||
, transformers, transformers-base, unix, unordered-containers
|
||||
, uri-encode, uuid, vector, wai, wai-websockets, warp, websockets
|
||||
, wreq, x509, yaml, zlib, witherable, semialign, validation, cron
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "graphql-engine";
|
||||
version = "1.0.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hasura/graphql-engine.git";
|
||||
sha256 = "sha256-tNKoi3dtoXj0nn4qBgLBroo7SgX7SdVaHtBqjs1S3hQ=";
|
||||
rev = "1e3eb035d3c915032ba23e502bcb0132b4d54202";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
aeson aeson-casing ansi-wl-pprint asn1-encoding asn1-types async
|
||||
attoparsec attoparsec-iso8601 auto-update base base64-bytestring
|
||||
byteorder bytestring case-insensitive ci-info containers cryptonite
|
||||
data-has deepseq dependent-map dependent-sum directory ekg-core
|
||||
ekg-json fast-logger file-embed filepath generic-arbitrary
|
||||
ghc-heap-view graphql-parser hashable http-client http-client-tls
|
||||
http-types immortal insert-ordered-containers jose lens
|
||||
lifted-async lifted-base list-t mime-types monad-control monad-time
|
||||
monad-validate mtl mustache network network-uri
|
||||
optparse-applicative pem pg-client postgresql-binary
|
||||
postgresql-libpq process profunctors psqueues QuickCheck regex-tdfa
|
||||
scientific semver shakespeare split Spock-core stm stm-containers
|
||||
template-haskell text text-builder text-conversions
|
||||
th-lift-instances these time transformers transformers-base unix
|
||||
unordered-containers uri-encode uuid vector wai wai-websockets warp
|
||||
websockets wreq x509 yaml zlib
|
||||
witherable semialign validation
|
||||
cron
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
base bytestring pg-client text text-conversions
|
||||
];
|
||||
testHaskellDepends = [
|
||||
aeson base bytestring hspec hspec-core hspec-expectations-lifted
|
||||
http-client http-client-tls lifted-base monad-control mtl
|
||||
natural-transformation optparse-applicative pg-client process
|
||||
QuickCheck safe split text time transformers-base
|
||||
unordered-containers
|
||||
];
|
||||
benchmarkHaskellDepends = [
|
||||
async base bytestring criterion deepseq mwc-probability mwc-random
|
||||
split text vector
|
||||
];
|
||||
doCheck = false;
|
||||
homepage = "https://www.hasura.io";
|
||||
description = "GraphQL API over Postgres";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ offline ];
|
||||
hydraPlatforms = [];
|
||||
broken = true;
|
||||
}
|
||||
33
pkgs/development/misc/haskell/hasura/graphql-parser.nix
Normal file
33
pkgs/development/misc/haskell/hasura/graphql-parser.nix
Normal file
@ -0,0 +1,33 @@
|
||||
# This has been automatically generated by the script
|
||||
# ./update.sh. This should not be changed by hand.
|
||||
{ mkDerivation, aeson, attoparsec, base, bytestring, containers
|
||||
, criterion, deepseq, fetchgit, filepath, hashable, hedgehog, lib
|
||||
, prettyprinter, scientific, template-haskell, text, text-builder
|
||||
, th-lift-instances, unordered-containers, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "graphql-parser";
|
||||
version = "0.2.0.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hasura/graphql-parser-hs.git";
|
||||
sha256 = "015b1h475k8wmhm9hkrvyxr985x7d8yc0xgcdqj7vmziixvfwwwj";
|
||||
rev = "79beb0e85e00422a8a15318c0bc573765fc7b246";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
libraryHaskellDepends = [
|
||||
aeson attoparsec base bytestring containers deepseq filepath
|
||||
hashable hedgehog prettyprinter scientific template-haskell text
|
||||
text-builder th-lift-instances unordered-containers vector
|
||||
];
|
||||
testHaskellDepends = [
|
||||
attoparsec base bytestring hedgehog prettyprinter scientific text
|
||||
text-builder
|
||||
];
|
||||
benchmarkHaskellDepends = [
|
||||
base bytestring criterion prettyprinter text text-builder
|
||||
];
|
||||
homepage = "https://github.com/hasura/graphql-parser-hs";
|
||||
description = "A native Haskell GraphQL parser";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ lassulus ];
|
||||
}
|
||||
@ -1,36 +0,0 @@
|
||||
{ mkDerivation, aeson, attoparsec, base, bytestring, containers
|
||||
, criterion, fetchgit, filepath, hedgehog, hpack, prettyprinter
|
||||
, protolude, regex-tdfa, scientific, lib, template-haskell, text
|
||||
, text-builder, th-lift-instances, unordered-containers, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "graphql-parser";
|
||||
version = "0.1.0.1";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hasura/graphql-parser-hs.git";
|
||||
sha256 = "sha256-oem/h0AQPk7eSM/P6wMoWV9KirxutE4hnQWwrpQ6TGk=";
|
||||
rev = "ba8e26fef1488cf3c8c08e86f02730f56ec84e1f";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
libraryHaskellDepends = [
|
||||
aeson attoparsec base bytestring containers filepath hedgehog
|
||||
prettyprinter protolude regex-tdfa scientific template-haskell text
|
||||
text-builder th-lift-instances unordered-containers vector
|
||||
];
|
||||
libraryToolDepends = [ hpack ];
|
||||
testHaskellDepends = [
|
||||
aeson attoparsec base bytestring containers filepath hedgehog
|
||||
prettyprinter protolude regex-tdfa scientific template-haskell text
|
||||
text-builder th-lift-instances unordered-containers vector
|
||||
];
|
||||
benchmarkHaskellDepends = [
|
||||
aeson attoparsec base bytestring containers criterion filepath
|
||||
hedgehog prettyprinter protolude regex-tdfa scientific
|
||||
template-haskell text text-builder th-lift-instances
|
||||
unordered-containers vector
|
||||
];
|
||||
doCheck = false;
|
||||
prePatch = "hpack";
|
||||
homepage = "https://github.com/hasura/graphql-parser-hs#readme";
|
||||
license = lib.licenses.bsd3;
|
||||
}
|
||||
36
pkgs/development/misc/haskell/hasura/pg-client.nix
Normal file
36
pkgs/development/misc/haskell/hasura/pg-client.nix
Normal file
@ -0,0 +1,36 @@
|
||||
# This has been automatically generated by the script
|
||||
# ./update.sh. This should not be changed by hand.
|
||||
{ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring
|
||||
, Cabal, criterion, ekg-core, fetchgit, file-embed, hashable
|
||||
, hashtables, hasql, hasql-pool, hasql-transaction, hspec, lib
|
||||
, mmorph, monad-control, mtl, postgresql, postgresql-binary
|
||||
, postgresql-libpq, resource-pool, retry, scientific
|
||||
, template-haskell, text, text-builder, time, transformers-base
|
||||
, uuid, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "pg-client";
|
||||
version = "0.1.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hasura/pg-client-hs.git";
|
||||
sha256 = "1y79s3ai4h82szpm1j5n5ygybqr7cza9l0raxf39vgn66jhy1jd2";
|
||||
rev = "92975d0f8f933c8d06913dc97af259253bf7fb5f";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
setupHaskellDepends = [ base Cabal ];
|
||||
libraryHaskellDepends = [
|
||||
aeson aeson-casing attoparsec base bytestring ekg-core hashable
|
||||
hashtables mmorph monad-control mtl postgresql-binary
|
||||
postgresql-libpq resource-pool retry scientific template-haskell
|
||||
text text-builder time transformers-base uuid vector
|
||||
];
|
||||
librarySystemDepends = [ postgresql ];
|
||||
testHaskellDepends = [ base bytestring hspec mtl ];
|
||||
benchmarkHaskellDepends = [
|
||||
base bytestring criterion file-embed hashable hasql hasql-pool
|
||||
hasql-transaction mtl postgresql-libpq text text-builder
|
||||
];
|
||||
homepage = "https://github.com/hasura/platform";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ lassulus ];
|
||||
}
|
||||
@ -1,30 +0,0 @@
|
||||
{ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring
|
||||
, criterion, fetchgit, file-embed, hashable, hashtables, hasql
|
||||
, hasql-pool, hasql-transaction, monad-control, mtl
|
||||
, postgresql-binary, postgresql-libpq, resource-pool, retry
|
||||
, scientific, lib, template-haskell, text, text-builder, th-lift
|
||||
, th-lift-instances, time, transformers-base, uuid, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "pg-client";
|
||||
version = "0.1.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hasura/pg-client-hs.git";
|
||||
sha256 = "1941gj5yp24kx0xb1nd774nwp5vnpsp6m83isqkwpyz9spl4sq7l";
|
||||
rev = "70a849d09bea9461e72c5a5bbde06df65aab61c0";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
libraryHaskellDepends = [
|
||||
aeson aeson-casing attoparsec base bytestring hashable hashtables
|
||||
monad-control mtl postgresql-binary postgresql-libpq resource-pool
|
||||
retry scientific template-haskell text text-builder th-lift
|
||||
th-lift-instances time transformers-base uuid vector
|
||||
];
|
||||
testHaskellDepends = [ base ];
|
||||
benchmarkHaskellDepends = [
|
||||
base bytestring criterion file-embed hashable hasql hasql-pool
|
||||
hasql-transaction mtl postgresql-libpq text text-builder
|
||||
];
|
||||
homepage = "https://github.com/hasura/platform";
|
||||
license = lib.licenses.bsd3;
|
||||
}
|
||||
24
pkgs/development/misc/haskell/hasura/pool.nix
Normal file
24
pkgs/development/misc/haskell/hasura/pool.nix
Normal file
@ -0,0 +1,24 @@
|
||||
# This has been automatically generated by the script
|
||||
# ./update.sh. This should not be changed by hand.
|
||||
{ mkDerivation, base, fetchgit, hashable, hspec, lib, monad-control
|
||||
, stm, time, transformers, transformers-base, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "resource-pool";
|
||||
version = "0.2.3.2";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/hasura/pool.git";
|
||||
sha256 = "00q1fxh72fgjwl1pi3lnp4xg8f3kfm6q12gs9scinwbymfgzarms";
|
||||
rev = "bc4c3f739a8fb8ec4444336a34662895831c9acf";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
libraryHaskellDepends = [
|
||||
base hashable monad-control stm time transformers transformers-base
|
||||
vector
|
||||
];
|
||||
testHaskellDepends = [ base hspec ];
|
||||
homepage = "http://github.com/bos/pool";
|
||||
description = "A high-performance striped resource pooling implementation";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ lassulus ];
|
||||
}
|
||||
85
pkgs/development/misc/haskell/hasura/update.sh
Executable file
85
pkgs/development/misc/haskell/hasura/update.sh
Executable file
@ -0,0 +1,85 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p cabal2nix curl jq -I nixpkgs=.
|
||||
#
|
||||
# This script will update the hasura derivations to the latest version using
|
||||
# cabal2nix.
|
||||
#
|
||||
# Note that you should always try building hasura graphql-engine after updating it here, since
|
||||
# some of the overrides in pkgs/development/haskell/configuration-nix.nix may
|
||||
# need to be updated/changed.
|
||||
|
||||
set -eo pipefail
|
||||
|
||||
# This is the directory of this update.sh script.
|
||||
script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
|
||||
|
||||
# graphql-engine derivation created with cabal2nix.
|
||||
engine_derivation_file="${script_dir}/graphql-engine.nix"
|
||||
parser_derivation_file="${script_dir}/graphql-parser.nix"
|
||||
ciinfo_derivation_file="${script_dir}/ci-info.nix"
|
||||
pgclient_derivation_file="${script_dir}/pg-client.nix"
|
||||
pool_derivation_file="${script_dir}/pool.nix"
|
||||
ekgcore_derivation_file="${script_dir}/ekg-core.nix"
|
||||
ekgjson_derivation_file="${script_dir}/ekg-json.nix"
|
||||
|
||||
# TODO: get current revision of graphql-engine in Nixpkgs.
|
||||
# old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$engine_derivation_file")"
|
||||
|
||||
# This is the latest release version of graphql-engine on GitHub.
|
||||
new_version=$(curl --silent "https://api.github.com/repos/hasura/graphql-engine/releases" | jq '.[0].tag_name' --raw-output)
|
||||
|
||||
echo "Running cabal2nix and outputting to ${engine_derivation_file}..."
|
||||
|
||||
echo "# This has been automatically generated by the script" > "$engine_derivation_file"
|
||||
echo "# ./update.sh. This should not be changed by hand." >> "$engine_derivation_file"
|
||||
|
||||
cabal2nix --revision "$new_version" --subpath server --maintainer lassulus --no-check "https://github.com/hasura/graphql-engine.git" >> "$engine_derivation_file"
|
||||
|
||||
echo "Running cabal2nix and outputting to ${parser_derivation_file}..."
|
||||
|
||||
echo "# This has been automatically generated by the script" > "$parser_derivation_file"
|
||||
echo "# ./update.sh. This should not be changed by hand." >> "$parser_derivation_file"
|
||||
|
||||
cabal2nix --maintainer lassulus "https://github.com/hasura/graphql-parser-hs.git" >> "$parser_derivation_file"
|
||||
|
||||
echo "Running cabal2nix and outputting to ${ciinfo_derivation_file}..."
|
||||
|
||||
echo "# This has been automatically generated by the script" > "$ciinfo_derivation_file"
|
||||
echo "# ./update.sh. This should not be changed by hand." >> "$ciinfo_derivation_file"
|
||||
|
||||
cabal2nix --maintainer lassulus "https://github.com/hasura/ci-info-hs.git" >> "$ciinfo_derivation_file"
|
||||
|
||||
echo "Running cabal2nix and outputting to ${pgclient_derivation_file}..."
|
||||
|
||||
echo "# This has been automatically generated by the script" > "$pgclient_derivation_file"
|
||||
echo "# ./update.sh. This should not be changed by hand." >> "$pgclient_derivation_file"
|
||||
|
||||
cabal2nix --maintainer lassulus "https://github.com/hasura/pg-client-hs.git" >> "$pgclient_derivation_file"
|
||||
|
||||
echo "Running cabal2nix and outputting to ${pool_derivation_file}..."
|
||||
|
||||
echo "# This has been automatically generated by the script" > "$pool_derivation_file"
|
||||
echo "# ./update.sh. This should not be changed by hand." >> "$pool_derivation_file"
|
||||
|
||||
cabal2nix --maintainer lassulus "https://github.com/hasura/pool.git" >> "$pool_derivation_file"
|
||||
|
||||
echo "Running cabal2nix and outputting to ${ekgcore_derivation_file}..."
|
||||
|
||||
echo "# This has been automatically generated by the script" > "$ekgcore_derivation_file"
|
||||
echo "# ./update.sh. This should not be changed by hand." >> "$ekgcore_derivation_file"
|
||||
|
||||
cabal2nix --maintainer lassulus "https://github.com/hasura/ekg-core.git" >> "$ekgcore_derivation_file"
|
||||
|
||||
echo "Running cabal2nix and outputting to ${ekgjson_derivation_file}..."
|
||||
|
||||
echo "# This has been automatically generated by the script" > "$ekgjson_derivation_file"
|
||||
echo "# ./update.sh. This should not be changed by hand." >> "$ekgjson_derivation_file"
|
||||
|
||||
cabal2nix --maintainer lassulus "https://github.com/hasura/ekg-json.git" >> "$ekgjson_derivation_file"
|
||||
|
||||
echo "###################"
|
||||
echo "please update pkgs/servers/hasura/cli.nix vendorSha256"
|
||||
echo "please update pkgs/development/haskell-modules/configuration-common.nix graphql-engine version"
|
||||
echo "###################"
|
||||
|
||||
echo "Finished."
|
||||
@ -72,7 +72,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Radically simple IT automation";
|
||||
homepage = "http://www.ansible.com";
|
||||
homepage = "https://www.ansible.com";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
|
||||
@ -46,7 +46,7 @@ buildPythonPackage rec {
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.ansible.com";
|
||||
homepage = "https://www.ansible.com";
|
||||
description = "Radically simple IT automation";
|
||||
license = [ licenses.gpl3 ] ;
|
||||
maintainers = with maintainers; [ joamaki costrouc hexa ];
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
{ buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, datasette
|
||||
, pytestCheckHook
|
||||
, pytest-asyncio
|
||||
, sqlite-utils
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "datasette-template-sql";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simonw";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1ag5f62y445jscxnklcfd84pjinkknmrpk1kmm2j121p7484hrsn";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ datasette ];
|
||||
|
||||
checkInputs = [ pytestCheckHook pytest-asyncio sqlite-utils ];
|
||||
|
||||
pythonImportsCheck = [ "datasette_template_sql" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Datasette plugin for executing SQL queries from templates";
|
||||
homepage = "https://datasette.io/plugins/datasette-template-sql";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.MostAwesomeDude ];
|
||||
};
|
||||
}
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "markdown2";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
|
||||
# PyPI does not contain tests, so using GitHub instead.
|
||||
src = fetchFromGitHub {
|
||||
owner = "trentm";
|
||||
repo = "python-markdown2";
|
||||
rev = version;
|
||||
sha256 = "sha256:03qmf087phpj0h9hx111k4r5pkm48dhb61mqhp1v75gd09k0z79z";
|
||||
sha256 = "0y7kh9jj8ys00qkfmmyqj63y21g7wn7yr715kj0j1nabs6xbp0y7";
|
||||
};
|
||||
|
||||
checkInputs = [ pygments ];
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-sanic";
|
||||
version = "1.7.1";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yunstanford";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OtyulpSHUWERtcIRT5j3YtHciIxFiIFYKqtlEd1NSFw=";
|
||||
sha256 = "128qxpqilqjhpjzjzzfzsgi4bc0vxwmz0k3xwry6fwhyzcf2bzl5";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -5,15 +5,17 @@
|
||||
, typing-extensions
|
||||
, requests
|
||||
, yarl
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "transmission-rpc";
|
||||
version = "3.2.6";
|
||||
version = "3.2.7";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1k4yyrbdqxp43zsmcg37a99x4s2kwsm7yyajf810y2wx61nq49d1";
|
||||
sha256 = "36c022fddb45084c0d9f63db34abf79b66a0f2bab6484f4ac32eb2744a06fa15";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -25,11 +27,12 @@ buildPythonPackage rec {
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "transmission_rpc" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module that implements the Transmission bittorent client RPC protocol";
|
||||
homepage = "https://pypi.python.org/project/transmission-rpc/";
|
||||
homepage = "https://github.com/Trim21/transmission-rpc";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ eyjhb ];
|
||||
};
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "txtorcon";
|
||||
version = "20.0.0";
|
||||
version = "21.1.0";
|
||||
|
||||
checkInputs = [ pytest mock lsof GeoIP ];
|
||||
propagatedBuildInputs = [
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0yipb41w2icbj50d3z1j92d8w6xhbqd1rnmd31vzb5k3g20x0b0j";
|
||||
sha256 = "aebf0b9ec6c69a029f6b61fd534e785692e28fdcd2fd003ce3cc132b9393b7d6";
|
||||
};
|
||||
|
||||
# zope.interface issue
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, supportedGhcVersions ? [ "884" "8104" ], stdenv, haskellPackages
|
||||
{ lib, supportedGhcVersions ? [ "884" "8106" ], stdenv, haskellPackages
|
||||
, haskell }:
|
||||
#
|
||||
# The recommended way to override this package is
|
||||
|
||||
@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
|
||||
pname = "gnu-mdk";
|
||||
version = "1.3.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://ftp.gnu.org/gnu/mdk/v${version}/mdk-${version}.tar.gz";
|
||||
url = "mirror://gnu/gnu/mdk/v${version}/mdk-${version}.tar.gz";
|
||||
sha256 = "0bhk3c82kyp8167h71vdpbcr852h5blpnwggcswqqwvvykbms7lb";
|
||||
};
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "reviewdog";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "18fk4xzl6ys3azyw9ap14zgf3av5fdsrdn4mxx9calimvzbl4nfp";
|
||||
sha256 = "sha256-PneUN59ddYvhVIXqZeDCh0tWADkRTU9Dj0HNf0V8s3g=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1qcp8v426500cpfrchazsh5rw4nr0c31vmrhbfgb9js4vxrn8acr";
|
||||
vendorSha256 = "sha256-NI5pzKfUTjXqDukeQ1wFN/D0TBeXfDPGL69oEL7reCE=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "yq-go";
|
||||
version = "4.11.2";
|
||||
version = "4.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mikefarah";
|
||||
repo = "yq";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IzsI0jS+chm/xOdL1O11qxQTstKcUeZ9YxL7RtKHBZw=";
|
||||
sha256 = "sha256-AyI3RwWuHH760jUCCWhlBUkYYQ553QOmjFkdnvqKBtk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-X162NQ+NgOUbwEA6xdnuy0u18/GQLhR3zzi+TVgzMIc=";
|
||||
vendorSha256 = "sha256-u7elWOW/tz1ISM/KC1njkZmPi8AEEssZ5QtxK/+1/1I=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://software.cedar-solutions.com/utilities.html";
|
||||
homepage = "https://software.cedar-solutions.com/utilities.html";
|
||||
description = "Print large banners to ASCII terminals";
|
||||
license = licenses.gpl2Only;
|
||||
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, SDL, lua, libGLU, libGL }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bitsnbots";
|
||||
version = "20111230";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://moikmellah.org/downloads/bitsnbots/bitsnbots.source.tgz";
|
||||
sha256 = "1iiclm6bfpp2p6d692hpnw25xyr48ki1xkcxa7fvh5b7m1519gsp";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
sed -i '/^INCLUDE/d' Makefile.linux
|
||||
'';
|
||||
|
||||
makefile = "Makefile.linux";
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL";
|
||||
|
||||
NIX_LDFLAGS = "-lGL";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/${pname}-${version}
|
||||
cp -R bitsnbots resource scripts README $out/share/${pname}-${version}
|
||||
mkdir -p $out/bin
|
||||
ln -s $out/share/${pname}-${version}/bitsnbots $out/bin
|
||||
'';
|
||||
|
||||
buildInputs = [ SDL lua libGLU libGL ];
|
||||
|
||||
meta = {
|
||||
description = "Simple puzzle game with moving robots";
|
||||
homepage = "http://moikmellah.org/blog/?page_id=19";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
@ -3,10 +3,18 @@
|
||||
"date": "2020-03-27",
|
||||
"new": "vim-gist"
|
||||
},
|
||||
"nvim-bufferline-lua": {
|
||||
"date": "2021-08-22",
|
||||
"new": "bufferline-nvim"
|
||||
},
|
||||
"nvim-lsp": {
|
||||
"date": "2020-08-31",
|
||||
"new": "nvim-lspconfig"
|
||||
},
|
||||
"nvim-toggleterm-lua": {
|
||||
"date": "2021-08-22",
|
||||
"new": "toggleterm-nvim"
|
||||
},
|
||||
"vim-jade": {
|
||||
"date": "2020-03-27",
|
||||
"new": "vim-pug"
|
||||
|
||||
@ -77,12 +77,12 @@ final: prev:
|
||||
|
||||
ale = buildVimPluginFrom2Nix {
|
||||
pname = "ale";
|
||||
version = "2021-08-09";
|
||||
version = "2021-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dense-analysis";
|
||||
repo = "ale";
|
||||
rev = "a099fe24b2e898c93c0aa4391e5a5631932684a6";
|
||||
sha256 = "0gp764xcspvwmhqhjf8f94y2wxw32ids0zfy22r1z0s2zm85088r";
|
||||
rev = "f896744feec260fb196d38bba23308080c04192c";
|
||||
sha256 = "1j30gi0arpmya26cjcd5spdb1l7p4djkvpkfvd267bs2fdyh958q";
|
||||
};
|
||||
meta.homepage = "https://github.com/dense-analysis/ale/";
|
||||
};
|
||||
@ -173,12 +173,12 @@ final: prev:
|
||||
|
||||
asyncomplete-vim = buildVimPluginFrom2Nix {
|
||||
pname = "asyncomplete-vim";
|
||||
version = "2021-05-04";
|
||||
version = "2021-08-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "prabirshrestha";
|
||||
repo = "asyncomplete.vim";
|
||||
rev = "6c653c3f8f1c1cf7a34522c9555d5160f36d29ee";
|
||||
sha256 = "1zzdybfswlh66gw8a3imkwf7m6g13rlf6dqyg71c6bfmn3zlx2l0";
|
||||
rev = "73ac8e4e4525ba48e82d0f30643987b015233d4e";
|
||||
sha256 = "0gbmkxrxcwr5adzp2j7dd64dpzc775m1b9sv0si96gh9pb6119q2";
|
||||
};
|
||||
meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/";
|
||||
};
|
||||
@ -341,12 +341,12 @@ final: prev:
|
||||
|
||||
bracey-vim = buildVimPluginFrom2Nix {
|
||||
pname = "bracey-vim";
|
||||
version = "2021-05-11";
|
||||
version = "2021-08-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "turbio";
|
||||
repo = "bracey.vim";
|
||||
rev = "457933c107db65ff7e2695e07209a9a2934544b7";
|
||||
sha256 = "1x8c8l9x4i9n2rlh3a8zha0ni85v04p32w7yciwxp7ddlwzf3lwh";
|
||||
rev = "4e1a22acc01787814819df1057d039d4ecf357eb";
|
||||
sha256 = "05cz8hx2jk3zp1h65j4pfpvdvcff65wp59j7j796ljnjaggj9kh2";
|
||||
};
|
||||
meta.homepage = "https://github.com/turbio/bracey.vim/";
|
||||
};
|
||||
@ -387,6 +387,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/jlanzarotta/bufexplorer/";
|
||||
};
|
||||
|
||||
bufferline-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "bufferline-nvim";
|
||||
version = "2021-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "akinsho";
|
||||
repo = "bufferline.nvim";
|
||||
rev = "35ac1c1e2e6f7cbf6a1ad027d8bf019a284b28d5";
|
||||
sha256 = "1sdq5yjav7ak5lkw0kiz8mwffnxva94w1xav8y8kxy8f95b78a2g";
|
||||
};
|
||||
meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
|
||||
};
|
||||
|
||||
BufOnly-vim = buildVimPluginFrom2Nix {
|
||||
pname = "BufOnly-vim";
|
||||
version = "2010-10-18";
|
||||
@ -425,24 +437,24 @@ final: prev:
|
||||
|
||||
caw-vim = buildVimPluginFrom2Nix {
|
||||
pname = "caw-vim";
|
||||
version = "2021-04-15";
|
||||
version = "2021-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tyru";
|
||||
repo = "caw.vim";
|
||||
rev = "42637427b1760f3f3006fafe95fb3e25fedca07b";
|
||||
sha256 = "1xyc50y7cicqwvzqyj0jm3bzqbwcy39v4mdjjx2czlmzzgv8qlqy";
|
||||
rev = "2c0cd18aa113cc255daf4366f1d01a7a25ce0110";
|
||||
sha256 = "1sa7mhqvfgyr3fsdyl9bjb7scw8ii4y9ig4n3qq77lm4k7snzp2v";
|
||||
};
|
||||
meta.homepage = "https://github.com/tyru/caw.vim/";
|
||||
};
|
||||
|
||||
chadtree = buildVimPluginFrom2Nix {
|
||||
pname = "chadtree";
|
||||
version = "2021-08-19";
|
||||
version = "2021-08-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "chadtree";
|
||||
rev = "69544e754415ff9788e8ed55fa89ab23554b2526";
|
||||
sha256 = "1p73am7r6740k4l7vyndcd2pxdx9qpyicp8f07lcx950k4qq7yr2";
|
||||
rev = "b84f08364a3b3a6eb9795ecdab418d1e786b0be4";
|
||||
sha256 = "0jh6xbiqrnldk1l2p1jqfi34wwci7nx2pxhvcv0fi9mb7r5bzvmw";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/chadtree/";
|
||||
};
|
||||
@ -473,12 +485,12 @@ final: prev:
|
||||
|
||||
ci_dark = buildVimPluginFrom2Nix {
|
||||
pname = "ci_dark";
|
||||
version = "2021-06-20";
|
||||
version = "2021-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "yunlingz";
|
||||
repo = "ci_dark";
|
||||
rev = "8ff6b42196ccb1f84b781a8ccb10bc117ad58e88";
|
||||
sha256 = "0ym3sg6vd0jwqq33dx5vfblhf0hjis9zfp0fcsn4iyiq0rf7jphz";
|
||||
rev = "a2fb69aabbe2bbbf1fd08d34c168f2348a4af493";
|
||||
sha256 = "1fd6pk0vl8il42d53rzddlbbk5r4k0gz95bk964pc81z38bmskcw";
|
||||
};
|
||||
meta.homepage = "https://github.com/yunlingz/ci_dark/";
|
||||
};
|
||||
@ -617,12 +629,12 @@ final: prev:
|
||||
|
||||
cmp_luasnip = buildVimPluginFrom2Nix {
|
||||
pname = "cmp_luasnip";
|
||||
version = "2021-08-16";
|
||||
version = "2021-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "saadparwaiz1";
|
||||
repo = "cmp_luasnip";
|
||||
rev = "1852a9e9e3a0e0ba0363e3be6c87f46982fba549";
|
||||
sha256 = "1ji3ys0k0sw23yh4yk3pgb2ab895jfsjnsjrpy0idvmxclk20l0m";
|
||||
rev = "fc033ce441b29f1755fd2314125772d21e5c5127";
|
||||
sha256 = "1np6x7wybh7w1m06h03sczv35a7ag3j37a8sk0yjcm95vysmwikd";
|
||||
};
|
||||
meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/";
|
||||
};
|
||||
@ -701,12 +713,12 @@ final: prev:
|
||||
|
||||
coc-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "coc-nvim";
|
||||
version = "2021-08-18";
|
||||
version = "2021-08-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neoclide";
|
||||
repo = "coc.nvim";
|
||||
rev = "e141be935e45800947f4f88ea89a2067c5d7b47f";
|
||||
sha256 = "0k2ll4vcjsj8xak4ki9h6m89rkhzdb0d70n4p34hhajf6li4lbfc";
|
||||
rev = "5f5e3135de04c9e245c1ecf53b67836c692fd06a";
|
||||
sha256 = "1cljdxgqxiyq6gg71pg9k5b8iwvj8nzg4m7llzj957lrhfpavfxg";
|
||||
};
|
||||
meta.homepage = "https://github.com/neoclide/coc.nvim/";
|
||||
};
|
||||
@ -822,12 +834,12 @@ final: prev:
|
||||
|
||||
compe-tmux = buildVimPluginFrom2Nix {
|
||||
pname = "compe-tmux";
|
||||
version = "2021-08-09";
|
||||
version = "2021-08-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "andersevenrud";
|
||||
repo = "compe-tmux";
|
||||
rev = "e9b92b703389732a4b6100b890daacc5f2115636";
|
||||
sha256 = "0czf30dwnksp72ppsydkw2z93s39m5jcmzdrpvlg39zmalxcgbll";
|
||||
rev = "9109c5e39881cc300518888d5cd501606cbb7e0f";
|
||||
sha256 = "15n1r2dnxbbx49xv5i4aq5vkxf8rn3fviwz886hpcxvzxp39gw35";
|
||||
};
|
||||
meta.homepage = "https://github.com/andersevenrud/compe-tmux/";
|
||||
};
|
||||
@ -1098,12 +1110,12 @@ final: prev:
|
||||
|
||||
defx-icons = buildVimPluginFrom2Nix {
|
||||
pname = "defx-icons";
|
||||
version = "2021-03-07";
|
||||
version = "2021-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kristijanhusak";
|
||||
repo = "defx-icons";
|
||||
rev = "563bc2d07d6c369a293ea8cb2fad8afd38bf4a02";
|
||||
sha256 = "0gp65vf7lb00k4pk9iyr2zm6q3lfz16ad70hh3ldnj2azdfz539m";
|
||||
rev = "82c3eb13bed83453d2361a72d4af7b52a74b2b93";
|
||||
sha256 = "0gvrk7spf1fkyvldcrs03d50sck9gbhn52mk0d19awxylf765ygz";
|
||||
};
|
||||
meta.homepage = "https://github.com/kristijanhusak/defx-icons/";
|
||||
};
|
||||
@ -1158,12 +1170,12 @@ final: prev:
|
||||
|
||||
denite-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "denite-nvim";
|
||||
version = "2021-08-18";
|
||||
version = "2021-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shougo";
|
||||
repo = "denite.nvim";
|
||||
rev = "72871ae8f4e75e0271e096b4c37854dde49012d8";
|
||||
sha256 = "07n8pda0y7hn38xv94w8gzmf0qn4l8sbp0hviznknc0jmch1rxvd";
|
||||
rev = "bde582bc5c898ce849c586255a71cec5eccef194";
|
||||
sha256 = "0p090sh70n1kxdv0wl7nby596gvlkyk7p2rbgl5z4igqqdaizdh3";
|
||||
};
|
||||
meta.homepage = "https://github.com/Shougo/denite.nvim/";
|
||||
};
|
||||
@ -1448,12 +1460,12 @@ final: prev:
|
||||
|
||||
diffview-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "diffview-nvim";
|
||||
version = "2021-07-25";
|
||||
version = "2021-08-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sindrets";
|
||||
repo = "diffview.nvim";
|
||||
rev = "2411f5303192a9c8056ec174fb995773f90b52b8";
|
||||
sha256 = "03ssikggkymsxwvf5c9w7w9jv4b0ivk25p3b0i0lwvw3fpzdbsgn";
|
||||
rev = "e0ffb1cb7c5ea9e693e5ee5ee3ce1e5f78916ed6";
|
||||
sha256 = "1s3j2hdswrvw0vj6qycxyh71zg24b38anxr59ragq0hjm05zddb1";
|
||||
};
|
||||
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
|
||||
};
|
||||
@ -1654,12 +1666,12 @@ final: prev:
|
||||
|
||||
fcitx-vim = buildVimPluginFrom2Nix {
|
||||
pname = "fcitx-vim";
|
||||
version = "2021-08-15";
|
||||
version = "2021-08-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lilydjwg";
|
||||
repo = "fcitx.vim";
|
||||
rev = "4042bbb29c50a592062563f5042951abec696702";
|
||||
sha256 = "1y5c1nan5gajrz1l0zkqx0y3a8cpam6l62yd7x19z6dzn7m1b5yb";
|
||||
rev = "3554b279a09f0edf31129ad162613e5954097fd0";
|
||||
sha256 = "1bhjylsw6b44nhmsiy0xvligrdnh9gnz27cwriqxp7lfv5pcz0ch";
|
||||
};
|
||||
meta.homepage = "https://github.com/lilydjwg/fcitx.vim/";
|
||||
};
|
||||
@ -2063,12 +2075,12 @@ final: prev:
|
||||
|
||||
glow-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "glow-nvim";
|
||||
version = "2021-08-19";
|
||||
version = "2021-08-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ellisonleao";
|
||||
repo = "glow.nvim";
|
||||
rev = "bee0d2db015f8499d2102367f2c60154b38ee7c2";
|
||||
sha256 = "0racy87lqhalw26m9m2ikc002j263jlnnpn77aryc0hn5rh9dhsd";
|
||||
rev = "a6ee89368525e59fd4e834ee59bd5df6327ee949";
|
||||
sha256 = "1nh06qipvyb66kzgc20c7b3fjxdibjmdazc6lkbkk2gbc42nghb7";
|
||||
};
|
||||
meta.homepage = "https://github.com/ellisonleao/glow.nvim/";
|
||||
};
|
||||
@ -2099,12 +2111,12 @@ final: prev:
|
||||
|
||||
goto-preview = buildVimPluginFrom2Nix {
|
||||
pname = "goto-preview";
|
||||
version = "2021-06-20";
|
||||
version = "2021-08-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rmagatti";
|
||||
repo = "goto-preview";
|
||||
rev = "39aa1e0334b577c59c4f7177ef36624bdd83f100";
|
||||
sha256 = "0rr22r1yp7s3hqfdqf48wlv2bqw9j5izwgm3np7x1ygp85xizcbg";
|
||||
rev = "017efbcb377a6c0e16c4902328cf34d7257cbd1c";
|
||||
sha256 = "11n09m7agy9b5zx0cralam7gsr2bfwpf4564z2iwxgia3186bs8g";
|
||||
};
|
||||
meta.homepage = "https://github.com/rmagatti/goto-preview/";
|
||||
};
|
||||
@ -2135,12 +2147,12 @@ final: prev:
|
||||
|
||||
gruvbox-community = buildVimPluginFrom2Nix {
|
||||
pname = "gruvbox-community";
|
||||
version = "2021-08-18";
|
||||
version = "2021-08-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruvbox-community";
|
||||
repo = "gruvbox";
|
||||
rev = "f29a88b5e16c8a6c8e774ba06854b2832bef50b1";
|
||||
sha256 = "1p6103h8ac60c7lzlnn71kp6xrpzkmnh4nrw69s3p91mfbp73hxb";
|
||||
rev = "dba3e04ab97bf80d41c0d30f34ecde8ca2762c47";
|
||||
sha256 = "1kryx30fzj33lm969jgx3715s3cz5cp7hlxjs5d29a11gqbmpi0n";
|
||||
};
|
||||
meta.homepage = "https://github.com/gruvbox-community/gruvbox/";
|
||||
};
|
||||
@ -2387,12 +2399,12 @@ final: prev:
|
||||
|
||||
indent-blankline-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "indent-blankline-nvim";
|
||||
version = "2021-08-05";
|
||||
version = "2021-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lukas-reineke";
|
||||
repo = "indent-blankline.nvim";
|
||||
rev = "134a1ace3274e14cf3f2c9b845f6a62c58d2f2de";
|
||||
sha256 = "1n3cbfvm4jdiwhv2hc6379xqjpjpdfzvz9zs2zpb1pj9qjdznqcc";
|
||||
rev = "f912393a296194e7201523a2a0b0bcd6a009de90";
|
||||
sha256 = "093bxpv3l2q25wr6xvdsnr4krlwxds0rq3168nnfwf0hy8645c7c";
|
||||
};
|
||||
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
|
||||
};
|
||||
@ -2796,12 +2808,12 @@ final: prev:
|
||||
|
||||
lightspeed-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lightspeed-nvim";
|
||||
version = "2021-08-17";
|
||||
version = "2021-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggandor";
|
||||
repo = "lightspeed.nvim";
|
||||
rev = "08f5bcfee90e2fe91e9c4cf2538ac17bc27c90af";
|
||||
sha256 = "0impdwlrd5jbcbmyk32r0dy0jwq3481l3ajryvbj7cqhjibm71nv";
|
||||
rev = "177ef542f6f26147f16be7b07c1e6fcfa66bf128";
|
||||
sha256 = "0c6bwdgi2d43jar05zcfarsas3r7y9v7igr3ldsgd7491wf8hjhg";
|
||||
};
|
||||
meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
|
||||
};
|
||||
@ -2892,12 +2904,12 @@ final: prev:
|
||||
|
||||
lsp_signature-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "lsp_signature-nvim";
|
||||
version = "2021-08-18";
|
||||
version = "2021-08-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ray-x";
|
||||
repo = "lsp_signature.nvim";
|
||||
rev = "42b2c3b0767cf08616f0428eb57c254748a80d83";
|
||||
sha256 = "1p3dp9csj43bjgjfmv1aa3497ph2nmfdylinwqx15kgpgfhk2qxg";
|
||||
rev = "ea9525f20297220ddfb6c6eb0423dad80301980e";
|
||||
sha256 = "1hqrmn6ggl6xadx5klb8z5jh3szwd7p8xyb7pclxds628l9rr9sp";
|
||||
};
|
||||
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
|
||||
};
|
||||
@ -2952,12 +2964,12 @@ final: prev:
|
||||
|
||||
luasnip = buildVimPluginFrom2Nix {
|
||||
pname = "luasnip";
|
||||
version = "2021-08-19";
|
||||
version = "2021-08-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "l3mon4d3";
|
||||
repo = "luasnip";
|
||||
rev = "e3d057b2cc0d6ff7250ba1bb108d17e40b2904e8";
|
||||
sha256 = "02k612ib8974ra0221ldf8vrzk3na64g4w1z60mzy3i53qdjayh9";
|
||||
rev = "6d398e3443933a68607215538e614662d2ffa5c8";
|
||||
sha256 = "0ll54nqa3lxzhxyjsya8y4qiyyicfsp5yz25mjdgqmvvf4i39jxz";
|
||||
};
|
||||
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
|
||||
};
|
||||
@ -3324,12 +3336,12 @@ final: prev:
|
||||
|
||||
neco-vim = buildVimPluginFrom2Nix {
|
||||
pname = "neco-vim";
|
||||
version = "2021-08-19";
|
||||
version = "2021-08-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shougo";
|
||||
repo = "neco-vim";
|
||||
rev = "344b753261fdd298c1b47ee59ac8268bd338e00f";
|
||||
sha256 = "0nmrjsylj46fdz96jidfg74y8yn55rkw9w41332zswm9h5mwp4av";
|
||||
rev = "5acaca6d173e1566b207c5477f06e7e49efe1a76";
|
||||
sha256 = "040jliyl8zs617kdw7xa4kjxyxakdz16gk5vp1j0zmaynwlfwf8n";
|
||||
};
|
||||
meta.homepage = "https://github.com/Shougo/neco-vim/";
|
||||
};
|
||||
@ -3372,12 +3384,12 @@ final: prev:
|
||||
|
||||
neogit = buildVimPluginFrom2Nix {
|
||||
pname = "neogit";
|
||||
version = "2021-08-17";
|
||||
version = "2021-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "TimUntersberger";
|
||||
repo = "neogit";
|
||||
rev = "5cdf492b9844dcac4de7c3001bc1871decc6251f";
|
||||
sha256 = "0mzp2hifll0jkw1p7ycxlbysiqs2zrlka4x5s92xp050q33zj1il";
|
||||
rev = "06000011b9a8b1f2f843489c32afdb487e163c14";
|
||||
sha256 = "1qy7w190z3zvmb04pybcgxkc75hkivkj8msksbw1xlyhj7n9vz9h";
|
||||
};
|
||||
meta.homepage = "https://github.com/TimUntersberger/neogit/";
|
||||
};
|
||||
@ -3456,12 +3468,12 @@ final: prev:
|
||||
|
||||
neosnippet-vim = buildVimPluginFrom2Nix {
|
||||
pname = "neosnippet-vim";
|
||||
version = "2021-08-06";
|
||||
version = "2021-08-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shougo";
|
||||
repo = "neosnippet.vim";
|
||||
rev = "f490d5db67f91c41f86a9d796b42af9a6a3b0d01";
|
||||
sha256 = "1n0fd71hjyrw22p4a2cd3l153p1bnjw15y9vpdzncchy7r6wxdcs";
|
||||
rev = "c1634915a8f798cded2bef39c6f24a9d988aca10";
|
||||
sha256 = "02cvrxfy6n7z5xl5ijw2fkz81j7lm18agyx6qs11a5l5f515h4a2";
|
||||
};
|
||||
meta.homepage = "https://github.com/Shougo/neosnippet.vim/";
|
||||
};
|
||||
@ -3648,12 +3660,12 @@ final: prev:
|
||||
|
||||
nord-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "nord-nvim";
|
||||
version = "2021-08-16";
|
||||
version = "2021-08-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "shaunsingh";
|
||||
repo = "nord.nvim";
|
||||
rev = "4d1bef41e01fbdcb31a47d722e107b29a1f9f428";
|
||||
sha256 = "1v9d7dsmchmkzqqf92rzhscv4n0n75jm0hqkq49m11d62dc5aic9";
|
||||
rev = "d2b6f9d4688a381f26a652df7e1b6a49e9f33542";
|
||||
sha256 = "03jjx1mblqwdrz7g280wvdyq9sbfj6spf8k61gcq1gy7bb4qjfp7";
|
||||
};
|
||||
meta.homepage = "https://github.com/shaunsingh/nord.nvim/";
|
||||
};
|
||||
@ -3778,18 +3790,6 @@ final: prev:
|
||||
meta.homepage = "https://github.com/ojroques/nvim-bufdel/";
|
||||
};
|
||||
|
||||
nvim-bufferline-lua = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-bufferline-lua";
|
||||
version = "2021-08-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "akinsho";
|
||||
repo = "nvim-bufferline.lua";
|
||||
rev = "067ec55a10ef8a58f8c7b45621daca759ab54437";
|
||||
sha256 = "1lm6jwsngqnhfh43r3s1qf2qynfd92d7pyp7a2myxcdzhcdhn08f";
|
||||
};
|
||||
meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/";
|
||||
};
|
||||
|
||||
nvim-cm-racer = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-cm-racer";
|
||||
version = "2017-07-27";
|
||||
@ -3804,12 +3804,12 @@ final: prev:
|
||||
|
||||
nvim-cmp = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-cmp";
|
||||
version = "2021-08-17";
|
||||
version = "2021-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "nvim-cmp";
|
||||
rev = "f12fd73f11c979384ae82d2b1cd9332b5cf5f661";
|
||||
sha256 = "1qpk4a7r89431pad4afqxyxx1csi0h7wjgwh07fp4rfacr6k005m";
|
||||
rev = "f3a54918944d2c8778e6f13e2fc3ec4251863afb";
|
||||
sha256 = "0zjmvpxx46dy1q7jg1a7r51nqc7wzqa8vjzd8ff8nphs0j5zlvfn";
|
||||
};
|
||||
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
|
||||
};
|
||||
@ -3910,14 +3910,26 @@ final: prev:
|
||||
meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
|
||||
};
|
||||
|
||||
nvim-gps = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-gps";
|
||||
version = "2021-08-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "smiteshp";
|
||||
repo = "nvim-gps";
|
||||
rev = "f365bc331c1fd752429427cdfed4aa142e9fc74f";
|
||||
sha256 = "1phzrw37y9gzcimy5r3phy2x53c9b2q5l3v5ipcx1k4q6pfkh026";
|
||||
};
|
||||
meta.homepage = "https://github.com/smiteshp/nvim-gps/";
|
||||
};
|
||||
|
||||
nvim-highlite = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-highlite";
|
||||
version = "2021-08-05";
|
||||
version = "2021-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Iron-E";
|
||||
repo = "nvim-highlite";
|
||||
rev = "929cb313e90589576348c3a2e9a18bac8a56999c";
|
||||
sha256 = "0j48zy517px40w119xad97zja0p7fspapnd1n70w3lq9ank0l7a1";
|
||||
rev = "dd827f091554065736105c72e1256d1fc8f4f445";
|
||||
sha256 = "11jndab13dhd6pqzbd385awzhmxvzz68aza09qmfqkjvmcs1gy8c";
|
||||
};
|
||||
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
|
||||
};
|
||||
@ -3960,24 +3972,24 @@ final: prev:
|
||||
|
||||
nvim-lightbulb = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lightbulb";
|
||||
version = "2021-06-05";
|
||||
version = "2021-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kosayoda";
|
||||
repo = "nvim-lightbulb";
|
||||
rev = "388cc8caaf3e10836810aabbb9283a27dd8584cd";
|
||||
sha256 = "0a7izbvpwn0sx9gvpczvl57fy9rm7jaibc4m44asjz501m04lbra";
|
||||
rev = "e94e434f4549c9c331f875931b3e804fb1d2bc16";
|
||||
sha256 = "0043vzjp4p48xw03xn9g5l0daplg3rfijqxdq00kp0s6np3c312j";
|
||||
};
|
||||
meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
|
||||
};
|
||||
|
||||
nvim-lspconfig = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-lspconfig";
|
||||
version = "2021-08-18";
|
||||
version = "2021-08-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "nvim-lspconfig";
|
||||
rev = "e2601bb4b8d125e3f96274fe57136004dce4c587";
|
||||
sha256 = "0yvz273qy2qf82f5yfkzh8zncwkg0hwkjy7b47f3bf65g5nwibzn";
|
||||
rev = "9adbacf29835bf521a99a8d3f0b6f2157b1b9166";
|
||||
sha256 = "0k4b6qsrvlgxr600x9wgkfdraqczx49zqyqfz88xf6pjbx0zyach";
|
||||
};
|
||||
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
||||
};
|
||||
@ -4054,26 +4066,14 @@ final: prev:
|
||||
meta.homepage = "https://github.com/norcalli/nvim-terminal.lua/";
|
||||
};
|
||||
|
||||
nvim-toggleterm-lua = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-toggleterm-lua";
|
||||
version = "2021-08-15";
|
||||
src = fetchFromGitHub {
|
||||
owner = "akinsho";
|
||||
repo = "nvim-toggleterm.lua";
|
||||
rev = "775012662eb2070e44b294d43938fa2625a9c836";
|
||||
sha256 = "0q39ddq6yb1iscgp1mdgdyhz0cmb794ycbfd5ph3xp8ffly4z7hk";
|
||||
};
|
||||
meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/";
|
||||
};
|
||||
|
||||
nvim-tree-lua = buildVimPluginFrom2Nix {
|
||||
pname = "nvim-tree-lua";
|
||||
version = "2021-08-14";
|
||||
version = "2021-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyazdani42";
|
||||
repo = "nvim-tree.lua";
|
||||
rev = "d74af818c085e1ffdcf7e9afc101de8cbe3ad883";
|
||||
sha256 = "1524p6zd3q2bmrik7xbqwlin4pdv566vlr54mxhxpb5lx70yn43w";
|
||||
rev = "c75e4a63b73f223a80835ab3b75f602dc3e60e66";
|
||||
sha256 = "0n3h9pv029nplr2d102p8gj7ygx69iha9hgpzy7kfn4pwsaz7vzq";
|
||||
};
|
||||
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
|
||||
};
|
||||
@ -4681,12 +4681,12 @@ final: prev:
|
||||
|
||||
refactoring-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "refactoring-nvim";
|
||||
version = "2021-08-18";
|
||||
version = "2021-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theprimeagen";
|
||||
repo = "refactoring.nvim";
|
||||
rev = "ab4c6b0fb37bcadbc55ae02c9638bbc424dc8842";
|
||||
sha256 = "0j54rv7gq31m8g0jwb6smvipgcd9pizry39vqx97wfbikcsw3zab";
|
||||
rev = "df03980e5fcdbcf1d126c63713be2781e3c0ba42";
|
||||
sha256 = "0z93igf1adnm183zamk3y10lbqg6diy42grg1k853a2xrrmjbhfk";
|
||||
};
|
||||
meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
|
||||
};
|
||||
@ -4741,12 +4741,12 @@ final: prev:
|
||||
|
||||
rnvimr = buildVimPluginFrom2Nix {
|
||||
pname = "rnvimr";
|
||||
version = "2021-08-04";
|
||||
version = "2021-08-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kevinhwang91";
|
||||
repo = "rnvimr";
|
||||
rev = "75eb226fe32ef18add0fc70715cbcc7550ecb698";
|
||||
sha256 = "12skmq1zlpkk8y05503p01rxfdkqdl3mdhf8bbgq3f2ky7d7iarj";
|
||||
rev = "9f75ac3734bde4cd2cc1726b6936650ac4e144d6";
|
||||
sha256 = "03jgq6rd3rxs6hn2ksh8nbkbv7lpabcb7372xifq5vhgqqfj447j";
|
||||
};
|
||||
meta.homepage = "https://github.com/kevinhwang91/rnvimr/";
|
||||
};
|
||||
@ -5139,12 +5139,12 @@ final: prev:
|
||||
|
||||
sql-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "sql-nvim";
|
||||
version = "2021-08-19";
|
||||
version = "2021-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tami5";
|
||||
repo = "sql.nvim";
|
||||
rev = "2feef57bef147cf502b4491e3fc6c58a05f3096e";
|
||||
sha256 = "0zyjbhhn33nbz7cf9vhr94gn38pvr5hd9d31sirdwqy49shvwlc1";
|
||||
rev = "eb1f0512c3b781740090877b39bc9332c01edb46";
|
||||
sha256 = "1dykwqv01fcf8k2q8fz7z4zgc9wh4v551b9mwm44n2lqzg35swzg";
|
||||
};
|
||||
meta.homepage = "https://github.com/tami5/sql.nvim/";
|
||||
};
|
||||
@ -5247,12 +5247,12 @@ final: prev:
|
||||
|
||||
symbols-outline-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "symbols-outline-nvim";
|
||||
version = "2021-08-19";
|
||||
version = "2021-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "simrat39";
|
||||
repo = "symbols-outline.nvim";
|
||||
rev = "2047f401e7a9f0024cc48f7bbe8cc73bc199f883";
|
||||
sha256 = "0d5bcg4l4vfsr0pydcslj574ib6qxqsnhgi6k61p4wa4v1c6aif2";
|
||||
rev = "40b7d5cbaa51c031061827c48e6a05748db7e91d";
|
||||
sha256 = "1mk4g1kgg2as3kk010wd9x2f4v60an68mqflpk97ng6a52laj5nw";
|
||||
};
|
||||
meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/";
|
||||
};
|
||||
@ -5332,12 +5332,12 @@ final: prev:
|
||||
|
||||
tagalong-vim = buildVimPluginFrom2Nix {
|
||||
pname = "tagalong-vim";
|
||||
version = "2021-06-28";
|
||||
version = "2021-08-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "AndrewRadev";
|
||||
repo = "tagalong.vim";
|
||||
rev = "e04ed6f46da5b55450a52e7de1025f1486d55839";
|
||||
sha256 = "0bcmli82a58zvyqpacz5zyz9k9q8x39rcci095lz6ab6vnwhbl47";
|
||||
rev = "6c8c0f4903daed1c11087a014a8bc23ac4334850";
|
||||
sha256 = "1vcymd05pacs3ywf4bq20vhn46a3d4hpl2lwcbc5z1cv18iwd3ip";
|
||||
};
|
||||
meta.homepage = "https://github.com/AndrewRadev/tagalong.vim/";
|
||||
};
|
||||
@ -5416,12 +5416,12 @@ final: prev:
|
||||
|
||||
telescope-frecency-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope-frecency-nvim";
|
||||
version = "2021-08-05";
|
||||
version = "2021-08-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope-frecency.nvim";
|
||||
rev = "459041fb42d81c65444b147d25b1e28b0c8ac8f9";
|
||||
sha256 = "0n4bv22azqgvqk00dcnxzafpx1mkdfm6ds3w6pyn0mflkfninfb7";
|
||||
rev = "f8cf92a6372054a912e19e8b192c9e1c5261c831";
|
||||
sha256 = "1mgihx3kqj70blyqv2yjhn4kw8374f13c3qxxq3mhpv9vcbwb6id";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
|
||||
};
|
||||
@ -5501,12 +5501,12 @@ final: prev:
|
||||
|
||||
telescope-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "telescope-nvim";
|
||||
version = "2021-08-19";
|
||||
version = "2021-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope.nvim";
|
||||
rev = "d6d28dbe324de9826a579155076873888169ba0f";
|
||||
sha256 = "0gxp54b5p1hbaigm7xq0c7dcnq1dbncp80fl8nrmwax34r6rv4d1";
|
||||
rev = "8381a215e091dc9e1f6ad9ceaeadf35ef3cfed8f";
|
||||
sha256 = "0cn1ynvva8nzjyrp285ficfa74wky0gikii2hysdi0g4ndnh6ypa";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
|
||||
};
|
||||
@ -5620,6 +5620,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/freitass/todo.txt-vim/";
|
||||
};
|
||||
|
||||
toggleterm-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "toggleterm-nvim";
|
||||
version = "2021-08-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "akinsho";
|
||||
repo = "toggleterm.nvim";
|
||||
rev = "5a4429d33cc8f286a0ad30b89084ec5284d6a652";
|
||||
sha256 = "0rflwn9bbnffly5i66n3hxrf9cgbpqphqc2p6bjpxlyydda1vdx3";
|
||||
};
|
||||
meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
|
||||
};
|
||||
|
||||
tokyonight-nvim = buildVimPluginFrom2Nix {
|
||||
pname = "tokyonight-nvim";
|
||||
version = "2021-08-06";
|
||||
@ -6378,12 +6390,12 @@ final: prev:
|
||||
|
||||
vim-clap = buildVimPluginFrom2Nix {
|
||||
pname = "vim-clap";
|
||||
version = "2021-08-16";
|
||||
version = "2021-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "liuchengxu";
|
||||
repo = "vim-clap";
|
||||
rev = "4a7e9bad08ccfebcf294ea0091d74ee64d98d236";
|
||||
sha256 = "0b5ldixvf2f3bk7ivzb3s7zb8s4ir7gayli1i6bdq753flkjq0bx";
|
||||
rev = "299a5d23f6c8d8f51bbd4aeb01f8c1c27d4a0604";
|
||||
sha256 = "090hm59p6n44740irfkxv5r40iyr4mady30zqcswbx4r1xhd8vzc";
|
||||
};
|
||||
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
|
||||
};
|
||||
@ -7158,12 +7170,12 @@ final: prev:
|
||||
|
||||
vim-fugitive = buildVimPluginFrom2Nix {
|
||||
pname = "vim-fugitive";
|
||||
version = "2021-08-19";
|
||||
version = "2021-08-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpope";
|
||||
repo = "vim-fugitive";
|
||||
rev = "81f293852ec195727a657c7d247af5cc3f705c45";
|
||||
sha256 = "0a5411vcmgssb9j7mpr43zpi2hjnp4md8fvjxjkhx6in69pvyh91";
|
||||
rev = "5d1a276b455dd9a32375a5ac84050adff67062e3";
|
||||
sha256 = "1bm3fwbg9nmdxpvaqrs31g88ij5b5wxip2s4j9v1i0c0w5jplxjn";
|
||||
};
|
||||
meta.homepage = "https://github.com/tpope/vim-fugitive/";
|
||||
};
|
||||
@ -7230,12 +7242,12 @@ final: prev:
|
||||
|
||||
vim-gitbranch = buildVimPluginFrom2Nix {
|
||||
pname = "vim-gitbranch";
|
||||
version = "2017-05-27";
|
||||
version = "2021-08-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "itchyny";
|
||||
repo = "vim-gitbranch";
|
||||
rev = "8118dc1cdd387bd609852be4bf350360ce881193";
|
||||
sha256 = "01gvd96mnzfc5s0951zzq122birg5svnximkldgb9kv5bmsnmh3j";
|
||||
rev = "1a8ba866f3eaf0194783b9f8573339d6ede8f1ed";
|
||||
sha256 = "0nd6wwc0xd5b9djlcf18phmzjaqc3l7imarh1cil9644n1ls0l00";
|
||||
};
|
||||
meta.homepage = "https://github.com/itchyny/vim-gitbranch/";
|
||||
};
|
||||
@ -7326,12 +7338,12 @@ final: prev:
|
||||
|
||||
vim-grepper = buildVimPluginFrom2Nix {
|
||||
pname = "vim-grepper";
|
||||
version = "2021-05-10";
|
||||
version = "2021-08-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mhinz";
|
||||
repo = "vim-grepper";
|
||||
rev = "b80004c050501122d58f82712b21d0b7c8dfc019";
|
||||
sha256 = "049552dvsk14hx4h9rp9g65xkf13n42z304lzxca69j5q6k1qrdl";
|
||||
rev = "1c3c4c616df2fa118289df17bfc3961fe0a2993b";
|
||||
sha256 = "0kdrz7b5kdl2cs05anx3pq4yb746x773bfqlbkrg56h6jrgpx1wx";
|
||||
};
|
||||
meta.homepage = "https://github.com/mhinz/vim-grepper/";
|
||||
};
|
||||
@ -7699,12 +7711,12 @@ final: prev:
|
||||
|
||||
vim-javacomplete2 = buildVimPluginFrom2Nix {
|
||||
pname = "vim-javacomplete2";
|
||||
version = "2021-03-18";
|
||||
version = "2021-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "artur-shaik";
|
||||
repo = "vim-javacomplete2";
|
||||
rev = "b01e32ec3d005423d5e6043b18b563086a623dc8";
|
||||
sha256 = "0d9a6ynir9hgl9yp0mh0ng935llj4z9jkd9rvpddskcvq7h5590c";
|
||||
rev = "54a4b02edef78509621d180794df0c6924e48b3b";
|
||||
sha256 = "08hi6r1cspkklir9qa6x4h4a3zs404hvcwsspylysv7asnv8jncf";
|
||||
};
|
||||
meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/";
|
||||
};
|
||||
@ -8865,12 +8877,12 @@ final: prev:
|
||||
|
||||
vim-rails = buildVimPluginFrom2Nix {
|
||||
pname = "vim-rails";
|
||||
version = "2021-06-01";
|
||||
version = "2021-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpope";
|
||||
repo = "vim-rails";
|
||||
rev = "3b3796352a6f1a68e54e5f7ae5e0c1b9103fab0e";
|
||||
sha256 = "1f0xns0h55szamms17wi06k1ninvygsc4yw82hr29kfq94hvn57l";
|
||||
rev = "03a5c3e85411db1488cdfd1029d2a91f9327c8a2";
|
||||
sha256 = "0x72948i7ilzavf3922hl5d5vmq57f8a7zazpvlmnzs0msvvqzwr";
|
||||
};
|
||||
meta.homepage = "https://github.com/tpope/vim-rails/";
|
||||
};
|
||||
@ -8913,12 +8925,12 @@ final: prev:
|
||||
|
||||
vim-rhubarb = buildVimPluginFrom2Nix {
|
||||
pname = "vim-rhubarb";
|
||||
version = "2021-07-16";
|
||||
version = "2021-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tpope";
|
||||
repo = "vim-rhubarb";
|
||||
rev = "b4aad6dc43660db554bba2942026fb9965f1a45e";
|
||||
sha256 = "04ckpl3q1k4l530fhf5srbklfqdz4rfrcapwsa92n4bwskfxbnsp";
|
||||
rev = "e804fb67b75697f98f500f67ed11e891e370bd04";
|
||||
sha256 = "11cifxc6i2h00f71w28f2q5zr76198672g9ccx8ah5i7xw5a949x";
|
||||
};
|
||||
meta.homepage = "https://github.com/tpope/vim-rhubarb/";
|
||||
};
|
||||
@ -9802,12 +9814,12 @@ final: prev:
|
||||
|
||||
vim-vsnip-integ = buildVimPluginFrom2Nix {
|
||||
pname = "vim-vsnip-integ";
|
||||
version = "2020-12-31";
|
||||
version = "2021-08-21";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "vim-vsnip-integ";
|
||||
rev = "60dfbb0dc73cfc4828e9328251a46ccbd7e9b5fe";
|
||||
sha256 = "0nv8imllzpm5zvg2n3c5mb7lc1v1fn6jmqy8vgmv2fp1050p3dy3";
|
||||
rev = "8f94cdd9ca6c3e6c328edaf22029f1bf17f3d1c5";
|
||||
sha256 = "1wh44m7jn1s7jyk0g9flf2qhkqgcl5amfi5w7dwjqkr8z495r29h";
|
||||
};
|
||||
meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/";
|
||||
};
|
||||
@ -10114,12 +10126,12 @@ final: prev:
|
||||
|
||||
vimspector = buildVimPluginFrom2Nix {
|
||||
pname = "vimspector";
|
||||
version = "2021-08-03";
|
||||
version = "2021-08-20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "puremourning";
|
||||
repo = "vimspector";
|
||||
rev = "57ce0992803fcf22c0557550fff45e3fe869f707";
|
||||
sha256 = "0136i5yisg6ndvg7rcsr9qqrslgzafbl006csx7s51khd5qmfgmb";
|
||||
rev = "14f34ea6d12b71a720356ce83c386f8ba393e700";
|
||||
sha256 = "1w680m5xwv6imyc4rd5mpj76w2ac6qgvfsaw33xd9wpgl3ld444j";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
meta.homepage = "https://github.com/puremourning/vimspector/";
|
||||
@ -10127,12 +10139,12 @@ final: prev:
|
||||
|
||||
vimtex = buildVimPluginFrom2Nix {
|
||||
pname = "vimtex";
|
||||
version = "2021-08-19";
|
||||
version = "2021-08-22";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lervag";
|
||||
repo = "vimtex";
|
||||
rev = "5b8c24681831bd816b0e70c0b6b597c2c3945755";
|
||||
sha256 = "1f9ih0r9vqazrspd0h8jvrv3m66akd0aj9misgkh7fh3mnvmwzri";
|
||||
rev = "058f139985f4eede396d83f45a6b2e7b3924a012";
|
||||
sha256 = "1nxxw6k0y5ccsvm39h4mfrk93ply2xh5y1lihhwy17vaigwyx687";
|
||||
};
|
||||
meta.homepage = "https://github.com/lervag/vimtex/";
|
||||
};
|
||||
|
||||
@ -6,8 +6,8 @@ ahmedkhalf/lsp-rooter.nvim@main
|
||||
airblade/vim-gitgutter
|
||||
airblade/vim-rooter
|
||||
ajmwagar/vim-deus
|
||||
akinsho/nvim-bufferline.lua
|
||||
akinsho/nvim-toggleterm.lua
|
||||
akinsho/bufferline.nvim
|
||||
akinsho/toggleterm.nvim
|
||||
aklt/plantuml-syntax
|
||||
allendang/nvim-expand-expr@main
|
||||
altercation/vim-colors-solarized
|
||||
@ -666,6 +666,7 @@ sjl/gundo.vim
|
||||
sjl/splice.vim
|
||||
sk1418/last256
|
||||
slashmili/alchemist.vim
|
||||
smiteshp/nvim-gps
|
||||
sodapopcan/vim-twiggy
|
||||
solarnz/arcanist.vim
|
||||
sonph/onehalf
|
||||
|
||||
73
pkgs/os-specific/darwin/xattr/default.nix
Normal file
73
pkgs/os-specific/darwin/xattr/default.nix
Normal file
@ -0,0 +1,73 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchzip
|
||||
, buildPythonPackage
|
||||
, python
|
||||
, ed
|
||||
, unifdef
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xattr";
|
||||
version = "61.60.1";
|
||||
|
||||
src = fetchzip rec {
|
||||
url = "https://opensource.apple.com/tarballs/python_modules/python_modules-${version}.tar.gz";
|
||||
sha256 = "19kydl7w4vpdi7zmfd5z9vjkq24jfk2cv4j0pppw69j06czhdwwi";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/Modules/xattr-0.6.4";
|
||||
format = "other";
|
||||
|
||||
nativeBuildInputs = [
|
||||
ed
|
||||
unifdef
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"OBJROOT=$(PWD)"
|
||||
"DSTROOT=${placeholder "out"}"
|
||||
"OSL=${placeholder "doc"}/share/xattr/OpenSourceLicenses"
|
||||
"OSV=${placeholder "doc"}/share/xattr/OpenSourceVersions"
|
||||
];
|
||||
|
||||
# need to use `out` instead of `bin` since buildPythonPackage ignores the latter
|
||||
outputs = [ "out" "doc" "python" ];
|
||||
|
||||
# We need to patch a reference to gnutar in an included Makefile
|
||||
postUnpack = ''
|
||||
chmod u+w $sourceRoot/..
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ../Makefile.inc --replace gnutar tar
|
||||
substituteInPlace Makefile --replace "/usr" ""
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
# prevent setup.py from trying to download setuptools
|
||||
sed -i xattr-*/setup.py -e '/ez_setup/d'
|
||||
|
||||
# create our custom target dirs we patch in
|
||||
mkdir -p "$doc/share/xattr/"OpenSource{Licenses,Versions}
|
||||
mkdir -p "$python/lib/${python.libPrefix}"
|
||||
'';
|
||||
|
||||
# move python package to its own output to reduce clutter
|
||||
postInstall = ''
|
||||
mv "$out/lib/python" "$python/${python.sitePackages}"
|
||||
rmdir "$out/lib"
|
||||
'';
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix" "PYTHONPATH" ":" "${placeholder "python"}/${python.sitePackages}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Display and manipulate extended attributes";
|
||||
license = [ licenses.psfl licenses.mit ]; # see $doc/share/xattr/OpenSourceLicenses
|
||||
maintainers = [ maintainers.sternenseemann ];
|
||||
homepage = "https://opensource.apple.com/source/python_modules/";
|
||||
platforms = lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation {
|
||||
|
||||
meta = {
|
||||
description = "Firmware for cards supported by the b43 kernel module";
|
||||
homepage = "http://wireless.kernel.org/en/users/Drivers/b43";
|
||||
homepage = "https://wireless.wiki.kernel.org/en/users/drivers/b43";
|
||||
license = lib.licenses.unfree;
|
||||
};
|
||||
}
|
||||
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Firmware for cards supported by the b43 kernel module";
|
||||
homepage = "http://wireless.kernel.org/en/users/Drivers/b43";
|
||||
homepage = "https://wireless.wiki.kernel.org/en/users/drivers/b43";
|
||||
downloadPage = "http://www.lwfinger.com/b43-firmware";
|
||||
license = licenses.unfree;
|
||||
};
|
||||
|
||||
@ -9,7 +9,7 @@ buildGoModule rec {
|
||||
|
||||
subPackages = [ "cmd/hasura" ];
|
||||
|
||||
vendorSha256 = "sha256-Fp6o3xZ/964q8yzJJFrqWZtQ5zYNy6Wreh42YxWjNbU=";
|
||||
vendorSha256 = "1pkc9bh5s2vqnpkmnm91zaihh98b3drhiv4lcpi98rhln8r52b1k";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "elvish";
|
||||
version = "0.15.0";
|
||||
version = "0.16.1";
|
||||
|
||||
excludedPackages = [ "website" ];
|
||||
|
||||
@ -12,10 +12,10 @@ buildGoModule rec {
|
||||
owner = "elves";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1jksdpf86miz1dv3vrmvpvz4k1c2m23dway6a7b1cypg03c68a75";
|
||||
sha256 = "sha256-i7RJiR1Mta2TrWBSUk0WM3InMV2cwbdlp3KHUdZgQ8I=";
|
||||
};
|
||||
|
||||
vendorSha256 = "124m9680pl7wrh7ld7v39dfl86r6vih1pjk3bmbihy0fjgxnnq0b";
|
||||
vendorSha256 = "sha256-5tZwGrp/L9L+pf/yp8zlbb0voe60+if+NNf8ua2MujI=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@ in buildPythonApplication rec {
|
||||
propagatedBuildInputs = [ xrandr pygobject3 ];
|
||||
|
||||
meta = {
|
||||
homepage = "http://christian.amsuess.com/tools/arandr/";
|
||||
homepage = "https://christian.amsuess.com/tools/arandr/";
|
||||
description = "A simple visual front end for XRandR";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ lib.maintainers.domenkozar ];
|
||||
|
||||
@ -265,7 +265,7 @@ in pythonPackages.buildPythonApplication rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Music tagger and library organizer";
|
||||
homepage = "http://beets.io";
|
||||
homepage = "https://beets.io";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ aszlig doronbehar lovesegfault pjones ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -1,5 +1,19 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, flex, bison, vips, gtk2
|
||||
, fftw, gsl, goffice, libgsf }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, glib
|
||||
, libxml2
|
||||
, flex
|
||||
, bison
|
||||
, vips
|
||||
, gtk2
|
||||
, fftw
|
||||
, gsl
|
||||
, goffice
|
||||
, libgsf
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nip2";
|
||||
@ -10,11 +24,28 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0l7n427njif53npqn02gfjjly8y3khbrkzqxp10j5vp9h97psgiw";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ pkg-config glib libxml2 flex bison vips
|
||||
gtk2 fftw gsl goffice libgsf
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
flex
|
||||
pkg-config
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
libxml2
|
||||
vips
|
||||
gtk2
|
||||
fftw
|
||||
gsl
|
||||
goffice
|
||||
libgsf
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/nip2 --set VIPSHOME "$out"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/libvips/nip2";
|
||||
description = "Graphical user interface for VIPS image processing system";
|
||||
|
||||
@ -1,34 +1,44 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, pkg-config
|
||||
, glib
|
||||
, libxml2
|
||||
, expat
|
||||
, fftw
|
||||
, orc
|
||||
, lcms
|
||||
, imagemagick
|
||||
, openexr
|
||||
, libtiff
|
||||
, libjpeg
|
||||
, libgsf
|
||||
, libexif
|
||||
, libheif
|
||||
, librsvg
|
||||
, ApplicationServices
|
||||
, Foundation
|
||||
, python27
|
||||
, libpng
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, gtk-doc
|
||||
, gobject-introspection
|
||||
,
|
||||
# Optional dependencies
|
||||
, libjpeg
|
||||
, libexif
|
||||
, librsvg
|
||||
, poppler
|
||||
, libgsf
|
||||
, libtiff
|
||||
, fftw
|
||||
, lcms2
|
||||
, libpng
|
||||
, libimagequant
|
||||
, imagemagick
|
||||
, pango
|
||||
, orc
|
||||
, matio
|
||||
, cfitsio
|
||||
, libwebp
|
||||
, openexr
|
||||
, openjpeg
|
||||
, libjxl
|
||||
, openslide
|
||||
, libheif
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vips";
|
||||
version = "8.11.2";
|
||||
version = "8.11.3";
|
||||
|
||||
outputs = [ "bin" "out" "man" "dev" ];
|
||||
|
||||
@ -36,7 +46,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "libvips";
|
||||
repo = "libvips";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Psb+LrpTWtZwO9ekOLJIXsy8W49jW4Jdi+EmiJ+1MsQ=";
|
||||
sha256 = "sha256-CWuULuUMBV2VUCZEBg0MzS7rXI8UUkNh5XPV2eA8xt8=";
|
||||
# Remove unicode file names which leads to different checksums on HFS+
|
||||
# vs. other filesystems because of unicode normalisation.
|
||||
extraPostFetch = ''
|
||||
@ -54,22 +64,31 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
glib
|
||||
libxml2
|
||||
fftw
|
||||
orc
|
||||
lcms
|
||||
imagemagick
|
||||
openexr
|
||||
libtiff
|
||||
libjpeg
|
||||
libgsf
|
||||
libexif
|
||||
libheif
|
||||
libpng
|
||||
librsvg
|
||||
python27
|
||||
libpng
|
||||
expat
|
||||
] ++ lib.optionals stdenv.isDarwin [ApplicationServices Foundation];
|
||||
(python3.withPackages (p: [ p.pycairo ]))
|
||||
# Optional dependencies
|
||||
libjpeg
|
||||
libexif
|
||||
librsvg
|
||||
poppler
|
||||
libgsf
|
||||
libtiff
|
||||
fftw
|
||||
lcms2
|
||||
libpng
|
||||
libimagequant
|
||||
imagemagick
|
||||
pango
|
||||
orc
|
||||
matio
|
||||
cfitsio
|
||||
libwebp
|
||||
openexr
|
||||
openjpeg
|
||||
libjxl
|
||||
openslide
|
||||
libheif
|
||||
] ++ lib.optionals stdenv.isDarwin [ ApplicationServices Foundation ];
|
||||
|
||||
# Required by .pc file
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -24,7 +24,7 @@ in appimageTools.wrapType2 {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Installer for BetterDiscord";
|
||||
homepage = "https://betterdiscord.net";
|
||||
homepage = "https://betterdiscord.app";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.ivar ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "shadowenv";
|
||||
version = "2.0.3";
|
||||
version = "2.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shopify";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1h8hfyxxl4bpx8azzxj0snmzccn6xjd9vc2iyp8i2ar7aiyhf5yd";
|
||||
sha256 = "sha256-BXCIb91EOpu/GUVvmFZbycuWYAS1n5Sxg5OiYx5rlPA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "1ixjkb82863z160spylza2a5hk82x0c4wjjnzgakbzgrwv29pai3";
|
||||
cargoSha256 = "sha256-Hn+128ZQljTroebDQBBNynSq7WTZLpB5sdA2Gz54pOU=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -1,19 +1,21 @@
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, zlib, bzip2 }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, zlib, bzip2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bgpdump";
|
||||
version = "1.6.0";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ris.ripe.net/source/bgpdump/libbgpdump-1.6.0.tgz";
|
||||
sha256 = "144369gj35mf63nz4idqwsvgsirw7fybm8kkk07yymrjp8jr3aqk";
|
||||
src = fetchFromGitHub {
|
||||
owner = "RIPE-NCC";
|
||||
repo = "bgpdump";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1HXMf9mHManR7jhonU2Agon0YFXOlM9APIN1Zm840AM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ zlib bzip2 ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://bitbucket.org/ripencc/bgpdump/";
|
||||
homepage = "https://github.com/RIPE-NCC/bgpdump";
|
||||
description = "Analyze dump files produced by Zebra/Quagga or MRT";
|
||||
license = lib.licenses.hpnd;
|
||||
maintainers = with lib.maintainers; [ lewo ];
|
||||
|
||||
@ -1,26 +1,23 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "brook";
|
||||
version = "20200201";
|
||||
|
||||
goPackagePath = "github.com/txthinking/brook";
|
||||
version = "20210701";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "txthinking";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0fyw2q99gapnrg836x299sgagx94a5jpw4x3gnsf69fih7cqp9lm";
|
||||
sha256 = "sha256-MYd9q1pjrdLbgIoIakHeBuCjlEjXib0CNivZiqk5hns=";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
vendorSha256 = "sha256-iaaXLpzN69yHBcAi9GS+G7LupX/7VABo1XFNegk+i3Q=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/txthinking/brook";
|
||||
description = "A cross-platform Proxy/VPN software";
|
||||
license = with licenses; [ gpl3 ];
|
||||
license = with licenses; [ gpl3Only ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ xrelkd ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
165
pkgs/tools/networking/brook/deps.nix
generated
165
pkgs/tools/networking/brook/deps.nix
generated
@ -1,165 +0,0 @@
|
||||
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/urfave/cli";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/urfave/cli";
|
||||
rev = "3f8c3bca5729c9b679beffd0d88a67d468f832fd";
|
||||
sha256 = "07m5dfp5190wczdw2vqzz4srcpjz5lci1z12rzww9pg9pdjs63gy";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/cpuguy83/go-md2man";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/cpuguy83/go-md2man";
|
||||
rev = "217d7bd9dd5494abdf2877afbeb24ba0e11b43d6";
|
||||
sha256 = "0vsmdrh5c5ngrnq91yg40l8388vh7l1p4wlv4lh7p977dp75ivg6";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gorilla/mux";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gorilla/mux";
|
||||
rev = "75dcda0896e109a2a22c9315bca3bb21b87b2ba5";
|
||||
sha256 = "1d0sy1paa055ic84sp3766s9pa24q008hf77dc842vrgvn8p3wmh";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gorilla/websocket";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gorilla/websocket";
|
||||
rev = "c3e18be99d19e6b3e8f1559eea2c161a665c4b6b";
|
||||
sha256 = "03n1n0nwz3k9qshmriycqznnnvd3dkzsfwpnfjzzvafjxk9kyapv";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mdp/qrterminal";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mdp/qrterminal";
|
||||
rev = "b74f0e01e9f532111951caf89df78e5619193db5";
|
||||
sha256 = "1xz5f3dfkdwd6svnbh98rlr5pfr4s4hrqs4vffn9wy5vb336pp8p";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/miekg/dns";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/miekg/dns";
|
||||
rev = "6c0c4e6581f8e173cc562c8b3363ab984e4ae071";
|
||||
sha256 = "0fpd9alvhzrkb1c31n4lrxlpv1nlhy51w1yg39xxb3mjmrb7lby1";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/patrickmn/go-cache";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/patrickmn/go-cache";
|
||||
rev = "46f407853014144407b6c2ec7ccc76bf67958d93";
|
||||
sha256 = "08155wdk2883qw37p7wgrpv8wb9lbx4cpfgrraivdavs3qbjlq5j";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/shurcooL/sanitized_anchor_name";
|
||||
rev = "7bfe4c7ecddb3666a94b053b422cdd8f5aaa3615";
|
||||
sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/txthinking/gotun2socks";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/txthinking/gotun2socks";
|
||||
rev = "35016fdae05e78db993d43f55eb96ddbe3958252";
|
||||
sha256 = "11rl8pqyd6jzi5alpymzi0i5q7pk2492di44v85g7r24y6livrjg";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/txthinking/socks5";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/txthinking/socks5";
|
||||
rev = "254e122c4eaf8657900905ed5bed5777870b9df8";
|
||||
sha256 = "1q43sxzacj216mdzl44khhx51w1z78jpraw955dnjv9va0zqbhmi";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/txthinking/x";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/txthinking/x";
|
||||
rev = "99b19c1440b66f803ee98b30b6829651cc3f90cc";
|
||||
sha256 = "0vzw9wxlgj21y35qv580806vy6k6w1z5yqd5n6ccnq8cd3lvmx70";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/urfave/negroni";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/urfave/negroni";
|
||||
rev = "f4316798d5d3acd39eb6784301b19f27f471415f";
|
||||
sha256 = "0w4iva6s8v8sk95l8mb1a67v0bn4h7njyylv9dnwma0d3l7k24y3";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/crypto";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/crypto";
|
||||
rev = "69ecbb4d6d5dab05e49161c6e77ea40a030884e1";
|
||||
sha256 = "1ylm1lp1miihaq93p8rh2yh823qljqkyqwk3gjzk2bdvzz427pr5";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/net";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/net";
|
||||
rev = "6afb5195e5aab057fda82e27171243402346b0ad";
|
||||
sha256 = "1aiz41q2yxgg3dxfkn33ff54vhaxbiwcps9j3ia1xx4cqxim38zw";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "9fbb57f87de9ccfe3a99d4e3270ce8a926ebba4f";
|
||||
sha256 = "0qaz2jjkrxzgkapmjqingdwamrgq2aiblxvzzgrcsv2qhkj0wdps";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/text";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/text";
|
||||
rev = "929e72ca90deac4784bbe451caf10faa5b256ebe";
|
||||
sha256 = "0kwyw87bx0rsc5bbqrrg36yv2b7rs4ijs4p4444s8zwzq6sw24y8";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/russross/blackfriday.v2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/russross/blackfriday.v2";
|
||||
rev = "d3b5b032dc8e8927d31a5071b56e14c89f045135";
|
||||
sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "rsc.io/qr";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/rsc/qr";
|
||||
rev = "ca9a01fc2f9505024045632c50e5e8cd6142fafe";
|
||||
sha256 = "04yx493g0fqp8i59zjxnl4k3s0cl0kr5m8xh0ph8m10r1hkw0xr3";
|
||||
};
|
||||
}
|
||||
]
|
||||
@ -1,24 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, openssl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "socat-2.0.0-b9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2";
|
||||
sha256 = "1ll395xjv4byvv0k2zjbxk8vp3mg3y2w5paa05wv553bqsjv1vs9";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
patches = lib.singleton ./libressl-fixes.patch ;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A utility for bidirectional data transfer between two independent data channels";
|
||||
homepage = "http://www.dest-unreach.org/socat/";
|
||||
repositories.git = "git://repo.or.cz/socat.git";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.eelco ];
|
||||
broken = true; # broken with openssl 1.1
|
||||
};
|
||||
}
|
||||
@ -1,173 +0,0 @@
|
||||
Patch from OpenBSD
|
||||
--- a/sslcls.c Sat Jan 24 03:15:22 2015
|
||||
+++ b/sslcls.c Sat Jul 18 20:01:59 2015
|
||||
@@ -55,6 +55,7 @@ const SSL_METHOD *sycSSLv2_server_method(void) {
|
||||
}
|
||||
#endif
|
||||
|
||||
+#ifdef HAVE_SSLv3_client_method
|
||||
const SSL_METHOD *sycSSLv3_client_method(void) {
|
||||
const SSL_METHOD *result;
|
||||
Debug("SSLv3_client_method()");
|
||||
@@ -62,7 +63,9 @@ const SSL_METHOD *sycSSLv3_client_method(void) {
|
||||
Debug1("SSLv3_client_method() -> %p", result);
|
||||
return result;
|
||||
}
|
||||
+#endif
|
||||
|
||||
+#ifdef HAVE_SSLv3_server_method
|
||||
const SSL_METHOD *sycSSLv3_server_method(void) {
|
||||
const SSL_METHOD *result;
|
||||
Debug("SSLv3_server_method()");
|
||||
@@ -70,6 +73,7 @@ const SSL_METHOD *sycSSLv3_server_method(void) {
|
||||
Debug1("SSLv3_server_method() -> %p", result);
|
||||
return result;
|
||||
}
|
||||
+#endif
|
||||
|
||||
const SSL_METHOD *sycSSLv23_client_method(void) {
|
||||
const SSL_METHOD *result;
|
||||
@@ -331,14 +335,6 @@ void sycSSL_free(SSL *ssl) {
|
||||
return;
|
||||
}
|
||||
|
||||
-int sycRAND_egd(const char *path) {
|
||||
- int result;
|
||||
- Debug1("RAND_egd(\"%s\")", path);
|
||||
- result = RAND_egd(path);
|
||||
- Debug1("RAND_egd() -> %d", result);
|
||||
- return result;
|
||||
-}
|
||||
-
|
||||
DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u) {
|
||||
DH *result;
|
||||
Debug4("PEM_read_bio_DHparams(%p, %p, %p, %p)",
|
||||
@@ -375,7 +371,7 @@ int sycFIPS_mode_set(int onoff) {
|
||||
}
|
||||
#endif /* WITH_FIPS */
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
|
||||
+#if (OPENSSL_VERSION_NUMBER >= 0x00908000L) && !defined(OPENSSL_NO_COMP)
|
||||
const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl) {
|
||||
const COMP_METHOD *result;
|
||||
Debug1("SSL_get_current_compression(%p)", ssl);
|
||||
--- a/sslcls.h Sat Jan 24 11:15:22 2015
|
||||
+++ b/sslcls.h Mon Apr 13 15:06:25 2015
|
||||
@@ -47,7 +47,6 @@ X509 *sycSSL_get_peer_certificate(SSL *ssl);
|
||||
int sycSSL_shutdown(SSL *ssl);
|
||||
void sycSSL_CTX_free(SSL_CTX *ctx);
|
||||
void sycSSL_free(SSL *ssl);
|
||||
-int sycRAND_egd(const char *path);
|
||||
|
||||
DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u);
|
||||
|
||||
@@ -55,7 +54,7 @@ BIO *sycBIO_new_file(const char *filename, const char
|
||||
|
||||
int sycFIPS_mode_set(int onoff);
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
|
||||
+#if (OPENSSL_VERSION_NUMBER >= 0x00908000L) && !defined(OPENSSL_NO_COMP)
|
||||
const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl);
|
||||
const COMP_METHOD *sycSSL_get_current_expansion(SSL *ssl);
|
||||
const char *sycSSL_COMP_get_name(const COMP_METHOD *comp);
|
||||
@@ -98,7 +97,6 @@ const char *sycSSL_COMP_get_name(const COMP_METHOD *co
|
||||
#define sycSSL_shutdown(s) SSL_shutdown(s)
|
||||
#define sycSSL_CTX_free(c) SSL_CTX_free(c)
|
||||
#define sycSSL_free(s) SSL_free(s)
|
||||
-#define sycRAND_egd(p) RAND_egd(p)
|
||||
|
||||
#define sycPEM_read_bio_DHparams(b,x,p,u) PEM_read_bio_DHparams(b,x,p,u)
|
||||
|
||||
--- a/xio-openssl.c Sat Jan 24 15:33:42 2015
|
||||
+++ b/xio-openssl.c Mon Apr 13 14:59:12 2015
|
||||
@@ -108,7 +108,6 @@ const struct optdesc opt_openssl_key = { "open
|
||||
const struct optdesc opt_openssl_dhparam = { "openssl-dhparam", "dh", OPT_OPENSSL_DHPARAM, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC };
|
||||
const struct optdesc opt_openssl_cafile = { "openssl-cafile", "cafile", OPT_OPENSSL_CAFILE, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC };
|
||||
const struct optdesc opt_openssl_capath = { "openssl-capath", "capath", OPT_OPENSSL_CAPATH, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC };
|
||||
-const struct optdesc opt_openssl_egd = { "openssl-egd", "egd", OPT_OPENSSL_EGD, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC };
|
||||
const struct optdesc opt_openssl_pseudo = { "openssl-pseudo", "pseudo", OPT_OPENSSL_PSEUDO, GROUP_OPENSSL, PH_SPEC, TYPE_BOOL, OFUNC_SPEC };
|
||||
#if OPENSSL_VERSION_NUMBER >= 0x00908000L
|
||||
const struct optdesc opt_openssl_compress = { "openssl-compress", "compress", OPT_OPENSSL_COMPRESS, GROUP_OPENSSL, PH_SPEC, TYPE_STRING, OFUNC_SPEC };
|
||||
@@ -147,7 +146,7 @@ int xio_reset_fips_mode(void) {
|
||||
static void openssl_conn_loginfo(SSL *ssl) {
|
||||
Notice1("SSL connection using %s", SSL_get_cipher(ssl));
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
|
||||
+#if (OPENSSL_VERSION_NUMBER >= 0x00908000L) && !defined(OPENSSL_NO_COMP)
|
||||
{
|
||||
const COMP_METHOD *comp, *expansion;
|
||||
|
||||
@@ -722,7 +721,6 @@ int
|
||||
char *opt_dhparam = NULL; /* file name of DH params */
|
||||
char *opt_cafile = NULL; /* certificate authority file */
|
||||
char *opt_capath = NULL; /* certificate authority directory */
|
||||
- char *opt_egd = NULL; /* entropy gathering daemon socket path */
|
||||
#if OPENSSL_VERSION_NUMBER >= 0x00908000L
|
||||
char *opt_compress = NULL; /* compression method */
|
||||
#endif
|
||||
@@ -741,7 +739,6 @@ int
|
||||
retropt_string(opts, OPT_OPENSSL_CAPATH, &opt_capath);
|
||||
retropt_string(opts, OPT_OPENSSL_KEY, &opt_key);
|
||||
retropt_string(opts, OPT_OPENSSL_DHPARAM, &opt_dhparam);
|
||||
- retropt_string(opts, OPT_OPENSSL_EGD, &opt_egd);
|
||||
retropt_bool(opts,OPT_OPENSSL_PSEUDO, &opt_pseudo);
|
||||
#if OPENSSL_VERSION_NUMBER >= 0x00908000L
|
||||
retropt_string(opts, OPT_OPENSSL_COMPRESS, &opt_compress);
|
||||
@@ -877,10 +874,6 @@ int
|
||||
}
|
||||
}
|
||||
|
||||
- if (opt_egd) {
|
||||
- sycRAND_egd(opt_egd);
|
||||
- }
|
||||
-
|
||||
if (opt_pseudo) {
|
||||
long int randdata;
|
||||
/* initialize libc random from actual microseconds */
|
||||
@@ -1098,7 +1091,7 @@ static int openssl_SSL_ERROR_SSL(int level, const char
|
||||
if (e == ((ERR_LIB_RAND<<24)|
|
||||
(RAND_F_SSLEAY_RAND_BYTES<<12)|
|
||||
(RAND_R_PRNG_NOT_SEEDED)) /*0x24064064*/) {
|
||||
- Error("too few entropy; use options \"egd\" or \"pseudo\"");
|
||||
+ Error("too few entropy; use option \"pseudo\"");
|
||||
stat = STAT_NORETRY;
|
||||
} else {
|
||||
Msg2(level, "%s(): %s", funcname, ERR_error_string(e, buf));
|
||||
--- a/xio-openssl.h Sun Jun 23 07:16:48 2013
|
||||
+++ b/xio-openssl.h Sat Apr 19 15:58:21 2014
|
||||
@@ -21,7 +21,6 @@ extern const struct optdesc opt_openssl_key;
|
||||
extern const struct optdesc opt_openssl_dhparam;
|
||||
extern const struct optdesc opt_openssl_cafile;
|
||||
extern const struct optdesc opt_openssl_capath;
|
||||
-extern const struct optdesc opt_openssl_egd;
|
||||
extern const struct optdesc opt_openssl_pseudo;
|
||||
#if OPENSSL_VERSION_NUMBER >= 0x00908000L
|
||||
extern const struct optdesc opt_openssl_compress;
|
||||
--- a/xioopts.c Sat Jan 24 11:15:22 2015
|
||||
+++ b/xioopts.c Mon Apr 13 15:06:25 2015
|
||||
@@ -412,7 +412,6 @@ const struct optname optionnames[] = {
|
||||
#ifdef ECHOPRT
|
||||
IF_TERMIOS("echoprt", &opt_echoprt)
|
||||
#endif
|
||||
- IF_OPENSSL("egd", &opt_openssl_egd)
|
||||
IF_ANY ("end-close", &opt_end_close)
|
||||
IF_TERMIOS("eof", &opt_veof)
|
||||
IF_TERMIOS("eol", &opt_veol)
|
||||
@@ -1102,7 +1101,6 @@ const struct optname optionnames[] = {
|
||||
IF_OPENSSL("openssl-compress", &opt_openssl_compress)
|
||||
#endif
|
||||
IF_OPENSSL("openssl-dhparam", &opt_openssl_dhparam)
|
||||
- IF_OPENSSL("openssl-egd", &opt_openssl_egd)
|
||||
#if WITH_FIPS
|
||||
IF_OPENSSL("openssl-fips", &opt_openssl_fips)
|
||||
#endif
|
||||
--- a/xioopts.h Sat Jan 24 11:15:22 2015
|
||||
+++ b/xioopts.h Mon Apr 13 15:06:25 2015
|
||||
@@ -478,7 +478,6 @@ enum e_optcode {
|
||||
OPT_OPENSSL_COMPRESS,
|
||||
#endif
|
||||
OPT_OPENSSL_DHPARAM,
|
||||
- OPT_OPENSSL_EGD,
|
||||
OPT_OPENSSL_FIPS,
|
||||
OPT_OPENSSL_KEY,
|
||||
OPT_OPENSSL_METHOD,
|
||||
@ -1,44 +0,0 @@
|
||||
diff -rc apg-2.2.3/Makefile apg-2.2.3-new/Makefile
|
||||
*** apg-2.2.3/Makefile 2003-08-07 17:40:30.000000000 +0200
|
||||
--- apg-2.2.3-new/Makefile 2013-07-24 12:25:31.159938436 +0200
|
||||
***************
|
||||
*** 113,131 ****
|
||||
if test -x ./apg; then \
|
||||
./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \
|
||||
./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \
|
||||
! ./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apg ${INSTALL_PREFIX}${APG_BIN_DIR}; \
|
||||
./install-sh -c -m 0444 ./doc/man/apg.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \
|
||||
fi
|
||||
if test -x ./apgd; then \
|
||||
./mkinstalldirs ${INSTALL_PREFIX}${APGD_BIN_DIR}; \
|
||||
./mkinstalldirs ${INSTALL_PREFIX}${APGD_MAN_DIR}; \
|
||||
! ./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgd ${INSTALL_PREFIX}${APGD_BIN_DIR}; \
|
||||
./install-sh -c -m 0444 ./doc/man/apgd.8 ${INSTALL_PREFIX}${APGD_MAN_DIR}; \
|
||||
fi
|
||||
if test -x ./apgbfm; then \
|
||||
./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \
|
||||
./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \
|
||||
! ./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgbfm ${INSTALL_PREFIX}${APG_BIN_DIR}; \
|
||||
./install-sh -c -m 0444 ./doc/man/apgbfm.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \
|
||||
fi
|
||||
|
||||
--- 113,131 ----
|
||||
if test -x ./apg; then \
|
||||
./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \
|
||||
./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \
|
||||
! ./install-sh -c -m 0755 ./apg ${INSTALL_PREFIX}${APG_BIN_DIR}; \
|
||||
./install-sh -c -m 0444 ./doc/man/apg.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \
|
||||
fi
|
||||
if test -x ./apgd; then \
|
||||
./mkinstalldirs ${INSTALL_PREFIX}${APGD_BIN_DIR}; \
|
||||
./mkinstalldirs ${INSTALL_PREFIX}${APGD_MAN_DIR}; \
|
||||
! ./install-sh -c -m 0755 ./apgd ${INSTALL_PREFIX}${APGD_BIN_DIR}; \
|
||||
./install-sh -c -m 0444 ./doc/man/apgd.8 ${INSTALL_PREFIX}${APGD_MAN_DIR}; \
|
||||
fi
|
||||
if test -x ./apgbfm; then \
|
||||
./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \
|
||||
./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \
|
||||
! ./install-sh -c -m 0755 ./apgbfm ${INSTALL_PREFIX}${APG_BIN_DIR}; \
|
||||
./install-sh -c -m 0444 ./doc/man/apgbfm.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \
|
||||
fi
|
||||
|
||||
@ -1,25 +1,18 @@
|
||||
{ lib, stdenv, fetchurl, openssl }:
|
||||
{ lib, stdenv, fetchFromGitHub, openssl, autoreconfHook }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apg";
|
||||
version = "2.3.0b";
|
||||
version = "unstable-2015-01-29";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.adel.nursat.kz/apg/download/apg-${version}.tar.gz";
|
||||
sha256 = "14lbq81xrcsmpk1b9qmqyz7n6ypf08zcxvcvp6f7ybcyf0lj1rfi";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wilx";
|
||||
repo = "apg";
|
||||
rev = "7ecdbac79156c8864fa3ff8d61e9f1eb264e56c2";
|
||||
sha256 = "sha256-+7TrJACdm/i/pc0dsp8edEIOjx8cip+x0Qc2gONajSE=";
|
||||
};
|
||||
configurePhase = ''
|
||||
substituteInPlace Makefile --replace /usr/local "$out"
|
||||
'';
|
||||
makeFlags = ["CC=${stdenv.cc.targetPrefix}cc"];
|
||||
|
||||
patches = [
|
||||
./apg.patch
|
||||
./phony-install-target.patch
|
||||
];
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
sed -i -e 's|APG_CLIBS += -lcrypt|APG_CLIBS += -L${openssl.out}/lib -lcrypto|' Makefile
|
||||
'';
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
meta = {
|
||||
description = "Tools for random password generation";
|
||||
@ -66,7 +59,7 @@ stdenv.mkDerivation rec {
|
||||
* Ability to enforce remote users to use only allowed type of
|
||||
password generation
|
||||
'';
|
||||
homepage = "http://www.adel.nursat.kz/apg/";
|
||||
homepage = "https://github.com/wilx/apg";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ astsmtl ];
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
diff -ur a/Makefile b/Makefile
|
||||
--- a/Makefile 2003-08-08 00:40:39.000000000 +0900
|
||||
+++ b/Makefile 2018-04-05 22:29:39.284191020 +0900
|
||||
@@ -142,6 +142,7 @@
|
||||
strip ${CS_PROGNAME}
|
||||
strip ${BFM_PROGNAME}
|
||||
|
||||
+.PHONY: install
|
||||
install:
|
||||
if test -x ./apg; then \
|
||||
./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \
|
||||
@ -1,17 +1,29 @@
|
||||
{lib, stdenv, fetchurl, autoreconfHook}:
|
||||
{ lib
|
||||
, stdenv
|
||||
, autoreconfHook
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pwgen";
|
||||
version = "2.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tytso/pwgen/archive/v${version}.tar.gz";
|
||||
sha256 = "8d6e94f28655e61d6126290e3eafad4d17d7fba0d0d354239522a740a270bb2f";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tytso";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1j6c6m9fcy24jn8mk989x49yk765xb26lpr8yhpiaqk206wlss2z";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Password generator which creates passwords which can be easily memorized by a human";
|
||||
platforms = lib.platforms.all;
|
||||
homepage = "https://github.com/tytso/pwgen";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
source 'https://rubygems.org'
|
||||
gem 'bcat'
|
||||
@ -1,15 +0,0 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
bcat (0.6.2)
|
||||
rack (~> 1.0)
|
||||
rack (1.6.11)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
bcat
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.4
|
||||
@ -1,17 +0,0 @@
|
||||
{ lib, bundlerApp, bundlerUpdateScript }:
|
||||
|
||||
bundlerApp {
|
||||
pname = "bcat";
|
||||
gemdir = ./.;
|
||||
exes = [ "bcat" "btee" "a2h" ];
|
||||
|
||||
passthru.updateScript = bundlerUpdateScript "bcat";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pipe to browser utility";
|
||||
homepage = "http://rtomayko.github.com/bcat/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jraygauthier nicknovitski ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -1,23 +0,0 @@
|
||||
{
|
||||
bcat = {
|
||||
dependencies = ["rack"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0w2wwlngcs7f4lmvifixrb89bjkw2lx8z0nn72w360hz394ic651";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.6.2";
|
||||
};
|
||||
rack = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.11";
|
||||
};
|
||||
}
|
||||
@ -1,22 +1,22 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK30-gtk3,
|
||||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK31-gtk3,
|
||||
boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk3, gtkspell3, pugixml,
|
||||
nlohmann_json, hicolor-icon-theme, wrapGAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "poedit";
|
||||
version = "2.4.3";
|
||||
version = "3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vslavik";
|
||||
repo = "poedit";
|
||||
rev = "v${version}-oss";
|
||||
sha256 = "02xf2w3d2lnr3vqmil9vvg9pir7d21x4zrj9xwpgb7dhs0gimj0x";
|
||||
sha256 = "0bxhyxsa641ip6wab9ms9g4w6mb1bv46y5h5b436spl5c70rcn4z";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook
|
||||
libxslt xmlto boost libtool pkg-config ];
|
||||
|
||||
buildInputs = [ lucenepp nlohmann_json wxGTK30-gtk3 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ];
|
||||
buildInputs = [ lucenepp nlohmann_json wxGTK31-gtk3 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ];
|
||||
|
||||
propagatedBuildInputs = [ gettext ];
|
||||
|
||||
|
||||
@ -69,6 +69,7 @@ mapAliases ({
|
||||
batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10
|
||||
bazaar = throw "bazaar has been deprecated by breezy."; # added 2020-04-19
|
||||
bazaarTools = throw "bazaar has been deprecated by breezy."; # added 2020-04-19
|
||||
bcat = throw "bcat has been removed because upstream is dead"; # added 2021-08-22
|
||||
beegfs = throw "beegfs has been removed."; # added 2019-11-24
|
||||
bluezFull = bluez; # Added 2019-12-03
|
||||
bpftool = bpftools; # Added 2021-05-03
|
||||
@ -78,6 +79,7 @@ mapAliases ({
|
||||
bootchart = throw "bootchart has been removed from nixpkgs, as it is without a maintainer"; # added 2019-12-10
|
||||
bomi = throw "bomi has been removed from nixpkgs since it was broken and abandoned upstream"; # added 2020-12-10
|
||||
btrfsProgs = btrfs-progs; # added 2016-01-03
|
||||
bitsnbots = throw "bitsnbots has been removed because it was broken and upstream missing"; # added 2021-08-22
|
||||
bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03
|
||||
bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03
|
||||
bittorrentSync20 = throw "bittorrentSync20 has been deprecated by resilio-sync."; # added 2019-06-03
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user