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: 0771a1273dd7
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: ec27f6ff3c90
Choose a head ref
  • 13 commits
  • 15 files changed
  • 10 contributors

Commits on Sep 6, 2019

  1. source-serif-pro: 2.010 -> 3.000

    @dywedir
    dywedir committed Sep 6, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    dywedir Vlad M.
    GPG key ID: 3B1AD98E3D65BD4D
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d4da04c View commit details

Commits on Sep 7, 2019

  1. Add Pamplemousse to the maintainers list

    @Pamplemousse
    Pamplemousse committed Sep 7, 2019
    Copy the full SHA
    fb32560 View commit details

Commits on Sep 8, 2019

  1. rappel: init at unstable-2019-07-08

    @Pamplemousse
    Pamplemousse committed Sep 8, 2019
    Copy the full SHA
    7778326 View commit details

  2. kde_applications: 19.08.0 -> 19.08.1

    @nyanloutre @FRidh
    nyanloutre authored and FRidh committed Sep 8, 2019
    Copy the full SHA
    a054efd View commit details

  3. Merge pull request #68229 from dywedir/source-serif-pro 

    source-serif-pro: 2.010 -> 3.000
    @ttuegel
    ttuegel authored Sep 8, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    26b0958 View commit details

  4. freeimage: 3.17.0 -> 3.18.0

    @orivej
    orivej committed Sep 8, 2019
    Copy the full SHA
    88825bb View commit details

  5. wasabiwallet: 1.1.5 -> 1.1.6

    @prusnak @FRidh
    prusnak authored and FRidh committed Sep 8, 2019
    Copy the full SHA
    2a44aeb View commit details

  6. pythonPackages.pvlib: 0.6.1 -> 0.6.3

    @jluttine @FRidh
    jluttine authored and FRidh committed Sep 8, 2019
    Copy the full SHA
    8e814a8 View commit details

  7. pythonPackage.XlsxWriter: 1.1.8 -> 1.2.0

    @jluttine @FRidh
    jluttine authored and FRidh committed Sep 8, 2019
    Copy the full SHA
    a00a398 View commit details

  8. pythonPackages.can: 3.1.0 -> 3.3.1

    @jluttine @FRidh
    jluttine authored and FRidh committed Sep 8, 2019
    Copy the full SHA
    766f0d0 View commit details

  9. jing-trang: fixup build 

    Thanks to lopsided98.  Fixes #68307.
    @vcunat
    vcunat committed Sep 8, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6756cc5 View commit details

  10. epkowa: update (#68225)

    @symphorien @veprbl
    symphorien authored and veprbl committed Sep 8, 2019
    Copy the full SHA
    8772a1d View commit details

  11. Merge pull request #68282 from Pamplemousse/rappel 

    rappel: init at unstable-2019-07-08
    @worldofpeace
    worldofpeace authored Sep 8, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ec27f6f View commit details
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -4782,6 +4782,12 @@
githubId = 11016164;
name = "Fedor Pakhomov";
};
pamplemousse = {
email = "xav.maso@gmail.com";
github = "Pamplemousse";
githubId = 2647236;
name = "Xavier Maso";
};
panaeon = {
email = "vitalii.voloshyn@gmail.com";
github = "panaeon";
52 changes: 26 additions & 26 deletions pkgs/applications/blockchains/wasabiwallet/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,37 +2,37 @@

stdenv.mkDerivation rec {
pname = "wasabiwallet";
version = "1.1.5";
version = "1.1.6";

src = fetchurl {
url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz";
sha256 = "1iq7qkpq073yq1bz8pam4cbm2myznhpjr3g9afblvmxwgbdjxak0";
};
src = fetchurl {
url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz";
sha256 = "1i7fhaj9chjlm7qg0h3azy4djnm9rxskbr3dzjj0n9rw8cjdqyq6";
};

dontBuild = true;
dontPatchELF = true;
dontBuild = true;
dontPatchELF = true;

desktopItem = makeDesktopItem {
name = "wasabi";
exec = "wasabiwallet";
desktopName = "Wasabi";
genericName = "Bitcoin wallet";
comment = meta.description;
categories = "Application;Network;Utility;";
};
desktopItem = makeDesktopItem {
name = "wasabi";
exec = "wasabiwallet";
desktopName = "Wasabi";
genericName = "Bitcoin wallet";
comment = meta.description;
categories = "Application;Network;Utility;";
};

installPhase = ''
mkdir -p $out/opt/${pname} $out/bin $out/share/applications
cp -Rv . $out/opt/${pname}
cd $out/opt/${pname}
for i in $(find . -type f -name '*.so') wassabee
do
patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc.lib xorg.libX11 curl fontconfig.lib krb5 zlib dotnet-sdk ]} $i
done
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" wassabee
ln -s $out/opt/${pname}/wassabee $out/bin/${pname}
cp -v $desktopItem/share/applications/* $out/share/applications
'';
mkdir -p $out/opt/${pname} $out/bin $out/share/applications
cp -Rv . $out/opt/${pname}
cd $out/opt/${pname}
for i in $(find . -type f -name '*.so') wassabee
do
patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc.lib xorg.libX11 curl fontconfig.lib krb5 zlib dotnet-sdk ]} $i
done
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" wassabee
ln -s $out/opt/${pname}/wassabee $out/bin/${pname}
cp -v $desktopItem/share/applications/* $out/share/applications
'';

meta = with stdenv.lib; {
description = "Privacy focused Bitcoin wallet";
2 changes: 1 addition & 1 deletion pkgs/applications/kde/fetch.sh
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/applications/19.08.0/ )
WGET_ARGS=( https://download.kde.org/stable/applications/19.08.1/ )
Loading