chore(3p/sources): Bump channels & overlays
* //users/tazjin/emacs: string-edit was renamed to string-edit-at-point
1b2c64ce1b
* //users/grfn/…/modules:
- readyset.nix: use rain from nixpkgs
- obs.nix: use input-overlay from nixpkgs (newer version, untested)
Change-Id: I5887078cee22673c129d186a8448855b92d7b250
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7306
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: grfn <grfn@gws.fyi>
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
This commit is contained in:
sterni
parent
ff658006f0
commit
419a9ab0fe
5 changed files with 21 additions and 85 deletions
30
third_party/sources/sources.json
vendored
30
third_party/sources/sources.json
vendored
|
|
@ -17,10 +17,10 @@
|
|||
"homepage": "",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "c5e7dafee9514e8961289f81a52dfc45c419a13f",
|
||||
"sha256": "08sfsb8in7kfij55136a9dymrmhj4pfg5l4pqbgp040z5a7m3iam",
|
||||
"rev": "f301f0c632a7af8681a02eca35b3e1d271be2c37",
|
||||
"sha256": "1fwjq982fz5amm71cmyazsa0z9xhi3vjqv2jbv08rg1a9yn5vx31",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/nix-community/emacs-overlay/archive/c5e7dafee9514e8961289f81a52dfc45c419a13f.tar.gz",
|
||||
"url": "https://github.com/nix-community/emacs-overlay/archive/f301f0c632a7af8681a02eca35b3e1d271be2c37.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"home-manager": {
|
||||
|
|
@ -29,10 +29,10 @@
|
|||
"homepage": "https://nix-community.github.io/home-manager/",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "6ce3493a3c5c6a8f4cfa6f5f88723272e0cfd335",
|
||||
"sha256": "09mrmrbvi2f3wd6dwyqqkc2lsyb8ljqwv84f1z6lffiyjdvz6vm7",
|
||||
"rev": "fe85cc4c37d5f37104e349c5553029417e3833d1",
|
||||
"sha256": "1ym6wprkwckhvlv6yjikl07lyn15hsgnwm4brk9yn912h947d9vv",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/nix-community/home-manager/archive/6ce3493a3c5c6a8f4cfa6f5f88723272e0cfd335.tar.gz",
|
||||
"url": "https://github.com/nix-community/home-manager/archive/fe85cc4c37d5f37104e349c5553029417e3833d1.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"impermanence": {
|
||||
|
|
@ -41,10 +41,10 @@
|
|||
"homepage": "",
|
||||
"owner": "nix-community",
|
||||
"repo": "impermanence",
|
||||
"rev": "def994adbdfc28974e87b0e4c949e776207d5557",
|
||||
"sha256": "1xj0s2qj7xcq1zai6diymfza7mxwhizw1akxz392nv39az71yn24",
|
||||
"rev": "5df9108b346f8a42021bf99e50de89c9caa251c3",
|
||||
"sha256": "114xvdxdwmfvyi78ifb3kpscwrjkwndjxnl27dqcixpcjrjkhdj2",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/nix-community/impermanence/archive/def994adbdfc28974e87b0e4c949e776207d5557.tar.gz",
|
||||
"url": "https://github.com/nix-community/impermanence/archive/5df9108b346f8a42021bf99e50de89c9caa251c3.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"naersk": {
|
||||
|
|
@ -65,10 +65,10 @@
|
|||
"homepage": "",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5f588eb4a958f1a526ed8da02d6ea1bea0047b9f",
|
||||
"sha256": "1wgk7d1j8yj3arsbiva69bicnf3m9id8knjp625knq0siv3i9xsg",
|
||||
"rev": "54be84c3ac0122c2b2272fc68a9015304bc0bb73",
|
||||
"sha256": "18wams1qsf36f4m46m258y9kbdj7igp66i0yl55w03cb7fqvs1g9",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/5f588eb4a958f1a526ed8da02d6ea1bea0047b9f.tar.gz",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/54be84c3ac0122c2b2272fc68a9015304bc0bb73.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
|
|
@ -89,10 +89,10 @@
|
|||
"homepage": "",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "7bb04cd980cf71119d08b6833f4a0525e8b6a54a",
|
||||
"sha256": "0fpjwm17lxmmp2in9ps9xqgcwml20vc63l9d4jqzzbd10d6wbnmf",
|
||||
"rev": "f0ddbb639e2f23529ced79602cee6eb3903fc888",
|
||||
"sha256": "1k8lbawzvjls9by2fsw8gbdbmgqfmif9fay5bi1wf14nwm6654q4",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/oxalica/rust-overlay/archive/7bb04cd980cf71119d08b6833f4a0525e8b6a54a.tar.gz",
|
||||
"url": "https://github.com/oxalica/rust-overlay/archive/f0ddbb639e2f23529ced79602cee6eb3903fc888.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"rustsec-advisory-db": {
|
||||
|
|
|
|||
|
|
@ -10,21 +10,7 @@
|
|||
(writeShellScriptBin "dotclip" "xclip -out -selection clipboard | dot -Tpng | feh -")
|
||||
(writeShellScriptBin "dotcontroller" "curl -s localhost:6033/graph | dot -Tpng | feh -")
|
||||
|
||||
# TODO(grfn): rain fails to build with Go >=1.18, investigate.
|
||||
(buildGo117Module rec {
|
||||
pname = "rain";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws-cloudformation";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "168gkchshl5f1awqi1cgvdkm6q707702rnn0v4i5djqxmg5rk0p9";
|
||||
};
|
||||
|
||||
vendorHash = "sha256:16bx7cjh5cq9zlis8lf28i016avgqf3j9fmcvkqzd8db2vxpqx3v";
|
||||
})
|
||||
|
||||
rain
|
||||
awscli2
|
||||
amazon-ecr-credential-helper
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,60 +1,10 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with pkgs;
|
||||
|
||||
let
|
||||
libuiohook = stdenv.mkDerivation rec {
|
||||
pname = "libuiohook";
|
||||
version = "1.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kwhat";
|
||||
repo = "libuiohook";
|
||||
rev = version;
|
||||
sha256 = "1isfxn3cfrdqq22d3mlz2lzm4asf9gprs7ww2xy9c3j3srk9kd7r";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
./bootstrap.sh
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
libtool
|
||||
autoconf
|
||||
automake
|
||||
xlibsWrapper
|
||||
xorg.libXtst
|
||||
xorg.libXinerama
|
||||
xorg.libxkbfile
|
||||
libxkbcommon
|
||||
];
|
||||
};
|
||||
|
||||
obs-input-overlay = stdenv.mkDerivation rec {
|
||||
pname = "obs-input-overlay";
|
||||
version = "4.8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "univrsal";
|
||||
repo = "input-overlay";
|
||||
rev = "v${version}";
|
||||
sha256 = "1dklg0dx9ijwyhgwcaqz859rbpaivmqxqvh9w3h4byrh5pnkz8bf";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ obs-studio libuiohook ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i CMakeLists.txt \
|
||||
-e '2iinclude(${obs-studio.src}/cmake/Modules/ObsHelpers.cmake)' \
|
||||
-e '2ifind_package(LibObs REQUIRED)'
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-Wno-dev"
|
||||
];
|
||||
};
|
||||
inherit (pkgs) obs-studio;
|
||||
obs-input-overlay = pkgs.obs-studio-plugins.input-overlay;
|
||||
in
|
||||
|
||||
{
|
||||
home.packages = [
|
||||
obs-studio
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@
|
|||
(use-package rainbow-delimiters :hook (prog-mode . rainbow-delimiters-mode))
|
||||
(use-package rainbow-mode)
|
||||
(use-package s)
|
||||
(use-package string-edit)
|
||||
(use-package string-edit-at-point)
|
||||
|
||||
(use-package swiper
|
||||
:after (counsel ivy)
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ pkgs.makeOverridable
|
|||
restclient
|
||||
rust-mode
|
||||
sly
|
||||
string-edit
|
||||
string-edit-at-point
|
||||
swiper
|
||||
telephone-line
|
||||
terraform-mode
|
||||
|
|
|
|||
Loading…
Reference in a new issue