diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-04-16 12:01:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-16 12:01:10 +0000 |
| commit | 6be56bfc2e9b55bab869132f31bd74b07f837ac7 (patch) | |
| tree | e41785833e5847e2a7ff2ac46f10208375b62138 /pkgs/applications | |
| parent | 83e19bd62ee767a9003088013c8ba61dd7211f95 (diff) | |
| parent | faad370edcb37162401be50d45526f52bb16a713 (diff) | |
| download | nixpkgs-6be56bfc2e9b55bab869132f31bd74b07f837ac7.tar nixpkgs-6be56bfc2e9b55bab869132f31bd74b07f837ac7.tar.gz nixpkgs-6be56bfc2e9b55bab869132f31bd74b07f837ac7.tar.bz2 nixpkgs-6be56bfc2e9b55bab869132f31bd74b07f837ac7.tar.lz nixpkgs-6be56bfc2e9b55bab869132f31bd74b07f837ac7.tar.xz nixpkgs-6be56bfc2e9b55bab869132f31bd74b07f837ac7.tar.zst nixpkgs-6be56bfc2e9b55bab869132f31bd74b07f837ac7.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications')
4 files changed, 29 insertions, 6 deletions
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index e06096933c9..b4858b21eee 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "sha256-0XCW047WopPr3pRTy9rF3Ff6MvNRHT4FletzOERD41A="; + sha256 = "sha256-eYYaHpfSaYYrLkcD81Y4rsAMYDP1IJ7fLJJepkACkA8="; }; patches = [ diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 3660b0d7e0b..f737f18d158 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -2,6 +2,7 @@ , cairo , cmake , fetchFromGitHub +, libuv , libXdmcp , libpthreadstubs , libxcb @@ -43,13 +44,13 @@ stdenv.mkDerivation rec { pname = "polybar"; - version = "3.5.7"; + version = "3.6.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-h12VW3IY4do4cKz2Fd/QgVTBk+zJO+qXuRUCQUyO/x0="; + hash = "sha256-mLAcA8afGLNhRRU/x/TngCMcSRXdEM5wKWoYZhezJqU="; fetchSubmodules = true; }; @@ -62,6 +63,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo + libuv libXdmcp libpthreadstubs libxcb @@ -84,6 +86,14 @@ stdenv.mkDerivation rec { ++ lib.optional i3Support i3 ++ lib.optional i3GapsSupport i3-gaps; + patches = [ ./remove-hardcoded-etc.diff ]; + + # Replace hardcoded /etc when copying and reading the default config. + postPatch = '' + substituteInPlace CMakeLists.txt --replace "/etc" $out + substituteAllInPlace src/utils/file.cpp + ''; + postInstall = if i3Support then '' wrapProgram $out/bin/polybar \ diff --git a/pkgs/applications/misc/polybar/remove-hardcoded-etc.diff b/pkgs/applications/misc/polybar/remove-hardcoded-etc.diff new file mode 100644 index 00000000000..d0c6db8b6b0 --- /dev/null +++ b/pkgs/applications/misc/polybar/remove-hardcoded-etc.diff @@ -0,0 +1,13 @@ +diff --git a/src/utils/file.cpp b/src/utils/file.cpp +index 9511ad61..d3d82b99 100644 +--- a/src/utils/file.cpp ++++ b/src/utils/file.cpp +@@ -322,7 +322,7 @@ namespace file_util { + possible_paths.push_back(xdg_config_dir + suffix + ".ini"); + } + +- possible_paths.push_back("/etc" + suffix + ".ini"); ++ possible_paths.push_back("@out@" + suffix + ".ini"); + + for (const string& p : possible_paths) { + if (exists(p)) { diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 74ffdf3ccd8..5d6df5dac0d 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -93,11 +93,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.37.113"; + version = "1.37.116"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "YjLUDoVrZitJEQOfoM/YmD55OOL/K3KF9v76zjguQHM="; + sha256 = "HoqmzUyYas5ho9S8ZeXHj+LuNspejuQ69B6HxuKXWtw="; }; dontConfigure = true; |