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: 088e1bdf7d93
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: b55e3054b919
Choose a head ref
  • 18 commits
  • 21 files changed
  • 5 contributors

Commits on Sep 12, 2018

  1. scs: Fix darwin build

    Additionally we make the unit-test deterministic by specifying a seed
    instead of using something random.
    
    (cherry picked from commit d726c0f)
    knedlsepp authored and LnL7 committed Sep 12, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    Copy the full SHA
    84361ab View commit details
  2. eolie: 0.9.35 -> 0.9.36

    (cherry picked from commit 508e353)
    worldofpeace authored and Mic92 committed Sep 12, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    362498c View commit details
  3. vault: 0.10.4 -> 0.11.1

    zimbatm authored and LnL7 committed Sep 12, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    Copy the full SHA
    770ee0b View commit details
  4. boo: remove, broken since Jun 2016

    marked broken in June 2016, no visible attempt to fix it,
    so let's get rid of it
    
    (cherry picked from commit 5a166ff)
    xeji committed Sep 12, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    Copy the full SHA
    18e9a5c View commit details
  5. nant: remove

    - our version is from 2015
    - it doesn't build
    - upstream project is dead, last release 2012, last commit Oct 2016.
    - used by only 1 nixpkgs package: `boo`, marked broken since 2016.
    
    (cherry picked from commit dc84de5)
    xeji committed Sep 12, 2018
    Copy the full SHA
    e586eda View commit details
  6. banshee: remove

    - was broken since June 2016 because it depends on `boo`
    - no visible attempts to fix in over 2 years
    
    (cherry picked from commit 2953d4c)
    xeji committed Sep 12, 2018
    Copy the full SHA
    7d5b1d1 View commit details
  7. alock: mark linux only

    The darwin build fails and it's probably not particularly useful there.
    
        utils.c:33:19: error: use of undeclared identifier 'CLOCK_MONOTONIC'
            clock_gettime(CLOCK_MONOTONIC, &t);
    
    /cc ZHF #45961
    
    (cherry picked from commit 139eb11)
    LnL7 committed Sep 12, 2018
    Copy the full SHA
    5bf7983 View commit details
  8. asio: mark broken on darwin

    Started to fail since 1.12.1.
    
        Undefined symbols for architecture x86_64:
          "boost::chrono::steady_clock::now()", referenced from:
              pinger::start_send() in ping.o
              asio::detail::timer_queue<asio::detail::chrono_time_traits<boost::chrono::steady_clock, asio::wait_traits<boost::chrono::steady_clock> > >::wait_duration_msec(long) const in ping.o
              asio::detail::timer_queue<asio::detail::chrono_time_traits<boost::chrono::steady_clock, asio::wait_traits<boost::chrono::steady_clock> > >::wait_duration_usec(long) const in ping.o
              asio::detail::timer_queue<asio::detail::chrono_time_traits<boost::chrono::steady_clock, asio::wait_traits<boost::chrono::steady_clock> > >::get_ready_timers(asio::detail::op_queue<asio::detail::scheduler_operation>&) in ping.o
              pinger::handle_receive(unsigned long) in p
    
    /cc ZHF #45961
    
    (cherry picked from commit 80a4e48)
    LnL7 committed Sep 12, 2018
    Copy the full SHA
    93f4bb6 View commit details
  9. atlas: mark broken on darwin

    Started to fail since 3.10.3.
    
        /private/tmp/nix-build-atlas-3.10.3.drv-0/ATLAS/build/bin/ATLrun.sh: line 4: 31119 Segmentation fault: 11  $atldir/$*
        make[3]: *** [Makefile:1695: ssanity_test] Error 139
    
    /cc ZHF #45961
    
    (cherry picked from commit f1542f6)
    LnL7 committed Sep 12, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7b82c4f View commit details
  10. bitcoin-abc: mark broken on darwin

    Last successful build https://hydra.nixos.org/build/74552872.
    
    /cc ZHF #45961
    
    (cherry picked from commit cf9d1a6)
    LnL7 committed Sep 12, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a95c041 View commit details
  11. bitcoin-classic: mark broken on darwin

    Last successful build https://hydra.nixos.org/build/74552951.
    
    /cc ZHF #45961
    
    (cherry picked from commit d990bae)
    LnL7 committed Sep 12, 2018
    Copy the full SHA
    509e79e View commit details
  12. bitcoin-unlimited: mark broken on darwin

    /cc ZHF #45961
    
    (cherry picked from commit eaff0b7)
    LnL7 committed Sep 12, 2018
    Copy the full SHA
    72830db View commit details
  13. bitcoin-xt: mark broken on darwin

    /cc ZHF #45961
    
    (cherry picked from commit 8f6ede9)
    LnL7 committed Sep 12, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    3c2e66d View commit details
  14. ethsign: mark broken on darwin

    Could be caused by our older 10.10.5 CoreFoundation.
    
        go/src/github.com/ethereum/go-ethereum/vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go:51:216:
        cannot use nil as type _Ctype_CFAllocatorRef in argument to func literal
        go/src/github.com/ethereum/go-ethereum/vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go:162:47:
        cannot use nil as type _Ctype_CFAllocatorRef in argument to
        _Cfunc_CFStringCreateWithCStringNoCopy
        go/src/github.com/ethereum/go-ethereum/vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go:163:225:
        cannot use nil as type _Ctype_CFAllocatorRef in argument to func literal
    
    /cc ZHF #45961
    
    (cherry picked from commit e7ecf59)
    LnL7 committed Sep 12, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    70f2abe View commit details
  15. litecoin: add missing framework and mark broken on darwin

        In file included from qt/bitcoin.cpp:9:
        ./qt/bitcoingui.h:14:10: fatal error: 'QLabel' file not found
        #include <QLabel>
                 ^~~~~~~~
        1 error generated.
    
    /cc ZHF #45961
    
    (cherry picked from commit 0dff3d5)
    LnL7 committed Sep 12, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    91da313 View commit details
  16. aws-okta: mark broken on darwin

    Could be caused by our older 10.10.5 CoreFoundation.
    
        # github.com/segmentio/aws-okta/vendor/github.com/keybase/go-keychain
        go/src/github.com/segmentio/aws-okta/vendor/github.com/keybase/go-keychain/corefoundation_go110.go:35:33: cannot use nil as type _Ctype_CFAllocatorRef in argument to _Cfunc_CFDataCreate
        go/src/github.com/segmentio/aws-okta/vendor/github.com/keybase/go-keychain/corefoundation_go110.go:61: cannot use nil as type _Ctype_CFAllocatorRef in argument to func literal
        go/src/github.com/segmentio/aws-okta/vendor/github.com/keybase/go-keychain/corefoundation_go110.go:98:41: cannot use nil as type _Ctype_CFAllocatorRef in argument to _Cfunc_CFStringCreateWithBytes
        go/src/github.com/segmentio/aws-okta/vendor/github.com/keybase/go-keychain/corefoundation_go110.go:133: cannot use nil as type _Ctype_CFAllocatorRef in argument to func literal
    
    /cc ZHF #45961
    
    (cherry picked from commit b814881)
    LnL7 committed Sep 12, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    642d69b View commit details
  17. asymptote: mark broken on darwin

    It only builds with gc-7.6.0 on darwin for some reason.
    
    /cc ZHF #45961
    
    (cherry picked from commit 9fc6f11)
    LnL7 committed Sep 12, 2018

    Verified

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

