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: 0be5e2442501
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: 133d836dafa5
Choose a head ref
  • 6 commits
  • 4 files changed
  • 6 contributors

Commits on Nov 13, 2019

  1. profiles/graphical.nix: Drop systemWide pulseaudio in iso 

    It's not needed since #66338 and should have been done earlier.

This is based on a follow-up on #56167.

(cherry picked from commit 4403cd1)
    @etu
    etu committed Nov 13, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    rnhmjoj Michele Guerini Rocco
    GPG key ID: BFBAF4C975F76450
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f888fe8 View commit details

  2. Merge pull request #73359 from etu/1909-disable-systemwide-pulse-iso 

    [19.09] profiles/graphical.nix: Drop systemWide pulseaudio in iso
    @adisbladis
    adisbladis authored Nov 13, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7cf3959 View commit details

  3. ppsspp: use qt5's mkDerivation 

    (cherry picked from commit 0ac7bb6)
    @W95Psp @worldofpeace
    W95Psp authored and worldofpeace committed Nov 13, 2019
    Copy the full SHA
    16defc9 View commit details

  4. mendeley: Use QT mkDerivation 

    (cherry picked from commit 658bf7f)
    @alexarice @worldofpeace
    alexarice authored and worldofpeace committed Nov 13, 2019
    Copy the full SHA
    16cb729 View commit details

Commits on Nov 14, 2019

  1. mendeley: use wrapQtApp 

    (cherry picked from commit 7c8b042)
    @worldofpeace
    worldofpeace committed Nov 14, 2019
    Copy the full SHA
    d1da904 View commit details

  2. vim-vint: fix startup 

    Ensure that `pkg_resources` is available during runtime.

(cherry picked from commit e2bad17)
    @Ma27
    Ma27 committed Nov 14, 2019
    Copy the full SHA
    133d836 View commit details
1 change: 0 additions & 1 deletion nixos/modules/profiles/graphical.nix
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,6 @@

# Enable sound in virtualbox appliances.
hardware.pulseaudio.enable = true;
hardware.pulseaudio.systemWide = true; # Needed since we run plasma as root.

environment.systemPackages = [ pkgs.glxinfo pkgs.firefox ];
}
8 changes: 5 additions & 3 deletions pkgs/applications/office/mendeley/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ fetchurl, stdenv, dpkg, which
{ fetchurl, stdenv, mkDerivation, dpkg, which
, makeWrapper
, alsaLib
, desktop-file-utils
@@ -90,7 +90,7 @@ let

in

stdenv.mkDerivation {
mkDerivation {
pname = "mendeley";
inherit version;

@@ -106,6 +106,8 @@ stdenv.mkDerivation {

dontUnpack = true;

dontWrapQtApps = true;

installPhase = ''
dpkg-deb -x $src $out
mv $out/opt/mendeleydesktop/{bin,lib,share} $out
@@ -115,7 +117,7 @@ stdenv.mkDerivation {
--set-rpath ${stdenv.lib.makeLibraryPath deps}:$out/lib \
$out/bin/mendeleydesktop
wrapProgram $out/bin/mendeleydesktop \
wrapQtApp $out/bin/mendeleydesktop \
--add-flags "--unix-distro-build" \
${stdenv.lib.optionalString autorunLinkHandler # ignore errors installing the link handler
''--run "$out/bin/install-mendeley-link-handler.sh $out/bin/mendeleydesktop ||:"''}
2 changes: 1 addition & 1 deletion pkgs/development/tools/vim-vint/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ buildPythonApplication rec {
substituteInPlace setup.py --replace "return requires" "return []"
'';
checkInputs = [ pytest ];
propagatedBuildInputs = [ ansicolor chardet pyyaml ] ;
propagatedBuildInputs = [ ansicolor chardet pyyaml setuptools] ;

# The acceptance tests check for stdout and location of binary files, which fails in nix-build.
checkPhase = ''
4 changes: 2 additions & 2 deletions pkgs/misc/emulators/ppsspp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qtmultimedia
{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qtmultimedia
, glew, libzip, snappy, zlib, withGamepads ? true, SDL2 }:

assert withGamepads -> (SDL2 != null);
with stdenv.lib;

stdenv.mkDerivation rec {
mkDerivation rec {
pname = "ppsspp";
version = "1.4.2";