Compare commits

..

No commits in common. "80f909abb11681ca4a9811b9b6dfd1da4f7a2bc5" and "f8e172c166c099be2a9bb871ce82680a4f917074" have entirely different histories.

5 changed files with 16 additions and 17 deletions

View File

@ -36,15 +36,15 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v2.3.4 uses: actions/checkout@v2.3.3
- name: Install nix - name: Install nix
uses: cachix/install-nix-action@v12 uses: cachix/install-nix-action@v11
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@v8 uses: cachix/cachix-action@v6
if: ${{ matrix.cachixName != '<YOUR_CACHIX_NAME>' }} if: ${{ matrix.cachixName != '<YOUR_CACHIX_NAME>' }}
with: with:
name: ${{ matrix.cachixName }} name: ${{ matrix.cachixName }}

View File

@ -19,20 +19,20 @@ rec {
inherit (pkgs.rustPackages_1_45) rustPlatform; inherit (pkgs.rustPackages_1_45) rustPlatform;
}).overrideAttrs (oldAttrs: rec { }).overrideAttrs (oldAttrs: rec {
pname = "${oldAttrs.pname}-ligatures"; pname = "${oldAttrs.pname}-ligatures";
version = "0.7.0.20201204"; version = "0.6.0.20201022";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "zenixls2"; owner = "zenixls2";
repo = "alacritty"; repo = "alacritty";
fetchSubmodules = true; fetchSubmodules = true;
rev = "9adfaeb01bffb902eb305ed9de376d2032ba994e"; rev = "525fe0ea174354db7ba28de65328a0db18fd7f70";
sha256 = "0lvynwgjrcrpvywpmqniw27268m0m9lw0lpwnfrbhipyp24c7pnx"; sha256 = "1j8mrslii7bw721bkgaqxm9ldrm5f01cil55dfjn7ziwz3xjvqvx";
}; };
cargoDeps = oldAttrs.cargoDeps.overrideAttrs (pkgs.lib.const { cargoDeps = oldAttrs.cargoDeps.overrideAttrs (pkgs.lib.const {
name = "${pname}-${version}-vendor.tar.gz"; name = "${pname}-${version}-vendor.tar.gz";
inherit src; inherit src;
outputHash = "1jjyqxpqk5k3kdjb4hmff562j2jncjmpq6wyyi7i3f3v1qc3xsb9"; outputHash = "11kj2hr9wkq1zq13ml561i0i0h40d34iwqy0b8apn9ij8pdp0b37";
}); });
ligatureInputs = [ ligatureInputs = [

View File

@ -20,16 +20,16 @@ let
buildGoModule (stdenv.lib.recursiveUpdate args rec { buildGoModule (stdenv.lib.recursiveUpdate args rec {
inherit pname; inherit pname;
version = "1.5.2"; version = "1.4.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ProtonMail"; owner = "ProtonMail";
repo = "proton-bridge"; repo = "proton-bridge";
rev = "br-${version}"; rev = "br-${version}";
sha256 = "1mv7fwapcarii43nnsgk7ifqlah07k54zk6vxxxmrp04gy0mzki6"; sha256 = "1339h3sa7xhqx7mbq2zzvv3mln0zsxh4aa437hs4r3gbq8jvbf97";
}; };
vendorSha256 = "01d6by8xj9py72lpfns08zqnsym98v8imb7d6hgmnzp4hfqzbz3c"; vendorSha256 = "0kdjm30xchng09k09fr7mfs9abgl0xncc25v9hzqfli6ii1qr1l2";
nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [
pkg-config pkg-config

View File

@ -9,13 +9,13 @@
buildGoModule rec { buildGoModule rec {
pname = "go-qt"; pname = "go-qt";
version = "20200904"; version = "20200701";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "therecipe"; owner = "therecipe";
repo = "qt"; repo = "qt";
rev = "c0c124a5770d357908f16fa57e0aa0ec6ccd3f91"; rev = "7f61353ee73e225efd0b08dacf0ef32f41285c71";
sha256 = "197wdh2v0g5g2dpb1gcd5gp0g4wqzip34cawisvy6z7mygmsc8rd"; sha256 = "1qwyi3rr6x49w2cbxhsyg3sbyxib7l08g6j6z1mb5w22bdgmcy7c";
}; };
vendorSha256 = "00wghn93xz240ddj47b8mkbx3cg7c0486igp6vv0x9r6ylhywsm6"; vendorSha256 = "00wghn93xz240ddj47b8mkbx3cg7c0486igp6vv0x9r6ylhywsm6";
@ -55,6 +55,5 @@ buildGoModule rec {
homepage = "https://github.com/therecipe/qt"; homepage = "https://github.com/therecipe/qt";
description = "Qt bindings for Go"; description = "Qt bindings for Go";
license = licenses.lgpl3; license = licenses.lgpl3;
broken = true; # -mod=vendor -trimpath not supported (can be '', 'mod', 'readonly', or 'vendor'); not sure what's changed in nixpkgs
}; };
} }

View File

@ -7,13 +7,13 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "zsh-z"; pname = "zsh-z";
version = "2020.09.19.09209db"; version = "2020.06.30.ae71aab";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "agkozak"; owner = "agkozak";
repo = "zsh-z"; repo = "zsh-z";
rev = "09209db2daf4b0e7f180cea04d1344fcc06a9410"; rev = "ae71aabec5472095b01d25b4c341adb349c277f4";
sha256 = "06z96v3w998hcws13lj6332154aqg1qg3ignv2x835frq677yfzm"; sha256 = "1b3ad39l90jqzvfym6xl7lxsmab0anmjs7viiz8ldxddad9106b0";
}; };
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];