Compare commits

..

3 Commits

Author SHA1 Message Date
31106758c5
cardboard: mark as broken 2021-06-12 11:08:11 +10:00
2f4dacf6ee
alacritty-ligatures: refactor into standalone file 2021-06-12 11:07:37 +10:00
c92d05b6b8
radeon-profile-daemon: add wrapQtAppsHook
Required as part of the latest staging-next commit set to Nixpkgs [1].

Note that this breaks builds on all current non-unstable Nixpkgs
branches (but as the repository notes, they are not supported anyway).

[1]: 02924cf951/doc/languages-frameworks/qt.section.md
2021-02-20 21:29:03 +11:00
3 changed files with 15 additions and 15 deletions

View File

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

12
flake.lock generated
View File

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

View File

@ -12,20 +12,20 @@
alacritty.overrideAttrs (oldAttrs: rec { alacritty.overrideAttrs (oldAttrs: rec {
pname = "${oldAttrs.pname}-ligatures"; pname = "${oldAttrs.pname}-ligatures";
version = "0.7.2.20210209.g3ed0430"; version = "0.7.1.20210107.gada2680";
src = pkgs.fetchFromGitHub { src = fetchFromGitHub {
owner = "zenixls2"; owner = "zenixls2";
repo = "alacritty"; repo = "alacritty";
fetchSubmodules = true; fetchSubmodules = true;
rev = "3ed043046fc74f288d4c8fa7e4463dc201213500"; rev = "df24940a9ccf7ba897fa3167046ee8b181342d8f";
sha256 = "1dGk4ORzMSUQhuKSt5Yo7rOJCJ5/folwPX2tLiu0suA="; sha256 = "sha256-2Th2aojTN36MgYSFXiACcBkTpTou/X1Ub5JR2sgZa34=";
}; };
cargoDeps = oldAttrs.cargoDeps.overrideAttrs (pkgs.lib.const { cargoDeps = oldAttrs.cargoDeps.overrideAttrs (lib.const {
name = "${pname}-${version}-vendor.tar.gz"; name = "${pname}-${version}-vendor.tar.gz";
inherit src; inherit src;
outputHash = "pONu6caJmEKnbr7j+o9AyrYNpS4Q8OEjNZOhGTalncc="; outputHash = "sha256-weGYh5qeaOHFfq2nf0UdsuIZud+7/8SCD0g0BAjoJIc=";
}); });
ligatureInputs = [ ligatureInputs = [