commit 128cdeffd0b801dd36258684e25fcd4ee99015d3 · pyrox.dev/nixpkgs

+4 -4

doc/coding-conventions.xml

···

       254
       254
        
         dash) — e.g., <literal>"hello-0.3.1rc2"</literal>.</para></listitem>

     

       255
       255
        
       

     

       256
       256
        
         <listitem><para>If a package is not a release but a commit from a repository, then

     

       257
       257
       -
         the version part of the name <emphasis>must</emphasis> be the date of that 

     

       257
       257
       +
         the version part of the name <emphasis>must</emphasis> be the date of that

     

       258
       258
        
         (fetched) commit. The date must be in <literal>"YYYY-MM-DD"</literal> format.

     

       259
       259
        
         Also append <literal>"unstable"</literal> to the name - e.g.,

     

       260
       260
        
         <literal>"pkgname-unstable-2014-09-23"</literal>.</para></listitem>

     
···

       456
       456
        
         <varlistentry>

     

       457
       457
        
           <term>If it’s a <emphasis>window manager</emphasis>:</term>

     

       458
       458
        
           <listitem>

     

       459
       459
       -
             <para><filename>applications/window-managers</filename> (e.g. <filename>awesome</filename>, <filename>compiz</filename>, <filename>stumpwm</filename>)</para>

     

       459
       459
       +
             <para><filename>applications/window-managers</filename> (e.g. <filename>awesome</filename>, <filename>stumpwm</filename>)</para>

     

       460
       460
        
           </listitem>

     

       461
       461
        
         </varlistentry>

     

       462
       462
        
         <varlistentry>

     
···

       661
       661
        
       </section>

     

       662
       662
        
       

     

       663
       663
        
       <section xml:id="sec-patches"><title>Patches</title>

     

       664
       664
       -
         <para>Only patches that are unique to <literal>nixpkgs</literal> should be 

     

       664
       664
       +
         <para>Only patches that are unique to <literal>nixpkgs</literal> should be

     

       665
       665
        
           included in <literal>nixpkgs</literal> source.</para>

     

       666
       666
       -
         <para>Patches available online should be retrieved using 

     

       666
       666
       +
         <para>Patches available online should be retrieved using

     

       667
       667
        
           <literal>fetchpatch</literal>.</para>

     

       668
       668
        
         <para>

     

       669
       669
        
       <programlisting>

+7 -1

nixos/doc/manual/release-notes/rl-1709.xml

···

       165
       165
        
             Refer to the description of the options for more details.

     

       166
       166
        
           </para>

     

       167
       167
        
         </listitem>

     

       168
       168
       +
         <listitem>

     

       169
       169
       +
           <para>

     

       170
       170
       +
             The <literal>compiz</literal> window manager and package was

     

       171
       171
       +
             removed. The system support had been broken for several years.

     

       172
       172
       +
           </para>

     

       173
       173
       +
         </listitem>

     

       168
       174
        
       </itemizedlist>

     

       169
       175
        
       

     

       170
       176
        
       <para>Other notable improvements:</para>

     
···

       210
       216
        
         <listitem>

     

       211
       217
        
           <para>

     

       212
       218
        
             Nixpkgs overlays may now be specified with a file as well as a directory. The

     

       213
       213
       -
             value of <literal>&lt;nixpkgs-overlays></literal> may be a file, and 

     

       219
       219
       +
             value of <literal>&lt;nixpkgs-overlays></literal> may be a file, and

     

       214
       220
        
             <filename>~/.config/nixpkgs/overlays.nix</filename> can be used instead of the

     

       215
       221
        
             <filename>~/.config/nixpkgs/overalys</filename> directory.

     

       216
       222
        
           </para>

-1

nixos/modules/module-list.nix

···

       630
       630
        
         ./services/x11/redshift.nix

     

       631
       631
        
         ./services/x11/urxvtd.nix

     

       632
       632
        
         ./services/x11/window-managers/awesome.nix

     

       633
       633
       -
         #./services/x11/window-managers/compiz.nix

     

       634
       633
        
         ./services/x11/window-managers/default.nix

     

       635
       634
        
         ./services/x11/window-managers/fluxbox.nix

     

       636
       635
        
         ./services/x11/window-managers/icewm.nix

-60

nixos/modules/services/x11/window-managers/compiz.nix

