From c34dd57a3cc42c17d3fcb98864c93764f1857501 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Thu, 6 May 2021 10:00:55 +0200 Subject: [PATCH 01/65] xpra: 4.0.6 -> 4.1.3 --- pkgs/tools/X11/xpra/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 0dffdf7bbf7..be1a6080a23 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,5 +1,5 @@ -{ lib, fetchurl, callPackage, substituteAll, python3, pkg-config, writeText -, xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk +{ lib, fetchurl, substituteAll, python3, pkg-config, writeText +, xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk, pandoc , wrapGAppsHook, xorgserver, getopt, xauth, util-linux, which , ffmpeg, x264, libvpx, libwebp, x265 , libfakeXinerama @@ -13,8 +13,11 @@ let xf86videodummy = xorg.xf86videodummy.overrideDerivation (p: { patches = [ + # patch provided by Xpra upstream ./0002-Constant-DPI.patch + # https://github.com/Xpra-org/xpra/issues/349 ./0003-fix-pointer-limits.patch + # patch provided by Xpra upstream ./0005-support-for-30-bit-depth-in-dummy-driver.patch ]; }); @@ -30,27 +33,27 @@ let in buildPythonApplication rec { pname = "xpra"; - version = "4.0.6"; + version = "4.1.3"; src = fetchurl { - url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - sha256 = "nGcvbZFGYd2nQ75LL4YN+xcWb7UsViA3OAqpcrTwieg="; + url = "https://xpra.org/src/${pname}-${version}.tar.gz"; + sha256 = "TesmPRmfWy+IqqxoNFd04oX/b2ryGreZPeh2r4sL8JQ="; }; patches = [ - (substituteAll { + (substituteAll { # correct hardcoded paths src = ./fix-paths.patch; inherit (xorg) xkeyboardconfig; inherit libfakeXinerama; }) - ./fix-41106.patch + ./fix-41106.patch # https://github.com/NixOS/nixpkgs/issues/41106 ]; postPatch = '' substituteInPlace setup.py --replace '/usr/include/security' '${pam}/include/security' ''; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook pandoc ]; buildInputs = with xorg; [ libX11 xorgproto libXrender libXi libXtst libXfixes libXcomposite libXdamage From 87f11f84b2da8a5709a92f7759c358cb2eb4c6bd Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Sat, 8 May 2021 12:11:48 +0200 Subject: [PATCH 02/65] maintainers: add serokell team, move various packages to it --- maintainers/team-list.nix | 9 +++++++++ nixos/tests/oci-containers.nix | 2 +- pkgs/servers/jetbrains/youtrack.nix | 2 +- pkgs/servers/oauth2-proxy/default.nix | 2 +- pkgs/tools/admin/acme.sh/default.nix | 2 +- pkgs/tools/security/vault/vault-bin.nix | 2 +- 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 9af8d11c6f9..3ec9ad71a82 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -178,4 +178,13 @@ with lib.maintainers; { ]; scope = "Maintain SageMath and the dependencies that are likely to break it."; }; + + serokell = { + # Verify additions by checking commit signature from an already existing member of the team. + members = [ + balsoft + mkaito + ]; + scope = "Group registration for Serokell employees who collectively maintain packages."; + }; } diff --git a/nixos/tests/oci-containers.nix b/nixos/tests/oci-containers.nix index 0dfc7ffb276..68077e3540a 100644 --- a/nixos/tests/oci-containers.nix +++ b/nixos/tests/oci-containers.nix @@ -12,7 +12,7 @@ let name = "oci-containers-${backend}"; meta = { - maintainers = with lib.maintainers; [ adisbladis benley mkaito ]; + maintainers = with lib.maintainers; [ adisbladis benley ] ++ lib.teams.serokell.members; }; nodes = { diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix index 5258a0224be..88fd5b64fa6 100644 --- a/pkgs/servers/jetbrains/youtrack.nix +++ b/pkgs/servers/jetbrains/youtrack.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Issue tracking and project management tool for developers"; - maintainers = with maintainers; [ yorickvp ]; + maintainers = with maintainers; teams.serokell.members; # https://www.jetbrains.com/youtrack/buy/license.html license = licenses.unfree; }; diff --git a/pkgs/servers/oauth2-proxy/default.nix b/pkgs/servers/oauth2-proxy/default.nix index 7c2bcbe4740..fe4335a7411 100644 --- a/pkgs/servers/oauth2-proxy/default.nix +++ b/pkgs/servers/oauth2-proxy/default.nix @@ -20,6 +20,6 @@ buildGoModule rec { description = "A reverse proxy that provides authentication with Google, Github, or other providers"; homepage = "https://github.com/oauth2-proxy/oauth2-proxy/"; license = licenses.mit; - maintainers = with maintainers; [ yorickvp knl ]; + maintainers = with maintainers; teams.serokell.members ++ [ knl ]; }; } diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix index 63ca45452e6..ae85a5ab687 100644 --- a/pkgs/tools/admin/acme.sh/default.nix +++ b/pkgs/tools/admin/acme.sh/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { description = "A pure Unix shell script implementing ACME client protocol"; homepage = "https://acme.sh/"; license = licenses.gpl3; - maintainers = [ maintainers.yorickvp ]; + maintainers = teams.serokell.members; }; } diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 40ce05331f9..44755db2d33 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -49,6 +49,6 @@ in stdenv.mkDerivation { description = "A tool for managing secrets, this binary includes the UI"; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]; license = licenses.mpl20; - maintainers = with maintainers; [ offline psyanticy mkaito Chili-Man ]; + maintainers = with maintainers; teams.serokell.members ++ [ offline psyanticy Chili-Man ]; }; } From 870fa77ff6eeba7eff8596869b50c4c475033c03 Mon Sep 17 00:00:00 2001 From: hyperfekt Date: Wed, 2 Dec 2020 00:52:54 +0100 Subject: [PATCH 03/65] nixos/filesystems: mount persistent storage to /sys/fs/pstore --- nixos/modules/tasks/filesystems.nix | 34 +++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index e468cb88003..2aeb8598ada 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -272,10 +272,10 @@ in wants = [ "local-fs.target" "remote-fs.target" ]; }; - # Emit systemd services to format requested filesystems. systemd.services = - let + # Emit systemd services to format requested filesystems. + let formatDevice = fs: let mountPoint' = "${escapeSystemdPath fs.mountPoint}.mount"; @@ -302,8 +302,34 @@ in unitConfig.DefaultDependencies = false; # needed to prevent a cycle serviceConfig.Type = "oneshot"; }; - - in listToAttrs (map formatDevice (filter (fs: fs.autoFormat) fileSystems)); + in listToAttrs (map formatDevice (filter (fs: fs.autoFormat) fileSystems)) // { + # Mount /sys/fs/pstore for evacuating panic logs and crashdumps from persistent storage onto the disk using systemd-pstore. + # This cannot be done with the other special filesystems because the pstore module (which creates the mount point) is not loaded then. + # Since the pstore filesystem is usually empty right after mounting because the backend isn't registered yet, and a path unit cannot detect files inside of it, the same service waits for that to happen. systemd's restart mechanism can't be used here because the first failure also fails all dependent units. + "mount-pstore" = { + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.utillinux}/bin/mount -t pstore -o nosuid,noexec,nodev pstore /sys/fs/pstore"; + ExecStartPost = pkgs.writeShellScript "wait-for-pstore.sh" '' + set -eu + TRIES=0 + while [ $TRIES -lt 20 ] && [ "$(cat /sys/module/pstore/parameters/backend)" = "(null)" ]; do + sleep 0.1 + TRIES=$((TRIES+1)) + done + ''; + RemainAfterExit = true; + }; + unitConfig = { + ConditionVirtualization = "!container"; + DefaultDependencies = false; # needed to prevent a cycle + }; + after = [ "modprobe@pstore.service" ]; + requires = [ "modprobe@pstore.service" ]; + before = [ "systemd-pstore.service" ]; + wantedBy = [ "systemd-pstore.service" ]; + }; + }; systemd.tmpfiles.rules = [ "d /run/keys 0750 root ${toString config.ids.gids.keys}" From 3e3e763a075cea09e6db7a4ec51aa0e90435f2fe Mon Sep 17 00:00:00 2001 From: hyperfekt Date: Wed, 2 Dec 2020 00:54:35 +0100 Subject: [PATCH 04/65] nixos/systemd: enable systemd-pstore.service As described in issue #81138, the Install section of upstream units is currently ignored, so we make it part of the sysinit.target manually. --- nixos/doc/manual/release-notes/rl-2105.xml | 6 ++++++ nixos/modules/profiles/installation-device.nix | 8 ++++++++ nixos/modules/system/boot/systemd.nix | 2 ++ 3 files changed, 16 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index 924fe7ae038..d767b8ba74b 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -1035,6 +1035,12 @@ environment.systemPackages = [ + + + The newly enabled systemd-pstore.service now automatically evacuates crashdumps and panic logs from the persistent storage to /var/lib/systemd/pstore. + This prevents NVRAM from filling up, which ensures the latest diagnostic data is always stored and alleviates problems with writing new boot configurations. + + diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 7dc493fb495..8e3aa20daa6 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -99,5 +99,13 @@ with lib; # because we have the firewall enabled. This makes installs from the # console less cumbersome if the machine has a public IP. networking.firewall.logRefusedConnections = mkDefault false; + + # Prevent installation media from evacuating persistent storage, as their + # var directory is not persistent and it would thus result in deletion of + # those entries. + environment.etc."systemd/pstore.conf".text = '' + [PStore] + Unlink=no + ''; }; } diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index d4ae4c93468..6be7b7e6846 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -90,6 +90,7 @@ let "systemd-fsck@.service" "systemd-fsck-root.service" "systemd-remount-fs.service" + "systemd-pstore.service" "local-fs.target" "local-fs-pre.target" "remote-fs.target" @@ -1183,6 +1184,7 @@ in systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.network-online.wantedBy = [ "multi-user.target" ]; systemd.services.systemd-importd.environment = proxy_env; + systemd.services.systemd-pstore.wantedBy = [ "sysinit.target" ]; # see #81138 # Don't bother with certain units in containers. systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container"; From 648eada1c313aa4320cb5d07807f6e6dcfa55d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20H=C3=B6ppner?= Date: Mon, 10 May 2021 20:28:31 +0100 Subject: [PATCH 05/65] Update maintainers/team-list.nix Co-authored-by: Sandro --- maintainers/team-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 3ec9ad71a82..39329e582d7 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -180,7 +180,7 @@ with lib.maintainers; { }; serokell = { - # Verify additions by checking commit signature from an already existing member of the team. + # Verify additions by approval of an already existing member of the team. members = [ balsoft mkaito From 8d89aa01d69c3b4bb0d5d2b879f98d437f7f508d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20H=C3=B6ppner?= Date: Mon, 10 May 2021 20:28:36 +0100 Subject: [PATCH 06/65] Update pkgs/servers/jetbrains/youtrack.nix Co-authored-by: Sandro --- pkgs/servers/jetbrains/youtrack.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix index 88fd5b64fa6..cba162fd262 100644 --- a/pkgs/servers/jetbrains/youtrack.nix +++ b/pkgs/servers/jetbrains/youtrack.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Issue tracking and project management tool for developers"; - maintainers = with maintainers; teams.serokell.members; + maintainers = teams.serokell.members; # https://www.jetbrains.com/youtrack/buy/license.html license = licenses.unfree; }; From 548818a448ea8fc37a75fe584b886544cbdbc6f6 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Thu, 13 May 2021 00:22:52 +0200 Subject: [PATCH 07/65] rtl_433: 20.11 -> 21.05 --- pkgs/applications/radio/rtl_433/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix index b926e29bc47..18941bff68a 100644 --- a/pkgs/applications/radio/rtl_433/default.nix +++ b/pkgs/applications/radio/rtl_433/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "20.11"; + version = "21.05"; pname = "rtl_433"; src = fetchFromGitHub { owner = "merbanan"; repo = "rtl_433"; rev = version; - sha256 = "093bxjxkg7yf78wqj5gpijbfa2p05ny09qqsj84kzi1svnzsa369"; + sha256 = "sha256-01mXOwLv16yTR65BboN+TFm2aE2EMfW1D5teDdW2wLg="; }; nativeBuildInputs = [ pkg-config cmake ]; From a474001e5a310118fee934f04d33e5ffd9fa8844 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Thu, 13 May 2021 15:22:10 +0200 Subject: [PATCH 08/65] fakeroot: apply all brew patches to fix Darwin --- pkgs/tools/system/fakeroot/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index 57a986e3da9..0e4f51c7ea6 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -37,6 +37,18 @@ stdenv.mkDerivation rec { sed -i -e "s@getopt@$(type -p getopt)@g" -e "s@sed@$(type -p sed)@g" ${pname}-${version}/scripts/fakeroot.in ''; + postConfigure = let + # additional patch from brew, but needs to be applied to a generated file + patch-wraptmpf = fetchpatch { + name = "fakeroot-patch-wraptmpf-h.patch"; + url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=3;bug=766649;filename=fakeroot-patch-wraptmpf-h.patch;msg=20"; + sha256 = "1jhsi4bv6nnnjb4vmmmbhndqg719ckg860hgw98bli8m05zwbx6a"; + }; + in lib.optional stdenv.isDarwin '' + make wraptmpf.h + patch -p1 < ${patch-wraptmpf} + ''; + meta = { homepage = "https://salsa.debian.org/clint/fakeroot"; description = "Give a fake root environment through LD_PRELOAD"; From 03f23a84496a3daabd1ec43e2e31cdd32884c9dd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 13 May 2021 20:01:28 +0000 Subject: [PATCH 09/65] gallery-dl: 1.17.3 -> 1.17.4 --- pkgs/applications/misc/gallery-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 8f6c97d196d..854b8a5f9b3 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.17.3"; + version = "1.17.4"; src = fetchPypi { inherit pname version; - sha256 = "5da10d931c371841575d988b4e91e9d4ce55c8c3c99aa6d4efa5abca34c75ec8"; + sha256 = "4df80fd923b03b2413a3d1c50e32c3006d100ed5acc1400ace69d8dc2162d293"; }; propagatedBuildInputs = [ requests ]; From 341836ced2a4556abcf68eec0164ced9fd79ff8a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 14 May 2021 12:53:57 +0000 Subject: [PATCH 10/65] nixos-rebuild: support prebuilt Nix on aarch64 We have a fallback hashes entry for aarch64-linux, but it was unused by nixos-rebuild. --- pkgs/os-specific/linux/nixos-rebuild/default.nix | 1 + pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/nixos-rebuild/default.nix b/pkgs/os-specific/linux/nixos-rebuild/default.nix index 9fb7e366465..b317c5a1fbf 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/default.nix +++ b/pkgs/os-specific/linux/nixos-rebuild/default.nix @@ -18,5 +18,6 @@ substituteAll { inherit runtimeShell nix; nix_x86_64_linux = fallback.x86_64-linux; nix_i686_linux = fallback.i686-linux; + nix_aarch64_linux = fallback.aarch64-linux; path = lib.makeBinPath [ coreutils jq gnused gnugrep ]; } diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 01d0fa823b9..03b1dd347b7 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -386,6 +386,8 @@ prebuiltNix() { echo @nix_x86_64_linux@ elif [[ "$machine" =~ i.86 ]]; then echo @nix_i686_linux@ + elif [[ "$machine" = aarch64 ]]; then + echo @nix_aarch64_linux@ else echo "$0: unsupported platform" exit 1 From 6e8500341de5675ad13cc0624a8d075fe5eb29be Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 14 May 2021 15:43:38 +0200 Subject: [PATCH 11/65] phpPackages.psysh: 0.10.4 -> 0.10.8 --- pkgs/development/php-packages/psysh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/psysh/default.nix b/pkgs/development/php-packages/psysh/default.nix index 514706dc178..c12eb6b4585 100644 --- a/pkgs/development/php-packages/psysh/default.nix +++ b/pkgs/development/php-packages/psysh/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "psysh"; - version = "0.10.4"; + version = "0.10.8"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz"; - sha256 = "005xh5rz12bsy9yvzzr69zpr0p7v4sh6cafhpinpfrvbwfq068f1"; + sha256 = "sha256-6opSBKR5eI5HlaJy4A94JrxYfUtCCNVlyntmLZbWfOE="; }; phases = [ "installPhase" ]; From 77b27f5aac00b3a46e775f1ddd1cc0c149e44c84 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 14 May 2021 16:57:16 +0200 Subject: [PATCH 12/65] diffoscope: 172 -> 175 --- pkgs/tools/misc/diffoscope/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 27da4900285..ce0d920ca4a 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -2,7 +2,7 @@ , abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc , e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar , gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R -, sng, sqlite, squashfsTools, tcpdump, odt2txt, unzip, wabt, xxd, xz, zip, zstd +, radare2, sng, sqlite, squashfsTools, tcpdump, odt2txt, unzip, wabt, xxd, xz, zip, zstd , enableBloat ? false }: @@ -16,11 +16,11 @@ let in python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "172"; + version = "175"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "1j162jh5lkiixpb5ym3smyrkvjldm8m8vnx25cgwb7cxkk701w5x"; + sha256 = "sha256-ofRu5bD+kymdXdViPxfGD/2cf7lUvnEQfYAqog5GIIk="; }; outputs = [ "out" "man" ]; @@ -56,7 +56,7 @@ python3Packages.buildPythonApplication rec { ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit ] ++ lib.optionals enableBloat ([ abootimg apksigner apktool cbfstool colord ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric - hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt + hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt radare2 ] ++ (with python3Packages; [ binwalk guestfs h5py ])); checkInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath; From fff9cf00fd1cb7e0c7646683ba719304a3cac710 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 11 May 2021 23:45:22 +0200 Subject: [PATCH 13/65] caddy: support user and group options --- nixos/modules/services/web-servers/caddy.nix | 33 +++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index 6ecfc113ca2..955b9756406 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -63,6 +63,18 @@ in { ''; }; + user = mkOption { + default = "caddy"; + type = types.str; + description = "User account under which caddy runs."; + }; + + group = mkOption { + default = "caddy"; + type = types.str; + description = "Group account under which caddy runs."; + }; + adapter = mkOption { default = "caddyfile"; example = "nginx"; @@ -123,8 +135,8 @@ in { ExecStart = "${cfg.package}/bin/caddy run --config ${configJSON}"; ExecReload = "${cfg.package}/bin/caddy reload --config ${configJSON}"; Type = "simple"; - User = "caddy"; - Group = "caddy"; + User = cfg.user; + Group = cfg.group; Restart = "on-abnormal"; AmbientCapabilities = "cap_net_bind_service"; CapabilityBoundingSet = "cap_net_bind_service"; @@ -142,13 +154,18 @@ in { }; }; - users.users.caddy = { - group = "caddy"; - uid = config.ids.uids.caddy; - home = cfg.dataDir; - createHome = true; + users.users = optionalAttrs (cfg.user == "caddy") { + caddy = { + group = cfg.group; + uid = config.ids.uids.caddy; + home = cfg.dataDir; + createHome = true; + }; + }; + + users.groups = optionalAttrs (cfg.group == "caddy") { + caddy.gid = config.ids.gids.caddy; }; - users.groups.caddy.gid = config.ids.uids.caddy; }; } From a53747a2df4e950b7d43a48d5cc665c6a548217d Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sat, 15 May 2021 15:20:46 +0200 Subject: [PATCH 14/65] rtl_433: update license to gpl2Plus --- pkgs/applications/radio/rtl_433/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix index 18941bff68a..72aa865176c 100644 --- a/pkgs/applications/radio/rtl_433/default.nix +++ b/pkgs/applications/radio/rtl_433/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Decode traffic from devices that broadcast on 433.9 MHz, 868 MHz, 315 MHz, 345 MHz and 915 MHz"; homepage = "https://github.com/merbanan/rtl_433"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ earldouglas ]; platforms = platforms.all; }; From fba93f57b445b8426e4cefd41c53970f016efa09 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sat, 15 May 2021 18:48:04 +0200 Subject: [PATCH 15/65] ttyd: 1.6.1 -> 1.6.3 This also adds support for libwebsockets 4.x. --- pkgs/servers/ttyd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/servers/ttyd/default.nix index 3ef571bc82a..8ef8c7a7c04 100644 --- a/pkgs/servers/ttyd/default.nix +++ b/pkgs/servers/ttyd/default.nix @@ -7,12 +7,12 @@ with builtins; stdenv.mkDerivation rec { pname = "ttyd"; - version = "1.6.1"; + version = "1.6.3"; src = fetchFromGitHub { owner = "tsl0922"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "1ifgw93g8jaaa6fgfqjnn83n5ccr6l72ynwwwa97hfwjk90r14fg"; + sha256 = "ErWd99js2EldkRNWFdgZw/X3DIz266kM3lLlC34Deno="; }; nativeBuildInputs = [ pkg-config cmake xxd ]; From b6595ab614a2ea69305c35cf6d11bc8694b9289e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 16 May 2021 09:52:53 +0300 Subject: [PATCH 16/65] pistol: 0.2.0 -> 0.2.1 --- pkgs/tools/misc/pistol/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix index b0a3d2d8cad..52c83abdf68 100644 --- a/pkgs/tools/misc/pistol/default.nix +++ b/pkgs/tools/misc/pistol/default.nix @@ -2,17 +2,19 @@ , buildGoModule , fetchFromGitHub , file +, installShellFiles +, asciidoctor }: buildGoModule rec { pname = "pistol"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "doronbehar"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c85XF1Glg6A7utPfXOv4LBesJy9+ErE2B+DO243mMhg="; + sha256 = "sha256-NUHk48P3kUx+e9BR9k9K/VaHnbZ6Do6RRf1S0974sO8="; }; vendorSha256 = "sha256-n98cjXsgg2w3shbZPnk3g7mBbzV5Tc3jd9ZtiRk1KUM="; @@ -24,6 +26,14 @@ buildGoModule rec { buildInputs = [ file ]; + nativeBuildInputs = [ + installShellFiles + asciidoctor + ]; + postBuild = '' + asciidoctor -b manpage -d manpage README.adoc + installManPage pistol.1 + ''; buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; From f1d61e1b4bc38ff1b2434fc94884b28476c62436 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sun, 16 May 2021 13:21:54 +0200 Subject: [PATCH 17/65] imagemagick6: 6.9.12.8 -> 6.9.12-12 --- pkgs/applications/graphics/ImageMagick/6.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index d6e97c5d682..cafad76c273 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "6.9.12-8"; + version = "6.9.12-12"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick6"; rev = version; - sha256 = "sha256-ZFCmoZOdZ3jbM5S90zBNiMGJKFylMLO0r3DB25wu3MM="; + sha256 = "sha256-yqMYuayQjPlTqi3+CtwP5CdsAGud/fHR0I2LwUPIq00="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From 16ccf81982f27b609173f7f630f5a47d775b6c12 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 16 May 2021 02:33:25 -0300 Subject: [PATCH 18/65] cardboard: 0.0.0-unstable=2021-01-21 -> 0.0.0+unstable=2021-05-10 --- pkgs/applications/window-managers/cardboard/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/cardboard/default.nix b/pkgs/applications/window-managers/cardboard/default.nix index ec4f738877b..17ef08af5e8 100644 --- a/pkgs/applications/window-managers/cardboard/default.nix +++ b/pkgs/applications/window-managers/cardboard/default.nix @@ -15,6 +15,7 @@ , mesa , meson , ninja +, pandoc , pixman , pkg-config , unzip @@ -56,18 +57,19 @@ let in stdenv.mkDerivation rec { pname = "cardboard"; - version = "0.0.0-unstable=2021-01-21"; + version = "0.0.0+unstable=2021-05-10"; src = fetchFromGitLab { owner = "cardboardwm"; repo = pname; - rev = "f2ef2ff076ddbbd23994553b8eff131f9bd0207f"; - hash = "sha256-43aqAWk4QoIP0BpRyPRDWFtVh/1UbrBoEeTDEF2gZX4="; + rev = "b54758d85164fb19468f5ca52588ebea576cd027"; + hash = "sha256-Kn5NyQSDyX7/nn2bKZPnsuepkoppi5XIkdu7IDy5r4w="; }; nativeBuildInputs = [ meson ninja + pandoc pkg-config unzip ]; @@ -101,6 +103,7 @@ stdenv.mkDerivation rec { # "Inherited" from Nixpkgs expression for wlroots mesonFlags = [ + "-Dman=true" "-Dwlroots:logind-provider=systemd" "-Dwlroots:libseat=disabled" ]; From ec7ed128a1ba4008b73d85d772312c09370ff609 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 May 2021 11:41:31 -0300 Subject: [PATCH 19/65] stilo-themes: 3.36-3 -> 3.38-1 --- pkgs/data/themes/stilo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/stilo/default.nix b/pkgs/data/themes/stilo/default.nix index 54d6f2a6e3c..bfcda049329 100644 --- a/pkgs/data/themes/stilo/default.nix +++ b/pkgs/data/themes/stilo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "stilo-themes"; - version = "3.36-3"; + version = "3.38-1"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "0haxzqxyfx3rc305w7f744fp2xb6j7yn28ldynnvmm47h7ga3as3"; + sha256 = "09xarzp0j0a8cqzcg0447jl5cgvl6ccj5f00dik1hy2nlrz7d8ad"; }; nativeBuildInputs = [ meson ninja sassc ]; From fe29880472b296ff472f9c20772786e371533bce Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 16 May 2021 13:24:22 +0200 Subject: [PATCH 20/65] cargo-c,rav1e: Remove myself as maintainer I'm not using rav1e anymore and we're now using svt-av1 for ffmpeg-full. --- pkgs/development/tools/rust/cargo-c/default.nix | 2 +- pkgs/tools/video/rav1e/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix index 8d12da30a6f..7db1ea7f374 100644 --- a/pkgs/development/tools/rust/cargo-c/default.nix +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -45,6 +45,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/lu-zero/cargo-c/releases/tag/v${version}"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index 16699e15ba6..b53938e36a3 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -49,6 +49,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/xiph/rav1e"; changelog = "https://github.com/xiph/rav1e/releases/tag/v${version}"; license = licenses.bsd2; - maintainers = [ maintainers.primeos ]; + maintainers = [ ]; }; } From de9e2ce42d7834cdc361cc8139ffb9b76643768d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 16 May 2021 20:36:16 +0200 Subject: [PATCH 21/65] yubikey-manager-qt: 1.1.5 -> 1.2.2 (#123118) --- .../tools/misc/yubikey-manager-qt/default.nix | 52 +++++++++++-------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index 02982f9cc4a..00e3ec1fbdc 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -1,53 +1,61 @@ { lib -, stdenv +, mkDerivation , fetchurl -, wrapQtAppsHook , pcsclite , pyotherside -, pythonPackages , python3 , qmake , qtbase , qtgraphicaleffects -, qtquickcontrols , qtquickcontrols2 , yubikey-manager , yubikey-personalization }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "yubikey-manager-qt"; - version = "1.1.5"; + version = "1.2.2"; src = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "1yimlaqvhq34gw6wkqgil0qq8x9zbfzh4psqihjr2d9jaa2wygwy"; + sha256 = "1jqibv7na9h2r8nxgzp40j9qpyiwx97c65krivkcqjwdjk5lrahl"; }; - nativeBuildInputs = [ wrapQtAppsHook python3.pkgs.wrapPython qmake ]; + nativeBuildInputs = [ + python3.pkgs.wrapPython + qmake + ]; postPatch = '' substituteInPlace ykman-gui/deployment.pri --replace '/usr/bin' "$out/bin" ''; - buildInputs = [ pythonPackages.python qtbase qtgraphicaleffects qtquickcontrols qtquickcontrols2 pyotherside ]; + buildInputs = [ + pyotherside + python3 + qtbase + qtgraphicaleffects + qtquickcontrols2 + ]; - pythonPath = [ yubikey-manager ]; + pythonPath = [ + (yubikey-manager.override { python3Packages = python3.pkgs; }) + ]; - dontWrapQtApps = true; postInstall = '' - buildPythonPath "$pythonPath" - - wrapQtApp $out/bin/ykman-gui \ - --prefix LD_LIBRARY_PATH : "${lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" \ - --prefix PYTHONPATH : "$program_PYTHONPATH" - - mkdir -p $out/share/applications - cp resources/ykman-gui.desktop $out/share/applications/ykman-gui.desktop - mkdir -p $out/share/ykman-gui/icons - cp resources/icons/*.{icns,ico,png,xpm} $out/share/ykman-gui/icons + install -Dt $out/share/applications resources/ykman-gui.desktop + install -Dt $out/share/ykman-gui/icons resources/icons/*.{icns,ico,png,xpm} substituteInPlace $out/share/applications/ykman-gui.desktop \ - --replace 'Exec=ykman-gui' "Exec=$out/bin/ykman-gui" \ + --replace 'Exec=ykman-gui' "Exec=$out/bin/ykman-gui" + ''; + + qtWrapperArgs = [ + "--prefix" "LD_LIBRARY_PATH" ":" (lib.makeLibraryPath [ pcsclite yubikey-personalization ]) + ]; + + preFixup = '' + buildPythonPath "$pythonPath" + qtWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH") ''; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1544ad8c68d..6dea4096416 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18289,9 +18289,7 @@ in yubikey-manager = callPackage ../tools/misc/yubikey-manager { }; - yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt { - pythonPackages = python3Packages; - }; + yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt { }; yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { }; From bf7b94061d734791254215c30d557400a55b879a Mon Sep 17 00:00:00 2001 From: schnusch Date: Sun, 16 May 2021 20:56:42 +0200 Subject: [PATCH 22/65] esbuild: 0.11.19 -> 0.11.23 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index cc1c250d94d..6c4dcb0492d 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.11.19"; + version = "0.11.23"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "1cg1qjjsbqr9xbgh8m48vkcb52vf64ycd5x86px60apr068y9df9"; + sha256 = "0m9dhmvysdla9scam367hxjgbzgg8mbf9mn385qqvbmyx3svxakn"; }; vendorSha256 = "1n5538yik72x94vzfq31qaqrkpxds5xys1wlibw2gn2am0z5c06q"; From 7051dd78ff0790dd0d627d7fdc2648cfc3c3f13a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 16 May 2021 21:17:48 +0200 Subject: [PATCH 23/65] kdeltachat: unstable-2021-05-03 -> unstable-2021-05-16 --- .../networking/instant-messengers/kdeltachat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index ae567daec36..295e6f3679b 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2021-05-03"; + version = "unstable-2021-05-16"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "dd7455764074c0864234a6a25ab6f87e8d5c3121"; - sha256 = "1vsy2jcisvf9mndxlwif3ghv1n2gz5ycr1qh72kgski38qan621v"; + rev = "670960e18a7e9a1d994f26af27a12c73a7413c9a"; + sha256 = "1k065pvz1p2wm1rvw4nlcmknc4z10ya4qfch5kz77bbhkf9vfw2l"; }; nativeBuildInputs = [ From 74b74b05550f258e9055b824eff49b15637dd917 Mon Sep 17 00:00:00 2001 From: fortune Date: Mon, 17 May 2021 03:29:15 +0800 Subject: [PATCH 24/65] river: add fortuneteller2k as maintainer (#123271) --- pkgs/applications/window-managers/river/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index a7331aa39af..b8b53027219 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { description = "A dynamic tiling wayland compositor"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ fortuneteller2k ]; }; } From dfb2d52a78ef79157f8aad5c4deae18373cf52cb Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 16 May 2021 21:45:55 +0200 Subject: [PATCH 25/65] angelscript: Make Darwin-compatible --- .../interpreters/angelscript/default.nix | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index 3fbd64467fe..9a6aae053f9 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, unzip}: +{ lib, stdenv, fetchurl, unzip, cmake }: let s = # Generated upstream information rec { @@ -12,25 +12,32 @@ let in stdenv.mkDerivation { inherit (s) name version; - nativeBuildInputs = [ unzip ]; + src = fetchurl { inherit (s) url sha256; }; + + nativeBuildInputs = [ unzip cmake ]; + preConfigure = '' - cd angelscript/projects/gnuc - export makeFlags="$makeFlags PREFIX=$out" + export ROOT=$PWD + cd angelscript/projects/cmake ''; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + postInstall = '' mkdir -p "$out/share/docs/angelscript" - cp -r ../../../docs/* "$out/share/docs/angelscript" + cp -r $ROOT/docs/* "$out/share/docs/angelscript" ''; - meta = { + + meta = with lib; { inherit (s) version; description = "Light-weight scripting library"; - license = lib.licenses.zlib ; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; - downloadPage = "http://www.angelcode.com/angelscript/downloads.html"; - homepage="http://www.angelcode.com/angelscript/"; + license = licenses.zlib; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.all; + downloadPage = "https://www.angelcode.com/angelscript/downloads.html"; + homepage = "https://www.angelcode.com/angelscript/"; }; } From 08ab7e10f3b5bfa0a87df22f764179ccebf21707 Mon Sep 17 00:00:00 2001 From: Elliot Cameron Date: Thu, 13 May 2021 20:31:00 -0400 Subject: [PATCH 26/65] go_2-dev: 2021-03-22 -> 2021-04-13 --- pkgs/development/compilers/go/2-dev.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/go/2-dev.nix b/pkgs/development/compilers/go/2-dev.nix index 21347cbd65a..4b541e8990e 100644 --- a/pkgs/development/compilers/go/2-dev.nix +++ b/pkgs/development/compilers/go/2-dev.nix @@ -39,12 +39,12 @@ in stdenv.mkDerivation rec { pname = "go2-unstable"; - version = "2021-03-22"; + version = "2021-04-13"; src = fetchgit { url = https://go.googlesource.com/go; - rev = "a4b4db4cdeefb7b4ea5adb09073dd123846b3588"; - sha256 = "sha256:1wqqnywcrfazydi5wcg04s6zgsfh4m879vxfgacgrnigd23ynhvr"; + rev = "9cd52cf2a93a958e8e001aea36886e7846c91f2f"; + sha256 = "sha256:0hybm93y4i4j7bs86y7h73nc1wqnspkq75if7n1032zf9bs8sm96"; }; # perl is used for testing go vet From 2142f885261a690a17a9e208b4cff270c6e3386a Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Mon, 10 May 2021 12:01:10 +0200 Subject: [PATCH 27/65] nixos/containerd: sanitize StateDirectory and RuntimeDirectory --- nixos/modules/services/cluster/kubernetes/default.nix | 6 +++--- nixos/modules/services/cluster/kubernetes/kubelet.nix | 2 +- nixos/modules/virtualisation/containerd.nix | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index 19edc338bba..0dc3649237b 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -7,12 +7,12 @@ let defaultContainerdConfigFile = pkgs.writeText "containerd.toml" '' version = 2 - root = "/var/lib/containerd/daemon" - state = "/var/run/containerd/daemon" + root = "/var/lib/containerd" + state = "/run/containerd" oom_score = 0 [grpc] - address = "/var/run/containerd/containerd.sock" + address = "/run/containerd/containerd.sock" [plugins."io.containerd.grpc.v1.cri"] sandbox_image = "pause:latest" diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index a428a60800c..fcfcc843547 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -134,7 +134,7 @@ in containerRuntimeEndpoint = mkOption { description = "Endpoint at which to find the container runtime api interface/socket"; type = str; - default = "unix:///var/run/containerd/containerd.sock"; + default = "unix:///run/containerd/containerd.sock"; }; enable = mkEnableOption "Kubernetes kubelet."; diff --git a/nixos/modules/virtualisation/containerd.nix b/nixos/modules/virtualisation/containerd.nix index 194276d1695..6d6ba454bd8 100644 --- a/nixos/modules/virtualisation/containerd.nix +++ b/nixos/modules/virtualisation/containerd.nix @@ -54,6 +54,9 @@ in LimitNOFILE = "infinity"; TasksMax = "infinity"; OOMScoreAdjust = "-999"; + + StateDirectory = "containerd"; + RuntimeDirectory = "containerd"; }; }; }; From 7e310dd8e82cbbaae9132756d7da9bf85ad10ab3 Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Mon, 10 May 2021 12:08:56 +0200 Subject: [PATCH 28/65] nixos/containerd: StartLimit* options must be in the unit-section also, raise limits to ensure reasonable startup time, now that StartLimits are actually enforced --- nixos/modules/virtualisation/containerd.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/virtualisation/containerd.nix b/nixos/modules/virtualisation/containerd.nix index 6d6ba454bd8..b554bc6ea24 100644 --- a/nixos/modules/virtualisation/containerd.nix +++ b/nixos/modules/virtualisation/containerd.nix @@ -44,9 +44,7 @@ in KillMode = "process"; Type = "notify"; Restart = "always"; - RestartSec = "5"; - StartLimitBurst = "8"; - StartLimitIntervalSec = "120s"; + RestartSec = "10"; # "limits" defined below are adopted from upstream: https://github.com/containerd/containerd/blob/master/containerd.service LimitNPROC = "infinity"; @@ -58,6 +56,10 @@ in StateDirectory = "containerd"; RuntimeDirectory = "containerd"; }; + unitConfig = { + StartLimitBurst = "16"; + StartLimitIntervalSec = "120s"; + }; }; }; } From 0b95e8cbfaf1b00809cb713d8dfb76bdc2861102 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 May 2021 09:45:41 +0000 Subject: [PATCH 29/65] conmon: 2.0.27 -> 2.0.28 --- pkgs/applications/virtualization/conmon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index 5e84b883b6e..2736d28f839 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.0.27"; + version = "2.0.28"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LMvhSoKd652XVPzuId8Ortf0f08FUP1zCn06PgtRwkA="; + sha256 = "sha256-lwR+XoB1LoW/pLjmvExUJKGnAqFhvcDs3sEKkw6pv48="; }; nativeBuildInputs = [ pkg-config ]; From 7f56f38051938bbfe9f16546ae830df15cc61ac6 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 16 May 2021 22:22:10 +0200 Subject: [PATCH 30/65] wiiuse: Make Darwin-compatible --- pkgs/development/libraries/wiiuse/default.nix | 15 ++++++++++----- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/wiiuse/default.nix b/pkgs/development/libraries/wiiuse/default.nix index 738c6a43008..d5d34fb618d 100644 --- a/pkgs/development/libraries/wiiuse/default.nix +++ b/pkgs/development/libraries/wiiuse/default.nix @@ -2,8 +2,10 @@ , stdenv , fetchFromGitHub , cmake -, pkg-config , bluez +, libobjc +, Foundation +, IOBluetooth }: stdenv.mkDerivation rec { @@ -19,15 +21,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ (lib.getDev bluez) ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ bluez ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc Foundation IOBluetooth ]; - cmakeFlags = [ "-DBUILD_EXAMPLE_SDL=NO" ]; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ bluez ]; + + cmakeFlags = [ "-DBUILD_EXAMPLE_SDL=OFF" ]; meta = with lib; { description = "Feature complete cross-platform Wii Remote access library"; - license = licenses.gpl3; + license = licenses.gpl3Plus; homepage = "https://github.com/wiiuse/wiiuse"; maintainers = with maintainers; [ shamilton ]; - platforms = with platforms; linux; + platforms = with platforms; unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c1240f0285..9d435023fe1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9680,7 +9680,10 @@ in whsniff = callPackage ../applications/networking/sniffers/whsniff { }; - wiiuse = callPackage ../development/libraries/wiiuse { }; + wiiuse = callPackage ../development/libraries/wiiuse { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) Foundation IOBluetooth; + }; woeusb = callPackage ../tools/misc/woeusb { }; From f2a29c1ee93b9f0ab9077704f5e1699b964b1978 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 16 May 2021 22:24:34 +0200 Subject: [PATCH 31/65] superTuxKart: Make Darwin-compatible --- pkgs/games/super-tux-kart/default.nix | 33 +++++++++++++++++++-------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index 7998e13817d..3589e10e7a5 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -9,18 +9,19 @@ , SDL2 , glew , openal +, OpenAL , libvorbis , libogg , curl , freetype -, bluez , libjpeg , libpng -, enet , harfbuzz , mcpp , wiiuse , angelscript +, Cocoa +, IOKit }: let dir = "stk-code"; @@ -82,10 +83,14 @@ stdenv.mkDerivation rec { }) ]; - # Deletes all bundled libs in stk-code/lib except those - # That couldn't be replaced with system packages postPatch = '' + # Deletes all bundled libs in stk-code/lib except those + # That couldn't be replaced with system packages find lib -maxdepth 1 -type d | egrep -v "^lib$|${(lib.concatStringsSep "|" bundledLibraries)}" | xargs -n1 -L1 -r -I{} rm -rf {} + + # Allow building with system-installed wiiuse on Darwin + substituteInPlace CMakeLists.txt \ + --replace 'NOT (APPLE OR HAIKU)) AND USE_SYSTEM_WIIUSE' 'NOT (HAIKU)) AND USE_SYSTEM_WIIUSE' ''; nativeBuildInputs = [ cmake pkg-config makeWrapper ]; @@ -93,20 +98,19 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 glew - openal libvorbis libogg freetype curl - bluez libjpeg libpng - enet harfbuzz mcpp wiiuse ] - ++ lib.optional (!stdenv.hostPlatform.isAarch64) angelscript; + ++ lib.optional (!stdenv.hostPlatform.isAarch64) angelscript + ++ lib.optional stdenv.hostPlatform.isLinux openal + ++ lib.optionals stdenv.hostPlatform.isDarwin [ OpenAL IOKit Cocoa ]; cmakeFlags = [ "-DBUILD_RECORDER=OFF" # libopenglrecorder is not in nixpkgs @@ -117,9 +121,18 @@ stdenv.mkDerivation rec { "-DOpenGL_GL_PREFERENCE=GLVND" ]; + # Extract binary from built app bundle + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir $out/bin + mv $out/{supertuxkart.app/Contents/MacOS,bin}/supertuxkart + rm -rf $out/supertuxkart.app + ''; + # Obtain the assets directly from the fetched store path, to avoid duplicating assets across multiple engine builds preFixup = '' - wrapProgram $out/bin/supertuxkart --set-default SUPERTUXKART_ASSETS_DIR "${assets}" + wrapProgram $out/bin/supertuxkart \ + --set-default SUPERTUXKART_ASSETS_DIR "${assets}" \ + --set-default SUPERTUXKART_DATADIR "$out/share/supertuxkart" \ ''; meta = with lib; { @@ -132,7 +145,7 @@ stdenv.mkDerivation rec { homepage = "https://supertuxkart.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pyrolagus peterhoeg ]; - platforms = with platforms; linux; + platforms = with platforms; unix; changelog = "https://github.com/supertuxkart/stk-code/blob/${version}/CHANGELOG.md"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d435023fe1..08ab140da49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28502,7 +28502,9 @@ in superTux = callPackage ../games/supertux { }; - superTuxKart = callPackage ../games/super-tux-kart { }; + superTuxKart = callPackage ../games/super-tux-kart { + inherit (darwin.apple_sdk.frameworks) Cocoa IOKit OpenAL; + }; synthv1 = libsForQt5.callPackage ../applications/audio/synthv1 { }; From 81ffbb808ac4dc8c8258285d9a7a0d7e8b76514f Mon Sep 17 00:00:00 2001 From: Imran Hossain Date: Sun, 16 May 2021 16:32:07 -0400 Subject: [PATCH 32/65] zotero: 5.0.96 -> 5.0.96.2 --- pkgs/applications/office/zotero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 99fd54c5cc7..53f021344d8 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "5.0.96"; + version = "5.0.96.2"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "sha256-W8Iu8UoTqC3aK7lB4bq1L7cNmjaEvjEK+ODcZ9kk3f8="; + sha256 = "sha256-ZT+qxNLjdG29DhyV0JXtgDHDi2gYPyKrZwgJOro5III="; }; nativeBuildInputs = [ wrapGAppsHook ]; From 06741b34d8d7a2805e07d23b6f201b8f1a6e63a7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 May 2021 13:50:14 -0700 Subject: [PATCH 33/65] hashcat: 6.1.1 -> 6.2.1 (#123256) --- pkgs/tools/security/hashcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index ba46fbde2d6..f3e61835421 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "hashcat"; - version = "6.1.1"; + version = "6.2.1"; src = fetchurl { url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; - sha256 = "104z63m7lqbb0sdrxhf9yi15l4a9zwf9m6zs9dbb3gf0nfxl1h9r"; + sha256 = "sha256-SZTp7o7wUIgdXHmGsrlaOr8hFPeeTbqiilN/jirVyTs="; }; nativeBuildInputs = [ makeWrapper ]; From 1e85864c6f7afe8ba44ee0cde0ad29f9ab80c137 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 17 May 2021 06:12:50 +1000 Subject: [PATCH 34/65] youtube-dl: 2021.04.26 -> 2021.05.16 https://github.com/ytdl-org/youtube-dl/releases/tag/2021.05.16 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 3baad9f939b..e5b8d79eeb6 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2021.04.26"; + version = "2021.05.16"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0jpa65jr5djn9175p6a8j9i1zgarshfwfsgmprc0vvnsl3s23ksc"; + sha256 = "1z8sdzvkxhscnzy7cnjag308glif0k8jylr11biqwzypm1f2l0fl"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; From a5d04b89fd5238f0e38ef87de4678e378761d67b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 16 May 2021 13:21:14 -0700 Subject: [PATCH 35/65] azure-cli: fix build Older version of pyjwt has a test which doesn't fully agree with the new cryptography's output. However, azure-cli-core tests this, so we are relatively safe to disable tests for the pinned pyjwt package. --- pkgs/tools/admin/azure-cli/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 87580a6e3b9..421aa3da4a4 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -457,6 +457,10 @@ let inherit version; sha256 = "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd"; }; + + # new cryptography returns slightly different values than what's expected + # this gets tested in azure-cli-core, so not absolutely necessary to run tests here + doCheck = false; }); knack = super.knack.overridePythonAttrs(oldAttrs: rec { From 245070134f670feab40696464ae63d733645befc Mon Sep 17 00:00:00 2001 From: Jakob Klepp Date: Sat, 15 May 2021 11:56:22 +0200 Subject: [PATCH 36/65] plantuml-server: 1.2020.14 -> 1.2021.6 --- pkgs/tools/misc/plantuml-server/default.nix | 26 +++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/tools/misc/plantuml-server/default.nix index ad0ffa810cd..f0176afa4b9 100644 --- a/pkgs/tools/misc/plantuml-server/default.nix +++ b/pkgs/tools/misc/plantuml-server/default.nix @@ -1,30 +1,34 @@ -{ lib, stdenv, fetchFromGitHub, maven, jdk }: +{ lib, stdenv, fetchFromGitHub, maven, jdk8_headless }: let - version = "1.2020.14"; + version = "1.2021.6"; src = fetchFromGitHub { owner = "plantuml"; repo = "plantuml-server"; rev = "v${version}"; - sha256 = "08g6ddpkly5yhjhw7gpsanyspar1752jy9cypwxsqrdzqrv738b8"; + sha256 = "sha256:1v69vabdq9pv75wzb6n5s198iy5ijfcx6lgjqwxz7n5ns3blf6sz"; }; # perform fake build to make a fixed-output derivation out of the files downloaded from maven central deps = stdenv.mkDerivation { name = "plantuml-server-${version}-deps"; inherit src; - buildInputs = [ jdk maven ]; + nativeBuildInputs = [ jdk8_headless maven ]; buildPhase = '' + runHook preBuild + while mvn package -Dmaven.repo.local=$out/.m2; [ $? = 1 ]; do echo "timeout, restart maven to continue downloading" done + + runHook postBuild ''; # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1wwgyjalhlj5azggs9vvsrr54pg7gl8p36pgf6pk12rsszzl7a97"; + outputHash = "sha256:1fvir7yvg4a4dc4kiv2d5q081cygj7s2lmxj90j8zzkggyq7v8zh"; }; in @@ -33,25 +37,33 @@ stdenv.mkDerivation rec { inherit version; inherit src; - buildInputs = [ jdk maven ]; + nativeBuildInputs = [ jdk8_headless maven ]; buildPhase = '' + runHook preBuild + # 'maven.repo.local' must be writable so copy it out of nix store cp -R $src repo chmod +w -R repo cd repo mvn package --offline -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p "$out/webapps" cp "target/plantuml.war" "$out/webapps/plantuml.war" + + runHook postInstall ''; meta = with lib; { description = "A web application to generate UML diagrams on-the-fly."; homepage = "https://plantuml.com/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ truh ]; }; From 454df730b638d051e157b61950b328b389451589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Sat, 15 May 2021 23:01:12 +0200 Subject: [PATCH 37/65] gping: fix darwin build --- pkgs/tools/networking/gping/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix index 33ea36da38a..6b7e0e0b4e2 100644 --- a/pkgs/tools/networking/gping/default.nix +++ b/pkgs/tools/networking/gping/default.nix @@ -1,6 +1,8 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub +, libiconv }: rustPlatform.buildRustPackage rec { @@ -16,6 +18,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-2PxhtAqROgufVGGH7VtEJJU6Sa2OrGbbMVRUWYbAD0Q="; + buildInputs = lib.optional stdenv.isDarwin libiconv; + meta = with lib; { description = "Ping, but with a graph"; homepage = "https://github.com/orf/gping"; From de658376785cf7120957f8adeeb70855ef405e6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Sat, 15 May 2021 23:06:04 +0200 Subject: [PATCH 38/65] gptman: fix darwin build --- pkgs/tools/system/gptman/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/gptman/default.nix b/pkgs/tools/system/gptman/default.nix index 5209856edeb..648b68bcbc4 100644 --- a/pkgs/tools/system/gptman/default.nix +++ b/pkgs/tools/system/gptman/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv }: rustPlatform.buildRustPackage rec { pname = "gptman"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1cp8cyrd7ab8r2j28b69c2p3ysix5b9hpsqk07cmzgqwwml0qj12"; + buildInputs = lib.optional stdenv.isDarwin libiconv; + meta = with lib; { description = "A CLI tool for Linux to copy a partition from one disk to another and more."; homepage = "https://github.com/cecton/gptman"; From 523572c9f396f85ff2cdd02852e8e2f6d7b690f0 Mon Sep 17 00:00:00 2001 From: "J. Neto" Date: Sat, 15 May 2021 21:41:15 -0300 Subject: [PATCH 39/65] s3ql: 3.3.2 -> 3.7.2 --- pkgs/tools/backup/s3ql/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix index 70394afb50e..f67b5467078 100644 --- a/pkgs/tools/backup/s3ql/default.nix +++ b/pkgs/tools/backup/s3ql/default.nix @@ -2,19 +2,19 @@ python3Packages.buildPythonApplication rec { pname = "s3ql"; - version = "3.3.2"; + version = "3.7.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "release-${version}"; - sha256 = "1x0xj8clfs8fdczn8skc2wag5i4z47bsvlczn22iaf20hll1bb2w"; + sha256 = "11f8k5vzfq69slzv17vddj135mzlcpmcj3cj3bigq717qb8vd6wl"; }; - checkInputs = [ which ] ++ (with python3Packages; [ cython pytest ]); + checkInputs = [ which ] ++ (with python3Packages; [ cython pytest pytest-trio ]); propagatedBuildInputs = with python3Packages; [ - sqlite apsw pycrypto requests defusedxml dugong llfuse - cython pytest pytest-catchlog google-auth google-auth-oauthlib + sqlite apsw pycrypto requests defusedxml dugong + google-auth google-auth-oauthlib trio pyfuse3 ]; preBuild = '' From 82f66a4050c1e2a3278b10d0594ef3cdcc16c2a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Sun, 16 May 2021 10:08:13 +0200 Subject: [PATCH 40/65] handlr: fix darwin build --- pkgs/tools/misc/handlr/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/handlr/default.nix b/pkgs/tools/misc/handlr/default.nix index c8143ea330a..a2dfe7feafc 100644 --- a/pkgs/tools/misc/handlr/default.nix +++ b/pkgs/tools/misc/handlr/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, shared-mime-info }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, shared-mime-info, libiconv }: rustPlatform.buildRustPackage rec { pname = "handlr"; @@ -14,6 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-xDQV8wVlzItz0lzR1nVRPVsg7nSf/khUhevDlGgSO3g="; nativeBuildInputs = [ shared-mime-info ]; + buildInputs = lib.optional stdenv.isDarwin libiconv; preCheck = '' export HOME=$TEMPDIR From 40c346de466d83a25d7750686c5b96ddfc6476c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Sun, 16 May 2021 11:14:44 +0200 Subject: [PATCH 41/65] heimdall-gui: fix darwin build --- pkgs/tools/misc/heimdall/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index 41b6adb7bfa..e934bbb5c84 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -31,7 +31,11 @@ mkDerivation { substituteInPlace libpit/CMakeLists.txt --replace "-std=gnu++11" "" ''; - installPhase = '' + installPhase = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv bin/heimdall-frontend.app $out/Applications/heimdall-frontend.app + wrapQtApp $out/Applications/heimdall-frontend.app/Contents/MacOS/heimdall-frontend + '' + '' mkdir -p $out/{bin,share/doc/heimdall,lib/udev/rules.d} install -m755 -t $out/bin bin/* install -m644 -t $out/lib/udev/rules.d ../heimdall/60-heimdall.rules From 9716355b45f47fc3069cc9c5dbedc50fdc4793cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Sun, 16 May 2021 13:35:14 +0200 Subject: [PATCH 42/65] inform6: fix darwin build --- pkgs/development/compilers/inform6/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/inform6/default.nix b/pkgs/development/compilers/inform6/default.nix index f0c182f0207..950bafa67d9 100644 --- a/pkgs/development/compilers/inform6/default.nix +++ b/pkgs/development/compilers/inform6/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "PREFIX=${placeholder "out"}" + ]; meta = with lib; { description = "Interactive fiction compiler and libraries"; From a5bff380e60bcb56ed69407e7e27b45385061007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Sun, 16 May 2021 21:36:23 +0200 Subject: [PATCH 43/65] krapslog: fix darwin build --- pkgs/tools/misc/krapslog/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/krapslog/default.nix b/pkgs/tools/misc/krapslog/default.nix index ba6f92cc0fc..a5cbbc87770 100644 --- a/pkgs/tools/misc/krapslog/default.nix +++ b/pkgs/tools/misc/krapslog/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv }: rustPlatform.buildRustPackage rec { pname = "krapslog"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-rcLsqMegCos+v0OkdRvH9xoopE7R/njEUVteMY/6mj8="; + buildInputs = lib.optional stdenv.isDarwin libiconv; + meta = with lib; { description = "Visualize a log file with sparklines"; homepage = "https://github.com/acj/krapslog-rs"; From dc2efe7680a1bb45dac415a5918acb744ef92a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Sun, 16 May 2021 21:54:33 +0200 Subject: [PATCH 44/65] libacr38u: fix darwin build --- pkgs/tools/security/libacr38u/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/libacr38u/default.nix b/pkgs/tools/security/libacr38u/default.nix index 314abba853d..0acb7e8bb1a 100644 --- a/pkgs/tools/security/libacr38u/default.nix +++ b/pkgs/tools/security/libacr38u/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, pcsclite , libusb-compat-0_1 }: +{ lib, stdenv, fetchurl, pkg-config, pcsclite , libusb-compat-0_1, IOKit }: stdenv.mkDerivation { version = "1.7.11"; @@ -12,7 +12,8 @@ stdenv.mkDerivation { doCheck = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pcsclite libusb-compat-0_1 ]; + buildInputs = [ pcsclite libusb-compat-0_1 ] + ++ lib.optional stdenv.isDarwin IOKit; preBuild = '' makeFlagsArray=(usbdropdir="$out/pcsc/drivers"); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c1240f0285..5f27e342b0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15439,7 +15439,9 @@ in libaccounts-glib = callPackage ../development/libraries/libaccounts-glib { }; - libacr38u = callPackage ../tools/security/libacr38u { }; + libacr38u = callPackage ../tools/security/libacr38u { + inherit (darwin.apple_sdk.frameworks) IOKit; + }; libadwaita = callPackage ../development/libraries/libadwaita { }; From 2412b97e181b31338839122762fd7b41e10d74fe Mon Sep 17 00:00:00 2001 From: sophrosyne97 Date: Sun, 16 May 2021 15:10:06 -0400 Subject: [PATCH 45/65] nfstrace: fix build error --- pkgs/tools/networking/nfstrace/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/networking/nfstrace/default.nix b/pkgs/tools/networking/nfstrace/default.nix index a1bf83726d2..ca75e50fa52 100644 --- a/pkgs/tools/networking/nfstrace/default.nix +++ b/pkgs/tools/networking/nfstrace/default.nix @@ -16,6 +16,12 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/debian/nfstrace/raw/debian/0.4.3.1-3/debian/patches/reproducible_build.patch"; sha256 = "0fd96r8xi142kjwibqkd46s6jwsg5kfc5v28bqsj9rdlc2aqmay5"; }) + # Fixes build failure with gcc-10 + # Related PR https://github.com/epam/nfstrace/pull/42/commits/4562a895ed3ac0e811bdd489068ad3ebe4d7b501 + (fetchpatch { + url = "https://github.com/epam/nfstrace/commit/4562a895ed3ac0e811bdd489068ad3ebe4d7b501.patch"; + sha256 = "1fbicbllyykjknik7asa81x0ixxmbwqwkiz74cnznagv10jlkj3p"; + }) ]; postPatch = '' From 195ee1e14b6356f81f53505dc8a03875fc369df0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 May 2021 15:49:47 +0200 Subject: [PATCH 46/65] python3Packages.hsluv: init at 5.0.2 --- .../python-modules/hsluv/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/hsluv/default.nix diff --git a/pkgs/development/python-modules/hsluv/default.nix b/pkgs/development/python-modules/hsluv/default.nix new file mode 100644 index 00000000000..b6573db5326 --- /dev/null +++ b/pkgs/development/python-modules/hsluv/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "hsluv"; + version = "5.0.2"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "hsluv"; + repo = "hsluv-python"; + rev = "v${version}"; + sha256 = "0r0w8ycjwfg3pmzjghzrs0lkam93fzvgiqvrwh3nl9jnqlpw7v7j"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "hsluv" ]; + + meta = with lib; { + description = "Python implementation of HSLuv"; + homepage = "https://github.com/hsluv/hsluv-python"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9ca7815c3b8..857c01e617e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3113,6 +3113,8 @@ in { hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { }; + hsluv = callPackage ../development/python-modules/hsluv { }; + hstspreload = callPackage ../development/python-modules/hstspreload { }; html2text = callPackage ../development/python-modules/html2text { }; From ba2cac52bdfbc8dd661104f94b68e56a16a941fb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 May 2021 16:02:02 +0200 Subject: [PATCH 47/65] python3Packages.Nikola: fix build --- .../python-modules/Nikola/default.nix | 139 +++++++++++------- 1 file changed, 86 insertions(+), 53 deletions(-) diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index d8c49c99eba..17a6e4d6a89 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -1,79 +1,112 @@ { lib -, stdenv +, aiohttp +, Babel +, blinker , buildPythonPackage -, isPy3k -, fetchPypi -, doit -, glibcLocales -, pytest -, pytestcov -, mock -, pygments -, pillow , dateutil , docutils -, Mako -, unidecode -, lxml -, Yapsy -, PyRSS2Gen -, Logbook -, blinker -, natsort -, requests -, piexif -, markdown -, phpserialize -, jinja2 -, Babel +, doit +, fetchPypi , freezegun -, toml +, ghp-import +, hsluv +, html5lib +, ipykernel +, jinja2 +, lxml +, Mako +, markdown +, micawber +, mock +, natsort , notebook +, phpserialize +, piexif +, pillow +, pygal +, pygments +, pyphen +, PyRSS2Gen +, pytestCheckHook +, pythonOlder +, requests , ruamel_yaml -, aiohttp +, stdenv +, toml +, typogrify +, unidecode , watchdog +, Yapsy }: buildPythonPackage rec { pname = "Nikola"; version = "8.1.3"; - - # Nix contains only Python 3 supported version of doit, which is a dependency - # of Nikola. Python 2 support would require older doit 0.29.0 (which on the - # other hand doesn't support Python 3.3). So, just disable Python 2. - disabled = !isPy3k; - - checkInputs = [ pytest pytestcov mock glibcLocales freezegun ]; - - propagatedBuildInputs = [ - # requirements.txt - doit pygments pillow dateutil docutils Mako markdown unidecode - lxml Yapsy PyRSS2Gen Logbook blinker natsort requests piexif Babel - # requirements-extras.txt - phpserialize jinja2 toml notebook ruamel_yaml aiohttp watchdog - ]; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; sha256 = "05eac356bb4273cdd05d2dd6ad676226133496c457af91987c3f0d40e2fe57ef"; }; - patchPhase = '' - # upstream added bound so that requires.io doesn't send mails about update - # nikola should work with markdown 3.0: https://github.com/getnikola/nikola/pull/3175#issue-220147596 - sed -i 's/Markdown>.*/Markdown/' requirements.txt + propagatedBuildInputs = [ + aiohttp + Babel + blinker + dateutil + docutils + doit + ghp-import + hsluv + html5lib + ipykernel + jinja2 + lxml + Mako + markdown + micawber + natsort + notebook + phpserialize + piexif + pillow + pygal + pygments + pyphen + PyRSS2Gen + requests + ruamel_yaml + toml + typogrify + unidecode + watchdog + Yapsy + ]; + + checkInputs = [ + freezegun + mock + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov nikola --cov-report term-missing" "" ''; - checkPhase = '' - LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" py.test . - ''; + disabledTests = [ + # AssertionError + "test_compiling_markdown" + ]; - meta = { + pythonImportsCheck = [ "nikola" ]; + + meta = with lib; { + description = "Static website and blog generator"; homepage = "https://getnikola.com/"; - description = "A modular, fast, simple, static website and blog generator"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ jluttine ]; - # all tests fail + license = licenses.mit; + maintainers = with maintainers; [ jluttine ]; + # All tests fail broken = stdenv.isDarwin; }; } From a58b32743baedbf6cad6ce7ec4e7c99d69a414a6 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 16 May 2021 14:25:21 -0400 Subject: [PATCH 48/65] vimPlugins.indent-blankline-nvim-lua: init at 2021-04-28 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 8d80f3e9b18..475039066dd 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2013,6 +2013,18 @@ let meta.homepage = "https://github.com/haya14busa/incsearch.vim/"; }; + indent-blankline-nvim-lua = buildVimPluginFrom2Nix { + pname = "indent-blankline-nvim-lua"; + version = "2021-04-28"; + src = fetchFromGitHub { + owner = "lukas-reineke"; + repo = "indent-blankline.nvim"; + rev = "ec5816267caa5fdde7a5e5a8359b9b19bc8ecf49"; + sha256 = "008q3rg6fz36k334ci30f1vci9hws4y04z8gr4wnq9q8qx57y7nh"; + }; + meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; + }; + indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline-nvim"; version = "2021-03-06"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index ec322def0c0..b40344ead69 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -328,6 +328,7 @@ LucHermitte/lh-vim-lib ludovicchabant/vim-gutentags ludovicchabant/vim-lawrencium lukas-reineke/indent-blankline.nvim +lukas-reineke/indent-blankline.nvim@lua as indent-blankline-nvim-lua lukaszkorecki/workflowish lumiliet/vim-twig luochen1990/rainbow From 2b467919c1d53270a3a14431683b78ebb922b830 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 May 2021 13:33:02 +0200 Subject: [PATCH 49/65] python3Packages.pyupgrade: 2.12.0 -> 2.16.0 --- pkgs/development/python-modules/pyupgrade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index 8cd250f6e01..93fd8403be7 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.12.0"; + version = "2.16.0"; disabled = isPy27; src = fetchFromGitHub { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pAZszyv7jXEwtQYzEk5Zq2ULP0K2vX0y6IvR6wYsJ9c="; + sha256 = "sha256-U1Ak0oGy0FxBMqRM2A3N7VuNDz2aUW4FFW+hKKhjfdk="; }; checkInputs = [ pytestCheckHook ]; From abd6f00001710347d56e14e1928876c166e2c9df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 14 May 2021 18:22:27 +0200 Subject: [PATCH 50/65] python3Packages.torchvision-bin: init at 0.9.1 This derivation can be used in conjunction with pytorch-bin to avoid the long build time of PyTorch/TorchVision CUDA builds. --- .../python-modules/torchvision/bin.nix | 59 +++++++++++++++++++ .../torchvision/binary-hashes.nix | 22 +++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 83 insertions(+) create mode 100644 pkgs/development/python-modules/torchvision/bin.nix create mode 100644 pkgs/development/python-modules/torchvision/binary-hashes.nix diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix new file mode 100644 index 00000000000..62980dcca8c --- /dev/null +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchurl +, isPy37 +, isPy38 +, isPy39 +, patchelf +, pillow +, python +, pytorch-bin +}: + +let + pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; + srcs = import ./binary-hashes.nix version; + unsupported = throw "Unsupported system"; + version = "0.9.1"; +in buildPythonPackage { + inherit version; + + pname = "torchvision"; + + format = "wheel"; + + src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; + + disabled = !(isPy37 || isPy38 || isPy39); + + nativeBuildInputs = [ + patchelf + ]; + + propagatedBuildInputs = [ + pillow + pytorch-bin + ]; + + pythonImportsCheck = [ "torchvision" ]; + + postFixup = let + rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib ]; + in '' + # Note: after patchelf'ing, libcudart can still not be found. However, this should + # not be an issue, because PyTorch is loaded before torchvision and brings + # in the necessary symbols. + patchelf --set-rpath "${rpath}:${pytorch-bin}/${python.sitePackages}/torch/lib:" \ + "$out/${python.sitePackages}/torchvision/_C.so" + ''; + + meta = with lib; { + description = "PyTorch vision library"; + homepage = "https://pytorch.org/"; + changelog = "https://github.com/pytorch/vision/releases/tag/v${version}"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix new file mode 100644 index 00000000000..b9a991e24ab --- /dev/null +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -0,0 +1,22 @@ +# Warning: use the same CUDA version as pytorch-bin. +# +# Precompiled wheels can be found at: +# https://download.pytorch.org/whl/torch_stable.html + +version: { + x86_64-linux-37 = { + name = "torchvision-${version}-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu111/torchvision-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-7EMVB8KZg2I3P4RqnIVk/7OOAPA1OWOipns58cSCUrw="; + }; + x86_64-linux-38 = { + name = "torchvision-${version}-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu111/torchvision-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-VjsCBW9Lusr4aDQLqaFh5dpV/5ZJ5PDs7nY4CbCHDTA="; + }; + x86_64-linux-39 = { + name = "torchvision-${version}-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu111/torchvision-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-pzR7TBE+WcAmozskoeOVBuMkGJf9tvsaXsUkTcu86N8="; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 857c01e617e..21eacfb16c2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8225,6 +8225,8 @@ in { torchvision = callPackage ../development/python-modules/torchvision { }; + torchvision-bin = callPackage ../development/python-modules/torchvision/bin.nix { }; + tornado = callPackage ../development/python-modules/tornado { }; # Used by circus and grab-site, 2020-08-29 From 64bb7a00ba2a71662017401aaf61684284b7c5e2 Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Sun, 16 May 2021 13:46:51 +0000 Subject: [PATCH 51/65] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 162 ++++++++++++++-------------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 475039066dd..aa65a6a4f6a 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -89,12 +89,12 @@ let aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2021-04-25"; + version = "2021-05-15"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "9cf0d261a5fb24908f6cc7588f568646dce3d712"; - sha256 = "051s3nxil63gl3y6xj047c8ifxpra1xqlp3bic3x2ww1fb3wpjz3"; + rev = "d1c07000f95825579f00e24077e65387fc1db0d6"; + sha256 = "1n1vs0n596mg82kmhmscfy983di6h86mhangs6rk3zdyhzyjax5b"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -245,12 +245,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2021-02-26"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "1ed59bff2a84e48e1a243a7e5d336a395f610e2a"; - sha256 = "1acz9zwb9mwyhfckpzv22dy5c4bq83jrmvvbd22z9k0hm5py2538"; + rev = "39f8083c885149f52712b65b8d5380d63939bc23"; + sha256 = "1kc8lszdc4gglf5pyp7g6kb4kspml8rd41jv083p29ipwy9n8a8j"; }; meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; @@ -401,12 +401,12 @@ let chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-05-15"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "17ff080bd699dabc9e5735d950e2081eb5da4022"; - sha256 = "0l70y8zzxa761hwgcwviqpa54wgxdbbhabfs39pv7s2871xqkng5"; + rev = "544df784d1cba98a50e985f2c766b21321c9788c"; + sha256 = "027ss037if1p0a4s4x93p8ydkm77m1gsra38j2j0cgz0qmw6rpf0"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -702,12 +702,12 @@ let conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2021-04-25"; + version = "2021-05-15"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "b7cc8a2e0936f3069235ed312fb89ff2a5390660"; - sha256 = "0bxbisyzpp9rrakzqp3kqx61yzgcqvg90qll76vx7s6mxp0qz9rw"; + rev = "5d3b1afe96d11f059016d0b556f2797b54af916e"; + sha256 = "0f4ms7c3bffak9dpx0c5wgq2asbg7xavr70cwsmxf0fifpacahhs"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -942,12 +942,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-05-14"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "f34db320ae8d31d6264112fe04283822df68f2e3"; - sha256 = "0nb9lh5yc1a5yhw1hih33nkvhspmzpskz61s82azx0hccafcazn9"; + rev = "b78ff508cdb2427c396d66b5fbc24321148f53ab"; + sha256 = "1gbdbclc0kyfdqvy9rz15s0swcv07cpijriwnsbdjskiw7936qpp"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -2424,12 +2424,12 @@ let lispdocs-nvim = buildVimPluginFrom2Nix { pname = "lispdocs-nvim"; - version = "2021-04-14"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "tami5"; repo = "lispdocs.nvim"; - rev = "5225b347a722ba54ce3744364a3e0ff2939743cd"; - sha256 = "0x4nshkizivjz5ldb3scsxxi6x379g3rfpiplsixcs6bpxkib166"; + rev = "69fbcd854e9600b0f2c6f1c9ec4cb8fde8f5e6da"; + sha256 = "19n12m6rnv8blbavd2zkwwv6x7gjfziavc5i0zdh4h1l9x9hmwq3"; }; meta.homepage = "https://github.com/tami5/lispdocs.nvim/"; }; @@ -2916,12 +2916,12 @@ let neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-04-25"; + version = "2021-05-15"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "cd00786925191a245c85744c84ec0749b1c8b3f7"; - sha256 = "0770p37i6r0dwyx9chfg75zy0wcw8a044xfh7vk7ddcqcmp4flhy"; + rev = "5cabfceab77bdba16bcc81d2d8c05d76c8304a57"; + sha256 = "087zzlfvdc1462rdsn1i4x1lypsqcdfh78zgwcicvgbg4ja9zsd3"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3192,48 +3192,48 @@ let nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-05-11"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "cd8a10b9191ead80802100e00e741dcc89304634"; - sha256 = "06s4q9d18j2hanwxardsbbc4dzjwdb5z5xyrn1h2i5dlvfkyj2dl"; + rev = "0da518e9ccaa78355a3d5b08b4ecd5324b918789"; + sha256 = "13qdll3khcxgm32l9hqvnman3c8a1p8q34x0ry6p0yqlx2da05qx"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2021-05-14"; + version = "2021-05-15"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "1eef75abc5d8bb0bf0273b56ad20a3454ccbb27d"; - sha256 = "161nrdr5k659xsqqfw88vdqd9a0mvfr3cixx7qfb6jlc9wcyzs3m"; + rev = "550e235da7edc910bc3c8018ce385a85d705bc67"; + sha256 = "1qvls8hmj2pdl3kk366667hwmw01hh7fp4nynn0xvyfkbw1bcylg"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2021-05-13"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "51f155757bd92b24b32b5f4a6bcd09de0e9b8936"; - sha256 = "0xdh3f28sn342z6q175s6shqirryz6p8sf6dz72y7wv9y5a7x7y4"; + rev = "582e913d23e7afaf8f54beafd7dd21b1aea65ddc"; + sha256 = "0i18dzl6nwpk88qsdz7q155kscxgzma4p7nikszvqfy64dyxf3y7"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-05-12"; + version = "2021-05-15"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "64ba179ea810b868eda1031b2c476596657e3a52"; - sha256 = "0fi7naa720ihvxad3628w482bzav8nsipz497zv8f033zcj5qcq3"; + rev = "f395a14247ab5ca76254945c8ad8bb646a1c0f1c"; + sha256 = "1415v2cc6g81b6hh5h6ikqbr7qyzipbmbs59jb2jqqbjr5rwffg5"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3312,12 +3312,12 @@ let nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2021-05-06"; + version = "2021-05-15"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "66d4a0daabf4be3abb478e9477ade28871b77f56"; - sha256 = "17zgwp8lw5npm3g28n2hqhpdc4m34ndp39rrlm1vgqkksp08lh56"; + rev = "c2fd4d042c94d4246e583d7d0231365790fdafac"; + sha256 = "1kkq8l2c9142vbr2lbs1gc95np8mfaxyldzkaabydh99bh4z72v2"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -3336,12 +3336,12 @@ let nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-05-13"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "131a8e75b91543a74c95014e381e70ee517476d6"; - sha256 = "0g30ajlp2lvkpji7nf5vpbnl61wz09rngrfhdc9zw3xwcd52a2da"; + rev = "4a5268bff73e43792f2d216a52ae19507da5c866"; + sha256 = "1p6rryac1caw97smkvg4cskd8zr01m3kvrg3ir6zsa7gg1l0npx6"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3384,12 +3384,12 @@ let nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-05-14"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "3ed00a8a0de63054af5f133d6096d755ea0ac230"; - sha256 = "04waag4lvsygbzxydifw2hkdm9biwcs1663giah9nrwaahf0m32a"; + rev = "68806113013a5debf382cc069adcf8ff786cefb2"; + sha256 = "1klvvvyd936gh9ax7a91v750k7a2asq8zwk8fbbha57s8kmca252"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3456,12 +3456,12 @@ let nvim-toggleterm-lua = buildVimPluginFrom2Nix { pname = "nvim-toggleterm-lua"; - version = "2021-05-14"; + version = "2021-05-15"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-toggleterm.lua"; - rev = "ffe9a7e44d888f6f745e532a5aace8547e176ef0"; - sha256 = "165dzr7b7dhpzirbdm2nnpzrw1l27qv37sza9am5b4qiy54fmar3"; + rev = "63acbaf2dba462de3501b37efb96f57ec00ed952"; + sha256 = "0pr9qggp3zdzgj6qgfm9fwqjwi54lvdxicmyfzq0xgqsdn1bdsya"; }; meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; }; @@ -3672,12 +3672,12 @@ let packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-05-13"; + version = "2021-05-15"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "c51be59d62ac0b4fca80a4a4d75ab0870f494246"; - sha256 = "13ak67pm1k183xq8w2lbdn5hnf3lfxklcagrzjkxb96flf6fmiyh"; + rev = "af1a46466c5752b9d1953fb508d2544473f4821e"; + sha256 = "01nkgvqq9v1bc729pd10ghih60d42iap6ivm7n39419rh2df9qsv"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -4562,12 +4562,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2021-03-23"; + version = "2021-05-15"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "f6012cb65da4bda46b0779a36840df36ad01483e"; - sha256 = "08vb3ffm1f47q5gxyqmmfv75x12001qpkqml7v612wnnfpclcqf5"; + rev = "bafd7c51e0c921f403cb1c76835cd6652d1dd78a"; + sha256 = "176h1pz7kmyqyx91q36ynqncx6lx15f48i1d4jz8838wky1g2jpf"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -4683,12 +4683,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-05-13"; + version = "2021-05-15"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "e88864123bf9896d294f83140937e5eab6e105f1"; - sha256 = "1h1xk0rwj83cz3sfihcfny4825ia084lsl4xhj7zsdlw0fq8miaq"; + rev = "4da66dab44f37d0de4b88cedf9e114c5b0855c20"; + sha256 = "1xpns9dxik239ipzic2kih4zkb5wwvzgbc8pxd60wgqi2021n7vn"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -4828,12 +4828,12 @@ let trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble-nvim"; - version = "2021-05-12"; + version = "2021-05-15"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "135d4e95dd8a266272964ac2b13a31812b2db82d"; - sha256 = "087a9gwzydvnh8fqqqvhpv3vz7g4bgmrrw2jxdc8nqj1a39gn3b4"; + rev = "4375f1f0b2457fcbb91d32de457e6e3b3bb7eba7"; + sha256 = "1szn4fklxm23nbi30arx6qqf96v0s1v0q11vqx886y9a6c2i325m"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -4888,12 +4888,12 @@ let undotree = buildVimPluginFrom2Nix { pname = "undotree"; - version = "2021-04-02"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "101edfb795bc17b814efb12e6df6a884507a34f6"; - sha256 = "0fa2iqgzc85955ixa4hf1mjy7sm7hrbkha5l1scganc9zswd5iv2"; + rev = "271c56586196b8e42cdcadc8037aa5d3051071c4"; + sha256 = "1sjsv4zzmkkj3l56gbb5f0ad0g6clh1wc76q4d6qsaqv4qg4nsal"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -5500,12 +5500,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-05-13"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "c1b20c2a4db279918942c5486b8a61bb1571ebf5"; - sha256 = "148l1s419rhb21492mvb0v4mw1hcmsp8djn57r77sc958rqilyad"; + rev = "f343ae73bbc678be228791d7891996db12fbee47"; + sha256 = "020xbya3hk0mz658g5jwkbk2v1313v2aa5cj8sl40cgqzp0lgmm1"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -5716,12 +5716,12 @@ let vim-css-color = buildVimPluginFrom2Nix { pname = "vim-css-color"; - version = "2021-05-06"; + version = "2021-05-15"; src = fetchFromGitHub { owner = "ap"; repo = "vim-css-color"; - rev = "cabad5f2a247296145ab4059df98e92cdb3ffe78"; - sha256 = "0r28r46bszfid40ra86y435r0l5f9bxkpxs9jnhqbvgbwhm4c5nx"; + rev = "fce515d173d8d9bbf279e1fefea5eacd6be98be8"; + sha256 = "0hb97jhhrqi6drzfzirg9wdyg9jprw8pzd9ahklx380w2pkvzz4n"; }; meta.homepage = "https://github.com/ap/vim-css-color/"; }; @@ -5980,12 +5980,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2021-04-21"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "c3cb96e153728fbfd050173b4af19118b131f278"; - sha256 = "1v0rgzpnpanics4zhx3y9m6ppa727yc0mvcx065jg2a2a1563sgy"; + rev = "6dc61ad4dcfa520d56f3a4373bd507f529a25382"; + sha256 = "1rqr16wcwzrs6w9iwg4wghqm7nb1jgzwjmfimvclnkbqpp8ssaq6"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -6364,12 +6364,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-05-13"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "381f73610ba281da8a56cdcf37e11a9dfcc822de"; - sha256 = "0zaw9xc8f5275661g4alxmkx554q49il6fkf3kh3lyalas59l9d8"; + rev = "daf75a94f458a157c6649f21410a12b823a16ff9"; + sha256 = "16bzig83mx3ynn74py7l52qzs8ddmn0qrs5dvgl1mmw5p82mwgf0"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -7855,12 +7855,12 @@ let vim-quickrun = buildVimPluginFrom2Nix { pname = "vim-quickrun"; - version = "2021-04-28"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-quickrun"; - rev = "3f6acfc2de2fa06e8e61269cf6a900336552abdc"; - sha256 = "11hdq749sli3k4cp4g0s9vm7v2blp49k0s1r814drc0x5rxkj5fy"; + rev = "aea6538c8ddd15e5df368911341f7989ecc49615"; + sha256 = "0pbi884fcnigb7wwr9w0sjs7w6713wsp01d3v7njnph70bfs1mx5"; }; meta.homepage = "https://github.com/thinca/vim-quickrun/"; }; @@ -9080,12 +9080,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-05-11"; + version = "2021-05-15"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "2708e8e6ecc00bfd7d9fee923d287345553aba02"; - sha256 = "173l5rmg12rqcl7f0lq9f5shx94mf7f8793m74ls1v3k06xdcqj2"; + rev = "aacd62f09feed377c35930790514b2739fa08e51"; + sha256 = "0na5dvwc8hly32hjkicw8vgy0agx4zyvsrdrjn21sz0daw48cabi"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -9189,12 +9189,12 @@ let which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key-nvim"; - version = "2021-05-13"; + version = "2021-05-15"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "840311c272eda2c4fc0d92070e9ef2dd13f884e7"; - sha256 = "0ys931k4imq1vn8y7apwnfisf19aib8kvyvlfk7sjriyd50sqg3b"; + rev = "d85ce3627f4060f622e4c0a9657f26c0151829de"; + sha256 = "06fpk200r3h7m3bk3yg1p6h14f19z037g8mw2775s38bhwp3g39a"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; From b0129813017a9045db26b94e508d74bb502221b3 Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Sun, 16 May 2021 13:47:14 +0000 Subject: [PATCH 52/65] vimPlugins.todo-comments-nvim: init at 2021-05-16 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index aa65a6a4f6a..d085d989728 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4777,6 +4777,18 @@ let meta.homepage = "https://github.com/wellle/tmux-complete.vim/"; }; + todo-comments-nvim = buildVimPluginFrom2Nix { + pname = "todo-comments-nvim"; + version = "2021-05-16"; + src = fetchFromGitHub { + owner = "folke"; + repo = "todo-comments.nvim"; + rev = "0f6a87bb04925775bb2fd68c063152512e033313"; + sha256 = "1w2qgchd8r553i836pb4zjy2h23nryd5nfc905h5nxw0jaqb1f4i"; + }; + meta.homepage = "https://github.com/folke/todo-comments.nvim/"; + }; + todo-txt-vim = buildVimPluginFrom2Nix { pname = "todo-txt-vim"; version = "2021-03-20"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index b40344ead69..c1ebd896360 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -137,6 +137,7 @@ fisadev/vim-isort flazz/vim-colorschemes floobits/floobits-neovim folke/lsp-colors.nvim@main +folke/todo-comments.nvim@main folke/trouble.nvim@main folke/which-key.nvim@main freitass/todo.txt-vim From 873996595cc920b561e27823e53f5eae240917d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 11 May 2021 20:56:43 +0200 Subject: [PATCH 53/65] acl2: fix darwin build --- .../acl2/libipasirglucose4/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix b/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix index b9a61b88a30..5c10c176c14 100644 --- a/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix +++ b/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix @@ -1,6 +1,11 @@ { lib, stdenv, fetchurl, zlib, unzip }: -stdenv.mkDerivation rec { +let + + cxx = "${stdenv.cc.targetPrefix}c++"; + libName = "libipasirglucose4" + stdenv.targetPlatform.extensions.sharedLibrary; + +in stdenv.mkDerivation rec { pname = "libipasirglucose4"; # This library has no version number AFAICT (beyond generally being based on # Glucose 4.x), but it was submitted to the 2017 SAT competition so let's use @@ -18,13 +23,16 @@ stdenv.mkDerivation rec { sourceRoot = "sat/glucose4"; patches = [ ./0001-Support-shared-library-build.patch ]; + makeFlags = [ "CXX=${cxx}" ]; + postBuild = '' - g++ -shared -Wl,-soname,libipasirglucose4.so -o libipasirglucose4.so \ + ${cxx} -shared -o ${libName} \ + ${if stdenv.cc.isClang then "" else "-Wl,-soname,${libName}"} \ ipasirglucoseglue.o libipasirglucose4.a ''; installPhase = '' - install -D libipasirglucose4.so $out/lib/libipasirglucose4.so + install -D ${libName} $out/lib/${libName} ''; meta = with lib; { From fb637b899a9b6ccb1cb47e5916a7c94b686c554a Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Tue, 11 May 2021 06:31:28 -0600 Subject: [PATCH 54/65] python3Packages.behave: disable tests --- pkgs/development/python-modules/behave/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index 43c74fc9571..1198f034d00 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -17,6 +17,12 @@ buildPythonApplication rec { }; checkInputs = [ pytestCheckHook mock pathpy pyhamcrest pytest-html ]; + + # upstream tests are failing, so instead we only check if we can import it + doCheck = false; + + pythonImportsCheck = [ "behave" ]; + buildInputs = [ glibcLocales ]; propagatedBuildInputs = [ colorama cucumber-tag-expressions parse parse-type six ]; From 4db951e4e17cc36795adbfec1c930d1342c263e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 11 May 2021 22:44:54 +0200 Subject: [PATCH 55/65] atinout: fix darwin build --- pkgs/tools/networking/atinout/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/atinout/default.nix b/pkgs/tools/networking/atinout/default.nix index bc2af5c5ee2..93535531d91 100644 --- a/pkgs/tools/networking/atinout/default.nix +++ b/pkgs/tools/networking/atinout/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { name = "atinout-${version}"; version = "0.9.2-alpha"; - NIX_CFLAGS_COMPILE = "-Werror=implicit-fallthrough=0"; - LANG = "C.UTF-8"; + NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.cc.isClang) "-Werror=implicit-fallthrough=0"; + LANG = if stdenv.isDarwin then "en_US.UTF-8" else "C.UTF-8"; nativeBuildInputs = [ ronn mount ]; src = fetchgit { @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "0bninv2bklz7ly140cxx8iyaqjlq809jjx6xqpimn34ghwsaxbpv"; }; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + installPhase = '' make PREFIX=$out install ''; From ce0cabb49d5bd4f4afca3ec040888f3bd65bb42a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 17 May 2021 00:16:15 +0200 Subject: [PATCH 56/65] numberstation: init at 0.4.0 (#122190) --- .../misc/numberstation/default.nix | 68 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/applications/misc/numberstation/default.nix diff --git a/pkgs/applications/misc/numberstation/default.nix b/pkgs/applications/misc/numberstation/default.nix new file mode 100644 index 00000000000..c51306bb93f --- /dev/null +++ b/pkgs/applications/misc/numberstation/default.nix @@ -0,0 +1,68 @@ +{ lib +, python3 +, fetchFromSourcehut +, desktop-file-utils +, glib +, gobject-introspection +, gtk3 +, libhandy +, librsvg +, meson +, ninja +, pkg-config +, wrapGAppsHook +}: + +python3.pkgs.buildPythonApplication rec { + pname = "numberstation"; + version = "0.4.0"; + + format = "other"; + + src = fetchFromSourcehut { + owner = "~martijnbraam"; + repo = "numberstation"; + rev = version; + sha256 = "038yyffqknr274f7jh5z12y68pjxr37f8y2cn2pwhf605jmbmpwv"; + }; + + postPatch = '' + patchShebangs build-aux/meson + ''; + + nativeBuildInputs = [ + desktop-file-utils + glib + gtk3 + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + gobject-introspection + gtk3 + libhandy + librsvg + ]; + + propagatedBuildInputs = with python3.pkgs; [ + keyring + pygobject3 + pyotp + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + description = "TOTP Authentication application for mobile"; + homepage = "https://sr.ht/~martijnbraam/numberstation/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f27e342b0e..2487a36818e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7036,6 +7036,8 @@ in ntlmrecon = callPackage ../tools/security/ntlmrecon { }; + numberstation = callPackage ../applications/misc/numberstation { }; + nvchecker = with python3Packages; toPythonApplication nvchecker; miller = callPackage ../tools/text/miller { }; From 8c63ac789359e1a0a7199229809bdd0673752805 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 30 Mar 2020 22:28:02 +0200 Subject: [PATCH 57/65] vimPlugins: generate an overlay let update.py generates generated.nix as an overlay. This should help maintaining vim-plugins outside of nixpkgs, as one can use update.py to generate an out-of-tree vimPlugins overlay. --- pkgs/misc/vim-plugins/aliases.nix | 11 +++++------ pkgs/misc/vim-plugins/default.nix | 17 +++++++++++++---- pkgs/misc/vim-plugins/update.py | 9 ++++----- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/pkgs/misc/vim-plugins/aliases.nix b/pkgs/misc/vim-plugins/aliases.nix index 4cfb6ccd372..4e08e5fe05e 100644 --- a/pkgs/misc/vim-plugins/aliases.nix +++ b/pkgs/misc/vim-plugins/aliases.nix @@ -1,8 +1,7 @@ # Deprecated aliases - for backward compatibility +lib: -lib: overriden: - -with overriden; +final: prev: let # Removing recurseForDerivation prevents derivations of aliased attribute @@ -21,12 +20,12 @@ let # Make sure that we are not shadowing something from # all-packages.nix. - checkInPkgs = n: alias: if builtins.hasAttr n overriden + checkInPkgs = n: alias: if builtins.hasAttr n prev then throw "Alias ${n} is still in vim-plugins" else alias; mapAliases = aliases: - lib.mapAttrs (n: alias: removeDistribute + lib.mapAttrs (n: alias: removeDistribute (removeRecurseForDerivations (checkInPkgs n alias))) aliases; @@ -36,7 +35,7 @@ let ) (builtins.fromJSON (builtins.readFile ./deprecated.json)); in -mapAliases ({ +mapAliases (with prev; { airline = vim-airline; alternative = a-vim; # backwards compat, added 2014-10-21 bats = bats-vim; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index e6bca9484a2..00637f6fb00 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -5,8 +5,12 @@ let inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix; + inherit (lib) extends; + + initialPackages = self: {}; + plugins = callPackage ./generated.nix { - inherit buildVimPluginFrom2Nix overrides; + inherit buildVimPluginFrom2Nix; }; # TL;DR @@ -21,8 +25,13 @@ let inherit llvmPackages; }; - aliases = lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib plugins); + aliases = if (config.allowAliases or true) then final: prev: {} else (import ./aliases.nix lib); + extensible-self = lib.makeExtensible + (extends aliases + (extends overrides + (extends plugins initialPackages) + ) + ); in - -plugins // aliases + extensible-self diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py index 1180b4572d2..df948cc0e55 100755 --- a/pkgs/misc/vim-plugins/update.py +++ b/pkgs/misc/vim-plugins/update.py @@ -47,9 +47,9 @@ def generate_nix(plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: s f.write(HEADER) f.write( """ -{ lib, buildVimPluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: -let - packages = ( self: +{ lib, buildVimPluginFrom2Nix, fetchFromGitHub }: + +final: prev: {""" ) for owner, repo, plugin in sorted_plugins: @@ -75,8 +75,7 @@ let ) f.write( """ -}); -in lib.fix' (lib.extends overrides packages) +} """ ) print(f"updated {outfile}") From 0a9e9c09659dff66f40829d5161b8b71931dbeee Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sat, 15 May 2021 14:16:00 +0200 Subject: [PATCH 58/65] pkgs/misc/vim-plugins/update.py: add logging there was a 404 error, having basic logging makes it easier to troubleshoot --- maintainers/scripts/pluginupdate.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index e7a183952b0..91c5214d153 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -13,6 +13,7 @@ import http import json import os import subprocess +import logging import sys import time import traceback @@ -34,6 +35,14 @@ ATOM_ENTRY = "{http://www.w3.org/2005/Atom}entry" # " vim gets confused here ATOM_LINK = "{http://www.w3.org/2005/Atom}link" # " ATOM_UPDATED = "{http://www.w3.org/2005/Atom}updated" # " +LOG_LEVELS = { + logging.getLevelName(level): level for level in [ + logging.DEBUG, logging.INFO, logging.WARN, logging.ERROR ] +} + +log = logging.getLogger() +log.addHandler(logging.StreamHandler()) + def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: float = 2): """Retry calling the decorated function using an exponential backoff. @@ -235,6 +244,7 @@ def prefetch_plugin( alias: Optional[str], cache: "Optional[Cache]" = None, ) -> Tuple[Plugin, Dict[str, str]]: + log.info("Prefetching plugin %s", repo_name) repo = Repo(user, repo_name, branch, alias) commit, date = repo.latest_commit() has_submodules = repo.has_submodules() @@ -464,6 +474,11 @@ def parse_args(editor: Editor): "--no-commit", "-n", action="store_true", default=False, help="Whether to autocommit changes" ) + parser.add_argument( + "--debug", "-d", choices=LOG_LEVELS.keys(), + default=logging.getLevelName(logging.WARN), + help="Adjust log level" + ) return parser.parse_args() @@ -503,6 +518,9 @@ def update_plugins(editor: Editor): """The main entry function of this module. All input arguments are grouped in the `Editor`.""" args = parse_args(editor) + log.setLevel(LOG_LEVELS[args.debug]) + + log.info("Start updating plugins") nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True) update = get_update(args.input_file, args.outfile, args.proc, editor) From 1372b429cca63f5e63ba4d942944730475cea336 Mon Sep 17 00:00:00 2001 From: sophrosyne97 Date: Sun, 16 May 2021 08:27:55 -0400 Subject: [PATCH 59/65] cataclysm-dda-git: 2019-11-22 -> 2020-12-09 --- pkgs/games/cataclysm-dda/git.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index 9af90481acd..b07689c0930 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -2,9 +2,9 @@ , tiles ? true, Cocoa , debug ? false , useXdgDir ? false -, version ? "2019-11-22" -, rev ? "a6c8ece992bffeae3788425dd4b3b5871e66a9cd" -, sha256 ? "0ww2q5gykxm802z1kffmnrfahjlx123j1gfszklpsv0b1fccm1ab" +, version ? "2020-12-09" +, rev ? "cb02195d9fb5ba71f35a105be4104c3d8883065c" +, sha256 ? "108cs6vp99qmqqfnmczad0xjgcl82bypm5xszwnlfcswdsrfs4da" }: let From f269c57097d4b2b56556d5393d8248659dc40fc3 Mon Sep 17 00:00:00 2001 From: "\"Matthieu Coudron\"" <"mcoudron@hotmail.com"> Date: Mon, 17 May 2021 00:48:52 +0200 Subject: [PATCH 60/65] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 59 ++++++++++++++--------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index d085d989728..3f39433ec68 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1,7 +1,7 @@ # This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit! -{ lib, buildVimPluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: -let - packages = ( self: +{ lib, buildVimPluginFrom2Nix, fetchFromGitHub }: + +final: prev: { a-vim = buildVimPluginFrom2Nix { pname = "a-vim"; @@ -1631,12 +1631,12 @@ let ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2021-02-14"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "abbb157ac9d06fdfba537f97ab96e197b3bb36cb"; - sha256 = "008alqgqbrjh9sqgazqq1kk5hnpikd8afnia5lx9rv8c2am1d2fv"; + rev = "dec6adb151cc5514f8ea99b8568e7a4c94db6318"; + sha256 = "14k0crk6lvj6qp1rpfmldmw5w9axy7336aacpvfsh7d4a93xdjzv"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -3132,12 +3132,12 @@ let nnn-vim = buildVimPluginFrom2Nix { pname = "nnn-vim"; - version = "2021-04-27"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "mcchrish"; repo = "nnn.vim"; - rev = "422cd80e35c81a303d16a600f549dc4d319cecf6"; - sha256 = "187q3m0llrwmrqskf14cqy9ndvvj8nfnyrw46f8mdkrslkfs9vf2"; + rev = "a997a8fc9739d1bf1900c66f056e1b11a9f61443"; + sha256 = "1rdcjnfgk1yi2ick7m7xh07daarfjvxgf3w656hzarbqshpamy2a"; }; meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; @@ -3300,12 +3300,12 @@ let nvim-dap-virtual-text = buildVimPluginFrom2Nix { pname = "nvim-dap-virtual-text"; - version = "2021-04-26"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "96b8e0423609a23cb971edb1d10c757d7930787b"; - sha256 = "0z84xisjj4a0blfy7ds5hlwvvr6yc7nwiqglli1h6lp7abxs5xx0"; + rev = "29a79b7c15e7e15a416bcaa0efddfe67928b7bdd"; + sha256 = "0wl9dl83cx2hlik7yx6kknb7spsaqlzri2kybf3xcna44mqfq688"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -3388,8 +3388,8 @@ let src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "68806113013a5debf382cc069adcf8ff786cefb2"; - sha256 = "1klvvvyd936gh9ax7a91v750k7a2asq8zwk8fbbha57s8kmca252"; + rev = "0699e6c16c37c08418339675d142af0e00ccbeaa"; + sha256 = "0rdqxcrcybvdspl22xzyrvv4rqikhq2liqja0jkf2xavc42j7fxx"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3456,12 +3456,12 @@ let nvim-toggleterm-lua = buildVimPluginFrom2Nix { pname = "nvim-toggleterm-lua"; - version = "2021-05-15"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-toggleterm.lua"; - rev = "63acbaf2dba462de3501b37efb96f57ec00ed952"; - sha256 = "0pr9qggp3zdzgj6qgfm9fwqjwi54lvdxicmyfzq0xgqsdn1bdsya"; + rev = "46ffb283c490f96b31d699b766471f83da0bc0cf"; + sha256 = "0pimi8hm213n17lkiyz7ib4d804grzv3pzv060nh3qagdvi5rvnx"; }; meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; }; @@ -3480,12 +3480,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-05-11"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "efbb1c66d27eb5b4bfbcc1f59d3384e0641c8214"; - sha256 = "1sfc7890v4lgc7r4a5k922qbnc1lpjp3i8sj1jqqxd4a73x1nsvm"; + rev = "71247a4a658a7678328fa6224ede103dcf1268fc"; + sha256 = "05f90s36nzk13s2rdyrzalwv4psz9pjccw89ihxbik1ndg8iwz18"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4093,12 +4093,12 @@ let rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools-nvim"; - version = "2021-05-10"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "2de94fc88d6382e5f0b61f1c619c8919fd45aea3"; - sha256 = "14fg0qs1y2xszpdsnp8gcynqj9fx5c47ckbpgr48hv5df8xncasf"; + rev = "6f92ba636c06069592c64f85888b452da7e81cfd"; + sha256 = "1ng259hs6l6q17hc3y2iyd7v9xm6mkfg0jbpwgrbk4pf2clpn2aa"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -4683,12 +4683,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-05-15"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "4da66dab44f37d0de4b88cedf9e114c5b0855c20"; - sha256 = "1xpns9dxik239ipzic2kih4zkb5wwvzgbc8pxd60wgqi2021n7vn"; + rev = "69eb5eacff421e05aeb1e02ff97ef64bfd955c53"; + sha256 = "1yn5hzv57lld6zpxd7cqnjhj3qb5l9ngnnrb9kfp6c6gy137wlj8"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -7871,8 +7871,8 @@ let src = fetchFromGitHub { owner = "thinca"; repo = "vim-quickrun"; - rev = "aea6538c8ddd15e5df368911341f7989ecc49615"; - sha256 = "0pbi884fcnigb7wwr9w0sjs7w6713wsp01d3v7njnph70bfs1mx5"; + rev = "7685488adfbd2950a8ef4ecaedafef8a036f9275"; + sha256 = "1jsdxm2cgd5aqir3g7jbyq17xsslc8a5xmpmlsyci5hprrhnnv2c"; }; meta.homepage = "https://github.com/thinca/vim-quickrun/"; }; @@ -9405,5 +9405,4 @@ let meta.homepage = "https://github.com/troydm/zoomwintab.vim/"; }; -}); -in lib.fix' (lib.extends overrides packages) +} From 42bb7e9e4ceb2c2afe03f9725da4a7566c18c5d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Mon, 17 May 2021 00:57:29 +0200 Subject: [PATCH 61/65] clpm: fix darwin build (#123029) --- pkgs/development/tools/clpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/clpm/default.nix b/pkgs/development/tools/clpm/default.nix index ae2e1011ae2..9d3ddace37e 100644 --- a/pkgs/development/tools/clpm/default.nix +++ b/pkgs/development/tools/clpm/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - ln -s ${openssl.out}/lib/libcrypto.so.* . - ln -s ${openssl.out}/lib/libssl.so.* . + ln -s ${openssl.out}/lib/libcrypto*${stdenv.hostPlatform.extensions.sharedLibrary}* . + ln -s ${openssl.out}/lib/libssl*${stdenv.hostPlatform.extensions.sharedLibrary}* . common-lisp.sh --script scripts/build.lisp runHook postBuild From f867062ef9e2b862f397d7a38f4899667a7be2d3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 May 2021 12:27:20 +0000 Subject: [PATCH 62/65] erlangR21: 21.3.8.22 -> 21.3.8.23 --- pkgs/development/interpreters/erlang/R21.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix index f0291bcfd9f..3959c13e57b 100644 --- a/pkgs/development/interpreters/erlang/R21.nix +++ b/pkgs/development/interpreters/erlang/R21.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "21.3.8.22"; - sha256 = "sha256-k6dChY/ogWqmcNz9P3t+p9C7oywXhR5oqdBfNtkh6I4="; + version = "21.3.8.23"; + sha256 = "sha256-zIEXn2HuXeRKHfXmm0AAv9rEqqc4gIgaYek0hSUK5YU="; } From a2f3a63953b6fc0812cca363accbc5d4176f1f02 Mon Sep 17 00:00:00 2001 From: ydlr <58453832+ydlr@users.noreply.github.com> Date: Sun, 16 May 2021 23:05:40 +0000 Subject: [PATCH 63/65] restore buildMix and its bootstrapper (#122374) * restore mixBuild remove bootstrapper by going through ERL_LIBS mix will use ERL_LIBS to find compiled dependencies Co-authored-by: Zach --- doc/languages-frameworks/beam.section.md | 2 + pkgs/development/beam-modules/build-mix.nix | 85 +++++++++++++++++++++ pkgs/development/beam-modules/default.nix | 1 + 3 files changed, 88 insertions(+) create mode 100644 pkgs/development/beam-modules/build-mix.nix diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index 947968db15e..2a4753a1199 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -34,6 +34,8 @@ Erlang.mk works exactly as expected. There is a bootstrap process that needs to For Elixir applications use `mixRelease` to make a release. See examples for more details. +There is also a `buildMix` helper, whose behavior is closer to that of `buildErlangMk` and `buildRebar3`. The primary difference is that mixRelease makes a release, while buildMix only builds the package, making it useful for libraries and other dependencies. + ## How to Install BEAM Packages {#how-to-install-beam-packages} BEAM builders are not registered at the top level, simply because they are not relevant to the vast majority of Nix users. To install any of those builders into your profile, refer to them by their attribute path `beamPackages.rebar3`: diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix new file mode 100644 index 00000000000..7e19f19a093 --- /dev/null +++ b/pkgs/development/beam-modules/build-mix.nix @@ -0,0 +1,85 @@ +{ stdenv, writeText, elixir, erlang, hex, lib }: + +{ name +, version +, src +, buildInputs ? [ ] +, beamDeps ? [ ] +, propagatedBuildInputs ? [ ] +, postPatch ? "" +, compilePorts ? false +, meta ? { } +, enableDebugInfo ? false +, mixEnv ? "prod" +, ... +}@attrs: + +with lib; +let + shell = drv: stdenv.mkDerivation { + name = "interactive-shell-${drv.name}"; + buildInputs = [ drv ]; + }; + + pkg = self: stdenv.mkDerivation (attrs // { + name = "${name}-${version}"; + inherit version; + inherit src; + + MIX_ENV = mixEnv; + MIX_DEBUG = if enableDebugInfo then 1 else 0; + HEX_OFFLINE = 1; + + # stripping does not have any effect on beam files + dontStrip = true; + + # add to ERL_LIBS so other modules can find at runtime. + # http://erlang.org/doc/man/code.html#code-path + # Mix also searches the code path when compiling with the --no-deps-check + # flag, which is why there is no complicated booterstrapper like the one + # used by buildRebar3. + setupHook = attrs.setupHook or + writeText "setupHook.sh" '' + addToSearchPath ERL_LIBS "$1/lib/erlang/lib" + ''; + + buildInputs = buildInputs ++ [ elixir hex ]; + propagatedBuildInputs = propagatedBuildInputs ++ beamDeps; + + buildPhase = attrs.buildPhase or '' + runHook preBuild + export HEX_HOME="$TEMPDIR/hex" + export MIX_HOME="$TEMPDIR/mix" + mix compile --no-deps-check + runHook postBuild + ''; + + installPhase = attrs.installPhase or '' + runHook preInstall + + # This uses the install path convention established by nixpkgs maintainers + # for all beam packages. Changing this will break compatibility with other + # builder functions like buildRebar3 and buildErlangMk. + mkdir -p "$out/lib/erlang/lib/${name}-${version}" + + # Some packages like db_connection will use _build/shared instead of + # honoring the $MIX_ENV variable. + for reldir in _build/{$MIX_ENV,shared}/lib/${name}/{src,ebin,priv,include} ; do + if test -d $reldir ; then + # Some builds produce symlinks (eg: phoenix priv dircetory). They must + # be followed with -H flag. + cp -Hrt "$out/lib/erlang/lib/${name}-${version}" "$reldir" + fi + done + + runHook postInstall + ''; + + passthru = { + packageName = name; + env = shell self; + inherit beamDeps; + }; + }); +in +fix pkg diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index f63ecd95083..3375fd61260 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -32,6 +32,7 @@ let buildRebar3 = callPackage ./build-rebar3.nix { }; buildHex = callPackage ./build-hex.nix { }; buildErlangMk = callPackage ./build-erlang-mk.nix { }; + buildMix = callPackage ./build-mix.nix { }; fetchMixDeps = callPackage ./fetch-mix-deps.nix { }; mixRelease = callPackage ./mix-release.nix { }; From ea6d3aa18f516a703128ac4967c4782100993031 Mon Sep 17 00:00:00 2001 From: Raphael Megzari Date: Mon, 17 May 2021 08:06:46 +0900 Subject: [PATCH 64/65] cargo-flash: 0.8.0 -> 0.10.1 ; fix darwin build (#123210) --- .../tools/rust/cargo-flash/default.nix | 18 ++++++++++++------ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-flash/default.nix b/pkgs/development/tools/rust/cargo-flash/default.nix index 39b56c2d656..b615ebeaf39 100644 --- a/pkgs/development/tools/rust/cargo-flash/default.nix +++ b/pkgs/development/tools/rust/cargo-flash/default.nix @@ -1,22 +1,28 @@ { lib -, rustPlatform, fetchFromGitHub -, libusb1, pkg-config, rustfmt }: +, stdenv +, rustPlatform +, fetchFromGitHub +, libusb1 +, pkg-config +, rustfmt +, Security +}: rustPlatform.buildRustPackage rec { pname = "cargo-flash"; - version = "0.8.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "probe-rs"; repo = pname; rev = "v${version}"; - sha256 = "1bcpv1r4pdpp22w7za7kdy7jl487x3nlwxiz6sqq3iq6wq3j9zj0"; + sha256 = "sha256-aQ5647woODs/A4fcxSsQoQHL6YQ0TpfQFegtXETqlHk="; }; - cargoSha256 = "1pf117fgw9x9diksqv58cw7i0kzmp25yj73y5ll69sk46b6z4j90"; + cargoSha256 = "sha256-P7xyg9I1MhmiKlyAI9cvABcYKNxB6TSvTgMsMk5KxAQ="; nativeBuildInputs = [ pkg-config rustfmt ]; - buildInputs = [ libusb1 ]; + buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { description = "A cargo extension for working with microcontrollers"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a999b951a6..714d8b56c80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11558,7 +11558,9 @@ in cargo-embed = callPackage ../development/tools/rust/cargo-embed { }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; cargo-feature = callPackage ../development/tools/rust/cargo-feature { }; - cargo-flash = callPackage ../development/tools/rust/cargo-flash { }; + cargo-flash = callPackage ../development/tools/rust/cargo-flash { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-fund = callPackage ../development/tools/rust/cargo-fund { inherit (darwin.apple_sdk.frameworks) Security; }; From ba0da8a076e94ff1119cd46fe58d12c54f9e978b Mon Sep 17 00:00:00 2001 From: William Kral Date: Sat, 15 May 2021 09:58:12 -0700 Subject: [PATCH 65/65] virtualbox: 6.1.18 -> 6.1.22 --- .../virtualization/virtualbox/default.nix | 6 ++---- .../virtualization/virtualbox/extpack.nix | 2 +- .../virtualbox/guest-additions/default.nix | 2 +- .../virtualization/virtualbox/linux-5-11.patch | 12 ------------ 4 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 pkgs/applications/virtualization/virtualbox/linux-5-11.patch diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index fe19f1f4a3e..4f792b4eb6e 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -23,7 +23,7 @@ let buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. - version = "6.1.18"; + version = "6.1.22"; iasl' = iasl.overrideAttrs (old: rec { inherit (old) pname; @@ -40,7 +40,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40"; + sha256 = "99816d2a15205d49362a31e8ffeb8262d2fa0678c751dfd0a7c43b2faca8be49"; }; outputs = [ "out" "modsrc" ]; @@ -103,8 +103,6 @@ in stdenv.mkDerivation { qtPluginPath = "${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix}:${qtwayland.bin}/${qtbase.qtPluginPrefix}"; }) ++ [ - # NOTE: the patch for linux 5.11 can be removed when the next version of VirtualBox is released - ./linux-5-11.patch ./qtx11extras.patch ]; diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index 4aa3ed1fd49..8c64337c6cb 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -12,7 +12,7 @@ fetchurl rec { # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS - let value = "d609e35accff5c0819ca9be47de302abf094dc1b6d4c54da8fdda639671f267e"; + let value = "6d33d9cc1c5a8f8a2a70e5aaaa778a341322d2ba7eb34f7de420fb5f312b9e87"; in assert (builtins.stringLength value) == 64; value; meta = { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index c35ebdb81d0..218d4983ca5 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "904432eb331d7ae517afaa4e4304e6492b7947b46ecb8267de7ef792c4921b4c"; + sha256 = "bffc316a7b8d5ed56d830e9f6aef02b4e5ffc28674032142e96ffbedd905f8c9"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/applications/virtualization/virtualbox/linux-5-11.patch b/pkgs/applications/virtualization/virtualbox/linux-5-11.patch deleted file mode 100644 index 66b70bf0d97..00000000000 --- a/pkgs/applications/virtualization/virtualbox/linux-5-11.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c -index 7033b45..c8178a6 100644 ---- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c -+++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c -@@ -39,6 +39,7 @@ - #endif - #include - #include -+#include - #include - #include - #include