Merge master into staging-next
This commit is contained in:
commit
95c24d591a
|
@ -119,22 +119,31 @@ in
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.trousers ];
|
environment.systemPackages = [ pkgs.trousers ];
|
||||||
|
|
||||||
# system.activationScripts.tcsd =
|
services.udev.extraRules = ''
|
||||||
# ''
|
# Give tcsd ownership of all TPM devices
|
||||||
# chown ${cfg.user}:${cfg.group} ${tcsdConf}
|
KERNEL=="tpm[0-9]*", MODE="0660", OWNER="${cfg.user}", GROUP="${cfg.group}"
|
||||||
# '';
|
# Tag TPM devices to create a .device unit for tcsd to depend on
|
||||||
|
ACTION=="add", KERNEL=="tpm[0-9]*", TAG+="systemd"
|
||||||
|
'';
|
||||||
|
|
||||||
|
systemd.tmpfiles.rules = [
|
||||||
|
# Initialise the state directory
|
||||||
|
"d ${cfg.stateDir} 0770 ${cfg.user} ${cfg.group} - -"
|
||||||
|
];
|
||||||
|
|
||||||
systemd.services.tcsd = {
|
systemd.services.tcsd = {
|
||||||
description = "TCSD";
|
description = "Manager for Trusted Computing resources";
|
||||||
after = [ "systemd-udev-settle.service" ];
|
documentation = [ "man:tcsd(8)" ];
|
||||||
|
|
||||||
|
requires = [ "dev-tpm0.device" ];
|
||||||
|
after = [ "dev-tpm0.device" ];
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
path = [ pkgs.trousers ];
|
|
||||||
preStart =
|
serviceConfig = {
|
||||||
''
|
User = cfg.user;
|
||||||
mkdir -m 0700 -p ${cfg.stateDir}
|
Group = cfg.group;
|
||||||
chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir}
|
ExecStart = "${pkgs.trousers}/sbin/tcsd -f -c ${tcsdConf}";
|
||||||
'';
|
};
|
||||||
serviceConfig.ExecStart = "${pkgs.trousers}/sbin/tcsd -f -c ${tcsdConf}";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
users.users = optionalAttrs (cfg.user == "tss") {
|
users.users = optionalAttrs (cfg.user == "tss") {
|
||||||
|
|
|
@ -1,20 +1,49 @@
|
||||||
{ lib, stdenv, fetchFromGitHub , cmake, libjack2, libsndfile, pkg-config }:
|
{ lib, stdenv, fetchFromGitHub
|
||||||
|
, libjack2, libsndfile, xorg, freetype, libxkbcommon
|
||||||
|
, cairo, glib, gnome3, flac, libogg, libvorbis, libopus
|
||||||
|
, cmake, pkg-config
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "sfizz";
|
pname = "sfizz";
|
||||||
version = "0.4.0";
|
version = "0.5.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "sfztools";
|
owner = "sfztools";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "0zpmvmh7n0064rxfqxb7z9rnz493k7yq7nl0vxppqnasg97jn5f3";
|
sha256 = "sha256-3RdY5+BPsdk6vctDy24w5aJsVOV9qzSgXs62Pm5UEKs=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
libjack2
|
||||||
|
libsndfile
|
||||||
|
flac
|
||||||
|
libogg
|
||||||
|
libvorbis
|
||||||
|
libopus
|
||||||
|
xorg.libX11
|
||||||
|
xorg.libxcb
|
||||||
|
xorg.libXau
|
||||||
|
xorg.libXdmcp
|
||||||
|
xorg.xcbutil
|
||||||
|
xorg.xcbutilcursor
|
||||||
|
xorg.xcbutilrenderutil
|
||||||
|
xorg.xcbutilkeysyms
|
||||||
|
xorg.xcbutilimage
|
||||||
|
libxkbcommon
|
||||||
|
cairo
|
||||||
|
glib
|
||||||
|
gnome3.zenity
|
||||||
|
freetype
|
||||||
|
];
|
||||||
nativeBuildInputs = [ cmake pkg-config ];
|
nativeBuildInputs = [ cmake pkg-config ];
|
||||||
|
|
||||||
buildInputs = [ libjack2 libsndfile ];
|
postPatch = ''
|
||||||
|
substituteInPlace editor/external/vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp \
|
||||||
|
--replace '"/usr/bin/zenity' '"${gnome3.zenity}/bin/zenity'
|
||||||
|
'';
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DCMAKE_BUILD_TYPE=Release"
|
"-DCMAKE_BUILD_TYPE=Release"
|
||||||
|
|
|
@ -24,11 +24,11 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "wasabiwallet";
|
pname = "wasabiwallet";
|
||||||
version = "1.1.12.4";
|
version = "1.1.12.5";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz";
|
url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz";
|
||||||
sha256 = "sha256-1yg0C1lJrLxQEs2GA+XEBUx/JAyc+aW0UWjLhSEy0RI=";
|
sha256 = "sha256-6KIsSsCAyZ6uYSbDBIKdtM4adGOttvJ78obCptcd57s=";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
|
|
|
@ -124,7 +124,9 @@ let
|
||||||
postBuild = ''
|
postBuild = ''
|
||||||
ln -s ${extraInit} $out/lib/php.ini
|
ln -s ${extraInit} $out/lib/php.ini
|
||||||
|
|
||||||
wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib
|
if test -e $out/bin/php; then
|
||||||
|
wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib
|
||||||
|
fi
|
||||||
|
|
||||||
if test -e $out/bin/php-fpm; then
|
if test -e $out/bin/php-fpm; then
|
||||||
wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib
|
wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib
|
||||||
|
|
|
@ -59,7 +59,7 @@ with lib;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "webkitgtk";
|
pname = "webkitgtk";
|
||||||
version = "2.30.5";
|
version = "2.30.6";
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
|
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
|
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
|
||||||
sha256 = "07vzbbnvz69rn9pciji4axfpclp98bpj4a0br2z0gbn5wc4an3bx";
|
sha256 = "07kwkn7gnlfw4idl5vyyzhzbj2bjzvjrclbikn9vaw0pm73nwwsh";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = optionals stdenv.isLinux [
|
patches = optionals stdenv.isLinux [
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ lib, buildDunePackage, fetchurl
|
{ lib, buildDunePackage, fetchurl
|
||||||
, bisect_ppx, ppx_cstruct, pkg-config
|
, bisect_ppx, ppx_cstruct
|
||||||
, rresult, cstruct, cstruct-lwt, mirage-net, mirage-clock
|
, rresult, cstruct, cstruct-lwt, mirage-net, mirage-clock
|
||||||
, mirage-random, mirage-stack, mirage-protocols, mirage-time
|
, mirage-random, mirage-stack, mirage-protocols, mirage-time
|
||||||
, ipaddr, macaddr, macaddr-cstruct, mirage-profile, fmt
|
, ipaddr, macaddr, macaddr-cstruct, mirage-profile, fmt
|
||||||
|
@ -11,23 +11,18 @@
|
||||||
|
|
||||||
buildDunePackage rec {
|
buildDunePackage rec {
|
||||||
pname = "tcpip";
|
pname = "tcpip";
|
||||||
version = "6.1.0";
|
version = "6.0.0";
|
||||||
|
|
||||||
useDune2 = true;
|
useDune2 = true;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
|
url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
|
||||||
sha256 = "e81c98a6e80e05f9fa4e5fbee50e6c247f6011254c7b1d9a0e58bae318c1f0c8";
|
sha256 = "0wbrs8jz1vw3zdrqmqcwawxh4yhc2gy30rw7gz4w116cblkvnb8s";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
./no-opam-pkg-config-path.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
bisect_ppx
|
bisect_ppx
|
||||||
ppx_cstruct
|
ppx_cstruct
|
||||||
pkg-config
|
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
diff --git a/freestanding/Makefile b/freestanding/Makefile
|
|
||||||
index f22d220d..4bb3ac57 100644
|
|
||||||
--- a/freestanding/Makefile
|
|
||||||
+++ b/freestanding/Makefile
|
|
||||||
@@ -1,6 +1,4 @@
|
|
||||||
-PKG_CONFIG_PATH := $(shell opam config var prefix)/lib/pkgconfig
|
|
||||||
-
|
|
||||||
-EXISTS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --exists ocaml-freestanding; echo $$?)
|
|
||||||
+EXISTS := $(shell pkg-config --exists ocaml-freestanding; echo $$?)
|
|
||||||
|
|
||||||
.PHONY: all clean
|
|
||||||
all: libtcpip_freestanding_stubs.a
|
|
||||||
@@ -10,7 +8,7 @@ libtcpip_freestanding_stubs.a:
|
|
||||||
touch $@
|
|
||||||
else
|
|
||||||
CC ?= cc
|
|
||||||
-FREESTANDING_CFLAGS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags ocaml-freestanding)
|
|
||||||
+FREESTANDING_CFLAGS := $(shell pkg-config --cflags ocaml-freestanding)
|
|
||||||
CFLAGS := $(FREESTANDING_CFLAGS)
|
|
||||||
|
|
||||||
OBJS=checksum_stubs.o
|
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "bitarray";
|
pname = "bitarray";
|
||||||
version = "1.8.0";
|
version = "1.8.1";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "fe4444d92b17073bf1f9f24e3015a0e5bb70a645c47df93ef8a9ce8be33fcbad";
|
sha256 = "e02f79fba7a470d438eb39017d503498faaf760b17b6b46af1a9de12fd58d311";
|
||||||
};
|
};
|
||||||
|
|
||||||
pythonImportsCheck = [ "bitarray" ];
|
pythonImportsCheck = [ "bitarray" ];
|
||||||
|
|
|
@ -6,11 +6,11 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "managesieve";
|
pname = "managesieve";
|
||||||
version = "0.7";
|
version = "0.7.1";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "1dx0j8hhjwip1ackaj2m4hqrrx2iiv846ic4wa6ymrawwb8iq8m6";
|
sha256 = "44930a3b48332d23b35a5305ae7ba47904d4485ed1b7a22208b7d5ad9d60427a";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [ pytestCheckHook ];
|
checkInputs = [ pytestCheckHook ];
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pynmea2";
|
pname = "pynmea2";
|
||||||
version = "1.16.0";
|
version = "1.17.0";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "0w9g5qh573276404f04b46684ydlakv30ds0x0r4kcl370ljmfsg";
|
sha256 = "0x5xrk51dpzsvky1ncikadm80a44a82j3mjjykmhmx7jddc5qh9d";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [ pytestCheckHook ];
|
checkInputs = [ pytestCheckHook ];
|
||||||
|
|
|
@ -1,28 +1,56 @@
|
||||||
{ lib, fetchPypi, buildPythonPackage, setuptools_scm
|
{ lib
|
||||||
, requests, requests-file, idna, filelock, pytest
|
, buildPythonPackage
|
||||||
|
, fetchPypi
|
||||||
|
, filelock
|
||||||
|
, idna
|
||||||
|
, pytest-mock
|
||||||
|
, pytestCheckHook
|
||||||
|
, pythonOlder
|
||||||
|
, requests
|
||||||
|
, requests-file
|
||||||
, responses
|
, responses
|
||||||
|
, setuptools-scm
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "tldextract";
|
pname = "tldextract";
|
||||||
version = "3.1.0";
|
version = "3.1.0";
|
||||||
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "cfae9bc8bda37c3e8c7c8639711ad20e95dc85b207a256b60b0b23d7ff5540ea";
|
sha256 = "cfae9bc8bda37c3e8c7c8639711ad20e95dc85b207a256b60b0b23d7ff5540ea";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ requests requests-file idna filelock ];
|
nativeBuildInputs = [ setuptools-scm ];
|
||||||
checkInputs = [ pytest responses ];
|
|
||||||
nativeBuildInputs = [ setuptools_scm ];
|
propagatedBuildInputs = [
|
||||||
|
filelock
|
||||||
|
idna
|
||||||
|
requests
|
||||||
|
requests-file
|
||||||
|
];
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
pytest-mock
|
||||||
|
pytestCheckHook
|
||||||
|
responses
|
||||||
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace pytest.ini --replace " --pylint" ""
|
||||||
|
'';
|
||||||
|
|
||||||
# No tests included
|
|
||||||
doCheck = false;
|
|
||||||
pythonImportsCheck = [ "tldextract" ];
|
pythonImportsCheck = [ "tldextract" ];
|
||||||
|
|
||||||
meta = {
|
meta = with lib; {
|
||||||
|
description = "Python module to accurately separate the TLD from the domain of an URL";
|
||||||
|
longDescription = ''
|
||||||
|
tldextract accurately separates the gTLD or ccTLD (generic or country code top-level domain)
|
||||||
|
from the registered domain and subdomains of a URL.
|
||||||
|
'';
|
||||||
homepage = "https://github.com/john-kurkowski/tldextract";
|
homepage = "https://github.com/john-kurkowski/tldextract";
|
||||||
description = "Accurately separate the TLD from the registered domain and subdomains of a URL, using the Public Suffix List";
|
license = with licenses; [ bsd3 ];
|
||||||
license = lib.licenses.bsd3;
|
maintainers = with maintainers; [ fab ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
43
pkgs/development/tools/bashate/default.nix
Normal file
43
pkgs/development/tools/bashate/default.nix
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
{ lib
|
||||||
|
, Babel
|
||||||
|
, buildPythonApplication
|
||||||
|
, fetchPypi
|
||||||
|
, fixtures
|
||||||
|
, mock
|
||||||
|
, pbr
|
||||||
|
, pytestCheckHook
|
||||||
|
, pythonOlder
|
||||||
|
, setuptools
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonApplication rec {
|
||||||
|
pname = "bashate";
|
||||||
|
version = "2.0.0";
|
||||||
|
disabled = pythonOlder "3.5";
|
||||||
|
|
||||||
|
src = fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
sha256 = "05qsaaqfpvr6h4g19prbkpznwb9a4dwzyzivdzh9x80cgkq0r6gb";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
Babel
|
||||||
|
pbr
|
||||||
|
setuptools
|
||||||
|
];
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
fixtures
|
||||||
|
mock
|
||||||
|
pytestCheckHook
|
||||||
|
];
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "bashate" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Style enforcement for bash programs";
|
||||||
|
homepage = "https://opendev.org/openstack/bashate";
|
||||||
|
license = with licenses; [ asl20 ];
|
||||||
|
maintainers = with maintainers; [ fab ];
|
||||||
|
};
|
||||||
|
}
|
77
pkgs/development/tools/ocaml/merlin/4.x.nix
Normal file
77
pkgs/development/tools/ocaml/merlin/4.x.nix
Normal file
|
@ -0,0 +1,77 @@
|
||||||
|
{ lib
|
||||||
|
, substituteAll
|
||||||
|
, fetchurl
|
||||||
|
, ocaml
|
||||||
|
, dune_2
|
||||||
|
, buildDunePackage
|
||||||
|
, yojson
|
||||||
|
, csexp
|
||||||
|
, result
|
||||||
|
, dot-merlin-reader
|
||||||
|
, jq
|
||||||
|
, menhir
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
merlinVersion = "4.1";
|
||||||
|
|
||||||
|
hashes = {
|
||||||
|
"4.1-411" = "9e2e6fc799c93ce1f2c7181645eafa37f64e43ace062b69218e1c29ac459937d";
|
||||||
|
"4.1-412" = "fb4caede73bdb8393bd60e31792af74b901ae2d319ac2f2a2252c694d2069d8d";
|
||||||
|
};
|
||||||
|
|
||||||
|
ocamlVersionShorthand = lib.concatStrings
|
||||||
|
(lib.take 2 (lib.splitVersion ocaml.version));
|
||||||
|
|
||||||
|
version = "${merlinVersion}-${ocamlVersionShorthand}";
|
||||||
|
in
|
||||||
|
|
||||||
|
if !lib.hasAttr version hashes
|
||||||
|
then builtins.throw "merlin ${merlinVersion} is not available for OCaml ${ocaml.version}"
|
||||||
|
else
|
||||||
|
|
||||||
|
buildDunePackage {
|
||||||
|
pname = "merlin";
|
||||||
|
inherit version;
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz";
|
||||||
|
sha256 = hashes."${version}";
|
||||||
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(substituteAll {
|
||||||
|
src = ./fix-paths.patch;
|
||||||
|
dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader";
|
||||||
|
dune = "${dune_2}/bin/dune";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
useDune2 = true;
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
dot-merlin-reader
|
||||||
|
yojson
|
||||||
|
csexp
|
||||||
|
result
|
||||||
|
];
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
checkPhase = ''
|
||||||
|
runHook preCheck
|
||||||
|
patchShebangs tests/merlin-wrapper
|
||||||
|
dune runtest # filtering with -p disables tests
|
||||||
|
runHook postCheck
|
||||||
|
'';
|
||||||
|
checkInputs = [
|
||||||
|
jq
|
||||||
|
menhir
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "An editor-independent tool to ease the development of programs in OCaml";
|
||||||
|
homepage = "https://github.com/ocaml/merlin";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = [ maintainers.vbgl maintainers.sternenseemann ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -3,8 +3,14 @@
|
||||||
|
|
||||||
buildDunePackage rec {
|
buildDunePackage rec {
|
||||||
pname = "merlin";
|
pname = "merlin";
|
||||||
|
version = "3.4.2";
|
||||||
|
|
||||||
inherit (dot-merlin-reader) src version useDune2;
|
src = fetchurl {
|
||||||
|
url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz";
|
||||||
|
sha256 = "e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81";
|
||||||
|
};
|
||||||
|
|
||||||
|
useDune2 = true;
|
||||||
|
|
||||||
minimumOCamlVersion = "4.02.3";
|
minimumOCamlVersion = "4.02.3";
|
||||||
|
|
||||||
|
|
|
@ -2,15 +2,15 @@
|
||||||
|
|
||||||
buildDunePackage rec {
|
buildDunePackage rec {
|
||||||
pname = "dot-merlin-reader";
|
pname = "dot-merlin-reader";
|
||||||
version = "3.4.2";
|
version = "4.1";
|
||||||
|
|
||||||
useDune2 = true;
|
useDune2 = true;
|
||||||
|
|
||||||
minimumOCamlVersion = "4.02.1";
|
minimumOCamlVersion = "4.06";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz";
|
url = "https://github.com/ocaml/merlin/releases/download/v${version}/dot-merlin-reader-v${version}.tbz";
|
||||||
sha256 = "109ai1ggnkrwbzsl1wdalikvs1zx940m6n65jllxj68in6bvidz1";
|
sha256 = "14a36d6fb8646a5df4530420a7861722f1a4ee04753717947305e3676031e7cd";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ yojson csexp result ];
|
buildInputs = [ yojson csexp result ];
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoPackage rec {
|
buildGoPackage rec {
|
||||||
pname = "lazydocker";
|
pname = "lazydocker";
|
||||||
version = "0.10";
|
version = "0.12";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jesseduffield";
|
owner = "jesseduffield";
|
||||||
repo = "lazydocker";
|
repo = "lazydocker";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "04j5bcsxm2yf74zkphnjrg8j3w0v6bsny8sg2k4gbisgshl1i3p8";
|
sha256 = "sha256-bpc83DFAyrAQ3VI9saYe+10ZQqOHgscerRKRyjfYD4g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
goPackagePath = "github.com/jesseduffield/lazydocker";
|
goPackagePath = "github.com/jesseduffield/lazydocker";
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "emplace";
|
pname = "emplace";
|
||||||
version = "1.4.0";
|
version = "1.4.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tversteeg";
|
owner = "tversteeg";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-6dmXWqkf8Z+cc4wnOuVCe4+Byfk3VTYXehTN1MCiFLE=";
|
sha256 = "sha256-lBCGSeEVxlXrn1RHqMEYSXLOehJw/DiL+33nx4+rV2Y=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-uDoxMHSNoqH/AOixmkV6pwrDu/XSqXBCrAz4L7MMPU8=";
|
cargoSha256 = "sha256-QL71pJ5RBWRRse5DXwctMvu+z818jEEQjaNBXHLy20Y=";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Mirror installed software on multiple machines";
|
description = "Mirror installed software on multiple machines";
|
||||||
|
|
|
@ -6,13 +6,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "grype";
|
pname = "grype";
|
||||||
version = "0.8.0";
|
version = "0.9.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "anchore";
|
owner = "anchore";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-/OgAh33DF0UkBcc5GriGgeoZ7kae9GhGnUnIX6lGlys=";
|
sha256 = "sha256-X67TEHKmKKuTFGo55ZVkYVNw4f/d8aU2b/FQsq1OIJg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-SGO8RKSOK0PHqSIJfTdcuAmqMtFuo9MBdiEylDUpOFo=";
|
vendorSha256 = "sha256-SGO8RKSOK0PHqSIJfTdcuAmqMtFuo9MBdiEylDUpOFo=";
|
||||||
|
|
|
@ -22,6 +22,11 @@ stdenv.mkDerivation {
|
||||||
url = "https://github.com/ipmitool/ipmitool/commit/5db314f694f75c575cd7c9ffe9ee57aaf3a88866.patch";
|
url = "https://github.com/ipmitool/ipmitool/commit/5db314f694f75c575cd7c9ffe9ee57aaf3a88866.patch";
|
||||||
sha256 = "01niwrgajhrdhl441gzmw6v1r1yc3i8kn98db4b6smfn5fwdp1pa";
|
sha256 = "01niwrgajhrdhl441gzmw6v1r1yc3i8kn98db4b6smfn5fwdp1pa";
|
||||||
})
|
})
|
||||||
|
(fetchpatch {
|
||||||
|
name = "CVE-2020-5208.patch";
|
||||||
|
url = "https://github.com/ipmitool/ipmitool/commit/e824c23316ae50beb7f7488f2055ac65e8b341f2.patch";
|
||||||
|
sha256 = "sha256-X7MnoX2fzByRpRY4p33xetT+V2aehlQ/qU+aeaqtTUY=";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [ openssl ];
|
buildInputs = [ openssl ];
|
||||||
|
|
|
@ -100,6 +100,16 @@ mapAliases ({
|
||||||
cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10
|
cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10
|
||||||
cifs_utils = cifs-utils; # added 2016-08
|
cifs_utils = cifs-utils; # added 2016-08
|
||||||
ckb = ckb-next; # added 2018-10-21
|
ckb = ckb-next; # added 2018-10-21
|
||||||
|
|
||||||
|
# these are for convenience, not for backward compat and shouldn't expire
|
||||||
|
clang5Stdenv = lowPrio llvmPackages_5.stdenv;
|
||||||
|
clang6Stdenv = lowPrio llvmPackages_6.stdenv;
|
||||||
|
clang7Stdenv = lowPrio llvmPackages_7.stdenv;
|
||||||
|
clang8Stdenv = lowPrio llvmPackages_8.stdenv;
|
||||||
|
clang9Stdenv = lowPrio llvmPackages_9.stdenv;
|
||||||
|
clang10Stdenv = lowPrio llvmPackages_10.stdenv;
|
||||||
|
clang11Stdenv = lowPrio llvmPackages_11.stdenv;
|
||||||
|
|
||||||
clangAnalyzer = clang-analyzer; # added 2015-02-20
|
clangAnalyzer = clang-analyzer; # added 2015-02-20
|
||||||
clawsMail = claws-mail; # added 2016-04-29
|
clawsMail = claws-mail; # added 2016-04-29
|
||||||
clutter_gtk = clutter-gtk; # added 2018-02-25
|
clutter_gtk = clutter-gtk; # added 2018-02-25
|
||||||
|
|
|
@ -1134,6 +1134,8 @@ in
|
||||||
|
|
||||||
barman = python3Packages.callPackage ../tools/misc/barman { };
|
barman = python3Packages.callPackage ../tools/misc/barman { };
|
||||||
|
|
||||||
|
bashate = python3Packages.callPackage ../development/tools/bashate { };
|
||||||
|
|
||||||
bash-my-aws = callPackage ../tools/admin/bash-my-aws { };
|
bash-my-aws = callPackage ../tools/admin/bash-my-aws { };
|
||||||
|
|
||||||
bashcards = callPackage ../tools/misc/bashcards { };
|
bashcards = callPackage ../tools/misc/bashcards { };
|
||||||
|
@ -10776,7 +10778,7 @@ in
|
||||||
llvm_6 = llvmPackages_6.llvm;
|
llvm_6 = llvmPackages_6.llvm;
|
||||||
llvm_5 = llvmPackages_5.llvm;
|
llvm_5 = llvmPackages_5.llvm;
|
||||||
|
|
||||||
llvmPackages = recurseIntoAttrs (with targetPlatform;
|
llvmPackages = with targetPlatform;
|
||||||
if isDarwin then
|
if isDarwin then
|
||||||
llvmPackages_7
|
llvmPackages_7
|
||||||
else if isFreeBSD then
|
else if isFreeBSD then
|
||||||
|
@ -10786,55 +10788,55 @@ in
|
||||||
else if isWasm then
|
else if isWasm then
|
||||||
llvmPackages_8
|
llvmPackages_8
|
||||||
else
|
else
|
||||||
llvmPackages_latest);
|
llvmPackages_latest;
|
||||||
|
|
||||||
llvmPackages_5 = callPackage ../development/compilers/llvm/5 {
|
llvmPackages_5 = recurseIntoAttrs (callPackage ../development/compilers/llvm/5 {
|
||||||
inherit (stdenvAdapters) overrideCC;
|
inherit (stdenvAdapters) overrideCC;
|
||||||
buildLlvmTools = buildPackages.llvmPackages_5.tools;
|
buildLlvmTools = buildPackages.llvmPackages_5.tools;
|
||||||
targetLlvmLibraries = targetPackages.llvmPackages_5.libraries;
|
targetLlvmLibraries = targetPackages.llvmPackages_5.libraries;
|
||||||
};
|
});
|
||||||
|
|
||||||
llvmPackages_6 = callPackage ../development/compilers/llvm/6 {
|
llvmPackages_6 = recurseIntoAttrs (callPackage ../development/compilers/llvm/6 {
|
||||||
inherit (stdenvAdapters) overrideCC;
|
inherit (stdenvAdapters) overrideCC;
|
||||||
buildLlvmTools = buildPackages.llvmPackages_6.tools;
|
buildLlvmTools = buildPackages.llvmPackages_6.tools;
|
||||||
targetLlvmLibraries = targetPackages.llvmPackages_6.libraries;
|
targetLlvmLibraries = targetPackages.llvmPackages_6.libraries;
|
||||||
};
|
});
|
||||||
|
|
||||||
llvmPackages_7 = callPackage ../development/compilers/llvm/7 {
|
llvmPackages_7 = recurseIntoAttrs (callPackage ../development/compilers/llvm/7 {
|
||||||
inherit (stdenvAdapters) overrideCC;
|
inherit (stdenvAdapters) overrideCC;
|
||||||
buildLlvmTools = buildPackages.llvmPackages_7.tools;
|
buildLlvmTools = buildPackages.llvmPackages_7.tools;
|
||||||
targetLlvmLibraries = targetPackages.llvmPackages_7.libraries;
|
targetLlvmLibraries = targetPackages.llvmPackages_7.libraries;
|
||||||
};
|
});
|
||||||
|
|
||||||
llvmPackages_8 = callPackage ../development/compilers/llvm/8 {
|
llvmPackages_8 = recurseIntoAttrs (callPackage ../development/compilers/llvm/8 {
|
||||||
inherit (stdenvAdapters) overrideCC;
|
inherit (stdenvAdapters) overrideCC;
|
||||||
buildLlvmTools = buildPackages.llvmPackages_8.tools;
|
buildLlvmTools = buildPackages.llvmPackages_8.tools;
|
||||||
targetLlvmLibraries = targetPackages.llvmPackages_8.libraries;
|
targetLlvmLibraries = targetPackages.llvmPackages_8.libraries;
|
||||||
};
|
});
|
||||||
|
|
||||||
llvmPackages_9 = callPackage ../development/compilers/llvm/9 {
|
llvmPackages_9 = recurseIntoAttrs (callPackage ../development/compilers/llvm/9 {
|
||||||
inherit (stdenvAdapters) overrideCC;
|
inherit (stdenvAdapters) overrideCC;
|
||||||
buildLlvmTools = buildPackages.llvmPackages_9.tools;
|
buildLlvmTools = buildPackages.llvmPackages_9.tools;
|
||||||
targetLlvmLibraries = targetPackages.llvmPackages_9.libraries;
|
targetLlvmLibraries = targetPackages.llvmPackages_9.libraries;
|
||||||
};
|
});
|
||||||
|
|
||||||
llvmPackages_10 = callPackage ../development/compilers/llvm/10 {
|
llvmPackages_10 = recurseIntoAttrs (callPackage ../development/compilers/llvm/10 {
|
||||||
inherit (stdenvAdapters) overrideCC;
|
inherit (stdenvAdapters) overrideCC;
|
||||||
buildLlvmTools = buildPackages.llvmPackages_10.tools;
|
buildLlvmTools = buildPackages.llvmPackages_10.tools;
|
||||||
targetLlvmLibraries = targetPackages.llvmPackages_10.libraries;
|
targetLlvmLibraries = targetPackages.llvmPackages_10.libraries;
|
||||||
};
|
});
|
||||||
|
|
||||||
llvmPackages_11 = callPackage ../development/compilers/llvm/11 ({
|
llvmPackages_11 = recurseIntoAttrs (callPackage ../development/compilers/llvm/11 ({
|
||||||
inherit (stdenvAdapters) overrideCC;
|
inherit (stdenvAdapters) overrideCC;
|
||||||
buildLlvmTools = buildPackages.llvmPackages_11.tools;
|
buildLlvmTools = buildPackages.llvmPackages_11.tools;
|
||||||
targetLlvmLibraries = targetPackages.llvmPackages_11.libraries;
|
targetLlvmLibraries = targetPackages.llvmPackages_11.libraries;
|
||||||
} // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) {
|
} // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) {
|
||||||
stdenv = gcc7Stdenv;
|
stdenv = gcc7Stdenv;
|
||||||
});
|
}));
|
||||||
|
|
||||||
llvmPackages_latest = llvmPackages_11;
|
llvmPackages_latest = llvmPackages_11;
|
||||||
|
|
||||||
llvmPackages_rocm = callPackage ../development/compilers/llvm/rocm { };
|
llvmPackages_rocm = recurseIntoAttrs (callPackage ../development/compilers/llvm/rocm { });
|
||||||
|
|
||||||
lorri = callPackage ../tools/misc/lorri {
|
lorri = callPackage ../tools/misc/lorri {
|
||||||
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
|
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
|
||||||
|
|
|
@ -634,7 +634,10 @@ let
|
||||||
|
|
||||||
menhir = callPackage ../development/ocaml-modules/menhir { };
|
menhir = callPackage ../development/ocaml-modules/menhir { };
|
||||||
|
|
||||||
merlin = callPackage ../development/tools/ocaml/merlin { };
|
merlin =
|
||||||
|
if lib.versionAtLeast ocaml.version "4.11"
|
||||||
|
then callPackage ../development/tools/ocaml/merlin/4.x.nix { }
|
||||||
|
else callPackage ../development/tools/ocaml/merlin { };
|
||||||
|
|
||||||
merlin-extend = callPackage ../development/ocaml-modules/merlin-extend { };
|
merlin-extend = callPackage ../development/ocaml-modules/merlin-extend { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue