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: 85cadf9a9bba
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b162c2c0f4c4
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 16, 2018

  1. kde_frameworks: 5.44 -> 5.45

    @bkchr
    bkchr committed Apr 16, 2018
    Copy the full SHA
    52858e4 View commit details

Commits on Apr 18, 2018

  1. ki18n: Adds patch that fixes infinite loop in po files generation

    @bkchr
    bkchr committed Apr 18, 2018
    Copy the full SHA
    39ba663 View commit details

Commits on Apr 19, 2018

  1. Merge pull request #38960 from bkchr/kde_frameworks_5_45 

    kde_frameworks: 5.44 -> 5.45
    @peterhoeg
    peterhoeg authored Apr 19, 2018
    Copy the full SHA
    b162c2c View commit details
Showing with 320 additions and 314 deletions.
  1. +1 −1 pkgs/development/libraries/kde-frameworks/fetch.sh
  2. +7 −1 pkgs/development/libraries/kde-frameworks/ki18n.nix
  3. +312 −312 pkgs/development/libraries/kde-frameworks/srcs.nix
2 changes: 1 addition & 1 deletion pkgs/development/libraries/kde-frameworks/fetch.sh
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.44/ -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.45/ -A '*.tar.xz' )
8 changes: 7 additions & 1 deletion pkgs/development/libraries/kde-frameworks/ki18n.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation, lib, fetchpatch,
extra-cmake-modules, gettext, python,
qtbase, qtdeclarative, qtscript,
}:
@@ -13,4 +13,10 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ];
propagatedNativeBuildInputs = [ gettext python ];
buildInputs = [ qtdeclarative qtscript ];
patches = [
(fetchpatch {
url = "https://phabricator.kde.org/D12216?download=true";
sha256 = "04gpyb11vlgivqjx3lqdwgqb4ss5bphy5zmh65k57bbv4rnlsm15";
})
];
}
Loading