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: 9745c3b64a69
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: 625f62bbb459
Choose a head ref
  • 7 commits
  • 5 files changed
  • 7 contributors

Commits on May 25, 2019

  1. slack: 3.4.0 -> 3.4.2

    Milan Pässler committed May 25, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vszakats Viktor Szakats
    Copy the full SHA
    1078041 View commit details

Commits on May 26, 2019

  1. Copy the full SHA
    a7a9047 View commit details
  2. mutt: 1.11.4 -> 1.12.0

    Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
    matthiasbeyer committed May 26, 2019
    Copy the full SHA
    0a3fdeb View commit details

Commits on May 27, 2019

  1. Merge pull request #62081 from matthiasbeyer/update-mutt

    mutt: 1.11.4 -> 1.12.0
    lsix authored May 27, 2019
    Copy the full SHA
    e4fc985 View commit details
  2. Merge pull request #62066 from petabyteboy/feature/slack

    slack: 3.4.0 -> 3.4.2
    c0bw3b authored May 27, 2019
    Copy the full SHA
    b978c1d View commit details
  3. exodus: init at 19.5.24

    mmahut authored and Lassulus committed May 27, 2019
    Copy the full SHA
    4d5ab3a View commit details
  4. Merge pull request #62080 from thefloweringash/packer-1.4.1

    packer: 1.4.0 -> 1.4.1
    markuskowa authored May 27, 2019
    Copy the full SHA
    625f62b View commit details
78 changes: 78 additions & 0 deletions pkgs/applications/altcoins/exodus/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
{ stdenv, lib, makeWrapper, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, gnome2,
atk, cairo, gdk_pixbuf, xorg, xorg_sys_opengl, utillinux, alsaLib, dbus, at-spi2-atk,
cups, vivaldi-ffmpeg-codecs, libpulseaudio }:

stdenv.mkDerivation rec {
pname = "exodus";
version = "19.5.24";

src = fetchurl {
url = "https://exodusbin.azureedge.net/releases/${pname}-linux-x64-${version}.zip";
sha256 = "1yx296i525qmpqh8f2vax7igffg826nr8cyq1l0if35374bdsqdw";
};

sourceRoot = ".";
unpackCmd = ''
${unzip}/bin/unzip "$src" -x "Exodus*/lib*so"
'';

installPhase = ''
mkdir -p $out/bin $out/share/applications
cd Exodus-linux-x64
cp -r . $out
ln -s $out/Exodus $out/bin/Exodus
ln -s $out/exodus.desktop $out/share/applications
substituteInPlace $out/share/applications/exodus.desktop \
--replace 'Exec=bash -c "cd `dirname %k` && ./Exodus"' "Exec=Exodus"
'';

dontPatchELF = true;
dontBuild = true;

preFixup = let
libPath = lib.makeLibraryPath [
glib
nss
nspr
gtk3-x11
gnome2.pango
atk
cairo
gdk_pixbuf
xorg.libX11
xorg.libxcb
xorg.libXcomposite
xorg.libXcursor
xorg.libXdamage
xorg.libXext
xorg.libXfixes
xorg.libXi
xorg.libXrender
xorg.libXtst
xorg_sys_opengl
utillinux
xorg.libXrandr
xorg.libXScrnSaver
alsaLib
dbus.lib
at-spi2-atk
cups.lib
libpulseaudio
systemd
vivaldi-ffmpeg-codecs
];
in ''
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${libPath}" \
$out/Exodus
'';

meta = with stdenv.lib; {
homepage = "https://www.exodus.io/";
description = "Top-rated cryptocurrency wallet with Trezor integration and built-in Exchange";
license = licenses.unfree;
platforms = platforms.linux;
maintainers = [ maintainers.mmahut ];
};
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ darkMode ? false, stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo,
cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gtk3, gdk_pixbuf,
libappindicator-gtk3, libnotify, libxcb, nspr, nss, pango , systemd, xorg,
at-spi2-atk }:
at-spi2-atk, libuuid }:

let

version = "3.4.0";
version = "3.4.2";

rpath = stdenv.lib.makeLibraryPath [
alsaLib
@@ -30,6 +30,7 @@ let
nss
stdenv.cc.cc
systemd
libuuid

xorg.libxkbfile
xorg.libX11
@@ -49,7 +50,7 @@ let
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
sha256 = "0ld53gg0dbfpi79lz2sx5br29mlhwkfcypzf3iya4cm75a33hyw5";
sha256 = "0qbj41ymckz8w1p2pazyxg7pimgn9gmpvxz4ygcm0nyivfmw2crq";
}
else
throw "Slack is not supported on ${stdenv.hostPlatform.system}";
4 changes: 2 additions & 2 deletions pkgs/applications/networking/mailreaders/mutt/default.nix
Original file line number Diff line number Diff line change
@@ -27,11 +27,11 @@ with stdenv.lib;

stdenv.mkDerivation rec {
name = "mutt-${version}";
version = "1.11.4";
version = "1.12.0";

src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
sha256 = "0098pr4anmq2a0id8wfi2vci3cgcfwf9k4q411w22xn8lrz3aldn";
sha256 = "13zr2fpql33sdbsjsiaa952js5bvphc1x4lqsj36qyzdhj3l84na";
};

patches = optional smimeSupport (fetchpatch {
4 changes: 2 additions & 2 deletions pkgs/development/tools/packer/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "packer-${version}";
version = "1.4.0";
version = "1.4.1";

goPackagePath = "github.com/hashicorp/packer";

@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "hashicorp";
repo = "packer";
rev = "v${version}";
sha256 = "0fpzmwh7vq8vc7gvlnpx4ji4yaxwi2h2ksz0z4782469pkcnbg56";
sha256 = "13pj48pbhl47rwyi6gd6dhq9wq0z2h8kzjkahhqhf62dfssv35db";
};

meta = with stdenv.lib; {
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -2783,6 +2783,8 @@ in

exiftool = perlPackages.ImageExifTool;

exodus = callPackage ../applications/altcoins/exodus { };

ext4magic = callPackage ../tools/filesystems/ext4magic { };

extract_url = callPackage ../applications/misc/extract_url { };