diff --git a/overlays/default.nix b/overlays/default.nix index 20240edd..0d2cef36 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -30,7 +30,6 @@ (import ./nix-index.nix) (import ./prr.nix) (import ./neovim-plugins.nix) - (import ./element-desktop.nix) (import ./signal-desktop.nix) ]; }); diff --git a/overlays/element-desktop.nix b/overlays/element-desktop.nix deleted file mode 100644 index 3f3de868..00000000 --- a/overlays/element-desktop.nix +++ /dev/null @@ -1,3 +0,0 @@ -final: prev: { - element-desktop = prev.element-desktop.override { electron = prev.electron; }; -} diff --git a/overlays/prr-remote-origin-trailing-slash.patch b/overlays/prr-remote-origin-trailing-slash.patch deleted file mode 100644 index 5eadba80..00000000 --- a/overlays/prr-remote-origin-trailing-slash.patch +++ /dev/null @@ -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 = ''; - diff --git a/overlays/prr.nix b/overlays/prr.nix index 3765cbcd..1ec990a6 100644 --- a/overlays/prr.nix +++ b/overlays/prr.nix @@ -1,18 +1,16 @@ final: prev: { prr = prev.buildNpmPackage { pname = "prr"; - version = "unstable-2022-06-05"; + version = "unstable-2023-11-27"; src = prev.fetchFromGitHub { owner = "TritonDataCenter"; repo = "prr"; - rev = "bfbce27d955b6b75729ef647cec9f81dc04fea3c"; - hash = "sha256-Z5sKddpHmSJxzacMOuDOxMxBpjApS7FWCWRelHMi/4g="; + rev = "c2c3f031b6719984f620ff4ce72163bacaa170e4"; + hash = "sha256-3xNs30ZOXgSZK7thMEr4XdKCKB0effmwglT88zJtrTE="; }; - npmDepsHash = "sha256-wVh3WCuUn9l/gILx25tgxTwtwH0Q19lpXTU8gOHWsCg="; - - patches = [./prr-remote-origin-trailing-slash.patch]; + npmDepsHash = "sha256-4wzMmjSyauZbtW0zqE1PCOsM0YRH4/ngYlHoudiLAsg="; dontBuild = true; installPhase = ''