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: 803e956919ef
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: 007e94cdb3bd
Choose a head ref

Commits on Mar 2, 2019

  1. brig: init at 0.3.0

    offlinehacker committed Mar 2, 2019
    Copy the full SHA
    cdd8b94 View commit details

Commits on Mar 22, 2019

  1. plex: 1.14.1.5488 -> 1.15.2.793

    Averell Dalton committed Mar 22, 2019
    Copy the full SHA
    028a4b6 View commit details

Commits on Mar 24, 2019

  1. Copy the full SHA
    3152d49 View commit details

Commits on Mar 25, 2019

  1. Copy the full SHA
    a0a1dc0 View commit details
  2. Copy the full SHA
    b1d040b View commit details
  3. Copy the full SHA
    1c3a4ef View commit details

Commits on Mar 26, 2019

  1. pythonPackages.pyarrow: fix build

    Setting setupPyBuildFlags makes builder add an additional target
    "build_ext" to setup.py arguments in addition to "bdisst_wheel".
    pyarrow's setup.py recently started to try to redo build_ext again which
    broke the build.
    veprbl committed Mar 26, 2019
    Copy the full SHA
    49e9194 View commit details
  2. Copy the full SHA
    55223a8 View commit details
  3. Copy the full SHA
    2645454 View commit details
  4. Copy the full SHA
    4f1d762 View commit details
  5. qmmp: 1.2.5 -> 1.3.1

    gnidorah authored and bjornfor committed Mar 26, 2019
    Copy the full SHA
    ae02455 View commit details
  6. Merge pull request #58283 from dylex/bootzlib

    fetchurl: use fetchurlBoot for zlib deps
    matthewbauer authored Mar 26, 2019
    Copy the full SHA
    e8c84d3 View commit details
  7. Merge pull request #56718 from xtruder/pkgs/brig/init

    brig: init at 0.3.0
    offlinehacker authored Mar 26, 2019
    Copy the full SHA
    5c74e42 View commit details
  8. nbd: 3.18 -> 3.19

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/nbd/versions
    r-ryantm committed Mar 26, 2019
    Copy the full SHA
    ad70015 View commit details
  9. Merge pull request #58381 from dtzWill/update/gnupg-2.2.15

    gnupg: 2.2.14 -> 2.2.15
    peti authored Mar 26, 2019
    Copy the full SHA
    806d022 View commit details
  10. Merge pull request #57928 from averelld/plex-update

    plex: 1.14.1.5488 -> 1.15.1.791
    LnL7 authored Mar 26, 2019
    Copy the full SHA
    018d329 View commit details
  11. Merge pull request #58391 from r-ryantm/auto-update/nbd

    nbd: 3.18 -> 3.19
    peti authored Mar 26, 2019
    Copy the full SHA
    ffc14a6 View commit details
  12. Merge pull request #57687 from jacereda/libcaca-nox

    libcaca: make x11 optional, disabled on darwin
    LnL7 authored Mar 26, 2019
    Copy the full SHA
    b0f4ef9 View commit details
  13. Copy the full SHA
    6fc7d8a View commit details
  14. Merge pull request #58326 from veprbl/pr/pyarrow_fix_2

    pythonPackages.pyarrow: fix build
    veprbl authored Mar 26, 2019
    Copy the full SHA
    0eb2c19 View commit details
  15. Copy the full SHA
    007e94c View commit details
2 changes: 1 addition & 1 deletion nixos/modules/services/misc/plex.nix
Original file line number Diff line number Diff line change
@@ -146,7 +146,7 @@ in
PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS="6";
PLEX_MEDIA_SERVER_TMPDIR="/tmp";
PLEX_MEDIA_SERVER_USE_SYSLOG="true";
LD_LIBRARY_PATH="/run/opengl-driver/lib:${cfg.package}/usr/lib/plexmediaserver";
LD_LIBRARY_PATH="/run/opengl-driver/lib:${cfg.package}/usr/lib/plexmediaserver/lib";
LC_ALL="en_US.UTF-8";
LANG="en_US.UTF-8";
};
4 changes: 2 additions & 2 deletions pkgs/applications/altcoins/monero-gui/default.nix
Original file line number Diff line number Diff line change
@@ -13,13 +13,13 @@ with stdenv.lib;

