Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: be20f1eb3df5
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ede11844d6ed
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 3, 2020

  1. roundcube: 1.4.4 -> 1.4.5 

    https://github.com/roundcube/roundcubemail/releases/tag/1.4.5
(cherry picked from commit b236a58)
    @Ma27
    Ma27 committed Jun 3, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    JounQin JounQin
    GPG key ID: 0BC0B62F2E603198
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6197877 View commit details

  2. jetbrains: update 

    fixed missing zlib path to rpath in the clion bundled clangd binary

(cherry picked from commit 3b605ea)
    @uael @Mic92
    uael authored and Mic92 committed Jun 3, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ede1184 View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 pkgs/applications/editors/jetbrains/default.nix
  2. +2 −2 pkgs/servers/roundcube/default.nix
2 changes: 1 addition & 1 deletion pkgs/applications/editors/jetbrains/default.nix
View file
Original file line number Diff line number Diff line change
@@ -66,7 +66,7 @@ let
bin/gdb/linux/bin/gdbserver
patchelf --set-interpreter $interp \
--set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" \
--set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}" \
bin/clang/linux/clangd
patchelf --set-interpreter $interp \
--set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}" \
4 changes: 2 additions & 2 deletions pkgs/servers/roundcube/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "roundcube";
version = "1.4.4";
version = "1.4.5";

src = fetchurl {
url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
sha256 = "1my726p0wmsn21nbdsjx02h6hnbh8nidzipzdy0gk0qgda1j729b";
sha256 = "1qjjyx6p71dvip1c4knkqkv6lhdvank1png773snaw9g4fz8h73f";
};

patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];