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

Commits on Apr 8, 2020

  1. grantlee: 5.1.0 -> 5.2.0 (#84621)

    Milan authored Apr 8, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    dywedir Vlad M.
    GPG key ID: 3B1AD98E3D65BD4D
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4dee289 View commit details
4 changes: 2 additions & 2 deletions pkgs/development/libraries/grantlee/5/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@

mkDerivation rec {
pname = "grantlee";
version = "5.1.0";
version = "5.2.0";
grantleePluginPrefix = "lib/grantlee/${lib.versions.majorMinor version}";

src = fetchurl {
url = "https://github.com/steveire/grantlee/archive/v${version}.tar.gz";
sha256 = "1lf9rkv0i0kd7fvpgg5l8jb87zw8dzcwd1liv6hji7g4wlpmfdiq";
sha256 = "02lrdbnvaz19hkawbbj2psww1m04qsbhvv172ggpp5bbfkjwx6hk";
name = "${pname}-${version}.tar.gz";
};

24 changes: 0 additions & 24 deletions pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch
View file

This file was deleted.

8 changes: 4 additions & 4 deletions pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch
View file
Original file line number Diff line number Diff line change
@@ -2,17 +2,17 @@ Index: grantlee-5.1.0/templates/lib/templateloader.cpp
===================================================================
--- grantlee-5.1.0.orig/templates/lib/templateloader.cpp
+++ grantlee-5.1.0/templates/lib/templateloader.cpp
@@ -141,10 +141,6 @@ Template FileSystemTemplateLoader::loadB
@@ -142,10 +142,6 @@ Template FileSystemTemplateLoader::loadByName(const QString &fileName,
+ QLatin1Char('/') + fileName);
const QFileInfo fi(file);

- if (file.exists()
- && !fi.canonicalFilePath().contains(
- QDir(d->m_templateDirs.at(i)).canonicalPath()))
- QDir(d->m_templateDirs.at(i)).canonicalPath()))
- return Template();
++i;
}

@@ -173,11 +169,6 @@ FileSystemTemplateLoader::getMediaUri(co
+ QLatin1Char('/') + fileName);

1 change: 0 additions & 1 deletion pkgs/development/libraries/grantlee/5/series
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
grantlee-nix-profiles.patch
grantlee-no-canonicalize-filepath.patch
grantlee-cxx11.patch