stdenv.mkDerivation rec {
name = "monero-gui-${version}";
version = "0.13.0.4";
version = "0.14.0.0";

src = fetchFromGitHub {
owner = "monero-project";
repo = "monero-gui";
rev = "v${version}";
sha256 = "142yj5s15bhm300dislq3x5inw1f37shnrd5vyj78jjcvry3wymw";
sha256 = "1l4kx2vidr7bpds43jdbwyaz0q1dy7sricpz061ff1fkappbxdh8";
};

nativeBuildInputs = [ qmake pkgconfig ];
12 changes: 7 additions & 5 deletions pkgs/applications/altcoins/monero-gui/move-log-file.patch
Original file line number Diff line number Diff line change
@@ -13,15 +13,17 @@ index 79223c0..e80b317 100644
parser.addHelpOption();
parser.process(app);
diff --git a/Logger.cpp b/Logger.cpp
index 660bafc..dae24d4 100644
index 6b1daba..c357762 100644
--- a/Logger.cpp
+++ b/Logger.cpp
@@ -15,7 +15,7 @@ static const QString default_name = "monero-wallet-gui.log";
#elif defined(Q_OS_MAC)
static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0) + "/Library/Logs";
@@ -28,8 +28,8 @@ static const QString defaultLogName = "monero-wallet-gui.log";
static const QString appFolder = "Library/Logs";
#else // linux + bsd
//HomeLocation = "~"
- static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0);
- static const QString appFolder = ".bitmonero";
+ static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).at(0);
+ static const QString appFolder = "bitmonero";
#endif


4 changes: 2 additions & 2 deletions pkgs/applications/altcoins/monero/default.nix
Original file line number Diff line number Diff line change
@@ -11,12 +11,12 @@ with stdenv.lib;

