diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/libraries/grantlee | |
parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/grantlee')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/grantlee/5/default.nix | 13 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/grantlee/default.nix | 9 |
2 files changed, 12 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/libraries/grantlee/5/default.nix b/nixpkgs/pkgs/development/libraries/grantlee/5/default.nix index 4eef2d407d8e..56899b1f8978 100644 --- a/nixpkgs/pkgs/development/libraries/grantlee/5/default.nix +++ b/nixpkgs/pkgs/development/libraries/grantlee/5/default.nix @@ -1,14 +1,15 @@ -{ mkDerivation, lib, fetchurl, qtbase, qtscript, cmake }: +{ mkDerivation, lib, fetchFromGitHub, qtbase, qtscript, cmake }: mkDerivation rec { pname = "grantlee"; 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 = "02lrdbnvaz19hkawbbj2psww1m04qsbhvv172ggpp5bbfkjwx6hk"; - name = "${pname}-${version}.tar.gz"; + src = fetchFromGitHub { + owner = "steveire"; + repo = "grantlee"; + rev = "v${version}"; + sha256 = "sha256-mAbgzdBdIW1wOTQNBePQuyTgkKdpn1c+zR3H7mXHvgk="; }; buildInputs = [ qtbase qtscript ]; @@ -46,7 +47,7 @@ mkDerivation rec { The syntax is intended to follow the syntax of the Django template system, and the design of Django is reused in Grantlee.''; - homepage = "http://gitorious.org/grantlee"; + homepage = "https://github.com/steveire/grantlee"; maintainers = [ maintainers.ttuegel ]; license = licenses.lgpl21; inherit (qtbase.meta) platforms; diff --git a/nixpkgs/pkgs/development/libraries/grantlee/default.nix b/nixpkgs/pkgs/development/libraries/grantlee/default.nix index 869430538e89..3301d6c47cff 100644 --- a/nixpkgs/pkgs/development/libraries/grantlee/default.nix +++ b/nixpkgs/pkgs/development/libraries/grantlee/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, fetchurl, qt4, cmake }: stdenv.mkDerivation rec { - name = "grantlee-0.5.1"; + pname = "grantlee"; + version = "0.5.1"; # Upstream download server has country code firewall, so I made a mirror. src = fetchurl { urls = [ - "http://downloads.grantlee.org/${name}.tar.gz" - "http://www.loegria.net/grantlee/${name}.tar.gz" + "http://downloads.grantlee.org/grantlee-${version}.tar.gz" + "http://www.loegria.net/grantlee/grantlee-${version}.tar.gz" ]; sha256 = "1b501xbimizmbmysl1j5zgnp48qw0r2r7lhgmxvzhzlv9jzhj60r"; }; @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { The syntax is intended to follow the syntax of the Django template system, and the design of Django is reused in Grantlee.''; - homepage = "http://gitorious.org/grantlee"; + homepage = "https://github.com/steveire/grantlee"; license = lib.licenses.lgpl21; inherit (qt4.meta) platforms; }; |