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: aa1151c0d9b8
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: 09aa1b23bb5f
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 17, 2020

  1. skanlite: use qt5's mkDerivaiton 

    (cherry picked from commit 4b20959)
    @worldofpeace
    worldofpeace committed Jan 17, 2020
    Copy the full SHA
    ed422d8 View commit details

  2. skanlite: don't set enableParallelBuilding 

    it's default on

(cherry picked from commit ac96ba0)
    @worldofpeace
    worldofpeace committed Jan 17, 2020
    Copy the full SHA
    b7e1cdd View commit details

  3. fish: fix systemctl completion

    @gebner
    gebner committed Jan 17, 2020
    Copy the full SHA
    09aa1b2 View commit details
Showing with 12 additions and 4 deletions.
  1. +2 −4 pkgs/applications/office/skanlite/default.nix
  2. +10 −0 pkgs/shells/fish/default.nix
6 changes: 2 additions & 4 deletions pkgs/applications/office/skanlite/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, extra-cmake-modules, qtbase,
{ stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, qtbase,
kcoreaddons, kdoctools, ki18n, kio, kxmlgui, ktextwidgets,
libksane
}:

let
minorVersion = "2.0";
in stdenv.mkDerivation rec {
in mkDerivation rec {
name = "skanlite-2.0.1";

src = fetchurl {
@@ -21,8 +21,6 @@ in stdenv.mkDerivation rec {
libksane
];

enableParallelBuilding = true;

meta = with stdenv.lib; {
description = "KDE simple image scanning application";
homepage = http://www.kde.org/applications/graphics/skanlite/;
10 changes: 10 additions & 0 deletions pkgs/shells/fish/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
groff, man-db, getent, libiconv, pcre2,
gettext, ncurses, python3,
cmake
, fetchpatch

, writeText

@@ -107,6 +108,15 @@ let
patchShebangs ./build_tools/git_version_gen.sh
'';

patches = [
# Fixes "Integer 243 in '243 (243)' followed by non-digit" error with systemctl completion.
# https://github.com/fish-shell/fish-shell/issues/5689 (will be included in fish 3.1.0)
(fetchpatch {
url = "https://github.com/fish-shell/fish-shell/commit/c6ec4235136e82c709e8d7b455f7c463f9714b48.patch";
sha256 = "02m6pkhhx6y21csydznsxkbpnwhcpzyz99xgd9ryh7s03v7wbigw";
})
];

# Required binaries during execution
# Python: Autocompletion generated from manpages and config editing
propagatedBuildInputs = [