commit 62d62b658835d675f483d1ff78517216f75bcc5d · pyrox.dev/nixpkgs

+4 -4

pkgs/development/compilers/go/1.1-darwin.nix

···

       69
       69
        
           cp ./misc/emacs/* $out/share/emacs/site-lisp/

     

       70
       70
        
         '';

     

       71
       71
        
       

     

       72
       72
       -
         meta = {

     

       72
       72
       +
         meta = with stdenv.lib; {

     

       73
       73
        
           homepage = http://golang.org/;

     

       74
       74
        
           description = "The Go Programming language";

     

       75
       75
       -
           license = "BSD";

     

       76
       76
       -
           maintainers = with stdenv.lib.maintainers; [ zef ];

     

       77
       77
       -
           platforms = stdenv.lib.platforms.darwin;

     

       75
       75
       +
           license = licenses.bsd3;

     

       76
       76
       +
           maintainers = with maintainers; [ zef ];

     

       77
       77
       +
           platforms = platforms.darwin;

     

       78
       78
        
         };

     

       79
       79
        
       }

+4 -4

pkgs/development/compilers/go/1.1.nix

···

       90
       90
        
           cp ./misc/emacs/* $out/share/emacs/site-lisp/

     

       91
       91
        
         '';

     

       92
       92
        
       

     

       93
       93
       -
         meta = {

     

       93
       93
       +
         meta = with stdenv.lib; {

     

       94
       94
        
           branch = "1.1";

     

       95
       95
        
           homepage = http://golang.org/;

     

       96
       96
        
           description = "The Go Programming language";

     

       97
       97
       -
           license = "BSD";

     

       98
       98
       -
           maintainers = with stdenv.lib.maintainers; [ pierron viric ];

     

       99
       99
       -
           platforms = stdenv.lib.platforms.linux;

     

       97
       97
       +
           license = licenses.bsd3;

     

       98
       98
       +
           maintainers = with maintainers; [ pierron viric ];

     

       99
       99
       +
           platforms = platforms.linux;

     

       100
       100
        
         };

     

       101
       101
        
       }

+4 -4

pkgs/development/compilers/go/1.2.nix

···

       81
       81
        
           cp ./misc/emacs/* $out/share/emacs/site-lisp/

     

       82
       82
        
         '';

     

       83
       83
        
       

     

       84
       84
       -
         meta = {

     

       84
       84
       +
         meta = with stdenv.lib; {

     

       85
       85
        
           branch = "1.2";

     

       86
       86
        
           homepage = http://golang.org/;

     

       87
       87
        
           description = "The Go Programming language";

     

       88
       88
       -
           license = "BSD";

     

       89
       89
       -
           maintainers = with stdenv.lib.maintainers; [ pierron viric ];

     

       90
       90
       -
           platforms = stdenv.lib.platforms.linux;

     

       88
       88
       +
           license = licenses.bsd3;

     

       89
       89
       +
           maintainers = with maintainers; [ pierron viric ];

     

       90
       90
       +
           platforms = platforms.linux;

     

       91
       91
        
         };

     

       92
       92
        
       }

+4 -4

pkgs/development/compilers/go/1.3.nix

···

       102
       102
        
       

     

       103
       103
        
         setupHook = ./setup-hook.sh;

     

       104
       104
        
       

     

       105
       105
       -
         meta = {

     

       105
       105
       +
         meta = with stdenv.lib; {

     

       106
       106
        
           branch = "1.3";

     

       107
       107
        
           homepage = http://golang.org/;

     

       108
       108
        
           description = "The Go Programming language";

     

       109
       109
       -
           license = "BSD";

     

       110
       110
       -
           maintainers = with stdenv.lib.maintainers; [ cstrahan ];

     

       111
       111
       -
           platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;

     

       109
       109
       +
           license = licenses.bsd3;

     

       110
       110
       +
           maintainers = with maintainers; [ cstrahan ];

     

       111
       111
       +
           platforms = platforms.linux ++ platforms.darwin;

     

       112
       112
        
         };

     

       113
       113
        
       }

+4 -4

pkgs/development/compilers/go/1.4.nix

···

       88
       88
        
       

     

       89
       89
        
         setupHook = ./setup-hook.sh;

     

       90
       90
        
       

     

       91
       91
       -
         meta = {

     

       91
       91
       +
         meta = with stdenv.lib; {

     

       92
       92
        
           branch = "1.4";

     

       93
       93
        
           homepage = http://golang.org/;

     

       94
       94
        
           description = "The Go Programming language";

     

       95
       95
       -
           license = "BSD";

     

       96
       96
       -
           maintainers = with stdenv.lib.maintainers; [ cstrahan wkennington ];

     

       97
       97
       -
           platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;

     

       95
       95
       +
           license = licenses.bsd3;

     

       96
       96
       +
           maintainers = with maintainers; [ cstrahan wkennington ];

     

       97
       97
       +
           platforms = platforms.linux ++ platforms.darwin;

     

       98
       98
        
         };

     

       99
       99
        
       }

+3 -3

pkgs/servers/felix/default.nix

···

       13
       13
        
           mkdir -p $out

     

       14
       14
        
           cp -av * $out

     

       15
       15
        
         '';

     

       16
       16
       -
         meta = {

     

       16
       16
       +
         meta = with stdenv.lib; {

     

       17
       17
        
           description = "An OSGi gateway";

     

       18
       18
        
           homepage = http://felix.apache.org;

     

       19
       19
       -
           license = "ASF";

     

       20
       20
       -
           maintainers = [ stdenv.lib.maintainers.sander ];

     

       19
       19
       +
           license = licenses.asl20;

     

       20
       20
       +
           maintainers = [ maintainers.sander ];

     

       21
       21
        
         };

     

       22
       22
        
       }

+5 -5

pkgs/servers/http/jboss/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, unzip, jdk, lib }:

     

       1
       1
       +
       { stdenv, fetchurl, unzip, jdk }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "jboss-as-7.1.1.Final";

     
···

       16
       16
        
           find $out/bin -name \*.sh -print0 | xargs -0 sed -i -e '/#!\/bin\/sh/aJAVA_HOME=${jdk}'

     

       17
       17
        
         '';

     

       18
       18
        
         

     

       19
       19
       -
         meta = {

     

       20
       20
       -
           homepage = "http://www.jboss.org/";

     

       19
       19
       +
         meta = with stdenv.lib; {

     

       20
       20
       +
           homepage = http://www.jboss.org/;

     

       21
       21
        
           description = "Open Source J2EE application server";

     

       22
       22
       -
           license = "GPL/LGPL";

     

       23
       23
       -
           maintainers = [ lib.maintainers.sander ];

     

       22
       22
       +
           license = licenses.lgpl21;

     

       23
       23
       +
           maintainers = [ maintainers.sander ];

     

       24
       24
        
         };

     

       25
       25
        
       }

+4 -4

pkgs/servers/memcached/default.nix

···

       10
       10
        
       

     

       11
       11
        
         buildInputs = [cyrus_sasl libevent];

     

       12
       12
        
       

     

       13
       13
       -
         meta = {

     

       13
       13
       +
         meta = with stdenv.lib; {

     

       14
       14
        
           description = "A distributed memory object caching system";

     

       15
       15
        
           repositories.git = https://github.com/memcached/memcached.git;

     

       16
       16
        
           homepage = http://memcached.org/;

     

       17
       17
       -
           license = "bsd";

     

       18
       18
       -
           maintainers = [ stdenv.lib.maintainers.coconnor ];

     

       19
       19
       -
           platforms = stdenv.lib.platforms.linux;

     

       17
       17
       +
           license = licenses.bsd3;

     

       18
       18
       +
           maintainers = [ maintainers.coconnor ];

     

       19
       19
       +
           platforms = platforms.linux;

     

       20
       20
        
         };

     

       21
       21
        
       }

     

       22
       22

+4 -4

pkgs/servers/monitoring/zabbix/2.0.nix

···

       78
       78
        
       

     

       79
       79
        
           configureFlags = "--enable-agent";

     

       80
       80
        
       

     

       81
       81
       -
           meta = {

     

       81
       81
       +
           meta = with stdenv.lib; {

     

       82
       82
        
             inherit branch;

     

       83
       83
        
             description = "An enterprise-class open source distributed monitoring solution (client-side agent)";

     

       84
       84
        
             homepage = http://www.zabbix.com/;

     

       85
       85
       -
             license = "GPL";

     

       86
       86
       -
             maintainers = [ stdenv.lib.maintainers.eelco ];

     

       87
       87
       -
             platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;

     

       85
       85
       +
             license = licenses.gpl2;

     

       86
       86
       +
             maintainers = [ maintainers.eelco ];

     

       87
       87
       +
             platforms = platforms.linux ++ platforms.darwin;

     

       88
       88
        
           };

     

       89
       89
        
         };

     

       90
       90

+4 -4

pkgs/servers/monitoring/zabbix/2.2.nix

···

       90
       90
        
       

     

       91
       91
        
           configureFlags = "--enable-agent";

     

       92
       92
        
       

     

       93
       93
       -
           meta = {

     

       93
       93
       +
           meta = with stdenv.lib; {

     

       94
       94
        
             inherit branch;

     

       95
       95
        
             description = "An enterprise-class open source distributed monitoring solution (client-side agent)";

     

       96
       96
        
             homepage = http://www.zabbix.com/;

     

       97
       97
       -
             license = "GPL";

     

       98
       98
       -
             maintainers = [ stdenv.lib.maintainers.eelco ];

     

       99
       99
       -
             platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;

     

       97
       97
       +
             license = licenses.gpl2;

     

       98
       98
       +
             maintainers = [ maintainers.eelco ];

     

       99
       99
       +
             platforms = platforms.linux ++ platforms.darwin;

     

       100
       100
        
           };

     

       101
       101
        
         };

     

       102
       102

+4 -4

pkgs/servers/monitoring/zabbix/default.nix

···

       57
       57
        
       

     

       58
       58
        
           configureFlags = "--enable-agent";

     

       59
       59
        
       

     

       60
       60
       -
           meta = {

     

       60
       60
       +
           meta = with stdenv.lib; {

     

       61
       61
        
             description = "An enterprise-class open source distributed monitoring solution (client-side agent)";

     

       62
       62
        
             homepage = http://www.zabbix.com/;

     

       63
       63
       -
             license = "GPL";

     

       64
       64
       -
             maintainers = [ stdenv.lib.maintainers.eelco ];

     

       65
       65
       -
             platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;

     

       63
       63
       +
             license = licenses.gpl2;

     

       64
       64
       +
             maintainers = [ maintainers.eelco ];

     

       65
       65
       +
             platforms = platforms.linux ++ platforms.darwin;

     

       66
       66
        
           };

     

       67
       67
        
         };

     

       68
       68

+2 -2

pkgs/servers/sql/postgresql/jdbc/default.nix

···

       20
       20
        
             cp jars/*.jar $out/share/java

     

       21
       21
        
           '';

     

       22
       22
        
       

     

       23
       23
       -
         meta = {

     

       23
       23
       +
         meta = with stdenv.lib; {

     

       24
       24
        
           homepage = http://jdbc.postgresql.org/;

     

       25
       25
        
           description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database";

     

       26
       26
       -
           license = "bsd";

     

       26
       26
       +
           license = licenses.bsd3;

     

       27
       27
        
         };

     

       28
       28
        
       }

+2 -2

pkgs/servers/sql/postgresql/psqlodbc/default.nix

···

       12
       12
        
       

     

       13
       13
        
         configureFlags = "--with-iodbc=${libiodbc}";

     

       14
       14
        
       

     

       15
       15
       -
         meta = {

     

       15
       15
       +
         meta = with stdenv.lib; {

     

       16
       16
        
           homepage = http://psqlodbc.projects.postgresql.org/;

     

       17
       17
        
           description = "ODBC driver for PostgreSQL";

     

       18
       18
       -
           license = "LGPL";

     

       18
       18
       +
           license = licenses.lgpl2;

     

       19
       19
        
         };

     

       20
       20
        
       }

+2 -2

pkgs/tools/compression/lzop/default.nix

···

       9
       9
        
       

     

       10
       10
        
         buildInputs = [ lzo ];

     

       11
       11
        
       

     

       12
       12
       -
         meta = {

     

       12
       12
       +
         meta = with stdenv.lib; {

     

       13
       13
        
           homepage = http://www.lzop.org;

     

       14
       14
        
           description = "Fast file compressor";

     

       15
       15
       -
           license = "GPL";

     

       15
       15
       +
           license = licenses.gpl2;

     

       16
       16
        
         };

     

       17
       17
        
       }

+2 -2

pkgs/tools/graphics/optipng/default.nix

···

       30
       30
        
           '';

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
       -
         meta = {

     

       33
       33
       +
         meta = with stdenv.lib; {

     

       34
       34
        
           homepage = http://optipng.sourceforge.net/;

     

       35
       35
        
           description = "A PNG optimizer";

     

       36
       36
       -
           license = "bsd";

     

       36
       36
       +
           license = licenses.zlib;

     

       37
       37
        
         };

     

       38
       38
        
       }

+2 -2

pkgs/tools/graphics/pdfread/default.nix

···

       40
       40
        
             --prefix PATH : ${ghostscript}/bin:${pngnq}/bin:${djvulibre}/bin:${unrar}/bin:${optipng}/bin

     

       41
       41
        
         '';

     

       42
       42
        
       

     

       43
       43
       -
         meta = {

     

       43
       43
       +
         meta = with stdenv.lib; {

     

       44
       44
        
           description = "PDF/DJVU to ebook format converter";

     

       45
       45
        
           homepage = http://www.mobileread.com/forums/showthread.php?t=21906;

     

       46
       46
       -
           license = "bsd";

     

       46
       46
       +
           license = licenses.mit;

     

       47
       47
        
         };

     

       48
       48
        
       }

+3 -3

pkgs/tools/security/muscleframework/default.nix

···

       20
       20
        
       

     

       21
       21
        
         buildInputs = [ libmusclecard pkgconfig pcsclite];

     

       22
       22
        
       

     

       23
       23
       -
         meta = {

     

       23
       23
       +
         meta = with stdenv.lib; {

     

       24
       24
        
           description = "MUSCLE smart card framework - mcard plugin";

     

       25
       25
        
           homepage = http://muscleplugins.alioth.debian.org/;

     

       26
       26
       -
           license = "BSD";

     

       27
       27
       -
           maintainers = with stdenv.lib.maintainers; [viric];

     

       26
       26
       +
           license = licenses.bsd3;

     

       27
       27
       +
           maintainers = with maintainers; [viric];

     

       28
       28
        
           # XXX: don't build before libmusclecard is fixed

     

       29
       29
        
           # platforms = with stdenv.lib.platforms; linux;

     

       30
       30
        
         };

+3 -3

pkgs/tools/security/muscletool/default.nix

···

       9
       9
        
       

     

       10
       10
        
         buildInputs = [ libmusclecard pcsclite pkgconfig ];

     

       11
       11
        
       

     

       12
       12
       -
         meta = {

     

       12
       12
       +
         meta = with stdenv.lib; {

     

       13
       13
        
           description = "Smart card applications for use with MUSCLE plugins";

     

       14
       14
        
           homepage = http://muscleapps.alioth.debian.org/;

     

       15
       15
       -
           license = "BSD"; # http://anonscm.debian.org/viewvc/muscleapps/trunk/muscleTool/COPYING?view=markup

     

       16
       16
       -
           maintainers = with stdenv.lib.maintainers; [viric];

     

       15
       15
       +
           license = licenses.bsd3;

     

       16
       16
       +
           maintainers = with maintainers; [viric];

     

       17
       17
        
           # XXX: don't build before libmusclecard is fixed

     

       18
       18
        
           # platforms = with stdenv.lib.platforms; linux;

     

       19
       19
        
         };