Commits on Sep 13, 2018

  1. mitmproxy: 3.0.4 -> 4.0.4, fix tests

    - add missing checkInputs
    - apply upstream patch to fix some tests that failed due to
      expired test ssl certs
    - re-enable a previously disabled test case
    
    (cherry picked from commit d225a91)
    xeji committed Sep 13, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    Copy the full SHA
    b55e305 View commit details
1 change: 1 addition & 0 deletions pkgs/applications/altcoins/bitcoin-abc.nix
Original file line number Diff line number Diff line change
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
homepage = https://bitcoinabc.org/;
maintainers = with maintainers; [ lassulus ];
license = licenses.mit;
broken = stdenv.isDarwin;
platforms = platforms.unix;
};
}
1 change: 1 addition & 0 deletions pkgs/applications/altcoins/bitcoin-classic.nix
Original file line number Diff line number Diff line change
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
homepage = https://bitcoinclassic.com/;
maintainers = with maintainers; [ jefdaj ];
license = licenses.mit;
broken = stdenv.isDarwin;
platforms = platforms.unix;
};
}
1 change: 1 addition & 0 deletions pkgs/applications/altcoins/bitcoin-unlimited.nix
Original file line number Diff line number Diff line change
@@ -62,6 +62,7 @@ stdenv.mkDerivation rec {
homepage = https://www.bitcoinunlimited.info/;
maintainers = with maintainers; [ DmitryTsygankov ];
license = licenses.mit;
broken = stdenv.isDarwin;
platforms = platforms.unix;
};
}
1 change: 1 addition & 0 deletions pkgs/applications/altcoins/bitcoin-xt.nix
Original file line number Diff line number Diff line change
@@ -43,6 +43,7 @@ stdenv.mkDerivation rec{
homepage = https://bitcoinxt.software/;
maintainers = with maintainers; [ jefdaj ];
license = licenses.mit;
broken = stdenv.isDarwin;
platforms = platforms.unix;
};
}
6 changes: 4 additions & 2 deletions pkgs/applications/altcoins/default.nix
Original file line number Diff line number Diff line change
@@ -62,8 +62,10 @@ rec {
buildGoPackage = buildGo110Package;
};