stdenv.mkDerivation rec {
name = "monero-${version}";
version = "0.13.0.4";
version = "0.14.0.2";

src = fetchgit {
url = "https://github.com/monero-project/monero.git";
rev = "v${version}";
sha256 = "1ambgakapijhsi1pd70vw8vvnlwa3nid944lqkbfq3wl25lmc70d";
sha256 = "1471iy6c8dfdqcmcwcp0m7fp9xl74dcm5hqlfdfi217abhawfs8k";
};

nativeBuildInputs = [ cmake pkgconfig git ];
4 changes: 2 additions & 2 deletions pkgs/applications/audio/qmmp/default.nix
Original file line number Diff line number Diff line change
@@ -29,11 +29,11 @@
# handle that.

stdenv.mkDerivation rec {
name = "qmmp-1.2.5";
name = "qmmp-1.3.1";

src = fetchurl {
url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
sha256 = "1xs8kg65088yzdhdkymmknkp1s4adzv095f5jhjvy62s8ymyjvnx";
sha256 = "1dmybzibpr6hpr2iv1wvrjgww842mng2x0rh1mr8gs8j191xvlhw";
};

buildInputs =
6 changes: 3 additions & 3 deletions pkgs/applications/editors/android-studio/default.nix
Original file line number Diff line number Diff line change
@@ -18,9 +18,9 @@ let
sha256Hash = "0d7d6n7n1zzhxpdykbwwbrw139mqxkp20d4l0570pk7975p1s2q9";
};
latestVersion = { # canary & dev
version = "3.5.0.6"; # "Android Studio 3.5 Canary 7"
build = "183.5346365";
sha256Hash = "0dfkhzsxabrv8cwgyv3gicpglgpccmi1ig5shlhp6a006awgfyj0";
version = "3.5.0.7"; # "Android Studio 3.5 Canary 8"
build = "191.5375575";
sha256Hash = "0vssynvj0j4xbin9h95lciilc3j9mkm53vwzxxr3kqxwl74qx4mj";
};
in rec {
# Old alias (TODO @primeos: Remove after 19.03 is branched off):
25 changes: 25 additions & 0 deletions pkgs/applications/networking/brig/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{ stdenv, buildGoPackage, fetchFromGitHub, fetchgx }:

buildGoPackage rec {
name = "brig-${version}";
version = "0.3.0";
rev = "v${version}";

goPackagePath = "github.com/sahib/brig";
subPackages = ["."];

src = fetchFromGitHub {
owner = "sahib";
repo = "brig";
inherit rev;
sha256 = "01hpb6cvq8cw21ka74jllggkv5pavc0sbl1207x32gzxslw3gsvy";
};

meta = with stdenv.lib; {
description = "File synchronization on top of ipfs with git like interface and FUSE filesystem";
homepage = https://github.com/sahib/brig;
license = licenses.agpl3;
platforms = platforms.unix;
maintainers = with maintainers; [ offline ];
};
}
16 changes: 13 additions & 3 deletions pkgs/development/libraries/libcaca/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{ stdenv, fetchurl, ncurses, zlib, imlib2, pkgconfig, libX11, libXext }:
{ stdenv, fetchurl, ncurses, zlib, pkgconfig, imlib2
, x11Support ? !stdenv.isDarwin, libX11, libXext
}:

stdenv.mkDerivation rec {
name = "libcaca-0.99.beta19";
@@ -13,8 +15,16 @@ stdenv.mkDerivation rec {

outputs = [ "bin" "dev" "out" "man" ];

propagatedBuildInputs = [ ncurses zlib imlib2 pkgconfig libX11 ]
++ stdenv.lib.optional stdenv.isDarwin libXext;
configureFlags = [
(if x11Support then "--enable-x11" else "--disable-x11")
];

NIX_CFLAGS_COMPILE = stdenv.lib.optional (!x11Support) "-DX_DISPLAY_MISSING";

enableParallelBuilding = true;

propagatedBuildInputs = [ ncurses zlib pkgconfig (imlib2.override { inherit x11Support; }) ]
++ stdenv.lib.optionals x11Support [ libX11 libXext];

postInstall = ''
mkdir -p $dev/bin
11 changes: 9 additions & 2 deletions pkgs/development/python-modules/pyarrow/default.nix
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@ buildPythonPackage rec {
checkInputs = [ hypothesis pandas pytest ];

PYARROW_BUILD_TYPE = "release";
PYARROW_WITH_PARQUET = true;
PYARROW_CMAKE_OPTIONS = [
"-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib"

@@ -24,6 +25,10 @@ buildPythonPackage rec {
"-DCMAKE_POLICY_DEFAULT_CMP0025=NEW"
];

preBuild = ''
export PYARROW_PARALLEL=$NIX_BUILD_CORES
'';

preCheck = ''
rm pyarrow/tests/test_jvm.py
rm pyarrow/tests/test_hdfs.py
@@ -43,13 +48,15 @@ buildPythonPackage rec {
# when it is not intended to be imported at all
rm pyarrow/tests/deserialize_buffer.py
substituteInPlace pyarrow/tests/test_feather.py --replace "test_deserialize_buffer_in_different_process" "_disabled"
# Fails to bind a socket
# "PermissionError: [Errno 1] Operation not permitted"
substituteInPlace pyarrow/tests/test_ipc.py --replace "test_socket_" "_disabled"
'';

ARROW_HOME = _arrow-cpp;
PARQUET_HOME = _arrow-cpp;

setupPyBuildFlags = ["--with-parquet" ];

checkPhase = ''
mv pyarrow/tests tests
rm -rf pyarrow
13 changes: 5 additions & 8 deletions pkgs/servers/plex/default.nix
Original file line number Diff line number Diff line change
@@ -6,9 +6,9 @@
let
plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass";
plexpkg = if enablePlexPass then plexPass else {
version = "1.14.1.5488";
vsnHash = "cc260c476";
sha256 = "8ee806f35ccedcecd0cab028bbe1f7e2ac7de24292b715978d3165c4712f5c40";
version = "1.15.2.793";
vsnHash = "782228f99";
sha256 = "0yxxyczcgbk79bhnbbqpsj6vg1hi2pbf88r29dmskr664a5s0sk7";
};

in stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
sha256 = plexpkg.sha256;

src = fetchurl {
url = "https://downloads.plex.tv/plex-media-server/${version}-${vsnHash}/plexmediaserver-${version}-${vsnHash}.x86_64.rpm";
url = "https://downloads.plex.tv/plex-media-server-new/${version}-${vsnHash}/redhat/plexmediaserver-${version}-${vsnHash}.x86_64.rpm";
inherit sha256;
};

@@ -45,15 +45,12 @@ in stdenv.mkDerivation rec {
"Plex Transcoder" \
"Plex Tuner Service" ; do
patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" "$out/usr/lib/plexmediaserver/$bin"
patchelf --set-rpath "$out/usr/lib/plexmediaserver" "$out/usr/lib/plexmediaserver/$bin"
patchelf --set-rpath "$out/usr/lib/plexmediaserver/lib" "$out/usr/lib/plexmediaserver/$bin"
done
find $out/usr/lib/plexmediaserver/Resources -type f -a -perm -0100 \
-print -exec patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" '{}' \;
# executables need libstdc++.so.6
ln -s "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}/libstdc++.so.6" "$out/usr/lib/plexmediaserver/libstdc++.so.6"
# Our next problem is the "Resources" directory in /usr/lib/plexmediaserver.
# This is ostensibly a skeleton directory, which contains files that Plex
# copies into its folder in /var. Unfortunately, there are some SQLite
1 change: 1 addition & 0 deletions pkgs/tools/networking/curl/default.nix
Original file line number Diff line number Diff line change
@@ -94,6 +94,7 @@ stdenv.mkDerivation rec {

postInstall = ''
moveToOutput bin/curl-config "$dev"
'' + stdenv.lib.optionalString scpSupport ''
sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la
'' + stdenv.lib.optionalString gnutlsSupport ''
ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so
4 changes: 2 additions & 2 deletions pkgs/tools/networking/nbd/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, which }:

stdenv.mkDerivation rec {
name = "nbd-3.18";
name = "nbd-3.19";

src = fetchurl {
url = "mirror://sourceforge/nbd/${name}.tar.xz";
sha256 = "0cb0sjiv0j9sh9dk24nrjm7sa0axbrcp2av5hc91g1ryzk764dyq";
sha256 = "1446rdg490fxd8mg5gvrf4nddbw1w7lf2daxy9cpc19yy4968iml";
};

buildInputs = [ glib ]
4 changes: 2 additions & 2 deletions pkgs/tools/security/gnupg/22.nix
Original file line number Diff line number Diff line change
@@ -16,11 +16,11 @@ assert guiSupport -> pinentry != null;
stdenv.mkDerivation rec {
name = "gnupg-${version}";

version = "2.2.14";
version = "2.2.15";

src = fetchurl {
url = "mirror://gnupg/gnupg/${name}.tar.bz2";
sha256 = "0yzqrg24j9fc4f8ss5pclyvg70a9z53sv89vl77xii8yvi3fvy8v";
sha256 = "0m6lyphbb20i84isdxzfhcbzyc682hdrdv4aqkzmhrdksycf536b";
};

depsBuildBuild = [ buildPackages.stdenv.cc ];
7 changes: 5 additions & 2 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -256,6 +256,7 @@ in
curl = buildPackages.curl.override rec {
# break dependency cycles
fetchurl = stdenv.fetchurlBoot;
zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; };
pkgconfig = buildPackages.pkgconfig.override { fetchurl = stdenv.fetchurlBoot; };
perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; };
openssl = buildPackages.openssl.override {
@@ -265,7 +266,7 @@ in
};
libssh2 = buildPackages.libssh2.override {
fetchurl = stdenv.fetchurlBoot;
inherit openssl;
inherit zlib openssl;
};
# On darwin, libkrb5 needs bootstrap_cmds which would require
# converting many packages to fetchurl_boot to avoid evaluation cycles.
@@ -277,7 +278,7 @@ in
};
nghttp2 = buildPackages.nghttp2.override {
fetchurl = stdenv.fetchurlBoot;
inherit pkgconfig openssl;
inherit zlib pkgconfig openssl;
c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; };
libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; };
};
@@ -16486,6 +16487,8 @@ in

notmuch-bower = callPackage ../applications/networking/mailreaders/notmuch-bower { };

brig = callPackages ../applications/networking/brig { };

bristol = callPackage ../applications/audio/bristol { };

bs1770gain = callPackage ../applications/audio/bs1770gain { };