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: f8d156f44fba
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: df29219f5118
Choose a head ref
  • 11 commits
  • 7 files changed
  • 7 contributors

Commits on Oct 22, 2018

  1. jackett: 0.10.250 -> 0.10.258

    (cherry picked from commit 914c341)
    edwtjo authored and nyanloutre committed Oct 22, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    c4cb419 View commit details
  2. jackett: 0.10.258 -> 0.10.304

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/jackett/versions
    
    (cherry picked from commit 7f5a809)
    r-ryantm authored and nyanloutre committed Oct 22, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    93a57b3 View commit details
  3. jackett: 0.10.304 -> 0.10.365

    (cherry picked from commit 896ae49)
    nyanloutre committed Oct 22, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    25b2aeb View commit details

Commits on Oct 23, 2018

  1. jackett: update mono version to 5.14

    See details here : NixOS/nixpkgs#48821 (comment)
    
    (cherry picked from commit 7a44e6e)
    nyanloutre committed Oct 23, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    2b4f746 View commit details
  2. mu: fix build for withMug = true (#48830)

    Fixes a following build error:
    
    /nix/store/xxx-binutils-2.30/bin/ld: cannot find -lgstapp-1.0
    /nix/store/xxx-binutils-2.30/bin/ld: cannot find -lgstaudio-1.0
    /nix/store/xxx-binutils-2.30/bin/ld: cannot find -lgstfft-1.0
    /nix/store/xxx-binutils-2.30/bin/ld: cannot find -lgstpbutils-1.0
    /nix/store/xxx-binutils-2.30/bin/ld: cannot find -lgstvideo-1.0
    /nix/store/xxx-binutils-2.30/bin/ld: cannot find -lgstbase-1.0
    /nix/store/xxx-binutils-2.30/bin/ld: cannot find -lgstreamer-1.0
    
    This workaround targets release-18.09 branch and is not needed at master (no
    idea why).
    veprbl authored and xeji committed Oct 23, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    694aff6 View commit details
  3. Merge pull request #48822 from nyanloutre/18-09-jackett-10-365

    [18.09] jackett: 0.10.250 -> 0.10.365
    Mic92 authored Oct 23, 2018
    Copy the full SHA
    1b7e30c View commit details
  4. gocode: 2018-07-27 -> 2018-10-22 (#48832)

    github.com/nsf/gocode has also been deprecated in favor of github.com/mdempsky/gocode
    
    (cherry picked from commit cc4b9ef)
    kalbasit authored and xeji committed Oct 23, 2018
    Copy the full SHA
    c162a0a View commit details
  5. opentracing-cpp: init 1.5.0

    rbvermaa committed Oct 23, 2018
    Copy the full SHA
    f49df04 View commit details
  6. opentracing-cpp: add meta

    rbvermaa committed Oct 23, 2018
    Copy the full SHA
    0b695b6 View commit details
  7. Copy the full SHA
    9d6184f View commit details
  8. Copy the full SHA
    df29219 View commit details
21 changes: 21 additions & 0 deletions pkgs/development/libraries/opentracing-cpp/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
name = "opentracing-cpp-${version}";
version = "1.5.0";
src = fetchFromGitHub {
owner = "opentracing";
repo = "opentracing-cpp";
rev = "v${version}";
sha256 = "09hxj59vvz1ncbx4iblgfc3b5i74hvb3vx5245bwwwfkx5cnj1gg";
};
buildInputs = [ cmake ];

meta = {
description = "C++ implementation of the OpenTracing API";
homepage = http://opentracing.io;
license = stdenv.lib.licenses.asl20;
maintainers = with stdenv.lib.maintainers; [ rob ];
};

}

46 changes: 38 additions & 8 deletions pkgs/development/tools/gocode/default.nix
Original file line number Diff line number Diff line change
@@ -1,20 +1,50 @@
{ stdenv, buildGoPackage, fetchgit }:
{ stdenv, buildGoPackage, fetchFromGitHub }:

buildGoPackage rec {
name = "gocode-${version}";
version = "20170903-${stdenv.lib.strings.substring 0 7 rev}";
rev = "c7fddb39ecbc9ebd1ebe7d2a3af473ed0fffffa1";
name = "gocode-unstable-${version}";
version = "2018-10-22";
rev = "e893215113e5f7594faa3a8eb176c2700c921276";

goPackagePath = "github.com/nsf/gocode";
goPackagePath = "github.com/mdempsky/gocode";

# we must allow references to the original `go` package,
# because `gocode` needs to dig into $GOROOT to provide completions for the
# standard packages.
allowGoReference = true;

src = fetchgit {
src = fetchFromGitHub {
inherit rev;
url = "https://github.com/nsf/gocode";
sha256 = "0qx8pq38faig41xkl1a4hrgp3ziyjyn6g53vn5wj7cdgm5kk67nb";

owner = "mdempsky";
repo = "gocode";
sha256 = "1zsll7yghv64890k7skl0g2lg9rsaiisgrfnb8kshsxrcxi1kc2l";
};

goDeps = ./deps.nix;

preBuild = ''
# getting an error building the testdata because they contain invalid files
# on purpose as part of the testing.
rm -r go/src/$goPackagePath/internal/suggest/testdata
'';

meta = with stdenv.lib; {
description = "An autocompletion daemon for the Go programming language";
longDescription = ''
Gocode is a helper tool which is intended to be integrated with your
source code editor, like vim, neovim and emacs. It provides several
advanced capabilities, which currently includes:
- Context-sensitive autocompletion
It is called daemon, because it uses client/server architecture for
caching purposes. In particular, it makes autocompletions very fast.
Typical autocompletion time with warm cache is 30ms, which is barely
noticeable.
'';
homepage = https://github.com/mdempsky/gocode;
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ kalbasit ];
};
}
11 changes: 11 additions & 0 deletions pkgs/development/tools/gocode/deps.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions pkgs/servers/http/nginx/modules.nix
Original file line number Diff line number Diff line change
@@ -131,6 +131,18 @@
};
};

