Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a80026ec0b78
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f54cb38d8515
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 13, 2018

  1. treewide: fix evaluation with allowAliases = false

    @ryantm
    ryantm committed Oct 13, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    costrouc Christopher Ostrouchov
    GPG key ID: 9ED59B0AB1EAF573
    Verified
    Learn about vigilant mode
    Copy the full SHA
    07f8104 View commit details

  2. Merge pull request #48339 from ryantm/fixaliases 

    treewide: fix evaluation with `allowAliases = false`
    @ryantm
    ryantm authored Oct 13, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    costrouc Christopher Ostrouchov
    GPG key ID: 9ED59B0AB1EAF573
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f54cb38 View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 pkgs/applications/networking/p2p/soulseekqt/default.nix
  2. +1 −1 pkgs/development/haskell-modules/configuration-nix.nix
4 changes: 2 additions & 2 deletions pkgs/applications/networking/p2p/soulseekqt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
, qtbase, qtmultimedia
, libjson, libgpgerror
, libX11, libxcb, libXau, libXdmcp, freetype, libbsd
, pythonPackages, squashfsTools, desktop_file_utils
, pythonPackages, squashfsTools, desktop-file-utils
}:

with stdenv.lib;
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {

dontBuild = true;

buildInputs = [ pythonPackages.binwalk squashfsTools desktop_file_utils ];
buildInputs = [ pythonPackages.binwalk squashfsTools desktop-file-utils ];

# avoid usage of appimage's runner option --appimage-extract
unpackCmd = ''
2 changes: 1 addition & 1 deletion pkgs/development/haskell-modules/configuration-nix.nix
View file
Original file line number Diff line number Diff line change
@@ -540,7 +540,7 @@ self: super: builtins.intersectAttrs super {
--prefix PATH : "${path}" \
--set NIX_CC_WRAPPER_x86_64_unknown_linux_gnu_TARGET_HOST 1 \
--set NIX_CFLAGS_COMPILE "-I${opencl-headers}/include" \
--set NIX_CFLAGS_LINK "-L${opencl-icd}/lib"
--set NIX_CFLAGS_LINK "-L${ocl-icd}/lib"
'';
});
}