litecoin = callPackage ./litecoin.nix { withGui = true; };
litecoind = callPackage ./litecoin.nix { withGui = false; };
litecoin = callPackage ./litecoin.nix {
inherit (darwin.apple_sdk.frameworks) AppKit;
};
litecoind = litecoin.override { withGui = false; };

masari = callPackage ./masari.nix { };

1 change: 1 addition & 0 deletions pkgs/applications/altcoins/ethsign/default.nix
Original file line number Diff line number Diff line change
@@ -54,6 +54,7 @@ buildGoPackage rec {
meta = with stdenv.lib; {
homepage = https://github.com/dapphub/ethsign;
description = "Make raw signed Ethereum transactions";
broken = stdenv.isDarwin; # test with CoreFoundation 10.11
license = [licenses.gpl3];
};
}
9 changes: 7 additions & 2 deletions pkgs/applications/altcoins/litecoin.nix
Original file line number Diff line number Diff line change
@@ -2,9 +2,12 @@
, pkgconfig, autoreconfHook
, openssl, db48, boost, zlib, miniupnpc
, glib, protobuf, utillinux, qt4, qrencode
, withGui, libevent }:
, AppKit
, withGui ? true, libevent
}:

with stdenv.lib;

stdenv.mkDerivation rec {

name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version;
@@ -20,6 +23,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ openssl db48 boost zlib
miniupnpc glib protobuf utillinux libevent ]
++ optionals stdenv.isDarwin [ AppKit ]
++ optionals withGui [ qt4 qrencode ];

configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
@@ -39,6 +43,7 @@ stdenv.mkDerivation rec {
homepage = https://litecoin.org/;
platforms = platforms.unix;
license = licenses.mit;
maintainers = with maintainers; [ offline AndersonTorres ];
broken = stdenv.isDarwin;
maintainers = with maintainers; [ offline AndersonTorres ];
};
}
57 changes: 0 additions & 57 deletions pkgs/applications/audio/banshee/default.nix

This file was deleted.

42 changes: 25 additions & 17 deletions pkgs/applications/networking/browsers/eolie/default.nix
Original file line number Diff line number Diff line change
@@ -1,45 +1,53 @@
{ stdenv, fetchgit, meson, ninja, pkgconfig, wrapGAppsHook
, desktop-file-utils, gobjectIntrospection, python36Packages
, gnome3, gst_all_1, gtkspell3, hunspell }:
{ stdenv, fetchgit, meson, ninja, pkgconfig
, python3, gtk3, libsecret, gst_all_1, webkitgtk
, glib-networking, gtkspell3, hunspell, desktop-file-utils
, gobjectIntrospection, wrapGAppsHook }:

stdenv.mkDerivation rec {
python3.pkgs.buildPythonApplication rec {
name = "eolie-${version}";
version = "0.9.35";
version = "0.9.36";

format = "other";
doCheck = false;

src = fetchgit {
url = "https://gitlab.gnome.org/World/eolie";
rev = "refs/tags/${version}";
fetchSubmodules = true;
sha256 = "0x3p1fgx1fhrnr7vkkpnl34401r6k6xg2mrjff7ncb1k57q522k7";
sha256 = "1pqs6lddkj7nvxdwf0yncwdcr7683mpvx3912vn7b1f2q2zkp1fv";
};

nativeBuildInputs = with python36Packages; [
nativeBuildInputs = [
desktop-file-utils
gobjectIntrospection
meson
ninja
pkgconfig
wrapGAppsHook
wrapPython
];

buildInputs = [ gtkspell3 hunspell python36Packages.pygobject3 ] ++ (with gnome3; [
glib glib-networking gsettings-desktop-schemas gtk3 webkitgtk libsecret
]) ++ (with gst_all_1; [
gst-libav gst-plugins-base gst-plugins-ugly gstreamer
]);
buildInputs = with gst_all_1; [
glib-networking
gst-libav
gst-plugins-base
gst-plugins-ugly
gstreamer
gtk3
gtkspell3
hunspell
libsecret
webkitgtk
];

pythonPath = with python36Packages; [
pythonPath = with python3.pkgs; [
beautifulsoup4
pycairo
pygobject3
python-dateutil
];

postFixup = "wrapPythonPrograms";

postPatch = ''
chmod +x meson_post_install.py # patchShebangs requires executable file
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
'';

45 changes: 0 additions & 45 deletions pkgs/development/compilers/boo/config.patch

This file was deleted.

46 changes: 0 additions & 46 deletions pkgs/development/compilers/boo/default.nix

This file was deleted.

1 change: 1 addition & 0 deletions pkgs/development/libraries/asio/generic.nix
Original file line number Diff line number Diff line change
@@ -20,6 +20,7 @@ stdenv.mkDerivation {
homepage = http://asio.sourceforge.net/;
description = "Cross-platform C++ library for network and low-level I/O programming";
license = licenses.boost;
broken = stdenv.isDarwin; # test when updating to >=1.12.1
platforms = platforms.unix;
};
}
1 change: 1 addition & 0 deletions pkgs/development/libraries/science/math/atlas/default.nix
Original file line number Diff line number Diff line change
@@ -110,6 +110,7 @@ stdenv.mkDerivation {
homepage = http://math-atlas.sourceforge.net/;
description = "Automatically Tuned Linear Algebra Software (ATLAS)";
license = stdenv.lib.licenses.bsd3;
broken = stdenv.isDarwin; # test when updating to >=3.10.3
platforms = stdenv.lib.platforms.unix;

longDescription = ''
24 changes: 15 additions & 9 deletions pkgs/development/libraries/science/math/scs/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, blas, liblapack, gfortran }:
{ stdenv, fetchFromGitHub, blas, liblapack, gfortran, fixDarwinDylibNames }:

stdenv.mkDerivation rec {
name = "scs-${version}";
@@ -11,24 +11,30 @@ stdenv.mkDerivation rec {
sha256 = "17lbcmcsniqlyzgbzmjipfd0rrk25a8hzh7l5wl2wp1iwsd8c3a9";
};

buildInputs = [ blas liblapack gfortran.cc.lib ];

# Actually link and add libgfortran to the rpath
patchPhase = ''
sed -i 's/#-lgfortran/-lgfortran/' scs.mk
postPatch = ''
substituteInPlace scs.mk \
--replace "#-lgfortran" "-lgfortran" \
--replace "gcc" "cc"
'';

nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;

buildInputs = [ blas liblapack gfortran.cc.lib ];

doCheck = true;

# Test demo requires passing any int as $1; 42 chosen arbitrarily
checkPhase = ''
./out/demo_socp_indirect 42
# Test demo requires passing data and seed; numbers chosen arbitrarily.
postCheck = ''
./out/demo_socp_indirect 42 0.42 0.42 42
'';

installPhase = ''
runHook preInstall
mkdir -p $out/lib
cp -r include $out/
cp out/*.a out/*.so $out/lib/
cp out/*.a out/*.so out/*.dylib $out/lib/
runHook postInstall
'';

meta = with stdenv.lib; {
Loading