cardboard: mark as broken

Bumps [cachix/cachix-action](https://github.com/cachix/cachix-action) from v9 to v10.
- [Release notes](https://github.com/cachix/cachix-action/releases)
- [Commits](https://github.com/cachix/cachix-action/compare/v9...73e75d1a0cd4330597a571e8f9dedb41faa2fc4e)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/build.yml

@@ -29,7 +29,7 @@ jobs:
         cachixName:
           - xeals
         nixPath:
-          - nixpkgs=channel:nixos-unstable
+          # - nixpkgs=channel:nixos-unstable
           - nixpkgs=channel:nixpkgs-unstable
           # Disable due to buildGoModule and buildRustPackage
           # - nixpkgs=channel:nixos-20.03
@@ -38,13 +38,13 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v2.3.4
     - name: Install nix
-      uses: cachix/install-nix-action@v12
+      uses: cachix/install-nix-action@v13
       with:
         nix_path: "${{ matrix.nixPath }}"
     - name: Show nixpkgs version
       run: nix-instantiate --eval -E '(import <nixpkgs> {}).lib.version'
     - name: Setup cachix
-      uses: cachix/cachix-action@v8
+      uses: cachix/cachix-action@v10
       if: ${{ matrix.cachixName != '<YOUR_CACHIX_NAME>' }}
       with:
         name: ${{ matrix.cachixName }}

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "flake-utils": {
       "locked": {
-        "lastModified": 1610051610,
-        "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=",
+        "lastModified": 1614513358,
+        "narHash": "sha256-LakhOx3S1dRjnh0b5Dg3mbZyH0ToC9I8Y2wKSkBaTzU=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc",
+        "rev": "5466c5bbece17adaab2d82fae80b46e807611bf3",
         "type": "github"
       },
       "original": {
@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1613761605,
-        "narHash": "sha256-lUF6UPR96ZzQC0faNXBHLoLhNAdxZqYqDwz0PaIZ/7Y=",
+        "lastModified": 1616259034,
+        "narHash": "sha256-WlMIiGIXJm7J+jemzd+ksoun6znWmabCZNz76szV158=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9816b99e71c3504b0b4c1f8b2e004148460029d4",
+        "rev": "4e0d3868c679da20108db402785f924daa1a7fb5",
         "type": "github"
       },
       "original": {

pkgs/applications/terminal-emulators/alacritty-ligatures/default.nix

@@ -0,0 +1,53 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+
+, alacritty
+
+, fontconfig
+, freetype
+, libglvnd
+, libxcb
+}:
+
+alacritty.overrideAttrs (oldAttrs: rec {
+  pname = "${oldAttrs.pname}-ligatures";
+  version = "0.7.2.20210209.g3ed0430";
+
+  src = pkgs.fetchFromGitHub {
+    owner = "zenixls2";
+    repo = "alacritty";
+    fetchSubmodules = true;
+    rev = "3ed043046fc74f288d4c8fa7e4463dc201213500";
+    sha256 = "1dGk4ORzMSUQhuKSt5Yo7rOJCJ5/folwPX2tLiu0suA=";
+  };
+
+  cargoDeps = oldAttrs.cargoDeps.overrideAttrs (pkgs.lib.const {
+    name = "${pname}-${version}-vendor.tar.gz";
+    inherit src;
+    outputHash = "pONu6caJmEKnbr7j+o9AyrYNpS4Q8OEjNZOhGTalncc=";
+  });
+
+  ligatureInputs = [
+    fontconfig
+    freetype
+    libglvnd
+    stdenv.cc.cc.lib
+    libxcb
+  ];
+
+  buildInputs = (oldAttrs.buildInputs or [ ]) ++ ligatureInputs;
+
+  # HACK: One of the ligature libraries required the C++ stdlib at runtime,
+  # and I can't work out a better way to push it to the RPATH.
+  postInstall = lib.optional (!stdenv.isDarwin) ''
+    patchelf \
+      --set-rpath ${lib.makeLibraryPath ligatureInputs}:"$(patchelf --print-rpath $out/bin/alacritty)" \
+      $out/bin/alacritty
+  '';
+
+  meta = oldAttrs.meta // {
+    description = "Alacritty with ligature patch applied";
+    homepage = "https://github.com/zenixls2/alacritty/tree/ligature";
+  };
+})

pkgs/applications/window-managers/cardboard/default.nix

@@ -68,5 +68,6 @@ stdenv.mkDerivation rec {
     homepage = "https://gitlab.com/cardboardwm/cardboard";
     license = licenses.gpl3;
     platforms = wlroots.meta.platforms;
+    broken = true;
   };
 }

pkgs/tools/misc/radeon-profile-daemon/default.nix

@@ -4,14 +4,15 @@
 
 , qtbase
 , qmake
+, wrapQtAppsHook ? null # Temporary backwards compatibility
 }:
 
 stdenv.mkDerivation rec {
   pname = "radeon-profile-daemon";
   version = "20190603.g06qxq2h";
 
-  nativeBuildInputs = [ qmake ];
   buildInputs = [ qtbase ];
+  nativeBuildInputs = [ qmake wrapQtAppsHook ];
 
   src = (
     fetchFromGitHub {

pkgs/top-level/all-packages.nix

@@ -2,47 +2,7 @@
 
 rec {
   # Alacritty with the unmerged ligature patches applied.
-  alacritty-ligatures = pkgs.alacritty.overrideAttrs (oldAttrs: rec {
-    pname = "${oldAttrs.pname}-ligatures";
-    version = "0.7.1.20210107.gada2680";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "zenixls2";
-      repo = "alacritty";
-      fetchSubmodules = true;
-      rev = "df24940a9ccf7ba897fa3167046ee8b181342d8f";
-      sha256 = "sha256-2Th2aojTN36MgYSFXiACcBkTpTou/X1Ub5JR2sgZa34=";
-    };
-
-    cargoDeps = oldAttrs.cargoDeps.overrideAttrs (pkgs.lib.const {
-      name = "${pname}-${version}-vendor.tar.gz";
-      inherit src;
-      outputHash = "sha256-weGYh5qeaOHFfq2nf0UdsuIZud+7/8SCD0g0BAjoJIc=";
-    });
-
-    ligatureInputs = [
-      pkgs.fontconfig
-      pkgs.freetype
-      pkgs.libglvnd
-      pkgs.stdenv.cc.cc.lib
-      pkgs.xlibs.libxcb
-    ];
-
-    buildInputs = (oldAttrs.buildInputs or []) ++ ligatureInputs;
-
-    # HACK: One of the ligature libraries required the C++ stdlib at runtime,
-    # and I can't work out a better way to push it to the RPATH.
-    postInstall = pkgs.lib.optional (!pkgs.stdenv.isDarwin) ''
-      patchelf \
-        --set-rpath ${pkgs.lib.makeLibraryPath ligatureInputs}:"$(patchelf --print-rpath $out/bin/alacritty)" \
-        $out/bin/alacritty
-    '';
-
-    meta = oldAttrs.meta // {
-      description = "Alacritty with ligature patch applied";
-      homepage = "https://github.com/zenixls2/alacritty/tree/ligature";
-    };
-  });
+  alacritty-ligatures = pkgs.callPackage ../applications/terminal-emulators/alacritty-ligatures { };
 
   amdgpu-fan = pkgs.callPackage ../tools/misc/amdgpu-fan { };