···

       1
       1
       -
       { config, lib, pkgs, ... }:

     

       2
       2
       -
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       5
       -
       let

     

       6
       6
       -
       

     

       7
       7
       -
         cfg = config.services.xserver.windowManager.compiz;

     

       8
       8
       -
         xorg = config.services.xserver.package;

     

       9
       9
       -
       

     

       10
       10
       -
       in

     

       11
       11
       -
       

     

       12
       12
       -
       {

     

       13
       13
       -
       

     

       14
       14
       -
         options = {

     

       15
       15
       -
       

     

       16
       16
       -
           services.xserver.windowManager.compiz = {

     

       17
       17
       -
       

     

       18
       18
       -
             enable = mkEnableOption "compiz";

     

       19
       19
       -
       

     

       20
       20
       -
             renderingFlag = mkOption {

     

       21
       21
       -
               default = "";

     

       22
       22
       -
               example = "--indirect-rendering";

     

       23
       23
       -
               description = "Pass the <option>--indirect-rendering</option> flag to Compiz.";

     

       24
       24
       -
             };

     

       25
       25
       -
       

     

       26
       26
       -
           };

     

       27
       27
       -
       

     

       28
       28
       -
         };

     

       29
       29
       -
       

     

       30
       30
       -
       

     

       31
       31
       -
         config = mkIf cfg.enable {

     

       32
       32
       -
       

     

       33
       33
       -
           services.xserver.windowManager.session = singleton

     

       34
       34
       -
             { name = "compiz";

     

       35
       35
       -
               start =

     

       36
       36
       -
                 ''

     

       37
       37
       -
                   # Start Compiz using the flat-file configuration backend

     

       38
       38
       -
                   # (ccp).

     

       39
       39
       -
                   export COMPIZ_PLUGINDIR=${config.system.path}/lib/compiz

     

       40
       40
       -
                   export COMPIZ_METADATADIR=${config.system.path}/share/compiz

     

       41
       41
       -
                   ${pkgs.compiz}/bin/compiz ccp ${cfg.renderingFlag} &

     

       42
       42
       -
       

     

       43
       43
       -
                   # Start GTK-style window decorator.

     

       44
       44
       -
                   ${pkgs.compiz}/bin/gtk-window-decorator &

     

       45
       45
       -
                 '';

     

       46
       46
       -
             };

     

       47
       47
       -
       

     

       48
       48
       -
           environment.systemPackages =

     

       49
       49
       -
             [ pkgs.compiz

     

       50
       50
       -
               pkgs.compiz_ccsm

     

       51
       51
       -
               pkgs.compiz_plugins_main

     

       52
       52
       -
               pkgs.compiz_plugins_extra

     

       53
       53
       -
               pkgs.libcompizconfig # for the "ccp" plugin

     

       54
       54
       -
             ];

     

       55
       55
       -
       

     

       56
       56
       -
           environment.pathsToLink = [ "/lib/compiz" "/share/compiz" ];

     

       57
       57
       -
       

     

       58
       58
       -
         };

     

       59
       59
       -
       

     

       60
       60
       -
       }

-1

nixos/modules/services/x11/window-managers/default.nix

···

       11
       11
        
           ./2bwm.nix

     

       12
       12
        
           ./afterstep.nix

     

       13
       13
        
           ./bspwm.nix

     

       14
       14
       -
           ./compiz.nix

     

       15
       14
        
           ./dwm.nix

     

       16
       15
        
           ./exwm.nix

     

       17
       16
        
           ./fluxbox.nix

-67

