From e396c6e6a97f80f6ba71010bf9914006d99ffead Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Thu, 16 Mar 2023 17:40:34 +0800 Subject: [PATCH 01/15] slack: fix feature flags The `--enable-features` flag should only be specified once as the final one will take precedence. --- .../networking/instant-messengers/slack/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 23571658a24b..439fd503529b 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -172,8 +172,7 @@ let makeWrapper $out/lib/slack/slack $out/bin/slack \ --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ --suffix PATH : ${lib.makeBinPath [xdg-utils]} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --add-flags "\''${WAYLAND_DISPLAY:+--enable-features=WebRTCPipeWireCapturer}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer}}" # Fix the desktop link substituteInPlace $out/share/applications/slack.desktop \ From f749c3ec34f129c69d46abb6f943688dc708095e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 17 Mar 2023 07:53:47 +0000 Subject: [PATCH 02/15] xorg.fontalias: 1.0.4 -> 1.0.5 Changes: https://www.spinics.net/lists/xorg/msg60833.html --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 6333125a74c7..745205074b3c 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -178,11 +178,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontalias = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { pname = "font-alias"; - version = "1.0.4"; + version = "1.0.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-alias-1.0.4.tar.bz2"; - sha256 = "0xjjjindczv3g7m1597l0x19zz75xy70wh5garghz61fpzl1l4gk"; + url = "mirror://xorg/individual/font/font-alias-1.0.5.tar.xz"; + sha256 = "0vkb5mybc0fjfq29lgf5w1b536bwifzkyj8ad9iy7q3kpcby52cz"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index e9be26b40165..d3bc86dc794a 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -135,7 +135,7 @@ mirror://xorg/individual/font/font-adobe-75dpi-1.0.3.tar.bz2 mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2 mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2 mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2 -mirror://xorg/individual/font/font-alias-1.0.4.tar.bz2 +mirror://xorg/individual/font/font-alias-1.0.5.tar.xz mirror://xorg/individual/font/font-arabic-misc-1.0.3.tar.bz2 mirror://xorg/individual/font/font-bh-100dpi-1.0.3.tar.bz2 mirror://xorg/individual/font/font-bh-75dpi-1.0.3.tar.bz2 From a2f9942dd8f0304a00aab859b3cc911062f7ede9 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 17 Mar 2023 17:23:43 +0100 Subject: [PATCH 03/15] usbguard-notifier: init at 0.1.0 --- .../linux/usbguard-notifier/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/os-specific/linux/usbguard-notifier/default.nix diff --git a/pkgs/os-specific/linux/usbguard-notifier/default.nix b/pkgs/os-specific/linux/usbguard-notifier/default.nix new file mode 100644 index 000000000000..c5b296809da1 --- /dev/null +++ b/pkgs/os-specific/linux/usbguard-notifier/default.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + libqb, + usbguard, + librsvg, + libnotify, + catch2, + asciidoc, +}: + +stdenv.mkDerivation rec { + pname = "usbguard-notifier"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "Cropi"; + repo = pname; + rev = "${pname}-${version}"; + hash = "sha256-gWvCGSbOuey2ELAPD2WCG4q77IClL0S7rE2RaUJDc1I="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config asciidoc ]; + buildInputs = [ libqb usbguard librsvg libnotify ]; + + configureFlags = [ "CPPFLAGS=-I${catch2}/include/catch2" ]; + + prePatch = '' + substituteInPlace configure.ac \ + --replace 'AC_MSG_FAILURE([Cannot detect the systemd system unit dir])' \ + 'systemd_unit_dir="$out/lib/systemd/user"' + ''; + + meta = { + description = "Notifications for detecting usbguard policy and device presence changes"; + homepage = "https://github.com/Cropi/usbguard-notifier"; + maintainers = with lib.maintainers; [ fpletz ]; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd5b476b01fb..5d1842b11737 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27163,6 +27163,8 @@ with pkgs; usbguard = callPackage ../os-specific/linux/usbguard { }; + usbguard-notifier = callPackage ../os-specific/linux/usbguard-notifier { }; + usbrelay = callPackage ../os-specific/linux/usbrelay { }; usbrelayd = callPackage ../os-specific/linux/usbrelay/daemon.nix { }; From 58d73d2397f5ccd251d7e3833ee36b2f117ec06d Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Fri, 17 Mar 2023 11:00:03 -0600 Subject: [PATCH 04/15] build-fhs-userenv-bubblewrap: Preserve symlinks in /etc If the original file in /etc is a symlink, make it a symlink inside the sandbox as well. This fixes https://github.com/NixOS/nixpkgs/issues/126234#issuecomment-1192203498 Co-authored-by: Linus Heckemann --- .../build-fhs-userenv-bubblewrap/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index 048233d728c4..b95d94f4a0bf 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -26,7 +26,7 @@ let "unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc" ]); - etcBindFlags = let + etcBindEntries = let files = [ # NixOS Compatibility "static" @@ -69,8 +69,7 @@ let "ca-certificates" "pki" ]; - in concatStringsSep "\n " - (map (file: "--ro-bind-try $(${coreutils}/bin/readlink -m /etc/${file}) /etc/${file}") files); + in map (path: "/etc/${path}") files; # Create this on the fly instead of linking from /nix # The container might have to modify it and re-run ldconfig if there are @@ -102,6 +101,7 @@ let blacklist=(/nix /dev /proc /etc) ro_mounts=() symlinks=() + etc_ignored=() for i in ${env}/*; do path="/''${i##*/}" if [[ $path == '/etc' ]]; then @@ -124,9 +124,21 @@ let continue fi ro_mounts+=(--ro-bind "$i" "/etc$path") + etc_ignored+=("/etc$path") done fi + for i in ${lib.escapeShellArgs etcBindEntries}; do + if [[ "''${etc_ignored[@]}" =~ "$i" ]]; then + continue + fi + if [[ -L $i ]]; then + symlinks+=(--symlink "$(${coreutils}/bin/readlink "$i")" "$i") + else + ro_mounts+=(--ro-bind-try "$i" "$i") + fi + done + declare -a auto_mounts # loop through all directories in the root for dir in /*; do @@ -179,7 +191,6 @@ let --symlink /etc/ld.so.cache ${pkgsi686Linux.glibc}/etc/ld.so.cache \ --ro-bind ${pkgsi686Linux.glibc}/etc/rpc ${pkgsi686Linux.glibc}/etc/rpc \ --remount-ro ${pkgsi686Linux.glibc}/etc \ - ${etcBindFlags} "''${ro_mounts[@]}" "''${symlinks[@]}" "''${auto_mounts[@]}" From 42ef5ded06774d4b269a7c95e29e12ab64fc553a Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Fri, 17 Mar 2023 11:00:14 -0600 Subject: [PATCH 05/15] build-fhs-userenv-bubblewrap: Use more descriptive names --- .../build-fhs-userenv-bubblewrap/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index b95d94f4a0bf..76e68573faa8 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -98,7 +98,7 @@ let ''; bwrapCmd = { initArgs ? "" }: '' - blacklist=(/nix /dev /proc /etc) + ignored=(/nix /dev /proc /etc) ro_mounts=() symlinks=() etc_ignored=() @@ -108,10 +108,10 @@ let : elif [[ -L $i ]]; then symlinks+=(--symlink "$(${coreutils}/bin/readlink "$i")" "$path") - blacklist+=("$path") + ignored+=("$path") else ro_mounts+=(--ro-bind "$i" "$path") - blacklist+=("$path") + ignored+=("$path") fi done @@ -142,8 +142,8 @@ let declare -a auto_mounts # loop through all directories in the root for dir in /*; do - # if it is a directory and it is not in the blacklist - if [[ -d "$dir" ]] && [[ ! "''${blacklist[@]}" =~ "$dir" ]]; then + # if it is a directory and it is not ignored + if [[ -d "$dir" ]] && [[ ! "''${ignored[@]}" =~ "$dir" ]]; then # add it to the mount list auto_mounts+=(--bind "$dir" "$dir") fi From 6214de91379c855f6ac929941e6e8aa8910589e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Mar 2023 02:10:26 +0000 Subject: [PATCH 06/15] aws-vault: 7.0.2 -> 7.1.1 --- pkgs/tools/admin/aws-vault/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index cb9e3d125579..2b47b6b7a5a3 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "aws-vault"; - version = "7.0.2"; + version = "7.1.1"; src = fetchFromGitHub { owner = "99designs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uNe2dltwLoUBUH/p4CN6HCOvBsq2yASxxwkSEtkJRbQ="; + sha256 = "sha256-ydg//2t+B02eXwnwsmECx+I8oluPf6dKntz7L6gWV88="; }; - vendorHash = "sha256-CPn4JLIZz23ZNcl3LPJumx20WOXTI13s69MVo/Pof+s="; + vendorHash = "sha256-4bJKDEZlO0DzEzTQ7m+SQuzhe+wKmL6wLueqgSz/46s="; nativeBuildInputs = [ installShellFiles makeWrapper ]; From 8815ddf3ebace99bfd294468120a46a431f95714 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Mar 2023 03:56:26 +0000 Subject: [PATCH 07/15] tbls: 1.62.1 -> 1.63.0 --- pkgs/tools/misc/tbls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index f0f87fbfab9f..2fd8e30e6336 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "tbls"; - version = "1.62.1"; + version = "1.63.0"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-x3Bh/xB/x71xNjVL5zqp1ag8TPQoxOpuOyDE1f54sGQ="; + hash = "sha256-r0jCuSTNx5BVkJshPSAO5Wwz1C2Lw2AYXYA46cMB+qY="; }; vendorHash = "sha256-YrDQSySBplYgakgvb6BwK1AK6h0Usy8MvCndHSSYrlQ="; From b3cf05383eb1b717011df8d752709a9ddcd7dffa Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 18 Mar 2023 11:51:45 +0100 Subject: [PATCH 08/15] jpegoptim: apply patch for CVE-2023-27781 See https://github.com/tjko/jpegoptim/issues/132 --- pkgs/applications/graphics/jpegoptim/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index ff00d565f47d..c7dbb39ae5b2 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libjpeg }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, libjpeg }: stdenv.mkDerivation rec { version = "1.5.2"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-PROQvOqsis8we58OOZ/kuY+L/CoV7XfnY9wvrpsTJu8="; }; + patches = [ + (fetchpatch { + name = "CVE-2023-27781.patch"; + url = "https://github.com/tjko/jpegoptim/commit/29a073ad297a0954f5e865264e24755d0ffe53ed.patch"; + hash = "sha256-YUjVg0cvElhzMG3b4t5bqcqnHAuzDoNvSqe0yvlgX4E="; + }) + ]; + # There are no checks, it seems. doCheck = false; From 96585d333242f0cfe403fb274e2276978b575e1e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 18 Mar 2023 11:43:09 +0100 Subject: [PATCH 09/15] python310Packages.lightning-utilities: 0.7.1 -> 0.8.0 https://github.com/Lightning-AI/utilities/releases/tag/v0.8.0 --- .../python-modules/lightning-utilities/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lightning-utilities/default.nix b/pkgs/development/python-modules/lightning-utilities/default.nix index cd5fb226e95d..22a312d26630 100644 --- a/pkgs/development/python-modules/lightning-utilities/default.nix +++ b/pkgs/development/python-modules/lightning-utilities/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "lightning-utilities"; - version = "0.7.1"; + version = "0.8.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "utilities"; rev = "refs/tags/v${version}"; - hash = "sha256-xjE5FsU1d/YcVHlfjtZE0T2LjGvsIOzbGJFU7PMDqdc="; + hash = "sha256-uwmX+/SK2zBkZQbN/t/DZ3i+XbdAJ/RM+Q649QwMUz0="; }; nativeBuildInputs = [ @@ -57,7 +57,13 @@ buildPythonPackage rec { disabledTestPaths = [ "docs" + # doctests that expect docs.txt in the wrong location + "src/lightning_utilities/install/requirements.py" + ]; + pytestFlagsArray = [ + # warns about distutils removal in python 3.12 + "-W" "ignore::DeprecationWarning" ]; meta = with lib; { From 6831c05b634ec8a1e84131dcd674d56de2a6d11e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 18 Mar 2023 11:44:02 +0100 Subject: [PATCH 10/15] python310Packages.pdm-backend: 2.0.2 -> 2.0.5 https://github.com/pdm-project/pdm-backend/releases/tag/2.0.3 https://github.com/pdm-project/pdm-backend/releases/tag/2.0.4 https://github.com/pdm-project/pdm-backend/releases/tag/2.0.5 --- pkgs/development/python-modules/pdm-backend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdm-backend/default.nix b/pkgs/development/python-modules/pdm-backend/default.nix index b5fba325b71e..715a4b528b31 100644 --- a/pkgs/development/python-modules/pdm-backend/default.nix +++ b/pkgs/development/python-modules/pdm-backend/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pdm-backend"; - version = "2.0.2"; + version = "2.0.5"; format = "pyproject"; src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm-backend"; rev = "refs/tags/${version}"; - hash = "sha256-3Wgc4kKQcE2FzfcqTs9jtfJ1Oj+qtHiDM4q8KuMNAak="; + hash = "sha256-d5kr5pr9tBc6So0wTy3/ASgk8KTOf2AV8Vfsmml5Qh0="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ From 1b99cfd174289cbab3c72fa2c6b2cad53c6d255f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 18 Mar 2023 11:45:52 +0100 Subject: [PATCH 11/15] python310Packages.pypdf: 3.5.1 -> 3.5.2 https://github.com/py-pdf/pypdf/blob/refs/tags/3.5.2/CHANGELOG.md --- pkgs/development/python-modules/pypdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix index ad58e6c11995..d5b152b603d1 100644 --- a/pkgs/development/python-modules/pypdf/default.nix +++ b/pkgs/development/python-modules/pypdf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pypdf"; - version = "3.5.1"; + version = "3.5.2"; format = "pyproject"; src = fetchFromGitHub { @@ -33,7 +33,7 @@ buildPythonPackage rec { rev = "refs/tags/${version}"; # fetch sample files used in tests fetchSubmodules = true; - hash = "sha256-2Ewa6mTLSNiUFIplfmZDRXmoiX1IQMwg4wq5dAU0O+4="; + hash = "sha256-f+M4sfUzDy8hxHUiWG9hyu0EYvnjNA46OtHzBSJdID0="; }; outputs = [ From a1238be2615289f9f505282462b440c3c207f996 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 18 Mar 2023 12:21:04 +0100 Subject: [PATCH 12/15] nomad_1_4: 1.4.4 -> 1.4.6 Fixes CVE-2023-1296. https://discuss.hashicorp.com/t/hcsec-2023-09-nomad-acls-can-not-deny-access-to-workloads-own-variables/51390 https://github.com/hashicorp/nomad/releases/tag/v1.4.6 https://github.com/hashicorp/nomad/releases/tag/v1.4.5 --- pkgs/applications/networking/cluster/nomad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index ba7f86e9e7d6..ce0ee37849cc 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -62,9 +62,9 @@ rec { nomad_1_4 = generic { buildGoModule = buildGo120Module; - version = "1.4.4"; - sha256 = "sha256-mAimuWolTJ3lMY/ArnLZFu+GZv9ADdGsriXsTcEgdYc="; - vendorSha256 = "sha256-QtP7pzsIBd2S79AUcbOeVG71Mb5qK706rq5DkT41VqM="; + version = "1.4.6"; + sha256 = "sha256-l4GvQIS5JSSgjBjPivAKAb7gKlVLw4WoZpPR8LxnLNc="; + vendorSha256 = "sha256-05BhKF6kx0wbu74cidpTFhUN668R/AxV6qWmchCm/WE="; passthru.tests.nomad = nixosTests.nomad; }; } From e6bbcf847d6affe5807bde1d6c521f608cac14d8 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 18 Mar 2023 12:35:17 +0100 Subject: [PATCH 13/15] vault-bin: 1.12.2 -> 1.13.0 Fixes CVE-2023-24999. https://discuss.hashicorp.com/t/hcsec-2023-07-vault-fails-to-verify-if-approle-secretid-belongs-to-role-during-a-destroy-operation/51305 https://developer.hashicorp.com/vault/docs/release-notes/1.13.0 --- pkgs/tools/security/vault/update-bin.sh | 0 pkgs/tools/security/vault/vault-bin.nix | 12 ++++++------ 2 files changed, 6 insertions(+), 6 deletions(-) mode change 100644 => 100755 pkgs/tools/security/vault/update-bin.sh diff --git a/pkgs/tools/security/vault/update-bin.sh b/pkgs/tools/security/vault/update-bin.sh old mode 100644 new mode 100755 diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index c312c2541d56..967c222e36ab 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "vault-bin"; - version = "1.12.2"; + version = "1.13.0"; src = let @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-viBGcd6MmevCOKBmizzTKzcAQ93kcvg4dZE70dhy4O4="; - aarch64-linux = "sha256-2Zy96bTP3N6CFCOJgPI0DTnsAvraBlFax3TeB+j/7Yw="; - i686-linux = "sha256-PZLDSeg9d01iL6e+EoRjpXwnoA8DUwTFcKL7X3S26mw="; - x86_64-darwin = "sha256-xV6bZVpTtEIZMeMVff+hmDKK7qVkItQ0ZRC0yycxad0="; - aarch64-darwin = "sha256-K0b8O04ZSrKbuM8tu3nt2tI7FktOpqwHEpoNTWYJpm4="; + x86_64-linux = "sha256-UIgFgfpqsWsjmyuU3Z/dA282S8gZ2RR2vUuvZngvQQk="; + aarch64-linux = "sha256-IEuFgfWmRl5ewrA0GX0Rv/88EbWnuWLag2InZ1oHaiU="; + i686-linux = "sha256-hm9SAZOanMckINTVUBQs+bn3X8p3m7gtw9F0gdMKJXA="; + x86_64-darwin = "sha256-/tjJFCBgsBvGa6icNIXz8DCmiKjjcoIC9/3dcSK4400="; + aarch64-darwin = "sha256-xdwSjDZdrUunhyBqZJMjuaFBI961JgU5mWw6UQr3oj0="; }; in fetchzip { From 3f96a3fbe1400aea19e8f0729714c9fc9cd4bce8 Mon Sep 17 00:00:00 2001 From: Kaleb Pace Date: Fri, 7 Oct 2022 02:44:45 -0500 Subject: [PATCH 14/15] balena-cli: init at 15.1.1 balena-cli: init at v14.3.1 balena-cli: update to 15.1.1 --- pkgs/tools/admin/balena-cli/default.nix | 61 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/tools/admin/balena-cli/default.nix diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix new file mode 100644 index 000000000000..be84937ce038 --- /dev/null +++ b/pkgs/tools/admin/balena-cli/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchzip +}: + +let + inherit (stdenv.hostPlatform) system; + throwSystem = throw "Unsupported system: ${system}"; + + plat = { + x86_64-linux = "linux-x64"; + x86_64-darwin = "macOS-x64"; + # Balena only packages for x86 so we rely on Rosetta for Apple Silicon + aarch64-darwin = "macOS-x64"; + x86_64-windows = "windows-x64"; + }.${system} or throwSystem; + + sha256 = { + x86_64-linux = "0gxki6w8p7ihv0zy02978hg8i242algiw0wpcajrvbx1ncbcb7yn"; + x86_64-darwin = "1ihxyf35px3s6q2yk4p3dy03rcj93hy96bj3pxqlv0rp05gnsf02"; + aarch64-darwin = "1ihxyf35px3s6q2yk4p3dy03rcj93hy96bj3pxqlv0rp05gnsf02"; + x86_64-windows = "104hc3qvs04l2hmjmp0bcjr5g5scp4frhprk1fpszziqhdmhwa40"; + }.${system} or throwSystem; +in +stdenv.mkDerivation rec { + pname = "balena-cli"; + version = "15.1.1"; + + src = fetchzip { + url = "https://github.com/balena-io/balena-cli/releases/download/v${version}/balena-cli-v${version}-${plat}-standalone.zip"; + inherit sha256; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r ./* $out/ + + ln -s $out/balena $out/bin/balena + + runHook postInstall + ''; + + meta = with lib; { + description = "A command line interface for balenaCloud or openBalena"; + longDescription = '' + The balena CLI is a Command Line Interface for balenaCloud or openBalena. It is a software + tool available for Windows, macOS and Linux, used through a command prompt / terminal window. + It can be used interactively or invoked in scripts. The balena CLI builds on the balena API + and the balena SDK, and can also be directly imported in Node.js applications. + ''; + homepage = "https://github.com/balena-io/balena-cli"; + changelog = "https://github.com/balena-io/balena-cli/blob/v${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = [ maintainers.kalebpace ]; + platforms = platforms.linux ++ platforms.darwin ++ platforms.cygwin ++ platforms.windows; + sourceProvenance = [ sourceTypes.binaryNativeCode ]; + mainProgram = "balena"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea3742ea64da..7da38819a5b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1429,6 +1429,8 @@ with pkgs; asleap = callPackage ../tools/networking/asleap { }; + balena-cli = callPackage ../tools/admin/balena-cli { }; + butler = callPackage ../games/itch/butler.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; }; From f6bbab1940f15d80cc6593552ece764fa1677b7c Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Sat, 18 Mar 2023 13:45:40 +0100 Subject: [PATCH 15/15] CODEOWNERS: Add OCaml maintainers * CODEOWNERS: add OCaml team --- .github/CODEOWNERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 248be7346118..63ed536b9644 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -310,3 +310,8 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/build-support/node/build-npm-package @winterqt /pkgs/build-support/node/fetch-npm-deps @winterqt /doc/languages-frameworks/javascript.section.md @winterqt + +# OCaml +/pkgs/build-support/ocaml @romildo @superherointj @ulrikstrid +/pkgs/development/compilers/ocaml @romildo @superherointj @ulrikstrid +/pkgs/development/ocaml-modules @romildo @superherointj @ulrikstrid