chore: clean up overlays for prr + element-desktop

This commit is contained in:
teutat3s 2023-12-11 12:38:46 +01:00
parent cedf46ad4c
commit 8c11d6ed98
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
4 changed files with 4 additions and 23 deletions

View file

@ -30,7 +30,6 @@
(import ./nix-index.nix) (import ./nix-index.nix)
(import ./prr.nix) (import ./prr.nix)
(import ./neovim-plugins.nix) (import ./neovim-plugins.nix)
(import ./element-desktop.nix)
(import ./signal-desktop.nix) (import ./signal-desktop.nix)
]; ];
}); });

View file

@ -1,3 +0,0 @@
final: prev: {
element-desktop = prev.element-desktop.override { electron = prev.electron; };
}

View file

@ -1,13 +0,0 @@
diff --git a/lib/prr.js b/lib/prr.js
index f654142..c1b0e41 100755
--- a/lib/prr.js
+++ b/lib/prr.js
@@ -133,7 +133,7 @@ function determineGitRepo(args, cb) {
return;
}
- var url = stdout.replace(/\n/, '');
+ var url = stdout.replace(/\/?\n/, '');
var gitUser = '';
var gitRepoName = '';

View file

@ -1,18 +1,16 @@
final: prev: { final: prev: {
prr = prev.buildNpmPackage { prr = prev.buildNpmPackage {
pname = "prr"; pname = "prr";
version = "unstable-2022-06-05"; version = "unstable-2023-11-27";
src = prev.fetchFromGitHub { src = prev.fetchFromGitHub {
owner = "TritonDataCenter"; owner = "TritonDataCenter";
repo = "prr"; repo = "prr";
rev = "bfbce27d955b6b75729ef647cec9f81dc04fea3c"; rev = "c2c3f031b6719984f620ff4ce72163bacaa170e4";
hash = "sha256-Z5sKddpHmSJxzacMOuDOxMxBpjApS7FWCWRelHMi/4g="; hash = "sha256-3xNs30ZOXgSZK7thMEr4XdKCKB0effmwglT88zJtrTE=";
}; };
npmDepsHash = "sha256-wVh3WCuUn9l/gILx25tgxTwtwH0Q19lpXTU8gOHWsCg="; npmDepsHash = "sha256-4wzMmjSyauZbtW0zqE1PCOsM0YRH4/ngYlHoudiLAsg=";
patches = [./prr-remote-origin-trailing-slash.patch];
dontBuild = true; dontBuild = true;
installPhase = '' installPhase = ''