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

Commits on Nov 20, 2019

  1. plasma5 setup hook: provide a default hookName

    @FRidh
    FRidh committed Nov 20, 2019
    Copy the full SHA
    78d7e56 View commit details

  2. kdeFrameworks: provide a default hookName

    @FRidh
    FRidh committed Nov 20, 2019
    Copy the full SHA
    13bab29 View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 pkgs/desktops/plasma-5/default.nix
  2. +1 −1 pkgs/development/libraries/kde-frameworks/default.nix
2 changes: 1 addition & 1 deletion pkgs/desktops/plasma-5/default.nix
View file
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ let
propagate = out:
let setupHook = { writeScript }:
writeScript "setup-hook" ''
if [ "$hookName" != postHook ]; then
if [ "${hookName:-}" != postHook ]; then
postHooks+=("source @dev@/nix-support/setup-hook")
else
# Propagate $${out} output
2 changes: 1 addition & 1 deletion pkgs/development/libraries/kde-frameworks/default.nix
View file
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ let
propagate = out:
let setupHook = { writeScript }:
writeScript "setup-hook" ''
if [ "$hookName" != postHook ]; then
if [ "${hookName:-}" != postHook ]; then
postHooks+=("source @dev@/nix-support/setup-hook")
else
# Propagate $dev so that this setup hook is propagated