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: e4f4e9fd1d05
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: 8c2c14ac392e
Choose a head ref
  • 5 commits
  • 4 files changed
  • 5 contributors

Commits on Oct 4, 2018

  1. elan: 0.5.0 -> 0.7.1

    @gebner
    gebner committed Oct 4, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6C654787275A64F1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0a7e258 View commit details

  2. nixos-option: fix #47722 when missing ~/.nix-defexpr/channels 

    The problem was that the non-fatal warning was not omitted
from the output when constructing a nix expression.
Now it seems OK for me.  When return code is OK,
the warnings don't get passed anywhere, but I expect
that won't matter for this utility.  Fatal errors are still shown.
    @vcunat
    vcunat committed Oct 4, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6C654787275A64F1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    de93b32 View commit details

  3. nodePackages.webtorrent-cli: add node-gyp dependency, fixes build

    @schneefux
    schneefux committed Oct 4, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6C654787275A64F1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ce4072c View commit details

  4. i2pd: 2.20.0 -> 2.21.0

    @edwtjo
    edwtjo committed Oct 4, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6C654787275A64F1
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6ffb60c View commit details

  5. Merge pull request #47869 from schneefux/pkg/webtorrent-cli 

    nodePackages.webtorrent-cli: add node-gyp dependency, fixes build
    @Mic92
    Mic92 authored Oct 4, 2018
    Copy the full SHA
    8c2c14a View commit details
4 changes: 2 additions & 2 deletions nixos/modules/installer/tools/nixos-option.sh
View file
Original file line number Diff line number Diff line change
@@ -82,15 +82,15 @@ evalNix(){
set -e

if test $exit_code -eq 0; then
cat <<EOF
sed '/^warning: Nix search path/d' <<EOF
$result
EOF
return 0;
else
sed -n '
/^error/ { s/, at (string):[0-9]*:[0-9]*//; p; };
/^warning: Nix search path/ { p; };
' <<EOF
' >&2 <<EOF
$result
EOF
exit_code=1
6 changes: 3 additions & 3 deletions pkgs/applications/science/logic/elan/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

rustPlatform.buildRustPackage rec {
name = "elan-${version}";
version = "0.5.0";
version = "0.7.1";

cargoSha256 = "01d3s47fjszxx8s5gr3haxq3kz3hswkrkr8x97wx8l4nfhm8ndd2";
cargoSha256 = "0vv7kr7rc3lvas7ngp5dp99ajjd5v8k5937ish7zqz1k4970q2f1";

src = fetchFromGitHub {
owner = "kha";
repo = "elan";
rev = "v${version}";
sha256 = "13zcqlyz0nwvd574llndrs7kvkznj6njljkq3v5j7kb3vndkj6i9";
sha256 = "0x5s1wm78yx5ci63wrmlkzm6k3281p33gn4dzw25k5s4vx0p9n24";
};

nativeBuildInputs = [ pkgconfig ];
4 changes: 4 additions & 0 deletions pkgs/development/node-packages/default-v8.nix
View file
Original file line number Diff line number Diff line change
@@ -107,4 +107,8 @@ nodePackages // {
dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this.
};

webtorrent-cli = nodePackages.webtorrent-cli.override {
buildInputs = [ nodePackages.node-gyp-build ];
};

}
4 changes: 2 additions & 2 deletions pkgs/tools/networking/i2pd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,13 +11,13 @@ stdenv.mkDerivation rec {

name = pname + "-" + version;
pname = "i2pd";
version = "2.20.0";
version = "2.21.0";

src = fetchFromGitHub {
owner = "PurpleI2P";
repo = pname;
rev = version;
sha256 = "182iwfaz9ar18pqknrg60w89iinj91rn2651yaz2ap77h2a2psvf";
sha256 = "02zsig63cambwm479ckw4kl1dk00g1q2sbzsvn9vy1xpjy928n7v";
};

buildInputs = with stdenv.lib; [ boost zlib openssl ]