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: dde4512da9d1
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: 3ba0d9f75ccf
Choose a head ref
  • 5 commits
  • 5 files changed
  • 4 contributors

Commits on Oct 3, 2019

  1. grafana: 6.4.0 -> 6.4.1

    (cherry picked from commit dbdb787)
    WilliButz authored and Ma27 committed Oct 3, 2019
    Copy the full SHA
    a7d57a9 View commit details
  2. racerd: 2019-03-20 -> 2019-09-02

    (cherry picked from commit 02795b4)
    Jonathan Ringer authored and marsam committed Oct 3, 2019
    Copy the full SHA
    8e1ce32 View commit details
  3. gnome15: mark as broken

    It doesn't support Python 3 and newer versions of libraries are Python 2-only.
    
    (cherry picked from commit 0c02eca)
    abbradar committed Oct 3, 2019
    Copy the full SHA
    b98fdaf View commit details
  4. python2.pkgs.mkrose: mark as broken

    It supports only Python 3 now.
    
    (cherry picked from commit 2dfb002)
    abbradar committed Oct 3, 2019
    Copy the full SHA
    7949b4f View commit details
  5. opera: use autoPatchelfHook, use wrapGAppsHook

    Fixes #70322
    
    (cherry picked from commit 6854358)
    worldofpeace committed Oct 3, 2019
    Copy the full SHA
    3ba0d9f View commit details
3 changes: 3 additions & 0 deletions pkgs/applications/misc/gnome15/default.nix
Original file line number Diff line number Diff line change
@@ -28,6 +28,9 @@ stdenv.mkDerivation {

meta = with stdenv.lib; {
description = "A set of tools for configuring the Logitech G15 keyboard";
# Doesn't work with new `keyring` library which is Python 3-only now.
# https://github.com/Gnome15/gnome15/issues/29
broken = true;
license = licenses.gpl3;
homepage = https://gnome15.org/;
platforms = platforms.linux;
116 changes: 55 additions & 61 deletions pkgs/applications/networking/browsers/opera/default.nix
Original file line number Diff line number Diff line change
@@ -36,60 +36,14 @@
, systemd
, at-spi2-atk
, at-spi2-core
, autoPatchelfHook
, wrapGAppsHook
}:

let

mirror = "https://get.geo.opera.com/pub/opera/desktop";

rpath = lib.makeLibraryPath [

# These provide shared libraries loaded when starting. If one is missing,
# an error is shown in stderr.
alsaLib.out
atk.out
cairo.out
cups
curl.out
dbus.lib
expat.out
fontconfig.lib
freetype.out
gdk-pixbuf.out
glib.out
gnome2.GConf
gtk3.out
libX11.out
libXScrnSaver.out
libXcomposite.out
libXcursor.out
libXdamage.out
libXext.out
libXfixes.out
libXi.out
libXrandr.out
libXrender.out
libXtst.out
libxcb.out
libnotify.out
libuuid.out
nspr.out
nss.out
pango.out
stdenv.cc.cc.lib

# This is a little tricky. Without it the app starts then crashes. Then it
# brings up the crash report, which also crashes. `strace -f` hints at a
# missing libudev.so.0.
systemd.lib

# Works fine without this except there is no sound.
libpulseaudio.out

at-spi2-atk
at-spi2-core
];

in stdenv.mkDerivation rec {

pname = "opera";
@@ -102,23 +56,63 @@ in stdenv.mkDerivation rec {

unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";

nativeBuildInputs = [
autoPatchelfHook
wrapGAppsHook
];

buildInputs = [
alsaLib
at-spi2-atk
at-spi2-core
atk
cairo
cups
curl
dbus
expat
fontconfig.lib
freetype
gdk-pixbuf
glib
gnome2.GConf
gtk3
libX11
libXScrnSaver
libXcomposite
libXcursor
libXdamage
libXext
libXfixes
libXi
libXrandr
libXrender
libXtst
libnotify
libuuid
libxcb
nspr
nss
pango
stdenv.cc.cc.lib
];

runtimeDependencies = [
# Works fine without this except there is no sound.
libpulseaudio.out

# This is a little tricky. Without it the app starts then crashes. Then it
# brings up the crash report, which also crashes. `strace -f` hints at a
# missing libudev.so.0.
systemd.lib
];

installPhase = ''
mkdir --parent $out
mv * $out/
mkdir -p $out
cp -r . $out/
mv $out/lib/*/opera/*.so $out/lib/
'';

postFixup = ''
find $out -executable -type f \
| while read f
do
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$out/lib:${rpath}" \
"$f"
done
'';

meta = with lib; {
homepage = "https://www.opera.com";
description = "Web browser";
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/mlrose/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{ stdenv, buildPythonPackage, fetchPypi, scikitlearn }:
{ stdenv, isPy27, buildPythonPackage, fetchPypi, scikitlearn }:

buildPythonPackage rec {
pname = "mlrose";
version = "1.2.0";
disabled = isPy27;

src = fetchPypi {
inherit pname version;
8 changes: 4 additions & 4 deletions pkgs/development/tools/rust/racerd/default.nix
Original file line number Diff line number Diff line change
@@ -4,20 +4,20 @@ with rustPlatform;

buildRustPackage rec {
pname = "racerd";
version = "2019-03-20";
version = "unstable-2019-09-02";
src = fetchFromGitHub {
owner = "jwilm";
repo = "racerd";
rev = "6f74488e58e42314a36ff000bae796fe54c1bdd1";
sha256 = "1lg7j2plxpn5l65jxhsm99vmy08ljdb666hm0y1nnmmzalrakrg1";
rev = "e3d380b9a1d3f3b67286d60465746bc89fea9098";
sha256 = "13jqdvjk4savcl03mrn2vzgdsd7vxv2racqbyavrxp2cm9h6cjln";
};

# a nightly compiler is required unless we use this cheat code.
RUSTC_BOOTSTRAP=1;

doCheck = false;

cargoSha256 = "15894qr0kpp5kivx0p71zmmfhfh8in0ydkvfirxh2r12x0r2jhdd";
cargoSha256 = "07130587drrdkrk7aqb8pl8i3p485qr6xh1m86630ydlnb9z6s6i";

buildInputs = [ makeWrapper ];

6 changes: 3 additions & 3 deletions pkgs/servers/monitoring/grafana/default.nix
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

buildGoPackage rec {
pname = "grafana";
version = "6.4.0";
version = "6.4.1";

goPackagePath = "github.com/grafana/grafana";

@@ -12,12 +12,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "0rqfgswlq4fs3kb1cdpisvhawxvfirrs5pja6143sm1via3p8y59";
sha256 = "0z615a885vh92kv9jm6ixhj0i1w0k44wl4rczvp6mcmasbvfb5fb";
};

srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "1hyawiq7jgdak93ayzxmksbvkvdmfc26ska0n28f4gqppvrvkcqn";
sha256 = "08y2h7c2zavxwmxlajg2qzfd0lhkj00i2azz5ydm184m38b98kk7";
};

postPatch = ''