commit 4ce95e453b13f3a53ec4c788278d95a88330b701 · pyrox.dev/nixpkgs

+4 -4

nixos/modules/services/editors/infinoted.nix

···

       10
       10
        
       

     

       11
       11
        
           package = mkOption {

     

       12
       12
        
             type = types.package;

     

       13
       13
       -
             default = pkgs.libinfinity.override { daemon = true; };

     

       14
       14
       -
             defaultText = "pkgs.libinfinity.override { daemon = true; }";

     

       13
       13
       +
             default = pkgs.libinfinity;

     

       14
       14
       +
             defaultText = "pkgs.libinfinity";

     

       15
       15
        
             description = ''

     

       16
       16
        
               Package providing infinoted

     

       17
       17
        
             '';

     
···

       119
       119
        
           users.groups = optional (cfg.group == "infinoted")

     

       120
       120
        
             { name = "infinoted";

     

       121
       121
        
             };

     

       122
       122
       -
         

     

       122
       122
       +
       

     

       123
       123
        
           systemd.services.infinoted =

     

       124
       124
        
             { description = "Gobby Dedicated Server";

     

       125
       125
        
       

     
···

       129
       129
        
               serviceConfig = {

     

       130
       130
        
                 Type = "simple";

     

       131
       131
        
                 Restart = "always";

     

       132
       132
       -
                 ExecStart = "${cfg.package}/bin/infinoted-${versions.majorMinor cfg.package.version} --config-file=/var/lib/infinoted/infinoted.conf";

     

       132
       132
       +
                 ExecStart = "${cfg.package.infinoted} --config-file=/var/lib/infinoted/infinoted.conf";

     

       133
       133
        
                 User = cfg.user;

     

       134
       134
        
                 Group = cfg.group;

     

       135
       135
        
                 PermissionsStartOnly = true;

+39 -38

pkgs/development/libraries/libinfinity/default.nix

···

       1
       1
        
       { gtkWidgets ? false # build GTK widgets for libinfinity

     

       2
       2
       -
       , daemon ? false # build infinote daemon

     

       3
       3
       -
       , documentation ? false # build documentation

     

       4
       2
        
       , avahiSupport ? false # build support for Avahi in libinfinity

     

       5
       3
        
       , stdenv, fetchurl, pkgconfig, glib, libxml2, gnutls, gsasl

     

       6
       6
       -
       , gtk2 ? null, gtkdoc ? null, avahi ? null, libdaemon ? null, libidn, gss

     

       4
       4
       +
       , gobjectIntrospection

     

       5
       5
       +
       , gtk3 ? null, gtk-doc, docbook_xsl, docbook_xml_dtd_412, avahi ? null, libdaemon, libidn, gss

     

       7
       6
        
       , libintl }:

     

       8
       7
        
       

     

       8
       8
       +
       assert avahiSupport -> avahi != null;

     

       9
       9
       +
       assert gtkWidgets -> gtk3 != null;

     

       10
       10
       +
       

     

       9
       11
        
       let

     

       10
       10
       -
         edf = flag: feature: (if flag then "--with-" else "--without-") + feature;

     

       11
       11
       -
         optional = cond: elem: assert cond -> elem != null; if cond then [elem] else [];

     

       12
       12
       +
         mkFlag = flag: feature: (if flag then "--with-" else "--without-") + feature;

     

       12
       13
        
       

     

       13
       13
       -
       in stdenv.mkDerivation rec {

     

       14
       14
       +
         self = stdenv.mkDerivation rec {

     

       15
       15
       +
           name = "libinfinity-${version}";

     

       16
       16
       +
           version = "0.7.1";

     

       17
       17
       +
           src = fetchurl {

     

       18
       18
       +
             url = "http://releases.0x539.de/libinfinity/${name}.tar.gz";

     

       19
       19
       +
             sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2";

     

       20
       20
       +
           };

     

       14
       21
        
       

     

       15
       15
       -
         name = "libinfinity-${version}";

     

       16
       16
       -
         version = "0.7.1";

     

       17
       17
       -
         src = fetchurl {

     

       18
       18
       -
           url = "http://releases.0x539.de/libinfinity/${name}.tar.gz";

     

       19
       19
       -
           sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2";

     

       20
       20
       -
         };

     

       22
       22
       +
           outputs = [ "bin" "out" "dev" "man" "devdoc" ];

     

       21
       23
        
       

     

       22
       22
       -
         nativeBuildInputs = [ pkgconfig ];

     

       23
       23
       -
         buildInputs = [ glib libxml2 gsasl libidn gss libintl ]

     

       24
       24
       -
           ++ optional gtkWidgets gtk2

     

       25
       25
       -
           ++ optional documentation gtkdoc

     

       26
       26
       -
           ++ optional avahiSupport avahi

     

       27
       27
       -
           ++ optional daemon libdaemon;

     

       24
       24
       +
           nativeBuildInputs = [ pkgconfig gtk-doc docbook_xsl docbook_xml_dtd_412 gobjectIntrospection ];

     

       25
       25
       +
           buildInputs = [ glib libxml2 gsasl libidn gss libintl libdaemon ]

     

       26
       26
       +
             ++ stdenv.lib.optional gtkWidgets gtk3

     

       27
       27
       +
             ++ stdenv.lib.optional avahiSupport avahi;

     

       28
       28
        
       

     

       29
       29
       -
         propagatedBuildInputs = [ gnutls ];

     

       29
       29
       +
           propagatedBuildInputs = [ gnutls ];

     

       30
       30
        
       

     

       31
       31
       -
         configureFlags = ''

     

       32
       32
       -
           ${if documentation then "--enable-gtk-doc" else "--disable-gtk-doc"}

     

       33
       33
       -
           ${edf gtkWidgets "inftextgtk"}

     

       34
       34
       -
           ${edf gtkWidgets "infgtk"}

     

       35
       35
       -
           ${edf daemon "infinoted"}

     

       36
       36
       -
           ${edf daemon "libdaemon"}

     

       37
       37
       -
           ${edf avahiSupport "avahi"}

     

       38
       38
       -
         '';

     

       31
       31
       +
           configureFlags = [

     

       32
       32
       +
             "--enable-gtk-doc"

     

       33
       33
       +
             "--enable-introspection"

     

       34
       34
       +
             (mkFlag gtkWidgets "inftextgtk")

     

       35
       35
       +
             (mkFlag gtkWidgets "infgtk")

     

       36
       36
       +
             "--with-infinoted"

     

       37
       37
       +
             "--with-libdaemon"

     

       38
       38
       +
             (mkFlag avahiSupport "avahi")

     

       39
       39
       +
           ];

     

       39
       40
        
       

     

       40
       40
       -
         passthru = {

     

       41
       41
       -
           inherit version;

     

       42
       42
       -
         };

     

       41
       41
       +
           passthru = {

     

       42
       42
       +
             infinoted = "${self.bin}/bin/infinoted-${stdenv.lib.versions.majorMinor version}";

     

       43
       43
       +
           };

     

       43
       44
        
       

     

       44
       44
       -
         meta = {

     

       45
       45
       -
           homepage = http://gobby.0x539.de/;

     

       46
       46
       -
           description = "An implementation of the Infinote protocol written in GObject-based C";

     

       47
       47
       -
           license = stdenv.lib.licenses.lgpl2Plus;

     

       48
       48
       -
           maintainers = [ stdenv.lib.maintainers.phreedom ];

     

       49
       49
       -
           platforms = with stdenv.lib.platforms; linux ++ darwin;

     

       45
       45
       +
           meta = {

     

       46
       46
       +
             homepage = http://gobby.0x539.de/;

     

       47
       47
       +
             description = "An implementation of the Infinote protocol written in GObject-based C";

     

       48
       48
       +
             license = stdenv.lib.licenses.lgpl2Plus;

     

       49
       49
       +
             maintainers = [ stdenv.lib.maintainers.phreedom ];

     

       50
       50
       +
             platforms = with stdenv.lib.platforms; linux ++ darwin;

     

       51
       51
       +
           };

     

       50
       52
        
         };

     

       51
       51
       -
       

     

       52
       52
       -
       }

     

       53
       53
       +
       in self

+1 -3

pkgs/top-level/all-packages.nix

···

       10471
       10471
        
       

     

       10472
       10472
        
         libiec61883 = callPackage ../development/libraries/libiec61883 { };

     

       10473
       10473
        
       

     

       10474
       10474
       -
         libinfinity = callPackage ../development/libraries/libinfinity {

     

       10475
       10475
       -
           inherit (gnome2) gtkdoc;

     

       10476
       10476
       -
         };

     

       10474
       10474
       +
         libinfinity = callPackage ../development/libraries/libinfinity { };

     

       10477
       10475
        
       

     

       10478
       10476
        
         libinput = callPackage ../development/libraries/libinput {

     

       10479
       10477
        
           graphviz = graphviz-nox;