Compare commits

..

6 Commits

9 changed files with 29 additions and 27 deletions

6
flake.lock generated
View File

@ -17,11 +17,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1607525610, "lastModified": 1611414562,
"narHash": "sha256-u+5o+8ucEGgm8IdC0t/kRm5BA2YEnUCW4PAQzwF1R30=", "narHash": "sha256-u002KfYA7Uk3vffnnmLz88BmxOzixYFdh+8II6ZT+Kg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "253de1fcdb3b82a74a0bf128a7ae2a7b2fed0932", "rev": "9d6fd2ba135c5b5c85c3332604d39b43e93b8298",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -21,15 +21,15 @@ assert withGui -> gtk3.meta.available;
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "psst"; pname = "psst";
version = "20210114.1fadc78"; version = "20210122.gec114ac";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jpochyla"; owner = "jpochyla";
repo = "psst"; repo = "psst";
rev = "1fadc78912af4d52e5e20e60e185f8e3ddcfc82e"; rev = "ec114ac8299179c8dd51bc026d6060dc75658b83";
sha256 = "1dvsxd3rica8sm9nlx14vh37wb9aclsz33ahklcfga7w0w8l4zzr"; sha256 = "02mh6hjnlimadc3w899hccss31p1r4sxgb5880zwn7yiycbq3yyj";
fetchSubmodules = true; fetchSubmodules = true;
}; };
cargoSha256 = "05miwyjyd9zjcxw3aws0xcv1jgmy0md8pa6vljg8wiqgknjxcw56"; cargoSha256 = "1m01rycnpy9asspih1x9l5ppfbjnqcfdycmzgkrmdwzah3x8s8xc";
nativeBuildInputs = [ pkg-config ] nativeBuildInputs = [ pkg-config ]
++ optional withGui copyDesktopItems; ++ optional withGui copyDesktopItems;

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.4"; version = "1.5.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ProtonMail"; owner = "ProtonMail";
repo = "proton-bridge"; repo = "proton-bridge";
rev = "br-${version}"; rev = "br-${version}";
sha256 = "1398d13skn6as9carxiws500rp5j9b33r0j2blpxrff856a8v0bp"; sha256 = "1na8min9cmn82lpad58abw6837k303fr09l6cvzswaxs73f231ig";
}; };
vendorSha256 = "1a83kh096pkyklqgdip112fps6ia90vg7zxv0nvivxmdyik2vcvz"; vendorSha256 = "1219xa1347877bfhnid15y6w9s4hf1czbrmll2iha4gpsmg066bb";
nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [
pkg-config pkg-config

View File

@ -23,13 +23,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cardboard"; pname = "cardboard";
version = "20210120"; version = "20210120.g7b15613";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "cardboardwm"; owner = "cardboardwm";
repo = "cardboard"; repo = "cardboard";
rev = "7b15613e6e1222a6a83d69a2e5da2810dfb45522"; rev = "7b15613e6e1222a6a83d69a2e5da2810dfb45522";
sha256 = "sha256-uL7zG2Q2tnGicWBeXgNjWK/drz2bbmbb5Z69sClYmhA="; sha256 = "044sb0lv1gcywpdncvlv7npxvbsqcc1mwpk0f6i73dinchdz7gmq";
}; };
patches = [ patches = [

View File

@ -11,7 +11,7 @@
buildGoModule rec { buildGoModule rec {
pname = "go-qt"; pname = "go-qt";
version = "20200904"; version = "20200904.gc0c124a";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "therecipe"; owner = "therecipe";

View File

@ -7,13 +7,13 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "zsh-z"; pname = "zsh-z";
version = "2020.09.19.09209db"; version = "20210117.g289a4a7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "agkozak"; owner = "agkozak";
repo = "zsh-z"; repo = "zsh-z";
rev = "09209db2daf4b0e7f180cea04d1344fcc06a9410"; rev = "289a4a7208db9b1778cba71c58fed46dbcea3bc7";
sha256 = "06z96v3w998hcws13lj6332154aqg1qg3ignv2x835frq677yfzm"; sha256 = "016prpavxdzjg372y2700rczdgzjb53bqz5mxjgmvrvjxwj69cf0";
}; };
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
@ -21,8 +21,7 @@ stdenv.mkDerivation {
propogatedBuildInputs = [ zsh ]; propogatedBuildInputs = [ zsh ];
installPhase = '' installPhase = ''
install -D zsh-z.plugin.zsh \ install -D zsh-z.plugin.zsh $out/share/zsh-z/zsh-z.zsh
$out/share/zsh-z/zsh-z.zsh
installShellCompletion --zsh _zshz installShellCompletion --zsh _zshz
''; '';

View File

@ -7,7 +7,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "radeon-profile-daemon"; pname = "radeon-profile-daemon";
version = "20190603"; version = "20190603.g06qxq2h";
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase ]; buildInputs = [ qtbase ];

View File

@ -20,7 +20,7 @@ assert opusSupport -> opusTools.meta.available;
python2Packages.buildPythonApplication rec { python2Packages.buildPythonApplication rec {
pname = "spotify-ripper"; pname = "spotify-ripper";
version = "2016.12.31"; version = "20161231.gd046419";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hbashton"; owner = "hbashton";

View File

@ -2,24 +2,22 @@
rec { rec {
# Alacritty with the unmerged ligature patches applied. # Alacritty with the unmerged ligature patches applied.
alacritty-ligatures = (pkgs.alacritty.override { alacritty-ligatures = pkgs.alacritty.overrideAttrs (oldAttrs: rec {
inherit (pkgs.rustPackages_1_45) rustPlatform;
}).overrideAttrs (oldAttrs: rec {
pname = "${oldAttrs.pname}-ligatures"; pname = "${oldAttrs.pname}-ligatures";
version = "0.7.0.20201204"; version = "0.7.1.20210107.gada2680";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "zenixls2"; owner = "zenixls2";
repo = "alacritty"; repo = "alacritty";
fetchSubmodules = true; fetchSubmodules = true;
rev = "9adfaeb01bffb902eb305ed9de376d2032ba994e"; rev = "ada2680e79a8f53cd350263c8cc91d2e2a264d81";
sha256 = "0lvynwgjrcrpvywpmqniw27268m0m9lw0lpwnfrbhipyp24c7pnx"; sha256 = "0c0k1ib1dl35731zyjb32apyn28xc63mhbwsig5mz3hnkyk5nisr";
}; };
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 = "1d1yz4xmal0f3c0pcn59lxfh5a3532nv7dv7s95svvi8qsvnk9gv";
}); });
ligatureInputs = [ ligatureInputs = [
@ -39,6 +37,11 @@ rec {
--set-rpath ${pkgs.lib.makeLibraryPath ligatureInputs}:"$(patchelf --show-rpath $out/bin/alacritty)" \ --set-rpath ${pkgs.lib.makeLibraryPath ligatureInputs}:"$(patchelf --show-rpath $out/bin/alacritty)" \
$out/bin/alacritty $out/bin/alacritty
''; '';
meta = oldAttrs.meta // {
description = "Alacritty with ligature patch applied";
homepage = "https://github.com/zenixls2/alacritty/tree/ligature";
};
}); });
amdgpu-fan = pkgs.callPackage ../tools/misc/amdgpu-fan { }; amdgpu-fan = pkgs.callPackage ../tools/misc/amdgpu-fan { };