From 5c09c468587c71be7ba0cc70399dda024f3c8100 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 9 Jul 2022 11:06:18 -0300 Subject: [PATCH 01/12] pcaudiolib: 1.1 -> 1.2 --- .../libraries/pcaudiolib/default.nix | 58 +++++++++++++------ 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index 2cfd0ab58bd1..7730b30b3967 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -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; }; -} +}) From 2d8b3b67ee3f9d4400e2d5de6efd849259f6f32f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 16 Jul 2022 11:22:13 +0800 Subject: [PATCH 02/12] vscode: 1.68.1 -> 1.69.1 --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 9f85c9f9a150..9514390c0d85 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -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"; From 81c37cf5f249567e4cc488f1b03f188a8426d2b0 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 16 Jul 2022 11:22:29 +0800 Subject: [PATCH 03/12] vscodium: 1.68.1 -> 1.69.1 --- pkgs/applications/editors/vscode/vscodium.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 721cfbabf82b..11a1c5e37fc8 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -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"; From d80170748c75ca4cb5f43060c5f334491b1167a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Jul 2022 06:49:18 +0000 Subject: [PATCH 04/12] python310Packages.fastcore: 1.5.5 -> 1.5.6 --- pkgs/development/python-modules/fastcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index c86dcd79aab5..f3377a5cd7be 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -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 = [ From ea8f501ff56a6db5410b918b86eaf11970f4d165 Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Mon, 18 Jul 2022 09:21:02 +0200 Subject: [PATCH 05/12] pls: 5.2.0 -> 5.3.0 --- pkgs/tools/misc/pls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pls/default.nix b/pkgs/tools/misc/pls/default.nix index a72b4e44aa45..78501bbf4827 100644 --- a/pkgs/tools/misc/pls/default.nix +++ b/pkgs/tools/misc/pls/default.nix @@ -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 ]; From c1d9c0118ee469e0acaee292f7a918b65e1edf8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Jul 2022 09:08:52 +0000 Subject: [PATCH 06/12] python310Packages.approvaltests: 5.3.0 -> 5.3.1 --- pkgs/development/python-modules/approvaltests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index bbd39cf619f4..449655c8b75e 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -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 = [ From 0d3340c27560ed665f66c4b3ec9cdc33162e9ef1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Jul 2022 10:37:57 +0000 Subject: [PATCH 07/12] python310Packages.dnslib: 0.9.19 -> 0.9.20 --- pkgs/development/python-modules/dnslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dnslib/default.nix b/pkgs/development/python-modules/dnslib/default.nix index 0f4ec03f5ff3..16d1dd356861 100644 --- a/pkgs/development/python-modules/dnslib/default.nix +++ b/pkgs/development/python-modules/dnslib/default.nix @@ -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"; From fdac405446db0dd47450cf6fd04200d1268bb326 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 18 Jul 2022 19:53:26 +0300 Subject: [PATCH 08/12] neofetch: improve detect NixOS version --- pkgs/tools/misc/neofetch/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index 9a6d03c6dcaf..806655ffe9f7 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -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" ]; From 3ee8d4c909cae4e2a1b1aac8e5b4a379e79ec3a9 Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Tue, 19 Jul 2022 06:19:18 +0200 Subject: [PATCH 09/12] netdata module: fix ExecStartPost (#181976) --- nixos/modules/services/monitoring/netdata.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index c6a3315d4022..03a76cab9f5e 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -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"; From cdd324d59bb0c5d9cff235b1baa9b7c5e20b7fb8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 19 Jul 2022 04:20:00 +0000 Subject: [PATCH 10/12] dive: fix build dive doesn't build with go 1.18 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c8af61fe2f2..73b6113703a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15733,7 +15733,9 @@ with pkgs; binutils = binutils; }; - dive = callPackage ../development/tools/dive { }; + dive = callPackage ../development/tools/dive { + buildGoModule = buildGo117Module; + }; doclifter = callPackage ../development/tools/misc/doclifter { }; From 23432ed4fcf6e3a466c6f6e616834871f65ca621 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Tue, 19 Jul 2022 04:51:30 +0000 Subject: [PATCH 11/12] ocamlPackage.odoc: 1.5.3 -> 2.1.1 (#181884) build tested by: fnix build -f. ocaml-ng.ocamlPackages_4_{05,06,07,08,09,10,11,12,13,14}.odoc fnix build -f. ocaml-ng.ocamlPackages_4_{08,09,10,11,12,13,14}.{odoc,curly,mdx} curly and mdx are the only reverse dependencies in ocaml-modules according to grep --- .../ocaml-modules/odoc/default.nix | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/odoc/default.nix b/pkgs/development/ocaml-modules/odoc/default.nix index 68c06cc4c6f7..3e25ba37fd1a 100644 --- a/pkgs/development/ocaml-modules/odoc/default.nix +++ b/pkgs/development/ocaml-modules/odoc/default.nix @@ -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"; From fa3c3c1a330e52e85f62ff874bc7cc401e087363 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 3 Jun 2022 14:18:51 +0200 Subject: [PATCH 12/12] =?UTF-8?q?coqPackages.flocq:=203.4.3=20=E2=86=92=20?= =?UTF-8?q?4.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit compcert: 3.10 → 3.11 coqPackages.VST: 2.9 → 2.10 --- pkgs/development/coq-modules/VST/default.nix | 2 ++ pkgs/development/coq-modules/compcert/default.nix | 4 +++- pkgs/development/coq-modules/flocq/default.nix | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix index ef22ecbdb953..dea603b5e4f5 100644 --- a/pkgs/development/coq-modules/VST/default.nix +++ b/pkgs/development/coq-modules/VST/default.nix @@ -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}"; diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 166dd037845c..596c059f5018 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -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 ]; diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index a0f4a3ecae82..ed973996feea 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -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";