opentracing = {
src =
let src' = fetchFromGitHub {
owner = "opentracing-contrib";
repo = "nginx-opentracing";
rev = "v0.7.0";
sha256 = "16jzxhhsyfjaxb50jy5py9ppscidfx1shvc29ihldp0zs6d8khma";
};
in "${src'}/opentracing";
inputs = [ pkgs.opentracing-cpp ];
};

pagespeed =
let
version = pkgs.psol.version;
4 changes: 2 additions & 2 deletions pkgs/servers/jackett/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "jackett-${version}";
version = "0.10.250";
version = "0.10.365";

src = fetchurl {
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
sha256 = "0695r03cgmiwrsjrcippiibpcahxb55pma5a6plcfl1f8jxiwv76";
sha256 = "1wq4by10wxhcz72fappb7isw0850laf2yk5bgpx8nrjxigmv4ik0";
};

buildInputs = [ makeWrapper ];
3 changes: 2 additions & 1 deletion pkgs/tools/networking/mu/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ stdenv, fetchFromGitHub, sqlite, pkgconfig, autoreconfHook, pmccabe
, xapian, glib, gmime, texinfo , emacs, guile
, gtk3, webkitgtk24x-gtk3, libsoup, icu
, gst-plugins-base
, withMug ? false }:

stdenv.mkDerivation rec {
@@ -26,7 +27,7 @@ stdenv.mkDerivation rec {

buildInputs = [
sqlite xapian glib gmime texinfo emacs guile libsoup icu
] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x-gtk3 ];
] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x-gtk3 gst-plugins-base ];

nativeBuildInputs = [ pkgconfig autoreconfHook pmccabe ];

5 changes: 4 additions & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -3364,7 +3364,7 @@ with pkgs;
jaaa = callPackage ../applications/audio/jaaa { };

jackett = callPackage ../servers/jackett {
mono = mono5;
mono = mono514;
};

jade = callPackage ../tools/text/sgml/jade { };
@@ -4450,6 +4450,8 @@ with pkgs;

opae = callPackage ../development/libraries/opae { };

opentracing-cpp = callPackages ../development/libraries/opentracing-cpp { };

openvswitch = callPackage ../os-specific/linux/openvswitch { };

optipng = callPackage ../tools/graphics/optipng {
@@ -11260,6 +11262,7 @@ with pkgs;

mu = callPackage ../tools/networking/mu {
texinfo = texinfo4;
gst-plugins-base = gst_all_1.gst-plugins-base;
};

mueval = callPackage ../development/tools/haskell/mueval { };