From 51cd05c8fc7558d3c5382f5bf85f16dba94e3f90 Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Mon, 3 Oct 2016 16:24:35 +0300 Subject: [PATCH 1/4] rambox: init at 0.4.4 --- .../instant-messengers/rambox/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/rambox/default.nix diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix new file mode 100644 index 00000000000..f3aa363f3d5 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl +, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig +, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }: + +stdenv.mkDerivation rec { + version = "0.4.4"; + name = "rambox-${version}"; + src = fetchurl { + url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox-${version}-x64.tar.gz"; + sha256 = "05xwabwij7fyifrypahcplymz46k01rzrwgp5gn79hh023w259i0"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + deps = with xorg; [ + gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes + libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib + cups expat stdenv.cc.cc + + udev libnotify + ]; + + installPhase = '' + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Rambox + patchelf --set-rpath "$out/share/rambox:${stdenv.lib.makeLibraryPath deps}" Rambox + + mkdir -p $out/bin $out/share/rambox + cp -r * $out/share/rambox + ln -s $out/share/rambox/Rambox $out/bin + ''; + + meta = with stdenv.lib; { + description = "Free and Open Source messaging and emailing app that combines common web applications into one"; + homepage = http://rambox.pro; + license = licenses.mit; + platforms = ["x86_64-linux"]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6a1d44ae9d..ccadebde527 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3350,6 +3350,8 @@ in radvd = callPackage ../tools/networking/radvd { }; + rambox = callPackage ../applications/networking/instant-messengers/rambox { }; + ranger = callPackage ../applications/misc/ranger { }; rarcrack = callPackage ../tools/security/rarcrack { }; From 756fece17dfe1f6247b6efd794465aa27cdcf7ca Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Mon, 3 Oct 2016 16:26:16 +0300 Subject: [PATCH 2/4] franz: init at 4.0.4 --- .../instant-messengers/franz/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/franz/default.nix diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix new file mode 100644 index 00000000000..71b5aaafaae --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl +, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig +, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }: + +stdenv.mkDerivation rec { + version = "4.0.4"; + name = "franz-${version}"; + src = fetchurl { + url = "https://github.com/meetfranz/franz-app/releases/download/4.0.4/Franz-linux-x64-${version}.tgz"; + sha256 = "0ssym0jfrig474g6j67g1jfybjkxnyhbqqjvrs8z6ihwlyd3rrk5"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + deps = with xorg; [ + gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes + libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib + cups expat stdenv.cc.cc + + udev libnotify + ]; + + unpackPhase = '' + tar xzf $src + ''; + + installPhase = '' + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Franz + patchelf --set-rpath "$out/share/franz:${stdenv.lib.makeLibraryPath deps}" Franz + + mkdir -p $out/bin $out/share/franz + cp -r * $out/share/franz + ln -s $out/share/franz/Franz $out/bin + ''; + + meta = with stdenv.lib; { + description = "A free messaging app that combines chat & messaging services into one application"; + homepage = http://meetfranz.com; + license = licenses.free; + platforms = ["x86_64-linux"]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ccadebde527..8ac467b9960 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1680,6 +1680,8 @@ in fprint_demo = callPackage ../tools/security/fprint_demo { }; + franz = callPackage ../applications/networking/instant-messengers/franz { }; + freeipmi = callPackage ../tools/system/freeipmi {}; freetalk = callPackage ../applications/networking/instant-messengers/freetalk { }; From 43d327c1376ebc7a53aff71595d11430f6899484 Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Mon, 3 Oct 2016 19:24:57 +0300 Subject: [PATCH 3/4] rambox, franz: recommendations by Mic92 --- lib/maintainers.nix | 1 + .../networking/instant-messengers/franz/default.nix | 2 ++ .../networking/instant-messengers/rambox/default.nix | 2 ++ 3 files changed, 5 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index cb8607cb199..d94bc265bdd 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -167,6 +167,7 @@ giogadi = "Luis G. Torres "; gleber = "Gleb Peregud "; globin = "Robin Gloster "; + gnidorah = "Alex Ivanov "; goibhniu = "Cillian de Róiste "; Gonzih = "Max Gonzih "; gpyh = "Yacine Hmito "; diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index 71b5aaafaae..1a69e530dd4 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { description = "A free messaging app that combines chat & messaging services into one application"; homepage = http://meetfranz.com; license = licenses.free; + maintainers = [ stdenv.lib.maintainers.gnidorah ]; platforms = ["x86_64-linux"]; + hydraPlatforms = []; }; } diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index f3aa363f3d5..028ec524974 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { description = "Free and Open Source messaging and emailing app that combines common web applications into one"; homepage = http://rambox.pro; license = licenses.mit; + maintainers = [ stdenv.lib.maintainers.gnidorah ]; platforms = ["x86_64-linux"]; + hydraPlatforms = []; }; } From 4e449d0159d95213380bc8b38859314aa09447fe Mon Sep 17 00:00:00 2001 From: Alex Ivanov Date: Mon, 3 Oct 2016 19:57:50 +0300 Subject: [PATCH 4/4] rambox, franz: support i386-linux --- .../networking/instant-messengers/franz/default.nix | 10 +++++++--- .../networking/instant-messengers/rambox/default.nix | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index 1a69e530dd4..3686862527e 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -3,11 +3,15 @@ , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }: stdenv.mkDerivation rec { + bits = if stdenv.system == "x86_64-linux" then "x64" + else "ia32"; version = "4.0.4"; name = "franz-${version}"; src = fetchurl { - url = "https://github.com/meetfranz/franz-app/releases/download/4.0.4/Franz-linux-x64-${version}.tgz"; - sha256 = "0ssym0jfrig474g6j67g1jfybjkxnyhbqqjvrs8z6ihwlyd3rrk5"; + url = "https://github.com/meetfranz/franz-app/releases/download/4.0.4/Franz-linux-${bits}-${version}.tgz"; + sha256 = if bits == "x64" then + "0ssym0jfrig474g6j67g1jfybjkxnyhbqqjvrs8z6ihwlyd3rrk5" else + "16l9jma2hiwzl9l41yhrwribcgmxca271rq0cfbbm9701mmmciyy"; }; phases = [ "unpackPhase" "installPhase" ]; @@ -39,7 +43,7 @@ stdenv.mkDerivation rec { homepage = http://meetfranz.com; license = licenses.free; maintainers = [ stdenv.lib.maintainers.gnidorah ]; - platforms = ["x86_64-linux"]; + platforms = ["i686-linux" "x86_64-linux"]; hydraPlatforms = []; }; } diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 028ec524974..802c814dbac 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -3,11 +3,15 @@ , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }: stdenv.mkDerivation rec { + bits = if stdenv.system == "x86_64-linux" then "x64" + else "ia32"; version = "0.4.4"; name = "rambox-${version}"; src = fetchurl { - url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox-${version}-x64.tar.gz"; - sha256 = "05xwabwij7fyifrypahcplymz46k01rzrwgp5gn79hh023w259i0"; + url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox-${version}-${bits}.tar.gz"; + sha256 = if bits == "x64" then + "05xwabwij7fyifrypahcplymz46k01rzrwgp5gn79hh023w259i0" else + "16j17rc8mld96mq1rxnwmxwfa2q5b44s40c56mwh34plqyn546l2"; }; phases = [ "unpackPhase" "installPhase" ]; @@ -35,7 +39,7 @@ stdenv.mkDerivation rec { homepage = http://rambox.pro; license = licenses.mit; maintainers = [ stdenv.lib.maintainers.gnidorah ]; - platforms = ["x86_64-linux"]; + platforms = ["i686-linux" "x86_64-linux"]; hydraPlatforms = []; }; }