Compare commits
No commits in common. "28235c3b29d48f45dd4590b798a83139052abe0e" and "a298d95bd65c4f42015bb3976d88f008306fa2e8" have entirely different histories.
28235c3b29
...
a298d95bd6
6
flake.lock
generated
6
flake.lock
generated
@ -17,11 +17,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1611414562,
|
"lastModified": 1607525610,
|
||||||
"narHash": "sha256-u002KfYA7Uk3vffnnmLz88BmxOzixYFdh+8II6ZT+Kg=",
|
"narHash": "sha256-u+5o+8ucEGgm8IdC0t/kRm5BA2YEnUCW4PAQzwF1R30=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9d6fd2ba135c5b5c85c3332604d39b43e93b8298",
|
"rev": "253de1fcdb3b82a74a0bf128a7ae2a7b2fed0932",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -21,15 +21,15 @@ assert withGui -> gtk3.meta.available;
|
|||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "psst";
|
pname = "psst";
|
||||||
version = "20210122.gec114ac";
|
version = "20210114.1fadc78";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jpochyla";
|
owner = "jpochyla";
|
||||||
repo = "psst";
|
repo = "psst";
|
||||||
rev = "ec114ac8299179c8dd51bc026d6060dc75658b83";
|
rev = "1fadc78912af4d52e5e20e60e185f8e3ddcfc82e";
|
||||||
sha256 = "02mh6hjnlimadc3w899hccss31p1r4sxgb5880zwn7yiycbq3yyj";
|
sha256 = "1dvsxd3rica8sm9nlx14vh37wb9aclsz33ahklcfga7w0w8l4zzr";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
cargoSha256 = "1m01rycnpy9asspih1x9l5ppfbjnqcfdycmzgkrmdwzah3x8s8xc";
|
cargoSha256 = "05miwyjyd9zjcxw3aws0xcv1jgmy0md8pa6vljg8wiqgknjxcw56";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ]
|
nativeBuildInputs = [ pkg-config ]
|
||||||
++ optional withGui copyDesktopItems;
|
++ optional withGui copyDesktopItems;
|
||||||
|
@ -20,16 +20,16 @@ let
|
|||||||
|
|
||||||
buildGoModule (stdenv.lib.recursiveUpdate args rec {
|
buildGoModule (stdenv.lib.recursiveUpdate args rec {
|
||||||
inherit pname;
|
inherit pname;
|
||||||
version = "1.5.6";
|
version = "1.5.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ProtonMail";
|
owner = "ProtonMail";
|
||||||
repo = "proton-bridge";
|
repo = "proton-bridge";
|
||||||
rev = "br-${version}";
|
rev = "br-${version}";
|
||||||
sha256 = "1na8min9cmn82lpad58abw6837k303fr09l6cvzswaxs73f231ig";
|
sha256 = "1398d13skn6as9carxiws500rp5j9b33r0j2blpxrff856a8v0bp";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "1219xa1347877bfhnid15y6w9s4hf1czbrmll2iha4gpsmg066bb";
|
vendorSha256 = "1a83kh096pkyklqgdip112fps6ia90vg7zxv0nvivxmdyik2vcvz";
|
||||||
|
|
||||||
nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [
|
nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [
|
||||||
pkg-config
|
pkg-config
|
||||||
|
@ -23,13 +23,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "cardboard";
|
pname = "cardboard";
|
||||||
version = "20210120.g7b15613";
|
version = "20210120";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "cardboardwm";
|
owner = "cardboardwm";
|
||||||
repo = "cardboard";
|
repo = "cardboard";
|
||||||
rev = "7b15613e6e1222a6a83d69a2e5da2810dfb45522";
|
rev = "7b15613e6e1222a6a83d69a2e5da2810dfb45522";
|
||||||
sha256 = "044sb0lv1gcywpdncvlv7npxvbsqcc1mwpk0f6i73dinchdz7gmq";
|
sha256 = "sha256-uL7zG2Q2tnGicWBeXgNjWK/drz2bbmbb5Z69sClYmhA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "go-qt";
|
pname = "go-qt";
|
||||||
version = "20200904.gc0c124a";
|
version = "20200904";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "therecipe";
|
owner = "therecipe";
|
||||||
|
@ -7,13 +7,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
pname = "zsh-z";
|
pname = "zsh-z";
|
||||||
version = "20210117.g289a4a7";
|
version = "2020.09.19.09209db";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "agkozak";
|
owner = "agkozak";
|
||||||
repo = "zsh-z";
|
repo = "zsh-z";
|
||||||
rev = "289a4a7208db9b1778cba71c58fed46dbcea3bc7";
|
rev = "09209db2daf4b0e7f180cea04d1344fcc06a9410";
|
||||||
sha256 = "016prpavxdzjg372y2700rczdgzjb53bqz5mxjgmvrvjxwj69cf0";
|
sha256 = "06z96v3w998hcws13lj6332154aqg1qg3ignv2x835frq677yfzm";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
@ -21,7 +21,8 @@ stdenv.mkDerivation {
|
|||||||
propogatedBuildInputs = [ zsh ];
|
propogatedBuildInputs = [ zsh ];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
install -D zsh-z.plugin.zsh $out/share/zsh-z/zsh-z.zsh
|
install -D zsh-z.plugin.zsh \
|
||||||
|
$out/share/zsh-z/zsh-z.zsh
|
||||||
installShellCompletion --zsh _zshz
|
installShellCompletion --zsh _zshz
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "radeon-profile-daemon";
|
pname = "radeon-profile-daemon";
|
||||||
version = "20190603.g06qxq2h";
|
version = "20190603";
|
||||||
|
|
||||||
nativeBuildInputs = [ qmake ];
|
nativeBuildInputs = [ qmake ];
|
||||||
buildInputs = [ qtbase ];
|
buildInputs = [ qtbase ];
|
||||||
|
@ -20,7 +20,7 @@ assert opusSupport -> opusTools.meta.available;
|
|||||||
|
|
||||||
python2Packages.buildPythonApplication rec {
|
python2Packages.buildPythonApplication rec {
|
||||||
pname = "spotify-ripper";
|
pname = "spotify-ripper";
|
||||||
version = "20161231.gd046419";
|
version = "2016.12.31";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hbashton";
|
owner = "hbashton";
|
||||||
|
@ -2,22 +2,24 @@
|
|||||||
|
|
||||||
rec {
|
rec {
|
||||||
# Alacritty with the unmerged ligature patches applied.
|
# Alacritty with the unmerged ligature patches applied.
|
||||||
alacritty-ligatures = pkgs.alacritty.overrideAttrs (oldAttrs: rec {
|
alacritty-ligatures = (pkgs.alacritty.override {
|
||||||
|
inherit (pkgs.rustPackages_1_45) rustPlatform;
|
||||||
|
}).overrideAttrs (oldAttrs: rec {
|
||||||
pname = "${oldAttrs.pname}-ligatures";
|
pname = "${oldAttrs.pname}-ligatures";
|
||||||
version = "0.7.1.20210107.gada2680";
|
version = "0.7.0.20201204";
|
||||||
|
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "zenixls2";
|
owner = "zenixls2";
|
||||||
repo = "alacritty";
|
repo = "alacritty";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
rev = "ada2680e79a8f53cd350263c8cc91d2e2a264d81";
|
rev = "9adfaeb01bffb902eb305ed9de376d2032ba994e";
|
||||||
sha256 = "0c0k1ib1dl35731zyjb32apyn28xc63mhbwsig5mz3hnkyk5nisr";
|
sha256 = "0lvynwgjrcrpvywpmqniw27268m0m9lw0lpwnfrbhipyp24c7pnx";
|
||||||
};
|
};
|
||||||
|
|
||||||
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 = "1d1yz4xmal0f3c0pcn59lxfh5a3532nv7dv7s95svvi8qsvnk9gv";
|
outputHash = "1jjyqxpqk5k3kdjb4hmff562j2jncjmpq6wyyi7i3f3v1qc3xsb9";
|
||||||
});
|
});
|
||||||
|
|
||||||
ligatureInputs = [
|
ligatureInputs = [
|
||||||
@ -37,11 +39,6 @@ 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 { };
|
||||||
|
Loading…
Reference in New Issue
Block a user