Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
74b6035ad9
|
|
@ -9,6 +9,13 @@ in
|
|||
services.jmusicbot = {
|
||||
enable = mkEnableOption "jmusicbot, a Discord music bot that's easy to set up and run yourself";
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.jmusicbot;
|
||||
defaultText = literalExpression "pkgs.jmusicbot";
|
||||
description = "JMusicBot package to use";
|
||||
};
|
||||
|
||||
stateDir = mkOption {
|
||||
type = types.path;
|
||||
description = ''
|
||||
|
|
@ -27,7 +34,7 @@ in
|
|||
after = [ "network-online.target" ];
|
||||
description = "Discord music bot that's easy to set up and run yourself!";
|
||||
serviceConfig = mkMerge [{
|
||||
ExecStart = "${pkgs.jmusicbot}/bin/JMusicBot";
|
||||
ExecStart = "${cfg.package}/bin/JMusicBot";
|
||||
WorkingDirectory = cfg.stateDir;
|
||||
Restart = "always";
|
||||
RestartSec = 20;
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@ in
|
|||
virtualisation.containerd = {
|
||||
args.config = toString containerdConfigChecked;
|
||||
settings = {
|
||||
version = 2;
|
||||
plugins."io.containerd.grpc.v1.cri" = {
|
||||
containerd.snapshotter =
|
||||
lib.mkIf config.boot.zfs.enabled (lib.mkOptionDefault "zfs");
|
||||
|
|
|
|||
|
|
@ -56,12 +56,12 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.8.0";
|
||||
version = "3.8.1";
|
||||
pname = "darktable";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
|
||||
sha256 = "01gp9dg5wr2rg1k8cqs0l3s7ism8a4q8qypgwccd4jh7ip3wfr9f";
|
||||
sha256 = "1xmyn9haagizh8qqg91bm1lx3dq1v8failxj943mipnvaj80dvl1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja llvm_13 pkg-config intltool perl desktop-file-utils wrapGAppsHook ];
|
||||
|
|
@ -119,15 +119,6 @@ stdenv.mkDerivation rec {
|
|||
"-DUSE_KWALLET=OFF"
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# This is merged in darktable master and will hopefully be in 3.8.1
|
||||
name = "cmake-fix.patch";
|
||||
url = "https://github.com/darktable-org/darktable/commit/58d247f7ebea76c55fa2525beb9f5ce092c6670d.patch";
|
||||
sha256 = "11fn6d2mwlapbf1zbyv6bhgv29kxcwrs7cnbway0rnl9nj8wimf2";
|
||||
})
|
||||
];
|
||||
|
||||
# darktable changed its rpath handling in commit
|
||||
# 83c70b876af6484506901e6b381304ae0d073d3c and as a result the
|
||||
# binaries can't find libdarktable.so, so change LD_LIBRARY_PATH in
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kube3d";
|
||||
version = "5.2.2";
|
||||
version = "5.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rancher";
|
||||
repo = "k3d";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yOrxEY2UpupVmbDSAhgruTUOhNVAGCpSJsvzDEFFccw=";
|
||||
sha256 = "sha256-ZuUjk1wb7iRZX+OpjLJHp1T0WYNjCHU6DpYF4V/heVc=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nerdctl";
|
||||
version = "0.16.1";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-s116SwgOj5xzfoz/iw17xubEKzPUx912QHk1+C6YhE8=";
|
||||
sha256 = "sha256-6v4oZmP/FBtHAdnxnbd/HFZln2LGOVGtMc1GyRV2aqs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-VvK4pHmV1WkIzQDHiFVzjurigP3F4xYl0DJCnImSx3s=";
|
||||
vendorSha256 = "sha256-joCJ4acSmClBJLZkW8DFeb0oha1Zowcpoaw6Elu+HrY=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -144,6 +144,17 @@ stdenv.mkDerivation rec {
|
|||
rev = "53532ddd4e2dc92469c1590ebf0c40f8f69bf579";
|
||||
sha256 = "sha256-6SoSBvIlqvNwZV3jTB6uPdUtaWIOeNmddi2poK/WvGs=";
|
||||
})
|
||||
|
||||
# TODO: This will not be necessary when Sphinx 4.4.1 is released,
|
||||
# since some warnings introduced in 4.4.0 will be disabled by then
|
||||
# (https://github.com/sphinx-doc/sphinx/pull/10126).
|
||||
# https://trac.sagemath.org/ticket/33272
|
||||
(fetchSageDiff {
|
||||
base = "9.5";
|
||||
name = "sphinx-4.4-warnings.patch";
|
||||
rev = "97d7958bed441cf2ccc714d88f83d3a8426bc085";
|
||||
sha256 = "sha256-y1STE0oxswnijGCsBw8eHWWqpmT1XMznIfA0vvX9pFA=";
|
||||
})
|
||||
];
|
||||
|
||||
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
|
||||
|
|
|
|||
|
|
@ -10,15 +10,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "containerd";
|
||||
version = "1.5.9";
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = "containerd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-v5seKJMfZUVMbydxKiTSy0OSwen6I/3DrGJnL2DyqHg=";
|
||||
sha256 = "sha256-0Fbmtb7Ec6WcA7ARtgdBK5i7yAq2t3iXtfLb/MZcKJA=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
@ -32,14 +30,13 @@ buildGoModule rec {
|
|||
buildPhase = ''
|
||||
runHook preBuild
|
||||
patchShebangs .
|
||||
make binaries man "VERSION=v${version}" "REVISION=${src.rev}"
|
||||
make binaries "VERSION=v${version}" "REVISION=${src.rev}"
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm555 bin/* -t $out/bin
|
||||
installManPage man/*.[1-9]
|
||||
installShellCompletion --bash contrib/autocomplete/ctr
|
||||
installShellCompletion --zsh --name _ctr contrib/autocomplete/zsh_autocomplete
|
||||
runHook postInstall
|
||||
|
|
|
|||
30
pkgs/data/themes/pitch-black/default.nix
Normal file
30
pkgs/data/themes/pitch-black/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ lib, stdenvNoCC, fetchFromGitHub }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec{
|
||||
pname = "pitch-black";
|
||||
version = "unstable-2019-07-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = pname;
|
||||
owner = "freefreeno";
|
||||
rev = "d8039341419aef1157c030bf3d9237bd926e0b95";
|
||||
hash = "sha256-Rn3ZMBD6srIkYFNN3HT5JFP46Akodmeqz5tbV2/2ZDA=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
rm LICENSE README.md
|
||||
mkdir -p $out/share
|
||||
mv GTK $out/share/themes
|
||||
mv * $out/share
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A dark plasma theme built with usability in mind";
|
||||
homepage = "https://github.com/freefreeno/Pitch-Black";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.pasqui23 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,7 +5,7 @@ with lib; mkCoqDerivation rec {
|
|||
owner = "DeepSpec";
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = range "8.10" "8.14"; out = "4.0.0"; }
|
||||
{ case = range "8.10" "8.15"; out = "4.0.0"; }
|
||||
] null;
|
||||
release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm";
|
||||
releaseRev = v: "${v}";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
{ lib, mkCoqDerivation, coq, compcert, ITree, version ? null }:
|
||||
|
||||
with lib;
|
||||
|
||||
# A few modules that are not built and installed by default
|
||||
# but that may be useful to some users.
|
||||
# They depend on ITree.
|
||||
|
|
@ -7,12 +9,15 @@ let extra_floyd_files = [
|
|||
"ASTsize.v"
|
||||
"io_events.v"
|
||||
"powerlater.v"
|
||||
"printf.v"
|
||||
]
|
||||
# floyd/printf.v is broken in VST 2.9
|
||||
++ optional (!versions.isGe "8.13" coq.coq-version) "printf.v"
|
||||
++ [
|
||||
"quickprogram.v"
|
||||
];
|
||||
in
|
||||
|
||||
with lib; mkCoqDerivation {
|
||||
mkCoqDerivation {
|
||||
pname = "coq${coq.coq-version}-VST";
|
||||
namePrefix = [];
|
||||
displayVersion = { coq = false; };
|
||||
|
|
@ -20,8 +25,10 @@ with lib; mkCoqDerivation {
|
|||
repo = "VST";
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = range "8.13" "8.15"; out = "2.9"; }
|
||||
{ case = range "8.12" "8.13"; out = "2.8"; }
|
||||
] null;
|
||||
release."2.9".sha256 = "sha256:1adwzbl1pprrrwrm7cm493098fizxanxpv7nyfbvwdhgbhcnv6qf";
|
||||
release."2.8".sha256 = "sha256-cyK88uzorRfjapNQ6XgQEmlbWnDsiyLve5po1VG52q0=";
|
||||
releaseRev = v: "v${v}";
|
||||
extraBuildInputs = [ ITree ];
|
||||
|
|
|
|||
|
|
@ -16,7 +16,8 @@ let compcert = mkCoqDerivation rec {
|
|||
|
||||
defaultVersion = with versions; switch coq.version [
|
||||
{ case = range "8.8" "8.11"; out = "3.8"; }
|
||||
{ case = range "8.12" "8.14"; out = "3.10"; }
|
||||
{ case = isEq "8.12" ; out = "3.9"; }
|
||||
{ case = range "8.12" "8.15"; out = "3.10"; }
|
||||
] null;
|
||||
|
||||
release = {
|
||||
|
|
@ -106,13 +107,18 @@ compcert.overrideAttrs (o:
|
|||
})
|
||||
];
|
||||
}
|
||||
{ cases = [ (isEq "8.14") "3.10" ];
|
||||
{ cases = [ (range "8.14" "8.15") "3.10" ];
|
||||
out = [
|
||||
# Support for Coq 8.14.1
|
||||
(fetchpatch {
|
||||
url = "https://github.com/AbsInt/CompCert/commit/a79f0f99831aa0b0742bf7cce459cc9353bd7cd0.patch";
|
||||
sha256 = "sha256:0g20x8gfzvplpad9y9vr1p33k6qv6rsp691x6687v9ffvz7zsz94";
|
||||
})
|
||||
# Support for Coq 8.15.0
|
||||
(fetchpatch {
|
||||
url = "https://github.com/AbsInt/CompCert/commit/a882f78c069f7337dd9f4abff117d4df98ef38a6.patch";
|
||||
sha256 = "sha256:16i87s608fj9ni7cvd5wrd7gicqniad7w78wi26pxdy0pacl7bjg";
|
||||
})
|
||||
];
|
||||
}
|
||||
] [];
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libqalculate";
|
||||
version = "3.22.0";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "libqalculate";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yj6adBP9nZLXZVg62bYenfuiMeyULEql25KbDen9ljA=";
|
||||
sha256 = "sha256-aRHwkdAbM164diIAIyBp1Kt6u/GLyCWTtwF4eFaWbGU=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ lib, stdenv, zlib, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "minizip-${zlib.version}";
|
||||
pname = "minizip";
|
||||
version = zlib.version;
|
||||
inherit (zlib) src;
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opencl-headers-${version}";
|
||||
pname = "opencl-headers";
|
||||
version = "2021.06.30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -23,8 +23,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ clang lld llvm ];
|
||||
|
||||
cmakeBuildType = "Release";
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_PREFIX_PATH=${llvm}/lib/cmake/llvm;${clang-unwrapped}/lib/cmake/clang"
|
||||
"-DLLVM_TARGETS_TO_BUILD='AMDGPU;X86'"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, unzip, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "metis";
|
||||
pname = "metis";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "croniter";
|
||||
version = "1.2.0";
|
||||
version = "1.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-CUQi9q657WRnFDk1A/o4iv5PhG4RDhmX/qV5TiCFwtc=";
|
||||
hash = "sha256-2/AgcJiKvH6JVVg5FZMbNvhlw4KJOQvhGgxBErVcqsY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "furo";
|
||||
version = "2022.1.2";
|
||||
version = "2022.2.14.1";
|
||||
format = "wheel";
|
||||
disable = pythonOlder "3.6";
|
||||
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
inherit pname version format;
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
sha256 = "sha256-lYAWv+E4fB6N31udcWlracTqpc2K/JSSq/sAirotMAw=";
|
||||
sha256 = "sha256-18uBJgNGNyEjMjUOyEkMuVcy02UGsCQxiljO4ufeD9o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "0.33.0";
|
||||
version = "0.34.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-6EgdTVEvDeCwTEOL5JGXzRFh0U2GjC4KIiDGrHXOD5Y=";
|
||||
sha256 = "sha256-XgVZwCXdUae1BA3WUm+mJ+zmnqLpp13ht+FRJ3udmQk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "net2grid";
|
||||
version = "2.0.0";
|
||||
version = "3.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "klaasnicolaas";
|
||||
repo = "python-net2grid";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2hjWQaktx7XUS7gf7A+9QNSZSujyVZUka/SwEnEu2dg=";
|
||||
hash = "sha256-nT9qMv4Zr7SjNwHRN3HRR11yl+Oue8VVCfJr2n1D02Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "plugwise";
|
||||
version = "0.16.2";
|
||||
version = "0.16.4";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "python-plugwise";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-//0M5eNWJoviHWuZnHO6hCEP3g2dA8utJeoS5Lp0Hy8=";
|
||||
sha256 = "sha256-G1PpVqq66uBAigrFxJVvcIKdyL3zTKxcosgkZTjy3Is=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "rokuecp";
|
||||
version = "0.13.2";
|
||||
version = "0.14.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "ctalkington";
|
||||
repo = "python-rokuecp";
|
||||
rev = version;
|
||||
hash = "sha256-TWjONAGUwcCaWiaCxgR1xV1R+Ouy7FvMUewZa3z1mBc=";
|
||||
hash = "sha256-B8tcYcBtgPkT6REDC7vhHmfO/MjMRQgR3PkF0pfjbyk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -56,6 +56,8 @@ buildPythonPackage rec {
|
|||
disabledTests = [
|
||||
# https://github.com/ctalkington/python-rokuecp/issues/249
|
||||
"test_resolve_hostname"
|
||||
# Assertion issue
|
||||
"test_guess_stream_format"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ddosify";
|
||||
version = "0.7.2";
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QLJB2WcnguknEMdgwJzltp++mJCL4cFOWU568aTk0sc=";
|
||||
sha256 = "sha256-urls47jS9Vu64PC/Ie+UTDfg17krs+UegqKub1QaYK4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-lbo9P2UN9TmUAqyhFdbOHWokoAogVQZihpcOlhmumxU=";
|
||||
|
|
|
|||
|
|
@ -73,43 +73,43 @@ rec {
|
|||
headers = "0vvizddmhprprbdf6bklasz6amwc254bpc9j0zlx23d1pgyxpnhc";
|
||||
};
|
||||
|
||||
electron_14 = mkElectron "14.2.5" {
|
||||
armv7l-linux = "d6f7e2fe6088f57ecd455035e0815c20dd1d84b4cbf669e5fa355b96f36eaf2e";
|
||||
aarch64-linux = "c8a1a7c5c04462bbe6e148587a72b002ab4bb90aecb9686546b22580c0f9fa52";
|
||||
x86_64-linux = "5820ea6c9cfe02096a75df43cab7cdfe5947d6d90207e98c563bd50c400f8110";
|
||||
i686-linux = "8099fc3b137e80c5e65493dea2cf3dfb923e86693f3b082429f6fd949560f540";
|
||||
x86_64-darwin = "258eb29426a5f275c49284be6818f856ffc29d04fa9cef6fafcdcd207092281d";
|
||||
aarch64-darwin = "38a19828c1d7ff5fb49c5db5a706482f4afbae9fecaedaf9ebea0a5765bf952d";
|
||||
headers = "172h9ba1s531y3s751inwsia6kr39412yivqkpdc58jmn47nmgb8";
|
||||
electron_14 = mkElectron "14.2.6" {
|
||||
armv7l-linux = "fd115652f491fff6a28bf39dc41e3c7f1b638e7dcc7856c33b6a97c7763ea9a3";
|
||||
aarch64-linux = "530df3030aeb2c0f67ba4bc210c0f0fe77670001d2ba30ad6858f74952528df2";
|
||||
x86_64-linux = "c3f91ced7e429079d43c182f47cea1eceef17ab65c390e15f9c6af56e58ed3d9";
|
||||
i686-linux = "d66881d0747c99618c500b46e044eb4e97442400624fbcf9a6af114743e6e8db";
|
||||
x86_64-darwin = "15db43c17a33bf9e31f66f5025e0810dfbd2b237f7645eda51409de7930cc9d1";
|
||||
aarch64-darwin = "a5f7b8cc5f6dfc7561368d2f09745967bb553a29a22ef74af8f795225483338a";
|
||||
headers = "0rxbij6qvi0xzcmbxf3fm1snvakaxp9c512z9ni36y98sgg4s3l8";
|
||||
};
|
||||
|
||||
electron_15 = mkElectron "15.3.6" {
|
||||
armv7l-linux = "4c105be3dc38ea8899f9fe58c05dfbf20e0d43e9b35ca815c43329d17b714d36";
|
||||
aarch64-linux = "3d06de32f02e38039c3c9deb418e3b9dbcda30f387f27e54fb1f1be068b80989";
|
||||
x86_64-linux = "5a9a3e37e92ad67d2a4ebb5ac85cb817d682fe2ca0b37b924d7f40085d246cc9";
|
||||
i686-linux = "32ff47793c8123fa6220ff9e7c524e3b89c0411e94bdb4d9391038cc58449b5f";
|
||||
x86_64-darwin = "faff636a6deedc3b7a3c900aef187baaeec2b83ccc405c56e3ea18d68894b82c";
|
||||
aarch64-darwin = "ae7350a7daa6eb2d21fa001c38217bc46a3894f843962c5cca192b837cc9d81c";
|
||||
headers = "1mbffk26kdn1id809sdg1kdhrf285zm9ls40b5zaflcljvqg3i2x";
|
||||
electron_15 = mkElectron "15.3.7" {
|
||||
armv7l-linux = "1cc5ce2ab6d795271f54e67a78eec607c0a14761ee1177078a157abad7aa61e6";
|
||||
aarch64-linux = "caf7146c738207b78ea63e95fa055f36829bb360e2d81fce10513fae238f2750";
|
||||
x86_64-linux = "e424dded1ac545634128bfb5c6195807aa96b7761be95f52ed760886f42874cc";
|
||||
i686-linux = "9f1898f9c96672076a87ca559dd11788964347fd17316f0c24f75c9c53985ce5";
|
||||
x86_64-darwin = "282f8737fdc73a3ddc82f56b4affc9f6fefec1b233e532e08d206344b657cd8a";
|
||||
aarch64-darwin = "d64e12c680d60b535fea7de4322504db04a83e63e8557d8e9b3677a334911752";
|
||||
headers = "0nfk75r72p5dgz0rdyqfqjmlwn2wlgn7h93a1v5ghjpwn1rp89m7";
|
||||
};
|
||||
|
||||
electron_16 = mkElectron "16.0.8" {
|
||||
armv7l-linux = "be3a598d5f7c677c11831b78a8a82d95132ea760bb643e526426b91fdf27aff7";
|
||||
aarch64-linux = "465cd93d69ea2e3273339d48bef58e7359b692da5535bff5882e803c22535ec5";
|
||||
x86_64-linux = "25767a94d4b0927616ed5008889cd65bb073c7005209671b34045f91d698c857";
|
||||
i686-linux = "1cedf35f501ea1512fe9ae5cae47a72e093b6eb7297f76b726551e4a33a593a5";
|
||||
x86_64-darwin = "a3c5e5368165304fc9392e3a5b59480965cf0f91f7d889257e6a622f48051cbf";
|
||||
aarch64-darwin = "dc8414d7b9a967bda530c83a81720519931aebf541cfaed142ee2042c16e683a";
|
||||
headers = "042gz036dzwbvvxvgbgkdb5nq7p8a7vcan6c35l7imgv1hd4g5v4";
|
||||
electron_16 = mkElectron "16.0.9" {
|
||||
armv7l-linux = "7071f18230f5d4bbf84d3f1955056f2a6952e5487dfdecb51708e419c0b1a594";
|
||||
aarch64-linux = "a7873d1cb2b632c9c48a6942bf4a436463c07cc488f4b0b4575e0e4a496c357d";
|
||||
x86_64-linux = "06d57bc1e59ebe046d5731d64eb67c41e793731e67aefbf33f4e3c23139285d4";
|
||||
i686-linux = "8603545bdaec512380050ce6f9f1ef283514b960c8d6c8682eaa6563d93705b2";
|
||||
x86_64-darwin = "d092af5e5fddb295e9ebb9b639006deec125b1f6b30896d22e98b84e5a74af40";
|
||||
aarch64-darwin = "62fd4d033fd0ad62d1c13ac219bd68e76b1625c305097c7aa2ab799f45c9e879";
|
||||
headers = "0d0jkjjfq32j09bjlpmx1hvi20rh8yfkfm7hfcv3xs831physbj5";
|
||||
};
|
||||
|
||||
electron_17 = mkElectron "17.0.0" {
|
||||
armv7l-linux = "29b31c5e77d4d6d9e1a4340fdf08c28ae6698ea9e20d636cec8a59dc758815ef";
|
||||
aarch64-linux = "e7bf2ec09b8a7018ba417fc670a15594fb8f3e930626485f2423e9a89e2dcbd0";
|
||||
x86_64-linux = "dc74e28719a79f05dd741cda8c22c2bb164dec178c6d560af085910b37cf000b";
|
||||
i686-linux = "6f6fe5fa0452e871abe82dbd25d7cf92ab7011995b3b2b15d04d8691ddc9e9de";
|
||||
x86_64-darwin = "c35d81af3a3f156059a53436d7874a46770cbf6e4e5087f7caee269e66abb636";
|
||||
aarch64-darwin = "7dc5eabc7e582a031d5bd079eeadc9582f5605446085b4cbd1dc7e7c9e978c45";
|
||||
headers = "1i3sx1xy62i4f68zbsz1a7jgqw7shx0653w9fyvcdly2nraxldil";
|
||||
electron_17 = mkElectron "17.0.1" {
|
||||
armv7l-linux = "0867f74427152c3b4110e11c9ce38e351531554868f62665b064f3d1dae5fd00";
|
||||
aarch64-linux = "7715f7eaaa287f83b945f491c2ca1eb0befed93725d81c85d06f8584db3a6cc4";
|
||||
x86_64-linux = "de789f548d6cc2ddff8db53b3bbfaac5631e90f14506935d2d7fafedf82e5adf";
|
||||
i686-linux = "4e81ce43552f22e271527d5f7ab84db6dda61c0922f8b6350e44fa52967f2dd9";
|
||||
x86_64-darwin = "d270858938e2f0e68479d91384e6f4d01be1d4e22b305dc2023ecd1a5e113d17";
|
||||
aarch64-darwin = "aecf14a88ede956e93fee5b48b773ad4d8d6605424c9d69a45950b673c89f8ca";
|
||||
headers = "1c3fl9fxmhkhvm825vmyxm8dm89xfy4iwqrb4ifmv5cz9dh9b9a8";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ginkgo";
|
||||
version = "2.1.2";
|
||||
version = "2.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onsi";
|
||||
repo = "ginkgo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/VJ1r1t/V2YkZGJUrJR3S6NPVP6EADIH9E6jmki8QRI=";
|
||||
sha256 = "sha256-q+m1NDl9zd6ueyBTzbzlvHIQyoIul5dAfUQ6UK4wlrc=";
|
||||
};
|
||||
vendorSha256 = "sha256-kMQ60HdsorZU27qoOY52DpwFwP+Br2bp8mRx+ZwnQlI=";
|
||||
|
||||
|
|
|
|||
24
pkgs/development/tools/quick-lint-js/default.nix
Normal file
24
pkgs/development/tools/quick-lint-js/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ cmake, fetchFromGitHub, lib, ninja, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "quick-lint-js";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "quick-lint";
|
||||
repo = "quick-lint-js";
|
||||
rev = version;
|
||||
sha256 = "sha256-F21eli4HdLw3RComvocwBrcGfruIjO23E6+7a4+6vbs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Find bugs in Javascript programs";
|
||||
homepage = "https://quick-lint-js.com";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ratsclub ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typos";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crate-ci";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XFx8M9cQ7uXm4LS983FOZ6hz3zffLahhwrBjytbwEWk=";
|
||||
sha256 = "sha256-dQ+FLKf+zNrUabrXWvdYqpNXzS+j92zQcaZXPTxxB/E=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-ngWvbNx41K3PfGbzJfH8uBUl0cuI/Abj6EbX8YANk6Q=";
|
||||
cargoSha256 = "sha256-ud2Hb8EoOiPyzp7qPUeQi8FZ49RXbrDsk8ZEBI6lPtk=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Source code spell checker";
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ddnet";
|
||||
version = "15.8.1";
|
||||
version = "15.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddnet";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-ZxLaGAKBACR65CRCjt3NPSjMNm7GQkESxF6sLv3q4lQ=";
|
||||
sha256 = "sha256-QGtXI4Dbua5LBXSvB17tnSTGEvCCoopvg1XKBuDIEoQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkg-config ];
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ let
|
|||
INSTALL_PATH="${placeholder "out"}/share/fzf-tab";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "zsh-fzf-tab";
|
||||
version = "unstable-2021-11-12";
|
||||
version = "unstable-2022-02-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Aloxaf";
|
||||
repo = "fzf-tab";
|
||||
rev = "190500bf1de6a89416e2a74470d3b5cceab102ba";
|
||||
sha256 = "1dipsy0s67fr47ig5559bcp1h5yn8rdjshhs8zsq7j8plvvh99qb";
|
||||
rev = "e8145d541a35d8a03df49fbbeefa50c4a0076bbf";
|
||||
sha256 = "h/3XP/BiNnUgQI29gEBl6RFee77WDhFyvsnTi1eRbKg=";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tarlz";
|
||||
version = "0.21";
|
||||
version = "0.22";
|
||||
outputs = [ "out" "man" "info" ];
|
||||
|
||||
nativeBuildInputs = [ lzip texinfo ];
|
||||
|
|
@ -10,12 +10,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/lzip/${pname}/${pname}-${version}.tar.lz";
|
||||
sha256 = "sha256-D5chEt0/Emo5TVoEEHaVzLu55gPnsZM2e9FxRgfgrfQ=";
|
||||
sha256 = "sha256-/M9yJvoktV0ybKsT926jSb7ERsWo33GkbTQwmaBQkdw=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
makeFlags = [ "CXX:=$(CXX)" ];
|
||||
doCheck = true;
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.nongnu.org/lzip/${pname}.html";
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mqttui";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EdJoPaTo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ScB0zJXyk8bPEDCxdymMqNmlhe/skNHr6IRmJpme+qQ=";
|
||||
sha256 = "sha256-Uts9hKhnFNYdQhxeUoTOehCcfgqQwStSoGWixgY3dPU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-736UYTCs4d1DcpHWl5AejEaW+SYzlgElozC3t/RU41g=";
|
||||
cargoSha256 = "sha256-YxXniyuQEM+vrCbflqCLlnXpH3ClAd9O496SFVKRvBs=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "btop";
|
||||
version = "1.2.2";
|
||||
hash = "sha256-MXPfqxpEIJUbWyT6Ni/wnkNQ234fzrAPdIrisw8gytw=";
|
||||
version = "1.2.3";
|
||||
hash = "sha256-vH167BL2ekWwxIhQWXkgJxl8z77S8SkmHVclW6XGc+8=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aristocratos";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "colordiff";
|
||||
version = "1.0.19";
|
||||
version = "1.0.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daveewart";
|
||||
repo = "colordiff";
|
||||
rev = "v${version}";
|
||||
sha256 = "1v7s1yn0qvn08iwm5js8mxn442392qyr7s9ij506byfd497ag7qk";
|
||||
sha256 = "sha256-+TtVnUX88LMd8zmhLsKTyR9JlgR7IkUB18PF3LRgPB0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ docbook_xml_dtd_412 docbook_xsl perl w3m xmlto ];
|
||||
|
|
|
|||
|
|
@ -22943,6 +22943,8 @@ with pkgs;
|
|||
|
||||
qemu_test = lowPrio (qemu.override { hostCpuOnly = true; nixosTestRunner = true; });
|
||||
|
||||
quick-lint-js = callPackage ../development/tools/quick-lint-js { };
|
||||
|
||||
linux-firmware = callPackage ../os-specific/linux/firmware/linux-firmware { };
|
||||
|
||||
qmk-udev-rules = callPackage ../os-specific/linux/qmk-udev-rules { };
|
||||
|
|
@ -23931,6 +23933,8 @@ with pkgs;
|
|||
|
||||
penna = callPackage ../data/fonts/penna { };
|
||||
|
||||
pitch-black = callPackage ../data/themes/pitch-black {};
|
||||
|
||||
plano-theme = callPackage ../data/themes/plano { };
|
||||
|
||||
plata-theme = callPackage ../data/themes/plata {
|
||||
|
|
@ -26332,7 +26336,7 @@ with pkgs;
|
|||
srain = callPackage ../applications/networking/irc/srain { };
|
||||
|
||||
super-productivity = callPackage ../applications/office/super-productivity {
|
||||
electron = electron_13;
|
||||
electron = electron_17;
|
||||
};
|
||||
|
||||
wlroots = wlroots_0_15;
|
||||
|
|
|
|||
|
|
@ -96,9 +96,7 @@ let
|
|||
topology = callPackage ../development/coq-modules/topology {};
|
||||
Velisarios = callPackage ../development/coq-modules/Velisarios {};
|
||||
Verdi = callPackage ../development/coq-modules/Verdi {};
|
||||
VST = callPackage ../development/coq-modules/VST {
|
||||
compcert = self.compcert.override { version = "3.9"; };
|
||||
};
|
||||
VST = callPackage ../development/coq-modules/VST {};
|
||||
zorns-lemma = callPackage ../development/coq-modules/zorns-lemma {};
|
||||
filterPackages = doesFilter: if doesFilter then filterCoqPackages self else self;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue