Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 10785e8960b9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4dda105db647
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 4, 2017

  1. rambox: 0.5.3 -> 0.5.9

    gnidorah committed Jun 4, 2017
    Copy the full SHA
    b62dea5 View commit details

Commits on Jun 5, 2017

  1. Merge pull request #26370 from gnidorah/master5 

    rambox: 0.5.3 -> 0.5.9
    @joachifm
    joachifm authored Jun 5, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    4dda105 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/applications/networking/instant-messengers/rambox/default.nix
8 changes: 4 additions & 4 deletions pkgs/applications/networking/instant-messengers/rambox/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ let
bits = if stdenv.system == "x86_64-linux" then "x64"
else "ia32";

version = "0.5.3";
version = "0.5.9";

myIcon = fetchurl {
url = "https://raw.githubusercontent.com/saenzramiro/rambox/9e4444e6297dd35743b79fe23f8d451a104028d5/resources/Icon.png";
@@ -25,16 +25,16 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox-${version}-${bits}.tar.gz";
sha256 = if bits == "x64" then
"14pp466l0fj98p5qsb7i11hd603gwsir26m3j4gljzcizb9hirqv" else
"13xmljsdahffdzndg30qxh8mj7bgd9jwkxknrvlh3l6w35pbj085";
"0wx1cj3h1h28lhvl8ysmvr2wxq39lklk37361i598vph2pvnibi0" else
"1dqjd5rmml63h3y43n1r68il3pn8zwy0wwr0866cnpizsbis96fy";
};

# don't remove runtime deps
dontPatchELF = true;

deps = (with xorg; [
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
libXrender libX11 libXtst libXScrnSaver
libXrender libX11 libXtst libXScrnSaver libxcb
]) ++ [
gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc