From 1f299ec958b7f0f8c93faeaee0e5f11fbf8281bd Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 13 Dec 2022 17:00:00 +0100 Subject: [PATCH 01/77] coredns: install man pages --- pkgs/servers/dns/coredns/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index 10cc86e00fff..bb9ae3ced4d7 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -2,6 +2,7 @@ , stdenv , buildGoModule , fetchFromGitHub +, installShellFiles }: buildGoModule rec { @@ -17,6 +18,10 @@ buildGoModule rec { vendorSha256 = "sha256-nyMeKmGoypDrpZHYHGjhRnjgC3tbOX/dlj96pnXrdLE="; + nativeBuildInputs = [ installShellFiles ]; + + outputs = [ "out" "man" ]; + postPatch = '' substituteInPlace test/file_cname_proxy_test.go \ --replace "TestZoneExternalCNAMELookupWithProxy" \ @@ -29,6 +34,10 @@ buildGoModule rec { sed -E -i 's/\blo\b/lo0/' plugin/bind/setup_test.go ''; + postInstall = '' + installManPage man/* + ''; + meta = with lib; { homepage = "https://coredns.io"; description = "A DNS server that runs middleware"; From cbb000c6dba8369cf2cbb0ff368305b830c18e5a Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Sat, 17 Dec 2022 12:25:24 +0000 Subject: [PATCH 02/77] perlPackages.LaTeXML: 0.8.6 -> 0.8.7 --- pkgs/top-level/perl-packages.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 624eacbd26f1..3d59fd0b1eba 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12835,19 +12835,11 @@ let LaTeXML = buildPerlPackage rec { pname = "LaTeXML"; - version = "0.8.6"; + version = "0.8.7"; src = fetchurl { url = "mirror://cpan/authors/id/B/BR/BRMILLER/${pname}-${version}.tar.gz"; - hash = "sha256-lSnGUbZ/Xo3e8f0YUvl051ahe3EcRtQRjwZ3rQ5um7E="; + hash = "sha256-JdqdlEB3newNrdTMLUIn6Oq4dDfAcZh3J03PuQakzHk="; }; - patches = [ - (fetchpatch { - # https://github.com/brucemiller/LaTeXML/issues/1669 - name = "downgrade-security-FileTemp.patch"; - url = "https://github.com/brucemiller/LaTeXML/commit/c3d6b9b88f9eafce6eee52b1634ea33085ba9ec6.patch"; - hash = "sha256-p+boNhshvSZtygVZUawjeN38bJsfM95JrkLOBbazhos="; - }) - ]; outputs = [ "out" "tex" ]; propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageMagick ImageSize JSONXS LWP ParseRecDescent PodParser TextUnidecode XMLLibXSLT ]; nativeBuildInputs = [ pkgs.makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; From 45f1d701019d43b63299e8a0bb79055f6dfc190e Mon Sep 17 00:00:00 2001 From: psondej Date: Wed, 21 Dec 2022 16:03:55 +0100 Subject: [PATCH 03/77] pwndbg: 2022.08.30 -> 2022.12.19 --- .../development/tools/misc/pwndbg/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix index 023b759c32e2..ff94a8e3183a 100644 --- a/pkgs/development/tools/misc/pwndbg/default.nix +++ b/pkgs/development/tools/misc/pwndbg/default.nix @@ -8,38 +8,45 @@ let pythonPath = with python3.pkgs; makePythonPath [ + capstone future - isort psutil + pwntools pycparser pyelftools - python-ptrace - ropgadget - six - unicorn pygments + unicorn + rpyc ]; + binPath = lib.makeBinPath ([ + python3.pkgs.pwntools # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/wrappers/checksec.py#L8 + ] ++ lib.optionals stdenv.isLinux [ + python3.pkgs.ropper # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/commands/ropper.py#L30 + python3.pkgs.ROPGadget # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/commands/rop.py#L32 + ]); in stdenv.mkDerivation rec { pname = "pwndbg"; - version = "2022.08.30"; + version = "2022.12.19"; format = "other"; src = fetchFromGitHub { owner = "pwndbg"; repo = "pwndbg"; rev = version; - sha256 = "sha256-rMdpNJonzbHyTXbnr6MtlVUmfAfLiCHaVSzuQRhtVpE="; + sha256 = "sha256-pyY2bMasd6GaJZZjLF48SvkKUBw3XfVa0g3Q0LiEi4k="; + fetchSubmodules = true; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/share/pwndbg - cp -r *.py pwndbg $out/share/pwndbg + cp -r *.py pwndbg gdb-pt-dump $out/share/pwndbg chmod +x $out/share/pwndbg/gdbinit.py makeWrapper ${gdb}/bin/gdb $out/bin/pwndbg \ --add-flags "-q -x $out/share/pwndbg/gdbinit.py" \ + --prefix PATH : ${binPath} \ --set NIX_PYTHONPATH ${pythonPath} ''; @@ -48,8 +55,8 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/pwndbg/pwndbg"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ mic92 ]; - # never built on aarch64-darwin since first introduction in nixpkgs + maintainers = with maintainers; [ mic92 patryk4815 ]; + # not supported on aarch64-darwin see: https://inbox.sourceware.org/gdb/3185c3b8-8a91-4beb-a5d5-9db6afb93713@Spark/ broken = stdenv.isDarwin && stdenv.isAarch64; }; } From 72ea3c7f445dfbc8a8459dc8868721c1964efe6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Dec 2022 13:26:19 +0000 Subject: [PATCH 04/77] wiki-js: 2.5.294 -> 2.5.295 --- pkgs/servers/web-apps/wiki-js/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix index 2194883bba29..6df706e22b79 100644 --- a/pkgs/servers/web-apps/wiki-js/default.nix +++ b/pkgs/servers/web-apps/wiki-js/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wiki-js"; - version = "2.5.294"; + version = "2.5.295"; src = fetchurl { url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz"; - sha256 = "sha256-HHqXDmmTcWYRXF0GQf9QKEagYxyc1uvB7MPgLR3zALk="; + sha256 = "sha256-itiW9/QtNpc8cFS5skwlc3JSWoVqbBbIcSlEd+GRkH0="; }; sourceRoot = "."; From 865723cd53a5f8758e00d09dab76b636c2460976 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 2 Jan 2023 21:35:35 +0100 Subject: [PATCH 05/77] Revert "nixos/stage-1: fix `modprobe` in initial ramdisk on systems w/glibc-2.34" This reverts commit da905d4cf918e28f924bab99c6f2a4012d55410d. See the commit linked above for further information on why this was needed. Apparently this is not needed anymore because the need for LD_LIBRARY_PATH (which is needed for `modprobe(8)` to find `libpthread.so.0`) doesn't exist anymore. Since d33e52b2539c5b36a5a876df9006a7145efd42ea the library path of each binary in extra-utils is patched correctly. --- nixos/modules/system/boot/stage-1-init.sh | 3 +-- nixos/modules/system/boot/stage-1.nix | 20 -------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 4596c160a957..0158c6ef31f3 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -234,8 +234,7 @@ done mkdir -p /lib ln -s @modulesClosure@/lib/modules /lib/modules ln -s @modulesClosure@/lib/firmware /lib/firmware -# see comment in stage-1.nix for explanation -echo @extraUtils@/bin/modprobe-kernel > /proc/sys/kernel/modprobe +echo @extraUtils@/bin/modprobe > /proc/sys/kernel/modprobe for i in @kernelModules@; do info "loading module $(basename $i)..." modprobe $i diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 95dcdfd7fbe1..33a7be0b6896 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -150,26 +150,6 @@ let copy_bin_and_libs ${pkgs.kmod}/bin/kmod ln -sf kmod $out/bin/modprobe - # Dirty hack to make sure the kernel properly loads modules - # such as ext4 on demand (e.g. on a `mount(2)` syscall). This is necessary - # because `kmod` isn't linked against `libpthread.so.0` anymore (since - # it was merged into `libc.so.6` since version `2.34`), but still needs - # to access it for some reason. This is not an issue in stage-1 itself - # because of the `LD_LIBRARY_PATH`-variable and anytime later because the rpath of - # kmod/modprobe points to glibc's `$out/lib` where `libpthread.so.6` exists. - # However, this is a problem when the kernel calls `modprobe` inside - # the initial ramdisk because it doesn't know about the - # `LD_LIBRARY_PATH` and the rpath was nuked. - # - # Also, we can't use `makeWrapper` here because `kmod` only does - # `modprobe` functionality if `argv[0] == "modprobe"`. - cat >$out/bin/modprobe-kernel < Date: Wed, 23 Nov 2022 21:28:44 +0100 Subject: [PATCH 06/77] maintainers: add traxys --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1cb76efc7be3..fcc291d85440 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14305,6 +14305,12 @@ githubId = 52011418; name = "Travis Davis"; }; + traxys = { + email = "quentin+dev@familleboyer.net"; + github = "traxys"; + githubId = 5623227; + name = "Quentin Boyer"; + }; TredwellGit = { email = "tredwell@tutanota.com"; github = "TredwellGit"; From df5d6a371ae1488b55795645afd172c1a5281f7c Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 6 Jan 2023 10:13:56 +0100 Subject: [PATCH 07/77] grub2: apply security patches Fixes CVE-2021-3981, CVE-2021-3695, CVE-2021-3696, CVE-2021-3697, CVE-2022-28733, CVE-2022-28734, CVE-2022-28735, CVE-2022-28736, CVE-2022-28737, CVE-2022-2601 and CVE-2022-3775. https://lists.gnu.org/archive/html/grub-devel/2022-06/msg00035.html https://lists.gnu.org/archive/html/grub-devel/2022-11/msg00059.html --- pkgs/tools/misc/grub/2.0x.nix | 236 ++++++++++++++++++++++++++++++++++ 1 file changed, 236 insertions(+) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 58ed620ffd08..556b0672fa03 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -78,6 +78,242 @@ stdenv.mkDerivation rec { url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=000b5cd04fd228f9741f5dca0491636bc0b89eb8"; sha256 = "sha256-Mex3qQ0lW7ZCv7ZI7MSSqbylJXZ5RTbR4Pv1+CJ0ciM="; }) + (fetchpatch { + name = "CVE-2021-3981.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=0adec29674561034771c13e446069b41ef41e4d4"; + sha256 = "sha256-3vkvWjcSv0hyY2EX3ig2EXEe+XLiRsXYlcd5kpY4wXw="; + }) + # June 2022 security patches + # https://lists.gnu.org/archive/html/grub-devel/2022-06/msg00035.html + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.1.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1469983ebb9674753ad333d37087fb8cb20e1dce"; + sha256 = "sha256-oB4S0jvIXsDPcjIz1E2LKm7gwdvZjywuI1j0P6JQdJg="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.2.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=14ceb3b3ff6db664649138442b6562c114dcf56e"; + sha256 = "sha256-mKe8gzd0U4PbV8z3TWCdvv7UugEgYaVIkB4dyMrSGEE="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.3.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=04c86e0bb7b58fc2f913f798cdb18934933e532d"; + sha256 = "sha256-sA+PTlk4hwYOVKRZBHkEskabzmsf47Hi4h3mzWOFjwM="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.4.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=6fe755c5c07bb386fda58306bfd19e4a1c974c53"; + sha256 = "sha256-8zmFocUfnjSyhYitUFDHoilHDnm1NJmhcKwO9dueV3k="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.5.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=f1ce0e15e70ea1aafcfa26ad93e7585f65783c6f"; + sha256 = "sha256-Wrlam6CRPUAHbKqe/X1YLcRxJ2LQTtmQ/Y66gxUlqK4="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.6.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=5bff31cdb6b93d738f850834e6291df1d0b136fa"; + sha256 = "sha256-ReLWSePXjRweymsVAL/uoBgYMWt9vRDcY3iXlDNZT0w="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.7.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=347880a13c239b4c2811c94c9a7cf78b607332e3"; + sha256 = "sha256-07hpHuJFw95xGoJ/6ej7i6HlCFb2QRxP3arvRjKW4uU="; + }) + ## Needed to apply patch 8 + (fetchpatch { + name = "video-remove-trailing-whitespaces.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1f48917d8ddb490dcdc70176e0f58136b7f7811a"; + sha256 = "sha256-/yf/LGpwYcQ36KITzmiFfg4BvhcApKbrlFzjKK8V2kI="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.8.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=e623866d9286410156e8b9d2c82d6253a1b22d08"; + sha256 = "sha256-zFxP6JY5Q9s3yJHdkbZ2w+dXFKeOCXjFnQKadB5HLCg="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.9.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=210245129c932dc9e1c2748d9d35524fb95b5042"; + sha256 = "sha256-FyZhdTlcRVmn7X2hv93RhWP7NOoEMb7ib/DWveyz3Ew="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.10.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=690bee69fae6b4bd911293d6b7e56774e29fdf64"; + sha256 = "sha256-nOAXxebCW/s5M6sjPKdSdx47/PcH1lc0yYT0flVwoC8="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.11.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=d5caac8ab79d068ad9a41030c772d03a4d4fbd7b"; + sha256 = "sha256-9fGJJkgZ6+E01MJqVTR1qFITx9EAx41Hv9QNfdqBgu0="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.12.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=768ef2199e0265cf455b154f1a80a612f02274c8"; + sha256 = "sha256-2/JJJux5vqXUc77bi3aXRy8NclbvyD/0e6UN8/6Ui3c="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.13.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=166a4d61448f74745afe1dac2f2cfb85d04909bf"; + sha256 = "sha256-XxTZ8P8qr4qEXELdHwaRACPeIZ/iixlATLB5RvVQsC8="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.14.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=22a3f97d39f6a10b08ad7fd1cc47c4dcd10413f6"; + sha256 = "sha256-bzB2gmGvWR2ylvMw779KQ/VHBBMsDNbG96eg9qQlljA="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.15.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=830a9628b2c9e1b6388af624aaf4a80818ed6be0"; + sha256 = "sha256-8fna2VbbUw8zBx77osaOOHlZFgRrHqwQK87RoUtCF6w="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.16.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=3e4817538de828319ba6d59ced2fbb9b5ca13287"; + sha256 = "sha256-iCZAyRS/a15x5aJCJBYl9nw6Hc3WRCUG7zF5V+OwDKg="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.17.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=f407e34f3871a4c402bbd516e7c28ea193cef1b7"; + sha256 = "sha256-S45cLZNTWapAodKudUz2fMjnPsW6vbtNz0bIvIBGmu4="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.18.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=c1b7eef9fa4aaefbf7d0507505c3bb2914e1ad6b"; + sha256 = "sha256-TWPfEAOePwC77yiVdsTSZIjfsMp7+0XabCz9K3FlV7w="; + }) + ## Needed to apply patch 19 + (fetchpatch { + name = "net-remove-trailing-whitespaces.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=e453a4a64392a41bc7b37f890aceb358112d1687"; + sha256 = "sha256-JCbUB77Y6js5u99uJ9StDxNjjahNy4nO3crK8/GvmPY="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.19.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=96abf4fb9d829f4a405d5df39bc74bbccbd0e322"; + sha256 = "sha256-6E2MKO5kauFA1TA8YkUgIUusniwHS2Sr44A/a7ZqDCo="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.20.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=ee9652031491326736714a988fbbaeab8ef9255c"; + sha256 = "sha256-E21q+Mj+JBQlUW0pe4zbaoL3ErXmCanyizwAsRYYZHk="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.21.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=8f287c3e13da2bf82049e2e464eca7ca4fef0a85"; + sha256 = "sha256-dZ24RwYsHeUrMuiU7PDgPcw+iK9cOd6q+E0xWXbtTkE="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.22.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=dad94fffe14be476df5f34a8e5a90ea62a41fe12"; + sha256 = "sha256-06TyTEvSy19dsnXZZoKBGx7ymJVWogr0NorzLflEwY4="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.23.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=ec6bfd3237394c1c7dbf2fd73417173318d22f4b"; + sha256 = "sha256-NryxSekO8oSxsnv5G9mFZExm4Pwfc778mslyUDuDhlM="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.24.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=b26b4c08e7119281ff30d0fb4a6169bd2afa8fe4"; + sha256 = "sha256-fSH3cxl/76DwkE8dHSR9uao9Vf1sJrhz7SmUSgDNodI="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.25.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=4bd9877f62166b7e369773ab92fe24a39f6515f8"; + sha256 = "sha256-VMtR/sF8F1BMKmJ06ZZEPNH/+l0RySy/E6lVWdCyFKE="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.26.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=deae293f399dde3773cf37dfa9b77ca7e04ef772"; + sha256 = "sha256-sCC3KE9adavw7jHMTVlxtyuwDFCPRDqT24H3AKUYf68="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.27.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=e40b83335bb33d9a2d1c06cc269875b3b3d6c539"; + sha256 = "sha256-cviCfBkzacAtnHGW87RLshhduE4Ym/v2Vq4h/sZDmZg="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.28.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=11e1cffb7e2492ddac4ab8d19ce466783adbb957"; + sha256 = "sha256-I1feoneVeU3XkscKfVprWWJfLUnrc5oauMXYDyDxo5M="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.29.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=13dce204cf6f3f0f49c9949971052a4c9657c0c0"; + sha256 = "sha256-DzFHxgR9A8FNZ/y9OMeBvTp1K6J5ePyL06dhHQmk7Ik="; + }) + (fetchpatch { + name = "CVE-2021-3695.CVE-2021-3696.CVE-2021-3697.CVE-2022-28733.CVE-2022-28734.CVE-2022-28735.CVE-2022-28736.CVE-2022-28737.30.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=2f4430cc0a44fd8c8aa7aee5c51887667ad3d6c3"; + sha256 = "sha256-AufP/10/auO4NMjYQ7yPDDbYShwGaktyQtqJx2Jasz8="; + }) + # October 2022 security patches + # https://lists.gnu.org/archive/html/grub-devel/2022-11/msg00059.html + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.1.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=f6b6236077f059e64ee315f2d7acb8fa4eda87c5"; + sha256 = "sha256-pk02iVf/u6CdsVjl8HaFBh0Bt473ZQzz5zBp9SoBLtE="; + }) + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.2.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=9c76ec09ae08155df27cd237eaea150b4f02f532"; + sha256 = "sha256-axbEOH5WFkUroGna2XY1f2kq7+B1Cs6LiubIA2EBdiM="; + }) + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.3.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=768e1ef2fc159f6e14e7246e4be09363708ac39e"; + sha256 = "sha256-aKDUVS/Yx1c87NCrt4EG8BlSpkHijUyAJIwbmtzNjD8="; + }) + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.4.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=c51292274ded3259eb04c2f1c8d253ffbdb5216a"; + sha256 = "sha256-OLNOKuAJuHy2MBMnU2xcYM7AaxmDk9fchXhggoDrxJU="; + }) + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.5.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=23843fe8947e4da955a05ad3d1858725bfcb56c8"; + sha256 = "sha256-ptn00nqVJlEb1c6HhoMy9nrBuctH077LM4yXKsK47gc="; + }) + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.6.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=b9396daf1c2e3cdc0a1e69b056852e0769fb24de"; + sha256 = "sha256-K7XNneDZjLpZh/C908+5uYsB/0oIdgQqmk0yJrdQLG4="; + }) + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.7.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1d2015598cc7a9fca4b39186273e3519a88e80c7"; + sha256 = "sha256-s4pZtszH4b/0u85rpzVapZmNQdYEq/wW06SQ3PW/1aU="; + }) + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.8.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=93a786a00163e50c29f0394df198518617e1c9a5"; + sha256 = "sha256-R8x557RMAxJ0ZV2jb6zDmwOPVlk6875q37fNpqKsPT0="; + }) + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.9.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1eac01c147b4d85d2ec4a7e5671fa4345f2e8549"; + sha256 = "sha256-eOnhmU3pT5cCVnNHcY/BzDjldfs7yh/OGsxa15tGv94="; + }) + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.10.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=992c06191babc1e109caf40d6a07ec6fdef427af"; + sha256 = "sha256-kezNKPcLmFXwyZbXtJbaPTIbE8tijmHIzdC2jsKwrNk="; + }) + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.11.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=9d81f71c6b8f55cf20cd56f5fe29c759df9b48cc"; + sha256 = "sha256-jnniVGy4KvFGFmcOP2YLA46k3cK8vwoByo19ismVUzE="; + }) + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.12.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=22b77b87e10a3a6c9bb9885415bc9a9c678378e6"; + sha256 = "sha256-iYTEqN5997I7MVIg82jt/bbEAYhcgq8fNRCNPpY9ze0="; + }) + (fetchpatch { + name = "CVE-2022-2601.CVE-2022-3775.13.patch"; + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1514678888595ef41a968a0c69b7ff769edd1e9c"; + sha256 = "sha256-tgAEoAtaNKJjscjMFkXXiVn59Pa4c+NiQ3iVW6CMrpo="; + }) ]; postPatch = if kbdcompSupport then '' From a429cecd3c23d11cdbdfcd70624d03dd5b8beb69 Mon Sep 17 00:00:00 2001 From: amesgen Date: Sat, 7 Jan 2023 15:50:36 +0100 Subject: [PATCH 08/77] nixos/gitea: don't run gitea-dump on activation --- nixos/modules/services/misc/gitea.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index ceb4c1172854..7663a7f345db 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -630,7 +630,6 @@ in systemd.services.gitea-dump = mkIf cfg.dump.enable { description = "gitea dump"; after = [ "gitea.service" ]; - wantedBy = [ "default.target" ]; path = [ gitea ]; environment = { From d54a3d5bff82b1d566eadb2ee7d3539299ab967d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 01:41:29 +0000 Subject: [PATCH 09/77] snappymail: 2.24.3 -> 2.24.4 --- pkgs/servers/snappymail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index 73ff59138f1e..cefb95961182 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.24.3"; + version = "2.24.4"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-PE27kaxpyHJxqNYnxixCeHkoPPyJBpF2LtgACb97Ojg="; + sha256 = "sha256-0DghGsP8CfFfLqBOlHkhHoOSXrQizNrFMpbPMLHsWzA="; }; sourceRoot = "snappymail"; From e0d77b1e3c2a8a27de60f0aa6061c99a4ceb6dd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Wed, 4 Jan 2023 12:31:35 +0900 Subject: [PATCH 10/77] luaPackages.vicious: 2.5.1 -> 2.6.0 --- pkgs/top-level/lua-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 5ea0e298f0a6..ecb022e715d5 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -140,13 +140,13 @@ rec { vicious = callPackage ({ fetchFromGitHub }: stdenv.mkDerivation rec { pname = "vicious"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "vicious-widgets"; repo = "vicious"; rev = "v${version}"; - sha256 = "sha256-geu/g/dFAVxtY1BuJYpZoVtFS/oL66NFnqiLAnJELtI="; + sha256 = "sha256-VlJ2hNou2+t7eSyHmFkC2xJ92OH/uJ/ewYHkFLQjUPQ="; }; buildInputs = [ lua ]; @@ -160,6 +160,7 @@ rec { meta = with lib; { description = "A modular widget library for the awesome window manager"; homepage = "https://vicious.rtfd.io"; + changelog = "https://vicious.rtfd.io/en/v${version}/changelog.html"; license = licenses.gpl2Plus; maintainers = with maintainers; [ makefu mic92 McSinyx ]; platforms = platforms.linux; From 309ed272be60962e4465ae7b8cd2bb5cb1bc4bee Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 10 Jan 2023 18:45:34 +0200 Subject: [PATCH 11/77] nixosTests.installer: bump memorySize Without it the tests sometimes fail because the OOM killer is triggered. https://hydra.nixos.org/build/204713462 --- nixos/tests/installer.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 398ad8de19cf..300f66027899 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -291,7 +291,7 @@ let # builds stuff in the VM, needs more juice virtualisation.diskSize = 8 * 1024; virtualisation.cores = 8; - virtualisation.memorySize = 1536; + virtualisation.memorySize = 2047; boot.initrd.systemd.enable = systemdStage1; From e13660c50c1f8e76158dff19602206a67806db04 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 10 Jan 2023 18:06:09 +0000 Subject: [PATCH 12/77] resholve: remove openssl from python27 --- pkgs/development/misc/resholve/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/misc/resholve/default.nix b/pkgs/development/misc/resholve/default.nix index f2db31c351ad..b90a65c06ed1 100644 --- a/pkgs/development/misc/resholve/default.nix +++ b/pkgs/development/misc/resholve/default.nix @@ -16,6 +16,7 @@ let self = python27'; pkgsBuildHost = pkgsBuildHost // { python27 = python27'; }; # strip down that python version as much as possible + openssl = null; bzip2 = null; readline = null; ncurses = null; From ad8005ba0878d3a13e88309ae2fceb832d887b73 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jan 2023 08:31:24 +0000 Subject: [PATCH 13/77] hwatch: 0.3.7 -> 0.3.9 --- pkgs/tools/misc/hwatch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/hwatch/default.nix b/pkgs/tools/misc/hwatch/default.nix index 512603bd3286..6e667a87fd07 100644 --- a/pkgs/tools/misc/hwatch/default.nix +++ b/pkgs/tools/misc/hwatch/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hwatch"; - version = "0.3.7"; + version = "0.3.9"; src = fetchFromGitHub { owner = "blacknon"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-FVqvwqsHkV/yK5okL1p6TiNUGDK2ZnzVNO4UDVkG+zM="; + sha256 = "sha256-O+qKVRPDn7y8JEAF75P6suH4hOfPLjWSNTDGX2V5z3w="; }; - cargoSha256 = "sha256-E4qh2cfpVNUa9OyJowSsaHU7pYiNu7IpxwISP0djVRA="; + cargoHash = "sha256-Bzg9EfVVSTKVb4nUfJ0Bygd5dRUutk+5MxojYjcJs0M="; nativeBuildInputs = [ installShellFiles ]; From ddd8303c56d4a75371d6503fc6895811c50ce5f3 Mon Sep 17 00:00:00 2001 From: SubhrajyotiSen Date: Fri, 13 Jan 2023 23:57:45 +0530 Subject: [PATCH 14/77] maestro: 1.18.5 -> 1.19.0 --- pkgs/development/mobile/maestro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/maestro/default.nix b/pkgs/development/mobile/maestro/default.nix index 514b5a0e8395..847789db5e47 100644 --- a/pkgs/development/mobile/maestro/default.nix +++ b/pkgs/development/mobile/maestro/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "maestro"; - version = "1.18.5"; + version = "1.19.0"; src = fetchurl { url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip"; - sha256 = "1wmcvkhhb9ksy35dpp7qa6vk4726pblza869xjx56qmadd6nrrax"; + sha256 = "1q5yz2lw3g3y11k9wgq8k5ghxmdp7c2qrz0as7r175rbmvxlf4xn"; }; dontUnpack = true; From 140cf1a9da60274baa66e55be1fb45ceda3907c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 05:33:37 +0000 Subject: [PATCH 15/77] calico-pod2daemon: 3.24.5 -> 3.25.0 --- pkgs/applications/networking/cluster/calico/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix index 192899ff1b22..d86af2177f87 100644 --- a/pkgs/applications/networking/cluster/calico/default.nix +++ b/pkgs/applications/networking/cluster/calico/default.nix @@ -2,16 +2,16 @@ builtins.mapAttrs (pname: { doCheck ? true, mainProgram ? pname, subPackages }: buildGoModule rec { inherit pname; - version = "3.24.5"; + version = "3.25.0"; src = fetchFromGitHub { owner = "projectcalico"; repo = "calico"; rev = "v${version}"; - hash = "sha256-fB9FHiIqVieVkPfHmBvcaUmUqkT1ZbDT26+DUE9lbdc="; + hash = "sha256-sD79WiGKfwjtoiYlLow4h58skbHpuZyzMQ0VOyBKRnk="; }; - vendorHash = "sha256-ogQ/REf5cngoGAFIBN++txew6UqOw1hqCVsixyuGtug="; + vendorHash = "sha256-p4Ve6qWnYyHUUyKmLfbaZIGGfleLuzz+MZgGRSsBoWM="; inherit doCheck subPackages; From bfa15b30c8cdc568355ad3c8e1208413debbd5aa Mon Sep 17 00:00:00 2001 From: traxys Date: Wed, 23 Nov 2022 21:30:40 +0100 Subject: [PATCH 16/77] oscclip: init at 0.4.1 --- pkgs/tools/misc/oscclip/default.nix | 34 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/misc/oscclip/default.nix diff --git a/pkgs/tools/misc/oscclip/default.nix b/pkgs/tools/misc/oscclip/default.nix new file mode 100644 index 000000000000..a22490633d8f --- /dev/null +++ b/pkgs/tools/misc/oscclip/default.nix @@ -0,0 +1,34 @@ +{ fetchFromGitHub +, python3Packages +, stdenv +, writeText +, lib +}: + +python3Packages.buildPythonApplication rec { + pname = "oscclip"; + version = "0.4.1"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "rumpelsepp"; + repo = "oscclip"; + rev = "v${version}"; + sha256 = "sha256-WQvZn+SWamEqEXPutIZVDZTIczybtHUG9QsN8XxUeg8="; + }; + + nativeBuildInputs = with python3Packages; [ poetry-core ]; + + meta = with lib; { + description = "A program that allows to copy/paste from a terminal using osc-52 control sequences."; + longDescription = '' + oscclip provides two commands: osc-copy and osc-paste. These commands allow to interact with the clipboard through the terminal directly. + This means that they work through ssh sessions for example (given that the terminal supports osc-52 sequences). + ''; + homepage = "https://github.com/rumpelsepp/oscclip"; + + license = licenses.gpl3Only; + maintainers = [ maintainers.traxys ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d26ccb74c05..e2f256607169 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10303,6 +10303,8 @@ with pkgs; operator-sdk = callPackage ../development/tools/operator-sdk { }; + oscclip = callPackage ../tools/misc/oscclip { }; + owncast = callPackage ../servers/owncast { }; update-dotdee = with python3Packages; toPythonApplication update-dotdee; From e484da35a5b579c232e235a652d9055c142d7e0a Mon Sep 17 00:00:00 2001 From: "M. A" Date: Sat, 14 Jan 2023 14:09:03 +0000 Subject: [PATCH 17/77] gitlab-runner: 15.7.1 -> 15.7.2 https://gitlab.com/gitlab-org/gitlab-runner/-/commit/181f788ed717327628f80cf34aec71980d4b1643 --- .../tools/continuous-integration/gitlab-runner/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 6d9563f32218..a4e319020b69 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "15.7.1"; + version = "15.7.2"; in buildGoModule rec { inherit version; @@ -17,13 +17,13 @@ buildGoModule rec { # For patchShebangs buildInputs = [ bash ]; - vendorSha256 = "sha256-GyhDns10eekU05D7SGbhYYlpK3OIajtUXXOcWgprBPc="; + vendorSha256 = "sha256-lZAESAJ7ZRjHW6MD/xm3rOczK0h8EfmRAAVxRbVLu/k="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-YHqezwud+/osCiqeR3QUvANFRU/oR451act+Crh4CRE="; + sha256 = "sha256-NiBQQ36F8aYi1Uk3P0UgBy4Pai6Coz3oQDvWWOGGQNw="; }; patches = [ From ba5e8f283539ca31643a576d650ffdab366dfacc Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Sat, 14 Jan 2023 14:38:32 -0600 Subject: [PATCH 18/77] resholve: track missed upstream Nix fix Forgot to port this resholve Nix API fix in the course of #184292. Same change as: github.com/abathur/resholve/commit/b743d2eb12d82e35c567733a7a884174e3606641 --- pkgs/development/misc/resholve/resholve-utils.nix | 2 ++ pkgs/development/misc/resholve/test.nix | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/pkgs/development/misc/resholve/resholve-utils.nix b/pkgs/development/misc/resholve/resholve-utils.nix index 26bf492d23ab..a3bc159b957a 100644 --- a/pkgs/development/misc/resholve/resholve-utils.nix +++ b/pkgs/development/misc/resholve/resholve-utils.nix @@ -129,6 +129,7 @@ rec { ) ) )} + '' + lib.optionalString (partialSolution.interpreter != "none") '' ${partialSolution.interpreter} -n $out ''; }; @@ -146,6 +147,7 @@ rec { ) ) } + '' + lib.optionalString (partialSolution.interpreter != "none") '' ${partialSolution.interpreter} -n $out/bin/${name} ''; }; diff --git a/pkgs/development/misc/resholve/test.nix b/pkgs/development/misc/resholve/test.nix index 2b8a3ec3d296..4d029622e8ac 100644 --- a/pkgs/development/misc/resholve/test.nix +++ b/pkgs/development/misc/resholve/test.nix @@ -179,4 +179,11 @@ rec { echo "Hello" file . ''; + resholvedScriptBinNone = resholve.writeScriptBin "resholved-script-bin" { + inputs = [ file ]; + interpreter = "none"; + } '' + echo "Hello" + file . + ''; } From 8175da9fba7b4bc1604a0920f0fc46f21934497c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 21:28:51 +0000 Subject: [PATCH 19/77] dmarc-metrics-exporter: 0.8.0 -> 0.9.0 --- .../prometheus/dmarc-metrics-exporter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix index 47c43917ec6c..9e622b69d89e 100644 --- a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "dmarc-metrics-exporter"; - version = "0.8.0"; + version = "0.9.0"; disabled = python3.pythonOlder "3.7"; @@ -14,8 +14,8 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "jgosmann"; repo = "dmarc-metrics-exporter"; - rev = "v${version}"; - hash = "sha256-uZCPEUoWNrcSz5qV24eFdZOOxKkoz+Qn6HpELBwOK2I="; + rev = "refs/tags/v${version}"; + hash = "sha256-OUeTOnb9ZhdJWzO+Wzl+liv4u3mlbyJ4tWyCHU5loqc="; }; pythonRelaxDeps = true; From 2c56763b587643ac2a08e2b91147e44d80ccd7c2 Mon Sep 17 00:00:00 2001 From: Joel Koen Date: Sun, 15 Jan 2023 14:14:19 +1000 Subject: [PATCH 20/77] maintainers: jyooru -> joelkoen --- maintainers/maintainer-list.nix | 12 ++++++------ pkgs/development/python-modules/rich-rst/default.nix | 2 +- pkgs/development/python-modules/rich/default.nix | 2 +- pkgs/development/python-modules/textual/default.nix | 2 +- .../python-modules/whatthepatch/default.nix | 2 +- pkgs/games/minecraft-servers/derivation.nix | 2 +- pkgs/games/purpur/default.nix | 2 +- pkgs/misc/rich-cli/default.nix | 2 +- pkgs/tools/misc/apkeep/default.nix | 2 +- pkgs/tools/misc/melody/default.nix | 2 +- pkgs/tools/misc/octofetch/default.nix | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 96886f8735b3..17add75c24b8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6876,6 +6876,12 @@ githubId = 310981; name = "Joel Burget"; }; + joelkoen = { + email = "mail@joelkoen.com"; + github = "joelkoen"; + githubId = 122502655; + name = "Joel Koen"; + }; joelmo = { email = "joel.moberg@gmail.com"; github = "joelmo"; @@ -7266,12 +7272,6 @@ githubId = 20658981; name = "Jarosław Wygoda"; }; - jyooru = { - email = "joel@joel.tokyo"; - github = "jyooru"; - githubId = 63786778; - name = "Joel"; - }; jyp = { email = "jeanphilippe.bernardy@gmail.com"; github = "jyp"; diff --git a/pkgs/development/python-modules/rich-rst/default.nix b/pkgs/development/python-modules/rich-rst/default.nix index f15e565bd043..f278db19a287 100644 --- a/pkgs/development/python-modules/rich-rst/default.nix +++ b/pkgs/development/python-modules/rich-rst/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "A beautiful reStructuredText renderer for rich"; homepage = "https://github.com/wasi-master/rich-rst"; license = licenses.mit; - maintainers = with maintainers; [ jyooru ]; + maintainers = with maintainers; [ joelkoen ]; }; } diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index a760ed03dfde..75943ac53783 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal"; homepage = "https://github.com/Textualize/rich"; license = licenses.mit; - maintainers = with maintainers; [ ris jyooru ]; + maintainers = with maintainers; [ ris joelkoen ]; }; } diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 4afe9220fa15..856ec4e652e2 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -67,6 +67,6 @@ buildPythonPackage rec { description = "TUI framework for Python inspired by modern web development"; homepage = "https://github.com/Textualize/textual"; license = licenses.mit; - maintainers = with maintainers; [ jyooru ]; + maintainers = with maintainers; [ joelkoen ]; }; } diff --git a/pkgs/development/python-modules/whatthepatch/default.nix b/pkgs/development/python-modules/whatthepatch/default.nix index 5c6d0114d034..12ffa8ebeada 100644 --- a/pkgs/development/python-modules/whatthepatch/default.nix +++ b/pkgs/development/python-modules/whatthepatch/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Python library for both parsing and applying patch files"; homepage = "https://github.com/cscorley/whatthepatch"; license = licenses.mit; - maintainers = with maintainers; [ jyooru ]; + maintainers = with maintainers; [ joelkoen ]; }; } diff --git a/pkgs/games/minecraft-servers/derivation.nix b/pkgs/games/minecraft-servers/derivation.nix index e5f11f71f211..0773be6bcfc7 100644 --- a/pkgs/games/minecraft-servers/derivation.nix +++ b/pkgs/games/minecraft-servers/derivation.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfreeRedistributable; platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice tomberek costrouc jyooru ]; + maintainers = with maintainers; [ thoughtpolice tomberek costrouc joelkoen ]; }; } diff --git a/pkgs/games/purpur/default.nix b/pkgs/games/purpur/default.nix index 91db55f2a9fd..33ec936dc63d 100644 --- a/pkgs/games/purpur/default.nix +++ b/pkgs/games/purpur/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ jyooru ]; + maintainers = with maintainers; [ joelkoen ]; mainProgram = "minecraft-server"; }; } diff --git a/pkgs/misc/rich-cli/default.nix b/pkgs/misc/rich-cli/default.nix index 86e7e3048e74..de4bee278c79 100644 --- a/pkgs/misc/rich-cli/default.nix +++ b/pkgs/misc/rich-cli/default.nix @@ -41,6 +41,6 @@ python3.pkgs.buildPythonApplication rec { description = "Command Line Interface to Rich"; homepage = "https://github.com/Textualize/rich-cli"; license = licenses.mit; - maintainers = with maintainers; [ jyooru ]; + maintainers = with maintainers; [ joelkoen ]; }; } diff --git a/pkgs/tools/misc/apkeep/default.nix b/pkgs/tools/misc/apkeep/default.nix index c1bca0969077..6cce77d1d849 100644 --- a/pkgs/tools/misc/apkeep/default.nix +++ b/pkgs/tools/misc/apkeep/default.nix @@ -37,6 +37,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/EFForg/apkeep"; changelog = "https://github.com/EFForg/apkeep/blob/${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ jyooru ]; + maintainers = with maintainers; [ joelkoen ]; }; } diff --git a/pkgs/tools/misc/melody/default.nix b/pkgs/tools/misc/melody/default.nix index 99b6ec2fc6b6..4633d66eebf4 100644 --- a/pkgs/tools/misc/melody/default.nix +++ b/pkgs/tools/misc/melody/default.nix @@ -16,6 +16,6 @@ rustPlatform.buildRustPackage rec { description = "Language that compiles to regular expressions"; homepage = "https://github.com/yoav-lavi/melody"; license = licenses.mit; - maintainers = with maintainers; [ jyooru ]; + maintainers = with maintainers; [ joelkoen ]; }; } diff --git a/pkgs/tools/misc/octofetch/default.nix b/pkgs/tools/misc/octofetch/default.nix index 3d2d2919aa56..634120d539cc 100644 --- a/pkgs/tools/misc/octofetch/default.nix +++ b/pkgs/tools/misc/octofetch/default.nix @@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/azur1s/octofetch"; description = "Github user information on terminal"; license = licenses.mit; - maintainers = with maintainers; [ jyooru ]; + maintainers = with maintainers; [ joelkoen ]; }; } From bfd2f2d909c2194e8ac5775425762ca4d90ca52d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 05:53:47 +0000 Subject: [PATCH 21/77] doh-proxy-rust: 0.9.6 -> 0.9.7 --- pkgs/servers/dns/doh-proxy-rust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dns/doh-proxy-rust/default.nix b/pkgs/servers/dns/doh-proxy-rust/default.nix index 59c8bd5fe8dd..d4e61ee045e8 100644 --- a/pkgs/servers/dns/doh-proxy-rust/default.nix +++ b/pkgs/servers/dns/doh-proxy-rust/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "doh-proxy-rust"; - version = "0.9.6"; + version = "0.9.7"; src = fetchCrate { inherit version; crateName = "doh-proxy"; - sha256 = "sha256-7eKqCiafzmwk0suH8GviRVBmmvhBd5/R4aF9cSvSyNU="; + sha256 = "sha256-rcLI5sLdqelnpfU7/T0s0l3rtpYBd77BBAXc4xSmCCE="; }; - cargoHash = "sha256-+IlVjordlMgf8srXtQVLMXRbYs+4htDP+NToVXxPqR4="; + cargoHash = "sha256-zkZuyegz82xOBq2t0jkMo6SLLteOHuhrFcROZCQeiyk="; buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; From dc94a2ed37e1d13a1e24a26d4d7d752499daad6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 08:18:06 +0000 Subject: [PATCH 22/77] macchina: 6.1.7 -> 6.1.8 --- pkgs/tools/misc/macchina/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/macchina/default.nix b/pkgs/tools/misc/macchina/default.nix index 646cac461fd7..76d17ea02ef9 100644 --- a/pkgs/tools/misc/macchina/default.nix +++ b/pkgs/tools/misc/macchina/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "macchina"; - version = "6.1.7"; + version = "6.1.8"; src = fetchFromGitHub { owner = "Macchina-CLI"; repo = pname; rev = "v${version}"; - hash = "sha256-zbQOmlFWpoQwf4rlDLn1V0vj1c66pVWrMROGANRDl9s="; + hash = "sha256-MntHq5nphfjbO0Rx7v6WjsnabSMH5Ke3aR9/embG/rk="; }; - cargoHash = "sha256-BYUGtaMG/fvQHYJgeSQcW+ZJOrm3N9g6m0c5TX9psJU="; + cargoHash = "sha256-w8WIpT8rUe7olB5kdpDyrId6D698AhcqzsfpOlutaHQ="; nativeBuildInputs = [ installShellFiles From 13147116e7f93ac3d48f09de019b74cc5382d1f5 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 15 Jan 2023 09:28:34 +0100 Subject: [PATCH 23/77] tagparser: 11.5.0 -> 11.5.1 Signed-off-by: Matthias Beyer --- pkgs/development/libraries/tagparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tagparser/default.nix b/pkgs/development/libraries/tagparser/default.nix index 06f316522217..8eb57c5441f1 100644 --- a/pkgs/development/libraries/tagparser/default.nix +++ b/pkgs/development/libraries/tagparser/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "tagparser"; - version = "11.5.0"; + version = "11.5.1"; src = fetchFromGitHub { owner = "Martchus"; repo = "tagparser"; rev = "v${version}"; - hash = "sha256-qgopl32cFQFQTYu9WBOzPeU69J8K49SREX7X0Pw7Als="; + hash = "sha256-6HvPbbDsHIYyTs0M5M8TkgqyAz0QtgRjuNJhYWFjNG4="; }; nativeBuildInputs = [ cmake ]; From 75d11aa291feb992b5114a40c0a34050b8fc3bc9 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 15 Jan 2023 09:41:22 +0100 Subject: [PATCH 24/77] smenu: 1.1.0 -> 1.2.0 Signed-off-by: Matthias Beyer --- pkgs/tools/misc/smenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index 6992158e73c9..0c8b73310602 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "1.1.0"; + version = "1.2.0"; pname = "smenu"; src = fetchFromGitHub { owner = "p-gen"; repo = "smenu"; rev = "v${version}"; - sha256 = "sha256-qzlBgGPzQ3lnTBKVzQ8ZN3fwOcPgeT+GSUWXray4EYw="; + sha256 = "sha256-DfND2lIHQc+7+8lM86MMOdFKhbUAOnSlkpLwxo10EI4="; }; buildInputs = [ ncurses ]; From f6e4fe96f4b2f8c4b7fb2b0a46290cf4e4e10860 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 14 Jan 2023 12:44:04 +0100 Subject: [PATCH 25/77] dtv-scan-tables: set PREFIX=$out, put files in `/share/dvbv5/..` This changes the output directory layout: Channel files are placed in `$out/share/dvbv5/dvb-xyz` instead of `$out/dvbv5/dvb-xyz`. This is closer to the layout common for other packages and facilitates merging packages with `buildEnv`. The only depender `tvheadend` is updated accordingly. --- pkgs/data/misc/dtv-scan-tables/default.nix | 4 ++-- pkgs/servers/tvheadend/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/dtv-scan-tables/default.nix b/pkgs/data/misc/dtv-scan-tables/default.nix index 741823871f4a..1761f36c36c2 100644 --- a/pkgs/data/misc/dtv-scan-tables/default.nix +++ b/pkgs/data/misc/dtv-scan-tables/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { v4l-utils ]; - installFlags = [ - "DATADIR=$(out)" + makeFlags = [ + "PREFIX=$(out)" ]; meta = with lib; { diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 72945ffaedbb..833d31de4013 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -105,7 +105,7 @@ in stdenv.mkDerivation { --replace /usr/bin/tar ${gnutar}/bin/tar substituteInPlace src/input/mpegts/scanfile.c \ - --replace /usr/share/dvb ${dtv-scan-tables}/dvbv5 + --replace /usr/share/dvb ${dtv-scan-tables}/share/dvbv5 # the version detection script `support/version` reads this file if it # exists, so let's just use that From 4e1a99790c3a7d59d7d96cf7daefab1f609f8acd Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 14 Jan 2023 13:03:34 +0100 Subject: [PATCH 26/77] dtv-scan-tables: check for spurious references in build result This package is pure data, so it must not have any runtime dependencies. --- pkgs/data/misc/dtv-scan-tables/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/data/misc/dtv-scan-tables/default.nix b/pkgs/data/misc/dtv-scan-tables/default.nix index 1761f36c36c2..4cbf43c144b2 100644 --- a/pkgs/data/misc/dtv-scan-tables/default.nix +++ b/pkgs/data/misc/dtv-scan-tables/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" ]; + allowedReferences = [ ]; + meta = with lib; { description = "Digital TV scan tables"; homepage = "https://github.com/tvheadend/dtv-scan-tables"; From b8714f08a47abf6163955a5e218d896161bfe774 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 14 Jan 2023 13:17:04 +0100 Subject: [PATCH 27/77] dtv-scan-tables: update/extend meta descriptions * `description`: add some keywords that help users in need of transponder tables to find this package. * `longDescription`: add --- pkgs/data/misc/dtv-scan-tables/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/data/misc/dtv-scan-tables/default.nix b/pkgs/data/misc/dtv-scan-tables/default.nix index 4cbf43c144b2..0c53436f8e5f 100644 --- a/pkgs/data/misc/dtv-scan-tables/default.nix +++ b/pkgs/data/misc/dtv-scan-tables/default.nix @@ -26,9 +26,20 @@ stdenv.mkDerivation rec { allowedReferences = [ ]; meta = with lib; { - description = "Digital TV scan tables"; + description = "Digital TV (DVB) channel/transponder scan tables"; homepage = "https://github.com/tvheadend/dtv-scan-tables"; license = with licenses; [ gpl2Only lgpl21Only ]; + longDescription = '' + When scanning for dvb channels, + most applications require an initial set of + transponder coordinates (frequencies etc.). + These coordinates differ, depending of the + receiver's location or on the satellite. + The package delivers a collection of transponder + tables ready to be used by software like "dvbv5-scan". + The package at hand is maintained and used by tvheadend, + it is a fork of the original one hosted by linuxtv.org. + ''; maintainers = with maintainers; [ ]; }; } From 0a2b99bbc2cc727dcdacb3196df67114269565f1 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 14 Jan 2023 12:49:17 +0100 Subject: [PATCH 28/77] dtv-scan-tables: rename to `dtv-scan-tables_tvheadend` This happens in preparation of the introduction of an alternate version, maintained by linuxtv. --- .../misc/dtv-scan-tables/{default.nix => tvheadend.nix} | 2 +- pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) rename pkgs/data/misc/dtv-scan-tables/{default.nix => tvheadend.nix} (97%) diff --git a/pkgs/data/misc/dtv-scan-tables/default.nix b/pkgs/data/misc/dtv-scan-tables/tvheadend.nix similarity index 97% rename from pkgs/data/misc/dtv-scan-tables/default.nix rename to pkgs/data/misc/dtv-scan-tables/tvheadend.nix index 0c53436f8e5f..b2edc34e5ea1 100644 --- a/pkgs/data/misc/dtv-scan-tables/default.nix +++ b/pkgs/data/misc/dtv-scan-tables/tvheadend.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "dtv-scan-tables"; - version = "20221027"; + version = "20221027-tvheadend"; src = fetchFromGitHub { owner = "tvheadend"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b78cb7e02726..0cf56a4936b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -455,7 +455,7 @@ with pkgs; dsq = callPackage ../tools/misc/dsq { }; - dtv-scan-tables = callPackage ../data/misc/dtv-scan-tables { }; + dtv-scan-tables_tvheadend = callPackage ../data/misc/dtv-scan-tables/tvheadend.nix { }; dufs = callPackage ../servers/http/dufs { inherit (darwin.apple_sdk.frameworks) Security; @@ -37818,7 +37818,9 @@ with pkgs; tvbrowser-bin = callPackage ../applications/misc/tvbrowser/bin.nix { }; - tvheadend = callPackage ../servers/tvheadend { }; + tvheadend = callPackage ../servers/tvheadend { + dtv-scan-tables = dtv-scan-tables_tvheadend; + }; twiggy = callPackage ../development/tools/twiggy { }; From d425725ce32504d43aa8e411d56c2b766314b9df Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 14 Jan 2023 13:23:31 +0100 Subject: [PATCH 29/77] dtv-scan-tables_linuxtv: init at 2022-04-30-57ed29822750 As this is the original repository of dtv scan tables, and is still actively maintained, it becomes the new default package for `dtv-scan-tables`. --- pkgs/data/misc/dtv-scan-tables/linuxtv.nix | 54 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/data/misc/dtv-scan-tables/linuxtv.nix diff --git a/pkgs/data/misc/dtv-scan-tables/linuxtv.nix b/pkgs/data/misc/dtv-scan-tables/linuxtv.nix new file mode 100644 index 000000000000..dcbf20c38e8d --- /dev/null +++ b/pkgs/data/misc/dtv-scan-tables/linuxtv.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchurl +, v4l-utils +}: + +let + + version_ = "2022-04-30-57ed29822750"; + +in + +stdenv.mkDerivation rec { + pname = "dtv-scan-tables"; + version = "${version_}-linuxtv"; + + src = fetchurl { + url = "https://linuxtv.org/downloads/${pname}/${pname}-${version_}.tar.bz2"; + hash = "sha256-amJoqjkkWTePo6E5IvwBWj+mP/gi9LDWTTPXE1Cm7J4="; + }; + + nativeBuildInputs = [ + v4l-utils + ]; + + sourceRoot = "usr/share/dvb"; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + allowedReferences = [ ]; + + meta = with lib; { + # git repo with current revision is here: + #downloadPage = "https://git.linuxtv.org/dtv-scan-tables.git"; + # Weekly releases are supposed to be here + downloadPage = "https://linuxtv.org/downloads/dtv-scan-tables/"; + # but sometimes they lag behind several weeks or even months. + description = "Digital TV (DVB) channel/transponder scan tables"; + homepage = "https://www.linuxtv.org/wiki/index.php/Dtv-scan-tables"; + license = with licenses; [ gpl2Only lgpl21Only ]; + longDescription = '' + When scanning for dvb channels, + most applications require an initial set of + transponder coordinates (frequencies etc.). + These coordinates differ, depending of the + receiver's location or on the satellite. + The package delivers a collection of transponder + tables ready to be used by software like "dvbv5-scan". + ''; + maintainers = with maintainers; [ yarny ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0cf56a4936b1..822c98b306d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -455,7 +455,9 @@ with pkgs; dsq = callPackage ../tools/misc/dsq { }; + dtv-scan-tables_linuxtv = callPackage ../data/misc/dtv-scan-tables/linuxtv.nix { }; dtv-scan-tables_tvheadend = callPackage ../data/misc/dtv-scan-tables/tvheadend.nix { }; + dtv-scan-tables = dtv-scan-tables_linuxtv; dufs = callPackage ../servers/http/dufs { inherit (darwin.apple_sdk.frameworks) Security; From a4b823d73cb2b99100d5067184bdd50fa7d35c6a Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 15 Jan 2023 15:19:11 +0300 Subject: [PATCH 30/77] linux: 5.10.162 -> 5.10.163 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 6aaf176b60ce..2187cd97cc71 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.162"; + version = "5.10.163"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "05yjgp1la5flwqji9b6j7nbdgg5fwzv2ph536v4f9pzza3y01i1f"; + sha256 = "084vq2fpkqpzwxhygn7l07wrx0m8cprz9q1l0ihc1aw8sgi2dqln"; }; } // (args.argsOverride or {})) From a05b3a75b9ac8e1ff31d39d66a3eea33ec83ef65 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 15 Jan 2023 15:19:18 +0300 Subject: [PATCH 31/77] linux: 5.15.86 -> 5.15.88 --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index fa9f84a72f6b..f34c3dda6d27 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.86"; + version = "5.15.88"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1vpjnmwqsx6akph2nvbsv2jl7pp8b7xns3vmwbljsl23lkpxkz40"; + sha256 = "10d1h5d962r9c0xmcw1rylibjz4n2g552axdz5zgjfkav7ykjxa1"; }; } // (args.argsOverride or { })) From 5677f8921804b2aca01ab9d9fb5126b052e3dd9d Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 15 Jan 2023 15:19:25 +0300 Subject: [PATCH 32/77] linux: 6.0.17 -> 6.0.19 --- pkgs/os-specific/linux/kernel/linux-6.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.0.nix b/pkgs/os-specific/linux/kernel/linux-6.0.nix index 81bb13202d6c..87050462e619 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.0.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.0.17"; + version = "6.0.19"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "020xrv9449gd0jnfgi0sb69bgs2p9sd49dghmd3bnnal584r5vm7"; + sha256 = "01q2sciv3l9brnsfcv9knx1ps3hq9rk1a08iqk3vscg3waq7xqxb"; }; } // (args.argsOverride or { })) From fd77307ab041e54019d799803424815a87b2ef9f Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 15 Jan 2023 15:19:50 +0300 Subject: [PATCH 33/77] linux: 6.1.3 -> 6.1.6 --- pkgs/os-specific/linux/kernel/linux-6.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index c51936f845bd..db6f6ee43fc0 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.3"; + version = "6.1.6"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "05q3b32kinvbgbibb8s3x8ax3gzlgznlcwvwb4y46gjilzkrmj3d"; + sha256 = "1qsygnsn67j843ywpswy5724zin5sszb5mz8b8h3lw553mb8wk9y"; }; } // (args.argsOverride or { })) From 4d4b65d9328175ba8fbebf1300cbdfe8ea43c338 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 15 Jan 2023 15:20:37 +0300 Subject: [PATCH 34/77] linux/hardened/patches/5.10: 5.10.161-hardened1 -> 5.10.163-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 8cb3a1c83451..bcc50f491660 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.161-hardened1.patch", - "sha256": "0lkgixy3qn2lf2snp7zsxyp6fad0b6yvvg2hk6l1jp9z8293gsap", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.161-hardened1/linux-hardened-5.10.161-hardened1.patch" + "name": "linux-hardened-5.10.163-hardened1.patch", + "sha256": "1mjbngc14grffjakjvx67dwsjff381gsg6k1pjrsmanr9xql4zcz", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.163-hardened1/linux-hardened-5.10.163-hardened1.patch" }, - "sha256": "0ya04njrxr4d37zkxvivmn5f0bdvcb504pyp9ahwz8nqpk8gdaks", - "version": "5.10.161" + "sha256": "084vq2fpkqpzwxhygn7l07wrx0m8cprz9q1l0ihc1aw8sgi2dqln", + "version": "5.10.163" }, "5.15": { "patch": { From d4fe0d103255383ecae9030b1cb15f025f181239 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 15 Jan 2023 15:20:47 +0300 Subject: [PATCH 35/77] linux/hardened/patches/5.15: 5.15.86-hardened1 -> 5.15.88-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index bcc50f491660..c92736241090 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.86-hardened1.patch", - "sha256": "04yp2qqn9axvkaqgihb1vxnkwnjs5s2q9106y5x4r1q4bf42nz2v", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.86-hardened1/linux-hardened-5.15.86-hardened1.patch" + "name": "linux-hardened-5.15.88-hardened1.patch", + "sha256": "1ahn0ysvnn8bw2ynd4xfzy8pzlnlidv7lwpyd8w5vxnkfzzgpwkz", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.88-hardened1/linux-hardened-5.15.88-hardened1.patch" }, - "sha256": "1vpjnmwqsx6akph2nvbsv2jl7pp8b7xns3vmwbljsl23lkpxkz40", - "version": "5.15.86" + "sha256": "10d1h5d962r9c0xmcw1rylibjz4n2g552axdz5zgjfkav7ykjxa1", + "version": "5.15.88" }, "5.4": { "patch": { From 6f0d5ff07cedc9820c78974f242010053fe1fa68 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 15 Jan 2023 15:20:56 +0300 Subject: [PATCH 36/77] linux/hardened/patches/6.0: 6.0.16-hardened1 -> 6.0.19-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c92736241090..12727efc8a77 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,11 +52,11 @@ "6.0": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.0.16-hardened1.patch", - "sha256": "19rakmfdkkbvvzphsksccgad3wc2khlcynzdqx10d7spldj8nkp1", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.16-hardened1/linux-hardened-6.0.16-hardened1.patch" + "name": "linux-hardened-6.0.19-hardened1.patch", + "sha256": "11yn5mrvs170685pwa9k7asxlv64vgfqfg2b6m5yn2a11pr1rxg5", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.19-hardened1/linux-hardened-6.0.19-hardened1.patch" }, - "sha256": "1r2wf3hf7yxl7lxma7plyi8pk3dmlsrpm763rf0g1h8ilsy72844", - "version": "6.0.16" + "sha256": "01q2sciv3l9brnsfcv9knx1ps3hq9rk1a08iqk3vscg3waq7xqxb", + "version": "6.0.19" } } From 33b60cca172932a8ac120b9994d00e6d91802aac Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 15 Jan 2023 15:21:06 +0300 Subject: [PATCH 37/77] linux/hardened/patches/6.1: init at 6.1.6-hardened1 --- nixos/tests/kernel-generic.nix | 1 + pkgs/os-specific/linux/kernel/hardened/patches.json | 10 ++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 2 ++ 4 files changed, 15 insertions(+) diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 7ee734a1eff0..ae3d47a49bd3 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -31,6 +31,7 @@ let linux_5_10_hardened linux_5_15_hardened linux_6_0_hardened + linux_6_1_hardened linux_testing; }; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 12727efc8a77..a6217e812d70 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -58,5 +58,15 @@ }, "sha256": "01q2sciv3l9brnsfcv9knx1ps3hq9rk1a08iqk3vscg3waq7xqxb", "version": "6.0.19" + }, + "6.1": { + "patch": { + "extra": "-hardened1", + "name": "linux-hardened-6.1.6-hardened1.patch", + "sha256": "1qj7fwz3mhw1qj5q6aqalrq0nsbfqs33jqg51w9pa1zv4z35n79m", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.6-hardened1/linux-hardened-6.1.6-hardened1.patch" + }, + "sha256": "1qsygnsn67j843ywpswy5724zin5sszb5mz8b8h3lw553mb8wk9y", + "version": "6.1.6" } } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61a8fa4bc024..b29d1dee2848 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25776,6 +25776,8 @@ with pkgs; linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened; linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened; linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened; + linuxPackages_6_1_hardened = linuxKernel.packages.linux_6_1_hardened; + linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened; # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index a9e381adc88d..5de691a3b1d7 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -249,6 +249,7 @@ in { linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream"; linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream"; linux_6_0_hardened = hardenedKernelFor kernels.linux_6_0 { }; + linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; })); /* Linux kernel modules are inherently tied to a specific kernel. So @@ -577,6 +578,7 @@ in { linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream"; linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream"; linux_6_0_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_0 { }); + linux_6_1_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_1 { }); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); From 6d5a8a8e9f08bdc19288aa10449916d1d327753d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 15 Jan 2023 13:18:34 +0100 Subject: [PATCH 38/77] chromiumDev: 110.0.5481.30 -> 111.0.5532.2 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 0c8220529016..e6b313fcebfe 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,9 +32,9 @@ } }, "dev": { - "version": "110.0.5481.30", - "sha256": "03r2mpnrw9p188lajf69lpd94rcgj5a9hs2nlf01f0czl6nij0bx", - "sha256bin64": "0wdvqq9h5vzmlwysnlw7wk4bzkmra7qp9k4p1c0phl05863ykasv", + "version": "111.0.5532.2", + "sha256": "0aaxfi4f88s1cfzyhngmsmb84awy85xjy6a8pk3bfamssgxj0981", + "sha256bin64": "1jjmqi27qwbnmcfq043gxws31v47yfkzs7jk7mxzzxbaqj7v3wf6", "deps": { "gn": { "version": "2022-12-12", From 6b6e05d0cd47182f2df6cfb8a977eba72110734e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 15 Jan 2023 13:18:34 +0100 Subject: [PATCH 39/77] chromiumBeta: 109.0.5414.74 -> 110.0.5481.30 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 0c8220529016..d7014ee2e222 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,15 +19,15 @@ } }, "beta": { - "version": "109.0.5414.74", - "sha256": "0pcfaj3n3rjk4va9g0ajlsv1719kdhqcnjdd4piinqxb4qy27vgd", - "sha256bin64": "1ihjjf8x5080p9bizhqrrr0rcjf0l1nps9xq9naa2f48y5zfshkd", + "version": "110.0.5481.30", + "sha256": "03r2mpnrw9p188lajf69lpd94rcgj5a9hs2nlf01f0czl6nij0bx", + "sha256bin64": "0bpv4qgbbi8651x5mp8qyqxlxqm5x9csml1yi3789f7d40hs4vj9", "deps": { "gn": { - "version": "2022-11-10", + "version": "2022-12-12", "url": "https://gn.googlesource.com/gn", - "rev": "1c4151ff5c1d6fbf7fa800b8d4bb34d3abc03a41", - "sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b" + "rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8", + "sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30" } } }, From c44e0571fccee3d2da453e106bf947f8db575273 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 10 Jan 2023 18:21:04 +0000 Subject: [PATCH 40/77] resholve: mark it as knownVulnerabilities, allow resholve-utils usage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We are marking `resholve` itself with `meta.knownVulnerabilities`, and overriding `resholve-utils` functions's `resholve` with `meta.knownVulnerabilities = [ ]`. This way, we can still use `resholve` at build-time without triggering security warnings, however we can't instantiate `resholve` itself. See: ``` $ nix-build -A resholve error: Package ‘resholve-0.8.4’ in /.../nixpkgs/pkgs/development/misc/resholve/resholve.nix:48 is marked as insecure, refusing to evaluate. $ nix-build -A ix /nix/store/k8cvj1bfxkjj8zdg6kgm7r8942bbj7w7-ix-20190815 ``` For debugging purposes, you can still bypass the security checks and instantiate `resholve` by: ``` $ NIXPKGS_ALLOW_INSECURE=1 nix-build -A resholve /nix/store/77s87hhqymc6x9wpclb04zg5jwm6fsij-resholve-0.8.4 ``` --- pkgs/development/misc/resholve/default.nix | 18 +++++++++--------- pkgs/development/misc/resholve/resholve.nix | 5 +++++ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/development/misc/resholve/default.nix b/pkgs/development/misc/resholve/default.nix index b90a65c06ed1..fa1de609d6ac 100644 --- a/pkgs/development/misc/resholve/default.nix +++ b/pkgs/development/misc/resholve/default.nix @@ -5,14 +5,12 @@ }: let - python27' = (pkgsBuildHost.python27.overrideAttrs (old: - { - # Overriding `meta.knownVulnerabilities` here, see #201859 for why it exists - # In resholve case this should not be a security issue, - # since it will only be used during build, not runtime - meta = (old.meta or { }) // { knownVulnerabilities = [ ]; }; - } - )).override { + removeKnownVulnerabilities = pkg: pkg.overrideAttrs (old: { + meta = (old.meta or { }) // { knownVulnerabilities = [ ]; }; + }); + # We are removing `meta.knownVulnerabilities` from `python27`, + # and setting it in `resholve` itself. + python27' = (removeKnownVulnerabilities pkgsBuildHost.python27).override { self = python27'; pkgsBuildHost = pkgsBuildHost // { python27 = python27'; }; # strip down that python version as much as possible @@ -99,6 +97,8 @@ rec { # funcs to validate and phrase invocations of resholve # and use those invocations to build packages resholve-utils = callPackage ./resholve-utils.nix { - inherit resholve; + # we can still use resholve-utils without triggering a security warn + # this is safe since we will only use `resholve` at build time + resholve = removeKnownVulnerabilities resholve; }; } diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix index d0ed5105ae4c..839d744be254 100644 --- a/pkgs/development/misc/resholve/resholve.nix +++ b/pkgs/development/misc/resholve/resholve.nix @@ -50,5 +50,10 @@ python27.pkgs.buildPythonApplication { license = with licenses; [ mit ]; maintainers = with maintainers; [ abathur ]; platforms = platforms.all; + knownVulnerabilities = [ '' + resholve depends on python27 (EOL). While it's safe to + run on trusted input in the build sandbox, you should + avoid running it on untrusted input. + '' ]; }; } From 66093a4120eb63e0ec2a7b5c14031920b7a3078d Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 10 Jan 2023 18:32:47 +0000 Subject: [PATCH 41/77] python27: remove stripLibs argument Since we are now guarantee that the `resholve` is not exposing `python27`, let's remove the `stripLibs` hack that tried to reduce its size. --- .../python/cpython/2.7/default.nix | 11 +--- pkgs/development/misc/resholve/default.nix | 54 ------------------- 2 files changed, 1 insertion(+), 64 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index c3c0687d2cfc..cfcf487b4356 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -35,7 +35,6 @@ , stripConfig ? false , stripIdlelib ? false , stripTests ? false -, stripLibs ? [ ] , pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}" }: @@ -322,15 +321,7 @@ in with passthru; stdenv.mkDerivation ({ '' + optionalString stripTests '' # Strip tests rm -R $out/lib/python*/test $out/lib/python*/**/test{,s} - '' + (concatStringsSep "\n" - (map - (lib: - '' - rm -vR $out/lib/python*/${lib} - # libraries in dynload (C libraries) may not exist, - # but when they exist they may be prefixed with _ - rm -vfR $out/lib/python*/lib-dynload/{,_}${lib} - '') stripLibs)); + ''; enableParallelBuilding = true; diff --git a/pkgs/development/misc/resholve/default.nix b/pkgs/development/misc/resholve/default.nix index fa1de609d6ac..4247d1ab21d7 100644 --- a/pkgs/development/misc/resholve/default.nix +++ b/pkgs/development/misc/resholve/default.nix @@ -26,60 +26,6 @@ let stripConfig = true; stripIdlelib = true; stripTests = true; - stripLibs = [ - # directories - "bsddb*" - "curses" - "compiler" - "ensurepip" - "hotshot" - "lib-tk" - "sqlite3" - # files - "aifc*" - "antigravity*" - "async*" - "*audio*" - "BaseHTTPServer*" - "Bastion*" - "binhex*" - "bdb*" - "CGIHTTPServer*" - "cgitb*" - "chunk*" - "colorsys*" - "dbhash*" - "dircache*" - "*dbm*" - "ftplib*" - "*hdr*" - "imaplib*" - "imputil*" - "MimeWriter*" - "mailbox*" - "mhlib*" - "mimify*" - "multifile*" - "netrc*" - "nntplib*" - "os2emxpath*" - "pyclbr*" - "pydoc*" - "SimpleHTTPServer*" - "sgmllib*" - "smtp*" - "ssl*" - "sun*" - "tabnanny*" - "telnetlib*" - "this*" - "wave*" - "webbrowser*" - "whichdb*" - "wsgiref*" - "xdrlib*" - "*XMLRPC*" - ]; enableOptimizations = false; }; callPackage = lib.callPackageWith (pkgs // { python27 = python27'; }); From 03ab899a453797d599d47391a9c2e5488076ec9e Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 10 Jan 2023 18:53:05 +0000 Subject: [PATCH 42/77] resholve-utils: set disallowedReferences for resholve.mkDerivation --- pkgs/development/misc/resholve/resholve-utils.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/misc/resholve/resholve-utils.nix b/pkgs/development/misc/resholve/resholve-utils.nix index 26bf492d23ab..d308f483458f 100644 --- a/pkgs/development/misc/resholve/resholve-utils.nix +++ b/pkgs/development/misc/resholve/resholve-utils.nix @@ -181,6 +181,7 @@ rec { src = unresholved; inherit version pname; buildInputs = [ resholve ]; + disallowedReferences = [ resholve ]; # retain a reference to the base passthru = unresholved.passthru // { From 1d77a869046c119ea50837ca1f94594b64985f77 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 10 Jan 2023 21:50:29 +0000 Subject: [PATCH 43/77] resholve: fix CLI tests --- pkgs/development/misc/resholve/default.nix | 6 +++++- pkgs/development/misc/resholve/resholve.nix | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/misc/resholve/default.nix b/pkgs/development/misc/resholve/default.nix index 4247d1ab21d7..74f45f8ed3cc 100644 --- a/pkgs/development/misc/resholve/default.nix +++ b/pkgs/development/misc/resholve/default.nix @@ -33,18 +33,22 @@ let deps = callPackage ./deps.nix { }; in rec { + # not exposed in all-packages + resholveBuildTimeOnly = removeKnownVulnerabilities resholve; # resholve itself resholve = callPackage ./resholve.nix { inherit (source) rSrc version; inherit (deps.oil) oildev; inherit (deps) configargparse; inherit resholve-utils; + # used only in tests + resholve = resholveBuildTimeOnly; }; # funcs to validate and phrase invocations of resholve # and use those invocations to build packages resholve-utils = callPackage ./resholve-utils.nix { # we can still use resholve-utils without triggering a security warn # this is safe since we will only use `resholve` at build time - resholve = removeKnownVulnerabilities resholve; + resholve = resholveBuildTimeOnly; }; } diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix index 839d744be254..28a0e401cf5d 100644 --- a/pkgs/development/misc/resholve/resholve.nix +++ b/pkgs/development/misc/resholve/resholve.nix @@ -8,6 +8,7 @@ , oildev , configargparse , binlore +, resholve , resholve-utils }: @@ -41,7 +42,7 @@ python27.pkgs.buildPythonApplication { passthru = { inherit (resholve-utils) mkDerivation phraseSolution writeScript writeScriptBin; - tests = callPackage ./test.nix { inherit rSrc binlore python27; }; + tests = callPackage ./test.nix { inherit rSrc binlore python27 resholve; }; }; meta = with lib; { From 521d08ddc7293e73808c29ae856930016dc33422 Mon Sep 17 00:00:00 2001 From: Yureka Date: Sun, 15 Jan 2023 13:44:17 +0100 Subject: [PATCH 44/77] mimalloc: fix static build --- pkgs/development/libraries/mimalloc/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix index 59841e075099..9f7e8ee59177 100644 --- a/pkgs/development/libraries/mimalloc/default.nix +++ b/pkgs/development/libraries/mimalloc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-0gX0rEOWT6Lp5AyRyrK5GPTBvAqc5SxSaNJOc5GIgKc="; }; - doCheck = true; + doCheck = !stdenv.hostPlatform.isStatic; preCheck = let ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in '' @@ -24,7 +24,11 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ninja ]; - cmakeFlags = [ "-DMI_INSTALL_TOPLEVEL=ON" ] ++ lib.optionals secureBuild [ "-DMI_SECURE=ON" ]; + cmakeFlags = [ "-DMI_INSTALL_TOPLEVEL=ON" ] + ++ lib.optionals secureBuild [ "-DMI_SECURE=ON" ] + ++ lib.optionals stdenv.hostPlatform.isStatic [ "-DMI_BUILD_SHARED=OFF" ] + ++ lib.optionals (!doCheck) [ "-DMI_BUILD_TESTS=OFF" ] + ; postInstall = let rel = lib.versions.majorMinor version; From 2761e7c03b5e2b5ecedcade582fb670b6e38e9fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 14:11:04 +0000 Subject: [PATCH 45/77] libfilezilla: 0.39.1 -> 0.41.0 --- pkgs/development/libraries/libfilezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 9d1c2f27b3b6..67b49b55c7d7 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.39.1"; + version = "0.41.0"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-89bA3yjzP1LPJTywP8UVeXUq5NrvKqxzRaa9feYjpsU="; + hash = "sha256-rCodDYKOpgB4fOoefuUNIfDTvZFSzs5hh7ivyQBiKqA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From f16bdcc60b6feafc7ee94f86e2c773d359619c22 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 15 Jan 2023 16:32:49 +0200 Subject: [PATCH 46/77] vscode-extensions.piousdeer.adwaita-theme: 1.0.8 -> 1.1.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 871a4c6c9995..ea6206bf39af 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2229,8 +2229,8 @@ let mktplcRef = { name = "adwaita-theme"; publisher = "piousdeer"; - version = "1.0.8"; - sha256 = "XyzxiwKQGDUIXp6rnt1BmPzfpd1WrG8HnEqYEOJV6P8="; + version = "1.1.0"; + sha256 = "sha256-tKpKLUcc33YrgDS95PJu22ngxhwjqeVMC1Mhhy+IPGE="; }; meta = with lib; { description = "Theme for the GNOME desktop"; From 905fd9fb418b28938b73dd0feabc95767446a351 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 14:33:08 +0000 Subject: [PATCH 47/77] ydotool: 1.0.1 -> 1.0.3 --- pkgs/tools/wayland/ydotool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/wayland/ydotool/default.nix b/pkgs/tools/wayland/ydotool/default.nix index 8f142ef64881..319a9249f0a4 100644 --- a/pkgs/tools/wayland/ydotool/default.nix +++ b/pkgs/tools/wayland/ydotool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ydotool"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitHub { owner = "ReimuNotMoe"; repo = "ydotool"; rev = "v${version}"; - sha256 = "sha256-maXXGCqB8dkGO8956hsKSwM4HQdYn6z1jBFENQ9sKcA="; + sha256 = "sha256-RcPHQFXD3YgfF11OFpcnSowPlEjxy2c2RWhGYr30GhI="; }; strictDeps = true; From a433a46e2c9fa3cf3361e90100e67a2fe5fb53d4 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 15 Jan 2023 10:15:26 -0500 Subject: [PATCH 48/77] stylua: 0.15.3 -> 0.16.0 Diff: https://github.com/johnnymorganz/stylua/compare/v0.15.3...v0.16.0 Changelog: https://github.com/johnnymorganz/stylua/blob/v0.16.0/CHANGELOG.md --- pkgs/development/tools/stylua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index f83535a10e47..19187643d187 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.15.3"; + version = "0.16.0"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EVsgiG16R4wh4Dh10rv7/H+VDONaVPWOfRNStrw8aso="; + sha256 = "sha256-DDK/ANBR0wH87/9wnZYwyYMbCl/N/m4KUvQJ/dB8las="; }; - cargoSha256 = "sha256-fDh6TchwQO+FvyPJzrso1Ls9ZIKMHDdFBTzf6AuvGqs="; + cargoSha256 = "sha256-xgOPjdy+uoUOdtYXq/lXR872QdzA1/r8Shi0q1E+e9Q="; # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu postPatch = '' From 2e70c4c30429587d123e8879d9107cbdfc7acbba Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Sun, 15 Jan 2023 16:25:22 +0100 Subject: [PATCH 49/77] go-task: 3.19.1 -> 3.20.0 --- pkgs/development/tools/go-task/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index af107674d063..466f0ff2a0b9 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-task"; - version = "3.19.1"; + version = "3.20.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-MtbgFx/+SVBcV6Yp1WEwKLQGx5oPxvqljtXeyUYNS+I="; + sha256 = "sha256-pKvotNUpZl51r+9+YFEQGXVsUBfxsmTZLnRIdrl7UGQ="; }; vendorHash = "sha256-AZtkWJ/U1dH9J+wowlcg25qBVyRRo6LCzc6IBYKBkVA="; From ff3c3bb1df8a2d462cbb15cebb3869f399dba485 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 15:42:45 +0000 Subject: [PATCH 50/77] ventoy-bin-full: 1.0.87 -> 1.0.88 --- pkgs/tools/cd-dvd/ventoy-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/pkgs/tools/cd-dvd/ventoy-bin/default.nix index a1fab735072b..5bf4ef2df56a 100644 --- a/pkgs/tools/cd-dvd/ventoy-bin/default.nix +++ b/pkgs/tools/cd-dvd/ventoy-bin/default.nix @@ -51,13 +51,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ventoy-bin"; - version = "1.0.87"; + version = "1.0.88"; src = let inherit (finalAttrs) version; in fetchurl { url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz"; - hash = "sha256-0m7MXLtSuq8GdDFXzKeY86DIglgeQ6wyEtpOyB/thkc="; + hash = "sha256-mg1dzXREIhO9LsoCEauuBR9ESGHM3RvoFN+5vHU0HDA="; }; patches = [ From 55888e7a13fcc67cbf148798d0da8fbdc8273896 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 15 Jan 2023 10:52:34 -0500 Subject: [PATCH 51/77] kodi: fix build --- pkgs/applications/video/kodi/unwrapped.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 1dae66723379..525ac2400bb3 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, makeWrapper , pkg-config, cmake, yasm, python3Packages , libxcrypt, libgcrypt, libgpg-error, libunistring , boost, avahi, lame @@ -107,13 +107,20 @@ in stdenv.mkDerivation { src = kodi_src; - # This is a backport of - # https://github.com/xbmc/xbmc/commit/a6dedce7ba1f03bdd83b019941d1e369a06f7888 - # to Kodi 19.4 Matrix. - # This can be removed once a new release of Kodi comes out and we upgrade - # to it. patches = [ + # This is a backport of + # https://github.com/xbmc/xbmc/commit/a6dedce7ba1f03bdd83b019941d1e369a06f7888 + # to Kodi 19.4 Matrix. + # This can be removed once a new major release of Kodi comes out and we upgrade + # to it. ./add-KODI_WEBSERVER_EXTRA_WHITELIST.patch + + # A patch to fix build until the next major release of Kodi comes out and we upgrade + # https://github.com/xbmc/xbmc/pull/22291 + (fetchpatch { + url = "https://github.com/xbmc/xbmc/commit/5449652abf0bb9dddd0d796de4120e60f19f89a5.patch"; + sha256 = "sha256-vqX08dTSPhIur4aVu2BzXEpAxMOjaadwRNI43GSV9Og="; + }) ]; buildInputs = [ From d599e734e5de8f2cfbd143a218c50b48b3db40c4 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 15 Jan 2023 16:57:13 +0100 Subject: [PATCH 52/77] autorandr: 1.12.1 -> 1.13, nixos/services/autorandr: add ignoreLeadOption --- nixos/modules/services/misc/autorandr.nix | 14 +++++++++++++- pkgs/tools/misc/autorandr/default.nix | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix index 072064143dbd..aa96acb61306 100644 --- a/nixos/modules/services/misc/autorandr.nix +++ b/nixos/modules/services/misc/autorandr.nix @@ -254,6 +254,12 @@ in { ''; }; + ignoreLid = mkOption { + default = false; + type = types.bool; + description = lib.mdDoc "Treat outputs as connected even if their lids are closed"; + }; + hooks = mkOption { type = hooksModule; description = lib.mdDoc "Global hook scripts"; @@ -340,7 +346,13 @@ in { startLimitIntervalSec = 5; startLimitBurst = 1; serviceConfig = { - ExecStart = "${pkgs.autorandr}/bin/autorandr --batch --change --default ${cfg.defaultTarget}"; + ExecStart = '' + ${pkgs.autorandr}/bin/autorandr \ + --batch \ + --change \ + --default ${cfg.defaultTarget} \ + ${optionalString cfg.ignoreLid "--ignore-lid"} + ''; Type = "oneshot"; RemainAfterExit = false; KillMode = "process"; diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index eb1ce13f3108..1f22401a4190 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -8,7 +8,7 @@ python3.pkgs.buildPythonApplication rec { pname = "autorandr"; - version = "1.12.1"; + version = "1.13"; format = "other"; nativeBuildInputs = [ installShellFiles ]; @@ -59,7 +59,7 @@ python3.pkgs.buildPythonApplication rec { owner = "phillipberndt"; repo = "autorandr"; rev = version; - sha256 = "sha256-7SNnbgV6PeseBD6wdilEIOfOL2KVDpnlkSn9SBgRhhM="; + sha256 = "sha256-pTWwDKBCZV3wkX/VHuWrwMFgUAMDvik11y+ysKiN3HU="; }; meta = with lib; { From ca8197a58ccabe8e6518c7b7e8f05dc391169ef3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 16:11:36 +0000 Subject: [PATCH 53/77] python310Packages.canopen: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/canopen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix index ccb3626e2f48..8793a1919342 100644 --- a/pkgs/development/python-modules/canopen/default.nix +++ b/pkgs/development/python-modules/canopen/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "canopen"; - version = "2.0.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vMiqnqg/etpdoNregQOJd75SqTgCwmV2SXKesfggZdk="; + hash = "sha256-vBJrsdy2Ljs02KEuOKB7WqgxnBdFfJv+II8Lu9qQ/2E="; }; nativeBuildInputs = [ From b2e13f253a3b01d1ba922bf9179769b9b76ed03c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 16:25:08 +0000 Subject: [PATCH 54/77] python310Packages.liquidctl: 1.12.0 -> 1.12.1 --- pkgs/development/python-modules/liquidctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/liquidctl/default.nix b/pkgs/development/python-modules/liquidctl/default.nix index 2e9f2ba3648c..68e6e4cf63a1 100644 --- a/pkgs/development/python-modules/liquidctl/default.nix +++ b/pkgs/development/python-modules/liquidctl/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "liquidctl"; - version = "1.12.0"; + version = "1.12.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5apn+8X7si8jniHSjt7sveqIuzeuI4uXllR627aT2vI="; + hash = "sha256-0QjgnTxqB50JNjSUAgBrGyhN2XC/TDYiC1tvhw1Bl1M="; }; nativeBuildInputs = [ From fd3efff8dcbfb218e5c017d329fdabb2dccbce42 Mon Sep 17 00:00:00 2001 From: Christian Bourjau Date: Sun, 15 Jan 2023 17:06:46 +0100 Subject: [PATCH 55/77] howard-hinnant-date: Build on unix The howard-hinnant-date library supports unix not only linux. --- pkgs/development/libraries/howard-hinnant-date/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/howard-hinnant-date/default.nix b/pkgs/development/libraries/howard-hinnant-date/default.nix index 6c35126143ec..b69c903adf08 100644 --- a/pkgs/development/libraries/howard-hinnant-date/default.nix +++ b/pkgs/development/libraries/howard-hinnant-date/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { license = licenses.mit; description = "A date and time library based on the C++11/14/17 header"; homepage = "https://github.com/HowardHinnant/date"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ r-burns ]; }; } From f5fa3461be21ea31add55e9153369141d5a3b1be Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Sun, 15 Jan 2023 22:02:55 +0530 Subject: [PATCH 56/77] cinny: 2.2.2 -> 2.2.3 --- .../networking/instant-messengers/cinny/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index d5246206e82d..e9ae4556588f 100644 --- a/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -4,11 +4,11 @@ let configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); in stdenv.mkDerivation rec { pname = "cinny"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - sha256 = "sha256-MNmU6MvDwGbFNQt7qe08klXjy1n2LiABlPkARGvjVJU="; + hash = "sha256-Q6f24LRYCxdgAguUVl7jf7srkd2L1IptiBgHJQq2dHE="; }; installPhase = '' From ff70f2befecc3b380a77b37d1a6b62cc0e2c94ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 16:53:14 +0000 Subject: [PATCH 57/77] python310Packages.rns: 0.4.6 -> 0.4.7 --- pkgs/development/python-modules/rns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 92b581a7aaac..7383946dcb16 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.4.6"; + version = "0.4.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-duWlglazdvWnX4rgcaoz3JbMPIDxJfx7BFUMNEQs0q4="; + hash = "sha256-1cTGzZ/5YgaYpSdk8nGLqgpKBNyY16fCFmrUJ+QwSDM="; }; propagatedBuildInputs = [ From d63bc47d1cd9be59e8c70b5e3d65e691da67ed54 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 15 Jan 2023 11:59:40 -0500 Subject: [PATCH 58/77] ruff: 0.0.221 -> 0.0.222 Diff: https://github.com/charliermarsh/ruff/compare/v0.0.221...v0.0.222 Changelog: https://github.com/charliermarsh/ruff/releases/tag/v0.0.222 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 7ccc29afa42e..b3656a597a84 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.221"; + version = "0.0.222"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-46pIudC1jUIOgqJ/5+Xcn01y4Qq1VBKyW36Dyzrz7uA="; + sha256 = "sha256-Tue5RmJjrOG0q3ZXl8hl5skmRE2KWdttzlCnmmo8JY0="; }; - cargoSha256 = "sha256-OxzOZyzAXuK08BAzRIepPc7sllZtlynWvHjvJAHWG5Q="; + cargoSha256 = "sha256-BZk6LFexkpnU8PKvFB705N6Er344VT3g35ZyZxc+his="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices From abb42c2aafe2413b509715feb4128bcc54b22b00 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Sun, 15 Jan 2023 23:17:53 +0530 Subject: [PATCH 59/77] headscale: 0.17.1 -> 0.18.0 --- pkgs/servers/headscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index a577b6251c52..b84632746c94 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "headscale"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - sha256 = "sha256-/NJUtmH67VZERCvExcX4W4T9Rcixc5m28ujNcrQduWg="; + hash = "sha256-0viXsBRCiaxBTTKXJngSov5M7toscQUOdXDTr1l0U3I="; }; - vendorSha256 = "sha256-Y1IK9Tx2sv0v27ZYtSxDP9keHQ7skctDOa+37pNGEC8="; + vendorHash = "sha256-SuKT+b8g6xEK15ry2IAmpS/vwDG+zJqK9nfsWpHNXuU="; ldflags = ["-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}"]; From 52e277d501a856430ae446b017d023a2ac50a05d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 15 Jan 2023 18:52:27 +0100 Subject: [PATCH 60/77] treewide: remove myself (ma27) as maintainer from a bunch of pkgs I don't use anymore --- pkgs/applications/science/astronomy/stellarium/default.nix | 2 +- pkgs/applications/window-managers/i3/status-rust.nix | 2 +- pkgs/applications/window-managers/sway/lock-effects.nix | 2 +- pkgs/development/tools/language-servers/rnix-lsp/default.nix | 2 +- pkgs/development/tools/misc/jiq/default.nix | 2 +- pkgs/tools/misc/gotify-cli/default.nix | 2 +- pkgs/tools/networking/dogdns/default.nix | 2 +- pkgs/tools/wayland/clipman/default.nix | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 559c36ece8c9..89ba8bf0e9d9 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { homepage = "https://stellarium.org/"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index ddc4383fbd73..d36ac492f985 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec { description = "Very resource-friendly and feature-rich replacement for i3status"; homepage = "https://github.com/greshake/i3status-rust"; license = licenses.gpl3Only; - maintainers = with maintainers; [ backuitist globin ma27 ]; + maintainers = with maintainers; [ backuitist globin ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/sway/lock-effects.nix b/pkgs/applications/window-managers/sway/lock-effects.nix index 52ff05a41878..b7e07444a06b 100644 --- a/pkgs/applications/window-managers/sway/lock-effects.nix +++ b/pkgs/applications/window-managers/sway/lock-effects.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ gnxlxnxx ma27 ]; + maintainers = with maintainers; [ gnxlxnxx ]; }; } diff --git a/pkgs/development/tools/language-servers/rnix-lsp/default.nix b/pkgs/development/tools/language-servers/rnix-lsp/default.nix index a587f87b3da7..7a05f2fa431d 100644 --- a/pkgs/development/tools/language-servers/rnix-lsp/default.nix +++ b/pkgs/development/tools/language-servers/rnix-lsp/default.nix @@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A work-in-progress language server for Nix, with syntax checking and basic completion"; license = licenses.mit; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/misc/jiq/default.nix b/pkgs/development/tools/misc/jiq/default.nix index 61477a4c7de0..2d566b0eac93 100644 --- a/pkgs/development/tools/misc/jiq/default.nix +++ b/pkgs/development/tools/misc/jiq/default.nix @@ -26,6 +26,6 @@ buildGoModule rec { homepage = "https://github.com/fiatjaf/jiq"; license = licenses.mit; description = "jid on jq - interactive JSON query tool using jq expressions"; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/tools/misc/gotify-cli/default.nix index c544a70d8686..a171ba43d6d5 100644 --- a/pkgs/tools/misc/gotify-cli/default.nix +++ b/pkgs/tools/misc/gotify-cli/default.nix @@ -25,7 +25,7 @@ buildGoModule rec { license = licenses.mit; homepage = "https://github.com/gotify/cli"; description = "A command line interface for pushing messages to gotify/server"; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; mainProgram = "gotify"; }; } diff --git a/pkgs/tools/networking/dogdns/default.nix b/pkgs/tools/networking/dogdns/default.nix index 0adca07798f2..288c5a073820 100644 --- a/pkgs/tools/networking/dogdns/default.nix +++ b/pkgs/tools/networking/dogdns/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { description = "Command-line DNS client"; homepage = "https://dns.lookup.dog"; license = licenses.eupl12; - maintainers = with maintainers; [ bbigras ma27 ]; + maintainers = with maintainers; [ bbigras ]; mainProgram = "dog"; }; } diff --git a/pkgs/tools/wayland/clipman/default.nix b/pkgs/tools/wayland/clipman/default.nix index 3c974f4cb779..d91699ba7295 100644 --- a/pkgs/tools/wayland/clipman/default.nix +++ b/pkgs/tools/wayland/clipman/default.nix @@ -31,7 +31,7 @@ buildGoModule rec { homepage = "https://github.com/yory8/clipman"; description = "A simple clipboard manager for Wayland"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } From fd651fc594727e365da1911129876c45d4537195 Mon Sep 17 00:00:00 2001 From: GenericNerdyUsername Date: Sun, 15 Jan 2023 18:01:20 +0000 Subject: [PATCH 61/77] jetbrains-jdk: fix manpages --- pkgs/development/compilers/jetbrains-jdk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 3d36ae9cc6ce..2d42d69775ef 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -84,6 +84,7 @@ openjdk17.overrideAttrs (oldAttrs: rec { in '' runHook preInstall + mv build/linux-x86_64-server-${buildType}/images/jdk/man build/linux-x86_64-server-${buildType}/images/jbrsdk${jcefSuffix}-${javaVersion}-linux-x64${debugSuffix}-b${build} rm -rf build/linux-x86_64-server-${buildType}/images/jdk mv build/linux-x86_64-server-${buildType}/images/jbrsdk${jcefSuffix}-${javaVersion}-linux-x64${debugSuffix}-b${build} build/linux-x86_64-server-${buildType}/images/jdk '' + oldAttrs.installPhase + "runHook postInstall"; From d182206882fc9d9aabd6ce8a3d735e51196c2333 Mon Sep 17 00:00:00 2001 From: Vladimir Pouzanov Date: Wed, 4 Jan 2023 13:35:49 +0000 Subject: [PATCH 62/77] ov: init at 0.13.0 Adds the ov, an advanced pager. I've put it into tools/text next to the similar packages. --- pkgs/tools/text/ov/default.nix | 60 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 62 insertions(+) create mode 100644 pkgs/tools/text/ov/default.nix diff --git a/pkgs/tools/text/ov/default.nix b/pkgs/tools/text/ov/default.nix new file mode 100644 index 000000000000..5b9e55f8de0d --- /dev/null +++ b/pkgs/tools/text/ov/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, pandoc +, makeWrapper +}: + +buildGoModule rec { + pname = "ov"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "noborus"; + repo = "ov"; + rev = "refs/tags/v${version}"; + hash = "sha256-vBPhCSor3wGCawz+097Lw29xgW6z5fV5PAMAq7TBiNM="; + }; + + vendorHash = "sha256-y3oSL1W2cjt6oUVbglHhun3XNCidqb7LTXtoA25+mpo="; + + ldflags = [ + "-X main.Version=v${version}" + "-X main.Revision=${src.rev}" + ]; + + subPackages = [ "." ]; + + nativeBuildInputs = [ + installShellFiles + pandoc + makeWrapper + ]; + + outputs = [ "out" "doc" ]; + + postInstall = '' + installShellCompletion --cmd ov \ + --bash <($out/bin/ov completion bash) \ + --fish <($out/bin/ov completion fish) \ + --zsh <($out/bin/ov completion zsh) + + mkdir -p $out/share/$name + cp $src/ov-less.yaml $out/share/$name/less-config.yaml + makeWrapper $out/bin/ov $out/bin/ov-less --add-flags "--config $out/share/$name/less-config.yaml" + + mkdir -p $doc/share/doc/$name + pandoc -s < $src/README.md > $doc/share/doc/$name/README.html + mkdir -p $doc/share/$name + cp $src/ov.yaml $doc/share/$name/sample-config.yaml + ''; + + meta = with lib; { + description = "Feature-rich terminal-based text viewer"; + homepage = "https://noborus.github.io/ov"; + license = licenses.mit; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ farcaller ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 459464f6b871..9490a70e8e96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38622,4 +38622,6 @@ with pkgs; tuner = callPackage ../applications/audio/tuner { }; jfrog-cli = callPackage ../tools/misc/jfrog-cli { }; + + ov = callPackage ../tools/text/ov { }; } From 1fd7d52d82ef97bd0771b17618633c2a46ea24e1 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 15 Jan 2023 21:33:21 +0300 Subject: [PATCH 63/77] nixos/gitea: fix creation of data directory --- nixos/modules/services/misc/gitea.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 00e90f5b32b4..50834d19c6b2 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -468,12 +468,14 @@ in "d '${cfg.stateDir}/conf' 0750 ${cfg.user} gitea - -" "d '${cfg.stateDir}/custom' 0750 ${cfg.user} gitea - -" "d '${cfg.stateDir}/custom/conf' 0750 ${cfg.user} gitea - -" + "d '${cfg.stateDir}/data' 0750 ${cfg.user} gitea - -" "d '${cfg.stateDir}/log' 0750 ${cfg.user} gitea - -" "z '${cfg.stateDir}' 0750 ${cfg.user} gitea - -" "z '${cfg.stateDir}/.ssh' 0700 ${cfg.user} gitea - -" "z '${cfg.stateDir}/conf' 0750 ${cfg.user} gitea - -" "z '${cfg.stateDir}/custom' 0750 ${cfg.user} gitea - -" "z '${cfg.stateDir}/custom/conf' 0750 ${cfg.user} gitea - -" + "z '${cfg.stateDir}/data' 0750 ${cfg.user} gitea - -" "z '${cfg.stateDir}/log' 0750 ${cfg.user} gitea - -" "Z '${cfg.stateDir}' - ${cfg.user} gitea - -" From 26ef8978d859bd05807224ea29b6b28ea12c66c2 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 15 Jan 2023 15:37:23 +0100 Subject: [PATCH 64/77] haskell/docs: New sections about available versions and hls + Various small improvements Co-authored-by: sternenseemann --- doc/languages-frameworks/haskell.section.md | 321 +++++++++++++------- 1 file changed, 212 insertions(+), 109 deletions(-) diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index e926b4cf9a16..ba7dfe47bc13 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -1,4 +1,4 @@ -# Haskell {#sec-haskell} +# Haskell {#haskell} The Haskell infrastructure in nixpkgs has two main purposes: The primary purpose is to provide a Haskell compiler and build tools as well as infrastructure for @@ -7,19 +7,10 @@ packaging Haskell-based packages. The secondary purpose is to provide support for Haskell development environment including prebuilt Haskell libraries. However, in this area sacrifices have been made due to self-imposed restrictions in nixpkgs, to lessen the maintenance -effort and improve performance. Therefore, it may be advantageous to use an -alternative to the Haskell infrastructure in nixpkgs for development -environments in some cases. The main limitations are that we only provide -first-class support for the default compiler (currently GHC 9.2.4) and usually -only provide a default and (if different) the latest version of a haskell -package. +effort and improve performance. (More details in the subsection +[Limitations.](#haskell-limitations)) - - -## Available packages {#sec-haskell-available-packages} +## Available packages {#haskell-available-packages} The compiler and most build tools are exposed at the top level: @@ -30,11 +21,12 @@ Many “normal” user facing packages written in Haskell, like `niv` or `cachix are also exposed at the top level, so there is nothing haskell specific to installing and using them. -All of these packages originally lived in the `haskellPackages` package set and -are re-exposed with a reduced dependency closure for convenience. +All of these packages originally are defined in the `haskellPackages` package +set and are re-exposed with a reduced dependency closure for convenience. +(see `justStaticExecutables` below) The `haskellPackages` set includes at least one version of every package from -hackage as well as some manually injected packages. This amounts to a lot of +Hackage as well as some manually injected packages. This amounts to a lot of packages, so it is hidden from `nix-env -qa` by default for performance reasons. You can still list all packages in the set like this, though: @@ -47,24 +39,17 @@ haskellPackages.abacate abac haskellPackages.abc-puzzle abc-puzzle-0.2.1 … ``` +Also the default set `haskellPackages` is included on [search.nixos.org]. The attribute names in `haskellPackages` always correspond with their name on -hackage. Since hackage allows names that are not valid nix without extra +Hackage. Since Hackage allows names that are not valid Nix without extra escaping, you sometimes need to extra care when handling attribute names like `3dmodels`. For packages that are part of [Stackage], we use the version prescribed by a Stackage solver (usually the current LTS one) as the default version. For all -other packages we use the latest version from Hackage. Sometimes alternative -versions of packages are provided whose attribute names are their normal name -with their version appended after an underscore, e.g. `Cabal_3_8_1_0`. - - +other packages we use the latest version from Hackage. See +[below](#haskell-available-versions) to learn which versions exactly are provided. Roughly half of the 16K packages contained in `haskellPackages` don't actually build and are marked as broken semi-automatically. Most of those packages are @@ -74,7 +59,7 @@ Very often fixing them is not a lot of work. `haskellPackages` is built with our default compiler, but we also provide other @@ -134,6 +119,92 @@ haskell.packages.ghc924.abc-puzzle Every package set also re-exposes the GHC used to build its packages as `haskell.packages.*.ghc`. +### Available package versions {#haskell-available-versions} + +We aim for a “blessed” package set which only contains one version of each +package, like Stackage (and based on it) but with more packages. Normally in +nixpkgs the number of building Haskell packages is roughly two to three times +the size of Stackage. For choosing the version to use for a certain package we +use the following rules: + +1. By default, for every package `haskellPackages.foo` is the newest version +found on Hackage (at the time of the last update of our package set). +2. If the Stackage snapshot that we use (usually the newest LTS snapshot) +contains a package, we use the Stackage version as default version for that +package. +3. For some packages, which are not on Stackage, we have manual overrides to +set the default version to a version older than the newest on Hackage. We do +this to get them or their reverse dependencies to compile in our package set. +4. For all packages, for which the newest Hackage version is not the default +version, there will also be a `haskellPackages.foo_x_y_z` package with the +newest version. +5. For some packages, we also manually add other `haskellPackages.foo_x_y_z` +versions, if they are required for a certain build. + +Relying on `haskellPackages.foo_x_y_z` attributes in derivations outside +nixpkgs is discouraged because they may change or disappear with every package +set update. + + +All `haskell.packages.*` package sets use the same package descriptions and the same sets +of versions by default. There are however GHC version specific override `.nix` +files to loosen this a bit. + +### Dependency resolution + +Normally when you build Haskell packages with `cabal-install`, `cabal-install` +does dependency resolution. It will look at all Haskell package versions known +on Hackage and tries to pick for every (transitive) dependency of your build +exactly one version. Those versions need to satisfy all the version constraints +given in the `.cabal` file of your package and all its dependencies. + +The Haskell builder in nixpkgs, (described in more detail in +[#haskell-mkderivation]), does no such thing. It will simply take as input +packages with names off the desired dependencies and just check whether they +fulfill the version bounds and (by default, see `jailbreak`) fail if they +don’t. + +The package resolution is done by the `haskellPackages.callPackage` function, +which will, e.g., use `haskellPackages.aeson` for a package input of name +`aeson`. +While this is the default behavior, it is possible to override the dependencies +for a specific package, see +[`override` and `overrideScope`](#haskell-overriding-haskell-packages). + +### Limitations {#haskell-limitations} + +Our main objective with `haskellPackages` is to package Haskell software in +nixpkgs. This entails some limitations, partially due to self-imposed +restrictions of nixpkgs, partially in the name of maintainability: + +* Only the packages built with the default compiler see extensive testing of the + whole package set. For other GHC versions only a few essential packages are + tested and cached. +* As described above we only build one version of most packages. + +The experience using an older or newer packaged compiler or using different +versions may be worse, because builds will not be cached on `cache.nixos.org` +or may fail. + +Thus, to get the best experience, make sure that your project can be compiled +using the default compiler of nixpkgs and recent versions of its dependencies. + +A result of this setup is, that getting a valid build plan for a given +package can sometimes be quite painful, and in fact this is where most of the +maintenance work for `haskellPackages` is required. Besides that, it is not +possible to get the dependencies of a legacy project from nixpkgs or to use a +specific stack solver for compiling a project. + +Even though we couldn‘t use them directly in nixpkgs, it would be desirable +to have tooling to generate working Nix package sets from build plans generated +by `cabal-install` or a specific Stackage snapshot via import-from-derivation. +Sadly we currently don’t have tooling for this. For this you might be +interested in the alternative [haskell.nix] framework, which, be warned, is +completely incompatible with packages from `haskellPackages`. + + + ## `haskellPackages.mkDerivation` {#haskell-mkderivation} Every haskell package set has its own haskell-aware `mkDerivation` which is used @@ -141,7 +212,7 @@ to build its packages. Generally you won't have to interact with this builder since [cabal2nix][cabal2nix] can generate packages using it for an arbitrary cabal package definition. Still it is useful to know the parameters it takes when you need to -[override](#sec-haskell-overriding-haskell-packages) a generated nix expression. +[override](#haskell-overriding-haskell-packages) a generated Nix expression. `haskellPackages.mkDerivation` is a wrapper around `stdenv.mkDerivation` which re-defines the default phases to be haskell aware and handles dependency @@ -152,20 +223,20 @@ but uses the underlying `Cabal` library instead. ### General arguments `pname` -: Package name, assumed to be the same as on hackage (if applicable) +: Package name, assumed to be the same as on Hackage (if applicable) `version` -: Packaged version, assumed to be the same as on hackage (if applicable) +: Packaged version, assumed to be the same as on Hackage (if applicable) `src` : Source of the package. If omitted, fetch package corresponding to `pname` -and `version` from hackage. +and `version` from Hackage. `sha256` : Hash to use for the default case of `src`. `revision` -: Revision number of the updated cabal file to fetch from hackage. +: Revision number of the updated cabal file to fetch from Hackage. If `null` (which is the default value), the one included in `src` is used. `editedCabalFile` @@ -221,7 +292,7 @@ package. Disabled by default. Enabled by default if supported. `enableHsc2hsViaAsm` -: Whether to pass `--via-asm` to `hsc2hs`. +: Whether to pass `--via-asm` to `hsc2hs`. Enabled by default only on Windows. `hyperlinkSource` : Whether to render the source as well as part of the haddock documentation @@ -237,7 +308,7 @@ Defaults to `true`. `jailbreak` : Whether to execute [jailbreak-cabal][jailbreak-cabal] before `configurePhase` to lift any version constraints in the cabal file. Note that this can't -lift version bounds if they are conditional, e.g. if a dependency is hidden +lift version bounds if they are conditional, i.e. if a dependency is hidden behind a flag. `enableParallelBuilding` @@ -245,7 +316,7 @@ behind a flag. `maxBuildCores` : Upper limit of jobs to use in parallel for compilation regardless of -`$NIX_BUILD_CORES`. Defaults to 16 as haskell compilation with GHC currently +`$NIX_BUILD_CORES`. Defaults to 16 as Haskell compilation with GHC currently sees a [performance regression](https://gitlab.haskell.org/ghc/ghc/-/issues/9221) if too many parallel jobs are used. @@ -254,7 +325,7 @@ if too many parallel jobs are used. Defaults to `false`. `doHaddock` -: Wether to build (HTML) documentation using [haddock][haddock]. +: Whether to build (HTML) documentation using [haddock][haddock]. Defaults to `true` if supported. `testTarget` @@ -291,8 +362,9 @@ Defaults to `false`. Is automatically enabled if `doHaddock` is `true`. `allowInconsistentDependencies` -: If enabled, allow multiple versions of the same package at configure time. -Usually in such a situation compilation would later fail. Defaults to `false`. +: If enabled, allow multiple versions of the same Haskell package in the +dependency tree at configure time. Often in such a situation compilation would +later fail because of type mismatches. Defaults to `false`. `enableLibraryForGhci` : Build and install a special object file for GHCi. This improves performance @@ -303,7 +375,7 @@ disk space. Defaults to `false`. : Name of the executable or library to build and install. If unset, all available targets are built and installed. -### Specifying dependencies +### Specifying dependencies {#haskell-derivation-deps} Since `haskellPackages.mkDerivation` is intended to be generated from cabal files, it reflects cabal's way of specifying dependencies. For one, dependencies @@ -393,7 +465,7 @@ That only leaves the following extra ways for specifying dependencies: : Deprecated, use either `benchmarkHaskellDepends` or `benchmarkSystemDepends`. The dependency specification methods in this list which are unconditional -are especially useful when writing [overrides](#sec-haskell-overriding-haskell-packages) +are especially useful when writing [overrides](#haskell-overriding-haskell-packages) when you want to make sure that they are definitely included. However, it is recommended to use the more accurate ones listed above when possible. @@ -404,7 +476,7 @@ arguments which are transparently set in `meta` of the resulting derivation. See the [Meta-attributes section](#chap-meta) for their documentation. * These attributes are populated with a default value if omitted: - * `homepage`: defaults to the hackage page for `pname`. + * `homepage`: defaults to the Hackage page for `pname`. * `platforms`: defaults to `lib.platforms.all` (since GHC can cross-compile) * These attributes are only set if given: * `description` @@ -414,41 +486,24 @@ the [Meta-attributes section](#chap-meta) for their documentation. * `broken` * `hydraPlatforms` -## Development environments {#sec-haskell-development-environments} +## Development environments {#haskell-development-environments} In addition to building and installing Haskell software, nixpkgs can also provide development environments for Haskell projects. This has the obvious advantage that you benefit from `cache.nixos.org` and no longer need to compile -all project dependencies yourself. +all project dependencies yourself. While it is often very useful, this is not +the primary use case of our package set. Have a look at the section +[available package versions](#haskell-available-versions) to learn which +versions of packages we provide and the section +[limitations](#haskell-limitations), to judge whether a `haskellPackages` +based development environment for your project is feasible. -Our main objective with `haskellPackages` is to package Haskell software in -nixpkgs. This entails some limitations, partially due to self-imposed -restrictions of nixpkgs, partially in the name of maintainability: - -* Only the packages built with the default compiler see extensive testing of the - whole package set. The experience using an older or newer packaged compiler - may be worse. - -* We aim for a “blessed” package set which only contains one version of each - package. - -Thus, to get the best experience, make sure that your project can be compiled -using the default compiler of nixpkgs and recent versions of its dependencies. -“Recent” can either mean the version contained in a certain [Stackage] snapshot -(usually the latest LTS or nightly one) -or the latest version from Hackage. Similarly to Stackage, we sometimes -intervene and downgrade packages to ensure as many packages as possible can -be compiled together. - -In particular, it is not possible to get the dependencies of a legacy project -from nixpkgs or to use a specific stack solver for compiling a project. - -Now for the actual development environments: By default every derivation built -using [`haskellPackages.mkDerivation`](#haskell-mkderivation) exposes an -environment suitable for building it interactively as the `env` attribute. For -example, if you have a local checkout of `random`, you can enter a development -environment for it like this (if the dependencies in the development and -packaged version match): +By default, every derivation built using +[`haskellPackages.mkDerivation`](#haskell-mkderivation) exposes an environment +suitable for building it interactively as the `env` attribute. For example, if +you have a local checkout of `random`, you can enter a development environment +for it like this (if the dependencies in the development and packaged version +match): ```console $ cd ~/src/random @@ -469,27 +524,26 @@ dependencies of `random`. Note that this environment does not mirror the environment used to build the package, but is intended as a convenient tool for development and simple debugging. `env` relies on the `ghcWithPackages` wrapper which automatically injects a pre-populated package-db into every -GHC invocation. When building the derivation, the appropriate flags would always -be passed explicitly. +GHC invocation. In contrast, using `nix-shell -A haskellPackages.random` will +not result in an environment in which the dependencies are in GHCs package +database. Instead, the Haskell builder will pass in all dependencies explicitly +via configure flags. `env` mirrors the normal derivation environment in one aspect: It does not include familiar development tools like `cabal-install`, since we rely on plain `Setup.hs` to build all packages. However, `cabal-install` will work as expected if in `PATH` (e.g. when installed globally and using a `nix-shell` without `--pure`). A declarative and pure way of adding arbitrary development tools is provided -via [`shellFor`](#ssec-haskell-shellFor). +via [`shellFor`](#haskell-shellFor). - +When using `cabal-install` for dependency resolution you need to be a bit +careful to achieve build purity. `cabal-install` will find and use all +dependencies installed from the packages `env` via Nix, but it will also +consult Hackage to potentially download and compile dependencies if it can‘t +find a valid build plan locally. To prevent this you can either never run +`cabal update`, remove the cabal database from your `~/.cabal` folder or run +`cabal` with `--offline`. Note though, that for some usecases `cabal2nix` needs +the local Hackage db. Often you won't work on a package that is already part of `haskellPackages` or Hackage, so we first need to write a Nix expression to obtain the development @@ -502,7 +556,7 @@ my-project.cabal src … $ cabal2nix ./. > my-project.nix ``` -The generated nix expression evaluates to a function ready to be +The generated Nix expression evaluates to a function ready to be `callPackage`-ed. For now, we can add a minimal `default.nix` which does just that: @@ -519,7 +573,7 @@ enter a shell with all the package's dependencies available using `nix-shell -A env default.nix`. If you have `cabal-install` installed globally, it'll work inside the shell as expected. -### shellFor {#ssec-haskell-shellFor} +### shellFor {#haskell-shellFor} Having to install tools globally is obviously not great, especially if you want to provide a batteries-included `shell.nix` with your project. Luckily there's a @@ -533,8 +587,8 @@ development environment inside `nix-shell`: development environment. This should be a function which takes a haskell package set and returns a list of packages. `shellFor` will pass the used package set to this function and include all dependencies of the returned package in the build -environment. This means you can reuse nix expressions of packages included in -nixpkgs, but also use local nix expressions like this: `hpkgs: [ +environment. This means you can reuse Nix expressions of packages included in +nixpkgs, but also use local Nix expressions like this: `hpkgs: [ (hpkgs.callPackage ./my-project.nix { }) ]`. `nativeBuildInputs` @@ -545,9 +599,8 @@ Defaults to `[]`. `buildInputs` : Expects a list of derivations to add as library dependencies, like `openssl`. This is rarely necessary as the haskell package expressions usually track system -dependencies as well. Defaults to `[]`. - - +dependencies as well. Defaults to `[]`. (see also +[derivation dependencies](#haskell-derivation-deps)) `withHoogle` : If this is true, `hoogle` will be added to `nativeBuildInputs`. @@ -579,7 +632,7 @@ pkgs.haskellPackages.shellFor { packages = hpkgs: [ # reuse the nixpkgs for this package hpkgs.distribution-nixpkgs - # call our generated nix expression manually + # call our generated Nix expression manually (hpkgs.callPackage ./my-project/my-project.nix { }) ]; @@ -602,7 +655,54 @@ pkgs.haskellPackages.shellFor { -## Overriding haskell packages {#sec-haskell-overriding-haskell-packages} +### haskell-language-server {#haskell-language-server} + +To use HLS in short: Install `pkgs.haskell-language-server` e.g. in +`nativeBuildInputs` in `shellFor` and use the `haskell-language-server-wrapper` +command to run it. See the [HLS user guide] on how to configure your text +editor to use HLS and how to test your setup. + +HLS needs to be compiled with the GHC version of the project you use it +on. + +``pkgs.haskell-language-server`` provides +``haskell-language-server-wrapper``, ``haskell-language-server`` +and ``haskell-language-server-x.x.x`` +binaries, where ``x.x.x`` is the GHC version for which it is compiled. By +default, it only includes binaries for the current GHC version, to reduce +closure size. The closure size is large, because HLS needs to be dynamically +linked to work reliably. You can override the list of supported GHC versions +with e.g. + +```nix +pkgs.haskell-language-server.override { supportedGhcVersions = [ "90" "94" ]; } +``` +Where all strings `version` are allowed such that +`haskell.packages.ghc${version}` is an existing package set. + +When you run `haskell-language-server-wrapper` it will detect the GHC +version used by the project you are working on (by asking e.g. cabal or +stack) and pick the appropriate versioned binary from your path. + +Be careful when installing HLS globally and using a pinned nixpkgs for a +Haskell project in a `nix-shell`. If the nixpkgs versions deviate to much +(e.g., use different `glibc` versions) the `haskell-language-server-?.?.?` +executable will try to detect these situations and refuse to start. It is +recommended to obtain HLS via `nix-shell` from the nixpkgs version pinned in +there instead. + +The top level `pkgs.haskell-language-server` attribute is just a convenience +wrapper to make it possible to install HLS for multiple GHC versions at the +same time. If you know, that you only use one GHC version, e.g., in a project +specific `nix-shell` you can simply use +`pkgs.haskellPackages.haskell-language-server` or +`pkgs.haskell.packages.*.haskell-language-server` from the package set you use. + +If you use `nix-shell` for your development environments remember to start your +editor in that environment. You may want to use something like `direnv` and/or an +editor plugin to achieve this. + +## Overriding Haskell packages {#haskell-overriding-haskell-packages} ### Overriding a single package @@ -644,7 +744,7 @@ haskellPackages.haskell-ci.overrideScope (self: super: { The custom interface comes into play when you want to override the arguments passed to `haskellPackages.mkDerivation`. For this, the function `overrideCabal` -from `haskell.lib.compose` is used. E.g. if you want to install a man page +from `haskell.lib.compose` is used. E.g., if you want to install a man page that is distributed with the package, you can do something like this: ```nix @@ -900,10 +1000,10 @@ you are working with or – even better – from the `self`/`final` fix point of Note: Some functions like `shellFor` that are not intended for overriding per se, are omitted in this section. -`cabalSdist { src, name }` +`cabalSdist { src, name ? ... }` : Generates the Cabal sdist tarball for `src`, suitable for uploading to Hackage. Contrary to `haskell.lib.compose.sdistTarball`, it uses `cabal-install` over `Setup.hs`, -so it is usually faster: No build dependencies need to be downloaded and we can +so it is usually faster: No build dependencies need to be downloaded, and we can skip compiling `Setup.hs`. `buildFromCabalSdist drv` @@ -929,15 +1029,15 @@ TODO(@NixOS/haskell): finish these planned sections * `callHackage`, `callHackageDirect` * `developPackage` -## Contributing {#sec-haskell-contributing} +## Contributing {#haskell-contributing} -### Fixing a broken package {#sec-haskell-fixing-a-broken-package} +### Fixing a broken package {#haskell-fixing-a-broken-package} -### Package set generation {#sec-haskell-package-set-generation} +### Package set generation {#haskell-package-set-generation} ### Packaging a Haskell project -### Backporting {#sec-haskell-backporting} +### Backporting {#haskell-backporting} Backporting changes to a stable NixOS version in general is covered in nixpkgs' `CONTRIBUTING.md` in general. In particular refer to the @@ -950,7 +1050,7 @@ it does for the unstable branches. --> -## F.A.Q. {#sec-haskell-faq} +## F.A.Q. {#haskell-faq} ### Why is topic X not covered in this section? Why is section Y missing? @@ -963,15 +1063,18 @@ If you feel any important topic is not documented at all, feel free to comment on the issue linked above. [Stackage]: https://www.stackage.org +[cabal-project-files]: https://cabal.readthedocs.io/en/latest/cabal-project.html [cabal2nix]: https://github.com/nixos/cabal2nix -[hoogle]: https://wiki.haskell.org/Hoogle -[haddock]: https://www.haskell.org/haddock/ +[cpphs]: https://Hackage.haskell.org/package/cpphs [haddock-hoogle-option]: https://haskell-haddock.readthedocs.io/en/latest/invoking.html#cmdoption-hoogle [haddock-hyperlinked-source-option]: https://haskell-haddock.readthedocs.io/en/latest/invoking.html#cmdoption-hyperlinked-source -[profiling]: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/profiling.html +[haddock]: https://www.haskell.org/haddock/ [haskell-program-coverage]: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/profiling.html#observing-code-coverage -[profiling-detail]: https://cabal.readthedocs.io/en/latest/cabal-project.html#cfg-field-profiling-detail +[haskell.nix]: https://input-output-hk.github.io/haskell.nix/index.html +[HLS user guide]: https://haskell-language-server.readthedocs.io/en/latest/configuration.html#configuring-your-editor +[hoogle]: https://wiki.haskell.org/Hoogle [jailbreak-cabal]: https://github.com/NixOS/jailbreak-cabal/ -[cpphs]: https://hackage.haskell.org/package/cpphs -[cabal-project-files]: https://cabal.readthedocs.io/en/latest/cabal-project.html [optparse-applicative-completions]: https://github.com/pcapriotti/optparse-applicative/blob/7726b63796aa5d0df82e926d467f039b78ca09e2/README.md#bash-zsh-and-fish-completions +[profiling-detail]: https://cabal.readthedocs.io/en/latest/cabal-project.html#cfg-field-profiling-detail +[profiling]: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/profiling.html +[search.nixos.org]: https://search.nixos.org From 3945dcee59a640711fe4fd7bf49c1da27a5552c2 Mon Sep 17 00:00:00 2001 From: ChaosAttractor Date: Mon, 16 Jan 2023 01:28:11 +0800 Subject: [PATCH 65/77] github-desktop: 3.0.6 -> 3.1.1 --- .../version-management/github-desktop/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/github-desktop/default.nix b/pkgs/applications/version-management/github-desktop/default.nix index 5ed726e2bf60..745934ae3877 100644 --- a/pkgs/applications/version-management/github-desktop/default.nix +++ b/pkgs/applications/version-management/github-desktop/default.nix @@ -15,15 +15,16 @@ , cups , mesa , systemd +, openssl }: stdenv.mkDerivation rec { pname = "github-desktop"; - version = "3.0.6"; + version = "3.1.1"; src = fetchurl { url = "https://github.com/shiftkey/desktop/releases/download/release-${version}-linux1/GitHubDesktop-linux-${version}-linux1.deb"; - hash = "sha256-UQsMT4/D571xgrU8C4HBoRO+qf08GCGerA4Y5gHcjRc="; + hash = "sha256-R8t0y7b2upMOsWebIBr9+qT2GqQ/ahzWLcFIWwK4JTs="; }; nativeBuildInputs = [ @@ -44,6 +45,7 @@ stdenv.mkDerivation rec { alsa-lib cups mesa + openssl ]; unpackPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b78cb7e02726..b0cbccbb0332 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3112,6 +3112,7 @@ with pkgs; github-commenter = callPackage ../development/tools/github-commenter { }; github-desktop = callPackage ../applications/version-management/github-desktop { + openssl = openssl_1_1; curl = curl.override { openssl = openssl_1_1; }; }; From 4919eed04738664e0324f0093af2e21d3e6c9659 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 19:29:51 +0000 Subject: [PATCH 66/77] python310Packages.deep-translator: 1.9.1 -> 1.9.2 --- pkgs/development/python-modules/deep-translator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deep-translator/default.nix b/pkgs/development/python-modules/deep-translator/default.nix index d7089a85cba9..e68cda8c0e25 100644 --- a/pkgs/development/python-modules/deep-translator/default.nix +++ b/pkgs/development/python-modules/deep-translator/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deep-translator"; - version = "1.9.1"; + version = "1.9.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-goLc/4BbVKUkH+csggKm6EKHmRVbv4i0Aq7N+/5WnmU="; + sha256 = "sha256-iHK1A44SZqJ5N+D2ets76xuU0mryGT7TehM4wryB/AY="; }; propagatedBuildInputs = [ From add18a6be2cb708c93f566a0a32d47b1fc43e6dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 20:07:26 +0000 Subject: [PATCH 67/77] thedesk: 23.0.3 -> 23.0.5 --- pkgs/applications/misc/thedesk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix index 730af1a5558b..57dbf849a3ae 100644 --- a/pkgs/applications/misc/thedesk/default.nix +++ b/pkgs/applications/misc/thedesk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "thedesk"; - version = "23.0.3"; + version = "23.0.5"; src = fetchurl { url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb"; - sha256 = "sha256-X1WNfpsHRkk2UNTExn338r4pWhtC1osrCo6V8g7Pxcc="; + sha256 = "sha256-6pXbHkLdJw0+G9lep/tGkbSGAf8AobkQQgvw6gPYlro="; }; nativeBuildInputs = [ From 522c93b86285e52b2dabb341f75b3448523dc1f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 05:55:11 +0000 Subject: [PATCH 68/77] dagger: 0.3.7 -> 0.3.9 --- .../tools/continuous-integration/dagger/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/dagger/default.nix b/pkgs/development/tools/continuous-integration/dagger/default.nix index a1872d285db1..91ad0b3ee907 100644 --- a/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -2,23 +2,23 @@ buildGoModule rec { pname = "dagger"; - version = "0.3.7"; + version = "0.3.9"; src = fetchFromGitHub { owner = "dagger"; repo = "dagger"; rev = "v${version}"; - hash = "sha256-67ILrOVG31LrLgMcT+bZyWQ3lSahWOdWRyWpgUYSr4I="; + hash = "sha256-tq3b/4ysGG7fozIou1cvWs+BJSe9rPDYKaV2GT3hLGE="; }; - vendorHash = "sha256-bidJ7V/+yU3pBVXMdD4S0QVh9gKcvRN46Ut5OdSrnNc="; + vendorHash = "sha256-8FjzL++AFNhHvk9ipeVK3tmPMEgTKg8Fz/vJZMEAPJE="; proxyVendor = true; subPackages = [ "cmd/dagger" ]; - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/dagger/dagger/internal/engine.Version=${version}" ]; passthru.tests.version = testers.testVersion { package = dagger; From faa2508dddf17492063e29a93d38489ac086e508 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 15 Jan 2023 20:34:30 +0100 Subject: [PATCH 69/77] =?UTF-8?q?sublime4-dev:=204141=20=E2=86=92=204147?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/editors/sublime/4/common.nix | 18 ++++++++++++++++-- .../editors/sublime/4/packages.nix | 6 +++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index ebf6cc2c53e1..7a8cc75e540b 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -3,6 +3,7 @@ { fetchurl, stdenv, lib, xorg, glib, libglvnd, glibcLocales, gtk3, cairo, pango, makeWrapper, wrapGAppsHook , writeShellScript, common-updater-scripts, curl , openssl_1_1, bzip2, bash, unzip, zip +, sqlite }: let @@ -15,7 +16,19 @@ let versionUrl = "https://download.sublimetext.com/latest/${if dev then "dev" else "stable"}"; versionFile = builtins.toString ./packages.nix; - libPath = lib.makeLibraryPath [ xorg.libX11 xorg.libXtst glib libglvnd openssl_1_1 gtk3 cairo pango curl ]; + neededLibraries = [ + xorg.libX11 + xorg.libXtst + glib + libglvnd + openssl_1_1 + gtk3 + cairo + pango + curl + ] ++ lib.optionals (lib.versionAtLeast buildVersion "4145") [ + sqlite + ]; in let binaryPackage = stdenv.mkDerivation rec { pname = "${pnameBase}-bin"; @@ -52,7 +65,7 @@ in let for binary in ${ builtins.concatStringsSep " " binaries }; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${lib.makeLibraryPath neededLibraries}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ $binary done @@ -67,6 +80,7 @@ in let # No need to patch these libraries, it works well with our own rm libcrypto.so.1.1 libssl.so.1.1 + ${lib.optionalString (lib.versionAtLeast buildVersion "4145") "rm libsqlite3.so"} mkdir -p $out cp -r * $out/ diff --git a/pkgs/applications/editors/sublime/4/packages.nix b/pkgs/applications/editors/sublime/4/packages.nix index d5a37aee5a47..5a60ce185c12 100644 --- a/pkgs/applications/editors/sublime/4/packages.nix +++ b/pkgs/applications/editors/sublime/4/packages.nix @@ -11,9 +11,9 @@ in } {}; sublime4-dev = common { - buildVersion = "4141"; + buildVersion = "4147"; dev = true; - x64sha256 = "eFo9v4hSrp1gV56adVyFB9sOApOXlKNvVBW0wbFYG4g="; - aarch64sha256 = "MmwSptvSH507+X9GT8GC4tzZFzEfT2pKc+/Qu5SbMkM="; + x64sha256 = "9zs+2cp+pid0y/v5tHJN4jp7sM1oGB5EgGzMASL3y4o="; + aarch64sha256 = "KyvHJPqBEfeQQJnuyWZA7vGhWkYFqMaTMx+uy+3cZ30="; } {}; } From 5a61f34f2e731059b67daa59d0d398688a477cfb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 15 Jan 2023 22:01:01 +0100 Subject: [PATCH 70/77] radare2: Fix ANSI Escape Sequence Injection vulns via DWARF Fixes: CVE-2023-0302 --- pkgs/development/tools/analysis/radare2/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 94165d992d8d..e02ce86d8efb 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -63,6 +63,11 @@ stdenv.mkDerivation rec { url = "https://github.com/radareorg/radare2/commit/842f809d4ec6a12af2906f948657281c9ebc8a24.patch"; sha256 = "sha256-asEXW9Ox48w9WQhOA9tleXIvynIjsWb6ItKmFTojgbQ="; }) + (fetchpatch { + name = "CVE-2023-0302.patch"; + url = "https://github.com/radareorg/radare2/commit/961f0e723903011d4f54c2396e44efa91fcc74ce.patch"; + hash = "sha256-QinRQDIY4p3P+M3Hh9w3Dv3N/2XTaf3N0nUluHPpAvg="; + }) ]; preBuild = '' From ef10ea96d8d8ed694be59735d47b74af686678a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 20:31:34 +0000 Subject: [PATCH 71/77] elixir_1_14: 1.14.2 -> 1.14.3 --- pkgs/development/interpreters/elixir/1.14.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/elixir/1.14.nix b/pkgs/development/interpreters/elixir/1.14.nix index cd03a0cc33aa..bedc3054eb17 100644 --- a/pkgs/development/interpreters/elixir/1.14.nix +++ b/pkgs/development/interpreters/elixir/1.14.nix @@ -1,8 +1,8 @@ { mkDerivation }: mkDerivation { - version = "1.14.2"; - sha256 = "sha256-ABS+tXWm0vP3jb4ixWSi84Ltya7LHAuEkGMuAoZqHPA="; - # https://hexdocs.pm/elixir/1.14.2/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp + version = "1.14.3"; + sha256 = "sha256-8rkuyAQAZdaKFXnSMaIPwbgoHnPs+nJ+mdbqcqYNeE4="; + # https://hexdocs.pm/elixir/1.14.3/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp minimumOTPVersion = "23"; } From fecbf169e2cdca7dfdf2d5168fc25b95dfefd9dc Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 15 Jan 2023 22:15:40 +0100 Subject: [PATCH 72/77] haskell/docs: Fix a link --- doc/languages-frameworks/haskell.section.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index ba7dfe47bc13..9c3ac6de620e 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -159,13 +159,12 @@ on Hackage and tries to pick for every (transitive) dependency of your build exactly one version. Those versions need to satisfy all the version constraints given in the `.cabal` file of your package and all its dependencies. -The Haskell builder in nixpkgs, (described in more detail in -[#haskell-mkderivation]), does no such thing. It will simply take as input -packages with names off the desired dependencies and just check whether they -fulfill the version bounds and (by default, see `jailbreak`) fail if they -don’t. +The [Haskell builder in nixpkgs](#haskell-mkderivation) does no such thing. +It will simply take as input packages with names off the desired dependencies +and just check whether they fulfill the version bounds and (by default, see +`jailbreak`) fail if they don’t. -The package resolution is done by the `haskellPackages.callPackage` function, +The package resolution is done by the `haskellPackages.callPackage` function which will, e.g., use `haskellPackages.aeson` for a package input of name `aeson`. While this is the default behavior, it is possible to override the dependencies From 00e7a3df836e0d2ea67ec17140d854ba23d8d69b Mon Sep 17 00:00:00 2001 From: Andrey Golovizin Date: Sun, 15 Jan 2023 22:15:47 +0100 Subject: [PATCH 73/77] aegisub: add wrapGAppsHook to nativeBuildInputs Fixes the `Settings schema 'org.gtk.Settings.FileChooser' is not installed` error when opening file dialogs. --- pkgs/applications/video/aegisub/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index 6c267aad77eb..079fb1792e18 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -25,6 +25,7 @@ , pcre , pkg-config , which +, wrapGAppsHook , wxGTK , zlib @@ -75,6 +76,7 @@ stdenv.mkDerivation rec { pkg-config which cmake + wrapGAppsHook ]; buildInputs = [ From 0816b75dd6d97db3f8442e2f6463e8f5fb76dd8f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 15 Jan 2023 23:19:00 +0100 Subject: [PATCH 74/77] hannom: fix build --- pkgs/data/fonts/hannom/default.nix | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/data/fonts/hannom/default.nix b/pkgs/data/fonts/hannom/default.nix index fa586caa79cc..72ba87fb17f9 100644 --- a/pkgs/data/fonts/hannom/default.nix +++ b/pkgs/data/fonts/hannom/default.nix @@ -1,27 +1,28 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "hannom"; version = "2005"; -in fetchzip { - name = "hannom-${version}"; - url = "mirror://sourceforge/vietunicode/hannom/hannom%20v${version}/hannomH.zip"; + src = fetchzip { + url = "mirror://sourceforge/vietunicode/hannom/hannom%20v${version}/hannomH.zip"; + stripRoot = false; + hash = "sha256-Oh8V72tYvVA6Sk0f9UTIkRQYjdUbEB/fmCSaRYfyoP8="; + }; - stripRoot = false; + dontBuild = true; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/truetype - mv $out/*.ttf -t $out/share/fonts/truetype - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob - ''; + mv *.ttf -t $out/share/fonts/truetype - sha256 = "sha256-zOYJxEHl4KM0ncVQDBs9+e3z8DxzF2ef3pRj0OVSuUo="; + runHook postInstall + ''; meta = with lib; { description = "UNICODE Han Nom Font Set"; - homepage = "http://vietunicode.sourceforge.net/fonts/fonts_hannom.html"; longDescription = '' The true type fonts HAN NOM A and HAN NOM B have been developed by Chan Nguyen Do Quoc Bao (Germany), To Minh Tam (USA) and Ni sinh Thien Vien Vien @@ -31,6 +32,7 @@ in fetchzip { code points by the Unicode Standard. Two sets of true type fonts are available with high and low resolutions. ''; + homepage = "https://vietunicode.sourceforge.net/fonts/fonts_hannom.html"; license = licenses.unfree; maintainers = with maintainers; [ wegank ]; platforms = platforms.all; From b720d8a06f5714dbc284944703d2f93678ccec7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 15 Jan 2023 23:09:14 +0000 Subject: [PATCH 75/77] Update pkgs/development/tools/misc/pwndbg/default.nix --- pkgs/development/tools/misc/pwndbg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix index ff94a8e3183a..d80fa230c8a4 100644 --- a/pkgs/development/tools/misc/pwndbg/default.nix +++ b/pkgs/development/tools/misc/pwndbg/default.nix @@ -22,7 +22,7 @@ let python3.pkgs.pwntools # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/wrappers/checksec.py#L8 ] ++ lib.optionals stdenv.isLinux [ python3.pkgs.ropper # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/commands/ropper.py#L30 - python3.pkgs.ROPGadget # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/commands/rop.py#L32 + python3.pkgs.ropgadget # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/commands/rop.py#L32 ]); in stdenv.mkDerivation rec { From a5b773966bb06e6482cdee944bbdaf60464cf326 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 23:12:10 +0000 Subject: [PATCH 76/77] python310Packages.google-cloud-os-config: 1.13.0 -> 1.14.0 --- .../python-modules/google-cloud-os-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index d6733d4d9319..84bbf21609b0 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.13.0"; + version = "1.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CHAiHhXjrLMz7On7Gm5H4fIY3Sq8R2whsI9+D9xXDIM="; + hash = "sha256-CLZC9Iub3LWvDPhetxlHorccRUritd+YzTI/MF1hHrY="; }; propagatedBuildInputs = [ From afd8814a124451395c71aa3af600af36d522d5d4 Mon Sep 17 00:00:00 2001 From: franzmondlichtmann <105480088+franzmondlichtmann@users.noreply.github.com> Date: Mon, 16 Jan 2023 01:00:03 +0100 Subject: [PATCH 77/77] maintainers: add franzmondlichtmann (#210867) * maintainers: add franzmondlichtmann * Update maintainers/maintainer-list.nix Co-authored-by: zendo Co-authored-by: zendo --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5d2b26c0639a..abca427f1d86 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16319,4 +16319,10 @@ github = "RossComputerGuy"; githubId = 19699320; }; + franzmondlichtmann = { + name = "Franz Schroepf"; + email = "franz-schroepf@t-online.de"; + github = "franzmondlichtmann"; + githubId = 105480088; + }; }