Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-01-20 18:53:14 +00:00 committed by GitHub
commit 6b321782b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
60 changed files with 443 additions and 305 deletions

View file

@ -58,6 +58,7 @@ in
"2.nixos.pool.ntp.org"
"3.nixos.pool.ntp.org"
];
type = types.listOf types.str;
description = ''
The set of NTP servers from which to synchronise.
'';

View file

@ -41,6 +41,7 @@ in
servers = mkOption {
default = config.networking.timeServers;
type = types.listOf types.str;
description = ''
The set of NTP servers from which to synchronise.
'';

View file

@ -79,6 +79,7 @@ in
servers = mkOption {
default = config.networking.timeServers;
type = types.listOf types.str;
description = ''
The set of NTP servers from which to synchronise.
'';

View file

@ -16,6 +16,7 @@ with lib;
};
servers = mkOption {
default = config.networking.timeServers;
type = types.listOf types.str;
description = ''
The set of NTP servers from which to synchronise.
'';

View file

@ -60,7 +60,8 @@ in rec {
(onFullSupported "nixos.tests.boot-stage1")
(onSystems ["x86_64-linux"] "nixos.tests.boot.uefiCdrom")
(onSystems ["x86_64-linux"] "nixos.tests.boot.uefiUsb")
(onSystems ["x86_64-linux"] "nixos.tests.chromium")
# TODO (@primeos): Fix the test failure since https://github.com/NixOS/nixpkgs/pull/110010:
#(onSystems ["x86_64-linux"] "nixos.tests.chromium")
(onFullSupported "nixos.tests.containers-imperative")
(onFullSupported "nixos.tests.containers-ip")
(onSystems ["x86_64-linux"] "nixos.tests.docker")

View file

@ -80,7 +80,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
def close_win():
def try_close(_):
machine.execute(
status, _ = machine.execute(
ru(
"${xdo "close-window" ''
search --onlyvisible --name "new tab"
@ -89,13 +89,14 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
''}"
)
)
machine.execute(
ru(
"${xdo "close-window" ''
key Ctrl+w
''}"
if status == 0:
machine.execute(
ru(
"${xdo "close-window" ''
key Ctrl+w
''}"
)
)
)
for _ in range(1, 20):
status, out = machine.execute(
ru(

View file

@ -1,85 +0,0 @@
{
alsaLib,
boost,
cln,
cmake,
fetchFromGitHub,
gcc,
ginac,
jamomacore,
kdnssd,
libsndfile,
ninja,
portaudio,
portmidi,
qtbase,
qtdeclarative,
qtimageformats,
qtmultimedia,
qtquickcontrols2,
qtserialport,
qtsvg,
qttools,
qtwebsockets,
rtaudio,
lib, stdenv
}:
stdenv.mkDerivation rec {
version = "1.0.0-b31";
pname = "i-score";
src = fetchFromGitHub {
owner = "OSSIA";
repo = "i-score";
rev = "v${version}";
sha256 = "0g7s6n11w3wflrv5i2047dxx56lryms7xj0mznnlk5bii7g8dxzb";
fetchSubmodules = true;
};
buildInputs = [
alsaLib
boost
cln
cmake
ginac
gcc
jamomacore
kdnssd
libsndfile
ninja
portaudio
portmidi
qtbase
qtdeclarative
qtimageformats
qtmultimedia
qtquickcontrols2
qtserialport
qtsvg
qttools
qtwebsockets
rtaudio
];
cmakeFlags = [
"-GNinja"
"-DISCORE_CONFIGURATION=static-release"
"-DISCORE_ENABLE_LTO=OFF"
"-DISCORE_BUILD_FOR_PACKAGE_MANAGER=True"
];
preConfigure = ''
export CMAKE_PREFIX_PATH="''${CMAKE_PREFIX_PATH-}:$(echo "${jamomacore}/jamoma/share/cmake/Jamoma")"
'';
postInstall = ''rm $out/bin/i-score.sh'';
meta = {
description = "An interactive sequencer for the intermedia arts";
homepage = "http://i-score.org/";
license = lib.licenses.cecill20;
maintainers = [ lib.maintainers.magnetophon ];
platforms = lib.platforms.linux;
};
}

View file

@ -7,13 +7,13 @@
mkDerivation rec {
pname = "musescore";
version = "3.5.2";
version = "3.6";
src = fetchFromGitHub {
owner = "musescore";
repo = "MuseScore";
rev = "v${version}";
sha256 = "VA0+npLUUXQJHalD01pmFTTum2Re7FiiyAwU1XvR93s=";
sha256 = "sha256-0M+idYnrgXyH6WLp+2jIYRnFzTB93v+dG1XHmSNyPjE=";
};
patches = [

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub }:
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation {
name = "kak-prelude";
version = "2020-06-09";

View file

@ -1,15 +1,15 @@
{ lib, stdenv, makeDesktopItem, fetchurl, unzip
, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3
, xorg, mozjpeg, makeWrapper, wrapGAppsHook, libuuid, at-spi2-core
, xorg, mozjpeg, makeWrapper, wrapGAppsHook, libuuid, at-spi2-core, libdrm, mesa
}:
stdenv.mkDerivation rec {
pname = "avocode";
version = "4.10.4";
version = "4.11.0";
src = fetchurl {
url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
sha256 = "06xf5y2mljk3pd74ap9n90bhhidbzpg5c6wws361ygd4f3x86c46";
sha256 = "sha256-50aGechzlVVRQz6WOASHRjT46BKbwyhbt7/0oq2PsOg=";
};
libPath = lib.makeLibraryPath (with xorg; [
@ -44,6 +44,8 @@ stdenv.mkDerivation rec {
libXtst
libXScrnSaver
libuuid
libdrm
mesa
]);
desktopItem = makeDesktopItem {

View file

@ -1,6 +1,9 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, readline, conf ? null }:
{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, readline
, conf ? null, withIcons ? false, withNerdIcons ? false }:
with lib;
# Mutually exclusive options
assert withIcons -> withNerdIcons == false;
assert withNerdIcons -> withIcons == false;
stdenv.mkDerivation rec {
pname = "nnn";
@ -13,13 +16,17 @@ stdenv.mkDerivation rec {
sha256 = "1fa7cmwrzn6kx87kms8i98p9azdlwyh2gnif29l340syl9hkr5qy";
};
configFile = optionalString (conf != null) (builtins.toFile "nnn.h" conf);
preBuild = optionalString (conf != null) "cp ${configFile} src/nnn.h";
configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf);
preBuild = lib.optionalString (conf != null) "cp ${configFile} src/nnn.h";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ readline ncurses ];
makeFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ];
makeFlags = [
"DESTDIR=${placeholder "out"}"
"PREFIX="
] ++ lib.optional withIcons [ "O_ICONS=1" ]
++ lib.optional withNerdIcons [ "O_NERD=1" ];
# shell completions
postInstall = ''
@ -28,7 +35,7 @@ stdenv.mkDerivation rec {
install -Dm555 misc/auto-completion/fish/nnn.fish -t $out/share/fish/vendor_completions.d
'';
meta = {
meta = with lib; {
description = "Small ncurses-based file browser forked from noice";
homepage = "https://github.com/jarun/nnn";
license = licenses.bsd2;

View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "nwg-launchers";
version = "0.4.2";
version = "0.4.3";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = pname;
rev = "v${version}";
sha256 = "0flp7mwj1pgcwx3k9pzc8pmqlkhbddj0maimdnvlazk87kzxpfd0";
sha256 = "sha256-vuvYL9N9xdg27uhiTe2OqxZ3/n/9EjlqPxtNMXpqpE8=";
};
nativeBuildInputs = [

View file

@ -1,20 +1,20 @@
{
"stable": {
"version": "87.0.4280.141",
"sha256": "0x9k809m36pfirnw2vnr9pk93nxdbgrvna0xf1rs3q91zkbr2x8l",
"sha256bin64": "0wq3yi0qyxzcid390w5rh4xjq92fjajvlifjl70g6sqnbk6vgvdp",
"version": "88.0.4324.96",
"sha256": "17y7x50cx2d3bbz0hna25j8pyqsk0914266mpvrpk5am52xwb5c9",
"sha256bin64": "09210781s9y49l6qkbd1v8w52741rmhxz6cc6qsldnqpm5mwlgsc",
"deps": {
"gn": {
"version": "2020-09-09",
"version": "2020-11-05",
"url": "https://gn.googlesource.com/gn",
"rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2",
"sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk"
"rev": "53d92014bf94c3893886470a1c7c1289f8818db0",
"sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9"
}
},
"chromedriver": {
"version": "87.0.4280.88",
"sha256_linux": "1insh1imi25sj4hdkbll5rzwnag8wvfxv4ckshpq8akl8r13p6lj",
"sha256_darwin": "048hsqp6575r980m769lzznvxypmfcwn89f1d3ik751ymzmb5r78"
"version": "88.0.4324.27",
"sha256_linux": "1vx1llg0x6903ggqa345iswd63y9c24184zv784q01zqxqwn0g8p",
"sha256_darwin": "0x1s6crfwkcn86w6p8g4vmx5raqlr41pjr4h2dbwppgrc0nx1p14"
}
},
"beta": {

View file

@ -20,6 +20,8 @@ buildGoModule rec {
# if the versions are not provided via file paths.
postInstall = "mv $out/bin/${pname}{,_v${version}}";
passthru.provider-source-address = "registry.terraform.io/scottwinkler/shell";
meta = with lib; {
inherit (src.meta) homepage;
description = "Terraform provider for executing shell commands and saving output to state file";

View file

@ -1,4 +1,15 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, olm, makeDesktopItem }:
{ lib
, stdenv
, substituteAll
, buildGoModule
, fetchFromGitHub
, makeDesktopItem
, makeWrapper
, libnotify
, olm
, pulseaudio
, sound-theme-freedesktop
}:
buildGoModule rec {
pname = "gomuks";
@ -15,7 +26,13 @@ buildGoModule rec {
doCheck = false;
buildInputs = [ olm ];
buildInputs = [ makeWrapper olm ];
# Upstream issue: https://github.com/tulir/gomuks/issues/260
patches = lib.optional stdenv.isLinux (substituteAll {
src = ./hardcoded_path.patch;
soundTheme = sound-theme-freedesktop;
});
postInstall = ''
cp -r ${
@ -30,13 +47,15 @@ buildGoModule rec {
}
}/* $out/
substituteAllInPlace $out/share/applications/*
wrapProgram $out/bin/gomuks \
--prefix PATH : "${lib.makeBinPath (lib.optionals stdenv.isLinux [ libnotify pulseaudio ])}"
'';
meta = with lib; {
homepage = "https://maunium.net/go/gomuks/";
description = "A terminal based Matrix client written in Go";
license = licenses.gpl3;
maintainers = with maintainers; [ tilpner emily ];
maintainers = with maintainers; [ charvp emily ];
platforms = platforms.unix;
};
}

View file

@ -0,0 +1,13 @@
diff --git a/lib/notification/notify_linux.go b/lib/notification/notify_linux.go
index f93a95f..da6a61d 100644
--- a/lib/notification/notify_linux.go
+++ b/lib/notification/notify_linux.go
@@ -32,7 +32,7 @@ func Send(title, text string, critical, sound bool) error {
if critical {
soundName = "complete"
}
- exec.Command("paplay", "/usr/share/sounds/freedesktop/stereo/"+soundName+".oga").Run()
+ exec.Command("paplay", "@soundTheme@/share/sounds/freedesktop/stereo/"+soundName+".oga").Run()
}
return exec.Command("notify-send", args...).Run()
}

View file

@ -1,46 +1,22 @@
{ stdenv, lib, fetchurl, xdg_utils, dpkg, makeWrapper, autoPatchelfHook
, libXtst, libXScrnSaver, gtk3, nss, alsaLib, udev, libnotify, wrapGAppsHook
}:
{ stdenv, callPackage, fetchurl, lib }:
let
version = "0.7.7";
in stdenv.mkDerivation rec {
mkRambox = opts: callPackage (import ./rambox.nix opts) { };
in mkRambox rec {
pname = "rambox";
inherit version;
version = "0.7.7";
src = {
x86_64-linux = fetchurl {
url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-amd64.deb";
sha256 = "0bij4f1bkg94gc8pq7r6yfym5zcvwc2ymdnmnmh5m4h1pa1gk6x9";
url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-x86_64.AppImage";
sha256 = "0f82hq0dzcjicdz6lkzj8889y100yqciqrwh8wjjy9pxkhjcdini";
};
i686-linux = fetchurl {
url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.deb";
sha256 = "1nhgqjha10jvyf9nsghvlkibg7byj8qz140639ygag9qlpd51rfs";
url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.AppImage";
sha256 = "1nhgqjha10jvyf9nsghvlkibg7byj8qz140639ygag9qlpd52rfs";
};
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ];
buildInputs = [ libXtst libXScrnSaver gtk3 nss alsaLib ];
runtimeDependencies = [ (lib.getLib udev) libnotify ];
unpackPhase = "dpkg-deb -x $src .";
installPhase = ''
mkdir -p $out/bin
cp -r opt $out
ln -s $out/opt/Rambox/rambox $out/bin
# provide resources
cp -r usr/share $out
substituteInPlace $out/share/applications/rambox.desktop \
--replace Exec=/opt/Rambox/rambox Exec=rambox
'';
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : ${xdg_utils}/bin
)
'';
meta = with lib; {
description = "Free and Open Source messaging and emailing app that combines common web applications into one";
homepage = "https://rambox.pro";

View file

@ -1,56 +1,25 @@
{ autoPatchelfHook, electron_7, fetchurl, makeDesktopItem, makeWrapper, nodePackages, nss, lib, stdenv, xdg_utils, xorg }:
{ stdenv, callPackage, fetchurl, lib }:
let
electron = electron_7;
in
stdenv.mkDerivation rec {
mkRambox = opts: callPackage (import ./rambox.nix opts) { };
in mkRambox rec {
pname = "rambox-pro";
version = "1.4.1";
dontBuild = true;
dontStrip = true;
desktopName = "Rambox Pro";
buildInputs = [ nss xorg.libXext xorg.libxkbfile xorg.libXScrnSaver ];
nativeBuildInputs = [ autoPatchelfHook makeWrapper nodePackages.asar ];
src = fetchurl {
url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.tar.gz";
sha256 = "1bd4fba3ac8c20fa557ebfb110f6503d36e6c3dba0401d1073529dcae2c2ec1e";
};
installPhase = ''
mkdir -p $out/{bin,resources/dist/renderer/assets/images/app,share/applications,share/icons/hicolor/256x256/apps}
asar e resources/app.asar $out/resources
substituteInPlace "$out/resources/dist/electron/main.js" \
--replace ",isHidden:" ",path:\"$out/bin/ramboxpro\",isHidden:"
cp $desktopItem/share/applications/* $out/share/applications
cp $out/resources/dist/electron/imgs/256x256.png $out/share/icons/hicolor/256x256/apps/ramboxpro.png
cp $out/resources/dist/electron/imgs/256x256.png $out/resources/dist/renderer/assets/images/app/icon.png
'';
postFixup = ''
makeWrapper ${electron}/bin/electron $out/bin/ramboxpro \
--add-flags "$out/resources --without-update" \
--prefix PATH : ${xdg_utils}/bin
'';
desktopItem = makeDesktopItem {
name = "rambox-pro";
exec = "ramboxpro";
icon = "ramboxpro";
type = "Application";
desktopName = "Rambox Pro";
categories = "Network;";
};
src = {
x86_64-linux = fetchurl {
url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.AppImage";
sha256 = "18383v3g26hd1czvw06gmjn8bdw2w9c7zb04zkfl6szgakrv26x4";
};
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
meta = with lib; {
description = "Messaging and emailing app that combines common web applications into one";
homepage = "https://rambox.pro";
license = licenses.unfree;
maintainers = with maintainers; [ chrisaw ];
platforms = [ "i686-linux" "x86_64-linux" ];
platforms = [ "x86_64-linux" ];
};
}

View file

@ -0,0 +1,30 @@
{ pname, version, src, meta, desktopName ? "Rambox" }:
{ appimageTools, stdenv, lib, fetchurl, makeDesktopItem }:
let
name = "${pname}-${version}";
desktopItem = (makeDesktopItem {
inherit desktopName;
name = pname;
exec = pname;
icon = pname;
type = "Application";
categories = "Network;";
});
appimageContents = appimageTools.extractType2 {
inherit name src;
};
in appimageTools.wrapType2 rec {
inherit name src meta;
extraInstallCommands = ''
mkdir -p $out/share/applications $out/share/icons/hicolor/256x256/apps
# CE uses rambox-<version>, Pro uses rambox
mv $out/bin/rambox* $out/bin/${pname}
install -Dm644 ${appimageContents}/usr/share/icons/hicolor/256x256/apps/rambox*.png $out/share/icons/hicolor/256x256/apps/${pname}.png
install -Dm644 ${desktopItem}/share/applications/* $out/share/applications
'';
}

View file

@ -18,11 +18,11 @@
stdenv.mkDerivation rec {
pname = "mailspring";
version = "1.7.8";
version = "1.8.0";
src = fetchurl {
url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb";
sha256 = "207fbf813b6da018a5b848e5dc1194b5996daab39adbd873b2cecb0565c105ce";
sha256 = "BtzYcHN87qH7s3GiBrsDfmuy9v2xdhCeSShu8+T9T3E=";
};
nativeBuildInputs = [
@ -60,7 +60,6 @@ stdenv.mkDerivation rec {
cp -ar ./usr/share $out
substituteInPlace $out/share/mailspring/resources/app.asar.unpacked/mailsync \
--replace realpath ${coreutils}/bin/realpath \
--replace dirname ${coreutils}/bin/dirname
ln -s $out/share/mailspring/mailspring $out/bin/mailspring

View file

@ -1,25 +0,0 @@
{ stdenv, fetchFromGitHub, pkg-config, alsaLib, portaudio, portmidi, libsndfile, cmake, libxml2 }:
stdenv.mkDerivation rec {
version = "1.0-beta.1";
pname = "JamomaCore";
src = fetchFromGitHub {
owner = "jamoma";
repo = "JamomaCore";
rev = "v${version}";
sha256 = "1hb9b6qc18rsvzvixgllknn756m6zwcn22c79rdibbyz1bhrcnln";
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ alsaLib portaudio portmidi libsndfile libxml2 ];
meta = {
description = "A C++ platform for building dynamic and reflexive systems with an emphasis on audio and media";
homepage = "http://www.jamoma.org";
license = stdenv.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.magnetophon ];
platforms = stdenv.lib.platforms.linux;
broken = true; # 2018-04-10
};
}

View file

@ -0,0 +1,26 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "fast-cpp-csv-parser";
version = "2021-01-03";
src = fetchFromGitHub {
owner = "ben-strasser";
repo = pname;
rev = "75600d0b77448e6c410893830df0aec1dbacf8e3";
sha256 = "04kalwgsr8khqr1j5j13vzwaml268c5dvc9wfcwfs13wp3snqwf2";
};
installPhase = ''
mkdir -p $out/lib/pkgconfig $out/include
cp -r *.h $out/include/
substituteAll ${./fast-cpp-csv-parser.pc.in} $out/lib/pkgconfig/fast-cpp-csv-parser.pc
'';
meta = with stdenv.lib; {
description = "A small, easy-to-use and fast header-only library for reading comma separated value (CSV) files";
homepage = "https://github.com/ben-strasser/fast-cpp-csv-parser";
license = licenses.bsd3;
maintainers = with maintainers; [ bhipple ];
};
}

View file

@ -0,0 +1,8 @@
prefix=@out@
includedir=${prefix}/include
Name: fast-cpp-csv-parser
Description: Fast header-only library for reading CSV files
URL: https://github.com/ben-strasser/fast-cpp-csv-parser
Version: @version@
Cflags: -isystem${includedir}

View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "libcint";
version = "4.0.6";
version = "4.0.7";
src = fetchFromGitHub {
owner = "sunqm";
repo = "libcint";
rev = "v${version}";
sha256 = "1bgzsyz1i0hvla5ax0lawp1kw25fkhzh9ddhq92mplizrj9y05c1";
sha256 = "sha256-/S5LcaIIAXq9QiH8wGPSw8KpWC3afX9HqiHrWHmGQ6s=";
};
nativeBuildInputs = [ cmake ];

View file

@ -23,14 +23,14 @@
stdenv.mkDerivation rec {
pname = "libhandy";
version = "1.0.2";
version = "1.0.3";
outputs = [ "out" "dev" "devdoc" "glade" ];
outputBin = "dev";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0b8wvjabv5mg8jbng8rsd5g84lk571nm0qpna20pwp0njh2qvmrs";
sha256 = "sha256-VZuzrMLDYkiJF+ty7SW9wYH0riaslNF3Y0zF00yGf3o=";
};
nativeBuildInputs = [

View file

@ -1,7 +1,7 @@
{ stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }:
stdenv.mkDerivation rec {
version = "4.9.6";
version = "4.9.7";
pname = "nco";
nativeBuildInputs = [ flex which ];
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/nco/nco/archive/${version}.tar.gz";
sha256 = "0f8vf66700dcr48jqd371bbldc61xkrilby13xp8j5l9q4xal808";
sha256 = "sha256-Q4okOoyodofAsMrSmAhFISeY05Be+i7OX4qy2annQq4=";
};
prePatch = ''

View file

@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "networking-ts-cxx";
version = "2019-02-27";
# Used until https://github.com/chriskohlhoff/networking-ts-impl/issues/17 is
# resolved and we can generate in Nix.
src = fetchFromGitHub {
owner = "chriskohlhoff";
repo = "networking-ts-impl";
rev = "c97570e7ceef436581be3c138868a19ad96e025b";
sha256 = "12b5lg989nn1b8v6x9fy3cxsf3hs5hr67bd1mfyh8pjikir7zv6j";
};
installPhase = ''
mkdir -p $out/{include,lib/pkgconfig}
cp -r include $out/
substituteAll ${./networking_ts.pc.in} $out/lib/pkgconfig/networking_ts.pc
'';
meta = with stdenv.lib; {
description = "Experimental implementation of the C++ Networking Technical Specification";
homepage = "https://github.com/chriskohlhoff/networking-ts-impl";
license = licenses.boost;
maintainers = with maintainers; [ bhipple ];
};
}

View file

@ -0,0 +1,8 @@
prefix=@out@
includedir=${prefix}/include
Name: networking_ts
Description: Experimental implementation of the C++ Networking Technical Specification
URL: https://github.com/chriskohlhoff/networking-ts-impl
Version: ${networking_ts_version}
Cflags: -isystem${includedir}

View file

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
version = "1.16.56"; # N.B: if you change this, change botocore too
version = "1.16.57"; # N.B: if you change this, change botocore too
src = fetchPypi {
inherit pname version;
sha256 = "sha256-RxUe1XHDFkWPSTHNJCKZW6DJ9oGMXffXX0n8hFII5C4=";
sha256 = "sha256-SkmcwvU91VeojG22pVJ0iiq9g//tpwzrcdyNs5oCcxQ=";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

View file

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
version = "1.19.56"; # N.B: if you change this, change boto3 and awscli to a matching version
version = "1.19.57"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
sha256 = "sha256-AUluTCwGqreWifLDRaDizOtf4dp4WKfn3xibz5dwMiM=";
sha256 = "sha256-x1bWX/qYnFwOkheBdeQav3sYrRmy/i6C4ZLwheJk4Do=";
};
propagatedBuildInputs = [

View file

@ -1,4 +1,4 @@
{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, substituteAll
{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch, substituteAll
, python, util-linux, pygit2, gitMinimal, git-annex, cacert
}:
@ -17,6 +17,11 @@ buildPythonPackage rec {
};
patches = [
# fix tests with recent versions of git-annex
(fetchpatch {
url = "https://github.com/alpernebbi/git-annex-adapter/commit/6c210d828e8a57b12c716339ad1bf15c31cd4a55.patch";
sha256 = "17kp7pnm9svq9av4q7hfic95xa1w3z02dnr8nmg14sjck2rlmqsi";
})
(substituteAll {
src = ./git-annex-path.patch;
gitAnnex = "${git-annex}/bin/git-annex";

View file

@ -3,12 +3,13 @@
, fetchPypi
, twisted
, passlib
, pycrypto
, pyopenssl
, pyparsing
, service-identity
, zope_interface
, isPy3k
, pythonAtLeast
, python
}:
buildPythonPackage rec {
@ -21,13 +22,15 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
twisted passlib pycrypto pyopenssl pyparsing service-identity zope_interface
twisted passlib pyopenssl pyparsing service-identity zope_interface
];
disabled = isPy3k;
# https://github.com/twisted/ldaptor/pull/210
disabled = !isPy3k || pythonAtLeast "3.9";
# TypeError: None is neither bytes nor unicode
doCheck = false;
checkPhase = ''
${python.interpreter} -m twisted.trial ldaptor
'';
meta = {
description = "A Pure-Python Twisted library for LDAP";

View file

@ -1,9 +1,12 @@
{ lib, buildPythonPackage, fetchFromGitHub, twisted, ldaptor, configobj }:
{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, twisted, ldaptor, configobj }:
buildPythonPackage rec {
pname = "privacyidea-ldap-proxy";
version = "0.6.1";
# https://github.com/privacyidea/privacyidea-ldap-proxy/issues/50
disabled = isPy3k;
src = fetchFromGitHub {
owner = "privacyidea";
repo = pname;

View file

@ -0,0 +1,24 @@
{ buildPythonPackage
, fetchPypi
, lib
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pytest-instafail";
version = "0.4.2";
src = fetchPypi {
inherit pname version;
sha256 = "10lpr6mjcinabqynj6v85bvb1xmapnhqmg50nys1r6hg7zgky9qr";
};
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "pytest_instafail" ];
meta = {
description = "pytest plugin that shows failures and errors instantly instead of waiting until the end of test session";
homepage = "https://github.com/pytest-dev/pytest-instafail";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.jacg ];
};
}

View file

@ -10,13 +10,13 @@
let
pname = "shattered-pixel-dungeon";
version = "0.8.2d";
version = "0.9.1d";
src = fetchFromGitHub {
owner = "00-Evan";
repo = "shattered-pixel-dungeon";
rev = "v${version}";
sha256 = "11lgalam1aacw01ar7nawiim4pbxqzrdrnxvj6wq9mg83hgsz65l";
sha256 = "0f9vi1iffh477zi03hi07rmfbkb8i4chwvv43vs70mgjh4qx7247";
};
postPatch = ''
@ -34,6 +34,8 @@ let
nativeBuildInputs = [ gradle_5 perl ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
# https://github.com/gradle/gradle/issues/4426
${stdenv.lib.optionalString stdenv.isDarwin "export TERM=dumb"}
gradle --no-daemon desktop:release
'';
# perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
@ -54,6 +56,8 @@ in stdenv.mkDerivation rec {
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
# https://github.com/gradle/gradle/issues/4426
${stdenv.lib.optionalString stdenv.isDarwin "export TERM=dumb"}
# point to offline repo
sed -ie "s#repositories {#repositories { maven { url '${deps}' };#g" build.gradle
gradle --offline --no-daemon desktop:release
@ -78,6 +82,8 @@ in stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = with maintainers; [ fgaz ];
platforms = platforms.all;
# https://github.com/NixOS/nixpkgs/pull/99885#issuecomment-740065005
broken = stdenv.isDarwin;
};
}

View file

@ -3912,6 +3912,19 @@ let
meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-writer.nvim/";
};
telescope-fzy-native-nvim = buildVimPluginFrom2Nix {
pname = "telescope-fzy-native-nvim";
version = "2021-01-02";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-fzy-native.nvim";
rev = "654dffd924b29fb9a9252dcbd63528b1498ac9fb";
sha256 = "01x9z3n03qharjw778cxb16gw1dsxzmsxph4xsbfy1avf21c6x9g";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/nvim-telescope/telescope-fzy-native.nvim/";
};
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
version = "2021-01-18";

View file

@ -671,6 +671,31 @@ self: super: {
ln -s ${tabnine}/bin/TabNine $target/binaries/TabNine_$(uname -s)
'';
});
telescope-fzy-native-nvim = super.telescope-fzy-native-nvim.overrideAttrs (old: {
preFixup =
let
fzy-lua-native-path = "deps/fzy-lua-native";
fzy-lua-native =
stdenv.mkDerivation {
name = "fzy-lua-native";
src = "${old.src}/${fzy-lua-native-path}";
# remove pre-compiled binaries
preBuild = "rm -rf static/*";
installPhase = ''
install -Dm 444 -t $out/static static/*
install -Dm 444 -t $out/lua lua/*
'';
};
in
''
rm -rf $target/${fzy-lua-native-path}/*
ln -s ${fzy-lua-native}/static $target/${fzy-lua-native-path}/static
ln -s ${fzy-lua-native}/lua $target/${fzy-lua-native-path}/lua
'';
meta.platforms = stdenv.lib.platforms.all;
});
} // (
let
nodePackageNames = [

View file

@ -407,6 +407,7 @@ nvim-lua/lsp_extensions.nvim
nvim-lua/plenary.nvim
nvim-lua/popup.nvim
nvim-telescope/telescope-fzf-writer.nvim
nvim-telescope/telescope-fzy-native.nvim
nvim-telescope/telescope.nvim
nvim-treesitter/completion-treesitter
nvim-treesitter/nvim-treesitter

View file

@ -484,8 +484,8 @@ let
mktplcRef = {
name = "metals";
publisher = "scalameta";
version = "1.9.7";
sha256 = "0v599yssvk358gxfxnyzzkyk0y5krsbp8n4rkp9wb2ncxqsqladr";
version = "1.9.10";
sha256 = "1afmqzlw3bl9bv59l9b2jrljhbq8djb7vl8rjv58c5wi7nvm2qab";
};
meta = {
license = lib.licenses.asl20;

View file

@ -1,15 +1,10 @@
{ stdenv, fetchurl, xar, cpio, pkgs, python3, pbzx, lib, darwin-stubs, print-reexports }:
let version = "10.12"; in
# Ensure appleSdkVersion is up to date.
assert stdenv.isDarwin -> stdenv.appleSdkVersion == version;
let
# sadly needs to be exported because security_tool needs it
sdk = stdenv.mkDerivation rec {
pname = "MacOS_SDK";
inherit version;
version = "10.12";
# This URL comes from https://swscan.apple.com/content/catalogs/others/index-10.12.merged-1.sucatalog, which we found by:
# 1. Google: site:swscan.apple.com and look for a name that seems appropriate for your version

View file

@ -7,21 +7,21 @@
},
"4.19": {
"extra": ".a",
"name": "linux-hardened-4.19.168.a.patch",
"sha256": "09s9l5qf44ly41fjs745gh00vf0lkkzymcks44zyzmsznjsxm2xx",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.168.a/linux-hardened-4.19.168.a.patch"
"name": "linux-hardened-4.19.169.a.patch",
"sha256": "0l3n1yjsa777pdxh4ib7phpfrw7c8vr1xwzgs8khnffllj9f16iq",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.169.a/linux-hardened-4.19.169.a.patch"
},
"5.10": {
"extra": ".a",
"name": "linux-hardened-5.10.8.a.patch",
"sha256": "1nqn50c6g7j7ljdq7y50y6kgmilc5mb266lg6z6kz0cqpn2qaxxx",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.8.a/linux-hardened-5.10.8.a.patch"
"name": "linux-hardened-5.10.9.a.patch",
"sha256": "0mkwyknafdbc2hqv4j7jjc6wsrrx6a76d69hxh7x90gi0s3f5rfw",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.9.a/linux-hardened-5.10.9.a.patch"
},
"5.4": {
"extra": ".a",
"name": "linux-hardened-5.4.90.a.patch",
"sha256": "1x0fkcgsw7q99xa2f97i2cyybwj4kjf6vypbm2bwgl76ghpchydq",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.90.a/linux-hardened-5.4.90.a.patch"
"name": "linux-hardened-5.4.91.a.patch",
"sha256": "0kqn9g6wh4rp9riwkjmzapmnwk0fd5z18z26j2rqfgq7x4r8d7rm",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.91.a/linux-hardened-5.4.91.a.patch"
},
"5.9": {
"extra": "",

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.19.168";
version = "4.19.169";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1whkqklqj8rz9lv88aldvwkwnb9xvg0njdbcrk56r7z6f9zkhnmm";
sha256 = "156y4ly7qyy5z7sbp2vccrs7za72k3zi2hfjpskqqd6civdlvln7";
};
} // (args.argsOverride or {}))

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.8";
version = "5.10.9";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1v83wm8xbhq1sgn7c84zi7l40vmd9k1gb653b686jp8n4na85z2w";
sha256 = "0la7dklpy6xd79fkzavpmlfyrc60kmmwz491msd95dmvv06kwwvz";
};
} // (args.argsOverride or {}))

View file

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.90";
version = "5.4.91";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "06pscvxjkpz35y6kbmyzdvn9mm4p7pfg0d49chi1q61z0sy3crv4";
sha256 = "05swzh4gb0mk6wzza0k6b0283cygkvj8a2d2b2gab6sb0fxn208f";
};
} // (args.argsOverride or {}))

View file

@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.10.4-rt22"; # updated by ./update-rt.sh
version = "5.10.8-rt24"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "1v2nbpp21c3fkw23dgrrfznnnlvi0538kj8wrlb2m6g94rn3jklh";
sha256 = "1v83wm8xbhq1sgn7c84zi7l40vmd9k1gb653b686jp8n4na85z2w";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "1wnp7w3k1z10ipg8vzgyh22lpfya1p3ckabjadk9hadpa1ialma0";
sha256 = "06fqwx9flcxzbjr9gb0d7v4hidypzz69r6p2mfzhqh7ii0p89f30";
};
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;

View file

@ -5,15 +5,15 @@
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
stdenv.mkDerivation rec {
version = "2021-01-16";
version = "2021-01-20";
pname = "oh-my-zsh";
rev = "efcbd9f3480a28ec69c607c46adcbfd8d230ac9f";
rev = "cd4918c2cdb6613cf77ea8f6f29e1930bd7f4bf5";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
sha256 = "1zngxqkhm49m2qczvyp5mws7d4bwxbb3fq20xqbbdpgk35smwnxc";
sha256 = "1b8zipghawa2rl3l6vylmhbwcwz9yq52xmbfpkz0bxhifisq74kn";
};
installPhase = ''

View file

@ -1,7 +1,5 @@
{ lib
, localSystem, crossSystem, config, overlays, crossOverlays ? []
# The version of darwin.apple_sdk used for sources provided by apple.
, appleSdkVersion ? "10.12"
# Minimum required macOS version, used both for compatibility as well as reproducability.
, macosVersionMin ? "10.12"
# Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
@ -150,7 +148,7 @@ in rec {
__extraImpureHostDeps = commonImpureHostDeps;
extraAttrs = {
inherit macosVersionMin appleSdkVersion platform;
inherit macosVersionMin platform;
};
overrides = self: super: (overrides self super) // {
inherit ccNoLibcxx;
@ -524,7 +522,7 @@ in rec {
extraAttrs = {
libc = pkgs.darwin.Libsystem;
shellPackage = pkgs.bash;
inherit macosVersionMin appleSdkVersion platform bootstrapTools;
inherit macosVersionMin platform bootstrapTools;
};
allowedRequisites = (with pkgs; [

View file

@ -28,11 +28,11 @@ let
in with py.pkgs; buildPythonApplication rec {
pname = "awscli";
version = "1.18.216"; # N.B: if you change this, change botocore to a matching version too
version = "1.18.217"; # N.B: if you change this, change botocore to a matching version too
src = fetchPypi {
inherit pname version;
sha256 = "sha256-6kJ+PmFVHf8rGvp7X7t7e1+RVoRL/OEQHP9gqSHughY=";
sha256 = "sha256-bRrEFDRccklM3f6K/HAptKYrPnnCPM3Jo4vNsDt3Fuo=";
};
postPatch = ''

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "mergerfs";
version = "2.32.0";
version = "2.32.2";
src = fetchFromGitHub {
owner = "trapexit";
repo = pname;
rev = version;
sha256 = "1qmhwkl2ws0hwd7s1mzrdiw4h7jpilzcr0w8dgx465mdzb5d2jad";
sha256 = "sha256-ybDVBcPkjsW2OxNxUmn5hG/qLEjxF9vqR8pZdb9tIBs=";
};
nativeBuildInputs = [

View file

@ -2,6 +2,8 @@
, fetchurl
, fetchzip
, autoPatchelfHook
, makeWrapper
, jdk
, libsecret
}:
@ -29,17 +31,20 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoPatchelfHook
makeWrapper
];
installPhase =
if stdenv.hostPlatform.system == "x86_64-linux" then
''
mkdir -p $out/bin
for f in configuration features p2 plugins Archi.ini Archi; do
cp $f $out/bin/
mkdir -p $out/bin $out/libexec
for f in configuration features p2 plugins Archi.ini; do
cp -r $f $out/libexec
done
install -D -m755 Archi $out/bin/Archi
install -D -m755 Archi $out/libexec/Archi
makeWrapper $out/libexec/Archi $out/bin/Archi \
--prefix PATH : ${jdk}/bin
''
else
''

View file

@ -18,12 +18,12 @@
mkDerivation rec {
pname = "kcollectd";
version = "0.11.99.0";
version = "0.12.0";
src = fetchFromGitLab {
owner = "aerusso";
repo = pname;
rev = "v${version}";
sha256 = "0h4ymvzihzbmyv3z0bp28g94wxc6c7lgi3my0xbka3advxr811gn";
sha256 = "sha256-Ihd4Ps4t9+sNB3joO3vTxDR/25t7Ecl6yvHQ15QiUdY=";
};
nativeBuildInputs = [

View file

@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "onefetch";
version = "2.7.3";
version = "2.9.1";
src = fetchFromGitHub {
owner = "o2sh";
repo = pname;
rev = "v${version}";
sha256 = "0c56na9s3g7rdb4cc6ccsnfby2ihf5zrfs3lg9qxiqsfr7mcn4w9";
sha256 = "sha256-owa+HmzMXpLR7H1FssW4gQiVAQGJRXhcitgJj6pxJRc=";
};
cargoSha256 = "05rrww53g3k2c8mpxvyc067qsgs7w9sxnzdlvmca1idbqa0k9060";
cargoSha256 = "sha256-TqWe4eARQmmWcwnvb6BIZrzGeKMpiIObPv0cW1JvWj4=";
buildInputs = with stdenv;
lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ];

View file

@ -0,0 +1,50 @@
{ autoreconfHook
, curl
, dbus
, fetchFromGitHub
, glib
, json-glib
, lib
, nix-update-script
, openssl
, pkg-config
, stdenv
}:
stdenv.mkDerivation rec {
pname = "rauc";
version = "1.5";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "10v9nllfw5y53797p00hk6645zkaa6cacsim1rh6y2jngnqfkmw0";
};
passthru = {
updateScript = nix-update-script {
attrPath = pname;
};
};
enableParallelBuilding = true;
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ curl dbus glib json-glib openssl ];
configureFlags = [
"--with-dbusinterfacesdir=${placeholder "out"}/share/dbus-1/interfaces"
"--with-dbuspolicydir=${placeholder "out"}/share/dbus-1/systemd.d"
"--with-dbussystemservicedir=${placeholder "out"}/share/dbus-1/system-services"
];
meta = with lib; {
description = "Safe and secure software updates for embedded Linux";
homepage = "https://rauc.io";
license = licenses.lgpl21;
maintainers = with maintainers; [ emantor ];
platforms = with platforms; linux;
};
}

View file

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, pkg-config, glib, which }:
stdenv.mkDerivation rec {
name = "nbd-3.20";
name = "nbd-3.21";
src = fetchurl {
url = "mirror://sourceforge/nbd/${name}.tar.xz";
sha256 = "1kfnyx52nna2mnw264njk1dl2zc8m78sz031yp65mbmpi99v7qg0";
sha256 = "sha256-52iK852Rczu80tsIBixE/lA9AE5RUodAE5xEr/amvvk=";
};
buildInputs = [ glib ]

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "home-manager";
version = "2020-09-06";
version = "2021-01-16";
src = fetchFromGitHub {
owner = "nix-community";
repo = "home-manager";
rev = "249650a07ee2d949fa599f3177a8c234adbd1bee";
sha256 = "0x858b7i15kx74aqwgi2n5ls7zjhcky95z9vbxfdlawmaz371dma";
rev = "8127799f79ee96129b295d78294f40a54078131f";
sha256 = "0iji8nxa66s409pvjwi370ycsw4m74w6b3ywnjpfkl2filpapjns";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kmon";
version = "1.5.1";
version = "1.5.3";
src = fetchFromGitHub {
owner = "orhun";
repo = pname;
rev = "v${version}";
sha256 = "0j6w4rg2gybcy1cv812qixravy0z0xpp33snrng11q802zq3mkmq";
sha256 = "sha256-2cP3kZnjlMmN3nWRPh1M+hk+dyssGNpJjlluDsm702g=";
};
cargoSha256 = "0x5s3yi5bv3h1k54lrgcvkpdkmfphvwhnrmk5lmk6xd9pxfh218p";
cargoSha256 = "sha256-JFDtmi10iCK66/2ovg8tGAgGDW8Y4b5IYkSbDqu0PmQ=";
nativeBuildInputs = [ python3 ];

View file

@ -1,14 +1,16 @@
{ lib, stdenv, fetchurl, pkg-config, python3, sqlite, libedit, zlib }:
{ lib, stdenv, fetchurl, pkg-config, python3, sqlite, libedit, zlib, runCommand, dieHook }:
stdenv.mkDerivation rec {
version = "5.8.0";
let
link-grammar = stdenv.mkDerivation rec {
version = "5.8.1";
pname = "link-grammar";
outputs = [ "bin" "out" "dev" "man" ];
src = fetchurl {
url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz";
sha256 = "1v8ngx77nachxln68xpvyw2lh7z59pzsi99h8j0mnrm0gjsacrdd";
sha256 = "sha256-EcT/VR+lFpJX2sxXUIDGOwdceQ7awpmEqUZBoJk7UFs=";
};
nativeBuildInputs = [ pkg-config python3 ];
@ -18,11 +20,30 @@ stdenv.mkDerivation rec {
"--disable-java-bindings"
];
doCheck = true;
passthru.tests = {
quick = runCommand "link-grammar-quick-test" {
buildInputs = [
link-grammar
dieHook
];
} ''
echo "Furiously sleep ideas green colorless." | link-parser en | grep "No complete linkages found." || die "Grammaticaly invalid sentence was parsed."
echo "Colorless green ideas sleep furiously." | link-parser en | grep "Found .* linkages." || die "Grammaticaly valid sentence was not parsed."
touch $out
'';
};
meta = with lib; {
description = "A Grammar Checking library";
homepage = "https://www.abisource.com/projects/link-grammar/";
license = licenses.lgpl21;
changelog = "https://github.com/opencog/link-grammar/blob/link-grammar-${version}/ChangeLog";
license = licenses.lgpl21Only;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;
};
}
};
in
link-grammar

View file

@ -258,6 +258,8 @@ mapAliases ({
inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped.";
infiniband-diags = rdma-core; # added 2019-08-09
inotifyTools = inotify-tools;
i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21
jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21
jasper = throw "jasper has been removed: abandoned upstream with many vulnerabilities";
jbuilder = dune; # added 2018-09-09
jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream";

View file

@ -2207,6 +2207,8 @@ in
fast-cli = nodePackages.fast-cli;
fast-cpp-csv-parser = callPackage ../development/libraries/fast-cpp-csv-parser { };
faudio = callPackage ../development/libraries/faudio { };
fd = callPackage ../tools/misc/fd { };
@ -5094,8 +5096,6 @@ in
i2pd = callPackage ../tools/networking/i2pd { };
i-score = libsForQt514.callPackage ../applications/audio/i-score { };
iasl = callPackage ../development/compilers/iasl { };
iannix = libsForQt5.callPackage ../applications/audio/iannix { };
@ -6322,6 +6322,8 @@ in
netcdffortran = callPackage ../development/libraries/netcdf-fortran { };
networking-ts-cxx = callPackage ../development/libraries/networking-ts-cxx { };
nco = callPackage ../development/libraries/nco { };
ncftp = callPackage ../tools/networking/ncftp { };
@ -12194,8 +12196,6 @@ in
jam = callPackage ../development/tools/build-managers/jam { };
jamomacore = callPackage ../development/libraries/audio/jamomacore { };
jbake = callPackage ../development/tools/jbake { };
jbang = callPackage ../development/tools/jbang { };
@ -28888,6 +28888,8 @@ in
rargs = callPackage ../tools/misc/rargs { };
rauc = callPackage ../tools/misc/rauc { };
redprl = callPackage ../applications/science/logic/redprl { };
renderizer = pkgs.callPackage ../development/tools/renderizer {};

View file

@ -6033,6 +6033,8 @@ in {
pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { };
pytest-instafail = callPackage ../development/python-modules/pytest-instafail { };
pytest-isort = callPackage ../development/python-modules/pytest-isort { };
pytest-lazy-fixture = callPackage ../development/python-modules/pytest-lazy-fixture { };