Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
305e8cb7b8
|
|
@ -201,7 +201,9 @@ in {
|
|||
serviceConfig = {
|
||||
ExecStart = "${cfg.package}/bin/netdata -P /run/netdata/netdata.pid -D -c /etc/netdata/netdata.conf";
|
||||
ExecReload = "${pkgs.util-linux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID";
|
||||
ExecStartPost = ''while [ "$(netdatacli ping)" != pong ]; do sleep 0.5; done'';
|
||||
ExecStartPost = pkgs.writeShellScript "wait-for-netdata-up" ''
|
||||
while [ "$(${pkgs.netdata}/bin/netdatacli ping)" != pong ]; do sleep 0.5; done
|
||||
'';
|
||||
|
||||
TimeoutStopSec = 60;
|
||||
Restart = "on-failure";
|
||||
|
|
|
|||
|
|
@ -14,17 +14,17 @@ let
|
|||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "0rq0bc99hsji4ni5mqw1rhzn2rng9rldm4xbdxlkrjyprc6qvffz";
|
||||
x86_64-darwin = "1yjcb65w0anxyjc1nd9kbwr4hwnrlk9c6kp1a2ncy1g181klzarl";
|
||||
aarch64-linux = "1fk7887clz9sd7fmz7lkxql7bnsvnbjd9fjixym2746x9if5ds42";
|
||||
aarch64-darwin = "1bfgsjnm5r1wpss69ncx310j23mbwhixdxmg07m3kpcfqrmznvgc";
|
||||
armv7l-linux = "0131i5cx2737wmngybvlw7d9c4gnilmla33nlrhf74ihic98jwlc";
|
||||
x86_64-linux = "0jixjbj1h9l0zrkb8sc3p4x7kjh87dramaz6j8369vv6mc4h8ymr";
|
||||
x86_64-darwin = "1lqxjzyzhr3dpvjpmmlvknaxjzryr6yz8rg1mh5p211wfi13rf1c";
|
||||
aarch64-linux = "0y4q1kpwhz0hyipsc7hah6xgz9p3sn0ysaqzw32dl91hkr6d52mf";
|
||||
aarch64-darwin = "1d89gr4aj0vl05rz9d5iv8kkgb8p5jbfc9b0hjj1cp0d276x6ipy";
|
||||
armv7l-linux = "11cawg3ql9iq9z56i68h26cz7ydg0az298cbs2kpsz2lzkw97wbd";
|
||||
}.${system};
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.68.1";
|
||||
version = "1.69.1";
|
||||
pname = "vscode";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@ let
|
|||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "1gx64ff9sgjqn8vw2hjpn3qlfpfyyhc5ivzc52vqyczaj1fcny65";
|
||||
x86_64-darwin = "0sv0iyqfw24k14r28qzvlpdb81b7fqhbgb1lqzb75adhdfpjwz31";
|
||||
aarch64-linux = "13mg7nn43k4bs1gl8cx1kly90yxz7iial6a1fpy4grxsk8mna1rj";
|
||||
aarch64-darwin = "0mnj3lckpqwb3kmg7x7r34idaxyhy55gpiiyj0gmpqp8hp0ai5sc";
|
||||
armv7l-linux = "0cvvigzmqp21jxwdfpkspdj7sva9bj977f9689qgb012kqvy41b2";
|
||||
x86_64-linux = "0nsqrhijx5ic467fk2d803x93yazjkybg9cwmkk2l343fdg86kyq";
|
||||
x86_64-darwin = "0hxafssjjx4gvbqpra517ar8dik5hkrnzx54v89g8p6s7kzkp1j0";
|
||||
aarch64-linux = "1sl3w17a0j4b6rgl3xkna34i24s5ig8fs8kh2ysigb34h2izjdwi";
|
||||
aarch64-darwin = "08wqiplyb16s7nvhlik7307jm3jznq7g611bp01q12bkxfa3bpp8";
|
||||
armv7l-linux = "0vzl70545dplvd7nkl5g8x7mninjv3bkdp6d2ww6g2hdbdx0hlhr";
|
||||
}.${system};
|
||||
|
||||
sourceRoot = if stdenv.isDarwin then "" else ".";
|
||||
|
|
@ -28,7 +28,7 @@ in
|
|||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.68.1";
|
||||
version = "1.69.1";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
|
|
|||
|
|
@ -25,9 +25,11 @@ mkCoqDerivation {
|
|||
repo = "VST";
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = range "8.14" "8.15"; out = "2.10"; }
|
||||
{ case = range "8.13" "8.15"; out = "2.9"; }
|
||||
{ case = range "8.12" "8.13"; out = "2.8"; }
|
||||
] null;
|
||||
release."2.10".sha256 = "sha256-RIxfPWoHnV1CFkpxCusoGY/LIk07TgC7wWGRP4BSq8w=";
|
||||
release."2.9".sha256 = "sha256:1adwzbl1pprrrwrm7cm493098fizxanxpv7nyfbvwdhgbhcnv6qf";
|
||||
release."2.8".sha256 = "sha256-cyK88uzorRfjapNQ6XgQEmlbWnDsiyLve5po1VG52q0=";
|
||||
releaseRev = v: "v${v}";
|
||||
|
|
|
|||
|
|
@ -16,7 +16,8 @@ let compcert = mkCoqDerivation rec {
|
|||
releaseRev = v: "v${v}";
|
||||
|
||||
defaultVersion = with versions; switch coq.version [
|
||||
{ case = range "8.13" "8.15"; out = "3.10"; }
|
||||
{ case = range "8.14" "8.15"; out = "3.11"; }
|
||||
{ case = isEq "8.13" ; out = "3.10"; }
|
||||
{ case = isEq "8.12" ; out = "3.9"; }
|
||||
{ case = range "8.8" "8.11"; out = "3.8"; }
|
||||
] null;
|
||||
|
|
@ -25,6 +26,7 @@ let compcert = mkCoqDerivation rec {
|
|||
"3.8".sha256 = "1gzlyxvw64ca12qql3wnq3bidcx9ygsklv9grjma3ib4hvg7vnr7";
|
||||
"3.9".sha256 = "1srcz2dqrvmbvv5cl66r34zqkm0hsbryk7gd3i9xx4slahc9zvdb";
|
||||
"3.10".sha256 = "sha256:19rmx8r8v46101ij5myfrz60arqjy7q3ra3fb8mxqqi3c8c4l4j6";
|
||||
"3.11".sha256 = "sha256-ZISs/ZAJVWtxp9+Sg5qV5Rss1gI9hK769GnBfawLa6A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -7,9 +7,11 @@ with lib; mkCoqDerivation {
|
|||
domain = "gitlab.inria.fr";
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = range "8.14" "8.16"; out = "4.1.0"; }
|
||||
{ case = range "8.7" "8.15"; out = "3.4.3"; }
|
||||
{ case = range "8.5" "8.8"; out = "2.6.1"; }
|
||||
] null;
|
||||
release."4.1.0".sha256 = "sha256:09rak9cha7q11yfqracbcq75mhmir84331h1218xcawza48rbjik";
|
||||
release."3.4.3".sha256 = "sha256-YTdWlEmFJjCcHkl47jSOgrGqdXoApJY4u618ofCaCZE=";
|
||||
release."3.4.2".sha256 = "1s37hvxyffx8ccc8mg5aba7ivfc39p216iibvd7f2cb9lniqk1pw";
|
||||
release."3.3.1".sha256 = "1mk8adhi5hrllsr0hamzk91vf2405sjr4lh5brg9201mcw11abkz";
|
||||
|
|
|
|||
|
|
@ -1,33 +1,53 @@
|
|||
{ config, stdenv, lib, fetchFromGitHub
|
||||
, autoconf, automake, which, libtool, pkg-config
|
||||
, portaudio, alsa-lib
|
||||
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:
|
||||
{ config
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, alsa-lib
|
||||
, autoconf
|
||||
, automake
|
||||
, libpulseaudio
|
||||
, libtool
|
||||
, pkg-config
|
||||
, portaudio
|
||||
, which
|
||||
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pcaudiolib";
|
||||
version = "1.1";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "espeak-ng";
|
||||
repo = "pcaudiolib";
|
||||
rev = version;
|
||||
sha256 = "0c55hlqqh0m7bcb3nlgv1s4a22s5bgczr1cakjh3767rjb10khi0";
|
||||
repo = finalAttrs.pname;
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ZG/HBk5DHaZP/H3M01vDr3M2nP9awwsPuKpwtalz3EE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoconf automake which libtool pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
libtool
|
||||
pkg-config
|
||||
which
|
||||
];
|
||||
|
||||
buildInputs = [ portaudio ]
|
||||
++ lib.optionals stdenv.isLinux [ alsa-lib ]
|
||||
++ lib.optionals pulseaudioSupport [ libpulseaudio ];
|
||||
buildInputs = [
|
||||
portaudio
|
||||
]
|
||||
++ lib.optional stdenv.isLinux alsa-lib
|
||||
++ lib.optional pulseaudioSupport libpulseaudio;
|
||||
|
||||
preConfigure = "./autogen.sh";
|
||||
preConfigure = ''
|
||||
./autogen.sh
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "Provides a C API to different audio devices";
|
||||
homepage = "https://github.com/espeak-ng/pcaudiolib";
|
||||
license = licenses.gpl3;
|
||||
description = "Provides a C API to different audio devices";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ aske ];
|
||||
platforms = platforms.all;
|
||||
platforms = platforms.unix;
|
||||
badPlatforms = platforms.darwin;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,25 +1,32 @@
|
|||
{ lib, fetchurl, buildDunePackage, ocaml
|
||||
, astring, cmdliner, cppo, fpath, result, tyxml
|
||||
, markup, alcotest, yojson, sexplib, jq
|
||||
, markup, yojson, sexplib0, jq
|
||||
, odoc-parser, ppx_expect, bash, fmt
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "odoc";
|
||||
version = "1.5.3";
|
||||
|
||||
minimumOCamlVersion = "4.02";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml/odoc/releases/download/${version}/odoc-${version}.tbz";
|
||||
sha256 = "0idzidmz7y10xkwcf4aih0mdvkipxk1gzi4anhnbbi2q2s0nzdzj";
|
||||
sha256 = "sha256-9XTb0ozQ/DorlVJcS7ld320fZAi7T+EhV/pTeIT5h/0=";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
# dune 3 is required for tests to pass
|
||||
duneVersion = if doCheck then "3" else "2";
|
||||
|
||||
buildInputs = [ astring cmdliner cppo fpath result tyxml ];
|
||||
buildInputs = [ astring cmdliner cppo fpath result tyxml odoc-parser fmt ];
|
||||
|
||||
checkInputs = [ alcotest markup yojson sexplib jq ];
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.05";
|
||||
checkInputs = [ markup yojson sexplib0 jq ppx_expect bash ];
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.08";
|
||||
|
||||
preCheck = ''
|
||||
# some run.t files check the content of patchShebangs-ed scripts, so patch
|
||||
# them as well
|
||||
find test \( -name '*.sh' -o -name 'run.t' \) -execdir sed 's@#!/bin/sh@#!${bash}/bin/sh@' -i '{}' \;
|
||||
patchShebangs test
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A documentation generator for OCaml";
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "5.3.0";
|
||||
version = "5.3.1";
|
||||
pname = "approvaltests";
|
||||
format = "setuptools";
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "approvals";
|
||||
repo = "ApprovalTests.Python";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-nKTMWdXnxAf+UBUHkx+LAY29A/QXH+AtPjC296aarjU=";
|
||||
sha256 = "sha256-9euZpfCxtGJOfkOB+okXUhp9Ow8AOz3cPfC963BO/h4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dnslib";
|
||||
version = "0.9.19";
|
||||
version = "0.9.20";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a6e36ca96c289e2cb4ac6aa05c037cbef318401ba8ff04a8676892ca79749c77";
|
||||
sha256 = "sha256-ApCrXQj6vR74XvFD0cM/3NVJyy5Qd57BpCOZiw0LKUU=";
|
||||
};
|
||||
|
||||
checkPhase = "VERSIONS=${python.interpreter} ./run_tests.sh";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastcore";
|
||||
version = "1.5.5";
|
||||
version = "1.5.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "fastai";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-q0hdWucmR1qMMWIY8xZ/ccItcwb9EIVQauecJYSsQjc=";
|
||||
sha256 = "sha256-j0jxyvx4KIqlrUJDqtUwKlahB8jq18FrgQhti15BaTA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -25,6 +25,12 @@ stdenvNoCC.mkDerivation rec {
|
|||
sha256 = "sha256-F6Q4dUtfmR28VxLbITiLFJ44FjG4T1Cvuz3a0nLisMs=";
|
||||
name = "update_old_nixos_logo.patch";
|
||||
})
|
||||
# https://github.com/dylanaraps/neofetch/pull/2157
|
||||
(fetchpatch {
|
||||
url = "https://github.com/dylanaraps/neofetch/commit/de253afcf41bab441dc58d34cae654040cab7451.patch";
|
||||
sha256 = "sha256-3i7WnCWNfsRjbenTULmKHft5o/o176imzforNmuoJwo=";
|
||||
name = "improve_detect_nixos_version.patch";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "pls";
|
||||
version = "5.2.0";
|
||||
version = "5.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dhruvkb";
|
||||
repo = "pls";
|
||||
rev = version;
|
||||
sha256 = "sha256-nmADeOVS5qdWsun36eKmeT4kYml0sTXYNa+YUiyNGQY=";
|
||||
sha256 = "sha256-MtbOrdMTwnKRGlmiisHuGvQ6ScWbAAV8100ruO0MRvM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python3.pkgs.poetry-core ];
|
||||
|
|
|
|||
|
|
@ -15737,7 +15737,9 @@ with pkgs;
|
|||
binutils = binutils;
|
||||
};
|
||||
|
||||
dive = callPackage ../development/tools/dive { };
|
||||
dive = callPackage ../development/tools/dive {
|
||||
buildGoModule = buildGo117Module;
|
||||
};
|
||||
|
||||
doclifter = callPackage ../development/tools/misc/doclifter { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue