Unverified Commit fb2c37b5 authored by Felix Bühler's avatar Felix Bühler Committed by GitHub
Browse files

Merge pull request #216064 from Stunkymonkey/treewide-pname-version-1 

inormalize/minc-widgets/gimp-plugins: use pname & version
parents 85cdc2a7 db348eb0

pkgs/applications/graphics/gimp/plugins/default.nix

+7 −3
Original line number Diff line number Diff line
@@ -109,7 +109,9 @@ in 
    /* menu:

       Video

    */

    name = "gap-2.6.0";

    pname = "gap";

    version = "2.6.0";



    src = fetchurl {

      url = "https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2";

      sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql";
@@ -228,7 +230,9 @@ in 
    /* menu:

      Filters/Enhance/Wavelet sharpen

    */

    name = "wavelet-sharpen-0.1.2";

    pname = "wavelet-sharpen";

    version = "0.1.2";



    # Workaround build failure on -fno-common toolchains like upstream

    # gcc-10. Otherwise build fails as:

    #   ld: interface.o:(.bss+0xe0): multiple definition of `fimg'; plugin.o:(.bss+0x40): first defined here
@@ -271,7 +275,7 @@ in 


  gimplensfun = pluginDerivation rec {

    version = "unstable-2018-10-21";

    name = "gimplensfun-${version}";

    pname = "gimplensfun";



    src = fetchFromGitHub {

      owner = "seebk";

pkgs/applications/science/biology/inormalize/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


stdenv.mkDerivation rec {

  pname = "inormalize";

  name  = "${pname}-2014-10-21";

  version  = "unstable-2014-10-21";



  src = fetchFromGitHub {

    owner  = "BIC-MNI";

pkgs/applications/science/biology/minc-widgets/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -4,8 +4,7 @@ 


stdenv.mkDerivation rec {

  pname = "minc-widgets";

  name  = "${pname}-2016-04-20";



  version = "unstable-2016-04-20";



  src = fetchFromGitHub {

    owner  = "BIC-MNI";