pkgs/applications/window-managers/compiz/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, cmake, pkgconfig

     

       2
       2
       -
       , libXrender, renderproto, gtk2, libwnck, pango, cairo

     

       3
       3
       -
       , GConf, libXdamage, damageproto, libxml2, libxslt, glibmm

     

       4
       4
       -
       , metacity

     

       5
       5
       -
       , libstartup_notification, libpthreadstubs, libxcb, intltool

     

       6
       6
       -
       , ORBit2, libXau, libICE, libSM

     

       7
       7
       -
       , dbus, dbus_glib, librsvg, mesa

     

       8
       8
       -
       , libXdmcp, libnotify, python2Packages

     

       9
       9
       -
       , hicolor_icon_theme, libjpeg_turbo, libsigcxx, protobuf

     

       10
       10
       -
       , xdg_utils

     

       11
       11
       -
       , gettext, boost, pyrex

     

       12
       12
       -
       , makeWrapper

     

       13
       13
       -
       }:

     

       14
       14
       -
       let

     

       15
       15
       -
         # FIXME: Use python.withPackages so we can get rid of PYTHONPATH wrapper

     

       16
       16
       -
         inherit (python2Packages) python dbus-python pygtk;

     

       17
       17
       -
       

     

       18
       18
       -
         s = # Generated upstream information

     

       19
       19
       -
         rec {

     

       20
       20
       -
           baseName="compiz";

     

       21
       21
       -
           version="0.9.13.1";

     

       22
       22
       -
           name="${baseName}-${version}";

     

       23
       23
       -
           hash="1grc4a4gc662hjs5adzdd3zlgsg1rh1wqm9aanbs8wm0l8mq0m4q";

     

       24
       24
       -
           url="https://launchpad.net/compiz/0.9.13/0.9.13.1/+download/compiz-0.9.13.1.tar.bz2";

     

       25
       25
       -
           sha256="1grc4a4gc662hjs5adzdd3zlgsg1rh1wqm9aanbs8wm0l8mq0m4q";

     

       26
       26
       -
         };

     

       27
       27
       -
         buildInputs = [cmake pkgconfig

     

       28
       28
       -
           libXrender renderproto gtk2 libwnck pango cairo

     

       29
       29
       -
           GConf libXdamage damageproto libxml2 libxslt glibmm libstartup_notification

     

       30
       30
       -
           metacity

     

       31
       31
       -
           libpthreadstubs libxcb intltool

     

       32
       32
       -
           ORBit2 libXau libICE libSM

     

       33
       33
       -
           dbus dbus_glib librsvg mesa

     

       34
       34
       -
           libXdmcp libnotify python

     

       35
       35
       -
           hicolor_icon_theme libjpeg_turbo libsigcxx protobuf pygtk dbus-python

     

       36
       36
       -
           xdg_utils

     

       37
       37
       -
           gettext boost pyrex

     

       38
       38
       -
           makeWrapper 

     

       39
       39
       -
           ];

     

       40
       40
       -
         in

     

       41
       41
       -
       stdenv.mkDerivation rec {

     

       42
       42
       -
         inherit (s) name version;

     

       43
       43
       -
         src = fetchurl {

     

       44
       44
       -
           inherit (s) url sha256;

     

       45
       45
       -
         };

     

       46
       46
       -
         inherit buildInputs;

     

       47
       47
       -
       

     

       48
       48
       -
         NIX_CFLAGS_COMPILE = " -Wno-error ";

     

       49
       49
       -
         NIX_CFLAGS_LINK = "-lm -ldl -pthread -lutil";

     

       50
       50
       -
         postInstall = ''

     

       51
       51
       -
           wrapProgram "$out/bin/ccsm" \

     

       52
       52
       -
             --prefix PYTHONPATH : "$PYTHONPATH" \

     

       53
       53
       -
             --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages"

     

       54
       54
       -
         '';

     

       55
       55
       -
       

     

       56
       56
       -
         # automatic moving fails, perhaps due to having two $out/lib*/pkgconfig

     

       57
       57
       -
         dontMoveLib64 = true;

     

       58
       58
       -
       

     

       59
       59
       -
         meta = {

     

       60
       60
       -
           description = "Compoziting window manager";

     

       61
       61
       -
           homepage = https://launchpad.net/compiz/;

     

       62
       62
       -
           license = stdenv.lib.licenses.gpl2;

     

       63
       63
       -
           maintainers = [stdenv.lib.maintainers.raskin];

     

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

     

       65
       65
       -
           inherit (s) version;

     

       66
       66
       -
         };

     

       67
       67
       -
       }

-1

pkgs/applications/window-managers/compiz/default.upstream

···

       1
       1
       -
       url https://launchpad.net/compiz/+download

-4

pkgs/top-level/all-packages.nix

···

       13690
       13690
        
       

     

       13691
       13691
        
         communi = libsForQt5.callPackage ../applications/networking/irc/communi { };

     

       13692
       13692
        
       

     

       13693
       13693
       -
         compiz = callPackage ../applications/window-managers/compiz {

     

       13694
       13694
       -
           inherit (gnome2) GConf ORBit2 metacity;

     

       13695
       13695
       -
         };

     

       13696
       13696
       -
       

     

       13697
       13693
        
         confclerk = callPackage ../applications/misc/confclerk { };

     

       13698
       13694
        
       

     

       13699
       13695
        
         copyq = callPackage ../applications/misc/copyq { };